ksp

Author: RubyLichtenstein

app/build.gradle.kts

@@ -1,8 +1,8 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
-    kotlin("kapt")
     id("com.google.dagger.hilt.android")
+    id("com.google.devtools.ksp")
 }
 
 android {
@@ -69,17 +69,12 @@ dependencies {
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
 
     implementation("com.google.dagger:hilt-android:$hiltVersion")
-    kapt("com.google.dagger:hilt-android-compiler:$hiltVersion")
+    ksp("com.google.dagger:hilt-android-compiler:$hiltVersion")
     androidTestImplementation("com.google.dagger:hilt-android-testing:$hiltVersion")
 
     testImplementation("io.mockk:mockk:${mockkVersion}")
     testImplementation("io.mockk:mockk-android:${mockkVersion}")
     testImplementation("io.mockk:mockk-agent:${mockkVersion}")
     androidTestImplementation("io.mockk:mockk-android:${mockkVersion}")
     androidTestImplementation("io.mockk:mockk-agent:${mockkVersion}")
-}
-
-// Allow references to generated code
-kapt {
-    correctErrorTypes = true
 }

build.gradle.kts

@@ -8,5 +8,5 @@ plugins {
     kotlin("plugin.serialization") version "1.9.10"
     id("com.android.library") version "8.1.1" apply false
     id("jacoco")
-//    id("com.google.devtools.ksp") version "1.8.10-1.0.9" apply false
+    id("com.google.devtools.ksp") version "1.9.10-1.0.13" apply false
 }

data/build.gradle.kts

@@ -3,11 +3,11 @@ apply(from = "../jacoco.gradle.kts")
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
-    kotlin("kapt")
     id("org.jetbrains.kotlin.plugin.serialization")
     id("dagger.hilt.android.plugin")
     id("com.google.dagger.hilt.android")
     id("jacoco")
+    id("com.google.devtools.ksp")
 }
 
 android {
@@ -70,10 +70,10 @@ dependencies {
     implementation("androidx.room:room-runtime:2.5.2")
     implementation("androidx.room:room-ktx:2.5.2")
 
-    kapt("androidx.room:room-compiler:2.5.2")
+    ksp("androidx.room:room-compiler:2.5.2")
 
     implementation("com.google.dagger:hilt-android:$hiltVersion")
-    kapt("com.google.dagger:hilt-android-compiler:$hiltVersion")
+    ksp("com.google.dagger:hilt-android-compiler:$hiltVersion")
     androidTestImplementation("com.google.dagger:hilt-android-testing:$hiltVersion")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")

data/src/main/java/com/rubylichtenstein/data/favorites/FavoritesRepository.kt

@@ -22,9 +22,8 @@ class FavoritesRepositoryImpl @Inject constructor(
         imagesDao.getFavoriteDogImages().map { it.map { it.toDogImageEntity() } }.asAsyncResult()
 
     override suspend fun updateFavoriteStatus(url: String, isFavorite: Boolean) {
-        //todo notify user in case of error
         withContext(Dispatchers.IO) {
-            val ret = imagesDao.updateFavoriteStatus(
+            imagesDao.updateFavoriteStatus(
                 url = url,
                 isFavorite = isFavorite
             )

domain/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     id("java-library")
     id("org.jetbrains.kotlin.jvm")
     id("jacoco")
+    id("com.google.devtools.ksp")
 }
 
 java {
@@ -59,7 +60,6 @@ val junitVersion: String by project
 
 dependencies {
     implementation("javax.inject:javax.inject:1")
-//    testImplementation("junit:junit:4.13.2")
 
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")

ui/build.gradle.kts

@@ -3,9 +3,9 @@ apply(from = "../jacoco.gradle.kts")
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
-    kotlin("kapt")
     id("com.google.dagger.hilt.android")
     id("jacoco")
+    id("com.google.devtools.ksp")
 }
 
 android {
@@ -50,7 +50,7 @@ dependencies {
     implementation(project(":domain"))
 
     implementation("com.google.dagger:hilt-android:$hiltVersion")
-    kapt("com.google.dagger:hilt-android-compiler:$hiltVersion")
+    ksp("com.google.dagger:hilt-android-compiler:$hiltVersion")
     androidTestImplementation("com.google.dagger:hilt-android-testing:$hiltVersion")
 
     implementation("androidx.core:core-ktx:1.12.0")

ui/src/main/java/com/rubylichtenstein/ui/AppNavigator.kt

@@ -4,7 +4,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.List
+import androidx.compose.material.icons.automirrored.filled.List
 import androidx.compose.material3.BottomAppBar
 import androidx.compose.material3.Icon
 import androidx.compose.material3.NavigationBar
@@ -15,7 +15,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-
 import androidx.navigation.NavHostController
 import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
@@ -33,7 +32,7 @@ import com.rubylichtenstein.ui.theme.DogBreedsTheme
 sealed class Screen(val route: String) {
     data object BreedsList : Screen("breedsList")
     data object Favorites : Screen("favorites")
-    class DogImages(val breed: String) : Screen("dogImages/$breed")
+    class DogImages(breed: String) : Screen("dogImages/$breed")
 }
 
 @Composable
@@ -100,7 +99,7 @@ fun MainAppScreen(navController: NavHostController) {
                     val currentRoute = navBackStackEntry?.destination?.route
 
                     NavigationBarItem(
-                        icon = { Icon(Icons.Default.List, contentDescription = null) },
+                        icon = { Icon(Icons.AutoMirrored.Filled.List, contentDescription = null) },
                         label = { Text("Breeds") },
                         selected = currentRoute == Screen.BreedsList.route,
                         onClick = {

ui/src/main/java/com/rubylichtenstein/ui/breeds/BreedsScreen.kt

@@ -28,6 +28,7 @@ import androidx.navigation.NavController
 import com.rubylichtenstein.domain.breeds.BreedEntity
 import com.rubylichtenstein.domain.common.AsyncResult
 import com.rubylichtenstein.domain.common.capitalizeWords
+import com.rubylichtenstein.ui.Screen
 import com.rubylichtenstein.ui.common.AsyncStateHandler
 
 @Composable
@@ -40,7 +41,7 @@ fun BreedsScreen(
     BreedsScreen(
         breedListState = breedListState,
         navigateToDogImages = { breedItem ->
-            navController.navigate("dogImages/${breedItem.route}")
+            navController.navigate(Screen.DogImages(breedItem.route).route)
         }
     )
 }

ui/src/main/java/com/rubylichtenstein/ui/favorites/FavoritesScreen.kt

@@ -76,10 +76,8 @@ fun FavoritesScreen(
                         }
 
                         DogImagesGrid(
-                            images = filteredImages,
-                            onToggleFavorite = { dogImage -> viewModel.toggleFavorite(dogImage) },
-                            showNames = true
-                        )
+                            images = filteredImages
+                        ) { dogImage -> viewModel.toggleFavorite(dogImage) }
                     }
                 }
             }

ui/src/main/java/com/rubylichtenstein/ui/images/ImagesGrid.kt

@@ -31,8 +31,7 @@ import com.rubylichtenstein.domain.images.DogImageEntity
 @Composable
 fun DogImagesGrid(
     images: List<DogImageEntity>,
-    onToggleFavorite: (DogImageEntity) -> Unit,
-    showNames: Boolean
+    onToggleFavorite: (DogImageEntity) -> Unit
 ) {
     LazyVerticalGrid(
         columns = GridCells.Fixed(2),

ui/src/main/java/com/rubylichtenstein/ui/images/ImagesScreen.kt

@@ -72,10 +72,8 @@ fun ImagesScreen(
         Box(modifier = Modifier.padding(innerPadding)) {
             AsyncStateHandler(dogImages) { dogImageList ->
                 DogImagesGrid(
-                    images = dogImageList,
-                    onToggleFavorite = { dogImage -> favoritesViewModel.toggleFavorite(dogImage) },
-                    showNames = false
-                )
+                    images = dogImageList
+                ) { dogImage -> favoritesViewModel.toggleFavorite(dogImage) }
             }
         }
     }