Working deeplinks

rozPierog · Jun 10, 2022 · d9b2239 · d9b2239
1 parent 8532892
commit d9b2239
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 15 deletions.
diff --git a/app/src/main/java/com/omelan/cofi/MainActivity.kt b/app/src/main/java/com/omelan/cofi/MainActivity.kt
@@ -1,6 +1,7 @@
 package com.omelan.cofi
 
 import android.app.PictureInPictureParams
+import android.content.Intent
 import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
@@ -15,11 +16,8 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
 import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.getValue
+import androidx.compose.runtime.*
 import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.luminance
@@ -119,13 +117,11 @@ class MainActivity : MonetCompatActivity() {
     @Composable
     fun MainRecipeDetails(
         navController: NavController,
-        backStackEntry: NavBackStackEntry,
+        recipeId: Int,
         goBack: () -> Unit,
         windowSizeClass: WindowSizeClass,
         db: AppDatabase
     ) {
-        val recipeId = backStackEntry.arguments?.getInt("recipeId")
-            ?: throw IllegalStateException("No Recipe ID")
         RecipeDetails(
             recipeId = recipeId,
             onRecipeEnd = { recipe ->
@@ -238,7 +234,10 @@ class MainActivity : MonetCompatActivity() {
         }
         val systemUiController = rememberSystemUiController()
         val windowSizeClass = calculateWindowSizeClass(this)
-
+        val intent by mainActivityViewModel.intent.observeAsState()
+        LaunchedEffect(intent) {
+            navController.handleDeepLink(intent)
+        }
         CofiTheme(monet) {
             val darkIcons = MaterialTheme.colorScheme.background.luminance() > 0.5
             systemUiController.setStatusBarColor(
@@ -292,13 +291,9 @@ class MainActivity : MonetCompatActivity() {
                             }
                         ),
                     ) { backStackEntry ->
-                        MainRecipeDetails(
-                            navController,
-                            backStackEntry,
-                            goBack,
-                            windowSizeClass,
-                            db,
-                        )
+                        val recipeId = backStackEntry.arguments?.getInt("recipeId")
+                            ?: throw IllegalStateException("No Recipe ID")
+                        MainRecipeDetails(navController, recipeId, goBack, windowSizeClass, db)
                     }
                     composable(
                         "edit/{recipeId}",
@@ -335,6 +330,13 @@ class MainActivity : MonetCompatActivity() {
         }
     }
 
+    override fun onNewIntent(newIntent: Intent?) {
+        super.onNewIntent(intent)
+        if (newIntent != null) {
+            mainActivityViewModel.setIntent(newIntent)
+        }
+    }
+
     override fun onPictureInPictureModeChanged(
         isInPictureInPictureMode: Boolean,
         newConfig: Configuration

diff --git a/app/src/main/java/com/omelan/cofi/MainActivityViewModel.kt b/app/src/main/java/com/omelan/cofi/MainActivityViewModel.kt
@@ -1,5 +1,6 @@
 package com.omelan.cofi
 
+import android.content.Intent
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -11,11 +12,18 @@ class MainActivityViewModel : ViewModel() {
     private val _canGoToPiP = MutableLiveData(false)
     val canGoToPiP: LiveData<Boolean> = _canGoToPiP
 
+    private val _intent = MutableLiveData(Intent())
+    val intent: LiveData<Intent> = _intent
+
     fun setIsInPiP(newPiPState: Boolean) {
         _pipState.value = newPiPState
     }
 
     fun setCanGoToPiP(newCanGoToPiP: Boolean) {
         _canGoToPiP.value = newCanGoToPiP
     }
+
+    fun setIntent(newIntent: Intent) {
+        _intent.value = newIntent
+    }
 }