Jetsnack - Migrate to Material 3

JetLagged/app/build.gradle.kts

@@ -114,7 +114,6 @@ dependencies {
     implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.constraintlayout.compose)
-    implementation(libs.google.android.material)
 
     implementation(libs.androidx.compose.runtime)
     implementation(libs.androidx.compose.foundation)

JetLagged/app/src/main/res/values/themes.xml

@@ -13,5 +13,5 @@
   the License.
   -->
 <resources>
-    <style name="Theme.JetLagged" parent="Theme.MaterialComponents.DayNight"/>
+    <style name="Theme.JetLagged" parent="android:Theme.Material.Light.NoActionBar"/>
 </resources>

JetLagged/gradle/libs.versions.toml

@@ -48,7 +48,6 @@ kotlin = "2.0.0"
 kotlinx_immutable = "0.3.7"
 ksp = "2.0.0-1.0.21"
 maps-compose = "3.1.1"
-material = "1.11.0"
 # @keep
 minSdk = "21"
 okhttp = "4.11.0"
@@ -78,7 +77,6 @@ androidx-compose-animation = { module = "androidx.compose.animation:animation",
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation",  version.ref = "androidx-compose-latest"}
 androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" ,version.ref = "androidx-compose-latest"}
-androidx-compose-material = { module = "androidx.compose.material:material" }
 androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
 androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive", version.ref = "androidx-compose-material3-adaptive" }
@@ -138,7 +136,6 @@ androidx-window-core = { module = "androidx.window:window-core", version.ref = "
 coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 core-jdk-desugaring = { module = "com.android.tools:desugar_jdk_libs", version.ref = "jdkDesugar" }
 dagger-hiltandroidplugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
-google-android-material = { module = "com.google.android.material:material", version.ref = "material" }
 googlemaps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "maps-compose" }
 googlemaps-maps = { module = "com.google.android.gms:play-services-maps", version.ref = "google-maps" }
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }

JetNews/app/build.gradle.kts

@@ -141,8 +141,6 @@ dependencies {
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.window)
 
-    implementation(libs.google.android.material)
-
     androidTestImplementation(libs.junit)
     androidTestImplementation(libs.androidx.test.core)
     androidTestImplementation(libs.androidx.test.runner)

JetNews/gradle/libs.versions.toml

@@ -48,7 +48,6 @@ kotlin = "2.0.0"
 kotlinx_immutable = "0.3.7"
 ksp = "2.0.0-1.0.21"
 maps-compose = "3.1.1"
-material = "1.11.0"
 # @keep
 minSdk = "21"
 okhttp = "4.11.0"
@@ -78,7 +77,6 @@ androidx-compose-animation = { module = "androidx.compose.animation:animation",
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation",  version.ref = "androidx-compose-latest"}
 androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" ,version.ref = "androidx-compose-latest"}
-androidx-compose-material = { module = "androidx.compose.material:material" }
 androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
 androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive", version.ref = "androidx-compose-material3-adaptive" }
@@ -138,7 +136,6 @@ androidx-window-core = { module = "androidx.window:window-core", version.ref = "
 coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 core-jdk-desugaring = { module = "com.android.tools:desugar_jdk_libs", version.ref = "jdkDesugar" }
 dagger-hiltandroidplugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
-google-android-material = { module = "com.google.android.material:material", version.ref = "material" }
 googlemaps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "maps-compose" }
 googlemaps-maps = { module = "com.google.android.gms:play-services-maps", version.ref = "google-maps" }
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }

Jetcaster/core/data-testing/build.gradle.kts

@@ -29,7 +29,9 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 }
-
+kotlin {
+    jvmToolchain(17)
+}
 dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(projects.core.data)

Jetcaster/core/data/build.gradle.kts

@@ -32,7 +32,9 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 }
-
+kotlin {
+    jvmToolchain(17)
+}
 dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)

Jetcaster/core/designsystem/build.gradle.kts

@@ -33,7 +33,9 @@ android {
     targetCompatibility = JavaVersion.VERSION_17
   }
 }
-
+kotlin {
+  jvmToolchain(17)
+}
 composeCompiler {
   enableStrongSkippingMode = true
 }

Jetcaster/core/domain-testing/build.gradle.kts

