diff --git a/.gitignore b/.gitignore index 56cc642..e52694b 100644 --- a/.gitignore +++ b/.gitignore @@ -49,6 +49,10 @@ captures/ .idea/modules.xml # Comment next line if keeping position of elements in Navigation Editor is relevant for you .idea/navEditor.xml +.idea/codeStyles/Project.xml +.idea/codeStyles/codeStyleConfig.xml +.idea/misc.xml +.idea/runConfigurations.xml # Keystore files # Uncomment the following lines if you do not want to check your keystore files in. diff --git a/README.md b/README.md index 7d5bd85..5fdaca8 100644 --- a/README.md +++ b/README.md @@ -62,8 +62,8 @@ Also available in Play Store - [x] Offline Persistence with Room - [x] Databinding - [ ] ~[Jetpack Compose](https://github.com/mrcsxsiq/Kotlin-Pokedex/issues/4)~ - See [compose-pokedex](https://github.com/zsoltk/compose-pokedex) -- [x] Coroutines -- [ ] Koin +- [ ] Coroutines +- [x] Koin - [ ] JUnit - [ ] MotionLayout - [ ] Transition Animations diff --git a/app/build.gradle b/app/build.gradle index 5d7bc1f..6b074d5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,11 +55,11 @@ dependencies { // DI // Koin for Android - implementation "org.koin:koin-android:2.0.1" + implementation 'org.koin:koin-android:2.0.1' // or Koin for Lifecycle scoping - implementation "org.koin:koin-androidx-scope:2.0.1" + implementation 'org.koin:koin-androidx-scope:2.0.1' // or Koin for Android Architecture ViewModel - implementation "org.koin:koin-androidx-viewmodel:2.0.1" + implementation 'org.koin:koin-androidx-viewmodel:2.0.1' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' diff --git a/app/src/main/java/dev/marcosfarias/pokedex/App.kt b/app/src/main/java/dev/marcosfarias/pokedex/App.kt index 07ce34b..80189cc 100644 --- a/app/src/main/java/dev/marcosfarias/pokedex/App.kt +++ b/app/src/main/java/dev/marcosfarias/pokedex/App.kt @@ -19,9 +19,8 @@ class App : Application() { private fun configureDI() = startKoin { androidContext(this@App) - modules(provideComponent()) + modules(appComponent) } - private fun provideComponent() = appComponent } diff --git a/app/src/main/java/dev/marcosfarias/pokedex/di/NetworkModule.kt b/app/src/main/java/dev/marcosfarias/pokedex/di/NetworkModule.kt index 5c901fd..5bf55a6 100644 --- a/app/src/main/java/dev/marcosfarias/pokedex/di/NetworkModule.kt +++ b/app/src/main/java/dev/marcosfarias/pokedex/di/NetworkModule.kt @@ -4,6 +4,7 @@ import dev.marcosfarias.pokedex.repository.PokemonService import org.koin.dsl.module import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory +import retrofit2.create val networkModule = module { single { @@ -13,9 +14,7 @@ val networkModule = module { .build() } - factory { - get().create( - PokemonService::class.java - ) + single { + get().create() } } \ No newline at end of file