Merge branch 'feature/settings' into 'develop' (8ee03ee5) · Commits · IF3210-2024-Android-AVK / IF3210-2024-Android-AVK · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

IF3210-2024-Android-AVK
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

IF3210-2024-Android-AVK
IF3210-2024-Android-AVK
Commits
8ee03ee5

Commit 8ee03ee5 authored 1 year ago by

Kenneth Ezekiel

Downloads
- Plain Diff

Merge branch 'feature/settings' into 'develop'

add: settings button

See merge request !6

parents ade1176d 3d109749

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/AndroidManifest.xml 1 addition, 3 deletions

app/src/main/AndroidManifest.xml
app/src/main/java/com/example/tubespbd/MainActivity.kt 1 addition, 1 deletion

app/src/main/java/com/example/tubespbd/MainActivity.kt
app/src/main/java/com/example/tubespbd/ui/settings/SettingsFragment.kt 7 additions, 12 deletions

...java/com/example/tubespbd/ui/settings/SettingsFragment.kt
app/src/main/java/com/example/tubespbd/ui/settings/SettingsViewModel.kt 3 additions, 3 deletions

...ava/com/example/tubespbd/ui/settings/SettingsViewModel.kt
app/src/main/res/layout/fragment_settings.xml 39 additions, 0 deletions

app/src/main/res/layout/fragment_settings.xml
app/src/main/res/menu/bottom_nav_menu.xml 2 additions, 2 deletions

app/src/main/res/menu/bottom_nav_menu.xml
app/src/main/res/navigation/mobile_navigation.xml 4 additions, 4 deletions

app/src/main/res/navigation/mobile_navigation.xml
app/src/main/res/values/strings.xml 1 addition, 1 deletion

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

with 58 additions and 26 deletions

0% 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