From 155fe0df07b6319110ade4c68198d62eaf1334a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 14:59:29 +0000 Subject: [PATCH 1/4] Bump androidx.compose.material3:material3 from 1.1.1 to 1.2.1 Bumps androidx.compose.material3:material3 from 1.1.1 to 1.2.1. --- updated-dependencies: - dependency-name: androidx.compose.material3:material3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ecaf7da776ba..f6aa632fb9d2 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,7 @@ ext { androidxViewpager2Version = '1.0.0' androidxWorkManagerVersion = "2.9.0" androidxWebkitVersion = '1.10.0' - androidxComposeMaterial3Version = '1.1.1' + androidxComposeMaterial3Version = '1.2.1' apacheCommonsTextVersion = '1.10.0' coilComposeVersion = '2.4.0' chrisbanesPhotoviewVersion = '2.3.0' From 0ed12c6c880a175a10511df1377ff609c6af0940 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Mon, 22 Jul 2024 16:08:26 -0400 Subject: [PATCH 2/4] Update deprecated material Divider, ArrowBack & SecondaryIndicator --- .../android/designsystem/DesignSystemColorsScreen.kt | 7 +++++-- .../android/designsystem/DesignSystemFontsScreen.kt | 3 ++- .../android/ui/compose/components/MainTopAppBar.kt | 3 ++- .../android/ui/sitemonitor/SiteMonitorParentActivity.kt | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemColorsScreen.kt b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemColorsScreen.kt index 1541bccd1d9b..6bedd20dd88a 100644 --- a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemColorsScreen.kt +++ b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemColorsScreen.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -64,7 +65,9 @@ fun DesignSystemColorsScreen( @OptIn(ExperimentalStdlibApi::class) @Composable fun ColorCard (colorName: String, color: Color) { - Row (modifier = Modifier.padding(10.dp, 3.dp).fillMaxWidth()) { + Row (modifier = Modifier + .padding(10.dp, 3.dp) + .fillMaxWidth()) { Column { Box( modifier = Modifier @@ -86,7 +89,7 @@ fun ColorCard (colorName: String, color: Color) { ) } } - Divider(modifier = Modifier.padding(start = 10.dp, end = 10.dp)) + HorizontalDivider(modifier = Modifier.padding(start = 10.dp, end = 10.dp)) } @Composable fun ColorCardList(colorOptions: List) { diff --git a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemFontsScreen.kt b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemFontsScreen.kt index aacdc40e3f56..b7407d665ab0 100644 --- a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemFontsScreen.kt +++ b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemFontsScreen.kt @@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -68,7 +69,7 @@ fun FontCard (text: String, font: TextStyle) { ) } } - Divider(modifier = Modifier.padding(start = 10.dp, end = 10.dp)) + HorizontalDivider(modifier = Modifier.padding(start = 10.dp, end = 10.dp)) } @Composable fun FontsTitle(title: String) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/compose/components/MainTopAppBar.kt b/WordPress/src/main/java/org/wordpress/android/ui/compose/components/MainTopAppBar.kt index efe28fa04419..38469dbe669b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/compose/components/MainTopAppBar.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/compose/components/MainTopAppBar.kt @@ -9,6 +9,7 @@ import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.Close import androidx.compose.runtime.Composable @@ -33,7 +34,7 @@ typealias NavigationIcon = @Composable () -> Unit object NavigationIcons { val BackIcon: NavigationIcon = { Icon( - Icons.Default.ArrowBack, + Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.navigate_up_desc), modifier = Modifier.graphicsLayer( scaleX = if (LocalLayoutDirection.current == LayoutDirection.Rtl) -1f else 1f, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitemonitor/SiteMonitorParentActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitemonitor/SiteMonitorParentActivity.kt index fa171c6ade04..93b008ac16a4 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitemonitor/SiteMonitorParentActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitemonitor/SiteMonitorParentActivity.kt @@ -186,7 +186,7 @@ class SiteMonitorParentActivity : AppCompatActivity(), SiteMonitorWebViewClient. contentColor = MaterialTheme.colors.onSurface, indicator = { tabPositions -> // Customizing the indicator color and style - TabRowDefaults.Indicator( + TabRowDefaults.SecondaryIndicator( Modifier.tabIndicatorOffset(tabPositions[tabIndex]), color = MaterialTheme.colors.onSurface, height = 2.0.dp From db0a1cadf1984f3ae02be52c921853ccc9830394 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Tue, 23 Jul 2024 06:37:10 -0400 Subject: [PATCH 3/4] Updated lint.xml with comments --- config/lint/lint.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/lint/lint.xml b/config/lint/lint.xml index 3985b167379f..ef455b41a278 100644 --- a/config/lint/lint.xml +++ b/config/lint/lint.xml @@ -69,4 +69,10 @@ + + + + + + From 32e676864b74f4ab710b3b019f0a71ab742b7f8d Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Tue, 23 Jul 2024 07:03:39 -0400 Subject: [PATCH 4/4] Resolved unused imports --- .../wordpress/android/designsystem/DesignSystemColorsScreen.kt | 1 - .../wordpress/android/designsystem/DesignSystemFontsScreen.kt | 1 - 2 files changed, 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemColorsScreen.kt b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemColorsScreen.kt index 6bedd20dd88a..8f6f11e5ca30 100644 --- a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemColorsScreen.kt +++ b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemColorsScreen.kt @@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Divider import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text diff --git a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemFontsScreen.kt b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemFontsScreen.kt index b7407d665ab0..d1f7f42d975a 100644 --- a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemFontsScreen.kt +++ b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemFontsScreen.kt @@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.defaultMinSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.material3.Divider import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text