merging with main

app/build.gradle

@@ -74,6 +74,7 @@ dependencies {
     implementation project(":features:share-entry")
 
     implementation project(':domains:store')
+    implementation project(":domains:android:compose-core")
     implementation project(":domains:android:core")
     implementation project(":domains:android:tracking")
     implementation project(":domains:android:push")

app/src/main/kotlin/app/dapk/st/graph/AppModule.kt

@@ -89,7 +89,7 @@ internal class AppModule(context: Application, logger: MatrixLogger) {
     private val matrixModules = MatrixModules(storeModule, trackingModule, workModule, logger, coroutineDispatchers)
     val domainModules = DomainModules(matrixModules, trackingModule.errorTracker)
 
-    val coreAndroidModule = CoreAndroidModule(intentFactory = object : IntentFactory {
+    val coreAndroidModule = app.dapk.st.core.CoreAndroidModule(intentFactory = object : IntentFactory {
         override fun notificationOpenApp(context: Context) = PendingIntent.getActivity(
             context,
             1000,
@@ -137,7 +137,7 @@ internal class FeatureModules internal constructor(
     private val domainModules: DomainModules,
     private val trackingModule: TrackingModule,
     private val workModule: WorkModule,
-    private val coreAndroidModule: CoreAndroidModule,
+    private val coreAndroidModule: app.dapk.st.core.CoreAndroidModule,
     imageLoaderModule: ImageLoaderModule,
     context: Context,
     buildMeta: BuildMeta,

domains/android/core/build.gradle

@@ -3,5 +3,4 @@ plugins { id 'kotlin' }
 dependencies {
     compileOnly project(":domains:android:stub")
     implementation project(":core")
-    implementation project(":features:navigator")
 }

features/navigator/build.gradle

@@ -1,4 +1,4 @@
-plugins { id 'kotlin' }
+applyAndroidLibraryModule(project)
 apply plugin: 'kotlin-parcelize'
 
 dependencies {

features/navigator/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="app.dapk.st.navigator"/>

features/share-entry/build.gradle

@@ -1,7 +1,7 @@
-applyAndroidLibraryModule(project)
+applyAndroidComposeLibraryModule(project)
 
 dependencies {
-    implementation project(":domains:android:core")
+    implementation project(":domains:android:compose-core")
     implementation project(":domains:android:viewmodel")
     implementation project(':domains:store')
     implementation project(':matrix:services:sync')