Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions app/src/main/java/at/bitfire/icsdroid/ui/nav/MainApp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,25 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.core.content.IntentCompat
import androidx.compose.ui.platform.LocalContext
import androidx.core.app.ShareCompat
import androidx.core.content.IntentCompat
import androidx.core.os.BundleCompat
import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
import androidx.navigation3.runtime.entry
import androidx.navigation3.runtime.entryProvider
import androidx.navigation3.runtime.rememberNavBackStack
import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
import androidx.navigation3.scene.rememberSceneSetupNavEntryDecorator
import androidx.navigation3.ui.NavDisplay
import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator
import at.bitfire.icsdroid.MainActivity.Companion.EXTRA_ERROR_MESSAGE
import at.bitfire.icsdroid.MainActivity.Companion.EXTRA_REQUEST_CALENDAR_PERMISSION
import at.bitfire.icsdroid.MainActivity.Companion.EXTRA_THROWABLE
import at.bitfire.icsdroid.R
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.EditSubscriptionScreen
import at.bitfire.icsdroid.ui.screen.InfoScreen
import at.bitfire.icsdroid.ui.screen.SubscriptionsScreen
import java.util.ServiceLoader

Expand Down
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ androidx-core = "1.17.0"
androidx-hilt = "1.3.0"
androidx-lifecycle = "2.9.4"
# should be replaced by androidx-lifecycle once nav3 is stable (probably 2.10.0?)
androidx-lifecycle-nav3 = "2.10.0-alpha03"
androidx-nav3 = "1.0.0-alpha09"
androidx-lifecycle-nav3 = "2.10.0-alpha04"
androidx-nav3 = "1.0.0-alpha10"
androidx-test-junit = "1.3.0"
androidx-test-rules = "1.7.0"
androidx-test-runner = "1.7.0"
androidx-work = "2.10.4"
androidx-work = "2.10.5"
bitfire-cert4android = "41009d4"
bitfire-synctools = "7aa709f6b6"
compose-dialogs = "1.3.0"
compose-material = "1.7.8"
compose-material3 = "1.3.2"
compose-runtime = "1.9.1"
compose-ui = "1.9.1"
compose-material3 = "1.4.0"
compose-runtime = "1.9.2"
compose-ui = "1.9.2"
datastore = "1.1.7"
desugaring = "2.1.5"
hilt = "2.57.1"
Expand All @@ -32,7 +32,7 @@ kotlinx-serialization-core = "1.9.0"
ksp = "2.2.20-2.0.3"
ktor = "3.3.0"
okhttp = "5.1.0"
room = "2.8.0"
room = "2.8.1"

[libraries]
aboutLibs-compose = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutLibs" }
Expand Down