DataSaveModuele to main component

diff --git a/core/src/main/java/ru/deadsoftware/cavedroid/game/GameComponent.java b/core/src/main/java/ru/deadsoftware/cavedroid/game/GameComponent.java
index ba0bf19b809ffdd05d71adcf659af7ae4ab1ac07..abff53b0889142f9132677d213bb9ba5b4a54b10 100644 (file)
--- a/core/src/main/java/ru/deadsoftware/cavedroid/game/GameComponent.java
+++ b/core/src/main/java/ru/deadsoftware/cavedroid/game/GameComponent.java
@@ -4,20 +4,13 @@ import dagger.Component;
 import ru.deadsoftware.cavedroid.MainComponent;
 import ru.deadsoftware.cavedroid.generated.module.*;
 import ru.fredboy.cavedroid.common.di.GameScope;
-import ru.fredboy.cavedroid.data.assets.di.DataAssetsModule;
-import ru.fredboy.cavedroid.data.items.di.DataItemsModule;
-import ru.fredboy.cavedroid.data.save.di.DataSaveModule;
 import ru.fredboy.cavedroid.domain.items.repository.ItemsRepository;
-import ru.fredboy.cavedroid.domain.save.repository.SaveDataRepository;
 
 @GameScope
 @Component(dependencies = {
             MainComponent.class
         },
         modules = {GameModule.class,
-//                DataAssetsModule.class,
-//                DataItemsModule.class,
-                DataSaveModule.class,
                 UseItemActionsModule.class,
                 UpdateBlockActionsModule.class,
                 PlaceBlockActionsModule.class,

diff --git a/core/src/main/java/ru/deadsoftware/cavedroid/menu/MenuComponent.java b/core/src/main/java/ru/deadsoftware/cavedroid/menu/MenuComponent.java
index ccd2aff3d9117d7157a6d0f19ff4dd034e46902f..567436821bf69a8e9fc7c6dfbcb7c26fa9011539 100644 (file)
--- a/core/src/main/java/ru/deadsoftware/cavedroid/menu/MenuComponent.java
+++ b/core/src/main/java/ru/deadsoftware/cavedroid/menu/MenuComponent.java
@@ -2,10 +2,9 @@ package ru.deadsoftware.cavedroid.menu;
 
 import dagger.Component;
 import ru.deadsoftware.cavedroid.MainComponent;
-import ru.fredboy.cavedroid.data.save.di.DataSaveModule;
 
 @MenuScope
-@Component(dependencies = MainComponent.class, modules = DataSaveModule.class)
+@Component(dependencies = MainComponent.class)
 public interface MenuComponent {
     MenuProc getMenuProc();
 }

diff --git a/core/src/main/kotlin/ru/deadsoftware/cavedroid/MainComponent.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/MainComponent.kt
index f1a6c1c4b2c77472efabb1236414d3a1dcc759b7..03261c834d9da6050c48371d10b46f2a2a9979ad 100644 (file)
--- a/core/src/main/kotlin/ru/deadsoftware/cavedroid/MainComponent.kt
+++ b/core/src/main/kotlin/ru/deadsoftware/cavedroid/MainComponent.kt
@@ -7,17 +7,18 @@ import ru.deadsoftware.cavedroid.misc.utils.AssetLoader
 import ru.deadsoftware.cavedroid.prefs.PreferencesStore
 import ru.fredboy.cavedroid.data.assets.di.DataAssetsModule
 import ru.fredboy.cavedroid.data.items.di.DataItemsModule
-import ru.fredboy.cavedroid.domain.assets.GameAssetsHolder
+import ru.fredboy.cavedroid.data.save.di.DataSaveModule
 import ru.fredboy.cavedroid.domain.assets.repository.*
 import ru.fredboy.cavedroid.domain.assets.usecase.DisposeAssetsUseCase
 import ru.fredboy.cavedroid.domain.assets.usecase.InitializeAssetsUseCase
 import ru.fredboy.cavedroid.domain.items.repository.ItemsRepository
+import ru.fredboy.cavedroid.domain.save.repository.SaveDataRepository
 import javax.inject.Singleton
 
 @Singleton
 @Component(
     dependencies = [CaveGame::class, PreferencesStore::class],
-    modules = [DataAssetsModule::class, DataItemsModule::class]
+    modules = [DataAssetsModule::class, DataItemsModule::class, DataSaveModule::class]
 )
 interface MainComponent {
 
@@ -49,4 +50,6 @@ interface MainComponent {
 
     val itemsRepository: ItemsRepository
 
+    val saveDataRepository: SaveDataRepository
+
 }
\ No newline at end of file