Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

com-ent-projet38-2024
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

d1fc628e

Commit d1fc628e authored 5 months ago by PFEFFER Melvil

Downloads
- Plain Diff

Merge branch 'main' into 'update-pages'

# Conflicts:
#   app/src/main/res/values/strings.xml - solved

parents 5f4047c3 af0e68ed

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/AndroidManifest.xml 2 additions, 1 deletion

app/src/main/AndroidManifest.xml
app/src/main/java/com/example/myapplication/OverlayDialogFragmentForm.java 47 additions, 0 deletions

.../com/example/myapplication/OverlayDialogFragmentForm.java
app/src/main/java/com/example/myapplication/PhotoPage.java 15 additions, 1 deletion

app/src/main/java/com/example/myapplication/PhotoPage.java
app/src/main/res/layout/fragment_form.xml 96 additions, 0 deletions

app/src/main/res/layout/fragment_form.xml
app/src/main/res/values/strings.xml 6 additions, 0 deletions

app/src/main/res/values/strings.xml

with 166 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment