From 646a27d3106e561ffac3dc7a9c430184e21690cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Salcedo=20Garc=C3=ADa?= <alvaro@alvr.dev>
Date: Sat, 9 Mar 2024 13:57:33 +0100
Subject: [PATCH 1/5] chore: rename di modules

---
 .idea/runConfigurations/Update_Apollo.xml     |   3 +-
 .../katana/common/session/data/di/module.kt   |   2 +-
 .../katana/common/session/domain/di/module.kt |   2 +-
 .../alvr/katana/common/user/data/di/module.kt |   2 +-
 .../katana/common/user/domain/di/module.kt    |   2 +-
 .../common/coroutines/KatanaDispatcher.kt     |  14 +++
 .../dev/alvr/katana/core/common/di/module.kt  |   9 ++
 .../alvr/katana/core/preferences/di/module.kt |   2 +-
 .../dev/alvr/katana/core/remote/di/module.kt  |   2 +-
 .../katana/features/account/data/di/module.kt |   2 +-
 .../features/account/domain/di/module.kt      |   2 +-
 .../katana/features/account/ui/di/module.kt   |   2 +-
 .../katana/features/explore/data/di/module.kt |   2 +-
 .../features/explore/domain/di/module.kt      |   2 +-
 .../katana/features/explore/ui/di/module.kt   |   2 +-
 features/home/ui/.gitignore                   |   1 +
 features/home/ui/build.gradle.kts             |  14 +++
 .../alvr/katana/features/home/ui/di/module.kt |   6 +
 .../katana/features/lists/data/di/module.kt   |   2 +-
 .../katana/features/lists/domain/di/module.kt |   2 +-
 .../katana/features/lists/ui/di/module.kt     |   2 +-
 .../katana/features/login/ui/di/module.kt     |   2 +-
 .../katana/features/social/data/di/module.kt  |   2 +-
 .../features/social/domain/di/module.kt       |   2 +-
 .../katana/features/social/ui/di/module.kt    |   2 +-
 shared/build.gradle.kts                       |   2 +
 .../dev/alvr/katana/shared/di/module.kt       | 110 ++++++++++--------
 27 files changed, 130 insertions(+), 67 deletions(-)
 create mode 100644 core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/coroutines/KatanaDispatcher.kt
 create mode 100644 core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/di/module.kt
 create mode 100644 features/home/ui/.gitignore
 create mode 100644 features/home/ui/build.gradle.kts
 create mode 100644 features/home/ui/src/commonMain/kotlin/dev/alvr/katana/features/home/ui/di/module.kt

diff --git a/.idea/runConfigurations/Update_Apollo.xml b/.idea/runConfigurations/Update_Apollo.xml
index b354b10e4..1ec857f83 100644
--- a/.idea/runConfigurations/Update_Apollo.xml
+++ b/.idea/runConfigurations/Update_Apollo.xml
@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="data:remote:base:downloadAnilistApolloSchemaFromIntrospection" />
+          <option value=":core:remote:downloadAnilistApolloSchemaFromIntrospection" />
         </list>
       </option>
       <option name="vmOptions" />
@@ -18,6 +18,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/common/session/data/src/commonMain/kotlin/dev/alvr/katana/common/session/data/di/module.kt b/common/session/data/src/commonMain/kotlin/dev/alvr/katana/common/session/data/di/module.kt
index 0d1dd928d..2ea72cfc7 100644
--- a/common/session/data/src/commonMain/kotlin/dev/alvr/katana/common/session/data/di/module.kt
+++ b/common/session/data/src/commonMain/kotlin/dev/alvr/katana/common/session/data/di/module.kt
@@ -19,7 +19,7 @@ private val sourcesModule = module {
     singleOf(::SessionLocalSourceImpl).bind<SessionLocalSource>()
 }
 
