Refactor: Move koin stuff to koin package

src/main/java/com/kdanmobile/reader/InitializerContentProvider.kt

@@ -4,6 +4,8 @@ import android.content.ContentProvider
 import android.content.ContentValues
 import android.database.Cursor
 import android.net.Uri
+import com.kdanmobile.reader.koin.KoinModule
+import com.kdanmobile.reader.koin.MyKoinContext
 import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.koinApplication
 

src/main/java/com/kdanmobile/reader/ReaderActivity.kt

@@ -24,6 +24,7 @@ import com.kdanmobile.reader.Utils.applyConstraintSet
 import com.kdanmobile.reader.annotationattribute.AnnotationAttribute
 import com.kdanmobile.reader.annotationattribute.AnnotationColor
 import com.kdanmobile.reader.annotationattribute.InkAttribute
+import com.kdanmobile.reader.koin.ReadModuleKoinComponent
 import com.kdanmobile.reader.password.DialogPasswordActivity
 import com.kdanmobile.reader.screen.contextmenu.TextBoxContextMenuActionListener
 import com.kdanmobile.reader.screen.model.SharePrefsModel

src/main/java/com/kdanmobile/reader/KoinModule.kt

@@ -1,9 +1,13 @@
-package com.kdanmobile.reader
+package com.kdanmobile.reader.koin
 
 import android.content.Context
 import com.kdanmobile.reader.copyfile.CopyFileViewModel
 import com.kdanmobile.reader.copyfile.CopyFileInfo
 import android.net.Uri
+import com.kdanmobile.reader.Config
+import com.kdanmobile.reader.ReaderModel
+import com.kdanmobile.reader.ReaderModelManager
+import com.kdanmobile.reader.ReaderViewModel
 import com.kdanmobile.reader.thumb.PdfThumbViewModel
 import org.koin.android.viewmodel.dsl.viewModel
 import org.koin.dsl.module
@@ -20,7 +24,8 @@ object KoinModule {
                     uri,
                     Config.PDF_SDK_LICENSE,
                     Config.PDF_SDK_RSA_MSG
-            ) }
+            )
+        }
         viewModel { (readerModel: ReaderModel) -> PdfThumbViewModel(readerModel) }
     }
 }

src/main/java/com/kdanmobile/reader/MyKoinContext.kt

@@ -1,4 +1,4 @@
-package com.kdanmobile.reader
+package com.kdanmobile.reader.koin
 
 import org.koin.core.KoinApplication
 

src/main/java/com/kdanmobile/reader/ReadModuleKoinComponent.kt

@@ -1,4 +1,4 @@
-package com.kdanmobile.reader
+package com.kdanmobile.reader.koin
 
 import org.koin.core.Koin
 import org.koin.core.KoinComponent

src/main/java/com/kdanmobile/reader/thumb/PdfThumbDialogFragment.kt

@@ -13,7 +13,7 @@ import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.Toolbar
 import android.support.v7.widget.helper.ItemTouchHelper
 import android.view.*
-import com.kdanmobile.reader.ReadModuleKoinComponent
+import com.kdanmobile.reader.koin.ReadModuleKoinComponent
 import com.kdanmobile.reader.R
 import com.kdanmobile.reader.ReaderActivity
 import com.kdanmobile.reader.ReaderViewModel