Merge branch 'trunk' into dependabot/gradle/androidx.compose-compose-bom-2024.10.01

Author: nbradbury

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainViewHolder.kt

@@ -9,7 +9,7 @@ import org.wordpress.android.R
 import org.wordpress.android.databinding.SiteCreationDomainsItemBinding
 import org.wordpress.android.databinding.SiteCreationDomainsItemV2Binding
 import org.wordpress.android.databinding.SiteCreationSuggestionsErrorItemBinding
-import org.wordpress.android.ui.compose.theme.AppThemeM2WithoutBackground
+import org.wordpress.android.ui.compose.theme.AppThemeM3WithoutBackground
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel.ListItemUiState.New
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel.ListItemUiState.Old
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel.ListItemUiState.Old.DomainUiState.AvailableDomain
@@ -66,7 +66,7 @@ sealed class SiteCreationDomainViewHolder<T : ViewBinding>(protected val binding
 
         fun onBind(uiState: New.DomainUiState) = with(binding) {
             composeView.setContent {
-                AppThemeM2WithoutBackground {
+                AppThemeM3WithoutBackground {
                     DomainItem(uiState)
                 }
             }

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsAdapter.kt

@@ -25,7 +25,7 @@ class SiteCreationDomainsAdapter(
         parent: ViewGroup,
         viewType: Int
     ): SiteCreationDomainViewHolder<*> {
-        return when (Type.values()[viewType]) {
+        return when (Type.entries[viewType]) {
             DOMAIN_V1 -> OldDomainViewHolder(parent, uiHelpers)
             DOMAIN_V2 -> NewDomainViewHolder(parent)
             ERROR_V1 -> OldDomainErrorViewHolder(parent)

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt

@@ -21,7 +21,7 @@ import org.wordpress.android.R
 import org.wordpress.android.databinding.SiteCreationDomainsScreenBinding
 import org.wordpress.android.databinding.SiteCreationFormScreenBinding
 import org.wordpress.android.ui.accounts.HelpActivity
-import org.wordpress.android.ui.compose.theme.AppThemeM2
+import org.wordpress.android.ui.compose.theme.AppThemeM3
 import org.wordpress.android.ui.sitecreation.SiteCreationBaseFormFragment
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel.DomainsUiState.DomainsUiContentState
 import org.wordpress.android.ui.sitecreation.domains.compose.SiteExample
@@ -73,7 +73,7 @@ class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
             it.initRecyclerView()
             it.initViewModel()
             it.siteExampleComposeView.setContent {
-                AppThemeM2 {
+                AppThemeM3 {
                     SiteExample()
                 }
             }

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/compose/DomainItem.kt

@@ -11,13 +11,13 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme.colors
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.ripple
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme.colorScheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -31,7 +31,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.wordpress.android.ui.compose.components.SolidCircle
-import org.wordpress.android.ui.compose.theme.AppThemeM2WithoutBackground
+import org.wordpress.android.ui.compose.theme.AppThemeM3WithoutBackground
 import org.wordpress.android.ui.compose.unit.Margin
 import org.wordpress.android.ui.compose.utils.asString
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel.ListItemUiState.New.DomainUiState
@@ -42,8 +42,8 @@ import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewMode
 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() = colors.primary.copy(0.1f)
-private val SecondaryTextColor @Composable get() = colors.onSurface.copy(0.46f)
+private val HighlightBgColor @Composable get() = colorScheme.primary.copy(0.1f)
+private val SecondaryTextColor @Composable get() = colorScheme.onSurface.copy(0.46f)
 private val SecondaryFontSize = 13.sp
 private val PrimaryFontSize = 17.sp
 private val StartPadding = 40.dp
@@ -76,7 +76,7 @@ fun DomainItem(uiState: DomainUiState): Unit = with(uiState) {
                     Icon(
                         imageVector = Icons.Default.Check,
                         contentDescription = stringResource(ComposeR.string.selected),
-                        tint = colors.primary,
+                        tint = colorScheme.primary,
                         modifier = Modifier.size(16.dp),
                     )
                 } else {
@@ -88,7 +88,7 @@ fun DomainItem(uiState: DomainUiState): Unit = with(uiState) {
             Column(verticalArrangement = Arrangement.spacedBy(2.dp), modifier = Modifier.weight(1f)) {
                 Text(
                     text = domainName,
-                    color = colors.onSurface.takeIf { tags.none { it is Unavailable } } ?: SecondaryTextColor,
+                    color = colorScheme.onSurface.takeIf { tags.none { it is Unavailable } } ?: SecondaryTextColor,
                     fontSize = PrimaryFontSize,
                     overflow = TextOverflow.Ellipsis,
                     maxLines = 1,
@@ -130,12 +130,12 @@ fun DomainItem(uiState: DomainUiState): Unit = with(uiState) {
             Row(modifier = Modifier.padding(bottom = Margin.ExtraLarge.value, start = StartPadding)) {
                 Text(
                     text = cost.subtitle.asString(),
-                    color = colors.primary,
+                    color = colorScheme.primary,
                     fontSize = SecondaryFontSize,
                 )
             }
         }
-        Divider(thickness = 0.5.dp)
+        HorizontalDivider(thickness = 0.5.dp)
     }
 }
 
@@ -166,14 +166,14 @@ private fun SalePrice(title: Pair<String, String>, subtitle: String, modifier: M
                 )
                 Text(
                     normalText,
-                    color = colors.primary,
+                    color = colorScheme.primary,
                     fontSize = PrimaryFontSize,
                 )
             }
         }
         Text(
             subtitle,
-            color = colors.primary,
+            color = colorScheme.primary,
             fontSize = SecondaryFontSize,
         )
     }
@@ -227,7 +227,7 @@ private fun DomainItemPreview() {
             onClick = {}
         )
     }
-    AppThemeM2WithoutBackground {
+    AppThemeM3WithoutBackground {
         Column {
             uiStates.forEach { DomainItem(it) }
         }

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/compose/SiteExample.kt

@@ -12,12 +12,12 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.outlined.Lock
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -32,9 +32,9 @@ 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.theme.AppThemeM2
+import org.wordpress.android.ui.compose.theme.AppThemeM3
 
-private val grayColor @Composable get() = MaterialTheme.colors.onSurface.copy(0.05f)
+private val grayColor @Composable get() = MaterialTheme.colorScheme.onSurface.copy(0.05f)
 private val regularFontSize = 12.sp
 private val regularRadius = 4.dp
 private val radius2x = regularRadius*2
@@ -97,7 +97,7 @@ private fun AddressBar(domainText: String) {
             modifier = Modifier
                 .weight(1f)
                 .height(36.dp)
-                .background(MaterialTheme.colors.surface, RoundedCornerShape(radius2x))
+                .background(MaterialTheme.colorScheme.surface, RoundedCornerShape(radius2x))
         ) {
             Box(
                 contentAlignment = Alignment.Center,
@@ -125,7 +125,7 @@ private fun AddressBar(domainText: String) {
             contentAlignment = Alignment.Center,
             modifier = Modifier
                 .size(36.dp)
-                .background(MaterialTheme.colors.surface, RoundedCornerShape(radius2x))
+                .background(MaterialTheme.colorScheme.surface, RoundedCornerShape(radius2x))
         ) {
             Icon(
                 imageVector = Icons.Default.Add,
@@ -142,7 +142,7 @@ private fun AddressBar(domainText: String) {
             .height(100.dp)
             .padding(horizontal = 8.dp)
             .background(
-                verticalGradient(0f to MaterialTheme.colors.surface, 1f to Color.Transparent),
+                verticalGradient(0f to MaterialTheme.colorScheme.surface, 1f to Color.Transparent),
                 RoundedCornerShape(radius2x, radius2x),
             )
     )
@@ -154,7 +154,7 @@ private fun AddressBar(domainText: String) {
 @Preview(widthDp = 900, heightDp = 415, name = "Landscape")
 @Preview(widthDp = 415, heightDp = 900, name = "RTL", locale = "ar")
 private fun SiteExamplePreview() {
-    AppThemeM2 {
+    AppThemeM3 {
         SiteExample()
     }
 }

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/plans/SiteCreationPlansFragment.kt

@@ -16,10 +16,10 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Button
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -45,7 +45,7 @@ import org.wordpress.android.R
 import org.wordpress.android.ui.WPWebViewActivity
 import org.wordpress.android.ui.compose.components.MainTopAppBar
 import org.wordpress.android.ui.compose.components.NavigationIcons
-import org.wordpress.android.ui.compose.theme.AppThemeM2
+import org.wordpress.android.ui.compose.theme.AppThemeM3
 import org.wordpress.android.ui.compose.utils.uiStringText
 import org.wordpress.android.ui.main.jetpack.migration.compose.state.LoadingState
 import org.wordpress.android.ui.sitecreation.SiteCreationActivity.Companion.ARG_STATE
@@ -62,7 +62,7 @@ class SiteCreationPlansFragment : Fragment(), SiteCreationPlansWebViewClientList
         savedInstanceState: Bundle?
     ): View = ComposeView(requireContext()).apply {
         setContent {
-            AppThemeM2 {
+            AppThemeM3 {
                 SiteCreationPlansPage(
                     navigationUp = requireActivity().onBackPressedDispatcher::onBackPressed
                 )
@@ -99,7 +99,7 @@ class SiteCreationPlansFragment : Fragment(), SiteCreationPlansWebViewClientList
     }
 
     @Composable
-    @SuppressLint("UnusedMaterialScaffoldPaddingParameter")
+    @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
     fun SiteCreationPlansPage(
         navigationUp: () -> Unit = { },
         viewModel: SiteCreationPlansViewModel = viewModel(),
@@ -140,12 +140,12 @@ class SiteCreationPlansFragment : Fragment(), SiteCreationPlansWebViewClientList
         ) {
             Text(
                 text = uiStringText(uiString = error.title),
-                style = MaterialTheme.typography.h5,
+                style = MaterialTheme.typography.headlineSmall,
                 textAlign = TextAlign.Center
             )
             Text(
                 text = uiStringText(uiString = error.description),
-                style = MaterialTheme.typography.body1,
+                style = MaterialTheme.typography.bodyLarge,
                 textAlign = TextAlign.Center,
                 modifier = Modifier.padding(top = 8.dp)
             )