@@ -29,7 +29,9 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 }
-
+kotlin {
+    jvmToolchain(17)
+}
 dependencies {
     implementation(projects.core.domain)
 

Jetcaster/core/domain/build.gradle.kts

@@ -31,7 +31,9 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 }
-
+kotlin {
+    jvmToolchain(17)
+}
 dependencies {
     coreLibraryDesugaring(libs.core.jdk.desugaring)
     implementation(projects.core.data)

Jetcaster/glancewidget/build.gradle.kts

@@ -36,7 +36,9 @@ android {
         }
     }
 }
-
+kotlin {
+    jvmToolchain(17)
+}
 composeCompiler {
     enableStrongSkippingMode = true
 }

Jetcaster/gradle/libs.versions.toml

@@ -48,7 +48,6 @@ kotlin = "2.0.0"
 kotlinx_immutable = "0.3.7"
 ksp = "2.0.0-1.0.21"
 maps-compose = "3.1.1"
-material = "1.11.0"
 # @keep
 minSdk = "21"
 okhttp = "4.11.0"
@@ -78,7 +77,6 @@ androidx-compose-animation = { module = "androidx.compose.animation:animation",
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation",  version.ref = "androidx-compose-latest"}
 androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" ,version.ref = "androidx-compose-latest"}
-androidx-compose-material = { module = "androidx.compose.material:material" }
 androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
 androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive", version.ref = "androidx-compose-material3-adaptive" }
@@ -138,7 +136,6 @@ androidx-window-core = { module = "androidx.window:window-core", version.ref = "
 coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 core-jdk-desugaring = { module = "com.android.tools:desugar_jdk_libs", version.ref = "jdkDesugar" }
 dagger-hiltandroidplugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
-google-android-material = { module = "com.google.android.material:material", version.ref = "material" }
 googlemaps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "maps-compose" }
 googlemaps-maps = { module = "com.google.android.gms:play-services-maps", version.ref = "google-maps" }
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }

Jetcaster/mobile/build.gradle.kts

@@ -87,7 +87,9 @@ android {
         excludes += "/META-INF/LGPL2.1"
     }
 }
-
+kotlin {
+    jvmToolchain(17)
+}
 composeCompiler {
     enableStrongSkippingMode = true
 }

Jetcaster/tv/build.gradle.kts

@@ -81,7 +81,9 @@ android {
         }
     }
 }
-
+kotlin {
+    jvmToolchain(17)
+}
 composeCompiler {
     enableStrongSkippingMode = true
 }

Jetcaster/wear/build.gradle

@@ -69,7 +69,9 @@ android {
         }
     }
 }
