Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

MOBAPP
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

fbaa37a5

Commit fbaa37a5 authored 2 months ago by THONG Sylvain

Downloads
- Plain Diff

Merge branch 'main' into 'feat/GoogleMaps'

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

parents 9c6cc0e1 542f1393

No related branches found

No related tags found

1 merge request!1feat(UI): GoogleMaps Fragment

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/fr/imt_atlantique/myfirstapplication/DatePickerFragment.java 10 additions, 0 deletions

...imt_atlantique/myfirstapplication/DatePickerFragment.java
app/src/main/java/fr/imt_atlantique/myfirstapplication/DisplayUserFragment.java 14 additions, 0 deletions

...mt_atlantique/myfirstapplication/DisplayUserFragment.java
app/src/main/java/fr/imt_atlantique/myfirstapplication/EditUserFragment.java 62 additions, 30 deletions

...r/imt_atlantique/myfirstapplication/EditUserFragment.java
app/src/main/java/fr/imt_atlantique/myfirstapplication/MainActivity.java 11 additions, 3 deletions

...va/fr/imt_atlantique/myfirstapplication/MainActivity.java
app/src/main/res/layout/phone_number_input.xml 3 additions, 5 deletions

app/src/main/res/layout/phone_number_input.xml
app/src/main/res/values-FR/strings.xml 1 addition, 0 deletions

app/src/main/res/values-FR/strings.xml
app/src/main/res/values/strings.xml 1 addition, 1 deletion

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

with 102 additions and 39 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