Jetsnack - Migrate to Material 3 (#1437)

Jetsnack sample is using Material 2 instead of Material 3, keeping most of the UI the same as previously. Material 3 is the preferred choice for Material. This pull request migrates to using M3, as well as fixes the filters screen selection to have a shared element transition to show and hide the dialog. https://github.com/user-attachments/assets/0121a41c-2aff-4bb0-abc3-d2075a8f2bd4 It also fixes build issues some machines were experiencing, where there is a mismatch in JVM versions by setting `jvmToolchain` version.
android · Aug 13, 2024 · 9996d5e · 9996d5e
2 parents d5c7da6 + 9ea3eba
commit 9996d5e
Show file tree

Hide file tree

Showing 67 changed files with 577 additions and 656 deletions.
diff --git a/.github/workflows/JetNews.yaml b/.github/workflows/JetNews.yaml
@@ -64,29 +64,10 @@ jobs:
             ~/.gradle/caches/jars-*
             ~/.gradle/caches/build-cache-*
           key: gradle-${{ hashFiles('checksum.txt') }}
-      - name: AVD cache
-        uses: actions/cache@v4
-        id: avd-cache
-        with:
-            path: |
-              ~/.android/avd/*
-              ~/.android/adb*
-            key: avd-${{ matrix.api-level }}
-      - name: create AVD and generate snapshot for caching
-        if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.api-level }}
-          force-avd-creation: false
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: false
-          script: echo "Generated AVD snapshot for caching."
       - name: Run instrumentation tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
-          force-avd-creation: false
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           arch: x86
           disable-animations: true
           script: ./gradlew connectedCheck --stacktrace

diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -40,26 +40,6 @@ jobs:
           draft: true
           prerelease: false
 
-      - name: Upload Crane
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: Crane/app/build/outputs/apk/debug/app-debug.apk
-          asset_name: crane-debug.apk
-          asset_content_type: application/vnd.android.package-archive          
-
-      - name: Upload Owl
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: Owl/app/build/outputs/apk/debug/app-debug.apk
-          asset_name: owl-debug.apk
-          asset_content_type: application/vnd.android.package-archive
-
       - name: Upload Jetcaster
         uses: actions/upload-release-asset@v1
         env:
@@ -99,13 +79,3 @@ jobs:
           asset_path: Jetsnack/app/build/outputs/apk/debug/app-debug.apk
           asset_name: jetsnack-debug.apk
           asset_content_type: application/vnd.android.package-archive
-
-      - name: Upload Jetsurvey
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: Jetsurvey/app/build/outputs/apk/debug/app-debug.apk
-          asset_name: jetsurvey-debug.apk
-          asset_content_type: application/vnd.android.package-archive
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
diff --git a/JetLagged/app/build.gradle.kts b/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)

diff --git a/JetLagged/app/src/main/res/values/themes.xml b/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>
diff --git a/JetLagged/gradle/libs.versions.toml b/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" }

diff --git a/JetNews/app/build.gradle.kts b/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)

diff --git a/JetNews/gradle/libs.versions.toml b/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" }

diff --git a/Jetcaster/core/data-testing/build.gradle.kts b/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)

diff --git a/Jetcaster/core/data/build.gradle.kts b/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)

diff --git a/Jetcaster/core/designsystem/build.gradle.kts b/Jetcaster/core/designsystem/build.gradle.kts
@@ -33,7 +33,9 @@ android {
     targetCompatibility = JavaVersion.VERSION_17
   }
 }
-
+kotlin {
+  jvmToolchain(17)
+}
 composeCompiler {
   enableStrongSkippingMode = true
 }

diff --git a/Jetcaster/core/domain-testing/build.gradle.kts b/Jetcaster/core/domain-testing/build.gradle.kts
@@ -29,7 +29,9 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 }
-
+kotlin {
+    jvmToolchain(17)
+}
 dependencies {
     implementation(projects.core.domain)
 

diff --git a/Jetcaster/core/domain/build.gradle.kts b/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)

diff --git a/Jetcaster/glancewidget/build.gradle.kts b/Jetcaster/glancewidget/build.gradle.kts
@@ -36,7 +36,9 @@ android {
         }
     }
 }
-
+kotlin {
+    jvmToolchain(17)
+}
 composeCompiler {
     enableStrongSkippingMode = true
 }

diff --git a/Jetcaster/gradle/libs.versions.toml b/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" }

diff --git a/Jetcaster/mobile/build.gradle.kts b/Jetcaster/mobile/build.gradle.kts
@@ -87,7 +87,9 @@ android {
         excludes += "/META-INF/LGPL2.1"
     }
 }
-
+kotlin {
+    jvmToolchain(17)
+}
 composeCompiler {
     enableStrongSkippingMode = true
 }

diff --git a/Jetcaster/tv/build.gradle.kts b/Jetcaster/tv/build.gradle.kts
@@ -81,7 +81,9 @@ android {
         }
     }
 }
-
+kotlin {
+    jvmToolchain(17)
+}
 composeCompiler {
     enableStrongSkippingMode = true
 }

diff --git a/Jetcaster/wear/build.gradle b/Jetcaster/wear/build.gradle
@@ -69,7 +69,9 @@ android {
         }
     }
 }
-
+kotlin {
+    jvmToolchain(17)
+}
 dependencies {
 
 

diff --git a/Jetchat/app/build.gradle.kts b/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)

diff --git a/Jetchat/app/src/main/res/values-v23/themes.xml b/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>

diff --git a/Jetchat/app/src/main/res/values-v27/themes.xml b/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>

diff --git a/Jetchat/app/src/main/res/values/themes.xml b/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>
 

diff --git a/Jetchat/gradle/libs.versions.toml b/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" }