Compose

README.md

@@ -1,2 +1,5 @@
 # Pokemons
 Exam task VMedia
+
+
+TODO: animate screen changes

app/build.gradle.kts

@@ -0,0 +1,98 @@
+plugins {
+    id("com.android.application")
+    kotlin("android")
+    id("com.google.devtools.ksp")
+    id("androidx.navigation.safeargs.kotlin")
+    id("dagger.hilt.android.plugin")
+}
+
+android {
+    namespace = "com.mdgd.pokemon"
+    compileSdk = rootProject.extra["compile"] as Int?
+
+    defaultConfig {
+        applicationId = "com.mdgd.pokemon"
+        minSdk = rootProject.extra["min"] as Int?
+
+        versionCode = 1
+        versionName = "1.0"
+        multiDexEnabled = true
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.6"
+    }
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+}
+
+dependencies {
+    implementation(project(":mvi"))
+    implementation(project(":models"))
+    implementation(project(":models_impl"))
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+
+    // swipe-refresh
+    implementation("com.google.accompanist:accompanist-swiperefresh:0.19.0")
+
+    // navigation
+    implementation("androidx.navigation:navigation-fragment-ktx:${rootProject.extra["nav_version"]}")
+    implementation("androidx.navigation:navigation-ui-ktx:${rootProject.extra["nav_version"]}")
+
+    // image loading
+    implementation("io.coil-kt:coil-compose:1.3.0")
+
+    // json
+    implementation("com.google.code.gson:gson:${rootProject.extra["gson"]}")
+
+    // hilt
+    implementation("com.google.dagger:hilt-android:${rootProject.extra["hilt"]}")
+    ksp("com.google.dagger:hilt-android-compiler:${rootProject.extra["hilt"]}")
+
+    implementation("androidx.hilt:hilt-navigation-fragment:${rootProject.extra["hilt_jetpack"]}")
+    ksp("androidx.hilt:hilt-compiler:${rootProject.extra["hilt_jetpack"]}")
+    implementation("androidx.hilt:hilt-work:1.0.0")
+
+    // lifecycle
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${rootProject.extra["lifecycle_ktx"]}")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:${rootProject.extra["lifecycle_ktx"]}")
+
+    implementation("androidx.work:work-runtime-ktx:${rootProject.extra["work_version"]}")
+
+    testImplementation("junit:junit:${rootProject.extra["ver_junit"]}")
+    testImplementation("org.mockito:mockito-core:${rootProject.extra["mockito_core"]}")
+    testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:${rootProject.extra["mockito_kotlin"]}")
+    testImplementation("android.arch.core:core-testing:${rootProject.extra["testing_core"]}")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${rootProject.extra["testing_coroutine"]}")
+    testImplementation("com.google.code.gson:gson:${rootProject.extra["gson"]}")
+
+    androidTestImplementation("androidx.test.ext:junit:${rootProject.extra["junit_android"]}")
+    androidTestImplementation("androidx.test.espresso:espresso-core:${rootProject.extra["espresso"]}")
+    androidTestImplementation("com.android.support.test.espresso:espresso-contrib:3.3.0")
+
+    implementation("androidx.core:core-ktx:${rootProject.extra["ktx"]}")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${rootProject.extra["coroutines"]}")
+}

app/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

app/src/androidTest/java/com/mdgd/pokemon/ExampleInstrumentedTest.java

@@ -1,15 +1,15 @@
 package com.mdgd.pokemon;
 
+import static org.junit.Assert.assertEquals;
+
 import android.content.Context;
 
-import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

app/src/main/AndroidManifest.xml

@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mdgd.pokemon">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:largeHeap="true"
         android:name=".PokemonsApp"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@drawable/ic_pokemon"
         android:label="@string/app_name"
+        android:largeHeap="true"
         android:roundIcon="@drawable/ic_pokemon"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/Theme.Pokemons">
 
