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.

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

Jump to bottom

Add NavigationSuiteScaffold #1373

Merged
merged 1 commit into from
May 22, 2024
Merged

Add NavigationSuiteScaffold #1373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
101 changes: 58 additions & 43 deletions app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ androidx.activity:activity-compose:1.8.0
androidx.activity:activity-ktx:1.8.0
androidx.activity:activity:1.8.0
androidx.annotation:annotation-experimental:1.4.0
androidx.annotation:annotation-jvm:1.7.1
androidx.annotation:annotation:1.7.1
androidx.annotation:annotation-jvm:1.8.0-rc01
androidx.annotation:annotation:1.8.0-rc01
androidx.appcompat:appcompat-resources:1.6.1
androidx.arch.core:core-common:2.2.0
androidx.arch.core:core-runtime:2.2.0
Expand All @@ -12,14 +12,18 @@ androidx.browser:browser:1.8.0
androidx.collection:collection-jvm:1.4.0
androidx.collection:collection-ktx:1.4.0
androidx.collection:collection:1.4.0
androidx.compose.animation:animation-android:1.6.3
androidx.compose.animation:animation-core-android:1.6.3
androidx.compose.animation:animation-core:1.6.3
androidx.compose.animation:animation:1.6.3
androidx.compose.foundation:foundation-android:1.6.3
androidx.compose.foundation:foundation-layout-android:1.6.3
androidx.compose.foundation:foundation-layout:1.6.3
androidx.compose.foundation:foundation:1.6.3
androidx.compose.animation:animation-android:1.7.0-alpha08
androidx.compose.animation:animation-core-android:1.7.0-alpha08
androidx.compose.animation:animation-core:1.7.0-alpha08
androidx.compose.animation:animation:1.7.0-alpha08
androidx.compose.foundation:foundation-android:1.7.0-alpha08
androidx.compose.foundation:foundation-layout-android:1.7.0-alpha08
androidx.compose.foundation:foundation-layout:1.7.0-alpha08
androidx.compose.foundation:foundation:1.7.0-alpha08
androidx.compose.material3.adaptive:adaptive-android:1.0.0-alpha12
androidx.compose.material3.adaptive:adaptive:1.0.0-alpha12
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.0.0-alpha07
androidx.compose.material3:material3-adaptive-navigation-suite:1.0.0-alpha07
androidx.compose.material3:material3-android:1.2.1
androidx.compose.material3:material3:1.2.1
androidx.compose.material:material-icons-core-android:1.6.3
Expand All @@ -28,45 +32,52 @@ androidx.compose.material:material-icons-extended-android:1.6.3
androidx.compose.material:material-icons-extended:1.6.3
androidx.compose.material:material-ripple-android:1.6.3
androidx.compose.material:material-ripple:1.6.3
androidx.compose.runtime:runtime-android:1.6.3
androidx.compose.runtime:runtime-saveable-android:1.6.3
androidx.compose.runtime:runtime-saveable:1.6.3
androidx.compose.runtime:runtime:1.6.3
androidx.compose.ui:ui-android:1.6.3
androidx.compose.ui:ui-geometry-android:1.6.3
androidx.compose.ui:ui-geometry:1.6.3
androidx.compose.ui:ui-graphics-android:1.6.3
androidx.compose.ui:ui-graphics:1.6.3
androidx.compose.ui:ui-text-android:1.6.3
androidx.compose.ui:ui-text:1.6.3
androidx.compose.ui:ui-tooling-preview-android:1.6.3
androidx.compose.ui:ui-tooling-preview:1.6.3
androidx.compose.ui:ui-unit-android:1.6.3
androidx.compose.ui:ui-unit:1.6.3
androidx.compose.ui:ui-util-android:1.6.3
androidx.compose.ui:ui-util:1.6.3
androidx.compose.ui:ui:1.6.3
androidx.compose.runtime:runtime-android:1.7.0-alpha08
androidx.compose.runtime:runtime-saveable-android:1.7.0-alpha08
androidx.compose.runtime:runtime-saveable:1.7.0-alpha08
androidx.compose.runtime:runtime:1.7.0-alpha08
androidx.compose.ui:ui-android:1.7.0-alpha08
androidx.compose.ui:ui-geometry-android:1.7.0-alpha08
androidx.compose.ui:ui-geometry:1.7.0-alpha08
androidx.compose.ui:ui-graphics-android:1.7.0-alpha08
androidx.compose.ui:ui-graphics:1.7.0-alpha08
androidx.compose.ui:ui-text-android:1.7.0-alpha08
androidx.compose.ui:ui-text:1.7.0-alpha08
androidx.compose.ui:ui-tooling-preview-android:1.7.0-alpha08
androidx.compose.ui:ui-tooling-preview:1.7.0-alpha08
androidx.compose.ui:ui-unit-android:1.7.0-alpha08
androidx.compose.ui:ui-unit:1.7.0-alpha08
androidx.compose.ui:ui-util-android:1.7.0-alpha08
androidx.compose.ui:ui-util:1.7.0-alpha08
androidx.compose.ui:ui:1.7.0-alpha08
androidx.compose:compose-bom:2024.02.02
androidx.concurrent:concurrent-futures:1.1.0
androidx.core:core-ktx:1.12.0
androidx.core:core:1.12.0
androidx.core:core-ktx:1.13.1
androidx.core:core:1.13.1
androidx.customview:customview-poolingcontainer:1.0.0
androidx.customview:customview:1.0.0
androidx.emoji2:emoji2:1.3.0
androidx.exifinterface:exifinterface:1.3.7
androidx.fragment:fragment:1.5.1
androidx.graphics:graphics-path:1.0.1
androidx.interpolator:interpolator:1.0.0
androidx.lifecycle:lifecycle-common-java8:2.7.0
androidx.lifecycle:lifecycle-common:2.7.0
androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0
androidx.lifecycle:lifecycle-livedata-core:2.7.0
androidx.lifecycle:lifecycle-livedata:2.7.0
androidx.lifecycle:lifecycle-process:2.7.0
androidx.lifecycle:lifecycle-runtime-ktx:2.7.0
androidx.lifecycle:lifecycle-runtime:2.7.0
androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0
androidx.lifecycle:lifecycle-viewmodel:2.7.0
androidx.lifecycle:lifecycle-common-java8:2.8.0-rc01
androidx.lifecycle:lifecycle-common-jvm:2.8.0-rc01
androidx.lifecycle:lifecycle-common:2.8.0-rc01
androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.0-rc01
androidx.lifecycle:lifecycle-livedata-core:2.8.0-rc01
androidx.lifecycle:lifecycle-livedata:2.8.0-rc01
androidx.lifecycle:lifecycle-process:2.8.0-rc01
androidx.lifecycle:lifecycle-runtime-android:2.8.0-rc01
androidx.lifecycle:lifecycle-runtime-compose-android:2.8.0-rc01
androidx.lifecycle:lifecycle-runtime-compose:2.8.0-rc01
androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.0-rc01
androidx.lifecycle:lifecycle-runtime-ktx:2.8.0-rc01
androidx.lifecycle:lifecycle-runtime:2.8.0-rc01
androidx.lifecycle:lifecycle-viewmodel-android:2.8.0-rc01
androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0-rc01
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.0-rc01
androidx.lifecycle:lifecycle-viewmodel:2.8.0-rc01
androidx.loader:loader:1.0.0
androidx.metrics:metrics-performance:1.0.0-alpha04
androidx.profileinstaller:profileinstaller:1.3.1
Expand All @@ -79,6 +90,10 @@ androidx.vectordrawable:vectordrawable-animated:1.1.0
androidx.vectordrawable:vectordrawable:1.1.0
androidx.versionedparcelable:versionedparcelable:1.1.1
androidx.viewpager:viewpager:1.0.0
androidx.window.extensions.core:core:1.0.0
androidx.window:window-core-android:1.3.0-beta01
androidx.window:window-core:1.3.0-beta01
androidx.window:window:1.3.0-beta01
com.google.accompanist:accompanist-drawablepainter:0.32.0
com.google.code.findbugs:jsr305:3.0.2
com.google.dagger:dagger-lint-aar:2.51
Expand All @@ -94,10 +109,10 @@ io.coil-kt:coil-compose-base:2.6.0
io.coil-kt:coil-compose:2.6.0
io.coil-kt:coil:2.6.0
javax.inject:javax.inject:1
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.23
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
org.jetbrains.kotlin:kotlin-stdlib:1.9.22
org.jetbrains.kotlin:kotlin-stdlib:1.9.23
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
Expand Down
131 changes: 67 additions & 64 deletions app/dependencies/prodReleaseRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
androidx.activity:activity-compose:1.8.0
androidx.activity:activity-ktx:1.8.0
androidx.activity:activity:1.8.0
androidx.activity:activity-compose:1.8.2
androidx.activity:activity-ktx:1.8.2
androidx.activity:activity:1.8.2
androidx.annotation:annotation-experimental:1.4.0
androidx.annotation:annotation-jvm:1.8.0-beta01
androidx.annotation:annotation:1.8.0-beta01
androidx.annotation:annotation-jvm:1.8.0-rc01
androidx.annotation:annotation:1.8.0-rc01
androidx.appcompat:appcompat-resources:1.6.1
androidx.appcompat:appcompat:1.6.1
androidx.arch.core:core-common:2.2.0
Expand All @@ -13,20 +13,22 @@ androidx.browser:browser:1.8.0
androidx.collection:collection-jvm:1.4.0
androidx.collection:collection-ktx:1.4.0
androidx.collection:collection:1.4.0
androidx.compose.animation:animation-android:1.7.0-alpha06
androidx.compose.animation:animation-core-android:1.7.0-alpha06
androidx.compose.animation:animation-core:1.7.0-alpha06
androidx.compose.animation:animation:1.7.0-alpha06
androidx.compose.foundation:foundation-android:1.7.0-alpha06
androidx.compose.foundation:foundation-layout-android:1.7.0-alpha06
androidx.compose.foundation:foundation-layout:1.7.0-alpha06
androidx.compose.foundation:foundation:1.7.0-alpha06
androidx.compose.material3.adaptive:adaptive-android:1.0.0-alpha10
androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0-alpha10
androidx.compose.material3.adaptive:adaptive-layout:1.0.0-alpha10
androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0-alpha10
androidx.compose.material3.adaptive:adaptive-navigation:1.0.0-alpha10
androidx.compose.material3.adaptive:adaptive:1.0.0-alpha10
androidx.compose.animation:animation-android:1.7.0-alpha08
androidx.compose.animation:animation-core-android:1.7.0-alpha08
androidx.compose.animation:animation-core:1.7.0-alpha08
androidx.compose.animation:animation:1.7.0-alpha08
androidx.compose.foundation:foundation-android:1.7.0-alpha08
androidx.compose.foundation:foundation-layout-android:1.7.0-alpha08
androidx.compose.foundation:foundation-layout:1.7.0-alpha08
androidx.compose.foundation:foundation:1.7.0-alpha08
androidx.compose.material3.adaptive:adaptive-android:1.0.0-alpha12
androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0-alpha12
androidx.compose.material3.adaptive:adaptive-layout:1.0.0-alpha12
androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0-alpha12
androidx.compose.material3.adaptive:adaptive-navigation:1.0.0-alpha12
androidx.compose.material3.adaptive:adaptive:1.0.0-alpha12
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.0.0-alpha07
androidx.compose.material3:material3-adaptive-navigation-suite:1.0.0-alpha07
androidx.compose.material3:material3-android:1.2.1
androidx.compose.material3:material3-window-size-class-android:1.2.1
androidx.compose.material3:material3-window-size-class:1.2.1
Expand All @@ -37,30 +39,30 @@ androidx.compose.material:material-icons-extended-android:1.6.3
androidx.compose.material:material-icons-extended:1.6.3
androidx.compose.material:material-ripple-android:1.6.3
androidx.compose.material:material-ripple:1.6.3
androidx.compose.runtime:runtime-android:1.7.0-alpha06
androidx.compose.runtime:runtime-saveable-android:1.7.0-alpha06
androidx.compose.runtime:runtime-saveable:1.7.0-alpha06
androidx.compose.runtime:runtime-android:1.7.0-alpha08
androidx.compose.runtime:runtime-saveable-android:1.7.0-alpha08
androidx.compose.runtime:runtime-saveable:1.7.0-alpha08
androidx.compose.runtime:runtime-tracing:1.0.0-beta01
androidx.compose.runtime:runtime:1.7.0-alpha06
androidx.compose.ui:ui-android:1.7.0-alpha06
androidx.compose.ui:ui-geometry-android:1.7.0-alpha06
androidx.compose.ui:ui-geometry:1.7.0-alpha06
androidx.compose.ui:ui-graphics-android:1.7.0-alpha06
androidx.compose.ui:ui-graphics:1.7.0-alpha06
androidx.compose.ui:ui-text-android:1.7.0-alpha06
androidx.compose.ui:ui-text:1.7.0-alpha06
androidx.compose.ui:ui-tooling-preview-android:1.7.0-alpha06
androidx.compose.ui:ui-tooling-preview:1.7.0-alpha06
androidx.compose.ui:ui-unit-android:1.7.0-alpha06
androidx.compose.ui:ui-unit:1.7.0-alpha06
androidx.compose.ui:ui-util-android:1.7.0-alpha06
androidx.compose.ui:ui-util:1.7.0-alpha06
androidx.compose.ui:ui:1.7.0-alpha06
androidx.compose.runtime:runtime:1.7.0-alpha08
androidx.compose.ui:ui-android:1.7.0-alpha08
androidx.compose.ui:ui-geometry-android:1.7.0-alpha08
androidx.compose.ui:ui-geometry:1.7.0-alpha08
androidx.compose.ui:ui-graphics-android:1.7.0-alpha08
androidx.compose.ui:ui-graphics:1.7.0-alpha08
androidx.compose.ui:ui-text-android:1.7.0-alpha08
androidx.compose.ui:ui-text:1.7.0-alpha08
androidx.compose.ui:ui-tooling-preview-android:1.7.0-alpha08
androidx.compose.ui:ui-tooling-preview:1.7.0-alpha08
androidx.compose.ui:ui-unit-android:1.7.0-alpha08
androidx.compose.ui:ui-unit:1.7.0-alpha08
androidx.compose.ui:ui-util-android:1.7.0-alpha08
androidx.compose.ui:ui-util:1.7.0-alpha08
androidx.compose.ui:ui:1.7.0-alpha08
androidx.compose:compose-bom:2024.02.02
androidx.concurrent:concurrent-futures:1.1.0
androidx.core:core-ktx:1.12.0
androidx.core:core-ktx:1.13.1
androidx.core:core-splashscreen:1.0.1
androidx.core:core:1.12.0
androidx.core:core:1.13.1
androidx.cursoradapter:cursoradapter:1.0.0
androidx.customview:customview-poolingcontainer:1.0.0
androidx.customview:customview:1.0.0
Expand All @@ -74,32 +76,33 @@ androidx.emoji2:emoji2-views-helper:1.3.0
androidx.emoji2:emoji2:1.3.0
androidx.exifinterface:exifinterface:1.3.7
androidx.fragment:fragment:1.5.1
androidx.graphics:graphics-path:1.0.0-beta02
androidx.graphics:graphics-path:1.0.1
androidx.hilt:hilt-common:1.1.0
androidx.hilt:hilt-navigation-compose:1.2.0
androidx.hilt:hilt-navigation:1.2.0
androidx.hilt:hilt-work:1.1.0
androidx.interpolator:interpolator:1.0.0
androidx.legacy:legacy-support-core-utils:1.0.0
androidx.lifecycle:lifecycle-common-java8:2.8.0-alpha04
androidx.lifecycle:lifecycle-common-jvm:2.8.0-alpha04
androidx.lifecycle:lifecycle-common:2.8.0-alpha04
androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.0-alpha04
androidx.lifecycle:lifecycle-livedata-core:2.8.0-alpha04
androidx.lifecycle:lifecycle-livedata:2.8.0-alpha04
androidx.lifecycle:lifecycle-process:2.8.0-alpha04
androidx.lifecycle:lifecycle-runtime-android:2.8.0-alpha04
androidx.lifecycle:lifecycle-runtime-compose:2.8.0-alpha04
androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.0-alpha04
androidx.lifecycle:lifecycle-runtime-ktx:2.8.0-alpha04
androidx.lifecycle:lifecycle-runtime:2.8.0-alpha04
androidx.lifecycle:lifecycle-service:2.8.0-alpha04
androidx.lifecycle:lifecycle-viewmodel-android:2.8.0-alpha04
androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.0-alpha04
androidx.lifecycle:lifecycle-viewmodel-compose:2.8.0-alpha04
androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0-alpha04
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.0-alpha04
androidx.lifecycle:lifecycle-viewmodel:2.8.0-alpha04
androidx.lifecycle:lifecycle-common-java8:2.8.0-rc01
androidx.lifecycle:lifecycle-common-jvm:2.8.0-rc01
androidx.lifecycle:lifecycle-common:2.8.0-rc01
androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.0-rc01
androidx.lifecycle:lifecycle-livedata-core:2.8.0-rc01
androidx.lifecycle:lifecycle-livedata:2.8.0-rc01
androidx.lifecycle:lifecycle-process:2.8.0-rc01
androidx.lifecycle:lifecycle-runtime-android:2.8.0-rc01
androidx.lifecycle:lifecycle-runtime-compose-android:2.8.0-rc01
androidx.lifecycle:lifecycle-runtime-compose:2.8.0-rc01
androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.0-rc01
androidx.lifecycle:lifecycle-runtime-ktx:2.8.0-rc01
androidx.lifecycle:lifecycle-runtime:2.8.0-rc01
androidx.lifecycle:lifecycle-service:2.8.0-rc01
androidx.lifecycle:lifecycle-viewmodel-android:2.8.0-rc01
androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.0-rc01
androidx.lifecycle:lifecycle-viewmodel-compose:2.8.0-rc01
androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0-rc01
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.0-rc01
androidx.lifecycle:lifecycle-viewmodel:2.8.0-rc01
androidx.loader:loader:1.0.0
androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
androidx.metrics:metrics-performance:1.0.0-alpha04
Expand Down Expand Up @@ -129,9 +132,9 @@ androidx.vectordrawable:vectordrawable:1.1.0
androidx.versionedparcelable:versionedparcelable:1.1.1
androidx.viewpager:viewpager:1.0.0
androidx.window.extensions.core:core:1.0.0
androidx.window:window-core-android:1.3.0-alpha03
androidx.window:window-core:1.3.0-alpha03
androidx.window:window:1.3.0-alpha03
androidx.window:window-core-android:1.3.0-beta01
androidx.window:window-core:1.3.0-beta01
androidx.window:window:1.3.0-beta01
androidx.work:work-runtime-ktx:2.9.0
androidx.work:work-runtime:2.9.0
com.caverock:androidsvg-aar:1.4
Expand Down Expand Up @@ -203,10 +206,10 @@ io.coil-kt:coil-svg:2.6.0
io.coil-kt:coil:2.6.0
javax.inject:javax.inject:1
org.checkerframework:checker-qual:3.12.0
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.23
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
org.jetbrains.kotlin:kotlin-stdlib:1.9.22
org.jetbrains.kotlin:kotlin-stdlib:1.9.23
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.0
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0
Expand Down
8 changes: 1 addition & 7 deletions app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import androidx.annotation.StringRes
import androidx.compose.ui.test.assertCountEquals
import androidx.compose.ui.test.assertIsOn
import androidx.compose.ui.test.assertIsSelected
import androidx.compose.ui.test.hasAnyAncestor
import androidx.compose.ui.test.hasTestTag
import androidx.compose.ui.test.hasText
import androidx.compose.ui.test.junit4.AndroidComposeTestRule
Expand Down Expand Up @@ -225,12 +224,7 @@ class NavigationTest {
onNodeWithText(ok).performClick()

// Check that the saved screen is still visible and selected.
onNode(
hasText(saved) and
hasAnyAncestor(
hasTestTag("NiaBottomBar") or hasTestTag("NiaNavRail"),
),
).assertIsSelected()
onNode(hasText(saved) and hasTestTag("NiaNavItem")).assertIsSelected()
}
}

Expand Down
Loading
Loading