Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-19 00:35:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bump!

Browse Source
This commit is contained in:
sadellie 2022-11-13 12:37:43 +04:00
parent d90ae9220a
commit 2a348867a2
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/build.gradle.kts
View File

@ -14,7 +14,7 @@ plugins {
id("com.google.firebase.crashlytics") id("com.google.firebase.crashlytics")
} }
val composeVersion = "1.3.0-beta01" val composeVersion = "1.4.0-alpha01"
// Flavor names // Flavor names
val playStore = "playStore" val playStore = "playStore"
@ -27,6 +27,7 @@ kapt {
useBuildCache = true useBuildCache = true
} }
@Suppress("UnstableApiUsage")
android { android {
namespace = "com.sadellie.unitto" namespace = "com.sadellie.unitto"
compileSdkVersion = "android-33" compileSdkVersion = "android-33"
@ -144,28 +145,28 @@ configurations {
} }
dependencies { dependencies {
implementation("androidx.core:core-ktx:1.8.0") implementation("androidx.core:core-ktx:1.9.0")
androidTestImplementation("androidx.test:core:1.4.0") androidTestImplementation("androidx.test:core:1.5.0")
androidTestImplementation("androidx.test.ext:junit-ktx:1.1.3") androidTestImplementation("androidx.test.ext:junit-ktx:1.1.4")
testImplementation("junit:junit:4.13.2") testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test:runner:1.4.0") androidTestImplementation("androidx.test:runner:1.5.1")
androidTestImplementation("androidx.test:rules:1.4.0") androidTestImplementation("androidx.test:rules:1.5.0")
// Compose and navigation // Compose and navigation
implementation("androidx.compose.ui:ui:$composeVersion") implementation("androidx.compose.ui:ui:$composeVersion")
implementation("androidx.compose.ui:ui-tooling-preview:$composeVersion") implementation("androidx.compose.ui:ui-tooling-preview:$composeVersion")
debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion") debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion")
implementation("androidx.navigation:navigation-compose:2.5.1") implementation("androidx.navigation:navigation-compose:2.5.3")
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0-alpha01") implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0-alpha03")
// Material Design 3 // Material Design 3
implementation("androidx.compose.material3:material3:1.0.0-beta01") implementation("androidx.compose.material3:material3:1.1.0-alpha02")
// Hilt and navigation // Hilt and navigation
implementation("androidx.hilt:hilt-navigation-compose:1.0.0") implementation("androidx.hilt:hilt-navigation-compose:1.0.0")
kapt("com.google.dagger:dagger-android-processor:2.43.2") kapt("com.google.dagger:dagger-android-processor:2.44.1")
implementation("com.google.dagger:hilt-android:2.43.2") implementation("com.google.dagger:hilt-android:2.44.1")
kapt("com.google.dagger:hilt-compiler:2.43.2") kapt("com.google.dagger:hilt-compiler:2.44.1")
// There are a lot of icons // There are a lot of icons
implementation("androidx.compose.material:material-icons-extended:$composeVersion") implementation("androidx.compose.material:material-icons-extended:$composeVersion")
@ -174,10 +175,10 @@ dependencies {
implementation("androidx.datastore:datastore-preferences:1.0.0") implementation("androidx.datastore:datastore-preferences:1.0.0")
// This is for system status bar color // This is for system status bar color
implementation("com.google.accompanist:accompanist-systemuicontroller:0.17.0") implementation("com.google.accompanist:accompanist-systemuicontroller:0.27.0")
// Firebase // Firebase
"playStoreImplementation"(platform("com.google.firebase:firebase-bom:30.3.2")) "playStoreImplementation"(platform("com.google.firebase:firebase-bom:31.0.2"))
"playStoreImplementation"("com.google.firebase:firebase-analytics-ktx") "playStoreImplementation"("com.google.firebase:firebase-analytics-ktx")
// Crashlytics and Analytics // Crashlytics and Analytics
"playStoreImplementation"("com.google.firebase:firebase-crashlytics-ktx") "playStoreImplementation"("com.google.firebase:firebase-crashlytics-ktx")
@ -188,7 +189,7 @@ dependencies {
kapt("androidx.room:room-compiler:2.4.3") kapt("androidx.room:room-compiler:2.4.3")
// Moshi // Moshi
implementation("com.squareup.moshi:moshi-kotlin:1.13.0") implementation("com.squareup.moshi:moshi-kotlin:1.14.0")
// Retrofit with Moshi Converter // Retrofit with Moshi Converter
implementation("com.squareup.retrofit2:converter-moshi:2.9.0") implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
@ -197,7 +198,7 @@ dependencies {
implementation("com.github.sadellie:themmo:0.0.5") implementation("com.github.sadellie:themmo:0.0.5")
// ComposeReorderable // ComposeReorderable
implementation("org.burnoutcrew.composereorderable:reorderable:0.9.2") implementation("org.burnoutcrew.composereorderable:reorderable:0.9.6")
// ExprK // ExprK
implementation("com.github.Keelar:ExprK:30c00415a8") implementation("com.github.Keelar:ExprK:30c00415a8")

2
app/src/main/java/com/sadellie/unitto/screens/common/UnittoListItem.kt
View File

@ -116,7 +116,7 @@ fun <T> UnittoListItem(
onExpandedChange = { dropDownExpanded = it } onExpandedChange = { dropDownExpanded = it }
) { ) {
OutlinedTextField( OutlinedTextField(
modifier = Modifier.widthIn(1.dp), modifier = Modifier.menuAnchor().widthIn(1.dp),
value = allOptions[currentOption] ?: selected.toString(), value = allOptions[currentOption] ?: selected.toString(),
onValueChange = {}, onValueChange = {},
readOnly = true, readOnly = true,

2
app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt
View File

@ -70,7 +70,7 @@ fun UnitGroupsScreen(
val state = rememberReorderableLazyListState( val state = rememberReorderableLazyListState(
onMove = viewModel::onMove, onMove = viewModel::onMove,
canDragOver = viewModel::canDragOver, canDragOver = { from, _ -> viewModel.canDragOver(from) },
onDragEnd = { _, _ -> viewModel.onDragEnd() } onDragEnd = { _, _ -> viewModel.onDragEnd() }
) )

6
build.gradle.kts
View File

@ -5,15 +5,15 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath("com.android.tools.build:gradle:7.2.2") classpath("com.android.tools.build:gradle:7.3.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
classpath("com.google.dagger:hilt-android-gradle-plugin:2.43") classpath("com.google.dagger:hilt-android-gradle-plugin:2.43")
// Google services // Google services
classpath("com.google.gms:google-services:4.3.13") classpath("com.google.gms:google-services:4.3.14")
// Crashlytics // Crashlytics
classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.1") classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2")
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle.kts files // in the individual module build.gradle.kts files