Update dependencies
This commit is contained in:
parent
d26d2aec77
commit
efcc365394
4 changed files with 23 additions and 23 deletions
|
|
@ -85,7 +85,7 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
composeOptions {
|
composeOptions {
|
||||||
kotlinCompilerExtensionVersion = "1.5.7"
|
kotlinCompilerExtensionVersion = "1.5.11"
|
||||||
}
|
}
|
||||||
|
|
||||||
packaging {
|
packaging {
|
||||||
|
|
@ -104,27 +104,27 @@ dependencies {
|
||||||
implementation("androidx.activity:activity-compose:1.8.2")
|
implementation("androidx.activity:activity-compose:1.8.2")
|
||||||
|
|
||||||
// Compose
|
// Compose
|
||||||
implementation("androidx.compose.ui:ui:1.5.4")
|
implementation("androidx.compose.ui:ui:1.6.5")
|
||||||
implementation("androidx.compose.ui:ui-util:1.5.4")
|
implementation("androidx.compose.ui:ui-util:1.6.5")
|
||||||
implementation("androidx.compose.ui:ui-graphics:1.5.4")
|
implementation("androidx.compose.ui:ui-graphics:1.6.5")
|
||||||
implementation("androidx.compose.ui:ui-tooling-preview:1.5.4")
|
implementation("androidx.compose.ui:ui-tooling-preview:1.6.5")
|
||||||
implementation("androidx.compose.material:material:1.5.4")
|
implementation("androidx.compose.material:material:1.6.5")
|
||||||
implementation("androidx.compose.material3:material3:1.1.2")
|
implementation("androidx.compose.material3:material3:1.2.1")
|
||||||
debugImplementation("androidx.compose.ui:ui-tooling:1.5.4")
|
debugImplementation("androidx.compose.ui:ui-tooling:1.6.5")
|
||||||
|
|
||||||
implementation("androidx.constraintlayout:constraintlayout-compose:1.0.1")
|
implementation("androidx.constraintlayout:constraintlayout-compose:1.0.1")
|
||||||
|
|
||||||
// Navigation
|
// Navigation
|
||||||
implementation("androidx.navigation:navigation-compose:2.7.6")
|
implementation("androidx.navigation:navigation-compose:2.7.7")
|
||||||
|
|
||||||
// Accompanist
|
// Accompanist
|
||||||
implementation("com.google.accompanist:accompanist-placeholder:0.32.0")
|
implementation("com.google.accompanist:accompanist-placeholder:0.34.0")
|
||||||
|
|
||||||
// Splash Screen support prior to Android 12
|
// Splash Screen support prior to Android 12
|
||||||
implementation("androidx.core:core-splashscreen:1.0.1")
|
implementation("androidx.core:core-splashscreen:1.0.1")
|
||||||
|
|
||||||
// Google service
|
// Google service
|
||||||
implementation("com.google.android.gms:play-services-auth:20.7.0")
|
implementation("com.google.android.gms:play-services-auth:21.0.0")
|
||||||
implementation(
|
implementation(
|
||||||
dependencyNotation = "com.google.api-client:google-api-client-android:1.23.0",
|
dependencyNotation = "com.google.api-client:google-api-client-android:1.23.0",
|
||||||
dependencyConfiguration = { exclude("org.apache.httpcomponents") },
|
dependencyConfiguration = { exclude("org.apache.httpcomponents") },
|
||||||
|
|
@ -135,17 +135,17 @@ dependencies {
|
||||||
)
|
)
|
||||||
|
|
||||||
// Import the BoM for the Firebase platform
|
// Import the BoM for the Firebase platform
|
||||||
implementation(platform("com.google.firebase:firebase-bom:32.7.0"))
|
implementation(platform("com.google.firebase:firebase-bom:32.8.1"))
|
||||||
implementation("com.google.firebase:firebase-crashlytics-ktx")
|
implementation("com.google.firebase:firebase-crashlytics-ktx")
|
||||||
implementation("com.google.firebase:firebase-analytics-ktx")
|
implementation("com.google.firebase:firebase-analytics-ktx")
|
||||||
implementation("com.google.firebase:firebase-auth-ktx")
|
implementation("com.google.firebase:firebase-auth-ktx")
|
||||||
implementation("com.google.firebase:firebase-database-ktx")
|
implementation("com.google.firebase:firebase-database-ktx")
|
||||||
|
|
||||||
// Hilt: Dependency injection
|
// Hilt: Dependency injection
|
||||||
implementation("androidx.hilt:hilt-navigation-compose:1.1.0")
|
implementation("androidx.hilt:hilt-navigation-compose:1.2.0")
|
||||||
implementation("com.google.dagger:hilt-android:2.50")
|
implementation("com.google.dagger:hilt-android:2.51.1")
|
||||||
ksp("com.google.dagger:hilt-android-compiler:2.50")
|
ksp("com.google.dagger:hilt-android-compiler:2.51.1")
|
||||||
ksp("com.google.dagger:hilt-compiler:2.50")
|
ksp("com.google.dagger:hilt-compiler:2.51.1")
|
||||||
|
|
||||||
// Room
|
// Room
|
||||||
implementation("androidx.room:room-runtime:2.6.1")
|
implementation("androidx.room:room-runtime:2.6.1")
|
||||||
|
|
@ -153,7 +153,7 @@ dependencies {
|
||||||
ksp("androidx.room:room-compiler:2.6.1")
|
ksp("androidx.room:room-compiler:2.6.1")
|
||||||
|
|
||||||
// Image
|
// Image
|
||||||
implementation("io.coil-kt:coil-compose:2.5.0")
|
implementation("io.coil-kt:coil-compose:2.6.0")
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ package com.pixelized.rplexicon.ui.screens.search
|
||||||
import android.content.res.Configuration
|
import android.content.res.Configuration
|
||||||
import androidx.annotation.StringRes
|
import androidx.annotation.StringRes
|
||||||
import androidx.compose.foundation.shape.CircleShape
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
|
||||||
import androidx.compose.material3.FilterChip
|
import androidx.compose.material3.FilterChip
|
||||||
import androidx.compose.material3.FilterChipDefaults
|
import androidx.compose.material3.FilterChipDefaults
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
|
@ -58,7 +57,6 @@ sealed class SearchFilterUio(
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
@Composable
|
||||||
fun SearchFilter(
|
fun SearchFilter(
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
|
|
@ -77,6 +75,8 @@ fun SearchFilter(
|
||||||
border = FilterChipDefaults.filterChipBorder(
|
border = FilterChipDefaults.filterChipBorder(
|
||||||
borderColor = MaterialTheme.lexicon.colorScheme.search.chip.unSelected,
|
borderColor = MaterialTheme.lexicon.colorScheme.search.chip.unSelected,
|
||||||
selectedBorderColor = MaterialTheme.lexicon.colorScheme.search.chip.selected,
|
selectedBorderColor = MaterialTheme.lexicon.colorScheme.search.chip.selected,
|
||||||
|
enabled = true,
|
||||||
|
selected = filter.selected.value,
|
||||||
selectedBorderWidth = 1.dp,
|
selectedBorderWidth = 1.dp,
|
||||||
),
|
),
|
||||||
selected = filter.selected.value,
|
selected = filter.selected.value,
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
plugins {
|
plugins {
|
||||||
id("com.android.application") version "8.2.1" apply false
|
id("com.android.application") version "8.3.1" apply false
|
||||||
id("org.jetbrains.kotlin.android") version "1.9.21" apply false
|
id("org.jetbrains.kotlin.android") version "1.9.23" apply false
|
||||||
id("com.google.gms.google-services") version "4.3.14" apply false
|
id("com.google.gms.google-services") version "4.3.14" apply false
|
||||||
id("com.google.dagger.hilt.android") version "2.50" apply false
|
id("com.google.dagger.hilt.android") version "2.50" apply false
|
||||||
id("com.google.firebase.crashlytics") version "2.9.7" apply false
|
id("com.google.firebase.crashlytics") version "2.9.7" apply false
|
||||||
id("androidx.room") version "2.6.0" apply false
|
id("androidx.room") version "2.6.0" apply false
|
||||||
id("com.google.devtools.ksp") version "1.9.21-1.0.16" apply false
|
id("com.google.devtools.ksp") version "1.9.23-1.0.20" apply false
|
||||||
}
|
}
|
||||||
|
|
|
||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,6 +1,6 @@
|
||||||
#Wed Jul 12 18:52:35 CEST 2023
|
#Wed Jul 12 18:52:35 CEST 2023
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue