From ced12643d0f300537115e99dc6fc6d9de6fa83d9 Mon Sep 17 00:00:00 2001 From: Arnau Mora Gras Date: Sun, 28 Apr 2024 10:56:32 +0200 Subject: [PATCH 1/2] Added M3 theme Signed-off-by: Arnau Mora --- .../at/bitfire/davdroid/ui/intro/IntroActivity.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/intro/IntroActivity.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/intro/IntroActivity.kt index f187c8d3d..633b93871 100644 --- a/app/src/main/kotlin/at/bitfire/davdroid/ui/intro/IntroActivity.kt +++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/intro/IntroActivity.kt @@ -26,8 +26,9 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.AndroidViewModel import at.bitfire.davdroid.log.Logger -import at.bitfire.davdroid.ui.M2Theme +import at.bitfire.davdroid.ui.AppTheme import at.bitfire.davdroid.ui.M2Colors +import at.bitfire.davdroid.ui.M2Theme import com.github.appintro.AppIntro2 import dagger.hilt.EntryPoint import dagger.hilt.InstallIn @@ -112,9 +113,12 @@ class IntroActivity : AppIntro2() { ComposeView(requireActivity()).apply { setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) setContent { + // TODO: Remove M2 theme once all pages have been migrated to M3 M2Theme { - Box(Modifier.padding(bottom = dimensionResource(com.github.appintro.R.dimen.appintro2_bottombar_height))) { - page.ComposePage() + AppTheme { + Box(Modifier.padding(bottom = dimensionResource(com.github.appintro.R.dimen.appintro2_bottombar_height))) { + page.ComposePage() + } } } } From de635ca6612c96bcf20526f941d254cabe0edba7 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Wed, 15 May 2024 15:59:24 +0200 Subject: [PATCH 2/2] Don't use M2 colors anymore --- .../at/bitfire/davdroid/ui/intro/IntroActivity.kt | 14 +++++--------- .../at/bitfire/davdroid/ui/intro/WelcomePage.kt | 6 ++---- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/intro/IntroActivity.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/intro/IntroActivity.kt index 97af7dd30..cc19cd9da 100644 --- a/app/src/main/kotlin/at/bitfire/davdroid/ui/intro/IntroActivity.kt +++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/intro/IntroActivity.kt @@ -25,8 +25,7 @@ import androidx.fragment.app.activityViewModels import androidx.lifecycle.ViewModel import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.ui.AppTheme -import at.bitfire.davdroid.ui.M2Colors -import at.bitfire.davdroid.ui.M2Theme +import at.bitfire.davdroid.ui.M3ColorScheme import com.github.appintro.AppIntro2 import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.lifecycle.HiltViewModel @@ -50,7 +49,7 @@ class IntroActivity : AppIntro2() { }) } - setBarColor(M2Colors.primaryDark.toArgb()) + setBarColor(M3ColorScheme.LightColors.primary.toArgb()) isSkipButtonEnabled = false onBackPressedDispatcher.addCallback(this) { @@ -89,12 +88,9 @@ class IntroActivity : AppIntro2() { ComposeView(requireActivity()).apply { setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) setContent { - // TODO: Remove M2 theme once all pages have been migrated to M3 - M2Theme { - AppTheme { - Box(Modifier.padding(bottom = dimensionResource(com.github.appintro.R.dimen.appintro2_bottombar_height))) { - page.ComposePage() - } + AppTheme { + Box(Modifier.padding(bottom = dimensionResource(com.github.appintro.R.dimen.appintro2_bottombar_height))) { + page.ComposePage() } } } diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/intro/WelcomePage.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/intro/WelcomePage.kt index 4282cd6d6..19820c87c 100644 --- a/app/src/main/kotlin/at/bitfire/davdroid/ui/intro/WelcomePage.kt +++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/intro/WelcomePage.kt @@ -4,7 +4,6 @@ package at.bitfire.davdroid.ui.intro -import android.app.Application import android.content.res.Configuration import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -31,7 +30,6 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import at.bitfire.davdroid.R -import at.bitfire.davdroid.ui.M2Colors.primaryDark class WelcomePage: IntroPage { @@ -55,7 +53,7 @@ class WelcomePage: IntroPage { Column( modifier = Modifier .fillMaxSize() - .background(color = primaryDark), + .background(color = MaterialTheme.colorScheme.primary), ) { Image( painter = painterResource(R.drawable.ic_launcher_foreground), @@ -108,7 +106,7 @@ class WelcomePage: IntroPage { Row( modifier = Modifier .fillMaxSize() - .background(color = primaryDark) + .background(color = MaterialTheme.colorScheme.primary) .padding( bottom = dimensionResource( com.github.appintro.R.dimen.appintro2_bottombar_height