Merge pull request #75 from Semper-Viventem/migrate-to-material-3

Migrate to material 3
Semper-Viventem · Dec 23, 2023 · 3c5da90 · 3c5da90
2 parents 95af8e6 + a67b2af
commit 3c5da90
Show file tree

Hide file tree

Showing 26 changed files with 1,055 additions and 793 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -24,7 +24,7 @@ android {
         minSdk = 29
         targetSdk = 34
         versionCode = (System.currentTimeMillis() / 1000).toInt()
-        versionName = "0.20.3-beta"
+        versionName = "0.21.0-beta"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -150,6 +150,7 @@ dependencies {
     implementation(libs.ktx)
     debugImplementation(libs.compose.tooling)
     implementation(libs.compose.tooling.preview)
+    implementation(libs.compose.material3)
 
     // room
     implementation(libs.room.runtime)

diff --git a/app/src/main/java/f/cking/software/TheApp.kt b/app/src/main/java/f/cking/software/TheApp.kt
@@ -1,6 +1,7 @@
 package f.cking.software
 
 import android.app.Application
+import com.google.android.material.color.DynamicColors
 import f.cking.software.data.DataModule
 import f.cking.software.domain.interactor.InteractorsModule
 import f.cking.software.domain.interactor.SaveFirstAppLaunchTimeInteractor
@@ -16,11 +17,16 @@ class TheApp : Application() {
     override fun onCreate() {
         super.onCreate()
         instance = this
+        applyDynamicColors()
         initDi()
         initTimber()
         saveFirstLaunchTime()
     }
 
+    private fun applyDynamicColors() {
+        DynamicColors.applyToActivitiesIfAvailable(this)
+    }
+
     private fun saveFirstLaunchTime() {
         getKoin().get<SaveFirstAppLaunchTimeInteractor>().execute()
     }

diff --git a/app/src/main/java/f/cking/software/ui/MainActivity.kt b/app/src/main/java/f/cking/software/ui/MainActivity.kt
@@ -1,25 +1,25 @@
 package f.cking.software.ui
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.SharedPreferences
 import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.statusBars
-import androidx.compose.foundation.layout.windowInsetsTopHeight
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Typography
-import androidx.compose.ui.Modifier
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.ColorScheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Typography
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.colorResource
 import androidx.lifecycle.ViewModel
@@ -67,43 +67,22 @@ class MainActivity : AppCompatActivity() {
 
         setContent {
             val focusManager = LocalFocusManager.current
+            val colors = themeColorScheme()
             MaterialTheme(
-                colors = MaterialTheme.colors.copy(
-                    primary = colorResource(id = R.color.primary),
-                    primaryVariant = colorResource(id = R.color.primary_variant),
-                    onPrimary = colorResource(id = R.color.on_primary),
-                    secondary = colorResource(id = R.color.secondary),
-                    secondaryVariant = colorResource(id = R.color.secondary_variant),
-                    onSecondary = colorResource(id = R.color.on_secondary),
-                    surface = colorResource(id = R.color.surface_color),
-                    onSurface = colorResource(id = R.color.on_surface),
-                ),
+                colorScheme = colors,
                 typography = Typography(
-                    body1 = MaterialTheme.typography.body1.copy(color = colorResource(id = R.color.on_surface)),
-                    body2 = MaterialTheme.typography.body2.copy(color = colorResource(id = R.color.on_surface)),
+                    bodyMedium = MaterialTheme.typography.bodyMedium.copy(color = colors.onSurface),
+                    bodyLarge = MaterialTheme.typography.bodyLarge.copy(color = colors.onSurface),
+                    bodySmall = MaterialTheme.typography.bodySmall.copy(color = colors.onSurface),
                 )
             ) {
                 val stack = viewModel.navigator.stack
                 if (stack.isEmpty()) {
                     finish()
                 } else {
                     focusManager.clearFocus(true)
-                    Column {
-                        Box(
-                            modifier = Modifier
-                                .windowInsetsTopHeight(WindowInsets.statusBars)
-                                .fillMaxWidth()
-                                .background(MaterialTheme.colors.primary)
-                        )
-                        Box(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .fillMaxHeight()
-                        ) {
-                            stack.forEach { screen ->
-                                screen()
-                            }
-                        }
+                    stack.forEach { screen ->
+                        screen()
                     }
                 }
             }
@@ -121,6 +100,7 @@ class MainActivity : AppCompatActivity() {
         intentHelper.handleActivityResult(requestCode, resultCode, data)
     }
 
+    @SuppressLint("MissingSuperCall")
     @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         router.navigate(BackCommand)
@@ -135,4 +115,84 @@ class MainActivity : AppCompatActivity() {
     private class MainActivityViewModel : ViewModel() {
         val navigator: Navigator = Navigator(root = ScreenNavigationCommands.OpenMainScreen)
     }
+
+    @Composable
+    private fun themeColorScheme(): ColorScheme {
+        val dynamicColorsAreSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+        val darkMode = isSystemInDarkTheme()
+        val colors = when {
+            dynamicColorsAreSupported && darkMode -> dynamicDarkColorScheme(this)
+            dynamicColorsAreSupported && !darkMode -> dynamicLightColorScheme(this)
+            darkMode -> darkColorScheme(
+                primary = colorResource(id = R.color.md_theme_dark_primary),
+                onPrimary = colorResource(id = R.color.md_theme_dark_onPrimary),
+                primaryContainer = colorResource(id = R.color.md_theme_dark_primaryContainer),
+                onPrimaryContainer = colorResource(id = R.color.md_theme_dark_onPrimaryContainer),
+                secondary = colorResource(id = R.color.md_theme_dark_secondary),
+                onSecondary = colorResource(id = R.color.md_theme_dark_onSecondary),
+                secondaryContainer = colorResource(id = R.color.md_theme_dark_secondaryContainer),
+                onSecondaryContainer = colorResource(id = R.color.md_theme_dark_onSecondaryContainer),
+                tertiary = colorResource(id = R.color.md_theme_dark_tertiary),
+                onTertiary = colorResource(id = R.color.md_theme_dark_onTertiary),
+                tertiaryContainer = colorResource(id = R.color.md_theme_dark_tertiaryContainer),
+                onTertiaryContainer = colorResource(id = R.color.md_theme_dark_onTertiaryContainer),
+                error = colorResource(id = R.color.md_theme_dark_error),
+                errorContainer = colorResource(id = R.color.md_theme_dark_errorContainer),
+                onError = colorResource(id = R.color.md_theme_dark_onError),
+                onErrorContainer = colorResource(id = R.color.md_theme_dark_onErrorContainer),
+                background = colorResource(id = R.color.md_theme_dark_background),
+                onBackground = colorResource(id = R.color.md_theme_dark_onBackground),
+                surface = colorResource(id = R.color.md_theme_dark_surface),
+                surfaceContainer = colorResource(id = R.color.md_theme_dark_surfaceContainer),
+                surfaceContainerHigh = colorResource(id = R.color.md_theme_dark_surfaceContainerHigh),
+                surfaceContainerHighest = colorResource(id = R.color.md_theme_dark_surfaceContainerHighest),
+                onSurface = colorResource(id = R.color.md_theme_dark_onSurface),
+                surfaceVariant = colorResource(id = R.color.md_theme_dark_surfaceVariant),
+                onSurfaceVariant = colorResource(id = R.color.md_theme_dark_onSurfaceVariant),
+                outline = colorResource(id = R.color.md_theme_dark_outline),
+                inverseOnSurface = colorResource(id = R.color.md_theme_dark_inverseOnSurface),
+                inverseSurface = colorResource(id = R.color.md_theme_dark_inverseSurface),
+                inversePrimary = colorResource(id = R.color.md_theme_dark_inversePrimary),
+                surfaceTint = colorResource(id = R.color.md_theme_dark_surfaceTint),
+                outlineVariant = colorResource(id = R.color.md_theme_dark_outlineVariant),
+                scrim = colorResource(id = R.color.md_theme_dark_scrim),
+            )
+            !darkMode -> lightColorScheme(
+                primary = colorResource(id = R.color.md_theme_light_primary),
+                onPrimary = colorResource(id = R.color.md_theme_light_onPrimary),
+                primaryContainer = colorResource(id = R.color.md_theme_light_primaryContainer),
+                onPrimaryContainer = colorResource(id = R.color.md_theme_light_onPrimaryContainer),
+                secondary = colorResource(id = R.color.md_theme_light_secondary),
+                onSecondary = colorResource(id = R.color.md_theme_light_onSecondary),
+                secondaryContainer = colorResource(id = R.color.md_theme_light_secondaryContainer),
+                onSecondaryContainer = colorResource(id = R.color.md_theme_light_onSecondaryContainer),
+                tertiary = colorResource(id = R.color.md_theme_light_tertiary),
+                onTertiary = colorResource(id = R.color.md_theme_light_onTertiary),
+                tertiaryContainer = colorResource(id = R.color.md_theme_light_tertiaryContainer),
+                onTertiaryContainer = colorResource(id = R.color.md_theme_light_onTertiaryContainer),
+                error = colorResource(id = R.color.md_theme_light_error),
+                errorContainer = colorResource(id = R.color.md_theme_light_errorContainer),
+                onError = colorResource(id = R.color.md_theme_light_onError),
+                onErrorContainer = colorResource(id = R.color.md_theme_light_onErrorContainer),
+                background = colorResource(id = R.color.md_theme_light_background),
+                onBackground = colorResource(id = R.color.md_theme_light_onBackground),
+                surface = colorResource(id = R.color.md_theme_light_surface),
+                surfaceContainer = colorResource(id = R.color.md_theme_light_surfaceContainer),
+                surfaceContainerHigh = colorResource(id = R.color.md_theme_light_surfaceContainerHigh),
+                surfaceContainerHighest = colorResource(id = R.color.md_theme_light_surfaceContainerHighest),
+                onSurface = colorResource(id = R.color.md_theme_light_onSurface),
+                surfaceVariant = colorResource(id = R.color.md_theme_light_surfaceVariant),
+                onSurfaceVariant = colorResource(id = R.color.md_theme_light_onSurfaceVariant),
+                outline = colorResource(id = R.color.md_theme_light_outline),
+                inverseOnSurface = colorResource(id = R.color.md_theme_light_inverseOnSurface),
+                inverseSurface = colorResource(id = R.color.md_theme_light_inverseSurface),
+                inversePrimary = colorResource(id = R.color.md_theme_light_inversePrimary),
+                surfaceTint = colorResource(id = R.color.md_theme_light_surfaceTint),
+                outlineVariant = colorResource(id = R.color.md_theme_light_outlineVariant),
+                scrim = colorResource(id = R.color.md_theme_light_scrim),
+            )
+            else -> throw IllegalStateException("This state is unreachable")
+        }
+        return colors
+    }
 }