diff --git a/.gitignore b/.gitignore index 52d7647..e44b316 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,4 @@ local.properties /.idea /.vs -/app +/.kotlin diff --git a/app/build.gradle b/app/build.gradle index 5d34550..483249e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,9 @@ plugins { - id 'com.android.application' - id 'org.jetbrains.kotlin.android' + alias(libs.plugins.androidApplication) + alias(libs.plugins.kotlinAndroid) + alias(libs.plugins.compose.compiler) + alias(libs.plugins.serialization) } -android.buildFeatures.buildConfig true android { namespace 'io.github.chinosk.gakumas.localify' @@ -38,39 +39,39 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '11' } buildFeatures { + buildConfig true compose true prefab true } - composeOptions { - kotlinCompilerExtensionVersion '1.5.1' - } - packaging { - resources { - excludes += '/META-INF/{AL2.0,LGPL2.1}' - } - } externalNativeBuild { cmake { path file('src/main/cpp/CMakeLists.txt') version '3.22.1' } } - packagingOptions { - pickFirst '**/libxdl.so' - pickFirst '**/libshadowhook.so' - exclude 'gakumas-local/gakuen-adapted-translation-data/**' - } dataBinding { enable true } + packaging { + jniLibs { + pickFirsts += "**/libxdl.so" + pickFirsts += "**/libshadowhook.so" + } + resources { + excludes += "**/META-INF/{AL2.0,LGPL2.1}" + excludes += "kotlin/**" + excludes += "**.bin" + } + } + applicationVariants.configureEach { variant -> variant.mergeAssetsProvider.configure { mergeAssetsTask -> mergeAssetsTask.doLast { @@ -83,42 +84,40 @@ android { } dependencies { + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.material3) + implementation(libs.material) - implementation 'androidx.core:core-ktx:1.13.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.2' - implementation 'androidx.compose.material3:material3' - implementation 'com.google.android.material:material:1.12.0' + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.appcompat) + implementation(libs.androidx.navigation.compose) - implementation "androidx.activity:activity-compose:1.9.0" - implementation "androidx.appcompat:appcompat:1.7.0" - implementation 'androidx.navigation:navigation-compose:2.7.7' - - def composeBom = platform('androidx.compose:compose-bom:2024.06.00') + def composeBom = platform(libs.androidx.compose.bom) implementation(composeBom) androidTestImplementation(composeBom) - implementation "androidx.compose.runtime:runtime" - implementation "androidx.compose.material:material" - implementation "androidx.compose.foundation:foundation" - implementation "androidx.compose.foundation:foundation-layout" - implementation "androidx.compose.animation:animation" - implementation "androidx.compose.ui:ui-tooling-preview" - androidTestImplementation "androidx.compose.ui:ui-test-junit4" - debugImplementation "androidx.compose.ui:ui-tooling" - debugImplementation "androidx.compose.ui:ui-test-manifest" - implementation "com.google.accompanist:accompanist-pager:0.30.0" - implementation "com.google.accompanist:accompanist-pager-indicators:0.30.0" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2" + implementation(libs.androidx.runtime) + implementation(libs.androidx.material) + implementation(libs.androidx.foundation) + implementation(libs.androidx.foundation.layout) + implementation(libs.androidx.animation) + implementation(libs.androidx.ui.tooling.preview) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) + implementation(libs.accompanist.pager) + implementation(libs.accompanist.pager.indicators) + implementation(libs.androidx.lifecycle.viewmodel.compose) - implementation "io.coil-kt:coil-compose:2.6.0" - implementation "io.coil-kt:coil-svg:2.6.0" + implementation(libs.coil.compose) + implementation(libs.coil.svg) - implementation(platform("com.squareup.okhttp3:okhttp-bom:4.12.0")) - implementation "com.squareup.okhttp3:okhttp" - implementation "com.squareup.okhttp3:logging-interceptor" + implementation(platform(libs.okhttp.bom)) + implementation(libs.okhttp) + implementation(libs.logging.interceptor) - implementation 'io.github.hexhacking:xdl:2.1.1' - implementation 'com.bytedance.android:shadowhook:1.0.9' - compileOnly 'de.robv.android.xposed:api:82' - implementation "org.jetbrains.kotlin:kotlin-reflect:1.9.22" - implementation 'com.google.code.gson:gson:2.11.0' + implementation(libs.xdl) + implementation(libs.shadowhook) + compileOnly(libs.xposed.api) + implementation(libs.kotlinx.serialization.json) } \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 481bb43..774e59c 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -18,4 +18,9 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile + +-keep class io.github.chinosk.gakumas.localify.GakumasHookMain { + (); + native ; +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dac5051..0db5fbf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -35,7 +35,6 @@ diff --git a/app/src/main/java/io/github/chinosk/gakumas/localify/ConfigUpdateListener.kt b/app/src/main/java/io/github/chinosk/gakumas/localify/ConfigUpdateListener.kt index a123491..bdc083d 100644 --- a/app/src/main/java/io/github/chinosk/gakumas/localify/ConfigUpdateListener.kt +++ b/app/src/main/java/io/github/chinosk/gakumas/localify/ConfigUpdateListener.kt @@ -1,9 +1,6 @@ package io.github.chinosk.gakumas.localify import android.view.KeyEvent -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.setValue import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import io.github.chinosk.gakumas.localify.databinding.ActivityMainBinding diff --git a/app/src/main/java/io/github/chinosk/gakumas/localify/GakumasHookMain.kt b/app/src/main/java/io/github/chinosk/gakumas/localify/GakumasHookMain.kt index 0a84172..a3675a1 100644 --- a/app/src/main/java/io/github/chinosk/gakumas/localify/GakumasHookMain.kt +++ b/app/src/main/java/io/github/chinosk/gakumas/localify/GakumasHookMain.kt @@ -16,7 +16,6 @@ import android.view.MotionEvent import android.widget.Toast import com.bytedance.shadowhook.ShadowHook import com.bytedance.shadowhook.ShadowHook.ConfigBuilder -import com.google.gson.Gson import de.robv.android.xposed.IXposedHookLoadPackage import de.robv.android.xposed.IXposedHookZygoteInit import de.robv.android.xposed.XC_MethodHook @@ -33,11 +32,9 @@ import kotlinx.coroutines.launch import java.io.File import java.util.Locale import kotlin.system.measureTimeMillis -import android.content.ContentResolver import io.github.chinosk.gakumas.localify.hookUtils.FileHotUpdater +import io.github.chinosk.gakumas.localify.mainUtils.json import io.github.chinosk.gakumas.localify.models.ProgramConfig -import java.io.BufferedReader -import java.io.InputStreamReader val TAG = "GakumasLocalify" @@ -225,13 +222,17 @@ class GakumasHookMain : IXposedHookLoadPackage, IXposedHookZygoteInit { if (gkmsData != null) { gkmsDataInited = true val initConfig = try { - Gson().fromJson(gkmsData, GakumasConfig::class.java) + json.decodeFromString(gkmsData) } catch (e: Exception) { null } val programConfig = try { - Gson().fromJson(programData, ProgramConfig::class.java) + if (programData == null) { + ProgramConfig() + } else { + json.decodeFromString(programData) + } } catch (e: Exception) { null diff --git a/app/src/main/java/io/github/chinosk/gakumas/localify/MainActivity.kt b/app/src/main/java/io/github/chinosk/gakumas/localify/MainActivity.kt index ce9286e..49bb778 100644 --- a/app/src/main/java/io/github/chinosk/gakumas/localify/MainActivity.kt +++ b/app/src/main/java/io/github/chinosk/gakumas/localify/MainActivity.kt @@ -15,23 +15,22 @@ import androidx.compose.runtime.collectAsState import androidx.core.content.FileProvider import androidx.databinding.DataBindingUtil import androidx.lifecycle.ViewModelProvider -import com.google.gson.ExclusionStrategy -import com.google.gson.FieldAttributes -import com.google.gson.Gson -import com.google.gson.GsonBuilder -import com.google.gson.JsonSyntaxException import io.github.chinosk.gakumas.localify.databinding.ActivityMainBinding import io.github.chinosk.gakumas.localify.hookUtils.FileHotUpdater import io.github.chinosk.gakumas.localify.hookUtils.FilesChecker import io.github.chinosk.gakumas.localify.hookUtils.MainKeyEventDispatcher +import io.github.chinosk.gakumas.localify.mainUtils.json import io.github.chinosk.gakumas.localify.models.GakumasConfig import io.github.chinosk.gakumas.localify.models.ProgramConfig +import io.github.chinosk.gakumas.localify.models.ProgramConfigSerializer import io.github.chinosk.gakumas.localify.models.ProgramConfigViewModel import io.github.chinosk.gakumas.localify.models.ProgramConfigViewModelFactory import io.github.chinosk.gakumas.localify.ui.pages.MainUI import io.github.chinosk.gakumas.localify.ui.theme.GakumasLocalifyTheme import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow +import kotlinx.serialization.SerializationException +import kotlinx.serialization.encodeToString import java.io.File @@ -78,8 +77,8 @@ class MainActivity : ComponentActivity(), ConfigUpdateListener { } } - private fun getProgramConfigContent(excludes: List? = null): String { - if (excludes == null) { + private fun getProgramConfigContent(excludes: List = emptyList()): String { + if (excludes.isEmpty()) { val configFile = File(filesDir, "localify-config.json") return if (configFile.exists()) { configFile.readText() @@ -89,18 +88,7 @@ class MainActivity : ComponentActivity(), ConfigUpdateListener { } } else { - val gson = GsonBuilder() - .setExclusionStrategies(object : ExclusionStrategy { - override fun shouldSkipField(f: FieldAttributes): Boolean { - return excludes.contains(f.name) - } - - override fun shouldSkipClass(clazz: Class<*>): Boolean { - return false - } - }) - .create() - return gson.toJson(programConfig) + return json.encodeToString(ProgramConfigSerializer(excludes), programConfig) } } @@ -113,7 +101,7 @@ class MainActivity : ComponentActivity(), ConfigUpdateListener { Log.d(TAG, e.toString()) } val configFile = File(filesDir, "gkms-config.json") - configFile.writeText(Gson().toJson(binding.config!!)) + configFile.writeText(json.encodeToString(binding.config!!)) } override fun saveProgramConfig() { @@ -125,7 +113,7 @@ class MainActivity : ComponentActivity(), ConfigUpdateListener { Log.d(TAG, e.toString()) } val configFile = File(filesDir, "localify-config.json") - configFile.writeText(Gson().toJson(programConfig)) + configFile.writeText(json.encodeToString(programConfig)) } fun getVersion(): List { @@ -155,20 +143,20 @@ class MainActivity : ComponentActivity(), ConfigUpdateListener { private fun loadConfig() { val configStr = getConfigContent() binding.config = try { - Gson().fromJson(configStr, GakumasConfig::class.java) + json.decodeFromString(configStr) } - catch (e: JsonSyntaxException) { + catch (e: SerializationException) { showToast("配置文件异常,已重置: $e") - Gson().fromJson("{}", GakumasConfig::class.java) + GakumasConfig() } saveConfig() val programConfigStr = getProgramConfigContent() programConfig = try { - Gson().fromJson(programConfigStr, ProgramConfig::class.java) + json.decodeFromString(programConfigStr) } - catch (e: JsonSyntaxException) { - Gson().fromJson("{}", ProgramConfig::class.java) + catch (e: SerializationException) { + ProgramConfig() } } diff --git a/app/src/main/java/io/github/chinosk/gakumas/localify/hookUtils/MainKeyEventDispatcher.kt b/app/src/main/java/io/github/chinosk/gakumas/localify/hookUtils/MainKeyEventDispatcher.kt index 4cc24fb..26b0182 100644 --- a/app/src/main/java/io/github/chinosk/gakumas/localify/hookUtils/MainKeyEventDispatcher.kt +++ b/app/src/main/java/io/github/chinosk/gakumas/localify/hookUtils/MainKeyEventDispatcher.kt @@ -1,11 +1,10 @@ package io.github.chinosk.gakumas.localify.hookUtils -import android.util.Log import android.view.KeyEvent object MainKeyEventDispatcher { private val targetDbgKeyList: IntArray = intArrayOf(19, 19, 20, 20, 21, 22, 21, 22, 30, 29) - private var currentIndex = 0; + private var currentIndex = 0 fun checkDbgKey(code: Int, action: Int): Boolean { if (action == KeyEvent.ACTION_UP) return false diff --git a/app/src/main/java/io/github/chinosk/gakumas/localify/mainUtils/JsonHelper.kt b/app/src/main/java/io/github/chinosk/gakumas/localify/mainUtils/JsonHelper.kt new file mode 100644 index 0000000..b8b6f10 --- /dev/null +++ b/app/src/main/java/io/github/chinosk/gakumas/localify/mainUtils/JsonHelper.kt @@ -0,0 +1,7 @@ +package io.github.chinosk.gakumas.localify.mainUtils + +import kotlinx.serialization.json.Json + +val json = Json { + encodeDefaults = true +} \ No newline at end of file diff --git a/app/src/main/java/io/github/chinosk/gakumas/localify/models/AboutPageConfig.kt b/app/src/main/java/io/github/chinosk/gakumas/localify/models/AboutPageConfig.kt index b26af40..e39f6e0 100644 --- a/app/src/main/java/io/github/chinosk/gakumas/localify/models/AboutPageConfig.kt +++ b/app/src/main/java/io/github/chinosk/gakumas/localify/models/AboutPageConfig.kt @@ -1,24 +1,31 @@ package io.github.chinosk.gakumas.localify.models -data class AboutPageConfig ( - var plugin_repo: String = "https://github.com/chinosk6/gakuen-imas-localify", - var main_contributors: List = listOf(), - var contrib_img: ContribImg = ContribImg( +import kotlinx.serialization.Serializable + +@Serializable +data class AboutPageConfig( + val plugin_repo: String = "https://github.com/chinosk6/gakuen-imas-localify", + val main_contributors: List = listOf(), + val contrib_img: ContribImg = ContribImg( "https://contrib.rocks/image?repo=chinosk6/gakuen-imas-localify", - "https://contrib.rocks/image?repo=chinosk6/GakumasTranslationData") + "https://contrib.rocks/image?repo=chinosk6/GakumasTranslationData" + ) ) -data class MainContributors ( - var name: String, - var links: List +@Serializable +data class MainContributors( + val name: String, + val links: List ) -data class ContribImg ( - var plugin: String, - var translation: String +@Serializable +data class ContribImg( + val plugin: String, + val translation: String ) -data class Links ( - var name: String, - var link: String -) \ No newline at end of file +@Serializable +data class Links( + val name: String, + val link: String +) diff --git a/app/src/main/java/io/github/chinosk/gakumas/localify/models/GakumasConfig.kt b/app/src/main/java/io/github/chinosk/gakumas/localify/models/GakumasConfig.kt index 1a72e7c..cff65cf 100644 --- a/app/src/main/java/io/github/chinosk/gakumas/localify/models/GakumasConfig.kt +++ b/app/src/main/java/io/github/chinosk/gakumas/localify/models/GakumasConfig.kt @@ -1,6 +1,8 @@ package io.github.chinosk.gakumas.localify.models +import kotlinx.serialization.Serializable +@Serializable data class GakumasConfig ( var dbgMode: Boolean = false, var enabled: Boolean = true, diff --git a/app/src/main/java/io/github/chinosk/gakumas/localify/models/ProgramConfig.kt b/app/src/main/java/io/github/chinosk/gakumas/localify/models/ProgramConfig.kt index 04ddb24..ea68ab1 100644 --- a/app/src/main/java/io/github/chinosk/gakumas/localify/models/ProgramConfig.kt +++ b/app/src/main/java/io/github/chinosk/gakumas/localify/models/ProgramConfig.kt @@ -1,12 +1,41 @@ package io.github.chinosk.gakumas.localify.models +import io.github.chinosk.gakumas.localify.mainUtils.json +import kotlinx.serialization.KSerializer +import kotlinx.serialization.Serializable +import kotlinx.serialization.descriptors.SerialDescriptor +import kotlinx.serialization.encoding.Decoder +import kotlinx.serialization.encoding.Encoder +import kotlinx.serialization.encoding.encodeStructure +import kotlinx.serialization.json.JsonElement +import kotlinx.serialization.json.encodeToJsonElement +import kotlinx.serialization.json.jsonObject -data class ProgramConfig ( +@Serializable +data class ProgramConfig( var checkBuiltInAssets: Boolean = true, var transRemoteZipUrl: String = "", var useRemoteAssets: Boolean = false, var delRemoteAfterUpdate: Boolean = true, var cleanLocalAssets: Boolean = false, - var p: Boolean = false ) + +class ProgramConfigSerializer( + private val excludes: List = emptyList(), +) : KSerializer { + override val descriptor: SerialDescriptor = ProgramConfig.serializer().descriptor + override fun serialize(encoder: Encoder, value: ProgramConfig) { + val jsonObject = json.encodeToJsonElement(value).jsonObject + encoder.encodeStructure(descriptor) { + jsonObject.keys.forEachIndexed { index, k -> + if (k in excludes) return@forEachIndexed + encodeSerializableElement(descriptor, index, JsonElement.serializer(), jsonObject[k]!!) + } + } + } + + override fun deserialize(decoder: Decoder): ProgramConfig { + return ProgramConfig.serializer().deserialize(decoder) + } +} diff --git a/app/src/main/java/io/github/chinosk/gakumas/localify/ui/pages/subPages/AboutPage.kt b/app/src/main/java/io/github/chinosk/gakumas/localify/ui/pages/subPages/AboutPage.kt index 7c0d346..c4a35d5 100644 --- a/app/src/main/java/io/github/chinosk/gakumas/localify/ui/pages/subPages/AboutPage.kt +++ b/app/src/main/java/io/github/chinosk/gakumas/localify/ui/pages/subPages/AboutPage.kt @@ -28,10 +28,10 @@ import coil.compose.rememberAsyncImagePainter import coil.decode.SvgDecoder import coil.request.ImageRequest import coil.size.Size -import com.google.gson.Gson import io.github.chinosk.gakumas.localify.MainActivity import io.github.chinosk.gakumas.localify.R import io.github.chinosk.gakumas.localify.hookUtils.FilesChecker.convertToString +import io.github.chinosk.gakumas.localify.mainUtils.json import io.github.chinosk.gakumas.localify.models.AboutPageConfig import io.github.chinosk.gakumas.localify.models.GakumasConfig import io.github.chinosk.gakumas.localify.ui.components.GakuButton @@ -48,7 +48,7 @@ fun AboutPage(modifier: Modifier = Modifier, val dataJsonString = context?.getString(R.string.about_contributors_asset_file)?.let { convertToString(context.assets?.open(it)) } - Gson().fromJson(dataJsonString, AboutPageConfig::class.java) + dataJsonString?.let { json.decodeFromString(it) } ?: AboutPageConfig() } @@ -137,7 +137,7 @@ fun AboutPage(modifier: Modifier = Modifier, url = contributorInfo.contrib_img.plugin, contentDescription = "plugin-contrib" ) - + Spacer(modifier = Modifier.height(4.dp)) Text(stringResource(R.string.translation_repository), fontSize = 16.sp) NetworkSvgImage( diff --git a/build.gradle b/build.gradle index cb82319..6e929d1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,4 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { -id 'com.android.application' version '8.2.0' apply false - id 'org.jetbrains.kotlin.android' version '1.9.0' apply false -} \ No newline at end of file + alias(libs.plugins.androidApplication) apply false + alias(libs.plugins.kotlinAndroid) apply false +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..10d5072 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,54 @@ +[versions] +accompanistPager = "0.30.0" +activityCompose = "1.9.0" +okhttpBom = "4.12.0" +xposedApi = "82" +appcompat = "1.7.0" +coil = "2.6.0" +composeBom = "2024.06.00" +agp = "8.5.0" +coreKtx = "1.13.1" +kotlin = "2.0.0" +lifecycle = "2.8.2" +material = "1.12.0" +navigationCompose = "2.7.7" +xdl = "2.1.1" +shadowhook = "1.0.9" +serialization="1.7.1" + +[libraries] +accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanistPager" } +accompanist-pager-indicators = { module = "com.google.accompanist:accompanist-pager-indicators", version.ref = "accompanistPager" } +androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" } +androidx-animation = { module = "androidx.compose.animation:animation" } +androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } +androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" } +androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" } +androidx-foundation = { module = "androidx.compose.foundation:foundation" } +androidx-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" } +androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" } +androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" } +androidx-material = { module = "androidx.compose.material:material" } +androidx-material3 = { module = "androidx.compose.material3:material3" } +androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" } +androidx-runtime = { module = "androidx.compose.runtime:runtime" } +androidx-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } +androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" } +androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } +androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } +logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor" } +okhttp = { module = "com.squareup.okhttp3:okhttp" } +okhttp-bom = { module = "com.squareup.okhttp3:okhttp-bom", version.ref = "okhttpBom" } +xposed-api = { module = "de.robv.android.xposed:api", version.ref = "xposedApi" } +coil-svg = { module = "io.coil-kt:coil-svg", version.ref = "coil" } +coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } +material = { module = "com.google.android.material:material", version.ref = "material" } +shadowhook = { module = "com.bytedance.android:shadowhook", version.ref = "shadowhook" } +xdl = { module = "io.github.hexhacking:xdl", version.ref = "xdl" } +kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" } + +[plugins] +androidApplication = { id = "com.android.application", version.ref = "agp" } +kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d20bc4c..a441313 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Fri May 17 13:19:52 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 4f906e0..b740cf1 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# 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/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd3..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle index b650505..cef7bc5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,17 @@ pluginManagement { repositories { - google() + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } mavenCentral() gradlePluginPortal() } } + dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories {