Fix Otus-Android#1

Artem Nagorny · Artem Nagorny · commit 7d7f9399e29b · 2024-05-05T21:27:39.000+03:00
diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -1,58 +1,66 @@
 package otus.homework.coroutines
 
-import android.content.Context
-import android.widget.Toast
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import java.net.SocketTimeoutException
 
 class CatsPresenter(
-    private val context: Context,
     private val catsRepository: ICatsRepository,
 ) {
     private var _catsJob: Job? = null
     private var _catsView: ICatsView? = null
 
-    private val scope: CoroutineScope by lazy { PresenterScope() }
+    private val scope: CoroutineScope = PresenterScope()
 
     fun onInitComplete() {
         cancelCatJob()
         _catsJob = scope.launch {
             try {
-                val cat: Cat = catsRepository.getCat()
+                val cat: Cat = loadCat()
 
                 _catsView?.populate(cat)
             } catch (e: SocketTimeoutException) {
-                Toast.makeText(
-                    context,
-                    "Не удалось получить ответ от сервера",
-                    Toast.LENGTH_SHORT,
-                ).show()
+                _catsView?.showToast("Не удалось получить ответ от сервера")
             } catch (e: Exception) {
+                if (e is CancellationException) {
+                    throw e
+                }
+
                 e.printStackTrace()
                 CrashMonitor.trackWarning()
                 e.message?.let { eMessage ->
-                    Toast.makeText(
-                        context,
-                        eMessage,
-                        Toast.LENGTH_SHORT,
-                    ).show()
+                    _catsView?.showToast(eMessage)
                 }
             }
         }
     }
 
+    private suspend fun loadCat(): Cat = coroutineScope {
+        val defFact = async {
+            catsRepository.getCatFact()
+        }
+        val defPresentation = async {
+            catsRepository.getCatPresentation()
+        }
+        val (fact, presentation) = Pair(defFact.await(), defPresentation.await())
+
+        Cat(
+            fact = fact,
+            presentation = presentation,
+        )
+    }
+
     fun attachView(catsView: ICatsView) {
         _catsView = catsView
     }
 
     fun detachView() {
-        _catsView = null
-    }
-
-    fun dispose() {
         cancelCatJob()
+        _catsView = null
     }
 
     private fun cancelCatJob() {
diff --git a/app/src/main/java/otus/homework/coroutines/CatsRepository.kt b/app/src/main/java/otus/homework/coroutines/CatsRepository.kt
@@ -1,37 +1,25 @@
 package otus.homework.coroutines
 
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 
 interface ICatsRepository {
-  suspend fun getCat(): Cat
+  suspend fun getCatFact(): Fact
+  suspend fun getCatPresentation(): Presentation
 }
 
 class CatsRepositoryImpl(
+  private val ioDispatcher: CoroutineDispatcher,
   private val service: CatsService,
 ) : ICatsRepository {
-  override suspend fun getCat(): Cat = withContext(Dispatchers.IO) {
-    val defFact = async {
-      getCatFact()
-    }
-    val defPresentation = async {
-      getCatPresentation()
-    }
-    val (fact, presentation) = Pair(defFact.await(), defPresentation.await())
-    Cat(
-      fact = fact,
-      presentation = presentation,
-    )
-  }
-
-  private suspend fun getCatFact(): Fact {
-    return service.getCatFact(Endpoints.FACTS_BASE_URL + "fact").toDomain()
+  override suspend fun getCatFact(): Fact = withContext(ioDispatcher) {
+    service.getCatFact(Endpoints.FACTS_BASE_URL + "fact").toDomain()
   }
 
-  private suspend fun getCatPresentation(): Presentation {
-    return service.getCatPresentation(Endpoints.PRESENTATION_BASE_URL)
-      .firstOrNull()?.toDomain()
-      ?: throw Exception("first presentation not found")
-  }
+  override suspend fun getCatPresentation(): Presentation =
+    withContext(ioDispatcher) {
+      service.getCatPresentation(Endpoints.PRESENTATION_BASE_URL)
+        .firstOrNull()?.toDomain()
+        ?: throw Exception("first presentation not found")
+    }
 }
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -5,6 +5,7 @@ import android.util.AttributeSet
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.squareup.picasso.Picasso
 
@@ -14,7 +15,7 @@ class CatsView @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
 
-    var presenter :CatsPresenter? = null
+    var presenter: CatsPresenter? = null
 
     override fun onFinishInflate() {
         super.onFinishInflate()
@@ -37,9 +38,19 @@ class CatsView @JvmOverloads constructor(
             .load(presentation.url)
             .into(findViewById<ImageView>(R.id.picture_imageView))
     }
+
+    override fun showToast(text: String) {
+        Toast.makeText(
+            context,
+            text,
+            Toast.LENGTH_SHORT,
+        ).show()
+    }
 }
 
 interface ICatsView {
 
     fun populate(cat: Cat)
+
+    fun showToast(text: String)
 }
diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -1,12 +1,14 @@
 package otus.homework.coroutines
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import java.net.SocketTimeoutException
 
@@ -15,39 +17,48 @@ class CatsViewModel(
 ): ViewModel() {
   private var _catsJob: Job? = null
 
-  val uiState = MutableLiveData<Result<Cat>>()
+  private val mutableUiState = MutableLiveData<Result<Cat>>()
+  val uiState: LiveData<Result<Cat>> = mutableUiState
 
   private val exceptionHandle = CoroutineExceptionHandler { _, throwable ->
     when (throwable) {
-      is CancellationException -> {
-        // ...
-      }
       is SocketTimeoutException -> {
-        uiState.value = Error("Не удалось получить ответ от сервера")
+        mutableUiState.value = Error("Не удалось получить ответ от сервера")
       }
       else -> {
         throwable.printStackTrace()
         CrashMonitor.trackWarning()
         throwable.message?.let { eMessage ->
-          uiState.value = Error(eMessage)
+          mutableUiState.value = Error(eMessage)
         }
       }
     }
   }
 
-  override fun onCleared() {
-    super.onCleared()
-    cancelCatJob()
-  }
-
   fun onInitComplete() {
     cancelCatJob()
     _catsJob = viewModelScope.launch(exceptionHandle) {
-      val cat: Cat = catsRepository.getCat()
-      uiState.value = Success(cat)
+      val cat: Cat = loadCat()
+
+      mutableUiState.value = Success(cat)
     }
   }
 
+  private suspend fun loadCat(): Cat = coroutineScope {
+    val defFact = async {
+      catsRepository.getCatFact()
+    }
+    val defPresentation = async {
+      catsRepository.getCatPresentation()
+    }
+    val (fact, presentation) = Pair(defFact.await(), defPresentation.await())
+
+    Cat(
+      fact = fact,
+      presentation = presentation,
+    )
+  }
+
   private fun cancelCatJob() {
     _catsJob?.cancel()
     _catsJob = null
diff --git a/app/src/main/java/otus/homework/coroutines/DiContainer.kt b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
@@ -1,5 +1,6 @@
 package otus.homework.coroutines
 
+import kotlinx.coroutines.Dispatchers
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
@@ -17,6 +18,7 @@ class DiContainer {
 
     val repository: ICatsRepository by lazy {
         CatsRepositoryImpl(
+            ioDispatcher = Dispatchers.IO,
             service = service,
         )
     }
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -23,10 +23,7 @@ class MainActivity : AppCompatActivity() {
         val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
         setContentView(view)
 
-        catsPresenter = CatsPresenter(
-            context = applicationContext,
-            catsRepository = diContainer.repository,
-        )
+        catsPresenter = CatsPresenter(diContainer.repository)
         view.presenter = catsPresenter
 //        catsPresenter.attachView(view)
 //        catsPresenter.onInitComplete()
@@ -50,7 +47,6 @@ class MainActivity : AppCompatActivity() {
         if (isFinishing) {
             catsPresenter.detachView()
         }
-        catsPresenter.dispose()
         super.onStop()
     }
 }
diff --git a/app/src/main/java/otus/homework/coroutines/PresenterScope.kt b/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
@@ -10,6 +10,6 @@ class PresenterScope : CoroutineScope {
     get() = Dispatchers.Main + CoroutineName(NAME)
 
   companion object {
-    const val NAME = "CatsCoroutine"
+    private const val NAME = "CatsCoroutine"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package otus.homework.coroutines`
`2`	`2`
	`3`	`+import kotlinx.coroutines.Dispatchers`
`3`	`4`	`import retrofit2.Retrofit`
`4`	`5`	`import retrofit2.converter.gson.GsonConverterFactory`
`5`	`6`
`@@ -17,6 +18,7 @@ class DiContainer {`
`17`	`18`
`18`	`19`	`val repository: ICatsRepository by lazy {`
`19`	`20`	`CatsRepositoryImpl(`
	`21`	`+ ioDispatcher = Dispatchers.IO,`
`20`	`22`	`service = service,`
`21`	`23`	`)`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,7 @@ class MainActivity : AppCompatActivity() {`
`23`	`23`	`val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView`
`24`	`24`	`setContentView(view)`
`25`	`25`
`26`		`- catsPresenter = CatsPresenter(`
`27`		`- context = applicationContext,`
`28`		`- catsRepository = diContainer.repository,`
`29`		`- )`
	`26`	`+ catsPresenter = CatsPresenter(diContainer.repository)`
`30`	`27`	`view.presenter = catsPresenter`
`31`	`28`	`// catsPresenter.attachView(view)`
`32`	`29`	`// catsPresenter.onInitComplete()`
`@@ -50,7 +47,6 @@ class MainActivity : AppCompatActivity() {`
`50`	`47`	`if (isFinishing) {`
`51`	`48`	`catsPresenter.detachView()`
`52`	`49`	`}`
`53`		`- catsPresenter.dispose()`
`54`	`50`	`super.onStop()`
`55`	`51`	`}`
`56`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ class PresenterScope : CoroutineScope {`
`10`	`10`	`get() = Dispatchers.Main + CoroutineName(NAME)`
`11`	`11`
`12`	`12`	`companion object {`
`13`		`- const val NAME = "CatsCoroutine"`
	`13`	`+ private const val NAME = "CatsCoroutine"`
`14`	`14`	`}`
`15`	`15`	`}`