From 3797ea4290eecc0da5d4d7cef31d820bb7bc96e9 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Thu, 24 Aug 2023 09:24:08 +0200 Subject: [PATCH 001/164] Enable SARIF support on GitHub Actions Splitted from the initial Lint rework in #759. --- .github/workflows/Build.yaml | 6 ++++++ .../src/main/kotlin/AndroidLintConventionPlugin.kt | 1 + 2 files changed, 7 insertions(+) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index 9a0dca106..3d49f3734 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -125,6 +125,12 @@ jobs: name: lint-reports path: '**/build/reports/lint-results-*.html' + - name: Upload lint reports (SARIF) + if: always() + uses: github/codeql-action/upload-sarif@v2 + with: + sarif_file: './' + androidTest: needs: build runs-on: macOS-latest # enables hardware acceleration in the virtual machine diff --git a/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt index 1734df930..68ca58b2a 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt @@ -42,5 +42,6 @@ class AndroidLintConventionPlugin : Plugin { private fun Lint.configure() { xmlReport = true + sarifReport = true checkDependencies = true } From d71383c2888b6ea1e3d8ec06b4059def30a7918d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mlynari=C4=8D?= Date: Wed, 10 Apr 2024 12:26:36 +0200 Subject: [PATCH 002/164] Add niaEdgeToEdge trace tag Change-Id: I8012c8b4544abc9488f96f6f01822fb15bb0775a --- .../samples/apps/nowinandroid/MainActivity.kt | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt index ad95c297f..d73c4bd63 100644 --- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt @@ -37,6 +37,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.metrics.performance.JankStats +import androidx.tracing.trace import com.google.samples.apps.nowinandroid.MainActivityUiState.Loading import com.google.samples.apps.nowinandroid.MainActivityUiState.Success import com.google.samples.apps.nowinandroid.core.analytics.AnalyticsHelper @@ -110,7 +111,7 @@ class MainActivity : ComponentActivity() { // Turn off the decor fitting system windows, which allows us to handle insets, // including IME animations, and go edge-to-edge // This also sets up the initial system bar style based on the platform theme - enableEdgeToEdge() + trace("niaEdgeToEdge") { enableEdgeToEdge() } setContent { val darkTheme = shouldUseDarkTheme(uiState) @@ -120,17 +121,19 @@ class MainActivity : ComponentActivity() { // resolve whether or not to show dark theme using uiState, since it can be different // than the configuration's dark theme value based on the user preference. DisposableEffect(darkTheme) { - enableEdgeToEdge( - statusBarStyle = SystemBarStyle.auto( - android.graphics.Color.TRANSPARENT, - android.graphics.Color.TRANSPARENT, - ) { darkTheme }, - navigationBarStyle = SystemBarStyle.auto( - lightScrim, - darkScrim, - ) { darkTheme }, - ) - onDispose {} + trace("niaEdgeToEdge") { + enableEdgeToEdge( + statusBarStyle = SystemBarStyle.auto( + android.graphics.Color.TRANSPARENT, + android.graphics.Color.TRANSPARENT, + ) { darkTheme }, + navigationBarStyle = SystemBarStyle.auto( + lightScrim, + darkScrim, + ) { darkTheme }, + ) + onDispose {} + } } val appState = rememberNiaAppState( From bd508c477a975f5fbc0b33f048b6aa338b71e4e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mlynari=C4=8D?= Date: Wed, 10 Apr 2024 11:51:39 +0200 Subject: [PATCH 003/164] Optimized handling of dark/light mode - Activity handles uiMode config change to prevent re-creating the whole activity - Wrap uiState logic into its classes - Optimize startup to prevent recomposing twice on startup - Optimize startup to call enableEdgeToEdge only once or when change occurs Change-Id: I6f7a48b3b6ce9b55db4ab2ec1770583028e9bc50 --- app/src/main/AndroidManifest.xml | 1 + .../samples/apps/nowinandroid/MainActivity.kt | 151 +++++++----------- .../nowinandroid/MainActivityViewModel.kt | 39 ++++- .../apps/nowinandroid/util/UiExtensions.kt | 49 ++++++ 4 files changed, 146 insertions(+), 94 deletions(-) create mode 100644 app/src/main/kotlin/com/google/samples/apps/nowinandroid/util/UiExtensions.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0b0482c13..961b0bec6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -39,6 +39,7 @@ diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt index d73c4bd63..5b10f7ec2 100644 --- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt @@ -22,12 +22,9 @@ import androidx.activity.SystemBarStyle import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.activity.viewModels -import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass -import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider -import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue @@ -38,27 +35,22 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.metrics.performance.JankStats import androidx.tracing.trace -import com.google.samples.apps.nowinandroid.MainActivityUiState.Loading -import com.google.samples.apps.nowinandroid.MainActivityUiState.Success import com.google.samples.apps.nowinandroid.core.analytics.AnalyticsHelper import com.google.samples.apps.nowinandroid.core.analytics.LocalAnalyticsHelper 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.model.data.DarkThemeConfig -import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand import com.google.samples.apps.nowinandroid.core.ui.LocalTimeZone import com.google.samples.apps.nowinandroid.ui.NiaApp import com.google.samples.apps.nowinandroid.ui.rememberNiaAppState +import com.google.samples.apps.nowinandroid.util.isSystemInDarkTheme import dagger.hilt.android.AndroidEntryPoint -import kotlinx.coroutines.flow.collect -import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.launch import javax.inject.Inject -private const val TAG = "MainActivity" - @OptIn(ExperimentalMaterial3WindowSizeClassApi::class) @AndroidEntryPoint class MainActivity : ComponentActivity() { @@ -82,60 +74,64 @@ class MainActivity : ComponentActivity() { lateinit var userNewsResourceRepository: UserNewsResourceRepository val viewModel: MainActivityViewModel by viewModels() - override fun onCreate(savedInstanceState: Bundle?) { val splashScreen = installSplashScreen() super.onCreate(savedInstanceState) - var uiState: MainActivityUiState by mutableStateOf(Loading) + // We keep this as a mutable state, so that we can track changes inside the composition. + // This allows us to react to dark/light mode changes. + var themeSettings by mutableStateOf( + ThemeSettings( + darkTheme = resources.configuration.isSystemInDarkTheme, + androidTheme = false, + disableDynamicTheming = true, + ), + ) // Update the uiState lifecycleScope.launch { lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) { - viewModel.uiState - .onEach { uiState = it } - .collect() + combine( + isSystemInDarkTheme(), + viewModel.uiState, + ) { systemDark, uiState -> + ThemeSettings( + darkTheme = uiState.shouldUseDarkTheme(systemDark), + androidTheme = uiState.shouldUseAndroidTheme, + disableDynamicTheming = uiState.shouldDisableDynamicTheming, + ) + } + .distinctUntilChanged() + .collect { newThemeSettings -> + trace("niaEdgeToEdge") { + // Turn off the decor fitting system windows, which allows us to handle insets, + // including IME animations, and go edge-to-edge. + // This is the same parameters as the default enableEdgeToEdge call, but we manually + // resolve whether or not to show dark theme using uiState, since it can be different + // than the configuration's dark theme value based on the user preference. + enableEdgeToEdge( + statusBarStyle = SystemBarStyle.auto( + lightScrim = android.graphics.Color.TRANSPARENT, + darkScrim = android.graphics.Color.TRANSPARENT, + ) { newThemeSettings.darkTheme }, + navigationBarStyle = SystemBarStyle.auto( + lightScrim = lightScrim, + darkScrim = darkScrim, + ) { newThemeSettings.darkTheme }, + ) + } + + themeSettings = newThemeSettings + } } } // Keep the splash screen on-screen until the UI state is loaded. This condition is // evaluated each time the app needs to be redrawn so it should be fast to avoid blocking // the UI. - splashScreen.setKeepOnScreenCondition { - when (uiState) { - Loading -> true - is Success -> false - } - } - - // Turn off the decor fitting system windows, which allows us to handle insets, - // including IME animations, and go edge-to-edge - // This also sets up the initial system bar style based on the platform theme - trace("niaEdgeToEdge") { enableEdgeToEdge() } + splashScreen.setKeepOnScreenCondition { viewModel.uiState.value.shouldKeepSplashScreen() } setContent { - val darkTheme = shouldUseDarkTheme(uiState) - - // Update the edge to edge configuration to match the theme - // This is the same parameters as the default enableEdgeToEdge call, but we manually - // resolve whether or not to show dark theme using uiState, since it can be different - // than the configuration's dark theme value based on the user preference. - DisposableEffect(darkTheme) { - trace("niaEdgeToEdge") { - enableEdgeToEdge( - statusBarStyle = SystemBarStyle.auto( - android.graphics.Color.TRANSPARENT, - android.graphics.Color.TRANSPARENT, - ) { darkTheme }, - navigationBarStyle = SystemBarStyle.auto( - lightScrim, - darkScrim, - ) { darkTheme }, - ) - onDispose {} - } - } - val appState = rememberNiaAppState( windowSizeClass = calculateWindowSizeClass(this), networkMonitor = networkMonitor, @@ -150,9 +146,9 @@ class MainActivity : ComponentActivity() { LocalTimeZone provides currentTimeZone, ) { NiaTheme( - darkTheme = darkTheme, - androidTheme = shouldUseAndroidTheme(uiState), - disableDynamicTheming = shouldDisableDynamicTheming(uiState), + darkTheme = themeSettings.darkTheme, + androidTheme = themeSettings.androidTheme, + disableDynamicTheming = themeSettings.disableDynamicTheming, ) { NiaApp(appState) } @@ -171,47 +167,6 @@ class MainActivity : ComponentActivity() { } } -/** - * Returns `true` if the Android theme should be used, as a function of the [uiState]. - */ -@Composable -private fun shouldUseAndroidTheme( - uiState: MainActivityUiState, -): Boolean = when (uiState) { - Loading -> false - is Success -> when (uiState.userData.themeBrand) { - ThemeBrand.DEFAULT -> false - ThemeBrand.ANDROID -> true - } -} - -/** - * Returns `true` if the dynamic color is disabled, as a function of the [uiState]. - */ -@Composable -private fun shouldDisableDynamicTheming( - uiState: MainActivityUiState, -): Boolean = when (uiState) { - Loading -> false - is Success -> !uiState.userData.useDynamicColor -} - -/** - * Returns `true` if dark theme should be used, as a function of the [uiState] and the - * current system context. - */ -@Composable -private fun shouldUseDarkTheme( - uiState: MainActivityUiState, -): Boolean = when (uiState) { - Loading -> isSystemInDarkTheme() - is Success -> when (uiState.userData.darkThemeConfig) { - DarkThemeConfig.FOLLOW_SYSTEM -> isSystemInDarkTheme() - DarkThemeConfig.LIGHT -> false - DarkThemeConfig.DARK -> true - } -} - /** * The default light scrim, as defined by androidx and the platform: * https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:activity/activity/src/main/java/androidx/activity/EdgeToEdge.kt;l=35-38;drc=27e7d52e8604a080133e8b842db10c89b4482598 @@ -223,3 +178,13 @@ private val lightScrim = android.graphics.Color.argb(0xe6, 0xFF, 0xFF, 0xFF) * https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:activity/activity/src/main/java/androidx/activity/EdgeToEdge.kt;l=40-44;drc=27e7d52e8604a080133e8b842db10c89b4482598 */ private val darkScrim = android.graphics.Color.argb(0x80, 0x1b, 0x1b, 0x1b) + +/** + * Class for the system theme settings. + * This wrapping class allows us to combine all the changes and prevent unnecessary recompositions. + */ +data class ThemeSettings( + val darkTheme: Boolean, + val androidTheme: Boolean, + val disableDynamicTheming: Boolean, +) diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivityViewModel.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivityViewModel.kt index 09f4597a7..3715bb8b4 100644 --- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivityViewModel.kt +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivityViewModel.kt @@ -21,6 +21,8 @@ import androidx.lifecycle.viewModelScope import com.google.samples.apps.nowinandroid.MainActivityUiState.Loading import com.google.samples.apps.nowinandroid.MainActivityUiState.Success import com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepository +import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig +import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand import com.google.samples.apps.nowinandroid.core.model.data.UserData import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.SharingStarted @@ -44,5 +46,40 @@ class MainActivityViewModel @Inject constructor( sealed interface MainActivityUiState { data object Loading : MainActivityUiState - data class Success(val userData: UserData) : MainActivityUiState + + data class Success(val userData: UserData) : MainActivityUiState { + override val shouldDisableDynamicTheming = !userData.useDynamicColor + + override val shouldUseAndroidTheme: Boolean = when (userData.themeBrand) { + ThemeBrand.DEFAULT -> false + ThemeBrand.ANDROID -> true + } + + override fun shouldUseDarkTheme(isSystemDarkTheme: Boolean) = + when (userData.darkThemeConfig) { + DarkThemeConfig.FOLLOW_SYSTEM -> isSystemDarkTheme + DarkThemeConfig.LIGHT -> false + DarkThemeConfig.DARK -> true + } + } + + /** + * Returns `true` if the state wasn't loaded yet and it should keep showing the splash screen. + */ + fun shouldKeepSplashScreen() = this is Loading + + /** + * Returns `true` if the dynamic color is disabled. + */ + val shouldDisableDynamicTheming: Boolean get() = false + + /** + * Returns `true` if the Android theme should be used. + */ + val shouldUseAndroidTheme: Boolean get() = false + + /** + * Returns `true` if dark theme should be used. + */ + fun shouldUseDarkTheme(isSystemDarkTheme: Boolean) = isSystemDarkTheme } diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/util/UiExtensions.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/util/UiExtensions.kt new file mode 100644 index 000000000..20d55ab4c --- /dev/null +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/util/UiExtensions.kt @@ -0,0 +1,49 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.samples.apps.nowinandroid.util + +import android.content.res.Configuration +import androidx.activity.ComponentActivity +import androidx.core.util.Consumer +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.callbackFlow +import kotlinx.coroutines.flow.conflate +import kotlinx.coroutines.flow.distinctUntilChanged + +/** + * Convenience wrapper for dark mode checking + */ +val Configuration.isSystemInDarkTheme + get() = (uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES + +/** + * Registers listener for configuration changes to retrieve whether system is in dark theme or not. + * Immediately upon subscribing, it sends the current value and then registers listener for changes. + */ +fun ComponentActivity.isSystemInDarkTheme() = callbackFlow { + channel.trySend(resources.configuration.isSystemInDarkTheme) + + val listener = Consumer { + channel.trySend(it.isSystemInDarkTheme) + } + + addOnConfigurationChangedListener(listener) + + awaitClose { removeOnConfigurationChangedListener(listener) } +} + .distinctUntilChanged() + .conflate() From 400f3b8a65ed4b5849079c863b208a9f2c3c7ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mlynari=C4=8D?= Date: Thu, 11 Apr 2024 10:41:34 +0200 Subject: [PATCH 004/164] Fix default value Change-Id: I6b77e1c23ad91c1c97f31a705161d444be7913c0 --- .../samples/apps/nowinandroid/MainActivity.kt | 16 ++++++++++------ .../apps/nowinandroid/MainActivityViewModel.kt | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt index 5b10f7ec2..6aef4edf7 100644 --- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt @@ -35,6 +35,7 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.metrics.performance.JankStats import androidx.tracing.trace +import com.google.samples.apps.nowinandroid.MainActivityUiState.Loading import com.google.samples.apps.nowinandroid.core.analytics.AnalyticsHelper import com.google.samples.apps.nowinandroid.core.analytics.LocalAnalyticsHelper import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository @@ -48,6 +49,8 @@ import com.google.samples.apps.nowinandroid.util.isSystemInDarkTheme import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import javax.inject.Inject @@ -83,8 +86,8 @@ class MainActivity : ComponentActivity() { var themeSettings by mutableStateOf( ThemeSettings( darkTheme = resources.configuration.isSystemInDarkTheme, - androidTheme = false, - disableDynamicTheming = true, + androidTheme = Loading.shouldUseAndroidTheme, + disableDynamicTheming = Loading.shouldDisableDynamicTheming, ), ) @@ -101,8 +104,10 @@ class MainActivity : ComponentActivity() { disableDynamicTheming = uiState.shouldDisableDynamicTheming, ) } + .onEach { themeSettings = it } + .map { it.darkTheme } .distinctUntilChanged() - .collect { newThemeSettings -> + .collect { darkTheme -> trace("niaEdgeToEdge") { // Turn off the decor fitting system windows, which allows us to handle insets, // including IME animations, and go edge-to-edge. @@ -113,15 +118,14 @@ class MainActivity : ComponentActivity() { statusBarStyle = SystemBarStyle.auto( lightScrim = android.graphics.Color.TRANSPARENT, darkScrim = android.graphics.Color.TRANSPARENT, - ) { newThemeSettings.darkTheme }, + ) { darkTheme }, navigationBarStyle = SystemBarStyle.auto( lightScrim = lightScrim, darkScrim = darkScrim, - ) { newThemeSettings.darkTheme }, + ) { darkTheme }, ) } - themeSettings = newThemeSettings } } } diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivityViewModel.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivityViewModel.kt index 3715bb8b4..2d22b7d9c 100644 --- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivityViewModel.kt +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivityViewModel.kt @@ -71,7 +71,7 @@ sealed interface MainActivityUiState { /** * Returns `true` if the dynamic color is disabled. */ - val shouldDisableDynamicTheming: Boolean get() = false + val shouldDisableDynamicTheming: Boolean get() = true /** * Returns `true` if the Android theme should be used. From 8d506bd5989175f5a32c9a4ae872574deedc9737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mlynari=C4=8D?= Date: Thu, 11 Apr 2024 11:05:02 +0200 Subject: [PATCH 005/164] Fix format Change-Id: I54c9a794cbb84ffba4378ccc901ceb603de4642c --- .../kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt index 6aef4edf7..c949ba00f 100644 --- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt @@ -125,7 +125,6 @@ class MainActivity : ComponentActivity() { ) { darkTheme }, ) } - } } } From 585f768a7a3ab0fa779204d838d4f859c6935c5f Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Tue, 14 May 2024 18:44:04 +0900 Subject: [PATCH 006/164] Remove defaultConfig testInstrumentationRunner. Change-Id: I1c3d0b8504ec4129f18fd5096f543a1bf90e21d3 --- core/designsystem/build.gradle.kts | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index 080100a66..570b8ba01 100644 --- a/core/designsystem/build.gradle.kts +++ b/core/designsystem/build.gradle.kts @@ -21,9 +21,6 @@ plugins { } android { - defaultConfig { - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } namespace = "com.google.samples.apps.nowinandroid.core.designsystem" } From 0e44f1bb9ee43d89d2507f4514494a82d212f186 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Tue, 14 May 2024 19:09:46 +0900 Subject: [PATCH 007/164] Remove dependency of `AndroidTest`. Change-Id: I0d362778fe10ea064a3f5eab1a8a5737802ff526 --- core/designsystem/build.gradle.kts | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index 570b8ba01..2d13f40f5 100644 --- a/core/designsystem/build.gradle.kts +++ b/core/designsystem/build.gradle.kts @@ -44,7 +44,4 @@ dependencies { testImplementation(libs.roborazzi) testImplementation(projects.core.screenshotTesting) testImplementation(projects.core.testing) - - androidTestImplementation(libs.androidx.compose.ui.test) - androidTestImplementation(projects.core.testing) } From 8560632efd16f11923f5bc7b77f39bba19c2506a Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Thu, 16 May 2024 15:19:04 +0900 Subject: [PATCH 008/164] Remove `isReturnDefaultValues`. Change-Id: I028244a23b6215e21269602b8df07e58b136b9f1 --- core/data/build.gradle.kts | 1 - core/datastore/build.gradle.kts | 5 ----- 2 files changed, 6 deletions(-) diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts index 142637ff9..f448e88c6 100644 --- a/core/data/build.gradle.kts +++ b/core/data/build.gradle.kts @@ -25,7 +25,6 @@ android { testOptions { unitTests { isIncludeAndroidResources = true - isReturnDefaultValues = true } } } diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts index 34ea5ee78..04a73bfa2 100644 --- a/core/datastore/build.gradle.kts +++ b/core/datastore/build.gradle.kts @@ -25,11 +25,6 @@ android { consumerProguardFiles("consumer-proguard-rules.pro") } namespace = "com.google.samples.apps.nowinandroid.core.datastore" - testOptions { - unitTests { - isReturnDefaultValues = true - } - } } dependencies { From a888c87c5f153309ec28a977f0a7d92655cb6277 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sat, 8 Jun 2024 21:44:27 +0900 Subject: [PATCH 009/164] Below than api24,use decodeFromString Change-Id: Icf428ebfe7e153e132e112c2dc6926bd40ab3951 --- .../core/network/demo/DemoNiaNetworkDataSource.kt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt index b7c912c00..0f91e0337 100644 --- a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt +++ b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt @@ -17,6 +17,7 @@ package com.google.samples.apps.nowinandroid.core.network.demo import JvmUnitTestDemoAssetManager +import android.os.Build import com.google.samples.apps.nowinandroid.core.network.Dispatcher import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource @@ -28,6 +29,7 @@ import kotlinx.coroutines.withContext import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream +import okio.use import javax.inject.Inject /** @@ -42,13 +44,21 @@ class DemoNiaNetworkDataSource @Inject constructor( @OptIn(ExperimentalSerializationApi::class) override suspend fun getTopics(ids: List?): List = withContext(ioDispatcher) { - assets.open(TOPICS_ASSET).use(networkJson::decodeFromStream) + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + assets.open(TOPICS_ASSET).use(networkJson::decodeFromStream) + } else { + networkJson.decodeFromString(assets.open(TOPICS_ASSET).toString()) + } } @OptIn(ExperimentalSerializationApi::class) override suspend fun getNewsResources(ids: List?): List = withContext(ioDispatcher) { - assets.open(NEWS_ASSET).use(networkJson::decodeFromStream) + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + assets.open(NEWS_ASSET).use(networkJson::decodeFromStream) + } else { + networkJson.decodeFromString(assets.open(TOPICS_ASSET).toString()) + } } override suspend fun getTopicChangeList(after: Int?): List = From a928bf1c51a8cbd218592236607b80b1a1d6827a Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sat, 8 Jun 2024 23:42:32 +0900 Subject: [PATCH 010/164] Create convertStreamToString. Change-Id: I07dbb58813bc891f407773fddab7f1487f1ed24f --- .../network/demo/DemoNiaNetworkDataSource.kt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt index 0f91e0337..203a1e0c5 100644 --- a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt +++ b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt @@ -30,7 +30,11 @@ import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream import okio.use +import java.io.ByteArrayOutputStream +import java.io.InputStream +import java.nio.charset.StandardCharsets import javax.inject.Inject +import kotlin.coroutines.coroutineContext /** * [NiaNetworkDataSource] implementation that provides static news resources to aid development @@ -67,6 +71,21 @@ class DemoNiaNetworkDataSource @Inject constructor( override suspend fun getNewsResourceChangeList(after: Int?): List = getNewsResources().mapToChangeList(NetworkNewsResource::id) + private suspend fun convertStreamToString(inputStream: InputStream): String = withContext( + coroutineContext, + ) { + val result = ByteArrayOutputStream() + val buffer = ByteArray(1024) + var length = 0 + while (true) { + length = inputStream.read(buffer) + if (length == -1) break + result.write(buffer, 0, length) + } + + result.toString(StandardCharsets.UTF_8.name()) + } + companion object { private const val NEWS_ASSET = "news.json" private const val TOPICS_ASSET = "topics.json" From 29e514f359b61218fa0f2506b260fd0eabbe21eb Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sat, 8 Jun 2024 23:44:53 +0900 Subject: [PATCH 011/164] Take capability below API 24, and add comment. Change-Id: I86d99fa9e74a8475c0b2bad202cfb4697ab1016b --- .../core/network/demo/DemoNiaNetworkDataSource.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt index 203a1e0c5..eaeafa12d 100644 --- a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt +++ b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt @@ -48,20 +48,26 @@ class DemoNiaNetworkDataSource @Inject constructor( @OptIn(ExperimentalSerializationApi::class) override suspend fun getTopics(ids: List?): List = withContext(ioDispatcher) { - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { assets.open(TOPICS_ASSET).use(networkJson::decodeFromStream) } else { - networkJson.decodeFromString(assets.open(TOPICS_ASSET).toString()) + // Use decodeFromString to capability with API 24 below. + // https://github.com/Kotlin/kotlinx.serialization/issues/2457#issuecomment-1786923342 + val topicsJsonString = convertStreamToString(assets.open(TOPICS_ASSET)) + networkJson.decodeFromString(topicsJsonString) } } @OptIn(ExperimentalSerializationApi::class) override suspend fun getNewsResources(ids: List?): List = withContext(ioDispatcher) { - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { assets.open(NEWS_ASSET).use(networkJson::decodeFromStream) } else { - networkJson.decodeFromString(assets.open(TOPICS_ASSET).toString()) + // Use decodeFromString to capability with API 24 below. + // https://github.com/Kotlin/kotlinx.serialization/issues/2457#issuecomment-1786923342 + val newsJsonString = convertStreamToString(assets.open(NEWS_ASSET)) + networkJson.decodeFromString(newsJsonString) } } From 6a205b14a7e5d89c5be294cb808c6d6129f1f34d Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sat, 8 Jun 2024 23:45:43 +0900 Subject: [PATCH 012/164] Add KDoC for convertStreamToString. Change-Id: Idb7fc085e889f8012234d14ad7bc0a4713073d6e --- .../nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt index eaeafa12d..671197bcc 100644 --- a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt +++ b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt @@ -77,6 +77,9 @@ class DemoNiaNetworkDataSource @Inject constructor( override suspend fun getNewsResourceChangeList(after: Int?): List = getNewsResources().mapToChangeList(NetworkNewsResource::id) + /** + * Convert [InputStream] to [String]. + */ private suspend fun convertStreamToString(inputStream: InputStream): String = withContext( coroutineContext, ) { From f394e3eb3857b26b66daa3e8ac80e6684b065cc8 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sat, 8 Jun 2024 23:46:51 +0900 Subject: [PATCH 013/164] Add API 21 to CI. Change-Id: I7e1406da9bf7d8aca44f48d9d7dfeb123d67a562 --- .github/workflows/Build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index 6bee0ddfb..7bbb75e07 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -153,7 +153,7 @@ jobs: timeout-minutes: 55 strategy: matrix: - api-level: [26, 30] + api-level: [21, 26, 30] steps: - name: Delete unnecessary tools 🔧 From 622ae698dbe601a8c19f816b385c30ba6c281ecc Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sun, 9 Jun 2024 11:06:16 +0900 Subject: [PATCH 014/164] Remove `okio.use` and redundant length init. Change-Id: Ibac659c7aff6d8be99f52d012d603f8251bbd23d --- .../nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt index 671197bcc..ac6c21739 100644 --- a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt +++ b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt @@ -29,7 +29,6 @@ import kotlinx.coroutines.withContext import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream -import okio.use import java.io.ByteArrayOutputStream import java.io.InputStream import java.nio.charset.StandardCharsets @@ -85,7 +84,7 @@ class DemoNiaNetworkDataSource @Inject constructor( ) { val result = ByteArrayOutputStream() val buffer = ByteArray(1024) - var length = 0 + var length: Int while (true) { length = inputStream.read(buffer) if (length == -1) break From d0d67185198785f26f9ac4f3223b21eebd044909 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sat, 6 Jul 2024 19:19:12 +0900 Subject: [PATCH 015/164] Fix an uninstall app after instrumented tests problem. Change-Id: I07c3e3417a9f14a7f4806d7d61c7ea7f4968ad5e --- gradle.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gradle.properties b/gradle.properties index 97f940e2e..afc64140f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -42,3 +42,7 @@ android.defaults.buildfeatures.shaders=false # Run Roborazzi screenshot tests with the local tests roborazzi.test.verify=true + +# Prevent uninstall app after instrumented tests +# https://issuetracker.google.com/issues/295039976 +android.injected.androidTest.leaveApksInstalledAfterRun=true From 65d7e4519ea75826d76c0e79fcc11fa586718430 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sat, 6 Jul 2024 20:18:38 +0900 Subject: [PATCH 016/164] Refactor to improve `FlavorDimension` extensibility, and replace to `register` lazy api. Change-Id: I6e2980f19da5a6e22a7773c84493424663e33fc4 --- .../com/google/samples/apps/nowinandroid/NiaFlavor.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt index 633098604..c3d996014 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt @@ -21,13 +21,16 @@ enum class NiaFlavor(val dimension: FlavorDimension, val applicationIdSuffix: St fun configureFlavors( commonExtension: CommonExtension<*, *, *, *, *, *>, - flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {} + flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {}, ) { commonExtension.apply { - flavorDimensions += FlavorDimension.contentType.name + FlavorDimension.values().forEach { + flavorDimensions += it.name + } + productFlavors { NiaFlavor.values().forEach { - create(it.name) { + register(it.name) { dimension = it.dimension.name flavorConfigurationBlock(this, it) if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) { From ba5edc5014a6160bc6bb051670d7e04f2d6f9b36 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sun, 7 Jul 2024 09:07:42 +0900 Subject: [PATCH 017/164] Add explicit variable name in lambda based on Type name. Change-Id: Ife739bcebb9b2586a6045ddac241f1591927c4b6 --- .../samples/apps/nowinandroid/NiaFlavor.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt index c3d996014..f57e634cc 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt @@ -16,7 +16,7 @@ enum class FlavorDimension { @Suppress("EnumEntryName") enum class NiaFlavor(val dimension: FlavorDimension, val applicationIdSuffix: String? = null) { demo(FlavorDimension.contentType, applicationIdSuffix = ".demo"), - prod(FlavorDimension.contentType) + prod(FlavorDimension.contentType), } fun configureFlavors( @@ -24,18 +24,18 @@ fun configureFlavors( flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {}, ) { commonExtension.apply { - FlavorDimension.values().forEach { - flavorDimensions += it.name + FlavorDimension.values().forEach { flavorDimension -> + flavorDimensions += flavorDimension.name } productFlavors { - NiaFlavor.values().forEach { - register(it.name) { - dimension = it.dimension.name - flavorConfigurationBlock(this, it) + NiaFlavor.values().forEach { niaFlavor -> + register(niaFlavor.name) { + dimension = niaFlavor.dimension.name + flavorConfigurationBlock(this, niaFlavor) if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) { - if (it.applicationIdSuffix != null) { - applicationIdSuffix = it.applicationIdSuffix + if (niaFlavor.applicationIdSuffix != null) { + applicationIdSuffix = niaFlavor.applicationIdSuffix } } } From 8b199c134da306f10d7aa09b88af222a246daee9 Mon Sep 17 00:00:00 2001 From: Alfayed Baksh Date: Tue, 1 Oct 2024 21:00:08 -0400 Subject: [PATCH 018/164] Update Jacoco.kt --- .../com/google/samples/apps/nowinandroid/Jacoco.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt index 972d539c6..05ce75611 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt @@ -88,13 +88,11 @@ internal fun Project.configureJacoco( html.required = true } - // TODO: This is missing files in src/debug/, src/prod, src/demo, src/demoDebug... - sourceDirectories.setFrom( - files( - "$projectDir/src/main/java", - "$projectDir/src/main/kotlin", - ), - ) + // Collect all java and kotlin source directories from the variant's source sets + val sourceDirs = variant.sources + .map { it.java.srcDirs + it.kotlin.srcDirs } + .flatten() + sourceDirectories.setFrom(sourceDirs) executionData.setFrom( project.fileTree("$buildDir/outputs/unit_test_code_coverage/${variant.name}UnitTest") From bf54ccc76073f9de28642df81a6d97e1b3ea3aa1 Mon Sep 17 00:00:00 2001 From: blue928sky Date: Wed, 6 Nov 2024 19:10:26 +0900 Subject: [PATCH 019/164] feat: use androidx.lifecycle.compose.LocalLifecycleOwner Change-Id: If0a414ee4d5aab277fb90343ba7d5aa6a9dbd2e8 --- .../apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt b/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt index 40f54e4a7..dd01b84c9 100644 --- a/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt +++ b/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt @@ -18,7 +18,6 @@ package com.google.samples.apps.nowinandroid.feature.bookmarks import androidx.activity.ComponentActivity import androidx.compose.runtime.CompositionLocalProvider -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.test.assertCountEquals import androidx.compose.ui.test.assertHasClickAction import androidx.compose.ui.test.filter @@ -33,6 +32,7 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performScrollToNode import androidx.lifecycle.Lifecycle +import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.testing.TestLifecycleOwner import com.google.samples.apps.nowinandroid.core.testing.data.userNewsResourcesTestData import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState From 1d659b0eeaf80c0679e1302bbe17e1547e120111 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sat, 9 Nov 2024 21:31:09 +0900 Subject: [PATCH 020/164] Replace kotlin("test") to version catalog `kotlin.test`. Change-Id: Ifd7de5dda724102063a9df660cacc6d6b16699e0 --- app/build.gradle.kts | 2 +- .../src/main/kotlin/AndroidLibraryConventionPlugin.kt | 4 ++-- .../convention/src/main/kotlin/JvmLibraryConventionPlugin.kt | 3 ++- lint/build.gradle.kts | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1e4361008..5434df8c2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -123,7 +123,6 @@ dependencies { testDemoImplementation(libs.roborazzi) testDemoImplementation(projects.core.screenshotTesting) - androidTestImplementation(kotlin("test")) androidTestImplementation(projects.core.testing) androidTestImplementation(projects.core.dataTest) androidTestImplementation(projects.core.datastoreTest) @@ -131,6 +130,7 @@ dependencies { androidTestImplementation(libs.androidx.navigation.testing) androidTestImplementation(libs.androidx.compose.ui.test) androidTestImplementation(libs.hilt.android.testing) + androidTestImplementation(libs.kotlin.test) baselineProfile(projects.benchmarks) } diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt index 71d818c0c..2a10901fb 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt @@ -53,8 +53,8 @@ class AndroidLibraryConventionPlugin : Plugin { disableUnnecessaryAndroidTests(target) } dependencies { - add("androidTestImplementation", kotlin("test")) - add("testImplementation", kotlin("test")) + add("androidTestImplementation", libs.findLibrary("kotlin.test").get()) + add("testImplementation", libs.findLibrary("kotlin.test").get()) add("implementation", libs.findLibrary("androidx.tracing.ktx").get()) } diff --git a/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt index 652409db6..afe47eeee 100644 --- a/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt @@ -15,6 +15,7 @@ */ import com.google.samples.apps.nowinandroid.configureKotlinJvm +import com.google.samples.apps.nowinandroid.libs import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.dependencies @@ -29,7 +30,7 @@ class JvmLibraryConventionPlugin : Plugin { } configureKotlinJvm() dependencies { - add("testImplementation", kotlin("test")) + add("testImplementation", libs.findLibrary("kotlin.test").get()) } } } diff --git a/lint/build.gradle.kts b/lint/build.gradle.kts index cfda9d64d..19ae8e442 100644 --- a/lint/build.gradle.kts +++ b/lint/build.gradle.kts @@ -39,7 +39,7 @@ kotlin { dependencies { compileOnly(libs.kotlin.stdlib) compileOnly(libs.lint.api) + testImplementation(libs.kotlin.test) testImplementation(libs.lint.checks) testImplementation(libs.lint.tests) - testImplementation(kotlin("test")) } From f1279c74ddb28f066b289f96729244c2a129d346 Mon Sep 17 00:00:00 2001 From: Timon van den Brink Date: Mon, 11 Nov 2024 20:29:01 +0100 Subject: [PATCH 021/164] Fix project dependency declaration consistency --- feature/foryou/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/foryou/build.gradle.kts b/feature/foryou/build.gradle.kts index 41d5b16a2..59f6844cf 100644 --- a/feature/foryou/build.gradle.kts +++ b/feature/foryou/build.gradle.kts @@ -29,7 +29,7 @@ dependencies { implementation(libs.accompanist.permissions) implementation(projects.core.data) implementation(projects.core.domain) - implementation(project(":core:notifications")) + implementation(projects.core.notifications) testImplementation(libs.hilt.android.testing) testImplementation(libs.robolectric) From 2190258ef939e3c015e7104987f7b78042358665 Mon Sep 17 00:00:00 2001 From: gibachan Date: Thu, 14 Nov 2024 21:55:41 +0900 Subject: [PATCH 022/164] Remove redundant annotations --- .../com/google/samples/apps/nowinandroid/ui/NiaApp.kt | 3 --- .../nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt | 2 -- .../apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt | 2 -- .../apps/nowinandroid/ui/SnackbarScreenshotTests.kt | 2 -- .../nowinandroid/core/designsystem/component/Navigation.kt | 7 ------- .../google/samples/apps/nowinandroid/core/ui/NewsFeed.kt | 2 -- 6 files changed, 18 deletions(-) diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt index 640b22e83..f27b90cbe 100644 --- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt @@ -37,7 +37,6 @@ import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.SnackbarResult.ActionPerformed import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi import androidx.compose.material3.adaptive.WindowAdaptiveInfo import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo import androidx.compose.runtime.Composable @@ -76,7 +75,6 @@ import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination import kotlin.reflect.KClass import com.google.samples.apps.nowinandroid.feature.settings.R as settingsR -@OptIn(ExperimentalMaterial3AdaptiveApi::class) @Composable fun NiaApp( appState: NiaAppState, @@ -126,7 +124,6 @@ fun NiaApp( @OptIn( ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class, - ExperimentalMaterial3AdaptiveApi::class, ) internal fun NiaApp( appState: NiaAppState, diff --git 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 index e84b96b73..9c9488fde 100644 --- 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 @@ -16,7 +16,6 @@ package com.google.samples.apps.nowinandroid.ui -import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi import androidx.compose.material3.adaptive.Posture import androidx.compose.material3.adaptive.WindowAdaptiveInfo import androidx.compose.runtime.CompositionLocalProvider @@ -113,7 +112,6 @@ class NiaAppScreenSizesScreenshotTests { TimeZone.setDefault(TimeZone.getTimeZone("UTC")) } - @OptIn(ExperimentalMaterial3AdaptiveApi::class) private fun testNiaAppScreenshotWithSize(width: Dp, height: Dp, screenshotName: String) { composeTestRule.setContent { CompositionLocalProvider( diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt index 2ef0d3e4f..78f568e03 100644 --- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt +++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt @@ -34,7 +34,6 @@ import androidx.compose.foundation.layout.windowInsetsStartWidth import androidx.compose.foundation.layout.windowInsetsTopHeight import androidx.compose.material3.SnackbarDuration.Indefinite import androidx.compose.material3.SnackbarHostState -import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi import androidx.compose.material3.adaptive.Posture import androidx.compose.material3.adaptive.WindowAdaptiveInfo import androidx.compose.runtime.Composable @@ -209,7 +208,6 @@ class SnackbarInsetsScreenshotTests { } } - @OptIn(ExperimentalMaterial3AdaptiveApi::class) private fun testSnackbarScreenshotWithSize( snackbarHostState: SnackbarHostState, width: Dp, diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt index fe2e98452..b9b1047c1 100644 --- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt +++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt @@ -19,7 +19,6 @@ package com.google.samples.apps.nowinandroid.ui import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.material3.SnackbarDuration.Indefinite import androidx.compose.material3.SnackbarHostState -import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi import androidx.compose.material3.adaptive.Posture import androidx.compose.material3.adaptive.WindowAdaptiveInfo import androidx.compose.runtime.CompositionLocalProvider @@ -182,7 +181,6 @@ class SnackbarScreenshotTests { } } - @OptIn(ExperimentalMaterial3AdaptiveApi::class) private fun testSnackbarScreenshotWithSize( snackbarHostState: SnackbarHostState, width: Dp, diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt index 4ac19b482..4a2099dc6 100644 --- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt +++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt @@ -28,10 +28,8 @@ import androidx.compose.material3.NavigationRail import androidx.compose.material3.NavigationRailItem import androidx.compose.material3.NavigationRailItemDefaults import androidx.compose.material3.Text -import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi import androidx.compose.material3.adaptive.WindowAdaptiveInfo import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo -import androidx.compose.material3.adaptive.navigationsuite.ExperimentalMaterial3AdaptiveNavigationSuiteApi import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteItemColors import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold @@ -184,10 +182,6 @@ fun NiaNavigationRail( * @param windowAdaptiveInfo The window adaptive info. * @param content The app content inside the scaffold. */ -@OptIn( - ExperimentalMaterial3AdaptiveNavigationSuiteApi::class, - ExperimentalMaterial3AdaptiveApi::class, -) @Composable fun NiaNavigationSuiteScaffold( navigationSuiteItems: NiaNavigationSuiteScope.() -> Unit, @@ -242,7 +236,6 @@ fun NiaNavigationSuiteScaffold( /** * A wrapper around [NavigationSuiteScope] to declare navigation items. */ -@OptIn(ExperimentalMaterial3AdaptiveNavigationSuiteApi::class) class NiaNavigationSuiteScope internal constructor( private val navigationSuiteScope: NavigationSuiteScope, private val navigationSuiteItemColors: NavigationSuiteItemColors, diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt index c22a02fa1..0b7b9f570 100644 --- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt +++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt @@ -21,7 +21,6 @@ import android.net.Uri import androidx.annotation.ColorInt import androidx.browser.customtabs.CustomTabColorSchemeParams import androidx.browser.customtabs.CustomTabsIntent -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope @@ -45,7 +44,6 @@ import com.google.samples.apps.nowinandroid.core.model.data.UserNewsResource * An extension on [LazyListScope] defining a feed with news resources. * Depending on the [feedState], this might emit no items. */ -@OptIn(ExperimentalFoundationApi::class) fun LazyStaggeredGridScope.newsFeed( feedState: NewsFeedUiState, onNewsResourcesCheckedChanged: (String, Boolean) -> Unit, From 093ff2c7f2fa22fc000a3f6a250d42a8eadf8fc1 Mon Sep 17 00:00:00 2001 From: Rob Orgiu Date: Mon, 18 Nov 2024 15:26:57 +0100 Subject: [PATCH 023/164] Simplify Drag&Drop implementation --- .../nowinandroid/core/ui/NewsResourceCard.kt | 21 +++++++------------ gradle/libs.versions.toml | 4 ++-- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt index 2395eb156..ff10b8d38 100644 --- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt +++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt @@ -24,7 +24,6 @@ import androidx.compose.foundation.Canvas import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.Image import androidx.compose.foundation.draganddrop.dragAndDropSource -import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -140,18 +139,14 @@ fun NewsResourceCardExpanded( modifier = Modifier .fillMaxWidth((.8f)) .dragAndDropSource { - detectTapGestures( - onLongPress = { - startTransfer( - DragAndDropTransferData( - ClipData.newPlainText( - sharingLabel, - sharingContent, - ), - flags = dragAndDropFlags, - ), - ) - }, + startTransfer( + DragAndDropTransferData( + ClipData.newPlainText( + sharingLabel, + sharingContent, + ), + flags = dragAndDropFlags, + ), ) }, ) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b1d9232ee..61ac0ee05 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,12 +2,12 @@ accompanist = "0.34.0" androidDesugarJdkLibs = "2.0.4" # AGP and tools should be updated together -androidGradlePlugin = "8.6.1" +androidGradlePlugin = "8.7.2" androidTools = "31.7.2" androidxActivity = "1.9.3" androidxAppCompat = "1.7.0" androidxBrowser = "1.8.0" -androidxComposeBom = "2024.09.00" +androidxComposeBom = "2024.11.00" androidxComposeRuntimeTracing = "1.0.0-beta01" androidxCore = "1.13.1" androidxCoreSplashscreen = "1.0.1" From 643b62ed688afe4b568b9ec60730cb905bf7f68a Mon Sep 17 00:00:00 2001 From: Ikko Eltociear Ashimine Date: Fri, 22 Nov 2024 00:24:52 +0900 Subject: [PATCH 024/164] docs: update README.md unecessary -> unnecessary --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1f5270323..83bf139be 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ To run the tests execute the following gradle tasks: - `connectedDemoDebugAndroidTest` run all instrumented tests against the `demoDebug` variant. **Note:** You should not run `./gradlew test` or `./gradlew connectedAndroidTest` as this will execute -tests against _all_ build variants which is both unecessary and will result in failures as only the +tests against _all_ build variants which is both unnecessary and will result in failures as only the `demoDebug` variant is supported. No other variants have any tests (although this might change in future). ## Screenshot tests From 30906692e44f97e632b7a2590d0ec57ff869abe6 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Fri, 22 Nov 2024 10:02:50 +0000 Subject: [PATCH 025/164] Update screenshot testing library to add accessibility checks Updated Roborazzi and added accessibility checks to screenshot tests. This will help ensure that our UI is accessible to all users. Currently only fails on ERROR level. --- core/screenshot-testing/build.gradle.kts | 1 + .../core/testing/util/ScreenshotHelper.kt | 17 +++++++++++++++++ gradle/libs.versions.toml | 5 +++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/core/screenshot-testing/build.gradle.kts b/core/screenshot-testing/build.gradle.kts index 794416ba9..57a43a200 100644 --- a/core/screenshot-testing/build.gradle.kts +++ b/core/screenshot-testing/build.gradle.kts @@ -26,6 +26,7 @@ android { dependencies { api(libs.bundles.androidx.compose.ui.test) api(libs.roborazzi) + api(libs.roborazzi.accessibility.check) implementation(libs.androidx.compose.ui.test) implementation(libs.androidx.activity.compose) implementation(libs.robolectric) diff --git a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt index f11651220..dbe286673 100644 --- a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt +++ b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt @@ -14,6 +14,8 @@ * limitations under the License. */ +@file:OptIn(ExperimentalRoborazziApi::class) + package com.google.samples.apps.nowinandroid.core.testing.util import androidx.activity.ComponentActivity @@ -30,10 +32,16 @@ import androidx.compose.ui.test.DeviceConfigurationOverride import androidx.compose.ui.test.junit4.AndroidComposeTestRule import androidx.compose.ui.test.onRoot import androidx.test.ext.junit.rules.ActivityScenarioRule +import com.github.takahirom.roborazzi.ExperimentalRoborazziApi +import com.github.takahirom.roborazzi.RoborazziATFAccessibilityCheckOptions +import com.github.takahirom.roborazzi.RoborazziATFAccessibilityChecker +import com.github.takahirom.roborazzi.RoborazziATFAccessibilityChecker.CheckLevel.Error import com.github.takahirom.roborazzi.RoborazziOptions import com.github.takahirom.roborazzi.RoborazziOptions.CompareOptions import com.github.takahirom.roborazzi.RoborazziOptions.RecordOptions import com.github.takahirom.roborazzi.captureRoboImage +import com.github.takahirom.roborazzi.checkRoboAccessibility +import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckPreset import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme import org.robolectric.RuntimeEnvironment @@ -50,6 +58,7 @@ enum class DefaultTestDevices(val description: String, val spec: String) { FOLDABLE("foldable", "spec:shape=Normal,width=673,height=841,unit=dp,dpi=480"), TABLET("tablet", "spec:shape=Normal,width=1280,height=800,unit=dp,dpi=480"), } + fun AndroidComposeTestRule, A>.captureMultiDevice( screenshotName: String, body: @Composable () -> Unit, @@ -88,6 +97,14 @@ fun AndroidComposeTestRule, A>.c "src/test/screenshots/${screenshotName}_$deviceName.png", roborazziOptions = roborazziOptions, ) + this.onRoot().checkRoboAccessibility( + roborazziATFAccessibilityCheckOptions = RoborazziATFAccessibilityCheckOptions( + failureLevel = Error, + checker = RoborazziATFAccessibilityChecker( + preset = AccessibilityCheckPreset.LATEST, + ), + ), + ) } /** diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 07076ca7d..f2c0bedb2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -50,8 +50,8 @@ protobuf = "4.26.1" protobufPlugin = "0.9.4" retrofit = "2.11.0" retrofitKotlinxSerializationJson = "1.0.0" -robolectric = "4.14" -roborazzi = "1.32.2" +robolectric = "4.14.1" +roborazzi = "1.33.0" room = "2.6.1" secrets = "2.0.1" truth = "1.4.2" @@ -141,6 +141,7 @@ retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.r retrofit-kotlin-serialization = { group = "com.squareup.retrofit2", name = "converter-kotlinx-serialization", version.ref = "retrofit" } robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" } roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" } +roborazzi-accessibility-check = { group = "io.github.takahirom.roborazzi", name = "roborazzi-accessibility-check", version.ref = "roborazzi" } room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } From 6f3894a91b081ea7c54aaf0be3b23e1bc5bd063f Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Fri, 22 Nov 2024 11:33:53 +0000 Subject: [PATCH 026/164] Update ScreenshotHelper.kt --- .../apps/nowinandroid/core/testing/util/ScreenshotHelper.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt index dbe286673..71f49cbc0 100644 --- a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt +++ b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt @@ -35,7 +35,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule import com.github.takahirom.roborazzi.ExperimentalRoborazziApi import com.github.takahirom.roborazzi.RoborazziATFAccessibilityCheckOptions import com.github.takahirom.roborazzi.RoborazziATFAccessibilityChecker -import com.github.takahirom.roborazzi.RoborazziATFAccessibilityChecker.CheckLevel.Error +import com.github.takahirom.roborazzi.RoborazziATFAccessibilityChecker.CheckLevel import com.github.takahirom.roborazzi.RoborazziOptions import com.github.takahirom.roborazzi.RoborazziOptions.CompareOptions import com.github.takahirom.roborazzi.RoborazziOptions.RecordOptions @@ -99,7 +99,7 @@ fun AndroidComposeTestRule, A>.c ) this.onRoot().checkRoboAccessibility( roborazziATFAccessibilityCheckOptions = RoborazziATFAccessibilityCheckOptions( - failureLevel = Error, + failureLevel = CheckLevel.Warning, checker = RoborazziATFAccessibilityChecker( preset = AccessibilityCheckPreset.LATEST, ), From ca87bfe6cfbb6c209c25a047eba99c244764ed95 Mon Sep 17 00:00:00 2001 From: yongsuk44 Date: Fri, 22 Nov 2024 23:12:02 +0900 Subject: [PATCH 027/164] Refactor: Use type safe SearchRoute --- .../feature/search/navigation/SearchNavigation.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt index 81f3576b4..3b16e5f71 100644 --- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt +++ b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt @@ -21,10 +21,12 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable import com.google.samples.apps.nowinandroid.feature.search.SearchRoute +import kotlinx.serialization.Serializable -const val SEARCH_ROUTE = "search_route" +@Serializable data object SearchRoute -fun NavController.navigateToSearch(navOptions: NavOptions? = null) = navigate(SEARCH_ROUTE, navOptions) +fun NavController.navigateToSearch(navOptions: NavOptions? = null) = + navigate(SearchRoute, navOptions) fun NavGraphBuilder.searchScreen( onBackClick: () -> Unit, @@ -33,7 +35,7 @@ fun NavGraphBuilder.searchScreen( ) { // TODO: Handle back stack for each top-level destination. At the moment each top-level // destination may have own search screen's back stack. - composable(route = SEARCH_ROUTE) { + composable { SearchRoute( onBackClick = onBackClick, onInterestsClick = onInterestsClick, From 0849597755395b84809ad24faf2b5a8ad9b10623 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 23 Nov 2024 06:24:59 +0000 Subject: [PATCH 028/164] Suppress A11y exception for now --- .../core/testing/util/ScreenshotHelper.kt | 11 +++++++-- .../foryou/ForYouScreenScreenshotTests.kt | 23 ++++++++++++++++--- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt index 71f49cbc0..20cb09a6f 100644 --- a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt +++ b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt @@ -31,6 +31,7 @@ import androidx.compose.ui.test.DarkMode import androidx.compose.ui.test.DeviceConfigurationOverride import androidx.compose.ui.test.junit4.AndroidComposeTestRule import androidx.compose.ui.test.onRoot +import androidx.compose.ui.test.printToString import androidx.test.ext.junit.rules.ActivityScenarioRule import com.github.takahirom.roborazzi.ExperimentalRoborazziApi import com.github.takahirom.roborazzi.RoborazziATFAccessibilityCheckOptions @@ -42,7 +43,10 @@ import com.github.takahirom.roborazzi.RoborazziOptions.RecordOptions import com.github.takahirom.roborazzi.captureRoboImage import com.github.takahirom.roborazzi.checkRoboAccessibility import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckPreset +import com.google.android.apps.common.testing.accessibility.framework.AccessibilityViewCheckResult import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme +import org.hamcrest.Matcher +import org.hamcrest.Matchers import org.robolectric.RuntimeEnvironment val DefaultRoborazziOptions = @@ -61,10 +65,11 @@ enum class DefaultTestDevices(val description: String, val spec: String) { fun AndroidComposeTestRule, A>.captureMultiDevice( screenshotName: String, + accessibilitySuppressions: Matcher = Matchers.not(Matchers.anything()), body: @Composable () -> Unit, ) { - DefaultTestDevices.entries.forEach { - this.captureForDevice(it.description, it.spec, screenshotName, body = body) + listOf(DefaultTestDevices.FOLDABLE).forEach { + this.captureForDevice(it.description, it.spec, screenshotName, body = body, accessibilitySuppressions = accessibilitySuppressions) } } @@ -73,6 +78,7 @@ fun AndroidComposeTestRule, A>.c deviceSpec: String, screenshotName: String, roborazziOptions: RoborazziOptions = DefaultRoborazziOptions, + accessibilitySuppressions: Matcher = Matchers.not(Matchers.anything()), darkMode: Boolean = false, body: @Composable () -> Unit, ) { @@ -102,6 +108,7 @@ fun AndroidComposeTestRule, A>.c failureLevel = CheckLevel.Warning, checker = RoborazziATFAccessibilityChecker( preset = AccessibilityCheckPreset.LATEST, + suppressions = accessibilitySuppressions ), ), ) diff --git a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt b/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt index 14b67c64e..243e25263 100644 --- a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt +++ b/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt @@ -19,6 +19,10 @@ package com.google.samples.apps.nowinandroid.feature.foryou import androidx.activity.ComponentActivity import androidx.compose.runtime.Composable import androidx.compose.ui.test.junit4.createAndroidComposeRule +import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils +import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesElements +import com.google.android.apps.common.testing.accessibility.framework.checks.TextContrastCheck +import com.google.android.apps.common.testing.accessibility.framework.matcher.ElementMatchers.withText import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme import com.google.samples.apps.nowinandroid.core.testing.util.DefaultTestDevices @@ -31,6 +35,7 @@ import com.google.samples.apps.nowinandroid.feature.foryou.OnboardingUiState.Loa import com.google.samples.apps.nowinandroid.feature.foryou.OnboardingUiState.NotShown import com.google.samples.apps.nowinandroid.feature.foryou.OnboardingUiState.Shown import dagger.hilt.android.testing.HiltTestApplication +import org.hamcrest.Matchers import org.junit.Before import org.junit.Rule import org.junit.Test @@ -53,8 +58,7 @@ class ForYouScreenScreenshotTests { /** * Use a test activity to set the content on. */ - @get:Rule - val composeTestRule = createAndroidComposeRule() + @get:Rule val composeTestRule = createAndroidComposeRule() private val userNewsResources = UserNewsResourcePreviewParameterProvider().values.first() @@ -108,7 +112,20 @@ class ForYouScreenScreenshotTests { @Test fun forYouScreenTopicSelection() { - composeTestRule.captureMultiDevice("ForYouScreenTopicSelection") { + composeTestRule.captureMultiDevice( + "ForYouScreenTopicSelection", + accessibilitySuppressions = Matchers.allOf( + AccessibilityCheckResultUtils.matchesCheck(TextContrastCheck::class.java), + Matchers.anyOf( + // Disabled Button + matchesElements(withText("Done")), + + // TODO investigate, seems a false positive + matchesElements(withText("What are you interested in?")), + matchesElements(withText("UI")), + ), + ), + ) { ForYouScreenTopicSelection() } } From 4f27c18f20fc89971f36fdf6bd2f26eee717ccb7 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 23 Nov 2024 06:30:30 +0000 Subject: [PATCH 029/164] Change order of exceptions --- .../core/testing/util/ScreenshotHelper.kt | 44 +++++++++++++------ .../foryou/ForYouScreenScreenshotTests.kt | 3 +- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt index 20cb09a6f..89994ac57 100644 --- a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt +++ b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt @@ -31,7 +31,6 @@ import androidx.compose.ui.test.DarkMode import androidx.compose.ui.test.DeviceConfigurationOverride import androidx.compose.ui.test.junit4.AndroidComposeTestRule import androidx.compose.ui.test.onRoot -import androidx.compose.ui.test.printToString import androidx.test.ext.junit.rules.ActivityScenarioRule import com.github.takahirom.roborazzi.ExperimentalRoborazziApi import com.github.takahirom.roborazzi.RoborazziATFAccessibilityCheckOptions @@ -44,6 +43,7 @@ import com.github.takahirom.roborazzi.captureRoboImage import com.github.takahirom.roborazzi.checkRoboAccessibility import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckPreset import com.google.android.apps.common.testing.accessibility.framework.AccessibilityViewCheckResult +import com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityViewCheckException import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme import org.hamcrest.Matcher import org.hamcrest.Matchers @@ -62,14 +62,19 @@ enum class DefaultTestDevices(val description: String, val spec: String) { FOLDABLE("foldable", "spec:shape=Normal,width=673,height=841,unit=dp,dpi=480"), TABLET("tablet", "spec:shape=Normal,width=1280,height=800,unit=dp,dpi=480"), } - fun AndroidComposeTestRule, A>.captureMultiDevice( screenshotName: String, accessibilitySuppressions: Matcher = Matchers.not(Matchers.anything()), body: @Composable () -> Unit, ) { - listOf(DefaultTestDevices.FOLDABLE).forEach { - this.captureForDevice(it.description, it.spec, screenshotName, body = body, accessibilitySuppressions = accessibilitySuppressions) + DefaultTestDevices.entries.forEach { + this.captureForDevice( + deviceName = it.description, + deviceSpec = it.spec, + screenshotName = screenshotName, + body = body, + accessibilitySuppressions = accessibilitySuppressions, + ) } } @@ -98,20 +103,33 @@ fun AndroidComposeTestRule, A>.c } } } + + // Run Accessibility checks first so logging is included + val accessibilityException = try { + this.onRoot().checkRoboAccessibility( + roborazziATFAccessibilityCheckOptions = RoborazziATFAccessibilityCheckOptions( + failureLevel = CheckLevel.Warning, + checker = RoborazziATFAccessibilityChecker( + preset = AccessibilityCheckPreset.LATEST, + suppressions = accessibilitySuppressions + ), + ), + ) + null + } catch (e: AccessibilityViewCheckException) { + e + } + this.onRoot() .captureRoboImage( "src/test/screenshots/${screenshotName}_$deviceName.png", roborazziOptions = roborazziOptions, ) - this.onRoot().checkRoboAccessibility( - roborazziATFAccessibilityCheckOptions = RoborazziATFAccessibilityCheckOptions( - failureLevel = CheckLevel.Warning, - checker = RoborazziATFAccessibilityChecker( - preset = AccessibilityCheckPreset.LATEST, - suppressions = accessibilitySuppressions - ), - ), - ) + + // Rethrow the Accessibility exception once screenshots have passed + if (accessibilityException != null) { + throw accessibilityException + } } /** diff --git a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt b/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt index 243e25263..29fc6f536 100644 --- a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt +++ b/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt @@ -58,7 +58,8 @@ class ForYouScreenScreenshotTests { /** * Use a test activity to set the content on. */ - @get:Rule val composeTestRule = createAndroidComposeRule() + @get:Rule + val composeTestRule = createAndroidComposeRule() private val userNewsResources = UserNewsResourcePreviewParameterProvider().values.first() From 3e4f66b489218be5f6b18896a53b5d91eccd4860 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 23 Nov 2024 06:44:49 +0000 Subject: [PATCH 030/164] spotless --- .../core/testing/util/ScreenshotHelper.kt | 17 ++++++++++++++++- .../foryou/ForYouScreenScreenshotTests.kt | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt index 89994ac57..00c54e909 100644 --- a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt +++ b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt @@ -18,6 +18,7 @@ package com.google.samples.apps.nowinandroid.core.testing.util +import android.graphics.Bitmap.CompressFormat.PNG import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.runtime.Composable @@ -44,10 +45,12 @@ import com.github.takahirom.roborazzi.checkRoboAccessibility import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckPreset import com.google.android.apps.common.testing.accessibility.framework.AccessibilityViewCheckResult import com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityViewCheckException +import com.google.android.apps.common.testing.accessibility.framework.utils.contrast.BitmapImage import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme import org.hamcrest.Matcher import org.hamcrest.Matchers import org.robolectric.RuntimeEnvironment +import java.io.FileOutputStream val DefaultRoborazziOptions = RoborazziOptions( @@ -111,7 +114,7 @@ fun AndroidComposeTestRule, A>.c failureLevel = CheckLevel.Warning, checker = RoborazziATFAccessibilityChecker( preset = AccessibilityCheckPreset.LATEST, - suppressions = accessibilitySuppressions + suppressions = accessibilitySuppressions, ), ), ) @@ -128,6 +131,18 @@ fun AndroidComposeTestRule, A>.c // Rethrow the Accessibility exception once screenshots have passed if (accessibilityException != null) { + accessibilityException.results.forEachIndexed { index, check -> + val viewImage = check.viewImage + if (viewImage is BitmapImage) { + FileOutputStream( + "build/outputs/roborazzi/" + + "${screenshotName}_${deviceName}_$index.png", + ).use { + viewImage.bitmap.compress(PNG, 100, it) + } + } + } + throw accessibilityException } } diff --git a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt b/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt index 29fc6f536..d5e3ca0f1 100644 --- a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt +++ b/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt @@ -122,8 +122,8 @@ class ForYouScreenScreenshotTests { matchesElements(withText("Done")), // TODO investigate, seems a false positive - matchesElements(withText("What are you interested in?")), - matchesElements(withText("UI")), +// matchesElements(withText("What are you interested in?")), +// matchesElements(withText("UI")), ), ), ) { From e77dedf0dcb85c3e33a635d141444e06f7256bf1 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 23 Nov 2024 06:47:12 +0000 Subject: [PATCH 031/164] logging --- .../apps/nowinandroid/core/testing/util/ScreenshotHelper.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt index 00c54e909..cca781725 100644 --- a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt +++ b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt @@ -50,6 +50,7 @@ import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme import org.hamcrest.Matcher import org.hamcrest.Matchers import org.robolectric.RuntimeEnvironment +import java.io.File import java.io.FileOutputStream val DefaultRoborazziOptions = @@ -134,9 +135,10 @@ fun AndroidComposeTestRule, A>.c accessibilityException.results.forEachIndexed { index, check -> val viewImage = check.viewImage if (viewImage is BitmapImage) { + val file = File("build/outputs/roborazzi/${screenshotName}_${deviceName}_$index.png") + println("Writing check.viewImage to $file") FileOutputStream( - "build/outputs/roborazzi/" + - "${screenshotName}_${deviceName}_$index.png", + file, ).use { viewImage.bitmap.compress(PNG, 100, it) } From 2415239d456ad84357a67df3031adbac4f32be05 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 23 Nov 2024 06:59:45 +0000 Subject: [PATCH 032/164] suppress checks --- .../feature/foryou/ForYouScreenScreenshotTests.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt b/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt index d5e3ca0f1..29fc6f536 100644 --- a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt +++ b/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt @@ -122,8 +122,8 @@ class ForYouScreenScreenshotTests { matchesElements(withText("Done")), // TODO investigate, seems a false positive -// matchesElements(withText("What are you interested in?")), -// matchesElements(withText("UI")), + matchesElements(withText("What are you interested in?")), + matchesElements(withText("UI")), ), ), ) { From 92c5d4b068aad54d2e94dffdc619a92ddf8ce9af Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 23 Nov 2024 07:02:46 +0000 Subject: [PATCH 033/164] reduce for now --- .../apps/nowinandroid/core/testing/util/ScreenshotHelper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt index cca781725..20b9a5deb 100644 --- a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt +++ b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt @@ -112,7 +112,7 @@ fun AndroidComposeTestRule, A>.c val accessibilityException = try { this.onRoot().checkRoboAccessibility( roborazziATFAccessibilityCheckOptions = RoborazziATFAccessibilityCheckOptions( - failureLevel = CheckLevel.Warning, + failureLevel = CheckLevel.Error, checker = RoborazziATFAccessibilityChecker( preset = AccessibilityCheckPreset.LATEST, suppressions = accessibilitySuppressions, From 83a8beee72e04e28bcbc79f292dc75d4631545fb Mon Sep 17 00:00:00 2001 From: Adnan Habib Date: Fri, 29 Nov 2024 20:08:16 +0500 Subject: [PATCH 034/164] Use typesafe project accessor Change-Id: Ib9f0a68debaf75431fe45d5a81128e33e4885321 --- feature/foryou/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/foryou/build.gradle.kts b/feature/foryou/build.gradle.kts index 41d5b16a2..59f6844cf 100644 --- a/feature/foryou/build.gradle.kts +++ b/feature/foryou/build.gradle.kts @@ -29,7 +29,7 @@ dependencies { implementation(libs.accompanist.permissions) implementation(projects.core.data) implementation(projects.core.domain) - implementation(project(":core:notifications")) + implementation(projects.core.notifications) testImplementation(libs.hilt.android.testing) testImplementation(libs.robolectric) From 55dbe61c650886e7a6986e9a506665f206ba7ad7 Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Mon, 9 Dec 2024 05:58:47 -0500 Subject: [PATCH 035/164] Optimize google maven downloading (#1051) --- build-logic/settings.gradle.kts | 8 +++++++- build.gradle.kts | 8 +++++++- settings.gradle.kts | 16 ++++++++++++++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index de9224e22..b359a5207 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -16,7 +16,13 @@ dependencyResolutionManagement { repositories { - google() + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } mavenCentral() } versionCatalogs { diff --git a/build.gradle.kts b/build.gradle.kts index fbcefa906..9a8652956 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,13 @@ buildscript { repositories { - google() + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } mavenCentral() // Android Build Server diff --git a/settings.gradle.kts b/settings.gradle.kts index 465a72616..2b8c6e45c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,7 +17,13 @@ pluginManagement { includeBuild("build-logic") repositories { - google() + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } mavenCentral() gradlePluginPortal() } @@ -26,7 +32,13 @@ pluginManagement { dependencyResolutionManagement { repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS repositories { - google() + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } mavenCentral() } } From ab87857c9be0da5f30d1161edbf93229512a090c Mon Sep 17 00:00:00 2001 From: sanao Date: Mon, 9 Dec 2024 20:33:57 +0900 Subject: [PATCH 036/164] [Refactor]: Replace enableAndroidTest with androidTest.enable (#1274) This is because enableAndroidTest is deprecated. Fixes #1272 --- .../samples/apps/nowinandroid/AndroidInstrumentedTests.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidInstrumentedTests.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidInstrumentedTests.kt index d0c26e4e6..c51dac5c9 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidInstrumentedTests.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidInstrumentedTests.kt @@ -30,6 +30,6 @@ import org.gradle.api.Project internal fun LibraryAndroidComponentsExtension.disableUnnecessaryAndroidTests( project: Project, ) = beforeVariants { - it.enableAndroidTest = it.enableAndroidTest + it.androidTest.enable = it.androidTest.enable && project.projectDir.resolve("src/androidTest").exists() } From 1881730806b8a86f6f75d5fbe387c13504f91a75 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Mon, 9 Dec 2024 20:36:31 +0900 Subject: [PATCH 037/164] Bump spotless(6.23.3 to 6.25.0) and ktlint(1.0.1 to 1.4.0) (#1318) * Bump up - spotless. - ktlint. Change-Id: I4a0d1b4089dd4882df4653303a52f07f2bf6771f * Update gradle/init.gradle.kts * Disable all new features since ktlint 1.3.0. https://github.com/pinterest/ktlint/releases/tag/1.3.0 Change-Id: I8f0ea640c06a2266cf0b7ede0da06bdd32651bbc * Disabled `ktlint_standard_function-signature`. Change-Id: Ib3e6e66d1774b39b5c92ec822308db107b070b82 --------- Co-authored-by: Don Turner --- .editorconfig | 10 ++++++++++ gradle/init.gradle.kts | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 7be3f8784..6c8c930bc 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,3 +5,13 @@ ij_kotlin_allow_trailing_comma=true ij_kotlin_allow_trailing_comma_on_call_site=true ktlint_function_naming_ignore_when_annotated_with=Composable, Test +ktlint_standard_backing-property-naming = disabled +ktlint_standard_binary-expression-wrapping = disabled +ktlint_standard_chain-method-continuation = disabled +ktlint_standard_class-signature = disabled +ktlint_standard_condition-wrapping = disabled +ktlint_standard_function-expression-body = disabled +ktlint_standard_function-literal = disabled +ktlint_standard_function-type-modifier-spacing = disabled +ktlint_standard_multiline-loop = disabled +ktlint_standard_function-signature = disabled diff --git a/gradle/init.gradle.kts b/gradle/init.gradle.kts index fe79fa01e..44dc41200 100644 --- a/gradle/init.gradle.kts +++ b/gradle/init.gradle.kts @@ -14,10 +14,10 @@ * limitations under the License. */ -val ktlintVersion = "1.0.1" +val ktlintVersion = "1.4.0" initscript { - val spotlessVersion = "6.23.3" + val spotlessVersion = "6.25.0" repositories { mavenCentral() From 9f11fe633758688e3962ac31167bd5aea9fc2160 Mon Sep 17 00:00:00 2001 From: Ali Shariat Date: Mon, 9 Dec 2024 12:41:17 +0100 Subject: [PATCH 038/164] Upgrade retrofit to 2.10.0 (#1344) * Upgrade retrofit to 2.10.0 * Update gradle/libs.versions.toml --------- Co-authored-by: Ben Weiss Co-authored-by: Zongle Wang --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 07076ca7d..f2b848031 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -50,8 +50,8 @@ protobuf = "4.26.1" protobufPlugin = "0.9.4" retrofit = "2.11.0" retrofitKotlinxSerializationJson = "1.0.0" -robolectric = "4.14" -roborazzi = "1.32.2" +robolectric = "4.11.1" +roborazzi = "1.7.0" room = "2.6.1" secrets = "2.0.1" truth = "1.4.2" From d10c8c0c25e8b289041f7bedea7d7eeff3a3b5b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:45:36 +0100 Subject: [PATCH 039/164] Bump firebaseCrashlyticsPlugin from 2.9.9 to 3.0.2 (#1656) Bumps `firebaseCrashlyticsPlugin` from 2.9.9 to 3.0.2. Updates `com.google.firebase:firebase-crashlytics-gradle` from 2.9.9 to 3.0.2 Updates `com.google.firebase.crashlytics` from 2.9.9 to 3.0.2 --- updated-dependencies: - dependency-name: com.google.firebase:firebase-crashlytics-gradle dependency-type: direct:production update-type: version-update:semver-major - dependency-name: com.google.firebase.crashlytics dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f2b848031..9e1764511 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,7 +30,7 @@ androidxWork = "2.9.0" coil = "2.7.0" dependencyGuard = "0.5.0" firebaseBom = "33.3.0" -firebaseCrashlyticsPlugin = "2.9.9" +firebaseCrashlyticsPlugin = "3.0.2" firebasePerfPlugin = "1.4.2" gmsPlugin = "4.4.1" googleOss = "17.1.0" From 3b84a5fcdb7a69c34602a933eb6d5b52f40fd403 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:45:56 +0100 Subject: [PATCH 040/164] Bump com.google.truth:truth from 1.4.2 to 1.4.4 (#1655) Bumps [com.google.truth:truth](https://github.com/google/truth) from 1.4.2 to 1.4.4. - [Release notes](https://github.com/google/truth/releases) - [Commits](https://github.com/google/truth/compare/v1.4.2...v1.4.4) --- updated-dependencies: - dependency-name: com.google.truth:truth dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9e1764511..0193fd585 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -54,7 +54,7 @@ robolectric = "4.11.1" roborazzi = "1.7.0" room = "2.6.1" secrets = "2.0.1" -truth = "1.4.2" +truth = "1.4.4" turbine = "1.1.0" [bundles] From bee6f6bb87ac06f3df1a6663c1a201ee4e5ce9dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:46:21 +0100 Subject: [PATCH 042/164] Bump androidxMacroBenchmark from 1.3.0 to 1.3.1 (#1652) Bumps `androidxMacroBenchmark` from 1.3.0 to 1.3.1. Updates `androidx.benchmark:benchmark-macro-junit4` from 1.3.0 to 1.3.1 Updates `androidx.baselineprofile` from 1.3.0 to 1.3.1 --- updated-dependencies: - dependency-name: androidx.benchmark:benchmark-macro-junit4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: androidx.baselineprofile dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0193fd585..07c5ba36e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ androidxDataStore = "1.1.1" androidxEspresso = "3.6.1" androidxHiltNavigationCompose = "1.2.0" androidxLifecycle = "2.8.6" -androidxMacroBenchmark = "1.3.0" +androidxMacroBenchmark = "1.3.1" androidxMetrics = "1.0.0-beta01" androidxNavigation = "2.8.0" androidxProfileinstaller = "1.3.1" From 56c284a3034ac7dd6061506886adcc07e37809df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:46:38 +0100 Subject: [PATCH 043/164] Bump com.google.accompanist:accompanist-permissions from 0.34.0 to 0.36.0 (#1658) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump com.google.accompanist:accompanist-permissions Bumps [com.google.accompanist:accompanist-permissions](https://github.com/google/accompanist) from 0.34.0 to 0.36.0. - [Release notes](https://github.com/google/accompanist/releases) - [Commits](https://github.com/google/accompanist/compare/v0.34.0...v0.36.0) --- updated-dependencies: - dependency-name: com.google.accompanist:accompanist-permissions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * 🤖 Updates baselines for Dependency Guard --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] --- app/dependencies/prodReleaseRuntimeClasspath.txt | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt index 49ab75cec..8c5c28927 100644 --- a/app/dependencies/prodReleaseRuntimeClasspath.txt +++ b/app/dependencies/prodReleaseRuntimeClasspath.txt @@ -145,7 +145,7 @@ androidx.work:work-runtime-ktx:2.9.0 androidx.work:work-runtime:2.9.0 com.caverock:androidsvg-aar:1.4 com.google.accompanist:accompanist-drawablepainter:0.32.0 -com.google.accompanist:accompanist-permissions:0.34.0 +com.google.accompanist:accompanist-permissions:0.36.0 com.google.android.datatransport:transport-api:3.2.0 com.google.android.datatransport:transport-backend-cct:3.3.0 com.google.android.datatransport:transport-runtime:3.3.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 07c5ba36e..dad49ae48 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -accompanist = "0.34.0" +accompanist = "0.36.0" androidDesugarJdkLibs = "2.0.4" # AGP and tools should be updated together androidGradlePlugin = "8.6.1" From 82b6352da135e64fb58ec32c9f8feb46e47d4998 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:53:10 +0100 Subject: [PATCH 044/164] Bump protobuf from 4.26.1 to 4.28.2 (#1630) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump protobuf from 4.26.1 to 4.28.2 Bumps `protobuf` from 4.26.1 to 4.28.2. Updates `com.google.protobuf:protobuf-kotlin-lite` from 4.26.1 to 4.28.2 Updates `com.google.protobuf:protoc` from 4.26.1 to 4.28.2 - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/commits) --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-kotlin-lite dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.protobuf:protoc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * 🤖 Updates baselines for Dependency Guard * 🤖 Updates screenshots --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: Ben Weiss --- .../prodReleaseRuntimeClasspath.txt | 4 ++-- ...Width_compactHeight_showsNavigationBar.png | Bin 48803 -> 48910 bytes ...idth_expandedHeight_showsNavigationBar.png | Bin 114403 -> 114469 bytes ...tWidth_mediumHeight_showsNavigationBar.png | Bin 63932 -> 63934 bytes ...Width_compactHeight_showsNavigationBar.png | Bin 78069 -> 78150 bytes ...dth_expandedHeight_showsNavigationRail.png | Bin 257040 -> 257060 bytes ...Width_mediumHeight_showsNavigationRail.png | Bin 141918 -> 141989 bytes .../insets_snackbar_compact_medium.png | Bin 33920 -> 32984 bytes ...ets_snackbar_compact_medium_noSnackbar.png | Bin 27036 -> 27004 bytes .../insets_snackbar_expanded_expanded.png | Bin 201760 -> 199377 bytes .../insets_snackbar_medium_medium.png | Bin 79426 -> 78456 bytes ...Width_compactHeight_showsNavigationBar.png | Bin 60317 -> 60398 bytes ...dth_expandedHeight_showsNavigationRail.png | Bin 165422 -> 165524 bytes ...Width_mediumHeight_showsNavigationRail.png | Bin 105192 -> 105231 bytes .../screenshots/snackbar_compact_medium.png | Bin 51292 -> 50000 bytes .../snackbar_compact_medium_noSnackbar.png | Bin 51551 -> 51523 bytes .../snackbar_expanded_expanded.png | Bin 215873 -> 213849 bytes .../screenshots/snackbar_medium_medium.png | Bin 96406 -> 95070 bytes .../Background_dark_defaultTheme_dynamic.png | Bin 5639 -> 5609 bytes ...ackground_dark_defaultTheme_notDynamic.png | Bin 4355 -> 4323 bytes ...ckground_light_androidTheme_notDynamic.png | Bin 4850 -> 4801 bytes .../Background_light_defaultTheme_dynamic.png | Bin 5544 -> 5479 bytes ...ckground_light_defaultTheme_notDynamic.png | Bin 4200 -> 4131 bytes ...ntBackground_dark_defaultTheme_dynamic.png | Bin 4198 -> 4182 bytes ...ackground_dark_defaultTheme_notDynamic.png | Bin 10932 -> 10908 bytes ...ckground_light_androidTheme_notDynamic.png | Bin 4850 -> 4801 bytes ...tBackground_light_defaultTheme_dynamic.png | Bin 5663 -> 5595 bytes ...ckground_light_defaultTheme_notDynamic.png | Bin 10604 -> 10609 bytes ...nLeadingIcon_dark_defaultTheme_dynamic.png | Bin 4784 -> 4768 bytes ...adingIcon_dark_defaultTheme_notDynamic.png | Bin 3828 -> 3807 bytes ...LeadingIcon_light_defaultTheme_dynamic.png | Bin 4733 -> 4679 bytes ...dingIcon_light_defaultTheme_notDynamic.png | Bin 3433 -> 3396 bytes .../Button_dark_androidTheme_notDynamic.png | Bin 4280 -> 4266 bytes .../Button_dark_defaultTheme_dynamic.png | Bin 4935 -> 4927 bytes .../Button_dark_defaultTheme_notDynamic.png | Bin 3915 -> 3899 bytes .../Button_light_androidTheme_notDynamic.png | Bin 3933 -> 3887 bytes .../Button_light_defaultTheme_dynamic.png | Bin 4999 -> 4944 bytes .../Button_light_defaultTheme_notDynamic.png | Bin 4031 -> 3999 bytes ...ineButton_dark_androidTheme_notDynamic.png | Bin 5666 -> 5651 bytes ...utlineButton_dark_defaultTheme_dynamic.png | Bin 6419 -> 6412 bytes ...ineButton_dark_defaultTheme_notDynamic.png | Bin 5269 -> 5247 bytes ...neButton_light_androidTheme_notDynamic.png | Bin 5448 -> 5393 bytes ...tlineButton_light_defaultTheme_dynamic.png | Bin 6330 -> 6277 bytes ...neButton_light_defaultTheme_notDynamic.png | Bin 5530 -> 5483 bytes ...pSelected_dark_androidTheme_notDynamic.png | Bin 3275 -> 3265 bytes ...ChipSelected_dark_defaultTheme_dynamic.png | Bin 3195 -> 3189 bytes ...pSelected_dark_defaultTheme_notDynamic.png | Bin 3206 -> 3190 bytes ...Selected_light_androidTheme_notDynamic.png | Bin 3306 -> 3247 bytes ...hipSelected_light_defaultTheme_dynamic.png | Bin 3316 -> 3267 bytes ...Selected_light_defaultTheme_notDynamic.png | Bin 3276 -> 3231 bytes ...ilterChip_dark_androidTheme_notDynamic.png | Bin 2948 -> 2936 bytes .../FilterChip_dark_defaultTheme_dynamic.png | Bin 2941 -> 2933 bytes ...ilterChip_dark_defaultTheme_notDynamic.png | Bin 2935 -> 2922 bytes .../FilterChip/FilterChip_fontScale2.png | Bin 2995 -> 2878 bytes ...lterChip_light_androidTheme_notDynamic.png | Bin 2995 -> 2950 bytes .../FilterChip_light_defaultTheme_dynamic.png | Bin 2935 -> 2893 bytes ...lterChip_light_defaultTheme_notDynamic.png | Bin 2996 -> 2956 bytes ...Unchecked_dark_androidTheme_notDynamic.png | Bin 1206 -> 1193 bytes ...tonUnchecked_dark_defaultTheme_dynamic.png | Bin 1291 -> 1270 bytes ...Unchecked_dark_defaultTheme_notDynamic.png | Bin 1314 -> 1279 bytes ...nchecked_light_androidTheme_notDynamic.png | Bin 1399 -> 1318 bytes ...onUnchecked_light_defaultTheme_dynamic.png | Bin 1161 -> 1097 bytes ...nchecked_light_defaultTheme_notDynamic.png | Bin 1160 -> 1100 bytes ...conButton_dark_androidTheme_notDynamic.png | Bin 575 -> 527 bytes .../IconButton_dark_defaultTheme_dynamic.png | Bin 575 -> 527 bytes ...conButton_dark_defaultTheme_notDynamic.png | Bin 575 -> 527 bytes ...onButton_light_androidTheme_notDynamic.png | Bin 575 -> 527 bytes .../IconButton_light_defaultTheme_dynamic.png | Bin 575 -> 527 bytes ...onButton_light_defaultTheme_notDynamic.png | Bin 575 -> 527 bytes .../LoadingWheel_animation_1000.png | Bin 1566 -> 1519 bytes .../LoadingWheel_animation_115.png | Bin 856 -> 811 bytes .../LoadingWheel_animation_20.png | Bin 342 -> 290 bytes .../LoadingWheel_animation_724.png | Bin 1488 -> 1442 bytes ...dingWheel_dark_androidTheme_notDynamic.png | Bin 1080 -> 1068 bytes ...LoadingWheel_dark_defaultTheme_dynamic.png | Bin 1068 -> 1061 bytes ...dingWheel_dark_defaultTheme_notDynamic.png | Bin 1078 -> 1063 bytes ...ingWheel_light_androidTheme_notDynamic.png | Bin 1189 -> 1129 bytes ...oadingWheel_light_defaultTheme_dynamic.png | Bin 1084 -> 1036 bytes ...ingWheel_light_defaultTheme_notDynamic.png | Bin 1176 -> 1123 bytes ...dingWheel_dark_androidTheme_notDynamic.png | Bin 3067 -> 1870 bytes ...LoadingWheel_dark_defaultTheme_dynamic.png | Bin 2845 -> 1829 bytes ...dingWheel_dark_defaultTheme_notDynamic.png | Bin 3378 -> 1998 bytes ...ingWheel_light_androidTheme_notDynamic.png | Bin 5424 -> 1919 bytes ...oadingWheel_light_defaultTheme_dynamic.png | Bin 5176 -> 1710 bytes ...ingWheel_light_defaultTheme_notDynamic.png | Bin 4326 -> 1872 bytes ...avigation_dark_androidTheme_notDynamic.png | Bin 3836 -> 3803 bytes .../Navigation_dark_defaultTheme_dynamic.png | Bin 3867 -> 3850 bytes ...avigation_dark_defaultTheme_notDynamic.png | Bin 3876 -> 3851 bytes .../Navigation/Navigation_fontScale2.png | Bin 8254 -> 8145 bytes ...vigation_light_androidTheme_notDynamic.png | Bin 4043 -> 3975 bytes .../Navigation_light_defaultTheme_dynamic.png | Bin 3813 -> 3755 bytes ...vigation_light_defaultTheme_notDynamic.png | Bin 3806 -> 3734 bytes .../Tabs_dark_androidTheme_notDynamic.png | Bin 2820 -> 2806 bytes .../Tabs/Tabs_dark_defaultTheme_dynamic.png | Bin 2814 -> 2805 bytes .../Tabs_dark_defaultTheme_notDynamic.png | Bin 2816 -> 2797 bytes .../test/screenshots/Tabs/Tabs_fontScale2.png | Bin 6852 -> 6794 bytes .../Tabs_light_androidTheme_notDynamic.png | Bin 2863 -> 2792 bytes .../Tabs/Tabs_light_defaultTheme_dynamic.png | Bin 2843 -> 2780 bytes .../Tabs_light_defaultTheme_notDynamic.png | Bin 2885 -> 2822 bytes .../Tag/Tag_dark_androidTheme_notDynamic.png | Bin 1952 -> 1885 bytes .../Tag/Tag_dark_defaultTheme_dynamic.png | Bin 1939 -> 1870 bytes .../Tag/Tag_dark_defaultTheme_notDynamic.png | Bin 1893 -> 1828 bytes .../test/screenshots/Tag/Tag_fontScale2.png | Bin 4248 -> 4157 bytes .../Tag/Tag_light_androidTheme_notDynamic.png | Bin 1930 -> 1846 bytes .../Tag/Tag_light_defaultTheme_dynamic.png | Bin 1760 -> 1699 bytes .../Tag/Tag_light_defaultTheme_notDynamic.png | Bin 1802 -> 1730 bytes ...TopAppBar_dark_androidTheme_notDynamic.png | Bin 3420 -> 3406 bytes .../TopAppBar_dark_defaultTheme_dynamic.png | Bin 3482 -> 3471 bytes ...TopAppBar_dark_defaultTheme_notDynamic.png | Bin 3411 -> 3398 bytes .../TopAppBar/TopAppBar_fontScale2.png | Bin 4959 -> 4899 bytes ...opAppBar_light_androidTheme_notDynamic.png | Bin 3501 -> 3430 bytes .../TopAppBar_light_defaultTheme_dynamic.png | Bin 3433 -> 3370 bytes ...opAppBar_light_defaultTheme_notDynamic.png | Bin 3513 -> 3453 bytes .../ForYouScreenLoading_foldable.png | Bin 15077 -> 10239 bytes .../screenshots/ForYouScreenLoading_phone.png | Bin 10702 -> 5806 bytes .../ForYouScreenLoading_tablet.png | Bin 19118 -> 13953 bytes ...rYouScreenPopulatedAndLoading_foldable.png | Bin 204139 -> 194529 bytes .../ForYouScreenPopulatedAndLoading_phone.png | Bin 46405 -> 40405 bytes ...ouScreenPopulatedAndLoading_phone_dark.png | Bin 46268 -> 40982 bytes ...ForYouScreenPopulatedAndLoading_tablet.png | Bin 235714 -> 225631 bytes .../ForYouScreenPopulatedFeed_foldable.png | Bin 190524 -> 190495 bytes .../ForYouScreenPopulatedFeed_phone.png | Bin 37379 -> 37359 bytes .../ForYouScreenPopulatedFeed_tablet.png | Bin 221124 -> 221093 bytes .../ForYouScreenTopicSelection_foldable.png | Bin 91305 -> 91275 bytes .../ForYouScreenTopicSelection_phone.png | Bin 23155 -> 23126 bytes .../ForYouScreenTopicSelection_phone_dark.png | Bin 24130 -> 24118 bytes .../ForYouScreenTopicSelection_tablet.png | Bin 99830 -> 99794 bytes gradle/libs.versions.toml | 2 +- 128 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt index 8c5c28927..a2719ef22 100644 --- a/app/dependencies/prodReleaseRuntimeClasspath.txt +++ b/app/dependencies/prodReleaseRuntimeClasspath.txt @@ -194,8 +194,8 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:31.1-android com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 -com.google.protobuf:protobuf-javalite:4.26.1 -com.google.protobuf:protobuf-kotlin-lite:4.26.1 +com.google.protobuf:protobuf-javalite:4.28.2 +com.google.protobuf:protobuf-kotlin-lite:4.28.2 com.squareup.okhttp3:logging-interceptor:4.12.0 com.squareup.okhttp3:okhttp:4.12.0 com.squareup.okio:okio-jvm:3.9.0 diff --git a/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png index 2f225431022cc3041e083b77a063f1506c4b0a6e..912fca4c782c33ff7c5d2ff82b62f3b1d1354267 100644 GIT binary patch delta 43635 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 Ic6#=I05tf`ivR!s delta 43566 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°f){mMce5Cpn}{nzN< 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