pull merge conflict (35dd4948) · 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
35dd4948

There was an error fetching the commit references. Please try again later.

Commit 35dd4948 authored 1 year ago by

Kenneth Ezekiel

Downloads
- Plain Diff

pull merge conflict

parents 82328259 f2005802

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/example/tubespbd/MainActivity.kt 25 additions, 1 deletion

app/src/main/java/com/example/tubespbd/MainActivity.kt
app/src/main/java/com/example/tubespbd/ui/scan/ScanFragment.kt 36 additions, 0 deletions

...rc/main/java/com/example/tubespbd/ui/scan/ScanFragment.kt
app/src/main/java/com/example/tubespbd/ui/scan/ScanViewModel.kt 11 additions, 0 deletions

...c/main/java/com/example/tubespbd/ui/scan/ScanViewModel.kt
app/src/main/res/layout/fragment_scan.xml 23 additions, 0 deletions

app/src/main/res/layout/fragment_scan.xml
app/src/main/res/menu/bottom_nav_menu.xml 5 additions, 0 deletions

app/src/main/res/menu/bottom_nav_menu.xml
app/src/main/res/navigation/mobile_navigation.xml 7 additions, 1 deletion

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

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

with 108 additions and 2 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