Moved a bunch of things into the "android" package

isaac-udy · Sep 19, 2023 · a023420 · a023420
1 parent 8403beb
commit a023420
Show file tree

Hide file tree

Showing 45 changed files with 130 additions and 74 deletions.
diff --git a/...ion/activity/ActivityResultDestination.kt → ...enro/android/ActivityResultDestination.kt b/...ion/activity/ActivityResultDestination.kt → ...enro/android/ActivityResultDestination.kt
@@ -1,4 +1,4 @@
-package dev.enro.destination.activity
+package dev.enro.android
 
 import android.content.Context
 import android.content.Intent
@@ -13,7 +13,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
-import dev.enro.android.activity
 import dev.enro.core.*
 import dev.enro.destination.compose.OverrideNavigationAnimations
 import dev.enro.destination.compose.navigationHandle

diff --git a/.../core/controller/NavigationApplication.kt → ...dev/enro/android/NavigationApplication.kt b/.../core/controller/NavigationApplication.kt → ...dev/enro/android/NavigationApplication.kt
@@ -1,4 +1,6 @@
-package dev.enro.core.controller
+package dev.enro.android
+
+import dev.enro.core.controller.NavigationController
 
 public interface NavigationApplication {
     public val navigationController: NavigationController

diff --git a/...n/java/dev/enro/hilt/NavigationContext.kt → ...ev/enro/android/hilt/NavigationContext.kt b/...n/java/dev/enro/hilt/NavigationContext.kt → ...ev/enro/android/hilt/NavigationContext.kt
@@ -1,4 +1,4 @@
-package dev.enro.hilt
+package dev.enro.android.hilt
 
 import dagger.hilt.internal.GeneratedComponentManager
 import dagger.hilt.internal.GeneratedComponentManagerHolder

diff --git a/...enro/viewmodel/EnroViewModelExtensions.kt → ...roid/viewmodel/EnroViewModelExtensions.kt b/...enro/viewmodel/EnroViewModelExtensions.kt → ...roid/viewmodel/EnroViewModelExtensions.kt
@@ -1,4 +1,4 @@
-package dev.enro.viewmodel
+package dev.enro.android.viewmodel
 
 import androidx.activity.ComponentActivity
 import androidx.annotation.MainThread

diff --git a/...ev/enro/viewmodel/EnroViewModelFactory.kt → ...android/viewmodel/EnroViewModelFactory.kt b/...ev/enro/viewmodel/EnroViewModelFactory.kt → ...android/viewmodel/EnroViewModelFactory.kt
@@ -1,4 +1,4 @@
-package dev.enro.viewmodel
+package dev.enro.android.viewmodel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider

diff --git a/...ewmodel/EnroViewModelFactoryExtensions.kt → ...ewmodel/EnroViewModelFactoryExtensions.kt b/...ewmodel/EnroViewModelFactoryExtensions.kt → ...ewmodel/EnroViewModelFactoryExtensions.kt
@@ -1,4 +1,4 @@
-package dev.enro.viewmodel
+package dev.enro.android.viewmodel
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember

diff --git a/.../EnroViewModelNavigationHandleProvider.kt → .../EnroViewModelNavigationHandleProvider.kt b/.../EnroViewModelNavigationHandleProvider.kt → .../EnroViewModelNavigationHandleProvider.kt
@@ -1,4 +1,4 @@
-package dev.enro.viewmodel
+package dev.enro.android.viewmodel
 
 import androidx.annotation.Keep
 import dev.enro.core.EnroException

diff --git a/...roller/usecase/GetNavigationAnimations.kt → ...ation/internal/GetNavigationAnimations.kt b/...roller/usecase/GetNavigationAnimations.kt → ...ation/internal/GetNavigationAnimations.kt
@@ -1,4 +1,4 @@
-package dev.enro.core.controller.usecase
+package dev.enro.animation.internal
 
 import android.provider.Settings
 import dev.enro.animation.ClosingTransition

diff --git a/...pository/NavigationAnimationRepository.kt → ...internal/NavigationAnimationRepository.kt b/...pository/NavigationAnimationRepository.kt → ...internal/NavigationAnimationRepository.kt
@@ -1,4 +1,4 @@
-package dev.enro.core.controller.repository
+package dev.enro.animation.internal
 
 import dev.enro.animation.ClosingTransition
 import dev.enro.animation.NavigationAnimationOverride

diff --git a/enro-core/src/main/java/dev/enro/core/NavigationExecutor.kt b/enro-core/src/main/java/dev/enro/core/NavigationExecutor.kt
@@ -65,7 +65,7 @@ public class NavigationExecutorBuilder<FromContext : Any, OpensContext : Any, Ke
     public fun defaultOpened(args: ExecutorArgs<out FromContext, out OpensContext, out KeyType>) {
         when (args.binding) {
             is ActivityNavigationBinding ->
-                DefaultContainerExecutor::open as ((ExecutorArgs<out Any, out OpensContext, out NavigationKey>) -> Unit)
+                DefaultContainerExecutor::open
 
             is FragmentNavigationBinding ->
                 DefaultContainerExecutor::open
@@ -83,7 +83,7 @@ public class NavigationExecutorBuilder<FromContext : Any, OpensContext : Any, Ke
     @Suppress("UNCHECKED_CAST")
     public fun defaultClosed(context: NavigationContext<out OpensContext>) {
         when (context.contextReference) {
-            is Activity -> DefaultContainerExecutor::close as (NavigationContext<out OpensContext>) -> Unit
+            is Activity -> DefaultContainerExecutor::close
             is Fragment -> DefaultContainerExecutor::close
             is ComposableDestination -> DefaultContainerExecutor::close
             else -> throw IllegalArgumentException("No default close executor found for context ${context.contextReference::class.java.simpleName}")

diff --git a/enro-core/src/main/java/dev/enro/core/NavigationHandle.kt b/enro-core/src/main/java/dev/enro/core/NavigationHandle.kt
@@ -18,12 +18,14 @@ public interface NavigationHandle : LifecycleOwner {
     public val instruction: NavigationInstruction.Open<*>
     public val dependencyScope: EnroDependencyScope
     public fun executeInstruction(navigationInstruction: NavigationInstruction)
-}
 
-public interface TypedNavigationHandle<T : NavigationKey> : NavigationHandle {
-    override val key: T
+    public interface Typed<T : NavigationKey> : NavigationHandle {
+        override val key: T
+    }
 }
 
+public typealias TypedNavigationHandle<T> = NavigationHandle.Typed<T>
+
 @PublishedApi
 internal class TypedNavigationHandleImpl<T : NavigationKey>(
     internal val navigationHandle: NavigationHandle,

diff --git a/enro-core/src/main/java/dev/enro/core/container/NavigationContainer.kt b/enro-core/src/main/java/dev/enro/core/container/NavigationContainer.kt
@@ -29,10 +29,9 @@ import dev.enro.compatability.Compatibility
 import dev.enro.core.controller.get
 import dev.enro.core.controller.interceptor.builder.NavigationInterceptorBuilder
 import dev.enro.core.controller.usecase.CanInstructionBeHostedAs
-import dev.enro.core.controller.usecase.GetNavigationAnimations
+import dev.enro.animation.internal.GetNavigationAnimations
 import dev.enro.core.getNavigationHandle
 import dev.enro.core.parentContainer
-import dev.enro.destination.fragment.parentContainer
 import dev.enro.extensions.getParcelableListCompat
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay

diff --git a/enro-core/src/main/java/dev/enro/core/container/NavigationContainerScope.kt b/enro-core/src/main/java/dev/enro/core/container/NavigationContainerScope.kt
@@ -5,9 +5,8 @@ import dev.enro.core.controller.EnroDependencyContainer
 import dev.enro.core.controller.EnroDependencyScope
 import dev.enro.core.controller.get
 import dev.enro.core.controller.register
-import dev.enro.core.controller.usecase.GetNavigationAnimations
+import dev.enro.animation.internal.GetNavigationAnimations
 import dev.enro.core.parentContainer
-import dev.enro.destination.fragment.parentContainer
 
 internal class NavigationContainerScope(
     owner: NavigationContainer,

diff --git a/enro-core/src/main/java/dev/enro/core/controller/NavigationController.kt b/enro-core/src/main/java/dev/enro/core/controller/NavigationController.kt
@@ -2,7 +2,7 @@ package dev.enro.core.controller
 
 import android.app.Application
 import androidx.annotation.Keep
-import androidx.fragment.app.FragmentManager.FragmentLifecycleCallbacks
+import dev.enro.android.NavigationApplication
 import dev.enro.core.EnroException
 import dev.enro.core.NavigationBinding
 import dev.enro.core.NavigationExecutor

diff --git a/enro-core/src/main/java/dev/enro/core/controller/NavigationControllerScope.kt b/enro-core/src/main/java/dev/enro/core/controller/NavigationControllerScope.kt
@@ -1,7 +1,7 @@
 package dev.enro.core.controller
 
-import android.app.Application
-import androidx.fragment.app.FragmentManager
+import dev.enro.animation.internal.GetNavigationAnimations
+import dev.enro.animation.internal.NavigationAnimationRepository
 import dev.enro.destination.activity.internal.ActivityLifecycleCallbacksForEnro
 import dev.enro.destination.fragment.internal.FragmentLifecycleCallbacksForEnro
 import dev.enro.core.controller.repository.*
@@ -48,8 +48,8 @@ internal class NavigationControllerScope(
             register { GetNavigationAnimations(get(), get<NavigationAnimationRepository>().controllerOverrides) }
 
             // Other
-            register<ActivityLifecycleCallbacksForEnro> { ActivityLifecycleCallbacksForEnro(get(), get()) }
-            register<FragmentLifecycleCallbacksForEnro> { FragmentLifecycleCallbacksForEnro(get(), get()) }
+            register { ActivityLifecycleCallbacksForEnro(get(), get()) }
+            register { FragmentLifecycleCallbacksForEnro(get(), get()) }
         }
     )
 }
diff --git a/enro-core/src/main/java/dev/enro/core/controller/createNavigationController.kt b/enro-core/src/main/java/dev/enro/core/controller/createNavigationController.kt
@@ -2,6 +2,7 @@ package dev.enro.core.controller
 
 import android.app.Application
 import androidx.annotation.Keep
+import dev.enro.android.NavigationApplication
 
 /**
  * Create a NavigationController from the NavigationControllerDefinition/DSL, and immediately attach it

diff --git a/enro-core/src/main/java/dev/enro/core/controller/defaultNavigationModule.kt b/enro-core/src/main/java/dev/enro/core/controller/defaultNavigationModule.kt
@@ -1,7 +1,7 @@
 package dev.enro.core.controller
 
-import dev.enro.destination.activity.ActivityResultBridge
-import dev.enro.destination.activity.ActivityResultDestination
+import dev.enro.android.ActivityResultBridge
+import dev.enro.android.ActivityResultDestination
 import dev.enro.destination.compose.composableDestination
 import dev.enro.core.controller.interceptor.HiltInstructionInterceptor
 import dev.enro.core.controller.interceptor.InstructionOpenedByInterceptor

diff --git a/enro-core/src/main/java/dev/enro/core/controller/generatedNavigationModule.kt b/enro-core/src/main/java/dev/enro/core/controller/generatedNavigationModule.kt
@@ -1,5 +1,7 @@
 package dev.enro.core.controller
 
+import dev.enro.android.NavigationApplication
+
 
 @Suppress("UNCHECKED_CAST")
 internal fun NavigationApplication.loadGeneratedNavigationModule(): NavigationModule  {

diff --git a/enro-core/src/main/java/dev/enro/core/controller/usecase/AddModuleToController.kt b/enro-core/src/main/java/dev/enro/core/controller/usecase/AddModuleToController.kt
@@ -1,5 +1,6 @@
 package dev.enro.core.controller.usecase
 
+import dev.enro.animation.internal.NavigationAnimationRepository
 import dev.enro.core.controller.NavigationModule
 import dev.enro.core.controller.repository.*
 

diff --git a/enro-core/src/main/java/dev/enro/core/hosts/NavigationHostFactories.kt b/enro-core/src/main/java/dev/enro/core/hosts/NavigationHostFactories.kt
@@ -9,8 +9,8 @@ import dev.enro.destination.activity.ActivityNavigationBinding
 import dev.enro.destination.compose.ComposableNavigationBinding
 import dev.enro.core.container.asPresentInstruction
 import dev.enro.destination.fragment.FragmentNavigationBinding
-import dev.enro.hilt.isHiltApplication
-import dev.enro.hilt.isHiltContext
+import dev.enro.android.hilt.isHiltApplication
+import dev.enro.android.hilt.isHiltContext
 
 internal class ActivityHost : NavigationHostFactory<Activity>(Activity::class.java) {
     override fun supports(

diff --git a/enro-core/src/main/java/dev/enro/core/result/NavigationResultExtensions.kt b/enro-core/src/main/java/dev/enro/core/result/NavigationResultExtensions.kt
@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import dev.enro.core.*
 import dev.enro.core.controller.usecase.createResultChannel
 import dev.enro.core.result.internal.LazyResultChannelProperty
-import dev.enro.viewmodel.getNavigationHandle
+import dev.enro.android.viewmodel.getNavigationHandle
 import kotlin.properties.ReadOnlyProperty
 import kotlin.reflect.KClass
 import dev.enro.core.closeWithResult as nonDeprecatedCloseWithResult

diff --git a/enro-core/src/main/java/dev/enro/core/result/flows/FlowResultChannel.kt b/enro-core/src/main/java/dev/enro/core/result/flows/FlowResultChannel.kt
@@ -10,7 +10,7 @@ import dev.enro.core.result.NavigationResultChannel
 import dev.enro.core.result.internal.ResultChannelImpl
 import dev.enro.core.result.registerForNavigationResultWithKey
 import dev.enro.extensions.getParcelableListCompat
-import dev.enro.viewmodel.getNavigationHandle
+import dev.enro.android.viewmodel.getNavigationHandle
 import kotlin.properties.PropertyDelegateProvider
 import kotlin.properties.ReadOnlyProperty
 

diff --git a/enro-core/src/main/java/dev/enro/destination/compose/ProvideViewModelFactory.kt b/enro-core/src/main/java/dev/enro/destination/compose/ProvideViewModelFactory.kt
@@ -9,7 +9,7 @@ import androidx.lifecycle.ViewModelStore
 import androidx.lifecycle.ViewModelStoreOwner
 import androidx.lifecycle.viewmodel.CreationExtras
 import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
-import dev.enro.viewmodel.withNavigationHandle
+import dev.enro.android.viewmodel.withNavigationHandle
 
 @Composable
 public fun ProvideViewModelFactory(

diff --git a/...core/src/main/java/dev/enro/destination/compose/destination/ComposableDestinationOwner.kt b/...core/src/main/java/dev/enro/destination/compose/destination/ComposableDestinationOwner.kt
@@ -21,8 +21,6 @@ import androidx.savedstate.SavedStateRegistry
 import androidx.savedstate.SavedStateRegistryOwner
 import dev.enro.animation.NavigationAnimation
 import dev.enro.core.*
-import dev.enro.destination.compose.ComposableDestination
-import dev.enro.destination.compose.LocalNavigationHandle
 import dev.enro.destination.compose.dialog.*
 import dev.enro.core.container.NavigationContainer
 import dev.enro.core.container.getAnimationsForEntering
@@ -31,6 +29,8 @@ import dev.enro.core.controller.usecase.ComposeEnvironment
 import dev.enro.core.controller.usecase.OnNavigationContextCreated
 import dev.enro.core.controller.usecase.OnNavigationContextSaved
 import dev.enro.android.activity
+import dev.enro.destination.compose.ComposableDestination
+import dev.enro.destination.compose.LocalNavigationHandle
 import dev.enro.extensions.rememberLifecycleState
 
 internal class ComposableDestinationOwner(

diff --git a/...java/dev/enro/destination/compose/destination/ComposableDestinationViewModelStoreOwner.kt b/...java/dev/enro/destination/compose/destination/ComposableDestinationViewModelStoreOwner.kt
@@ -9,7 +9,7 @@ import dagger.hilt.internal.GeneratedComponentManagerHolder
 import dev.enro.core.addOpenInstruction
 import dev.enro.core.controller.application
 import dev.enro.core.getNavigationHandle
-import dev.enro.viewmodel.withNavigationHandle
+import dev.enro.android.viewmodel.withNavigationHandle
 
 internal class ComposableDestinationViewModelStoreOwner(
     private val owner: ComposableDestinationOwner,

diff --git a/enro-core/src/test/java/dev/enro/ProjectArchitecture.kt b/enro-core/src/test/java/dev/enro/ProjectArchitecture.kt
@@ -37,15 +37,26 @@ internal class ProjectArchitecture {
         val allowedDependencies = listOf(
             "" to "dev.enro.core",
             "" to "dev.enro.annotation",
+            "" to "dev.enro.extensions",
+
+            "dev.enro.compatability" to "",
+            "" to "dev.enro.compatability",
+
             "dev.enro.destination" to "dev.enro.animation",
+
+            // Should be removed
+            "dev.enro.core.hosts" to "",
+
+            "dev.enro.core.container" to "dev.enro.animation",
+
             // Destinations are allowed to access Android specific functionality,
             // and the Android specific functionality is allowed to access the destinations
             "dev.enro.destination" to "dev.enro.android",
             "dev.enro.android" to "dev.enro.destination",
         )
         ArchRuleDefinition.classes()
             .that()
-            .resideInAPackage("dev.enro.destination.activity")
+            .resideInAPackage("dev.enro..")
             .should(NotDependOnOtherPackageGroups(allowedDependencies))
             .check(classes)
     }
@@ -69,7 +80,7 @@ internal object NotDependOnInternalClasses : ArchCondition<JavaClass>("not depen
 
 internal class NotDependOnOtherPackageGroups(
     private val allowedDependencies: List<Pair<String, String>>
-) : ArchCondition<JavaClass>("not depend on internal classes") {
+) : ArchCondition<JavaClass>("not depend on other package groups") {
     override fun check(item: JavaClass, events: ConditionEvents) {
         item.directDependenciesFromSelf
             .forEach { dependency ->
@@ -80,9 +91,12 @@ internal class NotDependOnOtherPackageGroups(
                 val targetPackage = dependency.targetClass.packageName
                 if (!targetPackage.startsWith("dev.enro")) return@forEach
 
+                if (originPackage.startsWith(targetPackage)) return@forEach
+                val commonPrefix = originPackage.commonPrefixWith(targetPackage)
+                if (commonPrefix.count { it == '.' } >= 3) return@forEach
+
                 val isAllowed = allowedDependencies.any {
-                    originPackage.startsWith(it.first) &&
-                            targetPackage.startsWith(it.second)
+                    (originPackage.startsWith(it.first) && targetPackage.startsWith(it.second))
                 }
                 if (isAllowed) return@forEach
 

diff --git a/enro-processor/src/main/java/dev/enro/processor/domain/DestinationReference.kt b/enro-processor/src/main/java/dev/enro/processor/domain/DestinationReference.kt
@@ -33,10 +33,10 @@ sealed class DestinationReference {
             .any { it.declaration.qualifiedName?.asString() == "androidx.fragment.app.Fragment" }
 
         val isSyntheticClass = declaration is KSClassDeclaration && declaration.getAllSuperTypes()
-            .any { it.declaration.qualifiedName?.asString() == "dev.enro.core.synthetic.SyntheticDestination" }
+            .any { it.declaration.qualifiedName?.asString() == "dev.enro.destination.synthetic.SyntheticDestination" }
 
         val isSyntheticProvider = declaration is KSPropertyDeclaration &&
-                declaration.type.resolve().declaration.qualifiedName?.asString() == "dev.enro.core.synthetic.SyntheticDestinationProvider"
+                declaration.type.resolve().declaration.qualifiedName?.asString() == "dev.enro.destination.synthetic.SyntheticDestinationProvider"
 
         val isComposable = declaration is KSFunctionDeclaration && declaration.annotations
             .any { it.shortName.asString() == "Composable" }
@@ -76,7 +76,7 @@ sealed class DestinationReference {
                 .firstOrNull { actualName == it.simpleName.toString() && it != element }
 
             val syntheticProviderMirror = processingEnv.elementUtils
-                .getTypeElement("dev.enro.core.synthetic.SyntheticDestinationProvider")
+                .getTypeElement("dev.enro.destination.synthetic.SyntheticDestinationProvider")
                 .asType()
             val erasedSyntheticProvider = processingEnv.typeUtils.erasure(syntheticProviderMirror)
             val erasedReturnType = processingEnv.typeUtils.erasure(syntheticElement!!.returnType)

diff --git a/enro-processor/src/main/java/dev/enro/processor/generator/NavigationDestinationGenerator.kt b/enro-processor/src/main/java/dev/enro/processor/generator/NavigationDestinationGenerator.kt
@@ -306,19 +306,19 @@ fun JavaFile.Builder.addImportsForBinding(): JavaFile.Builder {
 fun FileSpec.Builder.addImportsForBinding(): FileSpec.Builder {
     return this
         .addImport(
-        "dev.enro.core.activity",
+        "dev.enro.destination.activity",
             "activityDestination"
         )
         .addImport(
-            "dev.enro.core.fragment",
+            "dev.enro.destination.fragment",
             "fragmentDestination"
         )
         .addImport(
-            "dev.enro.core.synthetic",
+            "dev.enro.destination.synthetic",
             "syntheticDestination"
         )
         .addImport(
-            "dev.enro.core.compose",
+            "dev.enro.destination.compose",
             "composableDestination"
         )
 }
diff --git a/enro-test/src/main/java/dev/enro/test/EnroTest.kt b/enro-test/src/main/java/dev/enro/test/EnroTest.kt
@@ -4,10 +4,10 @@ package dev.enro.test
 import android.app.Application
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.platform.app.InstrumentationRegistry
-import dev.enro.core.controller.NavigationApplication
+import dev.enro.android.NavigationApplication
 import dev.enro.core.controller.NavigationController
 import dev.enro.core.controller.createUnattachedNavigationController
-import dev.enro.viewmodel.EnroViewModelNavigationHandleProvider
+import dev.enro.android.viewmodel.EnroViewModelNavigationHandleProvider
 
 object EnroTest {
 

diff --git a/enro/hilt-test/src/androidTest/java/dev/enro/TestApplication.kt b/enro/hilt-test/src/androidTest/java/dev/enro/TestApplication.kt
@@ -2,7 +2,7 @@ package dev.enro
 
 import android.app.Application
 import dev.enro.annotations.NavigationComponent
-import dev.enro.core.controller.NavigationApplication
+import dev.enro.android.NavigationApplication
 import dev.enro.core.controller.createNavigationController
 import dev.enro.core.plugins.EnroLogger
 

diff --git a/enro/hilt-test/src/androidTest/java/dev/enro/hilt/test/HiltViewModelCreationTests.kt b/enro/hilt-test/src/androidTest/java/dev/enro/hilt/test/HiltViewModelCreationTests.kt
@@ -27,8 +27,8 @@ import dev.enro.core.*
 import dev.enro.destination.compose.EnroContainer
 import dev.enro.destination.fragment.containerManager
 import dev.enro.expectContext
-import dev.enro.viewmodel.enroViewModels
-import dev.enro.viewmodel.navigationHandle
+import dev.enro.android.viewmodel.enroViewModels
+import dev.enro.android.viewmodel.navigationHandle
 import dev.enro.waitOnMain
 import junit.framework.TestCase.assertTrue
 import kotlinx.parcelize.Parcelize

diff --git a/enro/src/androidTest/java/dev/enro/TestApplication.kt b/enro/src/androidTest/java/dev/enro/TestApplication.kt
@@ -3,7 +3,7 @@ package dev.enro
 import android.app.Application
 import dev.enro.annotations.NavigationComponent
 import dev.enro.destination.compose.composableDestination
-import dev.enro.core.controller.NavigationApplication
+import dev.enro.android.NavigationApplication
 import dev.enro.core.controller.createNavigationController
 import dev.enro.core.destinations.ComposableDestinations
 import dev.enro.core.destinations.ManuallyBoundComposableScreen