diff --git a/.DS_Store b/.DS_Store
index a3eb37c..f2d471a 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2e07a8e..858d37b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,7 +1,7 @@
name: Build and Test
on:
- push:
+ pull_request:
branches:
- master
@@ -29,7 +29,7 @@ jobs:
- name: Upload Tests Reports
if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: test-reports
path: '**/build/reports/tests/'
diff --git a/.gitignore b/.gitignore
index 16dcd12..e046624 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
# Gradle files
.gradle/
-build/
+gradle/wrapper/gradle-wrapper.jar
+gradlew
+gradlew.bat
# Local configuration file (sdk path, etc)
local.properties
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..0d7facb 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,10 @@
-
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0d9b546..ffd8114 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,24 +4,13 @@
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8978d23..74dd639 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,7 @@
+
-
+
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4293343..11551e9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -61,10 +61,9 @@ dependencies {
implementation(project(":core:designsystem"))
- implementation(Dependencies.JetpackCompose.iconsExtended)
+ implementation(libs.compose.icons.extended)
- implementation(Dependencies.Hilt.hiltCompose)
- implementation(Dependencies.Hilt.hiltCore)
- implementation(Dependencies.Hilt.hiltAndroid)
- ksp(Dependencies.Hilt.hiltCompiler)
+ implementation(libs.hilt.compose)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 28c1f99..b1b19df 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
- id("com.android.application") version "8.1.0" apply false
+ id("com.android.application") version "8.11.1" apply false
id("org.jetbrains.kotlin.android") version "1.9.10" apply false
- id("com.android.library") version "8.1.0" apply false
+ id("com.android.library") version "8.11.1" apply false
id("com.google.devtools.ksp") version "1.9.0-1.0.13" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "1.8.10" apply false
}
diff --git a/build/.DS_Store b/build/.DS_Store
new file mode 100644
index 0000000..1a26793
Binary files /dev/null and b/build/.DS_Store differ
diff --git a/build/kotlin/.DS_Store b/build/kotlin/.DS_Store
new file mode 100644
index 0000000..b4876ee
Binary files /dev/null and b/build/kotlin/.DS_Store differ
diff --git a/build/reports/problems/problems-report.html b/build/reports/problems/problems-report.html
new file mode 100644
index 0000000..151b567
--- /dev/null
+++ b/build/reports/problems/problems-report.html
@@ -0,0 +1,663 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ Gradle Configuration Cache
+
+
+
+
+
+
+ Loading...
+
+
+
+
+
+
+
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
deleted file mode 100644
index 3c2ffab..0000000
--- a/buildSrc/build.gradle.kts
+++ /dev/null
@@ -1,6 +0,0 @@
-plugins {
- `kotlin-dsl`
-}
-repositories{
- mavenCentral()
-}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
deleted file mode 100644
index 9de842c..0000000
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ /dev/null
@@ -1,112 +0,0 @@
-object Version {
- const val core = "1.9.0"
- const val extendedIcon = "1.6.0-beta01"
- const val navigation = "2.7.5"
- const val lifecycleRuntime = "2.6.2"
- const val composeActivity = "1.8.0"
- const val material3 = "1.2.0-alpha11"
- const val coil = "2.4.0"
- const val retrofit = "2.9.0"
- const val moshi = "1.15.0"
- const val room = "2.6.1"
- const val hilt = "2.48.1"
- const val hiltCompose = "1.1.0"
- const val kotlinSerialization = "1.5.1"
- const val kotlinJakeWhartonSerialization = "1.0.0"
- const val httpLogging = "4.11.0"
- const val timber = "5.0.1"
- const val kotlinCoroutine = "1.7.1"
- const val junit = "4.13.2"
- const val androidJUnit = "1.1.5"
- const val espresso = "3.5.1"
- const val composeBomTest = "2023.03.00"
- const val mockk = "1.13.3"
- const val turbine = "1.0.0"
- const val coroutineTest = "1.5.2"
- const val androidxTestCore = "1.5.0"
- const val androidxTestRunner = "1.2.0"
-}
-
-object Dependencies {
- const val core = "androidx.core:core-ktx:${Version.core}"
-
- object JetpackCompose {
- const val iconsCore = "androidx.compose.material:material-icons-core"
- const val iconsExtended =
- "androidx.compose.material:material-icons-extended:${Version.extendedIcon}"
- const val navigation = "androidx.navigation:navigation-compose:${Version.navigation}"
- const val lifecycleRuntime =
- "androidx.lifecycle:lifecycle-runtime-compose:${Version.lifecycleRuntime}"
- const val composeActivity = "androidx.activity:activity-compose:${Version.composeActivity}"
- const val ui = "androidx.compose.ui:ui"
- const val uiGraphics = "androidx.compose.ui:ui-graphics"
- const val toolingPreview = "androidx.compose.ui:ui-tooling"
- const val material3 = "androidx.compose.material3:material3:${Version.material3}"
- }
-
- object Coil {
- const val coilCore = "io.coil-kt:coil:${Version.coil}"
- const val coilCompose = "io.coil-kt:coil-compose:${Version.coil}"
- }
-
- object Retrofit {
- const val retrofitCore = "com.squareup.retrofit2:retrofit:${Version.retrofit}"
- const val retrofitScalarsConverter = "com.squareup.retrofit2:converter-scalars:${Version.retrofit}"
- const val retrofitKotlinSerialization =
- "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:${Version.kotlinJakeWhartonSerialization}"
- }
-
- object Serialization {
- const val kotlinSerialization =
- "org.jetbrains.kotlinx:kotlinx-serialization-json:${Version.kotlinSerialization}"
- }
-
- object Lifecycle {
- const val lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:${Version.lifecycleRuntime}"
- }
-
- object Room {
- const val roomCore = "androidx.room:room-ktx:${Version.room}"
- const val roomCompiler = "androidx.room:room-compiler:${Version.room}"
- const val roomTesting = "androidx.room:room-testing:${Version.room}"
- }
-
- object Hilt {
- const val hiltCore = "com.google.dagger:hilt-android:${Version.hilt}"
- const val hiltCompiler = "com.google.dagger:hilt-android-compiler:${Version.hilt}"
- const val hiltAndroid = "com.google.dagger:hilt-android:${Version.hilt}"
- const val hiltCompose = "androidx.hilt:hilt-navigation-compose:${Version.hiltCompose}"
- }
-
- object Logging {
- const val interceptorLogging =
- "com.squareup.okhttp3:logging-interceptor:${Version.httpLogging}"
- const val timber = "com.jakewharton.timber:timber:${Version.timber}"
- }
-
- object Concurrency{
- const val kotlinCoroutine = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Version.kotlinCoroutine}"
- }
-
- object Testing {
- const val junit = "junit:junit:${Version.junit}"
- const val androidxTestCore = "androidx.test:core-ktx:${Version.androidxTestCore}"
- const val androidJUnit = "androidx.test.ext:junit:${Version.androidJUnit}"
- const val espresso = "androidx.test.espresso:espresso-core:${Version.espresso}"
- const val composeBomTest = "androidx.compose:compose-bom:${Version.composeBomTest}"
- const val composeJunitUiTest = "androidx.compose.ui:ui-test-junit4"
- const val composeUiTooling = "androidx.compose.ui:ui-tooling"
- const val composeManifestUITest = "androidx.compose.ui:ui-test-manifest"
- const val mockk = "io.mockk:mockk:${Version.mockk}"
- const val turbine = "app.cash.turbine:turbine:${Version.turbine}"
- const val coroutineTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Version.coroutineTest}"
- const val androidxTestRunner = "androidx.test:runner:${Version.androidxTestRunner}"
- }
-}
-
-object Plugins {
- const val androidLibrary = "com.android.library"
- const val kotlinAndroid = "org.jetbrains.kotlin.android"
- const val daggerHilt = "com.google.dagger.hilt.android"
- const val kotlinKapt = "kotlin-kapt"
-}
\ No newline at end of file
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
index 7cd5ee7..ab770de 100644
--- a/core/common/build.gradle.kts
+++ b/core/common/build.gradle.kts
@@ -35,8 +35,8 @@ android {
}
dependencies {
- implementation(Dependencies.Hilt.hiltCore)
- ksp(Dependencies.Hilt.hiltCompiler)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
testImplementation(project(":core:testing"))
testImplementation(kotlin("test"))
diff --git a/core/common/src/main/java/com/tobioyelekan/dogbreed/core/common/result/Result.kt b/core/common/src/main/java/com/tobioyelekan/dogbreed/core/common/result/Result.kt
deleted file mode 100644
index 8b47f89..0000000
--- a/core/common/src/main/java/com/tobioyelekan/dogbreed/core/common/result/Result.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.tobioyelekan.dogbreed.core.common.result
-
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-
-sealed interface Result {
- data class Success(val value: T) : Result
- data class Failure(val errorMessage: String) : Result
-}
-
-fun Flow.mapToSuccess(transform: (T) -> R): Flow> {
- return map { value ->
- Result.Success(transform(value))
- }
-}
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
index c59bb8b..720e287 100644
--- a/core/database/build.gradle.kts
+++ b/core/database/build.gradle.kts
@@ -38,18 +38,18 @@ android {
}
dependencies {
- implementation(Dependencies.Room.roomCore)
- ksp(Dependencies.Room.roomCompiler)
+ implementation(libs.room.core)
+ ksp(libs.room.compiler)
- implementation(Dependencies.Hilt.hiltCore)
- ksp(Dependencies.Hilt.hiltCompiler)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
implementation(project(":core:model"))
androidTestImplementation(project(":core:testing"))
androidTestImplementation(kotlin("test"))
- androidTestImplementation(Dependencies.Room.roomTesting)
- androidTestImplementation(Dependencies.Testing.androidxTestCore)
- androidTestImplementation(Dependencies.Testing.androidxTestRunner)
+ androidTestImplementation(libs.room.testing)
+ androidTestImplementation(libs.androidx.test.core)
+ androidTestImplementation(libs.androidx.test.runner)
}
\ No newline at end of file
diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
index 8dfc40b..51c9ca7 100644
--- a/core/designsystem/build.gradle.kts
+++ b/core/designsystem/build.gradle.kts
@@ -39,10 +39,10 @@ android {
}
dependencies {
- implementation(Dependencies.core)
- api(Dependencies.Hilt.hiltCompose)
- api(Dependencies.JetpackCompose.lifecycleRuntime)
- api(Dependencies.JetpackCompose.material3)
- api(Dependencies.JetpackCompose.toolingPreview)
- api(Dependencies.Coil.coilCompose)
+ implementation(libs.core)
+ api(libs.hilt.compose)
+ api(libs.compose.lifecycle.runtime)
+ api(libs.compose.material3)
+ api(libs.compose.ui.tooling)
+ api(libs.coil.compose)
}
\ No newline at end of file
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
index 662453a..2f62571 100644
--- a/core/network/build.gradle.kts
+++ b/core/network/build.gradle.kts
@@ -43,16 +43,15 @@ android {
}
dependencies {
- implementation(Dependencies.Retrofit.retrofitCore)
- implementation(Dependencies.Retrofit.retrofitKotlinSerialization)
- implementation(Dependencies.Retrofit.retrofitScalarsConverter)
+ implementation(libs.retrofit.core)
+ implementation(libs.retrofit.kotlin.serialization)
+ implementation(libs.retrofit.scalars)
- implementation(Dependencies.Serialization.kotlinSerialization)
+ implementation(libs.kotlin.serialization)
- implementation(Dependencies.Logging.interceptorLogging)
- implementation(Dependencies.Logging.timber)
+ implementation(libs.logging.interceptor)
+ implementation(libs.timber)
- implementation(Dependencies.Hilt.hiltCore)
- implementation(Dependencies.Hilt.hiltAndroid)
- ksp(Dependencies.Hilt.hiltCompiler)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
}
\ No newline at end of file
diff --git a/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/DogBreedApiService.kt b/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/DogBreedApiService.kt
index 36b5081..3b0310e 100644
--- a/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/DogBreedApiService.kt
+++ b/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/DogBreedApiService.kt
@@ -1,6 +1,5 @@
package com.tobioyelekan.dogbreed.core.network
-import com.tobioyelekan.dogbreed.core.network.adapter.ApiResult
import com.tobioyelekan.dogbreed.core.network.model.BreedImageApiModel
import com.tobioyelekan.dogbreed.core.network.model.DogBreedsApiModel
import com.tobioyelekan.dogbreed.core.network.model.SubBreedImageApiModel
@@ -9,16 +8,16 @@ import retrofit2.http.Path
interface DogBreedApiService {
@GET("breeds/list/all")
- suspend fun getAllDogBreeds(): ApiResult
+ suspend fun getAllDogBreeds(): DogBreedsApiModel
@GET("breed/{breedName}/images/random")
suspend fun getBreedRandomImage(
@Path("breedName") breedName: String
- ): ApiResult
+ ): BreedImageApiModel
@GET("breed/{breedName}/{subBreedName}/images")
suspend fun getSubBreedImages(
@Path("breedName") breedName: String,
@Path("subBreedName") subBreedName: String
- ): ApiResult
+ ) : SubBreedImageApiModel
}
\ No newline at end of file
diff --git a/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/adapter/ApiResult.kt b/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/adapter/ApiResult.kt
deleted file mode 100644
index 645f970..0000000
--- a/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/adapter/ApiResult.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.tobioyelekan.dogbreed.core.network.adapter
-
-sealed class ApiResult {
- /**
- * Represents a network result that successfully received a response containing body data.
- */
- class Success(val data: T) : ApiResult()
-
- /**
- * Represents a network result that successfully received a response containing an error message.
- */
- class Error(val code: Int?, val message: String) : ApiResult()
-
- /**
- * Represents a network result that faced an unexpected exception before getting a response
- * from the network such as IOException and UnKnownHostException.
- */
- class Exception(val throwable: Throwable) : ApiResult()
-}
\ No newline at end of file
diff --git a/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/adapter/ApiResultAdapterFactory.kt b/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/adapter/ApiResultAdapterFactory.kt
deleted file mode 100644
index 760ca7a..0000000
--- a/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/adapter/ApiResultAdapterFactory.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.tobioyelekan.dogbreed.core.network.adapter
-
-import retrofit2.Call
-import retrofit2.CallAdapter
-import retrofit2.Retrofit
-import java.lang.reflect.ParameterizedType
-import java.lang.reflect.Type
-
-class ApiResultAdapterFactory : CallAdapter.Factory() {
- override fun get(returnType: Type, annotations: Array, retrofit: Retrofit): CallAdapter<*, *>? {
- if (Call::class.java != getRawType(returnType)) return null
- check(returnType is ParameterizedType)
-
- val responseType = getParameterUpperBound(0, returnType)
- if (getRawType(responseType) != ApiResult::class.java) return null
- check(responseType is ParameterizedType)
-
- val successType = getParameterUpperBound(0, responseType)
-
- return ApiResultCallAdapter(successType)
- }
-}
diff --git a/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/adapter/ApiResultCall.kt b/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/adapter/ApiResultCall.kt
deleted file mode 100644
index 3e18a57..0000000
--- a/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/adapter/ApiResultCall.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.tobioyelekan.dogbreed.core.network.adapter
-
-import okhttp3.Request
-import okio.Timeout
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import timber.log.Timber
-import java.net.UnknownHostException
-
-internal class ApiResultCall(
- private val callDelegate: Call,
-) : Call> {
-
- override fun enqueue(callback: Callback>) = callDelegate.enqueue(
- object : Callback {
- override fun onResponse(call: Call, response: Response) {
- val body = response.body()
- if (response.isSuccessful) {
- if (body != null) {
- callback.onResponse(
- this@ApiResultCall,
- Response.success(ApiResult.Success(body))
- )
- } else {
- Timber.e(response.code().toString(), response.message())
- callback.onResponse(
- this@ApiResultCall,
- Response.success(ApiResult.Error(response.code(), response.message()))
- )
- }
- }
- }
-
- override fun onFailure(call: Call, throwable: Throwable) {
- Timber.e(throwable)
- val message = if (throwable is UnknownHostException) {
- "It appears your network connectivity is down. Check your connection and try again"
- } else {
- "Something went wrong"
- }
- callback.onResponse(
- this@ApiResultCall, Response.success(
- ApiResult.Exception(
- Throwable(cause = throwable, message = message)
- )
- )
- )
- }
- }
- )
-
- override fun clone(): Call> = ApiResultCall(callDelegate.clone())
-
- override fun execute(): Response> =
- throw UnsupportedOperationException("ResponseCall does not support execute.")
-
- override fun isExecuted(): Boolean = callDelegate.isExecuted
-
- override fun cancel() = callDelegate.cancel()
-
- override fun isCanceled(): Boolean = callDelegate.isCanceled
-
- override fun request(): Request = callDelegate.request()
-
- override fun timeout(): Timeout = callDelegate.timeout()
-}
diff --git a/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/adapter/ApiResultCallAdapter.kt b/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/adapter/ApiResultCallAdapter.kt
deleted file mode 100644
index 720dae0..0000000
--- a/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/adapter/ApiResultCallAdapter.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.tobioyelekan.dogbreed.core.network.adapter
-
-import retrofit2.Call
-import retrofit2.CallAdapter
-import java.lang.reflect.Type
-
-internal class ApiResultCallAdapter(
- private val successType: Type,
-) : CallAdapter>> {
- override fun responseType(): Type = successType
-
- override fun adapt(call: Call): Call> = ApiResultCall(call)
-}
diff --git a/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/di/NetworkModule.kt b/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/di/NetworkModule.kt
index 42cd472..9a110f4 100644
--- a/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/di/NetworkModule.kt
+++ b/core/network/src/main/java/com/tobioyelekan/dogbreed/core/network/di/NetworkModule.kt
@@ -1,7 +1,6 @@
package com.tobioyelekan.dogbreed.core.network.di
import com.tobioyelekan.dogbreed.core.network.DogBreedApiService
-import com.tobioyelekan.dogbreed.core.network.adapter.ApiResultAdapterFactory
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
@@ -48,7 +47,6 @@ object NetworkModule {
.addConverterFactory(
json.asConverterFactory("application/json".toMediaType())
)
- .addCallAdapterFactory(ApiResultAdapterFactory())
.build()
}
diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts
index 22d5caf..90bfa28 100644
--- a/core/testing/build.gradle.kts
+++ b/core/testing/build.gradle.kts
@@ -33,10 +33,10 @@ android {
}
dependencies {
- api(Dependencies.Testing.junit)
- api(Dependencies.Testing.turbine)
- api(Dependencies.Testing.mockk)
- api(Dependencies.Testing.coroutineTest)
+ api(libs.junit)
+ api(libs.turbine)
+ api(libs.mockk)
+ api(libs.coroutine.test)
implementation(project(":core:model"))
}
\ No newline at end of file
diff --git a/data/.DS_Store b/data/.DS_Store
new file mode 100644
index 0000000..014353e
Binary files /dev/null and b/data/.DS_Store differ
diff --git a/data/allbreeds/build.gradle.kts b/data/allbreeds/build.gradle.kts
index ba4e908..b6165fc 100644
--- a/data/allbreeds/build.gradle.kts
+++ b/data/allbreeds/build.gradle.kts
@@ -35,9 +35,8 @@ android {
}
dependencies {
- implementation(Dependencies.Hilt.hiltCore)
- ksp(Dependencies.Hilt.hiltCompiler)
- implementation(Dependencies.Hilt.hiltAndroid)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
implementation(project(":core:network"))
implementation(project(":core:database"))
diff --git a/data/allbreeds/src/main/java/com/tobioyelekan/dogbreed/data/allbreeds/repository/DogBreedsRepository.kt b/data/allbreeds/src/main/java/com/tobioyelekan/dogbreed/data/allbreeds/repository/DogBreedsRepository.kt
index a327a12..c032f06 100644
--- a/data/allbreeds/src/main/java/com/tobioyelekan/dogbreed/data/allbreeds/repository/DogBreedsRepository.kt
+++ b/data/allbreeds/src/main/java/com/tobioyelekan/dogbreed/data/allbreeds/repository/DogBreedsRepository.kt
@@ -1,6 +1,5 @@
package com.tobioyelekan.dogbreed.data.allbreeds.repository
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.core.model.DogBreed
interface DogBreedsRepository {
diff --git a/data/allbreeds/src/main/java/com/tobioyelekan/dogbreed/data/allbreeds/repository/DogBreedsRepositoryImpl.kt b/data/allbreeds/src/main/java/com/tobioyelekan/dogbreed/data/allbreeds/repository/DogBreedsRepositoryImpl.kt
index 310e835..988874e 100644
--- a/data/allbreeds/src/main/java/com/tobioyelekan/dogbreed/data/allbreeds/repository/DogBreedsRepositoryImpl.kt
+++ b/data/allbreeds/src/main/java/com/tobioyelekan/dogbreed/data/allbreeds/repository/DogBreedsRepositoryImpl.kt
@@ -1,14 +1,14 @@
package com.tobioyelekan.dogbreed.data.allbreeds.repository
import com.tobioyelekan.dogbreed.core.database.dao.DogBreedDao
-import com.tobioyelekan.dogbreed.core.database.entity.DogBreedEntity
import com.tobioyelekan.dogbreed.core.network.DogBreedApiService
-import com.tobioyelekan.dogbreed.core.network.adapter.ApiResult
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.core.database.entity.toDomainModel
import com.tobioyelekan.dogbreed.core.model.DogBreed
import com.tobioyelekan.dogbreed.data.allbreeds.mapper.toEntity
import com.tobioyelekan.dogbreed.data.allbreeds.util.mergeEntities
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
import javax.inject.Inject
class DogBreedsRepositoryImpl @Inject constructor(
@@ -17,50 +17,35 @@ class DogBreedsRepositoryImpl @Inject constructor(
) : DogBreedsRepository {
override suspend fun getAllBreeds(): Result> {
- return when (val response = dogBreedService.getAllDogBreeds()) {
- is ApiResult.Success -> {
- val dogBreedEntities = mutableListOf()
-
- response.data.breeds.map { breed ->
- val breedImageResponse = dogBreedService.getBreedRandomImage(breed.key)
- if (breedImageResponse is ApiResult.Success) {
- dogBreedEntities.add(
- breed.toEntity(breedImageResponse.data.imageUrl)
- )
- } else {
- return Result.Failure("Something went wrong, please contact support and try again")
+ return runCatching {
+ val dogBreedEntities = coroutineScope {
+ val response = dogBreedService.getAllDogBreeds()
+ response.breeds.map { breed ->
+ async {
+ val image = dogBreedService.getBreedRandomImage(breed.key)
+ breed.toEntity(image.imageUrl)
}
- }
+ }.awaitAll()
+ }
- val cachedFavoritesBreeds = dogBreedDao.getAllBreeds().filter { it.isFavorite }
+ val cachedFavoritesBreeds = dogBreedDao.getAllBreeds().filter { it.isFavorite }
- val entities = if (cachedFavoritesBreeds.isEmpty())
- dogBreedEntities
- else
- mergeEntities(dogBreedEntities, cachedFavoritesBreeds)
+ val entities = if (cachedFavoritesBreeds.isEmpty())
+ dogBreedEntities
+ else
+ mergeEntities(dogBreedEntities, cachedFavoritesBreeds)
- dogBreedDao.nukeTable()
- dogBreedDao.saveBreeds(entities)
- //end
+ dogBreedDao.nukeTable()
+ dogBreedDao.saveBreeds(entities)
- Result.Success(entities.map { it.toDomainModel() })
- }
-
- is ApiResult.Error -> {
- return Result.Failure("Something went wrong, please contact support and try again")
- }
-
- is ApiResult.Exception -> {
+ entities.map { it.toDomainModel() }
+ }
+ .recoverCatching {
val breeds = dogBreedDao
.getAllBreeds()
.map { it.toDomainModel() }
- if (breeds.isNotEmpty()) {
- return Result.Success(breeds)
- }
-
- Result.Failure( "Please check your internet connection and try again")
+ breeds.ifEmpty { throw it }
}
- }
}
-}
\ No newline at end of file
+}
diff --git a/data/allbreeds/src/test/java/com/tobioyelekan/dogbreed/data/allbreeds/repository/DogBreedsRepositoryImplTest.kt b/data/allbreeds/src/test/java/com/tobioyelekan/dogbreed/data/allbreeds/repository/DogBreedsRepositoryImplTest.kt
index 93f78fa..0be7334 100644
--- a/data/allbreeds/src/test/java/com/tobioyelekan/dogbreed/data/allbreeds/repository/DogBreedsRepositoryImplTest.kt
+++ b/data/allbreeds/src/test/java/com/tobioyelekan/dogbreed/data/allbreeds/repository/DogBreedsRepositoryImplTest.kt
@@ -1,11 +1,9 @@
package com.tobioyelekan.dogbreed.data.allbreeds.repository
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.core.database.dao.DogBreedDao
import com.tobioyelekan.dogbreed.core.database.entity.DogBreedEntity
import com.tobioyelekan.dogbreed.core.database.entity.toDomainModel
import com.tobioyelekan.dogbreed.core.network.DogBreedApiService
-import com.tobioyelekan.dogbreed.core.network.adapter.ApiResult
import com.tobioyelekan.dogbreed.core.network.model.BreedImageApiModel
import com.tobioyelekan.dogbreed.core.network.model.DogBreedsApiModel
import com.tobioyelekan.dogbreed.data.allbreeds.mapper.toEntity
@@ -14,9 +12,9 @@ import com.tobioyelekan.dogbreed.testing.data.TestData.dogBreedApiResponseTestDa
import io.mockk.coEvery
import io.mockk.coVerify
import io.mockk.mockk
+import junit.framework.TestCase.assertTrue
import kotlinx.coroutines.test.runTest
import org.junit.Test
-import java.net.UnknownHostException
import kotlin.test.assertEquals
class DogBreedsRepositoryImplTest {
@@ -31,10 +29,10 @@ class DogBreedsRepositoryImplTest {
val sampleImageUrl = "imageUrl"
coEvery { dogBreedService.getAllDogBreeds() } returns
- ApiResult.Success(data = DogBreedsApiModel(dogBreedApiResponseTestData))
+ DogBreedsApiModel(dogBreedApiResponseTestData)
coEvery { dogBreedService.getBreedRandomImage(any()) } returns
- ApiResult.Success(data = BreedImageApiModel(sampleImageUrl))
+ BreedImageApiModel(sampleImageUrl)
//when
val actual = subject.getAllBreeds()
@@ -44,7 +42,7 @@ class DogBreedsRepositoryImplTest {
dogBreedApiResponseTestData
.map { it.toEntity(sampleImageUrl) }
.map { it.toDomainModel() }
- assertEquals(Result.Success(dogBreedDomain), actual)
+ assertEquals(Result.success(dogBreedDomain), actual)
}
@Test
@@ -53,10 +51,9 @@ class DogBreedsRepositoryImplTest {
val sampleImageUrl = "imageUrl"
coEvery { dogBreedService.getAllDogBreeds() } returns
- ApiResult.Success(data = DogBreedsApiModel(dogBreedApiResponseTestData))
-
+ DogBreedsApiModel(dogBreedApiResponseTestData)
coEvery { dogBreedService.getBreedRandomImage(any()) } returns
- ApiResult.Success(data = BreedImageApiModel(sampleImageUrl))
+ BreedImageApiModel(sampleImageUrl)
//when
subject.getAllBreeds()
@@ -73,10 +70,10 @@ class DogBreedsRepositoryImplTest {
val dogBreedEntities = dogBreedApiResponseTestData.map { it.toEntity(sampleImageUrl) }
coEvery { dogBreedService.getAllDogBreeds() } returns
- ApiResult.Success(data = DogBreedsApiModel(dogBreedApiResponseTestData))
+ DogBreedsApiModel(dogBreedApiResponseTestData)
coEvery { dogBreedService.getBreedRandomImage(any()) } returns
- ApiResult.Success(data = BreedImageApiModel(sampleImageUrl))
+ BreedImageApiModel(sampleImageUrl)
coEvery { dogBreedDao.getAllBreeds() } returns cachedEntities
@@ -85,15 +82,13 @@ class DogBreedsRepositoryImplTest {
//then
val expectedDogBreedDomains = mergeEntities(dogBreedEntities, cachedEntities).map { it.toDomainModel() }
- assertEquals(Result.Success(expectedDogBreedDomains), actual)
+ assertEquals(Result.success(expectedDogBreedDomains), actual)
}
@Test
fun `getAllBreeds handles api exception and fallbacks to database`() = runTest {
//given
- coEvery { dogBreedService.getAllDogBreeds() } returns ApiResult.Exception(
- UnknownHostException()
- )
+ coEvery { dogBreedService.getAllDogBreeds() } throws Exception("something went wrong")
coEvery { dogBreedDao.getAllBreeds() } returns cachedEntities
//when
@@ -102,24 +97,21 @@ class DogBreedsRepositoryImplTest {
//then
val domainBreeds = cachedEntities.map { it.toDomainModel() }
coVerify(exactly = 0) { dogBreedDao.saveBreeds(any()) }
- assertEquals(Result.Success(domainBreeds), actual)
+ assertEquals(Result.success(domainBreeds), actual)
}
@Test
- fun `getAllBreeds handles api error`() = runTest {
+ fun `getAllBreeds handles api error, throw error no database fallback`() = runTest {
//given
- coEvery { dogBreedService.getAllDogBreeds() } returns ApiResult.Error(
- 500,
- "Something went wrong"
- )
+ coEvery { dogBreedService.getAllDogBreeds() } throws Exception("something went wrong")
//when
val actual = subject.getAllBreeds()
//then
- coVerify(exactly = 0) { dogBreedDao.getAllBreeds() }
+ coVerify(exactly = 1) { dogBreedDao.getAllBreeds() }
coVerify(exactly = 0) { dogBreedDao.saveBreeds(any()) }
- assert(actual is Result.Failure)
+ assertTrue(actual.isFailure)
}
private val sampleImageUrl = "imageUrl"
diff --git a/data/breedDetails/build.gradle.kts b/data/breedDetails/build.gradle.kts
index c598a96..fdf35da 100644
--- a/data/breedDetails/build.gradle.kts
+++ b/data/breedDetails/build.gradle.kts
@@ -35,9 +35,8 @@ android {
}
dependencies {
- implementation(Dependencies.Hilt.hiltCore)
- ksp(Dependencies.Hilt.hiltCompiler)
- implementation(Dependencies.Hilt.hiltAndroid)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
implementation(project(":core:database"))
implementation(project(":core:common"))
diff --git a/data/breedDetails/src/main/java/com/tobioyelekan/dogbreed/data/breeddetails/repository/DogBreedDetailRepository.kt b/data/breedDetails/src/main/java/com/tobioyelekan/dogbreed/data/breeddetails/repository/DogBreedDetailRepository.kt
index 7b02e73..ed82138 100644
--- a/data/breedDetails/src/main/java/com/tobioyelekan/dogbreed/data/breeddetails/repository/DogBreedDetailRepository.kt
+++ b/data/breedDetails/src/main/java/com/tobioyelekan/dogbreed/data/breeddetails/repository/DogBreedDetailRepository.kt
@@ -2,10 +2,10 @@ package com.tobioyelekan.dogbreed.data.breeddetails.repository
import com.tobioyelekan.dogbreed.core.model.DogBreed
import kotlinx.coroutines.flow.Flow
-import com.tobioyelekan.dogbreed.core.common.result.Result
interface DogBreedDetailRepository {
fun getBreedDetails(breedName: String): Flow>
+ fun getFavoriteBreeds(): Flow>>
suspend fun addFavoriteBreed(name:String): Result
suspend fun removeFavoriteBreed(name:String): Result
}
\ No newline at end of file
diff --git a/data/breedDetails/src/main/java/com/tobioyelekan/dogbreed/data/breeddetails/repository/DogBreedDetailsRepositoryImpl.kt b/data/breedDetails/src/main/java/com/tobioyelekan/dogbreed/data/breeddetails/repository/DogBreedDetailsRepositoryImpl.kt
index d53c0d7..e0164bb 100644
--- a/data/breedDetails/src/main/java/com/tobioyelekan/dogbreed/data/breeddetails/repository/DogBreedDetailsRepositoryImpl.kt
+++ b/data/breedDetails/src/main/java/com/tobioyelekan/dogbreed/data/breeddetails/repository/DogBreedDetailsRepositoryImpl.kt
@@ -1,45 +1,39 @@
package com.tobioyelekan.dogbreed.data.breeddetails.repository
-import android.database.sqlite.SQLiteException
import com.tobioyelekan.dogbreed.core.database.dao.DogBreedDao
import com.tobioyelekan.dogbreed.core.model.DogBreed
import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flowOf
-import com.tobioyelekan.dogbreed.core.common.result.Result
-import com.tobioyelekan.dogbreed.core.common.result.mapToSuccess
import com.tobioyelekan.dogbreed.core.database.entity.toDomainModel
-import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.map
import javax.inject.Inject
class DogBreedDetailsRepositoryImpl @Inject constructor(
private val dogBreedDao: DogBreedDao
) : DogBreedDetailRepository {
override fun getBreedDetails(breedName: String): Flow> {
- return try {
- val breed = dogBreedDao.getBreed(breedName)
- breed.filterNotNull()
- .mapToSuccess { it.toDomainModel() }
- } catch (e: SQLiteException) {
- flowOf(Result.Failure("something went wrong, please try again"))
- }
+ return dogBreedDao.getBreed(breedName)
+ .map { runCatching { it.toDomainModel() } }
+ .catch { emit(Result.failure(it)) }
+ }
+
+ override fun getFavoriteBreeds(): Flow>> {
+ return dogBreedDao.getFavoriteBreeds()
+ .map { entities->
+ runCatching { entities.map { it.toDomainModel() } }
+ }
+ .catch { emit(Result.failure(it)) }
}
override suspend fun addFavoriteBreed(name: String): Result {
- return try {
+ return runCatching {
dogBreedDao.updateBreed(name, true)
- Result.Success(Unit)
- } catch (e: SQLiteException) {
- Result.Failure("something went wrong, please try again")
}
}
override suspend fun removeFavoriteBreed(name: String): Result {
- return try {
+ return runCatching {
dogBreedDao.updateBreed(name, false)
- Result.Success(Unit)
- } catch (e: SQLiteException) {
- Result.Failure("something went wrong, please try again")
}
}
-
}
diff --git a/data/breedDetails/src/test/java/com/tobioyelekan/dogbreed/data/breeddetails/DogBreedDetailsRepositoryImplTest.kt b/data/breedDetails/src/test/java/com/tobioyelekan/dogbreed/data/breeddetails/DogBreedDetailsRepositoryImplTest.kt
index 185258c..1d253c1 100644
--- a/data/breedDetails/src/test/java/com/tobioyelekan/dogbreed/data/breeddetails/DogBreedDetailsRepositoryImplTest.kt
+++ b/data/breedDetails/src/test/java/com/tobioyelekan/dogbreed/data/breeddetails/DogBreedDetailsRepositoryImplTest.kt
@@ -1,8 +1,6 @@
package com.tobioyelekan.dogbreed.data.breeddetails
import android.database.sqlite.SQLiteException
-import com.tobioyelekan.dogbreed.core.common.result.Result
-import com.tobioyelekan.dogbreed.core.common.result.mapToSuccess
import com.tobioyelekan.dogbreed.core.database.dao.DogBreedDao
import com.tobioyelekan.dogbreed.core.database.entity.DogBreedEntity
import com.tobioyelekan.dogbreed.core.database.entity.toDomainModel
@@ -10,8 +8,11 @@ import com.tobioyelekan.dogbreed.data.breeddetails.repository.DogBreedDetailsRep
import io.mockk.coEvery
import io.mockk.coVerify
import io.mockk.mockk
+import junit.framework.TestCase.assertTrue
import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
import kotlinx.coroutines.test.runTest
import org.junit.Test
import kotlin.test.assertEquals
@@ -30,7 +31,8 @@ class DogBreedDetailsRepositoryImplTest {
val actual = subject.getBreedDetails("breedName")
//then
- val expected = breedEntity.mapToSuccess { it.toDomainModel() }
+ val expected = breedEntity.map { runCatching { it.toDomainModel() } }
+
coVerify { dogBreedDao.getBreed(any()) }
assertEquals(expected.first(), actual.first())
}
@@ -38,15 +40,16 @@ class DogBreedDetailsRepositoryImplTest {
@Test
fun `getBreedDetails returns error when db error occurs`() = runTest {
//given
- coEvery { dogBreedDao.getBreed(any()) } throws SQLiteException()
+ coEvery { dogBreedDao.getBreed(any()) } returns flow {
+ throw Exception("something went wrong")
+ }
//when
val actual = subject.getBreedDetails("breedName")
//then
- val expected = flowOf(Result.Failure("something went wrong, please try again"))
coVerify { dogBreedDao.getBreed(any()) }
- assertEquals(expected.first(), actual.first())
+ assertTrue(actual.first().isFailure)
}
@Test
@@ -58,7 +61,7 @@ class DogBreedDetailsRepositoryImplTest {
val actual = subject.addFavoriteBreed("breedName")
//then
- val expected = flowOf(Result.Success(Unit))
+ val expected = flowOf(Result.success(Unit))
coVerify { dogBreedDao.updateBreed(any(), true) }
assertEquals(expected.first(), actual)
}
@@ -72,9 +75,8 @@ class DogBreedDetailsRepositoryImplTest {
val actual = subject.addFavoriteBreed("breedName")
//then
- val expected = flowOf(Result.Failure("something went wrong, please try again"))
coVerify { dogBreedDao.updateBreed(any(), true) }
- assertEquals(expected.first(), actual)
+ assertTrue(actual.isFailure)
}
@Test
@@ -86,7 +88,7 @@ class DogBreedDetailsRepositoryImplTest {
val actual = subject.removeFavoriteBreed("breedName")
//then
- val expected = flowOf(Result.Success(Unit))
+ val expected = flowOf(Result.success(Unit))
coVerify { dogBreedDao.updateBreed(any(), false) }
assertEquals(expected.first(), actual)
}
@@ -100,9 +102,8 @@ class DogBreedDetailsRepositoryImplTest {
val actual = subject.removeFavoriteBreed("breedName")
//then
- val expected = flowOf(Result.Failure("something went wrong, please try again"))
coVerify { dogBreedDao.updateBreed(any(), false) }
- assertEquals(expected.first(), actual)
+ assertTrue(actual.isFailure)
}
diff --git a/data/favorites/.gitignore b/data/favorites/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/data/favorites/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/data/favorites/build.gradle.kts b/data/favorites/build.gradle.kts
deleted file mode 100644
index 12efd50..0000000
--- a/data/favorites/build.gradle.kts
+++ /dev/null
@@ -1,49 +0,0 @@
-plugins {
- id("com.android.library")
- id("org.jetbrains.kotlin.android")
- id("com.google.devtools.ksp")
- id("dagger.hilt.android.plugin")
-
-}
-
-android {
- namespace = "com.tobioyelekan.dogbreed.data.favorites"
- compileSdk = 34
-
- defaultConfig {
- minSdk = 24
-
- testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
- consumerProguardFiles("consumer-rules.pro")
- }
-
- buildTypes {
- release {
- isMinifyEnabled = false
- proguardFiles(
- getDefaultProguardFile("proguard-android-optimize.txt"),
- "proguard-rules.pro"
- )
- }
- }
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
- }
- kotlinOptions {
- jvmTarget = "17"
- }
-}
-
-dependencies {
- implementation(Dependencies.Hilt.hiltCore)
- ksp(Dependencies.Hilt.hiltCompiler)
- implementation(Dependencies.Hilt.hiltAndroid)
-
- implementation(project(":core:database"))
- implementation(project(":core:common"))
- implementation(project(":core:model"))
-
- testImplementation(project(":core:testing"))
- testImplementation(kotlin("test"))
-}
\ No newline at end of file
diff --git a/data/favorites/consumer-rules.pro b/data/favorites/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/data/favorites/proguard-rules.pro b/data/favorites/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/data/favorites/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/data/favorites/src/main/AndroidManifest.xml b/data/favorites/src/main/AndroidManifest.xml
deleted file mode 100644
index a5918e6..0000000
--- a/data/favorites/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/data/favorites/src/main/java/com/tobioyelekan/dogbreed/data/favorites/di/FavoriteDataModule.kt b/data/favorites/src/main/java/com/tobioyelekan/dogbreed/data/favorites/di/FavoriteDataModule.kt
deleted file mode 100644
index 6e4fd42..0000000
--- a/data/favorites/src/main/java/com/tobioyelekan/dogbreed/data/favorites/di/FavoriteDataModule.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.tobioyelekan.dogbreed.data.favorites.di
-
-import com.tobioyelekan.dogbreed.data.favorites.repository.FavoriteBreedRepository
-import com.tobioyelekan.dogbreed.data.favorites.repository.FavoriteBreedRepositoryImpl
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-
-@Module
-@InstallIn(SingletonComponent::class)
-interface FavoriteDataModule {
- @Binds
- fun bindsFavoriteBreedsRepository(
- impl: FavoriteBreedRepositoryImpl
- ): FavoriteBreedRepository
-}
\ No newline at end of file
diff --git a/data/favorites/src/main/java/com/tobioyelekan/dogbreed/data/favorites/repository/FavoriteBreedRepository.kt b/data/favorites/src/main/java/com/tobioyelekan/dogbreed/data/favorites/repository/FavoriteBreedRepository.kt
deleted file mode 100644
index 6f2a284..0000000
--- a/data/favorites/src/main/java/com/tobioyelekan/dogbreed/data/favorites/repository/FavoriteBreedRepository.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.tobioyelekan.dogbreed.data.favorites.repository
-
-import com.tobioyelekan.dogbreed.core.common.result.Result
-import com.tobioyelekan.dogbreed.core.model.DogBreed
-import kotlinx.coroutines.flow.Flow
-
-interface FavoriteBreedRepository {
- fun getFavoriteBreeds(): Flow>>
-}
\ No newline at end of file
diff --git a/data/favorites/src/main/java/com/tobioyelekan/dogbreed/data/favorites/repository/FavoriteBreedRepositoryImpl.kt b/data/favorites/src/main/java/com/tobioyelekan/dogbreed/data/favorites/repository/FavoriteBreedRepositoryImpl.kt
deleted file mode 100644
index e991258..0000000
--- a/data/favorites/src/main/java/com/tobioyelekan/dogbreed/data/favorites/repository/FavoriteBreedRepositoryImpl.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.tobioyelekan.dogbreed.data.favorites.repository
-
-import android.database.sqlite.SQLiteException
-import com.tobioyelekan.dogbreed.core.database.dao.DogBreedDao
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
-import com.tobioyelekan.dogbreed.core.common.result.Result
-import com.tobioyelekan.dogbreed.core.common.result.mapToSuccess
-import com.tobioyelekan.dogbreed.core.database.entity.toDomainModel
-import com.tobioyelekan.dogbreed.core.model.DogBreed
-import javax.inject.Inject
-
-class FavoriteBreedRepositoryImpl @Inject constructor(
- private val dogBreedDao: DogBreedDao
-) : FavoriteBreedRepository {
- override fun getFavoriteBreeds(): Flow>> {
- return try {
- val result = dogBreedDao.getFavoriteBreeds().map { list ->
- list.map {
- it.toDomainModel()
- }
- }
- result.mapToSuccess {it}
- } catch (e: SQLiteException) {
- flowOf(Result.Failure("something went wrong, please try again"))
- }
- }
-}
\ No newline at end of file
diff --git a/data/favorites/src/test/java/com/tobioyelekan/dogbreed/data/favorites/FavoriteBreedRepositoryImplTest.kt b/data/favorites/src/test/java/com/tobioyelekan/dogbreed/data/favorites/FavoriteBreedRepositoryImplTest.kt
deleted file mode 100644
index 2429156..0000000
--- a/data/favorites/src/test/java/com/tobioyelekan/dogbreed/data/favorites/FavoriteBreedRepositoryImplTest.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.tobioyelekan.dogbreed.data.favorites
-
-import android.database.sqlite.SQLiteException
-import com.tobioyelekan.dogbreed.core.common.result.Result
-import com.tobioyelekan.dogbreed.core.common.result.mapToSuccess
-import com.tobioyelekan.dogbreed.core.database.dao.DogBreedDao
-import com.tobioyelekan.dogbreed.core.database.entity.DogBreedEntity
-import com.tobioyelekan.dogbreed.core.database.entity.toDomainModel
-import com.tobioyelekan.dogbreed.data.favorites.repository.FavoriteBreedRepositoryImpl
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.mockk
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.test.runTest
-import org.junit.Test
-import kotlin.test.assertEquals
-
-class FavoriteBreedRepositoryImplTest {
- private val dogBreedDao: DogBreedDao = mockk()
- private val subject = FavoriteBreedRepositoryImpl(dogBreedDao)
-
- @Test
- fun `getFavoriteBreeds returns favorite breeds`() = runTest {
- //given
- val breedEntities = flowOf(cachedEntities.filter { it.isFavorite })
- coEvery { dogBreedDao.getFavoriteBreeds() } returns breedEntities
-
- //when
- val actual = subject.getFavoriteBreeds()
-
- //then
- val expected = breedEntities
- .map { it.map { it.toDomainModel() } }
- .mapToSuccess { it }
- coVerify { dogBreedDao.getFavoriteBreeds() }
- assertEquals(expected.first(), actual.first())
- }
-
- @Test
- fun `getBreedDetails returns error when db error occurs`() = runTest {
- //given
- coEvery { dogBreedDao.getFavoriteBreeds() } throws SQLiteException()
-
- //when
- val actual = subject.getFavoriteBreeds()
-
- //then
- val expected = flowOf(Result.Failure("something went wrong, please try again"))
- coVerify { dogBreedDao.getFavoriteBreeds() }
- assertEquals(expected.first(), actual.first())
- }
-
- private val sampleImageUrl = "imageUrl"
-
- private val cachedEntities = listOf(
- DogBreedEntity(
- name = "dog1",
- imageUrl = sampleImageUrl,
- subBreeds = listOf("dog1a", "dog1b"),
- isFavorite = true
- ),
- DogBreedEntity(
- name = "dog2",
- imageUrl = sampleImageUrl,
- subBreeds = emptyList(),
- isFavorite = false
- ),
- DogBreedEntity(
- name = "dog3",
- imageUrl = sampleImageUrl,
- subBreeds = listOf("dog3a"),
- isFavorite = true
- )
- )
-}
\ No newline at end of file
diff --git a/data/subbreeds/build.gradle.kts b/data/subbreeds/build.gradle.kts
index 3059fe8..5ce0751 100644
--- a/data/subbreeds/build.gradle.kts
+++ b/data/subbreeds/build.gradle.kts
@@ -35,9 +35,8 @@ android {
}
dependencies {
- implementation(Dependencies.Hilt.hiltCore)
- ksp(Dependencies.Hilt.hiltCompiler)
- implementation(Dependencies.Hilt.hiltAndroid)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
implementation(project(":core:network"))
implementation(project(":core:common"))
diff --git a/data/subbreeds/src/main/java/com/tobioyelekan/dogbreed/data/subbreeds/repository/DogSubBreedRepository.kt b/data/subbreeds/src/main/java/com/tobioyelekan/dogbreed/data/subbreeds/repository/DogSubBreedRepository.kt
index 136d313..843c38a 100644
--- a/data/subbreeds/src/main/java/com/tobioyelekan/dogbreed/data/subbreeds/repository/DogSubBreedRepository.kt
+++ b/data/subbreeds/src/main/java/com/tobioyelekan/dogbreed/data/subbreeds/repository/DogSubBreedRepository.kt
@@ -1,6 +1,5 @@
package com.tobioyelekan.dogbreed.data.subbreeds.repository
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.core.model.SubBreedImage
interface DogSubBreedRepository {
diff --git a/data/subbreeds/src/main/java/com/tobioyelekan/dogbreed/data/subbreeds/repository/DogSubBreedRepositoryImpl.kt b/data/subbreeds/src/main/java/com/tobioyelekan/dogbreed/data/subbreeds/repository/DogSubBreedRepositoryImpl.kt
index 2fbd9c1..493f8a3 100644
--- a/data/subbreeds/src/main/java/com/tobioyelekan/dogbreed/data/subbreeds/repository/DogSubBreedRepositoryImpl.kt
+++ b/data/subbreeds/src/main/java/com/tobioyelekan/dogbreed/data/subbreeds/repository/DogSubBreedRepositoryImpl.kt
@@ -1,9 +1,7 @@
package com.tobioyelekan.dogbreed.data.subbreeds.repository
import com.tobioyelekan.dogbreed.core.network.DogBreedApiService
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.core.model.SubBreedImage
-import com.tobioyelekan.dogbreed.core.network.adapter.ApiResult
import com.tobioyelekan.dogbreed.data.subbreeds.mapper.toDomain
import javax.inject.Inject
@@ -14,25 +12,11 @@ class DogSubBreedRepositoryImpl @Inject constructor(
breedName: String,
subBreedName: String
): Result> {
- return when (
- val response = dogBreedService
- .getSubBreedImages(
- breedName = breedName,
- subBreedName = subBreedName
- )
- ) {
- is ApiResult.Success -> {
- val data = response.data.toDomain()
- Result.Success(value = data)
- }
-
- is ApiResult.Error -> {
- return Result.Failure("Something went wrong, please contact support and try again")
- }
-
- is ApiResult.Exception -> {
- Result.Failure( "Please check your internet connection and try again")
- }
+ return runCatching {
+ dogBreedService.getSubBreedImages(
+ breedName = breedName,
+ subBreedName = subBreedName
+ ).toDomain()
}
}
}
\ No newline at end of file
diff --git a/data/subbreeds/src/test/java/com/tobioyelekan/dogbreed/data/subbreeds/DogSubBreedRepositoryImplTest.kt b/data/subbreeds/src/test/java/com/tobioyelekan/dogbreed/data/subbreeds/DogSubBreedRepositoryImplTest.kt
index 1e363de..5f42ac0 100644
--- a/data/subbreeds/src/test/java/com/tobioyelekan/dogbreed/data/subbreeds/DogSubBreedRepositoryImplTest.kt
+++ b/data/subbreeds/src/test/java/com/tobioyelekan/dogbreed/data/subbreeds/DogSubBreedRepositoryImplTest.kt
@@ -1,17 +1,15 @@
package com.tobioyelekan.dogbreed.data.subbreeds
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.core.network.DogBreedApiService
-import com.tobioyelekan.dogbreed.core.network.adapter.ApiResult
import com.tobioyelekan.dogbreed.core.network.model.SubBreedImageApiModel
import com.tobioyelekan.dogbreed.data.subbreeds.mapper.toDomain
import com.tobioyelekan.dogbreed.data.subbreeds.repository.DogSubBreedRepositoryImpl
import io.mockk.coEvery
import io.mockk.coVerify
import io.mockk.mockk
+import junit.framework.TestCase.assertTrue
import kotlinx.coroutines.test.runTest
import org.junit.Test
-import java.net.UnknownHostException
import kotlin.test.assertEquals
class DogSubBreedRepositoryImplTest {
@@ -26,7 +24,7 @@ class DogSubBreedRepositoryImplTest {
any(),
any()
)
- } returns ApiResult.Success(sampleResponse)
+ } returns sampleResponse
//when
val actual = subject.getSubBreeds("breedName", "subBreedName")
@@ -34,7 +32,7 @@ class DogSubBreedRepositoryImplTest {
//then
val expected = sampleResponse.toDomain()
coVerify { service.getSubBreedImages(any(), any()) }
- assertEquals(Result.Success(expected), actual)
+ assertEquals(Result.success(expected), actual)
}
@Test
@@ -45,35 +43,14 @@ class DogSubBreedRepositoryImplTest {
any(),
any()
)
- } returns ApiResult.Exception(UnknownHostException())
+ } throws Exception("something went wrong")
//when
val actual = subject.getSubBreeds("breedName", "subBreedName")
//then
coVerify { service.getSubBreedImages(any(), any()) }
- assert(actual is Result.Failure)
- }
-
- @Test
- fun `getSubBreeds handles api error`() = runTest {
- //given
- coEvery {
- service.getSubBreedImages(
- any(),
- any()
- )
- } returns ApiResult.Error(
- 500,
- "Something went wrong"
- )
-
- //when
- val actual = subject.getSubBreeds("breedName", "subBreedName")
-
- //then
- coVerify { service.getSubBreedImages(any(), any()) }
- assert(actual is Result.Failure)
+ assertTrue(actual.isFailure)
}
private val sampleResponse = SubBreedImageApiModel(listOf("image1", "image2", "image3"))
diff --git a/domain/allbreeds/build.gradle.kts b/domain/allbreeds/build.gradle.kts
index c77e135..e224aea 100644
--- a/domain/allbreeds/build.gradle.kts
+++ b/domain/allbreeds/build.gradle.kts
@@ -35,9 +35,8 @@ android {
}
dependencies {
- implementation(Dependencies.Hilt.hiltCore)
- ksp(Dependencies.Hilt.hiltCompiler)
- implementation(Dependencies.Hilt.hiltAndroid)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
implementation(project(":data:allbreeds"))
implementation(project(":core:common"))
diff --git a/domain/allbreeds/src/main/java/com/tobioyelekan/dogbreed/domain/allbreeds/GetDogBreedListUseCase.kt b/domain/allbreeds/src/main/java/com/tobioyelekan/dogbreed/domain/allbreeds/GetDogBreedListUseCase.kt
index 2aea375..edfa609 100644
--- a/domain/allbreeds/src/main/java/com/tobioyelekan/dogbreed/domain/allbreeds/GetDogBreedListUseCase.kt
+++ b/domain/allbreeds/src/main/java/com/tobioyelekan/dogbreed/domain/allbreeds/GetDogBreedListUseCase.kt
@@ -1,6 +1,5 @@
package com.tobioyelekan.dogbreed.domain.allbreeds
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.core.model.DogBreed
import com.tobioyelekan.dogbreed.data.allbreeds.repository.DogBreedsRepository
import javax.inject.Inject
diff --git a/domain/allbreeds/src/test/java/com/tobioyelekan/dogbreed/domain/allbreeds/GetDogBreedListUseCaseTest.kt b/domain/allbreeds/src/test/java/com/tobioyelekan/dogbreed/domain/allbreeds/GetDogBreedListUseCaseTest.kt
index 8164d8a..dba3482 100644
--- a/domain/allbreeds/src/test/java/com/tobioyelekan/dogbreed/domain/allbreeds/GetDogBreedListUseCaseTest.kt
+++ b/domain/allbreeds/src/test/java/com/tobioyelekan/dogbreed/domain/allbreeds/GetDogBreedListUseCaseTest.kt
@@ -1,10 +1,10 @@
package com.tobioyelekan.dogbreed.domain.allbreeds
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.data.allbreeds.repository.DogBreedsRepositoryImpl
import com.tobioyelekan.dogbreed.testing.data.TestData.dogBreeds
import io.mockk.coEvery
import io.mockk.mockk
+import junit.framework.TestCase.assertTrue
import kotlinx.coroutines.test.runTest
import org.junit.Test
import kotlin.test.assertEquals
@@ -16,25 +16,26 @@ class GetDogBreedListUseCaseTest {
@Test
fun `return list of breeds`() = runTest {
//given
- coEvery { dogBreedRepository.getAllBreeds() } returns Result.Success(dogBreeds)
+ coEvery { dogBreedRepository.getAllBreeds() } returns Result.success(dogBreeds)
//when
val actual = subject()
//then
- assertEquals(Result.Success(dogBreeds), actual)
+ assertEquals(Result.success(dogBreeds), actual)
}
@Test
fun `return error when repository throws error`() = runTest {
//given
- coEvery { dogBreedRepository.getAllBreeds() } returns Result.Failure("something went wrong")
+ coEvery { dogBreedRepository.getAllBreeds() } returns
+ Result.failure(Exception("something went wrong"))
//when
val actual = subject()
//then
- assert(actual is Result.Failure)
+ assertTrue(actual.isFailure)
}
}
\ No newline at end of file
diff --git a/domain/breedDetails/build.gradle.kts b/domain/breedDetails/build.gradle.kts
index 2244f3c..6daf2ee 100644
--- a/domain/breedDetails/build.gradle.kts
+++ b/domain/breedDetails/build.gradle.kts
@@ -35,9 +35,8 @@ android {
}
dependencies {
- implementation(Dependencies.Hilt.hiltCore)
- ksp(Dependencies.Hilt.hiltCompiler)
- implementation(Dependencies.Hilt.hiltAndroid)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
implementation(project(":data:breedDetails"))
implementation(project(":core:common"))
diff --git a/domain/breedDetails/src/main/java/com/tobioyelekan/dogbreed/domain/breedDetails/AddFavoriteBreedUseCase.kt b/domain/breedDetails/src/main/java/com/tobioyelekan/dogbreed/domain/breedDetails/AddFavoriteBreedUseCase.kt
index 50367a9..6a3c0d6 100644
--- a/domain/breedDetails/src/main/java/com/tobioyelekan/dogbreed/domain/breedDetails/AddFavoriteBreedUseCase.kt
+++ b/domain/breedDetails/src/main/java/com/tobioyelekan/dogbreed/domain/breedDetails/AddFavoriteBreedUseCase.kt
@@ -1,7 +1,6 @@
package com.tobioyelekan.dogbreed.domain.breedDetails
import com.tobioyelekan.dogbreed.data.breeddetails.repository.DogBreedDetailRepository
-import com.tobioyelekan.dogbreed.core.common.result.Result
import javax.inject.Inject
class AddFavoriteBreedUseCase @Inject constructor(
diff --git a/domain/breedDetails/src/main/java/com/tobioyelekan/dogbreed/domain/breedDetails/DeleteFavoriteBreedUseCase.kt b/domain/breedDetails/src/main/java/com/tobioyelekan/dogbreed/domain/breedDetails/DeleteFavoriteBreedUseCase.kt
index 3a2accd..63d1e4f 100644
--- a/domain/breedDetails/src/main/java/com/tobioyelekan/dogbreed/domain/breedDetails/DeleteFavoriteBreedUseCase.kt
+++ b/domain/breedDetails/src/main/java/com/tobioyelekan/dogbreed/domain/breedDetails/DeleteFavoriteBreedUseCase.kt
@@ -1,6 +1,5 @@
package com.tobioyelekan.dogbreed.domain.breedDetails
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.data.breeddetails.repository.DogBreedDetailRepository
import javax.inject.Inject
diff --git a/domain/breedDetails/src/main/java/com/tobioyelekan/dogbreed/domain/breedDetails/GetBreedDetailsUseCase.kt b/domain/breedDetails/src/main/java/com/tobioyelekan/dogbreed/domain/breedDetails/GetBreedDetailsUseCase.kt
index bf66520..06d66bd 100644
--- a/domain/breedDetails/src/main/java/com/tobioyelekan/dogbreed/domain/breedDetails/GetBreedDetailsUseCase.kt
+++ b/domain/breedDetails/src/main/java/com/tobioyelekan/dogbreed/domain/breedDetails/GetBreedDetailsUseCase.kt
@@ -1,6 +1,5 @@
package com.tobioyelekan.dogbreed.domain.breedDetails
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.core.model.DogBreed
import com.tobioyelekan.dogbreed.data.breeddetails.repository.DogBreedDetailRepository
import kotlinx.coroutines.flow.Flow
diff --git a/domain/breedDetails/src/test/java/com/tobioyelekan/dogbreed/domain/breedDetails/AddFavoriteBreedUseCaseTest.kt b/domain/breedDetails/src/test/java/com/tobioyelekan/dogbreed/domain/breedDetails/AddFavoriteBreedUseCaseTest.kt
index e1d5304..277c722 100644
--- a/domain/breedDetails/src/test/java/com/tobioyelekan/dogbreed/domain/breedDetails/AddFavoriteBreedUseCaseTest.kt
+++ b/domain/breedDetails/src/test/java/com/tobioyelekan/dogbreed/domain/breedDetails/AddFavoriteBreedUseCaseTest.kt
@@ -1,9 +1,9 @@
package com.tobioyelekan.dogbreed.domain.breedDetails
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.data.breeddetails.repository.DogBreedDetailsRepositoryImpl
import io.mockk.coEvery
import io.mockk.mockk
+import junit.framework.TestCase.assertTrue
import kotlinx.coroutines.test.runTest
import org.junit.Test
import kotlin.test.assertEquals
@@ -15,24 +15,25 @@ class AddFavoriteBreedUseCaseTest {
@Test
fun `add favorite returns success`() = runTest {
//given
- coEvery { repository.addFavoriteBreed(any()) } returns Result.Success(Unit)
+ coEvery { repository.addFavoriteBreed(any()) } returns Result.success(Unit)
//when
val actual = subject("breedName")
//then
- assertEquals(Result.Success(Unit), actual)
+ assertEquals(Result.success(Unit), actual)
}
@Test
fun `add favorite return error when repository throws error`() = runTest {
//given
- coEvery { repository.addFavoriteBreed(any()) } returns Result.Failure("Something went wrong")
+ coEvery { repository.addFavoriteBreed(any()) } returns
+ Result.failure(Exception("Something went wrong"))
//when
val actual = subject("breedName")
//then
- assert(actual is Result.Failure)
+ assertTrue(actual.isFailure)
}
}
\ No newline at end of file
diff --git a/domain/breedDetails/src/test/java/com/tobioyelekan/dogbreed/domain/breedDetails/DeleteFavoriteBreedUseCaseTest.kt b/domain/breedDetails/src/test/java/com/tobioyelekan/dogbreed/domain/breedDetails/DeleteFavoriteBreedUseCaseTest.kt
index 2db1455..f1f6baa 100644
--- a/domain/breedDetails/src/test/java/com/tobioyelekan/dogbreed/domain/breedDetails/DeleteFavoriteBreedUseCaseTest.kt
+++ b/domain/breedDetails/src/test/java/com/tobioyelekan/dogbreed/domain/breedDetails/DeleteFavoriteBreedUseCaseTest.kt
@@ -1,9 +1,9 @@
package com.tobioyelekan.dogbreed.domain.breedDetails
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.data.breeddetails.repository.DogBreedDetailsRepositoryImpl
import io.mockk.coEvery
import io.mockk.mockk
+import junit.framework.TestCase.assertTrue
import kotlinx.coroutines.test.runTest
import org.junit.Test
import kotlin.test.assertEquals
@@ -15,24 +15,25 @@ class DeleteFavoriteBreedUseCaseTest {
@Test
fun `remove favorite returns success`() = runTest {
//given
- coEvery { repository.removeFavoriteBreed(any()) } returns Result.Success(Unit)
+ coEvery { repository.removeFavoriteBreed(any()) } returns Result.success(Unit)
//when
val actual = subject("breedName")
//then
- assertEquals(Result.Success(Unit), actual)
+ assertEquals(Result.success(Unit), actual)
}
@Test
fun `remove favorite return error when repository throws error`() = runTest {
//given
- coEvery { repository.removeFavoriteBreed(any()) } returns Result.Failure("Something went wrong")
+ coEvery { repository.removeFavoriteBreed(any()) } returns
+ Result.failure(Exception("Something went wrong"))
//when
val actual = subject("breedName")
//then
- assert(actual is Result.Failure)
+ assertTrue(actual.isFailure)
}
}
\ No newline at end of file
diff --git a/domain/breedDetails/src/test/java/com/tobioyelekan/dogbreed/domain/breedDetails/GetBreedDetailsUseCaseTest.kt b/domain/breedDetails/src/test/java/com/tobioyelekan/dogbreed/domain/breedDetails/GetBreedDetailsUseCaseTest.kt
index 4046483..038f856 100644
--- a/domain/breedDetails/src/test/java/com/tobioyelekan/dogbreed/domain/breedDetails/GetBreedDetailsUseCaseTest.kt
+++ b/domain/breedDetails/src/test/java/com/tobioyelekan/dogbreed/domain/breedDetails/GetBreedDetailsUseCaseTest.kt
@@ -1,6 +1,5 @@
package com.tobioyelekan.dogbreed.domain.breedDetails
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.data.breeddetails.repository.DogBreedDetailsRepositoryImpl
import com.tobioyelekan.dogbreed.testing.data.TestData.dogBreeds
import io.mockk.coEvery
@@ -10,6 +9,7 @@ import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.test.runTest
import org.junit.Test
import kotlin.test.assertEquals
+import kotlin.test.assertTrue
class GetBreedDetailsUseCaseTest {
private val repository: DogBreedDetailsRepositoryImpl = mockk()
@@ -18,24 +18,25 @@ class GetBreedDetailsUseCaseTest {
@Test
fun `get breed details returns breed successfully`() = runTest {
//given
- coEvery { repository.getBreedDetails(any()) } returns flowOf(Result.Success(dogBreeds[0]))
+ coEvery { repository.getBreedDetails(any()) } returns flowOf(Result.success(dogBreeds[0]))
//when
val actual = subject("breedName")
//then
- assertEquals(Result.Success(dogBreeds[0]), actual.first())
+ assertEquals(Result.success(dogBreeds[0]), actual.first())
}
@Test
fun `get breed details return error when repository throws error`() = runTest {
//given
- coEvery { repository.getBreedDetails(any()) } returns flowOf(Result.Failure("Something went wrong"))
+ coEvery { repository.getBreedDetails(any()) } returns
+ flowOf(Result.failure(Exception("Something went wrong")))
//when
val actual = subject("breedName")
//then
- assert(actual.first() is Result.Failure)
+ assertTrue(actual.first().isFailure)
}
}
\ No newline at end of file
diff --git a/domain/favorites/build.gradle.kts b/domain/favorites/build.gradle.kts
index 24d0b8f..1c38155 100644
--- a/domain/favorites/build.gradle.kts
+++ b/domain/favorites/build.gradle.kts
@@ -35,11 +35,10 @@ android {
}
dependencies {
- implementation(Dependencies.Hilt.hiltCore)
- ksp(Dependencies.Hilt.hiltCompiler)
- implementation(Dependencies.Hilt.hiltAndroid)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
- implementation(project(":data:favorites"))
+ implementation(project(":data:breedDetails"))
implementation(project(":core:common"))
implementation(project(":core:model"))
diff --git a/domain/favorites/src/main/java/com/tobioyelekan/dogbreed/domain/favorites/GetFavoriteBreedsUseCase.kt b/domain/favorites/src/main/java/com/tobioyelekan/dogbreed/domain/favorites/GetFavoriteBreedsUseCase.kt
index 8e70ee3..764558b 100644
--- a/domain/favorites/src/main/java/com/tobioyelekan/dogbreed/domain/favorites/GetFavoriteBreedsUseCase.kt
+++ b/domain/favorites/src/main/java/com/tobioyelekan/dogbreed/domain/favorites/GetFavoriteBreedsUseCase.kt
@@ -1,15 +1,14 @@
package com.tobioyelekan.dogbreed.domain.favorites
import com.tobioyelekan.dogbreed.core.model.DogBreed
-import com.tobioyelekan.dogbreed.core.common.result.Result
-import com.tobioyelekan.dogbreed.data.favorites.repository.FavoriteBreedRepository
+import com.tobioyelekan.dogbreed.data.breeddetails.repository.DogBreedDetailRepository
import kotlinx.coroutines.flow.Flow
import javax.inject.Inject
class GetFavoriteBreedsUseCase @Inject constructor(
- private val repository: FavoriteBreedRepository
-){
- operator fun invoke(): Flow>>{
+ private val repository: DogBreedDetailRepository
+) {
+ operator fun invoke(): Flow>> {
return repository.getFavoriteBreeds()
}
}
\ No newline at end of file
diff --git a/domain/favorites/src/test/java/com/tobioyelekan/dogbreed/domain/favorites/GetFavoriteBreedsUseCaseTest.kt b/domain/favorites/src/test/java/com/tobioyelekan/dogbreed/domain/favorites/GetFavoriteBreedsUseCaseTest.kt
index b7e5a7c..5496441 100644
--- a/domain/favorites/src/test/java/com/tobioyelekan/dogbreed/domain/favorites/GetFavoriteBreedsUseCaseTest.kt
+++ b/domain/favorites/src/test/java/com/tobioyelekan/dogbreed/domain/favorites/GetFavoriteBreedsUseCaseTest.kt
@@ -1,10 +1,10 @@
package com.tobioyelekan.dogbreed.domain.favorites
-import com.tobioyelekan.dogbreed.core.common.result.Result
-import com.tobioyelekan.dogbreed.data.favorites.repository.FavoriteBreedRepositoryImpl
+import com.tobioyelekan.dogbreed.data.breeddetails.repository.DogBreedDetailsRepositoryImpl
import com.tobioyelekan.dogbreed.testing.data.TestData.dogBreeds
import io.mockk.coEvery
import io.mockk.mockk
+import junit.framework.TestCase.assertTrue
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.test.runTest
@@ -12,30 +12,31 @@ import org.junit.Test
import kotlin.test.assertEquals
class GetFavoriteBreedsUseCaseTest {
- private val repository: FavoriteBreedRepositoryImpl = mockk()
+ private val repository: DogBreedDetailsRepositoryImpl = mockk()
private val subject = GetFavoriteBreedsUseCase(repository)
@Test
fun `get favorites breeds returns breeds successfully`() = runTest {
//given
- coEvery { repository.getFavoriteBreeds() } returns flowOf(Result.Success(dogBreeds))
+ coEvery { repository.getFavoriteBreeds() } returns flowOf(Result.success(dogBreeds))
//when
val actual = subject()
//then
- assertEquals(Result.Success(dogBreeds), actual.first())
+ assertEquals(Result.success(dogBreeds), actual.first())
}
@Test
fun `get favorites breeds returns error when repository throws error`() = runTest {
//given
- coEvery { repository.getFavoriteBreeds() } returns flowOf(Result.Failure("Something went wrong"))
+ coEvery { repository.getFavoriteBreeds() } returns
+ flowOf(Result.failure(Exception("Something went wrong")))
//when
val actual = subject()
//then
- assert(actual.first() is Result.Failure)
+ assertTrue(actual.first().isFailure)
}
}
\ No newline at end of file
diff --git a/domain/subbreeds/build.gradle.kts b/domain/subbreeds/build.gradle.kts
index 2091039..181883b 100644
--- a/domain/subbreeds/build.gradle.kts
+++ b/domain/subbreeds/build.gradle.kts
@@ -35,9 +35,8 @@ android {
}
dependencies {
- implementation(Dependencies.Hilt.hiltCore)
- ksp(Dependencies.Hilt.hiltCompiler)
- implementation(Dependencies.Hilt.hiltAndroid)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
implementation(project(":data:subbreeds"))
implementation(project(":core:common"))
diff --git a/domain/subbreeds/src/main/java/com/tobioyelekan/dogbreed/domain/subbreeds/GetSubBreedImageUseCase.kt b/domain/subbreeds/src/main/java/com/tobioyelekan/dogbreed/domain/subbreeds/GetSubBreedImageUseCase.kt
index 1d7be06..664da62 100644
--- a/domain/subbreeds/src/main/java/com/tobioyelekan/dogbreed/domain/subbreeds/GetSubBreedImageUseCase.kt
+++ b/domain/subbreeds/src/main/java/com/tobioyelekan/dogbreed/domain/subbreeds/GetSubBreedImageUseCase.kt
@@ -1,6 +1,5 @@
package com.tobioyelekan.dogbreed.domain.subbreeds
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.core.model.SubBreedImage
import com.tobioyelekan.dogbreed.data.subbreeds.repository.DogSubBreedRepository
import javax.inject.Inject
diff --git a/domain/subbreeds/src/test/java/com/tobioyelekan/dogbreed/domain/subbreeds/GetSubBreedImageUseCaseTest.kt b/domain/subbreeds/src/test/java/com/tobioyelekan/dogbreed/domain/subbreeds/GetSubBreedImageUseCaseTest.kt
index f350672..42f079f 100644
--- a/domain/subbreeds/src/test/java/com/tobioyelekan/dogbreed/domain/subbreeds/GetSubBreedImageUseCaseTest.kt
+++ b/domain/subbreeds/src/test/java/com/tobioyelekan/dogbreed/domain/subbreeds/GetSubBreedImageUseCaseTest.kt
@@ -1,10 +1,10 @@
package com.tobioyelekan.dogbreed.domain.subbreeds
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.data.subbreeds.repository.DogSubBreedRepositoryImpl
import com.tobioyelekan.dogbreed.testing.data.TestData.subBreedImages
import io.mockk.coEvery
import io.mockk.mockk
+import junit.framework.TestCase.assertTrue
import kotlinx.coroutines.test.runTest
import org.junit.Test
import kotlin.test.assertEquals
@@ -16,25 +16,26 @@ class GetSubBreedImageUseCaseTest {
@Test
fun `return list of favorites breeds`() = runTest {
//given
- coEvery { repository.getSubBreeds(any(), any()) } returns Result.Success(subBreedImages)
+ coEvery { repository.getSubBreeds(any(), any()) } returns Result.success(subBreedImages)
//when
val actual = subject("breedName", "subBreedName")
//then
- assertEquals(Result.Success(subBreedImages), actual)
+ assertEquals(Result.success(subBreedImages), actual)
}
@Test
fun `return error when repository throws error`() = runTest {
//given
- coEvery { repository.getSubBreeds(any(), any()) } returns Result.Failure("something went wrong")
+ coEvery { repository.getSubBreeds(any(), any()) } returns
+ Result.failure(Exception("something went wrong"))
//when
val actual = subject("breedName", "subBreedName")
//then
- assert(actual is Result.Failure)
+ assertTrue(actual.isFailure)
}
}
\ No newline at end of file
diff --git a/feature/allbreeds/build.gradle.kts b/feature/allbreeds/build.gradle.kts
index 335d78e..309a01a 100644
--- a/feature/allbreeds/build.gradle.kts
+++ b/feature/allbreeds/build.gradle.kts
@@ -44,11 +44,9 @@ android {
}
dependencies {
- implementation(Dependencies.Concurrency.kotlinCoroutine)
-
- implementation(Dependencies.Hilt.hiltCore)
- ksp(Dependencies.Hilt.hiltCompiler)
- implementation(Dependencies.Hilt.hiltAndroid)
+ implementation(libs.kotlin.coroutine)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
implementation(project(":domain:allbreeds"))
implementation(project(":core:designsystem"))
@@ -61,7 +59,7 @@ dependencies {
androidTestImplementation(project(":core:testing"))
androidTestImplementation(kotlin("test"))
- androidTestImplementation(Dependencies.Testing.composeJunitUiTest)
- debugImplementation(Dependencies.Testing.composeManifestUITest)
+ androidTestImplementation(libs.compose.junit.ui.test)
+ debugImplementation(libs.compose.test.manifest)
}
\ No newline at end of file
diff --git a/feature/allbreeds/src/main/java/com/tobioyelekan/dogbreed/feature/allbreeds/AllBreedsUiState.kt b/feature/allbreeds/src/main/java/com/tobioyelekan/dogbreed/feature/allbreeds/AllBreedsUiState.kt
index fa063cd..63b5617 100644
--- a/feature/allbreeds/src/main/java/com/tobioyelekan/dogbreed/feature/allbreeds/AllBreedsUiState.kt
+++ b/feature/allbreeds/src/main/java/com/tobioyelekan/dogbreed/feature/allbreeds/AllBreedsUiState.kt
@@ -5,7 +5,7 @@ import com.tobioyelekan.dogbreed.core.model.DogBreed
@Immutable
sealed class AllBreedsUiState {
- object Loading : AllBreedsUiState()
+ data object Loading : AllBreedsUiState()
class Success(val dogBreeds: List): AllBreedsUiState()
class Error(val message: String) : AllBreedsUiState()
}
diff --git a/feature/allbreeds/src/main/java/com/tobioyelekan/dogbreed/feature/allbreeds/AllBreedsViewModel.kt b/feature/allbreeds/src/main/java/com/tobioyelekan/dogbreed/feature/allbreeds/AllBreedsViewModel.kt
index ca85901..e830ad4 100644
--- a/feature/allbreeds/src/main/java/com/tobioyelekan/dogbreed/feature/allbreeds/AllBreedsViewModel.kt
+++ b/feature/allbreeds/src/main/java/com/tobioyelekan/dogbreed/feature/allbreeds/AllBreedsViewModel.kt
@@ -9,7 +9,6 @@ import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import javax.inject.Inject
-import com.tobioyelekan.dogbreed.core.common.result.Result
import kotlinx.coroutines.CoroutineDispatcher
@HiltViewModel
@@ -27,10 +26,13 @@ class AllBreedsViewModel @Inject constructor(
private fun getDogBreeds() {
viewModelScope.launch(ioDispatcher) {
- when (val result = getDogBreedListUseCase()) {
- is Result.Success -> _uiState.update { AllBreedsUiState.Success(result.value) }
- is Result.Failure -> _uiState.update { AllBreedsUiState.Error(result.errorMessage) }
- }
+ getDogBreedListUseCase()
+ .onSuccess { value ->
+ _uiState.update { AllBreedsUiState.Success(value) }
+ }
+ .onFailure {
+ _uiState.update { AllBreedsUiState.Error("something went wrong") }
+ }
}
}
}
\ No newline at end of file
diff --git a/feature/allbreeds/src/test/java/com/tobioyelekan/dogbreed/feature/allbreeds/AllBreedsViewModelTest.kt b/feature/allbreeds/src/test/java/com/tobioyelekan/dogbreed/feature/allbreeds/AllBreedsViewModelTest.kt
index 2a855f7..53927a8 100644
--- a/feature/allbreeds/src/test/java/com/tobioyelekan/dogbreed/feature/allbreeds/AllBreedsViewModelTest.kt
+++ b/feature/allbreeds/src/test/java/com/tobioyelekan/dogbreed/feature/allbreeds/AllBreedsViewModelTest.kt
@@ -1,6 +1,5 @@
package com.tobioyelekan.dogbreed.feature.allbreeds
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.domain.allbreeds.GetDogBreedListUseCase
import com.tobioyelekan.dogbreed.testing.data.TestData.dogBreeds
import com.tobioyelekan.dogbreed.testing.util.MainDispatcherRule
@@ -29,7 +28,7 @@ class AllBreedsViewModelTest {
fun stateIsInitiallyLoading() = runTest{
coEvery { useCase.invoke() } coAnswers {
delay(1000)
- Result.Success(dogBreeds)
+ Result.success(dogBreeds)
}
viewModel = AllBreedsViewModel(useCase, coroutineTestDispatcher)
@@ -38,7 +37,7 @@ class AllBreedsViewModelTest {
@Test
fun `emit success when usecase returns list of breeds`() = runTest {
- coEvery { useCase.invoke() } returns Result.Success(dogBreeds)
+ coEvery { useCase.invoke() } returns Result.success(dogBreeds)
viewModel = AllBreedsViewModel(useCase, coroutineTestDispatcher)
@@ -48,7 +47,7 @@ class AllBreedsViewModelTest {
@Test
fun `emit error when usecase returns error`() = runTest {
- coEvery { useCase.invoke() } returns Result.Failure("Something went wrong")
+ coEvery { useCase.invoke() } returns Result.failure(Exception("Something went wrong"))
viewModel = AllBreedsViewModel(useCase, coroutineTestDispatcher)
diff --git a/feature/breedDetails/build.gradle.kts b/feature/breedDetails/build.gradle.kts
index 85ccfab..ba43cfe 100644
--- a/feature/breedDetails/build.gradle.kts
+++ b/feature/breedDetails/build.gradle.kts
@@ -43,11 +43,9 @@ android {
}
dependencies {
- implementation(Dependencies.Hilt.hiltCore)
- ksp(Dependencies.Hilt.hiltCompiler)
- implementation(Dependencies.Hilt.hiltAndroid)
-
- implementation(Dependencies.Concurrency.kotlinCoroutine)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
+ implementation(libs.kotlin.coroutine)
implementation(project(":domain:breedDetails"))
implementation(project(":core:designsystem"))
@@ -60,6 +58,6 @@ dependencies {
androidTestImplementation(project(":core:testing"))
androidTestImplementation(kotlin("test"))
- androidTestImplementation(Dependencies.Testing.composeJunitUiTest)
- debugImplementation(Dependencies.Testing.composeManifestUITest)
+ androidTestImplementation(libs.compose.junit.ui.test)
+ debugImplementation(libs.compose.test.manifest)
}
\ No newline at end of file
diff --git a/feature/breedDetails/src/main/java/com/tobioyelekan/dogbreed/feature/breedDetails/DogBreedDetailsViewModel.kt b/feature/breedDetails/src/main/java/com/tobioyelekan/dogbreed/feature/breedDetails/DogBreedDetailsViewModel.kt
index 4ec61c0..d34474e 100644
--- a/feature/breedDetails/src/main/java/com/tobioyelekan/dogbreed/feature/breedDetails/DogBreedDetailsViewModel.kt
+++ b/feature/breedDetails/src/main/java/com/tobioyelekan/dogbreed/feature/breedDetails/DogBreedDetailsViewModel.kt
@@ -3,7 +3,6 @@ package com.tobioyelekan.dogbreed.feature.breedDetails
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.core.common.util.toTitleCase
import com.tobioyelekan.dogbreed.domain.breedDetails.AddFavoriteBreedUseCase
import com.tobioyelekan.dogbreed.domain.breedDetails.DeleteFavoriteBreedUseCase
@@ -46,12 +45,15 @@ class DogBreedDetailsViewModel @Inject constructor(
}
val uiState: StateFlow =
- getBreedDetailsUseCase(breedName).map { result ->
- when (result) {
- is Result.Success -> DogBreedDetailsUIState.Success(result.value)
- is Result.Failure -> DogBreedDetailsUIState.Error(result.errorMessage)
+ getBreedDetailsUseCase(breedName)
+ .map { result ->
+ result.fold(
+ onSuccess = { DogBreedDetailsUIState.Success(it) },
+ onFailure = {
+ DogBreedDetailsUIState.Error("Something went wrong")
+ }
+ )
}
- }
.stateIn(
scope = viewModelScope,
started = SharingStarted.WhileSubscribed(5_000),
@@ -60,21 +62,20 @@ class DogBreedDetailsViewModel @Inject constructor(
fun onFavoriteClicked(isFavorite: Boolean) {
viewModelScope.launch(ioDispatcher) {
- val result = if (isFavorite)
- deleteFavoriteBreedUseCase.invoke(breedName)
- else
- addFavoriteBreedUseCase.invoke(breedName)
+ val result = if (isFavorite) {
+ deleteFavoriteBreedUseCase(breedName)
+ } else {
+ addFavoriteBreedUseCase(breedName)
+ }
- when (result) {
- is Result.Success -> {
+ result
+ .onSuccess {
val msg = if (isFavorite) "Removed as favorite" else "Added as favorite"
_actionState.emit(ActionState.ShowMessage(msg))
}
-
- is Result.Failure -> {
- _actionState.emit(ActionState.ShowMessage(result.errorMessage))
+ .onFailure {
+ _actionState.emit(ActionState.ShowMessage("Something went wrong"))
}
- }
}
}
diff --git a/feature/breedDetails/src/test/java/com/tobioyelekan/dogbreed/feature/breedDetails/DogBreedDetailsViewModelTest.kt b/feature/breedDetails/src/test/java/com/tobioyelekan/dogbreed/feature/breedDetails/DogBreedDetailsViewModelTest.kt
index 3fcfdc0..5c3c84b 100644
--- a/feature/breedDetails/src/test/java/com/tobioyelekan/dogbreed/feature/breedDetails/DogBreedDetailsViewModelTest.kt
+++ b/feature/breedDetails/src/test/java/com/tobioyelekan/dogbreed/feature/breedDetails/DogBreedDetailsViewModelTest.kt
@@ -2,7 +2,6 @@ package com.tobioyelekan.dogbreed.feature.breedDetails
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.core.common.util.toTitleCase
import com.tobioyelekan.dogbreed.domain.breedDetails.AddFavoriteBreedUseCase
import com.tobioyelekan.dogbreed.domain.breedDetails.DeleteFavoriteBreedUseCase
@@ -58,7 +57,7 @@ class DogBreedDetailsViewModelTest {
@Test
fun `emit success when usecase returns success`() = runTest {
- coEvery { getBreedDetailsUseCase.invoke(any()) } returns flowOf(Result.Success(dogBreeds[0]))
+ coEvery { getBreedDetailsUseCase.invoke(any()) } returns flowOf(Result.success(dogBreeds[0]))
initializeViewModel()
@@ -73,7 +72,8 @@ class DogBreedDetailsViewModelTest {
@Test
fun `emit error when usecase returns error`() = runTest {
- coEvery { getBreedDetailsUseCase.invoke(any()) } returns flowOf(Result.Failure("Something went wrong"))
+ coEvery { getBreedDetailsUseCase.invoke(any()) } returns
+ flowOf(Result.failure(Exception("Something went wrong")))
initializeViewModel()
@@ -88,7 +88,7 @@ class DogBreedDetailsViewModelTest {
@Test
fun `on add favorite emits success message`() = runTest {
- coEvery { addFavoriteBreedUseCase.invoke(any()) } returns Result.Success(Unit)
+ coEvery { addFavoriteBreedUseCase.invoke(any()) } returns Result.success(Unit)
initializeViewModel()
@@ -104,7 +104,7 @@ class DogBreedDetailsViewModelTest {
@Test
fun `on remove favorite emits success`() = runTest {
- coEvery { deleteFavoriteBreedUseCase.invoke(any()) } returns Result.Success(Unit)
+ coEvery { deleteFavoriteBreedUseCase.invoke(any()) } returns Result.success(Unit)
initializeViewModel()
@@ -120,8 +120,10 @@ class DogBreedDetailsViewModelTest {
@Test
fun `emits error adding or removing favorite breed`() = runTest {
- coEvery { addFavoriteBreedUseCase.invoke(any()) } returns Result.Failure("Something went wrong")
- coEvery { deleteFavoriteBreedUseCase.invoke(any()) } returns Result.Failure("Something went wrong")
+ coEvery { addFavoriteBreedUseCase.invoke(any()) } returns
+ Result.failure(Exception("Something went wrong"))
+ coEvery { deleteFavoriteBreedUseCase.invoke(any()) } returns
+ Result.failure(Exception("Something went wrong"))
initializeViewModel()
diff --git a/feature/favorites/build.gradle.kts b/feature/favorites/build.gradle.kts
index 6eb48fc..bb1cda5 100644
--- a/feature/favorites/build.gradle.kts
+++ b/feature/favorites/build.gradle.kts
@@ -43,12 +43,11 @@ android {
}
dependencies {
- implementation(Dependencies.Hilt.hiltCompose)
- implementation(Dependencies.Hilt.hiltCore)
- ksp(Dependencies.Hilt.hiltCompiler)
- implementation(Dependencies.Hilt.hiltAndroid)
+ implementation(libs.hilt.compose)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
- implementation(Dependencies.Concurrency.kotlinCoroutine)
+ implementation(libs.kotlin.coroutine)
implementation(project(":domain:favorites"))
implementation(project(":core:designsystem"))
@@ -61,6 +60,6 @@ dependencies {
androidTestImplementation(project(":core:testing"))
androidTestImplementation(kotlin("test"))
- androidTestImplementation(Dependencies.Testing.composeJunitUiTest)
- debugImplementation(Dependencies.Testing.composeManifestUITest)
+ androidTestImplementation(libs.compose.junit.ui.test)
+ debugImplementation(libs.compose.test.manifest)
}
\ No newline at end of file
diff --git a/feature/favorites/src/main/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedScreen.kt b/feature/favorites/src/main/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedScreen.kt
index e23ecb1..086e4a1 100644
--- a/feature/favorites/src/main/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedScreen.kt
+++ b/feature/favorites/src/main/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedScreen.kt
@@ -52,7 +52,6 @@ internal fun FavoriteBreedScreenContent(
}
is FavoriteBreedUIState.Error -> ErrorState(text = state.message)
- FavoriteBreedUIState.Empty -> EmptyState()
}
}
}
@@ -62,21 +61,24 @@ private fun FavoriteBreedListContent(
breeds: List,
onBreedClicked: (breedName: String) -> Unit
) {
- Box(modifier = Modifier.fillMaxSize()) {
- LazyVerticalGrid(
- columns = GridCells.Fixed(2),
- state = rememberLazyGridState()
- ) {
- items(items = breeds, key = { it.name }) {
- DogBreedItem(
- breedName = it.name,
- imgUrl = it.imageUrl
- ) {
- onBreedClicked(it.name)
+ if (breeds.isEmpty())
+ EmptyState()
+ else
+ Box(modifier = Modifier.fillMaxSize()) {
+ LazyVerticalGrid(
+ columns = GridCells.Fixed(2),
+ state = rememberLazyGridState()
+ ) {
+ items(items = breeds, key = { it.name }) {
+ DogBreedItem(
+ breedName = it.name,
+ imgUrl = it.imageUrl
+ ) {
+ onBreedClicked(it.name)
+ }
}
}
}
- }
}
@Composable
diff --git a/feature/favorites/src/main/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedUIState.kt b/feature/favorites/src/main/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedUIState.kt
index 382cb7d..6894828 100644
--- a/feature/favorites/src/main/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedUIState.kt
+++ b/feature/favorites/src/main/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedUIState.kt
@@ -5,8 +5,7 @@ import com.tobioyelekan.dogbreed.core.model.DogBreed
@Immutable
sealed class FavoriteBreedUIState {
- object Loading : FavoriteBreedUIState()
- object Empty : FavoriteBreedUIState()
+ data object Loading : FavoriteBreedUIState()
class Success(val favoriteBreeds: List) : FavoriteBreedUIState()
class Error(val message: String) : FavoriteBreedUIState()
}
\ No newline at end of file
diff --git a/feature/favorites/src/main/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedViewModel.kt b/feature/favorites/src/main/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedViewModel.kt
index d9cfe4b..e0bc9a2 100644
--- a/feature/favorites/src/main/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedViewModel.kt
+++ b/feature/favorites/src/main/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedViewModel.kt
@@ -9,7 +9,6 @@ import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn
import javax.inject.Inject
-import com.tobioyelekan.dogbreed.core.common.result.Result
@HiltViewModel
class FavoriteBreedViewModel @Inject constructor(
@@ -17,16 +16,17 @@ class FavoriteBreedViewModel @Inject constructor(
) : ViewModel() {
val uiState: StateFlow =
- getFavoriteBreedsUseCase().map { result ->
- when (result) {
- is Result.Success -> {
- if (result.value.isEmpty()) return@map FavoriteBreedUIState.Empty
- FavoriteBreedUIState.Success(result.value)
- }
-
- is Result.Failure -> FavoriteBreedUIState.Error(result.errorMessage)
+ getFavoriteBreedsUseCase()
+ .map { result ->
+ result.fold(
+ onSuccess = { data ->
+ FavoriteBreedUIState.Success(data)
+ },
+ onFailure = {
+ FavoriteBreedUIState.Error("something went wrong")
+ }
+ )
}
- }
.stateIn(
scope = viewModelScope,
started = SharingStarted.WhileSubscribed(5_000),
diff --git a/feature/favorites/src/test/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedViewModelTest.kt b/feature/favorites/src/test/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedViewModelTest.kt
index 32f3b11..6e8bd03 100644
--- a/feature/favorites/src/test/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedViewModelTest.kt
+++ b/feature/favorites/src/test/java/com/tobioyelekan/dogbreed/feature/favorites/FavoriteBreedViewModelTest.kt
@@ -1,6 +1,5 @@
package com.tobioyelekan.dogbreed.feature.favorites
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.domain.favorites.GetFavoriteBreedsUseCase
import com.tobioyelekan.dogbreed.testing.data.TestData.dogBreeds
import com.tobioyelekan.dogbreed.testing.util.MainDispatcherRule
@@ -34,7 +33,7 @@ class FavoriteBreedViewModelTest {
@Test
fun `emit favorite breeds when usecase returns success and list is not empty`() = runTest {
- coEvery { useCase.invoke() } returns flowOf(Result.Success(favoriteBreeds))
+ coEvery { useCase.invoke() } returns flowOf(Result.success(favoriteBreeds))
viewModel = FavoriteBreedViewModel(useCase)
val collectJob = launch(coroutineTestDispatcher) {
@@ -50,22 +49,10 @@ class FavoriteBreedViewModelTest {
collectJob.cancel()
}
- @Test
- fun `emit empty state when usecase returns success and list is empty`() = runTest {
- coEvery { useCase.invoke() } returns flowOf(Result.Success(emptyList()))
- viewModel = FavoriteBreedViewModel(useCase)
-
- val collectJob = launch(coroutineTestDispatcher) {
- viewModel.uiState.collect()
- }
-
- assert(viewModel.uiState.value is FavoriteBreedUIState.Empty)
- collectJob.cancel()
- }
-
@Test
fun `emit error state when usecase returns error`() = runTest {
- coEvery { useCase.invoke() } returns flowOf(Result.Failure("Something went wrong"))
+ coEvery { useCase.invoke() } returns
+ flowOf(Result.failure(Exception("Something went wrong")))
viewModel = FavoriteBreedViewModel(useCase)
val collectJob = launch(coroutineTestDispatcher) {
diff --git a/feature/subbreeds/build.gradle.kts b/feature/subbreeds/build.gradle.kts
index 9923ce2..8830254 100644
--- a/feature/subbreeds/build.gradle.kts
+++ b/feature/subbreeds/build.gradle.kts
@@ -43,12 +43,11 @@ android {
}
dependencies {
- implementation(Dependencies.Hilt.hiltCompose)
- implementation(Dependencies.Hilt.hiltCore)
- ksp(Dependencies.Hilt.hiltCompiler)
- implementation(Dependencies.Hilt.hiltAndroid)
+ implementation(libs.hilt.compose)
+ implementation(libs.hilt.core)
+ ksp(libs.hilt.compiler)
- implementation(Dependencies.Concurrency.kotlinCoroutine)
+ implementation(libs.kotlin.coroutine)
implementation(project(":domain:subbreeds"))
implementation(project(":core:designsystem"))
@@ -61,6 +60,6 @@ dependencies {
androidTestImplementation(project(":core:testing"))
androidTestImplementation(kotlin("test"))
- androidTestImplementation(Dependencies.Testing.composeJunitUiTest)
- debugImplementation(Dependencies.Testing.composeManifestUITest)
+ androidTestImplementation(libs.compose.junit.ui.test)
+ debugImplementation(libs.compose.test.manifest)
}
\ No newline at end of file
diff --git a/feature/subbreeds/src/main/java/com/tobioyelekan/dogbreed/feature/subbreeds/SubBreedViewModel.kt b/feature/subbreeds/src/main/java/com/tobioyelekan/dogbreed/feature/subbreeds/SubBreedViewModel.kt
index f8046c3..0fe528e 100644
--- a/feature/subbreeds/src/main/java/com/tobioyelekan/dogbreed/feature/subbreeds/SubBreedViewModel.kt
+++ b/feature/subbreeds/src/main/java/com/tobioyelekan/dogbreed/feature/subbreeds/SubBreedViewModel.kt
@@ -11,7 +11,6 @@ import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import javax.inject.Inject
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.core.common.util.toTitleCase
import com.tobioyelekan.dogbreed.feature.subbreeds.navigation.breedNameArgs
import com.tobioyelekan.dogbreed.feature.subbreeds.navigation.subBreedNameArgs
@@ -37,10 +36,13 @@ class SubBreedViewModel @Inject constructor(
private fun fetchImages() {
viewModelScope.launch {
- when (val result = getSubBreedImageUseCase(breedName, subBreedName)) {
- is Result.Success -> _uiState.update { SubBreedUIState.Success(result.value) }
- is Result.Failure -> _uiState.update { SubBreedUIState.Error(result.errorMessage) }
- }
+ getSubBreedImageUseCase(breedName, subBreedName)
+ .onSuccess { result ->
+ _uiState.update { SubBreedUIState.Success(result) }
+ }
+ .onFailure {
+ _uiState.update { SubBreedUIState.Error("something went wrong") }
+ }
}
}
}
\ No newline at end of file
diff --git a/feature/subbreeds/src/test/java/com/tobioyelekan/dogbreed/feature/subbreeds/SubBreedViewModelTest.kt b/feature/subbreeds/src/test/java/com/tobioyelekan/dogbreed/feature/subbreeds/SubBreedViewModelTest.kt
index 18e9d72..5875476 100644
--- a/feature/subbreeds/src/test/java/com/tobioyelekan/dogbreed/feature/subbreeds/SubBreedViewModelTest.kt
+++ b/feature/subbreeds/src/test/java/com/tobioyelekan/dogbreed/feature/subbreeds/SubBreedViewModelTest.kt
@@ -2,7 +2,6 @@ package com.tobioyelekan.dogbreed.feature.subbreeds
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
-import com.tobioyelekan.dogbreed.core.common.result.Result
import com.tobioyelekan.dogbreed.core.common.util.toTitleCase
import com.tobioyelekan.dogbreed.domain.subbreeds.GetSubBreedImageUseCase
import com.tobioyelekan.dogbreed.feature.subbreeds.navigation.breedNameArgs
@@ -38,7 +37,7 @@ class SubBreedViewModelTest {
fun stateIsInitiallyLoading() = runTest {
coEvery { useCase.invoke(any(), any()) } coAnswers {
delay(1000)
- Result.Success(subBreedImages)
+ Result.success(subBreedImages)
}
viewModel = SubBreedViewModel(savedStateHandle, useCase)
@@ -49,7 +48,7 @@ class SubBreedViewModelTest {
@Test
fun `emit value from savedStateHandle as app bar title when viewmodel is launched`() =
runTest {
- coEvery { useCase.invoke(any(), any()) } returns Result.Success(subBreedImages)
+ coEvery { useCase.invoke(any(), any()) } returns Result.success(subBreedImages)
viewModel = SubBreedViewModel(savedStateHandle, useCase)
viewModel.appBarTitle.test {
@@ -61,7 +60,7 @@ class SubBreedViewModelTest {
@Test
fun `emit subbreed images when usecase returns success`() =
runTest {
- coEvery { useCase.invoke(any(), any()) } returns Result.Success(subBreedImages)
+ coEvery { useCase.invoke(any(), any()) } returns Result.success(subBreedImages)
viewModel = SubBreedViewModel(savedStateHandle, useCase)
viewModel.uiState.test {
@@ -74,13 +73,14 @@ class SubBreedViewModelTest {
@Test
fun `emit error when usecase returns success`() =
runTest {
- coEvery { useCase.invoke(any(), any()) } returns Result.Failure("Something went wrong")
+ coEvery { useCase.invoke(any(), any()) } returns
+ Result.failure(Exception("something went wrong"))
viewModel = SubBreedViewModel(savedStateHandle, useCase)
viewModel.uiState.test {
val item = awaitItem()
assert(viewModel.uiState.value is SubBreedUIState.Error)
- assertEquals("Something went wrong", (item as SubBreedUIState.Error).message)
+ assertEquals("something went wrong", (item as SubBreedUIState.Error).message)
}
}
}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..42d2522
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,97 @@
+[versions]
+core = "1.9.0"
+extended-icon = "1.6.0-beta01"
+navigation = "2.7.5"
+lifecycle-runtime = "2.6.2"
+compose-activity = "1.8.0"
+compose-ui = "1.5.0"
+compose-ui-graphics = "1.5.0"
+compose-tooling-preview = "1.5.0"
+compose-junit-ui-test = "1.5.0"
+compose-test-manifest = "1.5.0"
+material3 = "1.2.0-alpha11"
+coil = "2.4.0"
+retrofit = "2.9.0"
+moshi = "1.15.0"
+room = "2.6.1"
+hilt = "2.48.1"
+hilt-compose = "1.1.0"
+kotlin-serialization = "1.5.1"
+kotlin-jakewharton-serialization = "1.0.0"
+http-logging = "4.11.0"
+timber = "5.0.1"
+kotlin-coroutine = "1.7.1"
+junit = "4.13.2"
+android-junit = "1.1.5"
+espresso = "3.5.1"
+compose-bom-test = "2023.03.00"
+mockk = "1.13.3"
+turbine = "1.0.0"
+coroutine-test = "1.5.2"
+androidx-test-core = "1.5.0"
+androidx-test-runner = "1.2.0"
+
+[libraries]
+core = { module = "androidx.core:core-ktx", version.ref = "core" }
+
+# Jetpack Compose
+compose-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "compose-ui" }
+compose-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "extended-icon" }
+compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" }
+compose-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle-runtime" }
+compose-activity = { module = "androidx.activity:activity-compose", version.ref = "compose-activity" }
+compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-ui" }
+compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics", version.ref = "compose-ui-graphics" }
+compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
+
+# Coil
+coil-core = { module = "io.coil-kt:coil", version.ref = "coil" }
+coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
+
+# Retrofit
+retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
+retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }
+retrofit-kotlin-serialization = { module = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter", version.ref = "kotlin-jakewharton-serialization" }
+
+# Serialization
+kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" }
+
+# Lifecycle
+lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle-runtime" }
+
+# Room
+room-core = { module = "androidx.room:room-ktx", version.ref = "room" }
+room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
+room-testing = { module = "androidx.room:room-testing", version.ref = "room" }
+
+# Hilt
+hilt-core = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
+hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
+hilt-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hilt-compose" }
+
+# Logging
+logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "http-logging" }
+timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
+
+# Concurrency
+kotlin-coroutine = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutine" }
+
+# Testing
+junit = { module = "junit:junit", version.ref = "junit" }
+androidx-test-core = { module = "androidx.test:core-ktx", version.ref = "androidx-test-core" }
+android-junit = { module = "androidx.test.ext:junit", version.ref = "android-junit" }
+espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
+compose-bom-test = { module = "androidx.compose:compose-bom", version.ref = "compose-bom-test" }
+compose-junit-ui-test = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose-junit-ui-test" }
+compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-tooling-preview" }
+compose-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose-test-manifest" }
+mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
+turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
+coroutine-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutine-test" }
+androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" }
+
+[plugins]
+android-library = { id = "com.android.library" }
+kotlin-android = { id = "org.jetbrains.kotlin.android" }
+dagger-hilt = { id = "com.google.dagger.hilt.android" }
+kotlin-kapt = { id = "kotlin-kapt" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c..d64cd49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4332cd1..37f853b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Tue Nov 07 21:07:42 WAT 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0..1aa94a4 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
#
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,67 +17,99 @@
#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
##############################################################################
# Attempt to set APP_HOME
+
# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
warn () {
echo "$*"
-}
+} >&2
die () {
echo
echo "$*"
echo
exit 1
-}
+} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ JAVACMD=java
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
+ fi
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
fi
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
fi
- i=`expr $i + 1`
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
done
- case $i in
- 0) set -- ;;
- 1) set -- "$args0" ;;
- 2) set -- "$args0" "$args1" ;;
- 3) set -- "$args0" "$args1" "$args2" ;;
- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
fi
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=`save "$@"`
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f..6689b85 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 537dcaa..f0cfeaf 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -25,7 +25,6 @@ include(":feature:favorites")
include(":feature:subbreeds")
include(":data:allbreeds")
include(":data:breedDetails")
-include(":data:favorites")
include(":data:subbreeds")
include(":domain:allbreeds")
include(":domain:breedDetails")