diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d3ee38f..4b04a59 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,7 +4,7 @@ plugins { alias(libs.plugins.kotlin.compose) alias(libs.plugins.kotlin.serialization) alias(libs.plugins.hilt) - id("org.jetbrains.kotlin.kapt") + alias(libs.plugins.google.devtools.ksp) } android { @@ -74,12 +74,12 @@ dependencies { // Hilt implementation(libs.hilt.android) implementation(libs.hilt.navigation.compose) - kapt(libs.hilt.compiler) + ksp(libs.hilt.android.compiler) // Room implementation(libs.room.runtime) implementation(libs.room.ktx) - kapt(libs.room.compiler) + ksp(libs.room.compiler) // Retrofit implementation(libs.retrofit) diff --git a/app/src/main/java/com/novayaplaneta/ui/screens/rewards/RewardsScreen.kt b/app/src/main/java/com/novayaplaneta/ui/screens/rewards/RewardsScreen.kt index b1eb060..95be903 100644 --- a/app/src/main/java/com/novayaplaneta/ui/screens/rewards/RewardsScreen.kt +++ b/app/src/main/java/com/novayaplaneta/ui/screens/rewards/RewardsScreen.kt @@ -3,6 +3,7 @@ package com.novayaplaneta.ui.screens.rewards import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.filled.Star import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/app/src/main/java/com/novayaplaneta/ui/screens/timer/TimerScreen.kt b/app/src/main/java/com/novayaplaneta/ui/screens/timer/TimerScreen.kt index 2855be2..fd95c0a 100644 --- a/app/src/main/java/com/novayaplaneta/ui/screens/timer/TimerScreen.kt +++ b/app/src/main/java/com/novayaplaneta/ui/screens/timer/TimerScreen.kt @@ -62,7 +62,7 @@ fun TimerScreen( val sweepAngle = 360f * progress drawArc( - color = MaterialTheme.colorScheme.primary, + color = Color.Red, startAngle = -90f, sweepAngle = sweepAngle, useCenter = false, diff --git a/build.gradle.kts b/build.gradle.kts index 2be3a46..cf91d6a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,4 +5,5 @@ plugins { alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.hilt) apply false + alias(libs.plugins.google.devtools.ksp) apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e13ffcf..2a9ff7d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,6 +20,7 @@ navigation = "2.8.4" coil = "2.7.0" lottie = "6.1.0" coroutines = "1.10.0" +ksp = "2.0.21-1.0.26" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -40,7 +41,7 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3" # Hilt hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" } -hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" } +hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" } hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hiltNavigationCompose" } # Room @@ -76,5 +77,5 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } -kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } +google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }