refactor: add decompose library for architecture (#36)

* refactor: introduce decompose * refactor: better modularization
diegoberaldin · Jun 9, 2023 · 0ed2c90 · 0ed2c90
1 parent 0803954
commit 0ed2c90
Show file tree

Hide file tree

Showing 311 changed files with 4,943 additions and 3,006 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/artifacts/main_jvm_1_0_1.xml b/.idea/artifacts/main_jvm_1_0_1.xml
diff --git a/.idea/artifacts/repo_jvm_1_0_1.xml b/.idea/artifacts/repo_jvm_1_0_1.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,12 +24,12 @@ kotlin {
             dependencies {
                 implementation(compose.desktop.currentOs)
                 implementation(compose.materialIconsExtended)
-                implementation(libs.essenty.instancekeeper)
-
                 implementation(compose.foundation)
                 implementation(compose.animation)
 
                 implementation(libs.koin)
+                implementation(libs.decompose)
+                implementation(libs.decompose.extensions)
 
                 implementation(projects.coreCommon)
                 implementation(projects.coreData)
@@ -55,7 +55,7 @@ kotlin {
 
 compose.desktop {
     application {
-        mainClass = "MetaTermKt"
+        mainClass = "MainKt"
         nativeDistributions {
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
             packageName = "MetaTerm"

diff --git a/core-common/build.gradle.kts b/core-common/build.gradle.kts
@@ -23,7 +23,8 @@ kotlin {
                 implementation(compose.desktop.currentOs)
 
                 implementation(libs.koin)
-                implementation(libs.essenty.instancekeeper)
+                implementation(libs.decompose)
+                implementation(libs.kotlinx.coroutines)
                 implementation(libs.androidx.datastore)
 
                 api(libs.bundles.log4j)

diff --git a/core-common/gradle.properties b/core-common/gradle.properties
@@ -1,4 +1,4 @@
 kotlin.code.style=official
 kotlin.version=1.8.0
 agp.version=7.3.0
-compose.version=1.3.1
+compose.version=1.4.0
diff --git a/...coroutines/CoroutineDispatcherProvider.kt → ...coroutines/CoroutineDispatcherProvider.kt b/...coroutines/CoroutineDispatcherProvider.kt → ...coroutines/CoroutineDispatcherProvider.kt
@@ -1,4 +1,4 @@
-package coroutines
+package common.coroutines
 
 import kotlinx.coroutines.CoroutineDispatcher
 

diff --git a/...utines/CoroutineDispatcherProviderImpl.kt → ...utines/CoroutineDispatcherProviderImpl.kt b/...utines/CoroutineDispatcherProviderImpl.kt → ...utines/CoroutineDispatcherProviderImpl.kt
@@ -1,4 +1,4 @@
-package coroutines
+package common.coroutines
 
 import kotlinx.coroutines.Dispatchers
 

diff --git a/core-common/src/jvmMain/kotlin/common/di/CommonModule.kt b/core-common/src/jvmMain/kotlin/common/di/CommonModule.kt
@@ -0,0 +1,31 @@
+package common.di
+
+import common.files.DefaultFileManager
+import common.files.FileManager
+import common.keystore.DefaultTemporaryKeyStore
+import common.keystore.TemporaryKeyStore
+import common.log.DefaultLogManager
+import common.log.LogManager
+import common.notification.DefaultNotificationCenter
+import common.notification.NotificationCenter
+import org.koin.dsl.module
+import common.coroutines.CoroutineDispatcherProvider
+import common.coroutines.CoroutineDispatcherProviderImpl
+
+val commonModule = module {
+    single<CoroutineDispatcherProvider> {
+        CoroutineDispatcherProviderImpl
+    }
+    single<NotificationCenter> {
+        DefaultNotificationCenter
+    }
+    single<TemporaryKeyStore> {
+        DefaultTemporaryKeyStore(fileManager = get())
+    }
+    single<FileManager> {
+        DefaultFileManager
+    }
+    single<LogManager> {
+        DefaultLogManager(fileManager = get())
+    }
+}
diff --git a/...vmMain/kotlin/files/DefaultFileManager.kt → ...kotlin/common/files/DefaultFileManager.kt b/...vmMain/kotlin/files/DefaultFileManager.kt → ...kotlin/common/files/DefaultFileManager.kt
@@ -1,4 +1,4 @@
-package files
+package common.files
 
 import java.io.File
 import java.util.*

diff --git a/...n/src/jvmMain/kotlin/files/FileManager.kt → ...vmMain/kotlin/common/files/FileManager.kt b/...n/src/jvmMain/kotlin/files/FileManager.kt → ...vmMain/kotlin/common/files/FileManager.kt
@@ -1,4 +1,4 @@
-package files
+package common.files
 
 interface FileManager {
     fun getFilePath(vararg components: String): String

diff --git a/...tlin/keystore/DefaultTemporaryKeyStore.kt → ...mmon/keystore/DefaultTemporaryKeyStore.kt b/...tlin/keystore/DefaultTemporaryKeyStore.kt → ...mmon/keystore/DefaultTemporaryKeyStore.kt
@@ -1,4 +1,4 @@
-package keystore
+package common.keystore
 
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.PreferenceDataStoreFactory
@@ -9,7 +9,7 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.floatPreferencesKey
 import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
-import files.FileManager
+import common.files.FileManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first

diff --git a/...Main/kotlin/keystore/TemporaryKeyStore.kt → ...tlin/common/keystore/TemporaryKeyStore.kt b/...Main/kotlin/keystore/TemporaryKeyStore.kt → ...tlin/common/keystore/TemporaryKeyStore.kt
@@ -1,4 +1,4 @@
-package keystore
+package common.keystore
 
 interface TemporaryKeyStore {
     suspend fun save(key: String, value: Boolean)

diff --git a/...c/jvmMain/kotlin/log/DefaultLogManager.kt → ...in/kotlin/common/log/DefaultLogManager.kt b/...c/jvmMain/kotlin/log/DefaultLogManager.kt → ...in/kotlin/common/log/DefaultLogManager.kt
@@ -1,6 +1,6 @@
-package log
+package common.log
 
-import files.FileManager
+import common.files.FileManager
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 

diff --git a/...mmon/src/jvmMain/kotlin/log/LogManager.kt → ...c/jvmMain/kotlin/common/log/LogManager.kt b/...mmon/src/jvmMain/kotlin/log/LogManager.kt → ...c/jvmMain/kotlin/common/log/LogManager.kt
@@ -1,4 +1,4 @@
-package log
+package common.log
 
 interface LogManager {
     fun trace(message: String)

diff --git a/...notification/DefaultNotificationCenter.kt → ...notification/DefaultNotificationCenter.kt b/...notification/DefaultNotificationCenter.kt → ...notification/DefaultNotificationCenter.kt
@@ -1,4 +1,4 @@
-package notification
+package common.notification
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

diff --git a/...kotlin/notification/NotificationCenter.kt → ...common/notification/NotificationCenter.kt b/...kotlin/notification/NotificationCenter.kt → ...common/notification/NotificationCenter.kt
@@ -1,4 +1,4 @@
-package notification
+package common.notification
 
 import kotlinx.coroutines.flow.SharedFlow
 

diff --git a/...Main/kotlin/ui/components/CustomDialog.kt → ...tlin/common/ui/components/CustomDialog.kt b/...Main/kotlin/ui/components/CustomDialog.kt → ...tlin/common/ui/components/CustomDialog.kt
@@ -1,4 +1,4 @@
-package ui.components
+package common.ui.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
@@ -19,7 +19,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.rememberDialogState
-import ui.theme.Spacing
+import common.ui.theme.Spacing
 
 @Composable
 fun CustomDialog(

diff --git a/...lin/ui/components/CustomOpenFileDialog.kt → ...mon/ui/components/CustomOpenFileDialog.kt b/...lin/ui/components/CustomOpenFileDialog.kt → ...mon/ui/components/CustomOpenFileDialog.kt
@@ -1,4 +1,4 @@
-package ui.components
+package common.ui.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.window.AwtWindow

diff --git a/.../ui/components/CustomProgressIndicator.kt → .../ui/components/CustomProgressIndicator.kt b/.../ui/components/CustomProgressIndicator.kt → .../ui/components/CustomProgressIndicator.kt
@@ -1,4 +1,4 @@
-package ui.components
+package common.ui.components
 
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.background
@@ -27,8 +27,8 @@ import androidx.compose.ui.text.drawText
 import androidx.compose.ui.text.rememberTextMeasurer
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
-import utils.toLocalPixel
-import utils.toRadians
+import common.utils.toLocalPixel
+import common.utils.toRadians
 import java.text.DecimalFormat
 import kotlin.math.sin
 

diff --git a/...lin/ui/components/CustomSaveFileDialog.kt → ...mon/ui/components/CustomSaveFileDialog.kt b/...lin/ui/components/CustomSaveFileDialog.kt → ...mon/ui/components/CustomSaveFileDialog.kt
@@ -1,4 +1,4 @@
-package ui.components
+package common.ui.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.window.AwtWindow

diff --git a/...ain/kotlin/ui/components/CustomSpinner.kt → ...lin/common/ui/components/CustomSpinner.kt b/...ain/kotlin/ui/components/CustomSpinner.kt → ...lin/common/ui/components/CustomSpinner.kt
@@ -1,4 +1,4 @@
-package ui.components
+package common.ui.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
@@ -32,7 +32,7 @@ import androidx.compose.ui.input.pointer.PointerEventType
 import androidx.compose.ui.input.pointer.onPointerEvent
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import ui.theme.Spacing
+import common.ui.theme.Spacing
 
 @OptIn(ExperimentalComposeUiApi::class, ExperimentalFoundationApi::class)
 @Composable

diff --git a/...Main/kotlin/ui/components/CustomTabBar.kt → ...tlin/common/ui/components/CustomTabBar.kt b/...Main/kotlin/ui/components/CustomTabBar.kt → ...tlin/common/ui/components/CustomTabBar.kt
@@ -1,4 +1,4 @@
-package ui.components
+package common.ui.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
@@ -22,8 +22,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import ui.theme.SelectedBackground
-import ui.theme.Spacing
+import common.ui.theme.SelectedBackground
+import common.ui.theme.Spacing
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable

diff --git a/...n/kotlin/ui/components/CustomTextField.kt → ...n/common/ui/components/CustomTextField.kt b/...n/kotlin/ui/components/CustomTextField.kt → ...n/common/ui/components/CustomTextField.kt
@@ -1,4 +1,4 @@
-package ui.components
+package common.ui.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
@@ -15,7 +15,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import ui.theme.Spacing
+import common.ui.theme.Spacing
 
 @Composable
 fun CustomTextField(

diff --git a/...kotlin/ui/components/CustomToolTipArea.kt → ...common/ui/components/CustomToolTipArea.kt b/...kotlin/ui/components/CustomToolTipArea.kt → ...common/ui/components/CustomToolTipArea.kt
@@ -1,4 +1,4 @@
-package ui.components
+package common.ui.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.TooltipArea
@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import ui.theme.Spacing
+import common.ui.theme.Spacing
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable

diff --git a/...mMain/kotlin/ui/components/StyledLabel.kt → ...otlin/common/ui/components/StyledLabel.kt b/...mMain/kotlin/ui/components/StyledLabel.kt → ...otlin/common/ui/components/StyledLabel.kt
@@ -1,4 +1,4 @@
-package ui.components
+package common.ui.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -16,7 +16,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import ui.theme.Spacing
+import common.ui.theme.Spacing
 
 @Composable
 fun StyledLabel(

diff --git a/.../jvmMain/kotlin/ui/components/TreeItem.kt → ...n/kotlin/common/ui/components/TreeItem.kt b/.../jvmMain/kotlin/ui/components/TreeItem.kt → ...n/kotlin/common/ui/components/TreeItem.kt
@@ -1,4 +1,4 @@
-package ui.components
+package common.ui.components
 
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.layout.Arrangement
@@ -13,7 +13,7 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.PathEffect
 import androidx.compose.ui.unit.dp
-import ui.theme.Spacing
+import common.ui.theme.Spacing
 
 @Composable
 fun TreeItem(

diff --git a/...mon/src/jvmMain/kotlin/ui/theme/Colors.kt → .../jvmMain/kotlin/common/ui/theme/Colors.kt b/...mon/src/jvmMain/kotlin/ui/theme/Colors.kt → .../jvmMain/kotlin/common/ui/theme/Colors.kt
@@ -1,4 +1,4 @@
-package ui.theme
+package common.ui.theme
 
 import androidx.compose.material.darkColors
 import androidx.compose.ui.graphics.Color

diff --git a/...src/jvmMain/kotlin/ui/theme/Dimensions.kt → ...Main/kotlin/common/ui/theme/Dimensions.kt b/...src/jvmMain/kotlin/ui/theme/Dimensions.kt → ...Main/kotlin/common/ui/theme/Dimensions.kt
@@ -1,4 +1,4 @@
-package ui.theme
+package common.ui.theme
 
 import androidx.compose.ui.unit.dp
 

diff --git a/...mmon/src/jvmMain/kotlin/ui/theme/Fonts.kt → ...c/jvmMain/kotlin/common/ui/theme/Fonts.kt b/...mmon/src/jvmMain/kotlin/ui/theme/Fonts.kt → ...c/jvmMain/kotlin/common/ui/theme/Fonts.kt
@@ -1,4 +1,4 @@
-package ui.theme
+package common.ui.theme
 
 import androidx.compose.material.Typography
 import androidx.compose.ui.text.TextStyle

diff --git a/.../jvmMain/kotlin/ui/theme/MetaTermTheme.kt → ...n/kotlin/common/ui/theme/MetaTermTheme.kt b/.../jvmMain/kotlin/ui/theme/MetaTermTheme.kt → ...n/kotlin/common/ui/theme/MetaTermTheme.kt
@@ -1,4 +1,4 @@
-package ui.theme
+package common.ui.theme
 
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable

diff --git a/...n/src/jvmMain/kotlin/utils/AppBusiness.kt → ...vmMain/kotlin/common/utils/AppBusiness.kt b/...n/src/jvmMain/kotlin/utils/AppBusiness.kt → ...vmMain/kotlin/common/utils/AppBusiness.kt
@@ -1,4 +1,4 @@
-package utils
+package common.utils
 
 import com.arkivanov.essenty.instancekeeper.InstanceKeeper
 import com.arkivanov.essenty.instancekeeper.InstanceKeeperDispatcher

diff --git a/...on/src/jvmMain/kotlin/utils/Extensions.kt → ...jvmMain/kotlin/common/utils/Extensions.kt b/...on/src/jvmMain/kotlin/utils/Extensions.kt → ...jvmMain/kotlin/common/utils/Extensions.kt
@@ -1,4 +1,4 @@
-package utils
+package common.utils
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalDensity