Skip to content

Commit 8cdba91

Browse files
committed
Factored out Nav3 Adaptive for now
1 parent 1669648 commit 8cdba91

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ dependencies {
9797
implementation(libs.androidx.navigation3.runtime)
9898
implementation(libs.androidx.navigation3.ui)
9999
implementation(libs.androidx.lifecycle.viewmodel.navigation3)
100-
implementation(libs.androidx.material3.navigation3)
100+
//implementation(libs.androidx.material3.navigation3)
101101
implementation(libs.timber)
102102
implementation(libs.kim)
103103
implementation(project.dependencies.platform(libs.koin.bom))

app/src/main/kotlin/com/darkrockstudios/app/securecamera/App.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.compose.runtime.*
88
import androidx.compose.ui.Modifier
99
import androidx.lifecycle.compose.LifecycleResumeEffect
1010
import androidx.navigation3.runtime.NavBackStack
11+
import androidx.navigation3.runtime.NavKey
1112
import com.darkrockstudios.app.securecamera.auth.AuthorizationRepository
1213
import com.darkrockstudios.app.securecamera.navigation.AppNavHost
1314
import com.darkrockstudios.app.securecamera.navigation.NavController
@@ -20,7 +21,7 @@ import org.koin.compose.koinInject
2021
@Composable
2122
fun App(
2223
capturePhoto: MutableState<Boolean?>,
23-
backStack: NavBackStack,
24+
backStack: NavBackStack<NavKey>,
2425
navController: NavController
2526
) {
2627
KoinContext {

app/src/main/kotlin/com/darkrockstudios/app/securecamera/navigation/AppNavigation.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import androidx.compose.ui.Modifier
1111
import androidx.compose.ui.res.stringResource
1212
import androidx.navigation3.runtime.NavBackStack
1313
import androidx.navigation3.runtime.NavKey
14-
import androidx.navigation3.runtime.entry
1514
import androidx.navigation3.runtime.entryProvider
1615
import androidx.navigation3.ui.NavDisplay
1716
import com.darkrockstudios.app.securecamera.R
@@ -31,7 +30,7 @@ import kotlin.io.encoding.ExperimentalEncodingApi
3130
@OptIn(ExperimentalEncodingApi::class)
3231
@Composable
3332
fun AppNavHost(
34-
backStack: NavBackStack,
33+
backStack: NavBackStack<NavKey>,
3534
navController: NavController,
3635
capturePhoto: MutableState<Boolean?>,
3736
modifier: Modifier = Modifier,

app/src/main/kotlin/com/darkrockstudios/app/securecamera/navigation/Nav3CompatController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class NavOptions {
1919
}
2020

2121
class Nav3CompatController(
22-
private val backStack: NavBackStack
22+
private val backStack: NavBackStack<NavKey>
2323
) : NavController {
2424
override fun navigate(key: NavKey, builder: (NavOptions.() -> Unit)?) {
2525
val opts = NavOptions().apply { builder?.invoke(this) }

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencyResolutionManagement {
1818
mavenCentral()
1919
maven { url = uri("https://jitpack.io") }
2020
// TODO this is only needed for nav3 snapshots, can remove once they are stable
21-
maven { url = uri("https://androidx.dev/snapshots/builds/13915848/artifacts/repository") }
21+
//maven { url = uri("https://androidx.dev/snapshots/builds/13915848/artifacts/repository") }
2222
}
2323
}
2424

0 commit comments

Comments
 (0)