diff --git a/app/src/main/java/com/imashnake/animite/features/home/Home.kt b/app/src/main/java/com/imashnake/animite/features/home/Home.kt index 454ef3cc..acdb6755 100644 --- a/app/src/main/java/com/imashnake/animite/features/home/Home.kt +++ b/app/src/main/java/com/imashnake/animite/features/home/Home.kt @@ -20,9 +20,9 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.verticalScroll -import androidx.compose.material.Icon -import androidx.compose.material.IconButton -import androidx.compose.material.Surface +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Surface import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.PlayArrow import androidx.compose.material3.MaterialTheme @@ -299,7 +299,12 @@ private fun MediaTypeSelector( modifier = Modifier .padding(dimensionResource(Res.dimen.media_type_selector_padding)) .size(dimensionResource(Res.dimen.media_type_choice_size)) - .offset(animateDpAsState(targetValue = if (selectedOption.value == MediaType.ANIME) 0.dp else 40.dp).value), + .offset( + animateDpAsState( + targetValue = if (selectedOption.value == MediaType.ANIME) 0.dp else 40.dp, + label = "media_switch" + ).value + ), shape = CircleShape, color = MaterialTheme.colorScheme.background ) { } diff --git a/app/src/main/java/com/imashnake/animite/features/media/MediaPage.kt b/app/src/main/java/com/imashnake/animite/features/media/MediaPage.kt index 0247bcce..12c2e9b2 100644 --- a/app/src/main/java/com/imashnake/animite/features/media/MediaPage.kt +++ b/app/src/main/java/com/imashnake/animite/features/media/MediaPage.kt @@ -5,6 +5,7 @@ import android.content.res.Configuration import android.net.Uri import android.text.Html import android.util.Log +import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -322,9 +323,7 @@ fun MediaGenres( colors = SuggestionChipDefaults.suggestionChipColors( containerColor = color.copy(alpha = 0.25f) ), - border = SuggestionChipDefaults.suggestionChipBorder( - borderColor = Color.Transparent - ) + border = BorderStroke(width = 0.dp, color = Color.Transparent) ) } } diff --git a/app/src/main/java/com/imashnake/animite/features/searchbar/SearchFab.kt b/app/src/main/java/com/imashnake/animite/features/searchbar/SearchFab.kt index 332a1944..311ad498 100644 --- a/app/src/main/java/com/imashnake/animite/features/searchbar/SearchFab.kt +++ b/app/src/main/java/com/imashnake/animite/features/searchbar/SearchFab.kt @@ -9,8 +9,8 @@ import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.selection.TextSelectionColors import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight import androidx.compose.material.icons.rounded.Close -import androidx.compose.material.icons.rounded.KeyboardArrowRight import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.LocalContentColor @@ -132,7 +132,7 @@ internal fun ExpandedSearchBarContent( modifier = Modifier.size(dimensionResource(com.imashnake.animite.core.R.dimen.icon_size)) ) { Icon( - imageVector = Icons.Rounded.KeyboardArrowRight, + imageVector = Icons.AutoMirrored.Rounded.KeyboardArrowRight, contentDescription = null ) } diff --git a/app/src/main/java/com/imashnake/animite/features/ui/MediaSmall.kt b/app/src/main/java/com/imashnake/animite/features/ui/MediaSmall.kt index d45a3a4c..a0d090f1 100644 --- a/app/src/main/java/com/imashnake/animite/features/ui/MediaSmall.kt +++ b/app/src/main/java/com/imashnake/animite/features/ui/MediaSmall.kt @@ -16,7 +16,6 @@ import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -73,7 +72,6 @@ fun MediaSmallRow( * @param label A label for the [image], if this is `null`, the [label] is not shown. * @param onClick Action to happen when the card is clicked. */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun MediaSmall( image: String?, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e01e65d6..8f72090e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,63 +13,65 @@ dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version.re # Core Library Desugaring # https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md. -desugaring = "2.0.3" +desugaring = "2.0.4" +# TODO: `SystemUiController` is deprecated. +# https://github.com/android/nowinandroid/pull/817 # Accompanist # https://github.com/google/accompanist/releases. accompanist = "0.32.0" # Android Gradle Plugin # https://developer.android.com/studio/releases/gradle-plugin. -agp = "8.1.1" +agp = "8.2.0" # AndroidX # https://androidx.tech. -activity = "1.7.2" -core = "1.12.0-rc01" -lifecycle = "2.6.1" -extJunit = "1.1.5" -espresso = "3.5.1" +activity = "1.8.2" +core = "1.13.0-alpha02" +lifecycle = "2.7.0-rc02" +extJunit = "1.2.0-alpha02" +espresso = "3.6.0-alpha02" +# TODO: Breaking changes; review release notes and update. # Apollo Kotlin # https://github.com/apollographql/apollo-kotlin/releases. apollo = "3.8.2" # COIL # https://github.com/coil-kt/coil/blob/main/CHANGELOG.md. -coil = "2.4.0" +coil = "2.5.0" -# TODO: Replace this with [Appyx](https://github.com/bumble-tech/appyx). # Compose Destinations # https://github.com/raamcosta/compose-destinations/releases. -composeDestinations = "1.9.51" +composeDestinations = "1.9.55" # Compose # https://developer.android.com/jetpack/androidx/releases/compose. -composeAnimation = "1.5.0" -composeCompiler = "1.5.3" -composeFoundation = "1.5.0" -composeMaterial = "1.5.0" -composeMaterial3 = "1.2.0-alpha06" -composeRuntime = "1.5.0" -composeUi = "1.5.0" +composeAnimation = "1.6.0-beta03" +composeCompiler = "1.5.7" +composeFoundation = "1.6.0-beta03" +composeMaterial = "1.6.0-beta03" +composeMaterial3 = "1.2.0-beta01" +composeRuntime = "1.6.0-beta03" +composeUi = "1.6.0-beta03" # Dagger # https://github.com/google/dagger/releases. -dagger = "2.48" +dagger = "2.50" # Hilt # https://developer.android.com/jetpack/androidx/releases/hilt. -hilt = "1.0.0" +hilt = "1.1.0" # Kotlin # https://kotlinlang.org/docs/releases.html#release-details. -kotlin = "1.9.10" -coroutines = "1.7.3" +kotlin = "1.9.21" +coroutines = "1.8.0-RC2" # KSP # https://github.com/google/ksp/releases. -ksp = "1.9.10-1.0.13" +ksp = "1.9.21-1.0.16" # Test # https://github.com/junit-team/junit4/releases. @@ -77,7 +79,7 @@ junit = "4.13.2" # Dependency Analysis Gradle Plugin # https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin/blob/main/CHANGELOG.md. -dependencyAnalysis = "1.21.0" +dependencyAnalysis = "1.28.0" [libraries] diff --git a/settings.gradle.kts b/settings.gradle.kts index 062ee86c..b65f64bf 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -34,5 +34,5 @@ include( configure { buildToolsVersion = "34.0.0" compileSdk = 34 - minSdk = 26 + minSdk = 29 }