Adicionar repository ao projeto

app/src/main/java/com/iacovelli/repository/facts/data/Repository.kt

@@ -0,0 +1,21 @@
+package com.iacovelli.repository.facts.data
+
+import com.iacovelli.repository.facts.domain.Fact
+
+interface Repository {
+    suspend fun getFact(): Fact
+}
+
+class RepositoryImpl(
+    private val remoteService: CatFactRemoteService,
+    private val cacheService: CatFactCacheService
+): Repository {
+
+    override suspend fun getFact(): Fact {
+        return try {
+            remoteService.getFacts().toListOfFacts().random()
+        } catch(exception: Exception) {
+            Fact(cacheService.getFacts().random())
+        }
+    }
+}

app/src/main/java/com/iacovelli/repository/facts/presentation/MainActivity.kt

@@ -9,14 +9,16 @@ import com.iacovelli.repository.CustomApplication
 import com.iacovelli.repository.R
 import com.iacovelli.repository.facts.data.CatFactCacheServiceImpl
 import com.iacovelli.repository.facts.data.CatFactRemoteService
+import com.iacovelli.repository.facts.data.RepositoryImpl
 import kotlinx.android.synthetic.main.activity_main.*
 import retrofit2.Retrofit
 
 class MainActivity : AppCompatActivity() {
 
     private val remoteService by lazy { getRetrofit().create(CatFactRemoteService::class.java) }
     private val cacheService by lazy { CatFactCacheServiceImpl() }
-    private val viewModel by viewModels<MainViewModel> { MainViewModel.Factory(remoteService, cacheService) }
+    private val repository by lazy { RepositoryImpl(remoteService, cacheService) }
+    private val viewModel by viewModels<MainViewModel> { MainViewModel.Factory(repository) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/iacovelli/repository/facts/presentation/MainViewModel.kt

@@ -4,37 +4,28 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import com.iacovelli.repository.facts.data.CatFactCacheService
-import com.iacovelli.repository.facts.data.CatFactRemoteService
+import com.iacovelli.repository.facts.data.Repository
 import com.iacovelli.repository.facts.domain.Fact
 import kotlinx.coroutines.launch
 
 class MainViewModel(
-    private val remoteService: CatFactRemoteService,
-    private val cacheService: CatFactCacheService
+    private val repository: Repository
 ) : ViewModel() {
 
     val cats = MutableLiveData<Fact>()
 
     fun fetchData() {
         viewModelScope.launch {
-            try {
-                val result = remoteService.getFacts().toListOfFacts()
-                cats.value = result.random()
-            } catch(exception: Exception) {
-                val result = cacheService.getFacts().random()
-                cats.value = Fact(result)
-            }
+            cats.value = repository.getFact()
         }
     }
 
     @Suppress("UNCHECKED_CAST")
     class Factory(
-        private val remoteService: CatFactRemoteService,
-        private val cacheService: CatFactCacheService
+        private val repository: Repository
     ) : ViewModelProvider.Factory {
         override fun <T : ViewModel?> create(modelClass: Class<T>): T {
-            return MainViewModel(remoteService, cacheService) as T
+            return MainViewModel(repository) as T
         }
     }
 }