devol
/
smalltalk-matrix
mirror of https://github.com/ouchadam/small-talk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merging with main

This commit is contained in:
Adam Brown 2022-06-13 19:10:02 +01:00
parent 1450a70283
commit a7a5d73bac
7 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

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

4
app/src/main/kotlin/app/dapk/st/graph/AppModule.kt
View File

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

0
domains/android/core/src/main/kotlin/app/dapk/st/core/CoreAndroidModule.kt → domains/android/compose-core/src/main/kotlin/app/dapk/st/core/CoreAndroidModule.kt
View File

1
domains/android/core/build.gradle
View File

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

2
features/navigator/build.gradle
View File

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

2
features/navigator/src/main/AndroidManifest.xml Normal file
View File

@ -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"/>

4
features/share-entry/build.gradle
View File

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