Fix rebase changes

tooploox · Jul 5, 2023 · 99379a3 · 99379a3
1 parent 5700704
commit 99379a3
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 103 deletions.
diff --git a/app/src/main/kotlin/co/touchlab/kampkit/android/ui/BreedsScreen.kt b/app/src/main/kotlin/co/touchlab/kampkit/android/ui/BreedsScreen.kt
@@ -27,6 +27,7 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import co.touchlab.kampkit.android.R
 import co.touchlab.kampkit.domain.breed.Breed
+import co.touchlab.kampkit.ui.breeds.BreedsNavRequest
 import co.touchlab.kampkit.ui.breeds.BreedsViewModel
 import co.touchlab.kampkit.ui.breeds.BreedsViewState
 import co.touchlab.kermit.Logger
@@ -83,7 +84,7 @@ fun BreedsScreenContent(
                     LaunchedEffect(breeds) {
                         onSuccess(breeds)
                     }
-                    Success(successData = breeds, favoriteBreed = onFavorite)
+                    Success(successData = breeds, onBreedClick = onBreedClick)
                 }
             }
 

diff --git a/ios/KaMPKitiOS/Breeds/BreedsViewModel.swift b/ios/KaMPKitiOS/Breeds/BreedsViewModel.swift
@@ -35,7 +35,7 @@ class BreedsViewModel: ObservableObject {
             .store(in: &cancellables)
     }
 
