Skip to content

Commit

Permalink
Merge pull request #21446 from wordpress-mobile/issue/prefs-privacy-m3
Browse files Browse the repository at this point in the history 
Issue/prefs privacy m3
  • Loading branch information
@nbradbury
nbradbury authored Nov 13, 2024
2 parents a81d9ef + 8b84c8d commit 7553850
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions ...ress/src/main/java/org/wordpress/android/ui/prefs/privacy/banner/PrivacyBannerFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
import org.wordpress.android.ui.WPBottomSheetDialogFragment
import org.wordpress.android.ui.compose.theme.AppThemeM2
import org.wordpress.android.ui.compose.theme.AppThemeM3
import org.wordpress.android.util.DisplayUtilsWrapper
import org.wordpress.android.util.extensions.fillScreen
import org.wordpress.android.viewmodel.main.WPMainActivityViewModel
Expand All @@ -34,7 +34,7 @@ class PrivacyBannerFragment : WPBottomSheetDialogFragment() {
): View {
return ComposeView(requireContext()).apply {
setContent {
AppThemeM2 {
AppThemeM3 {
PrivacyBannerScreen(viewModel)
}
}
Expand Down
42 changes: 21 additions & 21 deletions WordPress/src/main/java/org/wordpress/android/ui/prefs/privacy/banner/PrivacyBannerScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CornerSize
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.Button
import androidx.compose.material.ButtonDefaults
import androidx.compose.material.CircularProgressIndicator
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.material.contentColorFor
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
import androidx.compose.material3.contentColorFor
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
Expand All @@ -35,8 +36,7 @@ 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.buttons.WPSwitch
import org.wordpress.android.ui.compose.theme.AppThemeM2
import org.wordpress.android.ui.compose.theme.AppThemeM3

@Composable
fun PrivacyBannerScreen(viewModel: PrivacyBannerViewModel) {
Expand All @@ -57,7 +57,7 @@ fun PrivacyBannerScreen(
onSavePressed: () -> Unit,
onSettingsPressed: () -> Unit,
) {
Box(Modifier.background(MaterialTheme.colors.surface)) {
Box(Modifier.background(MaterialTheme.colorScheme.surface)) {
Column(
Modifier
.padding(vertical = 16.dp)
Expand All @@ -66,12 +66,12 @@ fun PrivacyBannerScreen(
Text(
text = stringResource(R.string.privacy_banner_title),
modifier = Modifier.padding(horizontal = 16.dp),
style = MaterialTheme.typography.h6
style = MaterialTheme.typography.titleLarge
)

Text(
modifier = Modifier.padding(top = 8.dp, start = 16.dp, end = 16.dp),
style = MaterialTheme.typography.body2,
style = MaterialTheme.typography.bodyMedium,
text = stringResource(R.string.privacy_banner_description)
)

Expand All @@ -87,7 +87,7 @@ fun PrivacyBannerScreen(
text = stringResource(R.string.privacy_banner_analytics),
)
Spacer(modifier = Modifier.weight(1f))
WPSwitch(
Switch(
modifier = Modifier.padding(end = 16.dp),
checked = state.analyticsSwitchEnabled,
onCheckedChange = { onSwitchChanged(it) },
Expand All @@ -99,7 +99,7 @@ fun PrivacyBannerScreen(
style = TextStyle(
lineHeight = 20.sp,
fontSize = 14.sp,
color = MaterialTheme.colors.onSurface.copy(
color = MaterialTheme.colorScheme.onSurface.copy(
alpha = 0.60f
),
),
Expand All @@ -115,7 +115,7 @@ fun PrivacyBannerScreen(
style = TextStyle(
lineHeight = 20.sp,
fontSize = 14.sp,
color = MaterialTheme.colors.error,
color = MaterialTheme.colorScheme.error,
),
text = stringResource(R.string.privacy_banner_error_save)
)
Expand All @@ -133,12 +133,12 @@ fun PrivacyBannerScreen(
.weight(1f)
.fillMaxHeight(),
colors = ButtonDefaults.buttonColors(
backgroundColor = MaterialTheme.colors.surface,
contentColor = contentColorFor(MaterialTheme.colors.surface)
containerColor = MaterialTheme.colorScheme.surface,
contentColor = contentColorFor(MaterialTheme.colorScheme.surface)
),
border = ButtonDefaults.outlinedBorder,
border = ButtonDefaults.outlinedButtonBorder(),
shape = MaterialTheme.shapes.small.copy(CornerSize(8.dp)),
elevation = ButtonDefaults.elevation(
elevation = ButtonDefaults.buttonElevation(
defaultElevation = 0.dp,
pressedElevation = 0.dp,
disabledElevation = 0.dp,
Expand All @@ -159,7 +159,7 @@ fun PrivacyBannerScreen(
colors = ButtonDefaults.buttonColors(
contentColor = Color.White,
),
elevation = ButtonDefaults.elevation(
elevation = ButtonDefaults.buttonElevation(
defaultElevation = 0.dp,
pressedElevation = 0.dp,
disabledElevation = 0.dp,
Expand Down Expand Up @@ -191,7 +191,7 @@ fun PrivacyBannerScreen(
@Preview(name = "Smaller screen", device = Devices.NEXUS_5)
@Composable
private fun PreviewPrivacyBanner() {
AppThemeM2 {
AppThemeM3 {
PrivacyBannerScreen(
state = PrivacyBannerViewModel.UiState(
analyticsSwitchEnabled = false,
Expand All @@ -206,7 +206,7 @@ private fun PreviewPrivacyBanner() {
@Preview(name = "With error")
@Composable
private fun PreviewError() {
AppThemeM2 {
AppThemeM3 {
PrivacyBannerScreen(
state = PrivacyBannerViewModel.UiState(
analyticsSwitchEnabled = false,
Expand Down

0 comments on commit 7553850

Please sign in to comment.