-        <activity android:name=".ui.MainActivity">
+        <activity
+            android:name=".ui.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+
     </application>
 
 </manifest>

app/src/main/java/com/mdgd/pokemon/PokemonsApp.kt

@@ -1,22 +1,28 @@
 package com.mdgd.pokemon
 
+import androidx.hilt.work.HiltWorkerFactory
 import androidx.multidex.MultiDexApplication
-import com.mdgd.pokemon.models.AppModule
-import com.mdgd.pokemon.models_impl.DefaultAppModule
+import androidx.work.Configuration
+import dagger.hilt.android.HiltAndroidApp
+import javax.inject.Inject
 
-class PokemonsApp : MultiDexApplication() {
+@HiltAndroidApp
+class PokemonsApp : MultiDexApplication(), Configuration.Provider {
 
-    var appComponent: AppModule? = null
-        private set
+    companion object {
+        var instance: PokemonsApp? = null
+            private set
+    }
+
+    @Inject
+    lateinit var workerFactory: HiltWorkerFactory
 
     override fun onCreate() {
         super.onCreate()
         instance = this
-        appComponent = DefaultAppModule(this)
     }
 
-    companion object {
-        var instance: PokemonsApp? = null
-            private set
-    }
+    override fun getWorkManagerConfiguration() = Configuration.Builder()
+        .setWorkerFactory(workerFactory)
+        .build()
 }

app/src/main/java/com/mdgd/pokemon/bg/LoadPokemonsContract.kt

@@ -3,5 +3,3 @@ package com.mdgd.pokemon.bg
 interface ServiceModel {
     fun load()
 }
-
-interface LoadPokemonContext

app/src/main/java/com/mdgd/pokemon/bg/LoadPokemonsModel.kt

@@ -8,10 +8,8 @@ import kotlinx.coroutines.*
 class LoadPokemonsModel(private val repo: PokemonsRepo, private val cache: Cache) : ServiceModel {
     private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
     private val exceptionHandler = CoroutineExceptionHandler { _, e ->
-        coroutineScope.launch {
-            cache.putLoadingProgress(Result(e))
-            cancelScope()
-        }
+        cache.putLoadingProgress(Result(e))
+        coroutineScope.cancel()
     }
 
     override fun load() {
@@ -20,13 +18,9 @@ class LoadPokemonsModel(private val repo: PokemonsRepo, private val cache: Cache
             repo.loadInitialPages(initialAmount)
             cache.putLoadingProgress(Result(initialAmount))
 
-            cache.putLoadingProgress(Result(repo.loadPokemons(initialAmount)))
-            cancelScope()
+            val newAmount = repo.loadPokemons(initialAmount)
+            cache.putLoadingProgress(Result(newAmount))
+            coroutineScope.cancel()
         }
     }
-
-    private suspend fun cancelScope() {
-        delay(50)
-        coroutineScope.cancel()
-    }
 }

app/src/main/java/com/mdgd/pokemon/bg/UploadWorker.kt

@@ -1,12 +1,20 @@
 package com.mdgd.pokemon.bg
 
 import android.content.Context
+import androidx.hilt.work.HiltWorker
 import androidx.work.Worker
 import androidx.work.WorkerParameters
-import com.mdgd.pokemon.PokemonsApp.Companion.instance
+import com.mdgd.pokemon.models.cache.Cache
+import com.mdgd.pokemon.models.repo.PokemonsRepo
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 
-class UploadWorker(context: Context, params: WorkerParameters) : Worker(context, params) {
-    private val model: ServiceModel = PokemonsLoadingModelFactory(instance!!.appComponent!!).create()
+@HiltWorker
+class UploadWorker @AssistedInject constructor(
+    @Assisted context: Context, @Assisted params: WorkerParameters,
+    repo: PokemonsRepo, cache: Cache
+) : Worker(context, params) {
+    private val model: ServiceModel = LoadPokemonsModel(repo, cache)
 
     override fun doWork(): Result {
         model.load()