Merge pull request #41 from ImaginativeShohag/dev

Material3, Solution of PopBackStack
ImaginativeShohag · Jul 11, 2024 · a13b819 · a13b819
2 parents cfc7f17 + 9b189cb
commit a13b819
Show file tree

Hide file tree

Showing 197 changed files with 5,715 additions and 5,370 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/workflows/build-beta-upload-android.yml b/.github/workflows/build-beta-upload-android.yml
@@ -11,7 +11,7 @@ jobs:
     if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up ruby env
         uses: ruby/setup-ruby@v1
@@ -27,7 +27,7 @@ jobs:
 
       # Set up your GitHub Actions workflow with a specific version of Java
       - name: Setup Java JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
@@ -59,7 +59,7 @@ jobs:
           GOOGLE_PLAY_SERVICE_ACCOUNT_KEY: ${{ steps.service_account_json_file.outputs.filePath }}
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: assets
           path: |

diff --git a/.github/workflows/build-production-upload-android.yml b/.github/workflows/build-production-upload-android.yml
@@ -8,7 +8,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up ruby env
         uses: ruby/setup-ruby@v1
@@ -24,7 +24,7 @@ jobs:
 
       # Set up your GitHub Actions workflow with a specific version of Java
       - name: Setup Java JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
@@ -56,7 +56,7 @@ jobs:
           GOOGLE_PLAY_SERVICE_ACCOUNT_KEY: ${{ steps.service_account_json_file.outputs.filePath }}
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: assets
           path: |

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -59,7 +59,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize local properties
         env:
@@ -69,7 +69,7 @@ jobs:
 
       # Set up your GitHub Actions workflow with a specific version of Java
       - name: Setup Java JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17

diff --git a/.github/workflows/ktlint_with_reviewdog.yml b/.github/workflows/ktlint_with_reviewdog.yml
@@ -15,4 +15,5 @@ jobs:
         with:
           github_token: ${{ secrets.github_token }}
           reporter: github-pr-review
-          android: true
+          ktlint_version: 1.3.1
+          custom_rule_path: spotless/ktlint/ktlint-compose-0.4.5-all.jar
diff --git a/.gitignore b/.gitignore
@@ -100,4 +100,5 @@ lint/tmp/
 *.hprof
 
 # IntelliJ project icon
-!.idea/icon.svg
+!.idea/icon.svg
+!.idea/ktlint-plugin.xml
diff --git a/.idea/ktlint-plugin.xml b/.idea/ktlint-plugin.xml
diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ Feel free to request features or suggestions for improvements.
 - Hilt
 - Everywhere dark mode support
 - A lot of Ready to use compositions
+- Material 3
 - Gradle Kotlin DSL
 - CI/CD
     - ktlint
@@ -80,7 +81,7 @@ Feel free to request features or suggestions for improvements.
 
 - Migrate to Material 3
     - [x] CMS
-    - [ ] Full app
+    - [x] Full app
 - [ ] Add accompanist WebView
 - [ ] x, y, z translation simulation
 - [ ] Shadow manipulation with device gyroscope
