added new lines in files, move factory to file

Author: Vera Sokolova

app/build.gradle

@@ -48,4 +48,4 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
     implementation 'androidx.activity:activity-ktx:1.7.2'
     testImplementation 'junit:junit:4.13.2'
-}
+}

app/src/main/AndroidManifest.xml

@@ -20,4 +20,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/otus/homework/coroutines/CatViewModel.kt

@@ -19,14 +19,6 @@ class CatViewModel(
 ) : ViewModel() {
     val catModel = MutableLiveData<Result>()
 
-    class CatsViewModelFactory(private val factService: CatsFactService,
-                               private val imageService: CatsImageService) : ViewModelProvider.Factory {
-        @Suppress("UNCHECKED_CAST")
-        override fun <T : ViewModel> create(modelClass: Class<T>): T {
-            return CatViewModel(factService, imageService) as T
-        }
-    }
-
     fun onInitComplete() {
         loadData()
     }

app/src/main/java/otus/homework/coroutines/CatsFactService.kt

@@ -8,4 +8,4 @@ interface CatsFactService {
 
     @GET("fact")
     suspend fun getCatFact() : Response<Fact>
-}
+}

app/src/main/java/otus/homework/coroutines/CatsImageService.kt

@@ -12,4 +12,4 @@ interface CatsImageService {
     companion object {
         const val BASE_URL = "https://cataas.com/"
     }
-}
+}

app/src/main/java/otus/homework/coroutines/CatsPresenter.kt

@@ -1,14 +1,12 @@
 package otus.homework.coroutines
 
-import android.util.Log
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import otus.homework.coroutines.model.CatModel
-import java.lang.Exception
 import java.net.SocketTimeoutException
 
 class CatsPresenter(
@@ -60,4 +58,4 @@ class CatsPresenter(
     fun onStop(){
         catsScope.cancel()
     }
-}
+}

app/src/main/java/otus/homework/coroutines/CatsView.kt

@@ -42,4 +42,4 @@ interface ICatsView {
 
     fun populate(catModel: CatModel)
     fun showToast(message: String)
-}
+}

app/src/main/java/otus/homework/coroutines/CrashMonitor.kt

@@ -13,4 +13,4 @@ object CrashMonitor {
         crashesList.add(message)
         Log.e("crash_mirror", message)
     }
-}
+}

app/src/main/java/otus/homework/coroutines/DiContainer.kt

@@ -45,4 +45,4 @@ class DiContainer {
             .addConverterFactory(GsonConverterFactory.create(gson))
             .build()
     }
-}
+}

app/src/main/java/otus/homework/coroutines/MainActivity.kt

@@ -4,6 +4,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
+import otus.homework.coroutines.model.CatsViewModelFactory
 
 
 class MainActivity : AppCompatActivity() {
@@ -25,7 +26,7 @@ class MainActivity : AppCompatActivity() {
 
         catViewModel = ViewModelProvider(
             this,
-            CatViewModel.CatsViewModelFactory(diContainer.serviceFact, diContainer.serviceImage)
+            CatsViewModelFactory(diContainer.serviceFact, diContainer.serviceImage)
         )[CatViewModel::class.java]
 
         view.viewModel = catViewModel
@@ -50,4 +51,4 @@ class MainActivity : AppCompatActivity() {
 //        catsPresenter.onStop()
         super.onStop()
     }
-}
+}

app/src/main/java/otus/homework/coroutines/PresenterScope.kt

@@ -10,4 +10,4 @@ class PresenterScope : CoroutineScope {
 
     override val coroutineContext: CoroutineContext
         get() = Job() + Dispatchers.Main + CoroutineName("CatsCoroutine")
-}
+}

app/src/main/java/otus/homework/coroutines/Result.kt

@@ -5,4 +5,4 @@ import otus.homework.coroutines.model.CatModel
 sealed class Result {
     data class Success(val catData: CatModel) : Result()
     data class Error(val throwable: Throwable) : Result()
-}
+}

app/src/main/java/otus/homework/coroutines/model/CatsViewModelFactory.kt

@@ -0,0 +1,16 @@
+package otus.homework.coroutines.model
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import otus.homework.coroutines.CatViewModel
+import otus.homework.coroutines.CatsFactService
+import otus.homework.coroutines.CatsImageService
+
+class CatsViewModelFactory(private val factService: CatsFactService,
+                           private val imageService: CatsImageService
+) : ViewModelProvider.Factory {
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return CatViewModel(factService, imageService) as T
+    }
+}

app/src/main/java/otus/homework/coroutines/model/Fact.kt

@@ -7,4 +7,4 @@ data class Fact(
 	val fact: String,
 	@field:SerializedName("length")
 	val length: Int
-)
+)

app/src/main/res/layout/activity_main.xml

@@ -34,4 +34,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/fact_textView" />
-</otus.homework.coroutines.CatsView>
+</otus.homework.coroutines.CatsView>

build.gradle

@@ -23,4 +23,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}