refactor: remove dead code and move everything of extensions in one p…

…lace
FunkyMuse · Nov 20, 2023 · 63bd359 · 63bd359
1 parent c9573a1
commit 63bd359
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 88 deletions.
diff --git a/app/src/main/java/dev/funkymuse/fosho/sample/MainActivity.kt b/app/src/main/java/dev/funkymuse/fosho/sample/MainActivity.kt
@@ -33,8 +33,8 @@ import com.google.accompanist.navigation.material.rememberBottomSheetNavigator
 import dagger.hilt.android.AndroidEntryPoint
 import dev.funkymuse.fosho.navigator.android.GraphFactory
 import dev.funkymuse.fosho.navigator.android.LocalNavHostController
+import dev.funkymuse.fosho.navigator.android.NavHostControllerEvents
 import dev.funkymuse.fosho.navigator.android.addGraphs
-import dev.funkymuse.fosho.navigator.android.navigator.NavHostControllerEvents
 import dev.funkymuse.fosho.navigator.android.navigator.NavigatorDirections
 import dev.funkymuse.fosho.navigator.android.navigator.impl.Navigator
 import dev.funkymuse.fosho.navigator.android.wrapped.hideBottomNavigation

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,6 @@ plugins {
     alias(libs.plugins.kotlinAndroid).apply(false)
     alias(libs.plugins.ksp).apply(false)
     alias(libs.plugins.hilt).apply(false)
-    alias(libs.plugins.jetbrainsCompose).apply(false)
     alias(libs.plugins.kotlinJvm) apply false
     alias(libs.plugins.dokka)
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,5 @@
 [versions]
 #Jetbrains
-jetbrainsComposeCompiler = "1.5.10"
 kotlin-immutable-collections = "0.3.6"
 kotlin = "1.9.20"
 coroutines = "1.7.3"
@@ -43,7 +42,7 @@ app-build-kotlinJVMTarget = "17"
 app-version-groupId = "dev.funkymuse.fosho"
 app-version-appId = "dev.funkymuse.fosho.sample"
 app-version-versionCode = "1"
-app-version-versionName = "0.0.4"
+app-version-versionName = "0.0.5"
 
 
 [libraries]
@@ -140,7 +139,6 @@ hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
-jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "jetbrainsComposeCompiler" }
 kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 java-library = { id = "java-library" }
 convention-compose-app = { id = "convention.android.compose.app" }

diff --git a/navigator-android/src/main/java/dev/funkymuse/fosho/navigator/android/Extensions.kt b/navigator-android/src/main/java/dev/funkymuse/fosho/navigator/android/Extensions.kt
@@ -12,6 +12,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.util.Consumer
+import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
@@ -151,6 +152,21 @@ fun OnNewIntentListener(key: Any, onIntent: (intent: Intent) -> Unit) {
     }
 }
 
+@Composable
+fun ListenForIntentRedirections(
+    navController: NavHostController,
+    onListenForRedirections: (Intent?, NavBackStackEntry?) -> Unit
+) {
+    val activity = (LocalContext.current.getActivity() as ComponentActivity)
+    DisposableEffect(navController) {
+        val listener = Consumer<Intent> {
+            onListenForRedirections(it, navController.currentBackStackEntry)
+        }
+        activity.addOnNewIntentListener(listener)
+        onDispose { activity.removeOnNewIntentListener(listener) }
+    }
+}
+
 private fun Context.getActivity(): Activity {
     if (this is Activity) return this
     return if (this is ContextWrapper) baseContext.getActivity() else getActivity()

diff --git a/...roid/src/main/java/dev/funkymuse/fosho/navigator/android/navigator/NavigatorExtensions.kt b/...roid/src/main/java/dev/funkymuse/fosho/navigator/android/navigator/NavigatorExtensions.kt
diff --git a/navigator-codegen/build.gradle.kts b/navigator-codegen/build.gradle.kts
@@ -1,11 +1,9 @@
 plugins {
     id(libs.plugins.convention.kotlin.library.get().pluginId)
-    alias(libs.plugins.jetbrainsCompose)
 }
 
 dependencies {
     implementation(libs.ksp.symbol.processing.api)
     implementation(libs.squareup.kotlinpoet)
-    implementation(libs.compose.runtime)
     testImplementation(libs.bundles.processor.unit.tests)
 }