From b1ba225fa65504abc8e0fa193c48e1661c5a7578 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Aug 2022 18:12:26 +0000 Subject: [PATCH 1/3] Bump compose-theme-adapter from 1.1.8 to 1.1.17 Bumps [compose-theme-adapter](https://github.com/material-components/material-components-android-compose-theme-adapter) from 1.1.8 to 1.1.17. - [Release notes](https://github.com/material-components/material-components-android-compose-theme-adapter/releases) - [Commits](https://github.com/material-components/material-components-android-compose-theme-adapter/compare/material-v1.1.8...material-v1.1.17) --- updated-dependencies: - dependency-name: com.google.android.material:compose-theme-adapter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 139903d750eb..723b4d28c5cd 100644 --- a/build.gradle +++ b/build.gradle @@ -107,7 +107,7 @@ ext { composeVersion = "1.1.1" composeAccompanistVersion = "0.23.1" lifecycleViewmodelComposeVersion = "2.4.1" - composeThemeAdapterVersion = "1.1.8" + composeThemeAdapterVersion = "1.1.17" // Testing jUnitVersion = '4.13.2' From 27d98f31607888d81ac1697aa173394d10a1a771 Mon Sep 17 00:00:00 2001 From: JorgeMucientes Date: Mon, 5 Sep 2022 12:58:37 +0200 Subject: [PATCH 2/3] Fix compose compile problems after updating MDC-adapter version --- .../android/ui/moremenu/MoreMenuScreen.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/moremenu/MoreMenuScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/moremenu/MoreMenuScreen.kt index df6802f94c69..ce035fde1090 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/moremenu/MoreMenuScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/moremenu/MoreMenuScreen.kt @@ -30,9 +30,9 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentHeight -import androidx.compose.foundation.lazy.GridCells.Fixed -import androidx.compose.foundation.lazy.LazyVerticalGrid -import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.itemsIndexed import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Button @@ -101,7 +101,7 @@ fun MoreMenuScreen( @Composable private fun MoreMenuItems(state: MoreMenuViewState) { LazyVerticalGrid( - cells = Fixed(2), + columns = GridCells.Fixed(2), contentPadding = PaddingValues( horizontal = dimensionResource(id = R.dimen.major_100), vertical = dimensionResource(id = R.dimen.major_100) @@ -310,7 +310,7 @@ fun MoreMenuBadge(badgeState: BadgeState?) { } AnimatedVisibility( visibleState = visible, - enter = BadgeEnterAnimation() + enter = badgeEnterAnimation() ) { val backgroundColor = colorResource(id = badgeState.backgroundColor) Text( @@ -330,7 +330,7 @@ fun MoreMenuBadge(badgeState: BadgeState?) { @OptIn(ExperimentalAnimationApi::class) @Composable -private fun BadgeEnterAnimation(): EnterTransition { +private fun badgeEnterAnimation(): EnterTransition { val animationSpec = TweenSpec(durationMillis = 400, delay = 200) return scaleIn(animationSpec = animationSpec) + fadeIn(animationSpec = animationSpec) } From 25751cafd68f36f981db3d25edace7e64eac168e Mon Sep 17 00:00:00 2001 From: jorgemucientesfayos Date: Mon, 9 Jan 2023 13:43:45 +0100 Subject: [PATCH 3/3] Revert accidental renaming --- .../com/woocommerce/android/ui/moremenu/MoreMenuScreen.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/moremenu/MoreMenuScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/moremenu/MoreMenuScreen.kt index ce035fde1090..03dab7759b35 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/moremenu/MoreMenuScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/moremenu/MoreMenuScreen.kt @@ -310,7 +310,7 @@ fun MoreMenuBadge(badgeState: BadgeState?) { } AnimatedVisibility( visibleState = visible, - enter = badgeEnterAnimation() + enter = BadgeEnterAnimation() ) { val backgroundColor = colorResource(id = badgeState.backgroundColor) Text( @@ -330,7 +330,7 @@ fun MoreMenuBadge(badgeState: BadgeState?) { @OptIn(ExperimentalAnimationApi::class) @Composable -private fun badgeEnterAnimation(): EnterTransition { +private fun BadgeEnterAnimation(): EnterTransition { val animationSpec = TweenSpec(durationMillis = 400, delay = 200) return scaleIn(animationSpec = animationSpec) + fadeIn(animationSpec = animationSpec) }