commit 6105429a2a14d6ec16bbe039c4fe0e4e74e05ba7
parent 7f83c8b258d6e5cd474770150da4212f87b33a70
Author: Caner Karaca <37447503+CanerKaraca23@users.noreply.github.com>
Date: Sat, 1 Jun 2024 11:09:03 +0300
chore: update dependencies (#1062)
Co-authored-by: rhunk <101876869+rhunk@users.noreply.github.com>
Diffstat:
10 files changed, 63 insertions(+), 38 deletions(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -8,6 +8,7 @@ import java.io.ByteArrayOutputStream
plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.kotlinAndroid)
+ alias(libs.plugins.compose.compiler)
id("kotlin-parcelize")
}
@@ -20,10 +21,6 @@ android {
compose = true
}
- composeOptions {
- kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
- }
-
defaultConfig {
applicationId = rootProject.ext["applicationId"].toString()
versionCode = rootProject.ext["appVersionCode"].toString().toInt()
diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/features/FeaturesRoot.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/features/FeaturesRoot.kt
@@ -19,6 +19,7 @@ import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Color
@@ -32,6 +33,7 @@ import androidx.navigation.NavGraph.Companion.findStartDestination
import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavOptions
import androidx.navigation.compose.composable
+import com.github.skydoves.colorpicker.compose.AlphaTile
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
@@ -325,14 +327,16 @@ class FeaturesRoot : Routes.Route() {
}
registerDialogOnClickCallback().let { { it.invoke(true) } }.also {
- Box(
+ val selectedColor = (propertyValue.getNullable() as? Int)?.let { Color(it) }
+ AlphaTile(
modifier = Modifier
.size(30.dp)
.border(2.dp, Color.White, shape = RoundedCornerShape(15.dp))
- .background(
- color = (propertyValue.getNullable() as? Int)?.let { Color(it) } ?: Color.Transparent,
- shape = RoundedCornerShape(15.dp)
- )
+ .clip(RoundedCornerShape(15.dp)),
+ selectedColor = selectedColor ?: Color.Transparent,
+ tileEvenColor = selectedColor?.let { Color(0xFFCBCBCB) } ?: Color.Transparent,
+ tileOddColor = selectedColor?.let { Color.White } ?: Color.Transparent,
+ tileSize = 8.dp,
)
}
}
diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/util/AlertDialogs.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/util/AlertDialogs.kt
@@ -5,7 +5,16 @@ import android.view.MotionEvent
import android.widget.Toast
import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
@@ -13,8 +22,23 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Check
import androidx.compose.material.icons.filled.DeleteOutline
import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.FilledIconButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
@@ -34,8 +58,8 @@ import androidx.compose.ui.viewinterop.AndroidView
import com.github.skydoves.colorpicker.compose.AlphaSlider
import com.github.skydoves.colorpicker.compose.AlphaTile
import com.github.skydoves.colorpicker.compose.BrightnessSlider
+import com.github.skydoves.colorpicker.compose.ColorPickerController
import com.github.skydoves.colorpicker.compose.HsvColorPicker
-import com.github.skydoves.colorpicker.compose.rememberColorPickerController
import me.rhunk.snapenhance.common.bridge.wrapper.LocaleWrapper
import me.rhunk.snapenhance.common.config.DataProcessors
import me.rhunk.snapenhance.common.config.PropertyPair
@@ -347,7 +371,12 @@ class AlertDialogs(
}
DefaultDialogCard {
- val controller = rememberColorPickerController()
+ val controller = remember { ColorPickerController().apply {
+ if (currentColor == null) {
+ setWheelAlpha(1f)
+ setBrightness(1f, false)
+ }
+ } }
var colorHexValue by remember {
mutableStateOf(currentColor?.toArgb()?.let { Integer.toHexString(it) } ?: "")
}
@@ -399,6 +428,7 @@ class AlertDialogs(
.fillMaxWidth()
.padding(10.dp)
.height(35.dp),
+ initialColor = remember { currentColor },
controller = controller,
)
BrightnessSlider(
@@ -406,6 +436,7 @@ class AlertDialogs(
.fillMaxWidth()
.padding(10.dp)
.height(35.dp),
+ initialColor = remember { currentColor },
controller = controller,
)
Row(
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
alias(libs.plugins.androidApplication) apply false
alias(libs.plugins.androidLibrary) apply false
alias(libs.plugins.kotlinAndroid) apply false
+ alias(libs.plugins.compose.compiler) apply false
}
var versionName = "2.1.0"
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.kotlinAndroid)
+ alias(libs.plugins.compose.compiler)
id("kotlin-parcelize")
}
@@ -14,10 +15,6 @@ android {
compose = true
}
- composeOptions {
- kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
- }
-
defaultConfig {
minSdk = 28
buildConfigField("String", "VERSION_NAME", "\"${rootProject.ext["appVersionName"]}\"")
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.kotlinAndroid)
+ alias(libs.plugins.compose.compiler)
}
android {
@@ -15,10 +16,6 @@ android {
compose = true
}
- composeOptions {
- kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
- }
-
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
[versions]
-agp = "8.2.2"
-colorpicker-compose = "1.0.7"
+agp = "8.4.1"
+colorpicker-compose = "1.0.8"
libsu = "5.2.2"
-guava = "33.2.0-jre"
+guava = "33.2.1-jre"
jsoup = "1.17.2"
-kotlin = "1.9.23"
-kotlinx-coroutines-android = "1.8.0"
-compose-compiler = "1.5.13"
+kotlin = "2.0.0"
+compose-compiler = "2.0.0"
+kotlinx-coroutines-android = "1.8.1"
activity-ktx = "1.9.0"
androidx-documentfile = "1.1.0-alpha01"
coil-compose = "2.6.0"
@@ -15,9 +15,9 @@ osmdroid-android = "6.1.18"
recyclerview = "1.3.2"
compose-bom = "2024.05.00" # make sure all ui components are fully working after updating this
bcprov-jdk18on = "1.78.1"
-dexlib2 = "3.0.5"
+dexlib2 = "3.0.7"
ffmpeg-kit = "6.0-2.LTS"
-gson = "2.10.1"
+gson = "2.11.0"
junit = "5.10.2"
material3 = "1.2.1"
okhttp = "5.0.0-alpha.14"
@@ -58,6 +58,6 @@ rhino-android = { group = "com.faendir.rhino", name = "rhino-android", version.r
androidApplication = { id = "com.android.application", version.ref = "agp" }
androidLibrary = { id = "com.android.library", version.ref = "agp" }
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "compose-compiler" }
-
-[bundles]
+[bundles]+
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts
@@ -3,6 +3,7 @@ import com.android.build.gradle.internal.api.BaseVariantOutputImpl
plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.kotlinAndroid)
+ alias(libs.plugins.compose.compiler)
id("kotlin-parcelize")
}
@@ -29,10 +30,6 @@ android {
multiDexEnabled = true
}
- composeOptions {
- kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
- }
-
buildTypes {
release {
isMinifyEnabled = true
