fixes

Tiebe · May 7, 2023 · 2828d49 · 2828d49
1 parent c30df6c
commit 2828d49
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 32 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -46,6 +46,7 @@ dependencies {
     implementation(Compose.activity)
     implementation(Compose.runtime)
     implementation(Compose.ui)
+    implementation(Compose.material3)
     implementation(Compose.foundationLayout)
     implementation(Compose.material)
 

diff --git a/androidApp/src/main/java/nl/tiebe/otarium/androidApp/MainActivity.kt b/androidApp/src/main/java/nl/tiebe/otarium/androidApp/MainActivity.kt
@@ -1,13 +1,19 @@
 package nl.tiebe.otarium.androidApp
 
 import android.content.Context
+import android.content.res.Configuration
 import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
 import com.arkivanov.decompose.defaultComponentContext
 import nl.tiebe.otarium.RootView
+import nl.tiebe.otarium.ui.theme.DarkColorScheme
+import nl.tiebe.otarium.ui.theme.LightColorScheme
 import nl.tiebe.otarium.utils.refreshGradesBackground
 import nl.tiebe.otarium.utils.reloadTokensBackground
 import nl.tiebe.otarium.utils.ui.Android
@@ -35,8 +41,25 @@ class MainActivity : AppCompatActivity() {
 
         val rootComponentContext = defaultComponentContext()
 
+        val dynamicColor = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+        val darkMode = (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
+
+        val colorScheme =
+            when {
+                dynamicColor && darkMode -> {
+                    dynamicDarkColorScheme(Android.context)
+                }
+
+                dynamicColor && !darkMode -> {
+                    dynamicLightColorScheme(Android.context)
+                }
+
+                darkMode -> DarkColorScheme
+                else -> LightColorScheme
+            }
+
         setContent {
-            RootView(rootComponentContext)
+            RootView(rootComponentContext, colorScheme)
         }
     }
 

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -10,7 +10,7 @@ object Version {
     const val appcompat = "1.6.1"
     const val material = "1.4.0"
     const val compose = "1.4.0"
-    const val compose_android = "1.4.0"
+    const val compose_android = "1.4.3"
     const val compose_compiler = "1.4.0"
     const val ktor = "2.3.0"
     const val decompose = "2.0.0-compose-experimental-alpha-02"
@@ -30,6 +30,7 @@ object Compose {
     const val ui = "androidx.compose.ui:ui:${Version.compose_android}"
     const val foundationLayout = "androidx.compose.foundation:foundation-layout:${Version.compose_android}"
     const val material = "androidx.compose.material:material:${Version.compose_android}"
+    const val material3 = "androidx.compose.material3:material3:1.0.1"
 }
 
 

diff --git a/shared/src/androidMain/kotlin/nl/tiebe/otarium/RootViewAndroid.kt b/shared/src/androidMain/kotlin/nl/tiebe/otarium/RootViewAndroid.kt
@@ -1,32 +1,14 @@
 package nl.tiebe.otarium
 
-import android.os.Build
-import androidx.compose.material3.dynamicDarkColorScheme
-import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.ColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
 import com.arkivanov.decompose.DefaultComponentContext
-import nl.tiebe.otarium.ui.theme.DarkColorScheme
-import nl.tiebe.otarium.ui.theme.LightColorScheme
 
 @Composable
-fun RootView(rootComponentContext: DefaultComponentContext) {
+fun RootView(rootComponentContext: DefaultComponentContext, colorScheme: ColorScheme) {
     ProvideComponentContext(rootComponentContext) {
         setup()
 
-        val dynamicColor = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
-
-        val colorScheme = when {
-            dynamicColor && darkModeState.value -> {
-                dynamicDarkColorScheme(LocalContext.current)
-            }
-            dynamicColor && !darkModeState.value -> {
-                dynamicLightColorScheme(LocalContext.current)
-            }
-            darkModeState.value -> DarkColorScheme
-            else -> LightColorScheme
-        }
-
         Content(componentContext = rootComponentContext, colorScheme = colorScheme)
     }
 }
diff --git a/shared/src/commonMain/kotlin/nl/tiebe/otarium/Main.kt b/shared/src/commonMain/kotlin/nl/tiebe/otarium/Main.kt
@@ -2,12 +2,7 @@ package nl.tiebe.otarium
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
@@ -30,6 +25,7 @@ lateinit var darkModeState: MutableState<Boolean>
 val safeAreaState = mutableStateOf(PaddingValues())
 
 fun setup() {
+
     val oldVersion = settings.getInt("version", 1000)
 
     runVersionCheck(oldVersion)

diff --git a/shared/src/commonMain/kotlin/nl/tiebe/otarium/ui/home/HomeComponent.kt b/shared/src/commonMain/kotlin/nl/tiebe/otarium/ui/home/HomeComponent.kt
@@ -26,7 +26,7 @@ import nl.tiebe.otarium.utils.icons.bottombar.*
 interface HomeComponent {
     val dialog: Value<ChildSlot<MenuItem, MenuItemComponent>>
 
-    val visibleItems: List<MenuItem> get() = listOf(MenuItem.Timetable, MenuItem.Grades, MenuItem.Settings)
+    val visibleItems: List<MenuItem> get() = listOf(MenuItem.Timetable, MenuItem.Grades, MenuItem.Messages, MenuItem.Settings)
 
     @Parcelize
     sealed class MenuItem(val resourceId: StringResource, val icon: @Composable () -> Unit, val iconSelected: @Composable () -> Unit): Parcelable {
@@ -70,7 +70,8 @@ class DefaultHomeComponent(componentContext: ComponentContext, override val navi
 
     override val dialog: Value<ChildSlot<HomeComponent.MenuItem, MenuItemComponent>> = childSlot<HomeComponent.MenuItem, MenuItemComponent>(
         dialogNavigation,
-        "DefaultChildOverlay", { HomeComponent.MenuItem.Timetable },
+        "HomeComponentChildOverlay",
+        { HomeComponent.MenuItem.Timetable },
         persistent = true,
         handleBackButton = false
     ) { config, componentContext ->
@@ -113,6 +114,10 @@ class DefaultHomeComponent(componentContext: ComponentContext, override val navi
 
     private var clickCount: Pair<HomeComponent.MenuItem, Int> = HomeComponent.MenuItem.Timetable to 0
 
+    init {
+        println("init")
+    }
+
     override fun navigate(item: HomeComponent.MenuItem) {
         dialogNavigation.activate(item)
 

diff --git a/shared/src/commonMain/kotlin/nl/tiebe/otarium/ui/root/RootComponent.kt b/shared/src/commonMain/kotlin/nl/tiebe/otarium/ui/root/RootComponent.kt
@@ -51,13 +51,15 @@ class DefaultRootComponent(componentContext: ComponentContext): RootComponent, C
             }
         )
 
-    private fun homeComponent(componentContext: ComponentContext): HomeComponent =
-        DefaultHomeComponent(
+    private fun homeComponent(componentContext: ComponentContext): HomeComponent {
+        println("HomeComponent")
+        return DefaultHomeComponent(
             componentContext = componentContext,
             navigateRootComponent = { screen ->
                 currentScreen.value = screen
             }
         )
+    }
 
     private fun loginComponent(componentContext: ComponentContext): DefaultLoginComponent =
         DefaultLoginComponent(