Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Briar Mailbox
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

b0be799f

Commit b0be799f authored 2 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '141-move-navigation-to-activity' into 'main'

Move fragment navigation to activity

Closes #144 and #141

See merge request !112

parents fd1cc0cb cda80286

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

mailbox-android/src/main/java/org/briarproject/mailbox/android/MailboxNotificationManager.kt 6 additions, 2 deletions

...riarproject/mailbox/android/MailboxNotificationManager.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/StatusManager.kt 11 additions, 4 deletions

...in/java/org/briarproject/mailbox/android/StatusManager.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/ClockSkewFragment.kt 0 additions, 21 deletions

.../org/briarproject/mailbox/android/ui/ClockSkewFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MainActivity.kt 43 additions, 20 deletions

.../java/org/briarproject/mailbox/android/ui/MainActivity.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/NoNetworkFragment.kt 0 additions, 21 deletions

.../org/briarproject/mailbox/android/ui/NoNetworkFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/QrCodeFragment.kt 2 additions, 9 deletions

...ava/org/briarproject/mailbox/android/ui/QrCodeFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/SetupCompleteFragment.kt 2 additions, 4 deletions

.../briarproject/mailbox/android/ui/SetupCompleteFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/StartupFragment.kt 2 additions, 23 deletions

...va/org/briarproject/mailbox/android/ui/StartupFragment.kt
mailbox-android/src/main/res/navigation/nav_main.xml 37 additions, 78 deletions

mailbox-android/src/main/res/navigation/nav_main.xml

with 103 additions and 182 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