Skip to content

Migrate InfoActivity to Nav3 #666

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.

Sign up for GitHub

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

Merged
ArnyminerZ merged 7 commits into from
Sep 1, 2025
Merged

Migrate InfoActivity to Nav3 #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a96386
Migrate info activity to Nav3
ArnyminerZ Aug 25, 2025
d079f60
Merge branch 'dev' into nav3-migration/info-activity
ArnyminerZ Aug 26, 2025
613ebf5
Optimize imports
ArnyminerZ Aug 26, 2025
f269559
Merge branch 'dev' into nav3-migration/info-activity
ArnyminerZ Aug 27, 2025
d560338
Improve HTML display
ArnyminerZ Aug 27, 2025
188fc4b
Fixed link styles
ArnyminerZ Aug 27, 2025
1ba0b1a
Rename argument
ArnyminerZ Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,6 @@
android:label="@string/activity_edit_calendar"
android:parentActivityName=".MainActivity"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".ui.InfoActivity"
android:label="@string/activity_app_info"
android:parentActivityName=".MainActivity" />

</application>

Expand Down
261 changes: 0 additions & 261 deletions app/src/main/java/at/bitfire/icsdroid/ui/InfoActivity.kt
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions app/src/main/java/at/bitfire/icsdroid/ui/nav/Destination.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ sealed interface Destination : NavKey {
@Serializable
object SubscriptionList : Destination

@Serializable
object Info : Destination

@Serializable
data class AddSubscription(
val title: String? = null,
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/java/at/bitfire/icsdroid/ui/nav/MainApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import at.bitfire.icsdroid.MainActivity.Companion.EXTRA_THROWABLE
import at.bitfire.icsdroid.service.ComposableStartupService
import at.bitfire.icsdroid.ui.partials.AlertDialog
import at.bitfire.icsdroid.ui.screen.AddSubscriptionScreen
import at.bitfire.icsdroid.ui.screen.InfoScreen
import at.bitfire.icsdroid.ui.screen.SubscriptionsScreen
import java.util.ServiceLoader

Expand Down Expand Up @@ -94,9 +95,16 @@ fun MainApp(
entry(Destination.SubscriptionList) {
SubscriptionsScreen(
requestPermissions,
onAboutRequested = { backStack.add(Destination.Info) },
onAddRequested = { backStack.add(Destination.AddSubscription()) }
)
}
entry(Destination.Info) {
InfoScreen(
compStartupServices,
onBackRequested = ::goBack
)
}
entry<Destination.AddSubscription> { destination ->
var url: String? = null
LaunchedEffect(intentExtras) {
Expand Down
Loading