Skip to content

Update to latest dependencies (nav) #5

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
riggaroo merged 3 commits into from
May 15, 2025
Merged

Update to latest dependencies (nav) #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3ec76e
Update to latest versions of dependencies.
riggaroo May 15, 2025
bd5bc3e
Merge branch 'main' into riggaroo/deps-update
riggaroo May 15, 2025
96e83c4
Update to latest versions of dependencies.
riggaroo May 15, 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
7 changes: 4 additions & 3 deletions app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.graphics.TransformOrigin
import androidx.compose.ui.unit.IntOffset
import androidx.lifecycle.viewmodel.navigation3.ViewModelStoreNavEntryDecorator
import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
import androidx.navigation3.runtime.SavedStateNavEntryDecorator
import androidx.navigation3.runtime.entry
import androidx.navigation3.runtime.entryProvider
import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
import androidx.navigation3.ui.NavDisplay
import androidx.navigation3.ui.SceneSetupNavEntryDecorator
import com.android.developers.androidify.camera.CameraPreviewScreen
Expand Down Expand Up @@ -73,9 +75,8 @@ fun MainNavigation() {
backStack = backStack,
onBack = { backStack.removeLastOrNull() },
entryDecorators = listOf(
SceneSetupNavEntryDecorator,
Copy link
Contributor

@alexvanyo alexvanyo May 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing this SGTM to workaround the movableContentOf camera issue.
Maybe a feature request for Nav3 here is to allow explicitly opt-ing out an entry from being wrapped with movableContentOf, if there are lasting reasons why content can't be wrapped with movableContentOf.

SavedStateNavEntryDecorator,
ViewModelStoreNavEntryDecorator,
rememberSavedStateNavEntryDecorator(),
rememberViewModelStoreNavEntryDecorator(),
),
transitionSpec = {
ContentTransform(
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ appcompat = "1.7.0"
baselineprofile = "1.3.4"
benchmarkMacroJunit4 = "1.3.4"
camerax = "1.5.0-SNAPSHOT"
coilCompose = "3.1.0"
coilGif = "3.1.0"
composeBom = "2025.04.01"
coilCompose = "3.2.0"
coilGif = "3.2.0"
composeBom = "2025.05.00"
concurrent = "1.2.0"
converterGson = "2.11.0"
coreKtx = "1.15.0"
Expand All @@ -43,7 +43,7 @@ lifecycleViewmodelNavigation3 = "1.0.0-SNAPSHOT"
loggingInterceptor = "5.0.0-alpha.14"
material = "1.12.0"
media3 = "1.6.1"
navigation3 = "0.1.0-SNAPSHOT"
navigation3 = "1.0.0-SNAPSHOT"
okhttp = "4.12.0"
poseDetection = "18.0.0-beta5"
profileinstaller = "1.4.1"
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pluginManagement {
maven {
// You can find the maven URL for other artifacts (e.g. KMP, METALAVA) on their
// build pages.
url = uri("https://androidx.dev/snapshots/builds/13467503/artifacts/repository")
url = uri("https://androidx.dev/snapshots/builds/13496591/artifacts/repository")
}

}
Expand All @@ -23,7 +23,7 @@ dependencyResolutionManagement {
google()
mavenCentral()
maven {
url = uri("https://androidx.dev/snapshots/builds/13467503/artifacts/repository")
url = uri("https://androidx.dev/snapshots/builds/13496591/artifacts/repository")
}
}
}
Expand Down