From eaac70c5dd8700c044fbfbdf0db9cce419897b31 Mon Sep 17 00:00:00 2001
From: Luis Sedano <luismillan.sedano@sngular.team>
Date: Mon, 2 Jul 2018 12:54:23 +0200
Subject: [PATCH 1/2] feat: change dagger injection to koin - first step

---
 .idea/caches/build_file_checksums.ser         | Bin 535 -> 540 bytes
 .idea/misc.xml                                |  76 ++++++++++++++++++
 .idea/vcs.xml                                 |   2 +-
 app/build.gradle                              |   9 +--
 app/src/main/AndroidManifest.xml              |   1 +
 .../net/gahfy/mvvmposts/PostsApplication.kt   |  14 ++++
 .../net/gahfy/mvvmposts/base/BaseViewModel.kt |  24 +-----
 .../mvvmposts/injection/ViewModelFactory.kt   |  11 ++-
 .../injection/component/ViewModelInjector.kt  |  26 ------
 .../injection/module/NetworkModule.kt         |  46 -----------
 .../mvvmposts/ui/post/PostListActivity.kt     |   8 +-
 .../mvvmposts/ui/post/PostListViewModel.kt    |   5 +-
 .../net/gahfy/mvvmposts/utils/Modules.kt      |  30 +++++++
 build.gradle                                  |   2 +-
 14 files changed, 141 insertions(+), 113 deletions(-)
 create mode 100644 app/src/main/kotlin/net/gahfy/mvvmposts/PostsApplication.kt
 delete mode 100644 app/src/main/kotlin/net/gahfy/mvvmposts/injection/component/ViewModelInjector.kt
 delete mode 100644 app/src/main/kotlin/net/gahfy/mvvmposts/injection/module/NetworkModule.kt
 create mode 100644 app/src/main/kotlin/net/gahfy/mvvmposts/utils/Modules.kt

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 9798d4cc5f8339481096d58c145c64480e0099b3..8ce47080c0fa21aea1e48fc0745ecbfd58e683d9 100644
GIT binary patch
delta 128
zcmV-`0Du3N1e^qrm;_p&cjl3th!QI=RdZ!>b1!UlX>)UBWMOV^lZOE$6EnXq1nFxn
zcSzE+4(D}p=X3xJlkfo+5S2U<7<jhxL&>lc>iE`G*ON;D9TP)Xwgb2xCB~P{NrZuS
izNd5m5tEPs8<W`qEfGUdkBpaJ3BCa~X<`wg-FA2{a5P&0

delta 157
zcmbQkGM#0@3>KqBTpuUS=}6{DD$UGE(MvB%Ovy<tEo7);U}Iol5O}qD^+bsv-dT0b
zU)dkAi{C6^5Xi|-PR!9OD9SHLEh@=OEk-CVxKh^Y^es>(>iy-Pw=b?xEn!g84=qkD
zD%MX=%t))8Y{sY}a7DJ~W<SFwmX{5jGv54gs+)X((Oa-q_R*5VirbfZJ$@p6w>0Z;
F1pqETKT7}r

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 99202cc..5602458 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="MarkdownProjectSettings">
+    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true">
+      <PanelProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
+      </PanelProvider>
+    </PreviewSettings>
+    <ParserSettings gitHubSyntaxChange="false">
+      <PegdownExtensions>
+        <option name="ABBREVIATIONS" value="false" />
+        <option name="ANCHORLINKS" value="true" />
+        <option name="ASIDE" value="false" />
+        <option name="ATXHEADERSPACE" value="true" />
+        <option name="AUTOLINKS" value="true" />
+        <option name="DEFINITIONS" value="false" />
+        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
+        <option name="FENCED_CODE_BLOCKS" value="true" />
+        <option name="FOOTNOTES" value="false" />
+        <option name="HARDWRAPS" value="false" />
+        <option name="HTML_DEEP_PARSER" value="false" />
+        <option name="INSERTED" value="false" />
+        <option name="QUOTES" value="false" />
+        <option name="RELAXEDHRULES" value="true" />
+        <option name="SMARTS" value="false" />
+        <option name="STRIKETHROUGH" value="true" />
+        <option name="SUBSCRIPT" value="false" />
+        <option name="SUPERSCRIPT" value="false" />
+        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
+        <option name="SUPPRESS_INLINE_HTML" value="false" />
+        <option name="TABLES" value="true" />
+        <option name="TASKLISTITEMS" value="true" />
+        <option name="TOC" value="false" />
+        <option name="WIKILINKS" value="true" />
+      </PegdownExtensions>
+      <ParserOptions>
+        <option name="COMMONMARK_LISTS" value="true" />
+        <option name="DUMMY" value="false" />
+        <option name="EMOJI_SHORTCUTS" value="true" />
+        <option name="FLEXMARK_FRONT_MATTER" value="false" />
+        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
+        <option name="GFM_TABLE_RENDERING" value="true" />
+        <option name="GITBOOK_URL_ENCODING" value="false" />
+        <option name="GITHUB_EMOJI_URL" value="false" />
+        <option name="GITHUB_LISTS" value="false" />
+        <option name="GITHUB_WIKI_LINKS" value="true" />
+        <option name="JEKYLL_FRONT_MATTER" value="false" />
+        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
+      </ParserOptions>
+    </ParserSettings>
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true">
+      <GeneratorProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
+      </GeneratorProvider>
+      <headerTop />
+      <headerBottom />
+      <bodyTop />
+      <bodyBottom />
+    </HtmlSettings>
+    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
+      <StylesheetProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
+      </StylesheetProvider>
+      <ScriptProviders />
+      <cssText />
+    </CssSettings>
+    <HtmlExportSettings updateOnSave="false" parentDir="$ProjectFileDir$" targetDir="$ProjectFileDir$" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" />
+    <LinkMapSettings>
+      <textMaps />
+    </LinkMapSettings>
+  </component>
+  <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="mavenHome" value="Bundled (Maven 3)" />
+      </MavenGeneralSettings>
+    </option>
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index e85908a..a7b0d33 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,7 +33,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "com.android.support:appcompat-v7:$android_support_version"
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
@@ -63,10 +63,9 @@ dependencies {
     implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit_version"
     implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version"
 
-    // Dagger 2
-    implementation "com.google.dagger:dagger:$dagger2_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger2_version"
-    compileOnly "org.glassfish:javax.annotation:3.1.1"
+    // Koin
+    implementation "org.koin:koin-android:$koin_version"
+
 
     //Rx
     implementation "io.reactivex.rxjava2:rxjava:2.1.15"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2037091..eae7f6a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
+        android:name=".PostsApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/kotlin/net/gahfy/mvvmposts/PostsApplication.kt b/app/src/main/kotlin/net/gahfy/mvvmposts/PostsApplication.kt
new file mode 100644
index 0000000..34a808a
--- /dev/null
+++ b/app/src/main/kotlin/net/gahfy/mvvmposts/PostsApplication.kt
@@ -0,0 +1,14 @@
+package net.gahfy.mvvmposts
+
+import android.app.Application
+import net.gahfy.mvvmposts.utils.postsModule
+import org.koin.android.ext.android.startKoin
+
+class PostsApplication : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+
+        startKoin(this, listOf(postsModule(this)))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/net/gahfy/mvvmposts/base/BaseViewModel.kt b/app/src/main/kotlin/net/gahfy/mvvmposts/base/BaseViewModel.kt
index af568cd..2450fae 100644
--- a/app/src/main/kotlin/net/gahfy/mvvmposts/base/BaseViewModel.kt
+++ b/app/src/main/kotlin/net/gahfy/mvvmposts/base/BaseViewModel.kt
@@ -1,27 +1,5 @@
 package net.gahfy.mvvmposts.base
 
 import android.arch.lifecycle.ViewModel
-import net.gahfy.mvvmposts.injection.component.DaggerViewModelInjector
-import net.gahfy.mvvmposts.injection.component.ViewModelInjector
-import net.gahfy.mvvmposts.injection.module.NetworkModule
-import net.gahfy.mvvmposts.ui.post.PostListViewModel
 
-abstract class BaseViewModel:ViewModel(){
-    private val injector: ViewModelInjector = DaggerViewModelInjector
-            .builder()
-            .networkModule(NetworkModule)
-            .build()
-
-    init {
-        inject()
-    }
-
-    /**
-     * Injects the required dependencies
-     */
-    private fun inject() {
-        when (this) {
-            is PostListViewModel -> injector.inject(this)
-        }
-    }
-}
\ No newline at end of file
+abstract class BaseViewModel:ViewModel()
\ No newline at end of file
diff --git a/app/src/main/kotlin/net/gahfy/mvvmposts/injection/ViewModelFactory.kt b/app/src/main/kotlin/net/gahfy/mvvmposts/injection/ViewModelFactory.kt
index 9e94a57..0fea004 100644
--- a/app/src/main/kotlin/net/gahfy/mvvmposts/injection/ViewModelFactory.kt
+++ b/app/src/main/kotlin/net/gahfy/mvvmposts/injection/ViewModelFactory.kt
@@ -2,17 +2,16 @@ package net.gahfy.mvvmposts.injection
 
 import android.arch.lifecycle.ViewModel
 import android.arch.lifecycle.ViewModelProvider
-import android.arch.persistence.room.Room
-import android.support.v7.app.AppCompatActivity
-import net.gahfy.mvvmposts.model.database.AppDatabase
+import net.gahfy.mvvmposts.model.PostDao
+import net.gahfy.mvvmposts.network.PostApi
 import net.gahfy.mvvmposts.ui.post.PostListViewModel
 
-class ViewModelFactory(private val activity: AppCompatActivity): ViewModelProvider.Factory{
+class ViewModelFactory(private val postDao: PostDao, private val postApi: PostApi): ViewModelProvider.Factory{
+
     override fun <T : ViewModel?> create(modelClass: Class<T>): T {
         if (modelClass.isAssignableFrom(PostListViewModel::class.java)) {
-            val db = Room.databaseBuilder(activity.applicationContext, AppDatabase::class.java, "posts").build()
             @Suppress("UNCHECKED_CAST")
-            return PostListViewModel(db.postDao()) as T
+            return PostListViewModel(postDao, postApi) as T
         }
         throw IllegalArgumentException("Unknown ViewModel class")
 
diff --git a/app/src/main/kotlin/net/gahfy/mvvmposts/injection/component/ViewModelInjector.kt b/app/src/main/kotlin/net/gahfy/mvvmposts/injection/component/ViewModelInjector.kt
deleted file mode 100644
index 1ef5a8a..0000000
--- a/app/src/main/kotlin/net/gahfy/mvvmposts/injection/component/ViewModelInjector.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package net.gahfy.mvvmposts.injection.component
-
-import dagger.Component
-import net.gahfy.mvvmposts.injection.module.NetworkModule
-import net.gahfy.mvvmposts.ui.post.PostListViewModel
-import javax.inject.Singleton
-
-/**
- * Component providing inject() methods for presenters.
- */
-@Singleton
-@Component(modules = [(NetworkModule::class)])
-interface ViewModelInjector {
-    /**
-     * Injects required dependencies into the specified PostListViewModel.
-     * @param postListViewModel PostListViewModel in which to inject the dependencies
-     */
-    fun inject(postListViewModel: PostListViewModel)
-
-    @Component.Builder
-    interface Builder {
-        fun build(): ViewModelInjector
-
-        fun networkModule(networkModule: NetworkModule): Builder
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/net/gahfy/mvvmposts/injection/module/NetworkModule.kt b/app/src/main/kotlin/net/gahfy/mvvmposts/injection/module/NetworkModule.kt
deleted file mode 100644
index cfbd05c..0000000
--- a/app/src/main/kotlin/net/gahfy/mvvmposts/injection/module/NetworkModule.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package net.gahfy.mvvmposts.injection.module
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import io.reactivex.schedulers.Schedulers
-import net.gahfy.mvvmposts.network.PostApi
-import net.gahfy.mvvmposts.utils.BASE_URL
-import retrofit2.Retrofit
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
-import retrofit2.converter.moshi.MoshiConverterFactory
-
-/**
- * Module which provides all required dependencies about network
- */
-@Module
-// Safe here as we are dealing with a Dagger 2 module
-@Suppress("unused")
-object NetworkModule {
-    /**
-     * Provides the Post service implementation.
-     * @param retrofit the Retrofit object used to instantiate the service
-     * @return the Post service implementation.
-     */
-    @Provides
-    @Reusable
-    @JvmStatic
-    internal fun providePostApi(retrofit: Retrofit): PostApi {
-        return retrofit.create(PostApi::class.java)
-    }
-
-    /**
-     * Provides the Retrofit object.
-     * @return the Retrofit object
-     */
-    @Provides
-    @Reusable
-    @JvmStatic
-    internal fun provideRetrofitInterface(): Retrofit {
-        return Retrofit.Builder()
-                .baseUrl(BASE_URL)
-                .addConverterFactory(MoshiConverterFactory.create())
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
-                .build()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/net/gahfy/mvvmposts/ui/post/PostListActivity.kt b/app/src/main/kotlin/net/gahfy/mvvmposts/ui/post/PostListActivity.kt
index cebf3ec..e00c7d8 100644
--- a/app/src/main/kotlin/net/gahfy/mvvmposts/ui/post/PostListActivity.kt
+++ b/app/src/main/kotlin/net/gahfy/mvvmposts/ui/post/PostListActivity.kt
@@ -11,19 +11,25 @@ import android.support.v7.widget.LinearLayoutManager
 import net.gahfy.mvvmposts.R
 import net.gahfy.mvvmposts.databinding.ActivityPostListBinding
 import net.gahfy.mvvmposts.injection.ViewModelFactory
+import net.gahfy.mvvmposts.model.PostDao
+import net.gahfy.mvvmposts.network.PostApi
+import org.koin.android.ext.android.inject
 
 class PostListActivity: AppCompatActivity() {
     private lateinit var binding: ActivityPostListBinding
     private lateinit var viewModel: PostListViewModel
     private var errorSnackbar: Snackbar? = null
 
+    private val postDao : PostDao by inject()
+    private val postApi: PostApi by inject()
+
     override fun onCreate(savedInstanceState: Bundle?){
         super.onCreate(savedInstanceState)
 
         binding = DataBindingUtil.setContentView(this, R.layout.activity_post_list)
         binding.postList.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
 
-        viewModel = ViewModelProviders.of(this, ViewModelFactory(this)).get(PostListViewModel::class.java)
+        viewModel = ViewModelProviders.of(this, ViewModelFactory(postDao, postApi)).get(PostListViewModel::class.java)
         viewModel.errorMessage.observe(this, Observer {
             errorMessage -> if(errorMessage != null) showError(errorMessage) else hideError()
         })
diff --git a/app/src/main/kotlin/net/gahfy/mvvmposts/ui/post/PostListViewModel.kt b/app/src/main/kotlin/net/gahfy/mvvmposts/ui/post/PostListViewModel.kt
index 60e4102..f1b8d72 100644
--- a/app/src/main/kotlin/net/gahfy/mvvmposts/ui/post/PostListViewModel.kt
+++ b/app/src/main/kotlin/net/gahfy/mvvmposts/ui/post/PostListViewModel.kt
@@ -11,11 +11,8 @@ import net.gahfy.mvvmposts.base.BaseViewModel
 import net.gahfy.mvvmposts.model.Post
 import net.gahfy.mvvmposts.model.PostDao
 import net.gahfy.mvvmposts.network.PostApi
-import javax.inject.Inject
 
-class PostListViewModel(private val postDao: PostDao):BaseViewModel(){
-    @Inject
-    lateinit var postApi: PostApi
+class PostListViewModel(private val postDao: PostDao, private val postApi: PostApi):BaseViewModel(){
     val postListAdapter: PostListAdapter = PostListAdapter()
 
     val loadingVisibility: MutableLiveData<Int> = MutableLiveData()
diff --git a/app/src/main/kotlin/net/gahfy/mvvmposts/utils/Modules.kt b/app/src/main/kotlin/net/gahfy/mvvmposts/utils/Modules.kt
new file mode 100644
index 0000000..24faf88
--- /dev/null
+++ b/app/src/main/kotlin/net/gahfy/mvvmposts/utils/Modules.kt
@@ -0,0 +1,30 @@
+package net.gahfy.mvvmposts.utils
+
+import android.arch.persistence.room.Room
+import android.content.Context
+import io.reactivex.schedulers.Schedulers
+import net.gahfy.mvvmposts.model.database.AppDatabase
+import net.gahfy.mvvmposts.network.PostApi
+import net.gahfy.mvvmposts.ui.post.PostListViewModel
+import org.koin.dsl.module.Module
+import retrofit2.Retrofit
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
+import retrofit2.converter.moshi.MoshiConverterFactory
+
+fun postsModule(applicationContext: Context): Module = org.koin.dsl.module.applicationContext {
+    factory { PostListViewModel(get("dao"), get("network")) }
+    bean("dao") {
+        Room.databaseBuilder(applicationContext, AppDatabase::class.java, "posts").build().postDao()
+    }
+    bean("network") {
+        (get("retrofit") as Retrofit).create(PostApi::class.java) as PostApi
+    }
+    bean("retrofit") {
+        Retrofit.Builder()
+                .baseUrl(BASE_URL)
+                .addConverterFactory(MoshiConverterFactory.create())
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
+                .build()
+    }
+
+}
diff --git a/build.gradle b/build.gradle
index 61b9904..9c781b0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,9 +5,9 @@ buildscript {
     ext.kotlin_version = '1.2.30'
     ext.lifecycle_version = '1.1.1'
     ext.retrofit_version = '2.4.0'
-    ext.dagger2_version = '2.16'
     ext.android_support_version = '28.0.0-alpha3'
     ext.room_version = '1.1.1'
+    ext.koin_version = '0.9.2'
 
     repositories {
         google()

From 508f6b6cc820a17a695620b49aa8b8db82b97b48 Mon Sep 17 00:00:00 2001
From: Luis Sedano <luismillan.sedano@sngular.team>
Date: Mon, 2 Jul 2018 14:17:48 +0200
Subject: [PATCH 2/2] more koin tweaks

---
 .idea/caches/build_file_checksums.ser           | Bin 540 -> 540 bytes
 app/build.gradle                                |   3 +--
 .../gahfy/mvvmposts/ui/post/PostListActivity.kt |  12 ++----------
 .../kotlin/net/gahfy/mvvmposts/utils/Modules.kt |   3 ++-
 build.gradle                                    |   2 +-
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 8ce47080c0fa21aea1e48fc0745ecbfd58e683d9..4f29145bd356797ee19d6750311c9775ecdff69d 100644
GIT binary patch
delta 52
zcmV-40L%ZJ1e^qrnFHq#iIJS=5ck(4f!Gkd6=-p#=$y<C#FLW&coBQR*<&T`uCGt!
K@a&+>=@fXQ1si1m

delta 52
zcmV-40L%ZJ1e^qrnFFAA=8>G|5S2U<7<jhxL&>lc>iE`G*OQY0co9QTkBpaJ3BCa~
KX<`wg-FA3}P#5?B

diff --git a/app/build.gradle b/app/build.gradle
index a7b0d33..0b30bbf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,8 +64,7 @@ dependencies {
     implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version"
 
     // Koin
-    implementation "org.koin:koin-android:$koin_version"
-
+    implementation "org.koin:koin-android-architecture:$koin_version"
 
     //Rx
     implementation "io.reactivex.rxjava2:rxjava:2.1.15"
diff --git a/app/src/main/kotlin/net/gahfy/mvvmposts/ui/post/PostListActivity.kt b/app/src/main/kotlin/net/gahfy/mvvmposts/ui/post/PostListActivity.kt
index e00c7d8..087ff4d 100644
--- a/app/src/main/kotlin/net/gahfy/mvvmposts/ui/post/PostListActivity.kt
+++ b/app/src/main/kotlin/net/gahfy/mvvmposts/ui/post/PostListActivity.kt
@@ -1,7 +1,6 @@
 package net.gahfy.mvvmposts.ui.post
 
 import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
 import android.databinding.DataBindingUtil
 import android.os.Bundle
 import android.support.annotation.StringRes
@@ -10,26 +9,19 @@ import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
 import net.gahfy.mvvmposts.R
 import net.gahfy.mvvmposts.databinding.ActivityPostListBinding
-import net.gahfy.mvvmposts.injection.ViewModelFactory
-import net.gahfy.mvvmposts.model.PostDao
-import net.gahfy.mvvmposts.network.PostApi
-import org.koin.android.ext.android.inject
+import org.koin.android.architecture.ext.viewModel
 
 class PostListActivity: AppCompatActivity() {
     private lateinit var binding: ActivityPostListBinding
-    private lateinit var viewModel: PostListViewModel
+    private val viewModel by viewModel<PostListViewModel>()
     private var errorSnackbar: Snackbar? = null
 
-    private val postDao : PostDao by inject()
-    private val postApi: PostApi by inject()
-
     override fun onCreate(savedInstanceState: Bundle?){
         super.onCreate(savedInstanceState)
 
         binding = DataBindingUtil.setContentView(this, R.layout.activity_post_list)
         binding.postList.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
 
-        viewModel = ViewModelProviders.of(this, ViewModelFactory(postDao, postApi)).get(PostListViewModel::class.java)
         viewModel.errorMessage.observe(this, Observer {
             errorMessage -> if(errorMessage != null) showError(errorMessage) else hideError()
         })
diff --git a/app/src/main/kotlin/net/gahfy/mvvmposts/utils/Modules.kt b/app/src/main/kotlin/net/gahfy/mvvmposts/utils/Modules.kt
index 24faf88..c814262 100644
--- a/app/src/main/kotlin/net/gahfy/mvvmposts/utils/Modules.kt
+++ b/app/src/main/kotlin/net/gahfy/mvvmposts/utils/Modules.kt
@@ -6,13 +6,14 @@ import io.reactivex.schedulers.Schedulers
 import net.gahfy.mvvmposts.model.database.AppDatabase
 import net.gahfy.mvvmposts.network.PostApi
 import net.gahfy.mvvmposts.ui.post.PostListViewModel
+import org.koin.android.architecture.ext.viewModel
 import org.koin.dsl.module.Module
 import retrofit2.Retrofit
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.moshi.MoshiConverterFactory
 
 fun postsModule(applicationContext: Context): Module = org.koin.dsl.module.applicationContext {
-    factory { PostListViewModel(get("dao"), get("network")) }
+    viewModel { PostListViewModel(get("dao"), get("network")) }
     bean("dao") {
         Room.databaseBuilder(applicationContext, AppDatabase::class.java, "posts").build().postDao()
     }
diff --git a/build.gradle b/build.gradle
index 9c781b0..ba21bee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     ext.retrofit_version = '2.4.0'
     ext.android_support_version = '28.0.0-alpha3'
     ext.room_version = '1.1.1'
-    ext.koin_version = '0.9.2'
+    ext.koin_version = '0.9.3'
 
     repositories {
         google()