Merge pull request #3674 from CruGlobal/revert-3670-renovate/androidx…

….compose.material3-material3-1.x Revert "Update dependency androidx.compose.material3:material3 to v1.3.0"
CruGlobal · Sep 5, 2024 · 84a6d7a · 84a6d7a
2 parents 9f23f14 + 9a9a6c6
commit 84a6d7a
Show file tree

Hide file tree

Showing 113 changed files with 262 additions and 374 deletions.
diff --git a/app/config/ktlint/baseline.xml b/app/config/ktlint/baseline.xml
@@ -19,7 +19,7 @@
         <error line="40" column="9" source="compose:vm-injection-check" />
     </file>
     <file name="src/main/kotlin/org/cru/godtools/ui/languages/downloadable/DownloadableLanguagesLayout.kt">
-        <error line="58" column="5" source="compose:modifier-missing-check" />
+        <error line="59" column="5" source="compose:modifier-missing-check" />
     </file>
     <file name="src/main/kotlin/org/cru/godtools/ui/login/LoginLayout.kt">
         <error line="51" column="5" source="compose:modifier-missing-check" />

diff --git a/app/src/main/kotlin/org/cru/godtools/ui/account/activity/AccountActivityBadges.kt b/app/src/main/kotlin/org/cru/godtools/ui/account/activity/AccountActivityBadges.kt
@@ -20,7 +20,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.pluralStringResource
@@ -67,9 +66,6 @@ private fun ActivityBadge(badge: Badge, modifier: Modifier = Modifier) {
 
     ElevatedCard(
         elevation = CardDefaults.elevatedCardElevation(defaultElevation = if (badge.isEarned) 4.dp else 0.dp),
-        colors = CardDefaults.elevatedCardColors(
-            containerColor = if (badge.isEarned) Color.Unspecified else Color.Transparent
-        ),
         modifier = modifier.size(contentHeight.coerceAtLeast(100.dp))
     ) {
         Spacer(modifier = Modifier.weight(1f))

diff --git a/...src/main/kotlin/org/cru/godtools/ui/languages/downloadable/DownloadableLanguagesLayout.kt b/...src/main/kotlin/org/cru/godtools/ui/languages/downloadable/DownloadableLanguagesLayout.kt
@@ -13,6 +13,7 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
@@ -21,7 +22,6 @@ import androidx.compose.material3.ListItem
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SearchBar
 import androidx.compose.material3.Text
-import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -36,6 +36,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import kotlinx.coroutines.NonCancellable
@@ -151,7 +152,7 @@ private fun LanguageListItem(viewModel: LanguageViewModels.LanguageViewModel, mo
                 modifier = Modifier
                     .clickable(
                         interactionSource = remember { MutableInteractionSource() },
-                        indication = ripple(bounded = false),
+                        indication = rememberRipple(bounded = false, radius = Dp.Unspecified),
                     ) {
                         when {
                             !language.isAdded -> scope.launch(NonCancellable) { viewModel.pin() }

diff --git a/app/src/main/kotlin/org/cru/godtools/ui/tooldetails/ToolDetailsAbout.kt b/app/src/main/kotlin/org/cru/godtools/ui/tooldetails/ToolDetailsAbout.kt
@@ -14,13 +14,13 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Remove
+import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProvideTextStyle
 import androidx.compose.material3.Text
-import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.derivedStateOf
@@ -174,7 +174,7 @@ private fun ToolDetailsAboutAccordionSection(
         Icon(
             if (expanded) Icons.Filled.Remove else Icons.Filled.Add,
             contentDescription = null,
-            modifier = Modifier.indication(headerInteractions, ripple(bounded = false, radius = 20.dp))
+            modifier = Modifier.indication(headerInteractions, rememberRipple(bounded = false, radius = 20.dp))
         )
     }
     AnimatedVisibility(visible = expanded) {

diff --git a/...ntActivityBadgesPaparazziTest_AccountActivityBadges() - All Complete[NIGHT].png b/...ntActivityBadgesPaparazziTest_AccountActivityBadges() - All Complete[NIGHT].png
diff --git a/...ctivityBadgesPaparazziTest_AccountActivityBadges() - All Complete[NOTNIGHT].png b/...ctivityBadgesPaparazziTest_AccountActivityBadges() - All Complete[NOTNIGHT].png
diff --git a/...ActivityBadgesPaparazziTest_AccountActivityBadges() - All Incomplete[NIGHT].png b/...ActivityBadgesPaparazziTest_AccountActivityBadges() - All Incomplete[NIGHT].png
diff --git a/...ivityBadgesPaparazziTest_AccountActivityBadges() - All Incomplete[NOTNIGHT].png b/...ivityBadgesPaparazziTest_AccountActivityBadges() - All Incomplete[NOTNIGHT].png
diff --git a/...tActivityBadgesPaparazziTest_AccountActivityBadges() - Some Complete[NIGHT].png b/...tActivityBadgesPaparazziTest_AccountActivityBadges() - Some Complete[NIGHT].png
diff --git a/...tivityBadgesPaparazziTest_AccountActivityBadges() - Some Complete[NOTNIGHT].png b/...tivityBadgesPaparazziTest_AccountActivityBadges() - Some Complete[NOTNIGHT].png
diff --git a/...arazziTest_DeleteAccountLayout() - Deleting[Nexus 5,NIGHT,NO_ACCESSIBILITY].png b/...arazziTest_DeleteAccountLayout() - Deleting[Nexus 5,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...arazziTest_DeleteAccountLayout() - Deleting[Nexus 5,NOTNIGHT,ACCESSIBILITY].png b/...arazziTest_DeleteAccountLayout() - Deleting[Nexus 5,NOTNIGHT,ACCESSIBILITY].png
diff --git a/...zziTest_DeleteAccountLayout() - Deleting[Nexus 5,NOTNIGHT,NO_ACCESSIBILITY].png b/...zziTest_DeleteAccountLayout() - Deleting[Nexus 5,NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...ziTest_DeleteAccountLayout() - Deleting[Pixel 6 Pro,NIGHT,NO_ACCESSIBILITY].png b/...ziTest_DeleteAccountLayout() - Deleting[Pixel 6 Pro,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...est_DeleteAccountLayout() - Deleting[Pixel 6 Pro,NOTNIGHT,NO_ACCESSIBILITY].png b/...est_DeleteAccountLayout() - Deleting[Pixel 6 Pro,NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...parazziTest_DeleteAccountLayout() - Display[Nexus 5,NIGHT,NO_ACCESSIBILITY].png b/...parazziTest_DeleteAccountLayout() - Display[Nexus 5,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...parazziTest_DeleteAccountLayout() - Display[Nexus 5,NOTNIGHT,ACCESSIBILITY].png b/...parazziTest_DeleteAccountLayout() - Display[Nexus 5,NOTNIGHT,ACCESSIBILITY].png
diff --git a/...azziTest_DeleteAccountLayout() - Display[Nexus 5,NOTNIGHT,NO_ACCESSIBILITY].png b/...azziTest_DeleteAccountLayout() - Display[Nexus 5,NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...zziTest_DeleteAccountLayout() - Display[Pixel 6 Pro,NIGHT,NO_ACCESSIBILITY].png b/...zziTest_DeleteAccountLayout() - Display[Pixel 6 Pro,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...Test_DeleteAccountLayout() - Display[Pixel 6 Pro,NOTNIGHT,NO_ACCESSIBILITY].png b/...Test_DeleteAccountLayout() - Display[Pixel 6 Pro,NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...PaparazziTest_DeleteAccountLayout() - Error[Nexus 5,NIGHT,NO_ACCESSIBILITY].png b/...PaparazziTest_DeleteAccountLayout() - Error[Nexus 5,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...arazziTest_DeleteAccountLayout() - Error[Nexus 5,NOTNIGHT,NO_ACCESSIBILITY].png b/...arazziTest_DeleteAccountLayout() - Error[Nexus 5,NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...razziTest_DeleteAccountLayout() - Error[Pixel 6 Pro,NIGHT,NO_ACCESSIBILITY].png b/...razziTest_DeleteAccountLayout() - Error[Pixel 6 Pro,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...ziTest_DeleteAccountLayout() - Error[Pixel 6 Pro,NOTNIGHT,NO_ACCESSIBILITY].png b/...ziTest_DeleteAccountLayout() - Error[Pixel 6 Pro,NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...azziTest_LanguageFilter - Button - English Selected[NIGHT,NO_ACCESSIBILITY].png b/...azziTest_LanguageFilter - Button - English Selected[NIGHT,NO_ACCESSIBILITY].png
diff --git a/...azziTest_LanguageFilter - Button - English Selected[NOTNIGHT,ACCESSIBILITY].png b/...azziTest_LanguageFilter - Button - English Selected[NOTNIGHT,ACCESSIBILITY].png
diff --git a/...iTest_LanguageFilter - Button - English Selected[NOTNIGHT,NO_ACCESSIBILITY].png b/...iTest_LanguageFilter - Button - English Selected[NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...Test_LanguageFilter - Button - No Language Selected[NIGHT,NO_ACCESSIBILITY].png b/...Test_LanguageFilter - Button - No Language Selected[NIGHT,NO_ACCESSIBILITY].png
diff --git a/...Test_LanguageFilter - Button - No Language Selected[NOTNIGHT,ACCESSIBILITY].png b/...Test_LanguageFilter - Button - No Language Selected[NOTNIGHT,ACCESSIBILITY].png
diff --git a/...t_LanguageFilter - Button - No Language Selected[NOTNIGHT,NO_ACCESSIBILITY].png b/...t_LanguageFilter - Button - No Language Selected[NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...parazziTest_AppLanguageLayout() - Searching[Nexus 5,NIGHT,NO_ACCESSIBILITY].png b/...parazziTest_AppLanguageLayout() - Searching[Nexus 5,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...parazziTest_AppLanguageLayout() - Searching[Nexus 5,NOTNIGHT,ACCESSIBILITY].png b/...parazziTest_AppLanguageLayout() - Searching[Nexus 5,NOTNIGHT,ACCESSIBILITY].png
diff --git a/...azziTest_AppLanguageLayout() - Searching[Nexus 5,NOTNIGHT,NO_ACCESSIBILITY].png b/...azziTest_AppLanguageLayout() - Searching[Nexus 5,NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...zziTest_AppLanguageLayout() - Searching[Pixel 6 Pro,NIGHT,NO_ACCESSIBILITY].png b/...zziTest_AppLanguageLayout() - Searching[Pixel 6 Pro,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...Test_AppLanguageLayout() - Searching[Pixel 6 Pro,NOTNIGHT,NO_ACCESSIBILITY].png b/...Test_AppLanguageLayout() - Searching[Pixel 6 Pro,NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...uageLayoutPaparazziTest_AppLanguageLayout()[Nexus 5,NIGHT,NO_ACCESSIBILITY].png b/...uageLayoutPaparazziTest_AppLanguageLayout()[Nexus 5,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...uageLayoutPaparazziTest_AppLanguageLayout()[Nexus 5,NOTNIGHT,ACCESSIBILITY].png b/...uageLayoutPaparazziTest_AppLanguageLayout()[Nexus 5,NOTNIGHT,ACCESSIBILITY].png
diff --git a/...eLayoutPaparazziTest_AppLanguageLayout()[Nexus 5,NOTNIGHT,NO_ACCESSIBILITY].png b/...eLayoutPaparazziTest_AppLanguageLayout()[Nexus 5,NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...LayoutPaparazziTest_AppLanguageLayout()[Pixel 6 Pro,NIGHT,NO_ACCESSIBILITY].png b/...LayoutPaparazziTest_AppLanguageLayout()[Pixel 6 Pro,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...outPaparazziTest_AppLanguageLayout()[Pixel 6 Pro,NOTNIGHT,NO_ACCESSIBILITY].png b/...outPaparazziTest_AppLanguageLayout()[Pixel 6 Pro,NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...wnloadStatusIndicatorPaparazziTest_LanguageDownloadStatusIndicator()[NIGHT].png b/...wnloadStatusIndicatorPaparazziTest_LanguageDownloadStatusIndicator()[NIGHT].png
diff --git a/...oadStatusIndicatorPaparazziTest_LanguageDownloadStatusIndicator()[NOTNIGHT].png b/...oadStatusIndicatorPaparazziTest_LanguageDownloadStatusIndicator()[NOTNIGHT].png
diff --git a/....cru.godtools.ui.languages_LanguageNamePaparazziTest_LanguageNames()[NIGHT].png b/....cru.godtools.ui.languages_LanguageNamePaparazziTest_LanguageNames()[NIGHT].png
diff --git a/...u.godtools.ui.languages_LanguageNamePaparazziTest_LanguageNames()[NOTNIGHT].png b/...u.godtools.ui.languages_LanguageNamePaparazziTest_LanguageNames()[NOTNIGHT].png
diff --git a/...ayoutPaparazziTest_LanguageSettingsLayout()[Nexus 5,NIGHT,NO_ACCESSIBILITY].png b/...ayoutPaparazziTest_LanguageSettingsLayout()[Nexus 5,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...ayoutPaparazziTest_LanguageSettingsLayout()[Nexus 5,NOTNIGHT,ACCESSIBILITY].png b/...ayoutPaparazziTest_LanguageSettingsLayout()[Nexus 5,NOTNIGHT,ACCESSIBILITY].png
diff --git a/...utPaparazziTest_LanguageSettingsLayout()[Nexus 5,NOTNIGHT,NO_ACCESSIBILITY].png b/...utPaparazziTest_LanguageSettingsLayout()[Nexus 5,NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...tPaparazziTest_LanguageSettingsLayout()[Pixel 6 Pro,NIGHT,NO_ACCESSIBILITY].png b/...tPaparazziTest_LanguageSettingsLayout()[Pixel 6 Pro,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...parazziTest_LanguageSettingsLayout()[Pixel 6 Pro,NOTNIGHT,NO_ACCESSIBILITY].png b/...parazziTest_LanguageSettingsLayout()[Pixel 6 Pro,NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...razziTest_ToolDetailsLayout() - Downloading[Nexus 5,NIGHT,NO_ACCESSIBILITY].png b/...razziTest_ToolDetailsLayout() - Downloading[Nexus 5,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...razziTest_ToolDetailsLayout() - Downloading[Nexus 5,NOTNIGHT,ACCESSIBILITY].png b/...razziTest_ToolDetailsLayout() - Downloading[Nexus 5,NOTNIGHT,ACCESSIBILITY].png
diff --git a/...ziTest_ToolDetailsLayout() - Downloading[Nexus 5,NOTNIGHT,NO_ACCESSIBILITY].png b/...ziTest_ToolDetailsLayout() - Downloading[Nexus 5,NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...iTest_ToolDetailsLayout() - Downloading[Pixel 6 Pro,NIGHT,NO_ACCESSIBILITY].png b/...iTest_ToolDetailsLayout() - Downloading[Pixel 6 Pro,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...st_ToolDetailsLayout() - Downloading[Pixel 6 Pro,NOTNIGHT,NO_ACCESSIBILITY].png b/...st_ToolDetailsLayout() - Downloading[Pixel 6 Pro,NOTNIGHT,NO_ACCESSIBILITY].png
diff --git a/...razziTest_ToolDetailsLayout() - Drawer Open[Nexus 5,NIGHT,NO_ACCESSIBILITY].png b/...razziTest_ToolDetailsLayout() - Drawer Open[Nexus 5,NIGHT,NO_ACCESSIBILITY].png
diff --git a/...razziTest_ToolDetailsLayout() - Drawer Open[Nexus 5,NOTNIGHT,ACCESSIBILITY].png b/...razziTest_ToolDetailsLayout() - Drawer Open[Nexus 5,NOTNIGHT,ACCESSIBILITY].png