Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump androidx.compose.material3:material3 from 1.1.1 to 1.2.1 #20427

Merged
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ 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
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -64,7 +64,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
Expand All @@ -86,7 +88,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<ColorOption>) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ 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
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -68,7 +68,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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ ext {
androidxSwipeToRefreshVersion = '1.1.0'
androidxViewpager2Version = '1.0.0'
androidxWorkManagerVersion = "2.9.0"
androidxComposeMaterial3Version = '1.2.1'
androidxWebkitVersion = '1.11.0'
androidxComposeMaterial3Version = '1.1.1'
apacheCommonsTextVersion = '1.10.0'
coilComposeVersion = '2.4.0'
chrisbanesPhotoviewVersion = '2.3.0'
Expand Down
6 changes: 6 additions & 0 deletions config/lint/lint.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,10 @@
<issue id="UnknownNullness" severity="informational">
<ignore path="**/generated/**" />
</issue>

<!-- TODO: https://github.com/wordpress-mobile/WordPress-Android/issues/21065 -->
<issue id="UsingMaterialAndMaterial3Libraries" severity="warning" />

<!-- TODO: remove this when we upgrade to AGP 8.5.0 -->
<issue id="ObsoleteLintCustomCheck" severity="warning" />
</lint>
Loading