Finish m2 to m3 conversion (#21583)

wordpress-mobile · Jan 15, 2025 · 36f61cd · 36f61cd
2 parents e72074a + 11a5fd9
commit 36f61cd
Show file tree

Hide file tree

Showing 51 changed files with 277 additions and 965 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/barcodescanner/BarcodeScanner.kt b/WordPress/src/main/java/org/wordpress/android/ui/barcodescanner/BarcodeScanner.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.compose.LocalLifecycleOwner
-import org.wordpress.android.ui.compose.theme.AppThemeM2
+import org.wordpress.android.ui.compose.theme.AppThemeM3
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.camera.core.Preview as CameraPreview
 
@@ -99,7 +99,7 @@ class DummyCodeScanner : CodeScanner {
 @Preview(name = "Dark mode", uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Composable
 private fun BarcodeScannerScreenPreview() {
-    AppThemeM2 {
+    AppThemeM3 {
         BarcodeScanner(codeScanner = DummyCodeScanner(), onScannedResult = object : CodeScannerCallback {
             override fun run(status: CodeScannerStatus?) {
                 // no-ops

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/barcodescanner/BarcodeScanningFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/barcodescanner/BarcodeScanningFragment.kt
@@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResult
 import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
-import org.wordpress.android.ui.compose.theme.AppThemeM2
+import org.wordpress.android.ui.compose.theme.AppThemeM3
 import org.wordpress.android.util.WPPermissionUtils
 import javax.inject.Inject
 
@@ -38,7 +38,7 @@ class BarcodeScanningFragment : Fragment() {
     private fun observeCameraPermissionState(view: ComposeView) {
         viewModel.permissionState.observe(viewLifecycleOwner) { permissionState ->
             view.setContent {
-                AppThemeM2 {
+                AppThemeM3 {
                     BarcodeScannerScreen(
                         codeScanner = codeScanner,
                         permissionState = permissionState,

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/compose/components/ButtonsColumn.kt b/WordPress/src/main/java/org/wordpress/android/ui/compose/components/ButtonsColumn.kt
@@ -3,7 +3,7 @@ package org.wordpress.android.ui.compose.components
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.colorResource
@@ -18,9 +18,9 @@ fun ButtonsColumn(
     Column(
         modifier = modifier.padding(bottom = 10.dp)
     ) {
-        Divider(
-            color = colorResource(R.color.gray_10),
+        HorizontalDivider(
             thickness = 0.5.dp,
+            color = colorResource(R.color.gray_10)
         )
         content()
     }

diff --git a/...main/java/org/wordpress/android/ui/compose/components/ColumnWithFrostedGlassBackground.kt b/...main/java/org/wordpress/android/ui/compose/components/ColumnWithFrostedGlassBackground.kt
@@ -5,7 +5,7 @@ import android.os.Build.VERSION_CODES
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.material.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -43,9 +43,9 @@ fun ColumnWithTopGlassBorder(
     Column(
         modifier = Modifier.background(backgroundColor), horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Divider(
-            color = borderColor,
+        HorizontalDivider(
             thickness = borderThickness,
+            color = borderColor
         )
         content()
     }

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/compose/components/ContentAlphaProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/compose/components/ContentAlphaProvider.kt
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/compose/components/EmptyContent.kt b/WordPress/src/main/java/org/wordpress/android/ui/compose/components/EmptyContent.kt