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

bbbd8c2b

Commit bbbd8c2b authored 6 months ago by PFEFFER Melvil

Downloads
- Plain Diff

Merge branch 'update-pages' into 'main'

changed some pages as in Figma and run tutorial from photo page operational

See merge request !6

parents e0028a5f 27310d18

Branches form

No related tags found

1 merge request!6changed some pages as in Figma and run tutorial from photo page operational

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/example/myapplication/HomeActivity.java 11 additions, 6 deletions

...src/main/java/com/example/myapplication/HomeActivity.java
app/src/main/java/com/example/myapplication/PhotoPage.java 19 additions, 8 deletions

app/src/main/java/com/example/myapplication/PhotoPage.java
app/src/main/java/com/example/myapplication/TutorialActivity.java 14 additions, 4 deletions

...main/java/com/example/myapplication/TutorialActivity.java
app/src/main/res/drawable/camera_tiny.png 0 additions, 0 deletions

app/src/main/res/drawable/camera_tiny.png
app/src/main/res/drawable/folder.png 0 additions, 0 deletions

app/src/main/res/drawable/folder.png
app/src/main/res/drawable/shape_transparent.xml 1 addition, 6 deletions

app/src/main/res/drawable/shape_transparent.xml
app/src/main/res/layout/fragment_photo_page.xml 103 additions, 66 deletions

app/src/main/res/layout/fragment_photo_page.xml
app/src/main/res/layout/fragment_stats_page.xml 85 additions, 65 deletions

app/src/main/res/layout/fragment_stats_page.xml
app/src/main/res/values/strings.xml 5 additions, 1 deletion

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

with 238 additions and 156 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