Migrate IntroActivity and AboutActivity to Compose Navigation
#1213
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Arnau Mora <[email protected]>
Signed-off-by: Arnau Mora <[email protected]>
Signed-off-by: Arnau Mora <[email protected]>
Signed-off-by: Arnau Mora <[email protected]>
Signed-off-by: Arnau Mora <[email protected]>
Signed-off-by: Arnau Mora <[email protected]>
Signed-off-by: Arnau Mora <[email protected]>
Signed-off-by: Arnau Mora <[email protected]>
# Conflicts: # app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsScreen.kt # app/src/main/kotlin/at/bitfire/davdroid/ui/MainActivity.kt # app/src/ose/kotlin/at/bitfire/davdroid/OseFlavorModule.kt
Signed-off-by: Arnau Mora <[email protected]>
|
This PR/issue depends on: |
Signed-off-by: Arnau Mora <[email protected]>
# Conflicts: # app/src/main/kotlin/at/bitfire/davdroid/sync/account/AddressBookAuthenticatorService.kt # app/src/main/res/xml/sync_prefs.xml
|
So this is for after #1211, right? |
# Conflicts: # app/src/main/kotlin/at/bitfire/davdroid/ui/MainActivity.kt
Yup, this branch was checked out from migrate-main-activity |
Signed-off-by: Arnau Mora <[email protected]>
Signed-off-by: Arnau Mora <[email protected]>
# Conflicts: # app/src/main/kotlin/at/bitfire/davdroid/ui/MainActivity.kt # app/src/ose/kotlin/at/bitfire/davdroid/OseFlavorModule.kt
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
Migrates
IntroActivityandAboutActivityto Compose Navigation, following the progress made in #1211.Depends on #1211
Short description
IntroActivity.AboutActivity.IntroActivity(cancellation) is now passed using the back stack entry saved state handle.hiltViewModelinstead of simplyviewModel.at.bitfire.davdroid.ui.aboutpackage.Checklist