@@ -98,6 +99,8 @@ Feel free to request features or suggestions for improvements.
 - [x] Check map example issue: on click freeze
 - [ ] New: File browser using MediaStore
 - [ ] Get sidebar from Emudi app (https://www.youtube.com/watch?v=HNSKJIQtb4c)
+- [ ] Update `popBackStack()`
+- [ ] Migrate ExoPlayer: https://developer.android.com/media/media3/exoplayer/migration-guide
 
 # Note
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -46,7 +46,7 @@ android {
         minSdk = BuildConfigConst.minSdk
         targetSdk = BuildConfigConst.targetSdk
         versionCode = (findProperty("android.injected.version.code") as? String)?.toIntOrNull() ?: 1
-        versionName = "6.0.0.${getCurrentDateAsYYMMDD()}" // Major.Minor.Patch.YYMMDD
+        versionName = "7.0.0.${getCurrentDateAsYYMMDD()}" // Major.Minor.Patch.YYMMDD
         vectorDrawables.useSupportLibrary = true
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -87,7 +87,7 @@ android {
 
         // Enable experimental compose APIs
         freeCompilerArgs =
-            freeCompilerArgs + "-opt-in=androidx.compose.material.ExperimentalMaterialApi"
+            freeCompilerArgs + "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
         freeCompilerArgs =
             freeCompilerArgs + "-opt-in=androidx.compose.animation.ExperimentalAnimationApi"
         freeCompilerArgs =
@@ -131,6 +131,7 @@ dependencies {
     implementation(project(":tictactoe"))
     implementation(project(":exoplayer"))
     implementation(project(":cms"))
+    implementation(project(":popbackstack"))
 
     implementation(Libs.Kotlin.stdlib)
     implementation(Libs.AndroidX.coreKtx)
@@ -163,7 +164,6 @@ dependencies {
     implementation(Libs.AndroidX.Compose.foundation)
     implementation(Libs.AndroidX.Compose.layout)
     // Material Design
-    implementation(Libs.AndroidX.Compose.material)
     implementation(Libs.AndroidX.Compose.material3)
     implementation(Libs.AndroidX.Compose.material3WindowSizeClass)
     // Material design icons

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -66,6 +66,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".popbackstack.PopBackStackActivity"
+            android:exported="true"
+            android:theme="@style/Theme.WhyNotCompose" />
+
         <activity
             android:name=".ui.screens.tutorial.deeplinks.DeepLinksActivity"
             android:exported="true"

diff --git a/app/src/main/java/org/imaginativeworld/whynotcompose/App.kt b/app/src/main/java/org/imaginativeworld/whynotcompose/App.kt
@@ -36,8 +36,9 @@ import org.imaginativeworld.whynotcompose.utils.onesignal.MyNotificationWillShow
 import timber.log.Timber
 
 @HiltAndroidApp
-class App : Application(), OnMapsSdkInitializedCallback {
-
+class App :
+    Application(),
+    OnMapsSdkInitializedCallback {
     override fun onCreate() {
         super.onCreate()
 

diff --git a/...iveworld/whynotcompose/models/ListItem.kt → ...rld/whynotcompose/models/ListItemModel.kt b/...iveworld/whynotcompose/models/ListItem.kt → ...rld/whynotcompose/models/ListItemModel.kt
@@ -26,7 +26,7 @@
 
 package org.imaginativeworld.whynotcompose.models
 
-data class ListItem(
+data class ListItemModel(
     val id: Int,
     val name: String,
     val image: String = "https://picsum.photos/seed/$id/128/128"

diff --git a/app/src/main/java/org/imaginativeworld/whynotcompose/repositories/MockData.kt b/app/src/main/java/org/imaginativeworld/whynotcompose/repositories/MockData.kt
@@ -29,7 +29,7 @@ package org.imaginativeworld.whynotcompose.repositories
 import org.imaginativeworld.whynotcompose.base.models.User
 import org.imaginativeworld.whynotcompose.base.models.github.GithubRepo
 import org.imaginativeworld.whynotcompose.base.models.github.Owner
-import org.imaginativeworld.whynotcompose.models.ListItem
+import org.imaginativeworld.whynotcompose.models.ListItemModel
 
 object MockData {
     val dummyUser = User(
@@ -38,20 +38,20 @@ object MockData {
     )
 
     val dummyListItem = listOf(
-        ListItem(id = 1, name = "Cupcake"),
-        ListItem(id = 2, name = "Donut"),
-        ListItem(id = 3, name = "Eclair"),
-        ListItem(id = 4, name = "Froyo"),
-        ListItem(id = 5, name = "Gingerbread"),
-        ListItem(id = 6, name = "Honeycomb"),
-        ListItem(id = 7, name = "Ice cream sandwich"),
-        ListItem(id = 8, name = "Jelly bean"),
-        ListItem(id = 9, name = "KitKat"),
-        ListItem(id = 10, name = "Lollipop"),
-        ListItem(id = 11, name = "Marshmallow"),
-        ListItem(id = 12, name = "Nougat"),
-        ListItem(id = 13, name = "Oreo"),
-        ListItem(id = 14, name = "Pie")
+        ListItemModel(id = 1, name = "Cupcake"),
+        ListItemModel(id = 2, name = "Donut"),
+        ListItemModel(id = 3, name = "Eclair"),
+        ListItemModel(id = 4, name = "Froyo"),
+        ListItemModel(id = 5, name = "Gingerbread"),
+        ListItemModel(id = 6, name = "Honeycomb"),
+        ListItemModel(id = 7, name = "Ice cream sandwich"),
+        ListItemModel(id = 8, name = "Jelly bean"),
+        ListItemModel(id = 9, name = "KitKat"),
+        ListItemModel(id = 10, name = "Lollipop"),
+        ListItemModel(id = 11, name = "Marshmallow"),
+        ListItemModel(id = 12, name = "Nougat"),
+        ListItemModel(id = 13, name = "Oreo"),
+        ListItemModel(id = 14, name = "Pie")
     )
 
     val dummyGithubRepo = GithubRepo(

diff --git a/app/src/main/java/org/imaginativeworld/whynotcompose/ui/compositions/Snackbar.kt b/app/src/main/java/org/imaginativeworld/whynotcompose/ui/compositions/Snackbar.kt
@@ -28,30 +28,31 @@ package org.imaginativeworld.whynotcompose.ui.compositions
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Snackbar
-import androidx.compose.material.SnackbarData
-import androidx.compose.material.SnackbarDefaults
-import androidx.compose.material.SnackbarHost
-import androidx.compose.material.SnackbarHostState
-import androidx.compose.material.Text
-import androidx.compose.material.TextButton
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Snackbar
+import androidx.compose.material3.SnackbarData
+import androidx.compose.material3.SnackbarDefaults
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
 @Composable
-fun CustomSnackbarHost(state: SnackbarHostState) {
-    SnackbarHost(state) { data ->
+fun CustomSnackbarHost(
+    state: SnackbarHostState,
+    modifier: Modifier = Modifier
+) {
+    SnackbarHost(state, modifier) { data ->
         CustomSnackbar(
-            modifier = Modifier,
             snackbarData = data,
-            backgroundColor = MaterialTheme.colors.onBackground
+            backgroundColor = MaterialTheme.colorScheme.onBackground
         )
     }
 }
@@ -65,12 +66,11 @@ fun CustomSnackbar(
     modifier: Modifier = Modifier,
     actionOnNewLine: Boolean = false,
     shape: Shape = MaterialTheme.shapes.small,
-    backgroundColor: Color = SnackbarDefaults.backgroundColor,
-    contentColor: Color = MaterialTheme.colors.surface,
-    actionColor: Color = SnackbarDefaults.primaryActionColor,
-    elevation: Dp = 6.dp
+    backgroundColor: Color = SnackbarDefaults.color,
+    contentColor: Color = MaterialTheme.colorScheme.surface,
+    actionColor: Color = SnackbarDefaults.actionColor
 ) {
-    val actionLabel = snackbarData.actionLabel
+    val actionLabel = snackbarData.visuals.actionLabel
     val actionComposable: (@Composable () -> Unit)? = if (actionLabel != null) {
         @Composable {
             TextButton(
@@ -87,15 +87,14 @@ fun CustomSnackbar(
         content = {
             Text(
                 modifier = Modifier.fillMaxWidth(),
-                text = snackbarData.message,
+                text = snackbarData.visuals.message,
                 textAlign = TextAlign.Center
             )
         },
         action = actionComposable,
         actionOnNewLine = actionOnNewLine,
         shape = shape,
-        backgroundColor = backgroundColor,
-        contentColor = contentColor,
-        elevation = elevation
+        containerColor = backgroundColor,
+        contentColor = contentColor
     )
 }
diff --git a/app/src/main/java/org/imaginativeworld/whynotcompose/ui/screens/MainScreen.kt b/app/src/main/java/org/imaginativeworld/whynotcompose/ui/screens/MainScreen.kt
@@ -27,7 +27,7 @@
 package org.imaginativeworld.whynotcompose.ui.screens
 
 import androidx.compose.foundation.background
-import androidx.compose.material.MaterialTheme
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
@@ -46,23 +46,24 @@ fun MainScreen(
 
 @Preview
 @Composable
-fun MainScreenSkeletonPreview() {
+private fun MainScreenSkeletonPreview() {
     AppTheme {
         MainScreenSkeleton(
             updateUiThemeMode = {}
         )
     }
 }
 
+@Suppress("ktlint:compose:modifier-missing-check")
 @Composable
 fun MainScreenSkeleton(
     updateUiThemeMode: (UIThemeMode) -> Unit
 ) {
     val navController = rememberNavController()
 
     NavHostMain(
-        Modifier.background(MaterialTheme.colors.background),
         navController = navController,
-        updateUiThemeMode = updateUiThemeMode
+        updateUiThemeMode = updateUiThemeMode,
+        Modifier.background(MaterialTheme.colorScheme.background)
     )
 }