Merge pull request #160 from joreilly/dependency_updates

dependency updates

Author: joreilly

composeApp/src/androidMain/kotlin/dev/johnoreilly/climatetrace/MainActivity.kt

@@ -12,6 +12,7 @@ import androidx.compose.runtime.Composable
 import cafe.adriel.voyager.navigator.Navigator
 import dev.johnoreilly.climatetrace.di.initKoin
 import dev.johnoreilly.climatetrace.ui.CountryListScreen
+import dev.johnoreilly.wordmaster.androidApp.theme.ClimateTraceTheme
 
 class MainActivity : ComponentActivity() {
 
@@ -22,7 +23,7 @@ class MainActivity : ComponentActivity() {
         initKoin(this)
 
         setContent {
-            MaterialTheme {
+            ClimateTraceTheme {
                 AndroidApp()
             }
         }

composeApp/src/androidMain/kotlin/dev/johnoreilly/climatetrace/theme/Color.kt

@@ -0,0 +1,11 @@
+package dev.johnoreilly.wordmaster.androidApp.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)

composeApp/src/androidMain/kotlin/dev/johnoreilly/climatetrace/theme/Theme.kt

@@ -0,0 +1,57 @@
+package dev.johnoreilly.wordmaster.androidApp.theme
+
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+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.LocalContext
+
+private val DarkColorScheme = darkColorScheme(
+    primary = Purple80,
+    secondary = PurpleGrey80,
+    tertiary = Pink80
+)
+
+private val LightColorScheme = lightColorScheme(
+    primary = Purple40,
+    secondary = PurpleGrey40,
+    tertiary = Pink40
+
+    /* Other default colors to override
+    background = Color(0xFFFFFBFE),
+    surface = Color(0xFFFFFBFE),
+    onPrimary = Color.White,
+    onSecondary = Color.White,
+    onTertiary = Color.White,
+    onBackground = Color(0xFF1C1B1F),
+    onSurface = Color(0xFF1C1B1F),
+    */
+)
+
+@Composable
+fun ClimateTraceTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    // Dynamic color is available on Android 12+
+    dynamicColor: Boolean = true,
+    content: @Composable () -> Unit
+) {
+    val colorScheme = when {
+        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+            val context = LocalContext.current
+            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+        }
+
+        darkTheme -> DarkColorScheme
+        else -> LightColorScheme
+    }
+
+    MaterialTheme(
+        colorScheme = colorScheme,
+        typography = Typography,
+        content = content
+    )
+}

composeApp/src/androidMain/kotlin/dev/johnoreilly/climatetrace/theme/Type.kt

@@ -0,0 +1,32 @@
+package dev.johnoreilly.wordmaster.androidApp.theme
+
+import androidx.compose.material3.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+// Set of Material typography styles to start with
+val Typography = Typography(
+    bodyLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+    )
+    /* Other default text styles to override
+    titleLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 22.sp,
+        lineHeight = 28.sp,
+        letterSpacing = 0.sp
+    ),
+    labelSmall = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Medium,
+        fontSize = 11.sp,
+        lineHeight = 16.sp,
+        letterSpacing = 0.5.sp
+    )
+    */
+)

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ ksp = "2.2.0-2.0.2"
 kotlinx-coroutines = "1.10.2"
 
 
-agp = "8.11.0"
+agp = "8.11.1"
 android-compileSdk = "36"
 android-minSdk = "24"
 android-targetSdk = "36"
@@ -19,11 +19,11 @@ koin-compose-multiplatform = "4.1.0"
 kmpNativeCoroutines = "1.0.0-ALPHA-45"
 kmpObservableViewModel = "1.0.0-BETA-12"
 kstore = "1.0.0"
-ktor = "3.2.1"
+ktor = "3.2.2"
 treemapChart = "0.1.3"
 voyager= "1.1.0-beta03"
 molecule =  "2.1.0"
-mcp = "0.5.0"
+mcp = "0.6.0"
 shadowPlugin = "8.1.1"