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

Finish m2 to m3 conversion #21583

Merged
merged 36 commits into from
Jan 15, 2025
Merged
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
e6674f0
First pass at removing AppThemeM2
nbradbury Jan 14, 2025
a8a48b1
Second pass at removing AppThemeM2
nbradbury Jan 14, 2025
a56fc4b
Third pass at removing AppThemeM2
nbradbury Jan 14, 2025
11099d8
Fourth pass at removing AppThemeM2
nbradbury Jan 14, 2025
5a1c1b8
Replace PrimaryButton & SecondaryButton with M3
nbradbury Jan 14, 2025
0f23680
Removed M3 message, subtitle, and title
nbradbury Jan 14, 2025
9b772b9
Removed M2 empty content
nbradbury Jan 14, 2025
288ce9a
Updated to M3 divider
nbradbury Jan 14, 2025
be511c5
Use AppThemeM3 in login
nbradbury Jan 14, 2025
1289c77
Removed withBottomSheetElevation
nbradbury Jan 14, 2025
010bdef
Removed ContentAlphaProvider.kt
nbradbury Jan 14, 2025
8fe83f7
First pass at fixing MainTopAppBar
nbradbury Jan 14, 2025
b6a48dd
Fixed PostResolutionOverlay
nbradbury Jan 14, 2025
7d8fa99
Fixed EditJetpackSocialShareMessageActivity
nbradbury Jan 14, 2025
af7ef03
Renamed color palettes, changed lint warning to error
nbradbury Jan 14, 2025
a04427a
Removed unused WordPressColors.kt
nbradbury Jan 14, 2025
48f1a4b
Fixed JetpackColors.kt
nbradbury Jan 14, 2025
1449d4c
First pass at converting MainTopAppBar
nbradbury Jan 14, 2025
0ea305e
Fixed elevation in MainTopAppBar
nbradbury Jan 14, 2025
f74b5e2
Don't pass colors to MainTopAppBar unless necessary
nbradbury Jan 14, 2025
4c0a555
Fixed MainTopAppBar colors
nbradbury Jan 14, 2025
39fb43a
Fixed MainTopAppBar comment
nbradbury Jan 14, 2025
e46b860
Fixed PostResolutionOverlay
nbradbury Jan 14, 2025
5ff5cc3
Fixed PostSocialConnectionItem
nbradbury Jan 14, 2025
fc69557
Fixed PostSocialMessageItem
nbradbury Jan 14, 2025
c637b39
Fixed PostSocialSharesText
nbradbury Jan 14, 2025
1dfd3ab
Fixed PostSocialSharingItem & PrepublishingHomeSocialNoConnectionsItem
nbradbury Jan 14, 2025
c7fd1e8
Fixed PrepublishingSocialFragment
nbradbury Jan 14, 2025
e0bfb4d
Fixed PrepublishingSocialScreen
nbradbury Jan 14, 2025
f90a00b
First pass at fixing login composables
nbradbury Jan 14, 2025
2dd5ae1
Second pass at fixing login composables
nbradbury Jan 14, 2025
5cac354
Fixed TrainOfIcons and WPSwitch
nbradbury Jan 14, 2025
bed4b30
Fixed unused imports
nbradbury Jan 14, 2025
24761a1
Fixed formatting issues with PostResolutionOverlay
nbradbury Jan 15, 2025
f98b6ac
Restored Project_Default.xml
nbradbury Jan 15, 2025
11a5fd9
Merge branch 'trunk' into issue/finish-m2-to-m3-conversion
nbradbury Jan 15, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Replace PrimaryButton & SecondaryButton with M3
nbradbury committed Jan 14, 2025
commit 5a1c1b8cbc425eecf936e2121a851cf2d20f9b7f

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.wordpress.android.ui.compose.components.TrainOfIcons
import org.wordpress.android.ui.compose.components.TrainOfIconsModel
import org.wordpress.android.ui.compose.components.buttons.SecondaryButton
import org.wordpress.android.ui.compose.components.buttons.SecondaryButtonM3
import org.wordpress.android.ui.compose.theme.AppColor
import org.wordpress.android.ui.compose.theme.AppThemeM3Editor
import org.wordpress.android.ui.compose.unit.Margin
@@ -77,7 +77,7 @@ fun EditPostSettingsJetpackSocialNoConnections(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
) {
SecondaryButton(
SecondaryButtonM3(
text = connectProfilesButtonLabel,
onClick = onConnectProfilesCLick,
padding = PaddingValues(0.dp),
@@ -88,7 +88,7 @@ fun EditPostSettingsJetpackSocialNoConnections(

Spacer(Modifier.width(Margin.Medium.value))

SecondaryButton(
SecondaryButtonM3(
text = notNowButtonLabel,
onClick = onNotNowClick,
padding = PaddingValues(0.dp),
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import org.wordpress.android.ui.compose.components.TrainOfIconsModel
import org.wordpress.android.ui.compose.components.buttons.PrimaryButton
import org.wordpress.android.ui.compose.components.buttons.PrimaryButtonM3
import org.wordpress.android.ui.compose.theme.AppColor
import org.wordpress.android.ui.compose.theme.AppThemeM3Editor
import org.wordpress.android.ui.compose.unit.Margin
@@ -32,7 +32,7 @@ fun EditPostSettingsJetpackSocialSharesContainer(
horizontal = Margin.ExtraLarge.value,
)
)
PrimaryButton(
PrimaryButtonM3(
text = subscribeButtonLabel,
onClick = onSubscribeClick,
fillMaxWidth = false,
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ import androidx.compose.ui.unit.dp
import org.wordpress.android.R
import org.wordpress.android.ui.compose.components.TrainOfIcons
import org.wordpress.android.ui.compose.components.TrainOfIconsModel
import org.wordpress.android.ui.compose.components.buttons.SecondaryButton
import org.wordpress.android.ui.compose.components.buttons.SecondaryButtonM3
import org.wordpress.android.ui.compose.theme.AppColor
import org.wordpress.android.ui.compose.theme.AppThemeM3
import org.wordpress.android.ui.compose.unit.Margin
@@ -63,7 +63,7 @@ fun PrepublishingHomeSocialNoConnectionsItem(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
) {
SecondaryButton(
SecondaryButtonM3(
text = stringResource(R.string.prepublishing_nudges_social_new_connection_cta),
onClick = { onConnectClick(JetpackSocialFlow.PRE_PUBLISHING) },
padding = PaddingValues(0.dp),
@@ -75,7 +75,7 @@ fun PrepublishingHomeSocialNoConnectionsItem(
// min spacing between buttons
Spacer(Modifier.width(Margin.Medium.value))

SecondaryButton(
SecondaryButtonM3(
text = stringResource(R.string.button_not_now),
onClick = onDismissClick,
padding = PaddingValues(0.dp),
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import androidx.compose.material.Divider
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import org.wordpress.android.ui.compose.components.buttons.PrimaryButton
import org.wordpress.android.ui.compose.components.buttons.PrimaryButtonM3
import org.wordpress.android.ui.compose.unit.Margin
import org.wordpress.android.ui.posts.EditPostJetpackSocialConnectionsContainer
import org.wordpress.android.ui.posts.EditorJetpackSocialViewModel.JetpackSocialUiState
@@ -38,7 +38,7 @@ fun PrepublishingSocialScreen(
modifier = Modifier.padding(Margin.ExtraLarge.value),
)

PrimaryButton(
PrimaryButtonM3(
text = state.subscribeButtonLabel,
onClick = { state.onSubscribeClick(JetpackSocialFlow.PRE_PUBLISHING) },
padding = PaddingValues(horizontal = Margin.ExtraLarge.value)