-
+kotlin {
+    jvmToolchain(17)
+}
 dependencies {
 
 

Jetchat/app/build.gradle.kts

@@ -82,7 +82,9 @@ android {
 composeCompiler {
     enableStrongSkippingMode = true
 }
-
+kotlin {
+    jvmToolchain(17)
+}
 dependencies {
     val composeBom = platform(libs.androidx.compose.bom)
     implementation(composeBom)
@@ -100,7 +102,6 @@ dependencies {
     implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.navigation.fragment)
     implementation(libs.androidx.navigation.ui.ktx)
-    implementation(libs.google.android.material)
 
     implementation(libs.androidx.compose.foundation.layout)
     implementation(libs.androidx.compose.material3)

Jetchat/app/src/main/res/values-v23/themes.xml

@@ -16,7 +16,7 @@
 
 <resources>
 
-    <style name="Platform.Theme.Jetchat" parent="Theme.Material3.DayNight">
+    <style name="Platform.Theme.Jetchat" parent="android:Theme.Material.Light.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
     </style>

Jetchat/app/src/main/res/values-v27/themes.xml

@@ -16,7 +16,7 @@
 
 <resources>
 
-    <style name="Platform.Theme.Jetchat" parent="Theme.Material3.DayNight">
+    <style name="Platform.Theme.Jetchat" parent="android:Theme.Material.Light.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>

Jetchat/app/src/main/res/values/themes.xml

@@ -18,7 +18,7 @@
 
     <!-- Allows us to override platform level specific attributes in their
          respective values-vXX folder. -->
-    <style name="Platform.Theme.Jetchat" parent="Theme.Material3.DayNight">
+    <style name="Platform.Theme.Jetchat" parent="android:Theme.Material.Light.NoActionBar">
         <item name="android:statusBarColor">@color/black30</item>
     </style>
 

Jetchat/gradle/libs.versions.toml

@@ -48,7 +48,6 @@ kotlin = "2.0.0"
 kotlinx_immutable = "0.3.7"
 ksp = "2.0.0-1.0.21"
 maps-compose = "3.1.1"
-material = "1.11.0"
 # @keep
 minSdk = "21"
 okhttp = "4.11.0"
@@ -78,7 +77,6 @@ androidx-compose-animation = { module = "androidx.compose.animation:animation",
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation",  version.ref = "androidx-compose-latest"}
 androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" ,version.ref = "androidx-compose-latest"}
-androidx-compose-material = { module = "androidx.compose.material:material" }
 androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
 androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive", version.ref = "androidx-compose-material3-adaptive" }
@@ -138,7 +136,6 @@ androidx-window-core = { module = "androidx.window:window-core", version.ref = "
 coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 core-jdk-desugaring = { module = "com.android.tools:desugar_jdk_libs", version.ref = "jdkDesugar" }
 dagger-hiltandroidplugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
-google-android-material = { module = "com.google.android.material:material", version.ref = "material" }
 googlemaps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "maps-compose" }
 googlemaps-maps = { module = "com.google.android.gms:play-services-maps", version.ref = "google-maps" }
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }

Jetsnack/app/build.gradle.kts

@@ -55,16 +55,20 @@ android {
         getByName("release") {
             isMinifyEnabled = true
             signingConfig = signingConfigs.getByName("release")
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
-                    "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
 
         create("benchmark") {
             initWith(getByName("release"))
             signingConfig = signingConfigs.getByName("release")
             matchingFallbacks.add("release")
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
-                    "proguard-benchmark-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-benchmark-rules.pro"
+            )
             isDebuggable = false
         }
     }
@@ -114,7 +118,7 @@ dependencies {
     implementation(libs.androidx.compose.foundation.layout)
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.ui.util)
-    implementation(libs.androidx.compose.material)
+    implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.animation)
     implementation(libs.androidx.compose.material.iconsExtended)
     implementation(libs.androidx.compose.ui.tooling.preview)

Jetsnack/app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   Copyright 2020 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -27,12 +26,14 @@
 
         >
 
-        <profileable android:shell="true" tools:targetApi="q" />
+        <profileable
+            android:shell="true"
+            tools:targetApi="q" />
 
         <activity
             android:name=".ui.MainActivity"
-            android:theme="@style/Theme.Jetsnack"
             android:exported="true"
+            android:theme="@style/Theme.Jetsnack"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

Jetsnack/app/src/main/java/com/example/jetsnack/model/Filter.kt

@@ -32,6 +32,7 @@ class Filter(
 ) {
     val enabled = mutableStateOf(enabled)
 }
+
 val filters = listOf(
     Filter(name = "Organic"),
     Filter(name = "Gluten-free"),

Jetsnack/app/src/main/java/com/example/jetsnack/ui/JetsnackApp.kt

@@ -28,9 +28,10 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
-import androidx.compose.material.SnackbarHost
+import androidx.compose.material3.SnackbarHost
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.compositionLocalOf
@@ -71,11 +72,12 @@ fun JetsnackApp() {
                 ) {
                     composableWithCompositionLocal(
                         route = MainDestinations.HOME_ROUTE
-                    ) {
+                    ) { backStackEntry ->
                         MainContainer(
                             onSnackSelected = jetsnackNavController::navigateToSnackDetail
                         )
                     }
+
                     composableWithCompositionLocal(
                         "${MainDestinations.SNACK_DETAIL_ROUTE}/" +
                             "{${MainDestinations.SNACK_ID_KEY}}" +
@@ -151,15 +153,17 @@ fun MainContainer(
                 snackbar = { snackbarData -> JetsnackSnackbar(snackbarData) }
             )
         },
-        scaffoldState = jetsnackScaffoldState.scaffoldState,
-    ) { paddingValues ->
+        snackBarHostState = jetsnackScaffoldState.snackBarHostState,
+    ) { padding ->
         NavHost(
             navController = nestedNavController.navController,
             startDestination = HomeSections.FEED.route
         ) {
             addHomeGraph(
                 onSnackSelected = onSnackSelected,
-                modifier = Modifier.padding(paddingValues)
+                modifier = Modifier
+                    .padding(padding)
+                    .consumeWindowInsets(padding)
             )
         }
     }

Jetsnack/app/src/main/java/com/example/jetsnack/ui/SnackSharedElementKey.kt

@@ -29,3 +29,5 @@ enum class SnackSharedElementType {
     Tagline,
     Background
 }
+
+object FilterSharedElementKey