Merge pull request #17 from pseudoankit/fix-deeplink

Fix deeplink

Author: ankitk77

app/src/main/java/pseudoankit/droid/tasky/MainActivity.kt

@@ -29,7 +29,7 @@ import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.runBlocking
 import org.koin.android.ext.android.inject
 import pseudoankit.droid.core.deeplink.TaskyDeeplink
-import pseudoankit.droid.core.logger.TaskyLogger
+import pseudoankit.droid.core.logger.logInfo
 import pseudoankit.droid.coreui.deeplink.navigateViaDeepLink
 import pseudoankit.droid.coreui.util.extension.clearStack
 import pseudoankit.droid.navigation.navgraph.mainNavGraph
@@ -52,8 +52,6 @@ internal class MainActivity : ComponentActivity() {
         splashScreen.show()
         super.onCreate(savedInstanceState)
 
-        TaskyLogger.info("intent = $intent")
-
         window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         setContent {
@@ -109,7 +107,7 @@ internal class MainActivity : ComponentActivity() {
 
         val launcher = rememberPermissionState(permission = Manifest.permission.POST_NOTIFICATIONS)
 
-        TaskyLogger.info("Notification Permission Status", launcher.taskyStatus.name)
+        logInfo("Notification Permission Status", launcher.taskyStatus.name)
 
         LaunchedEffect(key1 = Unit) {
             launcher.launchPermissionRequest()
@@ -129,8 +127,4 @@ internal class MainActivity : ComponentActivity() {
             }
         }
     }
-
-    override fun onDestroy() {
-        super.onDestroy()
-    }
 }

core/core-ui/src/main/java/pseudoankit/droid/coreui/deeplink/DeepLinkReciever.kt

@@ -1,14 +1,16 @@
 package pseudoankit.droid.coreui.deeplink
 
+import android.net.Uri
 import androidx.navigation.NavController
-import pseudoankit.droid.core.deeplink.TaskyDeeplink
-import pseudoankit.droid.core.logger.TaskyLogger
+import pseudoankit.droid.core.logger.logError
 
-fun NavController.navigateViaDeepLink(deepLink: String) = try {
-    val internalRoute = TaskyDeeplink.mapToInternalRoute(deepLink)
-    navigate(internalRoute)
+fun NavController.navigateViaDeepLink(deepLink: String) {
+    navigateViaDeepLink(Uri.parse(deepLink))
+}
+
+fun NavController.navigateViaDeepLink(uri: Uri?) = try {
+    navigate(uri!!)
 } catch (e: IllegalArgumentException) {
     e.printStackTrace()
-    TaskyLogger.error("deeplink [$deepLink] failed with error msg = ${e.message}")
+    logError("deeplink [${uri}] failed with error msg ${e.message}")
 }
-

core/core-ui/src/main/java/pseudoankit/droid/coreui/util/extension/ContextExtension.kt

@@ -7,9 +7,14 @@ import android.content.Intent
 import android.net.Uri
 import android.provider.Settings
 import android.widget.Toast
+import pseudoankit.droid.core.deeplink.DeepLinkUtil
 import pseudoankit.droid.core.util.TextResource
 import pseudoankit.droid.core.util.TextResource.Companion.asString
 
+fun Context.openDeeplink(deeplink: String) {
+    startActivity(DeepLinkUtil.createDeeplinkIntent(deeplink))
+}
+
 fun Context.finish() {
     (this as? Activity)?.finish()
 }

core/core/src/main/java/pseudoankit/droid/core/coroutine/CoroutineUtil.kt

@@ -6,7 +6,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlin.coroutines.CoroutineContext
 
-fun launch(
+fun launchCoroutine(
     dispatcher: CoroutineContext = Dispatchers.IO,
     block: suspend CoroutineScope.() -> Unit
 ): Job {

core/core/src/main/java/pseudoankit/droid/core/deeplink/TaskyDeeplink.kt

@@ -5,37 +5,16 @@ package pseudoankit.droid.core.deeplink
  * Preferred way to create deeplink is via [pseudoankit.droid.navigation.deeplink.DeepLinkProvider]
  */
 object TaskyDeeplink {
-    private const val SCHEME = "tasky://"
-
-    private object Host {
-        const val login = "login"
-        const val home = "home"
-        const val reminder = "reminder"
-        const val agendaSelection = "agendaSelection"
-        const val widget = "widget"
-    }
-
     object Path {
         object Reminder {
-            const val ACTION = "{action}"
+            const val action = "{action}"
         }
     }
 
-    const val login = "${SCHEME}${Host.login}"
-    const val home = "${SCHEME}${Host.home}"
-    const val reminder = "${SCHEME}${Host.reminder}/${Path.Reminder.ACTION}"
-    const val agendaSelection = "${SCHEME}${Host.agendaSelection}"
-    const val fromWidget = "${SCHEME}${Host.widget}"
-
-    fun mapToInternalRoute(externalLink: String) = externalLink.run {
-        when {
-            contains(Host.home) -> "home_screen"
-            contains(Host.login) -> "login_screen"
-            contains(Host.reminder) -> {
-                replace(SCHEME + Host.reminder, "reminder_screen")
-            }
-            contains(Host.agendaSelection) -> "agenda_items_screen"
-            else -> ""
-        }
-    }
+    const val login = "tasky://login"
+    const val registration = "tasky://registration"
+    const val home = "tasky://home"
+    const val reminder = "tasky://reminder/${Path.Reminder.action}"
+    const val agendaSelection = "tasky://agendaSelection"
+    const val profile = "tasky://profile"
 }

core/core/src/main/java/pseudoankit/droid/core/logger/TaskyLogger.kt

@@ -14,3 +14,11 @@ object TaskyLogger {
         Log.e("$INTERNAL_TAG $tag", value.joinToString(", "))
     }
 }
+
+fun logInfo(vararg value: Any, tag: String = "") {
+    TaskyLogger.info(*value, tag)
+}
+
+fun logError(vararg value: Any, tag: String = "") {
+    TaskyLogger.error(*value, tag)
+}

core/core/src/main/java/pseudoankit/droid/core/util/extension/CollectionExtension.kt

@@ -4,7 +4,5 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 
 inline fun <T, R> Iterable<T>.mapToImmutableList(transform: (T) -> R): ImmutableList<R> {
-    return map {
-        transform(it)
-    }.toImmutableList()
+    return map(transform).toImmutableList()
 }

core/navigation/src/main/java/pseudoankit/droid/navigation/deeplink/DeepLinkProvider.kt

@@ -26,7 +26,7 @@ internal class DeepLinkProvider : ReminderDeepLinkProvider, HomeDeepLinkProvider
 
     override fun reminderScreenRoute(action: AgendaTypes.Action): String {
         return TaskyDeeplink.reminder.replace(
-            TaskyDeeplink.Path.Reminder.ACTION,
+            TaskyDeeplink.Path.Reminder.action,
             ActionNavTypeSerializer.toRouteString(action)
         )
     }

core/preferences-manager/src/main/java/pseudoankit/droid/preferencesmanager/BasePreference.kt

@@ -6,6 +6,7 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.emptyPreferences
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 
@@ -31,5 +32,6 @@ abstract class BasePreference(
             .map { prefs ->
                 prefs[key]
             }
+            .distinctUntilChanged()
     }
 }

feature/authentication/src/main/java/pseudoankit/droid/authentication/presentation/registration/RegistrationScreen.kt

@@ -10,6 +10,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
+import com.ramcosta.composedestinations.annotation.DeepLink
 import com.ramcosta.composedestinations.annotation.Destination
 import kotlinx.coroutines.flow.collectLatest
 import org.koin.androidx.compose.getViewModel
@@ -18,6 +19,7 @@ import pseudoankit.droid.authentication.di.RegistrationModule
 import pseudoankit.droid.authentication.navigator.AuthNavigator
 import pseudoankit.droid.authentication.presentation.registration.ui.RegistrationScreenComponents
 import pseudoankit.droid.authentication.presentation.registration.ui.RegistrationScreenComponents.RegistrationInputFields
+import pseudoankit.droid.core.deeplink.TaskyDeeplink
 import pseudoankit.droid.coreui.koin.load
 import pseudoankit.droid.coreui.util.extension.showToast
 import pseudoankit.droid.unify.component.button.UnifyButton
@@ -26,7 +28,11 @@ import pseudoankit.droid.unify.screen.UnifyScreen
 import pseudoankit.droid.unify.screen.UnifyScreenConfig
 import pseudoankit.droid.unify.token.UnifyDimens
 
-@Destination
+@Destination(
+    deepLinks = [
+        DeepLink(uriPattern = TaskyDeeplink.registration)
+    ]
+)
 @Composable
 internal fun RegistrationScreen(navigator: AuthNavigator) = RegistrationModule.load {
     val viewModel: RegistrationViewModel = getViewModel()