Updating to latest Compose and dependencies

Author: astamato

app/build.gradle

@@ -6,12 +6,12 @@ plugins {
 }
 
 android {
-    compileSdk 31
+    compileSdk 32
 
     defaultConfig {
         applicationId "com.example.astrobin"
         minSdk 24
-        targetSdk 31
+        targetSdk 32
         versionCode 1
         versionName "1.0"
 
@@ -59,7 +59,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
+        kotlinCompilerExtensionVersion compose_compiler_version
     }
     packagingOptions {
         resources {
@@ -69,27 +69,26 @@ android {
 }
 
 dependencies {
-
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.compose.material:material-icons-extended:$compose_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
     implementation 'com.github.bumptech.glide:glide:4.12.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
-    implementation 'androidx.activity:activity-compose:1.4.0'
-    implementation "androidx.navigation:navigation-fragment-ktx:2.5.0-alpha04"
-    implementation "androidx.navigation:navigation-ui-ktx:2.5.0-alpha04"
-    implementation "androidx.navigation:navigation-compose:2.5.0-alpha04"
-    implementation "androidx.paging:paging-compose:1.0.0-alpha14"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.activity:activity-compose:1.5.1'
+    implementation "androidx.navigation:navigation-fragment-ktx:2.5.1"
+    implementation "androidx.navigation:navigation-ui-ktx:2.5.1"
+    implementation "androidx.navigation:navigation-compose:2.5.1"
+    implementation "androidx.paging:paging-compose:1.0.0-alpha15"
     implementation "com.google.accompanist:accompanist-flowlayout:0.20.2"
     implementation "com.google.accompanist:accompanist-insets-ui:0.20.2"
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.moshi:moshi:1.11.0"
     implementation "com.squareup.moshi:moshi-kotlin:1.11.0"
     implementation "com.squareup.retrofit2:converter-moshi:2.9.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.0"
-    implementation "io.coil-kt:coil-compose:1.4.0"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.10.0"
+    implementation "io.coil-kt:coil-compose:2.1.0"
     implementation "com.google.dagger:hilt-android:$hilt_version"
     implementation 'androidx.paging:paging-common-ktx:3.1.1'
     kapt "com.google.dagger:hilt-compiler:$hilt_version"

app/src/main/java/com/example/astrobin/api/ImageLoader.kt

@@ -1,11 +1,14 @@
 package com.example.astrobin.api
 
 import android.app.Application
+import android.content.Context
 import coil.ImageLoader
-import coil.util.CoilUtils
+import coil.disk.DiskCache
+import coil.memory.MemoryCache
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import okhttp3.OkHttpClient
 
@@ -15,12 +18,22 @@ object ImageLoaderModule {
   @Provides
   fun imageLoader(
     application: Application,
-    okHttpClient: OkHttpClient
+    okHttpClient: OkHttpClient,
+    @ApplicationContext context: Context
   ) = ImageLoader.Builder(application)
     .okHttpClient(
       okHttpClient.newBuilder()
-        .cache(CoilUtils.createDefaultCache(application))
+         .build()
+    ).memoryCache {
+      MemoryCache.Builder(context)
+        .maxSizePercent(0.25)
         .build()
-    )
+    }
+    .diskCache {
+      DiskCache.Builder()
+        .directory(context.cacheDir.resolve("image_cache"))
+        .maxSizePercent(0.02)
+        .build()
+    }
     .build()
-}
+}

app/src/main/java/com/example/astrobin/ui/components/Buttons.kt

@@ -1,15 +1,15 @@
 package com.example.astrobin.ui.components
 
-import android.graphics.Paint
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.Icon
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -24,8 +24,8 @@ import com.example.astrobin.ui.theme.Yellow
 fun AstroButton(
   icon: ImageVector,
   onClick: () -> Unit,
-  selected: Boolean = false,
   modifier: Modifier = Modifier,
+  selected: Boolean = false
 ) {
   val color = if (selected) Yellow else Color.Transparent
   val contentColor = if (selected) DarkBlue else Color.White
@@ -52,8 +52,8 @@ fun AstroButton2(
   icon: ImageVector,
   label: String,
   onClick: () -> Unit,
-  selected: Boolean = false,
   modifier: Modifier = Modifier,
+  selected: Boolean = false
 ) {
   val color = if (selected) Yellow else Color.Transparent
   val contentColor = if (selected) DarkBlue else Yellow
@@ -81,14 +81,13 @@ fun AstroButton2(
   }
 }
 
-@OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun CountButton(
   icon: ImageVector,
   label: String,
   onClick: () -> Unit,
-  selected: Boolean = false,
   modifier: Modifier = Modifier,
+  selected: Boolean = false
 ) {
   val color = if (selected) Yellow else Color.White
   Row(

build.gradle

@@ -1,14 +1,15 @@
 buildscript {
     ext {
-        compose_version = '1.2.0-alpha08'
-        hilt_version = '2.41'
+        compose_version = '1.2.0'
+        compose_compiler_version = '1.2.0'
+        hilt_version = '2.42'
     }
 }
 
 plugins {
     id 'com.android.application' version '7.1.0' apply false
     id 'com.android.library' version '7.1.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.20' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
     id 'dagger.hilt.android.plugin' version '2.41' apply false
 }
 

settings.gradle

@@ -7,7 +7,7 @@ pluginManagement {
     resolutionStrategy {
         eachPlugin {
             if (requested.id.id == 'dagger.hilt.android.plugin') {
-                useModule('com.google.dagger:hilt-android-gradle-plugin:2.40.5')
+                useModule('com.google.dagger:hilt-android-gradle-plugin:2.42')
             }
         }
     }