-val dataPreferencesSessionModule = module {
+val commonSessionDataModule = module {
     includes(dataStoreModule(), repositoriesModule, sourcesModule)
 }
 
diff --git a/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/di/module.kt b/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/di/module.kt
index ec2582e17..f5c1b0c43 100644
--- a/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/di/module.kt
+++ b/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/di/module.kt
@@ -18,6 +18,6 @@ private val useCasesModule = module {
     factoryOf(::SaveSessionUseCase)
 }
 
-val domainSessionModule = module {
+val commonSessionDomainModule = module {
     includes(useCasesModule)
 }
diff --git a/common/user/data/src/commonMain/kotlin/dev/alvr/katana/common/user/data/di/module.kt b/common/user/data/src/commonMain/kotlin/dev/alvr/katana/common/user/data/di/module.kt
index f490ca347..6b5a9269b 100644
--- a/common/user/data/src/commonMain/kotlin/dev/alvr/katana/common/user/data/di/module.kt
+++ b/common/user/data/src/commonMain/kotlin/dev/alvr/katana/common/user/data/di/module.kt
@@ -25,6 +25,6 @@ private val sourcesModule = module {
     singleOf(::UserInfoRemoteSourceImpl).bind<UserInfoRemoteSource>()
 }
 
-val dataRemoteUserModule = module {
+val commonUserDataModule = module {
     includes(managersModule, repositoriesModule, sourcesModule)
 }
diff --git a/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/di/module.kt b/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/di/module.kt
index 2f6341b58..4725c11c6 100644
--- a/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/di/module.kt
+++ b/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/di/module.kt
@@ -12,6 +12,6 @@ private val useCasesModule = module {
     factoryOf(::ObserveUserInfoUseCase)
 }
 
-val domainUserModule = module {
+val commonUserDomainModule = module {
     includes(useCasesModule)
 }
diff --git a/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/coroutines/KatanaDispatcher.kt b/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/coroutines/KatanaDispatcher.kt
new file mode 100644
index 000000000..6b160e5af
--- /dev/null
+++ b/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/coroutines/KatanaDispatcher.kt
@@ -0,0 +1,14 @@
+package dev.alvr.katana.core.common.coroutines
+
+import kotlin.jvm.JvmField
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.IO
+import kotlinx.coroutines.MainCoroutineDispatcher
+
+@Suppress("UseDataClass")
+class KatanaDispatcher internal constructor(
+    @JvmField val main: MainCoroutineDispatcher = Dispatchers.Main,
+    @JvmField val io: CoroutineDispatcher = Dispatchers.IO,
+    @JvmField val default: CoroutineDispatcher = Dispatchers.Default,
+)
diff --git a/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/di/module.kt b/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/di/module.kt
new file mode 100644
index 000000000..2258f8feb
--- /dev/null
+++ b/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/di/module.kt
@@ -0,0 +1,9 @@
+package dev.alvr.katana.core.common.di
+
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+
+val coreCommonModule = module {
+    singleOf(::KatanaDispatcher)
+}
diff --git a/core/preferences/src/commonMain/kotlin/dev/alvr/katana/core/preferences/di/module.kt b/core/preferences/src/commonMain/kotlin/dev/alvr/katana/core/preferences/di/module.kt
index 78549b58e..80b24e9af 100644
--- a/core/preferences/src/commonMain/kotlin/dev/alvr/katana/core/preferences/di/module.kt
+++ b/core/preferences/src/commonMain/kotlin/dev/alvr/katana/core/preferences/di/module.kt
@@ -5,6 +5,6 @@ import org.koin.dsl.module
 
 internal expect fun encryptionModule(): Module
 
-val dataPreferencesBaseModule = module {
+val corePreferencesModule = module {
     includes(encryptionModule())
 }
diff --git a/core/remote/src/commonMain/kotlin/dev/alvr/katana/core/remote/di/module.kt b/core/remote/src/commonMain/kotlin/dev/alvr/katana/core/remote/di/module.kt
index 87c939a0d..2c008ee03 100644
--- a/core/remote/src/commonMain/kotlin/dev/alvr/katana/core/remote/di/module.kt
+++ b/core/remote/src/commonMain/kotlin/dev/alvr/katana/core/remote/di/module.kt
@@ -112,7 +112,7 @@ private val apolloInterceptorsModule = module {
     factoryOf(::ReloadInterceptor).bind<ApolloInterceptor>()
 }
 
-val dataRemoteBaseModule = module {
+val coreRemoteModule = module {
     includes(apolloClientModule, apolloDatabaseModule, apolloInterceptorsModule)
 }
 
diff --git a/features/account/data/src/commonMain/kotlin/dev/alvr/katana/features/account/data/di/module.kt b/features/account/data/src/commonMain/kotlin/dev/alvr/katana/features/account/data/di/module.kt
index 0c01ca702..29178fcc2 100644
--- a/features/account/data/src/commonMain/kotlin/dev/alvr/katana/features/account/data/di/module.kt
+++ b/features/account/data/src/commonMain/kotlin/dev/alvr/katana/features/account/data/di/module.kt
@@ -2,5 +2,5 @@ package dev.alvr.katana.features.account.data.di
 
 import org.koin.dsl.module
 
-val dataRemoteAccountModule = module {
+val featuresAccountDataModule = module {
 }
diff --git a/features/account/domain/src/commonMain/kotlin/dev/alvr/katana/features/account/domain/di/module.kt b/features/account/domain/src/commonMain/kotlin/dev/alvr/katana/features/account/domain/di/module.kt
index 497ac648b..9b2077616 100644
--- a/features/account/domain/src/commonMain/kotlin/dev/alvr/katana/features/account/domain/di/module.kt
+++ b/features/account/domain/src/commonMain/kotlin/dev/alvr/katana/features/account/domain/di/module.kt
@@ -2,4 +2,4 @@ package dev.alvr.katana.features.account.domain.di
 
 import org.koin.dsl.module
 
-val domainAccountModule = module { }
+val featuresAccountDomainModule = module { }
diff --git a/features/account/ui/src/commonMain/kotlin/dev/alvr/katana/features/account/ui/di/module.kt b/features/account/ui/src/commonMain/kotlin/dev/alvr/katana/features/account/ui/di/module.kt
index d3490d2f6..c1a6ab861 100644
--- a/features/account/ui/src/commonMain/kotlin/dev/alvr/katana/features/account/ui/di/module.kt
+++ b/features/account/ui/src/commonMain/kotlin/dev/alvr/katana/features/account/ui/di/module.kt
@@ -8,6 +8,6 @@ private val viewModelsModule = module {
     factoryOf(::AccountViewModel)
 }
 
-val uiAccountModule = module {
+val featuresAccountUiModule = module {
     includes(viewModelsModule)
 }
diff --git a/features/explore/data/src/commonMain/kotlin/dev/alvr/katana/features/explore/data/di/module.kt b/features/explore/data/src/commonMain/kotlin/dev/alvr/katana/features/explore/data/di/module.kt
index 58a76ed65..e4b014c57 100644
--- a/features/explore/data/src/commonMain/kotlin/dev/alvr/katana/features/explore/data/di/module.kt
+++ b/features/explore/data/src/commonMain/kotlin/dev/alvr/katana/features/explore/data/di/module.kt
@@ -2,4 +2,4 @@ package dev.alvr.katana.features.explore.data.di
 
 import org.koin.dsl.module
 
-val dataRemoteExploreModule = module { }
+val featuresExploreDataModule = module { }
diff --git a/features/explore/domain/src/commonMain/kotlin/dev/alvr/katana/features/explore/domain/di/module.kt b/features/explore/domain/src/commonMain/kotlin/dev/alvr/katana/features/explore/domain/di/module.kt
index a0c3fdb1a..593630225 100644
--- a/features/explore/domain/src/commonMain/kotlin/dev/alvr/katana/features/explore/domain/di/module.kt
+++ b/features/explore/domain/src/commonMain/kotlin/dev/alvr/katana/features/explore/domain/di/module.kt
@@ -2,4 +2,4 @@ package dev.alvr.katana.features.explore.domain.di
 
 import org.koin.dsl.module
 
-val domainExploreModule = module { }
+val featuresExploreDomainModule = module { }
diff --git a/features/explore/ui/src/commonMain/kotlin/dev/alvr/katana/features/explore/ui/di/module.kt b/features/explore/ui/src/commonMain/kotlin/dev/alvr/katana/features/explore/ui/di/module.kt
index bdeba7b59..1f10f649c 100644
--- a/features/explore/ui/src/commonMain/kotlin/dev/alvr/katana/features/explore/ui/di/module.kt
+++ b/features/explore/ui/src/commonMain/kotlin/dev/alvr/katana/features/explore/ui/di/module.kt
@@ -2,4 +2,4 @@ package dev.alvr.katana.features.explore.ui.di
 
 import org.koin.dsl.module
 
-val uiExploreModule = module { }
+val featuresExploreUiModule = module { }
diff --git a/features/home/ui/.gitignore b/features/home/ui/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/features/home/ui/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/features/home/ui/build.gradle.kts b/features/home/ui/build.gradle.kts
new file mode 100644
index 000000000..64835d7e2
--- /dev/null
+++ b/features/home/ui/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    id("katana.multiplatform.ui")
+}
+
+katanaMultiplatform {
+    commonMainDependencies {
+        implementation(projects.core.common)
+        implementation(projects.core.ui)
+    }
+
+    commonTestDependencies {
+        implementation(projects.core.tests)
+    }
+}
diff --git a/features/home/ui/src/commonMain/kotlin/dev/alvr/katana/features/home/ui/di/module.kt b/features/home/ui/src/commonMain/kotlin/dev/alvr/katana/features/home/ui/di/module.kt
new file mode 100644
index 000000000..d3f2f0ee6
--- /dev/null
+++ b/features/home/ui/src/commonMain/kotlin/dev/alvr/katana/features/home/ui/di/module.kt
@@ -0,0 +1,6 @@
+package dev.alvr.katana.features.home.ui.di
+
+import org.koin.dsl.module
+
+val featuresHomeUiModule = module {
+}
diff --git a/features/lists/data/src/commonMain/kotlin/dev/alvr/katana/features/lists/data/di/module.kt b/features/lists/data/src/commonMain/kotlin/dev/alvr/katana/features/lists/data/di/module.kt
index 39f852a80..d278696e0 100644
--- a/features/lists/data/src/commonMain/kotlin/dev/alvr/katana/features/lists/data/di/module.kt
+++ b/features/lists/data/src/commonMain/kotlin/dev/alvr/katana/features/lists/data/di/module.kt
@@ -22,6 +22,6 @@ private val sourcesModule = module {
     singleOf(::MangaListsRemoteSourceImpl).bind<MangaListsRemoteSource>()
 }
 
-val dataRemoteListsModule = module {
+val featuresListsDataModule = module {
     includes(repositoriesModule, sourcesModule)
 }
diff --git a/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/di/module.kt b/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/di/module.kt
index aef9d57c9..065df4c6d 100644
--- a/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/di/module.kt
+++ b/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/di/module.kt
@@ -12,6 +12,6 @@ private val useCasesModule = module {
     factoryOf(::UpdateListUseCase)
 }
 
-val domainListsModule = module {
+val featuresListsDomainModule = module {
     includes(useCasesModule)
 }
diff --git a/features/lists/ui/src/commonMain/kotlin/dev/alvr/katana/features/lists/ui/di/module.kt b/features/lists/ui/src/commonMain/kotlin/dev/alvr/katana/features/lists/ui/di/module.kt
index 73eb5b39e..5b5f29941 100644
--- a/features/lists/ui/src/commonMain/kotlin/dev/alvr/katana/features/lists/ui/di/module.kt
+++ b/features/lists/ui/src/commonMain/kotlin/dev/alvr/katana/features/lists/ui/di/module.kt
@@ -10,6 +10,6 @@ private val viewModelsModule = module {
     factoryOf(::MangaListsViewModel)
 }
 
-val uiListsModule = module {
+val featuresListsUiModule = module {
     includes(viewModelsModule)
 }
diff --git a/features/login/ui/src/commonMain/kotlin/dev/alvr/katana/features/login/ui/di/module.kt b/features/login/ui/src/commonMain/kotlin/dev/alvr/katana/features/login/ui/di/module.kt
index 0abadb30f..162e4b3a1 100644
--- a/features/login/ui/src/commonMain/kotlin/dev/alvr/katana/features/login/ui/di/module.kt
+++ b/features/login/ui/src/commonMain/kotlin/dev/alvr/katana/features/login/ui/di/module.kt
@@ -7,6 +7,6 @@ private val viewModelsModule = module {
     factory { params -> LoginViewModel(params[0], get(), get()) }
 }
 
-val uiLoginModule = module {
+val featuresLoginUiModule = module {
     includes(viewModelsModule)
 }
diff --git a/features/social/data/src/commonMain/kotlin/dev/alvr/katana/features/social/data/di/module.kt b/features/social/data/src/commonMain/kotlin/dev/alvr/katana/features/social/data/di/module.kt
index 2469068d0..a5316df7d 100644
--- a/features/social/data/src/commonMain/kotlin/dev/alvr/katana/features/social/data/di/module.kt
+++ b/features/social/data/src/commonMain/kotlin/dev/alvr/katana/features/social/data/di/module.kt
@@ -2,4 +2,4 @@ package dev.alvr.katana.features.social.data.di
 
 import org.koin.dsl.module
 
-val dataRemoteSocialModule = module { }
+val featuresSocialDataModule = module { }
diff --git a/features/social/domain/src/commonMain/kotlin/dev/alvr/katana/features/social/domain/di/module.kt b/features/social/domain/src/commonMain/kotlin/dev/alvr/katana/features/social/domain/di/module.kt
index 92c0cd776..c64b6a709 100644
--- a/features/social/domain/src/commonMain/kotlin/dev/alvr/katana/features/social/domain/di/module.kt
+++ b/features/social/domain/src/commonMain/kotlin/dev/alvr/katana/features/social/domain/di/module.kt
@@ -2,4 +2,4 @@ package dev.alvr.katana.features.social.domain.di
 
 import org.koin.dsl.module
 
-val domainSocialModule = module { }
+val featuresSocialDomainModule = module { }
diff --git a/features/social/ui/src/commonMain/kotlin/dev/alvr/katana/features/social/ui/di/module.kt b/features/social/ui/src/commonMain/kotlin/dev/alvr/katana/features/social/ui/di/module.kt
index b7df4a83c..800774888 100644
--- a/features/social/ui/src/commonMain/kotlin/dev/alvr/katana/features/social/ui/di/module.kt
+++ b/features/social/ui/src/commonMain/kotlin/dev/alvr/katana/features/social/ui/di/module.kt
@@ -2,4 +2,4 @@ package dev.alvr.katana.features.social.ui.di
 
 import org.koin.dsl.module
 
-val uiSocialModule = module { }
+val featuresSocialUiModule = module { }
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 79c5a92a3..f4ea9a47f 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -23,6 +23,8 @@ katanaMultiplatform {
         api(projects.features.explore.domain)
         api(projects.features.explore.ui)
 
+        api(projects.features.home.ui)
+
         api(projects.features.lists.data)
         api(projects.features.lists.domain)
         api(projects.features.lists.ui)
diff --git a/shared/src/commonMain/kotlin/dev/alvr/katana/shared/di/module.kt b/shared/src/commonMain/kotlin/dev/alvr/katana/shared/di/module.kt
index f72ee382d..060fe3fa5 100644
--- a/shared/src/commonMain/kotlin/dev/alvr/katana/shared/di/module.kt
+++ b/shared/src/commonMain/kotlin/dev/alvr/katana/shared/di/module.kt
@@ -1,60 +1,76 @@
 package dev.alvr.katana.shared.di
 
-import dev.alvr.katana.common.session.data.di.dataPreferencesSessionModule
-import dev.alvr.katana.common.session.domain.di.domainSessionModule
-import dev.alvr.katana.common.user.data.di.dataRemoteUserModule
-import dev.alvr.katana.common.user.domain.di.domainUserModule
-import dev.alvr.katana.core.preferences.di.dataPreferencesBaseModule
-import dev.alvr.katana.core.remote.di.dataRemoteBaseModule
-import dev.alvr.katana.features.account.data.di.dataRemoteAccountModule
-import dev.alvr.katana.features.account.domain.di.domainAccountModule
-import dev.alvr.katana.features.account.ui.di.uiAccountModule
-import dev.alvr.katana.features.explore.data.di.dataRemoteExploreModule
-import dev.alvr.katana.features.explore.domain.di.domainExploreModule
-import dev.alvr.katana.features.explore.ui.di.uiExploreModule
-import dev.alvr.katana.features.lists.data.di.dataRemoteListsModule
-import dev.alvr.katana.features.lists.domain.di.domainListsModule
-import dev.alvr.katana.features.lists.ui.di.uiListsModule
-import dev.alvr.katana.features.login.ui.di.uiLoginModule
-import dev.alvr.katana.features.social.data.di.dataRemoteSocialModule
-import dev.alvr.katana.features.social.domain.di.domainSocialModule
-import dev.alvr.katana.features.social.ui.di.uiSocialModule
+import dev.alvr.katana.common.session.data.di.commonSessionDataModule
+import dev.alvr.katana.common.session.domain.di.commonSessionDomainModule
+import dev.alvr.katana.common.user.data.di.commonUserDataModule
+import dev.alvr.katana.common.user.domain.di.commonUserDomainModule
+import dev.alvr.katana.core.common.di.coreCommonModule
+import dev.alvr.katana.core.preferences.di.corePreferencesModule
+import dev.alvr.katana.core.remote.di.coreRemoteModule
+import dev.alvr.katana.features.account.data.di.featuresAccountDataModule
+import dev.alvr.katana.features.account.domain.di.featuresAccountDomainModule
+import dev.alvr.katana.features.account.ui.di.featuresAccountUiModule
+import dev.alvr.katana.features.explore.data.di.featuresExploreDataModule
+import dev.alvr.katana.features.explore.domain.di.featuresExploreDomainModule
+import dev.alvr.katana.features.explore.ui.di.featuresExploreUiModule
+import dev.alvr.katana.features.home.ui.di.featuresHomeUiModule
+import dev.alvr.katana.features.lists.data.di.featuresListsDataModule
+import dev.alvr.katana.features.lists.domain.di.featuresListsDomainModule
+import dev.alvr.katana.features.lists.ui.di.featuresListsUiModule
+import dev.alvr.katana.features.login.ui.di.featuresLoginUiModule
+import dev.alvr.katana.features.social.data.di.featuresSocialDataModule
+import dev.alvr.katana.features.social.domain.di.featuresSocialDomainModule
+import dev.alvr.katana.features.social.ui.di.featuresSocialUiModule
 import dev.alvr.katana.shared.viewmodel.MainViewModel
 import org.koin.core.module.dsl.factoryOf
 import org.koin.dsl.module
 
-private val uiMainModule = module {
+private val sharedModule = module {
     factoryOf(::MainViewModel)
 }
 
 val katanaModule = module {
     includes(
-        // Domain
-        domainAccountModule,
-        domainExploreModule,
-        domainListsModule,
-        domainSessionModule,
-        domainSocialModule,
-        domainUserModule,
-
-        // Data Preferences
-        dataPreferencesBaseModule,
-        dataPreferencesSessionModule,
-
-        // Data Remote
-        dataRemoteAccountModule,
-        dataRemoteExploreModule,
-        dataRemoteBaseModule,
-        dataRemoteListsModule,
-        dataRemoteSocialModule,
-        dataRemoteUserModule,
-
-        // Ui
-        uiAccountModule,
-        uiExploreModule,
-        uiListsModule,
-        uiLoginModule,
-        uiMainModule,
-        uiSocialModule,
+        // Core
+        coreCommonModule,
+        corePreferencesModule,
+        coreRemoteModule,
+
+        // Common Session
+        commonSessionDataModule,
+        commonSessionDomainModule,
+
+        // Common User
+        commonUserDataModule,
+        commonUserDomainModule,
+
+        // Feature Account
+        featuresAccountDataModule,
+        featuresAccountDomainModule,
+        featuresAccountUiModule,
+
+        // Feature Explore
+        featuresExploreDataModule,
+        featuresExploreDomainModule,
+        featuresExploreUiModule,
+
+        // Feature Home
+        featuresHomeUiModule,
+
+        // Feature Lists
+        featuresListsDataModule,
+        featuresListsDomainModule,
+        featuresListsUiModule,
+
+        // Feature Login
+        featuresLoginUiModule,
+
+        // Feature Social
+        featuresSocialDataModule,
+        featuresSocialDomainModule,
+        featuresSocialUiModule,
+
+        // Shared
+        sharedModule,
     )
 }

From 7dc5eede17a21bd754c96b18402c5f6e7ba652f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Salcedo=20Garc=C3=ADa?= <alvaro@alvr.dev>
Date: Sat, 9 Mar 2024 20:39:02 +0100
Subject: [PATCH 2/5] feat: add dispatchers to use cases

---
 .github/workflows/katana.yml                  | 25 +++++-----------
 .../usecases/ClearActiveSessionUseCase.kt     |  6 ++--
 .../usecases/DeleteAnilistTokenUseCase.kt     |  6 ++--
 .../domain/usecases/GetAnilistTokenUseCase.kt |  6 ++--
 .../session/domain/usecases/LogOutUseCase.kt  |  6 ++--
 .../usecases/ObserveActiveSessionUseCase.kt   |  4 ++-
 .../domain/usecases/SaveSessionUseCase.kt     |  6 ++--
 .../user/domain/usecases/GetUserIdUseCase.kt  |  6 ++--
 .../domain/usecases/ObserveUserInfoUseCase.kt |  4 ++-
 .../user/domain/usecases/SaveUserIdUseCase.kt |  6 ++--
 .../dev/alvr/katana/core/common/di/module.kt  |  3 +-
 .../core/domain/usecases/FlowUseCase.kt       | 29 ++++++++++---------
 .../katana/core/domain/usecases/UseCase.kt    | 20 ++++++++++---
 .../usecases/ObserveAnimeListUseCase.kt       |  4 ++-
 .../usecases/ObserveMangaListUseCase.kt       |  4 ++-
 .../domain/usecases/UpdateListUseCase.kt      |  6 ++--
 16 files changed, 83 insertions(+), 58 deletions(-)

diff --git a/.github/workflows/katana.yml b/.github/workflows/katana.yml
index 30705675b..622bdd391 100644
--- a/.github/workflows/katana.yml
+++ b/.github/workflows/katana.yml
@@ -55,6 +55,13 @@ jobs:
           gradle-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
       - name: Assemble Katana
         run: ./gradlew assembleDebug --no-daemon --stacktrace
+      - name: Upload debug artifacts
+        uses: actions/upload-artifact@v4.3.1
+        with:
+          name: Katana v${{ github.run_number }}
+          path: |
+            ${{ vars.ANDROID_DEBUG_APK }}
+          retention-days: 7
       - name: Upload compose reports artifact
         uses: actions/upload-artifact@v4.3.1
         if: always()
@@ -64,24 +71,6 @@ jobs:
             **/build/compose-metrics
             **/build/compose-reports
           retention-days: 7
-      - name: Upload Android APK
-        uses: rnkdsh/action-upload-diawi@v1.5.5
-        id: diawi_android
-        with:
-          token: ${{ secrets.DIAWI_TOKEN }}
-          file: ${{ vars.ANDROID_DEBUG_APK }}
-      - name: Post comment with Diawi link
-        uses: peter-evans/create-or-update-comment@v4.0.0
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            | Android                                       | iOS      |
-            |:---------------------------------------------:|:--------:|
-            | [Download APK (v${{ github.run_number }})][1] | Not yet. |
-            | ![2]                                          | Not yet. |
-
-            [1]: ${{ steps.diawi_android.outputs.url }}
-            [2]: https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=${{ steps.diawi_android.outputs.url }}
 
   static-analysis:
     name: Static analysis
diff --git a/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/ClearActiveSessionUseCase.kt b/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/ClearActiveSessionUseCase.kt
index 2faa848ed..727aef740 100644
--- a/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/ClearActiveSessionUseCase.kt
+++ b/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/ClearActiveSessionUseCase.kt
@@ -1,10 +1,12 @@
 package dev.alvr.katana.common.session.domain.usecases
 
 import dev.alvr.katana.common.session.domain.repositories.SessionRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.EitherUseCase
 
 class ClearActiveSessionUseCase(
+    dispatcher: KatanaDispatcher,
     private val repository: SessionRepository,
-) : EitherUseCase<Unit, Unit> {
-    override suspend fun invoke(params: Unit) = repository.clearActiveSession()
+) : EitherUseCase<Unit, Unit>(dispatcher) {
+    override suspend fun run(params: Unit) = repository.clearActiveSession()
 }
diff --git a/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/DeleteAnilistTokenUseCase.kt b/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/DeleteAnilistTokenUseCase.kt
index 437e9fcdb..da671a655 100644
--- a/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/DeleteAnilistTokenUseCase.kt
+++ b/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/DeleteAnilistTokenUseCase.kt
@@ -1,10 +1,12 @@
 package dev.alvr.katana.common.session.domain.usecases
 
 import dev.alvr.katana.common.session.domain.repositories.SessionRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.EitherUseCase
 
 class DeleteAnilistTokenUseCase(
+    dispatcher: KatanaDispatcher,
     private val repository: SessionRepository,
-) : EitherUseCase<Unit, Unit> {
-    override suspend fun invoke(params: Unit) = repository.deleteAnilistToken()
+) : EitherUseCase<Unit, Unit>(dispatcher) {
+    override suspend fun run(params: Unit) = repository.deleteAnilistToken()
 }
diff --git a/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/GetAnilistTokenUseCase.kt b/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/GetAnilistTokenUseCase.kt
index 9752c2e2d..3b0a707cd 100644
--- a/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/GetAnilistTokenUseCase.kt
+++ b/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/GetAnilistTokenUseCase.kt
@@ -2,10 +2,12 @@ package dev.alvr.katana.common.session.domain.usecases
 
 import dev.alvr.katana.common.session.domain.models.AnilistToken
 import dev.alvr.katana.common.session.domain.repositories.SessionRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.OptionUseCase
 
 class GetAnilistTokenUseCase(
+    dispatcher: KatanaDispatcher,
     private val repository: SessionRepository,
-) : OptionUseCase<Unit, AnilistToken> {
-    override suspend fun invoke(params: Unit) = repository.getAnilistToken()
+) : OptionUseCase<Unit, AnilistToken>(dispatcher) {
+    override suspend fun run(params: Unit) = repository.getAnilistToken()
 }
diff --git a/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/LogOutUseCase.kt b/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/LogOutUseCase.kt
index 318f62685..17a385b27 100644
--- a/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/LogOutUseCase.kt
+++ b/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/LogOutUseCase.kt
@@ -1,10 +1,12 @@
 package dev.alvr.katana.common.session.domain.usecases
 
 import dev.alvr.katana.common.session.domain.repositories.SessionRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.EitherUseCase
 
 class LogOutUseCase(
+    dispatcher: KatanaDispatcher,
     private val repository: SessionRepository,
-) : EitherUseCase<Unit, Unit> {
-    override suspend fun invoke(params: Unit) = repository.logout()
+) : EitherUseCase<Unit, Unit>(dispatcher) {
+    override suspend fun run(params: Unit) = repository.logout()
 }
diff --git a/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/ObserveActiveSessionUseCase.kt b/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/ObserveActiveSessionUseCase.kt
index 6e427e2df..f28487c6b 100644
--- a/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/ObserveActiveSessionUseCase.kt
+++ b/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/ObserveActiveSessionUseCase.kt
@@ -1,10 +1,12 @@
 package dev.alvr.katana.common.session.domain.usecases
 
 import dev.alvr.katana.common.session.domain.repositories.SessionRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.FlowEitherUseCase
 
 class ObserveActiveSessionUseCase(
+    dispatcher: KatanaDispatcher,
     private val repository: SessionRepository,
-) : FlowEitherUseCase<Unit, Boolean>() {
+) : FlowEitherUseCase<Unit, Boolean>(dispatcher) {
     override fun createFlow(params: Unit) = repository.sessionActive
 }
diff --git a/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/SaveSessionUseCase.kt b/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/SaveSessionUseCase.kt
index 83153eddc..7ec943182 100644
--- a/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/SaveSessionUseCase.kt
+++ b/common/session/domain/src/commonMain/kotlin/dev/alvr/katana/common/session/domain/usecases/SaveSessionUseCase.kt
@@ -2,10 +2,12 @@ package dev.alvr.katana.common.session.domain.usecases
 
 import dev.alvr.katana.common.session.domain.models.AnilistToken
 import dev.alvr.katana.common.session.domain.repositories.SessionRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.EitherUseCase
 
 class SaveSessionUseCase(
+    dispatcher: KatanaDispatcher,
     private val repository: SessionRepository,
-) : EitherUseCase<AnilistToken, Unit> {
-    override suspend fun invoke(token: AnilistToken) = repository.saveSession(token)
+) : EitherUseCase<AnilistToken, Unit>(dispatcher) {
+    override suspend fun run(params: AnilistToken) = repository.saveSession(params)
 }
diff --git a/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/usecases/GetUserIdUseCase.kt b/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/usecases/GetUserIdUseCase.kt
index ce94ba872..52e12f6ee 100644
--- a/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/usecases/GetUserIdUseCase.kt
+++ b/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/usecases/GetUserIdUseCase.kt
@@ -2,10 +2,12 @@ package dev.alvr.katana.common.user.domain.usecases
 
 import dev.alvr.katana.common.user.domain.models.UserId
 import dev.alvr.katana.common.user.domain.repositories.UserRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.EitherUseCase
 
 class GetUserIdUseCase(
+    dispatcher: KatanaDispatcher,
     private val repository: UserRepository,
-) : EitherUseCase<Unit, UserId> {
-    override suspend fun invoke(params: Unit) = repository.getUserId()
+) : EitherUseCase<Unit, UserId>(dispatcher) {
+    override suspend fun run(params: Unit) = repository.getUserId()
 }
diff --git a/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/usecases/ObserveUserInfoUseCase.kt b/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/usecases/ObserveUserInfoUseCase.kt
index e308fdb1d..5563cfae5 100644
--- a/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/usecases/ObserveUserInfoUseCase.kt
+++ b/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/usecases/ObserveUserInfoUseCase.kt
@@ -2,10 +2,12 @@ package dev.alvr.katana.common.user.domain.usecases
 
 import dev.alvr.katana.common.user.domain.models.UserInfo
 import dev.alvr.katana.common.user.domain.repositories.UserRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.FlowEitherUseCase
 
 class ObserveUserInfoUseCase(
+    dispatcher: KatanaDispatcher,
     private val repository: UserRepository,
-) : FlowEitherUseCase<Unit, UserInfo>() {
+) : FlowEitherUseCase<Unit, UserInfo>(dispatcher) {
     override fun createFlow(params: Unit) = repository.userInfo
 }
diff --git a/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/usecases/SaveUserIdUseCase.kt b/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/usecases/SaveUserIdUseCase.kt
index 457c39e8c..e000cc1ed 100644
--- a/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/usecases/SaveUserIdUseCase.kt
+++ b/common/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/usecases/SaveUserIdUseCase.kt
@@ -1,10 +1,12 @@
 package dev.alvr.katana.common.user.domain.usecases
 
 import dev.alvr.katana.common.user.domain.repositories.UserRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.EitherUseCase
 
 class SaveUserIdUseCase(
+    dispatcher: KatanaDispatcher,
     private val repository: UserRepository,
-) : EitherUseCase<Unit, Unit> {
-    override suspend fun invoke(params: Unit) = repository.saveUserId()
+) : EitherUseCase<Unit, Unit>(dispatcher) {
+    override suspend fun run(params: Unit) = repository.saveUserId()
 }
diff --git a/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/di/module.kt b/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/di/module.kt
index 2258f8feb..0e6784498 100644
--- a/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/di/module.kt
+++ b/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/di/module.kt
@@ -1,9 +1,8 @@
 package dev.alvr.katana.core.common.di
 
 import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
-import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 val coreCommonModule = module {
-    singleOf(::KatanaDispatcher)
+    single { KatanaDispatcher() }
 }
diff --git a/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/FlowUseCase.kt b/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/FlowUseCase.kt
index 971759f32..7d6d843b4 100644
--- a/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/FlowUseCase.kt
+++ b/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/FlowUseCase.kt
@@ -2,6 +2,7 @@ package dev.alvr.katana.core.domain.usecases
 
 import arrow.core.Either
 import arrow.core.Option
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.failures.Failure
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.BufferOverflow
@@ -9,33 +10,33 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
-
-sealed interface FlowUseCase<in P, out R> : (P) -> Unit {
-    val flow: Flow<R>
-}
-
-operator fun <R> FlowUseCase<Unit, R>.invoke() {
-    invoke(Unit)
-}
+import kotlinx.coroutines.flow.flowOn
 
 @OptIn(ExperimentalCoroutinesApi::class)
-sealed class BaseFlowUseCase<in P, out R> : FlowUseCase<P, R> {
+sealed class FlowUseCase<in P, out R>(dispatcher: KatanaDispatcher) {
     private val paramState = MutableSharedFlow<P>(
         replay = 1,
         extraBufferCapacity = 1,
         onBufferOverflow = BufferOverflow.DROP_OLDEST,
     )
 
-    override val flow: Flow<R> = paramState.flatMapLatest {
+    val flow: Flow<R> = paramState.flatMapLatest {
         createFlow(it).distinctUntilChanged()
-    }
+    }.flowOn(dispatcher.io)
 
     protected abstract fun createFlow(params: P): Flow<R>
 
-    override operator fun invoke(params: P) {
+    operator fun invoke(params: P) {
         paramState.tryEmit(params)
     }
 }
 
-abstract class FlowEitherUseCase<in P, out R> : BaseFlowUseCase<P, Either<Failure, R>>()
-abstract class FlowOptionUseCase<in P, out R> : BaseFlowUseCase<P, Option<R>>()
+operator fun <R> FlowUseCase<Unit, R>.invoke() {
+    invoke(Unit)
+}
+
+abstract class FlowEitherUseCase<in P, out R>(dispatcher: KatanaDispatcher) :
+    FlowUseCase<P, Either<Failure, R>>(dispatcher)
+
+abstract class FlowOptionUseCase<in P, out R>(dispatcher: KatanaDispatcher) :
+    FlowUseCase<P, Option<R>>(dispatcher)
diff --git a/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/UseCase.kt b/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/UseCase.kt
index 746079f15..bbb721a12 100644
--- a/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/UseCase.kt
+++ b/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/UseCase.kt
@@ -2,17 +2,29 @@ package dev.alvr.katana.core.domain.usecases
 
 import arrow.core.Either
 import arrow.core.Option
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.failures.Failure
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+
+sealed class UseCase<in P, out R>(private val dispatcher: KatanaDispatcher) {
+
+    abstract suspend fun run(params: P): R
+
+    suspend operator fun invoke(params: P): R = withContext(dispatcher.io) {
+        run(params)
+    }
 
-sealed interface UseCase<in P, out R> : suspend (P) -> R {
     fun sync(params: P): R = runBlocking {
         invoke(params)
     }
 }
 
-interface EitherUseCase<in P, out R> : UseCase<P, Either<Failure, R>>
-interface OptionUseCase<in P, out R> : UseCase<P, Option<R>>
+abstract class EitherUseCase<in P, out R>(dispatcher: KatanaDispatcher) :
+    UseCase<P, Either<Failure, R>>(dispatcher)
+
+abstract class OptionUseCase<in P, out R>(dispatcher: KatanaDispatcher) :
+    UseCase<P, Option<R>>(dispatcher)
 
-suspend operator fun <R> UseCase<Unit, R>.invoke(): R = this(Unit)
+suspend operator fun <R> UseCase<Unit, R>.invoke(): R = invoke(Unit)
 fun <R> UseCase<Unit, R>.sync(): R = sync(Unit)
diff --git a/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveAnimeListUseCase.kt b/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveAnimeListUseCase.kt
index 4f7553543..86c36efd6 100644
--- a/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveAnimeListUseCase.kt
+++ b/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveAnimeListUseCase.kt
@@ -1,12 +1,14 @@
 package dev.alvr.katana.features.lists.domain.usecases
 
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.FlowEitherUseCase
 import dev.alvr.katana.features.lists.domain.models.MediaCollection
 import dev.alvr.katana.features.lists.domain.models.entries.MediaEntry
 import dev.alvr.katana.features.lists.domain.repositories.ListsRepository
 
 class ObserveAnimeListUseCase(
+    dispatcher: KatanaDispatcher,
     private val repository: ListsRepository,
-) : FlowEitherUseCase<Unit, MediaCollection<MediaEntry.Anime>>() {
+) : FlowEitherUseCase<Unit, MediaCollection<MediaEntry.Anime>>(dispatcher) {
     override fun createFlow(params: Unit) = repository.animeCollection
 }
diff --git a/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveMangaListUseCase.kt b/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveMangaListUseCase.kt
index 47b9896b9..2a73549b5 100644
--- a/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveMangaListUseCase.kt
+++ b/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveMangaListUseCase.kt
@@ -1,12 +1,14 @@
 package dev.alvr.katana.features.lists.domain.usecases
 
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.FlowEitherUseCase
 import dev.alvr.katana.features.lists.domain.models.MediaCollection
 import dev.alvr.katana.features.lists.domain.models.entries.MediaEntry
 import dev.alvr.katana.features.lists.domain.repositories.ListsRepository
 
 class ObserveMangaListUseCase(
+    dispatcher: KatanaDispatcher,
     private val repository: ListsRepository,
-) : FlowEitherUseCase<Unit, MediaCollection<MediaEntry.Manga>>() {
+) : FlowEitherUseCase<Unit, MediaCollection<MediaEntry.Manga>>(dispatcher) {
     override fun createFlow(params: Unit) = repository.mangaCollection
 }
diff --git a/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/usecases/UpdateListUseCase.kt b/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/usecases/UpdateListUseCase.kt
index 1b9e691af..8429d4ac2 100644
--- a/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/usecases/UpdateListUseCase.kt
+++ b/features/lists/domain/src/commonMain/kotlin/dev/alvr/katana/features/lists/domain/usecases/UpdateListUseCase.kt
@@ -1,11 +1,13 @@
 package dev.alvr.katana.features.lists.domain.usecases
 
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.EitherUseCase
 import dev.alvr.katana.features.lists.domain.models.lists.MediaList
 import dev.alvr.katana.features.lists.domain.repositories.ListsRepository
 
 class UpdateListUseCase(
+    dispatcher: KatanaDispatcher,
     private val repository: ListsRepository,
-) : EitherUseCase<MediaList, Unit> {
-    override suspend fun invoke(entry: MediaList) = repository.updateList(entry)
+) : EitherUseCase<MediaList, Unit>(dispatcher) {
+    override suspend fun run(params: MediaList) = repository.updateList(params)
 }

From 9125b132821afd70c1994b6b9861d2b1a26705c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Salcedo=20Garc=C3=ADa?= <alvaro@alvr.dev>
Date: Sun, 10 Mar 2024 13:22:40 +0100
Subject: [PATCH 3/5] feat: bottom bar navigation

---
 ...atanaMultiplatformDataPreferencesPlugin.kt |   1 +
 build.gradle.kts                              |   1 +
 common/session/data/build.gradle.kts          |   1 -
 core/preferences/build.gradle.kts             |   1 -
 core/ui/build.gradle.kts                      |   1 +
 .../navigation/KatanaNavigationBar.kt         | 107 ++++++++++++++++++
 .../navigation/KatanaNavigationBarItem.kt     |  11 ++
 .../alvr/katana/core/ui/utils/landscape.kt    |  10 ++
 gradle/libs.versions.toml                     |  32 +++---
 shared/build.gradle.kts                       |   3 +-
 10 files changed, 147 insertions(+), 21 deletions(-)
 create mode 100644 core/ui/src/commonMain/kotlin/dev/alvr/katana/core/ui/components/navigation/KatanaNavigationBar.kt
 create mode 100644 core/ui/src/commonMain/kotlin/dev/alvr/katana/core/ui/components/navigation/KatanaNavigationBarItem.kt
 create mode 100644 core/ui/src/commonMain/kotlin/dev/alvr/katana/core/ui/utils/landscape.kt

diff --git a/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/mp/mobile/data/KatanaMultiplatformDataPreferencesPlugin.kt b/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/mp/mobile/data/KatanaMultiplatformDataPreferencesPlugin.kt
index 2207043ae..1bebbe9b1 100644
--- a/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/mp/mobile/data/KatanaMultiplatformDataPreferencesPlugin.kt
+++ b/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/mp/mobile/data/KatanaMultiplatformDataPreferencesPlugin.kt
@@ -14,6 +14,7 @@ internal class KatanaMultiplatformDataPreferencesPlugin : Plugin<Project> {
 
     override fun apply(target: Project) = with(target) {
         apply(plugin = "katana.multiplatform.mobile")
+        apply(plugin = "org.jetbrains.kotlin.plugin.serialization")
 
         with(extensions) {
             configure<KotlinMultiplatformExtension> { configureMultiplatform() }
diff --git a/build.gradle.kts b/build.gradle.kts
index 00bdfbb7a..f9ed3d9d1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,4 +16,5 @@ plugins {
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.mokkery) apply false
     alias(libs.plugins.sentry) apply false
+    alias(libs.plugins.serialization) apply false
 }
diff --git a/common/session/data/build.gradle.kts b/common/session/data/build.gradle.kts
index 32bbfbdde..6ec9f8de3 100644
--- a/common/session/data/build.gradle.kts
+++ b/common/session/data/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     id("katana.multiplatform.data.preferences")
-    alias(libs.plugins.serialization)
 }
 
 katanaMultiplatform {
diff --git a/core/preferences/build.gradle.kts b/core/preferences/build.gradle.kts
index 50540e6b1..55240e6f6 100644
--- a/core/preferences/build.gradle.kts
+++ b/core/preferences/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     id("katana.multiplatform.data.preferences")
-    alias(libs.plugins.serialization)
 }
 
 katanaMultiplatform {
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
index f2f517f06..b607bdbd5 100644
--- a/core/ui/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -6,6 +6,7 @@ katanaMultiplatform {
     commonMainDependencies {
         implementation(projects.core.common)
         implementation(libs.compose.placeholder)
+        implementation(libs.compose.windowsize)
         implementation(libs.materialkolor)
     }
 
diff --git a/core/ui/src/commonMain/kotlin/dev/alvr/katana/core/ui/components/navigation/KatanaNavigationBar.kt b/core/ui/src/commonMain/kotlin/dev/alvr/katana/core/ui/components/navigation/KatanaNavigationBar.kt
new file mode 100644
index 000000000..43a900a15
--- /dev/null
+++ b/core/ui/src/commonMain/kotlin/dev/alvr/katana/core/ui/components/navigation/KatanaNavigationBar.kt
@@ -0,0 +1,107 @@
+package dev.alvr.katana.core.ui.components.navigation
+
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.material3.Icon
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.NavigationRail
+import androidx.compose.material3.NavigationRailItem
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import dev.alvr.katana.core.ui.utils.isLandscape
+import kotlinx.collections.immutable.ImmutableList
+
+@Composable
+fun <T : KatanaNavigationBarItem> KatanaNavigationBar(
+    items: ImmutableList<T>,
+    type: KatanaNavigationBarType,
+    isSelected: (T) -> Boolean,
+    onClick: (T) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val isLandscape = isLandscape()
+
+    when {
+        type == KatanaNavigationBarType.Bottom && !isLandscape -> BottomNavigationBar(
+            items = items,
+            isSelected = isSelected,
+            onClick = onClick,
+            modifier = modifier,
+        )
+
+        type == KatanaNavigationBarType.Rail && isLandscape -> RailNavigationBar(
+            items = items,
+            isSelected = isSelected,
+            onClick = onClick,
+            modifier = modifier,
+        )
+    }
+}
+
+@Composable
+private fun <T : KatanaNavigationBarItem> BottomNavigationBar(
+    items: ImmutableList<T>,
+    isSelected: (T) -> Boolean,
+    onClick: (T) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    NavigationBar(modifier = modifier) {
+        items.forEach { item ->
+            val selected = isSelected(item)
+
+            NavigationBarItem(
+                icon = { NavigationBarIcon(item, selected) },
+                label = { NavigationBarLabel(item) },
+                selected = selected,
+                onClick = { onClick(item) },
+                alwaysShowLabel = false,
+            )
+        }
+    }
+}
+
+@Composable
+private fun <T : KatanaNavigationBarItem> RailNavigationBar(
+    items: ImmutableList<T>,
+    isSelected: (T) -> Boolean,
+    onClick: (T) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    NavigationRail(modifier = modifier) {
+        Spacer(Modifier.weight(1f))
+        items.forEach { item ->
+            val selected = isSelected(item)
+
+            NavigationRailItem(
+                icon = { NavigationBarIcon(item, selected) },
+                label = { NavigationBarLabel(item) },
+                selected = selected,
+                onClick = { onClick(item) },
+                alwaysShowLabel = false,
+            )
+        }
+        Spacer(Modifier.weight(1f))
+    }
+}
+
+@Composable
+private fun NavigationBarIcon(
+    destination: KatanaNavigationBarItem,
+    selected: Boolean,
+) {
+    Icon(
+        imageVector = if (selected) destination.selectedIcon else destination.unselectedIcon,
+        contentDescription = destination.label,
+    )
+}
+
+@Composable
+private fun NavigationBarLabel(destination: KatanaNavigationBarItem) {
+    Text(text = destination.label)
+}
+
+enum class KatanaNavigationBarType {
+    Bottom,
+    Rail,
+}
diff --git a/core/ui/src/commonMain/kotlin/dev/alvr/katana/core/ui/components/navigation/KatanaNavigationBarItem.kt b/core/ui/src/commonMain/kotlin/dev/alvr/katana/core/ui/components/navigation/KatanaNavigationBarItem.kt
new file mode 100644
index 000000000..9a33b5788
--- /dev/null
+++ b/core/ui/src/commonMain/kotlin/dev/alvr/katana/core/ui/components/navigation/KatanaNavigationBarItem.kt
@@ -0,0 +1,11 @@
+package dev.alvr.katana.core.ui.components.navigation
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.vector.ImageVector
+
+interface KatanaNavigationBarItem {
+    val key: Any
+    val selectedIcon: ImageVector
+    val unselectedIcon: ImageVector
+    @get:Composable val label: String
+}
diff --git a/core/ui/src/commonMain/kotlin/dev/alvr/katana/core/ui/utils/landscape.kt b/core/ui/src/commonMain/kotlin/dev/alvr/katana/core/ui/utils/landscape.kt
new file mode 100644
index 000000000..b9592227b
--- /dev/null
+++ b/core/ui/src/commonMain/kotlin/dev/alvr/katana/core/ui/utils/landscape.kt
@@ -0,0 +1,10 @@
+package dev.alvr.katana.core.ui.utils
+
+import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
+import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
+import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
+import androidx.compose.runtime.Composable
+
+@Composable
+@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
+fun isLandscape() = calculateWindowSizeClass().widthSizeClass > WindowWidthSizeClass.Medium
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 469dcfc88..082ec44f7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,12 +1,16 @@
 [versions]
-activity = "1.8.2"
-android = "8.3.0"
+android = "8.2.2"
+androidx-activity = "1.8.2"
+androidx-lifecycle = "2.7.0"
+androidx-splashscreen = "1.0.1"
 apollo = "3.8.2"
 arrow = "1.2.3"
 buildconfig = "5.3.5"
 complete-kotlin = "1.1.0"
 compose = "1.6.0"
 compose-compiler = "1.5.10.1"
+compose-placeholder = "1.0.7"
+compose-windowsize = "0.5.0"
 datastore = "1.1.0-beta02"
 destinations = "1.10.2"
 detekt = "1.23.5"
@@ -27,8 +31,7 @@ kotlinx-serialization = "1.6.3"
 kover = "0.7.6"
 ksp = "1.9.23-1.0.19"
 ktor = "2.3.9"
-lifecycle = "2.7.0"
-lyricist = "1.6.2-1.8.20"
+lyricist = "1.6.2"
 materialkolor = "1.4.3"
 mockk = "1.13.10"
 mokkery = "1.9.23-1.5.0"
@@ -36,14 +39,11 @@ okio = "3.9.0"
 orbit = "6.1.1"
 parcelable = "1.3.0"
 parcelize = "0.2.4"
-placeholder = "1.0.7"
 sentry = "7.6.0"
 sentry-multiplatform = "0.5.0"
 sentry-plugin = "4.3.1"
-splashscreen = "1.0.1"
 tink = "1.12.0"
 turbine = "1.1.0"
-window-size = "0.5.0"
 yamlbeans = "1.17"
 
 [plugins]
@@ -65,8 +65,10 @@ serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref
 
 [libraries]
 # AndroidX
-androidx-activity = { module = "androidx.activity:activity-compose", version.ref = "activity" }
-androidx-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "splashscreen" }
+androidx-activity = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
+androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
+androidx-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidx-splashscreen" }
 
 # Apollo
 apollo = { module = "com.apollographql.apollo3:apollo-runtime", version.ref = "apollo" }
@@ -79,8 +81,8 @@ arrow = { module = "io.arrow-kt:arrow-core", version.ref = "arrow" }
 
 # Compose
 compose-compiler = { module = "org.jetbrains.compose.compiler:compiler", version.ref = "compose-compiler" }
-compose-material3-windowsize = { module = "dev.chrisbanes.material3:material3-window-size-class-multiplatform", version.ref = "window-size" }
-compose-placeholder = { module = "com.eygraber:compose-placeholder-material3", version.ref = "placeholder" }
+compose-placeholder = { module = "com.eygraber:compose-placeholder-material3", version.ref = "compose-placeholder" }
+compose-windowsize = { module = "dev.chrisbanes.material3:material3-window-size-class-multiplatform", version.ref = "compose-windowsize" }
 
 # Datastore
 datastore = { module = "androidx.datastore:datastore", version.ref = "datastore" }
@@ -139,10 +141,6 @@ kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
 ktor-android = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
 ktor-ios = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
 
-# Lifecycle
-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle" }
-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "lifecycle" }
-
 # Lyricist
 lyricist = { module = "cafe.adriel.lyricist:lyricist", version.ref = "lyricist" }
 
@@ -318,8 +316,8 @@ ui-common = [
 ui-android = [
     "destinations",
     "koin-compose-android",
-    "lifecycle-runtime",
-    "lifecycle-viewmodel",
+    "androidx-lifecycle-runtime",
+    "androidx-lifecycle-viewmodel",
 ]
 ui-ios = []
 
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index f4ea9a47f..9ee35e3e9 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -35,8 +35,7 @@ katanaMultiplatform {
         api(projects.features.social.domain)
         api(projects.features.social.ui)
 
-        api(libs.compose.material3.windowsize)
-        api(libs.sentry.multiplatform)
+        implementation(libs.sentry.multiplatform)
     }
 
     androidMainDependencies {

From 1b960837c31843c2d9fd0e971f284d352c6b4503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Salcedo=20Garc=C3=ADa?= <alvaro@alvr.dev>
Date: Sun, 10 Mar 2024 18:08:33 +0100
Subject: [PATCH 4/5] chore: enable strong skipping

---
 .../mp/mobile/ui/KatanaMultiplatformComposePlugin.kt       | 2 ++
 gradle.properties                                          | 1 +
 .../kotlin/dev/alvr/katana/shared/KatanaApp.android.kt     | 7 ++-----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/mp/mobile/ui/KatanaMultiplatformComposePlugin.kt b/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/mp/mobile/ui/KatanaMultiplatformComposePlugin.kt
index db1fb3da9..a3098cdda 100644
--- a/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/mp/mobile/ui/KatanaMultiplatformComposePlugin.kt
+++ b/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/mp/mobile/ui/KatanaMultiplatformComposePlugin.kt
@@ -91,6 +91,8 @@ internal class KatanaMultiplatformComposePlugin : Plugin<Project> {
 
         kotlinCompilerPluginArgs.set(
             buildList {
+                add("experimentalStrongSkipping=${composePluginEnabled("katana.strongSkipping")}")
+
                 if (composePluginEnabled("katana.enableComposeCompilerMetrics")) {
                     add("metricsDestination=${composePluginDir("compose-metrics")}")
                 }
diff --git a/gradle.properties b/gradle.properties
index 68e2bcca0..7ae50ebdd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,7 @@
 # Katana
 katana.enableComposeCompilerMetrics=true
 katana.enableComposeCompilerReports=true
+katana.strongSkipping=true
 
 # Android
 android.enableJetifier=false
diff --git a/shared/src/androidMain/kotlin/dev/alvr/katana/shared/KatanaApp.android.kt b/shared/src/androidMain/kotlin/dev/alvr/katana/shared/KatanaApp.android.kt
index 588aa1533..9ab833669 100644
--- a/shared/src/androidMain/kotlin/dev/alvr/katana/shared/KatanaApp.android.kt
+++ b/shared/src/androidMain/kotlin/dev/alvr/katana/shared/KatanaApp.android.kt
@@ -1,17 +1,14 @@
 package dev.alvr.katana.shared
 
-import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
-import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
-import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.compose.runtime.Composable
+import dev.alvr.katana.core.ui.utils.isLandscape
 import dev.alvr.katana.shared.navigation.KatanaDestinations
 import org.koin.androidx.compose.koinViewModel
 
 @Composable
-@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
 internal actual fun KatanaContent() {
     KatanaDestinations(
-        useNavRail = calculateWindowSizeClass().widthSizeClass > WindowWidthSizeClass.Medium,
+        useNavRail = isLandscape(),
         vm = koinViewModel(),
     )
 }

From 28b90702d2fcfc8985ec27f301664606e4a78b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Salcedo=20Garc=C3=ADa?= <alvaro@alvr.dev>
Date: Sun, 10 Mar 2024 23:40:01 +0100
Subject: [PATCH 5/5] fix: tests

---
 .../data/datastore/SessionDataStoreTest.kt    |  6 +++---
 .../usecases/ClearActiveSessionUseCaseTest.kt | 17 +++++++++++++--
 .../usecases/DeleteAnilistTokenUseCaseTest.kt | 17 +++++++++++++--
 .../usecases/GetAnilistTokenUseCaseTest.kt    | 17 +++++++++++++--
 .../domain/usecases/LogOutUseCaseTest.kt      | 17 +++++++++++++--
 .../ObserveActiveSessionUseCaseTest.kt        | 17 +++++++++++++--
 .../usecases/SaveAnilistTokenUseCaseTest.kt   | 17 +++++++++++++--
 .../alvr/katana/common/user/data/di/module.kt | 18 ++++++++++++++++
 .../user/data/managers/UserIdManagerTest.kt   | 18 +++++++++-------
 .../domain/usecases/GetUserIdUseCaseTest.kt   | 17 +++++++++++++--
 .../usecases/ObserveUserInfoUseCaseTest.kt    | 17 +++++++++++++--
 .../domain/usecases/SaveUserIdUseCaseTest.kt  | 17 +++++++++++++--
 .../common/coroutines/AppKatanaDispatcher.kt  | 10 +++++++++
 .../common/coroutines/KatanaDispatcher.kt     | 15 +++++--------
 .../dev/alvr/katana/core/common/di/module.kt  |  9 +++++++-
 .../core/domain/usecases/FlowUseCase.kt       |  2 +-
 .../katana/core/domain/usecases/UseCase.kt    |  2 +-
 core/tests/build.gradle.kts                   |  2 ++
 .../alvr/katana/core/tests/KoinExtension.kt   | 21 +++++++++----------
 .../tests/coroutines/TestKatanaDispatcher.kt  | 13 ++++++++++++
 .../dev/alvr/katana/core/tests/di/module.kt   | 15 +++++++++++++
 .../usecases/ObserveAnimeListUseCaseTest.kt   | 17 +++++++++++++--
 .../usecases/ObserveMangaListUseCaseTest.kt   | 17 +++++++++++++--
 .../domain/usecases/UpdateListUseCaseTest.kt  | 17 +++++++++++++--
 gradle/libs.versions.toml                     |  2 +-
 25 files changed, 278 insertions(+), 59 deletions(-)
 create mode 100644 common/user/data/src/commonTest/kotlin/dev/alvr/katana/common/user/data/di/module.kt
 create mode 100644 core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/coroutines/AppKatanaDispatcher.kt
 create mode 100644 core/tests/src/commonMain/kotlin/dev/alvr/katana/core/tests/coroutines/TestKatanaDispatcher.kt
 create mode 100644 core/tests/src/commonMain/kotlin/dev/alvr/katana/core/tests/di/module.kt

diff --git a/common/session/data/src/commonTest/kotlin/dev/alvr/katana/common/session/data/datastore/SessionDataStoreTest.kt b/common/session/data/src/commonTest/kotlin/dev/alvr/katana/common/session/data/datastore/SessionDataStoreTest.kt
index 76ebbcbd7..8f275f115 100644
--- a/common/session/data/src/commonTest/kotlin/dev/alvr/katana/common/session/data/datastore/SessionDataStoreTest.kt
+++ b/common/session/data/src/commonTest/kotlin/dev/alvr/katana/common/session/data/datastore/SessionDataStoreTest.kt
@@ -8,7 +8,7 @@ import dev.alvr.katana.common.session.data.di.deleteDataStoreFiles
 import dev.alvr.katana.common.session.data.di.testDataStoreModule
 import dev.alvr.katana.common.session.data.models.Session
 import dev.alvr.katana.common.session.domain.models.AnilistToken
-import dev.alvr.katana.core.tests.KoinExtension
+import dev.alvr.katana.core.tests.koinExtension
 import io.kotest.core.spec.style.FreeSpec
 import io.kotest.core.test.TestCase
 import io.kotest.matchers.equals.shouldBeEqual
@@ -55,9 +55,9 @@ internal class SessionDataStoreTest : FreeSpec(), KoinTest {
         }
     }
 
-    override fun extensions() = listOf(KoinExtension(testDataStoreModule()))
-
     override suspend fun beforeEach(testCase: TestCase) {
         deleteDataStoreFiles()
     }
+
+    override fun extensions() = listOf(koinExtension(testDataStoreModule()))
 }
diff --git a/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/ClearActiveSessionUseCaseTest.kt b/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/ClearActiveSessionUseCaseTest.kt
index 99bd8c226..1fdedb156 100644
--- a/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/ClearActiveSessionUseCaseTest.kt
+++ b/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/ClearActiveSessionUseCaseTest.kt
@@ -4,8 +4,11 @@ import arrow.core.left
 import arrow.core.right
 import dev.alvr.katana.common.session.domain.failures.SessionFailure
 import dev.alvr.katana.common.session.domain.repositories.SessionRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.failures.Failure
 import dev.alvr.katana.core.domain.usecases.invoke
+import dev.alvr.katana.core.tests.di.coreTestsModule
+import dev.alvr.katana.core.tests.koinExtension
 import dev.alvr.katana.core.tests.shouldBeLeft
 import dev.alvr.katana.core.tests.shouldBeRight
 import dev.mokkery.answering.returns
@@ -13,11 +16,15 @@ import dev.mokkery.everySuspend
 import dev.mokkery.mock
 import dev.mokkery.verifySuspend
 import io.kotest.core.spec.style.FreeSpec
+import io.kotest.core.test.TestCase
+import org.koin.test.KoinTest
+import org.koin.test.inject
 
-internal class ClearActiveSessionUseCaseTest : FreeSpec() {
+internal class ClearActiveSessionUseCaseTest : FreeSpec(), KoinTest {
+    private val dispatcher by inject<KatanaDispatcher>()
     private val repo = mock<SessionRepository>()
 
-    private val useCase = ClearActiveSessionUseCase(repo)
+    private lateinit var useCase: ClearActiveSessionUseCase
 
     init {
         "successfully clearing the session" {
@@ -37,4 +44,10 @@ internal class ClearActiveSessionUseCaseTest : FreeSpec() {
             }
         }
     }
+
+    override suspend fun beforeEach(testCase: TestCase) {
+        useCase = ClearActiveSessionUseCase(dispatcher, repo)
+    }
+
+    override fun extensions() = listOf(koinExtension(coreTestsModule))
 }
diff --git a/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/DeleteAnilistTokenUseCaseTest.kt b/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/DeleteAnilistTokenUseCaseTest.kt
index b49da20ae..266f29cfb 100644
--- a/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/DeleteAnilistTokenUseCaseTest.kt
+++ b/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/DeleteAnilistTokenUseCaseTest.kt
@@ -4,8 +4,11 @@ import arrow.core.left
 import arrow.core.right
 import dev.alvr.katana.common.session.domain.failures.SessionFailure
 import dev.alvr.katana.common.session.domain.repositories.SessionRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.failures.Failure
 import dev.alvr.katana.core.domain.usecases.invoke
+import dev.alvr.katana.core.tests.di.coreTestsModule
+import dev.alvr.katana.core.tests.koinExtension
 import dev.alvr.katana.core.tests.shouldBeLeft
 import dev.alvr.katana.core.tests.shouldBeRight
 import dev.mokkery.answering.returns
@@ -13,11 +16,15 @@ import dev.mokkery.everySuspend
 import dev.mokkery.mock
 import dev.mokkery.verifySuspend
 import io.kotest.core.spec.style.FreeSpec
+import io.kotest.core.test.TestCase
+import org.koin.test.KoinTest
+import org.koin.test.inject
 
-internal class DeleteAnilistTokenUseCaseTest : FreeSpec() {
+internal class DeleteAnilistTokenUseCaseTest : FreeSpec(), KoinTest {
+    private val dispatcher by inject<KatanaDispatcher>()
     private val repo = mock<SessionRepository>()
 
-    private val useCase = DeleteAnilistTokenUseCase(repo)
+    private lateinit var useCase: DeleteAnilistTokenUseCase
 
     init {
         "successfully deleting the token" {
@@ -37,4 +44,10 @@ internal class DeleteAnilistTokenUseCaseTest : FreeSpec() {
             }
         }
     }
+
+    override suspend fun beforeEach(testCase: TestCase) {
+        useCase = DeleteAnilistTokenUseCase(dispatcher, repo)
+    }
+
+    override fun extensions() = listOf(koinExtension(coreTestsModule))
 }
diff --git a/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/GetAnilistTokenUseCaseTest.kt b/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/GetAnilistTokenUseCaseTest.kt
index 9e9e00c5a..b568f2a57 100644
--- a/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/GetAnilistTokenUseCaseTest.kt
+++ b/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/GetAnilistTokenUseCaseTest.kt
@@ -4,7 +4,10 @@ import arrow.core.none
 import arrow.core.some
 import dev.alvr.katana.common.session.domain.anilistTokenMock
 import dev.alvr.katana.common.session.domain.repositories.SessionRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.invoke
+import dev.alvr.katana.core.tests.di.coreTestsModule
+import dev.alvr.katana.core.tests.koinExtension
 import dev.alvr.katana.core.tests.shouldBeNone
 import dev.alvr.katana.core.tests.shouldBeSome
 import dev.mokkery.answering.returns
@@ -12,11 +15,15 @@ import dev.mokkery.everySuspend
 import dev.mokkery.mock
 import dev.mokkery.verifySuspend
 import io.kotest.core.spec.style.FreeSpec
+import io.kotest.core.test.TestCase
+import org.koin.test.KoinTest
+import org.koin.test.inject
 
-internal class GetAnilistTokenUseCaseTest : FreeSpec() {
+internal class GetAnilistTokenUseCaseTest : FreeSpec(), KoinTest {
+    private val dispatcher by inject<KatanaDispatcher>()
     private val repo = mock<SessionRepository>()
 
-    private val useCase = GetAnilistTokenUseCase(repo)
+    private lateinit var useCase: GetAnilistTokenUseCase
 
     init {
         "successfully getting the token" {
@@ -31,4 +38,10 @@ internal class GetAnilistTokenUseCaseTest : FreeSpec() {
             verifySuspend { repo.getAnilistToken() }
         }
     }
+
+    override suspend fun beforeEach(testCase: TestCase) {
+        useCase = GetAnilistTokenUseCase(dispatcher, repo)
+    }
+
+    override fun extensions() = listOf(koinExtension(coreTestsModule))
 }
diff --git a/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/LogOutUseCaseTest.kt b/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/LogOutUseCaseTest.kt
index 1a9ce78e3..c562c56c8 100644
--- a/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/LogOutUseCaseTest.kt
+++ b/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/LogOutUseCaseTest.kt
@@ -4,8 +4,11 @@ import arrow.core.left
 import arrow.core.right
 import dev.alvr.katana.common.session.domain.failures.SessionFailure
 import dev.alvr.katana.common.session.domain.repositories.SessionRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.failures.Failure
 import dev.alvr.katana.core.domain.usecases.invoke
+import dev.alvr.katana.core.tests.di.coreTestsModule
+import dev.alvr.katana.core.tests.koinExtension
 import dev.alvr.katana.core.tests.shouldBeLeft
 import dev.alvr.katana.core.tests.shouldBeRight
 import dev.mokkery.answering.returns
@@ -13,11 +16,15 @@ import dev.mokkery.everySuspend
 import dev.mokkery.mock
 import dev.mokkery.verifySuspend
 import io.kotest.core.spec.style.FreeSpec
+import io.kotest.core.test.TestCase
+import org.koin.test.KoinTest
+import org.koin.test.inject
 
-internal class LogOutUseCaseTest : FreeSpec() {
+internal class LogOutUseCaseTest : FreeSpec(), KoinTest {
+    private val dispatcher by inject<KatanaDispatcher>()
     private val repo = mock<SessionRepository>()
 
-    private val useCase = LogOutUseCase(repo)
+    private lateinit var useCase: LogOutUseCase
 
     init {
         "successfully saving the session" {
@@ -37,4 +44,10 @@ internal class LogOutUseCaseTest : FreeSpec() {
             }
         }
     }
+
+    override suspend fun beforeEach(testCase: TestCase) {
+        useCase = LogOutUseCase(dispatcher, repo)
+    }
+
+    override fun extensions() = listOf(koinExtension(coreTestsModule))
 }
diff --git a/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/ObserveActiveSessionUseCaseTest.kt b/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/ObserveActiveSessionUseCaseTest.kt
index 743af76e5..edf1e6d80 100644
--- a/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/ObserveActiveSessionUseCaseTest.kt
+++ b/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/ObserveActiveSessionUseCaseTest.kt
@@ -5,7 +5,10 @@ import arrow.core.left
 import arrow.core.right
 import dev.alvr.katana.common.session.domain.failures.SessionFailure
 import dev.alvr.katana.common.session.domain.repositories.SessionRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.invoke
+import dev.alvr.katana.core.tests.di.coreTestsModule
+import dev.alvr.katana.core.tests.koinExtension
 import dev.alvr.katana.core.tests.shouldBeLeft
 import dev.alvr.katana.core.tests.shouldBeRight
 import dev.mokkery.answering.returns
@@ -13,13 +16,17 @@ import dev.mokkery.every
 import dev.mokkery.mock
 import dev.mokkery.verify
 import io.kotest.core.spec.style.FreeSpec
+import io.kotest.core.test.TestCase
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.flow.flowOf
+import org.koin.test.KoinTest
+import org.koin.test.inject
 
-internal class ObserveActiveSessionUseCaseTest : FreeSpec() {
+internal class ObserveActiveSessionUseCaseTest : FreeSpec(), KoinTest {
+    private val dispatcher by inject<KatanaDispatcher>()
     private val repo = mock<SessionRepository>()
 
-    private val useCase = ObserveActiveSessionUseCase(repo)
+    private lateinit var useCase: ObserveActiveSessionUseCase
 
     init {
         "successfully observing the session" {
@@ -59,4 +66,10 @@ internal class ObserveActiveSessionUseCaseTest : FreeSpec() {
             verify { repo.sessionActive }
         }
     }
+
+    override suspend fun beforeEach(testCase: TestCase) {
+        useCase = ObserveActiveSessionUseCase(dispatcher, repo)
+    }
+
+    override fun extensions() = listOf(koinExtension(coreTestsModule))
 }
diff --git a/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/SaveAnilistTokenUseCaseTest.kt b/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/SaveAnilistTokenUseCaseTest.kt
index 20b5f213c..01e1c6d3b 100644
--- a/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/SaveAnilistTokenUseCaseTest.kt
+++ b/common/session/domain/src/commonTest/kotlin/dev/alvr/katana/common/session/domain/usecases/SaveAnilistTokenUseCaseTest.kt
@@ -5,7 +5,10 @@ import arrow.core.right
 import dev.alvr.katana.common.session.domain.anilistTokenMock
 import dev.alvr.katana.common.session.domain.failures.SessionFailure
 import dev.alvr.katana.common.session.domain.repositories.SessionRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.failures.Failure
+import dev.alvr.katana.core.tests.di.coreTestsModule
+import dev.alvr.katana.core.tests.koinExtension
 import dev.alvr.katana.core.tests.shouldBeLeft
 import dev.alvr.katana.core.tests.shouldBeRight
 import dev.mokkery.answering.returns
@@ -13,11 +16,15 @@ import dev.mokkery.everySuspend
 import dev.mokkery.mock
 import dev.mokkery.verifySuspend
 import io.kotest.core.spec.style.FreeSpec
+import io.kotest.core.test.TestCase
+import org.koin.test.KoinTest
+import org.koin.test.inject
 
-internal class SaveAnilistTokenUseCaseTest : FreeSpec() {
+internal class SaveAnilistTokenUseCaseTest : FreeSpec(), KoinTest {
+    private val dispatcher by inject<KatanaDispatcher>()
     private val repo = mock<SessionRepository>()
 
-    private val useCase = SaveSessionUseCase(repo)
+    private lateinit var useCase: SaveSessionUseCase
 
     init {
         "successfully saving the session" {
@@ -37,4 +44,10 @@ internal class SaveAnilistTokenUseCaseTest : FreeSpec() {
             }
         }
     }
+
+    override suspend fun beforeEach(testCase: TestCase) {
+        useCase = SaveSessionUseCase(dispatcher, repo)
+    }
+
+    override fun extensions() = listOf(koinExtension(coreTestsModule))
 }
diff --git a/common/user/data/src/commonTest/kotlin/dev/alvr/katana/common/user/data/di/module.kt b/common/user/data/src/commonTest/kotlin/dev/alvr/katana/common/user/data/di/module.kt
new file mode 100644
index 000000000..2659113f7
--- /dev/null
+++ b/common/user/data/src/commonTest/kotlin/dev/alvr/katana/common/user/data/di/module.kt
@@ -0,0 +1,18 @@
+package dev.alvr.katana.common.user.data.di
+
+import dev.alvr.katana.common.user.data.managers.UserIdManagerImpl
+import dev.alvr.katana.common.user.domain.managers.UserIdManager
+import dev.alvr.katana.common.user.domain.repositories.UserRepository
+import dev.alvr.katana.common.user.domain.usecases.GetUserIdUseCase
+import dev.alvr.katana.core.tests.di.coreTestsModule
+import org.koin.dsl.module
+
+private val managersModule = module {
+    single<UserIdManager> { (repo: UserRepository) ->
+        UserIdManagerImpl(GetUserIdUseCase(get(), repo))
+    }
+}
+
+internal val fakeCommonUserDataModule = module {
+    includes(coreTestsModule, managersModule)
+}
diff --git a/common/user/data/src/commonTest/kotlin/dev/alvr/katana/common/user/data/managers/UserIdManagerTest.kt b/common/user/data/src/commonTest/kotlin/dev/alvr/katana/common/user/data/managers/UserIdManagerTest.kt
index 576b52c7a..169394e4b 100644
--- a/common/user/data/src/commonTest/kotlin/dev/alvr/katana/common/user/data/managers/UserIdManagerTest.kt
+++ b/common/user/data/src/commonTest/kotlin/dev/alvr/katana/common/user/data/managers/UserIdManagerTest.kt
@@ -2,12 +2,12 @@ package dev.alvr.katana.common.user.data.managers
 
 import arrow.core.left
 import arrow.core.right
+import dev.alvr.katana.common.user.data.di.fakeCommonUserDataModule
 import dev.alvr.katana.common.user.domain.failures.UserFailure
 import dev.alvr.katana.common.user.domain.managers.UserIdManager
 import dev.alvr.katana.common.user.domain.models.UserId
 import dev.alvr.katana.common.user.domain.repositories.UserRepository
-import dev.alvr.katana.common.user.domain.usecases.GetUserIdUseCase
-import dev.alvr.katana.core.domain.usecases.invoke
+import dev.alvr.katana.core.tests.koinExtension
 import dev.alvr.katana.core.tests.shouldBeLeft
 import dev.alvr.katana.core.tests.shouldBeRight
 import dev.mokkery.answering.returns
@@ -15,24 +15,28 @@ import dev.mokkery.everySuspend
 import dev.mokkery.mock
 import dev.mokkery.verifySuspend
 import io.kotest.core.spec.style.FreeSpec
+import org.koin.core.parameter.parametersOf
+import org.koin.test.KoinTest
+import org.koin.test.inject
 
-internal class UserIdManagerTest : FreeSpec() {
+internal class UserIdManagerTest : FreeSpec(), KoinTest {
     private val repo = mock<UserRepository>()
 
-    private val useCase = GetUserIdUseCase(repo)
-    private val manager: UserIdManager = UserIdManagerImpl(useCase)
+    private val manager by inject<UserIdManager> { parametersOf(repo) }
 
     init {
         "server return viewer is valid" {
             everySuspend { repo.getUserId() } returns UserId(37_384).right()
             manager.getId().shouldBeRight(37_384)
-            verifySuspend { useCase() }
+            verifySuspend { repo.getUserId() }
         }
 
         "server fails to return something" {
             everySuspend { repo.getUserId() } returns UserFailure.GettingUserId.left()
             manager.getId().shouldBeLeft(UserFailure.GettingUserId)
-            verifySuspend { useCase() }
+            verifySuspend { repo.getUserId() }
         }
     }
+
+    override fun extensions() = listOf(koinExtension(fakeCommonUserDataModule))
 }
diff --git a/common/user/domain/src/commonTest/kotlin/dev/alvr/katana/common/user/domain/usecases/GetUserIdUseCaseTest.kt b/common/user/domain/src/commonTest/kotlin/dev/alvr/katana/common/user/domain/usecases/GetUserIdUseCaseTest.kt
index 612c15c64..7895f9c18 100644
--- a/common/user/domain/src/commonTest/kotlin/dev/alvr/katana/common/user/domain/usecases/GetUserIdUseCaseTest.kt
+++ b/common/user/domain/src/commonTest/kotlin/dev/alvr/katana/common/user/domain/usecases/GetUserIdUseCaseTest.kt
@@ -5,8 +5,11 @@ import arrow.core.right
 import dev.alvr.katana.common.user.domain.failures.UserFailure
 import dev.alvr.katana.common.user.domain.repositories.UserRepository
 import dev.alvr.katana.common.user.domain.userIdMock
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.failures.Failure
 import dev.alvr.katana.core.domain.usecases.invoke
+import dev.alvr.katana.core.tests.di.coreTestsModule
+import dev.alvr.katana.core.tests.koinExtension
 import dev.alvr.katana.core.tests.shouldBeLeft
 import dev.alvr.katana.core.tests.shouldBeRight
 import dev.mokkery.answering.returns
@@ -14,11 +17,15 @@ import dev.mokkery.everySuspend
 import dev.mokkery.mock
 import dev.mokkery.verifySuspend
 import io.kotest.core.spec.style.FreeSpec
+import io.kotest.core.test.TestCase
+import org.koin.test.KoinTest
+import org.koin.test.inject
 
-internal class GetUserIdUseCaseTest : FreeSpec() {
+internal class GetUserIdUseCaseTest : FreeSpec(), KoinTest {
+    private val dispatcher by inject<KatanaDispatcher>()
     private val repo = mock<UserRepository>()
 
-    private val useCase = GetUserIdUseCase(repo)
+    private lateinit var useCase: GetUserIdUseCase
 
     init {
         "successfully getting user id" {
@@ -38,4 +45,10 @@ internal class GetUserIdUseCaseTest : FreeSpec() {
             }
         }
     }
+
+    override suspend fun beforeEach(testCase: TestCase) {
+        useCase = GetUserIdUseCase(dispatcher, repo)
+    }
+
+    override fun extensions() = listOf(koinExtension(coreTestsModule))
 }
diff --git a/common/user/domain/src/commonTest/kotlin/dev/alvr/katana/common/user/domain/usecases/ObserveUserInfoUseCaseTest.kt b/common/user/domain/src/commonTest/kotlin/dev/alvr/katana/common/user/domain/usecases/ObserveUserInfoUseCaseTest.kt
index b1bbc036d..21288772b 100644
--- a/common/user/domain/src/commonTest/kotlin/dev/alvr/katana/common/user/domain/usecases/ObserveUserInfoUseCaseTest.kt
+++ b/common/user/domain/src/commonTest/kotlin/dev/alvr/katana/common/user/domain/usecases/ObserveUserInfoUseCaseTest.kt
@@ -6,7 +6,10 @@ import arrow.core.right
 import dev.alvr.katana.common.user.domain.failures.UserFailure
 import dev.alvr.katana.common.user.domain.repositories.UserRepository
 import dev.alvr.katana.common.user.domain.userInfoMock
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.invoke
+import dev.alvr.katana.core.tests.di.coreTestsModule
+import dev.alvr.katana.core.tests.koinExtension
 import dev.alvr.katana.core.tests.shouldBeLeft
 import dev.alvr.katana.core.tests.shouldBeRight
 import dev.mokkery.answering.returns
@@ -14,13 +17,17 @@ import dev.mokkery.every
 import dev.mokkery.mock
 import dev.mokkery.verify
 import io.kotest.core.spec.style.FreeSpec
+import io.kotest.core.test.TestCase
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.flow.flowOf
+import org.koin.test.KoinTest
+import org.koin.test.inject
 
-internal class ObserveUserInfoUseCaseTest : FreeSpec() {
+internal class ObserveUserInfoUseCaseTest : FreeSpec(), KoinTest {
+    private val dispatcher by inject<KatanaDispatcher>()
     private val repo = mock<UserRepository>()
 
-    private val useCase = ObserveUserInfoUseCase(repo)
+    private lateinit var useCase: ObserveUserInfoUseCase
 
     init {
         "successfully observing user info" {
@@ -49,4 +56,10 @@ internal class ObserveUserInfoUseCaseTest : FreeSpec() {
             verify { repo.userInfo }
         }
     }
+
+    override suspend fun beforeEach(testCase: TestCase) {
+        useCase = ObserveUserInfoUseCase(dispatcher, repo)
+    }
+
+    override fun extensions() = listOf(koinExtension(coreTestsModule))
 }
diff --git a/common/user/domain/src/commonTest/kotlin/dev/alvr/katana/common/user/domain/usecases/SaveUserIdUseCaseTest.kt b/common/user/domain/src/commonTest/kotlin/dev/alvr/katana/common/user/domain/usecases/SaveUserIdUseCaseTest.kt
index 544e49913..386173f1f 100644
--- a/common/user/domain/src/commonTest/kotlin/dev/alvr/katana/common/user/domain/usecases/SaveUserIdUseCaseTest.kt
+++ b/common/user/domain/src/commonTest/kotlin/dev/alvr/katana/common/user/domain/usecases/SaveUserIdUseCaseTest.kt
@@ -4,8 +4,11 @@ import arrow.core.left
 import arrow.core.right
 import dev.alvr.katana.common.user.domain.failures.UserFailure
 import dev.alvr.katana.common.user.domain.repositories.UserRepository
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.failures.Failure
 import dev.alvr.katana.core.domain.usecases.invoke
+import dev.alvr.katana.core.tests.di.coreTestsModule
+import dev.alvr.katana.core.tests.koinExtension
 import dev.alvr.katana.core.tests.shouldBeLeft
 import dev.alvr.katana.core.tests.shouldBeRight
 import dev.mokkery.answering.returns
@@ -13,11 +16,15 @@ import dev.mokkery.everySuspend
 import dev.mokkery.mock
 import dev.mokkery.verifySuspend
 import io.kotest.core.spec.style.FreeSpec
+import io.kotest.core.test.TestCase
+import org.koin.test.KoinTest
+import org.koin.test.inject
 
-internal class SaveUserIdUseCaseTest : FreeSpec() {
+internal class SaveUserIdUseCaseTest : FreeSpec(), KoinTest {
+    private val dispatcher by inject<KatanaDispatcher>()
     private val repo = mock<UserRepository>()
 
-    private val useCase = SaveUserIdUseCase(repo)
+    private lateinit var useCase: SaveUserIdUseCase
 
     init {
         "successfully saving user id" {
@@ -38,4 +45,10 @@ internal class SaveUserIdUseCaseTest : FreeSpec() {
             }
         }
     }
+
+    override suspend fun beforeEach(testCase: TestCase) {
+        useCase = SaveUserIdUseCase(dispatcher, repo)
+    }
+
+    override fun extensions() = listOf(koinExtension(coreTestsModule))
 }
diff --git a/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/coroutines/AppKatanaDispatcher.kt b/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/coroutines/AppKatanaDispatcher.kt
new file mode 100644
index 000000000..74b144b6d
--- /dev/null
+++ b/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/coroutines/AppKatanaDispatcher.kt
@@ -0,0 +1,10 @@
+package dev.alvr.katana.core.common.coroutines
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.IO
+
+internal class AppKatanaDispatcher : KatanaDispatcher {
+    override val main = Dispatchers.Main
+    override val io = Dispatchers.IO
+    override val default = Dispatchers.Default
+}
diff --git a/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/coroutines/KatanaDispatcher.kt b/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/coroutines/KatanaDispatcher.kt
index 6b160e5af..064a5edd6 100644
--- a/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/coroutines/KatanaDispatcher.kt
+++ b/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/coroutines/KatanaDispatcher.kt
@@ -1,14 +1,9 @@
 package dev.alvr.katana.core.common.coroutines
 
-import kotlin.jvm.JvmField
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.IO
-import kotlinx.coroutines.MainCoroutineDispatcher
 
-@Suppress("UseDataClass")
-class KatanaDispatcher internal constructor(
-    @JvmField val main: MainCoroutineDispatcher = Dispatchers.Main,
-    @JvmField val io: CoroutineDispatcher = Dispatchers.IO,
-    @JvmField val default: CoroutineDispatcher = Dispatchers.Default,
-)
+interface KatanaDispatcher {
+    val main: CoroutineDispatcher
+    val io: CoroutineDispatcher
+    val default: CoroutineDispatcher
+}
diff --git a/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/di/module.kt b/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/di/module.kt
index 0e6784498..8d1a1bfd8 100644
--- a/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/di/module.kt
+++ b/core/common/src/commonMain/kotlin/dev/alvr/katana/core/common/di/module.kt
@@ -1,8 +1,15 @@
 package dev.alvr.katana.core.common.di
 
+import dev.alvr.katana.core.common.coroutines.AppKatanaDispatcher
 import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.bind
 import org.koin.dsl.module
 
+private val dispatcherModule = module {
+    singleOf(::AppKatanaDispatcher) bind KatanaDispatcher::class
+}
+
 val coreCommonModule = module {
-    single { KatanaDispatcher() }
+    includes(dispatcherModule)
 }
diff --git a/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/FlowUseCase.kt b/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/FlowUseCase.kt
index 7d6d843b4..b47a4e9db 100644
--- a/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/FlowUseCase.kt
+++ b/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/FlowUseCase.kt
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOn
 
 @OptIn(ExperimentalCoroutinesApi::class)
-sealed class FlowUseCase<in P, out R>(dispatcher: KatanaDispatcher) {
+abstract class FlowUseCase<in P, out R> internal constructor(dispatcher: KatanaDispatcher) {
     private val paramState = MutableSharedFlow<P>(
         replay = 1,
         extraBufferCapacity = 1,
diff --git a/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/UseCase.kt b/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/UseCase.kt
index bbb721a12..3ba66fb1d 100644
--- a/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/UseCase.kt
+++ b/core/domain/src/commonMain/kotlin/dev/alvr/katana/core/domain/usecases/UseCase.kt
@@ -7,7 +7,7 @@ import dev.alvr.katana.core.domain.failures.Failure
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 
-sealed class UseCase<in P, out R>(private val dispatcher: KatanaDispatcher) {
+abstract class UseCase<in P, out R> internal constructor(private val dispatcher: KatanaDispatcher) {
 
     abstract suspend fun run(params: P): R
 
diff --git a/core/tests/build.gradle.kts b/core/tests/build.gradle.kts
index 9e3e63910..7252b5033 100644
--- a/core/tests/build.gradle.kts
+++ b/core/tests/build.gradle.kts
@@ -4,6 +4,8 @@ plugins {
 
 katanaMultiplatform {
     commonMainDependencies {
+        implementation(projects.core.common)
+
         implementation(libs.arrow)
         implementation(libs.koin)
         implementation(libs.koin.test.get().toString()) { exclude(group = "junit", module = "junit") }
diff --git a/core/tests/src/commonMain/kotlin/dev/alvr/katana/core/tests/KoinExtension.kt b/core/tests/src/commonMain/kotlin/dev/alvr/katana/core/tests/KoinExtension.kt
index 0de3efdc2..ec277078e 100644
--- a/core/tests/src/commonMain/kotlin/dev/alvr/katana/core/tests/KoinExtension.kt
+++ b/core/tests/src/commonMain/kotlin/dev/alvr/katana/core/tests/KoinExtension.kt
@@ -11,18 +11,17 @@ import org.koin.core.module.Module
 import org.koin.test.mock.MockProvider
 import org.koin.test.mock.Provider
 
-class KoinExtension(
+fun koinExtension(
+    vararg modules: Module,
+    mockProvider: Provider<*>? = null,
+    mode: KoinLifecycleMode = KoinLifecycleMode.Test,
+): TestCaseExtension = KoinExtensionImpl(modules.toList(), mockProvider, mode)
+
+private class KoinExtensionImpl(
     private val modules: List<Module>,
     private val mockProvider: Provider<*>? = null,
     private val mode: KoinLifecycleMode = KoinLifecycleMode.Test,
 ) : TestCaseExtension {
-
-    constructor(
-        module: Module,
-        mockProvider: Provider<*>? = null,
-        mode: KoinLifecycleMode = KoinLifecycleMode.Test,
-    ) : this(listOf(module), mockProvider, mode)
-
     @Suppress("TooGenericExceptionCaught")
     override suspend fun intercept(testCase: TestCase, execute: suspend (TestCase) -> TestResult): TestResult {
         return if (testCase.isApplicable()) {
@@ -46,8 +45,8 @@ class KoinExtension(
     private fun TestCase.isApplicable() =
         mode == KoinLifecycleMode.Root && isRootTest() ||
             mode == KoinLifecycleMode.Test && type == TestType.Test
+}
 
-    enum class KoinLifecycleMode {
-        Root, Test
-    }
+enum class KoinLifecycleMode {
+    Root, Test
 }
diff --git a/core/tests/src/commonMain/kotlin/dev/alvr/katana/core/tests/coroutines/TestKatanaDispatcher.kt b/core/tests/src/commonMain/kotlin/dev/alvr/katana/core/tests/coroutines/TestKatanaDispatcher.kt
new file mode 100644
index 000000000..185e6f40c
--- /dev/null
+++ b/core/tests/src/commonMain/kotlin/dev/alvr/katana/core/tests/coroutines/TestKatanaDispatcher.kt
@@ -0,0 +1,13 @@
+package dev.alvr.katana.core.tests.coroutines
+
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+
+@OptIn(ExperimentalCoroutinesApi::class)
+internal class TestKatanaDispatcher : KatanaDispatcher {
+    override val main = StandardTestDispatcher(name = "main")
+    override val io = UnconfinedTestDispatcher(name = "io")
+    override val default = UnconfinedTestDispatcher(name = "default")
+}
diff --git a/core/tests/src/commonMain/kotlin/dev/alvr/katana/core/tests/di/module.kt b/core/tests/src/commonMain/kotlin/dev/alvr/katana/core/tests/di/module.kt
new file mode 100644
index 000000000..16a9933bf
--- /dev/null
+++ b/core/tests/src/commonMain/kotlin/dev/alvr/katana/core/tests/di/module.kt
@@ -0,0 +1,15 @@
+package dev.alvr.katana.core.tests.di
+
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
+import dev.alvr.katana.core.tests.coroutines.TestKatanaDispatcher
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.bind
+import org.koin.dsl.module
+
+private val dispatcherModule = module {
+    singleOf(::TestKatanaDispatcher) bind KatanaDispatcher::class
+}
+
+val coreTestsModule = module {
+    includes(dispatcherModule)
+}
diff --git a/features/lists/domain/src/commonTest/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveAnimeListUseCaseTest.kt b/features/lists/domain/src/commonTest/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveAnimeListUseCaseTest.kt
index f7829800c..6178838ea 100644
--- a/features/lists/domain/src/commonTest/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveAnimeListUseCaseTest.kt
+++ b/features/lists/domain/src/commonTest/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveAnimeListUseCaseTest.kt
@@ -3,7 +3,10 @@ package dev.alvr.katana.features.lists.domain.usecases
 import app.cash.turbine.test
 import arrow.core.left
 import arrow.core.right
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.invoke
+import dev.alvr.katana.core.tests.di.coreTestsModule
+import dev.alvr.katana.core.tests.koinExtension
 import dev.alvr.katana.core.tests.shouldBeLeft
 import dev.alvr.katana.core.tests.shouldBeRight
 import dev.alvr.katana.features.lists.domain.failures.ListsFailure
@@ -15,13 +18,17 @@ import dev.mokkery.every
 import dev.mokkery.mock
 import dev.mokkery.verify
 import io.kotest.core.spec.style.FreeSpec
+import io.kotest.core.test.TestCase
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.flow.flowOf
+import org.koin.test.KoinTest
+import org.koin.test.inject
 
-internal class ObserveAnimeListUseCaseTest : FreeSpec() {
+internal class ObserveAnimeListUseCaseTest : FreeSpec(), KoinTest {
+    private val dispatcher by inject<KatanaDispatcher>()
     private val repo = mock<ListsRepository>()
 
-    private val useCase = ObserveAnimeListUseCase(repo)
+    private lateinit var useCase: ObserveAnimeListUseCase
 
     init {
         "successfully observe the anime lists" {
@@ -54,4 +61,10 @@ internal class ObserveAnimeListUseCaseTest : FreeSpec() {
             verify { repo.animeCollection }
         }
     }
+
+    override suspend fun beforeEach(testCase: TestCase) {
+        useCase = ObserveAnimeListUseCase(dispatcher, repo)
+    }
+
+    override fun extensions() = listOf(koinExtension(coreTestsModule))
 }
diff --git a/features/lists/domain/src/commonTest/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveMangaListUseCaseTest.kt b/features/lists/domain/src/commonTest/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveMangaListUseCaseTest.kt
index 7faf8c9ca..373b97155 100644
--- a/features/lists/domain/src/commonTest/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveMangaListUseCaseTest.kt
+++ b/features/lists/domain/src/commonTest/kotlin/dev/alvr/katana/features/lists/domain/usecases/ObserveMangaListUseCaseTest.kt
@@ -3,7 +3,10 @@ package dev.alvr.katana.features.lists.domain.usecases
 import app.cash.turbine.test
 import arrow.core.left
 import arrow.core.right
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.usecases.invoke
+import dev.alvr.katana.core.tests.di.coreTestsModule
+import dev.alvr.katana.core.tests.koinExtension
 import dev.alvr.katana.core.tests.shouldBeLeft
 import dev.alvr.katana.core.tests.shouldBeRight
 import dev.alvr.katana.features.lists.domain.failures.ListsFailure
@@ -15,13 +18,17 @@ import dev.mokkery.every
 import dev.mokkery.mock
 import dev.mokkery.verify
 import io.kotest.core.spec.style.FreeSpec
+import io.kotest.core.test.TestCase
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.flow.flowOf
+import org.koin.test.KoinTest
+import org.koin.test.inject
 
-internal class ObserveMangaListUseCaseTest : FreeSpec() {
+internal class ObserveMangaListUseCaseTest : FreeSpec(), KoinTest {
+    private val dispatcher by inject<KatanaDispatcher>()
     private val repo = mock<ListsRepository>()
 
-    private val useCase = ObserveMangaListUseCase(repo)
+    private lateinit var useCase: ObserveMangaListUseCase
 
     init {
         "successfully observe the manga lists" {
@@ -54,4 +61,10 @@ internal class ObserveMangaListUseCaseTest : FreeSpec() {
             verify { repo.mangaCollection }
         }
     }
+
+    override suspend fun beforeEach(testCase: TestCase) {
+        useCase = ObserveMangaListUseCase(dispatcher, repo)
+    }
+
+    override fun extensions() = listOf(koinExtension(coreTestsModule))
 }
diff --git a/features/lists/domain/src/commonTest/kotlin/dev/alvr/katana/features/lists/domain/usecases/UpdateListUseCaseTest.kt b/features/lists/domain/src/commonTest/kotlin/dev/alvr/katana/features/lists/domain/usecases/UpdateListUseCaseTest.kt
index a8e063d2c..219a3b8dc 100644
--- a/features/lists/domain/src/commonTest/kotlin/dev/alvr/katana/features/lists/domain/usecases/UpdateListUseCaseTest.kt
+++ b/features/lists/domain/src/commonTest/kotlin/dev/alvr/katana/features/lists/domain/usecases/UpdateListUseCaseTest.kt
@@ -2,7 +2,10 @@ package dev.alvr.katana.features.lists.domain.usecases
 
 import arrow.core.left
 import arrow.core.right
+import dev.alvr.katana.core.common.coroutines.KatanaDispatcher
 import dev.alvr.katana.core.domain.failures.Failure
+import dev.alvr.katana.core.tests.di.coreTestsModule
+import dev.alvr.katana.core.tests.koinExtension
 import dev.alvr.katana.core.tests.shouldBeLeft
 import dev.alvr.katana.core.tests.shouldBeRight
 import dev.alvr.katana.features.lists.domain.failures.ListsFailure
@@ -14,11 +17,15 @@ import dev.mokkery.matcher.any
 import dev.mokkery.mock
 import dev.mokkery.verifySuspend
 import io.kotest.core.spec.style.FreeSpec
+import io.kotest.core.test.TestCase
+import org.koin.test.KoinTest
+import org.koin.test.inject
 
-internal class UpdateListUseCaseTest : FreeSpec() {
+internal class UpdateListUseCaseTest : FreeSpec(), KoinTest {
+    private val dispatcher by inject<KatanaDispatcher>()
     private val repo = mock<ListsRepository>()
 
-    private val useCase = UpdateListUseCase(repo)
+    private lateinit var useCase: UpdateListUseCase
 
     init {
         "successfully updating the list" {
@@ -38,4 +45,10 @@ internal class UpdateListUseCaseTest : FreeSpec() {
             }
         }
     }
+
+    override suspend fun beforeEach(testCase: TestCase) {
+        useCase = UpdateListUseCase(dispatcher, repo)
+    }
+
+    override fun extensions() = listOf(koinExtension(coreTestsModule))
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 082ec44f7..7d5cfe2ec 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-android = "8.2.2"
+android = "8.3.0"
 androidx-activity = "1.8.2"
 androidx-lifecycle = "2.7.0"
 androidx-splashscreen = "1.0.1"