-    private func handleNavRequests(breedsState: BreedViewState) {
+    private func handleNavRequests(breedsState: BreedsViewState) {
         if let navRequest = breedsState.breedsNavRequest as? BreedsNavRequest.ToDetails {
             self.navCoordinator.onBreedDetailsRequest(breedId: navRequest.breedId)
             self.viewModelDelegate.onBreedDetailsNavRequestCompleted()

diff --git a/shared/src/commonMain/kotlin/co/touchlab/kampkit/core/Koin.kt b/shared/src/commonMain/kotlin/co/touchlab/kampkit/core/Koin.kt
@@ -5,10 +5,6 @@ import co.touchlab.kampkit.data.dog.DogApiImpl
 import co.touchlab.kampkit.data.dog.DogDatabaseHelper
 import co.touchlab.kampkit.data.dog.NetworkBreedRepository
 import co.touchlab.kampkit.domain.breed.BreedRepository
-import co.touchlab.kampkit.data.dog.DogApi
-import co.touchlab.kampkit.data.dog.DogApiImpl
-import co.touchlab.kampkit.data.dog.DogDatabaseHelper
-import co.touchlab.kampkit.data.dog.DogRepository
 import co.touchlab.kermit.Logger
 import co.touchlab.kermit.StaticConfig
 import co.touchlab.kermit.platformLogWriter

diff --git a/shared/src/commonMain/kotlin/co/touchlab/kampkit/data/dog/DogDatabaseHelper.kt b/shared/src/commonMain/kotlin/co/touchlab/kampkit/data/dog/DogDatabaseHelper.kt
@@ -1,7 +1,5 @@
 package co.touchlab.kampkit.data.dog
 
-import co.touchlab.kampkit.core.transactionWithContext
-import co.touchlab.kampkit.db.Breed
 import co.touchlab.kampkit.core.transactionWithContext
 import co.touchlab.kampkit.db.DbBreed
 import co.touchlab.kampkit.db.KaMPKitDb

diff --git a/shared/src/commonMain/kotlin/co/touchlab/kampkit/data/dog/DogRepository.kt b/shared/src/commonMain/kotlin/co/touchlab/kampkit/data/dog/DogRepository.kt
diff --git a/shared/src/commonMain/kotlin/co/touchlab/kampkit/data/dog/NetworkBreedRepository.kt b/shared/src/commonMain/kotlin/co/touchlab/kampkit/data/dog/NetworkBreedRepository.kt
@@ -18,7 +18,7 @@ class NetworkBreedRepository(
     private val clock: Clock
 ) : BreedRepository {
 
-    private val log = log.withTag("DogRepository")
+    private val log = log.withTag("NetworkBreedRepository")
 
     companion object {
         internal const val DB_TIMESTAMP_KEY = "DbTimestampKey"
@@ -28,10 +28,15 @@ class NetworkBreedRepository(
         ensureNeverFrozen()
     }
 
+    override fun getBreed(id: Long): Flow<Breed?> {
+        return dbHelper
+            .selectById(id)
+            .map { dbBreed -> dbBreed?.toDomain() }
+    }
     override fun getBreeds(): Flow<List<Breed>> {
-        return dbHelper.selectAllItems().map { list ->
-            list.map { dbBreed -> dbBreed.toDomain() }
-        }
+        return dbHelper
+            .selectAllItems()
+            .map { list -> list.map { dbBreed -> dbBreed.toDomain() } }
     }
 
     override suspend fun refreshBreedsIfStale() {
@@ -53,8 +58,10 @@ class NetworkBreedRepository(
     }
 
     override suspend fun updateBreedFavorite(breedId: Long) {
-        val foundBreedsWithId = dbHelper.selectById(breedId).first()
-        foundBreedsWithId.firstOrNull()?.let { breed ->
+        dbHelper
+            .selectById(breedId)
+            .first()
+            ?.let { breed ->
             dbHelper.updateFavorite(breed.id, !breed.favorite)
         }
     }

diff --git a/shared/src/commonMain/kotlin/co/touchlab/kampkit/domain/breed/BreedRepository.kt b/shared/src/commonMain/kotlin/co/touchlab/kampkit/domain/breed/BreedRepository.kt
@@ -3,6 +3,7 @@ package co.touchlab.kampkit.domain.breed
 import kotlinx.coroutines.flow.Flow
 
 interface BreedRepository {
+    fun getBreed(id: Long): Flow<Breed?>
     fun getBreeds(): Flow<List<Breed>>
     suspend fun refreshBreedsIfStale()
     suspend fun refreshBreeds()

diff --git a/shared/src/commonMain/kotlin/co/touchlab/kampkit/ui/breedDetails/BreedDetailsViewModel.kt b/shared/src/commonMain/kotlin/co/touchlab/kampkit/ui/breedDetails/BreedDetailsViewModel.kt
@@ -1,7 +1,7 @@
 package co.touchlab.kampkit.ui.breedDetails
 
 import co.touchlab.kampkit.core.ViewModel
-import co.touchlab.kampkit.data.dog.DogRepository
+import co.touchlab.kampkit.domain.breed.BreedRepository
 import co.touchlab.kermit.Logger
 import com.rickclephas.kmp.nativecoroutines.NativeCoroutinesState
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -13,7 +13,7 @@ import kotlin.native.ObjCName
 @ObjCName("BreedDetailsViewModelDelegate")
 class BreedDetailsViewModel(
     private val breedId: Long,
-    private val dogRepository: DogRepository,
+    private val breedRepository: BreedRepository,
     log: Logger
 ) : ViewModel() {
     private val log = log.withTag("BreedDetailsViewModel")
@@ -30,7 +30,7 @@ class BreedDetailsViewModel(
 
     private fun loadDetails() {
         viewModelScope.launch {
-            dogRepository.getBreed(breedId).collect { breed ->
+            breedRepository.getBreed(breedId).collect { breed ->
                 mutableDetailsState.update { previousState ->
                     val error = if (breed == null) "Couldn't load the breed details" else null
                     val newBreed = breed?.toDisplayable() ?: previousState.breed
@@ -46,7 +46,7 @@ class BreedDetailsViewModel(
 
     fun onFavoriteClick() {
         viewModelScope.launch {
-            dogRepository.updateBreedFavorite(breedId)
+            breedRepository.updateBreedFavorite(breedId)
         }
     }
 }
diff --git a/shared/src/commonMain/kotlin/co/touchlab/kampkit/ui/breedDetails/BreedDisplayable.kt b/shared/src/commonMain/kotlin/co/touchlab/kampkit/ui/breedDetails/BreedDisplayable.kt
@@ -1,6 +1,6 @@
 package co.touchlab.kampkit.ui.breedDetails
 
-import co.touchlab.kampkit.db.Breed
+import co.touchlab.kampkit.domain.breed.Breed
 
 data class BreedDisplayable(
     val id: Long = 0,

diff --git a/shared/src/commonMain/kotlin/co/touchlab/kampkit/ui/breeds/BreedsViewModel.kt b/shared/src/commonMain/kotlin/co/touchlab/kampkit/ui/breeds/BreedsViewModel.kt
@@ -1,7 +1,6 @@
 package co.touchlab.kampkit.ui.breeds
 
 import co.touchlab.kampkit.core.ViewModel
-import co.touchlab.kampkit.domain.breed.Breed
 import co.touchlab.kampkit.domain.breed.BreedRepository
 import co.touchlab.kermit.Logger
 import com.rickclephas.kmp.nativecoroutines.NativeCoroutinesState
@@ -105,17 +104,3 @@ class BreedsViewModel(
         }
     }
 }
-
-data class BreedViewState(
-    val breeds: List<Breed> = emptyList(),
-    val error: String? = null,
-    val isLoading: Boolean = false,
-    val isEmpty: Boolean = false,
-    val breedsNavRequest: BreedsNavRequest? = null
-) {
-    companion object {
-        // This method lets you use the default constructor values in Swift. When accessing the
-        // constructor directly, they will not work there and would need to be provided explicitly.
-        fun default() = BreedViewState()
-    }
-}
diff --git a/shared/src/commonMain/kotlin/co/touchlab/kampkit/ui/breeds/BreedsViewState.kt b/shared/src/commonMain/kotlin/co/touchlab/kampkit/ui/breeds/BreedsViewState.kt
@@ -6,7 +6,8 @@ data class BreedsViewState(
     val breeds: List<Breed> = emptyList(),
     val error: String? = null,
     val isLoading: Boolean = false,
-    val isEmpty: Boolean = false
+    val isEmpty: Boolean = false,
+    val breedsNavRequest: BreedsNavRequest? = null
 ) {
     companion object {
         // This method lets you use the default constructor values in Swift. When accessing the

diff --git a/shared/src/commonTest/kotlin/co/touchlab/kampkit/BreedsViewModelTest.kt b/shared/src/commonTest/kotlin/co/touchlab/kampkit/BreedsViewModelTest.kt
@@ -142,7 +142,7 @@ class BreedsViewModelTest {
         dbHelper.insertBreeds(breedNames)
         viewModel.onBreedClick(1).join()
 
-        viewModel.breedState.test {
+        viewModel.breedsState.test {
             val state = awaitItem()
             assertEquals(BreedsNavRequest.ToDetails(1), state.breedsNavRequest)
         }

diff --git a/...chlab/kampkit/NetworkDogRepositoryTest.kt → ...lab/kampkit/NetworkBreedRepositoryTest.kt b/...chlab/kampkit/NetworkDogRepositoryTest.kt → ...lab/kampkit/NetworkBreedRepositoryTest.kt
@@ -18,7 +18,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFails
 import kotlin.time.Duration.Companion.hours
 
-class NetworkDogRepositoryTest {
+class NetworkBreedRepositoryTest {
 
     private var kermit = Logger(StaticConfig())
     private var testDbConnection = testDbConnection()

diff --git a/shared/src/iosMain/kotlin/co/touchlab/kampkit/core/KoinIOS.kt b/shared/src/iosMain/kotlin/co/touchlab/kampkit/core/KoinIOS.kt
@@ -1,7 +1,6 @@
 package co.touchlab.kampkit.core
 
 import co.touchlab.kampkit.db.KaMPKitDb
-import co.touchlab.kampkit.ui.breeds.BreedsViewModel
 import co.touchlab.kampkit.ui.breedDetails.BreedDetailsViewModel
 import co.touchlab.kampkit.ui.breeds.BreedsViewModel
 import co.touchlab.kermit.Logger