Skip to content

Commit

Permalink
Merge pull request #110 from imashnake0/update-deps
Browse files Browse the repository at this point in the history
Updated dependencies
  • Loading branch information
imashnake0 authored Dec 22, 2023
2 parents 357ecea + 29162bc commit eeba9c8
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 35 deletions.
13 changes: 9 additions & 4 deletions app/src/main/java/com/imashnake/animite/features/home/Home.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
) { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -73,7 +72,6 @@ fun <T> 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?,
Expand Down
48 changes: 25 additions & 23 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,71 +13,73 @@ 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.
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]
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ include(
configure<SettingsExtension> {
buildToolsVersion = "34.0.0"
compileSdk = 34
minSdk = 26
minSdk = 29
}

0 comments on commit eeba9c8

Please sign in to comment.