From a7a5d73bace44cbb163e61980223c9ee82f64bb6 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 13 Jun 2022 19:10:02 +0100
Subject: [PATCH] merging with main

---
 app/build.gradle                                              | 1 +
 app/src/main/kotlin/app/dapk/st/graph/AppModule.kt            | 4 ++--
 .../src/main/kotlin/app/dapk/st/core/CoreAndroidModule.kt     | 0
 domains/android/core/build.gradle                             | 1 -
 features/navigator/build.gradle                               | 2 +-
 features/navigator/src/main/AndroidManifest.xml               | 2 ++
 features/share-entry/build.gradle                             | 4 ++--
 7 files changed, 8 insertions(+), 6 deletions(-)
 rename domains/android/{core => compose-core}/src/main/kotlin/app/dapk/st/core/CoreAndroidModule.kt (100%)
 create mode 100644 features/navigator/src/main/AndroidManifest.xml

diff --git a/app/build.gradle b/app/build.gradle
index 3c6f0bc..f625b8a 100644
--- a/app/build.gradle
+++ b/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")
diff --git a/app/src/main/kotlin/app/dapk/st/graph/AppModule.kt b/app/src/main/kotlin/app/dapk/st/graph/AppModule.kt
index 69065cc..9a94db7 100644
--- a/app/src/main/kotlin/app/dapk/st/graph/AppModule.kt
+++ b/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,
diff --git a/domains/android/core/src/main/kotlin/app/dapk/st/core/CoreAndroidModule.kt b/domains/android/compose-core/src/main/kotlin/app/dapk/st/core/CoreAndroidModule.kt
similarity index 100%
rename from domains/android/core/src/main/kotlin/app/dapk/st/core/CoreAndroidModule.kt
rename to domains/android/compose-core/src/main/kotlin/app/dapk/st/core/CoreAndroidModule.kt
diff --git a/domains/android/core/build.gradle b/domains/android/core/build.gradle
index 054db34..6a11a06 100644
--- a/domains/android/core/build.gradle
+++ b/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")
 }
diff --git a/features/navigator/build.gradle b/features/navigator/build.gradle
index d8faab7..6c97c96 100644
--- a/features/navigator/build.gradle
+++ b/features/navigator/build.gradle
@@ -1,4 +1,4 @@
-plugins { id 'kotlin' }
+applyAndroidLibraryModule(project)
 apply plugin: 'kotlin-parcelize'
 
 dependencies {
diff --git a/features/navigator/src/main/AndroidManifest.xml b/features/navigator/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..9926105
--- /dev/null
+++ b/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"/>
\ No newline at end of file
diff --git a/features/share-entry/build.gradle b/features/share-entry/build.gradle
index 542fb16..814f902 100644
--- a/features/share-entry/build.gradle
+++ b/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')