Change koin module names for consistency

julieminer · Aug 21, 2024 · ed5c1fd · ed5c1fd
1 parent f86254b
commit ed5c1fd
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 48 deletions.
diff --git a/.../data_app_data/di/AppDataServiceModule.kt → ...ead/data_app_data/di/DataAppDataModule.kt b/.../data_app_data/di/AppDataServiceModule.kt → ...ead/data_app_data/di/DataAppDataModule.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import org.koin.dsl.module
 
-val AppDataServiceModule = module {
+val DataAppDataModule = module {
     factory { CoroutineScope(Dispatchers.IO) }
     single<AppDataService> {
         AppDataServiceImpl(get(), get())

diff --git a/...ata_at_home/di/DataAtHomeServiceModule.kt → ...nhead/data_at_home/di/DataAtHomeModule.kt b/...ata_at_home/di/DataAtHomeServiceModule.kt → ...nhead/data_at_home/di/DataAtHomeModule.kt
@@ -2,11 +2,11 @@ package com.melonhead.data_at_home.di
 
 import com.melonhead.data_at_home.AtHomeService
 import com.melonhead.data_at_home.AtHomeServiceImpl
-import com.melonhead.lib_networking.di.NetworkingModule
+import com.melonhead.lib_networking.di.LibNetworkingModule
 import org.koin.dsl.module
 
-val DataAtHomeServiceModule = module {
-    includes(NetworkingModule)
+val DataAtHomeModule = module {
+    includes(LibNetworkingModule)
     single<AtHomeService> {
         AtHomeServiceImpl(get())
     }

diff --git a/...entication/src/main/java/com/melonhead/data_authentication/di/DataAuthenticationModule.kt b/...entication/src/main/java/com/melonhead/data_authentication/di/DataAuthenticationModule.kt
@@ -2,11 +2,11 @@ package com.melonhead.data_authentication.di
 
 import com.melonhead.data_authentication.services.LoginService
 import com.melonhead.data_authentication.services.LoginServiceImpl
-import com.melonhead.lib_networking.di.NetworkingModule
+import com.melonhead.lib_networking.di.LibNetworkingModule
 import org.koin.dsl.module
 
 val DataAuthenticationModule = module {
-    includes(NetworkingModule)
+    includes(LibNetworkingModule)
     single<LoginService> {
         LoginServiceImpl(get())
     }

diff --git a/...lonhead/data_user/di/UserServiceModule.kt → .../melonhead/data_user/di/DataUserModule.kt b/...lonhead/data_user/di/UserServiceModule.kt → .../melonhead/data_user/di/DataUserModule.kt
@@ -2,11 +2,11 @@ package com.melonhead.data_user.di
 
 import com.melonhead.data_user.services.UserService
 import com.melonhead.data_user.services.UserServiceImpl
-import com.melonhead.lib_networking.di.NetworkingModule
+import com.melonhead.lib_networking.di.LibNetworkingModule
 import org.koin.dsl.module
 
-val UserServiceModule = module {
-    includes(NetworkingModule)
+val DataUserModule = module {
+    includes(LibNetworkingModule)
     single<UserService> { UserServiceImpl(get()) }
 
 }
diff --git a/...tion/src/main/java/com/melonhead/feature_authentication/di/FeatureAuthenticationModule.kt b/...tion/src/main/java/com/melonhead/feature_authentication/di/FeatureAuthenticationModule.kt
@@ -1,8 +1,8 @@
 package com.melonhead.feature_authentication.di
 
-import com.melonhead.data_app_data.di.AppDataServiceModule
+import com.melonhead.data_app_data.di.DataAppDataModule
 import com.melonhead.data_authentication.di.DataAuthenticationModule
-import com.melonhead.data_user.di.UserServiceModule
+import com.melonhead.data_user.di.DataUserModule
 import com.melonhead.feature_authentication.AuthRepository
 import com.melonhead.feature_authentication.AuthRepositoryImpl
 import com.melonhead.feature_authentication.navigation.LoginScreenResolver
@@ -21,9 +21,8 @@ val FeatureAuthenticationModule = module {
     includes(LibAppContextModule)
 
     includes(DataAuthenticationModule)
-
-    includes(AppDataServiceModule)
-    includes(UserServiceModule)
+    includes(DataAppDataModule)
+    includes(DataUserModule)
 
     single<AuthRepository> { AuthRepositoryImpl(get(), get(), get(), get(), get(), get(), get(), get()) }
     single<LoginScreenResolver>(createdAtStart = true) { LoginScreenResolver() }

diff --git a/feature-manga-list/src/main/java/com/melonhead/feature_manga_list/MangaRepository.kt b/feature-manga-list/src/main/java/com/melonhead/feature_manga_list/MangaRepository.kt
@@ -7,7 +7,7 @@ import com.melonhead.lib_core.models.*
 import com.melonhead.data_app_data.AppDataService
 import com.melonhead.data_at_home.AtHomeService
 import com.melonhead.data_user.services.UserService
-import com.melonhead.feature_chapter_cache.ChapterCacheMechanism
+import com.melonhead.lib_chapter_cache.ChapterCacheMechanism
 import com.melonhead.feature_manga_list.services.MangaService
 import com.melonhead.lib_app_context.AppContext
 import com.melonhead.lib_app_events.AppEventsRepository

diff --git a/...re-manga-list/src/main/java/com/melonhead/feature_manga_list/di/FeatureMangaListModule.kt b/...re-manga-list/src/main/java/com/melonhead/feature_manga_list/di/FeatureMangaListModule.kt
@@ -1,20 +1,19 @@
 package com.melonhead.feature_manga_list.di
 
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.melonhead.data_app_data.di.AppDataServiceModule
-import com.melonhead.data_at_home.di.DataAtHomeServiceModule
+import com.melonhead.data_app_data.di.DataAppDataModule
+import com.melonhead.data_at_home.di.DataAtHomeModule
 import com.melonhead.feature_manga_list.MangaRepository
 import com.melonhead.feature_manga_list.MangaRepositoryImpl
 import com.melonhead.feature_manga_list.services.MangaService
 import com.melonhead.feature_manga_list.services.MangaServiceImpl
-import com.melonhead.data_user.di.UserServiceModule
-import com.melonhead.feature_chapter_cache.di.ChapterCacheModule
+import com.melonhead.data_user.di.DataUserModule
+import com.melonhead.lib_chapter_cache.di.LibChapterCacheModule
 import com.melonhead.feature_manga_list.navigation.MangaListScreenResolver
 import com.melonhead.feature_manga_list.viewmodels.MangaListViewModel
 import com.melonhead.lib_app_context.di.LibAppContextModule
 import com.melonhead.lib_app_events.di.LibAppEventsModule
-import com.melonhead.lib_database.di.DBModule
-import com.melonhead.lib_networking.di.NetworkingModule
+import com.melonhead.lib_database.di.LibDbModule
+import com.melonhead.lib_networking.di.LibNetworkingModule
 import com.melonhead.lib_notifications.di.LibNotificationsModule
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
@@ -23,13 +22,13 @@ val FeatureMangaListModule = module {
     includes(LibAppEventsModule)
     includes(LibNotificationsModule)
     includes(LibAppContextModule)
-    includes(DBModule)
-    includes(ChapterCacheModule)
-    includes(NetworkingModule)
+    includes(LibDbModule)
+    includes(LibChapterCacheModule)
+    includes(LibNetworkingModule)
 
-    includes(UserServiceModule)
-    includes(AppDataServiceModule)
-    includes(DataAtHomeServiceModule)
+    includes(DataUserModule)
+    includes(DataAppDataModule)
+    includes(DataAtHomeModule)
 
     single<MangaService> {
         MangaServiceImpl(get())

diff --git a/...n/java/com/melonhead/feature_native_chapter_viewer/di/FeatureNativeChapterViewerModule.kt b/...n/java/com/melonhead/feature_native_chapter_viewer/di/FeatureNativeChapterViewerModule.kt
@@ -1,6 +1,6 @@
 package com.melonhead.feature_native_chapter_viewer.di
 
-import com.melonhead.data_app_data.di.AppDataServiceModule
+import com.melonhead.data_app_data.di.DataAppDataModule
 import com.melonhead.feature_native_chapter_viewer.viewmodels.ChapterViewModel
 import com.melonhead.feature_native_chapter_viewer.navigation.NativeChapterViewerActivityResolver
 import com.melonhead.lib_app_events.di.LibAppEventsModule
@@ -11,7 +11,7 @@ import org.koin.dsl.module
 val FeatureNativeChapterViewerModule = module {
     includes(LibAppEventsModule)
     includes(LibNavigationModule)
-    includes(AppDataServiceModule)
+    includes(DataAppDataModule)
 
     viewModel {
         ChapterViewModel(get(), get(), get())

diff --git a/..._chapter_cache/ExampleInstrumentedTest.kt → ..._chapter_cache/ExampleInstrumentedTest.kt b/..._chapter_cache/ExampleInstrumentedTest.kt → ..._chapter_cache/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.melonhead.feature_chapter_cache
+package com.melonhead.lib_chapter_cache
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

diff --git a/lib-chapter-cache/src/main/java/com/melonhead/feature_chapter_cache/di/ChapterCacheModule.kt b/lib-chapter-cache/src/main/java/com/melonhead/feature_chapter_cache/di/ChapterCacheModule.kt
diff --git a/...re_chapter_cache/ChapterCacheMechanism.kt → ...ib_chapter_cache/ChapterCacheMechanism.kt b/...re_chapter_cache/ChapterCacheMechanism.kt → ...ib_chapter_cache/ChapterCacheMechanism.kt
@@ -1,4 +1,4 @@
-package com.melonhead.feature_chapter_cache
+package com.melonhead.lib_chapter_cache
 
 import com.melonhead.lib_database.chapter.ChapterEntity
 

diff --git a/lib-chapter-cache/src/main/java/com/melonhead/lib_chapter_cache/di/LibChapterCacheModule.kt b/lib-chapter-cache/src/main/java/com/melonhead/lib_chapter_cache/di/LibChapterCacheModule.kt
@@ -0,0 +1,13 @@
+package com.melonhead.lib_chapter_cache.di
+
+import com.melonhead.lib_chapter_cache.ChapterCacheMechanism
+import com.melonhead.lib_chapter_cache.ChapterCacheMechanismImpl
+import com.melonhead.lib_database.di.LibDbModule
+import org.koin.dsl.module
+
+val LibChapterCacheModule = module {
+    includes(LibDbModule)
+    single<ChapterCacheMechanism> {
+        ChapterCacheMechanismImpl()
+    }
+}
diff --git a/.../feature_chapter_cache/ExampleUnitTest.kt → ...head/lib_chapter_cache/ExampleUnitTest.kt b/.../feature_chapter_cache/ExampleUnitTest.kt → ...head/lib_chapter_cache/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.melonhead.feature_chapter_cache
+package com.melonhead.lib_chapter_cache
 
 import org.junit.Test
 

diff --git a/lib-database/src/main/java/com/melonhead/lib_database/di/DbModule.kt b/lib-database/src/main/java/com/melonhead/lib_database/di/DbModule.kt
@@ -7,7 +7,7 @@ import com.melonhead.lib_database.manga.MangaDatabase
 import com.melonhead.lib_database.readmarkers.ReadMarkerDatabase
 import org.koin.dsl.module
 
-val DBModule = module {
+val LibDbModule = module {
     single(createdAtStart = true) {
         Room.databaseBuilder(
             get(),

diff --git a/...ead/lib_networking/di/NetworkingModule.kt → .../lib_networking/di/LibNetworkingModule.kt b/...ead/lib_networking/di/NetworkingModule.kt → .../lib_networking/di/LibNetworkingModule.kt
@@ -19,7 +19,7 @@ import kotlinx.serialization.json.Json
 import org.koin.dsl.module
 import kotlin.time.DurationUnit
 
-val NetworkingModule = module {
+val LibNetworkingModule = module {
     single {
         HttpClient(CIO) {
             install(RateLimit) {