Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate IntroActivity and AboutActivity to Compose Navigation #1213

Draft
wants to merge 10 commits into
base: main-ose
Choose a base branch
from

Conversation

ArnyminerZ
Copy link
Member

@ArnyminerZ ArnyminerZ commented Jan 1, 2025

Purpose

Migrates IntroActivity and AboutActivity to Compose Navigation, following the progress made in #1211.

Depends on #1211

Short description

  • Got rid of IntroActivity.
  • Got rid of AboutActivity.
  • The result of IntroActivity (cancellation) is now passed using the back stack entry saved state handle.
  • All used view models now call hiltViewModel instead of simply viewModel.
  • Split all the "about" classes into their respective individual files in the at.bitfire.davdroid.ui.about package.

Checklist

  • The PR has a proper title, description and label.
  • I have self-reviewed the PR.
  • I have added documentation to complex functions and functions that can be used by other modules.
  • I have added reasonable tests or consciously decided to not add tests.

ArnyminerZ and others added 10 commits January 1, 2025 15:17
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]>
Copy link

github-actions bot commented Jan 1, 2025

This PR/issue depends on:

@ArnyminerZ ArnyminerZ self-assigned this Jan 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant