Merge pull request #21430 from wordpress-mobile/issue/21429-blaze-crash

Updated constraintlayout version to fix #21429
wordpress-mobile · Nov 8, 2024 · b3945a1 · b3945a1
2 parents 73b63d6 + a69fa04
commit b3945a1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/compose/DomainItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/compose/DomainItem.kt
@@ -30,6 +30,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import org.wordpress.android.R
 import org.wordpress.android.ui.compose.components.SolidCircle
 import org.wordpress.android.ui.compose.theme.AppThemeM3WithoutBackground
 import org.wordpress.android.ui.compose.unit.Margin
@@ -40,7 +41,6 @@ import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewMode
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel.ListItemUiState.New.DomainUiState.Tag.Recommended
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel.ListItemUiState.New.DomainUiState.Tag.Sale
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel.ListItemUiState.New.DomainUiState.Tag.Unavailable
-import androidx.compose.ui.R as ComposeR
 
 private val HighlightBgColor @Composable get() = colorScheme.primary.copy(0.1f)
 private val SecondaryTextColor @Composable get() = colorScheme.onSurface.copy(0.46f)
@@ -75,7 +75,7 @@ fun DomainItem(uiState: DomainUiState): Unit = with(uiState) {
                 if (isSelected) {
                     Icon(
                         imageVector = Icons.Default.Check,
-                        contentDescription = stringResource(ComposeR.string.selected),
+                        contentDescription = stringResource(R.string.item_selected),
                         tint = colorScheme.primary,
                         modifier = Modifier.size(16.dp),
                     )

diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
@@ -112,6 +112,7 @@
     <string name="free">Free</string>
     <string name="dismiss">Dismiss</string>
     <string name="sending">Sending</string>
+    <string name="item_selected">Selected</string>
 
     <string name="button_not_now">Not now</string>
     <string name="button_skip">Skip</string>

diff --git a/config/lint/lint.xml b/config/lint/lint.xml
@@ -80,4 +80,6 @@
     <!-- INTEROPERABILITY -->
     <!-- TODO: https://github.com/wordpress-mobile/WordPress-Android/issues/21065 -->
     <issue id="UsingMaterialAndMaterial3Libraries" severity="warning" />
+    <!-- TODO: https://github.com/wordpress-mobile/WordPress-Android/pull/21430 -->
+    <issue id="ObsoleteLintCustomCheck" severity="warning" />
 </lint>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ androidx-cardview = '1.0.0'
 androidx-compose-bom = '2024.10.01'
 androidx-compose-compiler = '1.5.15'
 androidx-compose-material3 = '1.3.1'
-androidx-constraintlayout-compose = '1.0.1'
+androidx-constraintlayout-compose = '1.1.0'
 androidx-constraintlayout-main = '2.2.0'
 androidx-core = '1.13.1'
 androidx-credentials = '1.2.0'