Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Merge branch 'main' into mlykotom/tz-perf-improvement

Tomáš Mlynaričf31fdb3ec293
diff --cc app/dependencies/prodReleaseRuntimeClasspath.txt
index 8a7906e2e,e7a4ac804..610ed087b
--- a/app/dependencies/prodReleaseRuntimeClasspath.txt
+++ b/app/dependencies/prodReleaseRuntimeClasspath.txt
@@@ -10,45 -10,46 +10,47 @@@ androidx.arch.core:core-common:2.2.
androidx.arch.core:core-runtime:2.2.0
androidx.autofill:autofill:1.0.0
androidx.browser:browser:1.6.0
- androidx.collection:collection-jvm:1.3.0
- androidx.collection:collection-ktx:1.3.0
- androidx.collection:collection:1.3.0
- androidx.compose.animation:animation-android:1.5.4
- androidx.compose.animation:animation-core-android:1.5.4
- androidx.compose.animation:animation-core:1.5.4
- androidx.compose.animation:animation:1.5.4
- androidx.compose.foundation:foundation-android:1.5.4
- androidx.compose.foundation:foundation-layout-android:1.5.4
- androidx.compose.foundation:foundation-layout:1.5.4
- androidx.compose.foundation:foundation:1.5.4
- androidx.compose.material3:material3-window-size-class:1.1.2
- androidx.compose.material3:material3:1.1.2
- androidx.compose.material:material-icons-core-android:1.5.4
- androidx.compose.material:material-icons-core:1.5.4
- androidx.compose.material:material-icons-extended-android:1.5.4
- androidx.compose.material:material-icons-extended:1.5.4
- androidx.compose.material:material-ripple-android:1.5.4
- androidx.compose.material:material-ripple:1.5.4
- androidx.compose.runtime:runtime-android:1.5.4
- androidx.compose.runtime:runtime-saveable-android:1.5.4
- androidx.compose.runtime:runtime-saveable:1.5.4
+ 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.1
+ androidx.compose.animation:animation-core-android:1.6.1
+ androidx.compose.animation:animation-core:1.6.1
+ androidx.compose.animation:animation:1.6.1
+ androidx.compose.foundation:foundation-android:1.6.1
+ androidx.compose.foundation:foundation-layout-android:1.6.1
+ androidx.compose.foundation:foundation-layout:1.6.1
+ androidx.compose.foundation:foundation:1.6.1
+ androidx.compose.material3:material3-android:1.2.0
+ androidx.compose.material3:material3-window-size-class-android:1.2.0
+ androidx.compose.material3:material3-window-size-class:1.2.0
+ androidx.compose.material3:material3:1.2.0
+ androidx.compose.material:material-icons-core-android:1.6.1
+ androidx.compose.material:material-icons-core:1.6.1
+ androidx.compose.material:material-icons-extended-android:1.6.1
+ androidx.compose.material:material-icons-extended:1.6.1
+ androidx.compose.material:material-ripple-android:1.6.1
+ androidx.compose.material:material-ripple:1.6.1
+ androidx.compose.runtime:runtime-android:1.6.1
+ androidx.compose.runtime:runtime-saveable-android:1.6.1
+ androidx.compose.runtime:runtime-saveable:1.6.1
+androidx.compose.runtime:runtime-tracing:1.0.0-beta01
- androidx.compose.runtime:runtime:1.5.4
- androidx.compose.ui:ui-android:1.5.4
- androidx.compose.ui:ui-geometry-android:1.5.4
- androidx.compose.ui:ui-geometry:1.5.4
- androidx.compose.ui:ui-graphics-android:1.5.4
- androidx.compose.ui:ui-graphics:1.5.4
- androidx.compose.ui:ui-text-android:1.5.4
- androidx.compose.ui:ui-text:1.5.4
- androidx.compose.ui:ui-tooling-preview-android:1.5.4
- androidx.compose.ui:ui-tooling-preview:1.5.4
- androidx.compose.ui:ui-unit-android:1.5.4
- androidx.compose.ui:ui-unit:1.5.4
- androidx.compose.ui:ui-util-android:1.5.4
- androidx.compose.ui:ui-util:1.5.4
- androidx.compose.ui:ui:1.5.4
- androidx.compose:compose-bom:2023.10.01
+ androidx.compose.runtime:runtime:1.6.1
+ androidx.compose.ui:ui-android:1.6.1
+ androidx.compose.ui:ui-geometry-android:1.6.1
+ androidx.compose.ui:ui-geometry:1.6.1
+ androidx.compose.ui:ui-graphics-android:1.6.1
+ androidx.compose.ui:ui-graphics:1.6.1
+ androidx.compose.ui:ui-text-android:1.6.1
+ androidx.compose.ui:ui-text:1.6.1
+ androidx.compose.ui:ui-tooling-preview-android:1.6.1
+ androidx.compose.ui:ui-tooling-preview:1.6.1
+ androidx.compose.ui:ui-unit-android:1.6.1
+ androidx.compose.ui:ui-unit:1.6.1
+ androidx.compose.ui:ui-util-android:1.6.1
+ androidx.compose.ui:ui-util:1.6.1
+ androidx.compose.ui:ui:1.6.1
+ androidx.compose:compose-bom:2024.02.00
androidx.concurrent:concurrent-futures:1.1.0
androidx.core:core-ktx:1.12.0
androidx.core:core-splashscreen:1.0.1
diff --cc app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt
index f3514b02f,f7345f04f..83ca1bb3d
--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt
+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt
@@@ -37,7 -37,7 +37,8 @@@ import com.google.samples.apps.nowinand
import com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepository
import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository
import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
+import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
+ import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
import com.google.samples.apps.nowinandroid.core.testing.util.DefaultRoborazziOptions
import com.google.samples.apps.nowinandroid.uitesthiltmanifest.HiltComponentActivity
import dagger.hilt.android.testing.BindValue
@@@ -144,15 -141,15 +145,17 @@@ class NiaAppScreenSizesScreenshotTests
) {
TestHarness(size = DpSize(width, height)) {
BoxWithConstraints {
- val fakeAppState = rememberNiaAppState(
- windowSizeClass = WindowSizeClass.calculateFromSize(
- DpSize(maxWidth, maxHeight),
- ),
- networkMonitor = networkMonitor,
- userNewsResourceRepository = userNewsResourceRepository,
- timeZoneMonitor = timeZoneMonitor,
- )
- NiaApp(fakeAppState)
+ NiaTheme {
- NiaApp(
++ val fakeAppState = rememberNiaAppState(
+ windowSizeClass = WindowSizeClass.calculateFromSize(
+ DpSize(maxWidth, maxHeight),
+ ),
+ networkMonitor = networkMonitor,
+ userNewsResourceRepository = userNewsResourceRepository,
++ timeZoneMonitor = timeZoneMonitor,
+ )
++ NiaApp(fakeAppState)
+ }
}
}
}
diff --cc gradle/libs.versions.toml
index 72a9eca3c,c26e134ca..85064eb6d
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@@ -7,8 -7,8 +7,8 @@@ androidTools = "31.2.0
androidxActivity = "1.8.0"
androidxAppCompat = "1.6.1"
androidxBrowser = "1.6.0"
- androidxComposeBom = "2023.10.01"
+ androidxComposeBom = "2024.02.00"
-androidxComposeCompiler = "1.5.7"
+androidxComposeCompiler = "1.5.8"
androidxComposeRuntimeTracing = "1.0.0-beta01"
androidxCore = "1.12.0"
androidxCoreSplashscreen = "1.0.1"