From 3df991d45bfc33a93e8786c1c907c3c18efc000a Mon Sep 17 00:00:00 2001 From: Lennoard Date: Sun, 10 Aug 2025 23:24:52 -0300 Subject: [PATCH 01/18] refactor: updated build scripts + version catalog --- app/build.gradle.kts | 55 ++++++++----- .../ui/params/edit/EditKernelParamActivity.kt | 5 -- build.gradle.kts | 38 ++------- buildSrc/src/main/kotlin/AndroidX.kt | 1 - buildSrc/src/main/kotlin/AppConfig.kt | 8 +- common/design/build.gradle.kts | 34 ++++---- common/utils/build.gradle.kts | 13 +-- data/build.gradle.kts | 39 ++++----- .../sysctlgui/data/utils/RootUtils.kt | 9 +-- domain/build.gradle.kts | 34 ++++++-- gradle/libs.versions.toml | 81 +++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 29 ++++++- 13 files changed, 232 insertions(+), 116 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4aa5fe0..b202615 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,11 +1,12 @@ -import org.jetbrains.kotlin.config.KotlinCompilerVersion import java.util.Properties plugins { - id("com.android.application") - kotlin("android") + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) + alias(libs.plugins.ksp) + alias(libs.plugins.jetbrains.kotlin.serialization) kotlin("kapt") - id("com.google.devtools.ksp") id("kotlin-parcelize") } @@ -93,28 +94,38 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlin { - jvmToolchain(17) - } - - composeOptions { - kotlinCompilerExtensionVersion = Compose.kotlinCompilerExtensionVersion + kotlinOptions { + jvmTarget = "17" } } dependencies { - implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) - implementation(kotlin("stdlib-jdk8", KotlinCompilerVersion.VERSION)) + implementation(project(":common:design")) + implementation(project(":common:utils")) + implementation(project(":domain")) + implementation(project(":data")) + + implementation(libs.kotlin.stdlib) + implementation(libs.kotlinx.coroutines.android) + + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.appcompat) + implementation(libs.androidx.material) + implementation(libs.androidx.navigation.compose) + implementation(libs.androidx.window) + + // Lifecycle + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.lifecycle.runtime.compose) + implementation(libs.androidx.lifecycle.viewmodel.ktx) + implementation(libs.androidx.lifecycle.viewmodel.navigation3) + implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.androidx.lifecycle.viewmodel.savedstate) + //ksp(libs.androidx.lifecycle.compiler) - implementation(project(Modules.domain)) - implementation(project(Modules.data)) - implementation(project(Modules.utils)) - implementation(project(Modules.design)) - - implementation(AndroidX.activity) implementation(AndroidX.splashScreen) implementation(AndroidX.lifecycleLiveData) - implementation(AndroidX.lifecycleRuntimeCompose) implementation(AndroidX.navigationFragment) implementation(AndroidX.navigationUi) implementation(AndroidX.preference) @@ -125,8 +136,10 @@ dependencies { implementation(Google.gson) - implementation(Dependencies.koinAndroid) - implementation(Dependencies.libSuCore) + implementation(libs.koin) + implementation(libs.koin.compose) + implementation(libs.bundles.libsu) + implementation(Dependencies.libSuIo) implementation(Dependencies.liveEvent) implementation(Dependencies.tapTargetView) diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditKernelParamActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditKernelParamActivity.kt index 3719b12..459e4e1 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditKernelParamActivity.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditKernelParamActivity.kt @@ -37,11 +37,6 @@ class EditKernelParamActivity : ComponentActivity() { handleIntent(intent) } - override fun onNewIntent(intent: Intent?) { - super.onNewIntent(intent) - handleIntent(intent ?: return) - } - private fun handleIntent(intent: Intent) { val param = intent.getParcelableExtra(EXTRA_PARAM) as? KernelParam if (param != null) { diff --git a/build.gradle.kts b/build.gradle.kts index d11fcfb..09c0244 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,33 +1,9 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.google.devtools.ksp") version "1.9.24-1.0.20" apply false -} - -buildscript { - repositories { - google() - mavenCentral() - } - - dependencies { - classpath("com.android.tools.build:gradle:8.5.0") - classpath(BuildPlugins.kotlin) - } -} - -allprojects { - repositories { - google() - mavenCentral() - maven { - url = uri("https://maven.google.com") - } - maven { - url = uri("https://jitpack.io") - } - } -} - -tasks.register("clean", Delete::class) { - delete(rootProject.buildDir) -} + alias(libs.plugins.android.application) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.compose) apply false + alias(libs.plugins.jetbrains.kotlin.jvm) apply false + alias(libs.plugins.android.library) apply false + alias(libs.plugins.ksp) apply false +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/AndroidX.kt b/buildSrc/src/main/kotlin/AndroidX.kt index 6f22260..52d512d 100644 --- a/buildSrc/src/main/kotlin/AndroidX.kt +++ b/buildSrc/src/main/kotlin/AndroidX.kt @@ -8,7 +8,6 @@ object AndroidX { private const val lifecycleVersion = "2.6.1" const val lifecycleLiveData = "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion" const val lifecycleViewModel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion" - const val lifecycleRuntimeCompose = "androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion" const val preference = "androidx.preference:preference-ktx:1.2.0" const val swipeRefreshLayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" diff --git a/buildSrc/src/main/kotlin/AppConfig.kt b/buildSrc/src/main/kotlin/AppConfig.kt index a2448da..3e47b91 100644 --- a/buildSrc/src/main/kotlin/AppConfig.kt +++ b/buildSrc/src/main/kotlin/AppConfig.kt @@ -1,10 +1,10 @@ object AppConfig { - val devCycle = false + val devCycle = true const val appId = "com.androidvip.sysctlgui" - const val compileSdkVersion = 34 - const val minSdkVersion = 21 - const val targetSdkVersion = 34 + const val compileSdkVersion = 36 + const val minSdkVersion = 24 + const val targetSdkVersion = 36 const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" const val proguardConsumerRules = "consumer-rules.pro" diff --git a/common/design/build.gradle.kts b/common/design/build.gradle.kts index e2da347..d9ddb38 100644 --- a/common/design/build.gradle.kts +++ b/common/design/build.gradle.kts @@ -1,6 +1,7 @@ plugins { - id("com.android.library") - id("org.jetbrains.kotlin.android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) } android { @@ -9,7 +10,6 @@ android { defaultConfig { minSdk = AppConfig.minSdkVersion - targetSdk = AppConfig.targetSdkVersion testInstrumentationRunner = AppConfig.testInstrumentationRunner consumerProguardFiles(AppConfig.proguardConsumerRules) @@ -38,27 +38,27 @@ android { kotlinOptions { jvmTarget = "17" } - - composeOptions { - kotlinCompilerExtensionVersion = Compose.kotlinCompilerExtensionVersion - } } dependencies { - val composeBom = platform(Compose.BoM) - api(composeBom) - androidTestImplementation(composeBom) + implementation(libs.androidx.core.ktx) + + api(platform(libs.androidx.compose.bom)) + api(libs.androidx.ui) + api(libs.androidx.ui.graphics) + api(libs.androidx.ui.tooling.preview) + api(libs.androidx.material3) + api(libs.androidx.material.icons.core) + api(libs.androidx.window) - api(AndroidX.activity) - api(AndroidX.appCompat) api(AndroidX.constraintLayout) - api(AndroidX.core) api(AndroidX.swipeRefreshLayout) - api(Compose.material3) api(Compose.material) - api(Compose.activity) - api(Compose.uiTooling) - debugApi(Compose.uiTooling) implementation(AndroidX.splashScreen) implementation(Google.material) + + androidTestApi(platform(libs.androidx.compose.bom)) + debugApi(libs.androidx.ui.tooling) + debugApi(libs.androidx.ui.test.manifest) } + diff --git a/common/utils/build.gradle.kts b/common/utils/build.gradle.kts index 6f0ac70..532ccf1 100644 --- a/common/utils/build.gradle.kts +++ b/common/utils/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.library") - id("org.jetbrains.kotlin.android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { @@ -9,7 +9,6 @@ android { defaultConfig { minSdk = AppConfig.minSdkVersion - targetSdk = AppConfig.targetSdkVersion testInstrumentationRunner = AppConfig.testInstrumentationRunner consumerProguardFiles(AppConfig.proguardConsumerRules) @@ -36,6 +35,10 @@ android { } dependencies { - implementation(AndroidX.lifecycleViewModel) - api(Dependencies.coroutinesCore) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.viewmodel.ktx) + implementation(libs.androidx.lifecycle.viewmodel.savedstate) + + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) } diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 9e7f726..28f6e5e 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -1,7 +1,8 @@ plugins { - id("com.android.library") - kotlin("android") - id("com.google.devtools.ksp") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.jetbrains.kotlin.serialization) + alias(libs.plugins.ksp) } android { @@ -10,7 +11,7 @@ android { defaultConfig { minSdk = AppConfig.minSdkVersion - targetSdk = AppConfig.targetSdkVersion + javaCompileOptions { annotationProcessorOptions { arguments += mapOf( @@ -33,8 +34,8 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlin { - jvmToolchain(17) + kotlinOptions { + jvmTarget = "17" } sourceSets { @@ -43,20 +44,22 @@ android { } dependencies { - implementation(project(Modules.domain)) - implementation(project(Modules.utils)) + implementation(project(":common:utils")) + implementation(project(":domain")) - implementation(AndroidX.preference) - implementation(AndroidX.room) - implementation(AndroidX.roomRuntime) - ksp(AndroidX.roomCompiler) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.preference) - implementation(Dependencies.libSuCore) - implementation(Google.gson) + // Room + implementation(libs.androidx.room.runtime) + implementation(libs.androidx.room.ktx) + ksp(libs.androidx.room.compiler) - implementation(Dependencies.koinAndroid) + implementation(libs.kotlinx.coroutines.android) + implementation(libs.kotlinx.serialization.json) + implementation(libs.koin) + implementation(libs.bundles.libsu) + implementation(Google.gson) - testImplementation("junit:junit:4.+") - androidTestImplementation("androidx.test.ext:junit:1.1.3") - androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0") + testImplementation(libs.junit) } diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/utils/RootUtils.kt b/data/src/main/java/com/androidvip/sysctlgui/data/utils/RootUtils.kt index 54c0620..901304a 100644 --- a/data/src/main/java/com/androidvip/sysctlgui/data/utils/RootUtils.kt +++ b/data/src/main/java/com/androidvip/sysctlgui/data/utils/RootUtils.kt @@ -9,10 +9,9 @@ import kotlinx.coroutines.withContext class RootUtils(private val dispatcher: CoroutineDispatcher = Dispatchers.Default) { suspend fun isBusyboxAvailable(): Boolean = withContext(dispatcher) { - val results: List = Shell.sh("which busybox").exec().out - return@withContext if (ShellUtils.isValidOutput(results)) { - results.first().isNotEmpty() - } else false + val results: List = Shell.cmd("which busybox").exec().out + return@withContext ShellUtils.isValidOutput(results) && results.firstOrNull() + ?.isNotEmpty() == true } suspend fun executeWithOutput( @@ -22,7 +21,7 @@ class RootUtils(private val dispatcher: CoroutineDispatcher = Dispatchers.Defaul ): String = withContext(dispatcher) { return@withContext runCatching { buildString { - val outputs = Shell.su(command).exec().out + val outputs = Shell.cmd(command).exec().out if (!ShellUtils.isValidOutput(outputs)) { append(defaultOutput) return@buildString diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index 495951c..63160d8 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -1,14 +1,34 @@ plugins { - id("java-library") - id("kotlin") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 +android { + namespace = "${AppConfig.appId}.domain" + compileSdk = AppConfig.compileSdkVersion + + defaultConfig { + minSdk = AppConfig.minSdkVersion + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = "17" + } } dependencies { - implementation(Dependencies.koinCore) -} + implementation(project(":common:utils")) + implementation(libs.androidx.core.ktx) + + implementation(libs.koin) + testImplementation(libs.junit) +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..f41fe46 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,81 @@ +[versions] +agp = "8.12.0" +libsu = "6.0.0" +jsoup = "1.21.1" +kotlin = "2.2.0" +kotlinxCoroutinesAndroid = "1.10.2" +ksp = "2.2.0-2.0.2" +coreKtx = "1.16.0" +junit = "4.13.2" +junitVersion = "1.3.0" +espressoCore = "3.7.0" +ktor = "3.2.3" +lifecycle = "2.9.2" +activityCompose = "1.10.1" +composeBom = "2025.07.00" +appcompat = "1.7.1" +material = "1.8.3" +materialIconsCore = "1.7.8" +navigationCompose = "2.9.3" +preference = "1.2.1" +room = "2.7.2" +nav3Lifecycle = "1.0.0-alpha03" +material3 = "1.5.0-alpha01" +kotlinxSerializationCore = "1.9.0" +koin = "4.1.0" +window = "1.4.0" + +[libraries] +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +androidx-material = { module = "androidx.compose.material:material", version.ref = "material" } +androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "materialIconsCore" } +androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" } +androidx-preference = { module = "androidx.preference:preference", version.ref = "preference" } +androidx-window = { module = "androidx.window:window", version.ref = "window" } +libsu-core = { module = "com.github.topjohnwu.libsu:core", version.ref = "libsu" } +libsu-nio = { module = "com.github.topjohnwu.libsu:nio", version.ref = "libsu" } +jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" } +androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle" } +androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" } +androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" } +androidx-lifecycle-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "nav3Lifecycle" } +androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "lifecycle" } +androidx-lifecycle-compiler = { group = "androidx.lifecycle", name = "lifecycle-compiler", version.ref = "lifecycle" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } +androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } +androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } +kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } +kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" } +kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinxSerializationCore" } +kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationCore" } +koin = { module = "io.insert-koin:koin-android", version.ref = "koin" } +koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" } +ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" } +ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } +ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" } + +[bundles] +ktor-clients = ["ktor-client-core", "ktor-client-android", "ktor-client-logging"] +libsu = ["libsu-core", "libsu-nio"] + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +android-library = { id = "com.android.library", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin"} +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6372a16..24dffe3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip diff --git a/settings.gradle.kts b/settings.gradle.kts index 1d3e2c5..8228a9a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,32 @@ +@file:Suppress("UnstableApiUsage") + +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { + url = uri("https://jitpack.io") + } + } +} + +rootProject.name = "SysctlGUI" include(":app") include(":data") include(":domain") -include(":common:utils") include(":common:design") +include(":common:utils") From 0d6ee55b768b50d397a040541ded7420f5a81742 Mon Sep 17 00:00:00 2001 From: Lennoard Date: Mon, 11 Aug 2025 20:48:13 -0300 Subject: [PATCH 02/18] refactor: [WIP] updated domain layer --- domain/consumer-rules.pro | 0 domain/proguard-rules.pro | 21 +++ .../sysctlgui/domain/StringProvider.kt | 12 ++ .../datasource/LocalDataSourceContract.kt | 10 -- .../datasource/RuntimeDataSourceContract.kt | 9 -- .../sysctlgui/domain/di/DomainModule.kt | 44 +++--- .../sysctlgui/domain/enums/CommitMode.kt | 27 ++++ .../sysctlgui/domain/enums/SettingItemType.kt | 27 ++++ .../domain/exceptions/ApplyValueException.kt | 18 +++ .../domain/exceptions/ExportExceptions.kt | 3 + .../domain/exceptions/ImportExceptions.kt | 8 +- .../sysctlgui/domain/models/AppSetting.kt | 31 ++++ .../domain/models/DomainKernelParam.kt | 69 --------- .../sysctlgui/domain/models/KernelParam.kt | 133 ++++++++++++++++++ .../domain/models/KernelParamContract.kt | 10 -- .../domain/models/ParamDocumentation.kt | 16 +++ .../sysctlgui/domain/repository/AppPrefs.kt | 12 +- .../repository/AppSettingsRepository.kt | 7 + .../repository/DocumentationRepository.kt | 18 +++ .../domain/repository/ParamsRepository.kt | 82 ++++++++--- .../domain/repository/PresetRepository.kt | 44 ++++++ .../domain/repository/UserRepository.kt | 47 +++++++ .../domain/usecase/AddUserParamUseCase.kt | 14 -- .../domain/usecase/AddUserParamsUseCase.kt | 16 ++- .../domain/usecase/ApplyParamUseCase.kt | 76 ++++++++++ .../domain/usecase/ApplyParamsUseCase.kt | 19 --- .../domain/usecase/BackupParamsUseCase.kt | 8 +- .../domain/usecase/ClearUserParamUseCase.kt | 4 +- .../domain/usecase/ExportParamsUseCase.kt | 18 ++- .../domain/usecase/GetAppSettingsUseCase.kt | 20 +++ .../domain/usecase/GetJsonParamsUseCase.kt | 7 - .../usecase/GetParamDocumentationUseCase.kt | 15 ++ .../usecase/GetParamsFromFilesUseCase.kt | 7 +- .../domain/usecase/GetRuntimeParamUseCase.kt | 25 ++++ .../domain/usecase/GetRuntimeParamsUseCase.kt | 16 ++- .../usecase/GetUserParamByNameUseCase.kt | 7 + .../domain/usecase/GetUserParamsUseCase.kt | 7 +- .../domain/usecase/ImportParamsUseCase.kt | 45 ------ .../usecase/IsTaskerInstalledUseCase.kt | 27 ++++ .../PerformDatabaseMigrationUseCase.kt | 9 -- .../domain/usecase/RemoveUserParamUseCase.kt | 10 +- .../domain/usecase/UpdateUserParamUseCase.kt | 14 -- .../domain/usecase/UpsertUserParamUseCase.kt | 26 ++++ 43 files changed, 758 insertions(+), 280 deletions(-) create mode 100644 domain/consumer-rules.pro create mode 100644 domain/proguard-rules.pro create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/StringProvider.kt delete mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/datasource/LocalDataSourceContract.kt delete mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/datasource/RuntimeDataSourceContract.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/enums/CommitMode.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/enums/SettingItemType.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/models/AppSetting.kt delete mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/models/DomainKernelParam.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/models/KernelParam.kt delete mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/models/KernelParamContract.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/models/ParamDocumentation.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/repository/AppSettingsRepository.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/repository/DocumentationRepository.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/repository/PresetRepository.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/repository/UserRepository.kt delete mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/AddUserParamUseCase.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ApplyParamUseCase.kt delete mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ApplyParamsUseCase.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetAppSettingsUseCase.kt delete mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetJsonParamsUseCase.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetParamDocumentationUseCase.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetRuntimeParamUseCase.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetUserParamByNameUseCase.kt delete mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ImportParamsUseCase.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/IsTaskerInstalledUseCase.kt delete mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/PerformDatabaseMigrationUseCase.kt delete mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/UpdateUserParamUseCase.kt create mode 100644 domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/UpsertUserParamUseCase.kt diff --git a/domain/consumer-rules.pro b/domain/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/domain/proguard-rules.pro b/domain/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/domain/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/StringProvider.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/StringProvider.kt new file mode 100644 index 0000000..b141cda --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/StringProvider.kt @@ -0,0 +1,12 @@ +package com.androidvip.sysctlgui.domain + +import androidx.annotation.StringRes + +/** + * Provides access to string resources. + * This interface allows for fetching localized strings, potentially with formatting arguments. + */ +interface StringProvider { + fun getString(@StringRes resId: Int): String + fun getString(@StringRes resId: Int, vararg formatArgs: Any): String +} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/datasource/LocalDataSourceContract.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/datasource/LocalDataSourceContract.kt deleted file mode 100644 index 7a47fe0..0000000 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/datasource/LocalDataSourceContract.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.androidvip.sysctlgui.domain.datasource - -interface LocalDataSourceContract { - suspend fun add(param: T, allowBlank: Boolean) - suspend fun addAll(params: List, allowBlank: Boolean) - suspend fun remove(param: T) - suspend fun edit(param: T, allowBlank: Boolean) - suspend fun clear() - suspend fun getData(): List -} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/datasource/RuntimeDataSourceContract.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/datasource/RuntimeDataSourceContract.kt deleted file mode 100644 index 40d9ede..0000000 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/datasource/RuntimeDataSourceContract.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.androidvip.sysctlgui.domain.datasource - -import java.io.File - -interface RuntimeDataSourceContract { - suspend fun edit(param: T, commitMode: String, useBusybox: Boolean, allowBlank: Boolean) - suspend fun getData(useBusybox: Boolean): List - suspend fun getParamsFromFiles(files: List): List -} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/di/DomainModule.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/di/DomainModule.kt index ca17635..dc7075a 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/di/DomainModule.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/di/DomainModule.kt @@ -1,34 +1,38 @@ package com.androidvip.sysctlgui.domain.di -import com.androidvip.sysctlgui.domain.usecase.AddUserParamUseCase import com.androidvip.sysctlgui.domain.usecase.AddUserParamsUseCase -import com.androidvip.sysctlgui.domain.usecase.ApplyParamsUseCase +import com.androidvip.sysctlgui.domain.usecase.ApplyParamUseCase import com.androidvip.sysctlgui.domain.usecase.BackupParamsUseCase import com.androidvip.sysctlgui.domain.usecase.ClearUserParamUseCase import com.androidvip.sysctlgui.domain.usecase.ExportParamsUseCase -import com.androidvip.sysctlgui.domain.usecase.GetJsonParamsUseCase +import com.androidvip.sysctlgui.domain.usecase.GetAppSettingsUseCase +import com.androidvip.sysctlgui.domain.usecase.GetParamDocumentationUseCase import com.androidvip.sysctlgui.domain.usecase.GetParamsFromFilesUseCase +import com.androidvip.sysctlgui.domain.usecase.GetRuntimeParamUseCase import com.androidvip.sysctlgui.domain.usecase.GetRuntimeParamsUseCase +import com.androidvip.sysctlgui.domain.usecase.GetUserParamByNameUseCase import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase -import com.androidvip.sysctlgui.domain.usecase.ImportParamsUseCase -import com.androidvip.sysctlgui.domain.usecase.PerformDatabaseMigrationUseCase +import com.androidvip.sysctlgui.domain.usecase.IsTaskerInstalledUseCase import com.androidvip.sysctlgui.domain.usecase.RemoveUserParamUseCase -import com.androidvip.sysctlgui.domain.usecase.UpdateUserParamUseCase +import com.androidvip.sysctlgui.domain.usecase.UpsertUserParamUseCase +import org.koin.android.ext.koin.androidContext +import org.koin.core.module.dsl.factoryOf import org.koin.dsl.module val domainModule = module { - factory { AddUserParamsUseCase(get(), get()) } - factory { AddUserParamUseCase(get(), get()) } - factory { ApplyParamsUseCase(get(), get()) } - factory { ClearUserParamUseCase(get()) } - factory { GetJsonParamsUseCase(get()) } - factory { GetParamsFromFilesUseCase(get()) } - factory { GetUserParamsUseCase(get()) } - factory { GetRuntimeParamsUseCase(get(), get()) } - factory { PerformDatabaseMigrationUseCase(get()) } - factory { RemoveUserParamUseCase(get()) } - factory { UpdateUserParamUseCase(get(), get()) } - factory { ImportParamsUseCase(get(), get(), get(), get()) } - factory { BackupParamsUseCase(get(), get()) } - factory { ExportParamsUseCase(get(), get()) } + factoryOf(::AddUserParamsUseCase) + factoryOf(::ApplyParamUseCase) + factoryOf(::ClearUserParamUseCase) + factoryOf(::GetParamsFromFilesUseCase) + factoryOf(::GetUserParamsUseCase) + factoryOf(::GetRuntimeParamsUseCase) + factoryOf(::GetRuntimeParamUseCase) + factoryOf(::GetUserParamByNameUseCase) + factoryOf(::RemoveUserParamUseCase) + factoryOf(::UpsertUserParamUseCase) + factoryOf(::BackupParamsUseCase) + factoryOf(::ExportParamsUseCase) + factoryOf(::GetAppSettingsUseCase) + factoryOf(::GetParamDocumentationUseCase) + factory { IsTaskerInstalledUseCase(androidContext()) } } diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/enums/CommitMode.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/enums/CommitMode.kt new file mode 100644 index 0000000..6b4b178 --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/enums/CommitMode.kt @@ -0,0 +1,27 @@ +package com.androidvip.sysctlgui.domain.enums + +/** + * Defines the method used to commit kernel parameter changes. + */ +enum class CommitMode { + /** + * Commits the value using the `sysctl -w` command. + * This is the default mode. + */ + SYSCTL, + /** + * Commits the value to the file using `echo` command. + * This method is generally safer and more reliable. + */ + ECHO; + + companion object { + fun parse(value: String): CommitMode { + return when (value) { + "sysctl" -> SYSCTL + "echo" -> ECHO + else -> SYSCTL + } + } + } +} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/enums/SettingItemType.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/enums/SettingItemType.kt new file mode 100644 index 0000000..52a17e9 --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/enums/SettingItemType.kt @@ -0,0 +1,27 @@ +package com.androidvip.sysctlgui.domain.enums + +/** + * Represents the different types of settings component that can be displayed in the UI. + * Each type corresponds to a specific UI element used to interact with the setting. + */ +enum class SettingItemType { + /** + * Simple setting header with no behavior + */ + Text, + + /** + * Represents a switch setting component that can be toggled on or off. + */ + Switch, + + /** + * Represents a list of options that can be selected from. + */ + List, + + /** + * Represents a slider component that allows the user to select a value within a range. + */ + Slider +} \ No newline at end of file diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/exceptions/ApplyValueException.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/exceptions/ApplyValueException.kt index dc60125..dd90a5f 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/exceptions/ApplyValueException.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/exceptions/ApplyValueException.kt @@ -1,4 +1,22 @@ package com.androidvip.sysctlgui.domain.exceptions +// TODO: Use sealed classes instead of exceptions +/** + * Exception thrown when a value commit fails or refuses to be applied (value remains the same) + */ class ApplyValueException(message: String) : Exception(message) + +/** + * Exception thrown when a value commit fails and the commit mode is "sysctl" + */ class CommitModeException(message: String) : Exception(message) + +/** + * Exception thrown when a value to be committed is blank and blank values are not allowed + */ +class BlankValueNotAllowedException() : IllegalArgumentException() + +/** + * Exception thrown when a shell command fails + */ +class ShellCommandException(message: String, cause: Throwable) : Exception(message, cause) diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/exceptions/ExportExceptions.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/exceptions/ExportExceptions.kt index 3d774bd..f4ced82 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/exceptions/ExportExceptions.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/exceptions/ExportExceptions.kt @@ -1,3 +1,6 @@ package com.androidvip.sysctlgui.domain.exceptions +/** + * Exception thrown when no parameter is found for a given kernel file path. + */ class NoParameterFoundException : Exception() diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/exceptions/ImportExceptions.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/exceptions/ImportExceptions.kt index 2e29597..1c5ca30 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/exceptions/ImportExceptions.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/exceptions/ImportExceptions.kt @@ -1,6 +1,12 @@ package com.androidvip.sysctlgui.domain.exceptions class InvalidFileExtensionException : Exception() +/** + * Thrown when an imported file is empty + */ class EmptyFileException : Exception() -class MalformedLineException : Exception() +/** + * Thrown when an invalid line is found during import. + */ +class MalformedLineException(message: String, cause: Throwable? = null) : Exception(message, cause) class NoValidParamException : Exception() diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/models/AppSetting.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/models/AppSetting.kt new file mode 100644 index 0000000..7754d4a --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/models/AppSetting.kt @@ -0,0 +1,31 @@ +package com.androidvip.sysctlgui.domain.models + +import com.androidvip.sysctlgui.domain.enums.SettingItemType + + +/** + * Represents an application setting. + * + * This data class encapsulates the properties of a single application setting, + * including its key, current value, enabled state, display information, and type. + * + * @param T The type of the setting's value. + * @property key A unique identifier for the setting. + * @property value The current value of the setting. + * @property enabled Indicates whether the setting is currently active or can be modified. Defaults to `true`. + * @property title A user-friendly name for the setting, displayed in the UI. + * @property description An optional detailed explanation of what the setting does. Defaults to `null`. + * @property category The group or section this setting belongs to, used for organization in the UI. + * @property type Defines how the setting is presented and interacted with in the UI (e.g., switch, list). + * @property values An optional list of possible values for the setting, typically used for dropdowns or selection lists. + */ +data class AppSetting( + val key: String, + val value: T, + val enabled: Boolean = true, + val title: String, + val description: String? = null, + val category: String, + val type: SettingItemType, + val values: List? = null +) diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/models/DomainKernelParam.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/models/DomainKernelParam.kt deleted file mode 100644 index 4ae163a..0000000 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/models/DomainKernelParam.kt +++ /dev/null @@ -1,69 +0,0 @@ -package com.androidvip.sysctlgui.domain.models - -open class DomainKernelParam( - open var id: Int = 0, - open var name: String = "", - open var path: String = "", - open var value: String = "", - open var favorite: Boolean = false, - open var taskerParam: Boolean = false, - open var taskerList: Int = LIST_NUMBER_PRIMARY_TASKER -) : KernelParamContract { - override val shortName: String get() = name.split(".").last() - - val configName: String get() = name.removeSuffix(shortName).removeSuffix(".") - - override fun setNameFromPath(path: String) { - if (path.trim().isEmpty() || !path.startsWith(PROC_SYS)) return - if (path.contains(".")) return - - name = path.removeSuffix("/") - .removePrefix(PROC_SYS) - .replace("/", ".") - .removePrefix(".") - } - - override fun setPathFromName(kernelParam: String) { - if (kernelParam.trim().isEmpty() || kernelParam.contains("/")) return - if (kernelParam.startsWith(".") || kernelParam.endsWith(".")) return - - path = "$PROC_SYS/${kernelParam.replace(".", "/")}" - } - - override fun hasValidPath(): Boolean { - if (path.trim().isEmpty() || !path.startsWith(PROC_SYS)) return false - if (path.contains(".")) return false - - return true - } - - override fun hasValidName(): Boolean { - if (name.trim().isEmpty() || name.contains("/")) return false - if (name.startsWith(".") || name.endsWith(".")) return false - - return true - } - - override fun equals(other: Any?): Boolean { - if (this === other) return true - if (javaClass != other?.javaClass) return false - - other as DomainKernelParam - if (name != other.name) return false - - return true - } - - override fun hashCode(): Int { - return name.hashCode() - } - - override fun toString(): String { - return "$name = $value" - } - - companion object { - private const val PROC_SYS = "/proc/sys" - const val LIST_NUMBER_PRIMARY_TASKER: Int = 0 - } -} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/models/KernelParam.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/models/KernelParam.kt new file mode 100644 index 0000000..4128970 --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/models/KernelParam.kt @@ -0,0 +1,133 @@ +package com.androidvip.sysctlgui.domain.models + +import com.androidvip.sysctlgui.utils.Consts + +/** + * Represents a kernel parameter. + */ +open class KernelParam( + /** + * The name of the kernel parameter (e.g., "vm.swappiness") + */ + open val name: String, + + /** + * The path of the kernel parameter (e.g., "/proc/sys/vm/swappiness") + */ + open val path: String, + + /** + * The value of the kernel parameter (e.g., "60") + */ + open val value: String, + + /** + * Indicates whether the parameter is marked as a favorite by the user. + */ + open val isFavorite: Boolean = false, + + /** + * Indicates whether the parameter is used in a Tasker profile + */ + open val isTaskerParam: Boolean = false, + + /** + * Indicates the Tasker list number (primary or secondary) + */ + open val taskerList: Int = Consts.LIST_NUMBER_INVALID, +) { + + open val lastNameSegment: String + get() = name.substringAfterLast('.', name) + + /** + * The configuration part of the name, excluding the lastNameSegment. + * For example, for `vm.swappiness`, configName would be `vm`. + */ + open val groupName: String + get() = name.substringBeforeLast('.', "") + + /** + * Checks if the [path] is valid for a kernel parameter. + */ + fun hasValidPath() = path.isKernelPathValid() + + /** + * Checks if the [name] is valid for a kernel parameter. + */ + fun hasValidName() = name.isKernelNameValid() + + companion object { + + /** + * Creates a new instance with its `path` derived from a given `newName`. + * Example: If `newName` is "vm.swappiness", the derived path will be "/proc/sys/vm/swappiness". + * + * @param name The name to derive the path from. It must be a valid kernel parameter name. + * @return A new [KernelParam] instance with the derived path. + * @throws IllegalArgumentException if `newName` is not a valid kernel parameter name. + */ + fun createFromName( + name: String, + value: String, + isFavorite: Boolean = false + ): KernelParam { + require(name.isKernelNameValid()) { "Invalid name: $name" } + val derivedPath = "${Consts.PROC_SYS}/${name.replace(".", "/")}" + return KernelParam(name, value, derivedPath, isFavorite) + } + + /** + * Creates a [KernelParam] instance from a given path and value. + * The name is derived from the path. + * For example, for `/proc/sys/vm/swappiness/`, the derived name will be `vm.swappiness`. + * + * @param path The path of the kernel parameter (e.g., "/proc/sys/vm/swappiness"). + * It must be a valid path as defined by [isKernelPathValid]. + * @param value The value of the kernel parameter (e.g., "60"). + * @return A new [KernelParam] instance. + * @throws IllegalArgumentException if the provided [path] is invalid. + */ + fun createFromPath(path: String, value: String): KernelParam { + require(path.isKernelPathValid()) { "Invalid path: $path" } + + val derivedName = path.removeSuffix("/") + .removePrefix(Consts.PROC_SYS) + .replace("/", ".") + .removePrefix(".") + + return KernelParam(derivedName, value, path) + } + } +} + +/** + * Checks if the path of this kernel parameter is valid. + * A path is considered valid if: + * - It is not empty after trimming whitespace. + * - It starts with [Consts.PROC_SYS]. + * - It does not contain any "." characters (as paths use "/" as separators). + * + * @return `true` if the path is valid, `false` otherwise. + */ +private fun String.isKernelPathValid(): Boolean { + if (this.trim().isEmpty() || !this.startsWith(Consts.PROC_SYS)) return false + if (this.contains(".")) return false + return true +} + +/** + * Checks if a string is a valid kernel parameter name. + * A valid name: + * - Is not empty or blank. + * - Does not contain forward slashes ('/'). + * - Does not start or end with a dot ('.'). + * + * @return `true` if the string is a valid name, `false` otherwise. + */ +private fun String.isKernelNameValid(): Boolean { + if (this.trim().isEmpty() || this.contains("/")) return false + if (this.startsWith(".") || this.endsWith(".")) return false + return true +} + diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/models/KernelParamContract.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/models/KernelParamContract.kt deleted file mode 100644 index 0affdb3..0000000 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/models/KernelParamContract.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.androidvip.sysctlgui.domain.models - -interface KernelParamContract { - val shortName: String - - fun setNameFromPath(path: String) - fun setPathFromName(kernelParam: String) - fun hasValidPath(): Boolean - fun hasValidName(): Boolean -} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/models/ParamDocumentation.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/models/ParamDocumentation.kt new file mode 100644 index 0000000..671d7af --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/models/ParamDocumentation.kt @@ -0,0 +1,16 @@ +package com.androidvip.sysctlgui.domain.models + +/** + * Represents documentation for a kernel parameter. + * + * @property title The title of the documentation. + * @property documentationText The plain text documentation. + * @property documentationHtml The HTML formatted documentation, if available. + * @property url The URL to the online documentation, if available. + */ +data class ParamDocumentation( + val title: String = "", + val documentationText: String = "", + val documentationHtml: String? = null, + val url: String? = null +) diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/AppPrefs.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/AppPrefs.kt index b2dc3e5..251b8cc 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/AppPrefs.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/AppPrefs.kt @@ -1,5 +1,11 @@ package com.androidvip.sysctlgui.domain.repository +/** + * Interface for accessing and modifying application preferences. + * + * This interface defines the contract for interacting with the application's settings, + * allowing various parts of the app to read and write preference values. + */ interface AppPrefs { var listFoldersFirst: Boolean var guessInputType: Boolean @@ -9,8 +15,12 @@ interface AppPrefs { var runOnStartUp: Boolean var startUpDelay: Int var showTaskerToast: Boolean - var migrationCompleted: Boolean var forceDark: Boolean var dynamicColors: Boolean var askedForNotificationPermission: Boolean + var useOnlineDocs: Boolean + var contrastLevel: Int + val searchHistory: Set + fun addSearchToHistory(query: String) + fun removeSearchFromHistory(query: String) } diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/AppSettingsRepository.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/AppSettingsRepository.kt new file mode 100644 index 0000000..ae0f1ed --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/AppSettingsRepository.kt @@ -0,0 +1,7 @@ +package com.androidvip.sysctlgui.domain.repository + +import com.androidvip.sysctlgui.domain.models.AppSetting + +fun interface AppSettingsRepository { + suspend fun getAppSettings(): List> +} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/DocumentationRepository.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/DocumentationRepository.kt new file mode 100644 index 0000000..dd28609 --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/DocumentationRepository.kt @@ -0,0 +1,18 @@ +package com.androidvip.sysctlgui.domain.repository + +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.models.ParamDocumentation + +/** + * Repository interface for fetching documentation for kernel parameters. + */ +fun interface DocumentationRepository { + /** + * Retrieves documentation for a given kernel parameter. + * + * @param param The kernel parameter for which to fetch documentation. + * @param online Whether to use the online documentation source. + * @return The documentation if found, null otherwise. + */ + suspend fun getDocumentation(param: KernelParam, online: Boolean): ParamDocumentation? +} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/ParamsRepository.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/ParamsRepository.kt index 81bf7aa..79849aa 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/ParamsRepository.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/ParamsRepository.kt @@ -1,33 +1,69 @@ package com.androidvip.sysctlgui.domain.repository -import com.androidvip.sysctlgui.domain.models.DomainKernelParam +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.enums.CommitMode +import kotlinx.coroutines.flow.Flow import java.io.File -import java.io.FileDescriptor -import java.io.InputStream +/** + * Repository interface for managing kernel parameters. + */ interface ParamsRepository { - suspend fun getUserParams(): List - suspend fun getJsonParams(): List - suspend fun getRuntimeParams(useBusybox: Boolean): List - suspend fun getParamsFromFiles(files: List): List - - suspend fun applyParam( - param: DomainKernelParam, - commitMode: String, + /** + * Gets all available kernel parameters at runtime. + * + * @param useBusybox whether to use busybox or not. + * @param userParams optional user params list to be merged with runtime params. + * @return a [List] of [KernelParam]s. + */ + fun getRuntimeParams( useBusybox: Boolean, - allowBlank: Boolean - ) - suspend fun updateUserParam(param: DomainKernelParam, allowBlank: Boolean) + userParams: List = emptyList() + ): Flow> + + /** + * Gets a kernel parameter value at runtime. + * + * @param paramName the name of the parameter to get, in the group.name format: + * - **vm.admin_reserve_kbytes (OK ✅)** + * - admin_reserve_kbytes (NO ❌) + * - vm/admin_reserve_kbytes (NO ❌) + * - /proc/sys/vm/admin_reserve_kbytes (NO ❌) + * @param useBusybox whether to use busybox or not. + * @return the [KernelParam] or null if not found or an error occurred. + */ + suspend fun getRuntimeParam(paramName: String, useBusybox: Boolean): KernelParam? + + /** + * Sets the value of a kernel parameter at runtime. + * @param param The [KernelParam] object representing the kernel parameter to be set. + * @param commitMode The commit mode to use when setting the parameter. + * @param useBusybox Whether to use busybox or not. + */ + suspend fun setRuntimeParam( + param: KernelParam, + commitMode: CommitMode, + useBusybox: Boolean + ): String - suspend fun addUserParam(param: DomainKernelParam, allowBlank: Boolean) - suspend fun addUserParams(params: List, allowBlank: Boolean) - suspend fun removeUserParam(param: DomainKernelParam) - suspend fun clearUserParams() + /** + * Reads kernel parameters from a list of files. + * Each file is expected to contain a single line with the parameter value. + * + * @param files A list of [File] objects representing the files to read parameters from. + * @return A [Flow] emitting a list of [KernelParam] objects. + */ + fun getParamsFromFiles(files: List): Flow> - suspend fun performDatabaseMigration() + /** + * Gets a list of kernel parameters from the given [path]. + * + * @param path The path to search for kernel parameters. + * @return A list of [KernelParam] objects found in the given path. + */ + fun getParamsFromPath(path: String): Flow> - suspend fun importParamsFromJson(stream: InputStream): List - suspend fun importParamsFromConf(stream: InputStream): List - suspend fun exportParams(params: List, fileDescriptor: FileDescriptor) - suspend fun backupParams(params: List, fileDescriptor: FileDescriptor) + companion object { + const val DEFAULT_ERROR_MESSAGE = "error" + } } diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/PresetRepository.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/PresetRepository.kt new file mode 100644 index 0000000..dabc145 --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/PresetRepository.kt @@ -0,0 +1,44 @@ +package com.androidvip.sysctlgui.domain.repository + +import com.androidvip.sysctlgui.domain.models.KernelParam +import java.io.FileDescriptor +import java.io.InputStream + + +/** + * Interface defining operations for managing kernel parameter presets. + * This interface provides methods to read and write kernel parameter presets, + * allowing users to save and load configurations. + */ +interface PresetRepository { + /** + * Reads a preset of kernel parameters from an input stream. + * + * This function attempts to determine if the input stream contains JSON or CONF formatted data + * and parses it accordingly. + * + * @param stream The input stream containing the kernel parameter preset. + * @return A list of [KernelParam] objects parsed from the stream. + * @throws IllegalArgumentException if the stream format cannot be determined or if parsing fails. + */ + suspend fun readPreset(stream: InputStream): List + + /** + * Exports a list of kernel parameters to a preset file. + * + * This function writes the provided kernel parameters to a specified file descriptor, + * typically for creating a user-defined preset. + * + * @param params The list of [KernelParam] objects to export. + * @param fileDescriptor The `FileDescriptor` of the file to write the parameters to. + */ + suspend fun exportToPreset(params: List, fileDescriptor: FileDescriptor) + + /** + * Backs up a list of kernel parameters. + * + * @param params The list of `KernelParam` objects to backup. + * @param fileDescriptor The `FileDescriptor` of the file to write the backup to. + */ + suspend fun backupParams(params: List, fileDescriptor: FileDescriptor) +} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/UserRepository.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/UserRepository.kt new file mode 100644 index 0000000..b577cdc --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/UserRepository.kt @@ -0,0 +1,47 @@ +package com.androidvip.sysctlgui.domain.repository + +import com.androidvip.sysctlgui.domain.models.KernelParam +import kotlinx.coroutines.flow.Flow + +/** + * Interface for managing user-specific kernel parameters. + */ +interface UserRepository { + /** + * Retrieves a [Flow] that emits a list of user-configurable kernel parameters. + * The [Flow] will emit a new list whenever the underlying data changes. + */ + val userParams: Flow> + + suspend fun getParamByName(name: String): KernelParam? + + /** + * Inserts or updates a user-configurable kernel parameter. + * If a parameter with the same ID already exists, it will be updated. + * Otherwise, a new parameter will be inserted. + * + * @param param The [KernelParam] to upsert. + * @return The row ID of the inserted or updated parameter. + */ + suspend fun upsertUserParam(param: KernelParam): Long + + /** + * Adds a list of kernel parameters to the list of user-configurable parameters. + * + * @param params The list of [KernelParam] objects to be added. + * @return A list of Long values representing the row IDs of the newly inserted parameters. + */ + suspend fun upsertUserParams(params: List): List + + /** + * Removes a kernel parameter from the list of user-configurable parameters. + * @param param The [KernelParam] to be removed. + * @return The number of rows deleted. + */ + suspend fun removeUserParam(param: KernelParam): Int + + /** + * Clears all user-configurable kernel parameters. + */ + suspend fun clearUserParams() +} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/AddUserParamUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/AddUserParamUseCase.kt deleted file mode 100644 index 2ad4552..0000000 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/AddUserParamUseCase.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.androidvip.sysctlgui.domain.usecase - -import com.androidvip.sysctlgui.domain.models.DomainKernelParam -import com.androidvip.sysctlgui.domain.repository.AppPrefs -import com.androidvip.sysctlgui.domain.repository.ParamsRepository - -class AddUserParamUseCase( - private val repository: ParamsRepository, - private val appPrefs: AppPrefs -) { - suspend operator fun invoke(param: DomainKernelParam) { - return repository.addUserParam(param, appPrefs.allowBlankValues) - } -} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/AddUserParamsUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/AddUserParamsUseCase.kt index dbd5d6f..d723500 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/AddUserParamsUseCase.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/AddUserParamsUseCase.kt @@ -1,14 +1,20 @@ package com.androidvip.sysctlgui.domain.usecase -import com.androidvip.sysctlgui.domain.models.DomainKernelParam +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.exceptions.BlankValueNotAllowedException import com.androidvip.sysctlgui.domain.repository.AppPrefs -import com.androidvip.sysctlgui.domain.repository.ParamsRepository +import com.androidvip.sysctlgui.domain.repository.UserRepository class AddUserParamsUseCase( - private val repository: ParamsRepository, + private val repository: UserRepository, private val appPrefs: AppPrefs ) { - suspend operator fun invoke(params: List) { - return repository.addUserParams(params, appPrefs.allowBlankValues) + suspend operator fun invoke(params: List): List { + if (!appPrefs.allowBlankValues) { + if (params.any { it.value.isBlank() }) { + throw BlankValueNotAllowedException() + } + } + return repository.upsertUserParams(params) } } diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ApplyParamUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ApplyParamUseCase.kt new file mode 100644 index 0000000..1001864 --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ApplyParamUseCase.kt @@ -0,0 +1,76 @@ +package com.androidvip.sysctlgui.domain.usecase + +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.enums.CommitMode +import com.androidvip.sysctlgui.domain.exceptions.ApplyValueException +import com.androidvip.sysctlgui.domain.exceptions.BlankValueNotAllowedException +import com.androidvip.sysctlgui.domain.exceptions.CommitModeException +import com.androidvip.sysctlgui.domain.exceptions.ShellCommandException +import com.androidvip.sysctlgui.domain.repository.AppPrefs +import com.androidvip.sysctlgui.domain.repository.ParamsRepository + +class ApplyParamUseCase( + private val repository: ParamsRepository, + private val appPrefs: AppPrefs +) { + suspend operator fun invoke(param: KernelParam) { + if (param.value.isBlank() && !appPrefs.allowBlankValues) { + throw BlankValueNotAllowedException() + } + + val commitMode = CommitMode.parse(appPrefs.commitMode) + + try { + val output = repository.setRuntimeParam( + param = param, + commitMode = commitMode, + useBusybox = appPrefs.useBusybox, + ) + when (commitMode) { + CommitMode.SYSCTL -> { + if (!output.contains(param.name)) { + throw CommitModeException( + "Sysctl command for '${param.name}' executed, but output did not confirm the change. " + + "Output: '$output'. Try using '${CommitMode.ECHO}' mode." + ) + } + } + + CommitMode.ECHO -> { + if (output.isEmpty().not()) { + throw CommitModeException( + "Echo command for '${param.path}' executed, but output was not empty. " + + "Output: '$output'. Try using '${CommitMode.SYSCTL}' mode." + ) + } + } + } + + } catch (e: ShellCommandException) { + val message = e.cause?.message.orEmpty() + throwApplyValueException( + message = "$message <- ${e.message}", + commitMode = commitMode, + param = param + ) + } catch (e: Exception) { + throwApplyValueException( + message = e.message.orEmpty(), + commitMode = commitMode, + param = param + ) + } + } + + private fun throwApplyValueException( + message: String, + commitMode: CommitMode, + param: KernelParam + ) { + val errorMessage = when (commitMode) { + CommitMode.SYSCTL -> "Failed to execute sysctl command for '${param.name}'" + CommitMode.ECHO -> "Failed to write value '${param.value}' to '${param.path}'" + } + throw ApplyValueException(errorMessage) + } +} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ApplyParamsUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ApplyParamsUseCase.kt deleted file mode 100644 index a8b3284..0000000 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ApplyParamsUseCase.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.androidvip.sysctlgui.domain.usecase - -import com.androidvip.sysctlgui.domain.models.DomainKernelParam -import com.androidvip.sysctlgui.domain.repository.AppPrefs -import com.androidvip.sysctlgui.domain.repository.ParamsRepository - -class ApplyParamsUseCase( - private val repository: ParamsRepository, - private val appPrefs: AppPrefs -) { - suspend operator fun invoke(param: DomainKernelParam) { - return repository.applyParam( - param, - appPrefs.commitMode, - appPrefs.useBusybox, - appPrefs.allowBlankValues - ) - } -} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/BackupParamsUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/BackupParamsUseCase.kt index e6dff15..372acd7 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/BackupParamsUseCase.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/BackupParamsUseCase.kt @@ -1,15 +1,15 @@ package com.androidvip.sysctlgui.domain.usecase import com.androidvip.sysctlgui.domain.exceptions.NoParameterFoundException -import com.androidvip.sysctlgui.domain.repository.ParamsRepository +import com.androidvip.sysctlgui.domain.repository.PresetRepository import java.io.FileDescriptor class BackupParamsUseCase( - private val getRuntimeParamsUseCase: GetRuntimeParamsUseCase, - private val repository: ParamsRepository + private val getRuntimeParams: GetRuntimeParamsUseCase, + private val repository: PresetRepository ) { suspend operator fun invoke(fileDescriptor: FileDescriptor) { - val params = getRuntimeParamsUseCase() + val params = getRuntimeParams() if (params.isEmpty()) throw NoParameterFoundException() return repository.backupParams(params, fileDescriptor) diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ClearUserParamUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ClearUserParamUseCase.kt index 0d70a25..fb3eea2 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ClearUserParamUseCase.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ClearUserParamUseCase.kt @@ -1,7 +1,7 @@ package com.androidvip.sysctlgui.domain.usecase -import com.androidvip.sysctlgui.domain.repository.ParamsRepository +import com.androidvip.sysctlgui.domain.repository.UserRepository -class ClearUserParamUseCase(private val repository: ParamsRepository) { +class ClearUserParamUseCase(private val repository: UserRepository) { suspend operator fun invoke() = repository.clearUserParams() } diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ExportParamsUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ExportParamsUseCase.kt index 7179b4a..0d32551 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ExportParamsUseCase.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ExportParamsUseCase.kt @@ -1,17 +1,25 @@ package com.androidvip.sysctlgui.domain.usecase import com.androidvip.sysctlgui.domain.exceptions.NoParameterFoundException -import com.androidvip.sysctlgui.domain.repository.ParamsRepository +import com.androidvip.sysctlgui.domain.repository.PresetRepository import java.io.FileDescriptor +/** + * Exports the current user parameters to a preset file. + * + * @throws NoParameterFoundException if there are no parameters to export. + */ class ExportParamsUseCase( - private val getUserParamUseCase: GetUserParamsUseCase, - private val repository: ParamsRepository + private val getUserParams: GetUserParamsUseCase, + private val repository: PresetRepository ) { + /** + * @param fileDescriptor The file descriptor to write the preset to. + */ suspend operator fun invoke(fileDescriptor: FileDescriptor) { - val params = getUserParamUseCase() + val params = getUserParams() if (params.isEmpty()) throw NoParameterFoundException() - return repository.exportParams(params, fileDescriptor) + return repository.exportToPreset(params, fileDescriptor) } } diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetAppSettingsUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetAppSettingsUseCase.kt new file mode 100644 index 0000000..32ff388 --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetAppSettingsUseCase.kt @@ -0,0 +1,20 @@ +package com.androidvip.sysctlgui.domain.usecase + +import com.androidvip.sysctlgui.domain.models.AppSetting +import com.androidvip.sysctlgui.domain.repository.AppSettingsRepository + +/** + * Use case for retrieving app settings. + * + * This class provides a way to fetch app settings, optionally filtering them based on a + * provided predicate. + * + * @property repository The [AppSettingsRepository] used to access app settings data. + */ +class GetAppSettingsUseCase(private val repository: AppSettingsRepository) { + suspend operator fun invoke( + filterPredicate: (AppSetting<*>) -> Boolean = { true } + ): List> { + return repository.getAppSettings().filter(filterPredicate) + } +} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetJsonParamsUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetJsonParamsUseCase.kt deleted file mode 100644 index 157dc69..0000000 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetJsonParamsUseCase.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.androidvip.sysctlgui.domain.usecase - -import com.androidvip.sysctlgui.domain.repository.ParamsRepository - -class GetJsonParamsUseCase(private val repository: ParamsRepository) { - suspend operator fun invoke() = repository.getJsonParams() -} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetParamDocumentationUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetParamDocumentationUseCase.kt new file mode 100644 index 0000000..021a2cc --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetParamDocumentationUseCase.kt @@ -0,0 +1,15 @@ +package com.androidvip.sysctlgui.domain.usecase + +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.models.ParamDocumentation +import com.androidvip.sysctlgui.domain.repository.AppPrefs +import com.androidvip.sysctlgui.domain.repository.DocumentationRepository + +class GetParamDocumentationUseCase( + private val repository: DocumentationRepository, + private val appPrefs: AppPrefs +) { + suspend operator fun invoke(param: KernelParam): ParamDocumentation? { + return repository.getDocumentation(param, appPrefs.useOnlineDocs) + } +} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetParamsFromFilesUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetParamsFromFilesUseCase.kt index 3c3347e..4a91398 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetParamsFromFilesUseCase.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetParamsFromFilesUseCase.kt @@ -1,11 +1,12 @@ package com.androidvip.sysctlgui.domain.usecase -import com.androidvip.sysctlgui.domain.models.DomainKernelParam +import com.androidvip.sysctlgui.domain.models.KernelParam import com.androidvip.sysctlgui.domain.repository.ParamsRepository +import kotlinx.coroutines.flow.single import java.io.File class GetParamsFromFilesUseCase(private val repository: ParamsRepository) { - suspend operator fun invoke(files: List): List { - return repository.getParamsFromFiles(files) + suspend operator fun invoke(files: List): List { + return repository.getParamsFromFiles(files).single() } } diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetRuntimeParamUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetRuntimeParamUseCase.kt new file mode 100644 index 0000000..62bb645 --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetRuntimeParamUseCase.kt @@ -0,0 +1,25 @@ +package com.androidvip.sysctlgui.domain.usecase + +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.repository.AppPrefs +import com.androidvip.sysctlgui.domain.repository.ParamsRepository +import kotlinx.coroutines.flow.single + + +/** + * Fetches a single runtime kernel parameter by its name. + * + * This use case interacts with the [ParamsRepository] to retrieve a specific kernel parameter + * and respects the user's preference for using BusyBox, as defined in [AppPrefs]. + */ +class GetRuntimeParamUseCase( + private val repository: ParamsRepository, + private val appPrefs: AppPrefs +) { + suspend operator fun invoke(paramName: String): KernelParam? { + return repository.getRuntimeParam( + useBusybox = appPrefs.useBusybox, + paramName = paramName + ) + } +} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetRuntimeParamsUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetRuntimeParamsUseCase.kt index 2746fae..6876b1d 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetRuntimeParamsUseCase.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetRuntimeParamsUseCase.kt @@ -1,14 +1,24 @@ package com.androidvip.sysctlgui.domain.usecase -import com.androidvip.sysctlgui.domain.models.DomainKernelParam +import com.androidvip.sysctlgui.domain.models.KernelParam import com.androidvip.sysctlgui.domain.repository.AppPrefs import com.androidvip.sysctlgui.domain.repository.ParamsRepository +import kotlinx.coroutines.flow.single +/** + * Fetches the list of runtime kernel parameters. + * + * This use case interacts with the [ParamsRepository] to retrieve the current kernel parameters + * and respects the user's preference for using BusyBox, as defined in [AppPrefs]. + */ class GetRuntimeParamsUseCase( private val repository: ParamsRepository, private val appPrefs: AppPrefs ) { - suspend operator fun invoke(): List { - return repository.getRuntimeParams(appPrefs.useBusybox) + suspend operator fun invoke(userParams: List = emptyList()): List { + return repository.getRuntimeParams( + useBusybox = appPrefs.useBusybox, + userParams = userParams + ).single() } } diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetUserParamByNameUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetUserParamByNameUseCase.kt new file mode 100644 index 0000000..5569c21 --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetUserParamByNameUseCase.kt @@ -0,0 +1,7 @@ +package com.androidvip.sysctlgui.domain.usecase + +import com.androidvip.sysctlgui.domain.repository.UserRepository + +class GetUserParamByNameUseCase(private val repository: UserRepository) { + suspend operator fun invoke(paramName: String) = repository.getParamByName(paramName) +} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetUserParamsUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetUserParamsUseCase.kt index 73222bf..529fdca 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetUserParamsUseCase.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetUserParamsUseCase.kt @@ -1,7 +1,8 @@ package com.androidvip.sysctlgui.domain.usecase -import com.androidvip.sysctlgui.domain.repository.ParamsRepository +import com.androidvip.sysctlgui.domain.repository.UserRepository +import kotlinx.coroutines.flow.single -class GetUserParamsUseCase(private val repository: ParamsRepository) { - suspend operator fun invoke() = repository.getUserParams() +class GetUserParamsUseCase(private val repository: UserRepository) { + suspend operator fun invoke() = repository.userParams.single() } diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ImportParamsUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ImportParamsUseCase.kt deleted file mode 100644 index b7c92c7..0000000 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ImportParamsUseCase.kt +++ /dev/null @@ -1,45 +0,0 @@ -package com.androidvip.sysctlgui.domain.usecase - -import com.androidvip.sysctlgui.domain.exceptions.InvalidFileExtensionException -import com.androidvip.sysctlgui.domain.exceptions.NoValidParamException -import com.androidvip.sysctlgui.domain.models.DomainKernelParam -import com.androidvip.sysctlgui.domain.repository.ParamsRepository -import java.io.InputStream - -class ImportParamsUseCase( - private val clearUserParamUseCase: ClearUserParamUseCase, - private val addUserParamsUseCase: AddUserParamsUseCase, - private val applyParamsUseCase: ApplyParamsUseCase, - private val repository: ParamsRepository -) { - suspend operator fun invoke( - stream: InputStream, - fileExtension: String - ): List { - val isBackup = fileExtension.endsWith(".conf") - val params = when { - fileExtension.endsWith(".json") -> repository.importParamsFromJson(stream) - isBackup -> repository.importParamsFromConf(stream) - else -> throw InvalidFileExtensionException() - } - - if (params.isEmpty()) throw NoValidParamException() - - val successfulParams = mutableListOf() - params.forEach { param -> - // Apply the param to check if valid - runCatching { applyParamsUseCase(param) }.onSuccess { - successfulParams.add(param) - } - } - - clearUserParamUseCase() - - // Prevent adding full backups to the apply-on-boot list - if (!isBackup) { - addUserParamsUseCase(successfulParams) - } - - return successfulParams - } -} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/IsTaskerInstalledUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/IsTaskerInstalledUseCase.kt new file mode 100644 index 0000000..52706a9 --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/IsTaskerInstalledUseCase.kt @@ -0,0 +1,27 @@ +package com.androidvip.sysctlgui.domain.usecase + +import android.content.Context +import android.content.pm.PackageManager +import android.os.Build + +class IsTaskerInstalledUseCase(private val context: Context) { + operator fun invoke(): Boolean { + val packageManager = context.packageManager + + return runCatching { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + packageManager.getPackageInfo( + TASKER_PACKAGE_NAME, + PackageManager.PackageInfoFlags.of(0L) + ) + } else { + packageManager.getPackageInfo(TASKER_PACKAGE_NAME, 0) + } + true + }.getOrDefault(false) + } + + companion object { + private const val TASKER_PACKAGE_NAME = "net.dinglisch.android.taskerm" + } +} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/PerformDatabaseMigrationUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/PerformDatabaseMigrationUseCase.kt deleted file mode 100644 index eea6e29..0000000 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/PerformDatabaseMigrationUseCase.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.androidvip.sysctlgui.domain.usecase - -import com.androidvip.sysctlgui.domain.repository.ParamsRepository - -class PerformDatabaseMigrationUseCase(private val repository: ParamsRepository) { - suspend operator fun invoke() { - return repository.performDatabaseMigration() - } -} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/RemoveUserParamUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/RemoveUserParamUseCase.kt index de0bd61..f592deb 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/RemoveUserParamUseCase.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/RemoveUserParamUseCase.kt @@ -1,8 +1,10 @@ package com.androidvip.sysctlgui.domain.usecase -import com.androidvip.sysctlgui.domain.models.DomainKernelParam -import com.androidvip.sysctlgui.domain.repository.ParamsRepository +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.repository.UserRepository -class RemoveUserParamUseCase(private val repository: ParamsRepository) { - suspend fun execute(param: DomainKernelParam) = repository.removeUserParam(param) +class RemoveUserParamUseCase(private val repository: UserRepository) { + suspend operator fun invoke(param: KernelParam) { + repository.removeUserParam(param) + } } diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/UpdateUserParamUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/UpdateUserParamUseCase.kt deleted file mode 100644 index 97192e0..0000000 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/UpdateUserParamUseCase.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.androidvip.sysctlgui.domain.usecase - -import com.androidvip.sysctlgui.domain.models.DomainKernelParam -import com.androidvip.sysctlgui.domain.repository.AppPrefs -import com.androidvip.sysctlgui.domain.repository.ParamsRepository - -class UpdateUserParamUseCase( - private val repository: ParamsRepository, - private val appPrefs: AppPrefs -) { - suspend operator fun invoke(param: DomainKernelParam) { - return repository.updateUserParam(param, appPrefs.allowBlankValues) - } -} diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/UpsertUserParamUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/UpsertUserParamUseCase.kt new file mode 100644 index 0000000..3ce75c7 --- /dev/null +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/UpsertUserParamUseCase.kt @@ -0,0 +1,26 @@ +package com.androidvip.sysctlgui.domain.usecase + +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.exceptions.BlankValueNotAllowedException +import com.androidvip.sysctlgui.domain.repository.AppPrefs +import com.androidvip.sysctlgui.domain.repository.UserRepository + +/** + * Updates a user-defined kernel parameter. + * + * @property repository The [UserRepository] to interact with user parameters. + * @property appPrefs The [AppPrefs] to check application preferences + * @throws BlankValueNotAllowedException if the parameter value is blank and blank values are not allowed. + */ +class UpsertUserParamUseCase( + private val repository: UserRepository, + private val appPrefs: AppPrefs +) { + suspend operator fun invoke(param: KernelParam): Long { + if (param.value.isBlank() && !appPrefs.allowBlankValues) { + throw BlankValueNotAllowedException() + } + + return repository.upsertUserParam(param) + } +} From 760a4f7a9104c8095caffb4b2ba0d8353f091bc7 Mon Sep 17 00:00:00 2001 From: Lennoard Date: Mon, 11 Aug 2025 21:29:18 -0300 Subject: [PATCH 03/18] refactor: [WIP] updated data layer --- .../sysctlgui/utils/BaseViewModel.kt | 5 +- .../com/androidvip/sysctlgui/utils/Consts.kt | 15 - .../sysctlgui/utils/ContextUtils.kt | 11 + .../com/androidvip/sysctlgui/utils/Misc.kt | 32 ++ .../androidvip/sysctlgui/utils/ViewState.kt | 16 - data/build.gradle.kts | 13 +- data/consumer-rules.pro | 0 .../com/androidvip/sysctlgui/data/Prefs.kt | 18 ++ .../data/datasource/JsonParamDataSource.kt | 93 ------ .../data/datasource/RoomParamDataSource.kt | 61 ---- .../data/datasource/RuntimeParamDataSource.kt | 93 ------ .../androidvip/sysctlgui/data/db/ParamDao.kt | 31 +- .../sysctlgui/data/db/ParamDatabase.kt | 4 +- .../sysctlgui/data/di/DataModule.kt | 78 ++++- .../sysctlgui/data/mapper/Mapper.kt | 6 - .../sysctlgui/data/mapper/RoomParamMapper.kt | 26 -- .../sysctlgui/data/models/KernelParamDTO.kt | 30 ++ .../sysctlgui/data/models/RoomKernelParam.kt | 24 -- .../sysctlgui/data/repository/AppPrefsImpl.kt | 78 +++-- .../repository/AppSettingsRepositoryImpl.kt | 145 +++++++++ .../repository/DocumentationRepositoryImpl.kt | 34 ++ .../data/repository/ParamsRepositoryImpl.kt | 298 +++++++----------- .../data/repository/PresetRepositoryImpl.kt | 70 ++++ .../data/repository/UserRepositoryImpl.kt | 45 +++ .../data/source/DocumentationDataSource.kt | 20 ++ .../source/OfflineDocumentationDataSource.kt | 122 +++++++ .../source/OnlineDocumentationDataSource.kt | 100 ++++++ .../data/utils/AndroidStringProvider.kt | 11 + .../data/utils/KernelParamSerializer.kt | 65 ++++ .../data/utils/PresetsFileProcessor.kt | 52 +++ .../sysctlgui/data/utils/RootUtils.kt | 57 ++-- {app => data}/src/main/res/raw/abi.txt | 0 {app => data}/src/main/res/raw/fs.txt | 0 {app => data}/src/main/res/raw/kernel.txt | 0 {app => data}/src/main/res/raw/net.txt | 0 {app => data}/src/main/res/raw/vm.txt | 0 36 files changed, 1046 insertions(+), 607 deletions(-) create mode 100644 common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/ContextUtils.kt create mode 100644 common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/Misc.kt delete mode 100644 common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/ViewState.kt create mode 100644 data/consumer-rules.pro create mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/Prefs.kt delete mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/datasource/JsonParamDataSource.kt delete mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/datasource/RoomParamDataSource.kt delete mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/datasource/RuntimeParamDataSource.kt delete mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/mapper/Mapper.kt delete mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/mapper/RoomParamMapper.kt create mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/models/KernelParamDTO.kt delete mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/models/RoomKernelParam.kt create mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt create mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/repository/DocumentationRepositoryImpl.kt create mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/repository/PresetRepositoryImpl.kt create mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt create mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/source/DocumentationDataSource.kt create mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/source/OfflineDocumentationDataSource.kt create mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/source/OnlineDocumentationDataSource.kt create mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/utils/AndroidStringProvider.kt create mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/utils/KernelParamSerializer.kt create mode 100644 data/src/main/java/com/androidvip/sysctlgui/data/utils/PresetsFileProcessor.kt rename {app => data}/src/main/res/raw/abi.txt (100%) rename {app => data}/src/main/res/raw/fs.txt (100%) rename {app => data}/src/main/res/raw/kernel.txt (100%) rename {app => data}/src/main/res/raw/net.txt (100%) rename {app => data}/src/main/res/raw/vm.txt (100%) diff --git a/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/BaseViewModel.kt b/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/BaseViewModel.kt index 0e06803..b5da4e6 100644 --- a/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/BaseViewModel.kt +++ b/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/BaseViewModel.kt @@ -8,6 +8,7 @@ import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.shareIn +import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch abstract class BaseViewModel : ViewModel() { @@ -28,7 +29,7 @@ abstract class BaseViewModel : ViewModel() { abstract fun onEvent(event: Event) protected fun setState(block: State.() -> State) { - _uiState.value = currentState.block() + _uiState.update(block) } protected fun setEffect(block: () -> Effect) { @@ -36,4 +37,4 @@ abstract class BaseViewModel : ViewModel() { _effect.send(block()) } } -} \ No newline at end of file +} diff --git a/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/Consts.kt b/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/Consts.kt index fa34402..1c16f66 100644 --- a/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/Consts.kt +++ b/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/Consts.kt @@ -8,19 +8,4 @@ object Consts { const val LIST_NUMBER_SECONDARY_TASKER: Int = 1 const val LIST_NUMBER_FAVORITES: Int = 2 const val LIST_NUMBER_APPLY_ON_BOOT: Int = 3 - - object Prefs { - const val LIST_FOLDERS_FIRST = "list_folders_first" - const val GUESS_INPUT_TYPE = "guess_input_type" - const val COMMIT_MODE = "commit_mode" - const val ALLOW_BLANK = "allow_blank_values" - const val USE_BUSYBOX = "use_busybox" - const val RUN_ON_START_UP = "run_on_start_up" - const val START_UP_DELAY = "startup_delay" - const val SHOW_TASKER_TOAST = "show_tasker_toast" - const val MIGRATION_COMPLETED = "migration_completed" - const val FORCE_DARK_THEME = "force_dark_theme" - const val DYNAMIC_COLORS = "dynamic_colors" - const val ASKED_NOTIFICATION_PERMISSION = "asked_notification_permission" - } } diff --git a/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/ContextUtils.kt b/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/ContextUtils.kt new file mode 100644 index 0000000..d084717 --- /dev/null +++ b/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/ContextUtils.kt @@ -0,0 +1,11 @@ +package com.androidvip.sysctlgui.utils + +import android.content.Context +import android.content.Intent +import androidx.core.net.toUri + +fun Context.browse(url: String) { + val intent = Intent(Intent.ACTION_VIEW, url.toUri()) + runCatching { startActivity(intent) } +} + diff --git a/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/Misc.kt b/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/Misc.kt new file mode 100644 index 0000000..806811e --- /dev/null +++ b/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/Misc.kt @@ -0,0 +1,32 @@ +package com.androidvip.sysctlgui.utils + +import android.view.View +import androidx.core.view.HapticFeedbackConstantsCompat +import androidx.core.view.ViewCompat + +/** + * Checks if a string is a valid sysctl line. + * A valid sysctl line must: + * - Contain exactly one "=" character. + * - Not have blank parts before or after the "=". + * - Have a key that matches the pattern: `^[a-zA-Z0-9_]+(\\.[a-zA-Z0-9_]+)+$` + * (e.g., "vm.swappiness", "net.ipv4.tcp_congestion_control"). + * + * @return `true` if the string is a valid sysctl line, `false` otherwise. + */ +fun String.isValidSysctlLine(): Boolean { + val parts = this.split("=", limit = 2) + if (parts.size != 2 || parts.any { it.isBlank() }) return false + + val keyPattern = "^[a-zA-Z0-9_]+(\\.[a-zA-Z0-9_]+)+$".toRegex() + return keyPattern.matches(parts.first()) +} + +fun performHapticFeedbackForToggle(newState: Boolean, view: View) { + val feedbackConst = if (newState) { + HapticFeedbackConstantsCompat.TOGGLE_ON + } else { + HapticFeedbackConstantsCompat.TOGGLE_OFF + } + ViewCompat.performHapticFeedback(view, feedbackConst) +} diff --git a/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/ViewState.kt b/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/ViewState.kt deleted file mode 100644 index d44fac1..0000000 --- a/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/ViewState.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.androidvip.sysctlgui.utils - -open class ViewState( - var data: List = listOf(), - var isLoading: Boolean = true, - var showEmptyState: Boolean = false, - var searchExpression: String = "", -) { - fun copyState( - data: List = this.data, - isLoading: Boolean = this.isLoading, - showEmptyState: Boolean = this.showEmptyState - ): ViewState { - return ViewState(data, isLoading, showEmptyState) - } -} diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 28f6e5e..56b4f2d 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -50,16 +50,17 @@ dependencies { implementation(libs.androidx.core.ktx) implementation(libs.androidx.preference) - // Room - implementation(libs.androidx.room.runtime) - implementation(libs.androidx.room.ktx) - ksp(libs.androidx.room.compiler) - implementation(libs.kotlinx.coroutines.android) implementation(libs.kotlinx.serialization.json) implementation(libs.koin) + implementation(libs.jsoup) + implementation(libs.bundles.ktor.clients) implementation(libs.bundles.libsu) - implementation(Google.gson) + + // Room + implementation(libs.androidx.room.runtime) + implementation(libs.androidx.room.ktx) + ksp(libs.androidx.room.compiler) testImplementation(libs.junit) } diff --git a/data/consumer-rules.pro b/data/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/Prefs.kt b/data/src/main/java/com/androidvip/sysctlgui/data/Prefs.kt new file mode 100644 index 0000000..94c6827 --- /dev/null +++ b/data/src/main/java/com/androidvip/sysctlgui/data/Prefs.kt @@ -0,0 +1,18 @@ +package com.androidvip.sysctlgui.data + +enum class Prefs(val key: String) { + ListFoldersFirst("list_folders_first"), + GuessInputType("guess_input_type"), + CommitMode("commit_mode"), + ALLOW_BLANK("allow_blank_values"), + UseBusybox("use_busybox"), + RunOnStartup("run_on_start_up"), + StartupDelay("startup_delay"), + ShowTaskerToast("show_tasker_toast"), + ForceDarkTheme("force_dark_theme"), + DynamicColors("dynamic_colors"), + AskedNotificationPermission("asked_notification_permission"), + UseOnlineDocs("use_online_docs"), + ContrastLevel("contrast_level"), + SearchHistory("search_history") +} diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/datasource/JsonParamDataSource.kt b/data/src/main/java/com/androidvip/sysctlgui/data/datasource/JsonParamDataSource.kt deleted file mode 100644 index ec5e755..0000000 --- a/data/src/main/java/com/androidvip/sysctlgui/data/datasource/JsonParamDataSource.kt +++ /dev/null @@ -1,93 +0,0 @@ -package com.androidvip.sysctlgui.data.datasource - -import android.content.Context -import com.androidvip.sysctlgui.utils.Consts -import com.androidvip.sysctlgui.domain.datasource.LocalDataSourceContract -import com.androidvip.sysctlgui.domain.models.DomainKernelParam -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext -import java.io.File -import java.lang.reflect.Type - -class JsonParamDataSource( - private val context: Context, - private val dispatcher: CoroutineDispatcher = Dispatchers.IO -) : LocalDataSourceContract { - @Deprecated( - "JSON database is no longer updated.", - replaceWith = ReplaceWith("roomParamDatasource.add(param)"), - level = DeprecationLevel.ERROR - ) - override suspend fun add(param: DomainKernelParam, allowBlank: Boolean) { - throw UnsupportedOperationException("Adding json params is not supported") - } - - @Deprecated( - "JSON database is no longer updated.", - replaceWith = ReplaceWith("roomParamDatasource.addAll(param)"), - level = DeprecationLevel.ERROR - ) - override suspend fun addAll(params: List, allowBlank: Boolean){ - throw UnsupportedOperationException("Adding json params is not supported") - } - - @Deprecated( - "JSON database is no longer updated.", - replaceWith = ReplaceWith("roomParamDatasource.remove(param)"), - level = DeprecationLevel.ERROR - ) - override suspend fun remove(param: DomainKernelParam) { - throw UnsupportedOperationException("Deleting params is only supported in room database") - } - - @Deprecated( - "JSON database is no longer updated.", - replaceWith = ReplaceWith("roomParamDatasource.edit(param)"), - level = DeprecationLevel.ERROR - ) - override suspend fun edit( - param: DomainKernelParam, - allowBlank: Boolean - ) { - throw UnsupportedOperationException("Updating json params is no longer supported") - } - - override suspend fun clear() = withContext(dispatcher) { - arrayOf( - "favorites-params", - "user-params", - "tasker-params-${Consts.LIST_NUMBER_PRIMARY_TASKER}", - "tasker-params-${Consts.LIST_NUMBER_SECONDARY_TASKER}", - "tasker-params-${Consts.LIST_NUMBER_FAVORITES}", - "tasker-params-${Consts.LIST_NUMBER_APPLY_ON_BOOT}" - ).forEach { fileName -> - val paramFile = File(context.filesDir, fileName) - paramFile.writeText("[]") - } - } - - override suspend fun getData(): List = withContext(dispatcher) { - val gson = Gson() - val params = mutableListOf() - - arrayOf( - "favorites-params", - "user-params", - "tasker-params-${Consts.LIST_NUMBER_PRIMARY_TASKER}", - "tasker-params-${Consts.LIST_NUMBER_SECONDARY_TASKER}", - "tasker-params-${Consts.LIST_NUMBER_FAVORITES}", - "tasker-params-${Consts.LIST_NUMBER_APPLY_ON_BOOT}" - ).forEach { fileName -> - val paramsFile = File(context.filesDir, "$fileName.json") - if (!paramsFile.exists()) return@forEach - - val type: Type = object : TypeToken>() {}.type - params.addAll(gson.fromJson(paramsFile.readText(), type)) - } - - return@withContext params.distinct() - } -} diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/datasource/RoomParamDataSource.kt b/data/src/main/java/com/androidvip/sysctlgui/data/datasource/RoomParamDataSource.kt deleted file mode 100644 index 0bd2815..0000000 --- a/data/src/main/java/com/androidvip/sysctlgui/data/datasource/RoomParamDataSource.kt +++ /dev/null @@ -1,61 +0,0 @@ -package com.androidvip.sysctlgui.data.datasource - -import com.androidvip.sysctlgui.data.db.ParamDao -import com.androidvip.sysctlgui.data.mapper.RoomParamMapper -import com.androidvip.sysctlgui.domain.datasource.LocalDataSourceContract -import com.androidvip.sysctlgui.domain.models.DomainKernelParam -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext - -class RoomParamDataSource( - private val paramDao: ParamDao, - private val dispatcher: CoroutineDispatcher = Dispatchers.IO -) : LocalDataSourceContract { - override suspend fun add( - param: DomainKernelParam, - allowBlank: Boolean - ) = withContext(dispatcher) { - if (!allowBlank) require(param.value.isNotBlank()) { - "Param contains blank value while ALLOW_BLANK is not active" - } - paramDao.insert(RoomParamMapper.unmap(param)) - } - - override suspend fun addAll( - params: List, - allowBlank: Boolean - ) = withContext(dispatcher) { - val filteredParams = if (allowBlank) { - params - } else params.filter { - it.value.isNotEmpty() - } - - paramDao.insert(*filteredParams.map { RoomParamMapper.unmap(it) }.toTypedArray()) - } - - override suspend fun remove(param: DomainKernelParam) = withContext(dispatcher) { - paramDao.delete(RoomParamMapper.unmap(param)) - } - - override suspend fun edit( - param: DomainKernelParam, - allowBlank: Boolean - ) = withContext(dispatcher) { - if (!allowBlank) require(param.value.isNotBlank()) { - "Param contains blank value while ALLOW_BLANK is not active" - } - paramDao.update(RoomParamMapper.unmap(param)) - } - - override suspend fun clear() = withContext(dispatcher) { - paramDao.clearTable() - } - - override suspend fun getData(): List = withContext(dispatcher) { - paramDao.getAll()?.map { - RoomParamMapper.map(it) - } ?: throw Exception("Failed to get params from the local database") - } -} diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/datasource/RuntimeParamDataSource.kt b/data/src/main/java/com/androidvip/sysctlgui/data/datasource/RuntimeParamDataSource.kt deleted file mode 100644 index 39a0b2b..0000000 --- a/data/src/main/java/com/androidvip/sysctlgui/data/datasource/RuntimeParamDataSource.kt +++ /dev/null @@ -1,93 +0,0 @@ -package com.androidvip.sysctlgui.data.datasource - -import com.androidvip.sysctlgui.data.utils.RootUtils -import com.androidvip.sysctlgui.domain.datasource.RuntimeDataSourceContract -import com.androidvip.sysctlgui.domain.exceptions.ApplyValueException -import com.androidvip.sysctlgui.domain.exceptions.CommitModeException -import com.androidvip.sysctlgui.domain.models.DomainKernelParam -import java.io.File -import java.lang.IllegalArgumentException - -class RuntimeParamDataSource( - private val rootUtils: RootUtils -) : RuntimeDataSourceContract { - override suspend fun edit( - param: DomainKernelParam, - commitMode: String, - useBusybox: Boolean, - allowBlank: Boolean - ) { - val commitResult = commitChanges(param, commitMode, useBusybox, allowBlank) - - when { - commitMode == "sysctl" -> { - if (commitResult == "error" || !commitResult.contains(param.name)) { - throw CommitModeException("Value refused to apply. Try using 'echo' mode.") - } - } - commitResult == "error" -> { - throw ApplyValueException("Value refused to apply") - } - } - } - - override suspend fun getData(useBusybox: Boolean): List { - val command = if (useBusybox) "busybox sysctl -a" else "sysctl -a" - val lines = mutableListOf() - rootUtils.executeWithOutput(command) { lines += it } - - return lines.filter { - it.isValidSysctlOutput() - }.map { - // Expected output: grandparent.parent.name = value - val split = it.split("=") - split.first().trim() to split.last().trim() - }.mapIndexed { index, paramPair -> - DomainKernelParam( - id = index + 1, - name = paramPair.first, - value = paramPair.second - ).apply { - setPathFromName(paramPair.first) - } - } - } - - override suspend fun getParamsFromFiles(files: List): List { - return files.map { - it.absolutePath - }.mapIndexed { index, path -> - DomainKernelParam( - id = index + 1, - path = path - ).apply { - setNameFromPath(path) - value = rootUtils.executeWithOutput("cat $path", "") - } - } - } - - private suspend fun commitChanges( - param: DomainKernelParam, - commitMode: String, - useBusybox: Boolean, - allowBlank: Boolean - ): String { - if (!allowBlank && param.value.isBlank()) throw IllegalArgumentException( - "Param contains blank value while ALLOW_BLANK is not active" - ) - - val prefix = if (useBusybox) "busybox " else "" - val command = when (commitMode) { - "sysctl" -> "${prefix}sysctl -w ${param.name}=${param.value}" - "echo" -> "echo '${param.value}' > ${param.path}" - else -> "busybox sysctl -w ${param.name}=${param.value}" - } - - return rootUtils.executeWithOutput(command, "error") - } - - private fun String.isValidSysctlOutput(): Boolean { - return !contains("denied") && !startsWith("sysctl") && contains("=") - } -} diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/db/ParamDao.kt b/data/src/main/java/com/androidvip/sysctlgui/data/db/ParamDao.kt index 6870cdb..968166c 100644 --- a/data/src/main/java/com/androidvip/sysctlgui/data/db/ParamDao.kt +++ b/data/src/main/java/com/androidvip/sysctlgui/data/db/ParamDao.kt @@ -2,25 +2,32 @@ package com.androidvip.sysctlgui.data.db import androidx.room.Dao import androidx.room.Delete -import androidx.room.Insert import androidx.room.Query -import androidx.room.Update -import com.androidvip.sysctlgui.data.models.RoomKernelParam +import androidx.room.Upsert +import com.androidvip.sysctlgui.data.models.KernelParamDTO +import com.androidvip.sysctlgui.data.models.PARAMS_TABLE_NAME +import kotlinx.coroutines.flow.Flow @Dao interface ParamDao { - @Query("SELECT * FROM roomKernelParam") - suspend fun getAll(): List? + @Query("SELECT * FROM $PARAMS_TABLE_NAME") + suspend fun getAll(): List - @Insert - suspend fun insert(vararg params: RoomKernelParam) + @Query("SELECT * FROM $PARAMS_TABLE_NAME") + fun getAllAsFlow(): Flow> - @Delete - suspend fun delete(param: RoomKernelParam) + @Query("SELECT * FROM $PARAMS_TABLE_NAME WHERE name = :name") + suspend fun getParamByName(name: String): KernelParamDTO? + + @Upsert + suspend fun upsert(param: KernelParamDTO): Long - @Update - suspend fun update(param: RoomKernelParam) + @Upsert + suspend fun upsertAll(params: List): List + + @Delete + suspend fun delete(param: KernelParamDTO): Int - @Query("DELETE FROM roomKernelParam") + @Query("DELETE FROM $PARAMS_TABLE_NAME") suspend fun clearTable() } diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/db/ParamDatabase.kt b/data/src/main/java/com/androidvip/sysctlgui/data/db/ParamDatabase.kt index ff2a1ed..7376bd3 100644 --- a/data/src/main/java/com/androidvip/sysctlgui/data/db/ParamDatabase.kt +++ b/data/src/main/java/com/androidvip/sysctlgui/data/db/ParamDatabase.kt @@ -2,9 +2,9 @@ package com.androidvip.sysctlgui.data.db import androidx.room.Database import androidx.room.RoomDatabase -import com.androidvip.sysctlgui.data.models.RoomKernelParam +import com.androidvip.sysctlgui.data.models.KernelParamDTO -@Database(entities = [RoomKernelParam::class], version = 1, exportSchema = false) +@Database(entities = [KernelParamDTO::class], version = 1, exportSchema = false) abstract class ParamDatabase : RoomDatabase() { abstract fun paramDao(): ParamDao } diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt b/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt index 9251daa..1cbd751 100644 --- a/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt +++ b/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt @@ -1,22 +1,44 @@ package com.androidvip.sysctlgui.data.di +import android.util.Log import androidx.preference.PreferenceManager -import com.androidvip.sysctlgui.data.datasource.JsonParamDataSource -import com.androidvip.sysctlgui.data.datasource.RoomParamDataSource -import com.androidvip.sysctlgui.data.datasource.RuntimeParamDataSource import com.androidvip.sysctlgui.data.db.ParamDatabase import com.androidvip.sysctlgui.data.db.ParamDatabaseManager import com.androidvip.sysctlgui.data.repository.AppPrefsImpl +import com.androidvip.sysctlgui.data.repository.AppSettingsRepositoryImpl +import com.androidvip.sysctlgui.data.repository.DocumentationRepositoryImpl import com.androidvip.sysctlgui.data.repository.ParamsRepositoryImpl +import com.androidvip.sysctlgui.data.repository.PresetRepositoryImpl +import com.androidvip.sysctlgui.data.repository.UserRepositoryImpl +import com.androidvip.sysctlgui.data.source.DocumentationDataSource +import com.androidvip.sysctlgui.data.source.OfflineDocumentationDataSource +import com.androidvip.sysctlgui.data.source.OnlineDocumentationDataSource +import com.androidvip.sysctlgui.data.utils.AndroidStringProvider +import com.androidvip.sysctlgui.data.utils.PresetsFileProcessor import com.androidvip.sysctlgui.data.utils.RootUtils +import com.androidvip.sysctlgui.domain.StringProvider import com.androidvip.sysctlgui.domain.repository.AppPrefs +import com.androidvip.sysctlgui.domain.repository.AppSettingsRepository +import com.androidvip.sysctlgui.domain.repository.DocumentationRepository import com.androidvip.sysctlgui.domain.repository.ParamsRepository -import kotlinx.coroutines.Dispatchers +import com.androidvip.sysctlgui.domain.repository.PresetRepository +import com.androidvip.sysctlgui.domain.repository.UserRepository +import io.ktor.client.HttpClient +import io.ktor.client.engine.android.Android +import io.ktor.client.plugins.logging.LogLevel +import io.ktor.client.plugins.logging.Logger +import io.ktor.client.plugins.logging.Logging +import org.koin.android.ext.koin.androidApplication import org.koin.android.ext.koin.androidContext +import org.koin.core.module.dsl.factoryOf +import org.koin.core.qualifier.named +import org.koin.dsl.bind import org.koin.dsl.module val utilsModule = module { - factory { RootUtils(Dispatchers.Default) } + factoryOf(::RootUtils) + factory { PresetsFileProcessor(androidContext().contentResolver) } + factory { AndroidStringProvider(androidApplication()) } } val dbModule = module { @@ -25,17 +47,49 @@ val dbModule = module { } val repositoryModule = module { - factory { AppPrefsImpl(get()) } - single { ParamsRepositoryImpl(get(), get(), get(), get()) } + factoryOf(::AppPrefsImpl) bind AppPrefs::class + factoryOf(::ParamsRepositoryImpl) bind ParamsRepository::class + factoryOf(::PresetRepositoryImpl) bind PresetRepository::class + factoryOf(::AppSettingsRepositoryImpl) bind AppSettingsRepository::class + + single { UserRepositoryImpl(paramDao = get().paramDao()) } + + factory { + DocumentationRepositoryImpl( + offlineDataSource = get(named()), + onlineDataSource = get(named()) + ) + } } val dataSourceModule = module { - single { JsonParamDataSource(androidContext()) } - single { RuntimeParamDataSource(rootUtils = get()) } + factory(named()) { + OfflineDocumentationDataSource(androidContext()) + } + + factory(named()) { + OnlineDocumentationDataSource(get()) + } +} + +val networkModule = module { single { - val db: ParamDatabase = get() - RoomParamDataSource(db.paramDao()) + HttpClient(engineFactory = Android) { + engine { + connectTimeout = 5000 + socketTimeout = 5000 + } + + install(Logging) { + logger = object : Logger { + override fun log(message: String) { + Log.v("KtorHttpClient", message) + } + } + level = LogLevel.BODY + } + } } } -val dataModules = utilsModule + dbModule + repositoryModule + dataSourceModule +val dataModules = utilsModule + dbModule + repositoryModule + dataSourceModule + networkModule diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/mapper/Mapper.kt b/data/src/main/java/com/androidvip/sysctlgui/data/mapper/Mapper.kt deleted file mode 100644 index 0adeea9..0000000 --- a/data/src/main/java/com/androidvip/sysctlgui/data/mapper/Mapper.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.androidvip.sysctlgui.data.mapper - -interface Mapper { - fun map(from: F): T - fun unmap(from: T): F -} diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/mapper/RoomParamMapper.kt b/data/src/main/java/com/androidvip/sysctlgui/data/mapper/RoomParamMapper.kt deleted file mode 100644 index 8047c20..0000000 --- a/data/src/main/java/com/androidvip/sysctlgui/data/mapper/RoomParamMapper.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.androidvip.sysctlgui.data.mapper - -import com.androidvip.sysctlgui.data.models.RoomKernelParam -import com.androidvip.sysctlgui.domain.models.DomainKernelParam - -object RoomParamMapper : Mapper { - override fun map(from: RoomKernelParam): DomainKernelParam = DomainKernelParam().apply { - id = from.id - name = from.name - path = from.path - value = from.value - favorite = from.favorite - taskerParam = from.taskerParam - taskerList = from.taskerList - } - - override fun unmap(from: DomainKernelParam): RoomKernelParam = RoomKernelParam().apply { - id = from.id - name = from.name - path = from.path - value = from.value - favorite = from.favorite - taskerParam = from.taskerParam - taskerList = from.taskerList - } -} diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/models/KernelParamDTO.kt b/data/src/main/java/com/androidvip/sysctlgui/data/models/KernelParamDTO.kt new file mode 100644 index 0000000..fd31d0e --- /dev/null +++ b/data/src/main/java/com/androidvip/sysctlgui/data/models/KernelParamDTO.kt @@ -0,0 +1,30 @@ +package com.androidvip.sysctlgui.data.models + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.PrimaryKey +import com.androidvip.sysctlgui.data.utils.KernelParamSerializer +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.utils.Consts +import kotlinx.serialization.Serializable + +@Entity(tableName = PARAMS_TABLE_NAME) +@Serializable(with = KernelParamSerializer::class) +data class KernelParamDTO( + @PrimaryKey(autoGenerate = true) + val id: Int = 0, + @ColumnInfo(name = "name") + override val name: String = "", + @ColumnInfo(name = "path") + override val path: String = "", + @ColumnInfo(name = "value") + override val value: String = "", + @ColumnInfo(name = "favorite") + override val isFavorite: Boolean = false, + @ColumnInfo(name = "tasker_param") + override val isTaskerParam: Boolean = false, + @ColumnInfo(name = "tasker_list") + override val taskerList: Int = Consts.LIST_NUMBER_PRIMARY_TASKER +) : KernelParam(name, path, value, isFavorite, isTaskerParam, taskerList) + +internal const val PARAMS_TABLE_NAME = "roomKernelParam" diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/models/RoomKernelParam.kt b/data/src/main/java/com/androidvip/sysctlgui/data/models/RoomKernelParam.kt deleted file mode 100644 index 143e3a6..0000000 --- a/data/src/main/java/com/androidvip/sysctlgui/data/models/RoomKernelParam.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.androidvip.sysctlgui.data.models - -import androidx.room.ColumnInfo -import androidx.room.Entity -import androidx.room.PrimaryKey -import com.androidvip.sysctlgui.utils.Consts - -@Entity -data class RoomKernelParam( - @PrimaryKey(autoGenerate = true) - var id: Int = 0, - @ColumnInfo(name = "name") - var name: String = "", - @ColumnInfo(name = "path") - var path: String = "", - @ColumnInfo(name = "value") - var value: String = "", - @ColumnInfo(name = "favorite") - var favorite: Boolean = false, - @ColumnInfo(name = "tasker_param") - var taskerParam: Boolean = false, - @ColumnInfo(name = "tasker_list") - var taskerList: Int = Consts.LIST_NUMBER_PRIMARY_TASKER -) diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppPrefsImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppPrefsImpl.kt index a48e7cc..4528454 100644 --- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppPrefsImpl.kt +++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppPrefsImpl.kt @@ -2,68 +2,90 @@ package com.androidvip.sysctlgui.data.repository import android.content.SharedPreferences import androidx.core.content.edit +import com.androidvip.sysctlgui.data.Prefs import com.androidvip.sysctlgui.domain.repository.AppPrefs -import com.androidvip.sysctlgui.utils.Consts +/** + * Implementation of [AppPrefs] that uses [SharedPreferences] to store and retrieve app preferences. + */ class AppPrefsImpl(private val prefs: SharedPreferences) : AppPrefs { override var listFoldersFirst: Boolean - get() = prefs.getBoolean(Consts.Prefs.LIST_FOLDERS_FIRST, true) + get() = prefs.getBoolean(Prefs.ListFoldersFirst.key, true) set(value) { - prefs.edit { putBoolean(Consts.Prefs.LIST_FOLDERS_FIRST, value) } + prefs.edit { putBoolean(Prefs.ListFoldersFirst.key, value) } } override var guessInputType: Boolean - get() = prefs.getBoolean(Consts.Prefs.GUESS_INPUT_TYPE, true) + get() = prefs.getBoolean(Prefs.GuessInputType.key, true) set(value) { - prefs.edit { putBoolean(Consts.Prefs.GUESS_INPUT_TYPE, value) } + prefs.edit { putBoolean(Prefs.GuessInputType.key, value) } } override var commitMode: String - get() = prefs.getString(Consts.Prefs.COMMIT_MODE, "sysctl") ?: "sysctl" + get() = prefs.getString(Prefs.CommitMode.key, "sysctl") ?: "sysctl" set(value) { - prefs.edit { putString(Consts.Prefs.COMMIT_MODE, value) } + prefs.edit { putString(Prefs.CommitMode.key, value) } } override var allowBlankValues: Boolean - get() = prefs.getBoolean(Consts.Prefs.ALLOW_BLANK, false) + get() = prefs.getBoolean(Prefs.ALLOW_BLANK.key, false) set(value) { - prefs.edit { putBoolean(Consts.Prefs.ALLOW_BLANK, value) } + prefs.edit { putBoolean(Prefs.ALLOW_BLANK.key, value) } } override var useBusybox: Boolean - get() = prefs.getBoolean(Consts.Prefs.USE_BUSYBOX, false) + get() = prefs.getBoolean(Prefs.UseBusybox.key, false) set(value) { - prefs.edit { putBoolean(Consts.Prefs.USE_BUSYBOX, value) } + prefs.edit { putBoolean(Prefs.UseBusybox.key, value) } } override var runOnStartUp: Boolean - get() = prefs.getBoolean(Consts.Prefs.RUN_ON_START_UP, false) + get() = prefs.getBoolean(Prefs.RunOnStartup.key, false) set(value) { - prefs.edit { putBoolean(Consts.Prefs.RUN_ON_START_UP, value) } + prefs.edit { putBoolean(Prefs.RunOnStartup.key, value) } } override var startUpDelay: Int - get() = prefs.getInt(Consts.Prefs.START_UP_DELAY, 0) + get() = prefs.getInt(Prefs.StartupDelay.key, 0) set(value) { - prefs.edit { putInt(Consts.Prefs.START_UP_DELAY, value) } + prefs.edit { putInt(Prefs.StartupDelay.key, value) } } override var showTaskerToast: Boolean - get() = prefs.getBoolean(Consts.Prefs.SHOW_TASKER_TOAST, true) + get() = prefs.getBoolean(Prefs.ShowTaskerToast.key, true) set(value) { - prefs.edit { putBoolean(Consts.Prefs.SHOW_TASKER_TOAST, value) } - } - override var migrationCompleted: Boolean - get() = prefs.getBoolean(Consts.Prefs.MIGRATION_COMPLETED, false) - set(value) { - prefs.edit { putBoolean(Consts.Prefs.MIGRATION_COMPLETED, value) } + prefs.edit { putBoolean(Prefs.ShowTaskerToast.key, value) } } override var forceDark: Boolean - get() = prefs.getBoolean(Consts.Prefs.FORCE_DARK_THEME, false) + get() = prefs.getBoolean(Prefs.ForceDarkTheme.key, false) set(value) { - prefs.edit { putBoolean(Consts.Prefs.FORCE_DARK_THEME, value) } + prefs.edit { putBoolean(Prefs.ForceDarkTheme.key, value) } } override var dynamicColors: Boolean - get() = prefs.getBoolean(Consts.Prefs.DYNAMIC_COLORS, false) + get() = prefs.getBoolean(Prefs.DynamicColors.key, false) set(value) { - prefs.edit { putBoolean(Consts.Prefs.DYNAMIC_COLORS, value) } + prefs.edit { putBoolean(Prefs.DynamicColors.key, value) } } override var askedForNotificationPermission: Boolean - get() = prefs.getBoolean(Consts.Prefs.ASKED_NOTIFICATION_PERMISSION, false) + get() = prefs.getBoolean(Prefs.AskedNotificationPermission.key, false) + set(value) { + prefs.edit { putBoolean(Prefs.AskedNotificationPermission.key, value) } + } + override var useOnlineDocs: Boolean + get() = prefs.getBoolean(Prefs.UseOnlineDocs.key, true) set(value) { - prefs.edit { putBoolean(Consts.Prefs.ASKED_NOTIFICATION_PERMISSION, value) } + prefs.edit { putBoolean(Prefs.UseOnlineDocs.key, value) } } + override var contrastLevel: Int + get() = prefs.getInt(Prefs.ContrastLevel.key, 1) + set(value) { + prefs.edit { putInt(Prefs.ContrastLevel.key, value) } + } + override val searchHistory: Set + get() = prefs.getStringSet(Prefs.SearchHistory.key, emptySet()) ?: emptySet() + + override fun addSearchToHistory(query: String) { + val currentHistory = searchHistory.toMutableSet() + currentHistory.add(query) + prefs.edit { putStringSet(Prefs.SearchHistory.key, currentHistory) } + } + + override fun removeSearchFromHistory(query: String) { + val currentHistory = searchHistory.toMutableSet() + currentHistory.remove(query) + prefs.edit { putStringSet(Prefs.SearchHistory.key, currentHistory) } + } } diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt new file mode 100644 index 0000000..386e7f8 --- /dev/null +++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt @@ -0,0 +1,145 @@ +package com.androidvip.sysctlgui.data.repository + +import android.content.Context +import android.content.SharedPreferences +import android.os.Build +import com.androidvip.sysctlgui.data.Prefs +import com.androidvip.sysctlgui.data.utils.RootUtils +import com.androidvip.sysctlgui.domain.enums.CommitMode +import com.androidvip.sysctlgui.domain.enums.SettingItemType +import com.androidvip.sysctlgui.domain.models.AppSetting +import com.androidvip.sysctlgui.domain.repository.AppSettingsRepository +import kotlinx.coroutines.withContext +import kotlin.coroutines.CoroutineContext + +class AppSettingsRepositoryImpl( + private val context: Context, + private val sharedPreferences: SharedPreferences, + private val rootUtils: RootUtils, + private val ioContext: CoroutineContext +) : AppSettingsRepository { + override suspend fun getAppSettings(): List> = withContext(ioContext) { + val usingDynamicColors = sharedPreferences.getBoolean(Prefs.DynamicColors.key, false) + val supportsDynamicColors = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S + + listOf( + /////////// GENERAL SETTINGS //////////// + AppSetting( + key = Prefs.ListFoldersFirst.key, + value = sharedPreferences.getBoolean(Prefs.ListFoldersFirst.key, true), + category = "General", + title = "List folders first", + description = "List folders first when using the kernel parameter browser option", + type = SettingItemType.Switch, + ), + AppSetting( + key = Prefs.GuessInputType.key, + value = sharedPreferences.getBoolean(Prefs.GuessInputType.key, true), + category = "General", + title = "Guess input type", + description = "Try to set the best input type for the keyboard based on the value of the parameter", + type = SettingItemType.Switch, + ), + AppSetting( + key = Prefs.UseOnlineDocs.key, + value = sharedPreferences.getBoolean(Prefs.UseOnlineDocs.key, true), + category = "General", + title = "Use online docs", + description = "Try to use online documentation when displaying parameter descriptions", + type = SettingItemType.Switch, + ), + + /////////// THEME SETTINGS //////////// + + AppSetting( + key = Prefs.ForceDarkTheme.key, + value = sharedPreferences.getBoolean(Prefs.ForceDarkTheme.key, false), + category = "Theme", + title = "Force Dark", + description = "Force dark theme when available", + type = SettingItemType.Switch, + ), + AppSetting( + key = Prefs.DynamicColors.key, + value = usingDynamicColors, + enabled = supportsDynamicColors, + category = "Theme", + title = "Dynamic Colors", + description = "Use dynamic colors when available", + type = SettingItemType.Switch, + ), + AppSetting( + key = Prefs.ContrastLevel.key, + enabled = !usingDynamicColors, + value = sharedPreferences.getInt(Prefs.ContrastLevel.key, 1), + category = "Theme", + title = "Contrast level", + description = "Contrast level for the theme colors", + type = SettingItemType.Slider, + values = listOf(1, 2, 3), + ), + + /////////// COMMIT SETTINGS //////////// + + AppSetting( + key = Prefs.CommitMode.key, + value = sharedPreferences.getString( + Prefs.CommitMode.key, + CommitMode.SYSCTL.name.lowercase() + ) ?: "sysctl", + category = "Operations", + title = "Commit mode", + description = "Command used when applying the parameter value", + type = SettingItemType.List, + values = listOf( + CommitMode.SYSCTL.name.lowercase(), + CommitMode.ECHO.name.lowercase(), + ) + ), + AppSetting( + key = Prefs.UseBusybox.key, + value = sharedPreferences.getBoolean(Prefs.UseBusybox.key, false), + enabled = rootUtils.isBusyboxAvailable(), + category = "Operations", + title = "Use busybox", + description = "Use busybox to execute commands", + type = SettingItemType.Switch, + ), + AppSetting( + key = Prefs.ALLOW_BLANK.key, + value = sharedPreferences.getBoolean(Prefs.ALLOW_BLANK.key, false), + category = "Operations", + title = "Allow blank values", + type = SettingItemType.Switch, + ), + + /////////// STARTUP SETTINGS //////////// + + AppSetting( + key = Prefs.RunOnStartup.key, + value = sharedPreferences.getBoolean(Prefs.RunOnStartup.key, false), + category = "Startup", + title = "Run on startup", + description = "Allow the application to apply parameters on startup", + type = SettingItemType.Switch, + ), + AppSetting( + key = Prefs.StartupDelay.key, + value = sharedPreferences.getInt(Prefs.StartupDelay.key, 0), + category = "Startup", + title = "Startup delay", + description = "Delay in seconds before applying parameters on startup", + type = SettingItemType.Slider, + values = (0..10).toList(), + ), + AppSetting( + key = "", + value = Unit, + category = "Startup", + title = "Manage parameters", + description = "Manage the parameters that will be applied at startup", + type = SettingItemType.Text, + ) + ) + } +} diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/DocumentationRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/DocumentationRepositoryImpl.kt new file mode 100644 index 0000000..09ae565 --- /dev/null +++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/DocumentationRepositoryImpl.kt @@ -0,0 +1,34 @@ +package com.androidvip.sysctlgui.data.repository + +import com.androidvip.sysctlgui.data.source.DocumentationDataSource +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.models.ParamDocumentation +import com.androidvip.sysctlgui.domain.repository.AppPrefs +import com.androidvip.sysctlgui.domain.repository.DocumentationRepository + +/** + * Repository for fetching documentation for kernel parameters. + * + * This repository can fetch documentation from either an online or offline data source, + * depending on the user's preference set in [AppPrefs]. + * + * @property offlineDataSource The data source for fetching documentation offline. + * @property onlineDataSource The data source for fetching documentation online. + * @property appPrefs The application preferences, used to determine whether to use online or + * offline documentation. + */ +class DocumentationRepositoryImpl( + private val offlineDataSource: DocumentationDataSource, + private val onlineDataSource: DocumentationDataSource +) : DocumentationRepository { + override suspend fun getDocumentation( + param: KernelParam, + online: Boolean + ): ParamDocumentation? { + return if (online) { + onlineDataSource.getDocumentation(param) + } else { + offlineDataSource.getDocumentation(param) + } + } +} diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/ParamsRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/ParamsRepositoryImpl.kt index 5400846..768c335 100644 --- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/ParamsRepositoryImpl.kt +++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/ParamsRepositoryImpl.kt @@ -1,207 +1,133 @@ package com.androidvip.sysctlgui.data.repository -import com.androidvip.sysctlgui.data.datasource.JsonParamDataSource -import com.androidvip.sysctlgui.data.datasource.RoomParamDataSource -import com.androidvip.sysctlgui.data.datasource.RuntimeParamDataSource -import com.androidvip.sysctlgui.domain.exceptions.EmptyFileException -import com.androidvip.sysctlgui.domain.exceptions.MalformedLineException -import com.androidvip.sysctlgui.domain.models.DomainKernelParam +import android.util.Log +import com.androidvip.sysctlgui.data.utils.RootUtils +import com.androidvip.sysctlgui.domain.enums.CommitMode +import com.androidvip.sysctlgui.domain.models.KernelParam import com.androidvip.sysctlgui.domain.repository.ParamsRepository -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken +import com.androidvip.sysctlgui.utils.isValidSysctlLine +import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.mapNotNull +import kotlinx.coroutines.flow.single +import kotlinx.coroutines.flow.toList import java.io.File -import java.io.FileDescriptor -import java.io.FileOutputStream -import java.io.InputStream -import java.lang.reflect.Type -import kotlin.coroutines.CoroutineContext class ParamsRepositoryImpl( - private val jsonParamDataSource: JsonParamDataSource, - private val roomParamDataSource: RoomParamDataSource, - private val runtimeParamDataSource: RuntimeParamDataSource, - private val changeListener: ChangeListener?, - private val ioContext: CoroutineContext = Dispatchers.IO, - private val workerContext: CoroutineContext = Dispatchers.Default + private val rootUtils: RootUtils, + private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO ) : ParamsRepository { - - override suspend fun getUserParams(): List = withContext(ioContext) { - return@withContext roomParamDataSource.getData() - } - - override suspend fun getJsonParams(): List = withContext(ioContext) { - return@withContext jsonParamDataSource.getData() - } - - override suspend fun getRuntimeParams( - useBusybox: Boolean - ): List = withContext(workerContext) { - val localParams = getUserParams() - val runtimeParams = runtimeParamDataSource.getData(useBusybox) - - return@withContext runtimeParams.onEach { runtimeParam -> - runtimeParam.updateParamWithLocalData(localParams) - } - } - - override suspend fun getParamsFromFiles( - files: List - ): List = withContext(ioContext) { - val localParams = getUserParams() - val fileParams = runtimeParamDataSource.getParamsFromFiles(files) - - return@withContext fileParams.onEach { runtimeParam -> - runtimeParam.updateParamWithLocalData(localParams) - } - } - - override suspend fun applyParam( - param: DomainKernelParam, - commitMode: String, + override fun getRuntimeParams( useBusybox: Boolean, - allowBlank: Boolean - ) = withContext(workerContext) { - runtimeParamDataSource.edit(param, commitMode, useBusybox, allowBlank).also { - changeListener?.onChange() - } - } - - override suspend fun updateUserParam( - param: DomainKernelParam, - allowBlank: Boolean - ) = withContext(ioContext) { - val storedParam = getUserParams().find { - it.name == param.name - } ?: return@withContext addUserParam(param, allowBlank) - - param.id = storedParam.id - return@withContext roomParamDataSource.edit(param, allowBlank).also { - changeListener?.onChange() - } - } - - override suspend fun addUserParam( - param: DomainKernelParam, - allowBlank: Boolean - ) = withContext(ioContext) { - return@withContext roomParamDataSource.add(param, allowBlank).also { - changeListener?.onChange() - } - } - - override suspend fun addUserParams( - params: List, - allowBlank: Boolean - ) = withContext(ioContext) { - return@withContext roomParamDataSource.addAll(params, allowBlank).also { - changeListener?.onChange() - } - } - - override suspend fun removeUserParam(param: DomainKernelParam) = withContext(ioContext) { - return@withContext roomParamDataSource.remove(param).also { - changeListener?.onChange() - } - } - - override suspend fun clearUserParams() = withContext(ioContext) { - return@withContext roomParamDataSource.clear().also { - jsonParamDataSource.clear() - changeListener?.onChange() - } - } - - override suspend fun performDatabaseMigration() = withContext(ioContext) { - val jsonParams = getJsonParams() - - return@withContext roomParamDataSource.addAll(jsonParams, true).also { - changeListener?.onChange() - } - } - - override suspend fun importParamsFromJson( - stream: InputStream - ): List = withContext(ioContext) { - if (stream.available() == 0) throw EmptyFileException() - - val rawText = buildString { - stream.bufferedReader().use { reader -> - reader.forEachLine { line -> - append(line) - } + userParams: List + ): Flow> = flow { + val command = if (useBusybox) BUSYBOX_SYSCTL_GET_ALL_COMMAND else SYSCTL_GET_ALL_COMMAND + val paramsList = rootUtils.executeCommandAndStreamOutput(command) + .filter { line -> line.isValidSysctlOutput() } + .mapNotNull { line -> + // Expected output: "grandparent.parent.name = value" + val parts = line.split("=", limit = 2) + val paramName = parts.first().trim() + val paramValue = if (parts.size > 1) parts.last().trim() else "" + runCatching { + KernelParam.createFromName( + name = paramName, + value = paramValue, + isFavorite = userParams.any { it.name == paramName } + ) + }.getOrNull() } - } - val type: Type = object : TypeToken>() {}.type - return@withContext Gson().fromJson(rawText, type) - } + .toList() - override suspend fun importParamsFromConf( - stream: InputStream - ): List = withContext(ioContext) { - fun String.validConfLine() = !startsWith("#") && !startsWith(";") && isNotEmpty() - val readParams = mutableListOf() + emit(paramsList) + }.flowOn(ioDispatcher) - if (stream.available() == 0) throw EmptyFileException() + override suspend fun getRuntimeParam(paramName: String, useBusybox: Boolean): KernelParam? { + val command = String.format( + SYSCTL_GET_PARAM_COMMAND_FORMAT, + if (useBusybox) BUSYBOX_PREFIX else "", + paramName + ) - var cont = 0 - stream.bufferedReader().forEachLine { line -> - if (line.validConfLine()) runCatching { - readParams.add( - DomainKernelParam( - id = ++cont, - name = line.split("=").first().trim(), - value = line.split("=")[1].trim() - ).apply { - setPathFromName(this.name) - } - ) - }.onFailure { - throw MalformedLineException() - } - } - return@withContext readParams - } + val paramValue = runCatching { + rootUtils.executeCommandAndStreamOutput(command).single() + }.getOrNull() ?: return null - override suspend fun exportParams( - params: List, - fileDescriptor: FileDescriptor - ) = withContext(ioContext) { - return@withContext FileOutputStream(fileDescriptor).use { stream -> - stream.write(Gson().toJson(params).toByteArray()) - } + return KernelParam.createFromName( + name = paramName, + value = paramValue + ) } - override suspend fun backupParams( - params: List, - fileDescriptor: FileDescriptor - ) = withContext(ioContext) { - val rawText = buildString { - params.forEach { param -> - appendLine(param.toString()) - } - } - - return@withContext FileOutputStream(fileDescriptor).use { stream -> - stream.write(rawText.toByteArray()) + override suspend fun setRuntimeParam( + param: KernelParam, + commitMode: CommitMode, + useBusybox: Boolean + ): String { + val command = when (commitMode) { + CommitMode.SYSCTL -> String.format( + SYSCTL_SET_PARAM_COMMAND_FORMAT, + if (useBusybox) BUSYBOX_PREFIX else "", + param.name, + param.value + ) + + CommitMode.ECHO -> String.format(ECHO_SET_PARAM_COMMAND_FORMAT, param.value, param.path) } - } - private fun DomainKernelParam.updateParamWithLocalData( - localParams: List - ): DomainKernelParam { - return apply { - favorite = localParams.firstOrNull { roomParam -> - (roomParam.name == name) && roomParam.favorite - } != null - taskerParam = localParams.firstOrNull { roomParam -> - (roomParam.name == name) && roomParam.taskerParam - } != null + val output = rootUtils.executeCommandAndStreamOutput(command).toList() + return output.joinToString("\n") + } + + /** + * Reads kernel parameters from a list of files. + * The parameter name is derived from the file path. + * + * @param files A list of [File] objects representing the kernel parameter files. + * @return A [Flow] emitting a list of [KernelParam] objects. + * Returns an empty list if no files are provided or if errors occur during processing. + * Emits null for files that could not be processed. + */ + override fun getParamsFromFiles(files: List): Flow> = flow { + val params = files.mapNotNull { file -> + try { + val path = file.absolutePath + val value = rootUtils.executeCommandAndStreamOutput( + command = String.format(CAT_COMMAND_FORMAT, path) + ).toList().joinToString("\n") + KernelParam.createFromPath(path, value) + } catch (e: Exception) { + Log.e(TAG, "Failed to process file: ${file.path}", e) + null + } } - } - - interface ChangeListener { - fun onChange() + emit(params) + }.flowOn(ioDispatcher) + + override fun getParamsFromPath(path: String): Flow> { + val files = File(path).listFiles()?.toList() ?: emptyList() + return getParamsFromFiles(files) + } + + private fun String.isValidSysctlOutput(): Boolean { + return isValidSysctlLine() && + !this.contains("denied", ignoreCase = true) && + !this.startsWith("sysctl") + } + + companion object { + private const val BUSYBOX_PREFIX = "busybox " + private const val SYSCTL_GET_ALL_COMMAND = "sysctl -a" + private const val BUSYBOX_SYSCTL_GET_ALL_COMMAND = "$BUSYBOX_PREFIX$SYSCTL_GET_ALL_COMMAND" + private const val SYSCTL_GET_PARAM_COMMAND_FORMAT = "%ssysctl -n %s" // prefix, name + private const val SYSCTL_SET_PARAM_COMMAND_FORMAT = + "%ssysctl -w %s=%s" // prefix, name, value + private const val ECHO_SET_PARAM_COMMAND_FORMAT = "echo '%s' > %s" // value, path + private const val CAT_COMMAND_FORMAT = "cat %s" // path + private const val TAG = "ParamsRepositoryImpl" } } diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/PresetRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/PresetRepositoryImpl.kt new file mode 100644 index 0000000..4d6a735 --- /dev/null +++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/PresetRepositoryImpl.kt @@ -0,0 +1,70 @@ +package com.androidvip.sysctlgui.data.repository + +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.exceptions.EmptyFileException +import com.androidvip.sysctlgui.domain.exceptions.MalformedLineException +import com.androidvip.sysctlgui.domain.repository.PresetRepository +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import kotlinx.serialization.json.Json +import java.io.FileDescriptor +import java.io.FileOutputStream +import java.io.InputStream +import kotlin.coroutines.CoroutineContext + +class PresetRepositoryImpl( + private val ioCoroutineContext: CoroutineContext = Dispatchers.IO +) : PresetRepository { + override suspend fun readPreset( + stream: InputStream + ): List = withContext(ioCoroutineContext) { + if (stream.available() == 0) throw EmptyFileException() + + return@withContext stream.bufferedReader().use { reader -> + reader.lineSequence() + .filter { it.validConfLine() } + .map { line -> + val parts = line.split("=", limit = 2) + if (parts.size == 2) { + val name = parts[0].trim() + val value = parts[1].trim() + runCatching { + KernelParam.createFromName(name = name, value = value) + }.getOrElse { + throw MalformedLineException("Invalid format for line: $line", it) + } + } else { + throw MalformedLineException("Line doesn't contain '=' separator: $line") + } + }.toList() + } + } + + override suspend fun exportToPreset(params: List, fileDescriptor: FileDescriptor) { + val content = params.joinToString(separator = "\n") { param -> + "${param.name}=${param.value}" + } + + writeContentToFileDescriptor(fileDescriptor, content) + } + + override suspend fun backupParams(params: List, fileDescriptor: FileDescriptor) { + val content = Json.encodeToString(params) + writeContentToFileDescriptor(fileDescriptor, content) + } + + private suspend fun writeContentToFileDescriptor( + fileDescriptor: FileDescriptor, + content: String + ) = withContext(ioCoroutineContext) { + FileOutputStream(fileDescriptor).use { fileOutputStream -> + fileOutputStream.writer(Charsets.UTF_8).buffered().use { writer -> + writer.write(content) + } + } + } +} + +private fun String.validConfLine(): Boolean { + return !startsWith("#") && !startsWith(";") && isNotEmpty() +} diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt new file mode 100644 index 0000000..3dbb29b --- /dev/null +++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt @@ -0,0 +1,45 @@ +package com.androidvip.sysctlgui.data.repository + +import com.androidvip.sysctlgui.data.db.ParamDao +import com.androidvip.sysctlgui.data.models.KernelParamDTO +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.repository.UserRepository +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.withContext +import kotlin.coroutines.CoroutineContext + +/** + * Implementation of [UserRepository] that uses a [ParamDao] to store and retrieve user parameters. + * + * @param paramDao The DAO used to interact with the database. + * @param coroutineContext The coroutine context to use for database operations. Defaults to [Dispatchers.IO]. + */ +class UserRepositoryImpl( + private val paramDao: ParamDao, + private val coroutineContext: CoroutineContext = Dispatchers.IO +) : UserRepository { + override val userParams: Flow> + get() = paramDao.getAllAsFlow() + + override suspend fun getParamByName(name: String) = withContext(coroutineContext) { + paramDao.getParamByName(name) + } + + override suspend fun upsertUserParam(param: KernelParam) = withContext(coroutineContext) { + paramDao.upsert(param as KernelParamDTO) + } + + override suspend fun upsertUserParams(params: List) = + withContext(coroutineContext) { + paramDao.upsertAll(params.map { it as KernelParamDTO }) + } + + override suspend fun removeUserParam(param: KernelParam) = withContext(coroutineContext) { + paramDao.delete(param as KernelParamDTO) + } + + override suspend fun clearUserParams() = withContext(coroutineContext) { + paramDao.clearTable() + } +} diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/source/DocumentationDataSource.kt b/data/src/main/java/com/androidvip/sysctlgui/data/source/DocumentationDataSource.kt new file mode 100644 index 0000000..de5672d --- /dev/null +++ b/data/src/main/java/com/androidvip/sysctlgui/data/source/DocumentationDataSource.kt @@ -0,0 +1,20 @@ +package com.androidvip.sysctlgui.data.source + +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.models.ParamDocumentation + + +/** + * Data source interface for fetching documentation for kernel parameters. + * This interface defines the contract for any class that provides access + * to kernel parameter documentation. + */ +fun interface DocumentationDataSource { + /** + * Retrieves documentation for a given kernel parameter. + * + * @param param The kernel parameter for which to fetch documentation. + * @return The documentation if found, null otherwise. + */ + suspend fun getDocumentation(param: KernelParam): ParamDocumentation? +} diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/source/OfflineDocumentationDataSource.kt b/data/src/main/java/com/androidvip/sysctlgui/data/source/OfflineDocumentationDataSource.kt new file mode 100644 index 0000000..82d88c4 --- /dev/null +++ b/data/src/main/java/com/androidvip/sysctlgui/data/source/OfflineDocumentationDataSource.kt @@ -0,0 +1,122 @@ +package com.androidvip.sysctlgui.data.source + +import android.annotation.SuppressLint +import android.content.Context +import com.androidvip.sysctlgui.data.R +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.models.ParamDocumentation +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import java.io.InputStream +import kotlin.coroutines.CoroutineContext + +/** + * Fetches documentation from offline sources. + * + * It first tries to find a string resource matching the parameter name. + * If not found, it attempts to extract documentation from raw text files + * bundled with the application, categorized by the parameter's path. + * + * @property context The application context, used to access resources. + * @property coroutineContext The coroutine context on which to perform operations. + */ +class OfflineDocumentationDataSource( + private val context: Context, + private val coroutineContext: CoroutineContext = Dispatchers.IO +) : DocumentationDataSource { + + /** + * Retrieves documentation for a given kernel parameter. + * + * This function attempts to find documentation in the following order: + * 1. **String Resource:** Checks for a string resource matching the parameter's name (normalized by replacing hyphens with underscores). + * 2. **Raw Text File:** If no string resource is found, it tries to locate documentation within a raw text file based on the parameter's path. + * - The path is expected to be in the format `/proc/sys/category/...`. + * - The "category" segment determines which raw file to read (e.g., `abi.txt`, `fs.txt`). + * - Inside the raw file, it searches for a section matching the parameter's name, delimited by "====" lines. + * + * @param param The [KernelParam] for which to retrieve documentation. + * @return A [String] containing the documentation if found, or `null` otherwise. + */ + @SuppressLint("DiscouragedApi") // Resource name is determined dynamically from name. + override suspend fun getDocumentation( + param: KernelParam) + : ParamDocumentation? = withContext(coroutineContext) { + val paramName = param.lastNameSegment + val resources = context.resources + + val normalizedResourceName = paramName.replace("-", "_") + val resId = resources.getIdentifier( + normalizedResourceName, + "string", + context.packageName + ) + val stringRes = runCatching { context.getString(resId) }.getOrNull() + + // Prefer the documented string resource + if (stringRes != null) return@withContext ParamDocumentation( + title = param.name, + documentationText = stringRes + ) + + // Assuming path is like /proc/sys/category/further/path + val pathSegments = param.path.trim('/').split('/') + if (pathSegments.size < MIN_PATH_SEGMENTS_FOR_CATEGORY) return@withContext null + + // Validate fixed parts like "proc" and "sys" + if (pathSegments.getOrNull(0) != "proc" || pathSegments.getOrNull(1) != "sys") { + // We did our best + return@withContext null + } + + // Index 2 after splitting by '/' and removing leading '/' + val category = pathSegments.getOrNull(2) + val rawInputStream: InputStream? = when (category) { + "abi" -> resources.openRawResource(R.raw.abi) + "fs" -> resources.openRawResource(R.raw.fs) + "kernel" -> resources.openRawResource(R.raw.kernel) + "net" -> resources.openRawResource(R.raw.net) + "vm" -> resources.openRawResource(R.raw.vm) + else -> null + } + + val documentation = rawInputStream?.use { inputStream -> + inputStream.bufferedReader().use { reader -> + reader.readText() + } + } + if (documentation.isNullOrEmpty()) return@withContext null + + /* + Trying to match: + + =============== + + paramName + + the <== + actual <== + documentation <== + + =============== + */ + val info: String? = runCatching { + documentation + .split("=+".toRegex()) + .last { it.contains("$paramName\n") } + .split("$paramName\n") + .last() + }.getOrNull() + + val documentationText = info.takeIf { it.isNullOrEmpty().not() } + if (documentationText == null) return@withContext null + return@withContext ParamDocumentation( + title = param.name, + documentationText = documentationText + ) + } + + companion object { + private const val MIN_PATH_SEGMENTS_FOR_CATEGORY = 4 + } +} diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/source/OnlineDocumentationDataSource.kt b/data/src/main/java/com/androidvip/sysctlgui/data/source/OnlineDocumentationDataSource.kt new file mode 100644 index 0000000..c79b528 --- /dev/null +++ b/data/src/main/java/com/androidvip/sysctlgui/data/source/OnlineDocumentationDataSource.kt @@ -0,0 +1,100 @@ +package com.androidvip.sysctlgui.data.source + +import android.util.Log +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.models.ParamDocumentation +import io.ktor.client.HttpClient +import io.ktor.client.request.get +import io.ktor.client.statement.bodyAsText +import io.ktor.http.isSuccess +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import org.jsoup.Jsoup +import kotlin.coroutines.CoroutineContext + + +class OnlineDocumentationDataSource( + private val client: HttpClient, + private val coroutineContext: CoroutineContext = Dispatchers.IO +) : DocumentationDataSource { + + /** + * Fetches the documentation for a given kernel parameter. + * + * This function constructs the documentation URL based on the parameter's name, + * retrieves the HTML content from that URL using Ktor and extracts the + * relevant documentation text using Jsoup. + * + * @param param The [KernelParam] for which to fetch documentation. + * @return The documentation text as a [ParamDocumentation], or `null` if the + * documentation could not be found or an error occurred. + */ + override suspend fun getDocumentation( + param: KernelParam + ): ParamDocumentation? = withContext(coroutineContext) { + val url = getDocumentationUrl(param) + + return@withContext runCatching { + val response = client.get(urlString = url) + + if (!response.status.isSuccess()) { + Log.w( + "OnlineDocRepo", + "Failed to fetch docs from $url. Status: ${response.status}" + ) + return@withContext null + } + + val html = response.bodyAsText() + val document = Jsoup.parse(html) + val htmlElementId = param.lastNameSegment.replace('_', '-') + val elements = document.select("section#$htmlElementId p") + + if (elements.isEmpty()) { + Log.w( + "OnlineDocRepo", + "No documentation found for ${param.name} with id $htmlElementId on $url" + ) + return@withContext null + } + + return@withContext ParamDocumentation( + title = param.name, + documentationText = elements.text(), + documentationHtml = elements.html().optimizedDocumentationHtml(), + url = url + ) + }.getOrElse { + Log.w("OnlineDocRepo", "Failed to fetch docs from $url", it) + return@withContext null + } + } + + private fun getDocumentationUrl(param: KernelParam): String { + val configName = param.groupName + return "${DOC_BASE_URL}$configName.html#${param.name}" + } + + /** + * Optimizes HTML documentation for display. + * + * This function performs a series of replacements on the input HTML string + * to try and improve its rendering in a basic HTML text renderer, such as Android's TextView. + * @return The optimized HTML string. + */ + private fun String.optimizedDocumentationHtml(): String { + return this.trimIndent() + .replace("
", "")
+            .replace("
", "") // For "code" blocks + .replace("", "") + .replace("", "") // For code tags + .replace("

  • ", "

  • ") + .replace("

    • ", "") // For spaced bullet points + .replace("

    ", "

    ") // For line breaks in paragraphs + .removeSuffix("
    ") // Remove the last line break + } + + companion object { + internal const val DOC_BASE_URL = "https://docs.kernel.org/admin-guide/sysctl/" + } +} diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/utils/AndroidStringProvider.kt b/data/src/main/java/com/androidvip/sysctlgui/data/utils/AndroidStringProvider.kt new file mode 100644 index 0000000..666fc53 --- /dev/null +++ b/data/src/main/java/com/androidvip/sysctlgui/data/utils/AndroidStringProvider.kt @@ -0,0 +1,11 @@ +package com.androidvip.sysctlgui.data.utils + +import android.app.Application +import com.androidvip.sysctlgui.domain.StringProvider + +class AndroidStringProvider(private val application: Application) : StringProvider { + override fun getString(resId: Int): String = application.getString(resId) + override fun getString(resId: Int, vararg formatArgs: Any): String { + return application.getString(resId, *formatArgs) + } +} diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/utils/KernelParamSerializer.kt b/data/src/main/java/com/androidvip/sysctlgui/data/utils/KernelParamSerializer.kt new file mode 100644 index 0000000..0357c1b --- /dev/null +++ b/data/src/main/java/com/androidvip/sysctlgui/data/utils/KernelParamSerializer.kt @@ -0,0 +1,65 @@ +package com.androidvip.sysctlgui.data.utils + +import com.androidvip.sysctlgui.data.models.KernelParamDTO +import com.androidvip.sysctlgui.utils.Consts +import kotlinx.serialization.KSerializer +import kotlinx.serialization.SerializationException +import kotlinx.serialization.descriptors.SerialDescriptor +import kotlinx.serialization.descriptors.buildClassSerialDescriptor +import kotlinx.serialization.descriptors.element +import kotlinx.serialization.encoding.CompositeDecoder +import kotlinx.serialization.encoding.Decoder +import kotlinx.serialization.encoding.Encoder +import kotlinx.serialization.encoding.decodeStructure +import kotlinx.serialization.encoding.encodeStructure + +object KernelParamSerializer : KSerializer { + override val descriptor: SerialDescriptor = buildClassSerialDescriptor("KernelParamDTO") { + element("id") + element("name") + element("path") + element("value") + element("isFavorite") + element("isTaskerParam") + element("taskerList") + } + + override fun serialize(encoder: Encoder, value: KernelParamDTO) { + encoder.encodeStructure(descriptor) { + encodeIntElement(descriptor, 0, value.id) + encodeStringElement(descriptor, 1, value.name) + encodeStringElement(descriptor, 2, value.path) + encodeStringElement(descriptor, 3, value.value) + encodeBooleanElement(descriptor, 4, value.isFavorite) + encodeBooleanElement(descriptor, 5, value.isTaskerParam) + encodeIntElement(descriptor, 6, value.taskerList) + } + } + + override fun deserialize(decoder: Decoder): KernelParamDTO { + return decoder.decodeStructure(descriptor) { + var id = 0 + var name = "" + var path = "" + var value = "" + var isFavorite = false + var isTaskerParam = false + var taskerList = Consts.LIST_NUMBER_PRIMARY_TASKER // Default + + while (true) { + when (val index = decodeElementIndex(descriptor)) { + 0 -> id = decodeIntElement(descriptor, 0) + 1 -> name = decodeStringElement(descriptor, 1) + 2 -> path = decodeStringElement(descriptor, 2) + 3 -> value = decodeStringElement(descriptor, 3) + 4 -> isFavorite = decodeBooleanElement(descriptor, 4) + 5 -> isTaskerParam = decodeBooleanElement(descriptor, 5) + 6 -> taskerList = decodeIntElement(descriptor, 6) + CompositeDecoder.Companion.DECODE_DONE -> break + else -> throw SerializationException("Unknown index $index") + } + } + KernelParamDTO(id, name, path, value, isFavorite, isTaskerParam, taskerList) + } + } +} \ No newline at end of file diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/utils/PresetsFileProcessor.kt b/data/src/main/java/com/androidvip/sysctlgui/data/utils/PresetsFileProcessor.kt new file mode 100644 index 0000000..696b4e1 --- /dev/null +++ b/data/src/main/java/com/androidvip/sysctlgui/data/utils/PresetsFileProcessor.kt @@ -0,0 +1,52 @@ +package com.androidvip.sysctlgui.data.utils + +import android.content.ContentResolver +import android.net.Uri +import android.util.Log +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.utils.isValidSysctlLine +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import java.io.IOException + +class PresetsFileProcessor( + private val contentResolver: ContentResolver, + private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO +) { + suspend fun getKernelParamsFromUri( + uri: Uri + ): List = withContext(ioDispatcher) { + contentResolver.openInputStream(uri)?.use { inputStream -> + val lines = inputStream.bufferedReader().readLines() + lines.mapNotNull { line -> + if (line.isValidSysctlLine()) { + runCatching { + KernelParam.Companion.createFromName( + name = line.substringBefore('=').trim(), + value = line.substringAfter('=').trim(), + isFavorite = true + ) + }.getOrNull() + } else { + Log.w("PresetsFileProcessor", "Invalid line: $line") + null + } + } + } ?: throw IOException("Failed to open input stream for URI: $uri") + } + + suspend fun backupParamsToUri( + uri: Uri, + params: List + ) = withContext(ioDispatcher) { + val fileContent = params.joinToString("\n") { "${it.name}=${it.value}" } + + contentResolver.openOutputStream(uri)?.use { outputStream -> + outputStream.bufferedWriter().use { writer -> + writer.write(fileContent) + writer.flush() + } + } ?: throw IOException("Failed to open output stream for URI: $uri") + } +} \ No newline at end of file diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/utils/RootUtils.kt b/data/src/main/java/com/androidvip/sysctlgui/data/utils/RootUtils.kt index 901304a..93bcfb1 100644 --- a/data/src/main/java/com/androidvip/sysctlgui/data/utils/RootUtils.kt +++ b/data/src/main/java/com/androidvip/sysctlgui/data/utils/RootUtils.kt @@ -1,42 +1,49 @@ package com.androidvip.sysctlgui.data.utils +import android.util.Log +import com.androidvip.sysctlgui.domain.exceptions.ShellCommandException import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.ShellUtils import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.withContext -class RootUtils(private val dispatcher: CoroutineDispatcher = Dispatchers.Default) { +class RootUtils(private val shellDispatcher: CoroutineDispatcher = Dispatchers.Default) { + suspend fun getRootShell(): Shell? = withContext(shellDispatcher) { + Shell.getShell().takeIf { it.isRoot } + } + + suspend fun isRootAvailable(): Boolean = withContext(shellDispatcher) { + Shell.isAppGrantedRoot() == true + } - suspend fun isBusyboxAvailable(): Boolean = withContext(dispatcher) { + suspend fun isBusyboxAvailable(): Boolean = withContext(shellDispatcher) { val results: List = Shell.cmd("which busybox").exec().out return@withContext ShellUtils.isValidOutput(results) && results.firstOrNull() ?.isNotEmpty() == true } - suspend fun executeWithOutput( - command: String, - defaultOutput: String = "", - forEachLine: ((String) -> Unit)? = null - ): String = withContext(dispatcher) { - return@withContext runCatching { - buildString { - val outputs = Shell.cmd(command).exec().out - if (!ShellUtils.isValidOutput(outputs)) { - append(defaultOutput) - return@buildString - } - outputs.forEach { line -> - if (forEachLine != null) { - forEachLine(line.orEmpty()) - appendLine(line.orEmpty()) - } else { - appendLine(line.orEmpty()) - } - } - }.trim().removeSuffix("\n") - }.getOrDefault(defaultOutput) - } + fun executeCommandAndStreamOutput(command: String): Flow = flow { + val result = Shell.cmd(command).exec() + val outputs = result.out + + if (ShellUtils.isValidOutput(outputs)) { + outputs.forEach { line -> + emit(line.orEmpty()) + } + } else { + if (result.isSuccess.not()) { + result.err.forEach { errorLine -> Log.e("RootUtils", errorLine) } + throw ShellCommandException( + message = "Command execution failed", + cause = Exception(result.err.joinToString("\n")) + ) + } + } + }.flowOn(shellDispatcher) fun finishProcess() { runCatching { diff --git a/app/src/main/res/raw/abi.txt b/data/src/main/res/raw/abi.txt similarity index 100% rename from app/src/main/res/raw/abi.txt rename to data/src/main/res/raw/abi.txt diff --git a/app/src/main/res/raw/fs.txt b/data/src/main/res/raw/fs.txt similarity index 100% rename from app/src/main/res/raw/fs.txt rename to data/src/main/res/raw/fs.txt diff --git a/app/src/main/res/raw/kernel.txt b/data/src/main/res/raw/kernel.txt similarity index 100% rename from app/src/main/res/raw/kernel.txt rename to data/src/main/res/raw/kernel.txt diff --git a/app/src/main/res/raw/net.txt b/data/src/main/res/raw/net.txt similarity index 100% rename from app/src/main/res/raw/net.txt rename to data/src/main/res/raw/net.txt diff --git a/app/src/main/res/raw/vm.txt b/data/src/main/res/raw/vm.txt similarity index 100% rename from app/src/main/res/raw/vm.txt rename to data/src/main/res/raw/vm.txt From 8fa41eb50c0e2441dbe8a606646d96a1c86e2642 Mon Sep 17 00:00:00 2001 From: Lennoard Date: Tue, 12 Aug 2025 20:50:04 -0300 Subject: [PATCH 04/18] refactor: [WIP] updated presentation layer --- app/build.gradle.kts | 22 +- app/src/main/AndroidManifest.xml | 20 +- .../com/androidvip/sysctlgui/SysctlGuiApp.kt | 4 +- .../core/navigation/TopLevelRoute.kt | 20 + .../sysctlgui/core/navigation/UiRoute.kt | 27 + .../data/mapper/DomainParamMapper.kt | 26 - .../sysctlgui/data/models/KernelParam.kt | 22 - .../sysctlgui/data/models/SettingsItem.kt | 10 - .../sysctlgui/di/PresentationModule.kt | 25 +- .../helpers/OnSettingsItemClickedListener.kt | 7 - .../sysctlgui/helpers/ParamDiffCallback.kt | 18 - .../helpers/SettingsItemDiffCallback.kt | 14 - .../sysctlgui/helpers/UiKernelParamMapper.kt | 17 + .../androidvip/sysctlgui/models/SearchHint.kt | 15 + .../sysctlgui/models/UiKernelParam.kt | 58 ++ .../services/tiles/StartAppTileService.kt | 26 +- .../services/tiles/StartUpTileService.kt | 60 +- .../ui/base/BaseAppCompatActivity.kt | 25 - .../sysctlgui/ui/base/BaseSearchFragment.kt | 57 -- .../sysctlgui/ui/base/BaseViewHolder.kt | 10 - .../sysctlgui/ui/components/ErrorContainer.kt | 96 +++ .../ui/components/SingleChoiceDialog.kt | 77 ++ .../ui/export/ExportOptionsFragment.kt | 152 ---- .../ui/export/ExportOptionsItemAdapter.kt | 40 - .../ui/export/ExportOptionsViewEffect.kt | 17 - .../ui/export/ExportOptionsViewModel.kt | 160 ---- .../sysctlgui/ui/main/AppNavHost.kt | 90 ++ .../sysctlgui/ui/main/MainActivity.kt | 81 +- .../sysctlgui/ui/main/MainNavBar.kt | 107 +++ .../sysctlgui/ui/main/MainScreen.kt | 105 +++ .../sysctlgui/ui/main/MainTopBar.kt | 75 ++ .../sysctlgui/ui/main/MainViewEffect.kt | 9 - .../sysctlgui/ui/main/MainViewModel.kt | 61 +- .../sysctlgui/ui/main/MainViewState.kt | 26 + .../ui/params/DocumentationBottomSheet.kt | 157 ++++ .../sysctlgui/ui/params/EmptyParamsWarning.kt | 76 -- .../ui/params/OnParamItemClickedListener.kt | 8 - .../params/OnPopUpMenuItemSelectedListener.kt | 13 - .../ui/params/browse/BrowseParamsViewModel.kt | 161 ---- .../browse/KernelParamBrowseFragment.kt | 277 ------ .../ui/params/browse/ParamBrowseItem.kt | 100 --- .../ui/params/browse/ParamBrowseScreen.kt | 313 +++++++ .../ui/params/browse/ParamBrowseState.kt | 23 + .../ui/params/browse/ParamBrowseViewModel.kt | 115 +++ .../params/browse/ParamBrowserViewEffect.kt | 11 - .../ui/params/browse/ParamBrowserViewEvent.kt | 13 - .../ui/params/browse/ParamBrowserViewState.kt | 14 - .../ui/params/browse/ParamFileRow.kt | 159 ++++ .../sysctlgui/ui/params/browse/ParamRow.kt | 106 +++ .../ui/params/edit/ActionToggleButton.kt | 188 ++++ .../ui/params/edit/EditKernelParamActivity.kt | 108 --- .../ui/params/edit/EditParamScreen.kt | 816 +++++++++++------- .../ui/params/edit/EditParamViewEffect.kt | 10 - .../ui/params/edit/EditParamViewEvent.kt | 15 - .../ui/params/edit/EditParamViewModel.kt | 253 +++--- .../ui/params/edit/EditParamViewState.kt | 26 +- .../ui/params/list/KernelParamListFragment.kt | 135 --- .../ui/params/list/ListParamsViewModel.kt | 47 - .../sysctlgui/ui/params/list/ParamItem.kt | 53 -- .../ui/params/list/ParamViewEffect.kt | 7 - .../ui/params/list/ParamViewEvent.kt | 9 - .../ui/params/list/ParamViewState.kt | 9 - .../params/user/BaseManageParamsActivity.kt | 47 - .../user/ManageFavoritesParamsActivity.kt | 12 - .../user/ManageOnStartUpParamsActivity.kt | 12 - .../ui/params/user/UserParamsScreen.kt | 242 ------ .../ui/params/user/UserParamsViewEvent.kt | 12 - .../ui/params/user/UserParamsViewModel.kt | 80 -- .../ui/params/user/UserParamsViewState.kt | 8 - .../ui/presets/ImportPresetScreen.kt | 357 ++++++++ .../sysctlgui/ui/presets/PresetsScreen.kt | 215 +++++ .../sysctlgui/ui/presets/PresetsViewModel.kt | 109 +++ .../sysctlgui/ui/presets/PresetsViewState.kt | 30 + .../sysctlgui/ui/search/SearchScreen.kt | 462 ++++++++++ .../sysctlgui/ui/search/SearchViewModel.kt | 140 +++ .../sysctlgui/ui/search/SearchViewState.kt | 23 + .../sysctlgui/ui/settings/SettingsFragment.kt | 120 --- .../sysctlgui/ui/settings/SettingsScreen.kt | 233 +++++ .../ui/settings/SettingsViewModel.kt | 68 ++ .../ui/settings/components/HeaderComponent.kt | 46 + .../components/SettingsComponentColumn.kt | 45 + .../components/SliderSettingComponent.kt | 89 ++ .../components/SwitchSettingComponent.kt | 91 ++ .../components/TextSettingComponent.kt | 111 +++ .../ui/settings/model/SettingsViewEvent.kt | 15 + .../sysctlgui/ui/start/StartActivity.kt | 44 +- .../sysctlgui/ui/start/StartErrorActivity.kt | 4 +- .../ui/tasker/TaskerPluginActivity.kt | 6 +- .../sysctlgui/ui/user/UserParamsScreen.kt | 262 ++++++ .../sysctlgui/ui/user/UserParamsViewModel.kt | 69 ++ .../sysctlgui/ui/user/UserParamsViewState.kt | 20 + .../sysctlgui/utils/DataBindingUtils.kt | 10 - .../sysctlgui/utils/KernelParamUtils.kt | 32 - .../androidvip/sysctlgui/utils/ThemeExt.kt | 28 - .../widgets/FavoriteWidgetParamUpdater.kt | 7 +- .../sysctlgui/widgets/FavoritesWidget.kt | 34 +- .../widgets/FavoritesWidgetService.kt | 13 +- .../sysctlgui/work/StartUpWorker.kt | 17 +- .../androidvip/sysctlgui/work/TaskerWorker.kt | 14 +- .../drawable-night/ic_launcher_background.xml | 10 - app/src/main/res/drawable/circle_file.xml | 10 - app/src/main/res/drawable/circle_folder.xml | 10 - .../main/res/drawable/fast_scroll_thumb.xml | 13 - .../main/res/drawable/fast_scroll_track.xml | 5 - .../main/res/drawable/ic_action_tasker.xml | 10 - app/src/main/res/drawable/ic_arrow_upward.xml | 12 + app/src/main/res/drawable/ic_close.xml | 9 - app/src/main/res/drawable/ic_config.xml | 5 - app/src/main/res/drawable/ic_delete_sweep.xml | 14 +- .../main/res/drawable/ic_documentation.xml | 14 +- app/src/main/res/drawable/ic_edit_outline.xml | 9 - app/src/main/res/drawable/ic_export.xml | 5 + app/src/main/res/drawable/ic_favorite.xml | 5 + .../res/drawable/ic_favorite_outlined.xml | 5 + app/src/main/res/drawable/ic_file.xml | 9 + app/src/main/res/drawable/ic_file_outline.xml | 9 - app/src/main/res/drawable/ic_folder.xml | 11 + .../main/res/drawable/ic_folder_outline.xml | 9 - app/src/main/res/drawable/ic_heart_broken.xml | 5 + app/src/main/res/drawable/ic_history.xml | 5 + app/src/main/res/drawable/ic_import.xml | 5 + app/src/main/res/drawable/ic_info_outline.xml | 9 - .../res/drawable/ic_launcher_background.xml | 2 +- app/src/main/res/drawable/ic_more_vert.xml | 9 - app/src/main/res/drawable/ic_name.xml | 5 - .../main/res/drawable/ic_open_in_browser.xml | 12 + app/src/main/res/drawable/ic_search.xml | 9 - .../main/res/drawable/ic_settings_outline.xml | 9 - app/src/main/res/drawable/ic_tasker.xml | 10 + .../main/res/drawable/ic_tasker_outlined.xml | 10 + .../main/res/layout-land/activity_main2.xml | 50 -- app/src/main/res/layout/activity_main2.xml | 43 - app/src/main/res/layout/activity_splash.xml | 1 - .../res/layout/activity_tasker_plugin.xml | 10 +- .../res/layout/fragment_export_options.xml | 43 - .../main/res/layout/list_item_settings.xml | 74 -- app/src/main/res/layout/settings_activity.xml | 26 - app/src/main/res/menu/menu_browse_params.xml | 32 - app/src/main/res/menu/menu_main.xml | 15 - app/src/main/res/menu/menu_main_search.xml | 23 - app/src/main/res/menu/menu_search.xml | 11 - app/src/main/res/menu/nav_main.xml | 24 - app/src/main/res/menu/popup_manage_params.xml | 5 - .../main/res/navigation/main_navigation.xml | 50 -- app/src/main/res/values-land/integers.xml | 4 - app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-v14/dimens.xml | 10 - app/src/main/res/values/integers.xml | 4 - app/src/main/res/values/strings.xml | 9 +- app/src/main/res/xml/preferences.xml | 86 -- buildSrc/src/main/kotlin/AndroidX.kt | 26 - buildSrc/src/main/kotlin/BuildPlugins.kt | 7 - buildSrc/src/main/kotlin/Compose.kt | 8 - buildSrc/src/main/kotlin/Dependencies.kt | 12 - buildSrc/src/main/kotlin/Google.kt | 4 - buildSrc/src/main/kotlin/Modules.kt | 7 - common/design/build.gradle.kts | 6 +- .../design/BaseBottomSheetFragment.kt | 67 -- .../sysctlgui/design/DesignResources.kt | 5 - .../sysctlgui/design/ModalBottomSheet.kt | 88 -- .../sysctlgui/design/theme/Color.kt | 290 +++++-- .../sysctlgui/design/theme/Shape.kt | 26 - .../sysctlgui/design/theme/Theme.kt | 303 +++++-- .../androidvip/sysctlgui/design/theme/Type.kt | 133 +++ .../src/main/res/font/passionone_bold.ttf | Bin 0 -> 22876 bytes .../src/main/res/font/passionone_regular.ttf | Bin 0 -> 23076 bytes .../src/main/res/font/sansation_bold.ttf | Bin 0 -> 37012 bytes .../main/res/font/sansation_bold_italic.ttf | Bin 0 -> 38740 bytes .../src/main/res/font/sansation_regular.ttf | Bin 0 -> 36764 bytes .../res/font/sansation_regular_italic.ttf | Bin 0 -> 38596 bytes .../design/src/main/res/layout/dialog_web.xml | 28 - .../main/res/layout/modal_bottom_sheet.xml | 79 -- .../preference_widget_switch_compat.xml | 9 - .../sysctlgui/data/ExampleInstrumentedTest.kt | 24 - .../sysctlgui/data/di/DataModule.kt | 14 +- .../sysctlgui/data/models/KernelParamDTO.kt | 15 +- .../repository/AppSettingsRepositoryImpl.kt | 3 +- .../data/repository/ParamsRepositoryImpl.kt | 22 +- .../data/repository/UserRepositoryImpl.kt | 6 +- .../source/OnlineDocumentationDataSource.kt | 24 +- .../data/utils/PresetsFileProcessor.kt | 11 +- .../sysctlgui/data/ExampleUnitTest.kt | 17 - .../sysctlgui/domain/enums}/Actions.kt | 5 +- .../sysctlgui/domain/models/KernelParam.kt | 13 +- gradle/libs.versions.toml | 19 +- 186 files changed, 5748 insertions(+), 4238 deletions(-) create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/core/navigation/TopLevelRoute.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/core/navigation/UiRoute.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/data/mapper/DomainParamMapper.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/data/models/KernelParam.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/data/models/SettingsItem.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/helpers/OnSettingsItemClickedListener.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/helpers/ParamDiffCallback.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/helpers/SettingsItemDiffCallback.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/helpers/UiKernelParamMapper.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/models/SearchHint.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/models/UiKernelParam.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseAppCompatActivity.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseSearchFragment.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseViewHolder.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/components/ErrorContainer.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/components/SingleChoiceDialog.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsFragment.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsItemAdapter.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsViewEffect.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsViewModel.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainTopBar.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewEffect.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewState.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/DocumentationBottomSheet.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/EmptyParamsWarning.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/OnParamItemClickedListener.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/OnPopUpMenuItemSelectedListener.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/BrowseParamsViewModel.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/KernelParamBrowseFragment.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseItem.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseState.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowserViewEffect.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowserViewEvent.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowserViewState.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamFileRow.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamRow.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/ActionToggleButton.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditKernelParamActivity.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewEffect.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewEvent.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/KernelParamListFragment.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ListParamsViewModel.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamItem.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamViewEffect.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamViewEvent.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamViewState.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/BaseManageParamsActivity.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/ManageFavoritesParamsActivity.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/ManageOnStartUpParamsActivity.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsScreen.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsViewEvent.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsViewModel.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsViewState.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/ImportPresetScreen.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsViewModel.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsViewState.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewModel.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewState.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsFragment.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsViewModel.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/HeaderComponent.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/SettingsComponentColumn.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/SliderSettingComponent.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/SwitchSettingComponent.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/TextSettingComponent.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/model/SettingsViewEvent.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsViewModel.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsViewState.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/utils/DataBindingUtils.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/utils/KernelParamUtils.kt delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/utils/ThemeExt.kt delete mode 100644 app/src/main/res/drawable-night/ic_launcher_background.xml delete mode 100644 app/src/main/res/drawable/circle_file.xml delete mode 100644 app/src/main/res/drawable/circle_folder.xml delete mode 100644 app/src/main/res/drawable/fast_scroll_thumb.xml delete mode 100644 app/src/main/res/drawable/fast_scroll_track.xml delete mode 100644 app/src/main/res/drawable/ic_action_tasker.xml create mode 100644 app/src/main/res/drawable/ic_arrow_upward.xml delete mode 100644 app/src/main/res/drawable/ic_close.xml delete mode 100644 app/src/main/res/drawable/ic_config.xml delete mode 100644 app/src/main/res/drawable/ic_edit_outline.xml create mode 100644 app/src/main/res/drawable/ic_export.xml create mode 100644 app/src/main/res/drawable/ic_favorite.xml create mode 100644 app/src/main/res/drawable/ic_favorite_outlined.xml create mode 100644 app/src/main/res/drawable/ic_file.xml delete mode 100644 app/src/main/res/drawable/ic_file_outline.xml create mode 100644 app/src/main/res/drawable/ic_folder.xml delete mode 100644 app/src/main/res/drawable/ic_folder_outline.xml create mode 100644 app/src/main/res/drawable/ic_heart_broken.xml create mode 100644 app/src/main/res/drawable/ic_history.xml create mode 100644 app/src/main/res/drawable/ic_import.xml delete mode 100644 app/src/main/res/drawable/ic_info_outline.xml delete mode 100644 app/src/main/res/drawable/ic_more_vert.xml delete mode 100644 app/src/main/res/drawable/ic_name.xml create mode 100644 app/src/main/res/drawable/ic_open_in_browser.xml delete mode 100644 app/src/main/res/drawable/ic_search.xml delete mode 100644 app/src/main/res/drawable/ic_settings_outline.xml create mode 100644 app/src/main/res/drawable/ic_tasker.xml create mode 100644 app/src/main/res/drawable/ic_tasker_outlined.xml delete mode 100644 app/src/main/res/layout-land/activity_main2.xml delete mode 100644 app/src/main/res/layout/activity_main2.xml delete mode 100644 app/src/main/res/layout/fragment_export_options.xml delete mode 100644 app/src/main/res/layout/list_item_settings.xml delete mode 100644 app/src/main/res/layout/settings_activity.xml delete mode 100644 app/src/main/res/menu/menu_browse_params.xml delete mode 100644 app/src/main/res/menu/menu_main.xml delete mode 100644 app/src/main/res/menu/menu_main_search.xml delete mode 100644 app/src/main/res/menu/menu_search.xml delete mode 100644 app/src/main/res/menu/nav_main.xml delete mode 100644 app/src/main/res/menu/popup_manage_params.xml delete mode 100644 app/src/main/res/navigation/main_navigation.xml delete mode 100644 app/src/main/res/values-land/integers.xml delete mode 100644 app/src/main/res/values-v14/dimens.xml delete mode 100644 app/src/main/res/values/integers.xml delete mode 100644 app/src/main/res/xml/preferences.xml delete mode 100644 buildSrc/src/main/kotlin/AndroidX.kt delete mode 100644 buildSrc/src/main/kotlin/BuildPlugins.kt delete mode 100644 buildSrc/src/main/kotlin/Compose.kt delete mode 100644 buildSrc/src/main/kotlin/Dependencies.kt delete mode 100644 buildSrc/src/main/kotlin/Google.kt delete mode 100644 buildSrc/src/main/kotlin/Modules.kt delete mode 100644 common/design/src/main/java/com/androidvip/sysctlgui/design/BaseBottomSheetFragment.kt delete mode 100644 common/design/src/main/java/com/androidvip/sysctlgui/design/DesignResources.kt delete mode 100644 common/design/src/main/java/com/androidvip/sysctlgui/design/ModalBottomSheet.kt delete mode 100644 common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Shape.kt create mode 100644 common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Type.kt create mode 100644 common/design/src/main/res/font/passionone_bold.ttf create mode 100644 common/design/src/main/res/font/passionone_regular.ttf create mode 100644 common/design/src/main/res/font/sansation_bold.ttf create mode 100644 common/design/src/main/res/font/sansation_bold_italic.ttf create mode 100644 common/design/src/main/res/font/sansation_regular.ttf create mode 100644 common/design/src/main/res/font/sansation_regular_italic.ttf delete mode 100644 common/design/src/main/res/layout/dialog_web.xml delete mode 100644 common/design/src/main/res/layout/modal_bottom_sheet.xml delete mode 100644 common/design/src/main/res/layout/preference_widget_switch_compat.xml delete mode 100644 data/src/androidTest/java/com/androidvip/sysctlgui/data/ExampleInstrumentedTest.kt delete mode 100644 data/src/test/java/com/androidvip/sysctlgui/data/ExampleUnitTest.kt rename {app/src/main/kotlin/com/androidvip/sysctlgui/helpers => domain/src/main/java/com/androidvip/sysctlgui/domain/enums}/Actions.kt (60%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b202615..1643914 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,7 +6,6 @@ plugins { alias(libs.plugins.kotlin.compose) alias(libs.plugins.ksp) alias(libs.plugins.jetbrains.kotlin.serialization) - kotlin("kapt") id("kotlin-parcelize") } @@ -65,7 +64,6 @@ android { buildFeatures { viewBinding = true - dataBinding = true compose = true } @@ -108,12 +106,14 @@ dependencies { implementation(libs.kotlin.stdlib) implementation(libs.kotlinx.coroutines.android) - implementation(libs.androidx.core.ktx) implementation(libs.androidx.activity.compose) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.core.splashscreen) implementation(libs.androidx.appcompat) implementation(libs.androidx.material) implementation(libs.androidx.navigation.compose) implementation(libs.androidx.window) + implementation(libs.androidx.work.runtime.ktx) // Lifecycle implementation(libs.androidx.lifecycle.runtime.ktx) @@ -124,23 +124,7 @@ dependencies { implementation(libs.androidx.lifecycle.viewmodel.savedstate) //ksp(libs.androidx.lifecycle.compiler) - implementation(AndroidX.splashScreen) - implementation(AndroidX.lifecycleLiveData) - implementation(AndroidX.navigationFragment) - implementation(AndroidX.navigationUi) - implementation(AndroidX.preference) - implementation(AndroidX.room) - implementation(AndroidX.roomRuntime) - implementation(AndroidX.workManager) - ksp(AndroidX.roomCompiler) - - implementation(Google.gson) - implementation(libs.koin) implementation(libs.koin.compose) implementation(libs.bundles.libsu) - - implementation(Dependencies.libSuIo) - implementation(Dependencies.liveEvent) - implementation(Dependencies.tapTargetView) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e683bad..dad076a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,25 +22,7 @@ android:theme="@style/AppTheme" android:enableOnBackInvokedCallback="true" tools:ignore="GoogleAppIndexingWarning"> - - - - - + ( + val name: String, + val route: T, + val selectedIcon: ImageVector, + val unselectedIcon: ImageVector +) diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/core/navigation/UiRoute.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/core/navigation/UiRoute.kt new file mode 100644 index 0000000..b53090c --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/core/navigation/UiRoute.kt @@ -0,0 +1,27 @@ +package com.androidvip.sysctlgui.core.navigation + +import kotlinx.serialization.Serializable + +/** + * Represents the different routes in the application's UI. + * This is used for navigation purposes. + */ +@Serializable +sealed interface UiRoute { + @Serializable + data object BrowseParams : UiRoute + @Serializable + data class EditParam(val paramName: String) : UiRoute + @Serializable + data object Presets : UiRoute + @Serializable + data object ImportPresets : UiRoute + @Serializable + data object Favorites : UiRoute + @Serializable + data object UserParams : UiRoute + @Serializable + data object Search : UiRoute + @Serializable + data object Settings : UiRoute +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/data/mapper/DomainParamMapper.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/data/mapper/DomainParamMapper.kt deleted file mode 100644 index b60af5b..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/data/mapper/DomainParamMapper.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.androidvip.sysctlgui.data.mapper - -import com.androidvip.sysctlgui.data.models.KernelParam -import com.androidvip.sysctlgui.domain.models.DomainKernelParam - -object DomainParamMapper : Mapper { - override fun map(from: DomainKernelParam): KernelParam = KernelParam().apply { - id = from.id - name = from.name - path = from.path - value = from.value - favorite = from.favorite - taskerParam = from.taskerParam - taskerList = from.taskerList - } - - override fun unmap(from: KernelParam): DomainKernelParam = DomainKernelParam().apply { - id = from.id - name = from.name - path = from.path - value = from.value - favorite = from.favorite - taskerParam = from.taskerParam - taskerList = from.taskerList - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/data/models/KernelParam.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/data/models/KernelParam.kt deleted file mode 100644 index 5843783..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/data/models/KernelParam.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.androidvip.sysctlgui.data.models - -import android.os.Parcelable -import com.androidvip.sysctlgui.domain.models.DomainKernelParam -import com.androidvip.sysctlgui.utils.Consts -import kotlinx.parcelize.Parcelize - -@Parcelize -data class KernelParam( - override var id: Int = 0, - override var name: String = "", - override var path: String = "", - override var value: String = "", - override var favorite: Boolean = false, - override var taskerParam: Boolean = false, - override var taskerList: Int = Consts.LIST_NUMBER_PRIMARY_TASKER -) : DomainKernelParam(), Parcelable { - override fun toString(): String { - if (name.isEmpty()) setNameFromPath(path) - return "$name = $value" - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/data/models/SettingsItem.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/data/models/SettingsItem.kt deleted file mode 100644 index edba905..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/data/models/SettingsItem.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.androidvip.sysctlgui.data.models - -import androidx.annotation.DrawableRes -import androidx.annotation.StringRes - -data class SettingsItem( - @StringRes val titleRes: Int, - @StringRes val descriptionRes: Int, - @DrawableRes val iconRes: Int -) diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt index 0acae81..87aac32 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt @@ -1,24 +1,25 @@ package com.androidvip.sysctlgui.di -import com.androidvip.sysctlgui.ui.export.ExportOptionsViewModel import com.androidvip.sysctlgui.ui.main.MainViewModel -import com.androidvip.sysctlgui.ui.params.browse.BrowseParamsViewModel +import com.androidvip.sysctlgui.ui.params.browse.ParamBrowseViewModel import com.androidvip.sysctlgui.ui.params.edit.EditParamViewModel -import com.androidvip.sysctlgui.ui.params.list.ListParamsViewModel -import com.androidvip.sysctlgui.ui.params.user.UserParamsViewModel +import com.androidvip.sysctlgui.ui.presets.PresetsViewModel +import com.androidvip.sysctlgui.ui.search.SearchViewModel +import com.androidvip.sysctlgui.ui.settings.SettingsViewModel +import com.androidvip.sysctlgui.ui.user.UserParamsViewModel import com.androidvip.sysctlgui.widgets.FavoriteWidgetParamUpdater import org.koin.android.ext.koin.androidContext -import org.koin.androidx.viewmodel.dsl.viewModel -import org.koin.androidx.viewmodel.dsl.viewModelOf +import org.koin.core.module.dsl.viewModelOf import org.koin.dsl.module -internal val presentationModules = module { - viewModel { BrowseParamsViewModel(get(), get()) } - viewModelOf(::ListParamsViewModel) - viewModelOf(::UserParamsViewModel) - viewModelOf(::EditParamViewModel) +internal val presentationModule = module { viewModelOf(::MainViewModel) - viewModel { ExportOptionsViewModel(get(), get(), get()) } + viewModelOf(::SettingsViewModel) + viewModelOf(::ParamBrowseViewModel) + viewModelOf(::EditParamViewModel) + viewModelOf(::SearchViewModel) + viewModelOf(::PresetsViewModel) + viewModelOf(::UserParamsViewModel) single { FavoriteWidgetParamUpdater(androidContext()).getListener() } } diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/OnSettingsItemClickedListener.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/OnSettingsItemClickedListener.kt deleted file mode 100644 index 97e3be3..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/OnSettingsItemClickedListener.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.androidvip.sysctlgui.helpers - -import com.androidvip.sysctlgui.data.models.SettingsItem - -interface OnSettingsItemClickedListener { - fun onSettingsItemClicked(item: SettingsItem, position: Int) -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/ParamDiffCallback.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/ParamDiffCallback.kt deleted file mode 100644 index cec3940..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/ParamDiffCallback.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.androidvip.sysctlgui.helpers - -import androidx.recyclerview.widget.DiffUtil -import com.androidvip.sysctlgui.data.models.KernelParam - -class ParamDiffCallback : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: KernelParam, newItem: KernelParam): Boolean { - return oldItem.name == newItem.name - } - - override fun areContentsTheSame(oldItem: KernelParam, newItem: KernelParam): Boolean { - return oldItem.name == newItem.name - && oldItem.path == newItem.path - && oldItem.value == newItem.value - && oldItem.favorite == newItem.favorite - && oldItem.taskerParam == newItem.taskerParam - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/SettingsItemDiffCallback.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/SettingsItemDiffCallback.kt deleted file mode 100644 index baab603..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/SettingsItemDiffCallback.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.androidvip.sysctlgui.helpers - -import androidx.recyclerview.widget.DiffUtil -import com.androidvip.sysctlgui.data.models.SettingsItem - -internal object SettingsItemDiffCallback : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: SettingsItem, newItem: SettingsItem): Boolean { - return oldItem.titleRes == newItem.titleRes - } - - override fun areContentsTheSame(oldItem: SettingsItem, newItem: SettingsItem): Boolean { - return oldItem == newItem - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/UiKernelParamMapper.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/UiKernelParamMapper.kt new file mode 100644 index 0000000..04dbaa2 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/UiKernelParamMapper.kt @@ -0,0 +1,17 @@ +package com.androidvip.sysctlgui.helpers + +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.models.UiKernelParam + +object UiKernelParamMapper { + fun map(param: KernelParam): UiKernelParam { + return UiKernelParam( + name = param.name, + path = param.path, + value = param.value, + isFavorite = param.isFavorite, + isTaskerParam = param.isTaskerParam, + taskerList = param.taskerList + ) + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/models/SearchHint.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/models/SearchHint.kt new file mode 100644 index 0000000..881e305 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/models/SearchHint.kt @@ -0,0 +1,15 @@ +package com.androidvip.sysctlgui.models + +/** + * Represents a search hint displayed to the user. + * + * This holds information about a single search suggestion, including the text of the hint + * and whether it originates from the user's search history. + * + * @property hint The text of the search hint. + * @property isFromHistory A boolean flag indicating whether the hint is from the user's search history + */ +data class SearchHint( + val hint: String, + val isFromHistory: Boolean = false +) diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/models/UiKernelParam.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/models/UiKernelParam.kt new file mode 100644 index 0000000..379d49d --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/models/UiKernelParam.kt @@ -0,0 +1,58 @@ +package com.androidvip.sysctlgui.models + +import android.os.Build +import android.os.Parcelable +import androidx.compose.runtime.Stable +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.utils.Consts +import kotlinx.parcelize.IgnoredOnParcel +import kotlinx.parcelize.Parcelize +import java.io.File +import java.nio.file.Paths +import kotlin.io.path.isDirectory + +/** + * Represents a kernel parameter with additional UI-specific properties. + */ +@Stable +@Parcelize +data class UiKernelParam( + override val name: String = "", + override val path: String = "", + override val value: String = "", + override val isFavorite: Boolean = false, + override val isTaskerParam: Boolean = false, + override val taskerList: Int = Consts.LIST_NUMBER_PRIMARY_TASKER +) : KernelParam(name, path, value, isFavorite, isTaskerParam, taskerList), Parcelable { + + /** + * Lazily determines if the [path] represents a directory. + * Uses [Paths] for Android O and above, otherwise falls back to [File]. + */ + @IgnoredOnParcel + val isDirectory by lazy { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + Paths.get(path).isDirectory() + } else { + File(path).isDirectory + } + } + + /** + * The last segment of the parameter's name or path. + * + * If the parameter represents a directory, this will be the last segment of its [path] + * after the last `/`. For example: `/proc/sys/vm/` -> `vm`. + * + * If the parameter represents a file, this will be the last segment of its [name] + * after the last `.`. For example: `vm.swappiness` -> `swappiness`. + * + * If there is no `.` in the name, the full [name] is returned. + */ + override val lastNameSegment: String + get() = if (isDirectory) { + path.substringAfterLast('/') + } else { + name.substringAfterLast('.', name) + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/services/tiles/StartAppTileService.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/services/tiles/StartAppTileService.kt index 1c9bb6b..0cbebac 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/services/tiles/StartAppTileService.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/services/tiles/StartAppTileService.kt @@ -1,23 +1,39 @@ package com.androidvip.sysctlgui.services.tiles +import android.annotation.SuppressLint +import android.app.PendingIntent import android.content.Intent import android.os.Build import android.service.quicksettings.Tile import android.service.quicksettings.TileService import androidx.annotation.RequiresApi +import androidx.core.service.quicksettings.PendingIntentActivityWrapper +import androidx.core.service.quicksettings.TileServiceCompat import com.androidvip.sysctlgui.ui.start.StartActivity -@RequiresApi(Build.VERSION_CODES.N) + class StartAppTileService : TileService() { + + @SuppressLint("StartActivityAndCollapseDeprecated") override fun onClick() { super.onClick() qsTile.apply { state = Tile.STATE_INACTIVE updateTile() } - startActivityAndCollapse( - Intent(this, StartActivity::class.java) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP) + + val intent = Intent(this, StartActivity::class.java).apply { + addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP) + } + + val wrapper = PendingIntentActivityWrapper( + this, + 0, + intent, + PendingIntent.FLAG_UPDATE_CURRENT, + false ) + + TileServiceCompat.startActivityAndCollapse(this, wrapper) } -} \ No newline at end of file +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/services/tiles/StartUpTileService.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/services/tiles/StartUpTileService.kt index b73db99..84aee78 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/services/tiles/StartUpTileService.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/services/tiles/StartUpTileService.kt @@ -1,55 +1,69 @@ package com.androidvip.sysctlgui.services.tiles -import android.os.Build import android.service.quicksettings.Tile import android.service.quicksettings.TileService import android.widget.Toast -import androidx.annotation.RequiresApi import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.data.utils.RootUtils import com.androidvip.sysctlgui.domain.repository.AppPrefs import com.androidvip.sysctlgui.helpers.StartUpServiceToggle -import com.topjohnwu.superuser.Shell +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.launch import org.koin.core.component.KoinComponent import org.koin.core.component.inject -@RequiresApi(Build.VERSION_CODES.N) class StartUpTileService : TileService(), KoinComponent { private val prefs: AppPrefs by inject() + private val rootUtils: RootUtils by inject() + private val serviceJob = Job() + private val serviceScope = CoroutineScope(Dispatchers.Main.immediate + serviceJob) + override fun onStartListening() { super.onStartListening() - qsTile.apply { - if (Shell.rootAccess()) { - state = if (isStartUpEnabled()) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE - } else { - state = Tile.STATE_UNAVAILABLE - label = resources.getString(R.string.tile_toggle_start_up_no_root_access_label) + serviceScope.launch { + qsTile.apply { + if (rootUtils.isRootAvailable()) { + state = if (isStartUpEnabled()) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE + } else { + state = Tile.STATE_UNAVAILABLE + label = resources.getString(R.string.tile_toggle_start_up_no_root_access_label) + } + updateTile() } - updateTile() } } override fun onClick() { super.onClick() - if (!Shell.rootAccess()) { - Toast.makeText( - this, - resources.getString(R.string.tile_toggle_start_up_no_root_access_toast), - Toast.LENGTH_LONG - ).show() - return - } + serviceScope.launch { + if (!rootUtils.isRootAvailable()) { + Toast.makeText( + this@StartUpTileService, + resources.getString(R.string.tile_toggle_start_up_no_root_access_toast), + Toast.LENGTH_LONG + ).show() + return@launch + } - toggleService(isStartUpEnabled().not()) + toggleService(isStartUpEnabled().not()) - qsTile.apply { - state = if (isStartUpEnabled()) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE - updateTile() + qsTile.apply { + state = if (isStartUpEnabled()) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE + updateTile() + } } } + override fun onDestroy() { + super.onDestroy() + serviceJob.cancel() + } + private fun isStartUpEnabled() = prefs.runOnStartUp private fun toggleService(enabled: Boolean) { diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseAppCompatActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseAppCompatActivity.kt deleted file mode 100644 index 12896ea..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseAppCompatActivity.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.androidvip.sysctlgui.ui.base - -import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity -import androidx.core.view.WindowCompat -import com.androidvip.sysctlgui.design.DesignStyles -import com.androidvip.sysctlgui.domain.repository.AppPrefs -import org.koin.android.ext.android.inject - -/** - * Base activity that uses AppCompat for theming - * TODO: Temporary until 100% compose - */ -abstract class BaseAppCompatActivity : AppCompatActivity() { - protected val prefs by inject() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - WindowCompat.setDecorFitsSystemWindows(window, false) - - if (prefs.forceDark) { - setTheme(DesignStyles.AppTheme_ForceDark) - } - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseSearchFragment.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseSearchFragment.kt deleted file mode 100644 index be07193..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseSearchFragment.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.androidvip.sysctlgui.ui.base - -import android.os.Bundle -import android.view.Menu -import android.view.MenuInflater -import android.widget.SearchView -import androidx.fragment.app.Fragment -import com.androidvip.sysctlgui.R - -abstract class BaseSearchFragment : Fragment() { - protected var searchExpression: String = "" - private var searchView: SearchView? = null - - abstract fun onQueryTextChanged() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setHasOptionsMenu(true) - } - - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - super.onCreateOptionsMenu(menu, inflater) - - inflater.inflate(R.menu.menu_search, menu) - setUpSearchView(menu) - } - - protected fun setUpSearchView(menu: Menu?) { - searchView = (menu?.findItem(R.id.action_search)?.actionView as? SearchView)?.apply { - setOnQueryTextListener( - object : - androidx.appcompat.widget.SearchView.OnQueryTextListener, - SearchView.OnQueryTextListener { - override fun onQueryTextSubmit(query: String?): Boolean { - return true - } - - override fun onQueryTextChange(newText: String?): Boolean { - searchExpression = newText.orEmpty().replace(".", "") - - this@BaseSearchFragment.onQueryTextChanged() - return true - } - } - ) - - // expand and show keyboard - isIconifiedByDefault = false - onActionViewExpanded() - } - } - - protected fun resetSearchExpression() { - searchExpression = "" - searchView?.setQuery("", false) - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseViewHolder.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseViewHolder.kt deleted file mode 100644 index 8aab4cb..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseViewHolder.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.androidvip.sysctlgui.ui.base - -import androidx.databinding.ViewDataBinding -import androidx.recyclerview.widget.RecyclerView - -abstract class BaseViewHolder( - binding: ViewDataBinding -) : RecyclerView.ViewHolder(binding.root) { - abstract fun bind(item: T, position: Int) -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/components/ErrorContainer.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/components/ErrorContainer.kt new file mode 100644 index 0000000..d1f6940 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/components/ErrorContainer.kt @@ -0,0 +1,96 @@ +package com.androidvip.sysctlgui.ui.components + +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.tween +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Close +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +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.unit.dp + +private const val ERROR_CONTAINER_ANIMATION_DURATION = 4000 + +@Composable +internal fun ErrorContainer(message: String, onAnimationEnd: () -> Unit) { + var animationStarted by remember { mutableStateOf(false) } + val progressTarget = if (animationStarted) 0f else 1f + + val progress by animateFloatAsState( + targetValue = progressTarget, + animationSpec = tween( + durationMillis = ERROR_CONTAINER_ANIMATION_DURATION, + easing = LinearEasing + ), + finishedListener = { value -> + if (value == 0f) { + onAnimationEnd() + } + } + ) + + LaunchedEffect(Unit) { animationStarted = true } + + Card( + modifier = Modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.errorContainer, + contentColor = MaterialTheme.colorScheme.onErrorContainer + ) + ) { + Box { + LinearProgressIndicator( + progress = { progress }, + modifier = Modifier + .align(Alignment.BottomCenter) + .fillMaxWidth(), + color = MaterialTheme.colorScheme.onErrorContainer, + trackColor = MaterialTheme.colorScheme.errorContainer + ) + + Row( + modifier = Modifier.padding(16.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(16.dp) + ) { + Icon( + modifier = Modifier.size(40.dp), + imageVector = Icons.Rounded.Close, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer + ) + Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + Text( + text = "Error", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onErrorContainer + ) + Text( + text = message, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onErrorContainer + ) + } + } + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/components/SingleChoiceDialog.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/components/SingleChoiceDialog.kt new file mode 100644 index 0000000..45ddb18 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/components/SingleChoiceDialog.kt @@ -0,0 +1,77 @@ +package com.androidvip.sysctlgui.ui.components + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import android.R as AndroidResources + +@Composable +fun SingleChoiceDialog( + showDialog: Boolean, + title: String, + options: List, + initialSelectedOptionIndex: Int, + onDismissRequest: () -> Unit, + onOptionSelected: (Int) -> Unit +) { + if (showDialog) { + var selectedOptionIndex by remember { mutableIntStateOf(initialSelectedOptionIndex) } + + AlertDialog( + onDismissRequest = onDismissRequest, + title = { Text(text = title) }, + text = { + Column { + options.forEachIndexed { index, option -> + Row( + modifier = Modifier + .fillMaxWidth() + .clickable { selectedOptionIndex = index } + .padding(vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically + ) { + RadioButton( + selected = (index == selectedOptionIndex), + onClick = { selectedOptionIndex = index } + ) + Text( + text = option, + modifier = Modifier.padding(start = 4.dp) + ) + } + } + } + }, + confirmButton = { + TextButton( + onClick = { + onOptionSelected(selectedOptionIndex) + onDismissRequest() + } + ) { + Text(stringResource(AndroidResources.string.ok)) + } + }, + dismissButton = { + TextButton(onClick = onDismissRequest) { + Text(stringResource(AndroidResources.string.cancel)) + } + } + ) + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsFragment.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsFragment.kt deleted file mode 100644 index 4f2a3ba..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsFragment.kt +++ /dev/null @@ -1,152 +0,0 @@ -package com.androidvip.sysctlgui.ui.export - -import android.app.Activity -import android.content.Intent -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.annotation.StringRes -import androidx.fragment.app.Fragment -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.models.SettingsItem -import com.androidvip.sysctlgui.databinding.FragmentExportOptionsBinding -import com.androidvip.sysctlgui.design.ModalBottomSheet -import com.androidvip.sysctlgui.helpers.OnSettingsItemClickedListener -import com.androidvip.sysctlgui.toast -import org.koin.androidx.viewmodel.ext.android.viewModel - -class ExportOptionsFragment : Fragment(), OnSettingsItemClickedListener { - private var _binding: FragmentExportOptionsBinding? = null - private val binding get() = _binding!! - private val viewModel: ExportOptionsViewModel by viewModel() - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - _binding = FragmentExportOptionsBinding.inflate(inflater, container, false) - return binding.root - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - val adapter = ExportOptionsItemAdapter(this) - binding.recyclerView.adapter = adapter - adapter.submitList(viewModel.getBackOptionItems()) - - observeUi() - } - - override fun onDestroyView() { - super.onDestroyView() - _binding = null - } - - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - if (resultCode != Activity.RESULT_OK) return toast(R.string.error) - - when (requestCode) { - RC_IMPORT_USER_PARAMS, - RC_RESTORE_PARAMS -> { - val uri = data?.data ?: return toast(R.string.import_error) - val extension = uri.lastPathSegment.orEmpty() - val stream = requireContext().contentResolver.openInputStream(uri) - ?: return toast(R.string.import_error) - viewModel.importParams(stream, extension) - } - - RC_EXPORT_USER_PARAMS -> { - val uri = data?.data ?: return toast(R.string.export_error) - viewModel.exportParams(uri, requireContext(), false) - } - - RC_BACKUP_PARAMS -> { - val uri = data?.data ?: return toast(R.string.export_error) - viewModel.exportParams(uri, requireContext(), true) - } - } - super.onActivityResult(requestCode, resultCode, data) - } - - override fun onSettingsItemClicked(item: SettingsItem, position: Int) { - when (position) { - 0 -> viewModel.doWhenImportUserParamsPressed() - 1 -> viewModel.doWhenExportUserParamsPressed() - 2 -> viewModel.doWhenBackupPressed() - 3 -> viewModel.doWhenRestorePressed() - } - } - - private fun observeUi() { - viewModel.viewEffect.observe(viewLifecycleOwner) { - when (it) { - is ExportOptionsViewEffect.ImportUserParams -> requestImportFile(RC_IMPORT_USER_PARAMS) - is ExportOptionsViewEffect.ExportUserParams -> requestExportFile(RC_EXPORT_USER_PARAMS) - is ExportOptionsViewEffect.RestoreRuntimeParams -> requestImportFile(RC_RESTORE_PARAMS) - is ExportOptionsViewEffect.BackupRuntimeParams -> requestExportFile(RC_BACKUP_PARAMS) - is ExportOptionsViewEffect.ShowImportError -> showErrorModal(it.messageRes) - is ExportOptionsViewEffect.ShowImportSuccess -> showSuccessModal( - getString(R.string.import_success_message, it.paramCount) - ) - is ExportOptionsViewEffect.ShowExportError -> showErrorModal(it.messageRes) - is ExportOptionsViewEffect.ShowExportSuccess -> showSuccessModal( - getString(R.string.export_success_message) - ) - } - } - - viewModel.viewState.observe(viewLifecycleOwner) { - binding.progress.visibility = if (it.isLoading) View.VISIBLE else View.GONE - binding.loadingText.visibility = if (it.isLoading) View.VISIBLE else View.GONE - binding.recyclerView.visibility = if (it.isLoading) View.GONE else View.VISIBLE - } - } - - private fun requestImportFile(requestCode: Int) { - val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply { - addCategory(Intent.CATEGORY_OPENABLE) - type = "*/*" - } - startActivityForResult(intent, requestCode) - } - - private fun requestExportFile(requestCode: Int) { - val extension = if (requestCode == RC_BACKUP_PARAMS) "conf" else "json" - val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply { - addCategory(Intent.CATEGORY_OPENABLE) - type = "*/*" - putExtra(Intent.EXTRA_TITLE, "params.$extension") - } - startActivityForResult(intent, requestCode) - } - - private fun showErrorModal(@StringRes messageRes: Int) { - ModalBottomSheet.newInstance( - getString(R.string.error), - getString(messageRes), - getString(android.R.string.ok) - ).also { - if (isAdded) it.show(childFragmentManager, "sheet") - } - } - - private fun showSuccessModal(message: String) { - ModalBottomSheet.newInstance( - getString(R.string.done), - message, - getString(android.R.string.ok) - ).also { - if (isAdded) it.show(childFragmentManager, "sheet") - } - } - - companion object { - private const val RC_IMPORT_USER_PARAMS: Int = 1 - private const val RC_EXPORT_USER_PARAMS: Int = 2 - private const val RC_BACKUP_PARAMS: Int = 3 - private const val RC_RESTORE_PARAMS: Int = 4 - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsItemAdapter.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsItemAdapter.kt deleted file mode 100644 index b031975..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsItemAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.androidvip.sysctlgui.ui.export - -import android.view.LayoutInflater -import android.view.ViewGroup -import androidx.recyclerview.widget.ListAdapter -import com.androidvip.sysctlgui.data.models.SettingsItem -import com.androidvip.sysctlgui.databinding.ListItemSettingsBinding -import com.androidvip.sysctlgui.helpers.OnSettingsItemClickedListener -import com.androidvip.sysctlgui.helpers.SettingsItemDiffCallback -import com.androidvip.sysctlgui.ui.base.BaseViewHolder - -class ExportOptionsItemAdapter( - private val itemClickedListener: OnSettingsItemClickedListener -) : ListAdapter>(SettingsItemDiffCallback) { - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HomeItemViewHolder { - val inflater = LayoutInflater.from(parent.context) - val binding = ListItemSettingsBinding.inflate( - inflater, parent, false - ) - return HomeItemViewHolder(binding) - } - - override fun onBindViewHolder(holder: BaseViewHolder<*>, position: Int) { - if (holder is HomeItemViewHolder) { - holder.bind(getItem(position), position) - } - } - - inner class HomeItemViewHolder( - private val binding: ListItemSettingsBinding - ) : BaseViewHolder(binding) { - override fun bind(item: SettingsItem, position: Int) { - binding.item = item - binding.position = position - binding.onSettingsItemClickedListener = itemClickedListener - binding.executePendingBindings() - } - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsViewEffect.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsViewEffect.kt deleted file mode 100644 index 8767785..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsViewEffect.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.androidvip.sysctlgui.ui.export - -import androidx.annotation.StringRes - -sealed interface ExportOptionsViewEffect { - object ImportUserParams : ExportOptionsViewEffect - object ExportUserParams : ExportOptionsViewEffect - - object BackupRuntimeParams : ExportOptionsViewEffect - object RestoreRuntimeParams : ExportOptionsViewEffect - - class ShowImportError(@StringRes val messageRes: Int) : ExportOptionsViewEffect - class ShowImportSuccess(val paramCount: Int) : ExportOptionsViewEffect - - class ShowExportError(@StringRes val messageRes: Int) : ExportOptionsViewEffect - object ShowExportSuccess : ExportOptionsViewEffect -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsViewModel.kt deleted file mode 100644 index 9caec46..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsViewModel.kt +++ /dev/null @@ -1,160 +0,0 @@ -package com.androidvip.sysctlgui.ui.export - -import android.content.Context -import android.net.Uri -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.models.SettingsItem -import com.androidvip.sysctlgui.domain.exceptions.EmptyFileException -import com.androidvip.sysctlgui.domain.exceptions.InvalidFileExtensionException -import com.androidvip.sysctlgui.domain.exceptions.MalformedLineException -import com.androidvip.sysctlgui.domain.exceptions.NoParameterFoundException -import com.androidvip.sysctlgui.domain.exceptions.NoValidParamException -import com.androidvip.sysctlgui.utils.ViewState -import com.androidvip.sysctlgui.domain.usecase.BackupParamsUseCase -import com.androidvip.sysctlgui.domain.usecase.ExportParamsUseCase -import com.androidvip.sysctlgui.domain.usecase.ImportParamsUseCase -import com.google.gson.JsonParseException -import com.google.gson.JsonSyntaxException -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -import java.io.IOException -import java.io.InputStream - -class ExportOptionsViewModel( - private val importParamsUseCase: ImportParamsUseCase, - private val exportParamsUseCase: ExportParamsUseCase, - private val backupParamsUseCase: BackupParamsUseCase, - private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO -) : ViewModel() { - private val _viewEffect = MutableLiveData() - internal val viewEffect: LiveData = _viewEffect - - private val _viewState = MutableLiveData>() - val viewState: LiveData> = _viewState - - fun getBackOptionItems(): List = listOf( - SettingsItem( - R.string.import_parameters, - R.string.read_from_file_sum, - R.drawable.ic_import_params - ), - SettingsItem( - R.string.export_parameters, - R.string.export_parameters_sum, - R.drawable.ic_export_params - ), - SettingsItem( - R.string.backup_parameters, - R.string.backup_parameters_sum, - R.drawable.ic_backup_params - ), - SettingsItem( - R.string.restore_parameters, - R.string.restore_parameters_sum, - R.drawable.ic_restore_params - ) - ) - - fun doWhenImportUserParamsPressed() = _viewEffect.postValue( - ExportOptionsViewEffect.ImportUserParams - ) - - fun doWhenExportUserParamsPressed() = _viewEffect.postValue( - ExportOptionsViewEffect.ExportUserParams - ) - - fun doWhenBackupPressed() = _viewEffect.postValue(ExportOptionsViewEffect.BackupRuntimeParams) - - fun doWhenRestorePressed() = _viewEffect.postValue(ExportOptionsViewEffect.RestoreRuntimeParams) - - fun importParams(stream: InputStream, fileExtension: String) = viewModelScope.launch { - _viewState.postValue(currentViewState.copyState(isLoading = true)) - - val postError: (Int) -> Unit = { - _viewEffect.postValue(ExportOptionsViewEffect.ShowImportError(it)) - } - val result = runCatching { importParamsUseCase(stream, fileExtension) } - when (result.exceptionOrNull()) { - is JsonParseException, - is JsonSyntaxException -> postError(R.string.import_error_invalid_json) - - is InvalidFileExtensionException -> postError(R.string.import_error_invalid_file_type) - - is EmptyFileException -> postError(R.string.import_error_empty_file) - - is MalformedLineException -> postError(R.string.import_error_malformed_line) - - is NoValidParamException -> postError(R.string.no_parameters_found) - - null -> { - val successfulParams = result.getOrNull().orEmpty() - _viewEffect.postValue( - ExportOptionsViewEffect.ShowImportSuccess(successfulParams.size) - ) - } - else -> postError(R.string.import_error) - } - - _viewState.postValue(currentViewState.copyState(isLoading = false)) - } - - fun exportParams(target: Uri, context: Context, backup: Boolean) = viewModelScope.launch { - _viewState.postValue(currentViewState.copyState(isLoading = true)) - - val postError: (Int) -> Unit = { - _viewEffect.postValue(ExportOptionsViewEffect.ShowExportError(it)) - } - val result = if (backup) { - backUpParamsWithFileDescriptor(target, context) - } else { - exportParamsWithFileDescriptor(target, context) - } - - result.exceptionOrNull()?.printStackTrace() - - when (result.exceptionOrNull()) { - is IOException -> postError(R.string.export_error_io) - - is NoParameterFoundException -> postError(R.string.export_error_no_param) - - is EmptyFileException -> postError(R.string.import_error_empty_file) - - null -> _viewEffect.postValue(ExportOptionsViewEffect.ShowExportSuccess) - - else -> postError(R.string.export_error) - } - - _viewState.postValue(currentViewState.copyState(isLoading = false)) - } - - private suspend fun exportParamsWithFileDescriptor( - target: Uri, - context: Context - ): Result = withContext(ioDispatcher) { - return@withContext runCatching { - context.contentResolver.openFileDescriptor(target, "w").use { - exportParamsUseCase(it!!.fileDescriptor) - } - } - } - - private suspend fun backUpParamsWithFileDescriptor( - target: Uri, - context: Context - ): Result = withContext(ioDispatcher) { - return@withContext runCatching { - context.contentResolver.openFileDescriptor(target, "w").use { - backupParamsUseCase(it!!.fileDescriptor) - } - } - } - - private val currentViewState: ViewState - get() = viewState.value ?: ViewState() -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt new file mode 100644 index 0000000..b01c59b --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt @@ -0,0 +1,90 @@ +package com.androidvip.sysctlgui.ui.main + +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.padding +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalView +import androidx.navigation.NavHostController +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import com.androidvip.sysctlgui.core.navigation.UiRoute +import com.androidvip.sysctlgui.ui.user.UserParamsScreen +import com.androidvip.sysctlgui.ui.params.browse.ParamBrowseScreen +import com.androidvip.sysctlgui.ui.params.browse.ParamBrowseScreenContentPreview +import com.androidvip.sysctlgui.ui.params.edit.EditParamScreen +import com.androidvip.sysctlgui.ui.presets.ImportPresetScreen +import com.androidvip.sysctlgui.ui.presets.PresetsScreen +import com.androidvip.sysctlgui.ui.search.SearchScreen +import com.androidvip.sysctlgui.ui.settings.SettingsScreen + +@Composable +internal fun AppNavHost(innerPadding: PaddingValues, navController: NavHostController) { + NavHost( + modifier = Modifier.padding(innerPadding), + navController = navController, + startDestination = UiRoute.BrowseParams + ) { + composable { + if (LocalView.current.isInEditMode) { + ParamBrowseScreenContentPreview() + } else { + ParamBrowseScreen( + onParamSelected = { + navController.navigate(UiRoute.EditParam(paramName = it.name)) + } + ) + } + } + + composable { + EditParamScreen(onNavigateBack = { navController.popBackStack() }) + } + + composable { + PresetsScreen( + onNavigateBack = { navController.popBackStack() }, + onNavigateToImport = { navController.navigate(UiRoute.ImportPresets) } + ) + } + + composable { + ImportPresetScreen(onNavigateBack = { navController.popBackStack() }) + } + + composable { + UserParamsScreen( + filterPredicate = { it.isFavorite }, + onParamSelected = { + navController.navigate(UiRoute.EditParam(paramName = it.name)) + } + ) + } + + composable { + SearchScreen( + onParamSelected = { + navController.navigate(UiRoute.EditParam(paramName = it.name)) + }, + onNavigateBack = { navController.popBackStack() } + ) + } + + composable { + SettingsScreen( + onNavigateToUserParams = { + navController.navigate(UiRoute.UserParams) + } + ) + } + + composable { + UserParamsScreen( + filterPredicate = { true }, + onParamSelected = { + navController.navigate(UiRoute.EditParam(paramName = it.name)) + } + ) + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt index 840b03d..d00fece 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt @@ -1,78 +1,48 @@ package com.androidvip.sysctlgui.ui.main import android.app.NotificationManager -import android.content.Context import android.os.Build import android.os.Bundle import android.os.Handler -import android.view.MenuItem +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.isSystemInDarkTheme import androidx.core.os.postDelayed -import androidx.core.view.WindowCompat -import androidx.navigation.fragment.NavHostFragment -import androidx.navigation.ui.AppBarConfiguration -import androidx.navigation.ui.setupWithNavController -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.databinding.ActivityMain2Binding -import com.androidvip.sysctlgui.helpers.Actions -import com.androidvip.sysctlgui.ui.base.BaseAppCompatActivity - -class MainActivity : BaseAppCompatActivity() { - private lateinit var binding: ActivityMain2Binding +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.domain.repository.AppPrefs +import org.koin.android.ext.android.inject +class MainActivity : ComponentActivity() { + private val prefs: AppPrefs by inject() private val notificationPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { _ -> } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - WindowCompat.setDecorFitsSystemWindows(window, false) - - binding = ActivityMain2Binding.inflate(layoutInflater) - setContentView(binding.root) - setSupportActionBar(binding.toolbar) + enableEdgeToEdge() + + setContent { + SysctlGuiTheme( + darkTheme = prefs.forceDark || isSystemInDarkTheme(), + contrastLevel = prefs.contrastLevel, + dynamicColor = prefs.dynamicColors + ) { + MainScreen() + } + } Handler(mainLooper).postDelayed(1000) { checkNotificationPermission() } - setUpNavigation() navigateFromIntent() } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - android.R.id.home -> finish() - - R.id.action_exit -> { - moveTaskToBack(true) - finish() - } - } - - return false // Let fragments have a chance to consume it - } - - override fun onSupportNavigateUp(): Boolean { - return navHost.navController.navigateUp() || super.onSupportNavigateUp() - } - - private fun setUpNavigation() = with(binding) { - val navController = navHost.navController - val defaultIds = setOf( - R.id.navigationBrowse, - R.id.navigationList, - R.id.navigationExport, - R.id.navigationSettings - ) - val appBarConfiguration = AppBarConfiguration(defaultIds) - - toolbar.setupWithNavController(navController, appBarConfiguration) - navView?.setupWithNavController(navController) - navRail?.setupWithNavController(navController) - } - private fun navigateFromIntent() { - val fragmentName = intent.getStringExtra(EXTRA_DESTINATION) ?: return + // TODO: handle intent + /*val fragmentName = intent.getStringExtra(EXTRA_DESTINATION) ?: return when (fragmentName) { Actions.BrowseParams.name -> R.id.navigationBrowse Actions.ListParams.name -> R.id.navigationList @@ -81,11 +51,11 @@ class MainActivity : BaseAppCompatActivity() { else -> null }?.let { id -> navHost.navController.navigate(id) - } + }*/ } private fun checkNotificationPermission() { - val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + val manager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return if (prefs.askedForNotificationPermission || !prefs.runOnStartUp) return if (manager.areNotificationsEnabled()) return @@ -94,9 +64,6 @@ class MainActivity : BaseAppCompatActivity() { prefs.askedForNotificationPermission = true } - private val navHost: NavHostFragment - get() = supportFragmentManager.findFragmentById(R.id.navHostFragment) as NavHostFragment - companion object { internal const val EXTRA_DESTINATION = "destination" } diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt new file mode 100644 index 0000000..8e42edb --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt @@ -0,0 +1,107 @@ +package com.androidvip.sysctlgui.ui.main + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Favorite +import androidx.compose.material.icons.filled.Home +import androidx.compose.material.icons.outlined.Build +import androidx.compose.material.icons.outlined.FavoriteBorder +import androidx.compose.material.icons.outlined.Home +import androidx.compose.material.icons.outlined.Settings +import androidx.compose.material.icons.rounded.Build +import androidx.compose.material.icons.rounded.Settings +import androidx.compose.material3.Icon +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.PreviewDynamicColors +import androidx.compose.ui.tooling.preview.PreviewLightDark +import androidx.navigation.NavDestination.Companion.hasRoute +import androidx.navigation.NavDestination.Companion.hierarchy +import androidx.navigation.NavGraph.Companion.findStartDestination +import androidx.navigation.NavHostController +import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.navigation.compose.rememberNavController +import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.core.navigation.TopLevelRoute +import com.androidvip.sysctlgui.core.navigation.UiRoute +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme + +@Composable +internal fun MainNavBar(navController: NavHostController = rememberNavController()) { + val browseParamsTitle = stringResource(R.string.browse) + val presetsTitle = stringResource(R.string.presets) + val favoritesTitle = stringResource(R.string.favorites) + val settingsTitle = stringResource(R.string.settings) + val topLevelRoutes = remember { + listOf( + TopLevelRoute( + name = browseParamsTitle, + route = UiRoute.BrowseParams, + selectedIcon = Icons.Filled.Home, + unselectedIcon = Icons.Outlined.Home + ), + TopLevelRoute( + name = presetsTitle, + route = UiRoute.Presets, + selectedIcon = Icons.Rounded.Build, + unselectedIcon = Icons.Outlined.Build + ), + TopLevelRoute( + name = favoritesTitle, + route = UiRoute.Favorites, + selectedIcon = Icons.Filled.Favorite, + unselectedIcon = Icons.Outlined.FavoriteBorder + ), + TopLevelRoute( + name = settingsTitle, + route = UiRoute.Settings, + selectedIcon = Icons.Rounded.Settings, + unselectedIcon = Icons.Outlined.Settings + ) + ) + } + + NavigationBar { + val navBackStackEntry by navController.currentBackStackEntryAsState() + val currentDestination = navBackStackEntry?.destination + + topLevelRoutes.forEach { route -> + val selected = currentDestination + ?.hierarchy + ?.any { it.hasRoute(route.route::class) } == true + + NavigationBarItem( + icon = { + Icon( + imageVector = if (selected) route.selectedIcon else route.unselectedIcon, + contentDescription = route.name, + ) + }, + label = { Text(route.name) }, + selected = selected, + onClick = { + navController.navigate(route.route) { + popUpTo(navController.graph.findStartDestination().id) { + saveState = true + } + launchSingleTop = true + restoreState = true + } + } + ) + } + } +} + +@Composable +@PreviewLightDark +@PreviewDynamicColors +private fun MainNavbarPreview() { + SysctlGuiTheme(dynamicColor = true) { + MainNavBar() + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt new file mode 100644 index 0000000..079de14 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt @@ -0,0 +1,105 @@ +package com.androidvip.sysctlgui.ui.main + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.expandVertically +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.shrinkVertically +import androidx.compose.animation.slideInVertically +import androidx.compose.animation.slideOutVertically +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SnackbarHost +import androidx.compose.material3.SnackbarHostState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.ui.tooling.preview.PreviewDynamicColors +import androidx.compose.ui.tooling.preview.PreviewLightDark +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.navigation.NavHostController +import androidx.navigation.compose.rememberNavController +import com.androidvip.sysctlgui.core.navigation.UiRoute +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import org.koin.androidx.compose.koinViewModel + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun MainScreen(viewModel: MainViewModel = koinViewModel()) { + val state by viewModel.uiState.collectAsStateWithLifecycle() + val navController = rememberNavController() + val snackbarHostState = remember { SnackbarHostState() } + + LaunchedEffect(Unit) { + viewModel.effect.collect { effect -> + if (effect is MainViewEffect.ShowSnackbar) { + val result = snackbarHostState.showSnackbar( + message = effect.message, + actionLabel = effect.actionLabel + ) + viewModel.onEvent(MainViewEvent.OnSnackbarResult(result)) + } + } + } + + MainScreenContent(state, navController, snackbarHostState) +} + +@Composable +private fun MainScreenContent( + state: MainViewState, + navController: NavHostController, + snackbarHostState: SnackbarHostState +) { + Scaffold( + topBar = { + AnimatedVisibility( + visible = state.showTopBar, + enter = expandVertically() + slideInVertically() + fadeIn(), + exit = shrinkVertically() + slideOutVertically() + fadeOut(), + label = "TopBar" + ) { + MainTopBar( + title = state.topBarTitle, + showSearch = state.showSearchAction, + showBack = state.showBackButton, + onSearchPressed = { navController.navigate(UiRoute.Search) }, + onBackPressed = { navController.popBackStack() } + ) + } + }, + bottomBar = { + AnimatedVisibility( + visible = state.showNavBar, + enter = expandVertically() + slideInVertically { it / 2 } + fadeIn(), + exit = shrinkVertically() + slideOutVertically { it / 2 } + fadeOut(), + label = "BottomBar" + ) { + MainNavBar(navController = navController) + } + }, + snackbarHost = { + SnackbarHost(snackbarHostState) + }, + content = { innerPadding -> + AppNavHost( + innerPadding = innerPadding, + navController = navController + ) + } + ) +} + +@Composable +@PreviewLightDark +@PreviewDynamicColors +private fun MainScreenPreview() { + SysctlGuiTheme(dynamicColor = true) { + MainScreenContent( + state = MainViewState(), + navController = rememberNavController(), + snackbarHostState = remember { SnackbarHostState() } + ) + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainTopBar.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainTopBar.kt new file mode 100644 index 0000000..4b214ce --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainTopBar.kt @@ -0,0 +1,75 @@ +package com.androidvip.sysctlgui.ui.main + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.expandHorizontally +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.shrinkHorizontally +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.rounded.ArrowBack +import androidx.compose.material.icons.rounded.Search +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.PreviewLightDark +import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun MainTopBar( + title: String = stringResource(R.string.app_name), + showBack: Boolean = false, + showSearch: Boolean = false, + onSearchPressed: () -> Unit, + onBackPressed: () -> Unit +) { + TopAppBar( + navigationIcon = { + AnimatedVisibility(visible = showBack) { + IconButton(onClick = onBackPressed) { + Icon( + imageVector = Icons.AutoMirrored.Rounded.ArrowBack, + contentDescription = "Back" + ) + } + } + }, + title = { + Text(title, maxLines = 1, overflow = TextOverflow.Ellipsis) + }, + actions = { + AnimatedVisibility( + visible = showSearch, + enter = expandHorizontally() + fadeIn(), + exit = shrinkHorizontally() + fadeOut() + ) { + IconButton(onClick = onSearchPressed) { + Icon( + imageVector = Icons.Rounded.Search, + contentDescription = stringResource(R.string.search) + ) + } + } + } + ) +} + +@Composable +@PreviewLightDark +private fun MainTopBarPreview() { + SysctlGuiTheme { + MainTopBar( + title = "SysctlGUI", + showBack = false, + showSearch = true, + onSearchPressed = {}, + onBackPressed = {} + ) + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewEffect.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewEffect.kt deleted file mode 100644 index e7b9ab6..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewEffect.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.androidvip.sysctlgui.ui.main - -sealed interface MainViewEffect { - object NavigateToKernelList : MainViewEffect - object NavigateToKernelBrowser : MainViewEffect - object ExportParams : MainViewEffect - object NavigateToFavorites : MainViewEffect - object NavigateToSettings : MainViewEffect -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewModel.kt index 6f5c92a..cccd608 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewModel.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewModel.kt @@ -1,41 +1,26 @@ package com.androidvip.sysctlgui.ui.main -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.ViewModel -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.models.SettingsItem - -class MainViewModel : ViewModel() { - private val _viewEffect = MutableLiveData() - val viewEffect: LiveData = _viewEffect - - fun getHomeItems(): List = listOf( - SettingsItem(R.string.show_variables, R.string.show_variables_sum, R.drawable.ic_edit_outline), - SettingsItem( - R.string.browse_variables, - R.string.browse_variables_sum, - R.drawable.ic_folder_outline - ), - SettingsItem( - R.string.export_options, - R.string.export_options_sum, - R.drawable.ic_file_import_outline - ), - SettingsItem( - R.string.show_favorites, - R.string.show_favorites_sum, - R.drawable.ic_favorite_unselected - ) - ) - - fun doWhenListPressed() = _viewEffect.postValue(MainViewEffect.NavigateToKernelList) - - fun doWhenBrowsePressed() = _viewEffect.postValue(MainViewEffect.NavigateToKernelBrowser) - - fun doWhenImportPressed() = _viewEffect.postValue(MainViewEffect.ExportParams) - - fun doWhenFavoritesPressed() = _viewEffect.postValue(MainViewEffect.NavigateToFavorites) - - fun doWhenSettingsPressed() = _viewEffect.postValue(MainViewEffect.NavigateToSettings) +import androidx.compose.material3.SnackbarResult +import com.androidvip.sysctlgui.utils.BaseViewModel + +class MainViewModel : BaseViewModel() { + + override fun createInitialState() = MainViewState() + + override fun onEvent(event: MainViewEvent) { + when (event) { + is MainViewEvent.OnSateChangeRequested -> { + setState { event.newState } + } + is MainViewEvent.ShowSnackbarRequested -> { + setEffect { MainViewEffect.ShowSnackbar(event.message, event.actionLabel) } + } + is MainViewEvent.OnSnackbarResult -> { + val snackbarResult = event.result + if (snackbarResult == SnackbarResult.ActionPerformed) { + setEffect { MainViewEffect.ActUponSckbarActionPerformed } + } + } + } + } } diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewState.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewState.kt new file mode 100644 index 0000000..da18a59 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewState.kt @@ -0,0 +1,26 @@ +package com.androidvip.sysctlgui.ui.main + +import androidx.compose.material3.SnackbarResult + +data class MainViewState( + val topBarTitle: String = "SysctlGUI", + val showTopBar: Boolean = true, + val showNavBar: Boolean = true, + val showBackButton: Boolean = false, + val showSearchAction: Boolean = true +) + +sealed interface MainViewEffect { + data class ShowSnackbar(val message: String, val actionLabel: String? = null) : MainViewEffect + data object ActUponSckbarActionPerformed : MainViewEffect +} + +sealed interface MainViewEvent { + data class OnSateChangeRequested(val newState: MainViewState) : MainViewEvent + data class ShowSnackbarRequested( + val message: String, + val actionLabel: String? = null + ) : MainViewEvent + + data class OnSnackbarResult(val result: SnackbarResult) : MainViewEvent +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/DocumentationBottomSheet.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/DocumentationBottomSheet.kt new file mode 100644 index 0000000..8ba0aab --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/DocumentationBottomSheet.kt @@ -0,0 +1,157 @@ +package com.androidvip.sysctlgui.ui.params + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.SheetState +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.rememberModalBottomSheetState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.TextLinkStyles +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.fromHtml +import androidx.compose.ui.text.style.TextDecoration +import androidx.compose.ui.tooling.preview.PreviewLightDark +import androidx.compose.ui.unit.dp +import androidx.core.text.HtmlCompat +import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.domain.models.ParamDocumentation +import com.androidvip.sysctlgui.utils.browse +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.launch +import org.intellij.lang.annotations.Language +import kotlin.text.append + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +internal fun DocumentationBottomSheet( + documentation: ParamDocumentation, + sheetState: SheetState +) { + val coroutineScope = rememberCoroutineScope() + ModalBottomSheet( + onDismissRequest = { coroutineScope.launch { sheetState.hide() } }, + sheetState = sheetState, + ) { + DocumentationBottomSheetContent( + documentation = documentation, + sheetState = sheetState + ) + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun DocumentationBottomSheetContent( + documentation: ParamDocumentation, + sheetState: SheetState, + coroutineScope: CoroutineScope = rememberCoroutineScope(), +) { + Column(modifier = Modifier.padding(24.dp)) { + val context = LocalContext.current + Text( + text = documentation.title, + style = MaterialTheme.typography.titleLarge, + color = MaterialTheme.colorScheme.onSurface + ) + + val documentationText = if (!documentation.documentationHtml.isNullOrEmpty()) { + AnnotatedString.fromHtml( + htmlString = documentation.documentationHtml.orEmpty(), + linkStyles = TextLinkStyles( + style = MaterialTheme.typography.bodyMedium.toSpanStyle().copy( + color = MaterialTheme.colorScheme.primary, + textDecoration = TextDecoration.Underline, + fontWeight = FontWeight.Medium + ), + pressedStyle = MaterialTheme.typography.bodyMedium.toSpanStyle().copy( + color = MaterialTheme.colorScheme.tertiary, + textDecoration = TextDecoration.Underline, + fontWeight = FontWeight.Medium + ) + ) + ) + } else { + AnnotatedString(documentation.documentationText) + } + Text( + text = documentationText, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface, + modifier = Modifier.padding(top = 16.dp) + ) + + if (documentation.url != null) { + TextButton( + onClick = { + context.browse(documentation.url.orEmpty()) + coroutineScope.launch { sheetState.hide() } + }, + modifier = Modifier + .align(alignment = Alignment.End) + .padding(top = 16.dp) + ) { + Icon( + painter = painterResource(R.drawable.ic_open_in_browser), + contentDescription = null, + modifier = Modifier.padding(end = 8.dp) + ) + Text(text = "Read more") + } + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +@PreviewLightDark +private fun DocumentationBottomSheetPreview() { + + @Language("HTML") + val htmlDocs = """ +

    + When BPF JIT compiler is enabled, then compiled images are unknown + addresses to the kernel, meaning they neither show up in traces nor + in /proc/kallsyms. This enables export of these addresses, which can + be used for debugging/tracing. If bpf_jit_harden is enabled, this + feature is disabled. +

    +

    Values :

    +
      +
    • 0 - disable JIT kallsyms export (default value)
      • +
    • 1 - enable JIT kallsyms export for privileged users only
      • +
    + """.trimIndent() + + val documentation = ParamDocumentation( + title = "/proc/sys/fs", + url = "https://docs.kernel.org/admin-guide/sysctl/fs.html", + documentationText = """ + The files in this directory can be used to tune and monitor miscellaneous and general + things in the operation of the Linux kernel. It is advisable to read both + documentation and source before actually making adjustments. + """.trimIndent(), + documentationHtml = htmlDocs + ) + + SysctlGuiTheme(dynamicColor = true) { + val state = rememberModalBottomSheetState() + + Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { + DocumentationBottomSheetContent(documentation = documentation, state) + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/EmptyParamsWarning.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/EmptyParamsWarning.kt deleted file mode 100644 index b63bf04..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/EmptyParamsWarning.kt +++ /dev/null @@ -1,76 +0,0 @@ -package com.androidvip.sysctlgui.ui.params - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Warning -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import com.androidvip.sysctlgui.R - -@Composable -fun EmptyParamsWarning() { - Box(modifier = Modifier.fillMaxSize()) { - Card( - modifier = Modifier - .fillMaxWidth() - .padding(24.dp), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.errorContainer - ) - ) { - Row( - modifier = Modifier.padding(24.dp), - horizontalArrangement = Arrangement.spacedBy( - 16.dp, - Alignment.CenterHorizontally - ) - ) { - Icon( - imageVector = Icons.Outlined.Warning, - contentDescription = stringResource(android.R.string.dialog_alert_title), - tint = MaterialTheme.colorScheme.onErrorContainer - ) - Column { - Text( - text = stringResource(id = R.string.error), - style = MaterialTheme.typography.bodyLarge.copy( - fontWeight = FontWeight.Medium - ), - color = MaterialTheme.colorScheme.onErrorContainer - ) - Text( - text = stringResource(id = R.string.no_parameters_found), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onErrorContainer - ) - } - } - } - } -} - -@Composable -@Preview -private fun EmptyParamsWarningPreview() { - Box(modifier = Modifier.background(Color.White)) { - EmptyParamsWarning() - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/OnParamItemClickedListener.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/OnParamItemClickedListener.kt deleted file mode 100644 index caa8b76..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/OnParamItemClickedListener.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.androidvip.sysctlgui.ui.params - -import android.view.View -import com.androidvip.sysctlgui.data.models.KernelParam - -fun interface OnParamItemClickedListener { - fun onParamItemClicked(param: KernelParam, itemLayout: View) -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/OnPopUpMenuItemSelectedListener.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/OnPopUpMenuItemSelectedListener.kt deleted file mode 100644 index 34aa6e5..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/OnPopUpMenuItemSelectedListener.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.androidvip.sysctlgui.ui.params - -import androidx.annotation.IdRes -import androidx.constraintlayout.widget.ConstraintLayout -import com.androidvip.sysctlgui.data.models.KernelParam - -interface OnPopUpMenuItemSelectedListener { - fun onPopUpMenuItemSelected( - kernelParam: KernelParam, - @IdRes itemId: Int, - removableLayout: ConstraintLayout - ) -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/BrowseParamsViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/BrowseParamsViewModel.kt deleted file mode 100644 index d92bb99..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/BrowseParamsViewModel.kt +++ /dev/null @@ -1,161 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.browse - -import androidx.lifecycle.viewModelScope -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.mapper.DomainParamMapper -import com.androidvip.sysctlgui.domain.repository.AppPrefs -import com.androidvip.sysctlgui.domain.usecase.GetParamsFromFilesUseCase -import com.androidvip.sysctlgui.utils.BaseViewModel -import com.androidvip.sysctlgui.utils.Consts -import com.topjohnwu.superuser.io.SuFile -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -import java.io.File - -class BrowseParamsViewModel( - private val getParamsFromFilesUseCase: GetParamsFromFilesUseCase, - appPrefs: AppPrefs, - private val dispatcher: CoroutineDispatcher = Dispatchers.IO -) : BaseViewModel() { - private var listFoldersFirst = true - private var searchExpression = "" - - init { - listFoldersFirst = appPrefs.listFoldersFirst - } - - override fun createInitialState(): ParamBrowserViewState = ParamBrowserViewState() - - override fun onEvent(event: ParamBrowserViewEvent) { - when (event) { - ParamBrowserViewEvent.RefreshRequested -> setPath(currentState.currentPath) - is ParamBrowserViewEvent.DirectoryChanged -> onDirectoryChanged(event.dir) - is ParamBrowserViewEvent.SearchExpressionChanged -> onSearchExpressionChanged(event.data) - is ParamBrowserViewEvent.ParamClicked -> setEffect { - ParamBrowserViewEffect.NavigateToParamDetails(DomainParamMapper.map(event.param)) - } - - ParamBrowserViewEvent.DocumentationMenuClicked -> setEffect { - ParamBrowserViewEffect.OpenDocumentationUrl(currentState.docUrl) - } - - ParamBrowserViewEvent.FavoritesMenuClicked -> setEffect { - ParamBrowserViewEffect.NavigateToFavorite - } - } - } - - private fun setPath(path: String) { - viewModelScope.launch { - loadBrowsableParamFiles(path) - } - } - - private fun onDirectoryChanged(newDir: File) { - val newPath = newDir.absolutePath - if (newPath.isEmpty() || !newPath.startsWith(Consts.PROC_SYS)) { - setEffect { ParamBrowserViewEffect.ShowToast(R.string.invalid_path) } - return - } - - setPath(newPath) - - when { - newPath.startsWith("/proc/sys/abi") -> setState { - copy( - docUrl = "https://www.kernel.org/doc/Documentation/sysctl/abi.txt", - showDocumentationMenu = true - ) - } - - newPath.startsWith("/proc/sys/fs") -> setState { - copy( - docUrl = "https://www.kernel.org/doc/Documentation/sysctl/fs.txt", - showDocumentationMenu = true - ) - } - - newPath.startsWith("/proc/sys/kernel") -> setState { - copy( - docUrl = "https://www.kernel.org/doc/Documentation/sysctl/kernel.txt", - showDocumentationMenu = true - ) - } - - newPath.startsWith("/proc/sys/net") -> setState { - copy( - docUrl = "https://www.kernel.org/doc/Documentation/sysctl/net.txt", - showDocumentationMenu = true - ) - } - - newPath.startsWith("/proc/sys/vm") -> setState { - copy( - docUrl = "https://www.kernel.org/doc/Documentation/sysctl/vm.txt", - showDocumentationMenu = true - ) - } - - else -> setState { copy(showDocumentationMenu = false) } - } - } - - private suspend fun getCurrentPathFiles(path: String) = withContext(dispatcher) { - runCatching { - val baseFile = File(path) - val file = if (baseFile.canRead()) baseFile else SuFile.open(path) - file.listFiles()?.toList() - }.getOrDefault(emptyList()) - } - - private suspend fun loadBrowsableParamFiles(path: String) { - setState { copy(isLoading = true) } - val files = getCurrentPathFiles(path).maybeDirectorySorted() - val params = getParamsFromFilesUseCase(files).map { - DomainParamMapper.map(it) - } - - setState { - copy( - currentPath = path, - isLoading = false, - data = params.filter { param -> byName(param.name, searchExpression) }, - totalData = params - ) - } - } - - private suspend fun List?.maybeDirectorySorted() = withContext(dispatcher) { - return@withContext this@maybeDirectorySorted?.run { - if (listFoldersFirst) { - sortedByDescending { it.isDirectory } - } else { - this - } - }?.toList().orEmpty() - } - - private fun onSearchExpressionChanged(expression: String) { - searchExpression = expression - - setState { - copy(data = this.totalData.filter { kernelParam -> - byName( - kernelParam.name, - searchExpression - ) - }) - } - } - - private fun byName(current: String, expected: String): Boolean { - if (expected.isEmpty()) { - return true - } - return current.lowercase() - .replace(".", "") - .contains(expected.lowercase()) - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/KernelParamBrowseFragment.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/KernelParamBrowseFragment.kt deleted file mode 100644 index 02f6406..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/KernelParamBrowseFragment.kt +++ /dev/null @@ -1,277 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.browse - -import android.annotation.SuppressLint -import android.app.Dialog -import android.os.Bundle -import android.view.LayoutInflater -import android.view.Menu -import android.view.MenuInflater -import android.view.MenuItem -import android.view.View -import android.view.ViewGroup -import android.view.Window -import android.webkit.WebChromeClient -import android.webkit.WebSettings -import android.webkit.WebView -import android.webkit.WebViewClient -import android.widget.ProgressBar -import androidx.activity.OnBackPressedCallback -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.itemsIndexed -import androidx.compose.material.ExperimentalMaterialApi -import androidx.compose.material.pullrefresh.PullRefreshIndicator -import androidx.compose.material.pullrefresh.pullRefresh -import androidx.compose.material.pullrefresh.rememberPullRefreshState -import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.MaterialTheme -import androidx.compose.runtime.Composable -import androidx.compose.runtime.SideEffect -import androidx.compose.runtime.getValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.ComposeView -import androidx.compose.ui.unit.dp -import androidx.lifecycle.compose.collectAsStateWithLifecycle -import androidx.lifecycle.lifecycleScope -import androidx.navigation.fragment.findNavController -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.models.KernelParam -import com.androidvip.sysctlgui.design.DesignIds -import com.androidvip.sysctlgui.design.DesignLayouts -import com.androidvip.sysctlgui.getColorRoles -import com.androidvip.sysctlgui.goAway -import com.androidvip.sysctlgui.show -import com.androidvip.sysctlgui.toast -import com.androidvip.sysctlgui.ui.base.BaseSearchFragment -import com.androidvip.sysctlgui.ui.params.EmptyParamsWarning -import com.androidvip.sysctlgui.ui.params.OnParamItemClickedListener -import com.androidvip.sysctlgui.ui.params.edit.EditKernelParamActivity -import com.androidvip.sysctlgui.utils.ComposeTheme -import com.androidvip.sysctlgui.utils.Consts -import kotlinx.coroutines.launch -import org.koin.android.ext.android.inject -import java.io.File - -class KernelParamBrowseFragment : BaseSearchFragment(), OnParamItemClickedListener { - private var actionBarMenu: Menu? = null - private val viewModel: BrowseParamsViewModel by inject() - private val currentPath: String get() = viewModel.currentState.currentPath - private val canGoBack: Boolean get() = currentPath != Consts.PROC_SYS - - private val onBackPressedCallback = object : OnBackPressedCallback(true) { - override fun handleOnBackPressed() { - if (canGoBack) { - onDirectoryChanged(File(currentPath).parentFile ?: File(Consts.PROC_SYS)) - } - } - } - - @OptIn(ExperimentalMaterialApi::class) - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - return ComposeView(requireContext()).apply { - setContent { - ComposeTheme { - val state by viewModel.uiState.collectAsStateWithLifecycle() - val refreshing = state.isLoading - val refreshState = rememberPullRefreshState( - refreshing = refreshing, - onRefresh = { refresh() } - ) - - actionBarMenu - ?.findItem(R.id.action_documentation) - ?.isVisible = state.showDocumentationMenu - - Box(Modifier.pullRefresh(refreshState)) { - if (state.showEmptyState) { - EmptyParamsWarning() - } else { - KernelParamsExplorer(state.data) - } - - PullRefreshIndicator( - modifier = Modifier.align(Alignment.TopCenter), - refreshing = refreshing, - state = refreshState, - backgroundColor = MaterialTheme.colorScheme.tertiaryContainer, - contentColor = MaterialTheme.colorScheme.onTertiaryContainer - ) - } - - SideEffect { onBackPressedCallback.isEnabled = canGoBack } - } - } - } - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - lifecycleScope.launch { - viewModel.onEvent(ParamBrowserViewEvent.DirectoryChanged(File(Consts.PROC_SYS))) - viewModel.effect.collect(::handleViewEffect) - } - - requireActivity().onBackPressedDispatcher.addCallback(onBackPressedCallback) - } - - override fun onStart() { - super.onStart() - refresh() - } - - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - inflater.inflate(R.menu.menu_browse_params, menu) - actionBarMenu = menu - - setUpSearchView(menu) - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - R.id.action_documentation -> { - viewModel.onEvent(ParamBrowserViewEvent.DocumentationMenuClicked) - } - R.id.action_favorites -> { - viewModel.onEvent(ParamBrowserViewEvent.FavoritesMenuClicked) - } - else -> return false - } - - return true - } - - override fun onQueryTextChanged() { - viewModel.onEvent(ParamBrowserViewEvent.SearchExpressionChanged(searchExpression)) - } - - override fun onParamItemClicked(param: KernelParam, itemLayout: View) { - viewModel.onEvent(ParamBrowserViewEvent.ParamClicked(param)) - } - - private fun onDirectoryChanged(newDir: File) { - viewModel.onEvent(ParamBrowserViewEvent.DirectoryChanged(newDir)) - resetSearchExpression() - } - - private fun handleViewEffect(viewEffect: ParamBrowserViewEffect) { - when (viewEffect) { - is ParamBrowserViewEffect.NavigateToParamDetails -> { - navigateToParamDetails(viewEffect.param) - } - is ParamBrowserViewEffect.NavigateToFavorite -> { - findNavController().navigate(R.id.navigateFavoritesParams) - } - is ParamBrowserViewEffect.OpenDocumentationUrl -> openDocumentationUrl(viewEffect.url) - is ParamBrowserViewEffect.ShowToast -> toast(viewEffect.stringRes) - } - } - - private fun navigateToParamDetails(param: KernelParam) { - startActivity(EditKernelParamActivity.getIntent(requireContext(), param)) - } - - private fun refresh() { - viewModel.onEvent(ParamBrowserViewEvent.RefreshRequested) - } - - @SuppressLint("SetJavaScriptEnabled") - private fun openDocumentationUrl(url: String) { - if (!isAdded) return - - val dialog = Dialog(requireContext()).apply { - requestWindowFeature(Window.FEATURE_NO_TITLE) - setContentView(DesignLayouts.dialog_web) - setCancelable(true) - } - - val progressBar: ProgressBar = dialog.findViewById(DesignIds.webDialogProgress) - val swipeLayout: SwipeRefreshLayout = dialog.findViewById(DesignIds.webDialogSwipeLayout) - - val webView = dialog.findViewById(DesignIds.webDialogWebView).apply { - val colorRoles = getColorRoles() - settings.apply { - javaScriptEnabled = true - cacheMode = WebSettings.LOAD_CACHE_ELSE_NETWORK - } - - loadUrl(url) - - webViewClient = object : WebViewClient() { - override fun onPageFinished(view: WebView, url: String) { - super.onPageFinished(view, url) - swipeLayout.isRefreshing = false - - val containerColorInt = colorRoles.accentContainer - val colorInt = colorRoles.onAccentContainer - - val containerColorHex = "#%06X".format(0xFFFFFF and containerColorInt) - val colorHex = "#%06X".format(0xFFFFFF and colorInt) - // Change webView background and text color to match the app theme - view.loadUrl( - """ - |javascript:( - |function() { - |document.querySelector('body').style.color='$colorHex'; - |document.querySelector('body').style.background='$containerColorHex'; - |} - |)() - """.trimMargin() - ) - } - } - - webChromeClient = object : WebChromeClient() { - override fun onProgressChanged(view: WebView, progress: Int) { - progressBar.progress = progress - if (progress == 100) { - progressBar.goAway() - swipeLayout.isRefreshing = false - } else { - progressBar.show() - } - } - } - } - - swipeLayout.apply { - val roles = getColorRoles() - setColorSchemeColors(roles.accent) - setProgressBackgroundColorSchemeColor(roles.accentContainer) - - setOnRefreshListener { webView.reload() } - } - - dialog.show() - } - - @Composable - private fun KernelParamsExplorer(params: List) { - LazyColumn { - itemsIndexed(params) { index, param -> - ParamBrowseItem( - onParamClick = { - viewModel.onEvent(ParamBrowserViewEvent.ParamClicked(param)) - }, - onDirectoryChanged = { - viewModel.onEvent(ParamBrowserViewEvent.DirectoryChanged(it)) - }, - param = param, - paramFile = File(param.path) - ) - if (index < params.lastIndex) { - HorizontalDivider( - thickness = 1.dp, - color = MaterialTheme.colorScheme.outlineVariant - ) - } - } - } - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseItem.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseItem.kt deleted file mode 100644 index 13e5349..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseItem.kt +++ /dev/null @@ -1,100 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.browse - -import androidx.compose.foundation.Canvas -import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.models.KernelParam -import com.androidvip.sysctlgui.design.theme.md_theme_light_background -import java.io.File - -@Composable -fun ParamBrowseItem( - onParamClick: (KernelParam) -> Unit, - onDirectoryChanged: (File) -> Unit, - param: KernelParam, - paramFile: File -) { - val isDir = paramFile.isDirectory - val outlineColor = MaterialTheme.colorScheme.outlineVariant - val surfaceColor = MaterialTheme.colorScheme.surfaceVariant - val tintColor = if (isDir) { - MaterialTheme.colorScheme.onSurfaceVariant - } else { - MaterialTheme.colorScheme.onSurface - } - - Box( - modifier = Modifier - .clickable { - if (isDir) onDirectoryChanged(paramFile) else onParamClick(param) - } - ) { - Row( - modifier = Modifier - .fillMaxWidth() - .padding(16.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(16.dp) - ) { - Box(contentAlignment = Alignment.Center) { - Canvas(modifier = Modifier.size(42.dp), onDraw = { - drawCircle(color = if (isDir) surfaceColor else outlineColor) - }) - - val iconResource = if (isDir) { - R.drawable.ic_folder_outline - } else { - R.drawable.ic_file_outline - } - Icon( - painter = painterResource(id = iconResource), - tint = tintColor, - contentDescription = "" - ) - } - Text( - text = param.shortName, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - color = MaterialTheme.colorScheme.onBackground, - style = if (isDir) { - MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium) - } else { - MaterialTheme.typography.bodyMedium - } - ) - } - } -} - -@Preview -@Composable -fun ParamItemPreview() { - val param = KernelParam(name = "test", value = "success") - Box(modifier = Modifier.background(md_theme_light_background)) { - ParamBrowseItem( - onParamClick = {}, - onDirectoryChanged = {}, - param = param, - paramFile = File("/") - ) - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt new file mode 100644 index 0000000..5ff042e --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt @@ -0,0 +1,313 @@ +package com.androidvip.sysctlgui.ui.params.browse + +import android.widget.Toast +import androidx.activity.compose.BackHandler +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.core.animateDpAsState +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.slideInVertically +import androidx.compose.animation.slideOutVertically +import androidx.compose.foundation.background +import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.rememberModalBottomSheetState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.style.TextDecoration +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.PreviewLightDark +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.models.ParamDocumentation +import com.androidvip.sysctlgui.models.UiKernelParam +import com.androidvip.sysctlgui.ui.main.MainViewEvent +import com.androidvip.sysctlgui.ui.main.MainViewModel +import com.androidvip.sysctlgui.ui.main.MainViewState +import com.androidvip.sysctlgui.ui.params.DocumentationBottomSheet +import com.androidvip.sysctlgui.utils.browse +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.map +import org.koin.compose.viewmodel.koinViewModel +import java.io.File + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ParamBrowseScreen( + mainViewModel: MainViewModel = koinViewModel(), + viewModel: ParamBrowseViewModel = koinViewModel(), + onParamSelected: (KernelParam) -> Unit +) { + var documentation by remember { mutableStateOf(null) } + val documentationSheetState = rememberModalBottomSheetState() + val context = LocalContext.current + val state by viewModel.uiState.collectAsStateWithLifecycle() + + LaunchedEffect(state) { + mainViewModel.onEvent( + MainViewEvent.OnSateChangeRequested( + MainViewState( + showTopBar = true, + showNavBar = true, + showBackButton = state.backEnabled, + showSearchAction = true + ) + ) + ) + } + + LaunchedEffect(viewModel.effect) { + viewModel.effect.collect { effect -> + when (effect) { + is ParamBrowseViewEffect.EditKernelParam -> onParamSelected(effect.param) + is ParamBrowseViewEffect.OpenBrowser -> context.browse(effect.url) + is ParamBrowseViewEffect.ShowError -> Toast.makeText( + context, + effect.errorMessage, + Toast.LENGTH_SHORT + ).show() + } + } + } + + ParamBrowseScreenContent( + params = state.params, + currentPath = state.currentPath, + documentation = state.documentation, + onParamClicked = { + viewModel.onEvent(ParamBrowseViewEvent.ParamClicked(it)) + }, + onDocumentationClicked = { + viewModel.onEvent(ParamBrowseViewEvent.DocumentationClicked(it)) + }, + backEnabled = state.backEnabled, + onBackPressed = { + viewModel.onEvent(ParamBrowseViewEvent.BackRequested) + } + ) + + documentation?.let { + DocumentationBottomSheet( + documentation = it, + sheetState = documentationSheetState + ) + } +} + +@Composable +private fun ParamBrowseScreenContent( + params: List, + currentPath: String, + documentation: ParamDocumentation?, + onParamClicked: (UiKernelParam) -> Unit, + onDocumentationClicked: (ParamDocumentation) -> Unit, + backEnabled: Boolean = false, + onBackPressed: () -> Unit, +) { + val listState = rememberLazyListState() + var headerVisible by remember { mutableStateOf(backEnabled) } + + BackHandler(enabled = backEnabled, onBack = onBackPressed) + + LaunchedEffect(listState) { + var previousOffset = listState.firstVisibleItemScrollOffset + var previousIndex = listState.firstVisibleItemIndex + + snapshotFlow { listState.firstVisibleItemIndex to listState.firstVisibleItemScrollOffset } + .map { (currentIndex, currentOffset) -> + when { + currentIndex > previousIndex -> false + currentIndex < previousIndex -> true + currentOffset > previousOffset -> false + currentOffset < previousOffset -> true + else -> null // No change or unable to determine (keep current state) + }.also { + previousIndex = currentIndex + previousOffset = currentOffset + } + } + .filter { it != null } + .distinctUntilChanged() + .collect { scrolledUp -> + headerVisible = scrolledUp ?: headerVisible + } + } + + val isAtTop by remember { + derivedStateOf { + listState.firstVisibleItemIndex == 0 && listState.firstVisibleItemScrollOffset == 0 + } + } + + val finalHeaderVisible = (headerVisible || isAtTop) && backEnabled + + Box(modifier = Modifier.fillMaxSize()) { + val spacerHeight by animateDpAsState(if (finalHeaderVisible) 56.dp else 0.dp) + LazyColumn( + state = listState, + modifier = Modifier.fillMaxSize() + ) { + item { Spacer(modifier = Modifier.height(spacerHeight)) } + + items( + count = params.size, + key = { index -> params[index].name } + ) { index -> + ParamFileRow( + modifier = Modifier.animateItem(), + param = params[index], + onParamClicked = onParamClicked, + ) + } + + if (documentation != null) { + item { Spacer(modifier = Modifier.height(56.dp)) } + } + } + + AnimatedVisibility( + visible = finalHeaderVisible, + enter = slideInVertically(initialOffsetY = { -it }) + fadeIn(), + exit = slideOutVertically(targetOffsetY = { -it }) + fadeOut(), + modifier = Modifier.align(Alignment.TopCenter) + ) { + InfoItem( + text = currentPath, + icon = painterResource(R.drawable.ic_arrow_upward), + onClicked = onBackPressed + ) + } + + AnimatedVisibility( + visible = finalHeaderVisible && documentation != null, + enter = slideInVertically(initialOffsetY = { it }) + fadeIn(), + exit = slideOutVertically(targetOffsetY = { it }) + fadeOut(), + modifier = Modifier.align(Alignment.BottomCenter) + ) { + InfoItem( + text = "Read documentation for \"${documentation?.title}\"", + textStyle = MaterialTheme.typography.titleSmall.copy( + textDecoration = TextDecoration.Underline, + color = MaterialTheme.colorScheme.primary + ), + icon = painterResource(R.drawable.ic_documentation), + onClicked = { onDocumentationClicked(documentation!!) } + ) + } + } +} + +@Composable +private fun InfoItem( + modifier: Modifier = Modifier, + text: String, + textStyle: TextStyle = MaterialTheme.typography.titleSmall.copy( + color = MaterialTheme.colorScheme.onSurfaceVariant + ), + icon: Painter, + onClicked: () -> Unit, +) { + val context = LocalContext.current + Row( + modifier = modifier + .fillMaxWidth() + .combinedClickable( + role = Role.Button, + onClick = onClicked, + onLongClick = { Toast.makeText(context, text, Toast.LENGTH_SHORT).show() }, + ) + .background(MaterialTheme.colorScheme.surfaceContainer) + .padding(horizontal = 16.dp, vertical = 12.dp) + .semantics(mergeDescendants = true) { this.contentDescription = text }, + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Icon( + painter = icon, + contentDescription = null, + tint = textStyle.color + ) + Text( + text = text, + style = textStyle, + maxLines = 2, + overflow = TextOverflow.MiddleEllipsis + ) + } +} + +@Composable +@PreviewLightDark +internal fun ParamBrowseScreenContentPreview() { + fun mapFilesToParams(files: Array?): List { + return files?.map { file -> + UiKernelParam( + name = file.name, + path = file.path, + value = "", + isFavorite = (0..5).random() % 2 == 0 + ) + } ?: emptyList() + } + + val root = File("/") + var currentPath by remember { mutableStateOf(root.path) } + var params by remember(currentPath) { + mutableStateOf(mapFilesToParams(File(currentPath).listFiles())) + } + + SysctlGuiTheme(dynamicColor = true) { + Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { + ParamBrowseScreenContent( + params = params, + currentPath = currentPath, + documentation = ParamDocumentation( + title = currentPath, + documentationText = "Documentation for $currentPath", + url = null + ), + onParamClicked = { + if (it.isDirectory) { + currentPath = it.path + params = mapFilesToParams(File(it.path).listFiles()) + } + }, + onDocumentationClicked = {}, + backEnabled = currentPath != root.path, + onBackPressed = { currentPath = File(currentPath).parent ?: root.path }, + ) + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseState.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseState.kt new file mode 100644 index 0000000..a141586 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseState.kt @@ -0,0 +1,23 @@ +package com.androidvip.sysctlgui.ui.params.browse + +import com.androidvip.sysctlgui.domain.models.ParamDocumentation +import com.androidvip.sysctlgui.models.UiKernelParam + +data class ParamBrowseState( + val params: List = emptyList(), + val currentPath: String = "", + val backEnabled: Boolean = false, + val documentation: ParamDocumentation? = null +) + +sealed interface ParamBrowseViewEffect { + data class OpenBrowser(val url: String) : ParamBrowseViewEffect + data class EditKernelParam(val param: UiKernelParam) : ParamBrowseViewEffect + data class ShowError(val errorMessage: String) : ParamBrowseViewEffect +} + +sealed interface ParamBrowseViewEvent { + data class ParamClicked(val param: UiKernelParam) : ParamBrowseViewEvent + data class DocumentationClicked(val docs: ParamDocumentation) : ParamBrowseViewEvent + object BackRequested : ParamBrowseViewEvent +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt new file mode 100644 index 0000000..f3b49d9 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt @@ -0,0 +1,115 @@ +package com.androidvip.sysctlgui.ui.params.browse + +import androidx.lifecycle.viewModelScope +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.repository.AppPrefs +import com.androidvip.sysctlgui.domain.usecase.GetParamDocumentationUseCase +import com.androidvip.sysctlgui.domain.usecase.GetParamsFromFilesUseCase +import com.androidvip.sysctlgui.helpers.UiKernelParamMapper +import com.androidvip.sysctlgui.models.UiKernelParam +import com.androidvip.sysctlgui.utils.BaseViewModel +import com.androidvip.sysctlgui.utils.Consts +import com.topjohnwu.superuser.nio.FileSystemManager +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.async +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.io.File + +class ParamBrowseViewModel( + private val getParamsFromFiles: GetParamsFromFilesUseCase, + private val getParamDocumentation: GetParamDocumentationUseCase, + private val appPrefs: AppPrefs, + private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO +) : BaseViewModel() { + override fun createInitialState() = ParamBrowseState() + + init { + viewModelScope.launch { + val startingDirectory = File(Consts.PROC_SYS) + val params = getParams(startingDirectory) + + setState { + copy( + params = params, + currentPath = startingDirectory.absolutePath + ) + } + } + } + + override fun onEvent(event: ParamBrowseViewEvent) { + when (event) { + is ParamBrowseViewEvent.DocumentationClicked -> setEffect { + ParamBrowseViewEffect.OpenBrowser(event.docs.url.orEmpty()) + } + + ParamBrowseViewEvent.BackRequested -> onBackRequested() + is ParamBrowseViewEvent.ParamClicked -> onParamClicked(event.param) + } + } + + private fun fetchChildParams(parentParam: UiKernelParam) { + viewModelScope.launch { + runCatching { + val newParamsDeferred = async { getParams(File(parentParam.path)) } + val directoryDocumentationDeferred = async { getParamDocumentation(parentParam) } + + val newParams = newParamsDeferred.await() + val directoryDocumentation = directoryDocumentationDeferred.await() + + setState { + copy( + params = newParams, + currentPath = parentParam.path, + backEnabled = parentParam.path != Consts.PROC_SYS, + documentation = directoryDocumentation + ) + } + }.onFailure { + setEffect { ParamBrowseViewEffect.ShowError(it.message ?: "Unknown error") } + } + } + } + + private fun fetchChildParams(parentPath: String) { + val param = KernelParam.createFromPath(parentPath, "") + fetchChildParams(UiKernelParamMapper.map(param)) + } + + private fun onParamClicked(param: UiKernelParam) { + if (param.isDirectory) { + fetchChildParams(param) + } else { + setEffect { + ParamBrowseViewEffect.EditKernelParam(param) + } + } + } + + private fun onBackRequested() { + val currentPath = currentState.currentPath + if (currentPath == Consts.PROC_SYS) return + val parentFile = File(currentPath).parentFile ?: return + + fetchChildParams(parentFile.absolutePath) + } + + private suspend fun getParams(file: File): List = withContext(ioDispatcher) { + val fileList = if (file.canRead()) { + file.listFiles()?.toList() ?: emptyList() + } else { + val rootAwareFile = FileSystemManager.getLocal().getFile(file.absolutePath) + rootAwareFile.listFiles()?.toList() ?: emptyList() + } + + val params = getParamsFromFiles(fileList).map(UiKernelParamMapper::map) + + if (appPrefs.listFoldersFirst) { + params.sortedByDescending { it.isDirectory } + } else { + params + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowserViewEffect.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowserViewEffect.kt deleted file mode 100644 index b258e95..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowserViewEffect.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.browse - -import androidx.annotation.StringRes -import com.androidvip.sysctlgui.data.models.KernelParam - -sealed class ParamBrowserViewEffect { - object NavigateToFavorite : ParamBrowserViewEffect() - class NavigateToParamDetails(val param: KernelParam) : ParamBrowserViewEffect() - class OpenDocumentationUrl(val url: String) : ParamBrowserViewEffect() - class ShowToast(@StringRes val stringRes: Int) : ParamBrowserViewEffect() -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowserViewEvent.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowserViewEvent.kt deleted file mode 100644 index ae5ea92..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowserViewEvent.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.browse - -import com.androidvip.sysctlgui.domain.models.DomainKernelParam -import java.io.File - -sealed interface ParamBrowserViewEvent { - object RefreshRequested : ParamBrowserViewEvent - class SearchExpressionChanged(val data: String) : ParamBrowserViewEvent - class ParamClicked(val param: DomainKernelParam) : ParamBrowserViewEvent - class DirectoryChanged(val dir: File) : ParamBrowserViewEvent - object DocumentationMenuClicked : ParamBrowserViewEvent - object FavoritesMenuClicked : ParamBrowserViewEvent -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowserViewState.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowserViewState.kt deleted file mode 100644 index be18a2c..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowserViewState.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.browse - -import com.androidvip.sysctlgui.data.models.KernelParam -import com.androidvip.sysctlgui.utils.Consts - -data class ParamBrowserViewState( - var data: List = listOf(), - var totalData: List = listOf(), - var isLoading: Boolean = true, - var showEmptyState: Boolean = false, - var currentPath: String = Consts.PROC_SYS, - var showDocumentationMenu: Boolean = false, - var docUrl: String = "https://www.kernel.org/doc/Documentation" -) diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamFileRow.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamFileRow.kt new file mode 100644 index 0000000..43f299c --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamFileRow.kt @@ -0,0 +1,159 @@ +package com.androidvip.sysctlgui.ui.params.browse + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight +import androidx.compose.material.icons.rounded.Favorite +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.PreviewDynamicColors +import androidx.compose.ui.tooling.preview.PreviewLightDark +import androidx.compose.ui.unit.dp +import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.models.UiKernelParam + +@Composable +fun ParamFileRow( + modifier: Modifier = Modifier, + param: UiKernelParam, + onParamClicked: (UiKernelParam) -> Unit, + showFavoriteIcon: Boolean = true, +) { + Box(modifier = Modifier.clickable { onParamClicked(param) }) { + val rowDescription = if (param.isDirectory) { + "Directory: ${param.name}" + } else { + "Parameter: ${param.name}" + } + Row( + modifier = modifier + .semantics(mergeDescendants = true) { contentDescription = rowDescription } + .padding(horizontal = 16.dp, vertical = 12.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + ParamIcon(param = param) + + Column(modifier = Modifier.weight(1f)) { + Text( + text = param.lastNameSegment, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onBackground, + fontWeight = if (param.isDirectory) FontWeight.Bold else FontWeight.Normal + ) + + if (param.value.isNotBlank() && !param.isDirectory) { + Text( + text = param.value, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + + TrailingIcon(param = param, showFavoriteIcon = showFavoriteIcon) + } + } +} + + +@Composable +private fun ParamIcon(param: UiKernelParam) { + val primaryContainerColor = MaterialTheme.colorScheme.primaryContainer + val secondaryContainerColor = MaterialTheme.colorScheme.secondaryContainer + val containerColor by remember(param.isDirectory) { + derivedStateOf { + if (param.isDirectory) primaryContainerColor else secondaryContainerColor + } + } + + val onPrimaryContainerColor = MaterialTheme.colorScheme.onPrimaryContainer + val onSecondaryContainerColor = MaterialTheme.colorScheme.onSecondaryContainer + val iconColor by remember(param.isDirectory) { + derivedStateOf { + if (param.isDirectory) onPrimaryContainerColor else onSecondaryContainerColor + } + } + + val iconId = if (param.isDirectory) R.drawable.ic_folder else R.drawable.ic_file + + Box( + modifier = Modifier + .size(42.dp) + .clip(CircleShape) + .background(containerColor), + contentAlignment = Alignment.Center + ) { + Icon( + painter = painterResource(iconId), + contentDescription = "Parameter icon", + modifier = Modifier.size(24.dp), + tint = iconColor + ) + } +} + +@Composable +private fun TrailingIcon(param: UiKernelParam, showFavoriteIcon: Boolean) { + if (param.isDirectory) { + Icon( + imageVector = Icons.AutoMirrored.Rounded.KeyboardArrowRight, + contentDescription = "Navigate do directory", + modifier = Modifier.size(24.dp), + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + } else if (param.isFavorite && showFavoriteIcon) { + Icon( + imageVector = Icons.Rounded.Favorite, + contentDescription = "Favorite", + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.size(18.dp) + ) + } +} + +@Composable +@PreviewLightDark +@PreviewDynamicColors +private fun ParamFileRowPreview() { + val param = UiKernelParam( + name = "vm.swappiness", + path = "/proc/sys/vm/swappiness", + value = "0" + ) + + SysctlGuiTheme(dynamicColor = true) { + Column(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { + ParamFileRow(param = param.copy(path = "C://"), onParamClicked = {}) + ParamFileRow(param = param.copy(path = "/home"), onParamClicked = {}) + ParamFileRow(param = param, onParamClicked = {}) + ParamFileRow(param = param.copy(isFavorite = true), onParamClicked = {}) + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamRow.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamRow.kt new file mode 100644 index 0000000..da3c96b --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamRow.kt @@ -0,0 +1,106 @@ +package com.androidvip.sysctlgui.ui.params.browse + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Favorite +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.semantics.stateDescription +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.PreviewLightDark +import androidx.compose.ui.unit.dp +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.models.UiKernelParam + +@Composable +fun ParamRow( + modifier: Modifier = Modifier, + param: UiKernelParam, + onParamClicked: (UiKernelParam) -> Unit, + showFullName: Boolean = false +) { + val rowDescription = "Parameter: ${param.name}" + val rowState = if (param.isFavorite) "Marked as favorite" else "" + + Row( + modifier = modifier + .heightIn(min = 64.dp) + .clickable { onParamClicked(param) }, + verticalAlignment = Alignment.CenterVertically + ) { + Column( + modifier = Modifier + .semantics(mergeDescendants = showFullName) { + this.contentDescription = rowDescription + this.stateDescription = rowState + } + .padding(16.dp) + .weight(1f), + verticalArrangement = Arrangement.spacedBy(2.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + text = if (showFullName) param.name else param.lastNameSegment, + modifier = Modifier.fillMaxWidth(), + maxLines = 1, + overflow = TextOverflow.Ellipsis, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onBackground, + fontWeight = FontWeight.Medium + ) + if (param.value.isNotBlank()) { + Text( + text = param.value, + modifier = Modifier.fillMaxWidth(), + maxLines = 2, + overflow = TextOverflow.Ellipsis, + color = MaterialTheme.colorScheme.onSurfaceVariant, + style = MaterialTheme.typography.bodyMedium, + ) + } + } + + if (param.isFavorite) { + Icon( + imageVector = Icons.Rounded.Favorite, + contentDescription = null, + tint = MaterialTheme.colorScheme.secondary, + modifier = Modifier + .padding(end = 16.dp) + .size(18.dp) + ) + } + } +} + +@Composable +@PreviewLightDark +private fun ParamRowPreview() { + val param = UiKernelParam( + name = "vm.swappiness", + path = "/proc/sys/vm/swappiness", + value = "0" + ) + + SysctlGuiTheme(contrastLevel = 1) { + Column(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { + ParamRow(param = param, onParamClicked = {}, showFullName = true) + ParamRow(param = param.copy(isFavorite = true), onParamClicked = {},) + } + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/ActionToggleButton.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/ActionToggleButton.kt new file mode 100644 index 0000000..3bf22ef --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/ActionToggleButton.kt @@ -0,0 +1,188 @@ +package com.androidvip.sysctlgui.ui.params.edit + +import androidx.compose.animation.AnimatedContent +import androidx.compose.animation.animateColorAsState +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateDpAsState +import androidx.compose.animation.core.spring +import androidx.compose.animation.core.tween +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.scaleIn +import androidx.compose.animation.scaleOut +import androidx.compose.animation.togetherWith +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.FloatingActionButton +import androidx.compose.material3.FloatingActionButtonDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.tooling.preview.PreviewDynamicColors +import androidx.compose.ui.tooling.preview.PreviewLightDark +import androidx.compose.ui.unit.dp +import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme + +@Composable +internal fun ActionToggleButton( + modifier: Modifier = Modifier, + isActive: Boolean, + iconOnActive: Painter, + iconOnInactive: Painter, + contentDescription: String? = null, + onToggle: (Boolean) -> Unit, +) { + val containerColor by animateColorAsState( + targetValue = if (isActive) { + MaterialTheme.colorScheme.secondary + } else { + MaterialTheme.colorScheme.background + }, + label = "FabContainerColor" + ) + + val defaultElevation by animateDpAsState( + targetValue = if (isActive) 4.dp else 2.dp, + label = "FabElevation" + ) + + FloatingActionButton( + modifier = modifier, + onClick = { onToggle(!isActive) }, + containerColor = containerColor, + elevation = FloatingActionButtonDefaults.elevation( + defaultElevation = defaultElevation, + pressedElevation = defaultElevation * 2 + ), + shape = CircleShape, + ) { + AnimatedContent( + targetState = isActive, + label = "ActionToggleButtonAnimation", + transitionSpec = { + val enterTransition = scaleIn( + animationSpec = spring( + dampingRatio = Spring.DampingRatioMediumBouncy, + stiffness = Spring.StiffnessLow + ), + initialScale = 1.25f + ) + fadeIn(animationSpec = tween(durationMillis = 200)) + + val exitTransition = scaleOut( + animationSpec = tween(durationMillis = 150), + targetScale = 1.25f + ) + fadeOut(animationSpec = tween(durationMillis = 100)) + + enterTransition togetherWith exitTransition + } + ) { isCurrentlyActive -> + val iconTint = if (isCurrentlyActive) { + MaterialTheme.colorScheme.onSecondary + } else { + MaterialTheme.colorScheme.onSurfaceVariant + } + + Icon( + painter = if (isCurrentlyActive) iconOnActive else iconOnInactive, + contentDescription = "Toggle $contentDescription", + tint = iconTint + ) + } + } +} + +@Composable +internal fun FavoriteButton( + modifier: Modifier = Modifier, + isFavorite: Boolean, + onFavoriteClick: (Boolean) -> Unit, +) { + ActionToggleButton( + modifier = modifier, + isActive = isFavorite, + iconOnActive = painterResource(R.drawable.ic_favorite), + iconOnInactive = painterResource(R.drawable.ic_favorite_outlined), + contentDescription = "favorite", + onToggle = onFavoriteClick + ) +} +@Composable +internal fun TaskerButton( + modifier: Modifier = Modifier, + isTaskerParam: Boolean, + onToggle: (Boolean) -> Unit, +) { + ActionToggleButton( + modifier = modifier, + isActive = isTaskerParam, + iconOnActive = painterResource(R.drawable.ic_tasker), + iconOnInactive = painterResource(R.drawable.ic_tasker_outlined), + contentDescription = "tasker param", + onToggle = onToggle + ) +} + +@PreviewLightDark +@Composable +private fun FavoriteButtonStatesPreview() { + SysctlGuiTheme { + Surface(color = MaterialTheme.colorScheme.background) { + Row( + modifier = Modifier.padding(16.dp), + horizontalArrangement = Arrangement.spacedBy(16.dp) + ) { + FavoriteButton( + isFavorite = false, + onFavoriteClick = {} + ) + FavoriteButton( + isFavorite = true, + onFavoriteClick = {} + ) + TaskerButton( + isTaskerParam = false, + onToggle = {} + ) + TaskerButton( + isTaskerParam = true, + onToggle = {} + ) + } + } + } +} + +@Composable +@PreviewDynamicColors +private fun FavoriteButtonInteractivePreview() { + SysctlGuiTheme(dynamicColor = true) { + Surface { + var isFavorite by remember { mutableStateOf(false) } + + Row( + modifier = Modifier.padding(16.dp), + horizontalArrangement = Arrangement.spacedBy(16.dp) + ) { + FavoriteButton( + isFavorite = isFavorite, + onFavoriteClick = { isFavorite = !isFavorite }, + ) + TaskerButton( + isTaskerParam = isFavorite, + onToggle = { isFavorite = !isFavorite } + ) + } + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditKernelParamActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditKernelParamActivity.kt deleted file mode 100644 index 459e4e1..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditKernelParamActivity.kt +++ /dev/null @@ -1,108 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.edit - -import android.app.Activity -import android.content.Context -import android.content.Intent -import android.os.Bundle -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import androidx.annotation.StringRes -import androidx.appcompat.app.AlertDialog -import androidx.lifecycle.lifecycleScope -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.models.KernelParam -import com.androidvip.sysctlgui.toast -import com.androidvip.sysctlgui.utils.ComposeTheme -import kotlinx.coroutines.launch -import org.koin.androidx.viewmodel.ext.android.viewModel - -class EditKernelParamActivity : ComponentActivity() { - private val viewModel by viewModel() - private val isEditingSavedParam: Boolean - get() = intent.getBooleanExtra(EXTRA_EDIT_SAVED_PARAM, false) - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - setContent { - ComposeTheme { - EditParamScreen(viewModel = viewModel) - } - } - - lifecycleScope.launch { - viewModel.effect.collect(::handleViewEffect) - } - - handleIntent(intent) - } - - private fun handleIntent(intent: Intent) { - val param = intent.getParcelableExtra(EXTRA_PARAM) as? KernelParam - if (param != null) { - viewModel.onEvent(EditParamViewEvent.ReceivedParam(param, this)) - } else { - finishWithInvalidParamError() - } - } - - private fun finishWithInvalidParamError() { - toast(R.string.unexpected_error) - finish() - } - - private fun handleViewEffect(effect: EditParamViewEffect) { - when (effect) { - EditParamViewEffect.NavigateBack -> onBackPressedDispatcher.onBackPressed() - EditParamViewEffect.ShowTaskerListSelection -> { - selectTaskerListAsDialog { listId -> - viewModel.onEvent(EditParamViewEvent.TaskerListSelected(listId)) - } - } - - is EditParamViewEffect.ShowApplyError -> doAfterParamNotApplied(effect.messageRes) - is EditParamViewEffect.ShowApplySuccess -> doAfterParamApplied() - } - } - - private fun selectTaskerListAsDialog(block: (Int) -> Unit) { - AlertDialog.Builder(this) - .setTitle(R.string.select_tasker_list) - .setNegativeButton(android.R.string.cancel) { _, _ -> } - .setSingleChoiceItems(R.array.tasker_lists, -1) { dialog, which -> - block(which) - dialog.dismiss() - }.also { - if (!isFinishing) { - it.show() - } - } - } - - private fun doAfterParamApplied() { - if (isEditingSavedParam) { - setResult(Activity.RESULT_OK) - toast(R.string.done) - finish() - } - } - - private fun doAfterParamNotApplied(@StringRes messageRes: Int) { - toast(messageRes) - if (isEditingSavedParam) { - setResult(Activity.RESULT_CANCELED) - finish() - } - } - - companion object { - const val EXTRA_EDIT_SAVED_PARAM = "edit_saved_param" - const val EXTRA_PARAM = "param" - - fun getIntent(context: Context, param: KernelParam): Intent { - return Intent(context, EditKernelParamActivity::class.java).apply { - putExtra(EXTRA_PARAM, param) - } - } - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt index 30b6e34..c9ee615 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt @@ -1,446 +1,592 @@ package com.androidvip.sysctlgui.ui.params.edit -import androidx.annotation.DrawableRes +import android.content.ClipData +import android.widget.Toast +import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.SizeTransform +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.slideInVertically +import androidx.compose.animation.slideOutVertically +import androidx.compose.animation.togetherWith +import androidx.compose.foundation.background +import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.widthIn -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.ArrowBack -import androidx.compose.material.icons.outlined.Check -import androidx.compose.material.icons.outlined.FavoriteBorder -import androidx.compose.material.icons.outlined.Refresh -import androidx.compose.material.icons.outlined.Warning +import androidx.compose.material.icons.rounded.Done +import androidx.compose.material.icons.rounded.Edit +import androidx.compose.material.icons.rounded.Warning +import androidx.compose.material3.AssistChip import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.ExtendedFloatingActionButton -import androidx.compose.material3.FloatingActionButtonDefaults +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton -import androidx.compose.material3.LargeFloatingActionButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField -import androidx.compose.material3.Scaffold -import androidx.compose.material3.SmallFloatingActionButton -import androidx.compose.material3.SnackbarDuration -import androidx.compose.material3.SnackbarHost -import androidx.compose.material3.SnackbarHostState -import androidx.compose.material3.SnackbarResult import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.scale +import androidx.compose.ui.platform.ClipEntry +import androidx.compose.ui.platform.LocalClipboard +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.TextLinkStyles import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.fromHtml import androidx.compose.ui.text.input.KeyboardType -import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.PreviewDynamicColors +import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp +import androidx.core.view.HapticFeedbackConstantsCompat +import androidx.core.view.ViewCompat import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.models.KernelParam +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.domain.enums.CommitMode +import com.androidvip.sysctlgui.domain.models.ParamDocumentation +import com.androidvip.sysctlgui.models.UiKernelParam +import com.androidvip.sysctlgui.ui.components.ErrorContainer +import com.androidvip.sysctlgui.ui.components.SingleChoiceDialog +import com.androidvip.sysctlgui.ui.main.MainViewEffect +import com.androidvip.sysctlgui.ui.main.MainViewEvent +import com.androidvip.sysctlgui.ui.main.MainViewModel +import com.androidvip.sysctlgui.ui.main.MainViewState +import com.androidvip.sysctlgui.utils.Consts +import com.androidvip.sysctlgui.utils.browse +import com.androidvip.sysctlgui.utils.performHapticFeedbackForToggle +import kotlinx.coroutines.launch +import org.intellij.lang.annotations.Language +import org.koin.androidx.compose.koinViewModel -@OptIn(ExperimentalMaterial3Api::class) @Composable -fun EditParamScreen(viewModel: EditParamViewModel) { - val state by viewModel.uiState.collectAsStateWithLifecycle() - val snackbarHostState = remember { SnackbarHostState() } - val listState = rememberLazyListState() - val expandedFabState = remember { - derivedStateOf { - listState.firstVisibleItemIndex == 0 - } +fun EditParamScreen( + viewModel: EditParamViewModel = koinViewModel(), + mainViewModel: MainViewModel = koinViewModel(), + onNavigateBack: () -> Unit +) { + val context = LocalContext.current + val state = viewModel.uiState.collectAsStateWithLifecycle() + val taskerListOptions = listOf("Primary", "Secondary") + var showSelectTaskerListDialog by rememberSaveable { mutableStateOf(true) } + var selectedOptionIndex by rememberSaveable { + mutableIntStateOf(Consts.LIST_NUMBER_PRIMARY_TASKER) } + var errorMessage by rememberSaveable { mutableStateOf("") } + var showError by rememberSaveable { mutableStateOf(false) } - Scaffold( - topBar = { - TopAppBar( - title = { Text(text = stringResource(id = R.string.edit_params)) }, - navigationIcon = { - IconButton(onClick = { viewModel.onEvent(EditParamViewEvent.BackPressed) }) { - Icon( - imageVector = Icons.Outlined.ArrowBack, - contentDescription = stringResource(id = R.string.restore_param), - tint = MaterialTheme.colorScheme.onPrimaryContainer - ) - } - } - ) - }, - snackbarHost = { SnackbarHost(snackbarHostState) }, - floatingActionButton = { - FloatingActionButtonColumn( - onReset = { viewModel.onEvent(EditParamViewEvent.ResetPressed) }, - onApply = { viewModel.onEvent(EditParamViewEvent.ApplyPressed) }, - hasApplied = state.hasApplied, - expanded = expandedFabState.value - ) - } - ) { contentPadding -> - LazyColumn( - modifier = Modifier - .fillMaxSize() - .padding(contentPadding), - state = listState - ) { - item { ParamTexts(param = state.param) } - item { - ParamValues( - param = state.param, - appliedValue = state.restoreValue, - keyboardType = state.keyboardType, - singleLine = state.singleLine, - onValueChange = { - viewModel.onEvent(EditParamViewEvent.ParamValueInputChanged(it)) - } - ) - } - item { - ParamActions( - onFavoriteClicked = { - viewModel.onEvent(EditParamViewEvent.FavoritePressed(state.param.favorite)) - }, - onTaskerClicked = { viewModel.onEvent(EditParamViewEvent.TaskerPressed) }, - param = state.param, - taskerAvailable = state.taskerAvailable + LaunchedEffect(Unit) { + mainViewModel.onEvent( + MainViewEvent.OnSateChangeRequested( + MainViewState( + topBarTitle = "Edit kernel parameter", + showTopBar = true, + showNavBar = false, + showBackButton = true, + showSearchAction = false ) + ) + ) + + mainViewModel.effect.collect { effect -> + if (effect is MainViewEffect.ActUponSckbarActionPerformed) { + viewModel.onEvent(EditParamViewEvent.UndoRequested) } - item { ParamDocs(info = state.paramInfo) } } } - val successMessage = stringResource(id = R.string.done) - val undoMessage = stringResource(id = R.string.undo) - LaunchedEffect(key1 = Unit) { + LaunchedEffect(viewModel.effect) { viewModel.effect.collect { effect -> when (effect) { + EditParamViewEffect.GoBack -> onNavigateBack() + + is EditParamViewEffect.ShowError -> { + errorMessage = effect.message + showError = true + } + + is EditParamViewEffect.OpenBrowser -> context.browse(effect.url) + is EditParamViewEffect.ShowApplySuccess -> { - val result = snackbarHostState.showSnackbar( - message = successMessage, - actionLabel = undoMessage, - duration = SnackbarDuration.Short + mainViewModel.onEvent( + MainViewEvent.ShowSnackbarRequested( + message = "Value applied successfully", + actionLabel = "Undo" + ) ) - - if (result == SnackbarResult.ActionPerformed) { - viewModel.onEvent(EditParamViewEvent.ResetPressed) - } } - else -> Unit } } } + + EditParamContent( + state = state.value, + showError = showError, + errorMessage = errorMessage, + onValueApply = { + viewModel.onEvent(EditParamViewEvent.ApplyPressed(it)) + }, + onTaskerClicked = { + viewModel.onEvent(EditParamViewEvent.TaskerTogglePressed(it, selectedOptionIndex)) + }, + onDocsReadMorePressed = { + viewModel.onEvent(EditParamViewEvent.DocumentationReadMoreClicked) + }, + onFavoriteToggle = { + viewModel.onEvent(EditParamViewEvent.FavoriteTogglePressed(it)) + }, + onErrorAnimationEnd = { showError = false }, + taskerListNameResolver = { listId -> taskerListOptions.getOrNull(listId).orEmpty() } + ) + + SingleChoiceDialog( + showDialog = showSelectTaskerListDialog, + title = "Choose a Tasker list", + options = taskerListOptions, + initialSelectedOptionIndex = selectedOptionIndex, + onDismissRequest = { showSelectTaskerListDialog = false }, + onOptionSelected = { + selectedOptionIndex = it + viewModel.onEvent(EditParamViewEvent.TaskerTogglePressed(true, it)) + } + ) } @Composable -private fun FloatingActionButtonColumn( - onReset: () -> Unit, - onApply: () -> Unit, - hasApplied: Boolean, - expanded: Boolean +private fun EditParamContent( + state: EditParamViewState, + showError: Boolean, + errorMessage: String, + onDocsReadMorePressed: () -> Unit, + onValueApply: (String) -> Unit, + onFavoriteToggle: (Boolean) -> Unit, + onTaskerClicked: (Boolean) -> Unit, + onErrorAnimationEnd: () -> Unit, + taskerListNameResolver: (Int) -> String = { "List #$it" }, ) { + val param = state.kernelParam + val view = LocalView.current + val context = LocalContext.current + val coroutineScope = rememberCoroutineScope() + val clipboardManager = LocalClipboard.current + val scrollState = rememberScrollState() + + val copyParamContentToClipboard = { + val clipData = ClipData.newPlainText( + "Kernel Parameter", + "${param.lastNameSegment}=${param.value} (${param.path})" + ) + val clipEntry = ClipEntry(clipData) + coroutineScope.launch { + clipboardManager.setClipEntry(clipEntry) + } + Toast.makeText(context, "Copied to clipboard", Toast.LENGTH_SHORT).show() + } + Column( - verticalArrangement = Arrangement.spacedBy(12.dp), - horizontalAlignment = Alignment.End, - modifier = Modifier.padding(bottom = 8.dp) + modifier = Modifier + .fillMaxSize() + .verticalScroll(scrollState) + .background(MaterialTheme.colorScheme.surfaceContainer) ) { - AnimatedVisibility(hasApplied) { - SmallFloatingActionButton( - onClick = onReset, - containerColor = MaterialTheme.colorScheme.tertiaryContainer, - contentColor = MaterialTheme.colorScheme.onTertiaryContainer + Column( + modifier = Modifier + .fillMaxWidth() + .background(MaterialTheme.colorScheme.background) + ) { + Text( + text = param.lastNameSegment, + style = MaterialTheme.typography.displayLarge, + modifier = Modifier + .combinedClickable( + enabled = true, + onClick = { + Toast.makeText(context, "Long press to copy", Toast.LENGTH_SHORT).show() + }, + onLongClick = copyParamContentToClipboard + ) + .padding(start = 16.dp, end = 16.dp, top = 64.dp), + maxLines = 3, + color = MaterialTheme.colorScheme.onBackground, + overflow = TextOverflow.Ellipsis + ) + + Row( + modifier = Modifier.padding( + horizontal = 16.dp, + vertical = if (param.isTaskerParam) 0.dp else 24.dp + ), + verticalAlignment = Alignment.CenterVertically ) { - Icon( - imageVector = Icons.Outlined.Refresh, - contentDescription = stringResource(id = R.string.restore_param), - tint = MaterialTheme.colorScheme.onTertiaryContainer + Column(modifier = Modifier.weight(1f)) { + Text( + text = param.name, + style = MaterialTheme.typography.titleMedium, + modifier = Modifier.padding(vertical = 8.dp), + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + + Text( + text = param.path, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + + Spacer(modifier = Modifier.width(8.dp)) + + if (state.taskerAvailable) { + TaskerButton( + isTaskerParam = param.isTaskerParam, + onToggle = { newState -> + performHapticFeedbackForToggle(newState, view) + onTaskerClicked(newState) + }, + modifier = Modifier.scale(0.85f) + ) + } + + FavoriteButton( + isFavorite = param.isFavorite, + onFavoriteClick = { newState -> + performHapticFeedbackForToggle(newState, view) + onFavoriteToggle(newState) + }, + modifier = Modifier.scale(0.85f) ) } - } - ExtendedFloatingActionButton( - text = { - Text( - text = stringResource(id = R.string.apply_param), - color = MaterialTheme.colorScheme.onSecondaryContainer, - fontWeight = FontWeight.Medium - ) - }, - icon = { - Icon( - imageVector = Icons.Outlined.Check, - contentDescription = stringResource(id = R.string.apply_param), - tint = MaterialTheme.colorScheme.onSecondaryContainer + if (param.isTaskerParam && state.taskerAvailable) { + val listName = taskerListNameResolver(param.taskerList) + AssistChip( + onClick = { onTaskerClicked(true) }, + modifier = Modifier.padding(16.dp), + label = { Text(text = "Tasker list: $listName") }, + leadingIcon = { + Icon( + painter = painterResource(R.drawable.ic_tasker), + contentDescription = "Tasker list", + tint = MaterialTheme.colorScheme.tertiary + ) + } ) - }, - onClick = onApply, - expanded = expanded, - containerColor = MaterialTheme.colorScheme.secondaryContainer + } + } + + ParamValueContent( + modifier = Modifier.padding(16.dp), + param = param, + keyboardType = state.keyboardType, + onValueApply = onValueApply + ) + + AnimatedVisibility( + visible = showError && errorMessage.isNotEmpty(), + modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 16.dp) + ) { + ErrorContainer(message = errorMessage, onAnimationEnd = onErrorAnimationEnd) + } + + ParamDocs( + modifier = Modifier.padding(16.dp), + documentation = state.documentation, + onReadMorePressed = onDocsReadMorePressed ) } } @Composable -private fun ParamTexts(param: KernelParam) { - Card( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 16.dp, vertical = 8.dp) +private fun ParamValueContent( + modifier: Modifier = Modifier, + param: UiKernelParam, + keyboardType: KeyboardType, + onValueApply: (String) -> Unit +) { + var isEditing by remember { mutableStateOf(false) } + var editedValue by remember(param.value) { mutableStateOf(param.value) } + val view = LocalView.current + + HorizontalDivider() + + Row( + modifier = modifier, + verticalAlignment = Alignment.CenterVertically ) { - Column(modifier = Modifier.padding(16.dp)) { + Column(modifier = Modifier.weight(1f)) { Text( - text = stringResource(id = R.string.param), - style = MaterialTheme.typography.headlineMedium, - color = MaterialTheme.colorScheme.onSurface + text = "Parameter value", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onBackground ) - ParamRow(iconRes = R.drawable.ic_config, text = param.configName) - ParamRow(iconRes = R.drawable.ic_name, text = param.shortName) - ParamRow(iconRes = R.drawable.ic_folder_outline, text = param.path) + EditableParamValue( + isEditing = isEditing, + paramValue = param.value, + editedValue = editedValue, + keyboardType = keyboardType, + onEditorValueChange = { editedValue = it }, + modifier = Modifier + .padding(top = 8.dp) + .fillMaxWidth() + ) + } + + IconButton( + onClick = { + if (isEditing) { + onValueApply(editedValue) + ViewCompat.performHapticFeedback(view, HapticFeedbackConstantsCompat.CONFIRM) + } + isEditing = !isEditing + } + ) { + AnimatedContent( + targetState = isEditing, + label = "EditButtonAnimation", + ) { editingActive -> + if (editingActive) { + Icon( + imageVector = Icons.Rounded.Done, + contentDescription = "Apply", + tint = MaterialTheme.colorScheme.primary + ) + } else { + Icon( + imageVector = Icons.Rounded.Edit, + contentDescription = "Edit", + tint = MaterialTheme.colorScheme.primary + ) + } + } } } } @Composable -private fun ParamRow(@DrawableRes iconRes: Int, text: String) { - Row( - modifier = Modifier.padding(top = 16.dp, start = 16.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(24.dp) - ) { - Icon( - painter = painterResource(id = iconRes), - contentDescription = "", - tint = MaterialTheme.colorScheme.onSurface, - modifier = Modifier.size(24.dp) - ) - Text( - text = text, - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.onSurface - ) +fun EditableParamValue( + isEditing: Boolean, + paramValue: String, + editedValue: String, + keyboardType: KeyboardType = KeyboardType.Text, + onEditorValueChange: (String) -> Unit, + modifier: Modifier = Modifier +) { + Box(modifier = modifier) { + AnimatedContent( + targetState = isEditing, + label = "EditableValueAnimation", + transitionSpec = { + if (targetState) { + slideInVertically { it } + fadeIn() togetherWith + slideOutVertically { -it } + fadeOut() + } else { + slideInVertically { -it } + fadeIn() togetherWith + slideOutVertically { it } + fadeOut() + }.using( + SizeTransform(clip = true) + ) + } + ) { editingActive -> + if (editingActive) { + OutlinedTextField( + value = editedValue, + onValueChange = onEditorValueChange, + label = { Text("New value") }, + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = keyboardType), + modifier = Modifier.fillMaxWidth() + ) + } else { + Text( + text = paramValue, + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.fillMaxWidth() + ) + } + } } } @Composable -private fun ParamValues( - param: KernelParam, - onValueChange: (String) -> Unit, - appliedValue: String, - keyboardType: KeyboardType, - singleLine: Boolean +private fun ParamDocs( + modifier: Modifier = Modifier, + documentation: ParamDocumentation?, + onReadMorePressed: () -> Unit, ) { - var typedValue by rememberSaveable { mutableStateOf(param.value) } - - Column(modifier = Modifier.padding(16.dp)) { - Text( - text = stringResource(id = R.string.value), - style = MaterialTheme.typography.headlineMedium, - color = MaterialTheme.colorScheme.onBackground - ) + HorizontalDivider() + Column(modifier = modifier) { Text( - modifier = Modifier.padding(top = 16.dp), - text = stringResource(id = R.string.current_value), + text = "Documentation", style = MaterialTheme.typography.titleMedium, color = MaterialTheme.colorScheme.onBackground ) - OutlinedTextField( - modifier = Modifier - .fillMaxWidth() - .padding(top = 8.dp), - textStyle = MaterialTheme.typography.bodyLarge.copy( - color = MaterialTheme.colorScheme.onBackground - ), - keyboardOptions = KeyboardOptions( - keyboardType = keyboardType, - imeAction = ImeAction.Done - ), - maxLines = 3, - singleLine = singleLine, - value = typedValue, - onValueChange = { typedValue = it; onValueChange(it) } - ) - Text( - modifier = Modifier.padding(top = 16.dp), - text = stringResource(id = R.string.last_applied_value), - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.onBackground - ) - SelectionContainer { - Text( - text = appliedValue, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onBackground - ) - } - } -} + if (documentation != null) { + val documentationText = if (!documentation.documentationHtml.isNullOrEmpty()) { + AnnotatedString.fromHtml( + htmlString = documentation.documentationHtml.orEmpty(), + linkStyles = TextLinkStyles( + style = MaterialTheme.typography.bodyMedium.toSpanStyle().copy( + color = MaterialTheme.colorScheme.primary, + textDecoration = TextDecoration.Underline, + fontWeight = FontWeight.Medium + ), + pressedStyle = MaterialTheme.typography.bodyMedium.toSpanStyle().copy( + color = MaterialTheme.colorScheme.tertiary, + textDecoration = TextDecoration.Underline, + fontWeight = FontWeight.Medium + ) + ) + ) + } else { + AnnotatedString(documentation.documentationText) + } -@Composable -private fun ParamActions( - onFavoriteClicked: () -> Unit, - onTaskerClicked: () -> Unit, - param: KernelParam, - taskerAvailable: Boolean -) { - Row( - modifier = Modifier - .fillMaxWidth() - .padding(16.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(24.dp, Alignment.CenterHorizontally) - ) { - Column( - horizontalAlignment = Alignment.CenterHorizontally - ) { - LargeFloatingActionButton( - modifier = Modifier.size(74.dp), - onClick = onFavoriteClicked, - containerColor = if (param.favorite) { - MaterialTheme.colorScheme.errorContainer - } else { - MaterialTheme.colorScheme.outlineVariant - }, - contentColor = if (param.favorite) { - MaterialTheme.colorScheme.onErrorContainer - } else { - MaterialTheme.colorScheme.outline - }, - elevation = FloatingActionButtonDefaults.elevation(defaultElevation = 0.dp) - ) { - Icon( - imageVector = Icons.Outlined.FavoriteBorder, - contentDescription = stringResource(id = R.string.set_favorite) + SelectionContainer { + Text( + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 8.dp), + text = documentationText, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant ) } - Text( + TextButton( + onClick = onReadMorePressed, modifier = Modifier - .widthIn(max = 82.dp) - .padding(top = 2.dp), - text = if (param.favorite) { - stringResource(id = R.string.remove_from_favorites) - } else { - stringResource(id = R.string.set_favorite) - }, - textAlign = TextAlign.Center, - style = MaterialTheme.typography.bodyMedium, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - color = MaterialTheme.colorScheme.onBackground - ) - } - - if (taskerAvailable) { - Column( - horizontalAlignment = Alignment.CenterHorizontally + .padding(vertical = 8.dp) + .align(Alignment.End) ) { - LargeFloatingActionButton( - modifier = Modifier.size(74.dp), - onClick = onTaskerClicked, - containerColor = if (param.taskerParam) { - MaterialTheme.colorScheme.primaryContainer - } else { - MaterialTheme.colorScheme.outlineVariant - }, - contentColor = if (param.taskerParam) { - MaterialTheme.colorScheme.onPrimaryContainer - } else { - MaterialTheme.colorScheme.outline - }, - elevation = FloatingActionButtonDefaults.elevation(defaultElevation = 0.dp) + Text(text = "Read more") + } + } else { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(24.dp), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.errorContainer + ) + ) { + Row( + modifier = Modifier.padding(24.dp), + horizontalArrangement = Arrangement.spacedBy( + 16.dp, + Alignment.CenterHorizontally + ) ) { Icon( - painter = painterResource(id = R.drawable.ic_action_tasker), - contentDescription = stringResource(id = R.string.set_favorite), - tint = MaterialTheme.colorScheme.onPrimaryContainer + imageVector = Icons.Rounded.Warning, + contentDescription = stringResource(android.R.string.dialog_alert_title), + tint = MaterialTheme.colorScheme.onErrorContainer + ) + Text( + text = "No documentation available", + style = MaterialTheme.typography.bodyLarge.copy(), + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.onErrorContainer ) } - Text( - modifier = Modifier - .widthIn(max = 82.dp) - .padding(top = 2.dp), - text = if (param.taskerParam) { - stringResource(id = R.string.remove_from_tasker_list) - } else { - stringResource(id = R.string.add_to_tasker_list) - }, - textAlign = TextAlign.Center, - style = MaterialTheme.typography.bodyMedium, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - color = MaterialTheme.colorScheme.onBackground - ) } } } } @Composable -private fun ParamDocs(info: String?) { - Text( - modifier = Modifier.padding(top = 16.dp, bottom = 0.dp, start = 16.dp, end = 16.dp), - text = stringResource(id = R.string.information), - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.onBackground - ) +@PreviewLightDark +@PreviewDynamicColors +private fun EditParamContentPreview() { - if (info != null) { - SelectionContainer { - Text( - modifier = Modifier.padding(top = 4.dp, bottom = 16.dp, start = 16.dp, end = 16.dp), - text = info, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onBackground + @Language("html") + val htmlDocs = """ +

    Correctable memory errors are very common on servers. + Soft-offline is kernel’s solution for memory pages having + (excessive) corrected memory errors.

    + +

    For different types_of page, soft-offline has different behaviors / costs.

    +
      +
    • For a raw error page, soft-offline migrates the in-use page’s content to a new raw page.
      • +
    • For a page that is part of a transparent hugepage, soft-offline splits the transparent hugepage into raw pages, then migrates only the raw error page. As a result, user is transparently backed by 1 less hugepage, impacting memory access performance.
      • +
    • For a page that is part of a HugeTLB hugepage, soft-offline first migrates the entire HugeTLB hugepage, during which a free hugepage will be consumed as migration target. Then the original hugepage is dissolved into raw pages without compensation, reducing the capacity of the HugeTLB pool by 1.
      • +
    • It is user’s call to choose between reliability (staying away from fragile physical memory) vs performance / capacity implications in transparent and HugeTLB cases.
      • +
    + """.trimIndent() + .replace( + "", + "" + ) + .replace("", "") + + var showError by remember { mutableStateOf(true) } + + SysctlGuiTheme(dynamicColor = true) { + Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { + + val state = EditParamViewState( + kernelParam = UiKernelParam( + name = "vm.enable_soft_offline", + path = "/proc/sys/vm/enable_soft_offline", + value = "1", + taskerList = 1, + isTaskerParam = false, + isFavorite = false + ), + taskerAvailable = true, + keyboardType = KeyboardType.Number, + documentation = ParamDocumentation( + title = "vm.enable_soft_offline", + documentationText = "", + documentationHtml = htmlDocs, + url = "url" + ), ) - } - } else { - Card( - modifier = Modifier - .fillMaxWidth() - .padding(24.dp), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.errorContainer + EditParamContent( + state = state, + showError = showError, + errorMessage = "Sysctl command for 'wm.swappiness' executed, " + + "but output did not confirm the change. Output: 'Access denied'. " + + "Try using '${CommitMode.ECHO}' mode.", + onValueApply = {}, + onTaskerClicked = {}, + onDocsReadMorePressed = {}, + onFavoriteToggle = {}, + onErrorAnimationEnd = { showError = false } ) - ) { - Row( - modifier = Modifier.padding(24.dp), - horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterHorizontally) - ) { - Icon( - imageVector = Icons.Outlined.Warning, - contentDescription = stringResource(android.R.string.dialog_alert_title), - tint = MaterialTheme.colorScheme.onErrorContainer - ) - Text( - text = stringResource(id = R.string.no_info_available), - style = MaterialTheme.typography.bodyLarge.copy( - fontWeight = FontWeight.Medium - ), - color = MaterialTheme.colorScheme.onErrorContainer - ) - } } } } diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewEffect.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewEffect.kt deleted file mode 100644 index 9e1c327..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewEffect.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.edit - -import androidx.annotation.StringRes - -sealed interface EditParamViewEffect { - class ShowApplyError(@StringRes val messageRes: Int) : EditParamViewEffect - object ShowApplySuccess : EditParamViewEffect - object NavigateBack : EditParamViewEffect - object ShowTaskerListSelection : EditParamViewEffect -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewEvent.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewEvent.kt deleted file mode 100644 index b289d50..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewEvent.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.edit - -import android.content.Context -import com.androidvip.sysctlgui.data.models.KernelParam - -sealed interface EditParamViewEvent { - class ReceivedParam(val param: KernelParam, val context: Context) : EditParamViewEvent - object BackPressed : EditParamViewEvent - class FavoritePressed(val favorite: Boolean) : EditParamViewEvent - object TaskerPressed : EditParamViewEvent - object ApplyPressed : EditParamViewEvent - object ResetPressed : EditParamViewEvent - class TaskerListSelected(val listId: Int) : EditParamViewEvent - class ParamValueInputChanged(val newValue: String) : EditParamViewEvent -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt index 44e5713..d8cb6ea 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt @@ -1,202 +1,141 @@ package com.androidvip.sysctlgui.ui.params.edit -import android.annotation.SuppressLint -import android.content.Context -import android.content.pm.PackageManager -import android.os.Build +import android.util.Log import androidx.compose.ui.text.input.KeyboardType +import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.models.KernelParam -import com.androidvip.sysctlgui.domain.exceptions.ApplyValueException -import com.androidvip.sysctlgui.domain.exceptions.CommitModeException import com.androidvip.sysctlgui.domain.repository.AppPrefs -import com.androidvip.sysctlgui.domain.usecase.ApplyParamsUseCase -import com.androidvip.sysctlgui.domain.usecase.UpdateUserParamUseCase -import com.androidvip.sysctlgui.readLines +import com.androidvip.sysctlgui.domain.usecase.ApplyParamUseCase +import com.androidvip.sysctlgui.domain.usecase.GetParamDocumentationUseCase +import com.androidvip.sysctlgui.domain.usecase.GetRuntimeParamUseCase +import com.androidvip.sysctlgui.domain.usecase.GetUserParamByNameUseCase +import com.androidvip.sysctlgui.domain.usecase.IsTaskerInstalledUseCase +import com.androidvip.sysctlgui.domain.usecase.UpsertUserParamUseCase +import com.androidvip.sysctlgui.helpers.UiKernelParamMapper +import com.androidvip.sysctlgui.models.UiKernelParam import com.androidvip.sysctlgui.utils.BaseViewModel -import java.io.InputStream import kotlinx.coroutines.launch class EditParamViewModel( - private val prefs: AppPrefs, - private val applyParams: ApplyParamsUseCase, - private val updateUserParam: UpdateUserParamUseCase + savedStateHandle: SavedStateHandle, + private val applyParam: ApplyParamUseCase, + private val getDocumentation: GetParamDocumentationUseCase, + private val upsertUserParam: UpsertUserParamUseCase, + private val getRuntimeParam: GetRuntimeParamUseCase, + private val getUserParam: GetUserParamByNameUseCase, + private val isTaskerInstalled: IsTaskerInstalledUseCase, + private val appPrefs: AppPrefs ) : BaseViewModel() { - override fun createInitialState(): EditParamViewState = EditParamViewState() + private val paramName: String? = savedStateHandle.get(PARAM_NAME_KEY) + private var previousKernelParamValue: String? = null - override fun onEvent(event: EditParamViewEvent) { - when (event) { - EditParamViewEvent.ApplyPressed -> { - applyParam(currentState.param.copy(value = currentState.typedValue)) - } - EditParamViewEvent.BackPressed -> { - setEffect { EditParamViewEffect.NavigateBack } - } - is EditParamViewEvent.FavoritePressed -> { - updateParam(currentState.param.copy(favorite = !currentState.param.favorite)) - } - is EditParamViewEvent.TaskerListSelected -> { - updateParam(currentState.param.copy(taskerList = event.listId, taskerParam = true)) - } - is EditParamViewEvent.ParamValueInputChanged -> { - setState { copy(typedValue = event.newValue) } - } - is EditParamViewEvent.ReceivedParam -> { - setInitialState(event.param, event.context) - } - EditParamViewEvent.ResetPressed -> { - applyParam(currentState.param.copy(value = currentState.restoreValue)) - } - EditParamViewEvent.TaskerPressed -> { - setEffect { EditParamViewEffect.ShowTaskerListSelection } + init { + viewModelScope.launch { + if (paramName.isNullOrEmpty()) return@launch setEffect { EditParamViewEffect.GoBack } + + val param = runCatching { getUserParam(paramName) }.getOrNull() + ?: getRuntimeParam(paramName) + ?: return@launch setEffect { EditParamViewEffect.GoBack } + + val documentation = getDocumentation(param) + + setState { + copy( + kernelParam = UiKernelParamMapper.map(param), + taskerAvailable = isTaskerInstalled(), + keyboardType = guessKeyboardType(param.value), + documentation = documentation, + ) } } } - private fun setInitialState(param: KernelParam, context: Context) { - val keyboardType = getKeyboardTypeForValue(param.value) - val singleLine = keyboardType != KeyboardType.Text || - param.value.length <= PARAM_LENGTH_INPUT_THRESHOLD + override fun createInitialState() = EditParamViewState() - setState { - copy( - param = param, - restoreValue = param.value, - typedValue = param.value, - paramInfo = findParamInfo(param, context), - taskerAvailable = isTaskerInstalled(context), - keyboardType = keyboardType, - singleLine = singleLine - ) + override fun onEvent(event: EditParamViewEvent) { + when (event) { + is EditParamViewEvent.ApplyPressed -> applyKernelParam(event.newValue) + is EditParamViewEvent.UndoRequested -> { + previousKernelParamValue?.let { applyKernelParam(it) } + } + is EditParamViewEvent.DocumentationReadMoreClicked -> onDocumentationReadMoreClicked() + is EditParamViewEvent.FavoriteTogglePressed -> onFavoriteTogglePressed(event.newState) + is EditParamViewEvent.TaskerTogglePressed -> onTaskerTogglePressed(event.newState, event.listId) } } - private fun applyParam(param: KernelParam) { + private fun applyKernelParam(newValue: String) { + val oldParam = currentState.kernelParam viewModelScope.launch { + val newParam = oldParam.copy(value = newValue) runCatching { - applyParams(param) - updateUserParam(param) - }.onFailure { - val messageRes = when (it) { - is ApplyValueException -> R.string.apply_value_error - is CommitModeException -> R.string.commit_value_error - else -> R.string.error - } - setEffect { EditParamViewEffect.ShowApplyError(messageRes) } + applyParam(newParam) + upsertUserParam(newParam) }.onSuccess { - setEffect { EditParamViewEffect.ShowApplySuccess } - setState { - copy(param = param, hasApplied = param.value != currentState.restoreValue) + setState { copy(kernelParam = newParam) } + setEffect { EditParamViewEffect.ShowApplySuccess(oldParam.value) } + previousKernelParamValue = oldParam.value + }.onFailure { + Log.e("EditParamViewModel", "Failed to apply param", it) + setEffect { + EditParamViewEffect.ShowError(it.message.orEmpty()) } } } } - private fun updateParam(param: KernelParam) { + private fun onFavoriteTogglePressed(newState: Boolean) { viewModelScope.launch { + val newParam = currentState.kernelParam.copy(isFavorite = newState) runCatching { - updateUserParam(param) - }.onFailure { - setEffect { EditParamViewEffect.ShowApplyError(R.string.error) } + upsertUserParam(newParam) }.onSuccess { - setState { copy(param = param) } + setState { copy(kernelParam = newParam) } + }.onFailure { + Log.e("EditParamViewModel", "Failed to update favorite status", it) + setEffect { + EditParamViewEffect.ShowError("Failed to update favorite status") + } } } } - private fun getKeyboardTypeForValue(paramValue: String): KeyboardType { - if (!prefs.guessInputType) return KeyboardType.Text - - val intValue = paramValue.toIntOrNull() - if (intValue != null) return KeyboardType.Number - - val decimalValue = paramValue.toDoubleOrNull() - if (decimalValue != null) return KeyboardType.Decimal - - return KeyboardType.Text - } - - @SuppressLint("DiscouragedApi") - private fun findParamInfo(param: KernelParam, context: Context): String? = with(context) { - val paramName = param.shortName - val resId = resources.getIdentifier( - paramName.replace("-", "_"), - "string", - packageName - ) - val stringRes = runCatching { getString(resId) }.getOrNull() - - // Prefer the documented string resource - if (stringRes != null) return stringRes - - if (!param.path.startsWith("/")) return null - - val subdirs = param.path.split("/") - if (subdirs.isEmpty() || subdirs.size < SUBDIR_THRESHOLD) return null - - // Finding param info within subdir whole documentation string - - val rawInputStream: InputStream? = when (subdirs[3]) { // /proc/sys/[?] - "abi" -> resources.openRawResource(R.raw.abi) - "fs" -> resources.openRawResource(R.raw.fs) - "kernel" -> resources.openRawResource(R.raw.kernel) - "net" -> resources.openRawResource(R.raw.net) - "vm" -> resources.openRawResource(R.raw.vm) - else -> null - } - - val documentation = buildString { - rawInputStream.readLines { - append(it) - append("\n") + private fun onTaskerTogglePressed(newState: Boolean, listId: Int) { + viewModelScope.launch { + val newParam = currentState.kernelParam.copy( + isTaskerParam = newState, + taskerList = listId + ) + runCatching { + upsertUserParam(newParam) + }.onSuccess { + setState { copy(kernelParam = newParam) } + }.onFailure { + Log.e("EditParamViewModel", "Failed to update tasker status", it) + setEffect { + EditParamViewEffect.ShowError("Failed to update tasker status") + } } } - if (documentation.isEmpty()) return null - - /* - Trying to match: - - =============== - - paramName - - the <== - actual <== - documentation <== - - =============== - */ - val info: String? = runCatching { - documentation - .split("=+".toRegex()) - .last { it.contains("$paramName\n") } - .split("$paramName\n") - .last() - }.getOrNull() + } - return info.takeIf { it.isNullOrEmpty().not() } + private fun onDocumentationReadMoreClicked() { + currentState.documentation?.url?.let { documentationUrl -> + setEffect { EditParamViewEffect.OpenBrowser(documentationUrl) } + } } - private fun isTaskerInstalled(context: Context): Boolean { - val packageManager = context.packageManager + private fun guessKeyboardType(paramValue: String): KeyboardType { + if (!appPrefs.guessInputType) return KeyboardType.Text - return runCatching { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - packageManager.getPackageInfo( - TASKER_PACKAGE_NAME, - PackageManager.PackageInfoFlags.of(0L) - ) - } else { - packageManager.getPackageInfo(TASKER_PACKAGE_NAME, 0) - } - true - }.getOrDefault(false) + return when { + paramValue.toIntOrNull() != null -> KeyboardType.Number + paramValue.toDoubleOrNull() != null -> KeyboardType.Decimal + else -> KeyboardType.Text + } } companion object { - private const val PARAM_LENGTH_INPUT_THRESHOLD = 12 - private const val SUBDIR_THRESHOLD = 4 - private const val TASKER_PACKAGE_NAME = "net.dinglisch.android.taskerm" + private const val PARAM_NAME_KEY = "paramName" } } diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewState.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewState.kt index 7f7105c..549e388 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewState.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewState.kt @@ -1,15 +1,27 @@ package com.androidvip.sysctlgui.ui.params.edit import androidx.compose.ui.text.input.KeyboardType -import com.androidvip.sysctlgui.data.models.KernelParam +import com.androidvip.sysctlgui.domain.models.ParamDocumentation +import com.androidvip.sysctlgui.models.UiKernelParam data class EditParamViewState( - val param: KernelParam = KernelParam(), - val restoreValue: String = "", // Backup, - val typedValue: String = "", - val hasApplied: Boolean = false, - val paramInfo: String? = null, + val kernelParam: UiKernelParam = UiKernelParam(), val taskerAvailable: Boolean = false, val keyboardType: KeyboardType = KeyboardType.Text, - val singleLine: Boolean = true + val documentation: ParamDocumentation? = null, ) + +sealed interface EditParamViewEffect { + data class OpenBrowser(val url: String) : EditParamViewEffect + data class ShowApplySuccess(val previousValue: String) : EditParamViewEffect + data class ShowError(val message: String) : EditParamViewEffect + data object GoBack : EditParamViewEffect +} + +sealed interface EditParamViewEvent { + data class ApplyPressed(val newValue: String) : EditParamViewEvent + data object UndoRequested : EditParamViewEvent + data class FavoriteTogglePressed(val newState: Boolean) : EditParamViewEvent + data class TaskerTogglePressed(val newState: Boolean, val listId: Int) : EditParamViewEvent + data object DocumentationReadMoreClicked : EditParamViewEvent +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/KernelParamListFragment.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/KernelParamListFragment.kt deleted file mode 100644 index 62fe69d..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/KernelParamListFragment.kt +++ /dev/null @@ -1,135 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.list - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.Menu -import android.view.MenuInflater -import android.view.MenuItem -import android.view.View -import android.view.ViewGroup -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.itemsIndexed -import androidx.compose.material.ExperimentalMaterialApi -import androidx.compose.material.pullrefresh.PullRefreshIndicator -import androidx.compose.material.pullrefresh.pullRefresh -import androidx.compose.material.pullrefresh.rememberPullRefreshState -import androidx.compose.material3.Divider -import androidx.compose.material3.MaterialTheme -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.ComposeView -import androidx.compose.ui.unit.dp -import androidx.lifecycle.compose.collectAsStateWithLifecycle -import androidx.lifecycle.lifecycleScope -import androidx.navigation.fragment.findNavController -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.models.KernelParam -import com.androidvip.sysctlgui.ui.base.BaseSearchFragment -import com.androidvip.sysctlgui.ui.params.EmptyParamsWarning -import com.androidvip.sysctlgui.ui.params.edit.EditKernelParamActivity -import com.androidvip.sysctlgui.utils.ComposeTheme -import kotlinx.coroutines.launch -import org.koin.androidx.viewmodel.ext.android.viewModel - -class KernelParamListFragment : BaseSearchFragment() { - private val viewModel: ListParamsViewModel by viewModel() - - @OptIn(ExperimentalMaterialApi::class) - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - return ComposeView(requireContext()).apply { - setContent { - ComposeTheme { - val state by viewModel.uiState.collectAsStateWithLifecycle() - val refreshing = state.isLoading - val refreshState = rememberPullRefreshState( - refreshing = refreshing, - onRefresh = { refreshList() } - ) - - Box(Modifier.pullRefresh(refreshState)) { - if (state.showEmptyState) { - EmptyParamsWarning() - } else { - KernelParamsList(state.data) - } - - PullRefreshIndicator( - modifier = Modifier.align(Alignment.TopCenter), - refreshing = refreshing, - state = refreshState, - backgroundColor = MaterialTheme.colorScheme.tertiaryContainer, - contentColor = MaterialTheme.colorScheme.onTertiaryContainer - ) - } - } - } - } - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - lifecycleScope.launch { - viewModel.effect.collect(::processEffect) - } - } - - override fun onStart() { - super.onStart() - refreshList() - } - - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - inflater.inflate(R.menu.menu_main_search, menu) - setUpSearchView(menu) - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - R.id.action_favorites -> findNavController().navigate(R.id.navigateFavoritesParams) - else -> return false - } - - return true - } - - override fun onQueryTextChanged() { - viewModel.onEvent(ParamViewEvent.SearchExpressionChanged(searchExpression)) - } - - private fun onParamItemClicked(param: KernelParam) { - startActivity(EditKernelParamActivity.getIntent(requireContext(), param)) - } - - private fun refreshList() { - viewModel.onEvent(ParamViewEvent.RefreshRequested) - } - - private fun processEffect(effect: ParamViewEffect) { - when (effect) { - is ParamViewEffect.NavigateToParamDetails -> onParamItemClicked(effect.param) - } - } - - @Composable - private fun KernelParamsList(params: List) { - LazyColumn { - itemsIndexed(params) { index, param -> - ParamItem( - onParamClick = { viewModel.onEvent(ParamViewEvent.ParamClicked(param)) }, - param = param - ) - if (index < params.lastIndex) { - Divider(color = MaterialTheme.colorScheme.outlineVariant, thickness = 1.dp) - } - } - } - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ListParamsViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ListParamsViewModel.kt deleted file mode 100644 index 59273ff..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ListParamsViewModel.kt +++ /dev/null @@ -1,47 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.list - -import androidx.lifecycle.viewModelScope -import com.androidvip.sysctlgui.data.mapper.DomainParamMapper -import com.androidvip.sysctlgui.domain.usecase.GetRuntimeParamsUseCase -import com.androidvip.sysctlgui.utils.BaseViewModel -import kotlinx.coroutines.launch - -class ListParamsViewModel( - private val getParamsUseCase: GetRuntimeParamsUseCase -) : BaseViewModel() { - private var searchExpression = "" - - private fun requestKernelParams() { - viewModelScope.launch { - setState { copy(isLoading = true) } - val params = getParamsUseCase() - .map(DomainParamMapper::map) - .filter { param -> - if (searchExpression.isNotEmpty()) { - param.name.lowercase() - .replace(".", "") - .contains(searchExpression.lowercase()) - } else { - true - } - } - setState { copy(isLoading = false, data = params, showEmptyState = params.isEmpty()) } - } - } - - override fun createInitialState(): ParamViewState = ParamViewState() - - override fun onEvent(event: ParamViewEvent) { - when (event) { - is ParamViewEvent.ParamClicked -> setEffect { - ParamViewEffect.NavigateToParamDetails(DomainParamMapper.map(event.param)) - } - is ParamViewEvent.SearchExpressionChanged -> { - searchExpression = event.data - requestKernelParams() - } - ParamViewEvent.RefreshRequested -> requestKernelParams() - else -> Unit - } - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamItem.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamItem.kt deleted file mode 100644 index 340b65f..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamItem.kt +++ /dev/null @@ -1,53 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.list - -import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import com.androidvip.sysctlgui.data.models.KernelParam -import com.androidvip.sysctlgui.design.theme.md_theme_light_background - -@Composable -fun ParamItem(onParamClick: (KernelParam) -> Unit, param: KernelParam) { - Column( - modifier = Modifier - .fillMaxWidth() - .clickable { onParamClick(param) } - ) { - Text( - modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 16.dp), - text = param.shortName, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - style = MaterialTheme.typography.bodyLarge, - color = MaterialTheme.colorScheme.secondary - ) - Spacer(modifier = Modifier.height(2.dp)) - Text( - modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 16.dp), - text = param.value, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onBackground - ) - } -} - -@Preview -@Composable -fun ParamItemPreview() { - val param = KernelParam(name = "test", value = "success") - Box(modifier = Modifier.background(md_theme_light_background)) { - ParamItem(onParamClick = {}, param = param) - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamViewEffect.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamViewEffect.kt deleted file mode 100644 index 51a92db..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamViewEffect.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.list - -import com.androidvip.sysctlgui.data.models.KernelParam - -sealed interface ParamViewEffect { - class NavigateToParamDetails(val param: KernelParam) : ParamViewEffect -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamViewEvent.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamViewEvent.kt deleted file mode 100644 index f60b160..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamViewEvent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.list - -import com.androidvip.sysctlgui.domain.models.DomainKernelParam - -sealed interface ParamViewEvent { - object RefreshRequested : ParamViewEvent - class SearchExpressionChanged(val data: String) : ParamViewEvent - class ParamClicked(val param: DomainKernelParam) : ParamViewEvent -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamViewState.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamViewState.kt deleted file mode 100644 index 865215c..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/ParamViewState.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.list - -import com.androidvip.sysctlgui.data.models.KernelParam - -data class ParamViewState( - var data: List = listOf(), - var isLoading: Boolean = true, - var showEmptyState: Boolean = false -) diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/BaseManageParamsActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/BaseManageParamsActivity.kt deleted file mode 100644 index 4f23947..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/BaseManageParamsActivity.kt +++ /dev/null @@ -1,47 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.user - -import android.os.Bundle -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import androidx.compose.runtime.getValue -import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.androidvip.sysctlgui.data.models.KernelParam -import com.androidvip.sysctlgui.ui.params.edit.EditKernelParamActivity -import com.androidvip.sysctlgui.utils.ComposeTheme -import org.koin.androidx.viewmodel.ext.android.viewModel - -abstract class BaseManageParamsActivity : ComponentActivity() { - private val viewModel: UserParamsViewModel by viewModel() - abstract val filterPredicate: (KernelParam) -> Boolean - abstract val title: String - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - setContent { - ComposeTheme { - val state by viewModel.uiState.collectAsStateWithLifecycle() - UserParamsScreen( - topBarTitle = title, - params = state.params, - searchViewVisible = state.searchViewVisible, - onQueryChanged = { - viewModel.onEvent(UserParamsViewEvent.SearchQueryChanged(it)) - }, - onSearch = { viewModel.onEvent(UserParamsViewEvent.SearchPressed) }, - onSearchPressed = { viewModel.onEvent(UserParamsViewEvent.SearchViewPressed) }, - onSearchClose = { viewModel.onEvent(UserParamsViewEvent.CloseSearchPressed) }, - onParamClicked = { startActivity(EditKernelParamActivity.getIntent(this, it)) }, - onDelete = { viewModel.onEvent(UserParamsViewEvent.DeleteSwipe(it)) }, - onBackPressed = { onBackPressedDispatcher.onBackPressed() } - ) - } - } - } - - override fun onStart() { - super.onStart() - viewModel.setBaseFilterPredicate(filterPredicate) - viewModel.onEvent(UserParamsViewEvent.ParamsRequested) - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/ManageFavoritesParamsActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/ManageFavoritesParamsActivity.kt deleted file mode 100644 index 8e2b1be..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/ManageFavoritesParamsActivity.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.user - -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.models.KernelParam - -class ManageFavoritesParamsActivity : BaseManageParamsActivity() { - override val title: String - get() = getString(R.string.tasker_list_plugin_favorites) - - override val filterPredicate: (KernelParam) -> Boolean - get() = { it.favorite } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/ManageOnStartUpParamsActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/ManageOnStartUpParamsActivity.kt deleted file mode 100644 index 9b6a726..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/ManageOnStartUpParamsActivity.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.user - -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.models.KernelParam - -class ManageOnStartUpParamsActivity : BaseManageParamsActivity() { - override val title: String - get() = getString(R.string.manage_parameters) - - override val filterPredicate: (KernelParam) -> Boolean - get() = { true } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsScreen.kt deleted file mode 100644 index 5f5abf0..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsScreen.kt +++ /dev/null @@ -1,242 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.user - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.items -import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.ArrowBack -import androidx.compose.material.icons.outlined.Close -import androidx.compose.material.icons.outlined.Search -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Scaffold -import androidx.compose.material3.SearchBar -import androidx.compose.material3.SwipeToDismissBox -import androidx.compose.material3.SwipeToDismissBoxValue -import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.rememberSwipeToDismissBoxState -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.rememberUpdatedState -import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.models.KernelParam -import com.androidvip.sysctlgui.design.theme.md_theme_light_background -import com.androidvip.sysctlgui.ui.params.EmptyParamsWarning -import com.androidvip.sysctlgui.ui.params.list.ParamItem - -@OptIn(ExperimentalMaterial3Api::class) -@Composable -fun UserParamsScreen( - topBarTitle: String, - params: List, - searchViewVisible: Boolean, - onQueryChanged: (String) -> Unit, - onSearch: (String) -> Unit, - onSearchPressed: () -> Unit, - onSearchClose: () -> Unit, - onDelete: (KernelParam) -> Unit, - onParamClicked: (KernelParam) -> Unit, - onBackPressed: () -> Unit -) { - val listState = rememberLazyListState() - - Scaffold( - topBar = { - if (searchViewVisible) { - ParamSearch( - onSearch = onSearch, - onClose = onSearchClose, - onQueryChanged = onQueryChanged - ) - } else { - TopAppBar( - title = { Text(text = topBarTitle) }, - navigationIcon = { - IconButton(onClick = onBackPressed) { - Icon( - imageVector = Icons.AutoMirrored.Outlined.ArrowBack, - contentDescription = stringResource(id = R.string.restore_param), - tint = MaterialTheme.colorScheme.onPrimaryContainer - ) - } - }, - actions = { - IconButton(onClick = onSearchPressed) { - Icon( - imageVector = Icons.Outlined.Search, - contentDescription = stringResource(id = R.string.search), - tint = MaterialTheme.colorScheme.onSurface - ) - } - } - ) - } - } - ) { contentPadding -> - if (params.isEmpty()) { - Box(modifier = Modifier.padding(top = 64.dp)) { EmptyParamsWarning() } - } else { - LazyColumn( - modifier = Modifier - .fillMaxSize() - .padding(contentPadding), - state = listState - ) { - items( - items = params, - key = { param -> param.id }, - itemContent = { param -> - SwipeToDismissContent( - onParamClick = onParamClicked, - onDelete = onDelete, - param = param - ) - } - ) - } - } - } -} - -@Composable -@OptIn(ExperimentalMaterial3Api::class) -private fun SwipeToDismissContent( - onParamClick: (KernelParam) -> Unit, - onDelete: (KernelParam) -> Unit, - param: KernelParam -) { - val currentParam by rememberUpdatedState(newValue = param) - val dismissState = rememberSwipeToDismissBoxState( - confirmValueChange = { - fun getResultFromValueChange(): Boolean { - if (it == SwipeToDismissBoxValue.EndToStart) { - onDelete(currentParam) - return true - } - return false - } - getResultFromValueChange() - } - ) - - SwipeToDismissBox( - state = dismissState, - enableDismissFromEndToStart = true, - backgroundContent = { - Box( - modifier = Modifier - .fillMaxSize() - .background(MaterialTheme.colorScheme.error), - contentAlignment = Alignment.CenterEnd - ) { - Icon( - modifier = Modifier.padding(end = 16.dp), - painter = painterResource(id = R.drawable.ic_delete_sweep), - contentDescription = "", - tint = MaterialTheme.colorScheme.onError - ) - } - } - ) { - Column(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { - ParamItem( - onParamClick = onParamClick, - param = param - ) - HorizontalDivider( - thickness = 1.dp, - color = MaterialTheme.colorScheme.outlineVariant - ) - } - } -} - -@OptIn(ExperimentalMaterial3Api::class) -@Composable -fun ParamSearch(onSearch: (String) -> Unit, onClose: () -> Unit, onQueryChanged: (String) -> Unit) { - var searchText by remember { mutableStateOf("") } - - SearchBar( - modifier = Modifier.fillMaxWidth(), - query = searchText, - onQueryChange = { searchText = it; onQueryChanged(it) }, - onSearch = onSearch, - active = false, - shape = RoundedCornerShape(0.dp), - onActiveChange = { }, - leadingIcon = { - Icon( - imageVector = Icons.Outlined.Search, - contentDescription = stringResource(id = R.string.search), - tint = MaterialTheme.colorScheme.onPrimaryContainer - ) - }, - trailingIcon = { - IconButton(onClick = onClose) { - Icon( - imageVector = Icons.Outlined.Close, - contentDescription = stringResource(id = android.R.string.cancel), - tint = MaterialTheme.colorScheme.onPrimaryContainer - ) - } - }, - placeholder = { - Text( - text = stringResource(id = R.string.search), - color = MaterialTheme.colorScheme.onPrimaryContainer - ) - } - ) { - } -} - -@Preview -@Composable -private fun UserParamsScreenPreview() { - val params = buildList { - repeat(15) { n -> - add( - KernelParam( - id = n, - favorite = n % 3 == 0, - name = buildString { (0..n).forEach { append((it * 4).toChar()) } }, - value = "${n * 31}" - ) - ) - } - } - Box(modifier = Modifier.background(md_theme_light_background)) { - UserParamsScreen( - topBarTitle = "Favorites", - params = params, - searchViewVisible = false, - onQueryChanged = {}, - onSearch = {}, - onSearchPressed = {}, - onParamClicked = {}, - onDelete = {}, - onSearchClose = {}, - onBackPressed = {} - ) - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsViewEvent.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsViewEvent.kt deleted file mode 100644 index 2d43672..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsViewEvent.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.user - -import com.androidvip.sysctlgui.data.models.KernelParam - -sealed interface UserParamsViewEvent { - object ParamsRequested : UserParamsViewEvent - object SearchViewPressed : UserParamsViewEvent - object SearchPressed : UserParamsViewEvent - object CloseSearchPressed : UserParamsViewEvent - class DeleteSwipe(val param: KernelParam) : UserParamsViewEvent - class SearchQueryChanged(val query: String) : UserParamsViewEvent -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsViewModel.kt deleted file mode 100644 index 8ea0e27..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsViewModel.kt +++ /dev/null @@ -1,80 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.user - -import androidx.lifecycle.viewModelScope -import com.androidvip.sysctlgui.data.mapper.DomainParamMapper -import com.androidvip.sysctlgui.data.models.KernelParam -import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase -import com.androidvip.sysctlgui.domain.usecase.RemoveUserParamUseCase -import com.androidvip.sysctlgui.domain.usecase.UpdateUserParamUseCase -import com.androidvip.sysctlgui.utils.BaseViewModel -import kotlinx.coroutines.launch - -typealias ParamFilterPredicate = (KernelParam) -> Boolean - -class UserParamsViewModel( - private val getParamsUseCase: GetUserParamsUseCase, - private val removeParamUseCase: RemoveUserParamUseCase, - private val updateParamUseCase: UpdateUserParamUseCase -) : BaseViewModel() { - private var baseFilterPredicate: ParamFilterPredicate = { true } - private var currentFilterPredicate: ParamFilterPredicate = { true } - - override fun createInitialState(): UserParamsViewState = UserParamsViewState() - - override fun onEvent(event: UserParamsViewEvent) { - when (event) { - UserParamsViewEvent.ParamsRequested -> getParams() - UserParamsViewEvent.SearchPressed -> getParams() - UserParamsViewEvent.CloseSearchPressed -> { - setState { copy(searchViewVisible = false) } - } - UserParamsViewEvent.SearchViewPressed -> { - setState { copy(searchViewVisible = true) } - } - is UserParamsViewEvent.DeleteSwipe -> { - if (event.param.favorite) { - event.param.favorite = false - update(event.param) - } else { - delete(event.param) - } - } - is UserParamsViewEvent.SearchQueryChanged -> { - currentFilterPredicate = { - it.name - .replace(".", "") - .contains(event.query, ignoreCase = true) && - baseFilterPredicate(it) - } - } - } - } - private fun getParams() { - viewModelScope.launch { - val params = getParamsUseCase() - .map { DomainParamMapper.map(it) } - .filter(currentFilterPredicate) - - setState { copy(params = params) } - } - } - - fun setBaseFilterPredicate(predicate: ParamFilterPredicate) { - baseFilterPredicate = predicate - currentFilterPredicate = baseFilterPredicate - } - - private fun delete(kernelParam: KernelParam) { - viewModelScope.launch { - removeParamUseCase.execute(kernelParam) - getParams() - } - } - - private fun update(kernelParam: KernelParam) { - viewModelScope.launch { - updateParamUseCase(kernelParam) - getParams() - } - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsViewState.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsViewState.kt deleted file mode 100644 index d3bcc4f..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsViewState.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.androidvip.sysctlgui.ui.params.user - -import com.androidvip.sysctlgui.data.models.KernelParam - -data class UserParamsViewState( - val searchViewVisible: Boolean = false, - val params: List = emptyList(), -) diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/ImportPresetScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/ImportPresetScreen.kt new file mode 100644 index 0000000..7f78ae5 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/ImportPresetScreen.kt @@ -0,0 +1,357 @@ +package com.androidvip.sysctlgui.ui.presets + +import android.widget.Toast +import androidx.compose.animation.AnimatedContent +import androidx.compose.animation.ExperimentalAnimationApi +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.tween +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.scaleIn +import androidx.compose.animation.scaleOut +import androidx.compose.animation.togetherWith +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.IntrinsicSize +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +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.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.CheckCircle +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +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.platform.LocalContext +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.withStyle +import androidx.compose.ui.tooling.preview.PreviewDynamicColors +import androidx.compose.ui.tooling.preview.PreviewLightDark +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.ui.main.MainViewEvent +import com.androidvip.sysctlgui.ui.main.MainViewModel +import com.androidvip.sysctlgui.ui.main.MainViewState +import org.koin.androidx.compose.koinViewModel + +private const val SUCCESS_ANIMATION_DURATION = 4000 + +@OptIn(ExperimentalAnimationApi::class) +@Composable +fun ImportPresetScreen( + viewModel: PresetsViewModel = koinViewModel(), + mainViewModel: MainViewModel = koinViewModel(), + onNavigateBack: () -> Unit +) { + val context = LocalContext.current + val state by viewModel.uiState.collectAsStateWithLifecycle() + + LaunchedEffect(Unit) { + mainViewModel.onEvent( + MainViewEvent.OnSateChangeRequested( + MainViewState( + topBarTitle = "Applying preset", + showTopBar = true, + showNavBar = false, + showBackButton = true, + showSearchAction = false + ) + ) + ) + } + + LaunchedEffect(viewModel.effect) { + viewModel.effect.collect { effect -> + when (effect) { + is PresetsViewEffect.ShowError -> { + Toast.makeText(context, effect.message, Toast.LENGTH_SHORT).show() + } + is PresetsViewEffect.ShowToast -> { + Toast.makeText(context, effect.message, Toast.LENGTH_SHORT).show() + } + PresetsViewEffect.GoBack -> onNavigateBack() + else -> {} + } + } + } + + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + AnimatedContent( + targetState = state.incomingPresetsScreenState, + transitionSpec = { + val isLoadingInitialState = initialState == IncomingPresetsScreenState.Loading + val isSuccessTargetState = targetState == IncomingPresetsScreenState.Success + if (isLoadingInitialState && isSuccessTargetState) { + val enterTransition = fadeIn() + scaleIn(initialScale = 0.8f) + val exitTransition = fadeOut() + scaleOut(targetScale = 0.9f) + enterTransition togetherWith exitTransition + } else { + fadeIn() togetherWith fadeOut() + } + } + ) { targetState -> + when (targetState) { + IncomingPresetsScreenState.Idle -> { + IncomingPresetsContent( + paramsToImport = state.paramsToImport, + onImportPressed = { + viewModel.onEvent(PresetsViewEvent.ConfirmImportPressed) + }, + onCancelPressed = { + viewModel.onEvent(PresetsViewEvent.CancelImportPressed) + } + ) + } + + IncomingPresetsScreenState.Loading -> { + LoadingIndicator() + } + + IncomingPresetsScreenState.Success -> { + SuccessIndicator( + onAnimationEnd = { + viewModel.onEvent(PresetsViewEvent.CancelImportPressed) + } + ) + } + } + } + } +} + +@Composable +private fun IncomingPresetsContent( + paramsToImport: List, + onImportPressed: () -> Unit, + onCancelPressed: () -> Unit +) { + Column(modifier = Modifier.fillMaxSize()) { + Text( + text = "${paramsToImport.size} parameters found", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onBackground, + modifier = Modifier + .fillMaxWidth() + .background(MaterialTheme.colorScheme.surfaceContainerHigh) + .padding(16.dp) + ) + + HorizontalDivider() + + LazyColumn( + modifier = Modifier + .fillMaxWidth() + .weight(1f) + ) { + itemsIndexed( + items = paramsToImport, + key = { index, item -> item.name } + ) { index, item -> + Row( + modifier = Modifier + .height(IntrinsicSize.Min) + .fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + Box( + modifier = Modifier + .width(36.dp) + .fillMaxHeight() + .background(MaterialTheme.colorScheme.surfaceContainerHigh) + ) { + Text( + text = "${index + 1}", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface, + fontFamily = FontFamily.Monospace, + fontWeight = FontWeight.Medium, + textAlign = TextAlign.End, + modifier = Modifier + .fillMaxWidth() + .padding(4.dp) + ) + } + + val text = buildAnnotatedString { + withStyle( + SpanStyle( + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.primary + ) + ) { + append(item.name) + } + append("=") + withStyle( + SpanStyle( + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.tertiary + ) + ) { + append(item.value) + } + } + Text( + text = text, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface, + fontFamily = FontFamily.Monospace, + fontWeight = FontWeight.Medium, + modifier = Modifier + .weight(1f) + .padding(4.dp) + ) + } + } + } + + HorizontalDivider() + + Row( + modifier = Modifier + .fillMaxWidth() + .background(MaterialTheme.colorScheme.surfaceContainer) + .padding(16.dp), + horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterHorizontally) + ) { + OutlinedButton( + modifier = Modifier.weight(1f), + onClick = onCancelPressed + ) { + Text(text = "Cancel") + } + + OutlinedButton( + modifier = Modifier.weight(1f), + onClick = onImportPressed, + enabled = paramsToImport.isNotEmpty(), + colors = ButtonDefaults.outlinedButtonColors( + containerColor = MaterialTheme.colorScheme.primary, + contentColor = MaterialTheme.colorScheme.onPrimary + ) + ) { + Text(text = "Import") + } + } + } +} + +@Composable +private fun LoadingIndicator() { + Column( + modifier = Modifier + .fillMaxSize() + .padding(32.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically) + ) { + CircularProgressIndicator() + Text( + text = "Loading preset...", + style = MaterialTheme.typography.bodyLarge, + modifier = Modifier.fillMaxWidth(), + color = MaterialTheme.colorScheme.onBackground, + textAlign = TextAlign.Center + ) + } +} + +@Composable +private fun SuccessIndicator(onAnimationEnd: () -> Unit) { + var animationStarted by remember { mutableStateOf(false) } + val progressTarget = if (animationStarted) 0f else 1f + + val progress by animateFloatAsState( + targetValue = progressTarget, + animationSpec = tween(durationMillis = SUCCESS_ANIMATION_DURATION, easing = LinearEasing), + finishedListener = { value -> + if (value == 0f) { + onAnimationEnd() + } + } + ) + + LaunchedEffect(Unit) { animationStarted = true } + + Column( + modifier = Modifier + .fillMaxSize() + .padding(32.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically) + ) { + Icon( + imageVector = Icons.Rounded.CheckCircle, + contentDescription = "Success", + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.size(128.dp) + ) + + Text( + text = "Presets successfully imported", + style = MaterialTheme.typography.titleLarge, + color = MaterialTheme.colorScheme.onBackground, + textAlign = TextAlign.Center + ) + + LinearProgressIndicator( + modifier = Modifier.fillMaxWidth(), + color = MaterialTheme.colorScheme.primary, + trackColor = MaterialTheme.colorScheme.surfaceVariant, + progress = { progress } + ) + } +} + +@Composable +@PreviewLightDark +@PreviewDynamicColors +private fun IncomingPresetsScreenPreview() { + SysctlGuiTheme(dynamicColor = true) { + Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { + IncomingPresetsContent( + paramsToImport = buildList { + repeat(16) { + add( + KernelParam( + name = "vm.swappiness.$it", + value = "value$it", + path = "" + ) + ) + } + }, + onImportPressed = {}, + onCancelPressed = {}, + ) + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt new file mode 100644 index 0000000..3b3b98a --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt @@ -0,0 +1,215 @@ +package com.androidvip.sysctlgui.ui.presets + +import android.widget.Toast +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.slideInVertically +import androidx.compose.animation.slideOutVertically +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material3.Card +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +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.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.tooling.preview.PreviewDynamicColors +import androidx.compose.ui.tooling.preview.PreviewLightDark +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.ui.components.ErrorContainer +import com.androidvip.sysctlgui.ui.main.MainViewEvent +import com.androidvip.sysctlgui.ui.main.MainViewModel +import com.androidvip.sysctlgui.ui.main.MainViewState +import org.koin.compose.viewmodel.koinViewModel + +@Composable +fun PresetsScreen( + viewModel: PresetsViewModel = koinViewModel(), + mainViewModel: MainViewModel = koinViewModel(), + onNavigateBack: () -> Unit, + onNavigateToImport: () -> Unit, +) { + val context = LocalContext.current + val state by viewModel.uiState.collectAsStateWithLifecycle() + val pickFileLauncher = rememberLauncherForActivityResult( + contract = ActivityResultContracts.OpenDocument(), + onResult = { uri -> + viewModel.onEvent(PresetsViewEvent.PresetFilePicked(uri)) + } + ) + val createFileLauncher = rememberLauncherForActivityResult( + contract = ActivityResultContracts.CreateDocument("text/plain"), + onResult = { uri -> + viewModel.onEvent(PresetsViewEvent.BackUpFileCreated(uri)) + } + ) + var showError by remember { mutableStateOf(false) } + var errorMessage by remember { mutableStateOf("") } + + LaunchedEffect(Unit) { + mainViewModel.onEvent( + MainViewEvent.OnSateChangeRequested( + MainViewState( + showTopBar = true, + showNavBar = true, + showBackButton = false, + showSearchAction = false + ) + ) + ) + } + + LaunchedEffect(viewModel.effect) { + viewModel.effect.collect { effect -> + when (effect) { + is PresetsViewEffect.ShowError -> { + errorMessage = effect.message + showError = true + } + PresetsViewEffect.ShowImportScreen -> onNavigateToImport() + is PresetsViewEffect.ShowToast -> { + Toast.makeText(context, effect.message, Toast.LENGTH_SHORT).show() + } + PresetsViewEffect.GoBack -> onNavigateBack() + } + } + } + + AnimatedVisibility(visible = state.loading) { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator() + } + } + + PresetsScreenContent( + onImportPressed = { pickFileLauncher.launch(arrayOf("*/*")) }, + onExportPressed = { + val defaultFileName = "backup.conf" + createFileLauncher.launch(defaultFileName) + }, + onErrorAnimationEnd = { showError = false }, + showError = showError, + errorMessage = errorMessage + ) +} + +@Composable +private fun PresetsScreenContent( + onImportPressed: () -> Unit, + onExportPressed: () -> Unit, + onErrorAnimationEnd: () -> Unit, + showError: Boolean, + errorMessage: String +) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp) + ) { + ImportCards( + onClick = onImportPressed, + title = "Import", + description = "Import presets from a file", + iconRes = R.drawable.ic_import + ) + ImportCards( + onClick = onExportPressed, + title = "Export", + description = "Export presets to a file", + iconRes = R.drawable.ic_export + ) + + Spacer(modifier = Modifier.weight(1f)) + + AnimatedVisibility( + visible = showError && errorMessage.isNotEmpty(), + enter = slideInVertically { it / 2 } + fadeIn(), + exit = slideOutVertically{ it / 2 } + fadeOut(), + modifier = Modifier.padding(bottom = 16.dp) + ) { + ErrorContainer(message = errorMessage, onAnimationEnd = onErrorAnimationEnd) + } + } +} + +@Composable +private fun ImportCards(onClick: () -> Unit, title: String, description: String, iconRes: Int) { + Card(onClick = onClick, modifier = Modifier.fillMaxWidth()) { + Row( + modifier = Modifier + .padding(16.dp) + .semantics(mergeDescendants = true) { + contentDescription = "$title - $description" + }, + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(16.dp) + ) { + Icon( + modifier = Modifier.size(40.dp), + painter = painterResource(id = iconRes), + contentDescription = null, + tint = MaterialTheme.colorScheme.primary + ) + Column { + Text( + text = title, + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurface + ) + Text( + text = description, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } +} + + + +@Composable +@PreviewLightDark +@PreviewDynamicColors +private fun PresetsScreenPreview() { + SysctlGuiTheme(dynamicColor = true) { + Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { + PresetsScreenContent( + onImportPressed = {}, + onExportPressed = {}, + onErrorAnimationEnd = {}, + showError = true, + errorMessage = "Error message" + ) + } + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsViewModel.kt new file mode 100644 index 0000000..2ef1f1f --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsViewModel.kt @@ -0,0 +1,109 @@ +package com.androidvip.sysctlgui.ui.presets + +import android.net.Uri +import android.util.Log +import androidx.lifecycle.viewModelScope +import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.data.utils.PresetsFileProcessor +import com.androidvip.sysctlgui.domain.StringProvider +import com.androidvip.sysctlgui.domain.exceptions.EmptyFileException +import com.androidvip.sysctlgui.domain.exceptions.MalformedLineException +import com.androidvip.sysctlgui.domain.exceptions.NoValidParamException +import com.androidvip.sysctlgui.domain.usecase.AddUserParamsUseCase +import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase +import com.androidvip.sysctlgui.utils.BaseViewModel +import kotlinx.coroutines.launch +import java.io.IOException + +class PresetsViewModel( + private val getUserParams: GetUserParamsUseCase, + private val addUserParams: AddUserParamsUseCase, + private val presetsFileProcessor: PresetsFileProcessor, + private val stringProvider: StringProvider +) : BaseViewModel() { + override fun createInitialState() = PresetsViewState() + + override fun onEvent(event: PresetsViewEvent) { + when (event) { + PresetsViewEvent.CancelImportPressed -> setEffect { PresetsViewEffect.GoBack } + PresetsViewEvent.ConfirmImportPressed -> confirmImport() + is PresetsViewEvent.PresetFilePicked -> handleImportPreset(event.uri) + is PresetsViewEvent.BackUpFileCreated -> handleBackup(event.uri) + } + } + + private fun confirmImport() { + viewModelScope.launch { + setState { copy(incomingPresetsScreenState = IncomingPresetsScreenState.Loading) } + val paramsToImport = uiState.value.paramsToImport + runCatching { + addUserParams(paramsToImport) + }.onSuccess { + setState { + copy( + paramsToImport = emptyList(), + incomingPresetsScreenState = IncomingPresetsScreenState.Success + ) + } + }.onFailure { + setState { copy(incomingPresetsScreenState = IncomingPresetsScreenState.Idle) } + setEffect { PresetsViewEffect.ShowError("Failed to import params") } + } + } + } + + private fun handleImportPreset(uri: Uri?) { + if (uri == null) { + setEffect { PresetsViewEffect.ShowError(stringProvider.getString(R.string.preset_error_file_picking)) } + return + } + + viewModelScope.launch { + try { + val params = presetsFileProcessor.getKernelParamsFromUri(uri) + setState { + copy( + paramsToImport = params, + incomingPresetsScreenState = IncomingPresetsScreenState.Idle + ) + } + setEffect { PresetsViewEffect.ShowImportScreen } + } catch (_: EmptyFileException) { + setEffect { PresetsViewEffect.ShowError(stringProvider.getString(R.string.import_error_empty_file)) } + } catch (_: MalformedLineException) { + setEffect { PresetsViewEffect.ShowError(stringProvider.getString(R.string.import_error_malformed_line)) } + } catch (_: NoValidParamException) { + setEffect { PresetsViewEffect.ShowError(stringProvider.getString(R.string.export_error_no_param)) } + } catch (_: IOException) { + setEffect { PresetsViewEffect.ShowError(stringProvider.getString(R.string.export_error_io)) } + } catch (e: Exception) { + Log.e("PresetsViewModel", "Error importing file", e) + setEffect { PresetsViewEffect.ShowError(stringProvider.getString(R.string.import_error)) } + } + } + } + + private fun handleBackup(uri: Uri?) { + if (uri == null) { + setEffect { PresetsViewEffect.ShowError(stringProvider.getString(R.string.preset_error_file_creation)) } + return + } + + viewModelScope.launch { + try { + val userParams = getUserParams() + + runCatching { + presetsFileProcessor.backupParamsToUri(uri, userParams) + }.onSuccess { + setEffect { PresetsViewEffect.ShowToast("Export complete") } + }.onFailure { + setEffect { PresetsViewEffect.ShowError(stringProvider.getString(R.string.preset_error_processing_file)) } + } + } catch (e: Exception) { + Log.e("PresetsViewModel", "Error saving file", e) + setEffect { PresetsViewEffect.ShowError(stringProvider.getString(R.string.preset_error_opening_file)) } + } + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsViewState.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsViewState.kt new file mode 100644 index 0000000..80f4a7a --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsViewState.kt @@ -0,0 +1,30 @@ +package com.androidvip.sysctlgui.ui.presets + +import android.net.Uri +import com.androidvip.sysctlgui.domain.models.KernelParam + +data class PresetsViewState( + val paramsToImport: List = emptyList(), + val loading: Boolean = false, + val incomingPresetsScreenState: IncomingPresetsScreenState = IncomingPresetsScreenState.Idle +) + +enum class IncomingPresetsScreenState { + Idle, + Loading, + Success +} + +sealed interface PresetsViewEvent { + data class PresetFilePicked(val uri: Uri?) : PresetsViewEvent + data class BackUpFileCreated(val uri: Uri?) : PresetsViewEvent + data object ConfirmImportPressed : PresetsViewEvent + data object CancelImportPressed : PresetsViewEvent +} + +sealed interface PresetsViewEffect { + data class ShowError(val message: String) : PresetsViewEffect + data class ShowToast(val message: String) : PresetsViewEffect + data object ShowImportScreen : PresetsViewEffect + data object GoBack : PresetsViewEffect +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt new file mode 100644 index 0000000..b6ab33a --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt @@ -0,0 +1,462 @@ +package com.androidvip.sysctlgui.ui.search + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.core.animateDpAsState +import androidx.compose.animation.core.tween +import androidx.compose.animation.expandHorizontally +import androidx.compose.animation.expandVertically +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.shrinkHorizontally +import androidx.compose.animation.shrinkVertically +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.rounded.ArrowBack +import androidx.compose.material.icons.rounded.Clear +import androidx.compose.material.icons.rounded.Search +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.ListItem +import androidx.compose.material3.ListItemDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SearchBar +import androidx.compose.material3.SearchBarDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +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.platform.LocalFocusManager +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.models.SearchHint +import com.androidvip.sysctlgui.models.UiKernelParam +import com.androidvip.sysctlgui.ui.main.MainViewEvent +import com.androidvip.sysctlgui.ui.main.MainViewModel +import com.androidvip.sysctlgui.ui.main.MainViewState +import com.androidvip.sysctlgui.ui.params.browse.ParamRow +import org.koin.compose.viewmodel.koinViewModel + +@Composable +fun SearchScreen( + viewModel: SearchViewModel = koinViewModel(), + mainViewModel: MainViewModel = koinViewModel(), + onParamSelected: (UiKernelParam) -> Unit, + onNavigateBack: () -> Unit +) { + val state by viewModel.uiState.collectAsStateWithLifecycle() + var searchQuery by remember { mutableStateOf("") } + var searchActive by remember { mutableStateOf(false) } + + LaunchedEffect(Unit) { + mainViewModel.onEvent( + MainViewEvent.OnSateChangeRequested( + MainViewState( + showTopBar = false, + showNavBar = true, + ) + ) + ) + } + + LaunchedEffect(viewModel.effect) { + viewModel.effect.collect { effect -> + when (effect) { + is SearchViewEffect.EditKernelParam -> onParamSelected(effect.param) + SearchViewEffect.NavigateBack -> onNavigateBack() + } + } + } + + SearchScreenContent( + searchQuery = searchQuery, + onSearchQueryChange = { + searchQuery = it + viewModel.onEvent(SearchViewEvent.SearchQueryChange(it)) + }, + searchActive = searchActive, + onSearchActiveChange = { searchActive = it }, + searchHints = state.searchHints, + searchResults = state.searchResults, + onNavigateBack = { viewModel.onEvent(SearchViewEvent.BackClicked) }, + onHistoryItemRemoveClicked = { + viewModel.onEvent(SearchViewEvent.HistoryItemRemoveClicked(it)) + }, + onSearch = { query -> + searchActive = false + viewModel.onEvent(SearchViewEvent.SearchRequested(query)) + } + ) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun SearchScreenContent( + searchQuery: String, + onSearchQueryChange: (String) -> Unit, + searchActive: Boolean, + onSearchActiveChange: (Boolean) -> Unit, + searchHints: List, + searchResults: List, + onHistoryItemRemoveClicked: (SearchHint) -> Unit, + onNavigateBack: () -> Unit, + onSearch: (String) -> Unit +) { + val focusManager = LocalFocusManager.current + val searchBarHorizontalPadding by animateDpAsState( + targetValue = if (searchActive) 0.dp else 16.dp, + label = "SearchBarHorizontalPadding", + animationSpec = tween(durationMillis = 300) + ) + val searchBarTopPadding by animateDpAsState( + targetValue = if (searchActive) 0.dp else 8.dp, + label = "SearchBarTopPadding", + animationSpec = tween(durationMillis = 300) + ) + + Scaffold( + topBar = { + val onActiveChange: (Boolean) -> Unit = { isActive -> + if (searchActive != isActive) { + onSearchActiveChange(isActive) + } + if (!isActive && searchQuery.isNotEmpty()) { + onSearchQueryChange("") + } + } + val searchBarColors = SearchBarDefaults.colors() + SearchBar( + inputField = { + SearchBarDefaults.InputField( + query = searchQuery, + onQueryChange = onSearchQueryChange, + onSearch = onSearch, + expanded = searchActive, + onExpandedChange = onActiveChange, + placeholder = { Text("Search kernel parameters") }, + leadingIcon = { + AnimatedVisibility( + visible = searchActive, + enter = expandVertically() + fadeIn(), + exit = shrinkVertically() + fadeOut() + ) { + IconButton(onClick = { + focusManager.clearFocus() + onSearchActiveChange(false) + onSearchQueryChange("") + if (searchQuery.isEmpty()) { + onNavigateBack() + } + }) { + Icon( + Icons.AutoMirrored.Rounded.ArrowBack, + contentDescription = "Back" + ) + } + } + + + AnimatedVisibility( + visible = !searchActive, + enter = expandVertically( + animationSpec = tween(delayMillis = 200) + ) + fadeIn( + animationSpec = tween(delayMillis = 200) + ), + exit = shrinkVertically( + animationSpec = tween(durationMillis = 0) + ) + fadeOut( + animationSpec = tween(durationMillis = 0) + ) + ) { + Icon(Icons.Rounded.Search, contentDescription = "Search Icon") + } + }, + trailingIcon = { + AnimatedVisibility( + visible = searchQuery.isNotEmpty() && searchActive, + enter = expandHorizontally(expandFrom = Alignment.Start) + fadeIn(), + exit = shrinkHorizontally(shrinkTowards = Alignment.Start) + fadeOut() + ) { + IconButton(onClick = { + onSearchQueryChange("") + }) { + Icon(Icons.Rounded.Clear, contentDescription = "Clear search") + } + } + }, + colors = searchBarColors.inputFieldColors, + ) + }, + expanded = searchActive, + onExpandedChange = onActiveChange, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = searchBarHorizontalPadding) + .padding(top = searchBarTopPadding), + shape = SearchBarDefaults.inputFieldShape, + colors = searchBarColors, + tonalElevation = SearchBarDefaults.TonalElevation, + shadowElevation = SearchBarDefaults.ShadowElevation, + windowInsets = SearchBarDefaults.windowInsets, + ) { + SearchViewContent( + searchHints = searchHints, + onHistoryItemRemoveClicked = onHistoryItemRemoveClicked, + onSearchQueryChange = onSearchQueryChange, + onSearch = onSearch, + onSearchActiveChange = onSearchActiveChange, + searchQuery = searchQuery + ) + } + } + ) { innerPadding -> + Box(modifier = Modifier.padding(innerPadding)) { + if (!searchActive) { + SearchResultsContent(searchResults, searchQuery) + } + + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } + } +} + +@Composable +private fun SearchViewContent( + searchHints: List, + onHistoryItemRemoveClicked: (SearchHint) -> Unit, + onSearchQueryChange: (String) -> Unit, + onSearch: (String) -> Unit, + onSearchActiveChange: (Boolean) -> Unit, + searchQuery: String +) { + val historyHints = searchHints.filter { it.isFromHistory } + val suggestionHints = searchHints.filter { !it.isFromHistory } + + LazyColumn(modifier = Modifier.fillMaxWidth()) { + if (historyHints.isNotEmpty()) { + item(key = "history_header") { + Text( + text = "Recent Searches", + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.primary, + modifier = Modifier + .animateItem() + .padding(horizontal = 16.dp, vertical = 12.dp) + ) + } + items(historyHints, key = { it.hint }) { hintItem -> + ListItem( + colors = ListItemDefaults.colors( + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh + ), + headlineContent = { Text(hintItem.hint) }, + leadingContent = { + Icon( + painter = painterResource(R.drawable.ic_history), + contentDescription = "History item" + ) + }, + trailingContent = { + IconButton( + onClick = { onHistoryItemRemoveClicked(hintItem) }, + modifier = Modifier.offset(16.dp) + ) { + Icon( + Icons.Rounded.Clear, + contentDescription = "Clear history item" + ) + } + }, + modifier = Modifier + .clickable { + onSearchQueryChange(hintItem.hint) + onSearch(hintItem.hint) + onSearchActiveChange(false) + } + .animateItem() + .fillMaxWidth() + .padding(horizontal = 16.dp) + ) + } + if (suggestionHints.isNotEmpty()) { + item { HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp)) } + } + } + + if (suggestionHints.isNotEmpty()) { + item { + Text( + text = "Suggestions", + style = MaterialTheme.typography.titleSmall, + color = MaterialTheme.colorScheme.primary, + fontWeight = FontWeight.Bold, + modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp) + ) + } + items(suggestionHints, key = { it.hint }) { hintItem -> + ListItem( + colors = ListItemDefaults.colors( + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh + ), + headlineContent = { Text(hintItem.hint) }, + modifier = Modifier + .clickable { + onSearchQueryChange(hintItem.hint) + onSearch(hintItem.hint) + onSearchActiveChange(false) + } + .fillMaxWidth() + .padding(horizontal = 16.dp) + ) + } + } + + if (searchHints.isEmpty() && searchQuery.isBlank()) { + item { + Box( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + contentAlignment = Alignment.Center + ) { + Text("No suggestions available.") + } + } + } + } +} + +@Composable +private fun SearchResultsContent(searchResults: List, searchQuery: String) { + if (searchResults.isNotEmpty()) { + LazyColumn( + modifier = Modifier + .fillMaxSize() + .padding(top = 8.dp) + ) { + itemsIndexed(searchResults) { index, param -> + ParamRow( + modifier = Modifier.animateItem(), + param = param, + showFullName = true, + onParamClicked = {} + ) + + if (index < searchResults.lastIndex) { + HorizontalDivider() + } + } + } + } else if (searchQuery.isNotEmpty()) { + Box( + modifier = Modifier + .fillMaxSize() + .padding(24.dp), + contentAlignment = Alignment.Center + ) { + Text( + text = "No results found for \"$searchQuery\"", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onBackground, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) + } + } else { + Box( + modifier = Modifier + .fillMaxSize() + .padding(24.dp), + contentAlignment = Alignment.Center + ) { + Text( + text = "Enter a query to search for kernel parameters.", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onBackground, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) + } + } +} + +@Composable +@Preview +private fun SearchScreenPreview() { + SysctlGuiTheme { + var searchQuery by remember { mutableStateOf("") } + var searchActive by remember { mutableStateOf(false) } + var searchHints by remember { + mutableStateOf( + listOf( + SearchHint("vm.swappiness", isFromHistory = false), + SearchHint("net.ipv4.tcp_congestion_control", isFromHistory = false), + SearchHint("kernel.panic", isFromHistory = true), + SearchHint("fs.file-max", isFromHistory = true) + ) + ) + } + var searchResults by remember { + mutableStateOf( + listOf( + UiKernelParam( + name = "vm.swappiness", + path = "/proc/sys/vm/swappiness", + isFavorite = false + ), + UiKernelParam( + name = "vm.overcommit_memory", + path = "/proc/sys/vm/overcommit_memory", + value = "1", + isFavorite = true + ), + UiKernelParam( + name = "net.ipv4.tcp_congestion_control", + path = "/proc/sys/net/ipv4/tcp_congestion_control", + value = "cubic" + ) + ) + ) + } + + SearchScreenContent( + searchQuery = searchQuery, + onSearchQueryChange = { searchQuery = it }, + searchActive = searchActive, + onSearchActiveChange = { searchActive = it }, + searchHints = searchHints, + searchResults = searchResults, + onNavigateBack = {}, + onHistoryItemRemoveClicked = { searchHints = searchHints - it }, + onSearch = { + searchResults = searchResults.filter { + it.name.contains(searchQuery, ignoreCase = true) + } + } + ) + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewModel.kt new file mode 100644 index 0000000..b024a89 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewModel.kt @@ -0,0 +1,140 @@ +package com.androidvip.sysctlgui.ui.search + +import androidx.lifecycle.viewModelScope +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.domain.repository.AppPrefs +import com.androidvip.sysctlgui.domain.usecase.GetRuntimeParamsUseCase +import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase +import com.androidvip.sysctlgui.helpers.UiKernelParamMapper +import com.androidvip.sysctlgui.models.SearchHint +import com.androidvip.sysctlgui.models.UiKernelParam +import com.androidvip.sysctlgui.utils.BaseViewModel +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +class SearchViewModel( + private val getUserParams: GetUserParamsUseCase, + private val getRuntimeParams: GetRuntimeParamsUseCase, + private val appPrefs: AppPrefs +) : BaseViewModel() { + private var preSearchJob: Job? = null + private val searchableParams = mutableListOf() + private val searchHistory = mutableSetOf() + + init { + viewModelScope.launch { + setState { copy(loading = true) } + + val fetchedHistory = appPrefs.searchHistory + val fetchedParams = fetchParams() + + searchHistory.addAll(fetchedHistory) + searchableParams.addAll(fetchedParams) + + val uiSearchHints = fetchedHistory.map { SearchHint(hint = it, isFromHistory = true) } + + setState { + copy( + loading = false, + searchHints = uiSearchHints + ) + } + } + } + + override fun createInitialState() = SearchViewState() + + private suspend fun fetchParams(): List { + val userParams = getUserParams() + return getRuntimeParams(userParams).map(UiKernelParamMapper::map) + } + + override fun onEvent(event: SearchViewEvent) { + when (event) { + SearchViewEvent.BackClicked -> setEffect { SearchViewEffect.NavigateBack } + is SearchViewEvent.HistoryItemRemoveClicked -> handleRemoveFromHistory(event.hint) + is SearchViewEvent.SearchRequested -> handleSearch(event.query) + is SearchViewEvent.SearchQueryChange -> handleSearchQueryChange(event.query) + is SearchViewEvent.ParamClicked -> setEffect { + SearchViewEffect.EditKernelParam(event.param) + } + } + } + + private fun handleSearchQueryChange(query: String) { + preSearchJob?.cancel() + if (query.isEmpty()) { + setState { copy(searchResults = emptyList()) } + } else if (query.length >= MIN_PRE_SEARCH_QUERY_LENGTH) { + preSearchJob = viewModelScope.launch { + delay(300L) // Debounce delay + handlePreSearch(query) + } + } + } + + private fun handleSearch(query: String) { + viewModelScope.launch { + setState { copy(loading = true) } + searchHistory.add(query) + appPrefs.addSearchToHistory(query) + + val hints = withContext(Dispatchers.IO) { + val historyHints = searchHistory + .take(MAX_SEARCH_HISTORY) + .map { SearchHint(hint = it, isFromHistory = true) } + + val paramHints = searchableParams + .filter { it.name.contains(query, ignoreCase = true) } + .take(MAX_SEARCH_HINTS) + .map { SearchHint(it.name) } + + historyHints + paramHints + } + + setState { + copy(loading = false, searchHints = hints) + } + } + } + + private fun handlePreSearch(query: String) { + viewModelScope.launch { + val hints = withContext(Dispatchers.IO) { + searchableParams + .filter { it.name.contains(query, ignoreCase = true) } + .map(UiKernelParamMapper::map) + } + + setState { + copy(loading = false, searchResults = hints) + } + } + } + + private fun handleRemoveFromHistory(searchHint: SearchHint) { + viewModelScope.launch { + withContext(Dispatchers.IO) { + appPrefs.removeSearchFromHistory(searchHint.hint) + searchHistory.remove(searchHint.hint) + } + + setState { + copy( + searchHints = searchHistory + .take(MAX_SEARCH_HISTORY) + .map { SearchHint(hint = it, isFromHistory = true) } + ) + } + } + } + + companion object { + private const val MIN_PRE_SEARCH_QUERY_LENGTH = 4 + private const val MAX_SEARCH_HISTORY = 3 + private const val MAX_SEARCH_HINTS = 5 + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewState.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewState.kt new file mode 100644 index 0000000..eea820a --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewState.kt @@ -0,0 +1,23 @@ +package com.androidvip.sysctlgui.ui.search + +import com.androidvip.sysctlgui.models.SearchHint +import com.androidvip.sysctlgui.models.UiKernelParam + +data class SearchViewState( + val loading: Boolean = true, + val searchHints: List = emptyList(), + val searchResults: List = emptyList() +) + +sealed interface SearchViewEvent { + data object BackClicked : SearchViewEvent + data class SearchQueryChange(val query: String) : SearchViewEvent + data class HistoryItemRemoveClicked(val hint: SearchHint) : SearchViewEvent + data class SearchRequested(val query: String) : SearchViewEvent + data class ParamClicked(val param: UiKernelParam) : SearchViewEvent +} + +sealed interface SearchViewEffect { + data object NavigateBack : SearchViewEffect + data class EditKernelParam(val param: UiKernelParam) : SearchViewEffect +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsFragment.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsFragment.kt deleted file mode 100644 index afb695a..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsFragment.kt +++ /dev/null @@ -1,120 +0,0 @@ -package com.androidvip.sysctlgui.ui.settings - -import android.app.NotificationManager -import android.content.Context -import android.os.Build -import android.os.Bundle -import androidx.activity.result.contract.ActivityResultContracts -import androidx.lifecycle.lifecycleScope -import androidx.preference.Preference -import androidx.preference.PreferenceFragmentCompat -import androidx.preference.SwitchPreferenceCompat -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.utils.RootUtils -import com.androidvip.sysctlgui.domain.repository.AppPrefs -import com.androidvip.sysctlgui.helpers.StartUpServiceToggle -import com.androidvip.sysctlgui.utils.Consts -import com.google.android.material.color.DynamicColors -import kotlinx.coroutines.launch -import org.koin.android.ext.android.inject - -class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener { - private val prefs: AppPrefs by inject() - private val rootUtils: RootUtils by inject() - - private val notificationPermissionLauncher = - registerForActivityResult(ActivityResultContracts.RequestPermission()) { _ -> } - - override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { - setPreferencesFromResource(R.xml.preferences, rootKey) - - val currCommitMode = prefs.commitMode - val commitModePref = findPreference(Consts.Prefs.COMMIT_MODE) - commitModePref?.summary = if (currCommitMode == "sysctl") { - "Use sysctl -w" - } else { - "Use echo 'value' > /proc/sys/…" - } - - val startupDelay = prefs.startUpDelay - val startupDelayPref = findPreference(Consts.Prefs.START_UP_DELAY) - - startupDelayPref?.summary = if (startupDelay > 0) { - getString(R.string.startup_delay_sum, startupDelay) - } else { - getString(R.string.startup_delay_disabled) - } - - val useBusyboxPref = findPreference(Consts.Prefs.USE_BUSYBOX) as SwitchPreferenceCompat? - lifecycleScope.launch { - if (rootUtils.isBusyboxAvailable()) { - useBusyboxPref?.isEnabled = true - } else { - useBusyboxPref?.isChecked = false - useBusyboxPref?.isEnabled = false - } - } - - val dynamicColorsPref = findPreference(Consts.Prefs.DYNAMIC_COLORS) as SwitchPreferenceCompat? - dynamicColorsPref?.isEnabled = DynamicColors.isDynamicColorAvailable() - - commitModePref?.onPreferenceChangeListener = this - startupDelayPref?.onPreferenceChangeListener = this - dynamicColorsPref?.onPreferenceChangeListener = this - findPreference(Consts.Prefs.RUN_ON_START_UP)?.onPreferenceChangeListener = this - findPreference(Consts.Prefs.FORCE_DARK_THEME)?.onPreferenceChangeListener = this - } - - override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean { - when (preference.key) { - Consts.Prefs.RUN_ON_START_UP -> { - StartUpServiceToggle.toggleStartUpService(requireContext(), newValue == true) - askForNotificationPermission() - } - - Consts.Prefs.COMMIT_MODE -> { - preference.summary = if (newValue == "sysctl") { - "Use sysctl -w" - } else { - "Use echo 'value' > /proc/sys/…" - } - } - - Consts.Prefs.START_UP_DELAY -> { - val selectedValue = (newValue as? Int) ?: 0 - - preference.summary = if (selectedValue > 0) { - getString(R.string.startup_delay_sum, selectedValue) - } else { - getString(R.string.startup_delay_disabled) - } - } - - Consts.Prefs.FORCE_DARK_THEME -> { - requireActivity().recreate() - } - - Consts.Prefs.DYNAMIC_COLORS -> { - if (newValue == true) { - DynamicColors.applyToActivitiesIfAvailable(requireActivity().application) - } - requireActivity().recreate() - } - } - - return true - } - - private fun askForNotificationPermission() { - val manager = requireContext().getSystemService(Context.NOTIFICATION_SERVICE) - as NotificationManager - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - if (!manager.areNotificationsEnabled()) { - notificationPermissionLauncher.launch( - android.Manifest.permission.POST_NOTIFICATIONS - ) - } - } - } -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt new file mode 100644 index 0000000..534a37e --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt @@ -0,0 +1,233 @@ +package com.androidvip.sysctlgui.ui.settings + +import android.Manifest +import android.content.pm.PackageManager +import android.os.Build +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.tooling.preview.PreviewLightDark +import androidx.compose.ui.unit.dp +import androidx.core.content.ContextCompat +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.androidvip.sysctlgui.data.Prefs +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.domain.enums.CommitMode +import com.androidvip.sysctlgui.domain.enums.SettingItemType +import com.androidvip.sysctlgui.domain.models.AppSetting +import com.androidvip.sysctlgui.ui.main.MainViewEvent +import com.androidvip.sysctlgui.ui.main.MainViewModel +import com.androidvip.sysctlgui.ui.main.MainViewState +import com.androidvip.sysctlgui.ui.settings.components.HeaderComponent +import com.androidvip.sysctlgui.ui.settings.components.SliderSettingComponent +import com.androidvip.sysctlgui.ui.settings.components.SwitchSettingComponent +import com.androidvip.sysctlgui.ui.settings.components.TextSettingComponent +import com.androidvip.sysctlgui.ui.settings.model.SettingsViewEffect +import com.androidvip.sysctlgui.ui.settings.model.SettingsViewEvent +import org.koin.androidx.compose.koinViewModel + +internal const val DISABLED_ALPHA = 0.38f + +@Composable +internal fun SettingsScreen( + mainViewModel: MainViewModel = koinViewModel(), + viewModel: SettingsViewModel = koinViewModel(), + onNavigateToUserParams: () -> Unit +) { + val state = viewModel.uiState.collectAsStateWithLifecycle() + val context = LocalContext.current + var hasNotificationPermission by remember { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + mutableStateOf( + ContextCompat.checkSelfPermission( + context, + Manifest.permission.POST_NOTIFICATIONS + ) == PackageManager.PERMISSION_GRANTED + ) + } else { + mutableStateOf(true) + } + } + + val permissionLauncher = rememberLauncherForActivityResult( + contract = ActivityResultContracts.RequestPermission(), + onResult = { isGranted -> + hasNotificationPermission = isGranted + } + ) + + + LaunchedEffect(Unit) { + mainViewModel.onEvent( + MainViewEvent.OnSateChangeRequested( + MainViewState( + showTopBar = true, + showNavBar = true, + ) + ) + ) + } + + LaunchedEffect(Unit) { + viewModel.effect.collect { effect -> + when (effect) { + SettingsViewEffect.RequestNotificationPermission -> { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + if (!hasNotificationPermission) { + permissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS) + } + } + } + } + } + } + + SettingsScreenContent( + settings = state.value.settings, + onNavigateToUserParams = onNavigateToUserParams, + onValueChanged = { appSetting, newValue -> + viewModel.onEvent(SettingsViewEvent.SettingValueChanged(appSetting, newValue)) + } + ) +} + +@Composable +private fun SettingsScreenContent( + settings: List> = emptyList(), + onNavigateToUserParams: () -> Unit, + onValueChanged: (AppSetting<*>, Any) -> Unit +) { + val groupedSettings = settings.groupBy { it.category } + LazyColumn(modifier = Modifier.fillMaxWidth()) { + groupedSettings.forEach { (category, settings) -> + item { + Text( + text = category, + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.primary, + modifier = Modifier.padding( + top = 8.dp, + bottom = 8.dp, + start = 56.dp, + end = 16.dp, + ) + ) + } + items(settings.size) { + val appSetting = settings[it] + when (appSetting.type) { + SettingItemType.Text -> { + HeaderComponent( + modifier = Modifier.fillMaxWidth(), + appSetting = appSetting, + onClick = onNavigateToUserParams + ) + } + SettingItemType.List -> { + TextSettingComponent( + modifier = Modifier.fillMaxWidth(), + appSetting = appSetting, + onValueChange = { newValue -> + onValueChanged(appSetting, newValue) + } + ) + } + SettingItemType.Switch -> { + SwitchSettingComponent( + modifier = Modifier.fillMaxWidth(), + appSetting = appSetting, + onValueChange = { newValue -> + onValueChanged(appSetting, newValue) + } + ) + } + SettingItemType.Slider -> { + SliderSettingComponent( + modifier = Modifier.fillMaxWidth(), + appSetting = appSetting, + onValueChange = { newValue -> + onValueChanged(appSetting, newValue) + } + ) + } + } + } + } + } +} + +@Composable +@PreviewLightDark +internal fun SettingsScreenPreview() { + SysctlGuiTheme { + val settings = listOf( + /////////// GENERAL SETTINGS //////////// + AppSetting( + key = Prefs.ListFoldersFirst.key, + value = true, + category = "General", + title = "List folders first", + description = "List folders first when using the kernel parameter browser option", + type = SettingItemType.Switch, + ), + + /////////// THEME SETTINGS //////////// + + AppSetting( + key = Prefs.ContrastLevel.key, + value = 1, + category = "Theme", + title = "Contrast level", + description = "Contrast level for the theme colors", + type = SettingItemType.Slider, + values = listOf(1, 2, 3), + ), + + /////////// COMMIT SETTINGS //////////// + + AppSetting( + key = Prefs.CommitMode.key, + value = "sysctl", + category = "Operations", + title = "Commit mode", + description = "Command used when applying the parameter value", + type = SettingItemType.List, + values = listOf( + CommitMode.SYSCTL.name.lowercase(), + CommitMode.ECHO.name.lowercase(), + ) + ), + + /////////// STARTUP SETTINGS //////////// + AppSetting( + key = "", + value = Unit, + category = "Startup", + title = "Manage parameters", + description = "Manage the parameters that will be applied at startup", + type = SettingItemType.Text, + ) + ) + Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { + SettingsScreenContent( + settings = settings, + onNavigateToUserParams = {}, + onValueChanged = { _, _ -> } + ) + } + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsViewModel.kt new file mode 100644 index 0000000..0828835 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsViewModel.kt @@ -0,0 +1,68 @@ +package com.androidvip.sysctlgui.ui.settings + +import android.content.SharedPreferences +import androidx.core.content.edit +import androidx.lifecycle.viewModelScope +import com.androidvip.sysctlgui.data.Prefs +import com.androidvip.sysctlgui.domain.enums.SettingItemType +import com.androidvip.sysctlgui.domain.usecase.GetAppSettingsUseCase +import com.androidvip.sysctlgui.ui.settings.model.SettingsViewEffect +import com.androidvip.sysctlgui.ui.settings.model.SettingsViewEvent +import com.androidvip.sysctlgui.ui.settings.model.SettingsViewState +import com.androidvip.sysctlgui.utils.BaseViewModel +import kotlinx.coroutines.launch + +class SettingsViewModel( + private val sharedPreferences: SharedPreferences, + private val getSettings: GetAppSettingsUseCase +) : BaseViewModel() { + + init { + viewModelScope.launch { + val settings = getSettings() + setState { copy(settings = settings) } + } + } + + override fun createInitialState() = SettingsViewState() + + override fun onEvent(event: SettingsViewEvent) { + when (event) { + is SettingsViewEvent.SettingValueChanged<*> -> { + if (event.appSetting.type == SettingItemType.Text) return + if (event.appSetting.key.isEmpty()) return + + when (event.newValue) { + is Boolean -> sharedPreferences.edit { + putBoolean(event.appSetting.key, event.newValue) + } + + is Int -> sharedPreferences.edit { + putInt(event.appSetting.key, event.newValue) + } + + is Long -> sharedPreferences.edit { + putLong(event.appSetting.key, event.newValue) + } + + is Float -> sharedPreferences.edit { + putFloat(event.appSetting.key, event.newValue) + } + + is String -> sharedPreferences.edit { + putString(event.appSetting.key, event.newValue) + } + + is List<*> -> sharedPreferences.edit { + val stringValues = event.newValue.filterIsInstance().toSet() + putStringSet(event.appSetting.key, stringValues) + } + } + + if (event.appSetting.key == Prefs.RunOnStartup.key) { + setEffect { SettingsViewEffect.RequestNotificationPermission } + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/HeaderComponent.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/HeaderComponent.kt new file mode 100644 index 0000000..2c7c59a --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/HeaderComponent.kt @@ -0,0 +1,46 @@ +package com.androidvip.sysctlgui.ui.settings.components + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.androidvip.sysctlgui.domain.models.AppSetting + +@Composable +fun HeaderComponent( + modifier: Modifier = Modifier, + appSetting: AppSetting<*>, + onClick: () -> Unit, + icon: @Composable (() -> Unit)? = null +) { + Box(modifier = modifier.clickable(onClick = onClick)) { + Row( + modifier = Modifier.padding(all = 16.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(space = 16.dp) + ) { + + Box( + modifier = Modifier + .align(Alignment.CenterVertically) + .size(24.dp) + ) { + icon?.invoke() + } + + SettingsComponentColumn( + title = appSetting.title, + description = appSetting.description, + enabled = appSetting.enabled, + modifier = Modifier.fillMaxWidth() + ) + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/SettingsComponentColumn.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/SettingsComponentColumn.kt new file mode 100644 index 0000000..29e877a --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/SettingsComponentColumn.kt @@ -0,0 +1,45 @@ +package com.androidvip.sysctlgui.ui.settings.components + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.androidvip.sysctlgui.ui.settings.DISABLED_ALPHA + +@Composable +internal fun SettingsComponentColumn( + modifier: Modifier = Modifier, + title: String, + description: String? = null, + enabled: Boolean = true, + bottomContent: @Composable (ColumnScope.() -> Unit)? = null +) { + Column( + verticalArrangement = Arrangement.Center, + modifier = modifier + ) { + Text( + text = title, + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onBackground + .copy(alpha = if (enabled) 1f else DISABLED_ALPHA) + ) + description?.let { + Text( + text = it, + modifier = Modifier.padding(top = 2.dp), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onBackground + .copy(alpha = if (enabled) 0.8f else DISABLED_ALPHA) + ) + } + bottomContent?.let { + bottomContent() + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/SliderSettingComponent.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/SliderSettingComponent.kt new file mode 100644 index 0000000..c2e563b --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/SliderSettingComponent.kt @@ -0,0 +1,89 @@ +package com.androidvip.sysctlgui.ui.settings.components + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Slider +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf +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.tooling.preview.PreviewLightDark +import androidx.compose.ui.unit.dp +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.domain.enums.SettingItemType +import com.androidvip.sysctlgui.domain.models.AppSetting + +@Composable +fun SliderSettingComponent( + modifier: Modifier = Modifier, + appSetting: AppSetting<*>, + onValueChange: (Int) -> Unit, + icon: @Composable (() -> Unit)? = null +) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = modifier.padding(all = 16.dp), + horizontalArrangement = Arrangement.spacedBy(space = 16.dp) + ) { + Box( + modifier = Modifier + .align(Alignment.CenterVertically) + .size(24.dp) + ) { + icon?.invoke() + } + + val values = appSetting.values?.filterIsInstance() ?: emptyList() + val minValue = values.min().toFloat() + val maxValue = values.max().toFloat() + var value by remember { + mutableFloatStateOf((appSetting.value as? Int)?.toFloat() ?: minValue) + } + + SettingsComponentColumn( + title = appSetting.title, + description = appSetting.description + " (${value.toInt()})", + enabled = appSetting.enabled, + modifier = Modifier.fillMaxWidth() + ) { + Slider( + modifier = Modifier.padding(top = 4.dp), + value = value, + enabled = appSetting.enabled, + onValueChange = { value = it.toInt().toFloat(); onValueChange(it.toInt()) }, + valueRange = minValue..maxValue, + ) + } + } +} + +@Composable +@PreviewLightDark +fun SliderSettingComponentPreview() { + SysctlGuiTheme(dynamicColor = true) { + Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { + SliderSettingComponent( + appSetting = AppSetting( + key = "key", + title = "Title", + description = "Description", + value = 0, + category = "", + type = SettingItemType.Slider, + values = (0..10).toList(), + ), + onValueChange = {} + ) + } + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/SwitchSettingComponent.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/SwitchSettingComponent.kt new file mode 100644 index 0000000..09a1369 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/SwitchSettingComponent.kt @@ -0,0 +1,91 @@ +package com.androidvip.sysctlgui.ui.settings.components + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Switch +import androidx.compose.runtime.Composable +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.tooling.preview.PreviewLightDark +import androidx.compose.ui.unit.dp +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.domain.enums.SettingItemType +import com.androidvip.sysctlgui.domain.models.AppSetting + +@Composable +fun SwitchSettingComponent( + modifier: Modifier = Modifier, + appSetting: AppSetting<*>, + onValueChange: (newValue: Boolean) -> Unit, + icon: @Composable (() -> Unit)? = null +) { + var checked by remember { mutableStateOf(appSetting.value as? Boolean) } + + Row( + modifier = modifier + .padding(all = 16.dp) + .clickable(enabled = appSetting.enabled) { + onValueChange(!(checked ?: false)) + checked = !(checked ?: false) + }, + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(space = 16.dp) + ) { + Box( + modifier = Modifier + .align(Alignment.CenterVertically) + .size(24.dp) + ) { + icon?.invoke() + } + + SettingsComponentColumn( + title = appSetting.title, + description = appSetting.description, + enabled = appSetting.enabled, + modifier = Modifier + .weight(1f) + .padding(end = 16.dp) + ) + + Switch( + checked = checked == true, + onCheckedChange = { + onValueChange(it) + checked = it + }, + enabled = appSetting.enabled, + modifier = Modifier.align(Alignment.CenterVertically) + ) + } +} + +@Composable +@PreviewLightDark +fun SwitchSettingComponentPreview() { + SysctlGuiTheme(dynamicColor = true) { + Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { + SwitchSettingComponent( + appSetting = AppSetting( + key = "key", + title = "Title", + description = "Description", + value = true, + category = "", + type = SettingItemType.Switch + ), + onValueChange = {} + ) + } + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/TextSettingComponent.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/TextSettingComponent.kt new file mode 100644 index 0000000..f8b1071 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/TextSettingComponent.kt @@ -0,0 +1,111 @@ +package com.androidvip.sysctlgui.ui.settings.components + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +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.tooling.preview.PreviewLightDark +import androidx.compose.ui.unit.dp +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.domain.enums.SettingItemType +import com.androidvip.sysctlgui.domain.models.AppSetting + +@Composable +fun TextSettingComponent( + modifier: Modifier = Modifier, + appSetting: AppSetting<*>, + onValueChange: (String) -> Unit, + icon: @Composable (() -> Unit)? = null +) { + var expanded by remember { mutableStateOf(false) } + + Box( + modifier = modifier + .clickable(enabled = appSetting.enabled && appSetting.type == SettingItemType.List) { + expanded = true + } + ) { + Row( + modifier = Modifier.padding(all = 16.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(space = 16.dp) + ) { + + Box( + modifier = Modifier + .align(Alignment.CenterVertically) + .size(24.dp) + ) { + icon?.invoke() + } + + SettingsComponentColumn( + title = appSetting.title, + description = appSetting.description, + enabled = appSetting.enabled, + modifier = Modifier.fillMaxWidth() + ) + } + } + + + DropdownMenu( + expanded = expanded, + onDismissRequest = { expanded = false } + ) { + appSetting.values?.forEach { item -> + DropdownMenuItem( + text = { + Text( + text = item as String, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface + ) + }, + onClick = { + onValueChange(item as String) + expanded = false + } + ) + } + } +} + +@Composable +@PreviewLightDark +private fun TextSettingComponentPreview() { + SysctlGuiTheme(dynamicColor = true) { + Box(modifier = Modifier + .fillMaxSize() + .background(MaterialTheme.colorScheme.background)) { + TextSettingComponent( + appSetting = AppSetting( + key = "key", + title = "Title", + description = "Description", + value = "sysctl", + category = "", + values = listOf("sysctl", "echo"), + type = SettingItemType.List + ), + onValueChange = {} + ) + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/model/SettingsViewEvent.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/model/SettingsViewEvent.kt new file mode 100644 index 0000000..21a61b8 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/model/SettingsViewEvent.kt @@ -0,0 +1,15 @@ +package com.androidvip.sysctlgui.ui.settings.model + +import com.androidvip.sysctlgui.domain.models.AppSetting + +sealed interface SettingsViewEvent { + class SettingValueChanged(val appSetting: AppSetting, val newValue: Any) : SettingsViewEvent +} + +sealed interface SettingsViewEffect { + object RequestNotificationPermission : SettingsViewEffect +} + +data class SettingsViewState( + val settings: List> = emptyList() +) diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartActivity.kt index 308f14b..5fe650c 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartActivity.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartActivity.kt @@ -4,49 +4,44 @@ import android.content.Intent import android.os.Build import android.os.Bundle import android.widget.Toast +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.lifecycle.lifecycleScope import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.models.KernelParam import com.androidvip.sysctlgui.data.utils.RootUtils import com.androidvip.sysctlgui.databinding.ActivitySplashBinding -import com.androidvip.sysctlgui.domain.usecase.PerformDatabaseMigrationUseCase +import com.androidvip.sysctlgui.domain.enums.Actions +import com.androidvip.sysctlgui.domain.repository.AppPrefs import com.androidvip.sysctlgui.goAway -import com.androidvip.sysctlgui.helpers.Actions import com.androidvip.sysctlgui.toast -import com.androidvip.sysctlgui.ui.base.BaseAppCompatActivity import com.androidvip.sysctlgui.ui.main.MainActivity -import com.androidvip.sysctlgui.ui.params.edit.EditKernelParamActivity -import com.topjohnwu.superuser.Shell -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext import org.koin.android.ext.android.inject -class StartActivity : BaseAppCompatActivity() { +class StartActivity : AppCompatActivity() { private lateinit var binding: ActivitySplashBinding private val rootUtils: RootUtils by inject() - private val performDatabaseMigrationUseCase: PerformDatabaseMigrationUseCase by inject() - private val dispatcher: CoroutineDispatcher by lazy { Dispatchers.Default } + private val prefs: AppPrefs by inject() override fun onCreate(savedInstanceState: Bundle?) { val splashScreen = installSplashScreen() super.onCreate(savedInstanceState) + enableEdgeToEdge() splashScreen.setKeepOnScreenCondition { true } binding = ActivitySplashBinding.inflate(layoutInflater) setContentView(binding.root) lifecycleScope.launch { + rootUtils.getRootShell() val isRootAccessGiven = checkRootAccess() binding.splashStatusText.setText(R.string.splash_status_checking_busybox) val isBusyBoxAvailable = checkBusyBox() binding.splashStatusText.setText(R.string.splash_status_checking_migration) - checkForDatabaseMigration() if (isRootAccessGiven) { if (!isBusyBoxAvailable) { @@ -67,23 +62,14 @@ class StartActivity : BaseAppCompatActivity() { } } - private suspend fun checkRootAccess() = withContext(dispatcher) { + private suspend fun checkRootAccess(): Boolean { delay(500) - Shell.rootAccess() + return rootUtils.isRootAvailable() } - private suspend fun checkBusyBox() = rootUtils.isBusyboxAvailable().also { + private suspend fun checkBusyBox(): Boolean { delay(500) - } - - private suspend fun checkForDatabaseMigration() { - delay(500) - if (!prefs.migrationCompleted) { - binding.splashStatusText.setText(R.string.splash_status_performing_migration) - - val result = runCatching { performDatabaseMigrationUseCase() } - prefs.migrationCompleted = result.isSuccess - } + return rootUtils.isBusyboxAvailable() } private fun navigate() { @@ -100,7 +86,9 @@ class StartActivity : BaseAppCompatActivity() { } Actions.EditParam.name -> { - Intent(this, EditKernelParamActivity::class.java).apply { + Intent(this, MainActivity::class.java) + // TODO: handle edit param intent + /*Intent(this, EditKernelParamActivity::class.java).apply { putExtra( EditKernelParamActivity.EXTRA_PARAM, intent.extras!!.getParcelable( @@ -114,7 +102,7 @@ class StartActivity : BaseAppCompatActivity() { false ) ) - } + }*/ } else -> { diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartErrorActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartErrorActivity.kt index 6c9b9ea..5602352 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartErrorActivity.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartErrorActivity.kt @@ -4,12 +4,12 @@ import android.content.Intent import android.graphics.drawable.AnimatedVectorDrawable import android.os.Bundle import android.os.Handler +import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import com.androidvip.sysctlgui.R import com.androidvip.sysctlgui.databinding.ActivityStartErrorBinding -import com.androidvip.sysctlgui.ui.base.BaseAppCompatActivity -class StartErrorActivity : BaseAppCompatActivity() { +class StartErrorActivity : AppCompatActivity() { private lateinit var binding: ActivityStartErrorBinding override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/tasker/TaskerPluginActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/tasker/TaskerPluginActivity.kt index 65b0e85..c3b59d5 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/tasker/TaskerPluginActivity.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/tasker/TaskerPluginActivity.kt @@ -1,6 +1,5 @@ package com.androidvip.sysctlgui.ui.tasker -import android.app.Activity import android.content.Intent import android.os.Bundle import android.view.MenuItem @@ -8,11 +7,10 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.os.bundleOf import com.androidvip.sysctlgui.databinding.ActivityTaskerPluginBinding import com.androidvip.sysctlgui.receivers.TaskerReceiver -import com.androidvip.sysctlgui.ui.base.BaseAppCompatActivity import kotlin.contracts.ExperimentalContracts @ExperimentalContracts -class TaskerPluginActivity : BaseAppCompatActivity() { +class TaskerPluginActivity : AppCompatActivity() { private lateinit var binding: ActivityTaskerPluginBinding override fun onCreate(savedInstanceState: Bundle?) { @@ -32,7 +30,7 @@ class TaskerPluginActivity : BaseAppCompatActivity() { putExtra(TaskerReceiver.EXTRA_BUNDLE, resultBundle) } - setResult(Activity.RESULT_OK, resultIntent) + setResult(RESULT_OK, resultIntent) finish() } } diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt new file mode 100644 index 0000000..8043c5d --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt @@ -0,0 +1,262 @@ +package com.androidvip.sysctlgui.ui.user + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.core.tween +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.shrinkVertically +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.SwipeToDismissBox +import androidx.compose.material3.SwipeToDismissBoxValue +import androidx.compose.material3.Text +import androidx.compose.material3.rememberSwipeToDismissBoxState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +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.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.domain.models.KernelParam +import com.androidvip.sysctlgui.models.UiKernelParam +import com.androidvip.sysctlgui.ui.main.MainViewEffect +import com.androidvip.sysctlgui.ui.main.MainViewEvent +import com.androidvip.sysctlgui.ui.main.MainViewModel +import com.androidvip.sysctlgui.ui.main.MainViewState +import com.androidvip.sysctlgui.ui.params.browse.ParamFileRow +import kotlinx.coroutines.delay +import org.koin.compose.viewmodel.koinViewModel +import kotlin.time.Duration.Companion.milliseconds + +const val ANIMATION_DURATION = 300 + +@Composable +fun UserParamsScreen( + mainViewModel: MainViewModel = koinViewModel(), + viewModel: UserParamsViewModel = koinViewModel(), + filterPredicate: (UiKernelParam) -> Boolean = { true }, + onParamSelected: (KernelParam) -> Unit, +) { + val context = LocalContext.current + val state by viewModel.uiState.collectAsStateWithLifecycle() + + LaunchedEffect(Unit) { + viewModel.onEvent(UserParamsViewEvent.ScreenLoaded(filterPredicate)) + + mainViewModel.onEvent( + MainViewEvent.OnSateChangeRequested( + MainViewState( + showTopBar = true, + showNavBar = true, + showBackButton = false, + showSearchAction = true + ) + ) + ) + + mainViewModel.effect.collect { effect -> + if (effect is MainViewEffect.ActUponSckbarActionPerformed) { + viewModel.onEvent(UserParamsViewEvent.ParamRestoreRequested) + } + } + } + + LaunchedEffect(viewModel.effect) { + viewModel.effect.collect { effect -> + when (effect) { + is UserParamsViewEffect.ShowParamDetails -> { + onParamSelected(effect.param) + } + + is UserParamsViewEffect.ShowUndoSnackBar -> { + mainViewModel.onEvent( + MainViewEvent.ShowSnackbarRequested( + message = context.getString(R.string.favorite_param_deleted_format, effect.param.name), + actionLabel = context.getString(R.string.undo) + ) + ) + } + } + } + } + + FavoritesScreenContent( + favoriteParams = state.userParams, + loading = state.loading, + onParamClicked = { + viewModel.onEvent(UserParamsViewEvent.ParamClicked(it)) + }, + onParamDeleteRequested = { + viewModel.onEvent(UserParamsViewEvent.ParamDeleteRequested(it)) + } + ) +} + +@Composable +private fun FavoritesScreenContent( + favoriteParams: List, + loading: Boolean, + onParamClicked: (UiKernelParam) -> Unit, + onParamDeleteRequested: (UiKernelParam) -> Unit +) { + val listState = rememberLazyListState() + + AnimatedVisibility(visible = loading, enter = fadeIn(), exit = fadeOut()) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + CircularProgressIndicator() + } + } + + if (favoriteParams.isEmpty() && !loading) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(32.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Icon( + painter = painterResource(R.drawable.ic_heart_broken), + contentDescription = "Empty", + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.size(128.dp) + ) + // TODO: Empty state image + Text( + text = "No favorites added", + style = MaterialTheme.typography.titleLarge, + color = MaterialTheme.colorScheme.onBackground, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) + } + return + } + + LazyColumn( + state = listState, + modifier = Modifier.fillMaxSize() + ) { + items( + count = favoriteParams.size, + key = { index -> favoriteParams[index].name } + ) { index -> + val param = favoriteParams[index] + var showParam by remember { mutableStateOf(true) } + val dismissState = rememberSwipeToDismissBoxState() + + LaunchedEffect(showParam, param) { + if (!showParam) { + delay(ANIMATION_DURATION.milliseconds) + onParamDeleteRequested(param) + } + } + + AnimatedVisibility( + visible = showParam, + exit = shrinkVertically( + animationSpec = tween(durationMillis = ANIMATION_DURATION), + shrinkTowards = Alignment.Top + ) + fadeOut(animationSpec = tween(durationMillis = ANIMATION_DURATION)) + ) { + val swipeBackgroundColor = MaterialTheme.colorScheme.errorContainer + val swipeContentColor = MaterialTheme.colorScheme.onErrorContainer + + SwipeToDismissBox( + state = dismissState, + enableDismissFromStartToEnd = false, + enableDismissFromEndToStart = true, + onDismiss = { showParam = false }, + backgroundContent = { + val color = when (dismissState.dismissDirection) { + SwipeToDismissBoxValue.EndToStart -> swipeBackgroundColor + else -> Color.Transparent + } + Box( + modifier = Modifier + .fillMaxSize() + .background(color) + .padding(horizontal = 16.dp), + contentAlignment = Alignment.CenterEnd + ) { + Icon( + painter = painterResource(R.drawable.ic_delete_sweep), + contentDescription = "Delete", + tint = swipeContentColor + ) + } + } + ) { + ParamFileRow( + modifier = Modifier.background(MaterialTheme.colorScheme.background), + param = param, + showFavoriteIcon = false, + onParamClicked = onParamClicked + ) + } + } + + if (index < favoriteParams.lastIndex && showParam) { + HorizontalDivider() + } + } + } +} + +@Composable +@Preview +private fun FavoriteScreenContentPreview() { + val params = listOf( + UiKernelParam( + name = "vm.swappiness", + path = "/proc/sys/vm/swappiness", + value = "100", + isFavorite = true + ), + UiKernelParam( + name = "vm.overcommit_memory", + path = "/proc/sys/vm/overcommit_memory", + value = "1", + isFavorite = true + ), + UiKernelParam( + name = "vm.overcommit_ratio", + path = "/proc/sys/vm/overcommit_ratio", + value = "2", + isFavorite = true + ) + ) + SysctlGuiTheme(dynamicColor = true) { + Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { + FavoritesScreenContent( + favoriteParams = params, + loading = false, + onParamClicked = {}, + onParamDeleteRequested = {} + ) + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsViewModel.kt new file mode 100644 index 0000000..cff23a5 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsViewModel.kt @@ -0,0 +1,69 @@ +package com.androidvip.sysctlgui.ui.user + +import androidx.lifecycle.viewModelScope +import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase +import com.androidvip.sysctlgui.domain.usecase.RemoveUserParamUseCase +import com.androidvip.sysctlgui.domain.usecase.UpsertUserParamUseCase +import com.androidvip.sysctlgui.helpers.UiKernelParamMapper +import com.androidvip.sysctlgui.models.UiKernelParam +import com.androidvip.sysctlgui.utils.BaseViewModel +import kotlinx.coroutines.launch + +class UserParamsViewModel( + private val getUserParams: GetUserParamsUseCase, + private val removeParam: RemoveUserParamUseCase, + private val upsertParam: UpsertUserParamUseCase, +) : BaseViewModel() { + override fun createInitialState() = UserParamsViewState() + + private var mostRecentlyRemovedParam: UiKernelParam? = null + + override fun onEvent(event: UserParamsViewEvent) { + when (event) { + is UserParamsViewEvent.ScreenLoaded -> loadParams(event.filterPredicate) + + is UserParamsViewEvent.ParamClicked -> setEffect { + UserParamsViewEffect.ShowParamDetails(event.param) + } + + is UserParamsViewEvent.ParamDeleteRequested -> removeParam(event.param) + + is UserParamsViewEvent.ParamRestoreRequested -> { + mostRecentlyRemovedParam?.let { reAddParam(it) } + } + } + } + + private fun loadParams(predicate: (UiKernelParam) -> Boolean) { + viewModelScope.launch { + val params = getUserParams() + .map(UiKernelParamMapper::map) + .filter(predicate) + setState { copy(userParams = params) } + } + } + + private fun removeParam(param: UiKernelParam) { + viewModelScope.launch { + runCatching { + removeParam.invoke(param) + }.onSuccess { + setState { copy(userParams = userParams - param) } + setEffect { UserParamsViewEffect.ShowUndoSnackBar(param) } + mostRecentlyRemovedParam = param + } + } + } + + private fun reAddParam(param: UiKernelParam) { + viewModelScope.launch { + runCatching { + val newId = upsertParam(param) + require(newId > 0) + }.onSuccess { + setState { copy(userParams = userParams + param) } + mostRecentlyRemovedParam = null + } + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsViewState.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsViewState.kt new file mode 100644 index 0000000..c460907 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsViewState.kt @@ -0,0 +1,20 @@ +package com.androidvip.sysctlgui.ui.user + +import com.androidvip.sysctlgui.models.UiKernelParam + +data class UserParamsViewState( + val userParams: List = emptyList(), + val loading: Boolean = true +) + +sealed interface UserParamsViewEvent { + data class ScreenLoaded(val filterPredicate: (UiKernelParam) -> Boolean) : UserParamsViewEvent + data class ParamClicked(val param: UiKernelParam) : UserParamsViewEvent + data class ParamDeleteRequested(val param: UiKernelParam) : UserParamsViewEvent + data object ParamRestoreRequested : UserParamsViewEvent +} + +sealed interface UserParamsViewEffect { + data class ShowParamDetails(val param: UiKernelParam) : UserParamsViewEffect + data class ShowUndoSnackBar(val param: UiKernelParam) : UserParamsViewEffect +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/utils/DataBindingUtils.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/utils/DataBindingUtils.kt deleted file mode 100644 index 289ec2a..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/utils/DataBindingUtils.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.androidvip.sysctlgui.utils - -import androidx.annotation.DrawableRes -import androidx.appcompat.widget.AppCompatImageView -import androidx.databinding.BindingAdapter - -@BindingAdapter("binding:srcCompatRes") -fun AppCompatImageView.setImageResourceCompat(@DrawableRes res: Int) { - setImageResource(res) -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/utils/KernelParamUtils.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/utils/KernelParamUtils.kt deleted file mode 100644 index ef59fdb..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/utils/KernelParamUtils.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.androidvip.sysctlgui.utils - -import android.content.Context -import android.net.Uri -import com.androidvip.sysctlgui.domain.models.DomainKernelParam -import com.google.gson.Gson -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext -import java.io.FileOutputStream - -// TODO: move to repository -object KernelParamUtils { - - suspend fun writeParamsToUri( - context: Context, - params: List, - uri: Uri - ) = withContext(Dispatchers.IO) { - return@withContext runCatching { - context.contentResolver.openFileDescriptor(uri, "w")?.use { - FileOutputStream(it.fileDescriptor).use { fileOutputStream -> - fileOutputStream.write(Gson().toJson(params).toByteArray()) - } - } - true - }.getOrElse { - it.printStackTrace() - false - } - } - -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/utils/ThemeExt.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/utils/ThemeExt.kt deleted file mode 100644 index f05ffeb..0000000 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/utils/ThemeExt.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.androidvip.sysctlgui.utils - -import android.app.Activity -import androidx.compose.runtime.Composable -import androidx.fragment.app.Fragment -import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme -import com.androidvip.sysctlgui.domain.repository.AppPrefs -import org.koin.android.ext.android.get - -@Composable -fun Activity.ComposeTheme(content: @Composable () -> Unit) { - val prefs: AppPrefs = get() - SysctlGuiTheme( - forceDark = prefs.forceDark, - dynamicColor = prefs.dynamicColors, - content = content - ) -} - -@Composable -fun Fragment.ComposeTheme(content: @Composable () -> Unit) { - val prefs: AppPrefs = get() - SysctlGuiTheme( - forceDark = prefs.forceDark, - dynamicColor = prefs.dynamicColors, - content = content - ) -} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoriteWidgetParamUpdater.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoriteWidgetParamUpdater.kt index 82a3ac6..c2a67f0 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoriteWidgetParamUpdater.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoriteWidgetParamUpdater.kt @@ -5,7 +5,6 @@ import android.appwidget.AppWidgetManager import android.content.ComponentName import android.content.Context import android.content.Intent -import android.os.Build import com.androidvip.sysctlgui.data.repository.ParamsRepositoryImpl class FavoriteWidgetParamUpdater(private val context: Context) : @@ -19,11 +18,7 @@ class FavoriteWidgetParamUpdater(private val context: Context) : if (idArray.isEmpty()) return - val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT - } else { - PendingIntent.FLAG_UPDATE_CURRENT - } + val flags = PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT idArray.forEach { intentUpdate.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, intArrayOf(it)) diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidget.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidget.kt index a02911d..afec2c9 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidget.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidget.kt @@ -6,19 +6,19 @@ import android.appwidget.AppWidgetProvider import android.content.Context import android.content.Intent import android.content.Intent.FLAG_ACTIVITY_NEW_TASK -import android.net.Uri -import android.os.Build import android.widget.RemoteViews +import androidx.core.net.toUri import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.mapper.DomainParamMapper +import com.androidvip.sysctlgui.domain.enums.Actions import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase -import com.androidvip.sysctlgui.helpers.Actions -import com.androidvip.sysctlgui.ui.params.edit.EditKernelParamActivity +import com.androidvip.sysctlgui.helpers.UiKernelParamMapper +import com.androidvip.sysctlgui.models.UiKernelParam import com.androidvip.sysctlgui.ui.start.StartActivity import com.androidvip.sysctlgui.widgets.FavoritesWidget.Companion.EDIT_PARAM_EXTRA import kotlinx.coroutines.runBlocking import org.koin.core.component.KoinComponent import org.koin.core.component.inject +import kotlin.collections.map class FavoritesWidget : AppWidgetProvider(), KoinComponent { private val getUserParamsUseCase: GetUserParamsUseCase by inject() @@ -41,11 +41,10 @@ class FavoritesWidget : AppWidgetProvider(), KoinComponent { } runBlocking { - val params = getUserParamsUseCase().filter { - it.favorite - }.map { - DomainParamMapper.map(it) - }.toMutableList() + val params = getUserParamsUseCase() + .filter { it.isFavorite } + .map(UiKernelParamMapper::map) + .toMutableList() if (params.isEmpty()) return@runBlocking @@ -53,8 +52,9 @@ class FavoritesWidget : AppWidgetProvider(), KoinComponent { Intent(context, StartActivity::class.java).apply { flags = FLAG_ACTIVITY_NEW_TASK action = Actions.EditParam.name - putExtra(EditKernelParamActivity.EXTRA_PARAM, param) - putExtra(EditKernelParamActivity.EXTRA_EDIT_SAVED_PARAM, true) + // TODO + /*putExtra(EditKernelParamActivity.EXTRA_PARAM, param) + putExtra(EditKernelParamActivity.EXTRA_EDIT_SAVED_PARAM, true)*/ context.startActivity(this) } } @@ -79,7 +79,7 @@ internal fun updateAppWidget( ) { val intent = Intent(context, FavoritesWidgetService::class.java).apply { putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId) - data = Uri.parse(this.toUri(Intent.URI_INTENT_SCHEME)) + data = toUri(Intent.URI_INTENT_SCHEME).toUri() } val views = RemoteViews( @@ -96,13 +96,9 @@ internal fun updateAppWidget( ).run { action = EDIT_PARAM_EXTRA putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId) - data = Uri.parse(toUri(Intent.URI_INTENT_SCHEME)) + data = toUri(Intent.URI_INTENT_SCHEME).toUri() - val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT - } else { - PendingIntent.FLAG_UPDATE_CURRENT - } + val flags = PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT PendingIntent.getBroadcast(context, 0, this, flags) } diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidgetService.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidgetService.kt index 9b7b82d..2876d99 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidgetService.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidgetService.kt @@ -6,8 +6,7 @@ import android.content.Intent import android.widget.RemoteViews import android.widget.RemoteViewsService import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.data.mapper.DomainParamMapper -import com.androidvip.sysctlgui.data.models.KernelParam +import com.androidvip.sysctlgui.domain.models.KernelParam import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase import com.androidvip.sysctlgui.widgets.FavoritesWidget.Companion.EXTRA_ITEM import kotlinx.coroutines.runBlocking @@ -36,9 +35,7 @@ class FavoritesRemoteViewsFactory( override fun onCreate() { runBlocking { params = getUserParamsUseCase().filter { - it.favorite - }.map { - DomainParamMapper.map(it) + it.isFavorite }.toMutableList() } } @@ -51,11 +48,7 @@ class FavoritesRemoteViewsFactory( override fun onDataSetChanged() { runBlocking { - params = getUserParamsUseCase().filter { - it.favorite - }.map { - DomainParamMapper.map(it) - }.toMutableList() + params = getUserParamsUseCase().filter { it.isFavorite }.toMutableList() } } diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/work/StartUpWorker.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/work/StartUpWorker.kt index 708f1d5..05e18e0 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/work/StartUpWorker.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/work/StartUpWorker.kt @@ -17,9 +17,8 @@ import androidx.work.WorkerParameters import com.androidvip.sysctlgui.R import com.androidvip.sysctlgui.data.utils.RootUtils import com.androidvip.sysctlgui.domain.repository.AppPrefs -import com.androidvip.sysctlgui.domain.usecase.ApplyParamsUseCase +import com.androidvip.sysctlgui.domain.usecase.ApplyParamUseCase import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase -import com.topjohnwu.superuser.Shell import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.delay @@ -36,8 +35,8 @@ class StartUpWorker( private val workerContext = Dispatchers.Default private val appPrefs: AppPrefs by inject() private val rootUtils: RootUtils by inject() - private val getUserParamsUseCase: GetUserParamsUseCase by inject() - private val applyParamsUseCase: ApplyParamsUseCase by inject() + private val getUserParams: GetUserParamsUseCase by inject() + private val applyParam: ApplyParamUseCase by inject() private val notificationManager: NotificationManagerCompat get() = NotificationManagerCompat.from(context) @@ -63,16 +62,16 @@ class StartUpWorker( } private suspend fun applyConfig(builder: NotificationCompat.Builder) { - getUserParamsUseCase().forEach { - builder.setContentText(it.toString()) + getUserParams().forEach { param -> + builder.setContentText(param.toString()) notifyIfPossible(builder) delay(250L) - applyParamsUseCase(it) + applyParam(param) } } - private suspend fun checkRequirements() = withContext(workerContext) { - appPrefs.runOnStartUp && Shell.rootAccess() + private suspend fun checkRequirements(): Boolean { + return appPrefs.runOnStartUp && rootUtils.isRootAvailable() } private suspend inline fun showNotificationAndThen( diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/work/TaskerWorker.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/work/TaskerWorker.kt index 410750e..c081e78 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/work/TaskerWorker.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/work/TaskerWorker.kt @@ -10,7 +10,7 @@ import androidx.work.WorkerParameters import androidx.work.workDataOf import com.androidvip.sysctlgui.R import com.androidvip.sysctlgui.domain.repository.AppPrefs -import com.androidvip.sysctlgui.domain.usecase.ApplyParamsUseCase +import com.androidvip.sysctlgui.domain.usecase.ApplyParamUseCase import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase import com.androidvip.sysctlgui.receivers.TaskerReceiver import com.androidvip.sysctlgui.toast @@ -30,8 +30,8 @@ class TaskerWorker( private val mainContext = Dispatchers.Main + SupervisorJob() private val workerContext = Dispatchers.IO private val appPrefs: AppPrefs by inject() - private val getUserParamsUseCase: GetUserParamsUseCase by inject() - private val applyParamsUseCase: ApplyParamsUseCase by inject() + private val getUserParams: GetUserParamsUseCase by inject() + private val applyParam: ApplyParamUseCase by inject() override suspend fun doWork(): Result { withContext(workerContext) { @@ -54,16 +54,16 @@ class TaskerWorker( } private suspend fun applyParams(listNumber: Int) { - val params = getUserParamsUseCase() + val params = getUserParams() when (listNumber) { Consts.LIST_NUMBER_PRIMARY_TASKER, - Consts.LIST_NUMBER_SECONDARY_TASKER -> params.filter { it.taskerParam } - Consts.LIST_NUMBER_FAVORITES -> params.filter { it.favorite } + Consts.LIST_NUMBER_SECONDARY_TASKER -> params.filter { it.isTaskerParam } + Consts.LIST_NUMBER_FAVORITES -> params.filter { it.isFavorite } Consts.LIST_NUMBER_APPLY_ON_BOOT -> params else -> emptyList() }.forEach { - applyParamsUseCase(it) + applyParam(it) } } diff --git a/app/src/main/res/drawable-night/ic_launcher_background.xml b/app/src/main/res/drawable-night/ic_launcher_background.xml deleted file mode 100644 index 5314cbc..0000000 --- a/app/src/main/res/drawable-night/ic_launcher_background.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/circle_file.xml b/app/src/main/res/drawable/circle_file.xml deleted file mode 100644 index 5e09b4b..0000000 --- a/app/src/main/res/drawable/circle_file.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/circle_folder.xml b/app/src/main/res/drawable/circle_folder.xml deleted file mode 100644 index 6c8c6fc..0000000 --- a/app/src/main/res/drawable/circle_folder.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/fast_scroll_thumb.xml b/app/src/main/res/drawable/fast_scroll_thumb.xml deleted file mode 100644 index 5735284..0000000 --- a/app/src/main/res/drawable/fast_scroll_thumb.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/fast_scroll_track.xml b/app/src/main/res/drawable/fast_scroll_track.xml deleted file mode 100644 index c6471b0..0000000 --- a/app/src/main/res/drawable/fast_scroll_track.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_action_tasker.xml b/app/src/main/res/drawable/ic_action_tasker.xml deleted file mode 100644 index 59e6a77..0000000 --- a/app/src/main/res/drawable/ic_action_tasker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_arrow_upward.xml b/app/src/main/res/drawable/ic_arrow_upward.xml new file mode 100644 index 0000000..8eff018 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_upward.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 8d6dbeb..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_config.xml b/app/src/main/res/drawable/ic_config.xml deleted file mode 100644 index a69f689..0000000 --- a/app/src/main/res/drawable/ic_config.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_delete_sweep.xml b/app/src/main/res/drawable/ic_delete_sweep.xml index 940a568..4ff2112 100644 --- a/app/src/main/res/drawable/ic_delete_sweep.xml +++ b/app/src/main/res/drawable/ic_delete_sweep.xml @@ -1,8 +1,12 @@ - - \ No newline at end of file + + + + diff --git a/app/src/main/res/drawable/ic_documentation.xml b/app/src/main/res/drawable/ic_documentation.xml index d9e0a7e..428b620 100644 --- a/app/src/main/res/drawable/ic_documentation.xml +++ b/app/src/main/res/drawable/ic_documentation.xml @@ -1,7 +1,13 @@ - - \ No newline at end of file + + + + diff --git a/app/src/main/res/drawable/ic_edit_outline.xml b/app/src/main/res/drawable/ic_edit_outline.xml deleted file mode 100644 index 2271737..0000000 --- a/app/src/main/res/drawable/ic_edit_outline.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_export.xml b/app/src/main/res/drawable/ic_export.xml new file mode 100644 index 0000000..248a716 --- /dev/null +++ b/app/src/main/res/drawable/ic_export.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_favorite.xml b/app/src/main/res/drawable/ic_favorite.xml new file mode 100644 index 0000000..a55d082 --- /dev/null +++ b/app/src/main/res/drawable/ic_favorite.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_favorite_outlined.xml b/app/src/main/res/drawable/ic_favorite_outlined.xml new file mode 100644 index 0000000..75654f6 --- /dev/null +++ b/app/src/main/res/drawable/ic_favorite_outlined.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_file.xml b/app/src/main/res/drawable/ic_file.xml new file mode 100644 index 0000000..1655262 --- /dev/null +++ b/app/src/main/res/drawable/ic_file.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_file_outline.xml b/app/src/main/res/drawable/ic_file_outline.xml deleted file mode 100644 index f925ee2..0000000 --- a/app/src/main/res/drawable/ic_file_outline.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_folder.xml b/app/src/main/res/drawable/ic_folder.xml new file mode 100644 index 0000000..769af8f --- /dev/null +++ b/app/src/main/res/drawable/ic_folder.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_folder_outline.xml b/app/src/main/res/drawable/ic_folder_outline.xml deleted file mode 100644 index 512eb78..0000000 --- a/app/src/main/res/drawable/ic_folder_outline.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_heart_broken.xml b/app/src/main/res/drawable/ic_heart_broken.xml new file mode 100644 index 0000000..8b4943e --- /dev/null +++ b/app/src/main/res/drawable/ic_heart_broken.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml new file mode 100644 index 0000000..041a166 --- /dev/null +++ b/app/src/main/res/drawable/ic_history.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_import.xml b/app/src/main/res/drawable/ic_import.xml new file mode 100644 index 0000000..4ad7f44 --- /dev/null +++ b/app/src/main/res/drawable/ic_import.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_info_outline.xml b/app/src/main/res/drawable/ic_info_outline.xml deleted file mode 100644 index 5aa45fb..0000000 --- a/app/src/main/res/drawable/ic_info_outline.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 2c34399..5314cbc 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -6,5 +6,5 @@ android:width="108dp" android:height="108dp" /> - + diff --git a/app/src/main/res/drawable/ic_more_vert.xml b/app/src/main/res/drawable/ic_more_vert.xml deleted file mode 100644 index 0f7ce68..0000000 --- a/app/src/main/res/drawable/ic_more_vert.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_name.xml b/app/src/main/res/drawable/ic_name.xml deleted file mode 100644 index 91e26d4..0000000 --- a/app/src/main/res/drawable/ic_name.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_open_in_browser.xml b/app/src/main/res/drawable/ic_open_in_browser.xml new file mode 100644 index 0000000..5a2c383 --- /dev/null +++ b/app/src/main/res/drawable/ic_open_in_browser.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml deleted file mode 100644 index 22f41a3..0000000 --- a/app/src/main/res/drawable/ic_search.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_settings_outline.xml b/app/src/main/res/drawable/ic_settings_outline.xml deleted file mode 100644 index 711fde8..0000000 --- a/app/src/main/res/drawable/ic_settings_outline.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_tasker.xml b/app/src/main/res/drawable/ic_tasker.xml new file mode 100644 index 0000000..905fb28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tasker.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_tasker_outlined.xml b/app/src/main/res/drawable/ic_tasker_outlined.xml new file mode 100644 index 0000000..165e5d7 --- /dev/null +++ b/app/src/main/res/drawable/ic_tasker_outlined.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/layout-land/activity_main2.xml b/app/src/main/res/layout-land/activity_main2.xml deleted file mode 100644 index 8a6a6bd..0000000 --- a/app/src/main/res/layout-land/activity_main2.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml deleted file mode 100644 index 7d94f7e..0000000 --- a/app/src/main/res/layout/activity_main2.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index d270c1f..ba0c7bc 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -25,7 +25,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/d16" - android:fontFamily="sans-serif-medium" android:gravity="center_horizontal" android:text="@string/splash_status_checking_root" android:textAppearance="?textAppearanceHeadline5" /> diff --git a/app/src/main/res/layout/activity_tasker_plugin.xml b/app/src/main/res/layout/activity_tasker_plugin.xml index 1981a4a..5a11583 100644 --- a/app/src/main/res/layout/activity_tasker_plugin.xml +++ b/app/src/main/res/layout/activity_tasker_plugin.xml @@ -13,8 +13,10 @@ android:layout_marginEnd="@dimen/d16" android:layout_marginBottom="@dimen/d16" android:text="@string/done" - app:backgroundTint="?colorSecondary" - app:icon="@drawable/ic_check" /> + android:textColor="?colorOnTertiary" + app:backgroundTint="?colorTertiary" + app:icon="@drawable/ic_check" + app:iconTint="?colorOnPrimary" /> + android:textColor="?colorPrimary" + android:textStyle="bold" /> - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/list_item_settings.xml b/app/src/main/res/layout/list_item_settings.xml deleted file mode 100644 index fa3909c..0000000 --- a/app/src/main/res/layout/list_item_settings.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml deleted file mode 100644 index 01ee430..0000000 --- a/app/src/main/res/layout/settings_activity.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/menu/menu_browse_params.xml b/app/src/main/res/menu/menu_browse_params.xml deleted file mode 100644 index e78ed41..0000000 --- a/app/src/main/res/menu/menu_browse_params.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml deleted file mode 100644 index db1f6b9..0000000 --- a/app/src/main/res/menu/menu_main.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - diff --git a/app/src/main/res/menu/menu_main_search.xml b/app/src/main/res/menu/menu_main_search.xml deleted file mode 100644 index 46a8dac..0000000 --- a/app/src/main/res/menu/menu_main_search.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml deleted file mode 100644 index 392e261..0000000 --- a/app/src/main/res/menu/menu_search.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/nav_main.xml b/app/src/main/res/menu/nav_main.xml deleted file mode 100644 index 58fdaf5..0000000 --- a/app/src/main/res/menu/nav_main.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/menu/popup_manage_params.xml b/app/src/main/res/menu/popup_manage_params.xml deleted file mode 100644 index 6d3116c..0000000 --- a/app/src/main/res/menu/popup_manage_params.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/navigation/main_navigation.xml b/app/src/main/res/navigation/main_navigation.xml deleted file mode 100644 index 5647a7f..0000000 --- a/app/src/main/res/navigation/main_navigation.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values-land/integers.xml b/app/src/main/res/values-land/integers.xml deleted file mode 100644 index 169ae66..0000000 --- a/app/src/main/res/values-land/integers.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 2 - diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e3152f0..bf64536 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -96,7 +96,7 @@ Restaurar a sua cópia de segurança anterior Opções de exportação Parâmetros exportados com sucesso - Para na exportação de parâmetros: nenhum parâmetro encontrado + Falha: nenhum parâmetro encontrado A exportação de parâmetros falhou devido a um erro do armazenamento Falha ao exportar parâmetros Importar, exportar ou fazer backup dos parâmetros do kernel diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 84ea67b..02d9158 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1,5 +1,4 @@ - Sysctl GUI Kök erişimi denetleniyor Busybox kontrol ediliyor Eski veritabanı şeması kontrol ediliyor diff --git a/app/src/main/res/values-v14/dimens.xml b/app/src/main/res/values-v14/dimens.xml deleted file mode 100644 index 212af5f..0000000 --- a/app/src/main/res/values-v14/dimens.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - 0dp - - diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml deleted file mode 100644 index 62657f3..0000000 --- a/app/src/main/res/values/integers.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 1 - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b334345..b22598b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -98,7 +98,7 @@ Backup all current runtime parameters. Please note that not all of these can be reapplied back once restored. Failed to export parameters Parameter export failed due to an IO error - Parameter export failed: no parameter to export + Failed: no parameter found Export options Parameters successfully exported Import, export or back up kernel parameters @@ -119,4 +119,11 @@ Use dynamic colors (Monet theme) when available Force dark theme Force dark theme when available + Favorites + Presets + File creation cancelled or failed + File picking cancelled or failed + There was an error while opening the file + There was an error while processing the file\n + Param deleted: %s diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml deleted file mode 100644 index 6238da5..0000000 --- a/app/src/main/res/xml/preferences.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/buildSrc/src/main/kotlin/AndroidX.kt b/buildSrc/src/main/kotlin/AndroidX.kt deleted file mode 100644 index 52d512d..0000000 --- a/buildSrc/src/main/kotlin/AndroidX.kt +++ /dev/null @@ -1,26 +0,0 @@ -object AndroidX { - const val activity = "androidx.activity:activity-ktx:1.7.2" - const val appCompat = "androidx.appcompat:appcompat:1.6.1" - const val constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4" - const val core = "androidx.core:core-ktx:1.10.1" - const val splashScreen = "androidx.core:core-splashscreen:1.0.1" - - private const val lifecycleVersion = "2.6.1" - const val lifecycleLiveData = "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion" - const val lifecycleViewModel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion" - - const val preference = "androidx.preference:preference-ktx:1.2.0" - const val swipeRefreshLayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" - - private const val navigationVersion = "2.6.0" - const val navigationFragment = "androidx.navigation:navigation-fragment-ktx:$navigationVersion" - const val navigationUi = "androidx.navigation:navigation-ui-ktx:$navigationVersion" - - private const val roomVersion = "2.5.2" - const val room = "androidx.room:room-ktx:$roomVersion" - const val roomRuntime = "androidx.room:room-runtime:$roomVersion" - const val roomCompiler = "androidx.room:room-compiler:$roomVersion" - - private const val workManagerVersion = "2.9.0" - const val workManager = "androidx.work:work-runtime-ktx:$workManagerVersion" -} diff --git a/buildSrc/src/main/kotlin/BuildPlugins.kt b/buildSrc/src/main/kotlin/BuildPlugins.kt deleted file mode 100644 index 168cf36..0000000 --- a/buildSrc/src/main/kotlin/BuildPlugins.kt +++ /dev/null @@ -1,7 +0,0 @@ -object BuildPlugins { - private const val agpVersion = "7.4.2" - const val gradle = "com.android.tools.build:gradle:$agpVersion" - - private const val kotlinVersion = "1.9.24" - const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" -} diff --git a/buildSrc/src/main/kotlin/Compose.kt b/buildSrc/src/main/kotlin/Compose.kt deleted file mode 100644 index 6ee5046..0000000 --- a/buildSrc/src/main/kotlin/Compose.kt +++ /dev/null @@ -1,8 +0,0 @@ -object Compose { - const val BoM = "androidx.compose:compose-bom:2024.06.00" - const val kotlinCompilerExtensionVersion = "1.5.14" - const val material3 = "androidx.compose.material3:material3" - const val material = "androidx.compose.material:material" - const val uiTooling = "androidx.compose.ui:ui-tooling" - const val activity = "androidx.activity:activity-compose:1.6.1" -} diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt deleted file mode 100644 index a6e42e6..0000000 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ /dev/null @@ -1,12 +0,0 @@ - -object Dependencies { - private const val koinVersion = "3.4.2" - const val koinAndroid = "io.insert-koin:koin-android:$koinVersion" - const val koinCore = "io.insert-koin:koin-core:$koinVersion" - - const val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3" - const val tapTargetView = "com.getkeepsafe.taptargetview:taptargetview:1.13.3" - const val libSuCore = "com.github.topjohnwu.libsu:core:2.5.1" - const val libSuIo = "com.github.topjohnwu.libsu:io:2.5.1" - const val liveEvent = "com.github.hadilq:live-event:1.3.0" -} diff --git a/buildSrc/src/main/kotlin/Google.kt b/buildSrc/src/main/kotlin/Google.kt deleted file mode 100644 index 6ab7f05..0000000 --- a/buildSrc/src/main/kotlin/Google.kt +++ /dev/null @@ -1,4 +0,0 @@ -object Google { - const val material = "com.google.android.material:material:1.9.0" - const val gson = "com.google.code.gson:gson:2.8.9" -} diff --git a/buildSrc/src/main/kotlin/Modules.kt b/buildSrc/src/main/kotlin/Modules.kt deleted file mode 100644 index d81ddd5..0000000 --- a/buildSrc/src/main/kotlin/Modules.kt +++ /dev/null @@ -1,7 +0,0 @@ -object Modules { - const val main = ":app" - const val domain = ":domain" - const val data = ":data" - const val utils = ":common:utils" - const val design = ":common:design" -} diff --git a/common/design/build.gradle.kts b/common/design/build.gradle.kts index d9ddb38..7208696 100644 --- a/common/design/build.gradle.kts +++ b/common/design/build.gradle.kts @@ -51,11 +51,7 @@ dependencies { api(libs.androidx.material.icons.core) api(libs.androidx.window) - api(AndroidX.constraintLayout) - api(AndroidX.swipeRefreshLayout) - api(Compose.material) - implementation(AndroidX.splashScreen) - implementation(Google.material) + api(libs.material) androidTestApi(platform(libs.androidx.compose.bom)) debugApi(libs.androidx.ui.tooling) diff --git a/common/design/src/main/java/com/androidvip/sysctlgui/design/BaseBottomSheetFragment.kt b/common/design/src/main/java/com/androidvip/sysctlgui/design/BaseBottomSheetFragment.kt deleted file mode 100644 index c237184..0000000 --- a/common/design/src/main/java/com/androidvip/sysctlgui/design/BaseBottomSheetFragment.kt +++ /dev/null @@ -1,67 +0,0 @@ -package com.androidvip.sysctlgui.design - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.core.view.ViewCompat -import androidx.viewbinding.ViewBinding -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import com.google.android.material.shape.MaterialShapeDrawable -import com.google.android.material.shape.ShapeAppearanceModel - -abstract class BaseBottomSheetFragment : BottomSheetDialogFragment() { - - lateinit var binding: Binding - - abstract fun setViewBinding(inflater: LayoutInflater, container: ViewGroup?): Binding - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = this.setViewBinding(inflater, container) - return binding.root - } - - override fun onStart() { - super.onStart() - val bottomSheetBehavior = BottomSheetBehavior.from(view?.parent as? View ?: return) - bottomSheetBehavior.addBottomSheetCallback( - object : BottomSheetBehavior.BottomSheetCallback() { - override fun onSlide(bottomSheet: View, slideOffset: Float) = Unit - - override fun onStateChanged(bottomSheet: View, newState: Int) { - when (newState) { - BottomSheetBehavior.STATE_EXPANDED -> { - val shape = createMaterialShapeDrawable(bottomSheet) - ViewCompat.setBackground(bottomSheet, shape) - } - BottomSheetBehavior.STATE_HIDDEN -> dismiss() - else -> Unit - } - } - } - ) - } - - private fun createMaterialShapeDrawable(bottomSheet: View): MaterialShapeDrawable { - val shapeAppearanceModel = ShapeAppearanceModel.builder( - context, - 0, - R.style.ShapeAppearance_SysctlGui_BottomSheet - ).build() - - val currentShape = bottomSheet.background as MaterialShapeDrawable - return MaterialShapeDrawable(shapeAppearanceModel).apply { - initializeElevationOverlay(context) - fillColor = currentShape.fillColor - tintList = currentShape.tintList - elevation = currentShape.elevation - strokeWidth = currentShape.strokeWidth - strokeColor = currentShape.strokeColor - } - } -} diff --git a/common/design/src/main/java/com/androidvip/sysctlgui/design/DesignResources.kt b/common/design/src/main/java/com/androidvip/sysctlgui/design/DesignResources.kt deleted file mode 100644 index 2a29b4f..0000000 --- a/common/design/src/main/java/com/androidvip/sysctlgui/design/DesignResources.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.androidvip.sysctlgui.design - -typealias DesignIds = com.androidvip.sysctlgui.design.R.id -typealias DesignLayouts = com.androidvip.sysctlgui.design.R.layout -typealias DesignStyles = com.androidvip.sysctlgui.design.R.style diff --git a/common/design/src/main/java/com/androidvip/sysctlgui/design/ModalBottomSheet.kt b/common/design/src/main/java/com/androidvip/sysctlgui/design/ModalBottomSheet.kt deleted file mode 100644 index 24968e5..0000000 --- a/common/design/src/main/java/com/androidvip/sysctlgui/design/ModalBottomSheet.kt +++ /dev/null @@ -1,88 +0,0 @@ -package com.androidvip.sysctlgui.design - -import android.content.Context -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.core.os.bundleOf -import com.androidvip.sysctlgui.design.databinding.ModalBottomSheetBinding - -open class ModalBottomSheet : BaseBottomSheetFragment() { - - private var listener: EventListener? = null - - override fun setViewBinding( - inflater: LayoutInflater, - container: ViewGroup? - ): ModalBottomSheetBinding = ModalBottomSheetBinding.inflate(inflater) - - override fun onAttach(context: Context) { - super.onAttach(context) - val parent = parentFragment - if (parent != null) { - listener = parent as? EventListener - } - - if (listener == null) { - listener = context as? EventListener - } - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - binding.sheetTitle.text = arguments?.getString(ARG_TITLE).orEmpty() - binding.sheetDescription.text = arguments?.getCharSequence(ARG_MESSAGE) ?: "" - - arguments?.getString(ARG_POSITIVE_BUTTON_TEXT)?.let { - binding.positiveButton.apply { - text = it - visibility = View.VISIBLE - setOnClickListener { - listener?.onContinuePressed() - dismiss() - } - } - } - - arguments?.getString(ARG_NEGATIVE_BUTTON_TEXT)?.let { - binding.negativeButton.apply { - text = it - visibility = View.VISIBLE - setOnClickListener { - listener?.onCancelPressed() - dismiss() - } - } - } - } - - interface EventListener { - fun onContinuePressed() - fun onCancelPressed() - } - - companion object { - private const val ARG_TITLE = "title" - private const val ARG_MESSAGE = "message" - private const val ARG_POSITIVE_BUTTON_TEXT = "positiveButtonText" - private const val ARG_NEGATIVE_BUTTON_TEXT = "negativeButtonText" - - fun newInstance( - title: String, - message: CharSequence, - positiveButtonText: String? = null, - negativeButtonText: String? = null - ): ModalBottomSheet { - return ModalBottomSheet().apply { - arguments = bundleOf( - ARG_TITLE to title, - ARG_MESSAGE to message, - ARG_POSITIVE_BUTTON_TEXT to positiveButtonText, - ARG_NEGATIVE_BUTTON_TEXT to negativeButtonText - ) - } - } - } -} diff --git a/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Color.kt b/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Color.kt index 14a01ef..e8fc935 100644 --- a/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Color.kt +++ b/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Color.kt @@ -2,88 +2,218 @@ package com.androidvip.sysctlgui.design.theme import androidx.compose.ui.graphics.Color -val md_theme_light_primary = Color(0xFF006685) -val md_theme_light_onPrimary = Color(0xFFFFFFFF) -val md_theme_light_primaryContainer = Color(0xFFBFE9FF) -val md_theme_light_onPrimaryContainer = Color(0xFF001F2A) -val md_theme_light_secondary = Color(0xFF4D616C) -val md_theme_light_onSecondary = Color(0xFFFFFFFF) -val md_theme_light_secondaryContainer = Color(0xFFD0E6F3) -val md_theme_light_onSecondaryContainer = Color(0xFF081E27) -val md_theme_light_tertiary = Color(0xFF5E5A7D) -val md_theme_light_onTertiary = Color(0xFFFFFFFF) -val md_theme_light_tertiaryContainer = Color(0xFFE4DFFF) -val md_theme_light_onTertiaryContainer = Color(0xFF1A1836) -val md_theme_light_error = Color(0xFFBA1A1A) -val md_theme_light_errorContainer = Color(0xFFFFDAD6) -val md_theme_light_onError = Color(0xFFFFFFFF) -val md_theme_light_onErrorContainer = Color(0xFF410002) -val md_theme_light_background = Color(0xFFFBFCFE) -val md_theme_light_onBackground = Color(0xFF191C1E) -val md_theme_light_surface = Color(0xFFFBFCFE) -val md_theme_light_onSurface = Color(0xFF191C1E) -val md_theme_light_surfaceVariant = Color(0xFFDCE3E9) -val md_theme_light_onSurfaceVariant = Color(0xFF40484C) -val md_theme_light_outline = Color(0xFF70787D) -val md_theme_light_inverseOnSurface = Color(0xFFF0F1F3) -val md_theme_light_inverseSurface = Color(0xFF2E3133) -val md_theme_light_inversePrimary = Color(0xFF6DD2FF) -val md_theme_light_shadow = Color(0xFF000000) -val md_theme_light_surfaceTint = Color(0xFF006685) -val md_theme_light_outlineVariant = Color(0xFFC0C8CD) -val md_theme_light_scrim = Color(0xFF000000) +val primaryLight = Color(0xFF4B5C92) +val onPrimaryLight = Color(0xFFFFFFFF) +val primaryContainerLight = Color(0xFFDBE1FF) +val onPrimaryContainerLight = Color(0xFF334478) +val secondaryLight = Color(0xFF595E72) +val onSecondaryLight = Color(0xFFFFFFFF) +val secondaryContainerLight = Color(0xFFDDE1F9) +val onSecondaryContainerLight = Color(0xFF414659) +val tertiaryLight = Color(0xFF1D6B50) +val onTertiaryLight = Color(0xFFFFFFFF) +val tertiaryContainerLight = Color(0xFFA7F2D0) +val onTertiaryContainerLight = Color(0xFF00513A) +val errorLight = Color(0xFFBA1A1A) +val onErrorLight = Color(0xFFFFFFFF) +val errorContainerLight = Color(0xFFFFDAD6) +val onErrorContainerLight = Color(0xFF93000A) +val backgroundLight = Color(0xFFFAF8FF) +val onBackgroundLight = Color(0xFF1A1B21) +val surfaceLight = Color(0xFFFAF8FF) +val onSurfaceLight = Color(0xFF1A1B21) +val surfaceVariantLight = Color(0xFFE2E2EC) +val onSurfaceVariantLight = Color(0xFF45464F) +val outlineLight = Color(0xFF757680) +val outlineVariantLight = Color(0xFFC5C6D0) +val scrimLight = Color(0xFF000000) +val inverseSurfaceLight = Color(0xFF2F3036) +val inverseOnSurfaceLight = Color(0xFFF1F0F7) +val inversePrimaryLight = Color(0xFFB4C5FF) +val surfaceDimLight = Color(0xFFDAD9E0) +val surfaceBrightLight = Color(0xFFFAF8FF) +val surfaceContainerLowestLight = Color(0xFFFFFFFF) +val surfaceContainerLowLight = Color(0xFFF4F3FA) +val surfaceContainerLight = Color(0xFFEEEDF4) +val surfaceContainerHighLight = Color(0xFFE8E7EF) +val surfaceContainerHighestLight = Color(0xFFE3E2E9) -val md_theme_dark_primary = Color(0xFF6DD2FF) -val md_theme_dark_onPrimary = Color(0xFF003547) -val md_theme_dark_primaryContainer = Color(0xFF004D65) -val md_theme_dark_onPrimaryContainer = Color(0xFFBFE9FF) -val md_theme_dark_secondary = Color(0xFFB4CAD6) -val md_theme_dark_onSecondary = Color(0xFF1F333D) -val md_theme_dark_secondaryContainer = Color(0xFF364954) -val md_theme_dark_onSecondaryContainer = Color(0xFFD0E6F3) -val md_theme_dark_tertiary = Color(0xFFC7C2EA) -val md_theme_dark_onTertiary = Color(0xFF2F2D4C) -val md_theme_dark_tertiaryContainer = Color(0xFF464364) -val md_theme_dark_onTertiaryContainer = Color(0xFFE4DFFF) -val md_theme_dark_error = Color(0xFFFFB4AB) -val md_theme_dark_errorContainer = Color(0xFF93000A) -val md_theme_dark_onError = Color(0xFF690005) -val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) -val md_theme_dark_background = Color(0xFF191C1E) -val md_theme_dark_onBackground = Color(0xFFE1E2E5) -val md_theme_dark_surface = Color(0xFF191C1E) -val md_theme_dark_onSurface = Color(0xFFE1E2E5) -val md_theme_dark_surfaceVariant = Color(0xFF40484C) -val md_theme_dark_onSurfaceVariant = Color(0xFFC0C8CD) -val md_theme_dark_outline = Color(0xFF8A9297) -val md_theme_dark_inverseOnSurface = Color(0xFF191C1E) -val md_theme_dark_inverseSurface = Color(0xFFE1E2E5) -val md_theme_dark_inversePrimary = Color(0xFF006685) -val md_theme_dark_shadow = Color(0xFF000000) -val md_theme_dark_surfaceTint = Color(0xFF6DD2FF) -val md_theme_dark_outlineVariant = Color(0xFF40484C) -val md_theme_dark_scrim = Color(0xFF000000) +val primaryLightMediumContrast = Color(0xFF213367) +val onPrimaryLightMediumContrast = Color(0xFFFFFFFF) +val primaryContainerLightMediumContrast = Color(0xFF5A6BA2) +val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF) +val secondaryLightMediumContrast = Color(0xFF303648) +val onSecondaryLightMediumContrast = Color(0xFFFFFFFF) +val secondaryContainerLightMediumContrast = Color(0xFF676C81) +val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF) +val tertiaryLightMediumContrast = Color(0xFF003F2C) +val onTertiaryLightMediumContrast = Color(0xFFFFFFFF) +val tertiaryContainerLightMediumContrast = Color(0xFF307A5E) +val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF) +val errorLightMediumContrast = Color(0xFF740006) +val onErrorLightMediumContrast = Color(0xFFFFFFFF) +val errorContainerLightMediumContrast = Color(0xFFCF2C27) +val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF) +val backgroundLightMediumContrast = Color(0xFFFAF8FF) +val onBackgroundLightMediumContrast = Color(0xFF1A1B21) +val surfaceLightMediumContrast = Color(0xFFFAF8FF) +val onSurfaceLightMediumContrast = Color(0xFF101116) +val surfaceVariantLightMediumContrast = Color(0xFFE2E2EC) +val onSurfaceVariantLightMediumContrast = Color(0xFF34363E) +val outlineLightMediumContrast = Color(0xFF51525B) +val outlineVariantLightMediumContrast = Color(0xFF6B6C75) +val scrimLightMediumContrast = Color(0xFF000000) +val inverseSurfaceLightMediumContrast = Color(0xFF2F3036) +val inverseOnSurfaceLightMediumContrast = Color(0xFFF1F0F7) +val inversePrimaryLightMediumContrast = Color(0xFFB4C5FF) +val surfaceDimLightMediumContrast = Color(0xFFC6C6CD) +val surfaceBrightLightMediumContrast = Color(0xFFFAF8FF) +val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF) +val surfaceContainerLowLightMediumContrast = Color(0xFFF4F3FA) +val surfaceContainerLightMediumContrast = Color(0xFFE8E7EF) +val surfaceContainerHighLightMediumContrast = Color(0xFFDDDCE3) +val surfaceContainerHighestLightMediumContrast = Color(0xFFD2D1D8) -val green_200 = Color(0xFF80E4A9) -val green_500 = Color(0xFF00C853) -val green_800 = Color(0xFF00B439) +val primaryLightHighContrast = Color(0xFF15295C) +val onPrimaryLightHighContrast = Color(0xFFFFFFFF) +val primaryContainerLightHighContrast = Color(0xFF35477B) +val onPrimaryContainerLightHighContrast = Color(0xFFFFFFFF) +val secondaryLightHighContrast = Color(0xFF262C3D) +val onSecondaryLightHighContrast = Color(0xFFFFFFFF) +val secondaryContainerLightHighContrast = Color(0xFF43485C) +val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF) +val tertiaryLightHighContrast = Color(0xFF003323) +val onTertiaryLightHighContrast = Color(0xFFFFFFFF) +val tertiaryContainerLightHighContrast = Color(0xFF00543C) +val onTertiaryContainerLightHighContrast = Color(0xFFFFFFFF) +val errorLightHighContrast = Color(0xFF600004) +val onErrorLightHighContrast = Color(0xFFFFFFFF) +val errorContainerLightHighContrast = Color(0xFF98000A) +val onErrorContainerLightHighContrast = Color(0xFFFFFFFF) +val backgroundLightHighContrast = Color(0xFFFAF8FF) +val onBackgroundLightHighContrast = Color(0xFF1A1B21) +val surfaceLightHighContrast = Color(0xFFFAF8FF) +val onSurfaceLightHighContrast = Color(0xFF000000) +val surfaceVariantLightHighContrast = Color(0xFFE2E2EC) +val onSurfaceVariantLightHighContrast = Color(0xFF000000) +val outlineLightHighContrast = Color(0xFF2A2C34) +val outlineVariantLightHighContrast = Color(0xFF474951) +val scrimLightHighContrast = Color(0xFF000000) +val inverseSurfaceLightHighContrast = Color(0xFF2F3036) +val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF) +val inversePrimaryLightHighContrast = Color(0xFFB4C5FF) +val surfaceDimLightHighContrast = Color(0xFFB9B8BF) +val surfaceBrightLightHighContrast = Color(0xFFFAF8FF) +val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF) +val surfaceContainerLowLightHighContrast = Color(0xFFF1F0F7) +val surfaceContainerLightHighContrast = Color(0xFFE3E2E9) +val surfaceContainerHighLightHighContrast = Color(0xFFD5D3DB) +val surfaceContainerHighestLightHighContrast = Color(0xFFC6C6CD) -val orange200 = Color(0xFFFFCB80) -val orange500 = Color(0xFFFF9600) -val orange800 = Color(0xFFFF7900) +val primaryDark = Color(0xFFB4C5FF) +val onPrimaryDark = Color(0xFF1A2D60) +val primaryContainerDark = Color(0xFF334478) +val onPrimaryContainerDark = Color(0xFFDBE1FF) +val secondaryDark = Color(0xFFC1C5DD) +val onSecondaryDark = Color(0xFF2B3042) +val secondaryContainerDark = Color(0xFF414659) +val onSecondaryContainerDark = Color(0xFFDDE1F9) +val tertiaryDark = Color(0xFF8CD5B4) +val onTertiaryDark = Color(0xFF003827) +val tertiaryContainerDark = Color(0xFF00513A) +val onTertiaryContainerDark = Color(0xFFA7F2D0) +val errorDark = Color(0xFFFFB4AB) +val onErrorDark = Color(0xFF690005) +val errorContainerDark = Color(0xFF93000A) +val onErrorContainerDark = Color(0xFFFFDAD6) +val backgroundDark = Color(0xFF121318) +val onBackgroundDark = Color(0xFFE3E2E9) +val surfaceDark = Color(0xFF121318) +val onSurfaceDark = Color(0xFFE3E2E9) +val surfaceVariantDark = Color(0xFF45464F) +val onSurfaceVariantDark = Color(0xFFC5C6D0) +val outlineDark = Color(0xFF8F909A) +val outlineVariantDark = Color(0xFF45464F) +val scrimDark = Color(0xFF000000) +val inverseSurfaceDark = Color(0xFFE3E2E9) +val inverseOnSurfaceDark = Color(0xFF2F3036) +val inversePrimaryDark = Color(0xFF4B5C92) +val surfaceDimDark = Color(0xFF121318) +val surfaceBrightDark = Color(0xFF38393F) +val surfaceContainerLowestDark = Color(0xFF0D0E13) +val surfaceContainerLowDark = Color(0xFF1A1B21) +val surfaceContainerDark = Color(0xFF1E1F25) +val surfaceContainerHighDark = Color(0xFF292A2F) +val surfaceContainerHighestDark = Color(0xFF34343A) -val white = Color.White -val white87 = Color(0xDEFFFFFF) -val white70 = Color(0xB3FFFFFF) -val white54 = Color(0x8AFFFFFF) -val white50 = Color(0x80FFFFFF) -val white38 = Color(0x61FFFFFF) -val white12 = Color(0x12FFFFFF) +val primaryDarkMediumContrast = Color(0xFFD3DBFF) +val onPrimaryDarkMediumContrast = Color(0xFF0D2255) +val primaryContainerDarkMediumContrast = Color(0xFF7D8FC8) +val onPrimaryContainerDarkMediumContrast = Color(0xFF000000) +val secondaryDarkMediumContrast = Color(0xFFD7DBF3) +val onSecondaryDarkMediumContrast = Color(0xFF202536) +val secondaryContainerDarkMediumContrast = Color(0xFF8B90A5) +val onSecondaryContainerDarkMediumContrast = Color(0xFF000000) +val tertiaryDarkMediumContrast = Color(0xFFA1ECCA) +val onTertiaryDarkMediumContrast = Color(0xFF002C1E) +val tertiaryContainerDarkMediumContrast = Color(0xFF569E80) +val onTertiaryContainerDarkMediumContrast = Color(0xFF000000) +val errorDarkMediumContrast = Color(0xFFFFD2CC) +val onErrorDarkMediumContrast = Color(0xFF540003) +val errorContainerDarkMediumContrast = Color(0xFFFF5449) +val onErrorContainerDarkMediumContrast = Color(0xFF000000) +val backgroundDarkMediumContrast = Color(0xFF121318) +val onBackgroundDarkMediumContrast = Color(0xFFE3E2E9) +val surfaceDarkMediumContrast = Color(0xFF121318) +val onSurfaceDarkMediumContrast = Color(0xFFFFFFFF) +val surfaceVariantDarkMediumContrast = Color(0xFF45464F) +val onSurfaceVariantDarkMediumContrast = Color(0xFFDBDBE6) +val outlineDarkMediumContrast = Color(0xFFB1B1BB) +val outlineVariantDarkMediumContrast = Color(0xFF8F9099) +val scrimDarkMediumContrast = Color(0xFF000000) +val inverseSurfaceDarkMediumContrast = Color(0xFFE3E2E9) +val inverseOnSurfaceDarkMediumContrast = Color(0xFF292A2F) +val inversePrimaryDarkMediumContrast = Color(0xFF34467A) +val surfaceDimDarkMediumContrast = Color(0xFF121318) +val surfaceBrightDarkMediumContrast = Color(0xFF43444A) +val surfaceContainerLowestDarkMediumContrast = Color(0xFF06070C) +val surfaceContainerLowDarkMediumContrast = Color(0xFF1C1D23) +val surfaceContainerDarkMediumContrast = Color(0xFF27282D) +val surfaceContainerHighDarkMediumContrast = Color(0xFF313238) +val surfaceContainerHighestDarkMediumContrast = Color(0xFF3C3D43) -val black = Color.Black -val black87 = Color(0xDE000000) -val black70 = Color(0xB3000000) -val black54 = Color(0x8A000000) -val black50 = Color(0x80000000) -val black38 = Color(0x61000000) -val black12 = Color(0x12000000) +val primaryDarkHighContrast = Color(0xFFEDEFFF) +val onPrimaryDarkHighContrast = Color(0xFF000000) +val primaryContainerDarkHighContrast = Color(0xFFAFC1FD) +val onPrimaryContainerDarkHighContrast = Color(0xFF000928) +val secondaryDarkHighContrast = Color(0xFFEDEFFF) +val onSecondaryDarkHighContrast = Color(0xFF000000) +val secondaryContainerDarkHighContrast = Color(0xFFBDC2D9) +val onSecondaryContainerDarkHighContrast = Color(0xFF060A1B) +val tertiaryDarkHighContrast = Color(0xFFB8FFDE) +val onTertiaryDarkHighContrast = Color(0xFF000000) +val tertiaryContainerDarkHighContrast = Color(0xFF88D2B1) +val onTertiaryContainerDarkHighContrast = Color(0xFF000E08) +val errorDarkHighContrast = Color(0xFFFFECE9) +val onErrorDarkHighContrast = Color(0xFF000000) +val errorContainerDarkHighContrast = Color(0xFFFFAEA4) +val onErrorContainerDarkHighContrast = Color(0xFF220001) +val backgroundDarkHighContrast = Color(0xFF121318) +val onBackgroundDarkHighContrast = Color(0xFFE3E2E9) +val surfaceDarkHighContrast = Color(0xFF121318) +val onSurfaceDarkHighContrast = Color(0xFFFFFFFF) +val surfaceVariantDarkHighContrast = Color(0xFF45464F) +val onSurfaceVariantDarkHighContrast = Color(0xFFFFFFFF) +val outlineDarkHighContrast = Color(0xFFEFEFFA) +val outlineVariantDarkHighContrast = Color(0xFFC2C2CC) +val scrimDarkHighContrast = Color(0xFF000000) +val inverseSurfaceDarkHighContrast = Color(0xFFE3E2E9) +val inverseOnSurfaceDarkHighContrast = Color(0xFF000000) +val inversePrimaryDarkHighContrast = Color(0xFF34467A) +val surfaceDimDarkHighContrast = Color(0xFF121318) +val surfaceBrightDarkHighContrast = Color(0xFF4F5056) +val surfaceContainerLowestDarkHighContrast = Color(0xFF000000) +val surfaceContainerLowDarkHighContrast = Color(0xFF1E1F25) +val surfaceContainerDarkHighContrast = Color(0xFF2F3036) +val surfaceContainerHighDarkHighContrast = Color(0xFF3A3B41) +val surfaceContainerHighestDarkHighContrast = Color(0xFF46464C) diff --git a/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Shape.kt b/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Shape.kt deleted file mode 100644 index d0f01ac..0000000 --- a/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Shape.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.androidvip.sysctlgui.design.theme - -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Shapes -import androidx.compose.material3.MaterialTheme -import androidx.compose.runtime.Composable -import androidx.compose.runtime.ReadOnlyComposable -import androidx.compose.ui.unit.dp - -val SysctlGuiShapes = Shapes( - extraSmall = RoundedCornerShape(4.dp), - small = RoundedCornerShape(8.dp), - medium = RoundedCornerShape(12.dp), - large = RoundedCornerShape(16.dp), - extraLarge = RoundedCornerShape(24.dp), -) - -val MaterialTheme.bottomSheetShape - @Composable - @ReadOnlyComposable - get() = RoundedCornerShape( - topStart = 24.dp, - topEnd = 24.dp, - bottomStart = 0.dp, - bottomEnd = 0.dp - ) diff --git a/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Theme.kt b/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Theme.kt index 60d1c57..69a1120 100644 --- a/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Theme.kt +++ b/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Theme.kt @@ -10,90 +10,263 @@ import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext -internal val LightColors = lightColorScheme( - primary = md_theme_light_primary, - onPrimary = md_theme_light_onPrimary, - primaryContainer = md_theme_light_primaryContainer, - onPrimaryContainer = md_theme_light_onPrimaryContainer, - secondary = md_theme_light_secondary, - onSecondary = md_theme_light_onSecondary, - secondaryContainer = md_theme_light_secondaryContainer, - onSecondaryContainer = md_theme_light_onSecondaryContainer, - tertiary = md_theme_light_tertiary, - onTertiary = md_theme_light_onTertiary, - tertiaryContainer = md_theme_light_tertiaryContainer, - onTertiaryContainer = md_theme_light_onTertiaryContainer, - error = md_theme_light_error, - errorContainer = md_theme_light_errorContainer, - onError = md_theme_light_onError, - onErrorContainer = md_theme_light_onErrorContainer, - background = md_theme_light_background, - onBackground = md_theme_light_onBackground, - surface = md_theme_light_surface, - onSurface = md_theme_light_onSurface, - surfaceVariant = md_theme_light_surfaceVariant, - onSurfaceVariant = md_theme_light_onSurfaceVariant, - outline = md_theme_light_outline, - inverseOnSurface = md_theme_light_inverseOnSurface, - inverseSurface = md_theme_light_inverseSurface, - inversePrimary = md_theme_light_inversePrimary, - surfaceTint = md_theme_light_surfaceTint, - outlineVariant = md_theme_light_outlineVariant, - scrim = md_theme_light_scrim +private val lightScheme = lightColorScheme( + primary = primaryLight, + onPrimary = onPrimaryLight, + primaryContainer = primaryContainerLight, + onPrimaryContainer = onPrimaryContainerLight, + secondary = secondaryLight, + onSecondary = onSecondaryLight, + secondaryContainer = secondaryContainerLight, + onSecondaryContainer = onSecondaryContainerLight, + tertiary = tertiaryLight, + onTertiary = onTertiaryLight, + tertiaryContainer = tertiaryContainerLight, + onTertiaryContainer = onTertiaryContainerLight, + error = errorLight, + onError = onErrorLight, + errorContainer = errorContainerLight, + onErrorContainer = onErrorContainerLight, + background = backgroundLight, + onBackground = onBackgroundLight, + surface = surfaceLight, + onSurface = onSurfaceLight, + surfaceVariant = surfaceVariantLight, + onSurfaceVariant = onSurfaceVariantLight, + outline = outlineLight, + outlineVariant = outlineVariantLight, + scrim = scrimLight, + inverseSurface = inverseSurfaceLight, + inverseOnSurface = inverseOnSurfaceLight, + inversePrimary = inversePrimaryLight, + surfaceDim = surfaceDimLight, + surfaceBright = surfaceBrightLight, + surfaceContainerLowest = surfaceContainerLowestLight, + surfaceContainerLow = surfaceContainerLowLight, + surfaceContainer = surfaceContainerLight, + surfaceContainerHigh = surfaceContainerHighLight, + surfaceContainerHighest = surfaceContainerHighestLight, ) -internal val DarkColors = darkColorScheme( - primary = md_theme_dark_primary, - onPrimary = md_theme_dark_onPrimary, - primaryContainer = md_theme_dark_primaryContainer, - onPrimaryContainer = md_theme_dark_onPrimaryContainer, - secondary = md_theme_dark_secondary, - onSecondary = md_theme_dark_onSecondary, - secondaryContainer = md_theme_dark_secondaryContainer, - onSecondaryContainer = md_theme_dark_onSecondaryContainer, - tertiary = md_theme_dark_tertiary, - onTertiary = md_theme_dark_onTertiary, - tertiaryContainer = md_theme_dark_tertiaryContainer, - onTertiaryContainer = md_theme_dark_onTertiaryContainer, - error = md_theme_dark_error, - errorContainer = md_theme_dark_errorContainer, - onError = md_theme_dark_onError, - onErrorContainer = md_theme_dark_onErrorContainer, - background = md_theme_dark_background, - onBackground = md_theme_dark_onBackground, - surface = md_theme_dark_surface, - onSurface = md_theme_dark_onSurface, - surfaceVariant = md_theme_dark_surfaceVariant, - onSurfaceVariant = md_theme_dark_onSurfaceVariant, - outline = md_theme_dark_outline, - inverseOnSurface = md_theme_dark_inverseOnSurface, - inverseSurface = md_theme_dark_inverseSurface, - inversePrimary = md_theme_dark_inversePrimary, - surfaceTint = md_theme_dark_surfaceTint, - outlineVariant = md_theme_dark_outlineVariant, - scrim = md_theme_dark_scrim +private val mediumContrastLightColorScheme = lightColorScheme( + primary = primaryLightMediumContrast, + onPrimary = onPrimaryLightMediumContrast, + primaryContainer = primaryContainerLightMediumContrast, + onPrimaryContainer = onPrimaryContainerLightMediumContrast, + secondary = secondaryLightMediumContrast, + onSecondary = onSecondaryLightMediumContrast, + secondaryContainer = secondaryContainerLightMediumContrast, + onSecondaryContainer = onSecondaryContainerLightMediumContrast, + tertiary = tertiaryLightMediumContrast, + onTertiary = onTertiaryLightMediumContrast, + tertiaryContainer = tertiaryContainerLightMediumContrast, + onTertiaryContainer = onTertiaryContainerLightMediumContrast, + error = errorLightMediumContrast, + onError = onErrorLightMediumContrast, + errorContainer = errorContainerLightMediumContrast, + onErrorContainer = onErrorContainerLightMediumContrast, + background = backgroundLightMediumContrast, + onBackground = onBackgroundLightMediumContrast, + surface = surfaceLightMediumContrast, + onSurface = onSurfaceLightMediumContrast, + surfaceVariant = surfaceVariantLightMediumContrast, + onSurfaceVariant = onSurfaceVariantLightMediumContrast, + outline = outlineLightMediumContrast, + outlineVariant = outlineVariantLightMediumContrast, + scrim = scrimLightMediumContrast, + inverseSurface = inverseSurfaceLightMediumContrast, + inverseOnSurface = inverseOnSurfaceLightMediumContrast, + inversePrimary = inversePrimaryLightMediumContrast, + surfaceDim = surfaceDimLightMediumContrast, + surfaceBright = surfaceBrightLightMediumContrast, + surfaceContainerLowest = surfaceContainerLowestLightMediumContrast, + surfaceContainerLow = surfaceContainerLowLightMediumContrast, + surfaceContainer = surfaceContainerLightMediumContrast, + surfaceContainerHigh = surfaceContainerHighLightMediumContrast, + surfaceContainerHighest = surfaceContainerHighestLightMediumContrast, +) + +private val highContrastLightColorScheme = lightColorScheme( + primary = primaryLightHighContrast, + onPrimary = onPrimaryLightHighContrast, + primaryContainer = primaryContainerLightHighContrast, + onPrimaryContainer = onPrimaryContainerLightHighContrast, + secondary = secondaryLightHighContrast, + onSecondary = onSecondaryLightHighContrast, + secondaryContainer = secondaryContainerLightHighContrast, + onSecondaryContainer = onSecondaryContainerLightHighContrast, + tertiary = tertiaryLightHighContrast, + onTertiary = onTertiaryLightHighContrast, + tertiaryContainer = tertiaryContainerLightHighContrast, + onTertiaryContainer = onTertiaryContainerLightHighContrast, + error = errorLightHighContrast, + onError = onErrorLightHighContrast, + errorContainer = errorContainerLightHighContrast, + onErrorContainer = onErrorContainerLightHighContrast, + background = backgroundLightHighContrast, + onBackground = onBackgroundLightHighContrast, + surface = surfaceLightHighContrast, + onSurface = onSurfaceLightHighContrast, + surfaceVariant = surfaceVariantLightHighContrast, + onSurfaceVariant = onSurfaceVariantLightHighContrast, + outline = outlineLightHighContrast, + outlineVariant = outlineVariantLightHighContrast, + scrim = scrimLightHighContrast, + inverseSurface = inverseSurfaceLightHighContrast, + inverseOnSurface = inverseOnSurfaceLightHighContrast, + inversePrimary = inversePrimaryLightHighContrast, + surfaceDim = surfaceDimLightHighContrast, + surfaceBright = surfaceBrightLightHighContrast, + surfaceContainerLowest = surfaceContainerLowestLightHighContrast, + surfaceContainerLow = surfaceContainerLowLightHighContrast, + surfaceContainer = surfaceContainerLightHighContrast, + surfaceContainerHigh = surfaceContainerHighLightHighContrast, + surfaceContainerHighest = surfaceContainerHighestLightHighContrast, +) + +private val darkScheme = darkColorScheme( + primary = primaryDark, + onPrimary = onPrimaryDark, + primaryContainer = primaryContainerDark, + onPrimaryContainer = onPrimaryContainerDark, + secondary = secondaryDark, + onSecondary = onSecondaryDark, + secondaryContainer = secondaryContainerDark, + onSecondaryContainer = onSecondaryContainerDark, + tertiary = tertiaryDark, + onTertiary = onTertiaryDark, + tertiaryContainer = tertiaryContainerDark, + onTertiaryContainer = onTertiaryContainerDark, + error = errorDark, + onError = onErrorDark, + errorContainer = errorContainerDark, + onErrorContainer = onErrorContainerDark, + background = backgroundDark, + onBackground = onBackgroundDark, + surface = surfaceDark, + onSurface = onSurfaceDark, + surfaceVariant = surfaceVariantDark, + onSurfaceVariant = onSurfaceVariantDark, + outline = outlineDark, + outlineVariant = outlineVariantDark, + scrim = scrimDark, + inverseSurface = inverseSurfaceDark, + inverseOnSurface = inverseOnSurfaceDark, + inversePrimary = inversePrimaryDark, + surfaceDim = surfaceDimDark, + surfaceBright = surfaceBrightDark, + surfaceContainerLowest = surfaceContainerLowestDark, + surfaceContainerLow = surfaceContainerLowDark, + surfaceContainer = surfaceContainerDark, + surfaceContainerHigh = surfaceContainerHighDark, + surfaceContainerHighest = surfaceContainerHighestDark, +) + +private val mediumContrastDarkColorScheme = darkColorScheme( + primary = primaryDarkMediumContrast, + onPrimary = onPrimaryDarkMediumContrast, + primaryContainer = primaryContainerDarkMediumContrast, + onPrimaryContainer = onPrimaryContainerDarkMediumContrast, + secondary = secondaryDarkMediumContrast, + onSecondary = onSecondaryDarkMediumContrast, + secondaryContainer = secondaryContainerDarkMediumContrast, + onSecondaryContainer = onSecondaryContainerDarkMediumContrast, + tertiary = tertiaryDarkMediumContrast, + onTertiary = onTertiaryDarkMediumContrast, + tertiaryContainer = tertiaryContainerDarkMediumContrast, + onTertiaryContainer = onTertiaryContainerDarkMediumContrast, + error = errorDarkMediumContrast, + onError = onErrorDarkMediumContrast, + errorContainer = errorContainerDarkMediumContrast, + onErrorContainer = onErrorContainerDarkMediumContrast, + background = backgroundDarkMediumContrast, + onBackground = onBackgroundDarkMediumContrast, + surface = surfaceDarkMediumContrast, + onSurface = onSurfaceDarkMediumContrast, + surfaceVariant = surfaceVariantDarkMediumContrast, + onSurfaceVariant = onSurfaceVariantDarkMediumContrast, + outline = outlineDarkMediumContrast, + outlineVariant = outlineVariantDarkMediumContrast, + scrim = scrimDarkMediumContrast, + inverseSurface = inverseSurfaceDarkMediumContrast, + inverseOnSurface = inverseOnSurfaceDarkMediumContrast, + inversePrimary = inversePrimaryDarkMediumContrast, + surfaceDim = surfaceDimDarkMediumContrast, + surfaceBright = surfaceBrightDarkMediumContrast, + surfaceContainerLowest = surfaceContainerLowestDarkMediumContrast, + surfaceContainerLow = surfaceContainerLowDarkMediumContrast, + surfaceContainer = surfaceContainerDarkMediumContrast, + surfaceContainerHigh = surfaceContainerHighDarkMediumContrast, + surfaceContainerHighest = surfaceContainerHighestDarkMediumContrast, +) + +private val highContrastDarkColorScheme = darkColorScheme( + primary = primaryDarkHighContrast, + onPrimary = onPrimaryDarkHighContrast, + primaryContainer = primaryContainerDarkHighContrast, + onPrimaryContainer = onPrimaryContainerDarkHighContrast, + secondary = secondaryDarkHighContrast, + onSecondary = onSecondaryDarkHighContrast, + secondaryContainer = secondaryContainerDarkHighContrast, + onSecondaryContainer = onSecondaryContainerDarkHighContrast, + tertiary = tertiaryDarkHighContrast, + onTertiary = onTertiaryDarkHighContrast, + tertiaryContainer = tertiaryContainerDarkHighContrast, + onTertiaryContainer = onTertiaryContainerDarkHighContrast, + error = errorDarkHighContrast, + onError = onErrorDarkHighContrast, + errorContainer = errorContainerDarkHighContrast, + onErrorContainer = onErrorContainerDarkHighContrast, + background = backgroundDarkHighContrast, + onBackground = onBackgroundDarkHighContrast, + surface = surfaceDarkHighContrast, + onSurface = onSurfaceDarkHighContrast, + surfaceVariant = surfaceVariantDarkHighContrast, + onSurfaceVariant = onSurfaceVariantDarkHighContrast, + outline = outlineDarkHighContrast, + outlineVariant = outlineVariantDarkHighContrast, + scrim = scrimDarkHighContrast, + inverseSurface = inverseSurfaceDarkHighContrast, + inverseOnSurface = inverseOnSurfaceDarkHighContrast, + inversePrimary = inversePrimaryDarkHighContrast, + surfaceDim = surfaceDimDarkHighContrast, + surfaceBright = surfaceBrightDarkHighContrast, + surfaceContainerLowest = surfaceContainerLowestDarkHighContrast, + surfaceContainerLow = surfaceContainerLowDarkHighContrast, + surfaceContainer = surfaceContainerDarkHighContrast, + surfaceContainerHigh = surfaceContainerHighDarkHighContrast, + surfaceContainerHighest = surfaceContainerHighestDarkHighContrast, ) @Composable fun SysctlGuiTheme( darkTheme: Boolean = isSystemInDarkTheme(), - forceDark: Boolean = false, dynamicColor: Boolean = false, + contrastLevel: Int = 1, content: @Composable () -> Unit ) { val colorScheme = when { - forceDark -> DarkColors dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { val context = LocalContext.current if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) } - darkTheme -> DarkColors - else -> LightColors + + darkTheme -> when (contrastLevel) { + 2 -> mediumContrastDarkColorScheme + 3 -> highContrastDarkColorScheme + else -> darkScheme + } + + else -> when (contrastLevel) { + 2 -> mediumContrastLightColorScheme + 3 -> highContrastLightColorScheme + else -> lightScheme + } } MaterialTheme( colorScheme = colorScheme, - shapes = SysctlGuiShapes, + typography = Typography, content = content ) } diff --git a/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Type.kt b/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Type.kt new file mode 100644 index 0000000..9277e5c --- /dev/null +++ b/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Type.kt @@ -0,0 +1,133 @@ +package com.androidvip.sysctlgui.design.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp +import com.androidvip.sysctlgui.design.R + +val passionOneFontFamily = FontFamily( + Font(resId = R.font.passionone_regular, weight = FontWeight.Normal), + Font(resId = R.font.passionone_regular, weight = FontWeight.Medium), + Font(resId = R.font.passionone_regular, weight = FontWeight.SemiBold), + Font(resId = R.font.passionone_bold, weight = FontWeight.Bold), + Font(resId = R.font.passionone_bold, weight = FontWeight.ExtraBold), + Font(resId = R.font.passionone_bold, weight = FontWeight.Black) +) + +val sansationFontFamily = FontFamily( + Font(resId = R.font.sansation_regular), + Font(resId = R.font.sansation_regular_italic, style = FontStyle.Italic), + Font(resId = R.font.sansation_bold, weight = FontWeight.Medium), + Font(resId = R.font.sansation_bold, weight = FontWeight.SemiBold), + Font(resId = R.font.sansation_bold, weight = FontWeight.Bold), + Font(resId = R.font.sansation_bold_italic, weight = FontWeight.Bold, style = FontStyle.Italic), +) + +val Typography = Typography( + displayLarge = TextStyle( + fontFamily = passionOneFontFamily, + fontWeight = FontWeight.Black, + fontSize = 57.sp, + lineHeight = 64.sp, + letterSpacing = 0.sp + ), + displayMedium = TextStyle( + fontFamily = passionOneFontFamily, + fontWeight = FontWeight.Bold, + fontSize = 45.sp, + lineHeight = 52.sp, + letterSpacing = 0.sp + ), + displaySmall = TextStyle( + fontFamily = passionOneFontFamily, + fontWeight = FontWeight.Bold, + fontSize = 36.sp, + lineHeight = 44.sp, + letterSpacing = 0.sp + ), + headlineLarge = TextStyle( + fontFamily = passionOneFontFamily, + fontWeight = FontWeight.Bold, + fontSize = 32.sp, + lineHeight = 40.sp, + letterSpacing = 0.sp + ), + headlineMedium = TextStyle( + fontFamily = passionOneFontFamily, + fontWeight = FontWeight.Bold, + fontSize = 28.sp, + lineHeight = 36.sp, + letterSpacing = 0.sp + ), + headlineSmall = TextStyle( + fontFamily = passionOneFontFamily, + fontWeight = FontWeight.SemiBold, + fontSize = 24.sp, + lineHeight = 32.sp, + letterSpacing = 0.sp + ), + titleLarge = TextStyle( + fontFamily = sansationFontFamily, + fontWeight = FontWeight.Bold, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + titleMedium = TextStyle( + fontFamily = sansationFontFamily, + fontWeight = FontWeight.Medium, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.15.sp + ), + titleSmall = TextStyle( + fontFamily = sansationFontFamily, + fontWeight = FontWeight.SemiBold, + fontSize = 14.sp, + lineHeight = 20.sp, + letterSpacing = 0.1.sp + ), + bodyLarge = TextStyle( + fontWeight = FontWeight.Medium, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.15.sp + ), + bodyMedium = TextStyle( + fontWeight = FontWeight.Normal, + fontSize = 14.sp, + lineHeight = 20.sp, + letterSpacing = 0.25.sp + ), + bodySmall = TextStyle( + fontWeight = FontWeight.Normal, + fontSize = 12.sp, + lineHeight = 16.sp, + letterSpacing = 0.4.sp + ), + labelLarge = TextStyle( + fontFamily = sansationFontFamily, + fontWeight = FontWeight.Medium, + fontSize = 14.sp, + lineHeight = 20.sp, + letterSpacing = 0.1.sp + ), + labelMedium = TextStyle( + fontFamily = sansationFontFamily, + fontWeight = FontWeight.Medium, + fontSize = 12.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ), + labelSmall = TextStyle( + fontFamily = sansationFontFamily, + fontWeight = FontWeight.Normal, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) +) diff --git a/common/design/src/main/res/font/passionone_bold.ttf b/common/design/src/main/res/font/passionone_bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..25a35e453ed4ed792204e44ba2f6378eb52b8903 GIT binary patch literal 22876 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 vmMGy literal 0 HcmV?d00001 diff --git a/common/design/src/main/res/font/passionone_regular.ttf b/common/design/src/main/res/font/passionone_regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..099be0fc86b29052f283167fe539ac9f6333ca25 GIT binary patch literal 23076 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

    &-0e_1nn|WxxNfwtb*s09f&5 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 literal 0 HcmV?d00001 diff --git a/common/design/src/main/res/font/sansation_bold_italic.ttf b/common/design/src/main/res/font/sansation_bold_italic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..8677879c7b2e26a20d0509bb9173fdf45a00ac1b GIT binary patch literal 38740 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

    vOjIs7K
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

literal 0
HcmV?d00001

diff --git a/common/design/src/main/res/font/sansation_regular.ttf b/common/design/src/main/res/font/sansation_regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e9bda1717a15cfe11eec38d175066f935bd206f6
GIT binary patch
literal 36764
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

literal 0
HcmV?d00001

diff --git a/common/design/src/main/res/font/sansation_regular_italic.ttf b/common/design/src/main/res/font/sansation_regular_italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..95258de9b8db2785badfb5f3c98b14521c4109f7
GIT binary patch
literal 38596
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

literal 0
HcmV?d00001

diff --git a/common/design/src/main/res/layout/dialog_web.xml b/common/design/src/main/res/layout/dialog_web.xml
deleted file mode 100644
index 7947cf0..0000000
--- a/common/design/src/main/res/layout/dialog_web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-    
-
-        
-
-    
-
-    
-
-
diff --git a/common/design/src/main/res/layout/modal_bottom_sheet.xml b/common/design/src/main/res/layout/modal_bottom_sheet.xml
deleted file mode 100644
index ca17b9e..0000000
--- a/common/design/src/main/res/layout/modal_bottom_sheet.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-
diff --git a/common/design/src/main/res/layout/preference_widget_switch_compat.xml b/common/design/src/main/res/layout/preference_widget_switch_compat.xml
deleted file mode 100644
index 8641b11..0000000
--- a/common/design/src/main/res/layout/preference_widget_switch_compat.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
\ No newline at end of file
diff --git a/data/src/androidTest/java/com/androidvip/sysctlgui/data/ExampleInstrumentedTest.kt b/data/src/androidTest/java/com/androidvip/sysctlgui/data/ExampleInstrumentedTest.kt
deleted file mode 100644
index 9f0a565..0000000
--- a/data/src/androidTest/java/com/androidvip/sysctlgui/data/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.androidvip.sysctlgui.data
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.androidvip.sysctlgui.data", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt b/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt
index 1cbd751..29155ea 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt
@@ -28,6 +28,8 @@ import io.ktor.client.engine.android.Android
 import io.ktor.client.plugins.logging.LogLevel
 import io.ktor.client.plugins.logging.Logger
 import io.ktor.client.plugins.logging.Logging
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
 import org.koin.android.ext.koin.androidApplication
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.module.dsl.factoryOf
@@ -36,7 +38,8 @@ import org.koin.dsl.bind
 import org.koin.dsl.module
 
 val utilsModule = module {
-    factoryOf(::RootUtils)
+    factory { Dispatchers.IO }
+    factory { RootUtils(Dispatchers.Default) }
     factory { PresetsFileProcessor(androidContext().contentResolver) }
     factory { AndroidStringProvider(androidApplication()) }
 }
@@ -50,10 +53,17 @@ val repositoryModule = module {
     factoryOf(::AppPrefsImpl) bind AppPrefs::class
     factoryOf(::ParamsRepositoryImpl) bind ParamsRepository::class
     factoryOf(::PresetRepositoryImpl) bind PresetRepository::class
-    factoryOf(::AppSettingsRepositoryImpl) bind AppSettingsRepository::class
 
     single { UserRepositoryImpl(paramDao = get().paramDao()) }
 
+    factory {
+        AppSettingsRepositoryImpl(
+            context = androidContext(),
+            sharedPreferences = get(),
+            rootUtils = get()
+        )
+    }
+
     factory {
         DocumentationRepositoryImpl(
             offlineDataSource = get(named()),
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/models/KernelParamDTO.kt b/data/src/main/java/com/androidvip/sysctlgui/data/models/KernelParamDTO.kt
index fd31d0e..5188801 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/models/KernelParamDTO.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/models/KernelParamDTO.kt
@@ -25,6 +25,19 @@ data class KernelParamDTO(
     override val isTaskerParam: Boolean = false,
     @ColumnInfo(name = "tasker_list")
     override val taskerList: Int = Consts.LIST_NUMBER_PRIMARY_TASKER
-) : KernelParam(name, path, value, isFavorite, isTaskerParam, taskerList)
+) : KernelParam(name, path, value, isFavorite, isTaskerParam, taskerList) {
+    companion object {
+        fun fromKernelParam(param: KernelParam): KernelParamDTO {
+            return KernelParamDTO(
+                name = param.name,
+                path = param.path,
+                value = param.value,
+                isFavorite = param.isFavorite,
+                isTaskerParam = param.isTaskerParam,
+                taskerList = param.taskerList
+            )
+        }
+    }
+}
 
 internal const val PARAMS_TABLE_NAME = "roomKernelParam"
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt
index 386e7f8..f0543d3 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt
@@ -9,6 +9,7 @@ import com.androidvip.sysctlgui.domain.enums.CommitMode
 import com.androidvip.sysctlgui.domain.enums.SettingItemType
 import com.androidvip.sysctlgui.domain.models.AppSetting
 import com.androidvip.sysctlgui.domain.repository.AppSettingsRepository
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlin.coroutines.CoroutineContext
 
@@ -16,7 +17,7 @@ class AppSettingsRepositoryImpl(
     private val context: Context,
     private val sharedPreferences: SharedPreferences,
     private val rootUtils: RootUtils,
-    private val ioContext: CoroutineContext
+    private val ioContext: CoroutineContext = Dispatchers.IO
 ) : AppSettingsRepository {
     override suspend fun getAppSettings(): List> = withContext(ioContext) {
         val usingDynamicColors = sharedPreferences.getBoolean(Prefs.DynamicColors.key, false)
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/ParamsRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/ParamsRepositoryImpl.kt
index 768c335..1797c0b 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/ParamsRepositoryImpl.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/ParamsRepositoryImpl.kt
@@ -96,10 +96,20 @@ class ParamsRepositoryImpl(
         val params = files.mapNotNull { file ->
             try {
                 val path = file.absolutePath
-                val value = rootUtils.executeCommandAndStreamOutput(
-                    command = String.format(CAT_COMMAND_FORMAT, path)
-                ).toList().joinToString("\n")
-                KernelParam.createFromPath(path, value)
+                if (file.isDirectory) {
+                    KernelParam.createFromPath(path, "")
+                } else {
+                    val fileContent = runCatching { file.readText() }.getOrNull()
+                    if (fileContent != null) {
+                        KernelParam.createFromPath(path, fileContent)
+                    } else {
+                        val command = String.format(CAT_COMMAND_FORMAT, path)
+                        val paramValue = rootUtils.executeCommandAndStreamOutput(command)
+                            .toList()
+                            .joinToString("\n")
+                        KernelParam.createFromPath(path, paramValue)
+                    }
+                }
             } catch (e: Exception) {
                 Log.e(TAG, "Failed to process file: ${file.path}", e)
                 null
@@ -119,6 +129,10 @@ class ParamsRepositoryImpl(
                 !this.startsWith("sysctl")
     }
 
+    interface ChangeListener {
+        fun onChange()
+    }
+
     companion object {
         private const val BUSYBOX_PREFIX = "busybox "
         private const val SYSCTL_GET_ALL_COMMAND = "sysctl -a"
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt
index 3dbb29b..f5ade4a 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt
@@ -27,16 +27,16 @@ class UserRepositoryImpl(
     }
 
     override suspend fun upsertUserParam(param: KernelParam) = withContext(coroutineContext) {
-        paramDao.upsert(param as KernelParamDTO)
+        paramDao.upsert(KernelParamDTO.fromKernelParam(param))
     }
 
     override suspend fun upsertUserParams(params: List) =
         withContext(coroutineContext) {
-            paramDao.upsertAll(params.map { it as KernelParamDTO })
+            paramDao.upsertAll(params.map { KernelParamDTO.fromKernelParam(it) })
         }
 
     override suspend fun removeUserParam(param: KernelParam) = withContext(coroutineContext) {
-        paramDao.delete(param as KernelParamDTO)
+        paramDao.delete(KernelParamDTO.fromKernelParam(param))
     }
 
     override suspend fun clearUserParams() = withContext(coroutineContext) {
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/source/OnlineDocumentationDataSource.kt b/data/src/main/java/com/androidvip/sysctlgui/data/source/OnlineDocumentationDataSource.kt
index c79b528..43f05fa 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/source/OnlineDocumentationDataSource.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/source/OnlineDocumentationDataSource.kt
@@ -10,6 +10,7 @@ import io.ktor.http.isSuccess
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.jsoup.Jsoup
+import java.io.File
 import kotlin.coroutines.CoroutineContext
 
 
@@ -48,7 +49,19 @@ class OnlineDocumentationDataSource(
             val html = response.bodyAsText()
             val document = Jsoup.parse(html)
             val htmlElementId = param.lastNameSegment.replace('_', '-')
-            val elements = document.select("section#$htmlElementId p")
+
+
+            if (File(param.path).isDirectory) {
+                // If we got something out of the request, might as well return at least the URL
+                return@withContext ParamDocumentation(
+                    title = param.name,
+                    documentationText = "",
+                    documentationHtml = "", // HTML might be huge (directory documentation)
+                    url = url
+                )
+            }
+
+            val elements = document.select("section#$htmlElementId :not(h2)")
 
             if (elements.isEmpty()) {
                 Log.w(
@@ -56,6 +69,9 @@ class OnlineDocumentationDataSource(
                     "No documentation found for ${param.name} with id $htmlElementId on $url"
                 )
                 return@withContext null
+            } else {
+                // Remove first element (usually a heading remnant)
+                elements.removeAt(0)
             }
 
             return@withContext ParamDocumentation(
@@ -71,8 +87,11 @@ class OnlineDocumentationDataSource(
     }
 
     private fun getDocumentationUrl(param: KernelParam): String {
+        if (File(param.path).isDirectory) {
+            return "${DOC_BASE_URL}${param.name}.html"
+        }
         val configName = param.groupName
-        return "${DOC_BASE_URL}$configName.html#${param.name}"
+        return "${DOC_BASE_URL}$configName.html#${param.lastNameSegment.replace('_', '-')}"
     }
 
     /**
@@ -87,6 +106,7 @@ class OnlineDocumentationDataSource(
             .replace("
    ", "")
             .replace("
    ", "") // For "code" blocks
             .replace("", "")
+            .replace("", "") // For code tags
             .replace("
  • ", "
  • ")
             .replace("
    • ", "") // For spaced bullet points
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/utils/PresetsFileProcessor.kt b/data/src/main/java/com/androidvip/sysctlgui/data/utils/PresetsFileProcessor.kt
index 696b4e1..5c47959 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/utils/PresetsFileProcessor.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/utils/PresetsFileProcessor.kt
@@ -3,6 +3,7 @@ package com.androidvip.sysctlgui.data.utils
 import android.content.ContentResolver
 import android.net.Uri
 import android.util.Log
+import com.androidvip.sysctlgui.domain.exceptions.NoParameterFoundException
 import com.androidvip.sysctlgui.domain.models.KernelParam
 import com.androidvip.sysctlgui.utils.isValidSysctlLine
 import kotlinx.coroutines.CoroutineDispatcher
@@ -19,10 +20,10 @@ class PresetsFileProcessor(
     ): List = withContext(ioDispatcher) {
         contentResolver.openInputStream(uri)?.use { inputStream ->
             val lines = inputStream.bufferedReader().readLines()
-            lines.mapNotNull { line ->
+            val params = lines.mapNotNull { line ->
                 if (line.isValidSysctlLine()) {
                     runCatching {
-                        KernelParam.Companion.createFromName(
+                        KernelParam.createFromName(
                             name = line.substringBefore('=').trim(),
                             value = line.substringAfter('=').trim(),
                             isFavorite = true
@@ -33,6 +34,12 @@ class PresetsFileProcessor(
                     null
                 }
             }
+
+            if (params.isEmpty()) {
+                throw NoParameterFoundException()
+            }
+
+            params
         } ?: throw IOException("Failed to open input stream for URI: $uri")
     }
 
diff --git a/data/src/test/java/com/androidvip/sysctlgui/data/ExampleUnitTest.kt b/data/src/test/java/com/androidvip/sysctlgui/data/ExampleUnitTest.kt
deleted file mode 100644
index 2365b1c..0000000
--- a/data/src/test/java/com/androidvip/sysctlgui/data/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.androidvip.sysctlgui.data
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/Actions.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/enums/Actions.kt
similarity index 60%
rename from app/src/main/kotlin/com/androidvip/sysctlgui/helpers/Actions.kt
rename to domain/src/main/java/com/androidvip/sysctlgui/domain/enums/Actions.kt
index 5750be5..347b501 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/Actions.kt
+++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/enums/Actions.kt
@@ -1,9 +1,8 @@
-package com.androidvip.sysctlgui.helpers
+package com.androidvip.sysctlgui.domain.enums
 
 enum class Actions {
     BrowseParams,
-    ListParams,
     ExportParams,
     OpenSettings,
     EditParam
-}
+}
\ No newline at end of file
diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/models/KernelParam.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/models/KernelParam.kt
index 4128970..9759f98 100644
--- a/domain/src/main/java/com/androidvip/sysctlgui/domain/models/KernelParam.kt
+++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/models/KernelParam.kt
@@ -57,6 +57,10 @@ open class KernelParam(
      */
     fun hasValidName() = name.isKernelNameValid()
 
+    override fun toString(): String {
+        return "$name=$value"
+    }
+
     companion object {
 
         /**
@@ -74,7 +78,12 @@ open class KernelParam(
         ): KernelParam {
             require(name.isKernelNameValid()) { "Invalid name: $name" }
             val derivedPath = "${Consts.PROC_SYS}/${name.replace(".", "/")}"
-            return KernelParam(name, value, derivedPath, isFavorite)
+            return KernelParam(
+                name = name,
+                path = derivedPath,
+                value = value,
+                isFavorite = isFavorite
+            )
         }
 
         /**
@@ -96,7 +105,7 @@ open class KernelParam(
                 .replace("/", ".")
                 .removePrefix(".")
 
-            return KernelParam(derivedName, value, path)
+            return KernelParam(derivedName, path = path, value = value)
         }
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f41fe46..356b3e6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,7 @@
 [versions]
 agp = "8.12.0"
+coreSplashscreen = "1.0.1"
+composeMaterial = "1.8.3"
 libsu = "6.0.0"
 jsoup = "1.21.1"
 kotlin = "2.2.0"
@@ -8,14 +10,13 @@ ksp = "2.2.0-2.0.2"
 coreKtx = "1.16.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
-espressoCore = "3.7.0"
 ktor = "3.2.3"
 lifecycle = "2.9.2"
 activityCompose = "1.10.1"
 composeBom = "2025.07.00"
 appcompat = "1.7.1"
-material = "1.8.3"
-materialIconsCore = "1.7.8"
+materialIconsCoreCompose = "1.7.8"
+material = "1.12.0"
 navigationCompose = "2.9.3"
 preference = "1.2.1"
 room = "2.7.2"
@@ -24,20 +25,22 @@ material3 = "1.5.0-alpha01"
 kotlinxSerializationCore = "1.9.0"
 koin = "4.1.0"
 window = "1.4.0"
+workRuntimeKtx = "2.10.3"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
-androidx-material = { module = "androidx.compose.material:material", version.ref = "material" }
-androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "materialIconsCore" }
+androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
+androidx-material = { module = "androidx.compose.material:material", version.ref = "composeMaterial" }
+androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "materialIconsCoreCompose" }
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" }
 androidx-preference = { module = "androidx.preference:preference", version.ref = "preference" }
 androidx-window = { module = "androidx.window:window", version.ref = "window" }
+androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" }
 libsu-core = { module = "com.github.topjohnwu.libsu:core", version.ref = "libsu" }
 libsu-nio = { module = "com.github.topjohnwu.libsu:nio", version.ref = "libsu" }
 jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
-androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle" }
 androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
@@ -59,13 +62,13 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3",
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" }
-kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinxSerializationCore" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationCore" }
 koin = { module = "io.insert-koin:koin-android", version.ref = "koin" }
 koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" }
 ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" }
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
+material = { module = "com.google.android.material:material", version.ref = "material" }
 
 [bundles]
 ktor-clients = ["ktor-client-core", "ktor-client-android", "ktor-client-logging"]
@@ -77,5 +80,5 @@ android-library = { id = "com.android.library", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin"}
+jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

From 776d7f87cfe06cd83b559063de2ad30e497f35a2 Mon Sep 17 00:00:00 2001
From: Lennoard 
Date: Wed, 13 Aug 2025 23:40:03 -0300
Subject: [PATCH 05/18] bugfix: search screen v3

---
 .../sysctlgui/ui/main/AppNavHost.kt           |  16 ++-
 .../sysctlgui/ui/search/SearchScreen.kt       | 133 +++++++++---------
 .../sysctlgui/ui/search/SearchViewModel.kt    |  38 ++---
 .../sysctlgui/ui/search/SearchViewState.kt    |   4 +-
 .../com/androidvip/sysctlgui/utils/Misc.kt    |  17 +--
 .../data/repository/ParamsRepositoryImpl.kt   |   4 +-
 .../data/repository/UserRepositoryImpl.kt     |   6 +-
 .../data/utils/PresetsFileProcessor.kt        |   4 +-
 .../domain/repository/UserRepository.kt       |   4 +-
 .../domain/usecase/GetUserParamsUseCase.kt    |   3 +-
 10 files changed, 123 insertions(+), 106 deletions(-)

diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt
index b01c59b..aef5eb1 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt
@@ -1,5 +1,9 @@
 package com.androidvip.sysctlgui.ui.main
 
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
@@ -9,7 +13,6 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import com.androidvip.sysctlgui.core.navigation.UiRoute
-import com.androidvip.sysctlgui.ui.user.UserParamsScreen
 import com.androidvip.sysctlgui.ui.params.browse.ParamBrowseScreen
 import com.androidvip.sysctlgui.ui.params.browse.ParamBrowseScreenContentPreview
 import com.androidvip.sysctlgui.ui.params.edit.EditParamScreen
@@ -17,13 +20,18 @@ import com.androidvip.sysctlgui.ui.presets.ImportPresetScreen
 import com.androidvip.sysctlgui.ui.presets.PresetsScreen
 import com.androidvip.sysctlgui.ui.search.SearchScreen
 import com.androidvip.sysctlgui.ui.settings.SettingsScreen
+import com.androidvip.sysctlgui.ui.user.UserParamsScreen
 
 @Composable
 internal fun AppNavHost(innerPadding: PaddingValues, navController: NavHostController) {
     NavHost(
         modifier = Modifier.padding(innerPadding),
         navController = navController,
-        startDestination = UiRoute.BrowseParams
+        startDestination = UiRoute.BrowseParams,
+        enterTransition = { scaleIn(initialScale = 0.9f) + fadeIn() },
+        exitTransition = { scaleOut(targetScale = 0.9f) + fadeOut() },
+        popEnterTransition = { scaleIn(initialScale = 1.1f) + fadeIn() },
+        popExitTransition = { scaleOut(targetScale = 1.1f) + fadeOut() }
     ) {
         composable {
             if (LocalView.current.isInEditMode) {
@@ -63,10 +71,10 @@ internal fun AppNavHost(innerPadding: PaddingValues, navController: NavHostContr
 
         composable {
             SearchScreen(
+                outerScaffoldPadding = innerPadding,
                 onParamSelected = {
                     navController.navigate(UiRoute.EditParam(paramName = it.name))
-                },
-                onNavigateBack = { navController.popBackStack() }
+                }
             )
         }
 
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt
index b6ab33a..b68a311 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt
@@ -1,16 +1,16 @@
 package com.androidvip.sysctlgui.ui.search
 
+import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.expandHorizontally
-import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkHorizontally
-import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.offset
@@ -63,8 +63,8 @@ import org.koin.compose.viewmodel.koinViewModel
 fun SearchScreen(
     viewModel: SearchViewModel = koinViewModel(),
     mainViewModel: MainViewModel = koinViewModel(),
-    onParamSelected: (UiKernelParam) -> Unit,
-    onNavigateBack: () -> Unit
+    outerScaffoldPadding: PaddingValues,
+    onParamSelected: (UiKernelParam) -> Unit
 ) {
     val state by viewModel.uiState.collectAsStateWithLifecycle()
     var searchQuery by remember { mutableStateOf("") }
@@ -81,16 +81,16 @@ fun SearchScreen(
         )
     }
 
-    LaunchedEffect(viewModel.effect) {
+    LaunchedEffect(Unit) {
         viewModel.effect.collect { effect ->
             when (effect) {
                 is SearchViewEffect.EditKernelParam -> onParamSelected(effect.param)
-                SearchViewEffect.NavigateBack -> onNavigateBack()
             }
         }
     }
 
     SearchScreenContent(
+        outerScaffoldPadding = outerScaffoldPadding,
         searchQuery = searchQuery,
         onSearchQueryChange = {
             searchQuery = it
@@ -98,12 +98,13 @@ fun SearchScreen(
         },
         searchActive = searchActive,
         onSearchActiveChange = { searchActive = it },
-        searchHints = state.searchHints,
-        searchResults = state.searchResults,
-        onNavigateBack = { viewModel.onEvent(SearchViewEvent.BackClicked) },
+        state = state,
         onHistoryItemRemoveClicked = {
             viewModel.onEvent(SearchViewEvent.HistoryItemRemoveClicked(it))
         },
+        onParamClicked = {
+            viewModel.onEvent(SearchViewEvent.ParamClicked(it))
+        },
         onSearch = { query ->
             searchActive = false
             viewModel.onEvent(SearchViewEvent.SearchRequested(query))
@@ -114,17 +115,18 @@ fun SearchScreen(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun SearchScreenContent(
+    state: SearchViewState,
+    outerScaffoldPadding: PaddingValues = PaddingValues(),
     searchQuery: String,
     onSearchQueryChange: (String) -> Unit,
     searchActive: Boolean,
     onSearchActiveChange: (Boolean) -> Unit,
-    searchHints: List,
-    searchResults: List,
     onHistoryItemRemoveClicked: (SearchHint) -> Unit,
-    onNavigateBack: () -> Unit,
-    onSearch: (String) -> Unit
+    onParamClicked: (UiKernelParam) -> Unit,
+    onSearch: (String) -> Unit,
 ) {
     val focusManager = LocalFocusManager.current
+    val navHostTopPadding = outerScaffoldPadding.calculateTopPadding()
     val searchBarHorizontalPadding by animateDpAsState(
         targetValue = if (searchActive) 0.dp else 16.dp,
         label = "SearchBarHorizontalPadding",
@@ -137,6 +139,9 @@ private fun SearchScreenContent(
     )
 
     Scaffold(
+        modifier = Modifier
+            .fillMaxSize()
+            .offset(y = -navHostTopPadding),
         topBar = {
             val onActiveChange: (Boolean) -> Unit = { isActive ->
                 if (searchActive != isActive) {
@@ -157,42 +162,25 @@ private fun SearchScreenContent(
                         onExpandedChange = onActiveChange,
                         placeholder = { Text("Search kernel parameters") },
                         leadingIcon = {
-                            AnimatedVisibility(
-                                visible = searchActive,
-                                enter = expandVertically() + fadeIn(),
-                                exit = shrinkVertically() + fadeOut()
-                            ) {
-                                IconButton(onClick = {
-                                    focusManager.clearFocus()
-                                    onSearchActiveChange(false)
-                                    onSearchQueryChange("")
-                                    if (searchQuery.isEmpty()) {
-                                        onNavigateBack()
+                            AnimatedContent(
+                                targetState = searchActive,
+                                label = "SearchIconsAnimation"
+                            ) { targetSearchActive ->
+                                if (targetSearchActive) {
+                                    IconButton(onClick = {
+                                        focusManager.clearFocus()
+                                        onSearchActiveChange(false)
+                                        onSearchQueryChange("")
+                                    }) {
+                                        Icon(
+                                            Icons.AutoMirrored.Rounded.ArrowBack,
+                                            contentDescription = "Back"
+                                        )
                                     }
-                                }) {
-                                    Icon(
-                                        Icons.AutoMirrored.Rounded.ArrowBack,
-                                        contentDescription = "Back"
-                                    )
+                                } else {
+                                    Icon(Icons.Rounded.Search, contentDescription = "Search Icon")
                                 }
                             }
-
-
-                            AnimatedVisibility(
-                                visible = !searchActive,
-                                enter = expandVertically(
-                                    animationSpec = tween(delayMillis = 200)
-                                ) + fadeIn(
-                                    animationSpec = tween(delayMillis = 200)
-                                ),
-                                exit = shrinkVertically(
-                                    animationSpec = tween(durationMillis = 0)
-                                ) + fadeOut(
-                                    animationSpec = tween(durationMillis = 0)
-                                )
-                            ) {
-                                Icon(Icons.Rounded.Search, contentDescription = "Search Icon")
-                            }
                         },
                         trailingIcon = {
                             AnimatedVisibility(
@@ -223,7 +211,7 @@ private fun SearchScreenContent(
                 windowInsets = SearchBarDefaults.windowInsets,
             ) {
                 SearchViewContent(
-                    searchHints = searchHints,
+                    searchHints = state.searchHints,
                     onHistoryItemRemoveClicked = onHistoryItemRemoveClicked,
                     onSearchQueryChange = onSearchQueryChange,
                     onSearch = onSearch,
@@ -233,12 +221,23 @@ private fun SearchScreenContent(
             }
         }
     ) { innerPadding ->
-        Box(modifier = Modifier.padding(innerPadding)) {
-            if (!searchActive) {
-                SearchResultsContent(searchResults, searchQuery)
+        AnimatedContent(
+            targetState = state.loading,
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(innerPadding)
+        ) {
+            if (it) {
+                Box(modifier = Modifier.fillMaxSize()) {
+                    CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
+                }
+            } else {
+                SearchResultsContent(
+                    searchResults = state.searchResults,
+                    searchQuery = searchQuery,
+                    onParamClicked = onParamClicked
+                )
             }
-
-            CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
         }
     }
 }
@@ -268,12 +267,12 @@ private fun SearchViewContent(
                         .padding(horizontal = 16.dp, vertical = 12.dp)
                 )
             }
-            items(historyHints, key = { it.hint }) { hintItem ->
+            items(historyHints, key = { "history:${it.hint}" }) { historyItem ->
                 ListItem(
                     colors = ListItemDefaults.colors(
                         containerColor = MaterialTheme.colorScheme.surfaceContainerHigh
                     ),
-                    headlineContent = { Text(hintItem.hint) },
+                    headlineContent = { Text(historyItem.hint) },
                     leadingContent = {
                         Icon(
                             painter = painterResource(R.drawable.ic_history),
@@ -282,7 +281,7 @@ private fun SearchViewContent(
                     },
                     trailingContent = {
                         IconButton(
-                            onClick = { onHistoryItemRemoveClicked(hintItem) },
+                            onClick = { onHistoryItemRemoveClicked(historyItem) },
                             modifier = Modifier.offset(16.dp)
                         ) {
                             Icon(
@@ -293,8 +292,8 @@ private fun SearchViewContent(
                     },
                     modifier = Modifier
                         .clickable {
-                            onSearchQueryChange(hintItem.hint)
-                            onSearch(hintItem.hint)
+                            onSearchQueryChange(historyItem.hint)
+                            onSearch(historyItem.hint)
                             onSearchActiveChange(false)
                         }
                         .animateItem()
@@ -317,7 +316,7 @@ private fun SearchViewContent(
                     modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp)
                 )
             }
-            items(suggestionHints, key = { it.hint }) { hintItem ->
+            items(suggestionHints, key = { "hint:${it.hint}" }) { hintItem ->
                 ListItem(
                     colors = ListItemDefaults.colors(
                         containerColor = MaterialTheme.colorScheme.surfaceContainerHigh
@@ -351,7 +350,11 @@ private fun SearchViewContent(
 }
 
 @Composable
-private fun SearchResultsContent(searchResults: List, searchQuery: String) {
+private fun SearchResultsContent(
+    searchResults: List,
+    searchQuery: String,
+    onParamClicked: (UiKernelParam) -> Unit
+) {
     if (searchResults.isNotEmpty()) {
         LazyColumn(
             modifier = Modifier
@@ -363,7 +366,7 @@ private fun SearchResultsContent(searchResults: List, searchQuery
                     modifier = Modifier.animateItem(),
                     param = param,
                     showFullName = true,
-                    onParamClicked = {}
+                    onParamClicked = onParamClicked
                 )
 
                 if (index < searchResults.lastIndex) {
@@ -448,15 +451,17 @@ private fun SearchScreenPreview() {
             onSearchQueryChange = { searchQuery = it },
             searchActive = searchActive,
             onSearchActiveChange = { searchActive = it },
-            searchHints = searchHints,
-            searchResults = searchResults,
-            onNavigateBack = {},
+            state = SearchViewState(
+                searchHints = searchHints,
+                searchResults = searchResults
+            ),
             onHistoryItemRemoveClicked = { searchHints = searchHints - it },
+            onParamClicked = {},
             onSearch = {
                 searchResults = searchResults.filter {
                     it.name.contains(searchQuery, ignoreCase = true)
                 }
-            }
+            },
         )
     }
 }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewModel.kt
index b024a89..9d6fccb 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewModel.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewModel.kt
@@ -22,19 +22,19 @@ class SearchViewModel(
 ) : BaseViewModel() {
     private var preSearchJob: Job? = null
     private val searchableParams = mutableListOf()
-    private val searchHistory = mutableSetOf()
+    private val searchHistory = mutableListOf()
 
     init {
         viewModelScope.launch {
-            setState { copy(loading = true) }
-
             val fetchedHistory = appPrefs.searchHistory
             val fetchedParams = fetchParams()
 
             searchHistory.addAll(fetchedHistory)
             searchableParams.addAll(fetchedParams)
 
-            val uiSearchHints = fetchedHistory.map { SearchHint(hint = it, isFromHistory = true) }
+            val uiSearchHints = fetchedHistory
+                .map { SearchHint(hint = it, isFromHistory = true) }
+                .takeLast(MAX_SEARCH_HINTS)
 
             setState {
                 copy(
@@ -54,7 +54,6 @@ class SearchViewModel(
 
     override fun onEvent(event: SearchViewEvent) {
         when (event) {
-            SearchViewEvent.BackClicked -> setEffect { SearchViewEffect.NavigateBack }
             is SearchViewEvent.HistoryItemRemoveClicked -> handleRemoveFromHistory(event.hint)
             is SearchViewEvent.SearchRequested -> handleSearch(event.query)
             is SearchViewEvent.SearchQueryChange -> handleSearchQueryChange(event.query)
@@ -82,21 +81,14 @@ class SearchViewModel(
             searchHistory.add(query)
             appPrefs.addSearchToHistory(query)
 
-            val hints = withContext(Dispatchers.IO) {
-                val historyHints = searchHistory
-                    .take(MAX_SEARCH_HISTORY)
-                    .map { SearchHint(hint = it, isFromHistory = true) }
-
-                val paramHints = searchableParams
+            val searchResults = withContext(Dispatchers.IO) {
+                searchableParams
                     .filter { it.name.contains(query, ignoreCase = true) }
-                    .take(MAX_SEARCH_HINTS)
-                    .map { SearchHint(it.name) }
-
-                historyHints + paramHints
+                    .map(UiKernelParamMapper::map)
             }
 
             setState {
-                copy(loading = false, searchHints = hints)
+                copy(loading = false, searchResults = searchResults)
             }
         }
     }
@@ -104,13 +96,21 @@ class SearchViewModel(
     private fun handlePreSearch(query: String) {
         viewModelScope.launch {
             val hints = withContext(Dispatchers.IO) {
-                searchableParams
+                val historyHints = searchHistory
+                    .toList()
+                    .take(MAX_SEARCH_HISTORY)
+                    .map { SearchHint(hint = it, isFromHistory = true) }
+
+                val paramHints = searchableParams
                     .filter { it.name.contains(query, ignoreCase = true) }
-                    .map(UiKernelParamMapper::map)
+                    .take(MAX_SEARCH_HINTS)
+                    .map { SearchHint(it.name) }
+
+                historyHints + paramHints
             }
 
             setState {
-                copy(loading = false, searchResults = hints)
+                copy(loading = false, searchHints = hints)
             }
         }
     }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewState.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewState.kt
index eea820a..282a131 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewState.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchViewState.kt
@@ -4,13 +4,12 @@ import com.androidvip.sysctlgui.models.SearchHint
 import com.androidvip.sysctlgui.models.UiKernelParam
 
 data class SearchViewState(
-    val loading: Boolean = true,
+    val loading: Boolean = false,
     val searchHints: List = emptyList(),
     val searchResults: List = emptyList()
 )
 
 sealed interface SearchViewEvent {
-    data object BackClicked : SearchViewEvent
     data class SearchQueryChange(val query: String) : SearchViewEvent
     data class HistoryItemRemoveClicked(val hint: SearchHint) : SearchViewEvent
     data class SearchRequested(val query: String) : SearchViewEvent
@@ -18,6 +17,5 @@ sealed interface SearchViewEvent {
 }
 
 sealed interface SearchViewEffect {
-    data object NavigateBack : SearchViewEffect
     data class EditKernelParam(val param: UiKernelParam) : SearchViewEffect
 }
diff --git a/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/Misc.kt b/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/Misc.kt
index 806811e..ad8eace 100644
--- a/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/Misc.kt
+++ b/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/Misc.kt
@@ -4,22 +4,23 @@ import android.view.View
 import androidx.core.view.HapticFeedbackConstantsCompat
 import androidx.core.view.ViewCompat
 
+
 /**
  * Checks if a string is a valid sysctl line.
  * A valid sysctl line must:
- * - Contain exactly one "=" character.
- * - Not have blank parts before or after the "=".
- * - Have a key that matches the pattern: `^[a-zA-Z0-9_]+(\\.[a-zA-Z0-9_]+)+$`
+ * - Contain an "=" character.
+ * - Have a key that matches the pattern: `^[a-zA-Z0-9_]+(?:\.[a-zA-Z0-9_]+)*$`
  *   (e.g., "vm.swappiness", "net.ipv4.tcp_congestion_control").
+ * - Have a non-blank value after the "=".
  *
  * @return `true` if the string is a valid sysctl line, `false` otherwise.
  */
-fun String.isValidSysctlLine(): Boolean {
-    val parts = this.split("=", limit = 2)
-    if (parts.size != 2 || parts.any { it.isBlank() }) return false
+fun String.isValidSysctlOutputLine(): Boolean {
+    val trimmedLine = this.trim()
+    val linePattern = """^([a-zA-Z0-9_]+(?:\.[a-zA-Z0-9_]+)*)\s*=\s*(.+)$""".toRegex()
+    val matchResult = linePattern.matchEntire(trimmedLine)
 
-    val keyPattern = "^[a-zA-Z0-9_]+(\\.[a-zA-Z0-9_]+)+$".toRegex()
-    return keyPattern.matches(parts.first())
+    return matchResult != null
 }
 
 fun performHapticFeedbackForToggle(newState: Boolean, view: View) {
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/ParamsRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/ParamsRepositoryImpl.kt
index 1797c0b..cc080e0 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/ParamsRepositoryImpl.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/ParamsRepositoryImpl.kt
@@ -5,7 +5,7 @@ import com.androidvip.sysctlgui.data.utils.RootUtils
 import com.androidvip.sysctlgui.domain.enums.CommitMode
 import com.androidvip.sysctlgui.domain.models.KernelParam
 import com.androidvip.sysctlgui.domain.repository.ParamsRepository
-import com.androidvip.sysctlgui.utils.isValidSysctlLine
+import com.androidvip.sysctlgui.utils.isValidSysctlOutputLine
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
@@ -124,7 +124,7 @@ class ParamsRepositoryImpl(
     }
 
     private fun String.isValidSysctlOutput(): Boolean {
-        return isValidSysctlLine() &&
+        return isValidSysctlOutputLine() &&
                 !this.contains("denied", ignoreCase = true) &&
                 !this.startsWith("sysctl")
     }
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt
index f5ade4a..d2e3d52 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt
@@ -19,9 +19,13 @@ class UserRepositoryImpl(
     private val paramDao: ParamDao,
     private val coroutineContext: CoroutineContext = Dispatchers.IO
 ) : UserRepository {
-    override val userParams: Flow>
+    override val userParamsFlow: Flow>
         get() = paramDao.getAllAsFlow()
 
+    override suspend fun getUserParams(): List = withContext(coroutineContext) {
+        paramDao.getAll()
+    }
+
     override suspend fun getParamByName(name: String) = withContext(coroutineContext) {
         paramDao.getParamByName(name)
     }
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/utils/PresetsFileProcessor.kt b/data/src/main/java/com/androidvip/sysctlgui/data/utils/PresetsFileProcessor.kt
index 5c47959..8ec44f9 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/utils/PresetsFileProcessor.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/utils/PresetsFileProcessor.kt
@@ -5,7 +5,7 @@ import android.net.Uri
 import android.util.Log
 import com.androidvip.sysctlgui.domain.exceptions.NoParameterFoundException
 import com.androidvip.sysctlgui.domain.models.KernelParam
-import com.androidvip.sysctlgui.utils.isValidSysctlLine
+import com.androidvip.sysctlgui.utils.isValidSysctlOutputLine
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -21,7 +21,7 @@ class PresetsFileProcessor(
         contentResolver.openInputStream(uri)?.use { inputStream ->
             val lines = inputStream.bufferedReader().readLines()
             val params = lines.mapNotNull { line ->
-                if (line.isValidSysctlLine()) {
+                if (line.isValidSysctlOutputLine()) {
                     runCatching {
                         KernelParam.createFromName(
                             name = line.substringBefore('=').trim(),
diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/UserRepository.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/UserRepository.kt
index b577cdc..953acd6 100644
--- a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/UserRepository.kt
+++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/UserRepository.kt
@@ -11,7 +11,9 @@ interface UserRepository {
      * Retrieves a [Flow] that emits a list of user-configurable kernel parameters.
      * The [Flow] will emit a new list whenever the underlying data changes.
      */
-    val userParams: Flow>
+    val userParamsFlow: Flow>
+
+    suspend fun getUserParams(): List
 
     suspend fun getParamByName(name: String): KernelParam?
 
diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetUserParamsUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetUserParamsUseCase.kt
index 529fdca..cefe97c 100644
--- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetUserParamsUseCase.kt
+++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/GetUserParamsUseCase.kt
@@ -1,8 +1,7 @@
 package com.androidvip.sysctlgui.domain.usecase
 
 import com.androidvip.sysctlgui.domain.repository.UserRepository
-import kotlinx.coroutines.flow.single
 
 class GetUserParamsUseCase(private val repository: UserRepository) {
-    suspend operator fun invoke() = repository.userParams.single()
+    suspend operator fun invoke() = repository.getUserParams()
 }

From 5e6d52f2201c688ea9fe72c996ea062c4c54401c Mon Sep 17 00:00:00 2001
From: Lennoard 
Date: Thu, 14 Aug 2025 20:58:56 -0300
Subject: [PATCH 06/18] bugfix: browse screen back button v3

---
 .../sysctlgui/ui/main/MainScreen.kt           |  7 ++-
 .../ui/params/browse/ParamBrowseScreen.kt     | 43 +++++++++++++++++--
 .../ui/params/browse/ParamBrowseState.kt      |  2 +
 .../ui/params/browse/ParamBrowseViewModel.kt  | 17 +++++++-
 4 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt
index 079de14..f180312 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt
@@ -1,5 +1,6 @@
 package com.androidvip.sysctlgui.ui.main
 
+import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
@@ -52,6 +53,8 @@ private fun MainScreenContent(
     navController: NavHostController,
     snackbarHostState: SnackbarHostState
 ) {
+    val onBackPressedDispatcherOwner = LocalOnBackPressedDispatcherOwner.current
+
     Scaffold(
         topBar = {
             AnimatedVisibility(
@@ -65,7 +68,9 @@ private fun MainScreenContent(
                     showSearch = state.showSearchAction,
                     showBack = state.showBackButton,
                     onSearchPressed = { navController.navigate(UiRoute.Search) },
-                    onBackPressed = { navController.popBackStack() }
+                    onBackPressed = {
+                        onBackPressedDispatcherOwner?.onBackPressedDispatcher?.onBackPressed()
+                    }
                 )
             }
         },
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt
index 5ff042e..ddff009 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt
@@ -20,6 +20,10 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.material.pullrefresh.pullRefresh
+import androidx.compose.material.pullrefresh.rememberPullRefreshState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -31,6 +35,7 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
@@ -57,13 +62,16 @@ import com.androidvip.sysctlgui.ui.main.MainViewModel
 import com.androidvip.sysctlgui.ui.main.MainViewState
 import com.androidvip.sysctlgui.ui.params.DocumentationBottomSheet
 import com.androidvip.sysctlgui.utils.browse
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 import org.koin.compose.viewmodel.koinViewModel
 import java.io.File
+import kotlin.time.Duration.Companion.seconds
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class)
 @Composable
 fun ParamBrowseScreen(
     mainViewModel: MainViewModel = koinViewModel(),
@@ -115,7 +123,9 @@ fun ParamBrowseScreen(
         backEnabled = state.backEnabled,
         onBackPressed = {
             viewModel.onEvent(ParamBrowseViewEvent.BackRequested)
-        }
+        },
+        isRefreshing = state.loading,
+        onRefresh = { viewModel.onEvent(ParamBrowseViewEvent.RefreshRequested) }
     )
 
     documentation?.let {
@@ -126,6 +136,8 @@ fun ParamBrowseScreen(
     }
 }
 
+
+@OptIn(ExperimentalMaterialApi::class)
 @Composable
 private fun ParamBrowseScreenContent(
     params: List,
@@ -135,8 +147,11 @@ private fun ParamBrowseScreenContent(
     onDocumentationClicked: (ParamDocumentation) -> Unit,
     backEnabled: Boolean = false,
     onBackPressed: () -> Unit,
+    isRefreshing: Boolean,
+    onRefresh: () -> Unit
 ) {
     val listState = rememberLazyListState()
+    val pullRefreshState = rememberPullRefreshState(refreshing = isRefreshing, onRefresh = onRefresh)
     var headerVisible by remember { mutableStateOf(backEnabled) }
 
     BackHandler(enabled = backEnabled, onBack = onBackPressed)
@@ -173,7 +188,11 @@ private fun ParamBrowseScreenContent(
 
     val finalHeaderVisible = (headerVisible || isAtTop) && backEnabled
 
-    Box(modifier = Modifier.fillMaxSize()) {
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .pullRefresh(pullRefreshState),
+    ) {
         val spacerHeight by animateDpAsState(if (finalHeaderVisible) 56.dp else 0.dp)
         LazyColumn(
             state = listState,
@@ -226,6 +245,14 @@ private fun ParamBrowseScreenContent(
                 onClicked = { onDocumentationClicked(documentation!!) }
             )
         }
+
+        PullRefreshIndicator(
+            refreshing = isRefreshing,
+            state = pullRefreshState,
+            modifier = Modifier.align(Alignment.TopCenter),
+            backgroundColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+            contentColor = MaterialTheme.colorScheme.tertiary
+        )
     }
 }
 
@@ -287,6 +314,8 @@ internal fun ParamBrowseScreenContentPreview() {
     var params by remember(currentPath) {
         mutableStateOf(mapFilesToParams(File(currentPath).listFiles()))
     }
+    var isRefreshingPreview by remember { mutableStateOf(false) }
+    val scope = rememberCoroutineScope()
 
     SysctlGuiTheme(dynamicColor = true) {
         Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) {
@@ -307,6 +336,14 @@ internal fun ParamBrowseScreenContentPreview() {
                 onDocumentationClicked = {},
                 backEnabled = currentPath != root.path,
                 onBackPressed = { currentPath = File(currentPath).parent ?: root.path },
+                isRefreshing = isRefreshingPreview,
+                onRefresh = {
+                    scope.launch {
+                        isRefreshingPreview = true
+                        delay(2.seconds)
+                        isRefreshingPreview = false
+                    }
+                }
             )
         }
     }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseState.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseState.kt
index a141586..ec5dd8d 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseState.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseState.kt
@@ -4,6 +4,7 @@ import com.androidvip.sysctlgui.domain.models.ParamDocumentation
 import com.androidvip.sysctlgui.models.UiKernelParam
 
 data class ParamBrowseState(
+    val loading: Boolean = false,
     val params: List = emptyList(),
     val currentPath: String = "",
     val backEnabled: Boolean = false,
@@ -20,4 +21,5 @@ sealed interface ParamBrowseViewEvent {
     data class ParamClicked(val param: UiKernelParam) : ParamBrowseViewEvent
     data class DocumentationClicked(val docs: ParamDocumentation) : ParamBrowseViewEvent
     object BackRequested : ParamBrowseViewEvent
+    object RefreshRequested : ParamBrowseViewEvent
 }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt
index f3b49d9..b2596c0 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt
@@ -27,13 +27,15 @@ class ParamBrowseViewModel(
 
     init {
         viewModelScope.launch {
+            setState { copy(loading = true) }
             val startingDirectory = File(Consts.PROC_SYS)
             val params = getParams(startingDirectory)
 
             setState {
                 copy(
                     params = params,
-                    currentPath = startingDirectory.absolutePath
+                    currentPath = startingDirectory.absolutePath,
+                    loading = false
                 )
             }
         }
@@ -47,11 +49,20 @@ class ParamBrowseViewModel(
 
             ParamBrowseViewEvent.BackRequested -> onBackRequested()
             is ParamBrowseViewEvent.ParamClicked -> onParamClicked(event.param)
+            ParamBrowseViewEvent.RefreshRequested -> handleRefreshRequested()
         }
     }
 
+    private fun handleRefreshRequested() {
+        val currentPath = currentState.currentPath
+        if (currentPath == Consts.PROC_SYS) return
+
+        fetchChildParams(currentPath)
+    }
+
     private fun fetchChildParams(parentParam: UiKernelParam) {
         viewModelScope.launch {
+            setState { copy(loading = true) }
             runCatching {
                 val newParamsDeferred = async { getParams(File(parentParam.path)) }
                 val directoryDocumentationDeferred = async { getParamDocumentation(parentParam) }
@@ -64,11 +75,13 @@ class ParamBrowseViewModel(
                         params = newParams,
                         currentPath = parentParam.path,
                         backEnabled = parentParam.path != Consts.PROC_SYS,
-                        documentation = directoryDocumentation
+                        documentation = directoryDocumentation,
+                        loading = false
                     )
                 }
             }.onFailure {
                 setEffect { ParamBrowseViewEffect.ShowError(it.message ?: "Unknown error") }
+                setState { copy(loading = false) }
             }
         }
     }

From ab2d038821ad663a59551129e79382841b261c42 Mon Sep 17 00:00:00 2001
From: Lennoard 
Date: Thu, 14 Aug 2025 20:59:38 -0300
Subject: [PATCH 07/18] bugfix: main viewModel instance

---
 .../androidvip/sysctlgui/di/PresentationModule.kt |  3 ++-
 .../androidvip/sysctlgui/ui/main/MainActivity.kt  | 15 ++++++++++++++-
 .../androidvip/sysctlgui/ui/main/MainNavBar.kt    |  9 ++++++++-
 .../sysctlgui/ui/settings/SettingsScreen.kt       |  1 +
 .../sysctlgui/ui/start/StartErrorActivity.kt      |  3 +++
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt
index 87aac32..2b8a58e 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt
@@ -9,11 +9,12 @@ import com.androidvip.sysctlgui.ui.settings.SettingsViewModel
 import com.androidvip.sysctlgui.ui.user.UserParamsViewModel
 import com.androidvip.sysctlgui.widgets.FavoriteWidgetParamUpdater
 import org.koin.android.ext.koin.androidContext
+import org.koin.core.module.dsl.singleOf
 import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 
 internal val presentationModule = module {
-    viewModelOf(::MainViewModel)
+    singleOf(::MainViewModel)
     viewModelOf(::SettingsViewModel)
     viewModelOf(::ParamBrowseViewModel)
     viewModelOf(::EditParamViewModel)
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt
index d00fece..9101eae 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt
@@ -1,10 +1,12 @@
 package com.androidvip.sysctlgui.ui.main
 
 import android.app.NotificationManager
+import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
@@ -21,7 +23,18 @@ class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(
+                lightScrim = Color.TRANSPARENT,
+                darkScrim = Color.TRANSPARENT,
+                detectDarkMode = { resources ->
+                    prefs.forceDark ||
+                        resources.configuration.uiMode and
+                            android.content.res.Configuration.UI_MODE_NIGHT_MASK ==
+                            android.content.res.Configuration.UI_MODE_NIGHT_YES
+                }
+            )
+        )
 
         setContent {
             SysctlGuiTheme(
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt
index 8e42edb..588bb03 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt
@@ -17,6 +17,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewDynamicColors
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.navigation.NavDestination.Companion.hasRoute
@@ -81,7 +82,13 @@ internal fun MainNavBar(navController: NavHostController = rememberNavController
                         contentDescription = route.name,
                     )
                 },
-                label = { Text(route.name) },
+                label = {
+                    Text(
+                        text = route.name,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis
+                    )
+                },
                 selected = selected,
                 onClick = {
                     navController.navigate(route.route) {
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt
index 534a37e..3a26724 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt
@@ -77,6 +77,7 @@ internal fun SettingsScreen(
                 MainViewState(
                     showTopBar = true,
                     showNavBar = true,
+                    showSearchAction = false
                 )
             )
         )
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartErrorActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartErrorActivity.kt
index 5602352..0909855 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartErrorActivity.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartErrorActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.graphics.drawable.AnimatedVectorDrawable
 import android.os.Bundle
 import android.os.Handler
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.androidvip.sysctlgui.R
@@ -14,6 +15,8 @@ class StartErrorActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+
         binding = ActivityStartErrorBinding.inflate(layoutInflater)
         setContentView(binding.root)
 

From 0d63f07619a24ab9f1d00e92bbfb3dcfa9aee6df Mon Sep 17 00:00:00 2001
From: Lennoard 
Date: Thu, 14 Aug 2025 22:30:08 -0300
Subject: [PATCH 08/18] bugfix: edit param screen

---
 .../sysctlgui/ui/main/MainScreen.kt           |   4 +-
 .../ui/params/browse/ParamBrowseViewModel.kt  |   4 +-
 .../ui/params/edit/EditParamScreen.kt         | 149 ++++++++++--------
 .../ui/params/edit/EditParamViewModel.kt      |  21 ++-
 .../repository/DocumentationRepositoryImpl.kt |  10 +-
 .../data/repository/UserRepositoryImpl.kt     |   6 +-
 6 files changed, 119 insertions(+), 75 deletions(-)

diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt
index f180312..60d7a87 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt
@@ -10,6 +10,7 @@ import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
@@ -37,7 +38,8 @@ fun MainScreen(viewModel: MainViewModel = koinViewModel()) {
             if (effect is MainViewEffect.ShowSnackbar) {
                 val result = snackbarHostState.showSnackbar(
                     message = effect.message,
-                    actionLabel = effect.actionLabel
+                    actionLabel = effect.actionLabel,
+                    duration = SnackbarDuration.Long
                 )
                 viewModel.onEvent(MainViewEvent.OnSnackbarResult(result))
             }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt
index b2596c0..1a36e1a 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt
@@ -65,7 +65,9 @@ class ParamBrowseViewModel(
             setState { copy(loading = true) }
             runCatching {
                 val newParamsDeferred = async { getParams(File(parentParam.path)) }
-                val directoryDocumentationDeferred = async { getParamDocumentation(parentParam) }
+                val directoryDocumentationDeferred = async {
+                    runCatching { getParamDocumentation(parentParam) }.getOrNull()
+                }
 
                 val newParams = newParamsDeferred.await()
                 val directoryDocumentation = directoryDocumentationDeferred.await()
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt
index c9ee615..f28758f 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt
@@ -2,6 +2,7 @@ package com.androidvip.sysctlgui.ui.params.edit
 
 import android.content.ClipData
 import android.widget.Toast
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.SizeTransform
@@ -12,6 +13,7 @@ import androidx.compose.animation.slideOutVertically
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -97,7 +99,7 @@ fun EditParamScreen(
     val context = LocalContext.current
     val state = viewModel.uiState.collectAsStateWithLifecycle()
     val taskerListOptions = listOf("Primary", "Secondary")
-    var showSelectTaskerListDialog by rememberSaveable { mutableStateOf(true) }
+    var showSelectTaskerListDialog by rememberSaveable { mutableStateOf(false) }
     var selectedOptionIndex by rememberSaveable {
         mutableIntStateOf(Consts.LIST_NUMBER_PRIMARY_TASKER)
     }
@@ -156,6 +158,7 @@ fun EditParamScreen(
             viewModel.onEvent(EditParamViewEvent.ApplyPressed(it))
         },
         onTaskerClicked = {
+            showSelectTaskerListDialog = it
             viewModel.onEvent(EditParamViewEvent.TaskerTogglePressed(it, selectedOptionIndex))
         },
         onDocsReadMorePressed = {
@@ -229,6 +232,8 @@ private fun EditParamContent(
                 modifier = Modifier
                     .combinedClickable(
                         enabled = true,
+                        indication = null,
+                        interactionSource = remember { MutableInteractionSource() },
                         onClick = {
                             Toast.makeText(context, "Long press to copy", Toast.LENGTH_SHORT).show()
                         },
@@ -287,7 +292,7 @@ private fun EditParamContent(
                 )
             }
 
-            if (param.isTaskerParam && state.taskerAvailable) {
+            AnimatedVisibility(visible = param.isTaskerParam && state.taskerAvailable) {
                 val listName = taskerListNameResolver(param.taskerList)
                 AssistChip(
                     onClick = { onTaskerClicked(true) },
@@ -337,6 +342,11 @@ private fun ParamValueContent(
     var editedValue by remember(param.value) { mutableStateOf(param.value) }
     val view = LocalView.current
 
+    BackHandler(
+        enabled = isEditing,
+        onBack = { isEditing = false }
+    )
+
     HorizontalDivider()
 
     Row(
@@ -454,75 +464,90 @@ private fun ParamDocs(
             color = MaterialTheme.colorScheme.onBackground
         )
 
-        if (documentation != null) {
-            val documentationText = if (!documentation.documentationHtml.isNullOrEmpty()) {
-                AnnotatedString.fromHtml(
-                    htmlString = documentation.documentationHtml.orEmpty(),
-                    linkStyles = TextLinkStyles(
-                        style = MaterialTheme.typography.bodyMedium.toSpanStyle().copy(
-                            color = MaterialTheme.colorScheme.primary,
-                            textDecoration = TextDecoration.Underline,
-                            fontWeight = FontWeight.Medium
-                        ),
-                        pressedStyle = MaterialTheme.typography.bodyMedium.toSpanStyle().copy(
-                            color = MaterialTheme.colorScheme.tertiary,
-                            textDecoration = TextDecoration.Underline,
-                            fontWeight = FontWeight.Medium
-                        )
-                    )
+        AnimatedContent(targetState = documentation != null) { documentationAvailable ->
+            if (documentationAvailable && documentation != null) {
+                DocumentationContent(
+                    documentation = documentation,
+                    onReadMorePressed = onReadMorePressed
                 )
             } else {
-                AnnotatedString(documentation.documentationText)
-            }
-
-            SelectionContainer {
-                Text(
+                Card(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .padding(vertical = 8.dp),
-                    text = documentationText,
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
-                )
+                        .padding(24.dp),
+                    colors = CardDefaults.cardColors(
+                        containerColor = MaterialTheme.colorScheme.errorContainer
+                    )
+                ) {
+                    Row(
+                        modifier = Modifier.padding(24.dp),
+                        horizontalArrangement = Arrangement.spacedBy(
+                            16.dp,
+                            Alignment.CenterHorizontally
+                        )
+                    ) {
+                        Icon(
+                            imageVector = Icons.Rounded.Warning,
+                            contentDescription = stringResource(android.R.string.dialog_alert_title),
+                            tint = MaterialTheme.colorScheme.onErrorContainer
+                        )
+                        Text(
+                            text = "No documentation available",
+                            style = MaterialTheme.typography.bodyLarge.copy(),
+                            fontWeight = FontWeight.Medium,
+                            color = MaterialTheme.colorScheme.onErrorContainer
+                        )
+                    }
+                }
             }
+        }
+    }
+}
 
-            TextButton(
-                onClick = onReadMorePressed,
-                modifier = Modifier
-                    .padding(vertical = 8.dp)
-                    .align(Alignment.End)
-            ) {
-                Text(text = "Read more")
-            }
+@Composable
+private fun DocumentationContent(
+    documentation: ParamDocumentation,
+    onReadMorePressed: () -> Unit
+) {
+    Column {
+        val documentationText = if (!documentation.documentationHtml.isNullOrEmpty()) {
+            AnnotatedString.fromHtml(
+                htmlString = documentation.documentationHtml.orEmpty(),
+                linkStyles = TextLinkStyles(
+                    style = MaterialTheme.typography.bodyMedium.toSpanStyle().copy(
+                        color = MaterialTheme.colorScheme.primary,
+                        textDecoration = TextDecoration.Underline,
+                        fontWeight = FontWeight.Medium
+                    ),
+                    pressedStyle = MaterialTheme.typography.bodyMedium.toSpanStyle().copy(
+                        color = MaterialTheme.colorScheme.tertiary,
+                        textDecoration = TextDecoration.Underline,
+                        fontWeight = FontWeight.Medium
+                    )
+                )
+            )
         } else {
-            Card(
+            AnnotatedString(documentation.documentationText)
+        }
+
+        SelectionContainer {
+            Text(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(24.dp),
-                colors = CardDefaults.cardColors(
-                    containerColor = MaterialTheme.colorScheme.errorContainer
-                )
-            ) {
-                Row(
-                    modifier = Modifier.padding(24.dp),
-                    horizontalArrangement = Arrangement.spacedBy(
-                        16.dp,
-                        Alignment.CenterHorizontally
-                    )
-                ) {
-                    Icon(
-                        imageVector = Icons.Rounded.Warning,
-                        contentDescription = stringResource(android.R.string.dialog_alert_title),
-                        tint = MaterialTheme.colorScheme.onErrorContainer
-                    )
-                    Text(
-                        text = "No documentation available",
-                        style = MaterialTheme.typography.bodyLarge.copy(),
-                        fontWeight = FontWeight.Medium,
-                        color = MaterialTheme.colorScheme.onErrorContainer
-                    )
-                }
-            }
+                    .padding(vertical = 8.dp),
+                text = documentationText,
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant
+            )
+        }
+
+        TextButton(
+            onClick = onReadMorePressed,
+            modifier = Modifier
+                .padding(vertical = 8.dp)
+                .align(Alignment.End)
+        ) {
+            Text(text = "Read more")
         }
     }
 }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt
index d8cb6ea..915f9b1 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt
@@ -12,7 +12,6 @@ import com.androidvip.sysctlgui.domain.usecase.GetUserParamByNameUseCase
 import com.androidvip.sysctlgui.domain.usecase.IsTaskerInstalledUseCase
 import com.androidvip.sysctlgui.domain.usecase.UpsertUserParamUseCase
 import com.androidvip.sysctlgui.helpers.UiKernelParamMapper
-import com.androidvip.sysctlgui.models.UiKernelParam
 import com.androidvip.sysctlgui.utils.BaseViewModel
 import kotlinx.coroutines.launch
 
@@ -37,16 +36,18 @@ class EditParamViewModel(
                 ?: getRuntimeParam(paramName)
                 ?: return@launch setEffect { EditParamViewEffect.GoBack }
 
-            val documentation = getDocumentation(param)
-
             setState {
                 copy(
                     kernelParam = UiKernelParamMapper.map(param),
                     taskerAvailable = isTaskerInstalled(),
-                    keyboardType = guessKeyboardType(param.value),
-                    documentation = documentation,
+                    keyboardType = guessKeyboardType(param.value)
                 )
             }
+
+            val documentation = runCatching { getDocumentation(param) }.getOrNull()
+            setState {
+                copy(documentation = documentation)
+            }
         }
     }
 
@@ -56,7 +57,7 @@ class EditParamViewModel(
         when (event) {
             is EditParamViewEvent.ApplyPressed -> applyKernelParam(event.newValue)
             is EditParamViewEvent.UndoRequested -> {
-                previousKernelParamValue?.let { applyKernelParam(it) }
+                previousKernelParamValue?.let { applyKernelParam(it, true) }
             }
             is EditParamViewEvent.DocumentationReadMoreClicked -> onDocumentationReadMoreClicked()
             is EditParamViewEvent.FavoriteTogglePressed -> onFavoriteTogglePressed(event.newState)
@@ -64,7 +65,7 @@ class EditParamViewModel(
         }
     }
 
-    private fun applyKernelParam(newValue: String) {
+    private fun applyKernelParam(newValue: String, isUndo: Boolean = false) {
         val oldParam = currentState.kernelParam
         viewModelScope.launch {
             val newParam = oldParam.copy(value = newValue)
@@ -73,7 +74,11 @@ class EditParamViewModel(
                 upsertUserParam(newParam)
             }.onSuccess {
                 setState { copy(kernelParam = newParam) }
-                setEffect { EditParamViewEffect.ShowApplySuccess(oldParam.value) }
+                if (!isUndo) {
+                    setEffect {
+                        EditParamViewEffect.ShowApplySuccess(previousValue = oldParam.value)
+                    }
+                }
                 previousKernelParamValue = oldParam.value
             }.onFailure {
                 Log.e("EditParamViewModel", "Failed to apply param", it)
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/DocumentationRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/DocumentationRepositoryImpl.kt
index 09ae565..b5f272b 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/DocumentationRepositoryImpl.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/DocumentationRepositoryImpl.kt
@@ -5,6 +5,7 @@ import com.androidvip.sysctlgui.domain.models.KernelParam
 import com.androidvip.sysctlgui.domain.models.ParamDocumentation
 import com.androidvip.sysctlgui.domain.repository.AppPrefs
 import com.androidvip.sysctlgui.domain.repository.DocumentationRepository
+import kotlinx.coroutines.withTimeout
 
 /**
  * Repository for fetching documentation for kernel parameters.
@@ -14,7 +15,6 @@ import com.androidvip.sysctlgui.domain.repository.DocumentationRepository
  *
  * @property offlineDataSource The data source for fetching documentation offline.
  * @property onlineDataSource The data source for fetching documentation online.
- * @property appPrefs The application preferences, used to determine whether to use online or
  * offline documentation.
  */
 class DocumentationRepositoryImpl(
@@ -26,9 +26,15 @@ class DocumentationRepositoryImpl(
         online: Boolean
     ): ParamDocumentation? {
         return if (online) {
-            onlineDataSource.getDocumentation(param)
+            withTimeout(REQUEST_TIMEOUT_MS) {
+                onlineDataSource.getDocumentation(param)
+            }
         } else {
             offlineDataSource.getDocumentation(param)
         }
     }
+
+    companion object {
+        private const val REQUEST_TIMEOUT_MS = 3000L
+    }
 }
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt
index d2e3d52..e6fbcc4 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt
@@ -31,7 +31,11 @@ class UserRepositoryImpl(
     }
 
     override suspend fun upsertUserParam(param: KernelParam) = withContext(coroutineContext) {
-        paramDao.upsert(KernelParamDTO.fromKernelParam(param))
+        val currentDatabaseParam = getParamByName(param.name)
+        val newParam = KernelParamDTO.fromKernelParam(param).copy(
+            id = currentDatabaseParam?.id ?: 0
+        )
+        paramDao.upsert(newParam)
     }
 
     override suspend fun upsertUserParams(params: List) =

From 2c65788ab4f633a5be226072914ecda2381f83c3 Mon Sep 17 00:00:00 2001
From: Lennoard 
Date: Thu, 14 Aug 2025 22:39:02 -0300
Subject: [PATCH 09/18] bugfix: favorites screen v3

---
 .../kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt  | 2 +-
 .../com/androidvip/sysctlgui/ui/user/UserParamsViewModel.kt    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt
index b68a311..08788dc 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt
@@ -75,7 +75,7 @@ fun SearchScreen(
             MainViewEvent.OnSateChangeRequested(
                 MainViewState(
                     showTopBar = false,
-                    showNavBar = true,
+                    showNavBar = false,
                 )
             )
         )
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsViewModel.kt
index cff23a5..90ed643 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsViewModel.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsViewModel.kt
@@ -36,10 +36,11 @@ class UserParamsViewModel(
 
     private fun loadParams(predicate: (UiKernelParam) -> Boolean) {
         viewModelScope.launch {
+            setState { copy(loading = true) }
             val params = getUserParams()
                 .map(UiKernelParamMapper::map)
                 .filter(predicate)
-            setState { copy(userParams = params) }
+            setState { copy(userParams = params, loading = false) }
         }
     }
 

From 7c4be2ff3a6c1ba7fb810e40c5d5499813d4dd03 Mon Sep 17 00:00:00 2001
From: Lennoard 
Date: Thu, 14 Aug 2025 23:13:27 -0300
Subject: [PATCH 10/18] bugfix: import presets

---
 .../sysctlgui/di/PresentationModule.kt        |  2 +-
 .../sysctlgui/ui/main/MainActivity.kt         |  4 ++++
 .../sysctlgui/ui/main/MainNavBar.kt           | 23 ++++++++++++-------
 .../sysctlgui/ui/presets/PresetsScreen.kt     |  2 +-
 .../data/repository/UserRepositoryImpl.kt     | 15 +++++++++---
 .../domain/usecase/ApplyParamUseCase.kt       |  2 +-
 6 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt
index 2b8a58e..1ab7173 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt
@@ -19,7 +19,7 @@ internal val presentationModule = module {
     viewModelOf(::ParamBrowseViewModel)
     viewModelOf(::EditParamViewModel)
     viewModelOf(::SearchViewModel)
-    viewModelOf(::PresetsViewModel)
+    singleOf(::PresetsViewModel)
     viewModelOf(::UserParamsViewModel)
 
     single { FavoriteWidgetParamUpdater(androidContext()).getListener() }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt
index 9101eae..6e6c0b9 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt
@@ -37,6 +37,10 @@ class MainActivity : ComponentActivity() {
         )
 
         setContent {
+            // TODO: Make the switch dynamic with the view model
+            // TODO: Test presets
+            // TODO: Translations
+            // TODO: Handle shortcuts / widgets
             SysctlGuiTheme(
                 darkTheme = prefs.forceDark || isSystemInDarkTheme(),
                 contrastLevel = prefs.contrastLevel,
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt
index 588bb03..b493c5b 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt
@@ -1,13 +1,14 @@
 package com.androidvip.sysctlgui.ui.main
 
+import androidx.compose.animation.AnimatedContent
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Favorite
-import androidx.compose.material.icons.filled.Home
 import androidx.compose.material.icons.outlined.Build
 import androidx.compose.material.icons.outlined.FavoriteBorder
 import androidx.compose.material.icons.outlined.Home
 import androidx.compose.material.icons.outlined.Settings
 import androidx.compose.material.icons.rounded.Build
+import androidx.compose.material.icons.rounded.Favorite
+import androidx.compose.material.icons.rounded.Home
 import androidx.compose.material.icons.rounded.Settings
 import androidx.compose.material3.Icon
 import androidx.compose.material3.NavigationBar
@@ -42,7 +43,7 @@ internal fun MainNavBar(navController: NavHostController = rememberNavController
             TopLevelRoute(
                 name = browseParamsTitle,
                 route = UiRoute.BrowseParams,
-                selectedIcon = Icons.Filled.Home,
+                selectedIcon = Icons.Rounded.Home,
                 unselectedIcon = Icons.Outlined.Home
             ),
             TopLevelRoute(
@@ -54,7 +55,7 @@ internal fun MainNavBar(navController: NavHostController = rememberNavController
             TopLevelRoute(
                 name = favoritesTitle,
                 route = UiRoute.Favorites,
-                selectedIcon = Icons.Filled.Favorite,
+                selectedIcon = Icons.Rounded.Favorite,
                 unselectedIcon = Icons.Outlined.FavoriteBorder
             ),
             TopLevelRoute(
@@ -77,10 +78,16 @@ internal fun MainNavBar(navController: NavHostController = rememberNavController
 
             NavigationBarItem(
                 icon = {
-                    Icon(
-                        imageVector = if (selected) route.selectedIcon else route.unselectedIcon,
-                        contentDescription = route.name,
-                    )
+                    AnimatedContent(targetState = selected) { selectedState ->
+                        Icon(
+                            imageVector = if (selectedState) {
+                                route.selectedIcon
+                            } else {
+                                route.unselectedIcon
+                            },
+                            contentDescription = route.name,
+                        )
+                    }
                 },
                 label = {
                     Text(
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt
index 3b3b98a..eaa63ce 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt
@@ -63,7 +63,7 @@ fun PresetsScreen(
         }
     )
     val createFileLauncher = rememberLauncherForActivityResult(
-        contract = ActivityResultContracts.CreateDocument("text/plain"),
+        contract = ActivityResultContracts.CreateDocument("*/*"),
         onResult = { uri ->
             viewModel.onEvent(PresetsViewEvent.BackUpFileCreated(uri))
         }
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt
index e6fbcc4..a75d123 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt
@@ -38,11 +38,20 @@ class UserRepositoryImpl(
         paramDao.upsert(newParam)
     }
 
-    override suspend fun upsertUserParams(params: List) =
-        withContext(coroutineContext) {
-            paramDao.upsertAll(params.map { KernelParamDTO.fromKernelParam(it) })
+    override suspend fun upsertUserParams(
+        params: List
+    ) = withContext(coroutineContext) {
+        val currentDatabaseParams = paramDao.getAll()
+        val newParams = params.map { param ->
+            val currentDatabaseParam = currentDatabaseParams.find { it.name == param.name }
+            KernelParamDTO.fromKernelParam(param).copy(
+                id = currentDatabaseParam?.id ?: 0
+            )
         }
 
+        paramDao.upsertAll(newParams)
+    }
+
     override suspend fun removeUserParam(param: KernelParam) = withContext(coroutineContext) {
         paramDao.delete(KernelParamDTO.fromKernelParam(param))
     }
diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ApplyParamUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ApplyParamUseCase.kt
index 1001864..afa5561 100644
--- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ApplyParamUseCase.kt
+++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ApplyParamUseCase.kt
@@ -71,6 +71,6 @@ class ApplyParamUseCase(
             CommitMode.SYSCTL -> "Failed to execute sysctl command for '${param.name}'"
             CommitMode.ECHO -> "Failed to write value '${param.value}' to '${param.path}'"
         }
-        throw ApplyValueException(errorMessage)
+        throw ApplyValueException(errorMessage + message)
     }
 }

From ff98d7f1c871485030fd75aa96107b280d13a200 Mon Sep 17 00:00:00 2001
From: Lennoard 
Date: Fri, 15 Aug 2025 23:22:10 -0300
Subject: [PATCH 11/18] bugfix: fixed favorites widget

---
 app/build.gradle.kts                          |   1 +
 app/src/main/AndroidManifest.xml              |   8 +-
 .../sysctlgui/di/PresentationModule.kt        |   4 +-
 .../sysctlgui/ui/main/AppNavHost.kt           |   8 +-
 .../sysctlgui/ui/main/MainActivity.kt         |  34 +++---
 .../sysctlgui/ui/main/MainScreen.kt           |  13 ++-
 .../ui/params/edit/EditParamViewModel.kt      |   3 +
 .../sysctlgui/ui/start/StartActivity.kt       |  39 +------
 .../widgets/FavoriteWidgetParamUpdater.kt     |  30 -----
 .../widgets/FavoritesGlanceWidget.kt          | 108 +++++++++++++++++
 .../widgets/FavoritesGlanceWidgetReceiver.kt  |   8 ++
 .../sysctlgui/widgets/FavoritesWidget.kt      | 109 ------------------
 .../widgets/FavoritesWidgetService.kt         |  82 -------------
 .../widgets/UpdateFavoriteWidgetUseCase.kt    |  14 +++
 .../widgets/ViewKernelParamDetailsAction.kt   |  29 +++++
 app/src/main/res/layout/favorites_widget.xml  |   3 +-
 ...o.xml => favorites_glance_widget_info.xml} |  10 +-
 .../domain/usecase/UpsertUserParamUseCase.kt  |   4 +-
 gradle/libs.versions.toml                     |   2 +
 19 files changed, 216 insertions(+), 293 deletions(-)
 delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoriteWidgetParamUpdater.kt
 create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidget.kt
 create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidgetReceiver.kt
 delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidget.kt
 delete mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidgetService.kt
 create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/widgets/UpdateFavoriteWidgetUseCase.kt
 create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/widgets/ViewKernelParamDetailsAction.kt
 rename app/src/main/res/xml/{favorites_widget_info.xml => favorites_glance_widget_info.xml} (53%)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1643914..cbf9b2a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -111,6 +111,7 @@ dependencies {
     implementation(libs.androidx.core.splashscreen)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.material)
+    implementation(libs.androidx.glance.appwidget)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.window)
     implementation(libs.androidx.work.runtime.ktx)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dad076a..9282f21 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -58,15 +58,14 @@
             
         
         
             
                 
             
-
             
+                android:resource="@xml/favorites_glance_widget_info" />
         
         
         
 
-        
          R.id.navigationBrowse
-            Actions.ListParams.name -> R.id.navigationList
-            Actions.ExportParams.name -> R.id.navigationExport
-            Actions.OpenSettings.name -> R.id.navigationSettings
-            else -> null
-        }?.let { id ->
-            navHost.navController.navigate(id)
-        }*/
+    private fun getRouteFromIntent(): UiRoute {
+        val extraDestination = intent.getStringExtra(EXTRA_DESTINATION)
+            ?: return UiRoute.BrowseParams
+
+        val extraParamName = intent.getStringExtra(EXTRA_PARAM_NAME)
+
+        return when (extraDestination) {
+            Actions.BrowseParams.name -> UiRoute.BrowseParams
+            Actions.ExportParams.name -> UiRoute.Presets
+            Actions.OpenSettings.name -> UiRoute.Settings
+            Actions.EditParam.name -> UiRoute.EditParam(extraParamName.orEmpty())
+            else -> UiRoute.BrowseParams
+        }
     }
 
     private fun checkNotificationPermission() {
@@ -83,5 +82,6 @@ class MainActivity : ComponentActivity() {
 
     companion object {
         internal const val EXTRA_DESTINATION = "destination"
+        internal const val EXTRA_PARAM_NAME = "paramName"
     }
 }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt
index 60d7a87..7005d0a 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt
@@ -28,7 +28,10 @@ import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun MainScreen(viewModel: MainViewModel = koinViewModel()) {
+fun MainScreen(
+    viewModel: MainViewModel = koinViewModel(),
+    startDestination: UiRoute = UiRoute.BrowseParams
+) {
     val state by viewModel.uiState.collectAsStateWithLifecycle()
     val navController = rememberNavController()
     val snackbarHostState = remember { SnackbarHostState() }
@@ -46,14 +49,15 @@ fun MainScreen(viewModel: MainViewModel = koinViewModel()) {
         }
     }
 
-    MainScreenContent(state, navController, snackbarHostState)
+    MainScreenContent(state, navController, snackbarHostState, startDestination)
 }
 
 @Composable
 private fun MainScreenContent(
     state: MainViewState,
     navController: NavHostController,
-    snackbarHostState: SnackbarHostState
+    snackbarHostState: SnackbarHostState,
+    startDestination: UiRoute = UiRoute.BrowseParams
 ) {
     val onBackPressedDispatcherOwner = LocalOnBackPressedDispatcherOwner.current
 
@@ -92,7 +96,8 @@ private fun MainScreenContent(
         content = { innerPadding ->
             AppNavHost(
                 innerPadding = innerPadding,
-                navController = navController
+                navController = navController,
+                startDestination = startDestination
             )
         }
     )
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt
index 915f9b1..05b4529 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt
@@ -13,6 +13,7 @@ import com.androidvip.sysctlgui.domain.usecase.IsTaskerInstalledUseCase
 import com.androidvip.sysctlgui.domain.usecase.UpsertUserParamUseCase
 import com.androidvip.sysctlgui.helpers.UiKernelParamMapper
 import com.androidvip.sysctlgui.utils.BaseViewModel
+import com.androidvip.sysctlgui.widgets.UpdateFavoriteWidgetUseCase
 import kotlinx.coroutines.launch
 
 class EditParamViewModel(
@@ -23,6 +24,7 @@ class EditParamViewModel(
     private val getRuntimeParam: GetRuntimeParamUseCase,
     private val getUserParam: GetUserParamByNameUseCase,
     private val isTaskerInstalled: IsTaskerInstalledUseCase,
+    private val updateFavoriteWidget: UpdateFavoriteWidgetUseCase,
     private val appPrefs: AppPrefs
 ) : BaseViewModel() {
     private val paramName: String? = savedStateHandle.get(PARAM_NAME_KEY)
@@ -80,6 +82,7 @@ class EditParamViewModel(
                     }
                 }
                 previousKernelParamValue = oldParam.value
+                updateFavoriteWidget()
             }.onFailure {
                 Log.e("EditParamViewModel", "Failed to apply param", it)
                 setEffect {
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartActivity.kt
index 5fe650c..5356d7f 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartActivity.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartActivity.kt
@@ -73,40 +73,11 @@ class StartActivity : AppCompatActivity() {
     }
 
     private fun navigate() {
-        val shortcutNames = arrayOf(
-            Actions.BrowseParams.name,
-            Actions.ExportParams.name,
-            Actions.OpenSettings.name
-        )
-        val nextIntent = when (intent.action) {
-            in shortcutNames -> {
-                Intent(this, MainActivity::class.java).apply {
-                    putExtra(MainActivity.EXTRA_DESTINATION, intent.action)
-                }
-            }
-
-            Actions.EditParam.name -> {
-                Intent(this, MainActivity::class.java)
-                // TODO: handle edit param intent
-                /*Intent(this, EditKernelParamActivity::class.java).apply {
-                    putExtra(
-                        EditKernelParamActivity.EXTRA_PARAM,
-                        intent.extras!!.getParcelable(
-                            EditKernelParamActivity.EXTRA_PARAM
-                        )
-                    )
-                    putExtra(
-                        EditKernelParamActivity.EXTRA_EDIT_SAVED_PARAM,
-                        intent.getBooleanExtra(
-                            EditKernelParamActivity.EXTRA_EDIT_SAVED_PARAM,
-                            false
-                        )
-                    )
-                }*/
-            }
-
-            else -> {
-                Intent(this, MainActivity::class.java)
+        val shortcutNames = Actions.entries.map { it.name }
+        val nextIntent = Intent(this, MainActivity::class.java).apply {
+            if (intent.action in shortcutNames) {
+                putExtra(MainActivity.EXTRA_DESTINATION, intent.action)
+                putExtras(intent.extras ?: Bundle())
             }
         }
 
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoriteWidgetParamUpdater.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoriteWidgetParamUpdater.kt
deleted file mode 100644
index c2a67f0..0000000
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoriteWidgetParamUpdater.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.androidvip.sysctlgui.widgets
-
-import android.app.PendingIntent
-import android.appwidget.AppWidgetManager
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import com.androidvip.sysctlgui.data.repository.ParamsRepositoryImpl
-
-class FavoriteWidgetParamUpdater(private val context: Context) :
-    ParamsRepositoryImpl.ChangeListener {
-    override fun onChange() {
-        val intentUpdate = Intent(context, FavoritesWidget::class.java)
-        intentUpdate.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
-        val idArray = AppWidgetManager.getInstance(context).getAppWidgetIds(
-            ComponentName(context, FavoritesWidget::class.java)
-        )
-
-        if (idArray.isEmpty()) return
-
-        val flags = PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-
-        idArray.forEach {
-            intentUpdate.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, intArrayOf(it))
-            PendingIntent.getBroadcast(context, it, intentUpdate, flags).send()
-        }
-    }
-
-    fun getListener(): ParamsRepositoryImpl.ChangeListener = this
-}
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidget.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidget.kt
new file mode 100644
index 0000000..01529f6
--- /dev/null
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidget.kt
@@ -0,0 +1,108 @@
+package com.androidvip.sysctlgui.widgets
+
+import android.content.Context
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.glance.GlanceId
+import androidx.glance.GlanceModifier
+import androidx.glance.action.actionParametersOf
+import androidx.glance.action.clickable
+import androidx.glance.appwidget.GlanceAppWidget
+import androidx.glance.appwidget.action.actionRunCallback
+import androidx.glance.appwidget.lazy.LazyColumn
+import androidx.glance.appwidget.lazy.items
+import androidx.glance.appwidget.provideContent
+import androidx.glance.background
+import androidx.glance.layout.Alignment
+import androidx.glance.layout.Column
+import androidx.glance.layout.Spacer
+import androidx.glance.layout.fillMaxSize
+import androidx.glance.layout.fillMaxWidth
+import androidx.glance.layout.height
+import androidx.glance.layout.padding
+import androidx.glance.text.FontWeight
+import androidx.glance.text.Text
+import androidx.glance.text.TextStyle
+import androidx.glance.unit.ColorProvider
+import com.androidvip.sysctlgui.design.theme.onPrimaryContainerLight
+import com.androidvip.sysctlgui.design.theme.primaryContainerLight
+import com.androidvip.sysctlgui.design.theme.primaryLight
+import com.androidvip.sysctlgui.domain.models.KernelParam
+import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+class FavoritesGlanceWidget : GlanceAppWidget(), KoinComponent {
+    private val getUserParamsUseCase: GetUserParamsUseCase by inject()
+
+    override suspend fun provideGlance(context: Context, id: GlanceId) {
+        val favoriteParams = getUserParamsUseCase().filter { it.isFavorite }
+
+        provideContent {
+            FavoritesWidgetContent(params = favoriteParams)
+        }
+    }
+
+    @Composable
+    fun FavoritesWidgetContent(params: List) {
+        Column(
+            modifier = GlanceModifier
+                .fillMaxSize()
+                .background(primaryContainerLight)
+                .padding(16.dp),
+            horizontalAlignment = Alignment.Horizontal.Start
+        ) {
+            Text(
+                text = "Favorite Kernel Params",
+                style = TextStyle(
+                    fontWeight = FontWeight.Bold,
+                    fontSize = 16.sp,
+                    color = ColorProvider(onPrimaryContainerLight)
+                ),
+                modifier = GlanceModifier.padding(vertical = 8.dp)
+            )
+            Spacer(GlanceModifier.height(8.dp))
+
+            if (params.isEmpty()) {
+                Text("No favorite parameters yet.")
+            } else {
+                LazyColumn {
+                    items(params) { param ->
+                        FavoriteItem(param = param)
+                        Spacer(GlanceModifier.height(4.dp))
+                    }
+                }
+            }
+        }
+    }
+
+    @Composable
+    fun FavoriteItem(param: KernelParam) {
+        Column(
+            modifier = GlanceModifier
+                .padding(vertical = 8.dp)
+                .fillMaxWidth()
+                .clickable(
+                    onClick = actionRunCallback(
+                        parameters = actionParametersOf(kernelParamNameKey to param.path)
+                    )
+                )
+        ) {
+            Text(
+                text = param.name,
+                style = TextStyle(
+                    fontWeight = FontWeight.Medium,
+                    color = ColorProvider(primaryLight)
+                )
+            )
+            Text(
+                text = param.value,
+                style = TextStyle(
+                    fontWeight = FontWeight.Medium,
+                    color = ColorProvider(primaryLight)
+                )
+            )
+        }
+    }
+}
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidgetReceiver.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidgetReceiver.kt
new file mode 100644
index 0000000..e9eb354
--- /dev/null
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidgetReceiver.kt
@@ -0,0 +1,8 @@
+package com.androidvip.sysctlgui.widgets
+
+import androidx.glance.appwidget.GlanceAppWidget
+import androidx.glance.appwidget.GlanceAppWidgetReceiver
+
+class FavoritesGlanceWidgetReceiver : GlanceAppWidgetReceiver() {
+    override val glanceAppWidget: GlanceAppWidget = FavoritesGlanceWidget()
+}
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidget.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidget.kt
deleted file mode 100644
index afec2c9..0000000
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidget.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.androidvip.sysctlgui.widgets
-
-import android.app.PendingIntent
-import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetProvider
-import android.content.Context
-import android.content.Intent
-import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
-import android.widget.RemoteViews
-import androidx.core.net.toUri
-import com.androidvip.sysctlgui.R
-import com.androidvip.sysctlgui.domain.enums.Actions
-import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase
-import com.androidvip.sysctlgui.helpers.UiKernelParamMapper
-import com.androidvip.sysctlgui.models.UiKernelParam
-import com.androidvip.sysctlgui.ui.start.StartActivity
-import com.androidvip.sysctlgui.widgets.FavoritesWidget.Companion.EDIT_PARAM_EXTRA
-import kotlinx.coroutines.runBlocking
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-import kotlin.collections.map
-
-class FavoritesWidget : AppWidgetProvider(), KoinComponent {
-    private val getUserParamsUseCase: GetUserParamsUseCase by inject()
-
-    override fun onUpdate(
-        context: Context,
-        appWidgetManager: AppWidgetManager,
-        appWidgetIds: IntArray
-    ) {
-        for (appWidgetId in appWidgetIds) {
-            updateAppWidget(context, appWidgetManager, appWidgetId)
-        }
-        super.onUpdate(context, appWidgetManager, appWidgetIds)
-    }
-
-    override fun onReceive(context: Context?, intent: Intent?) {
-        if (context == null || intent == null) return
-        if (intent.action != EDIT_PARAM_EXTRA) {
-            return super.onReceive(context, intent)
-        }
-
-        runBlocking {
-            val params = getUserParamsUseCase()
-                .filter { it.isFavorite }
-                .map(UiKernelParamMapper::map)
-                .toMutableList()
-
-            if (params.isEmpty()) return@runBlocking
-
-            val param = params[intent.getIntExtra(EXTRA_ITEM, 0)]
-            Intent(context, StartActivity::class.java).apply {
-                flags = FLAG_ACTIVITY_NEW_TASK
-                action = Actions.EditParam.name
-                // TODO
-                /*putExtra(EditKernelParamActivity.EXTRA_PARAM, param)
-                putExtra(EditKernelParamActivity.EXTRA_EDIT_SAVED_PARAM, true)*/
-                context.startActivity(this)
-            }
-        }
-
-        super.onReceive(context, intent)
-    }
-
-    override fun onDisabled(context: Context?) {
-        super.onDisabled(context)
-    }
-
-    companion object {
-        const val EDIT_PARAM_EXTRA = "com.androidvip.sysctlgui.EDIT_PARAM_EXTRA"
-        const val EXTRA_ITEM = "com.androidvip.sysctlgui.EXTRA_ITEM"
-    }
-}
-
-internal fun updateAppWidget(
-    context: Context,
-    appWidgetManager: AppWidgetManager,
-    appWidgetId: Int
-) {
-    val intent = Intent(context, FavoritesWidgetService::class.java).apply {
-        putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
-        data = toUri(Intent.URI_INTENT_SCHEME).toUri()
-    }
-
-    val views = RemoteViews(
-        context.packageName,
-        R.layout.favorites_widget
-    ).apply {
-        setRemoteAdapter(R.id.favorites_list, intent)
-        setEmptyView(R.id.favorites_list, R.id.empty_view)
-    }
-
-    val editParamPendingIntent: PendingIntent = Intent(
-        context,
-        FavoritesWidget::class.java
-    ).run {
-        action = EDIT_PARAM_EXTRA
-        putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
-        data = toUri(Intent.URI_INTENT_SCHEME).toUri()
-
-        val flags = PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-
-        PendingIntent.getBroadcast(context, 0, this, flags)
-    }
-    views.setPendingIntentTemplate(R.id.favorites_list, editParamPendingIntent)
-
-    appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.favorites_list)
-    appWidgetManager.updateAppWidget(appWidgetId, views)
-}
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidgetService.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidgetService.kt
deleted file mode 100644
index 2876d99..0000000
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesWidgetService.kt
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.androidvip.sysctlgui.widgets
-
-import android.appwidget.AppWidgetManager
-import android.content.Context
-import android.content.Intent
-import android.widget.RemoteViews
-import android.widget.RemoteViewsService
-import com.androidvip.sysctlgui.R
-import com.androidvip.sysctlgui.domain.models.KernelParam
-import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase
-import com.androidvip.sysctlgui.widgets.FavoritesWidget.Companion.EXTRA_ITEM
-import kotlinx.coroutines.runBlocking
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-
-class FavoritesWidgetService : RemoteViewsService() {
-    override fun onGetViewFactory(intent: Intent?): RemoteViewsFactory {
-        return FavoritesRemoteViewsFactory(applicationContext, intent!!)
-    }
-}
-
-class FavoritesRemoteViewsFactory(
-    val context: Context,
-    val intent: Intent
-) : RemoteViewsService.RemoteViewsFactory, KoinComponent {
-    private val getUserParamsUseCase: GetUserParamsUseCase by inject()
-
-    private var widgetId: Any = intent.getIntExtra(
-        AppWidgetManager.EXTRA_APPWIDGET_ID,
-        AppWidgetManager.INVALID_APPWIDGET_ID
-    )
-
-    private var params: MutableList = mutableListOf()
-
-    override fun onCreate() {
-        runBlocking {
-            params = getUserParamsUseCase().filter {
-                it.isFavorite
-            }.toMutableList()
-        }
-    }
-
-    override fun getLoadingView(): RemoteViews? = null
-
-    override fun getItemId(position: Int): Long {
-        return position.toLong()
-    }
-
-    override fun onDataSetChanged() {
-        runBlocking {
-            params = getUserParamsUseCase().filter { it.isFavorite }.toMutableList()
-        }
-    }
-
-    override fun hasStableIds(): Boolean = true
-
-    override fun getViewAt(position: Int): RemoteViews {
-        val views = RemoteViews(
-            context.packageName,
-            R.layout.list_item_kernel_param_widget_list
-        )
-
-        val param = params[position]
-        views.setTextViewText(R.id.listKernelParamName, param.name)
-        views.setTextViewText(R.id.listKernelParamValue, param.value)
-
-        val fillInIntent = Intent().apply {
-            putExtra(EXTRA_ITEM, position)
-        }
-
-        views.setOnClickFillInIntent(R.id.listKernelParamLayout, fillInIntent)
-        return views
-    }
-
-    override fun getCount(): Int = params.size
-
-    override fun getViewTypeCount(): Int = 1
-
-    override fun onDestroy() {
-        params.clear()
-    }
-}
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/UpdateFavoriteWidgetUseCase.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/UpdateFavoriteWidgetUseCase.kt
new file mode 100644
index 0000000..b4ed4ae
--- /dev/null
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/UpdateFavoriteWidgetUseCase.kt
@@ -0,0 +1,14 @@
+package com.androidvip.sysctlgui.widgets
+
+import android.content.Context
+import androidx.glance.appwidget.GlanceAppWidgetManager
+
+class UpdateFavoriteWidgetUseCase(private val context: Context) {
+    suspend operator fun invoke() {
+        val manager = GlanceAppWidgetManager(context)
+        val glanceIds = manager.getGlanceIds(FavoritesGlanceWidget::class.java)
+        glanceIds.forEach { glanceId ->
+            FavoritesGlanceWidget().update(context, glanceId)
+        }
+    }
+}
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/ViewKernelParamDetailsAction.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/ViewKernelParamDetailsAction.kt
new file mode 100644
index 0000000..009e0d3
--- /dev/null
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/ViewKernelParamDetailsAction.kt
@@ -0,0 +1,29 @@
+package com.androidvip.sysctlgui.widgets
+
+import android.content.Context
+import android.content.Intent
+import androidx.glance.GlanceId
+import androidx.glance.action.ActionParameters
+import androidx.glance.appwidget.action.ActionCallback
+import com.androidvip.sysctlgui.domain.enums.Actions
+import com.androidvip.sysctlgui.ui.main.MainActivity
+import com.androidvip.sysctlgui.ui.start.StartActivity
+
+internal val kernelParamNameKey = ActionParameters.Key("kernelParamNameKey")
+
+class ViewKernelParamDetailsAction : ActionCallback {
+    override suspend fun onAction(
+        context: Context,
+        glanceId: GlanceId,
+        parameters: ActionParameters
+    ) {
+        val paramName = parameters[kernelParamNameKey] ?: return
+
+        val intent = Intent(context, StartActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            action = Actions.EditParam.name
+            putExtra(MainActivity.EXTRA_PARAM_NAME, paramName)
+        }
+        context.startActivity(intent)
+    }
+}
diff --git a/app/src/main/res/layout/favorites_widget.xml b/app/src/main/res/layout/favorites_widget.xml
index 08b3875..6089b65 100644
--- a/app/src/main/res/layout/favorites_widget.xml
+++ b/app/src/main/res/layout/favorites_widget.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/colorBackgroundAlt">
+    android:background="@color/neutral_800">
 
     
 
diff --git a/app/src/main/res/xml/favorites_widget_info.xml b/app/src/main/res/xml/favorites_glance_widget_info.xml
similarity index 53%
rename from app/src/main/res/xml/favorites_widget_info.xml
rename to app/src/main/res/xml/favorites_glance_widget_info.xml
index 8dbf6cc..b78fe79 100644
--- a/app/src/main/res/xml/favorites_widget_info.xml
+++ b/app/src/main/res/xml/favorites_glance_widget_info.xml
@@ -1,10 +1,12 @@
 
 
+    android:widgetCategory="home_screen"
+    tools:ignore="UnusedAttribute" />
\ No newline at end of file
diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/UpsertUserParamUseCase.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/UpsertUserParamUseCase.kt
index 3ce75c7..b4a2095 100644
--- a/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/UpsertUserParamUseCase.kt
+++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/UpsertUserParamUseCase.kt
@@ -1,7 +1,7 @@
 package com.androidvip.sysctlgui.domain.usecase
 
-import com.androidvip.sysctlgui.domain.models.KernelParam
 import com.androidvip.sysctlgui.domain.exceptions.BlankValueNotAllowedException
+import com.androidvip.sysctlgui.domain.models.KernelParam
 import com.androidvip.sysctlgui.domain.repository.AppPrefs
 import com.androidvip.sysctlgui.domain.repository.UserRepository
 
@@ -23,4 +23,4 @@ class UpsertUserParamUseCase(
 
         return repository.upsertUserParam(param)
     }
-}
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 356b3e6..b362bae 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,6 +26,7 @@ kotlinxSerializationCore = "1.9.0"
 koin = "4.1.0"
 window = "1.4.0"
 workRuntimeKtx = "2.10.3"
+glanceAppwidget = "1.1.1"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -53,6 +54,7 @@ androidx-room-runtime = { group = "androidx.room", name = "room-runtime", versio
 androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
 androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+androidx-glance-appwidget = { group = "androidx.glance", name = "glance-appwidget", version.ref = "glanceAppwidget" }
 androidx-ui = { group = "androidx.compose.ui", name = "ui" }
 androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
 androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }

From 6625e0e439ab504a9559bfa5394af222b93d5935 Mon Sep 17 00:00:00 2001
From: Lennoard 
Date: Sat, 16 Aug 2025 22:10:50 -0300
Subject: [PATCH 12/18] feature: added new string resources

---
 .../com/androidvip/sysctlgui/Extensions.kt    |  58 ----------
 .../sysctlgui/ui/components/ErrorContainer.kt |   4 +-
 .../sysctlgui/ui/main/MainTopBar.kt           |   2 +-
 .../ui/params/DocumentationBottomSheet.kt     |   3 +-
 .../ui/params/browse/ParamBrowseScreen.kt     |   9 +-
 .../ui/params/browse/ParamFileRow.kt          |  13 +--
 .../sysctlgui/ui/params/browse/ParamRow.kt    |  11 +-
 .../ui/params/edit/ActionToggleButton.kt      |  31 +++---
 .../ui/params/edit/EditParamScreen.kt         |  46 +++++---
 .../ui/params/edit/EditParamViewModel.kt      |  21 +++-
 .../ui/presets/ImportPresetScreen.kt          |  16 +--
 .../sysctlgui/ui/presets/PresetsScreen.kt     |   9 +-
 .../sysctlgui/ui/presets/PresetsViewModel.kt  |   4 +-
 .../sysctlgui/ui/search/SearchScreen.kt       |  29 +++--
 .../sysctlgui/ui/start/StartActivity.kt       |   6 +-
 .../ui/tasker/TaskerPluginActivity.kt         |  18 ++++
 .../widgets/FavoritesGlanceWidget.kt          |   2 +-
 .../res/layout/activity_tasker_plugin.xml     |   4 +-
 app/src/main/res/values-pt-rBR/strings.xml    |  49 ++++++++-
 app/src/main/res/values/strings.xml           |  46 +++++++-
 .../res/xml/favorites_glance_widget_info.xml  |   2 +-
 common/design/src/main/res/values/colors.xml  | 100 +++++++++---------
 .../repository/AppSettingsRepositoryImpl.kt   |  89 +++++++++-------
 .../repository/DocumentationRepositoryImpl.kt |   5 +-
 .../source/OnlineDocumentationDataSource.kt   |  19 ++--
 data/src/main/res/values-pt-rBR/strings.xml   |  30 ++++++
 data/src/main/res/values/strings.xml          |  30 ++++++
 .../domain/repository/ParamsRepository.kt     |   6 +-
 28 files changed, 414 insertions(+), 248 deletions(-)
 create mode 100644 data/src/main/res/values-pt-rBR/strings.xml
 create mode 100644 data/src/main/res/values/strings.xml

diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/Extensions.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/Extensions.kt
index 4f82a5e..7f30045 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/Extensions.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/Extensions.kt
@@ -1,48 +1,14 @@
 package com.androidvip.sysctlgui
 
-import android.app.Activity
 import android.content.Context
-import android.content.res.ColorStateList
-import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.view.View
 import android.widget.Toast
-import androidx.annotation.AttrRes
-import androidx.core.view.ViewCompat
-import androidx.fragment.app.Fragment
 import com.androidvip.sysctlgui.receivers.TaskerReceiver
-import com.google.android.material.color.ColorRoles
-import com.google.android.material.color.MaterialColors
-import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import java.io.InputStream
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 
-fun View.goAway() { this.visibility = View.GONE }
-fun View.hide() { this.visibility = View.INVISIBLE }
-fun View.show() { this.visibility = View.VISIBLE }
-
-fun View.getColorRoles(@AttrRes colorAttrRes: Int = androidx.appcompat.R.attr.colorPrimary): ColorRoles {
-    val color = MaterialColors.getColor(this, colorAttrRes)
-    return MaterialColors.getColorRoles(context, color)
-}
-
-fun Snackbar.showAsLight() {
-    val roles = view.getColorRoles()
-    ViewCompat.setBackgroundTintList(view, ColorStateList.valueOf(roles.accentContainer))
-    setTextColor(roles.accent)
-    show()
-}
-
-fun Fragment.toast(messageRes: Int, length: Int = Toast.LENGTH_SHORT) {
-    if (!isAdded) return
-    requireContext().toast(getString(messageRes), length)
-}
-
 fun Context?.toast(messageRes: Int, length: Int = Toast.LENGTH_SHORT) {
     if (this == null) return
     toast(getString(messageRes), length)
@@ -61,20 +27,6 @@ fun Context.runOnUiThread(f: Context.() -> Unit) {
     }
 }
 
-fun Uri.readLines(context: Context?, forEachLine: (String) -> Unit) {
-    context?.contentResolver?.openInputStream(this).readLines(forEachLine)
-}
-
-fun InputStream?.readLines(forEachLine: (String) -> Unit) {
-    this?.use { inputStream ->
-        inputStream.bufferedReader().use {
-            it.readLines().forEach { line ->
-                forEachLine(line)
-            }
-        }
-    }
-}
-
 @ExperimentalContracts
 fun Bundle?.isValidTaskerBundle() : Boolean {
     contract {
@@ -82,13 +34,3 @@ fun Bundle?.isValidTaskerBundle() : Boolean {
     }
     return this != null && containsKey(TaskerReceiver.BUNDLE_EXTRA_LIST_NUMBER)
 }
-
-suspend inline fun Activity?.runSafeOnUiThread(crossinline uiBlock: () -> Unit) {
-    this?.let {
-        if (!it.isFinishing && !it.isDestroyed) {
-            withContext(Dispatchers.Main) {
-                runCatching(uiBlock)
-            }
-        }
-    }
-}
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/components/ErrorContainer.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/components/ErrorContainer.kt
index d1f6940..80bf0f6 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/components/ErrorContainer.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/components/ErrorContainer.kt
@@ -26,7 +26,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import com.androidvip.sysctlgui.R
 
 private const val ERROR_CONTAINER_ANIMATION_DURATION = 4000
 
@@ -80,7 +82,7 @@ internal fun ErrorContainer(message: String, onAnimationEnd: () -> Unit) {
                 )
                 Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
                     Text(
-                        text = "Error",
+                        text = stringResource(R.string.error),
                         style = MaterialTheme.typography.titleMedium,
                         color = MaterialTheme.colorScheme.onErrorContainer
                     )
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainTopBar.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainTopBar.kt
index 4b214ce..c82019a 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainTopBar.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainTopBar.kt
@@ -35,7 +35,7 @@ fun MainTopBar(
                 IconButton(onClick = onBackPressed) {
                     Icon(
                         imageVector = Icons.AutoMirrored.Rounded.ArrowBack,
-                        contentDescription = "Back"
+                        contentDescription = stringResource(R.string.go_back)
                     )
                 }
             }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/DocumentationBottomSheet.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/DocumentationBottomSheet.kt
index 8ba0aab..eb7b3d2 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/DocumentationBottomSheet.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/DocumentationBottomSheet.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.TextLinkStyles
 import androidx.compose.ui.text.font.FontWeight
@@ -109,7 +110,7 @@ private fun DocumentationBottomSheetContent(
                     contentDescription = null,
                     modifier = Modifier.padding(end = 8.dp)
                 )
-                Text(text = "Read more")
+                Text(text = stringResource(R.string.read_more))
             }
         }
     }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt
index ddff009..ec7f5f4 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt
@@ -43,6 +43,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
@@ -151,7 +152,8 @@ private fun ParamBrowseScreenContent(
     onRefresh: () -> Unit
 ) {
     val listState = rememberLazyListState()
-    val pullRefreshState = rememberPullRefreshState(refreshing = isRefreshing, onRefresh = onRefresh)
+    val pullRefreshState =
+        rememberPullRefreshState(refreshing = isRefreshing, onRefresh = onRefresh)
     var headerVisible by remember { mutableStateOf(backEnabled) }
 
     BackHandler(enabled = backEnabled, onBack = onBackPressed)
@@ -236,7 +238,10 @@ private fun ParamBrowseScreenContent(
             modifier = Modifier.align(Alignment.BottomCenter)
         ) {
             InfoItem(
-                text = "Read documentation for \"${documentation?.title}\"",
+                text = stringResource(
+                    R.string.read_documentation_format,
+                    documentation?.title.orEmpty()
+                ),
                 textStyle = MaterialTheme.typography.titleSmall.copy(
                     textDecoration = TextDecoration.Underline,
                     color = MaterialTheme.colorScheme.primary
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamFileRow.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamFileRow.kt
index 43f299c..72f7106 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamFileRow.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamFileRow.kt
@@ -23,6 +23,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontWeight
@@ -43,9 +44,9 @@ fun ParamFileRow(
 ) {
     Box(modifier = Modifier.clickable { onParamClicked(param) }) {
         val rowDescription = if (param.isDirectory) {
-            "Directory: ${param.name}"
+            stringResource(R.string.acessibility_directory_description_format, param.name)
         } else {
-            "Parameter: ${param.name}"
+            stringResource(R.string.acessibility_param_description_format, param.name)
         }
         Row(
             modifier = modifier
@@ -101,7 +102,7 @@ private fun ParamIcon(param: UiKernelParam) {
         }
     }
 
-    val iconId = if (param.isDirectory) R.drawable.ic_folder  else R.drawable.ic_file
+    val iconId = if (param.isDirectory) R.drawable.ic_folder else R.drawable.ic_file
 
     Box(
         modifier = Modifier
@@ -112,7 +113,7 @@ private fun ParamIcon(param: UiKernelParam) {
     ) {
         Icon(
             painter = painterResource(iconId),
-            contentDescription = "Parameter icon",
+            contentDescription = stringResource(R.string.acessibility_param_icon_description),
             modifier = Modifier.size(24.dp),
             tint = iconColor
         )
@@ -124,14 +125,14 @@ private fun TrailingIcon(param: UiKernelParam, showFavoriteIcon: Boolean) {
     if (param.isDirectory) {
         Icon(
             imageVector = Icons.AutoMirrored.Rounded.KeyboardArrowRight,
-            contentDescription = "Navigate do directory",
+            contentDescription = stringResource(R.string.acessibility_davegate_to_directory_description),
             modifier = Modifier.size(24.dp),
             tint = MaterialTheme.colorScheme.onSurfaceVariant
         )
     } else if (param.isFavorite && showFavoriteIcon) {
         Icon(
             imageVector = Icons.Rounded.Favorite,
-            contentDescription = "Favorite",
+            contentDescription = stringResource(R.string.favorites),
             tint = MaterialTheme.colorScheme.primary,
             modifier = Modifier.size(18.dp)
         )
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamRow.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamRow.kt
index da3c96b..c47fd07 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamRow.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamRow.kt
@@ -17,6 +17,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.stateDescription
@@ -24,6 +25,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
+import com.androidvip.sysctlgui.R
 import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme
 import com.androidvip.sysctlgui.models.UiKernelParam
 
@@ -34,8 +36,11 @@ fun ParamRow(
     onParamClicked: (UiKernelParam) -> Unit,
     showFullName: Boolean = false
 ) {
-    val rowDescription = "Parameter: ${param.name}"
-    val rowState = if (param.isFavorite) "Marked as favorite" else ""
+    val rowDescription = stringResource(
+        R.string.acessibility_param_description_format,
+        param.name
+    )
+    val rowState = if (param.isFavorite) stringResource(R.string.marked_as_favorite) else ""
 
     Row(
         modifier = modifier
@@ -100,7 +105,7 @@ private fun ParamRowPreview() {
     SysctlGuiTheme(contrastLevel = 1) {
         Column(modifier = Modifier.background(MaterialTheme.colorScheme.background)) {
             ParamRow(param = param, onParamClicked = {}, showFullName = true)
-            ParamRow(param = param.copy(isFavorite = true), onParamClicked = {},)
+            ParamRow(param = param.copy(isFavorite = true), onParamClicked = {})
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/ActionToggleButton.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/ActionToggleButton.kt
index 3bf22ef..a8819e4 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/ActionToggleButton.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/ActionToggleButton.kt
@@ -28,6 +28,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewDynamicColors
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
@@ -95,7 +96,10 @@ internal fun ActionToggleButton(
 
             Icon(
                 painter = if (isCurrentlyActive) iconOnActive else iconOnInactive,
-                contentDescription = "Toggle $contentDescription",
+                contentDescription = stringResource(
+                    R.string.toggle_format,
+                    contentDescription.orEmpty()
+                ),
                 tint = iconTint
             )
         }
@@ -113,10 +117,11 @@ internal fun FavoriteButton(
         isActive = isFavorite,
         iconOnActive = painterResource(R.drawable.ic_favorite),
         iconOnInactive = painterResource(R.drawable.ic_favorite_outlined),
-        contentDescription = "favorite",
+        contentDescription = stringResource(R.string.mark_as_favorite),
         onToggle = onFavoriteClick
     )
 }
+
 @Composable
 internal fun TaskerButton(
     modifier: Modifier = Modifier,
@@ -128,7 +133,7 @@ internal fun TaskerButton(
         isActive = isTaskerParam,
         iconOnActive = painterResource(R.drawable.ic_tasker),
         iconOnInactive = painterResource(R.drawable.ic_tasker_outlined),
-        contentDescription = "tasker param",
+        contentDescription = stringResource(R.string.toggle_tasker_param),
         onToggle = onToggle
     )
 }
@@ -142,22 +147,10 @@ private fun FavoriteButtonStatesPreview() {
                 modifier = Modifier.padding(16.dp),
                 horizontalArrangement = Arrangement.spacedBy(16.dp)
             ) {
-                FavoriteButton(
-                    isFavorite = false,
-                    onFavoriteClick = {}
-                )
-                FavoriteButton(
-                    isFavorite = true,
-                    onFavoriteClick = {}
-                )
-                TaskerButton(
-                    isTaskerParam = false,
-                    onToggle = {}
-                )
-                TaskerButton(
-                    isTaskerParam = true,
-                    onToggle = {}
-                )
+                FavoriteButton(isFavorite = false, onFavoriteClick = {})
+                FavoriteButton(isFavorite = true, onFavoriteClick = {})
+                TaskerButton(isTaskerParam = false, onToggle = {})
+                TaskerButton(isTaskerParam = true, onToggle = {})
             }
         }
     }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt
index f28758f..c6bc4ac 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt
@@ -58,6 +58,7 @@ import androidx.compose.ui.platform.LocalClipboard
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringArrayResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.TextLinkStyles
@@ -98,19 +99,20 @@ fun EditParamScreen(
 ) {
     val context = LocalContext.current
     val state = viewModel.uiState.collectAsStateWithLifecycle()
-    val taskerListOptions = listOf("Primary", "Secondary")
+    val taskerListOptions = stringArrayResource(R.array.tasker_lists).toList()
     var showSelectTaskerListDialog by rememberSaveable { mutableStateOf(false) }
     var selectedOptionIndex by rememberSaveable {
         mutableIntStateOf(Consts.LIST_NUMBER_PRIMARY_TASKER)
     }
     var errorMessage by rememberSaveable { mutableStateOf("") }
     var showError by rememberSaveable { mutableStateOf(false) }
+    val appBarTitle = stringResource(R.string.edit_params)
 
     LaunchedEffect(Unit) {
         mainViewModel.onEvent(
             MainViewEvent.OnSateChangeRequested(
                 MainViewState(
-                    topBarTitle = "Edit kernel parameter",
+                    topBarTitle = appBarTitle,
                     showTopBar = true,
                     showNavBar = false,
                     showBackButton = true,
@@ -126,6 +128,8 @@ fun EditParamScreen(
         }
     }
 
+    val successMessage = stringResource(R.string.value_applied_successfully)
+    val undoText = stringResource(R.string.undo)
     LaunchedEffect(viewModel.effect) {
         viewModel.effect.collect { effect ->
             when (effect) {
@@ -141,8 +145,8 @@ fun EditParamScreen(
                 is EditParamViewEffect.ShowApplySuccess -> {
                     mainViewModel.onEvent(
                         MainViewEvent.ShowSnackbarRequested(
-                            message = "Value applied successfully",
-                            actionLabel = "Undo"
+                            message = successMessage,
+                            actionLabel = undoText
                         )
                     )
                 }
@@ -173,7 +177,7 @@ fun EditParamScreen(
 
     SingleChoiceDialog(
         showDialog = showSelectTaskerListDialog,
-        title = "Choose a Tasker list",
+        title = stringResource(R.string.select_tasker_list),
         options = taskerListOptions,
         initialSelectedOptionIndex = selectedOptionIndex,
         onDismissRequest = { showSelectTaskerListDialog = false },
@@ -205,14 +209,18 @@ private fun EditParamContent(
 
     val copyParamContentToClipboard = {
         val clipData = ClipData.newPlainText(
-            "Kernel Parameter",
+            context.getString(R.string.kernel_params),
             "${param.lastNameSegment}=${param.value} (${param.path})"
         )
         val clipEntry = ClipEntry(clipData)
         coroutineScope.launch {
             clipboardManager.setClipEntry(clipEntry)
         }
-        Toast.makeText(context, "Copied to clipboard", Toast.LENGTH_SHORT).show()
+        Toast.makeText(
+            context,
+            context.getString(R.string.copied_to_clipboard),
+            Toast.LENGTH_SHORT
+        ).show()
     }
 
     Column(
@@ -235,7 +243,11 @@ private fun EditParamContent(
                         indication = null,
                         interactionSource = remember { MutableInteractionSource() },
                         onClick = {
-                            Toast.makeText(context, "Long press to copy", Toast.LENGTH_SHORT).show()
+                            Toast.makeText(
+                                context,
+                                context.getString(R.string.long_press_to_copy),
+                                Toast.LENGTH_SHORT
+                            ).show()
                         },
                         onLongClick = copyParamContentToClipboard
                     )
@@ -297,11 +309,11 @@ private fun EditParamContent(
                 AssistChip(
                     onClick = { onTaskerClicked(true) },
                     modifier = Modifier.padding(16.dp),
-                    label = { Text(text = "Tasker list: $listName") },
+                    label = { Text(text = stringResource(R.string.tasker_list_format, listName)) },
                     leadingIcon = {
                         Icon(
                             painter = painterResource(R.drawable.ic_tasker),
-                            contentDescription = "Tasker list",
+                            contentDescription = stringResource(R.string.tasker_list),
                             tint = MaterialTheme.colorScheme.tertiary
                         )
                     }
@@ -355,7 +367,7 @@ private fun ParamValueContent(
     ) {
         Column(modifier = Modifier.weight(1f)) {
             Text(
-                text = "Parameter value",
+                text = stringResource(R.string.parameter_value),
                 style = MaterialTheme.typography.titleMedium,
                 color = MaterialTheme.colorScheme.onBackground
             )
@@ -388,13 +400,13 @@ private fun ParamValueContent(
                 if (editingActive) {
                     Icon(
                         imageVector = Icons.Rounded.Done,
-                        contentDescription = "Apply",
+                        contentDescription = stringResource(R.string.apply_param),
                         tint = MaterialTheme.colorScheme.primary
                     )
                 } else {
                     Icon(
                         imageVector = Icons.Rounded.Edit,
-                        contentDescription = "Edit",
+                        contentDescription = stringResource(R.string.edit),
                         tint = MaterialTheme.colorScheme.primary
                     )
                 }
@@ -432,7 +444,7 @@ fun EditableParamValue(
                 OutlinedTextField(
                     value = editedValue,
                     onValueChange = onEditorValueChange,
-                    label = { Text("New value") },
+                    label = { Text(stringResource(R.string.new_value)) },
                     singleLine = true,
                     keyboardOptions = KeyboardOptions(keyboardType = keyboardType),
                     modifier = Modifier.fillMaxWidth()
@@ -459,7 +471,7 @@ private fun ParamDocs(
 
     Column(modifier = modifier) {
         Text(
-            text = "Documentation",
+            text = stringResource(R.string.documentation),
             style = MaterialTheme.typography.titleMedium,
             color = MaterialTheme.colorScheme.onBackground
         )
@@ -492,7 +504,7 @@ private fun ParamDocs(
                             tint = MaterialTheme.colorScheme.onErrorContainer
                         )
                         Text(
-                            text = "No documentation available",
+                            text = stringResource(R.string.no_info_available),
                             style = MaterialTheme.typography.bodyLarge.copy(),
                             fontWeight = FontWeight.Medium,
                             color = MaterialTheme.colorScheme.onErrorContainer
@@ -547,7 +559,7 @@ private fun DocumentationContent(
                 .padding(vertical = 8.dp)
                 .align(Alignment.End)
         ) {
-            Text(text = "Read more")
+            Text(text = stringResource(R.string.read_more))
         }
     }
 }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt
index 05b4529..fc92295 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamViewModel.kt
@@ -4,6 +4,11 @@ import android.util.Log
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
+import com.androidvip.sysctlgui.R
+import com.androidvip.sysctlgui.domain.StringProvider
+import com.androidvip.sysctlgui.domain.exceptions.ApplyValueException
+import com.androidvip.sysctlgui.domain.exceptions.BlankValueNotAllowedException
+import com.androidvip.sysctlgui.domain.exceptions.CommitModeException
 import com.androidvip.sysctlgui.domain.repository.AppPrefs
 import com.androidvip.sysctlgui.domain.usecase.ApplyParamUseCase
 import com.androidvip.sysctlgui.domain.usecase.GetParamDocumentationUseCase
@@ -25,6 +30,7 @@ class EditParamViewModel(
     private val getUserParam: GetUserParamByNameUseCase,
     private val isTaskerInstalled: IsTaskerInstalledUseCase,
     private val updateFavoriteWidget: UpdateFavoriteWidgetUseCase,
+    private val stringProvider: StringProvider,
     private val appPrefs: AppPrefs
 ) : BaseViewModel() {
     private val paramName: String? = savedStateHandle.get(PARAM_NAME_KEY)
@@ -85,8 +91,21 @@ class EditParamViewModel(
                 updateFavoriteWidget()
             }.onFailure {
                 Log.e("EditParamViewModel", "Failed to apply param", it)
+                val message = when (it) {
+                    is BlankValueNotAllowedException -> stringProvider.getString(
+                        R.string.apply_error_blank_values
+                    )
+                    is CommitModeException -> stringProvider.getString(
+                        R.string.apply_error_commit_mode
+                    )
+
+                    is ApplyValueException -> stringProvider.getString(
+                        R.string.apply_error_command_execution_failed
+                    )
+                    else -> it.message.orEmpty()
+                }
                 setEffect {
-                    EditParamViewEffect.ShowError(it.message.orEmpty())
+                    EditParamViewEffect.ShowError(message)
                 }
             }
         }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/ImportPresetScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/ImportPresetScreen.kt
index 7f78ae5..00a2e1d 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/ImportPresetScreen.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/ImportPresetScreen.kt
@@ -45,6 +45,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontFamily
@@ -55,6 +56,7 @@ import androidx.compose.ui.tooling.preview.PreviewDynamicColors
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.androidvip.sysctlgui.R
 import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme
 import com.androidvip.sysctlgui.domain.models.KernelParam
 import com.androidvip.sysctlgui.ui.main.MainViewEvent
@@ -78,7 +80,7 @@ fun ImportPresetScreen(
         mainViewModel.onEvent(
             MainViewEvent.OnSateChangeRequested(
                 MainViewState(
-                    topBarTitle = "Applying preset",
+                    topBarTitle = context.getString(R.string.applying_preset),
                     showTopBar = true,
                     showNavBar = false,
                     showBackButton = true,
@@ -155,7 +157,7 @@ private fun IncomingPresetsContent(
 ) {
     Column(modifier = Modifier.fillMaxSize()) {
         Text(
-            text = "${paramsToImport.size} parameters found",
+            text = stringResource(R.string.parameters_found_format, paramsToImport.size),
             style = MaterialTheme.typography.titleMedium,
             color = MaterialTheme.colorScheme.onBackground,
             modifier = Modifier
@@ -246,7 +248,7 @@ private fun IncomingPresetsContent(
                 modifier = Modifier.weight(1f),
                 onClick = onCancelPressed
             ) {
-                Text(text = "Cancel")
+                Text(text = stringResource(android.R.string.cancel))
             }
 
             OutlinedButton(
@@ -258,7 +260,7 @@ private fun IncomingPresetsContent(
                     contentColor = MaterialTheme.colorScheme.onPrimary
                 )
             ) {
-                Text(text = "Import")
+                Text(text = stringResource(R.string.import_text))
             }
         }
     }
@@ -275,7 +277,7 @@ private fun LoadingIndicator() {
     ) {
         CircularProgressIndicator()
         Text(
-            text = "Loading preset...",
+            text = stringResource(R.string.loading_preset),
             style = MaterialTheme.typography.bodyLarge,
             modifier = Modifier.fillMaxWidth(),
             color = MaterialTheme.colorScheme.onBackground,
@@ -310,13 +312,13 @@ private fun SuccessIndicator(onAnimationEnd: () -> Unit) {
     ) {
         Icon(
             imageVector = Icons.Rounded.CheckCircle,
-            contentDescription = "Success",
+            contentDescription = stringResource(R.string.success),
             tint = MaterialTheme.colorScheme.primary,
             modifier = Modifier.size(128.dp)
         )
 
         Text(
-            text = "Presets successfully imported",
+            text = stringResource(R.string.presets_import_success_message),
             style = MaterialTheme.typography.titleLarge,
             color = MaterialTheme.colorScheme.onBackground,
             textAlign = TextAlign.Center
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt
index eaa63ce..5b4d1ea 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.PreviewDynamicColors
@@ -137,14 +138,14 @@ private fun PresetsScreenContent(
     ) {
         ImportCards(
             onClick = onImportPressed,
-            title = "Import",
-            description = "Import presets from a file",
+            title = stringResource(R.string.import_text),
+            description = stringResource(R.string.import_presets_description),
             iconRes = R.drawable.ic_import
         )
         ImportCards(
             onClick = onExportPressed,
-            title = "Export",
-            description = "Export presets to a file",
+            title = stringResource(R.string.export),
+            description = stringResource(R.string.export_presets_description),
             iconRes = R.drawable.ic_export
         )
 
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsViewModel.kt
index 2ef1f1f..f184388 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsViewModel.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsViewModel.kt
@@ -47,7 +47,7 @@ class PresetsViewModel(
                 }
             }.onFailure {
                 setState { copy(incomingPresetsScreenState = IncomingPresetsScreenState.Idle) }
-                setEffect { PresetsViewEffect.ShowError("Failed to import params") }
+                setEffect { PresetsViewEffect.ShowError(stringProvider.getString(R.string.import_failure)) }
             }
         }
     }
@@ -96,7 +96,7 @@ class PresetsViewModel(
                 runCatching {
                     presetsFileProcessor.backupParamsToUri(uri, userParams)
                 }.onSuccess {
-                    setEffect { PresetsViewEffect.ShowToast("Export complete") }
+                    setEffect { PresetsViewEffect.ShowToast(stringProvider.getString(R.string.export_complete)) }
                 }.onFailure {
                     setEffect { PresetsViewEffect.ShowError(stringProvider.getString(R.string.preset_error_processing_file)) }
                 }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt
index 08788dc..71b6bad 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt
@@ -44,6 +44,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -160,7 +161,7 @@ private fun SearchScreenContent(
                         onSearch = onSearch,
                         expanded = searchActive,
                         onExpandedChange = onActiveChange,
-                        placeholder = { Text("Search kernel parameters") },
+                        placeholder = { Text(stringResource(R.string.search_title)) },
                         leadingIcon = {
                             AnimatedContent(
                                 targetState = searchActive,
@@ -174,11 +175,16 @@ private fun SearchScreenContent(
                                     }) {
                                         Icon(
                                             Icons.AutoMirrored.Rounded.ArrowBack,
-                                            contentDescription = "Back"
+                                            contentDescription = stringResource(R.string.go_back)
                                         )
                                     }
                                 } else {
-                                    Icon(Icons.Rounded.Search, contentDescription = "Search Icon")
+                                    Icon(
+                                        imageVector = Icons.Rounded.Search,
+                                        contentDescription = stringResource(
+                                            R.string.acessibility_search_icon
+                                        )
+                                    )
                                 }
                             }
                         },
@@ -191,7 +197,10 @@ private fun SearchScreenContent(
                                 IconButton(onClick = {
                                     onSearchQueryChange("")
                                 }) {
-                                    Icon(Icons.Rounded.Clear, contentDescription = "Clear search")
+                                    Icon(
+                                        imageVector = Icons.Rounded.Clear,
+                                        contentDescription = stringResource(R.string.clear_search)
+                                    )
                                 }
                             }
                         },
@@ -258,7 +267,7 @@ private fun SearchViewContent(
         if (historyHints.isNotEmpty()) {
             item(key = "history_header") {
                 Text(
-                    text = "Recent Searches",
+                    text = stringResource(R.string.recent_searches),
                     style = MaterialTheme.typography.titleSmall,
                     fontWeight = FontWeight.Bold,
                     color = MaterialTheme.colorScheme.primary,
@@ -276,7 +285,7 @@ private fun SearchViewContent(
                     leadingContent = {
                         Icon(
                             painter = painterResource(R.drawable.ic_history),
-                            contentDescription = "History item"
+                            contentDescription = stringResource(R.string.history_item)
                         )
                     },
                     trailingContent = {
@@ -286,7 +295,7 @@ private fun SearchViewContent(
                         ) {
                             Icon(
                                 Icons.Rounded.Clear,
-                                contentDescription = "Clear history item"
+                                contentDescription = stringResource(R.string.clear_history_item)
                             )
                         }
                     },
@@ -342,7 +351,7 @@ private fun SearchViewContent(
                         .padding(16.dp),
                     contentAlignment = Alignment.Center
                 ) {
-                    Text("No suggestions available.")
+                    Text(stringResource(R.string.search_no_suggestions))
                 }
             }
         }
@@ -382,7 +391,7 @@ private fun SearchResultsContent(
             contentAlignment = Alignment.Center
         ) {
             Text(
-                text = "No results found for \"$searchQuery\"",
+                text = stringResource(R.string.search_no_results_format, searchQuery),
                 style = MaterialTheme.typography.bodyLarge,
                 color = MaterialTheme.colorScheme.onBackground,
                 textAlign = TextAlign.Center,
@@ -397,7 +406,7 @@ private fun SearchResultsContent(
             contentAlignment = Alignment.Center
         ) {
             Text(
-                text = "Enter a query to search for kernel parameters.",
+                text = stringResource(R.string.search_message),
                 style = MaterialTheme.typography.bodyLarge,
                 color = MaterialTheme.colorScheme.onBackground,
                 textAlign = TextAlign.Center,
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartActivity.kt
index 5356d7f..d173902 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartActivity.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/start/StartActivity.kt
@@ -7,13 +7,13 @@ import android.widget.Toast
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.androidvip.sysctlgui.R
 import com.androidvip.sysctlgui.data.utils.RootUtils
 import com.androidvip.sysctlgui.databinding.ActivitySplashBinding
 import com.androidvip.sysctlgui.domain.enums.Actions
 import com.androidvip.sysctlgui.domain.repository.AppPrefs
-import com.androidvip.sysctlgui.goAway
 import com.androidvip.sysctlgui.toast
 import com.androidvip.sysctlgui.ui.main.MainActivity
 import kotlinx.coroutines.delay
@@ -41,8 +41,6 @@ class StartActivity : AppCompatActivity() {
             binding.splashStatusText.setText(R.string.splash_status_checking_busybox)
             val isBusyBoxAvailable = checkBusyBox()
 
-            binding.splashStatusText.setText(R.string.splash_status_checking_migration)
-
             if (isRootAccessGiven) {
                 if (!isBusyBoxAvailable) {
                     prefs.useBusybox = false
@@ -50,7 +48,7 @@ class StartActivity : AppCompatActivity() {
                 navigate()
                 finish()
             } else {
-                binding.splashProgress.goAway()
+                binding.splashProgress.isVisible = false
                 toast(R.string.root_not_found_sum, Toast.LENGTH_LONG)
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                     startActivity(
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/tasker/TaskerPluginActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/tasker/TaskerPluginActivity.kt
index c3b59d5..a1eb806 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/tasker/TaskerPluginActivity.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/tasker/TaskerPluginActivity.kt
@@ -3,8 +3,12 @@ package com.androidvip.sysctlgui.ui.tasker
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.androidvip.sysctlgui.databinding.ActivityTaskerPluginBinding
 import com.androidvip.sysctlgui.receivers.TaskerReceiver
 import kotlin.contracts.ExperimentalContracts
@@ -15,9 +19,23 @@ class TaskerPluginActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         binding = ActivityTaskerPluginBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, windowInsets ->
+            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+
+            view.updatePadding(
+                left = insets.left,
+                top = insets.top,
+                right = insets.right,
+                bottom = insets.bottom
+            )
+
+            WindowInsetsCompat.CONSUMED
+        }
+
         binding.taskerDoneButton.setOnClickListener {
             val selectedListNumber = binding.taskerListSpinner.selectedItemPosition // 0-based index
 
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidget.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidget.kt
index 01529f6..0ff68df 100644
--- a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidget.kt
+++ b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidget.kt
@@ -85,7 +85,7 @@ class FavoritesGlanceWidget : GlanceAppWidget(), KoinComponent {
                 .fillMaxWidth()
                 .clickable(
                     onClick = actionRunCallback(
-                        parameters = actionParametersOf(kernelParamNameKey to param.path)
+                        parameters = actionParametersOf(kernelParamNameKey to param.name)
                     )
                 )
         ) {
diff --git a/app/src/main/res/layout/activity_tasker_plugin.xml b/app/src/main/res/layout/activity_tasker_plugin.xml
index 5a11583..99a6e14 100644
--- a/app/src/main/res/layout/activity_tasker_plugin.xml
+++ b/app/src/main/res/layout/activity_tasker_plugin.xml
@@ -12,6 +12,7 @@
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="@dimen/d16"
         android:layout_marginBottom="@dimen/d16"
+        android:fontFamily="@font/sansation_bold"
         android:text="@string/done"
         android:textColor="?colorOnTertiary"
         app:backgroundTint="?colorTertiary"
@@ -38,7 +39,8 @@
             android:paddingTop="@dimen/d16"
             android:text="@string/tasker_select_list"
             android:textColor="?colorPrimary"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            app:fontFamily="@font/sansation_bold" />
 
         Tentar definir o melhor tipo de entrada para o teclado com base no valor do parâmetro
     Acesso root não encontrado. Você só pode editar parâmetros com acesso root.
     Informação
-    Nenhuma informação disponível para este parâmetro
+    Nenhuma documentação disponível para este parâmetro
     Pesquisar
     Aplicando seus parâmetros
     Notificação de inicialização
@@ -119,4 +119,51 @@
     Usar cores dinâmicas (Tema Monet) quando disponível
     Forçar tema escuro
     Forçar o uso do tema escuro quando disponível
+    Favoritos
+    Predefinições
+    A criação do arquivo foi cancelada ou falhou
+    A seleção de arquivo foi cancelada ou falhou
+    Ocorreu um erro ao abrir o arquivo
+    Ocorreu um erro ao processar o arquivo
+    Parâmetro excluído: %s
+    Voltar
+    Ler a documentação para \"%1$s\"
+    Diretório: %1$s
+    Parâmetro: %1$s
+    Ícone de parâmetro
+    Navegar para o diretório
+    Marcado como favorito
+    Alternar %1$s
+    Favoritar
+    Alternar parâmetro do Tasker
+    Valor aplicado com sucesso
+    Copiado para a área de transferência
+    Pressione e segure para copiar
+    Lista do Tasker: %1$s
+    Novo valor
+    Ler mais
+    Documentação
+    Valor do parâmetro
+    Aplicando predefinição
+    %1$d parâmetros encontrados
+    Importar
+    Carregando predefinição…
+    Sucesso
+    Predefinições importadas com sucesso
+    Importar predefinições de um arquivo
+    Exportar predefinições para um arquivo
+    Pesquisar parâmetros do kernel
+    Nenhuma sugestão disponível
+    Nenhum resultado encontrado para \"%1$s\"
+    Insira uma consulta para pesquisar parâmetros do kernel
+    Ícone de pesquisa
+    Limpar pesquisa
+    Pesquisas recentes
+    Item do histórico
+    Limpar item do histórico
+    Exportação concluída
+    Falha ao importar parâmetros
+    Valores em branco não são permitidos atualmente
+    O valor se recusou a aplicar com o modo de aplicação atual
+    Falha na execução do comando
 
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b22598b..37c55b0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,7 +40,7 @@
     Try to set the best input type for the keyboard based on the value of the parameter
     Root access not found. You can only edit properties with root access.
     Information
-    No info available for this parameter
+    No documentation available for this parameter
     Search
     Start Up
     Allow to apply parameters on start up
@@ -70,7 +70,7 @@
     Execution will not delayed
     Set as favorite
     Remove from favorites
-    no favorites selected
+    No favorites selected
     Tasker list
     Primary list
     Secondary list
@@ -124,6 +124,46 @@
     File creation cancelled or failed
     File picking cancelled or failed
     There was an error while opening the file
-    There was an error while processing the file\n
+    There was an error while processing the file
     Param deleted: %s
+    Go back
+    Read documentation for \"%1$s\"
+    Directory: %1$s
+    Parameter: %1$s
+    Parameter icon
+    Navigate to directory
+    Marked as favorite
+    Toggle %1$s
+    Favorite
+    Toggle Tasker param
+    Value applied successfully
+    Copied to clipboard
+    Long press to copy
+    Tasker list: %1$s
+    New value
+    Read more
+    Documentation
+    Parameter value
+    Applying preset
+    %1$d parameters found
+    Import
+    Loading preset…
+    Success
+    Presets successfully imported
+    Import presets from a file
+    Export presets to a file
+    Search kernel parameters
+    No suggestions available
+    No results found for \"%1$s\"
+    Enter a query to search for kernel parameters
+    Search Icon
+    Clear search
+    Recent searches
+    History item
+    Clear history item
+    Export complete
+    Failed to import params
+    Blank values are currently not allowed
+    Value refused to apply with current commit mode
+    Command execution failed
 
diff --git a/app/src/main/res/xml/favorites_glance_widget_info.xml b/app/src/main/res/xml/favorites_glance_widget_info.xml
index b78fe79..7e03039 100644
--- a/app/src/main/res/xml/favorites_glance_widget_info.xml
+++ b/app/src/main/res/xml/favorites_glance_widget_info.xml
@@ -2,7 +2,7 @@
 
 
-    @color/gray_800
-    @color/gray_900
+    @color/md_theme_light_primary
+    @color/md_theme_light_onPrimaryContainer
     @color/gray_700
     @color/gray_500
-    @color/violet_700
-    @color/violet_500
+    @color/md_theme_light_tertiary
+    @color/md_theme_light_tertiaryContainer
     @color/neutral_300
     @color/gray_300
 
@@ -89,64 +89,64 @@
     #192b3b
     #021219
 
-    #006685
+    #4B5C92
     #FFFFFF
-    #BFE9FF
-    #001F2A
-    #4D616C
+    #DBE1FF
+    #334478
+    #595E72
     #FFFFFF
-    #D0E6F3
-    #081E27
-    #5E5A7D
+    #DDE1F9
+    #414659
+    #1D6B50
     #FFFFFF
-    #E4DFFF
-    #1A1836
+    #A7F2D0
+    #00513A
     #BA1A1A
     #FFDAD6
     #FFFFFF
-    #410002
-    #FBFCFE
-    #191C1E
-    #FBFCFE
-    #191C1E
-    #DCE3E9
-    #40484C
-    #70787D
-    #F0F1F3
-    #2E3133
-    #6DD2FF
+    #93000A
+    #FAF8FF
+    #1A1B21
+    #FAF8FF
+    #1A1B21
+    #E2E2EC
+    #45464F
+    #757680
+    #F1F0F7
+    #2F3036
+    #B4C5FF
     #000000
-    #006685
-    #C0C8CD
+    #4B5C92
+    #C5C6D0
     #000000
-    #6DD2FF
-    #003547
-    #004D65
-    #BFE9FF
-    #B4CAD6
-    #1F333D
-    #364954
-    #D0E6F3
-    #C7C2EA
-    #2F2D4C
-    #464364
-    #E4DFFF
+    #B4C5FF
+    #1A2D60
+    #334478
+    #DBE1FF
+    #C1C5DD
+    #2B3042
+    #414659
+    #DDE1F9
+    #8CD5B4
+    #003827
+    #00513A
+    #A7F2D0
     #FFB4AB
     #93000A
     #690005
     #FFDAD6
-    #191C1E
-    #E1E2E5
-    #191C1E
-    #E1E2E5
-    #40484C
-    #C0C8CD
-    #8A9297
-    #191C1E
-    #E1E2E5
-    #006685
+    #121318
+    #E3E2E9
+    #121318
+    #E3E2E9
+    #45464F
+    #C5C6D0
+    #8F909A
+    #2F3036
+    #E3E2E9
+    #4B5C92
     #000000
-    #6DD2FF
-    #40484C
+    #B4C5FF
+    #45464F
     #000000
 
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt
index f0543d3..68d8269 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.os.Build
 import com.androidvip.sysctlgui.data.Prefs
+import com.androidvip.sysctlgui.data.R
 import com.androidvip.sysctlgui.data.utils.RootUtils
 import com.androidvip.sysctlgui.domain.enums.CommitMode
 import com.androidvip.sysctlgui.domain.enums.SettingItemType
@@ -22,31 +23,35 @@ class AppSettingsRepositoryImpl(
     override suspend fun getAppSettings(): List> = withContext(ioContext) {
         val usingDynamicColors = sharedPreferences.getBoolean(Prefs.DynamicColors.key, false)
         val supportsDynamicColors = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+        val currentCommitMode = sharedPreferences.getString(
+            Prefs.CommitMode.key,
+            CommitMode.SYSCTL.name.lowercase()
+        ) ?: CommitMode.SYSCTL.name
 
         listOf(
             ///////////  GENERAL SETTINGS  ////////////
             AppSetting(
                 key = Prefs.ListFoldersFirst.key,
                 value = sharedPreferences.getBoolean(Prefs.ListFoldersFirst.key, true),
-                category = "General",
-                title = "List folders first",
-                description = "List folders first when using the kernel parameter browser option",
+                category = context.getString(R.string.prefs_category_general),
+                title = context.getString(R.string.prefs_list_folders_first_title),
+                description = context.getString(R.string.prefs_list_folders_first_description),
                 type = SettingItemType.Switch,
             ),
             AppSetting(
                 key = Prefs.GuessInputType.key,
                 value = sharedPreferences.getBoolean(Prefs.GuessInputType.key, true),
-                category = "General",
-                title = "Guess input type",
-                description = "Try to set the best input type for the keyboard based on the value of the parameter",
+                category = context.getString(R.string.prefs_category_general),
+                title = context.getString(R.string.prefs_guess_input_type_title),
+                description = context.getString(R.string.prefs_guess_input_type_description),
                 type = SettingItemType.Switch,
             ),
             AppSetting(
                 key = Prefs.UseOnlineDocs.key,
                 value = sharedPreferences.getBoolean(Prefs.UseOnlineDocs.key, true),
-                category = "General",
-                title = "Use online docs",
-                description = "Try to use online documentation when displaying parameter descriptions",
+                category = context.getString(R.string.prefs_category_general),
+                title = context.getString(R.string.prefs_online_docs_title),
+                description = context.getString(R.string.prefs_online_docs_description),
                 type = SettingItemType.Switch,
             ),
 
@@ -55,42 +60,42 @@ class AppSettingsRepositoryImpl(
             AppSetting(
                 key = Prefs.ForceDarkTheme.key,
                 value = sharedPreferences.getBoolean(Prefs.ForceDarkTheme.key, false),
-                category = "Theme",
-                title = "Force Dark",
-                description = "Force dark theme when available",
+                category = context.getString(R.string.prefs_category_theme),
+                title = context.getString(R.string.prefs_force_dark_title),
+                description = context.getString(R.string.prefs_force_dark_description),
                 type = SettingItemType.Switch,
             ),
             AppSetting(
                 key = Prefs.DynamicColors.key,
                 value = usingDynamicColors,
                 enabled = supportsDynamicColors,
-                category = "Theme",
-                title = "Dynamic Colors",
-                description = "Use dynamic colors when available",
+                category = context.getString(R.string.prefs_category_theme),
+                title = context.getString(R.string.prefs_dynamic_colors_title),
+                description = context.getString(R.string.prefs_dynamic_colors_description),
                 type = SettingItemType.Switch,
             ),
             AppSetting(
                 key = Prefs.ContrastLevel.key,
                 enabled = !usingDynamicColors,
                 value = sharedPreferences.getInt(Prefs.ContrastLevel.key, 1),
-                category = "Theme",
-                title = "Contrast level",
-                description = "Contrast level for the theme colors",
+                category = context.getString(R.string.prefs_category_theme),
+                title = context.getString(R.string.prefs_contrast_level_title),
+                description = context.getString(R.string.prefs_contrast_level_description),
                 type = SettingItemType.Slider,
-                values = listOf(1, 2, 3),
+                values = listOf(CONTRAST_LEVEL_NORMAL, CONTRAST_LEVEL_MEDIUM, CONTRAST_LEVEL_HEIGH),
             ),
 
             ///////////  COMMIT SETTINGS  ////////////
 
             AppSetting(
                 key = Prefs.CommitMode.key,
-                value = sharedPreferences.getString(
-                    Prefs.CommitMode.key,
-                    CommitMode.SYSCTL.name.lowercase()
-                ) ?: "sysctl",
-                category = "Operations",
-                title = "Commit mode",
-                description = "Command used when applying the parameter value",
+                value = currentCommitMode,
+                category = context.getString(R.string.prefs_category_operations),
+                title = context.getString(
+                    R.string.prefs_commit_mode_title_format,
+                    currentCommitMode
+                ),
+                description = context.getString(R.string.prefs_commit_mode_description),
                 type = SettingItemType.List,
                 values = listOf(
                     CommitMode.SYSCTL.name.lowercase(),
@@ -101,16 +106,16 @@ class AppSettingsRepositoryImpl(
                 key = Prefs.UseBusybox.key,
                 value = sharedPreferences.getBoolean(Prefs.UseBusybox.key, false),
                 enabled = rootUtils.isBusyboxAvailable(),
-                category = "Operations",
-                title = "Use busybox",
-                description = "Use busybox to execute commands",
+                category = context.getString(R.string.prefs_category_operations),
+                title = context.getString(R.string.prefs_use_busybox_title),
+                description = context.getString(R.string.prefs_use_busybox_description),
                 type = SettingItemType.Switch,
             ),
             AppSetting(
                 key = Prefs.ALLOW_BLANK.key,
                 value = sharedPreferences.getBoolean(Prefs.ALLOW_BLANK.key, false),
-                category = "Operations",
-                title = "Allow blank values",
+                category = context.getString(R.string.prefs_category_operations),
+                title = context.getString(R.string.prefs_allow_blank_values_title),
                 type = SettingItemType.Switch,
             ),
 
@@ -119,28 +124,32 @@ class AppSettingsRepositoryImpl(
             AppSetting(
                 key = Prefs.RunOnStartup.key,
                 value = sharedPreferences.getBoolean(Prefs.RunOnStartup.key, false),
-                category = "Startup",
-                title = "Run on startup",
-                description = "Allow the application to apply parameters on startup",
+                category = context.getString(R.string.prefs_category_startup),
+                title = context.getString(R.string.prefs_run_on_startup_title),
+                description = context.getString(R.string.prefs_run_on_startup_description),
                 type = SettingItemType.Switch,
             ),
             AppSetting(
                 key = Prefs.StartupDelay.key,
                 value = sharedPreferences.getInt(Prefs.StartupDelay.key, 0),
-                category = "Startup",
-                title = "Startup delay",
-                description = "Delay in seconds before applying parameters on startup",
+                category = context.getString(R.string.prefs_category_startup),
+                title = context.getString(R.string.prefs_startup_delay_title),
+                description = context.getString(R.string.prefs_startup_delay_description),
                 type = SettingItemType.Slider,
                 values = (0..10).toList(),
             ),
             AppSetting(
                 key = "",
                 value = Unit,
-                category = "Startup",
-                title = "Manage parameters",
-                description = "Manage the parameters that will be applied at startup",
+                category = context.getString(R.string.prefs_category_startup),
+                title = context.getString(R.string.prefs_manage_parameters_title),
+                description = context.getString(R.string.prefs_manage_parameters_description),
                 type = SettingItemType.Text,
             )
         )
     }
 }
+
+const val CONTRAST_LEVEL_NORMAL = 1
+const val CONTRAST_LEVEL_MEDIUM = 2
+const val CONTRAST_LEVEL_HEIGH = 3
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/DocumentationRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/DocumentationRepositoryImpl.kt
index b5f272b..ee6f3ea 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/DocumentationRepositoryImpl.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/DocumentationRepositoryImpl.kt
@@ -6,6 +6,7 @@ import com.androidvip.sysctlgui.domain.models.ParamDocumentation
 import com.androidvip.sysctlgui.domain.repository.AppPrefs
 import com.androidvip.sysctlgui.domain.repository.DocumentationRepository
 import kotlinx.coroutines.withTimeout
+import kotlinx.coroutines.withTimeoutOrNull
 
 /**
  * Repository for fetching documentation for kernel parameters.
@@ -26,9 +27,9 @@ class DocumentationRepositoryImpl(
         online: Boolean
     ): ParamDocumentation? {
         return if (online) {
-            withTimeout(REQUEST_TIMEOUT_MS) {
+            withTimeoutOrNull(REQUEST_TIMEOUT_MS) {
                 onlineDataSource.getDocumentation(param)
-            }
+            } ?: offlineDataSource.getDocumentation(param)
         } else {
             offlineDataSource.getDocumentation(param)
         }
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/source/OnlineDocumentationDataSource.kt b/data/src/main/java/com/androidvip/sysctlgui/data/source/OnlineDocumentationDataSource.kt
index 43f05fa..c160563 100644
--- a/data/src/main/java/com/androidvip/sysctlgui/data/source/OnlineDocumentationDataSource.kt
+++ b/data/src/main/java/com/androidvip/sysctlgui/data/source/OnlineDocumentationDataSource.kt
@@ -104,14 +104,17 @@ class OnlineDocumentationDataSource(
     private fun String.optimizedDocumentationHtml(): String {
         return this.trimIndent()
             .replace("
    ", "")
-            .replace("
    ", "") // For "code" blocks
-            .replace("", "")
-            .replace("", "") // For code tags
-            .replace("
  • ", "
  • ")
-            .replace("
    • ", "") // For spaced bullet points
-            .replace("
    ", "
    ") // For line breaks in paragraphs
-            .removeSuffix("
    ") // Remove the last line break
+            .replace("
    ", "") // For "code" blocks + .replace( + " + "", // Handles + "" + ) + .replace("", "") // Universal closer for the above + .removeSuffix("
    ") } companion object { diff --git a/data/src/main/res/values-pt-rBR/strings.xml b/data/src/main/res/values-pt-rBR/strings.xml new file mode 100644 index 0000000..1e00c7a --- /dev/null +++ b/data/src/main/res/values-pt-rBR/strings.xml @@ -0,0 +1,30 @@ + + + General + Listar pastas primeiro + Listar as pastas primeiro ao usar a opção do navegador de parâmetros do kernel + Tipo de entrada de palpite + Tentar definir o melhor tipo de entrada para o teclado virtual com base no valor do parâmetro + Usar documentação online + Tente usar documentação online ao exibir a descrições dos parâmetros + Tema + Forçar Modo Escuro + Forçar tema escuro quando disponível + Cores Dinâmicas + Usar cores dinâmicas quando disponíveis + Nível de contraste + Nível de contraste para as cores do tema + Operações + Modo de aplicação (%s) + Comando usado ao aplicar o valor do parâmetro + Usar busybox + Use o busybox para executar comandos, se disponível + Permitir valores em branco + Inicialização + Executar na inicialização + Permitir que o aplicativo aplique parâmetros na inicialização + Atraso na inicialização + Atraso em segundos antes de reaplicar os parâmetros na inicialização + Gerenciar parâmetros + Gerenciar os parâmetros que serão aplicados na inicialização + \ No newline at end of file diff --git a/data/src/main/res/values/strings.xml b/data/src/main/res/values/strings.xml new file mode 100644 index 0000000..1d0666e --- /dev/null +++ b/data/src/main/res/values/strings.xml @@ -0,0 +1,30 @@ + + + General + List folders first + List folders first when using the kernel parameter browser option + Guess input type + Try to set the best input type for the soft keyboard based on the value of the parameter + Use online documentation + Try to use online documentation when displaying parameter descriptions + Theme + Force Dark + Force dark theme when available + Dynamic Colors + Use dynamic colors when available + Contrast level + Contrast level for the theme colors + Operations + Commit mode (%s) + Command used when applying the parameter value + Use busybox + Use busybox to execute commands, if available + Allow blank values + Startup + Run on startup + Allow the application to apply parameters on startup + Startup delay + Delay in seconds before applying parameters on startup + Manage parameters + Manage the parameters that will be applied at startup + diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/ParamsRepository.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/ParamsRepository.kt index 79849aa..062e1fc 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/ParamsRepository.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/ParamsRepository.kt @@ -1,7 +1,7 @@ package com.androidvip.sysctlgui.domain.repository -import com.androidvip.sysctlgui.domain.models.KernelParam import com.androidvip.sysctlgui.domain.enums.CommitMode +import com.androidvip.sysctlgui.domain.models.KernelParam import kotlinx.coroutines.flow.Flow import java.io.File @@ -62,8 +62,4 @@ interface ParamsRepository { * @return A list of [KernelParam] objects found in the given path. */ fun getParamsFromPath(path: String): Flow> - - companion object { - const val DEFAULT_ERROR_MESSAGE = "error" - } } From abaa51a096b48a4ce51b067836d197fae02d7ddf Mon Sep 17 00:00:00 2001 From: Lennoard Date: Sun, 17 Aug 2025 11:44:18 -0300 Subject: [PATCH 13/18] bugfix: react to changed theme settings --- .../sysctlgui/ui/main/MainActivity.kt | 47 ++++++++++++------- .../sysctlgui/ui/main/MainViewModel.kt | 34 +++++++++++++- .../sysctlgui/ui/main/MainViewState.kt | 7 +++ .../sysctlgui/ui/settings/SettingsScreen.kt | 1 - .../ui/settings/SettingsViewModel.kt | 14 ++++-- .../components/TextSettingComponent.kt | 42 ++++++++--------- .../sysctlgui/design/theme/Theme.kt | 6 ++- .../sysctlgui/data/repository/AppPrefsImpl.kt | 17 +++++++ .../sysctlgui/domain/repository/AppPrefs.kt | 3 ++ 9 files changed, 126 insertions(+), 45 deletions(-) diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt index 9253425..01a668d 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt @@ -1,6 +1,7 @@ package com.androidvip.sysctlgui.ui.main import android.app.NotificationManager +import android.content.res.Configuration import android.graphics.Color import android.os.Build import android.os.Bundle @@ -11,7 +12,10 @@ import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue import androidx.core.os.postDelayed +import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.androidvip.sysctlgui.core.navigation.UiRoute import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme import com.androidvip.sysctlgui.domain.enums.Actions @@ -20,31 +24,26 @@ import org.koin.android.ext.android.inject class MainActivity : ComponentActivity() { private val prefs: AppPrefs by inject() + private val mainViewModel: MainViewModel by inject() private val notificationPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { _ -> } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - enableEdgeToEdge( - statusBarStyle = SystemBarStyle.auto( - lightScrim = Color.TRANSPARENT, - darkScrim = Color.TRANSPARENT, - detectDarkMode = { resources -> - prefs.forceDark || - resources.configuration.uiMode and - android.content.res.Configuration.UI_MODE_NIGHT_MASK == - android.content.res.Configuration.UI_MODE_NIGHT_YES - } - ) - ) + updateEdgeToEdgeConfiguration(prefs.forceDark) setContent { - // TODO: Make the switch dynamic with the view model - // TODO: Translations + val themeState by mainViewModel.themeState.collectAsStateWithLifecycle() + val forceDark = themeState.forceDark + + LaunchedEffect(forceDark) { + updateEdgeToEdgeConfiguration(forceDark) + } + SysctlGuiTheme( - darkTheme = prefs.forceDark || isSystemInDarkTheme(), - contrastLevel = prefs.contrastLevel, - dynamicColor = prefs.dynamicColors + darkTheme = forceDark || isSystemInDarkTheme(), + contrastLevel = themeState.contrastLevel, + dynamicColor = themeState.dynamicColors ) { MainScreen(startDestination = getRouteFromIntent()) } @@ -55,6 +54,20 @@ class MainActivity : ComponentActivity() { } } + private fun updateEdgeToEdgeConfiguration(forceDark: Boolean) { + enableEdgeToEdge( + statusBarStyle = SystemBarStyle.auto( + lightScrim = Color.TRANSPARENT, + darkScrim = Color.TRANSPARENT, + detectDarkMode = { resources -> + val isSystemDark = resources.configuration.uiMode and + Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES + forceDark || isSystemDark + } + ) + ) + } + private fun getRouteFromIntent(): UiRoute { val extraDestination = intent.getStringExtra(EXTRA_DESTINATION) ?: return UiRoute.BrowseParams diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewModel.kt index cccd608..81950f6 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewModel.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewModel.kt @@ -1,9 +1,39 @@ package com.androidvip.sysctlgui.ui.main import androidx.compose.material3.SnackbarResult +import androidx.lifecycle.viewModelScope +import com.androidvip.sysctlgui.data.Prefs +import com.androidvip.sysctlgui.data.repository.CONTRAST_LEVEL_NORMAL +import com.androidvip.sysctlgui.domain.repository.AppPrefs import com.androidvip.sysctlgui.utils.BaseViewModel +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.stateIn -class MainViewModel : BaseViewModel() { +class MainViewModel( + private val appPrefs: AppPrefs +) : BaseViewModel() { + private val themeSettingsFlow: Flow = combine( + appPrefs.observeKey(Prefs.ForceDarkTheme.key, false), + appPrefs.observeKey(Prefs.DynamicColors.key, false), + appPrefs.observeKey(Prefs.ContrastLevel.key, CONTRAST_LEVEL_NORMAL) + ) { forceDark, dynamicColors, contrastLevel -> + ThemeSettings(forceDark, dynamicColors, contrastLevel) + } + val themeState = themeSettingsFlow.stateIn( + scope = viewModelScope, + started = SharingStarted.WhileSubscribed(5000), + initialValue = loadInitialThemeState() + ) + + private fun loadInitialThemeState(): ThemeSettings { + return ThemeSettings( + forceDark = appPrefs.forceDark, + contrastLevel = appPrefs.contrastLevel, + dynamicColors = appPrefs.dynamicColors + ) + } override fun createInitialState() = MainViewState() @@ -12,9 +42,11 @@ class MainViewModel : BaseViewModel { setState { event.newState } } + is MainViewEvent.ShowSnackbarRequested -> { setEffect { MainViewEffect.ShowSnackbar(event.message, event.actionLabel) } } + is MainViewEvent.OnSnackbarResult -> { val snackbarResult = event.result if (snackbarResult == SnackbarResult.ActionPerformed) { diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewState.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewState.kt index da18a59..5c634e7 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewState.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewState.kt @@ -1,6 +1,7 @@ package com.androidvip.sysctlgui.ui.main import androidx.compose.material3.SnackbarResult +import com.androidvip.sysctlgui.data.repository.CONTRAST_LEVEL_NORMAL data class MainViewState( val topBarTitle: String = "SysctlGUI", @@ -10,6 +11,12 @@ data class MainViewState( val showSearchAction: Boolean = true ) +data class ThemeSettings( + val forceDark: Boolean = false, + val dynamicColors: Boolean = false, + val contrastLevel: Int = CONTRAST_LEVEL_NORMAL +) + sealed interface MainViewEffect { data class ShowSnackbar(val message: String, val actionLabel: String? = null) : MainViewEffect data object ActUponSckbarActionPerformed : MainViewEffect diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt index 3a26724..792d189 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt @@ -70,7 +70,6 @@ internal fun SettingsScreen( } ) - LaunchedEffect(Unit) { mainViewModel.onEvent( MainViewEvent.OnSateChangeRequested( diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsViewModel.kt index 0828835..0968098 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsViewModel.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsViewModel.kt @@ -19,8 +19,7 @@ class SettingsViewModel( init { viewModelScope.launch { - val settings = getSettings() - setState { copy(settings = settings) } + loadSettings() } } @@ -62,7 +61,16 @@ class SettingsViewModel( if (event.appSetting.key == Prefs.RunOnStartup.key) { setEffect { SettingsViewEffect.RequestNotificationPermission } } + + viewModelScope.launch { + loadSettings() + } } } } -} \ No newline at end of file + + private suspend fun loadSettings() { + val settings = getSettings() + setState { copy(settings = settings) } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/TextSettingComponent.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/TextSettingComponent.kt index f8b1071..328dbeb 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/TextSettingComponent.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/TextSettingComponent.kt @@ -21,6 +21,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.PreviewLightDark +import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme import com.androidvip.sysctlgui.domain.enums.SettingItemType @@ -46,7 +47,6 @@ fun TextSettingComponent( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(space = 16.dp) ) { - Box( modifier = Modifier .align(Alignment.CenterVertically) @@ -62,27 +62,27 @@ fun TextSettingComponent( modifier = Modifier.fillMaxWidth() ) } - } - - DropdownMenu( - expanded = expanded, - onDismissRequest = { expanded = false } - ) { - appSetting.values?.forEach { item -> - DropdownMenuItem( - text = { - Text( - text = item as String, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurface - ) - }, - onClick = { - onValueChange(item as String) - expanded = false - } - ) + DropdownMenu( + expanded = expanded, + offset = DpOffset(16.dp, (-32).dp), + onDismissRequest = { expanded = false } + ) { + appSetting.values?.forEach { item -> + DropdownMenuItem( + text = { + Text( + text = item as String, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface + ) + }, + onClick = { + onValueChange(item as String) + expanded = false + } + ) + } } } } diff --git a/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Theme.kt b/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Theme.kt index 69a1120..4268a32 100644 --- a/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Theme.kt +++ b/common/design/src/main/java/com/androidvip/sysctlgui/design/theme/Theme.kt @@ -2,7 +2,8 @@ package com.androidvip.sysctlgui.design.theme import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.MaterialExpressiveTheme import androidx.compose.material3.darkColorScheme import androidx.compose.material3.dynamicDarkColorScheme import androidx.compose.material3.dynamicLightColorScheme @@ -238,6 +239,7 @@ private val highContrastDarkColorScheme = darkColorScheme( surfaceContainerHighest = surfaceContainerHighestDarkHighContrast, ) +@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun SysctlGuiTheme( darkTheme: Boolean = isSystemInDarkTheme(), @@ -264,7 +266,7 @@ fun SysctlGuiTheme( } } - MaterialTheme( + MaterialExpressiveTheme( colorScheme = colorScheme, typography = Typography, content = content diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppPrefsImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppPrefsImpl.kt index 4528454..1ef8f3f 100644 --- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppPrefsImpl.kt +++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppPrefsImpl.kt @@ -4,11 +4,26 @@ import android.content.SharedPreferences import androidx.core.content.edit import com.androidvip.sysctlgui.data.Prefs import com.androidvip.sysctlgui.domain.repository.AppPrefs +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.callbackFlow /** * Implementation of [AppPrefs] that uses [SharedPreferences] to store and retrieve app preferences. */ class AppPrefsImpl(private val prefs: SharedPreferences) : AppPrefs { + @Suppress("UNCHECKED_CAST") + override fun observeKey(key: String, default: T): Flow = callbackFlow { + val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, updatedKey -> + if (updatedKey == key) { + trySend(prefs.all[key] as T ?: default) + } + } + prefs.registerOnSharedPreferenceChangeListener(listener) + trySend(prefs.all[key] as T ?: default) + awaitClose { prefs.unregisterOnSharedPreferenceChangeListener(listener) } + } + override var listFoldersFirst: Boolean get() = prefs.getBoolean(Prefs.ListFoldersFirst.key, true) set(value) { @@ -88,4 +103,6 @@ class AppPrefsImpl(private val prefs: SharedPreferences) : AppPrefs { currentHistory.remove(query) prefs.edit { putStringSet(Prefs.SearchHistory.key, currentHistory) } } + + } diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/AppPrefs.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/AppPrefs.kt index 251b8cc..16f7f7d 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/AppPrefs.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/AppPrefs.kt @@ -1,5 +1,7 @@ package com.androidvip.sysctlgui.domain.repository +import kotlinx.coroutines.flow.Flow + /** * Interface for accessing and modifying application preferences. * @@ -7,6 +9,7 @@ package com.androidvip.sysctlgui.domain.repository * allowing various parts of the app to read and write preference values. */ interface AppPrefs { + fun observeKey(key: String, default: T): Flow var listFoldersFirst: Boolean var guessInputType: Boolean var commitMode: String From d7bb631e20b4dbdf006250f6026f25e08e8566b6 Mon Sep 17 00:00:00 2001 From: Lennoard Date: Sun, 17 Aug 2025 15:25:07 -0300 Subject: [PATCH 14/18] bugfix: removed unused resources --- app/build.gradle.kts | 4 +- .../sysctlgui/ui/main/MainActivity.kt | 1 + .../sysctlgui/ui/search/SearchScreen.kt | 2 +- .../sysctlgui/ui/user/UserParamsScreen.kt | 4 +- .../widgets/FavoritesGlanceWidget.kt | 6 +- .../main/res/drawable/ic_backup_params.xml | 9 -- .../main/res/drawable/ic_export_params.xml | 9 -- .../res/drawable/ic_favorite_selected.xml | 9 -- .../res/drawable/ic_favorite_unselected.xml | 9 -- .../res/drawable/ic_file_import_outline.xml | 8 -- .../main/res/drawable/ic_import_params.xml | 9 -- .../main/res/drawable/ic_restore_params.xml | 9 -- .../list_item_kernel_param_widget_list.xml | 29 ------- app/src/main/res/values-de/arrays.xml | 6 -- app/src/main/res/values-de/strings.xml | 66 --------------- app/src/main/res/values-land/bools.xml | 4 - app/src/main/res/values-land/dimens.xml | 4 - app/src/main/res/values-pt-rBR/arrays.xml | 6 -- app/src/main/res/values-pt-rBR/strings.xml | 70 +--------------- .../main/res/values-sw600dp-land/bools.xml | 4 - .../main/res/values-sw600dp-land/dimens.xml | 4 - app/src/main/res/values-sw600dp/bools.xml | 4 - app/src/main/res/values-sw600dp/dimens.xml | 4 - app/src/main/res/values-tr/strings.xml | 66 --------------- app/src/main/res/values/arrays.xml | 10 --- app/src/main/res/values/attrs.xml | 7 -- app/src/main/res/values/bools.xml | 4 - app/src/main/res/values/dimens.xml | 10 --- app/src/main/res/values/strings.xml | 70 +--------------- common/design/src/main/res/values/colors.xml | 82 +------------------ data/src/main/res/values-pt-rBR/strings.xml | 6 +- 31 files changed, 21 insertions(+), 514 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_backup_params.xml delete mode 100644 app/src/main/res/drawable/ic_export_params.xml delete mode 100644 app/src/main/res/drawable/ic_favorite_selected.xml delete mode 100644 app/src/main/res/drawable/ic_favorite_unselected.xml delete mode 100644 app/src/main/res/drawable/ic_file_import_outline.xml delete mode 100644 app/src/main/res/drawable/ic_import_params.xml delete mode 100644 app/src/main/res/drawable/ic_restore_params.xml delete mode 100644 app/src/main/res/layout/list_item_kernel_param_widget_list.xml delete mode 100644 app/src/main/res/values-de/arrays.xml delete mode 100644 app/src/main/res/values-land/bools.xml delete mode 100644 app/src/main/res/values-land/dimens.xml delete mode 100644 app/src/main/res/values-pt-rBR/arrays.xml delete mode 100644 app/src/main/res/values-sw600dp-land/bools.xml delete mode 100644 app/src/main/res/values-sw600dp-land/dimens.xml delete mode 100644 app/src/main/res/values-sw600dp/bools.xml delete mode 100644 app/src/main/res/values-sw600dp/dimens.xml delete mode 100644 app/src/main/res/values/attrs.xml delete mode 100644 app/src/main/res/values/bools.xml delete mode 100644 app/src/main/res/values/dimens.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cbf9b2a..2e4c304 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -20,7 +20,9 @@ android { versionCode = 16 versionName = "2.2.2" vectorDrawables.useSupportLibrary = true - resourceConfigurations.addAll(listOf("en", "de", "pt-rBR")) + androidResources { + localeFilters += listOf("en", "de", "pt-rBR", "tr") + } javaCompileOptions { annotationProcessorOptions { arguments += mapOf( diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt index 01a668d..08cc9cd 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt @@ -40,6 +40,7 @@ class MainActivity : ComponentActivity() { updateEdgeToEdgeConfiguration(forceDark) } + // TODO: Landscape Support SysctlGuiTheme( darkTheme = forceDark || isSystemInDarkTheme(), contrastLevel = themeState.contrastLevel, diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt index 71b6bad..d376049 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt @@ -318,7 +318,7 @@ private fun SearchViewContent( if (suggestionHints.isNotEmpty()) { item { Text( - text = "Suggestions", + text = stringResource(R.string.suggestions), style = MaterialTheme.typography.titleSmall, color = MaterialTheme.colorScheme.primary, fontWeight = FontWeight.Bold, diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt index 8043c5d..e32aa7c 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt @@ -34,6 +34,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -144,9 +145,8 @@ private fun FavoritesScreenContent( tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(128.dp) ) - // TODO: Empty state image Text( - text = "No favorites added", + text = stringResource(R.string.empty_favorites_widget), style = MaterialTheme.typography.titleLarge, color = MaterialTheme.colorScheme.onBackground, textAlign = TextAlign.Center, diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidget.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidget.kt index 0ff68df..f4ea51e 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidget.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/widgets/FavoritesGlanceWidget.kt @@ -2,6 +2,7 @@ package com.androidvip.sysctlgui.widgets import android.content.Context import androidx.compose.runtime.Composable +import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.glance.GlanceId @@ -25,6 +26,7 @@ import androidx.glance.text.FontWeight import androidx.glance.text.Text import androidx.glance.text.TextStyle import androidx.glance.unit.ColorProvider +import com.androidvip.sysctlgui.R import com.androidvip.sysctlgui.design.theme.onPrimaryContainerLight import com.androidvip.sysctlgui.design.theme.primaryContainerLight import com.androidvip.sysctlgui.design.theme.primaryLight @@ -54,7 +56,7 @@ class FavoritesGlanceWidget : GlanceAppWidget(), KoinComponent { horizontalAlignment = Alignment.Horizontal.Start ) { Text( - text = "Favorite Kernel Params", + text = stringResource(R.string.favorite_widget_title), style = TextStyle( fontWeight = FontWeight.Bold, fontSize = 16.sp, @@ -65,7 +67,7 @@ class FavoritesGlanceWidget : GlanceAppWidget(), KoinComponent { Spacer(GlanceModifier.height(8.dp)) if (params.isEmpty()) { - Text("No favorite parameters yet.") + Text(stringResource(R.string.empty_favorites_widget)) } else { LazyColumn { items(params) { param -> diff --git a/app/src/main/res/drawable/ic_backup_params.xml b/app/src/main/res/drawable/ic_backup_params.xml deleted file mode 100644 index b6e306a..0000000 --- a/app/src/main/res/drawable/ic_backup_params.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_export_params.xml b/app/src/main/res/drawable/ic_export_params.xml deleted file mode 100644 index 4556bb7..0000000 --- a/app/src/main/res/drawable/ic_export_params.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_favorite_selected.xml b/app/src/main/res/drawable/ic_favorite_selected.xml deleted file mode 100644 index 7c78dca..0000000 --- a/app/src/main/res/drawable/ic_favorite_selected.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_favorite_unselected.xml b/app/src/main/res/drawable/ic_favorite_unselected.xml deleted file mode 100644 index beb8d66..0000000 --- a/app/src/main/res/drawable/ic_favorite_unselected.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_file_import_outline.xml b/app/src/main/res/drawable/ic_file_import_outline.xml deleted file mode 100644 index a03b753..0000000 --- a/app/src/main/res/drawable/ic_file_import_outline.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_import_params.xml b/app/src/main/res/drawable/ic_import_params.xml deleted file mode 100644 index fbc9092..0000000 --- a/app/src/main/res/drawable/ic_import_params.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_restore_params.xml b/app/src/main/res/drawable/ic_restore_params.xml deleted file mode 100644 index 20c7b56..0000000 --- a/app/src/main/res/drawable/ic_restore_params.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/list_item_kernel_param_widget_list.xml b/app/src/main/res/layout/list_item_kernel_param_widget_list.xml deleted file mode 100644 index b02125f..0000000 --- a/app/src/main/res/layout/list_item_kernel_param_widget_list.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/values-de/arrays.xml b/app/src/main/res/values-de/arrays.xml deleted file mode 100644 index 2749019..0000000 --- a/app/src/main/res/values-de/arrays.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - sysctl -w verwenden - echo \'value\' > /proc/sys/… verwenden - - \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index fb984c8..f28c3e7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2,74 +2,28 @@ Überprüfe Rootstatus Überprüfe busybox - Prüfe auf ein altes Datenbankschema - Führe Datenbankmigration aus Fehler Einstellungen Über - Variabeln anzeigen - Kernel-Parameter in einer Liste anzeigen und verändern - Sysctl Operationen - Werte werden aus der Datei gelesen - Verwenden sie diese Option um aus einer .conf oder .json Datei die Parameter zu verwenden - Favoriten anzeigen - Erreichen sie ihre favorisierten Kernel-Parameter mit dieser Liste Beenden Kernel Parameter Variabeln durchstöbern In /proc/sys nach einem bestimmten Kernel-Parameter stöbern. Parameter verändern - Oh nein! Ein Fehler ist aufgetretten. - Überprüfen sie ihre Eingaben - Fehlgeschlagen - Ungültiger Pfad - Sysctl - Mit Sysctl können Kernel-Parameter zur Laufzeit geändert werden. Die verfügbaren Parameter verden aus /proc/sys bestimmt. - Mit dieser App soll eine graphische Möglichkeit geschaffen werden diese Parameter zu ändern. Der Quellcode ist einsehbar auf     GitHub. Support finden sie im XDA Thread.     - Ordner zuerst anzeigen - Beim Durchstöbern der Kernel-Parameter werden Ordner zuerst angezeigt - Anwendung - Operationen - Leerstehende Werte zulassen - Übernahmemodus - Eingabetyp erraten Fertig - Zur Gewährleistung von Kompatibilität wird Busybox verwendet - Busybox verwenden - Zurzeit wird sysctl verwendet - Anhand des Parameterwertes wird versucht den Eingabetyp der Tastatur zu setzten Rootzugriff verweigert. Werte können nur mit Rootzugriff geändert werden. - Information Keine Informationen für den Parameter verfügbar Suche - Systemstart - Beim Systemstart die Parameter übernehmen wende Parameter an Ihre Parameter werden angewendet Wende in %d Sekunden an… Startbenachrichtigung Ihre Parameter werden angewendet - Parameter verwalten - Verwalte Parameter die beim Systemstart angewandt werden - Exportiere Parameter - Exportiert die beim Start angewandeten Parameter - Keine Parameter gefunden - Parameter wiederherstellen - Stellt die Parameter von einem vorherigen Backup wieder her Importieren von Parametern ist fehlgeschlagen - Ungültige oder falsch formatierte JSON-Datei - Datei konnte nicht geöffnet werden: ungültiger Dateityp. Import ist nicht möglich: die Datei ist leer. Import ist nicht möglich: die Datei enthält einen Formatierungsfehler. - %d Parameter angewendet - Dokumentation öffnen Bearbeiten Löschen - Startup Verzögerung - Die Ausführung wird auf %d Sekunden verzögert - Ausführung findet sofort statt - Als Favorit auswählen - Aus Favoriten entfernen keine Favoriten ausgewählt Tasker Liste Primäre Liste @@ -80,43 +34,23 @@ Beim Systemstart angewendete Liste SysctlGUI: Tasker Profil #%d angewendet Wähle Tasker Liste aus - Lösche von Tasker Liste #%d - #%d wurde zur Tasker Liste hinzugefügt Wähle eine Liste aus die mit Tasker verwendet werden soll Wenn Tasker dieses Plugin ausführt, werden alle Parameter dieser Liste mit ihren Werten angewendet. Tasker Einstellungen - Zu Tasker hinzufügen - Aus Tasker entfernen - Es ist ein Fehler beim Anwenden der Parameter: %s aufgetreten Rückgängig Sysctl GUI starten Sysctl GUI beim Systemstart ausführen Kein Rootzugriff Rootzugriff wird benötigt - Parameter importieren - Parameter Backup - Erstellt ein Backup von allen Laufzeit Parametern. Nicht alle können bei der Wiederhestellung angewendet werden. - Parameter konnten nicht exportiert werden Aufgrund eines IO Fehlers ist der Export der Parameter fehlgeschlagen Exportieren der Parmameter ist fehlgeschlagen: keine Parameter gefunden Export Optionen - Parameter wurden erfolgreich exportiert Kernel Parameter importieren, exportieren oder ein Backup erstellen - Bitte warten, dies kann eine Weile dauern… Browse Export - Param list Try again Anwenden Wiederhestellen Parameter Wert - Zuletzt angewendeter Wert - Aktueller Wert - Der ausgewählte Wert konnte nicht angewendet werden - Der ausgewählte Wert konnte nicht angewendet werden. Versuche \"echo\" Modus. - Dynamische Farben - Dynamische Farben (Monet Theme) verwenden wenn möglich - Dark Theme erzwingen - Dark Theme erzwingen wenn möglich diff --git a/app/src/main/res/values-land/bools.xml b/app/src/main/res/values-land/bools.xml deleted file mode 100644 index 65b37a3..0000000 --- a/app/src/main/res/values-land/bools.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - true - \ No newline at end of file diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml deleted file mode 100644 index c946c4a..0000000 --- a/app/src/main/res/values-land/dimens.xml +++ /dev/null @@ -1,4 +0,0 @@ - - 120dp - @dimen/d32 - diff --git a/app/src/main/res/values-pt-rBR/arrays.xml b/app/src/main/res/values-pt-rBR/arrays.xml deleted file mode 100644 index 2721cdd..0000000 --- a/app/src/main/res/values-pt-rBR/arrays.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Usar sysctl -w - Usar echo \'valor\' > /proc/sys/… - - \ No newline at end of file diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 0901803..41b8666 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,77 +1,33 @@ Sobre - Permitir valores em branco - Aplicativo Procurar variáveis Procure em /proc/sys um parâmetro específico do kernel - Modo de aplicação Pronto Editar parâmetros - Por favor, verifique os campos de entrada Erro Sair - Falhou - Adivinhar tipo de entrada - Caminho inválido Parâmetros do kernel - Listar pastas primeiro - Listar pastas primeiro ao usar a opção de navegador de parâmetros do kernel - Operações - Ler valores do arquivo - Use esta opção para carregar parâmetros de um arquivo .conf ou .json selecionado Configurações - Mostrar variáveis - Exibir e editar todos os parâmetros do kernel em uma lista Verificando o busybox Verificando acesso root - Sysctl - Sysctl é usado para modificar os parâmetros do kernel no tempo de execução. Os parâmetros disponíveis são aqueles listados em /proc/sys. - Operações Sysctl - Algo de errado não está certo - Usar busybox - Busybox será usado para garantir a compatibilidade - O objetivo principal deste aplicativo é fornecer uma maneira gráfica de editar esses parâmetros. Você pode encontrar o código fonte no GitHub. Suporte no XDA Thread. - Atualmente confiando no binário sysctl do sistema - Tentar definir o melhor tipo de entrada para o teclado com base no valor do parâmetro Acesso root não encontrado. Você só pode editar parâmetros com acesso root. - Informação Nenhuma documentação disponível para este parâmetro Pesquisar Aplicando seus parâmetros Notificação de inicialização Aplicando seus parâmetros Aplicando parâmetros - Inicialização - Permitir a reaplicação de parâmetros na inicialização - Gerenciar parâmetros - Gerenciar os parâmetros que serão aplicados na inicialização - Nenhum parâmetro encontrado - Exportar parâmetros - Exportar os parâmetros que você alterou usando este aplicativo para um arquivo JSON - Não foi possível abrir o arquivo: tipo de arquivo inválido. Não foi possível importar os parâmetros: existem erros de formatação no arquivo. Não foi possível importar os parâmetros: o arquivo está vazio. - Restaurar parâmetros - Arquivo JSON inválido ou mal formado Falha ao importar parâmetros - %d parâmetro(s) aplicados - Abrir documentação Remover Editar - Atraso de inicialização - A execução será atrasada em %d segundos - A execução não será atrasada Aplicando em %d segundos… - Mostrar favoritos - Acesse os seus parâmetros favoritos a partir desta lista - Definir como favorito - nenhum favorito selecionado + Nenhum favorito adicionado Lista do Tasker SysctlGUI: Perfil Tasker #%d aplicado Selecione a lista do Tasker - Removido da lista do Tasker #%d - Adicionado à lista do Tasker #%d Selecione uma lista para ser usada com o Tasker Uma vez acionado pelo Tasker, o plugin reaplicará imediatamente todos os parâmetros da lista selecionada com seus respectivos valores. Configurações do Tasker @@ -81,44 +37,22 @@ Lista secundária do Tasker Lista de favoritos Lista de aplicar na inicialização - Adicionar ao Tasker - Falha ao aplicar: %s Desfazer - Migrando banco de dados - Verificando esquema de banco de dados antigo Acesso root necessário Requer acesso root Executar o SysctlGUI na inicialização Iniciar o SysctlGUI - Fazer backup dos parâmetros - Fazer backup de todos os parêmetros em runtime atuais. Por favor, note que nem todos os parâmetros podem ser reaplicados novamente, uma vez restaurados. - Importar parâmetros - Restaurar a sua cópia de segurança anterior Opções de exportação - Parâmetros exportados com sucesso Falha: nenhum parâmetro encontrado A exportação de parâmetros falhou devido a um erro do armazenamento - Falha ao exportar parâmetros Importar, exportar ou fazer backup dos parâmetros do kernel - Por favor aguarde, isto pode demorar algum tempo… Nevegar Exportar - Lista de parâmetros Tentar novamente Aplicar Restaurar Parâmetro Valor - Valor aplicado - Valor atual - Remover do Tasker - Remover dos favoritos - O valor selecionado não pôde ser aplicado - O valor selecionado não pôde ser aplicado. Tente usar o modo \"echo\". - Cores dinâmicas - Usar cores dinâmicas (Tema Monet) quando disponível - Forçar tema escuro - Forçar o uso do tema escuro quando disponível Favoritos Predefinições A criação do arquivo foi cancelada ou falhou @@ -166,4 +100,6 @@ Valores em branco não são permitidos atualmente O valor se recusou a aplicar com o modo de aplicação atual Falha na execução do comando + Sugestões + Parâmetros favoritos \ No newline at end of file diff --git a/app/src/main/res/values-sw600dp-land/bools.xml b/app/src/main/res/values-sw600dp-land/bools.xml deleted file mode 100644 index 65b37a3..0000000 --- a/app/src/main/res/values-sw600dp-land/bools.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - true - \ No newline at end of file diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml deleted file mode 100644 index 9c117c3..0000000 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 72dp - \ No newline at end of file diff --git a/app/src/main/res/values-sw600dp/bools.xml b/app/src/main/res/values-sw600dp/bools.xml deleted file mode 100644 index 2d2cf03..0000000 --- a/app/src/main/res/values-sw600dp/bools.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - false - \ No newline at end of file diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml deleted file mode 100644 index 513920d..0000000 --- a/app/src/main/res/values-sw600dp/dimens.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - @dimen/d32 - \ No newline at end of file diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 02d9158..94fc7d3 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1,74 +1,28 @@ Kök erişimi denetleniyor Busybox kontrol ediliyor - Eski veritabanı şeması kontrol ediliyor - Veritabanı taşıma gerçekleştiriliyor Hata Ayarlar Hakkında - Değişkenleri göster - Tüm çekirdek parametrelerini bir listede görüntüleme ve düzenleme - Sysctl işlemleri - Dosyadan değerleri oku - Seçilen bir .conf veya .json dosyasından parametre yüklemek için bu seçeneği kullanın - Favorileri göster - Bu listeden en sevdiğiniz çekirdek parametrelerine erişin Çıkış Çekirdek parametreleri Değişkenlere göz at Belirli bir çekirdek parametresi için /proc/sys üzerine göz atın Parametreleri düzenle - Yanlış olan bir şey doğru değil - Lütfen giriş alanlarını kontrol edin - Başarısız - Geçersiz yol - Sysctl - Sysctl, çalışma zamanında çekirdek parametrelerini değiştirmek için kullanılır. Mevcut parametreler/proc/sys altında listelenen parametrelerdir. - Bu uygulamanın temel amacı, bu parametreleri düzenlemek için grafiksel bir yol sağlamaktır. Kaynak kodunu şurada bulabilirsiniz: GitHub.DestekXDA Başlığı. - Önce klasörleri listele - Çekirdek parametresi tarayıcı seçeneğini kullanırken önce klasörleri listeleyin - Uygulama - Seçenekler - Boş değerlere izin ver - Gönderim modu - Tahmin giriş türü Bitti - Uyumluluğu sağlamak için Busybox kullanılacaktır - Busybox kutusunu kullan - Şu anda sistemin sysctl ikilisine güveniliyor - Parametrenin değerine göre klavye için en iyi giriş türünü ayarlamaya çalışın Kök erişimi bulunamadı. Yalnızca kök erişimi olan özellikleri düzenleyebilirsiniz. - Bilgi Bu parametre için bilgi yok Ara - Başlatma - Başlangıçta parametrelerin uygulanmasına izin ver Parametreler uygulanıyor Parametreleriniz uygulanıyor %d saniye içinde uygulanıyor… Başlatma Bildirimi Parametreleriniz uygulanıyor - Parametreleri yönet - Başlangıçta uygulanacak parametreleri yönetin - Parametreleri dışa aktar - Bu uygulamayı kullanarak değiştirdiğiniz parametreleri bir JSON dosyasına aktarın - Parametre bulunamadı - Parametreleri geri yükle - Önceki parametre yedeklemenizi geri yükleyin Parametreler içe aktarılamadı - Geçersiz veya hatalı biçimlendirilmiş JSON dosyası - Dosya açılamıyor: geçersiz dosya türü. Parametreler içe aktarılamıyor: boş dosya. Parametreler içe aktarılamıyor: dosyada bir biçimlendirme hatası var. - %d parametre uygulandı - Belgeyi aç Düzenle Kaldır - Başlatma gecikmesi - Yürütme %d saniye gecikecek - Yürütme gecikmeyecek - Favori olarak ayarla - Favorilerden kaldır favori seçilmedi Görevli listesi Birincil liste @@ -79,43 +33,23 @@ Önyükleme listesine uygula SysctlGUI: Görev profili #%d uygulandı Bir Görevli listesi seçin - Görevli listesinden kaldırıldı #%d - Görevli listesine #%d eklendi Görevli ile kullanılacak bir liste seçin Görevli tarafından tetiklendikten sonra, eklenti seçilen listedeki tüm parametreleri ilgili değerleriyle birlikte hemen yeniden uygulayacaktır. Görevli ayarları - Görevliye ekle - Görevliden kaldır - Parametreler uygulanamadı: %s Geri al Sysctl GUI\'yi başlat Önyüklemede Sysctl GUI\'yi çalıştır Kök erişimi gerektirir Kök erişimi gerekli - Parametreleri içe aktar - Parametreleri yedekle - Mevcut tüm çalışma zamanı parametrelerini yedekleyin. Bunların tamamının geri yüklendikten sonra tekrar uygulanamayacağını lütfen unutmayın. - Parametreler dışa aktarılamadı GÇ hatası nedeniyle parametre dışa aktarımı başarısız oldu Parametre dışa aktarılamadı: dışa aktarılacak parametre yok Dışa aktarma seçenekleri - Parametreler başarıyla dışa aktarıldı Çekirdek parametrelerini içe aktarın, dışa aktarın veya yedekleyin - Lütfen bekleyin, bu biraz zaman alabilir… Göz at Dışa Aktar - Parametre listesi Tekrar deneyin Uygula Geri Yükle Parametre Değer - Son uygulanan değer - Mevcut değer - Seçilen değer uygulanamadı - Seçilen değer uygulanamadı. \"echo\" modunu kullanmayı deneyin. - Dinamik renkler - Mevcut olduğunda dinamik renkler (Monet teması) kullanın - Karanlık temayı zorla - Mevcut olduğunda koyu temayı zorla \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index fcc996f..e0df010 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -1,14 +1,4 @@ - - Use sysctl -w - Use echo \'value\' > /proc/sys/… - - - - sysctl - echo - - @string/tasker_list_primary @string/tasker_list_secondary diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml deleted file mode 100644 index 55f0cef..0000000 --- a/app/src/main/res/values/attrs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml deleted file mode 100644 index 2d2cf03..0000000 --- a/app/src/main/res/values/bools.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - false - \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml deleted file mode 100644 index ab87823..0000000 --- a/app/src/main/res/values/dimens.xml +++ /dev/null @@ -1,10 +0,0 @@ - - 160dp - @dimen/d16 - @dimen/d16 - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 37c55b0..e8c6fdf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,75 +2,29 @@ Sysctl GUI Checking for root access Checking for busybox - Checking for old database schema - Performing database migration Error Settings About - Show variables - Display and edit all kernel parameters in a list - Sysctl operations - Read values from file - Use this option to load parameters from a selected .conf or .json file - Show favorites - Access your favorite kernel parameters from this list Exit Kernel parameters Browse variables Browse /proc/sys for a specific kernel parameter Edit parameters - Something wrong is not right - Please check the input fields - Failed - Invalid path - Sysctl - Sysctl is used to modify kernel parameters at runtime. The parameters available are those listed under /proc/sys. - This apps main purpose is to provide a graphical way to edit these parameters. You can find its source code on GitHub. Support on XDA Thread. - List folders first - List folders first when using the kernel parameter browser option - Application - Operations - Allow blank values - Commit mode - Guess input type Done - Busybox will be used to ensure compatibility - Use busybox - Currently relying on system\'s sysctl binary - Try to set the best input type for the keyboard based on the value of the parameter Root access not found. You can only edit properties with root access. - Information No documentation available for this parameter Search - Start Up - Allow to apply parameters on start up Applying parameters Applying your parameters Applying in %d seconds… Start Up Notification Applying your parameters - Manage parameters - Manage the parameters that will be applied at startup - Export parameters - Export parameters that you have altered using this application to a JSON file - No parameters found - Restore parameters - Restore your previous parameter backup Failed to import parameters - Invalid or malformed JSON file - Can\'t open file: invalid file type. Can\'t import params: empty file. Can\'t import params: there is a formatting error in the file. - %d parameter(s) applied - Open documentation Edit Remove - Startup delay - Execution will be delayed by %d seconds - Execution will not delayed - Set as favorite - Remove from favorites - No favorites selected + No favorites added Tasker list Primary list Secondary list @@ -80,45 +34,25 @@ Apply on boot list SysctlGUI: Tasker profile #%d applied Select a Tasker list - Removed from Tasker list #%d - Added to Tasker list #%d Select a list to be used with Tasker Once triggered by Tasker, the plugin will immediately reapply all parameters from the selected list with their respective values. Tasker settings - Add to Tasker - Remove from Tasker - Failed to apply params: %s Undo Start Sysctl GUI Run Sysctl GUI at boot Requires root access Root access required - Import parameters - Backup parameters - Backup all current runtime parameters. Please note that not all of these can be reapplied back once restored. - Failed to export parameters Parameter export failed due to an IO error Failed: no parameter found Export options - Parameters successfully exported Import, export or back up kernel parameters - Please wait, this may take some time… Browse Export - Param list Try again Apply Restore Parameter Value - Last applied value - Current value - Selected value could not be applied - Selected value could not be applied. Try using \"echo\" mode. - Dynamic colors - Use dynamic colors (Monet theme) when available - Force dark theme - Force dark theme when available Favorites Presets File creation cancelled or failed @@ -166,4 +100,6 @@ Blank values are currently not allowed Value refused to apply with current commit mode Command execution failed + Suggestions + Favorite Kernel Params diff --git a/common/design/src/main/res/values/colors.xml b/common/design/src/main/res/values/colors.xml index f7e91a3..262fc85 100644 --- a/common/design/src/main/res/values/colors.xml +++ b/common/design/src/main/res/values/colors.xml @@ -2,92 +2,12 @@ @color/md_theme_light_primary @color/md_theme_light_onPrimaryContainer - @color/gray_700 - @color/gray_500 @color/md_theme_light_tertiary @color/md_theme_light_tertiaryContainer - @color/neutral_300 - @color/gray_300 - #f6f7f8 - #e1f0fa - #c2d9e4 - #a2becc - #81a3b4 - #688fa2 - #4e7c90 - #426d7f - #345969 - #274654 - #16313d - - #e6e6ef - #c1c0d9 - #9997be - #736fa5 - #595293 - #413581 - #3b2e79 - #33256e - #2c1c62 - #1f0b4d - - #e0f2f1 - #b3dfda - #82cbc3 - #51b6ab - #2fa699 - #179687 - #15897a - #15897a - #12796a - #0b4d3f - - #80E4A9 - #00C853 - #00B439 - - #FFCB80 - #FF9600 - #FF7900 - - #feebee - #feced2 - #ed9b9a - #e27573 - #ec5751 - #f04837 - #e13f36 - #cf3630 - #c22f29 - #b3251e - - #000000 #DE000000 - #B3000000 - #8A000000 - #80000000 - #61000000 - #12000000 - - #FFFFFF - #DEFFFFFF - #B3FFFFFF - #8AFFFFFF - #80FFFFFF - #61FFFFFF - #12FFFFFF - - #e3eaf5 - #bfccda - #9aaabb - #75899e - #5b7289 - #415b74 - #354e65 - #273c50 #192b3b - #021219 + #FFFFFF #4B5C92 #FFFFFF diff --git a/data/src/main/res/values-pt-rBR/strings.xml b/data/src/main/res/values-pt-rBR/strings.xml index 1e00c7a..53df607 100644 --- a/data/src/main/res/values-pt-rBR/strings.xml +++ b/data/src/main/res/values-pt-rBR/strings.xml @@ -1,12 +1,12 @@ - General + Geral Listar pastas primeiro Listar as pastas primeiro ao usar a opção do navegador de parâmetros do kernel - Tipo de entrada de palpite + Adivinhar tipo de entrada Tentar definir o melhor tipo de entrada para o teclado virtual com base no valor do parâmetro Usar documentação online - Tente usar documentação online ao exibir a descrições dos parâmetros + Tentar a usar documentação online ao exibir a descrições dos parâmetros Tema Forçar Modo Escuro Forçar tema escuro quando disponível From 392c62ebb37a9b0ba47c5026596d06db3c18c408 Mon Sep 17 00:00:00 2001 From: Lennoard Date: Sun, 17 Aug 2025 15:29:57 -0300 Subject: [PATCH 15/18] refactor: updated app icon --- .../res/drawable/ic_launcher_background.xml | 9 ++++++++- .../main/res/mipmap-anydpi-v26/ic_launcher.xml | 4 ++-- .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 2 +- app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 4686 bytes .../res/mipmap-hdpi/ic_launcher_foreground.webp | Bin 0 -> 4076 bytes .../main/res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 4686 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 2870 bytes .../res/mipmap-mdpi/ic_launcher_foreground.webp | Bin 0 -> 2166 bytes .../main/res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 2870 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 6840 bytes .../mipmap-xhdpi/ic_launcher_foreground.webp | Bin 0 -> 6624 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 6840 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 11396 bytes .../mipmap-xxhdpi/ic_launcher_foreground.webp | Bin 0 -> 13456 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 11396 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 16688 bytes .../mipmap-xxxhdpi/ic_launcher_foreground.webp | Bin 0 -> 17420 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 16688 bytes 18 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 5314cbc..047116c 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -6,5 +6,12 @@ android:width="108dp" android:height="108dp" /> - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index db4457e..a267d70 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,6 @@ - - + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index db507df..a267d70 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..92ec6267a5a6c699a7754374c926dd1c5f154f66 GIT binary patch literal 4686 zcmV-U60z-4Nk&FS5&!^KMM6+kP&iCF5&!@%N5ByfO`vVtHjwPi|6iQ;hlu`90MEAM z&@L>3!uW)GCW_6fG%YuuBnw7uBT4ccTl^s|gaRg9$38zZKAEutTMS%MGZAK%1_{Up1%z zIPM>ppF_@zTenR+;U{>ca>-@`XahmpwsH8w-u6?7hzW3q2C9!np%1h2Z0WYGMUtEQ zMP(LitdBK|Fg{S6 zFHqaI?TjP^RjtC?+ z1WizZHfRuxKn?x}Ly{bit6`fEYmiAW3#u8=7Ex3L8-ioO9>NTkmEg>O zm)9hV(%~f?p=R#*8(gm}s^J7&zd*1BxEO3xmVYZ90z%J{s?82S^vn>B1XmTT>LEN< zR$xhR6WFILg|aa$5d|p$NxFhW5S%x%6t)2;U(0Gdpyd_8>EH&TwOPuLgh4K}5G)}e zB#9w7AKW}}6zB=_Q9JttAv-jT4^2q`LXfHOn_Q?1Ts`!Q0avgnWEEj?Pj(f?k*OsU znJekATiu{CvT~cn2Dwx0Yzw0n5aAEM4f9z_dJks~f)Z{rFAL0X3-{fkHT|3_Nt$Kt zDw2#Dyl3t;HcmeJ&dV>Z&}c@IF?(Sim8WcxkD*j#H`p5TtTiXiEb6@cy4>|!_MR}n zf1VFa#FdPxu?k%cNu|Xd`dQ|qO#5e=m}%D)nPZhKtfb}XbFR-fMB% z$4EvCnKUp1UuBfZdc1N|h>v9Tu)h8XQ)Fl*i+`saj@&^n#2g)%*( z1wuy>zAbxx!)`lJGF-rzv@R*7idu}S8U&;{ElM(#NI3!s)?gs@5r9lmb$_DkisYGZ z?|KqdrivZo{KYD*|Lv;x)p`@M?bVXFs>UGDs3}oLVR2Ut;$gajLMHJDPtc4YPfqw1 zr8J#1H4eB-*oG~?)cvMaN(MqVb6hD^xQ1uFvPM-K!K!%Jn;R+MSt7ZEs~HL4B3~F| zT<@TVqbp^)&5m&_>+sbF`6mu@8nTBMkO&A$nr3IEIv`5QW55+@oEi zim40K=ZeskkRr&*bxFe3qjq|U?IH`oWIE>d?zqP<|gK@o}Gcrez?YP;O&D6|ejold-@WrX!yQw5@X-zG=k2vup z!jY4%w|1(Wt__en$G;puZr)mK@d82T6OA}Z5B)dIi#HQ?+`Y3S6eI-!<#RvGNK)%x z<4U5Yv|g{SLYeti#k=-eo;)&)mjGAgTUYLXL!(Py@QR~Iw5Ks1tf8ipsV*8nr6&>`6TU^jc@Ffnay<%jphm8M*4pnWjB@|9sB>f zm@jaVlhSoPe5@H#&YMMiYD{yFe0*4opCFPoo1@kdVSyIxvq(zHNRM2fIczpHxOm_@ zJPNVXT1WiyjB-DmJO0NzDg-?0-ONRW(q3#mMKF&wiycO-y*LYGv9S@WU1O%SP*akY z@=-}mHVNuHX*M+Z%9ecOfa`~yWvmx_x~ z6PRYPTY%LpW=TmcU?L(3N_?+6GY$Q54E) z85vKTM)pUOM3Y;SBs(QEWmHLRqAFUeKKN=Qs%)f-$tSi#Q}F{7c# zCR|n6Q1!)>I;eNC0suwgjl!frq_7}Xg|z`PbJfF>p;d++?13ADG>|G5j8QU-xL93s zE92J>xV-~xmO>UEC%n!1pR3w$n&6a%^vGh3;@|0m-QM?2hdnhtgFR9626-8ot^1**hhyHWsR4z~wMsUG^|LmfA@1riitt&{*0vMlV zd3<$GWh})~#?>uyXuI}Cy|c|YKfB4<)!^Ix)!}dgFCrlVK!HmF0Fol?jOOROaI&2| zYUfQ`jq9IGeB|X}k32Wy{HGb27}Fr46Il+Y8Bc-Hwg^dr0>&@6&X2eC?~Wj1Af$$U z3HtFn{c!2wAHpwv+4$DS;&2INuxfI;H9I9LIfJ!B{t!~gc+4Cy9U3C0%bpLW-eVd0 zWQN>%quimLG6#3dUids_yicjx{{#5Ri$TJb`p?&1=STi{9GN8fW)i3#+v7z|HOD7q zO_IILZ524(Z0J5fdD+H2M{ThOQOAM=YBR$ zCkg;i_L=@tJbxR4M|R%lVGdi}3;hI| zD(E37m^gLq&P*C43P8!IgwBiACg<5F_@YDAa=%LU7ctGxstgYS8QVzcVCJgS;FYxL zb6=RF5|JEjtblT?X7m+gRc_j*} z+jMh?PXs!XMyd`OM>{o5j|d6ylKbI>^Via*w4yrOPTG)ztKIv5fYfGq{76Z7425l zEE?6S^?uW%pEIDJ-K(G3zSga3SykiGHk$tbz05z~8@C6-eq8d|HRV6LaflY)0DnOl zy^x&FqWS#1KYPUWb(t@ri_FI3iJwJxv#Pf5SjH**3E|IYY-{E<%Pd@#J2t10`CB^o zPK67fS6KWW?%3DPNc!;}%g2v*cSA&Lq6n=8I>g0FtU@xT3Y`VIwbuPDN0q8scmlW{QbjyDEy(-7Pb8RlL|9F3!U+y^Z z|Ar}H4dZ&X-$9r*&AI)`A~)ij#NIgDQw8Y&5A%|wYidf;SgI0?>Qa##z9J^8G+ahX zQdPRaoN5@BB)R5K}I*|ltH8Msnvm>R_|Ej{ew$eB6JCJXZ&&2xc*jjKOKer zV?rF*N3Q>Ve&Kp^?O|u$cH0(RvgjyE%95iP3_)yIMV$PEO$czwj-0vE?kE#zE8+V* z`6>VZSWSon2C$-SDjtUH8;$fG2w*N_2${tBPlxl8a*fi{d$VZAYp! zw9dmtWB&K^!!3`S@8>W4rQkq--^Z8y);se}b&7e(2dw9(9=acP-mW20bfbufsIXcV z1v3wFI?b>Ch_Fs(6VZ0VmBnevi|;X>0mJ=&FSd>Yq5yh?Q||}<>VoP%_i?>h$0PQ& z+GLw1G+RhwU2&9%2t+nQlO|3>2+r^V;u9gR3CoL1Q+8VN+^5F4>&w&kU@-G`9DUV# zRB&K8>Gre0w*+}hdHZZ47YmvX74zQn!$+q{fH2IGJ3Wi- literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000000000000000000000000000000000000..027253ff5f2cde9d510146988f99d8ca4d43a376 GIT binary patch literal 4076 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..681db35f738c2aeb4cc5a99589f30b3c9ca615ab GIT binary patch literal 2870 zcmV-63(53SNk&F43jhFDMM6+kP&iB?3jhEwFTe{BO^{96rbyDQ5&e&Xtq${7z1PWW zgIWLt;lEpinYL{Vq5M%*yLJx3ASh_thB1GX#nB!0e-8kNCkqe-0K5mlfn}Z|5LvqZ z|B!9x_it?-?7eSn+qP}n)|4aLwr$(Ck8K;->aO|^HqSfwj`!*~ziZz+iq&gZj1I5w z?5;ksjb35BfI2s`@5;!|KONgi4}(37ol%B%Mp?8a**0xk*~Xmf+O}=$@%-40^L5v@ zpN?(ZHAjq?bpz=mr|odtBzpeA_v(}EUcd%ETk5z2zSKF$la6p^>ckODRWQ$PY3gfc9) z{OHqV6NCE(q3;=+Hq$b4Xs0u{we(y!R8K30^m3&)eWCpKDRdyFh zB}piPsoaTD86^~f+&-F|tabH(Qmb4E|LgWkxnQJMQEsCbg4Z+jCYEN~4hV`j5=IC) z0H}sDwPDW^Qvf9Zxe}HxHqhH!kzYkGfaqVa;o8bylqxfTss;g6o8Znu3VvLygBq9& zPduWU6SZNj5|9H*fRr3V%#eG9n~_B&0wPq)xBSWH-5X0qEosvMXeR5P9Bu+PhqFN) zoCodzdu?)#w&Z{kazF{Xad+d4F9ypu5dl@IilD6-7feMcSV9d*btC}YDlC9qS1y%s zgvz8~Q*bueag&R-Ee-%+5`a=pX(*(NS<%(cydru;7G_C%3$~c;l)G4?H1)G=QWdNk_W(7*ZiEy{X1@gdvif*2HJ@vXr|)KnXwr zo1}rvA7ReEm~o+!T$9OXr)aotY75Nc<`Y#7NNPZ$`-7=TuewcZ5k`>Mvcd=HS~)0y zw_to^*cF`MR?K{|%fBVm9h+x2zi)Na6H8T)X_1@CGBKpBIJW8NQI3&HTJn#m_aCup znj=XloC0{uLw(`;vIOk=VwkhTyc^5`|J`VJ7pB-z&9FLGI&|;!tfs#t7!T}HU$c>U+GsQuLnwTx_4K^{8*H*y(;TNO1vyQ$QbtIt-sHCo( zz|hm7H&9`yZ(>GoQb~1y62K^x3yiEn*c;@~dQY$wsDnGEa`DlZCYI2VPDy2u+|;X9 zt1n=$mPQ+^Cs!qvP&lBm?lPlj61ERJ0kpXl*fUf?HC!{u$k1!BkF;F%}g>{HU~R`I3N|6NGyWir#N7%uxoh3M@A3#S3*f8wb01^ zxYTXbAgJ^f5m(l2hY4E>;O^~(q~9Vl73}= z;!8pIzskL{roUw)zukxgp$M9V_}%aA=f%hFapzBWg=RqIkoui5G15@KbBW-QSH1PS z%qR|VVX6l$SO>N+LQa(gxsjoe38qbdN6=G_@&i;adEtLc!BTFkI4RlCJ6@@M>yq6+ z_uSs!=s5e$|C}ynDj4Bw^=rUuF*#x3(;W@#!0GP#XwGfl9rTk!60ct{YS+cKKls~5 zRPU+0l)pK0gyZi1e=!$t(IP1ofsRh!?O(X8;oXz^-~NpZ*~Fb)+k4`TD=E$bEr8bo zm@|sht>4u?@YZ%dIHPLq+0H)&+4z!1Fr?qo7iBHK-3Z$-8v9)FP30e<4 z+%);8QK!3RmV#E(cP@S-0K^x!mDlgM`+)X`fnxeord^Psl=KMxBRw@5!NMQv(o3%8w=;KvwXhX zmaa8y6B=Q_#HcCWojv{MS1r47-qQBaS*K>m{ISI*=NQY7v{mpznP9fAxlJ%AdnFXD z5E?X`-1yR(+HAF~eE;lHUWN8K0Ps?J#!Y?V`0{kH$FFA_BE92xBj!l94_&3%{V zxE6$1<$u&yCz-k?1+PW(Fz-rM;*0%WYXpt-371*qKQR6lm)-=$X|<;y5d{zgSX(}5Xly1lL;h=ZTRb7AMX=C%6=>| zRrL}yUI}qSbhI3Xja182yoq!zr%O(gZ!cMfMJ|KZLe|Z#yYjcc{m)0fC0%KZYGJrZ z1a$o72oRLhQhrz%I-6qrs%T+l3uQ~8C=IlM1^`Th1Zx>VBDo*F_LF~DC_1Mt@qHGZ z-wV?Akp*3MOMZ8%@?k?m3k8oA8I-0T%RURsDO#7-it(Jcu@pY-yHgV%-m|^;-u&ncu8-7PJZeIm7zn!EM)keLJ(UbrY@4t(@u`4ox;}rbgPrnbHh1sUwIFD6&TRtC zTimyL^%V_RK%EoTUTr4Y7B61B_>adr*eL}Gi!_o?38%2B*xs+#PX zq|TyHDy<9)o>Y?MB9ROVxRF5Nhatmm1YT?M%W#7X$QOy9-n0XrB{K=6Lw>j%C(DQj zTrrvDxrhq@$@~nVKH#D$OXe%iGw_^8CPR<$fODV;DYXBQhBhF?6_JY!$N`7A8q2-_ zn;xAg{A1%NgaAjUU@2DMSrp<59C0TEHZ3|k^Zy`B$Id{_F&}Xlf`1JFaVaj-iGt0F zmJ$5vhbQ((6NwhwF)1Wl!2wq~0*5qiYZC`HPimX! zTUS}Vuk1(3%{HuB0V68GFpL!y^(`#a>2?E^-YO7^b2p6yusJ6kTH8*)`I~#bPxt(4 z>}tW;>{`L#;#{q7w#zs{C7=5CEwpI?x4Zdk|G&uPB%(ntG>8X0`InGFA6WRAd%wxpd#? zu6oCYWGJ=<1-LT%9syY>btrt5#(|g}!k~eF+ArMGVg3ZsR9~1T3)M+T%fanG&-)CIVkSnr_&as$szxfw~lEfT=%&^0hPE163H-UJYX6K z=&|5M6XZb)$DmQYa6~;5w?2`EEfH4v8~|)HCyvrE7-=M!cC?PL9r=DL?eNUML6x~M3}e*_vJa1; zwX`9@8%IEp6++9-dX=wBtSNh1DdY6G);GKLFD6sE@x`hXB<`I}v~6n}d=VJvM9qf&?HTYoAHOvf zk1MG6Rmuw-1%%)3AqiT3h+WI^!x)7U=gAL`jr7R|hB6}N{bk$xJuigu$BGJCU++}d z-fUTbUoE-``4{^M1^C}@>ESOiJ#&NMEYHc;FWJ=s0kEOvSz@-XXdl9CJjJuL57GqH z&N{uHmk{vK`@Aj^vwh{iMQ7uz2qIvhktcNHX5zyFj3`VsIXB#(r@7R6E9f8>98AMF zeBupRY_b^tOPG@ax0Ya|H?qG;?zGKeAZTfT41>qM`OeH@Qf&0(0Z=x#gv;cu60 z6J7jC0Ou#uuc?7)U*#5$*>^XCmLI;0+q#^TcX2@3{R*5)j`3D9tTbKI^xHwk-;cpA z=k!N@B}t{8C~!)hm3qw3VU#wrl-MH2ak(@u_%1(899f#GscA}fnBm3gSW!XI)pnM> zRhy#z$OF{BMI*xgA0*i6T2N2Nsz2=^NZGW>7r###Er}4%;O)#`LOZ@if zR9DTT-O1rj)SZwBfiLI;@4PC6%r?FMx0O9CH}Z9gNx2bT98sFC_2mv`y%jsNf66HY zucp}lidwa{Otc*Qd)j&G-6z+XH{UIX{#tfFSf3X_0X?t&Cm9zxL={7pGLx+LV?lArl063!8qmA;6O^=C|vbSLVENhLI3~& literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..681db35f738c2aeb4cc5a99589f30b3c9ca615ab GIT binary patch literal 2870 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
    v}UytINe2 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..cd8dad4ec0a4dbcf026c7bfa31f356fca70f6687 GIT binary patch literal 6840 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 SDE2+DP*tY|bUtpEV-*0s$E-^L literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000000000000000000000000000000000000..1bcf674e948e36f063330070873812fa9afa3f20 GIT binary patch literal 13456 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 yHVZh+lEEjN45=B6By%Kw|Z2@0LI4CBH?HT}3 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 SDE2+DP*tY|bUtpEV-*0s$E-^L literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..aae64e280f59379ed4ac93952429ffb6de3f2aff GIT binary patch literal 16688 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

    $v#By$3)IH9$qQ+@!Bj|N8ZHy=@PsA4@HcF*jVn z4!92qM&nF-{pj*;L`slDcA=jUMG}0Vf-9Z>S+D))8#j$>Pr@(YPtX7Ygh`1576E8b zWZSZ!Tz>j5SiQb4H3v#6dpNlC_V2&@jqkp;unuc*4*pI4?Qx|wfjfViz2lSP!zw?F ze3_1)e&;XWyE*lf_p}K>0%q`goWuZ@jXQ@hfL?6fd-82BpQ##kl@2OAR;YIoV7Tdi zfk70IS$QWSrzf0WkV-hsV41$Z*1K;qB?FKE0x+nM(09)L*PHpH_v;$bjq~s?_!%6B z768+33*z?0lcj!DY^8=_2RqZ;$!kCP%8$22ttmFiv}^H+W{VuYIG z%4=R%=Bd*+PJZ`Cf7MPXNDjP<%SLS_WYxuV(SDj4M*Vu3@{~> z=#bXYYx(F#2uMK%50Opd!PNhX4v7fWvbs@PdEm{()`vqDds2odv6z|7l-wH6Um8|5 zR2G0#NvwzvU~pxGZF_Us&-0+h^q_{%0La_)VEDhQBtIGaJtTx%cN)P&9efj_Kru!v5AVYo%bk0_lNI0(cn_-@L@{bq3|Gf>Xr&*m*MD_vC zQW#KmmdCsf`RtQ$Edqc5Q7B**gei8{0fp6#VG;X98NL9DhA0~2nQL9|N~OA=k}(BD z2c&Z!YsaC#d;A;+{W?9!T&FGi`w1|dzwf`sMNuG4H)7-!Gpj4`lUhg4pMCx(UmssR zsYXbGeIVZy8d@_4h5zg`xK5HVfC3I+HzYrNU<#)T10ohb5L%d9z2Oc=OC+#h0PYcj zkw}0_LW8n-xU%yP(A`IA(d9S=gfT8<11tYH*A~yUPJyW-A92Y`byX3}a(1OZn?72v zJq5;vl7ult7g;Mf?cAK;m?Q)n9$v%i=z)SctM#_Ls1$&l+l60`x}< zl3^^@yz})zl0sW^50@tZ?j=b-G9I zP+=_5QG~GEGO@!q2mlNP!YW?vvW5J&gn)p8$+*wsxO*fUS07`9;b46s;Q=1jRA(N& z^LZ_4_{{91?IQ1&5t%wo6LTNkn3>HATy;9CDghNU38?_$*^W0mhnhOnY?A{BfS};x z8rq1F8-axaR2akq1klu-dep6(+Vc-84lmi%`gWw7_F7^dsA$NdSt9 z$rP!el3N{ms6GF%ZZv8)K$UEgfD6DNhRvPw|L5nG=ilFxZD=AlZA1bbrZxX^e!f1i zjl!s643OT#BI;TgxkK~Roq$Yi&7oZvclFg`^0G{A7qGdHnTnTQ7HB zh*Q7-U`*C`*GNGVOwbHlfr;yT2?KQ1=!gGu#6L^tqAvL-{s?C6$gp1f-V+7G2te$G zq~5l@Jk_|rn0@-Secm}Az$w;4IR=9mHrw*H^K;;1UjDg#iy9IjfGIBO3ePbE;=Yf^ zU56FcDwr5!r|upQs}YG5DA5WaNfi^xMY47LZ{NQ3KYnZX<1L)~RM}U}+un6Z8 zZ%A%6crBExvElW*+aLUA?>oPmd;I?|#8Top7{KEMegX)XD6XP-=C0?X1D<8(3afhJ zaZR413uO3z z-#}4OVa=jv-rr|i)N2Y%KCZAt1LEM1$5p$QTPi39LPQFu945HMtBwAR^0KG4;<&hyB$)WHtm6G)>|QbRaNT&a@A1sX{%7ao z&U@fK$Q@XK3mXK{kOX~f;0n&*4SWQC2@}{ubPB^fRejsm-eS6F~-%_KM`*$L#keVzN#%l-Jx@(xuMPobtXi^Sq{+ z1s1YjOMlAv|=^ z#2Rj44Q>B)x3TqO^z}SVBjp0vJjlB$RYL<_=?aKl$6s3%B>K-JLESmTQcK zh=b?7j96YJj>MT?dg?CtT(8q~sX5Bb{=-I_eAmbS9kDcr2^@o7Qpj{cxXISM36_Y2 zAp=u-=@9W5Si`dddVs?tg<&&#j9tRPcjC|}poSS#FhU<)NDKuB90V|j9A0Ws=mrfy66Z>9Xc{;ToQO{IUjBF; z?oe$4q!g&>Cy%;B<5PG2xF&R-gej2e4LIUjUkTewuHDkwNz-5%1`G)i2|<_0ev0uz z00;o2A~jt-yBJylfg`nm1QA3S06{Dm8wx4Ek`WQRM^|TUL!bwCWCT*e2pJ3jB=b<% zfQ7@<+3l|X-y?@#KDPJn(eiXXsR1Nlk|c={p^N$MD}=OH3H0c~PmhZM{Su8wO_j3% z6wrcEn*im+p6@TNk($aBKv)cyiBu7*x5Ho5ony!Qhu-b){KS97yliWliun8hbQUT$ulLR0EKrI%NYQ7R-F{yk!0Z2+Tb)g<*i(Fbp z2at#;5(1^_KQ{uQqnulPcWJc0WISpIi!>8A2;N>b1YB4QKw!dEt*_A?oA-gTO#vg& z3J6g14Ky;xSevr%)4V0~X15TD!7|PbHsGP^raT(c(LVn18T07P^mx|kN%dvcSe0B$t-9&8`B1Zdy*lLh70X*$T}NK`7Xm+nOyiqco}l zA;cJzj4t6sdjZ4Kx4=p_v4Y_F-AcHlCGsGYx|W z+%Kpez|a8}!xJE9jrnHJo-d0!M4dUHksX0CpaE@#G5ONRZ+BH(>)l0Hpyc3~KJ;Xj znq-;}WZAmWJ4L?`lmwNa_Nb3GPIlktx0iX-DPz%f&sxq9Qm9l~pkZVs5FjcDL6(I! zZ?)}u#g}yNPaR?!FQ*DrebiAjipwl&OA#ee0>tpG9=02OBv2W03`Mp6AMc!a_aD@+ zjJ|_0U0i|$SVf5<|6-Neb(SFTCZ&m*Nee9+3sD6)IJGlklfbH2QQMgHSoLY=H*W$> zl`+stYQ47s0F8)G0p;F3-c*>m7L_K_`2&X;yAXj(wP{j%rb9Z?Q{14b9u$I_Zbx`` z>B{|uZj_qg8hY0?cO;>QOvwQk0D%G}jl)Kp){W_c>FqU->Q5fq4xJX2Rh9B$H`L;a zJFJEUHP~Pzh!7xZAb5fjGgQ(sf7@Qvt?P7usCBYbASwtbR{>J5XXC!}1Vj(A1t?qJ zo6rH14Ezo{3ovBJE2!4ioTKOQW>9vefGuX7hmi>`&2kLDX4UQ=)88mEL9*x1(5)d894Ojes5uSMf!gE zqTDUCYh37ny-bW9xkQL0H)XiCx#Z&fdu`Y+zBws}0hdUTN=fPBj+g<{Yj)>k##;1w z!9)fCOmaUWf4_hWhVTT)s!_jZCm3zwO&%y?r|MUq>f}z81!H&4(3d3^@=grULL<7TJ?}QAOU(W5lR35V z_{ynRH<@GI{R7l+)Kg(P{m+xD<|A9a*|ZUoj7CDr5CbaelzaWeZ3~!on{kfQ7)7Gr zxP9|wZo56|6qTi_K@L7MAp{}xB zwrWF~dG_hK&p&_a@TFk4(NAz5SL&>^rI7e{*8euV-C{?#eNA4l=j6&O^LF0rPyhj7 zP2vC~KoD&EXr>!4uKx4teCp}B&0k%NoHWrD6etR#AR4Tk-`0iyZ>yVW%Y3V&J)xb! z-(x+D8wMhnC>j;>_(S(&D=5yV1~i}uh@HcT1SNPAvUq>5wbwigG*XAVj|vc}fdh~v z2njIp{fqOBlX0@Z zD%9xbZah4otuap^HNwsdb0>Ut+4T3{KJ)wcRsT-=g|&aV@O!WQ(j!0SkH6#QKlb+T z-ug7Z+s=!b3$X8Pg@-{1Kw*fB(#)Ofv3lr)5p8z%7dDEtU4W?73TvoIOswN(SkP2l zTNmM$^%ObTop_GkS%cj|z(IngBKPBNTwtQCApi;5|I4+T<$YZC)_(mFyg=gKm&*MM zd#|T^H;#5Jm2y}GLM?xL=k{UvHVO*FuIjSfo2?N4ak$fF*5|GNp?h&@Ljsi2y-TQY z<>3SrQKLS=XpDso3oH!*$O5#eA&UeC%rpoWADj1Dy++4~0Ju>pi+${Utn#qV03ZYe zC|Nur+~^4)y0GeEhr3u0{Yr63cdVOH+a@lJIpQ(TX&$wQOvx4I)Wuf}T_6+-M%IoX zz%JvkGBXb4R)-?MAB&JwO$GuG00RLsszew=w_E|2)Q$-xFXDWycwS2(ma}@}BY0SW zxc@KA5f&=5NQ5wd*Q-OD#-hcn3L4PeG_7UiE{+suea1Mmi{}f;h($<%6oE1_q-zl% zi&U1##9~rot}W*sOP*#K#KlX47F#!4enh93h3mQSj0FK#t%eLL%<>9!v6M;`vf5Jp z!}D!Fj^~<+%TuB>Lq;K>Q(!331(OPnGxwo?OCVHX*`plB@Y`1baffq8t*a1&ff#LV z;x<@$0w|gQtw?bIY)u^6bCWWPq!p2XHjiVR zDMD&z!$Gvsr|=P>FbW$%0SG&bG`7YcPRwkB044<#LWal&kYU4)Kt%Wy47yK{s{jRI zq8;OhNQ&U~54fdN8}~z@t5htqS{fDWt5_MvqI7H-!wbf)R{m^}F}gv3lqg-tN{Coj z0m~{K01H$z zjfgBXL%=d>8-s^12_mv0=icVy+yh`^{I26Z34Oj&uIPS{+o2T`w39q^VPK14R6sEZ zz(NBQ>rp12Mh%7{+WHc%XRrxEfS{eJfHDLEWLU6% z5N0W5Szj?UbkV|FED}1r@Y>5QpJ|XZDS${F`$z!@-vB`E*eTym`_N#LkverXvMSUV z{jh+pz9t^csQ0eJaL!_>Va+!YfL(1EB8VBmEzA02*t|YG9(HynK?TA$Ireq;C(%Gg zR2RUS_jtd(+H1use55X;n+w4#$AYvB-?bhMG~R5d2sZzVnT5heK@yoCGDz4lo%7esr4@b^54#X9ogvY?Pj_iF)b#w@S+VZ7+lhXiY;8)&KJb`qc^ErSW4iO zEvcwWLksWVEo_r%TRU1jY@Xf!AO7Po$oiLv-c(Qx$gZWG7%-+shu1G4W4a4_{kN$T zZL3!_$f?|5LBSRmgTaBoP+<%oa<8@?d@+%f;T0}zde8!=@){!;+@MrO&#_gu?$5~! z*Z=-EW(Fi)pV6ZO)ugCXYhnx-K#jcy*AvLUdv#!?`+rR?H{q?4cqFL2V#LKrxvQH7 zv|G1mO!QtBw{9_UjMNZ@J5&>;Z_5VOb@^8N|9^4zfpk5^-aV*b7#($TCy)XddUTF} zH1F;FZM}WImHW*SRAWy?B~Jh;39{IbQV`?XZx+#P*#%_S5Jn?n64)b<1*lUcB(`bp zXypFdJ}*6g{rnYlAf3{q149apQP(KCVtr>rSX< zpx_BED5)Kz#V~%&*oh`%tQ{RfhAkXn5!9)&NuFl2tW~#qzxFQg=l3srPk^lSECa88 z)Upiv^nfu2^k6Wdy2uPJK>gRp&;HXd{Tg~KuuEcEcZH>azzSH}!6{zs`sqbCQ}{4h zyTK7)E0#e(9T1fYGNEb8=Dq#RW8Zn_*Z;nsS3z|n(h$;t!GM0G1iVF$Gzoe!k#`5r zbOG|6|M;IjmY>&2-C5w}nb3~eCLAS^P+EaOvQ9fh`{q85pozNdbjV zG##7uaFtgtT=y^k&i!wY0?&-Rx?!8rv;c3}t=nuO_YhCq>D40=IP>u}QG0f!kP-4^ z+{`CMZCI+XSRw3^UhN4+I%R_efR!V4lUinsiP8*MWDzM4R_R$yH0_O*Jb!lQH~+b_ z7bK|nF#MnY|EmcEsD^gp|Czh_Hd~-=R7?|*ATEA9FGW9`FQ?OM;i5Lq?ke@I(!$L^ z+u#JR;06kSh0E9*3ny@W0m)e0VgL*pl%!2^lWH12wqv_9tmo|dz5jV`??1e(agd-^ zdc?rp{lj${8U$2#ch!kETSj-4NtD`#>rsk65gE5Xp0`ha{PNgmefO?o_k3W!Yxn$Z zX>Fs{C=R0Hh6`7)0)TJ>fR%b{FgG%ET+w*k0t=udDM@ewN`RhY`(!H@8{31|&gWnM zrvLfwX^@pxr$9=%M~OA`-Ls$v9q7R<#EQB>-7aTIDy)mB_SapU*Jl&?WT*fE-0!*Kk$c{_ z`|2(AY^u+)3iHdQbST0qxK*wsf`uDM@FpgW7l>VtkR&C6f}11-j-nBYcc*Xk^?fGm0Ie~gacP}T zt^M|Fi0nHF!kC5oEPCK)*6d~7;%un0yu^}nJ>h14N%Ner!);k-STL$kQ7wR?N>R1P zq1hveNTLyi&vY;k26KJDrJi2ftTQX?{F(oCzIm>D!?C&I5v+(m&k()oLJeR5{pc7? zmBymm4UAT1pc(B(K&gB;a^9w4#lWc`03)E(`^-DA$7B0hx$xK}W%ESo?9)XaEto~l zb^$%EIriBxM-8d9XmEr;Q-@rO0{0#MNG0#H@k)BAU*T8zILO|KOF*8z7cm>-^tg8m}wyk=+S8c}4Dsy)AV5=$TD$Cf%at2zP z=dx#NhcbiP;_5Os@GisDSjtq_5ZCfz#-Gg|?y3=DD;qwC%7(Ozkg L!7eA#>3!S*wWsO- literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000000000000000000000000000000000000..0a1c7b789d240b46282769fed41bd5b9a48d3e89 GIT binary patch literal 17420 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 z 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 PdH?7ApZ9;>|9N`?vQ()F literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..aae64e280f59379ed4ac93952429ffb6de3f2aff GIT binary patch literal 16688 zcmV)AK*YaNNk&E}K>z?(MM6+kP&iB+K>z?RzrZgLO*m}ZMv@@Mm(5^u{TDpXJrzXs ze**YlU&R%^h!3!L5qu|tZG$)1o4J$H+F-*xb+--(#Bq|ECutt0iO@GfQ1)jX0aezf zFUC-JRn2EAdPypu`|WBH~LE00dG13IWeN%fvS}{Uhup(p16Pk^Px13N2%X z63^fOsAT?8j8FlEKzJq)0D$);djJSv0+DO3;l=GD@feMOQadBR9U{TZ;=+}i?PzV+ul9^4>bl7#H) z+aB1HHNe(hJ?z!D3oTz=NQoM6d)RA-N_~dCb|;{#YXU?>XppqzZmIsY>gej~LL~z! zqOohlbh(D4d#c@GJLa&W(lT0eFnFuYzm~t+RLf({H%1G03z#(qgtn0cN$C`S)LlJy z_fH@qCSd+2fT%F?Dh$kwd{z0-rrKOeRa68_L}NZkjG7IMjFucO6$)cY3V=d(11uw3Kn0|$JS%gmm&&snRX!X*U~W&^HYt*2 z+tw!@kj%_nnmil8vk5b^5fl25vo%%|CDqL+OKP?jS%s_YggO0 z#f_x<`>W*U9-e7t=4EDP%IE<01UB4k!p%0EXqlNAhntz(Fw@N7wyWy@V8ON;w|QQK z0jr3}5~5lDeQ(=lNYeIy*A)?|%Iq?_M?JP5+cws%#e3~Bmu%a%ZH>*I9<^1jtjx-c zjB8L;llOm+ZOPiUw{4#LdA|<;L8{rZWc%-Zn4WAQqiiCZ_?sMw&dGW*%?kQBquzTW zn-)z9#P>d)ZQC|&YumO`S|4-Gz1O;I+rDDg?fV?=(0vT|8QAs_IOIEaMQ_{2WpiV3 zV)R~vf!jukdNj*JyLt@TblhAfyfVOmT` zhTtFNw_oww58wUUDF;iEc7e+OsRPV8^W)CDxUglz>T{6UrZQB0PG5cc@aQV;oO|+P z>Ky|ddMOBjDM*;`6)H-IFwPu^ukLj0^{ip8M0@pQ-=QrBF8zjtM0BmfzbzplNP<+c zLfFnB(K!=`_LLJ<)oAL44~I4^SarO07A?TuWrm-bSXt6UaeyRUVbtlUp&Yi;xX1=b zyxKNz+J>LQ4%DlYf-DRSB`B0DnlU6)XJT-7?4w4bjq=Bq2_shh12j7S+S*jYPpJyY z1ED*kJ?o|;%#+cIot)0!8wawp|oRfT%hQNA-APLH@N))RE-kQVG3Xg z+zU^`UH}E7(v>)g_ko)la{J)h;5*bP!N0WIO9dQU;+_iW61W@_!jsPNCOHOZVMK!hPU9_WxOd(iB!H=cEof+>MFQtP>2A)U%<2AKLBVUPP{D$ zHp5%+Fw6p&DucpHmo7(q8v-|hL{GE;m<7*)XTj?*g?`d3sM>SS8E?bRf~nFq0dzUJ z_e29gk{E~<02dOz393$)T;^)namLMXDF_Qkl5^ZMqFe%@7AMtb zJI`xy1UlsD$-n@_Y$N;5k@~3kjYDh%(M@XOowBzzB`ot{jw6RZP34;seEU&#o> z=8Z8iqeBWQ49f9qdl^1EITbXR&0ryb!4nuG&ZO`0T?K}e85Gxg=WFy6JO9l}We=+V)k(EGSS@VTg=^pnUGlg~>Iu?1m|ph|$P-mwClMhGadcddk_0BUi?5E=7L!s%H$Ern33 zV2L_c0jQHWWtPC==&LfBt=@LcnarR7*iT7Vge50%K*)q_opb;(&-8W!m=Q>)35e44 z1H;|KktwJKT2qsk?qp8d33J>yf?R*>6nnreMgVbSQaKLO#g<7;l*Z$0QsH_q?KNKO z_>tezJ36B4gw0Qtr`^t%OD1S*M{aeb{#!lZ);jTj9XaajJKaa&IDlGg8)KRnBaAHjgdqAW`asGuTunF|rrOt{e16_*gVaIL>T!oi~)AOX>*vjPf{sd|aD zcCKke@UUWCbzF)Y<7TXn7z_uc*pK_=zGcH2Ajb54AX|=s1SLUuTmbd`utPB|K-W3W zg{yESmx&%ynTbdE^LT>LTCrYg{fpzgHGl>|!2$tbh(-e7`#XNEIPM zYzxA$T&b%>CA#(`z_dqz-eZn{+W;mpWCvtKZov<*VV#V(S?8^`6@f861~33AAjYK~ zuUc1k_!c8i-ecZ`AvCEG+dJLI9NPJ^HhfOtP2$LSP z1RnZj)zOYb6ebE8#>_wlnG8=CuJ|0=n1WQ|HI8Xs&V0zWWkfJyYu$R)a%4XgY)tly zLV`AUl;PrTfSMsDK#0KZdxJv?$SpAp;Bb8*pe5?4(@%B~(OHq(k~2D6XTsY$fWxrB z$l(`Zz&c#!m)F9=35_7^4$G)=P(d5u|JPTbH-wON^X2=)`ddI9QW!h)dWXxZ46G}M z(>o4eA9D6*Ai^%G%NxyoB3Q(;yYG(P*N`A;jGOb{-(EjogSV*dPN+w|fBrl0wJt0W zlSvVs%~mRriM3{(#8DgqApww+AncXT`0vBz64~1xQv(2l#X#O({;%&p_2o~fk1=j` zEs(K(iv_ewS9rDw-&8WOc(~>`>4-7K=n&u_p5OAfcuchrVdPC%)B2;YKY+SZe+ncp z@cI{X3Lu69gM(5`&p2spjq}zz2$CNOia6ugvJzm3hyX^~)Y(By3^DpSyW;gX;N92} zfZ^{cySbX=_W%gOnhISKnTeC=KhkD~W#w=#0w_#1q_5yo%Lij}>Iadpx>yRrgU8=K zi`V|10{Wf6=Mx|!ehlt|hNu7$Y_9WryG$;9YXz4b)2&w{v|FcIgBBMcBmX0q*b^oQ zP!pPgeXwPJ4DuLdCrX+1enrpUg;iO&M7H!am+H;{Yg@NLn5tO`x_Es@8+wc`7&%K- z=S^H#pz5Q${ohCV{1uHX=-vFhnHtvJu;swsNZp zvfJ;}cb@goJl79EWy-XR0r~%4e@OBIKnxi!(Phe(EPffi=mZY}pb^8=*bxl_5CD_G zV0hTDLNIn@4c?jJj2L{hv-iKeegSg2z0Bwfn2E2R14bp5z&3N2Ans9&uGIwrh(Rc# z0I;uCNHW9y~_n^ssDd7QKnfD+=*o1e`KAdXR{ zEZ<~q&yRpL>Qa8(%sd^7{MNSu3u7h@;t6aahK2o@!Mm{ufFbkvL~J60hZqiuID}8a z2cv*=p{=b*wsNle((|~$H|?0-%@FhKn7 z@4DoCu7N?4#QGstMoXl!m3R@LCZPOM5pjpxl!LrX_yr?Jz~tuJhrih10XmkK_T@Las&uYH1etm zQl^;LG1fF%TwewOhTQlT!^g?*``B{9E#sP5gpW33L`=M;0z1M0e0Z3FhZU*a=yBk2 zRL+gUzqx%q_}4}EFdy?MAi^f905k+(q+?&brDdATO%C|tUB=3o(T9K2*ZMCYf1goq zyFnbapP*XBA1+703nK^e103Uugz3j`YI5SU#r9)0O=-aB{xpR?~j9xcyszb zxqa6cpZ(3v$Nu2lT*DxFAv^>GJ!nA${W@T10a&tT^lZ2ZDU?%cT6U*C2jVU=Z_OV~ z1*M=b0H8lG5NU=;`F180hola3;6NEtW+_`fFW#lS?WgC~(QF!bg-WY#L-l{P(~n^c9)aC&Ac9Q$fjF^QEunE{k^pJVj}C z5>BApr=5E^)}gBK7cnIs@3uYL?UUCZIp#pAY_DKKz$^+$F=Lfp?c2)(;3MwmpVPni z?7MF2mFsk10?vX3ePAd^-o^G-fTxsDvv2kskkPkzn( zEvY&t^h>Tlg+|Iu#wOvq1fhv3_SD*K;nJCpgP5b{!jDqEfc$($g?tRqEh0ND;iyJo`00F>cS!$;bJjMJkAb*UK2OmiR@snSV9ZGNHf(jwhafwc)E9Jz2 zAtRZ^e(LcPmG}O*>Fh;kaU4|!IRZ>T@EB&4}ZVlPb|)Cg05eZGfS43Z}@e5EBCs}tI|Ly%F%=vTWRKk>x( z{c@qQ4GA!kmt^{5BQ~;T za0S5`JV$hB%bQEj{_l?4n`>95WpUZZ&t^nr?;kWgE84+ZBP$tMA_N&Z2uv-@+;zVT zj2>tBF-qq3`}|^swf5v%ly;b#IEVg&8$-nSkN9qxPhIq9e#r7J6Sq@+J78X07!D}e z2VulSI9IK?0M(gx%VOeqIq|38`|!X1PWb(xjg%#x(Jo<`IKd~vbtH}48O2dHTYuKq zhCG)w!tB=@RaOE_Ot_y=iEXiOBGIrC{E7K1Z2r3(hc9}r9HR&3+@9E?MZOe6RiF?p zOOmj&)|hQ9TO%B+R;;;8{rt>CcCJ7H`oLojy*iP ztxe&!m_){68BGm}LLeZ?%|SU20rH ztK=655*^75U;p?t4MD51}h{IRwRh9!xNoxf9mT}jZux$^B8OGJbH@P2qU83A3MyZrmPcYo1(^Y7YlMwBgz zhzh)5x3{hT_kEjQ+*+P4%g-02+EVw#5SYUk;g|6k5~K=+E?y~5TVC7^8HqGSxe~;^ zXy*M!(u^$B}00kVt94r8K5QJ36 zE@#?83d7`}1cu}S2|zzAcxWI-+7*o1aYS~x5T?(1bjmdNxuf`aEc-a$PeJ^i?zg81 zhiJgL1Ao)Ab|#z;p{OsF#y9xs<5D9H%gc$ zaWe-n1P~@HxOVXo)MAcEX2TsaG4;Bv>D%yI-*dKhnCWog2a&BI0P5D z|LI_16I+Pjf|0hNjKjkkBy1RCOiBcyYaoqGT!aM!6Euoiu=}zK;(mG{gmAMAgGsI! z3sLStIuo{R%*%s?#T1ah#eVF8gS=3%(ZM=A6fkB)AjfvAL>UvFG{Vj>+LrDhog1fJ z9PT*wYHZgJIqb^mMw_*Xrg@s+X6D1JxqkkaAU|80LCN{0TIEV!Gr~e$DrT9>ol*uhk$sQzB^U` zy*QtzAh@`O7w|p+ zG7U=LvK1i+1uUR~R0>U_H0sNVJ)i(0DF&#-2f{x%3R8dIpW%rHqpP;;M-H02uT!NMXAgAm|dID;0Zg@Uo+ zff1k!A9b{#k;06;fYnxtEdo#>A)879Bdncf3YQkh#NP=B(xFcvqBFLjCz9NXQDc;0 zJ*=XJCCq`bj{m|nXaLi017kVF&;YYU20)0!3lt!7{_}{72%W4r+V6)42Yt-L zLjZ;b<1nfKrr(M<0kJ^PXv4!{)BvPrpYHQ^vs+Qpk5mZe+%W`XG62aEcSsOnB^e2u z2Onh_r)TLX*_QffJn=y=E{Xs&612e>i(sd$#DRwZqM+epF9-@DEC50X-Wim7BddW7 z-_$uU7MkNWgq0xLB#?nN0mL&X8BEiJo2FPB^@B&nCAR!`VpwQlI1pw7fC=Cb zfzTF#Vq)}eqlrEgfIfD?LW~|ph!HVMOorTYHTxwjcu%6XA$RGTZ-|KD#9?64+LESZ5FwNAKE_TEhKgsd2PR&V%je;q)8n^o9udI*4rr^mbREe%3LyqKfGQ#|254dynFj|3 z0VOGM0V-QK3=C{pmNhW=Fe!XzG@w8TaRf^sG%y4~Bf{)6Wfw=X#Is;{XN<6BdOp+H zEmtl#qo)B8i6+YAe1Ml?rAa zQ8(?^(Ld;6-N9BU79t!frVAfi@SzakZtR1FTS)bDNb!B_@la@R5rm)wG4QA51o3@O z-_ir1L1tltD*x>N9~|0op9yV|w%uO9y6R)$NdO0ZcnEPHESLrc2#~2A-VAOcL7~Mu zR8b39e4;wKXY@-9eFnmUyk@9RD1_)?6E*_ei9>L485#;BF*|nuh%0Kbc@d<-b|mJ) zVlW8W3N!s)uRB14I^lidNqYx_g-e$H6bjrE>(=2}Zx#TV#Uetq0j#2j%=J=Kq6NTa z1gb#Tb|fMo5IDn+!SG~I=nNXcXpEp_&nufai9QkxU}Fh0&`7OOnj2S34?vm4QF*WY2CQ#c0FupD9oS+A0EsK+QW zjGv3A8&L0|-JslGVSA8(8l1TZ5K@M#!yqJj_+8dygMgbcun zMMRV^R;Yt7TiBLLK-^MAITTR(Le?glqLGOXE+GbBqliMd!AMz=NJBai!~d`tX_J#% zLJN=MI5P|`Wzhx?cLZ*q79gG`p7dr?*0td4YLW~<|BS97*Wmu2V z%~7R-2eWEZ+q8Uv~0T2ZTMHHZM0S&~+0>LT8 z3sN;fDojdih)k$EIBAcb1WQ=r5yuP&7(ga`+=h(^HMr;@1YyjLZOg~HpgSfK%ppT=s-ckDM^{Qw);f%@c5vl{ zrOhLRwyM{ntX`o~2wPln;bZeYJY?;R4ld$#^g%d@Ih65Pcpomp#%Pa?K;lAxiik82 z!Qeq;XmxV&ZQeJa{zd}VaEUxdfa>4pECvl=sNyr}-(c`c$F`~~2@wDogir^7ZLkG4 z&_pJ{@oAxu=)ef#H4G6X^dw-R5=C&hhf3LQtbC8wg)SNB!bSK!{23S_EG*zKj={rg z*bNyVND?H7XcTs3j7%wl8v+Q1C;olL!OY9VFG=9PoP%uHlK@e;l1tWD;iH6YY(9kM zxCBTL0G6Ny1%-yRTtbB{x7di$F7~2AmCi=zT3M$lI0Ccq z3^Z!A%myL$k-3p`(Ijzeol3;)|2I zX1M}nR_+6IXUc4@l@y4$@XodPcv5 zPz8lcXoLccL%{^N@Mw4zl#n1q6KCvy0f4|jC(+UQR!*2$y6w_PBsbBk zZuOkwpq^9FZ(uv5dHVDJFGSlZ0*~qRwZsgm0VEEX5V=LEN=Pjg@q?S_W>wuTl*JNhAi<=?X<`UR+J;9-3{;x5?;{8&W>5)6SnT^4H;bT-e{}nD zj3a%ui<$w5AVRPJyaPXp88|8G@Hj#wN0n$6O#uWe5rB-fSw>Fs#&#zD?Zs=L{(`ZB zc8hu+1=OZJ04NGqauFi4^-~G7ZZASI@2S@@cXV8Sduw*8);se*8mn6ucFS9h|Ci;z z;R*s|H-rM)^X4vSQRq*(w0gL0i}w^F|v^nV-n1M~d?%7p;*Yh#`R3 zPt?!1+(`#<@byM4S<{@LA})H5YvwY zvnU7~!F74MbbfaJ3Gck5YnCloCJ}M-^vdS1GhB0g9zQq!7N@X{>>Ux;0wi!lWO`vJ zY0H8uRs#?PYK*U0r_JxlmF2we&65L#y&7(94}v-aC=fkG450qU{XXWMCTQ@O__z_ElZ@$Cq-x1Oi|NzV zmUmx1{Pfki4bAzqrcvyUi>ru!XYm13|DXQpIes3$kEhW>j7cebSc7Z1)GckPlM+

    $v#By$3)IH9$qQ+@!Bj|N8ZHy=@PsA4@HcF*jVn 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 L!7eA#>3!S*wWsO- literal 0 HcmV?d00001 From 4c4f42f7c5de6890cd75cf7d4321d54ad7eb539c Mon Sep 17 00:00:00 2001 From: Lennoard Date: Sun, 17 Aug 2025 17:28:16 -0300 Subject: [PATCH 16/18] feature: added support for landscape orientation --- .../sysctlgui/ui/main/AppNavHost.kt | 6 +- .../sysctlgui/ui/main/MainActivity.kt | 1 - .../sysctlgui/ui/main/MainNavBar.kt | 48 +--- .../sysctlgui/ui/main/MainNavRail.kt | 77 +++++ .../sysctlgui/ui/main/MainScreen.kt | 35 ++- .../ui/main/TopLevelRouteProvider.kt | 46 +++ .../ui/params/browse/ParamBrowseScreen.kt | 33 ++- .../ui/params/browse/ParamBrowseViewModel.kt | 21 +- .../params/edit/EditParamLandscapeContent.kt | 267 ++++++++++++++++++ .../ui/params/edit/EditParamScreen.kt | 74 +++-- .../ui/presets/ImportPresetScreen.kt | 152 +++++++++- .../sysctlgui/ui/presets/PresetsScreen.kt | 63 +++-- .../sysctlgui/ui/search/SearchScreen.kt | 68 +++-- .../sysctlgui/ui/settings/SettingsScreen.kt | 64 +++-- .../sysctlgui/ui/user/UserParamsScreen.kt | 45 +-- .../sysctlgui/design/utils/UiUtils.kt | 12 + 16 files changed, 843 insertions(+), 169 deletions(-) create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavRail.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/TopLevelRouteProvider.kt create mode 100644 app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamLandscapeContent.kt create mode 100644 common/design/src/main/java/com/androidvip/sysctlgui/design/utils/UiUtils.kt diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt index a058f77..e64c1f7 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt @@ -5,7 +5,6 @@ import androidx.compose.animation.fadeOut import androidx.compose.animation.scaleIn import androidx.compose.animation.scaleOut import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalView @@ -24,12 +23,13 @@ import com.androidvip.sysctlgui.ui.user.UserParamsScreen @Composable internal fun AppNavHost( - innerPadding: PaddingValues, + modifier: Modifier = Modifier, + innerPadding: PaddingValues, // Handled in the outer scope, this is for inner scaffolds navController: NavHostController, startDestination: UiRoute = UiRoute.BrowseParams ) { NavHost( - modifier = Modifier.padding(innerPadding), + modifier = modifier, navController = navController, startDestination = startDestination, enterTransition = { scaleIn(initialScale = 0.9f) + fadeIn() }, diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt index 08cc9cd..01a668d 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt @@ -40,7 +40,6 @@ class MainActivity : ComponentActivity() { updateEdgeToEdgeConfiguration(forceDark) } - // TODO: Landscape Support SysctlGuiTheme( darkTheme = forceDark || isSystemInDarkTheme(), contrastLevel = themeState.contrastLevel, diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt index b493c5b..b2115d6 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt @@ -1,15 +1,6 @@ package com.androidvip.sysctlgui.ui.main import androidx.compose.animation.AnimatedContent -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Build -import androidx.compose.material.icons.outlined.FavoriteBorder -import androidx.compose.material.icons.outlined.Home -import androidx.compose.material.icons.outlined.Settings -import androidx.compose.material.icons.rounded.Build -import androidx.compose.material.icons.rounded.Favorite -import androidx.compose.material.icons.rounded.Home -import androidx.compose.material.icons.rounded.Settings import androidx.compose.material3.Icon import androidx.compose.material3.NavigationBar import androidx.compose.material3.NavigationBarItem @@ -17,7 +8,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.remember -import androidx.compose.ui.res.stringResource +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.PreviewDynamicColors import androidx.compose.ui.tooling.preview.PreviewLightDark @@ -27,45 +18,12 @@ import androidx.navigation.NavGraph.Companion.findStartDestination import androidx.navigation.NavHostController import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController -import com.androidvip.sysctlgui.R -import com.androidvip.sysctlgui.core.navigation.TopLevelRoute -import com.androidvip.sysctlgui.core.navigation.UiRoute import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme @Composable internal fun MainNavBar(navController: NavHostController = rememberNavController()) { - val browseParamsTitle = stringResource(R.string.browse) - val presetsTitle = stringResource(R.string.presets) - val favoritesTitle = stringResource(R.string.favorites) - val settingsTitle = stringResource(R.string.settings) - val topLevelRoutes = remember { - listOf( - TopLevelRoute( - name = browseParamsTitle, - route = UiRoute.BrowseParams, - selectedIcon = Icons.Rounded.Home, - unselectedIcon = Icons.Outlined.Home - ), - TopLevelRoute( - name = presetsTitle, - route = UiRoute.Presets, - selectedIcon = Icons.Rounded.Build, - unselectedIcon = Icons.Outlined.Build - ), - TopLevelRoute( - name = favoritesTitle, - route = UiRoute.Favorites, - selectedIcon = Icons.Rounded.Favorite, - unselectedIcon = Icons.Outlined.FavoriteBorder - ), - TopLevelRoute( - name = settingsTitle, - route = UiRoute.Settings, - selectedIcon = Icons.Rounded.Settings, - unselectedIcon = Icons.Outlined.Settings - ) - ) - } + val context = LocalContext.current + val topLevelRoutes = remember { TopLevelRouteProvider(context) } NavigationBar { val navBackStackEntry by navController.currentBackStackEntryAsState() diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavRail.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavRail.kt new file mode 100644 index 0000000..e16feb2 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavRail.kt @@ -0,0 +1,77 @@ +package com.androidvip.sysctlgui.ui.main + +import androidx.compose.animation.AnimatedContent +import androidx.compose.material3.Icon +import androidx.compose.material3.NavigationRail +import androidx.compose.material3.NavigationRailItem +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.PreviewLightDark +import androidx.navigation.NavDestination.Companion.hasRoute +import androidx.navigation.NavDestination.Companion.hierarchy +import androidx.navigation.NavGraph.Companion.findStartDestination +import androidx.navigation.NavHostController +import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.navigation.compose.rememberNavController +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme + +@Composable +internal fun MainNavRail(navController: NavHostController = rememberNavController()) { + val context = LocalContext.current + val topLevelRoutes = remember { TopLevelRouteProvider(context) } + + NavigationRail { + val navBackStackEntry by navController.currentBackStackEntryAsState() + val currentDestination = navBackStackEntry?.destination + + topLevelRoutes.forEach { route -> + val selected = currentDestination + ?.hierarchy + ?.any { it.hasRoute(route.route::class) } == true + + NavigationRailItem( + icon = { + AnimatedContent(targetState = selected) { selectedState -> + Icon( + imageVector = if (selectedState) { + route.selectedIcon + } else { + route.unselectedIcon + }, + contentDescription = route.name, + ) + } + }, + label = { + Text( + text = route.name, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + }, + selected = selected, + onClick = { + navController.navigate(route.route) { + popUpTo(navController.graph.findStartDestination().id) { + saveState = true + } + launchSingleTop = true + restoreState = true + } + } + ) + } + } +} + +@Composable +@PreviewLightDark +private fun MainNavbarPreview() { + SysctlGuiTheme(dynamicColor = true) { + MainNavRail() + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt index 7005d0a..613c15e 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt @@ -2,12 +2,18 @@ package com.androidvip.sysctlgui.ui.main import androidx.activity.compose.LocalOnBackPressedDispatcherOwner import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.expandHorizontally import androidx.compose.animation.expandVertically import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut +import androidx.compose.animation.shrinkHorizontally import androidx.compose.animation.shrinkVertically +import androidx.compose.animation.slideInHorizontally import androidx.compose.animation.slideInVertically +import androidx.compose.animation.slideOutHorizontally import androidx.compose.animation.slideOutVertically +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.padding import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Scaffold import androidx.compose.material3.SnackbarDuration @@ -17,6 +23,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.PreviewDynamicColors import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -24,6 +31,7 @@ import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController import com.androidvip.sysctlgui.core.navigation.UiRoute import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.design.utils.isLandscape import org.koin.androidx.compose.koinViewModel @OptIn(ExperimentalMaterial3Api::class) @@ -60,6 +68,7 @@ private fun MainScreenContent( startDestination: UiRoute = UiRoute.BrowseParams ) { val onBackPressedDispatcherOwner = LocalOnBackPressedDispatcherOwner.current + val isLandscape = isLandscape() Scaffold( topBar = { @@ -82,7 +91,7 @@ private fun MainScreenContent( }, bottomBar = { AnimatedVisibility( - visible = state.showNavBar, + visible = state.showNavBar && !isLandscape, enter = expandVertically() + slideInVertically { it / 2 } + fadeIn(), exit = shrinkVertically() + slideOutVertically { it / 2 } + fadeOut(), label = "BottomBar" @@ -94,11 +103,25 @@ private fun MainScreenContent( SnackbarHost(snackbarHostState) }, content = { innerPadding -> - AppNavHost( - innerPadding = innerPadding, - navController = navController, - startDestination = startDestination - ) + Row(Modifier.padding(innerPadding)) { + if (isLandscape) { + AnimatedVisibility( + visible = state.showNavBar, + enter = expandHorizontally() + slideInHorizontally { it / 2 } + fadeIn(), + exit = shrinkHorizontally() + slideOutHorizontally { it / 2 } + fadeOut(), + label = "NavRail" + ) { + MainNavRail(navController = navController) + } + } + + AppNavHost( + modifier = Modifier.weight(1f), + innerPadding = innerPadding, + navController = navController, + startDestination = startDestination + ) + } } ) } diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/TopLevelRouteProvider.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/TopLevelRouteProvider.kt new file mode 100644 index 0000000..cb5bb7f --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/TopLevelRouteProvider.kt @@ -0,0 +1,46 @@ +package com.androidvip.sysctlgui.ui.main + +import android.content.Context +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Build +import androidx.compose.material.icons.outlined.FavoriteBorder +import androidx.compose.material.icons.outlined.Home +import androidx.compose.material.icons.outlined.Settings +import androidx.compose.material.icons.rounded.Build +import androidx.compose.material.icons.rounded.Favorite +import androidx.compose.material.icons.rounded.Home +import androidx.compose.material.icons.rounded.Settings +import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.core.navigation.TopLevelRoute +import com.androidvip.sysctlgui.core.navigation.UiRoute + +object TopLevelRouteProvider { + operator fun invoke(context: Context): List> { + return listOf( + TopLevelRoute( + name = context.getString(R.string.browse), + route = UiRoute.BrowseParams, + selectedIcon = Icons.Rounded.Home, + unselectedIcon = Icons.Outlined.Home + ), + TopLevelRoute( + name = context.getString(R.string.presets), + route = UiRoute.Presets, + selectedIcon = Icons.Rounded.Build, + unselectedIcon = Icons.Outlined.Build + ), + TopLevelRoute( + name = context.getString(R.string.favorites), + route = UiRoute.Favorites, + selectedIcon = Icons.Rounded.Favorite, + unselectedIcon = Icons.Outlined.FavoriteBorder + ), + TopLevelRoute( + name = context.getString(R.string.settings), + route = UiRoute.Settings, + selectedIcon = Icons.Rounded.Settings, + unselectedIcon = Icons.Outlined.Settings + ) + ) + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt index ec7f5f4..faea61b 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseScreen.kt @@ -18,8 +18,11 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.GridItemSpan +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.foundation.lazy.grid.rememberLazyGridState import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.pullrefresh.PullRefreshIndicator import androidx.compose.material.pullrefresh.pullRefresh @@ -50,11 +53,13 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.androidvip.sysctlgui.R import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.design.utils.isLandscape import com.androidvip.sysctlgui.domain.models.KernelParam import com.androidvip.sysctlgui.domain.models.ParamDocumentation import com.androidvip.sysctlgui.models.UiKernelParam @@ -151,7 +156,7 @@ private fun ParamBrowseScreenContent( isRefreshing: Boolean, onRefresh: () -> Unit ) { - val listState = rememberLazyListState() + val listState = rememberLazyGridState() val pullRefreshState = rememberPullRefreshState(refreshing = isRefreshing, onRefresh = onRefresh) var headerVisible by remember { mutableStateOf(backEnabled) } @@ -196,25 +201,32 @@ private fun ParamBrowseScreenContent( .pullRefresh(pullRefreshState), ) { val spacerHeight by animateDpAsState(if (finalHeaderVisible) 56.dp else 0.dp) - LazyColumn( + val columns = if (isLandscape()) 2 else 1 + LazyVerticalGrid( + columns = GridCells.Fixed(columns), state = listState, modifier = Modifier.fillMaxSize() ) { - item { Spacer(modifier = Modifier.height(spacerHeight)) } + item(span = { GridItemSpan(columns) }) { + Spacer(modifier = Modifier.height(spacerHeight)) + } items( - count = params.size, - key = { index -> params[index].name } - ) { index -> + items = params, + key = { param -> param.name } + ) { param -> ParamFileRow( modifier = Modifier.animateItem(), - param = params[index], + param = param, + showFavoriteIcon = true, onParamClicked = onParamClicked, ) } if (documentation != null) { - item { Spacer(modifier = Modifier.height(56.dp)) } + item(span = { GridItemSpan(columns) }) { + Spacer(modifier = Modifier.height(56.dp)) + } } } @@ -302,6 +314,7 @@ private fun InfoItem( @Composable @PreviewLightDark +@Preview(device = "spec:parent=pixel_5,orientation=landscape") internal fun ParamBrowseScreenContentPreview() { fun mapFilesToParams(files: Array?): List { return files?.map { file -> diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt index 1a36e1a..30109b2 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/ParamBrowseViewModel.kt @@ -5,6 +5,7 @@ import com.androidvip.sysctlgui.domain.models.KernelParam import com.androidvip.sysctlgui.domain.repository.AppPrefs import com.androidvip.sysctlgui.domain.usecase.GetParamDocumentationUseCase import com.androidvip.sysctlgui.domain.usecase.GetParamsFromFilesUseCase +import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase import com.androidvip.sysctlgui.helpers.UiKernelParamMapper import com.androidvip.sysctlgui.models.UiKernelParam import com.androidvip.sysctlgui.utils.BaseViewModel @@ -20,9 +21,12 @@ import java.io.File class ParamBrowseViewModel( private val getParamsFromFiles: GetParamsFromFilesUseCase, private val getParamDocumentation: GetParamDocumentationUseCase, + private val getUserParams: GetUserParamsUseCase, private val appPrefs: AppPrefs, private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO ) : BaseViewModel() { + private val userParams = mutableListOf() + override fun createInitialState() = ParamBrowseState() init { @@ -31,6 +35,11 @@ class ParamBrowseViewModel( val startingDirectory = File(Consts.PROC_SYS) val params = getParams(startingDirectory) + runCatching { + userParams.clear() + userParams.addAll(getUserParams()) + } + setState { copy( params = params, @@ -64,7 +73,9 @@ class ParamBrowseViewModel( viewModelScope.launch { setState { copy(loading = true) } runCatching { - val newParamsDeferred = async { getParams(File(parentParam.path)) } + val newParamsDeferred = async { + getParams(File(parentParam.path)) + } val directoryDocumentationDeferred = async { runCatching { getParamDocumentation(parentParam) }.getOrNull() } @@ -119,7 +130,13 @@ class ParamBrowseViewModel( rootAwareFile.listFiles()?.toList() ?: emptyList() } - val params = getParamsFromFiles(fileList).map(UiKernelParamMapper::map) + val params = getParamsFromFiles(fileList).map { fileParam -> + UiKernelParamMapper.map(fileParam).copy( + isFavorite = userParams + .filter { it.isFavorite } + .any { it.name == fileParam.name } + ) + } if (appPrefs.listFoldersFirst) { params.sortedByDescending { it.isDirectory } diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamLandscapeContent.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamLandscapeContent.kt new file mode 100644 index 0000000..7a40198 --- /dev/null +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamLandscapeContent.kt @@ -0,0 +1,267 @@ +package com.androidvip.sysctlgui.ui.params.edit + +import android.content.ClipData +import android.widget.Toast +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.foundation.background +import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.AssistChip +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.scale +import androidx.compose.ui.platform.ClipEntry +import androidx.compose.ui.platform.LocalClipboard +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.domain.enums.CommitMode +import com.androidvip.sysctlgui.domain.models.ParamDocumentation +import com.androidvip.sysctlgui.models.UiKernelParam +import com.androidvip.sysctlgui.ui.components.ErrorContainer +import com.androidvip.sysctlgui.utils.performHapticFeedbackForToggle +import kotlinx.coroutines.launch +import org.intellij.lang.annotations.Language + +@Composable +internal fun EditParamLandscapeContent( + state: EditParamViewState, + showError: Boolean, + errorMessage: String, + onDocsReadMorePressed: () -> Unit, + onValueApply: (String) -> Unit, + onFavoriteToggle: (Boolean) -> Unit, + onTaskerClicked: (Boolean) -> Unit, + onErrorAnimationEnd: () -> Unit, + taskerListNameResolver: (Int) -> String = { "List #$it" }, +) { + val param = state.kernelParam + val view = LocalView.current + val context = LocalContext.current + val coroutineScope = rememberCoroutineScope() + val clipboardManager = LocalClipboard.current + val copyParamContentToClipboard = { + val clipData = ClipData.newPlainText( + context.getString(R.string.kernel_params), + "${param.lastNameSegment}=${param.value} (${param.path})" + ) + val clipEntry = ClipEntry(clipData) + coroutineScope.launch { + clipboardManager.setClipEntry(clipEntry) + } + Toast.makeText( + context, + context.getString(R.string.copied_to_clipboard), + Toast.LENGTH_SHORT + ).show() + } + + Row { + Column( + modifier = Modifier + .weight(1f) + .background(MaterialTheme.colorScheme.background) + .verticalScroll(rememberScrollState()) + ) { + Text( + text = param.lastNameSegment, + style = MaterialTheme.typography.displayMedium, + modifier = Modifier + .combinedClickable( + enabled = true, + indication = null, + interactionSource = remember { MutableInteractionSource() }, + onClick = { + Toast.makeText( + context, + context.getString(R.string.long_press_to_copy), + Toast.LENGTH_SHORT + ).show() + }, + onLongClick = copyParamContentToClipboard + ) + .padding(start = 16.dp, end = 16.dp, top = 24.dp), + maxLines = 3, + color = MaterialTheme.colorScheme.onBackground, + overflow = TextOverflow.Ellipsis + ) + + Row( + modifier = Modifier.padding( + horizontal = 16.dp, + vertical = if (param.isTaskerParam) 0.dp else 24.dp + ), + verticalAlignment = Alignment.CenterVertically + ) { + Column(modifier = Modifier.weight(1f)) { + Text( + text = param.name, + style = MaterialTheme.typography.titleMedium, + modifier = Modifier.padding(vertical = 8.dp), + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + + Text( + text = param.path, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + + Spacer(modifier = Modifier.width(8.dp)) + + if (state.taskerAvailable) { + TaskerButton( + isTaskerParam = param.isTaskerParam, + onToggle = { newState -> + performHapticFeedbackForToggle(newState, view) + onTaskerClicked(newState) + }, + modifier = Modifier.scale(0.85f) + ) + } + + FavoriteButton( + isFavorite = param.isFavorite, + onFavoriteClick = { newState -> + performHapticFeedbackForToggle(newState, view) + onFavoriteToggle(newState) + }, + modifier = Modifier.scale(0.85f) + ) + } + + AnimatedVisibility(visible = param.isTaskerParam && state.taskerAvailable) { + val listName = taskerListNameResolver(param.taskerList) + AssistChip( + onClick = { onTaskerClicked(true) }, + modifier = Modifier.padding(16.dp), + label = { Text(text = stringResource(R.string.tasker_list_format, listName)) }, + leadingIcon = { + Icon( + painter = painterResource(R.drawable.ic_tasker), + contentDescription = stringResource(R.string.tasker_list), + tint = MaterialTheme.colorScheme.tertiary + ) + } + ) + } + } + + Column( + modifier = Modifier + .weight(1f) + .background(MaterialTheme.colorScheme.surfaceContainer) + .verticalScroll(rememberScrollState()) + ) { + ParamValueContent( + modifier = Modifier.padding(16.dp), + param = param, + keyboardType = state.keyboardType, + onValueApply = onValueApply + ) + + AnimatedVisibility( + visible = showError && errorMessage.isNotEmpty(), + modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 16.dp) + ) { + ErrorContainer(message = errorMessage, onAnimationEnd = onErrorAnimationEnd) + } + + ParamDocs( + modifier = Modifier.padding(16.dp), + documentation = state.documentation, + onReadMorePressed = onDocsReadMorePressed + ) + } + } +} + +@Composable +@Preview(device = "spec:parent=pixel_5,orientation=landscape") +private fun EditParamContentPreview() { + + @Language("html") + val htmlDocs = """ +

    Correctable memory errors are very common on servers. + Soft-offline is kernel’s solution for memory pages having + (excessive) corrected memory errors.

    + +

    For different types_of page, soft-offline has different behaviors / costs.

    +
      +
    • For a raw error page, soft-offline migrates the in-use page’s content to a new raw page.
      • +
    • For a page that is part of a transparent hugepage, soft-offline splits the transparent hugepage into raw pages, then migrates only the raw error page. As a result, user is transparently backed by 1 less hugepage, impacting memory access performance.
      • +
    • For a page that is part of a HugeTLB hugepage, soft-offline first migrates the entire HugeTLB hugepage, during which a free hugepage will be consumed as migration target. Then the original hugepage is dissolved into raw pages without compensation, reducing the capacity of the HugeTLB pool by 1.
      • +
    • It is user’s call to choose between reliability (staying away from fragile physical memory) vs performance / capacity implications in transparent and HugeTLB cases.
      • +
    + """.trimIndent() + .replace( + "", + "" + ) + .replace("", "") + + var showError by remember { mutableStateOf(true) } + + SysctlGuiTheme(dynamicColor = true) { + Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { + + val state = EditParamViewState( + kernelParam = UiKernelParam( + name = "vm.enable_soft_offline", + path = "/proc/sys/vm/enable_soft_offline", + value = "1", + taskerList = 1, + isTaskerParam = false, + isFavorite = false + ), + taskerAvailable = true, + keyboardType = KeyboardType.Number, + documentation = ParamDocumentation( + title = "vm.enable_soft_offline", + documentationText = "", + documentationHtml = htmlDocs, + url = "url" + ), + ) + EditParamLandscapeContent( + state = state, + showError = showError, + errorMessage = "Sysctl command for 'wm.swappiness' executed, " + + "but output did not confirm the change. Output: 'Access denied'. " + + "Try using '${CommitMode.ECHO}' mode.", + onValueApply = {}, + onTaskerClicked = {}, + onDocsReadMorePressed = {}, + onFavoriteToggle = {}, + onErrorAnimationEnd = { showError = false } + ) + } + } +} diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt index c6bc4ac..016586d 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt @@ -75,6 +75,7 @@ import androidx.core.view.ViewCompat import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.androidvip.sysctlgui.R import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.design.utils.isLandscape import com.androidvip.sysctlgui.domain.enums.CommitMode import com.androidvip.sysctlgui.domain.models.ParamDocumentation import com.androidvip.sysctlgui.models.UiKernelParam @@ -154,26 +155,51 @@ fun EditParamScreen( } } - EditParamContent( - state = state.value, - showError = showError, - errorMessage = errorMessage, - onValueApply = { - viewModel.onEvent(EditParamViewEvent.ApplyPressed(it)) - }, - onTaskerClicked = { - showSelectTaskerListDialog = it - viewModel.onEvent(EditParamViewEvent.TaskerTogglePressed(it, selectedOptionIndex)) - }, - onDocsReadMorePressed = { - viewModel.onEvent(EditParamViewEvent.DocumentationReadMoreClicked) - }, - onFavoriteToggle = { - viewModel.onEvent(EditParamViewEvent.FavoriteTogglePressed(it)) - }, - onErrorAnimationEnd = { showError = false }, - taskerListNameResolver = { listId -> taskerListOptions.getOrNull(listId).orEmpty() } - ) + if (isLandscape()) { + EditParamLandscapeContent( + state = state.value, + showError = showError, + errorMessage = errorMessage, + onValueApply = { + viewModel.onEvent(EditParamViewEvent.ApplyPressed(it)) + }, + onTaskerClicked = { + showSelectTaskerListDialog = it + viewModel.onEvent(EditParamViewEvent.TaskerTogglePressed(it, selectedOptionIndex)) + }, + onDocsReadMorePressed = { + viewModel.onEvent(EditParamViewEvent.DocumentationReadMoreClicked) + }, + onFavoriteToggle = { + viewModel.onEvent(EditParamViewEvent.FavoriteTogglePressed(it)) + }, + onErrorAnimationEnd = { showError = false }, + taskerListNameResolver = { listId -> + taskerListOptions.getOrNull(listId).orEmpty() + } + ) + } else { + EditParamContent( + state = state.value, + showError = showError, + errorMessage = errorMessage, + onValueApply = { + viewModel.onEvent(EditParamViewEvent.ApplyPressed(it)) + }, + onTaskerClicked = { + showSelectTaskerListDialog = it + viewModel.onEvent(EditParamViewEvent.TaskerTogglePressed(it, selectedOptionIndex)) + }, + onDocsReadMorePressed = { + viewModel.onEvent(EditParamViewEvent.DocumentationReadMoreClicked) + }, + onFavoriteToggle = { + viewModel.onEvent(EditParamViewEvent.FavoriteTogglePressed(it)) + }, + onErrorAnimationEnd = { showError = false }, + taskerListNameResolver = { listId -> taskerListOptions.getOrNull(listId).orEmpty() } + ) + } SingleChoiceDialog( showDialog = showSelectTaskerListDialog, @@ -344,7 +370,7 @@ private fun EditParamContent( } @Composable -private fun ParamValueContent( +fun ParamValueContent( modifier: Modifier = Modifier, param: UiKernelParam, keyboardType: KeyboardType, @@ -416,7 +442,7 @@ private fun ParamValueContent( } @Composable -fun EditableParamValue( +internal fun EditableParamValue( isEditing: Boolean, paramValue: String, editedValue: String, @@ -462,7 +488,7 @@ fun EditableParamValue( } @Composable -private fun ParamDocs( +internal fun ParamDocs( modifier: Modifier = Modifier, documentation: ParamDocumentation?, onReadMorePressed: () -> Unit, @@ -517,7 +543,7 @@ private fun ParamDocs( } @Composable -private fun DocumentationContent( +internal fun DocumentationContent( documentation: ParamDocumentation, onReadMorePressed: () -> Unit ) { diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/ImportPresetScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/ImportPresetScreen.kt index 00a2e1d..1184ab9 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/ImportPresetScreen.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/ImportPresetScreen.kt @@ -58,6 +58,7 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.androidvip.sysctlgui.R import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.design.utils.isLandscape import com.androidvip.sysctlgui.domain.models.KernelParam import com.androidvip.sysctlgui.ui.main.MainViewEvent import com.androidvip.sysctlgui.ui.main.MainViewModel @@ -122,15 +123,27 @@ fun ImportPresetScreen( ) { targetState -> when (targetState) { IncomingPresetsScreenState.Idle -> { - IncomingPresetsContent( - paramsToImport = state.paramsToImport, - onImportPressed = { - viewModel.onEvent(PresetsViewEvent.ConfirmImportPressed) - }, - onCancelPressed = { - viewModel.onEvent(PresetsViewEvent.CancelImportPressed) - } - ) + if (isLandscape()) { + IncomingPresetsLandscapeContent( + paramsToImport = state.paramsToImport, + onImportPressed = { + viewModel.onEvent(PresetsViewEvent.ConfirmImportPressed) + }, + onCancelPressed = { + viewModel.onEvent(PresetsViewEvent.CancelImportPressed) + } + ) + } else { + IncomingPresetsContent( + paramsToImport = state.paramsToImport, + onImportPressed = { + viewModel.onEvent(PresetsViewEvent.ConfirmImportPressed) + }, + onCancelPressed = { + viewModel.onEvent(PresetsViewEvent.CancelImportPressed) + } + ) + } } IncomingPresetsScreenState.Loading -> { @@ -266,6 +279,127 @@ private fun IncomingPresetsContent( } } +@Composable +private fun IncomingPresetsLandscapeContent( + paramsToImport: List, + onImportPressed: () -> Unit, + onCancelPressed: () -> Unit +) { + Row( + modifier = Modifier.fillMaxSize(), + horizontalArrangement = Arrangement.spacedBy(16.dp) + ) { + LazyColumn( + modifier = Modifier + .fillMaxWidth() + .weight(1f) + ) { + itemsIndexed( + items = paramsToImport, + key = { index, item -> item.name } + ) { index, item -> + Row( + modifier = Modifier + .height(IntrinsicSize.Min) + .fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + Box( + modifier = Modifier + .width(36.dp) + .fillMaxHeight() + .background(MaterialTheme.colorScheme.surfaceContainerHigh) + ) { + Text( + text = "${index + 1}", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface, + fontFamily = FontFamily.Monospace, + fontWeight = FontWeight.Medium, + textAlign = TextAlign.End, + modifier = Modifier + .fillMaxWidth() + .padding(4.dp) + ) + } + + val text = buildAnnotatedString { + withStyle( + SpanStyle( + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.primary + ) + ) { + append(item.name) + } + append("=") + withStyle( + SpanStyle( + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.tertiary + ) + ) { + append(item.value) + } + } + Text( + text = text, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface, + fontFamily = FontFamily.Monospace, + fontWeight = FontWeight.Medium, + modifier = Modifier + .weight(1f) + .padding(4.dp) + ) + } + } + } + + Column( + modifier = Modifier + .fillMaxHeight() + .weight(1f), + verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + text = stringResource(R.string.parameters_found_format, paramsToImport.size), + style = MaterialTheme.typography.headlineMedium, + color = MaterialTheme.colorScheme.onBackground, + textAlign = TextAlign.Center, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 24.dp) + ) + + Row( + modifier = Modifier.padding(16.dp), + horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterHorizontally) + ) { + OutlinedButton( + modifier = Modifier.weight(1f), + onClick = onCancelPressed + ) { + Text(text = stringResource(android.R.string.cancel)) + } + + OutlinedButton( + modifier = Modifier.weight(1f), + onClick = onImportPressed, + enabled = paramsToImport.isNotEmpty(), + colors = ButtonDefaults.outlinedButtonColors( + containerColor = MaterialTheme.colorScheme.primary, + contentColor = MaterialTheme.colorScheme.onPrimary + ) + ) { + Text(text = stringResource(R.string.import_text)) + } + } + } + } +} + @Composable private fun LoadingIndicator() { Column( diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt index 5b4d1ea..49462bd 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt @@ -36,12 +36,13 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.tooling.preview.PreviewDynamicColors +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.androidvip.sysctlgui.R import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.design.utils.isLandscape import com.androidvip.sysctlgui.ui.components.ErrorContainer import com.androidvip.sysctlgui.ui.main.MainViewEvent import com.androidvip.sysctlgui.ui.main.MainViewModel @@ -136,18 +137,22 @@ private fun PresetsScreenContent( .padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp) ) { - ImportCards( - onClick = onImportPressed, - title = stringResource(R.string.import_text), - description = stringResource(R.string.import_presets_description), - iconRes = R.drawable.ic_import - ) - ImportCards( - onClick = onExportPressed, - title = stringResource(R.string.export), - description = stringResource(R.string.export_presets_description), - iconRes = R.drawable.ic_export - ) + if (isLandscape()) { + Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + ImportCards( + onImportPressed = onImportPressed, + onExportPressed = onExportPressed, + modifier = Modifier.weight(1f) + ) + } + } else { + ImportCards( + onImportPressed = onImportPressed, + onExportPressed = onExportPressed, + modifier = Modifier.fillMaxWidth(1f) + ) + } + Spacer(modifier = Modifier.weight(1f)) @@ -163,8 +168,34 @@ private fun PresetsScreenContent( } @Composable -private fun ImportCards(onClick: () -> Unit, title: String, description: String, iconRes: Int) { - Card(onClick = onClick, modifier = Modifier.fillMaxWidth()) { +private fun ImportCards( + onImportPressed: () -> Unit, + onExportPressed: () -> Unit, + modifier: Modifier = Modifier +) { + ImportCard( + onClick = onImportPressed, + modifier = modifier, + title = stringResource(R.string.import_text), + description = stringResource(R.string.import_presets_description), + iconRes = R.drawable.ic_import + ) + ImportCard( + modifier = modifier, + onClick = onExportPressed, + title = stringResource(R.string.export), + description = stringResource(R.string.export_presets_description), + iconRes = R.drawable.ic_export + ) +} + +@Composable +private fun ImportCard( + modifier: Modifier = Modifier, + onClick: () -> Unit, title: String, + description: String, iconRes: Int +) { + Card(onClick = onClick, modifier = modifier) { Row( modifier = Modifier .padding(16.dp) @@ -200,7 +231,7 @@ private fun ImportCards(onClick: () -> Unit, title: String, description: String, @Composable @PreviewLightDark -@PreviewDynamicColors +@Preview(device = "spec:parent=pixel_5,orientation=landscape") private fun PresetsScreenPreview() { SysctlGuiTheme(dynamicColor = true) { Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt index d376049..cea7c9d 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt @@ -15,9 +15,11 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.items -import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.GridItemSpan +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.foundation.lazy.grid.itemsIndexed import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.rounded.ArrowBack import androidx.compose.material.icons.rounded.Clear @@ -52,6 +54,7 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.androidvip.sysctlgui.R import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.design.utils.isLandscape import com.androidvip.sysctlgui.models.SearchHint import com.androidvip.sysctlgui.models.UiKernelParam import com.androidvip.sysctlgui.ui.main.MainViewEvent @@ -262,10 +265,18 @@ private fun SearchViewContent( ) { val historyHints = searchHints.filter { it.isFromHistory } val suggestionHints = searchHints.filter { !it.isFromHistory } + val columnsCount = if (isLandscape()) 2 else 1 + val hintItemColumns = GridCells.Fixed(columnsCount) - LazyColumn(modifier = Modifier.fillMaxWidth()) { + LazyVerticalGrid( + columns = hintItemColumns, + modifier = Modifier.fillMaxWidth() + ) { if (historyHints.isNotEmpty()) { - item(key = "history_header") { + item( + key = "history_header", + span = { GridItemSpan(maxLineSpan) } + ) { Text( text = stringResource(R.string.recent_searches), style = MaterialTheme.typography.titleSmall, @@ -273,6 +284,7 @@ private fun SearchViewContent( color = MaterialTheme.colorScheme.primary, modifier = Modifier .animateItem() + .fillMaxWidth() .padding(horizontal = 16.dp, vertical = 12.dp) ) } @@ -307,22 +319,37 @@ private fun SearchViewContent( } .animateItem() .fillMaxWidth() - .padding(horizontal = 16.dp) + .padding(horizontal = 8.dp, vertical = 4.dp) ) } + if (suggestionHints.isNotEmpty()) { - item { HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp)) } + item( + key = "history_suggestion_divider", + span = { GridItemSpan(maxLineSpan) } + ) { + HorizontalDivider( + modifier = Modifier + .padding(vertical = 8.dp) + .padding(horizontal = 16.dp) + ) + } } } if (suggestionHints.isNotEmpty()) { - item { + item( + key = "suggestions_header", + span = { GridItemSpan(maxLineSpan) } + ) { Text( text = stringResource(R.string.suggestions), style = MaterialTheme.typography.titleSmall, color = MaterialTheme.colorScheme.primary, fontWeight = FontWeight.Bold, - modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp) + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 12.dp) ) } items(suggestionHints, key = { "hint:${it.hint}" }) { hintItem -> @@ -338,13 +365,16 @@ private fun SearchViewContent( onSearchActiveChange(false) } .fillMaxWidth() - .padding(horizontal = 16.dp) + .padding(horizontal = 8.dp, vertical = 4.dp) // Padding for grid spacing ) } } if (searchHints.isEmpty() && searchQuery.isBlank()) { - item { + item( + key = "empty_search_suggestions", + span = { GridItemSpan(maxLineSpan) } + ) { Box( modifier = Modifier .fillMaxWidth() @@ -364,21 +394,25 @@ private fun SearchResultsContent( searchQuery: String, onParamClicked: (UiKernelParam) -> Unit ) { + val columns = if (isLandscape()) 2 else 1 if (searchResults.isNotEmpty()) { - LazyColumn( - modifier = Modifier - .fillMaxSize() - .padding(top = 8.dp) + LazyVerticalGrid( + columns = GridCells.Fixed(columns), + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(bottom = 8.dp) ) { itemsIndexed(searchResults) { index, param -> ParamRow( - modifier = Modifier.animateItem(), + modifier = Modifier + .animateItem() + .fillMaxWidth() + .padding(4.dp), param = param, showFullName = true, onParamClicked = onParamClicked ) - if (index < searchResults.lastIndex) { + if (columns == 1 && index < searchResults.lastIndex) { HorizontalDivider() } } diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt index 792d189..26df95b 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt @@ -9,7 +9,10 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.GridItemSpan +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -20,12 +23,14 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import androidx.core.content.ContextCompat import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.androidvip.sysctlgui.data.Prefs import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.design.utils.isLandscape import com.androidvip.sysctlgui.domain.enums.CommitMode import com.androidvip.sysctlgui.domain.enums.SettingItemType import com.androidvip.sysctlgui.domain.models.AppSetting @@ -112,34 +117,52 @@ private fun SettingsScreenContent( onValueChanged: (AppSetting<*>, Any) -> Unit ) { val groupedSettings = settings.groupBy { it.category } - LazyColumn(modifier = Modifier.fillMaxWidth()) { - groupedSettings.forEach { (category, settings) -> - item { + val columns = if (isLandscape()) 2 else 1 + + LazyVerticalGrid( + columns = GridCells.Fixed(columns), + modifier = Modifier.fillMaxWidth() + ) { + groupedSettings.forEach { (category, categorySettings) -> + item(span = { GridItemSpan(columns) }) { Text( text = category, style = MaterialTheme.typography.titleMedium, color = MaterialTheme.colorScheme.primary, - modifier = Modifier.padding( - top = 8.dp, - bottom = 8.dp, - start = 56.dp, - end = 16.dp, - ) + modifier = Modifier + .fillMaxWidth() + .padding( + top = 8.dp, + bottom = 8.dp, + start = if (columns > 1) 16.dp else 56.dp, + end = 16.dp, + ) ) } - items(settings.size) { - val appSetting = settings[it] + + items( + items = categorySettings, + key = { setting -> setting.key } + ) { appSetting -> + val itemModifier = if (columns > 1) { + Modifier + .fillMaxWidth() + .padding(horizontal = 8.dp, vertical = 4.dp) + } else { + Modifier.fillMaxWidth() + } + when (appSetting.type) { SettingItemType.Text -> { HeaderComponent( - modifier = Modifier.fillMaxWidth(), + modifier = itemModifier, appSetting = appSetting, onClick = onNavigateToUserParams ) } SettingItemType.List -> { TextSettingComponent( - modifier = Modifier.fillMaxWidth(), + modifier = itemModifier, appSetting = appSetting, onValueChange = { newValue -> onValueChanged(appSetting, newValue) @@ -148,7 +171,7 @@ private fun SettingsScreenContent( } SettingItemType.Switch -> { SwitchSettingComponent( - modifier = Modifier.fillMaxWidth(), + modifier = itemModifier, appSetting = appSetting, onValueChange = { newValue -> onValueChanged(appSetting, newValue) @@ -157,7 +180,7 @@ private fun SettingsScreenContent( } SettingItemType.Slider -> { SliderSettingComponent( - modifier = Modifier.fillMaxWidth(), + modifier = itemModifier, appSetting = appSetting, onValueChange = { newValue -> onValueChanged(appSetting, newValue) @@ -172,6 +195,7 @@ private fun SettingsScreenContent( @Composable @PreviewLightDark +@Preview(device = "spec:parent=pixel_5,orientation=landscape") internal fun SettingsScreenPreview() { SysctlGuiTheme { val settings = listOf( @@ -184,6 +208,14 @@ internal fun SettingsScreenPreview() { description = "List folders first when using the kernel parameter browser option", type = SettingItemType.Switch, ), + AppSetting( + key = Prefs.GuessInputType.key, + value = true, + category = "General", + title = "Guess input type", + description = "Description", + type = SettingItemType.Switch, + ), /////////// THEME SETTINGS //////////// diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt index e32aa7c..75bca1d 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt @@ -13,10 +13,11 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.itemsIndexed +import androidx.compose.foundation.lazy.grid.rememberLazyGridState import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.SwipeToDismissBox @@ -36,11 +37,12 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.PreviewScreenSizes import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.androidvip.sysctlgui.R import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme +import com.androidvip.sysctlgui.design.utils.isLandscape import com.androidvip.sysctlgui.domain.models.KernelParam import com.androidvip.sysctlgui.models.UiKernelParam import com.androidvip.sysctlgui.ui.main.MainViewEffect @@ -95,7 +97,10 @@ fun UserParamsScreen( is UserParamsViewEffect.ShowUndoSnackBar -> { mainViewModel.onEvent( MainViewEvent.ShowSnackbarRequested( - message = context.getString(R.string.favorite_param_deleted_format, effect.param.name), + message = context.getString( + R.string.favorite_param_deleted_format, + effect.param.name + ), actionLabel = context.getString(R.string.undo) ) ) @@ -123,7 +128,9 @@ private fun FavoritesScreenContent( onParamClicked: (UiKernelParam) -> Unit, onParamDeleteRequested: (UiKernelParam) -> Unit ) { - val listState = rememberLazyListState() + val isLandscape = isLandscape() + val gridState = rememberLazyGridState() + val columns = if (isLandscape) 2 else 1 AnimatedVisibility(visible = loading, enter = fadeIn(), exit = fadeOut()) { Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { @@ -156,15 +163,15 @@ private fun FavoritesScreenContent( return } - LazyColumn( - state = listState, + LazyVerticalGrid( + columns = GridCells.Fixed(columns), + state = gridState, modifier = Modifier.fillMaxSize() ) { - items( - count = favoriteParams.size, - key = { index -> favoriteParams[index].name } - ) { index -> - val param = favoriteParams[index] + itemsIndexed( + items = favoriteParams, + key = { _, param -> param.name } + ) { index, param -> var showParam by remember { mutableStateOf(true) } val dismissState = rememberSwipeToDismissBoxState() @@ -211,23 +218,21 @@ private fun FavoritesScreenContent( } ) { ParamFileRow( - modifier = Modifier.background(MaterialTheme.colorScheme.background), + modifier = Modifier + .background(MaterialTheme.colorScheme.background) + .fillMaxWidth(), param = param, - showFavoriteIcon = false, + showFavoriteIcon = true, onParamClicked = onParamClicked ) } } - - if (index < favoriteParams.lastIndex && showParam) { - HorizontalDivider() - } } } } @Composable -@Preview +@PreviewScreenSizes private fun FavoriteScreenContentPreview() { val params = listOf( UiKernelParam( diff --git a/common/design/src/main/java/com/androidvip/sysctlgui/design/utils/UiUtils.kt b/common/design/src/main/java/com/androidvip/sysctlgui/design/utils/UiUtils.kt new file mode 100644 index 0000000..13018c5 --- /dev/null +++ b/common/design/src/main/java/com/androidvip/sysctlgui/design/utils/UiUtils.kt @@ -0,0 +1,12 @@ +package com.androidvip.sysctlgui.design.utils + +import android.content.res.Configuration +import androidx.compose.runtime.Composable +import androidx.compose.runtime.ReadOnlyComposable +import androidx.compose.ui.platform.LocalConfiguration + +@Composable +@ReadOnlyComposable +fun isLandscape(): Boolean { + return LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE +} From c3a349d8956eab0d3c4328a1d87c5ea81fa4a950 Mon Sep 17 00:00:00 2001 From: Lennoard Date: Sun, 17 Aug 2025 21:52:57 -0300 Subject: [PATCH 17/18] feature: added "about" headers --- .../sysctlgui/ui/main/AppNavHost.kt | 4 +- .../sysctlgui/ui/main/MainTopBar.kt | 2 +- .../sysctlgui/ui/main/MainViewState.kt | 2 +- .../sysctlgui/ui/settings/SettingsScreen.kt | 79 +++++++++++++++++-- .../ui/settings/SettingsViewModel.kt | 32 +++++++- .../ui/settings/components/HeaderComponent.kt | 29 ++++--- .../components/TextSettingComponent.kt | 27 ++++--- .../ui/settings/model/SettingsViewEvent.kt | 5 ++ .../sysctlgui/ui/user/UserParamsScreen.kt | 6 ++ app/src/main/res/values-pt-rBR/strings.xml | 3 + app/src/main/res/values/strings.xml | 3 + .../com/androidvip/sysctlgui/data/Prefs.kt | 2 +- .../sysctlgui/data/di/DataModule.kt | 1 + .../sysctlgui/data/repository/AppPrefsImpl.kt | 4 +- .../repository/AppSettingsRepositoryImpl.kt | 69 ++++++++++++++-- data/src/main/res/drawable/ic_code.xml | 5 ++ data/src/main/res/drawable/ic_group.xml | 5 ++ data/src/main/res/drawable/ic_language.xml | 5 ++ data/src/main/res/values-pt-rBR/strings.xml | 10 +++ data/src/main/res/values/strings.xml | 10 +++ .../sysctlgui/domain/models/AppSetting.kt | 10 ++- 21 files changed, 274 insertions(+), 39 deletions(-) create mode 100644 data/src/main/res/drawable/ic_code.xml create mode 100644 data/src/main/res/drawable/ic_group.xml create mode 100644 data/src/main/res/drawable/ic_language.xml diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt index e64c1f7..f41e419 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/AppNavHost.kt @@ -84,8 +84,8 @@ internal fun AppNavHost( composable { SettingsScreen( - onNavigateToUserParams = { - navController.navigate(UiRoute.UserParams) + onNavigate = { route -> + navController.navigate(route) } ) } diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainTopBar.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainTopBar.kt index c82019a..ae10541 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainTopBar.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainTopBar.kt @@ -65,7 +65,7 @@ fun MainTopBar( private fun MainTopBarPreview() { SysctlGuiTheme { MainTopBar( - title = "SysctlGUI", + title = "Sysctl GUI", showBack = false, showSearch = true, onSearchPressed = {}, diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewState.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewState.kt index 5c634e7..bc6443c 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewState.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainViewState.kt @@ -4,7 +4,7 @@ import androidx.compose.material3.SnackbarResult import com.androidvip.sysctlgui.data.repository.CONTRAST_LEVEL_NORMAL data class MainViewState( - val topBarTitle: String = "SysctlGUI", + val topBarTitle: String = "Sysctl GUI", val showTopBar: Boolean = true, val showNavBar: Boolean = true, val showBackButton: Boolean = false, diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt index 26df95b..2bf4142 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsScreen.kt @@ -3,16 +3,23 @@ package com.androidvip.sysctlgui.ui.settings import android.Manifest import android.content.pm.PackageManager import android.os.Build +import android.widget.Toast import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.GridItemSpan import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.lazy.grid.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Info +import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -21,13 +28,18 @@ 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.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import androidx.core.content.ContextCompat import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.core.navigation.UiRoute import com.androidvip.sysctlgui.data.Prefs import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme import com.androidvip.sysctlgui.design.utils.isLandscape @@ -38,11 +50,13 @@ import com.androidvip.sysctlgui.ui.main.MainViewEvent import com.androidvip.sysctlgui.ui.main.MainViewModel import com.androidvip.sysctlgui.ui.main.MainViewState import com.androidvip.sysctlgui.ui.settings.components.HeaderComponent +import com.androidvip.sysctlgui.ui.settings.components.SettingsComponentColumn import com.androidvip.sysctlgui.ui.settings.components.SliderSettingComponent import com.androidvip.sysctlgui.ui.settings.components.SwitchSettingComponent import com.androidvip.sysctlgui.ui.settings.components.TextSettingComponent import com.androidvip.sysctlgui.ui.settings.model.SettingsViewEffect import com.androidvip.sysctlgui.ui.settings.model.SettingsViewEvent +import com.androidvip.sysctlgui.utils.browse import org.koin.androidx.compose.koinViewModel internal const val DISABLED_ALPHA = 0.38f @@ -51,7 +65,7 @@ internal const val DISABLED_ALPHA = 0.38f internal fun SettingsScreen( mainViewModel: MainViewModel = koinViewModel(), viewModel: SettingsViewModel = koinViewModel(), - onNavigateToUserParams: () -> Unit + onNavigate: (UiRoute) -> Unit ) { val state = viewModel.uiState.collectAsStateWithLifecycle() val context = LocalContext.current @@ -97,13 +111,27 @@ internal fun SettingsScreen( } } } + + is SettingsViewEffect.OpenBrowser -> { + context.browse(effect.url) + } + + is SettingsViewEffect.Navigate -> { + onNavigate(effect.route) + } + + is SettingsViewEffect.ShowToast -> { + Toast.makeText(context, effect.message, Toast.LENGTH_SHORT).show() + } } } } SettingsScreenContent( settings = state.value.settings, - onNavigateToUserParams = onNavigateToUserParams, + onSettingHeaderClicked = { appSetting -> + viewModel.onEvent(SettingsViewEvent.SettingHeaderClicked(appSetting)) + }, onValueChanged = { appSetting, newValue -> viewModel.onEvent(SettingsViewEvent.SettingValueChanged(appSetting, newValue)) } @@ -113,7 +141,7 @@ internal fun SettingsScreen( @Composable private fun SettingsScreenContent( settings: List> = emptyList(), - onNavigateToUserParams: () -> Unit, + onSettingHeaderClicked: (AppSetting<*>) -> Unit, onValueChanged: (AppSetting<*>, Any) -> Unit ) { val groupedSettings = settings.groupBy { it.category } @@ -157,7 +185,7 @@ private fun SettingsScreenContent( HeaderComponent( modifier = itemModifier, appSetting = appSetting, - onClick = onNavigateToUserParams + onClick = { onSettingHeaderClicked(appSetting) } ) } SettingItemType.List -> { @@ -190,6 +218,47 @@ private fun SettingsScreenContent( } } } + + item(span = { GridItemSpan(columns) }) { + Box(contentAlignment = Alignment.Center) { + Row( + modifier = Modifier.padding(all = 16.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(space = 16.dp) + ) { + + Icon( + imageVector = Icons.Rounded.Info, + contentDescription = null, + tint = MaterialTheme.colorScheme.onBackground, + modifier = Modifier.size(24.dp) + ) + + SettingsComponentColumn( + title = stringResource(R.string.about), + description = stringResource(R.string.sysctl_help), + modifier = Modifier.fillMaxWidth() + ) + } + } + } + + item(span = { GridItemSpan(columns) }) { + Text( + text = "Developed with ❤️ by Lennoard Silva\nAndroid enthusiast 🤖", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onBackground, + textAlign = TextAlign.Center, + modifier = Modifier + .fillMaxWidth() + .padding( + top = 64.dp, + bottom = 32.dp, + start = 24.dp, + end = 24.dp, + ) + ) + } } } @@ -257,7 +326,7 @@ internal fun SettingsScreenPreview() { Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { SettingsScreenContent( settings = settings, - onNavigateToUserParams = {}, + onSettingHeaderClicked = {}, onValueChanged = { _, _ -> } ) } diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsViewModel.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsViewModel.kt index 0968098..412eb38 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsViewModel.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsViewModel.kt @@ -3,8 +3,16 @@ package com.androidvip.sysctlgui.ui.settings import android.content.SharedPreferences import androidx.core.content.edit import androidx.lifecycle.viewModelScope +import com.androidvip.sysctlgui.R +import com.androidvip.sysctlgui.core.navigation.UiRoute import com.androidvip.sysctlgui.data.Prefs +import com.androidvip.sysctlgui.domain.StringProvider import com.androidvip.sysctlgui.domain.enums.SettingItemType +import com.androidvip.sysctlgui.domain.models.KEY_CONTRIBUTORS +import com.androidvip.sysctlgui.domain.models.KEY_DELETE_HISTORY +import com.androidvip.sysctlgui.domain.models.KEY_MANAGE_PARAMS +import com.androidvip.sysctlgui.domain.models.KEY_SOURCE_CODE +import com.androidvip.sysctlgui.domain.models.KEY_TRANSLATIONS import com.androidvip.sysctlgui.domain.usecase.GetAppSettingsUseCase import com.androidvip.sysctlgui.ui.settings.model.SettingsViewEffect import com.androidvip.sysctlgui.ui.settings.model.SettingsViewEvent @@ -14,7 +22,8 @@ import kotlinx.coroutines.launch class SettingsViewModel( private val sharedPreferences: SharedPreferences, - private val getSettings: GetAppSettingsUseCase + private val getSettings: GetAppSettingsUseCase, + private val stringProvider: StringProvider ) : BaseViewModel() { init { @@ -66,6 +75,27 @@ class SettingsViewModel( loadSettings() } } + + is SettingsViewEvent.SettingHeaderClicked<*> -> { + when (event.appSetting.key) { + KEY_MANAGE_PARAMS -> { + setEffect { SettingsViewEffect.Navigate(UiRoute.UserParams) } + } + + KEY_DELETE_HISTORY -> { + sharedPreferences.edit { remove(Prefs.SearchHistory.key) } + setEffect { + SettingsViewEffect.ShowToast(stringProvider.getString(R.string.history_deleted)) + } + } + + KEY_SOURCE_CODE, KEY_CONTRIBUTORS, KEY_TRANSLATIONS -> { + setEffect { + SettingsViewEffect.OpenBrowser(event.appSetting.value as String) + } + } + } + } } } diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/HeaderComponent.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/HeaderComponent.kt index 2c7c59a..a19637d 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/HeaderComponent.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/HeaderComponent.kt @@ -4,12 +4,16 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import com.androidvip.sysctlgui.domain.models.AppSetting @@ -17,22 +21,29 @@ import com.androidvip.sysctlgui.domain.models.AppSetting fun HeaderComponent( modifier: Modifier = Modifier, appSetting: AppSetting<*>, - onClick: () -> Unit, - icon: @Composable (() -> Unit)? = null + onClick: () -> Unit ) { - Box(modifier = modifier.clickable(onClick = onClick)) { + Box( + modifier = modifier.clickable(onClick = onClick), + contentAlignment = Alignment.Center + ) { Row( modifier = Modifier.padding(all = 16.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(space = 16.dp) ) { - Box( - modifier = Modifier - .align(Alignment.CenterVertically) - .size(24.dp) - ) { - icon?.invoke() + if (appSetting.iconResource != null) { + Box(modifier = Modifier.align(Alignment.CenterVertically)) { + Icon( + painter = painterResource(appSetting.iconResource!!), + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurface, + modifier = Modifier.size(24.dp) + ) + } + } else { + Spacer(modifier = Modifier.size(24.dp)) } SettingsComponentColumn( diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/TextSettingComponent.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/TextSettingComponent.kt index 328dbeb..ecf396d 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/TextSettingComponent.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/components/TextSettingComponent.kt @@ -5,12 +5,14 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -20,9 +22,11 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp +import com.androidvip.sysctlgui.R import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme import com.androidvip.sysctlgui.domain.enums.SettingItemType import com.androidvip.sysctlgui.domain.models.AppSetting @@ -31,8 +35,7 @@ import com.androidvip.sysctlgui.domain.models.AppSetting fun TextSettingComponent( modifier: Modifier = Modifier, appSetting: AppSetting<*>, - onValueChange: (String) -> Unit, - icon: @Composable (() -> Unit)? = null + onValueChange: (String) -> Unit ) { var expanded by remember { mutableStateOf(false) } @@ -47,12 +50,17 @@ fun TextSettingComponent( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(space = 16.dp) ) { - Box( - modifier = Modifier - .align(Alignment.CenterVertically) - .size(24.dp) - ) { - icon?.invoke() + if (appSetting.iconResource != null) { + Box(modifier = Modifier.align(Alignment.CenterVertically)) { + Icon( + painter = painterResource(appSetting.iconResource!!), + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurface, + modifier = Modifier.size(24.dp) + ) + } + } else { + Spacer(modifier = Modifier.size(24.dp)) } SettingsComponentColumn( @@ -101,6 +109,7 @@ private fun TextSettingComponentPreview() { description = "Description", value = "sysctl", category = "", + iconResource = R.drawable.ic_history, values = listOf("sysctl", "echo"), type = SettingItemType.List ), diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/model/SettingsViewEvent.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/model/SettingsViewEvent.kt index 21a61b8..75e2859 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/model/SettingsViewEvent.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/model/SettingsViewEvent.kt @@ -1,13 +1,18 @@ package com.androidvip.sysctlgui.ui.settings.model +import com.androidvip.sysctlgui.core.navigation.UiRoute import com.androidvip.sysctlgui.domain.models.AppSetting sealed interface SettingsViewEvent { class SettingValueChanged(val appSetting: AppSetting, val newValue: Any) : SettingsViewEvent + class SettingHeaderClicked(val appSetting: AppSetting) : SettingsViewEvent } sealed interface SettingsViewEffect { object RequestNotificationPermission : SettingsViewEffect + class OpenBrowser(val url: String) : SettingsViewEffect + class Navigate(val route: UiRoute) : SettingsViewEffect + class ShowToast(val message: String) : SettingsViewEffect } data class SettingsViewState( diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt index 75bca1d..bd5b529 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/user/UserParamsScreen.kt @@ -65,6 +65,11 @@ fun UserParamsScreen( ) { val context = LocalContext.current val state by viewModel.uiState.collectAsStateWithLifecycle() + val appBarTitle = if (state.userParams.all { it.isFavorite }) { + stringResource(R.string.app_name) + } else { + stringResource(R.string.startup_params) + } LaunchedEffect(Unit) { viewModel.onEvent(UserParamsViewEvent.ScreenLoaded(filterPredicate)) @@ -72,6 +77,7 @@ fun UserParamsScreen( mainViewModel.onEvent( MainViewEvent.OnSateChangeRequested( MainViewState( + topBarTitle = appBarTitle, showTopBar = true, showNavBar = true, showBackButton = false, diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 41b8666..bfdbbcf 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -102,4 +102,7 @@ Falha na execução do comando Sugestões Parâmetros favoritos + Histórico deletado + Parâmetros da inicialização + Sysctl é usado para modificar parâmetros do kernel em tempo de execução. Os parâmetros disponíveis são aqueles listados em /proc/sys e o objetivo principal deste aplicativo é fornecer uma maneira gráfica de editá-los. \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e8c6fdf..2a5ce33 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -102,4 +102,7 @@ Command execution failed Suggestions Favorite Kernel Params + History deleted + Startup params + Sysctl is used to modify kernel parameters at runtime. The parameters available are those listed under /proc/sys and this app\'s main purpose is to provide a graphical way to edit them. diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/Prefs.kt b/data/src/main/java/com/androidvip/sysctlgui/data/Prefs.kt index 94c6827..02b2ddc 100644 --- a/data/src/main/java/com/androidvip/sysctlgui/data/Prefs.kt +++ b/data/src/main/java/com/androidvip/sysctlgui/data/Prefs.kt @@ -4,7 +4,7 @@ enum class Prefs(val key: String) { ListFoldersFirst("list_folders_first"), GuessInputType("guess_input_type"), CommitMode("commit_mode"), - ALLOW_BLANK("allow_blank_values"), + AllowBlankValues("allow_blank_values"), UseBusybox("use_busybox"), RunOnStartup("run_on_start_up"), StartupDelay("startup_delay"), diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt b/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt index 29155ea..268600b 100644 --- a/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt +++ b/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt @@ -60,6 +60,7 @@ val repositoryModule = module { AppSettingsRepositoryImpl( context = androidContext(), sharedPreferences = get(), + isTaskerInstalled = get(), rootUtils = get() ) } diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppPrefsImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppPrefsImpl.kt index 1ef8f3f..d21206f 100644 --- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppPrefsImpl.kt +++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppPrefsImpl.kt @@ -40,9 +40,9 @@ class AppPrefsImpl(private val prefs: SharedPreferences) : AppPrefs { prefs.edit { putString(Prefs.CommitMode.key, value) } } override var allowBlankValues: Boolean - get() = prefs.getBoolean(Prefs.ALLOW_BLANK.key, false) + get() = prefs.getBoolean(Prefs.AllowBlankValues.key, false) set(value) { - prefs.edit { putBoolean(Prefs.ALLOW_BLANK.key, value) } + prefs.edit { putBoolean(Prefs.AllowBlankValues.key, value) } } override var useBusybox: Boolean get() = prefs.getBoolean(Prefs.UseBusybox.key, false) diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt index 68d8269..c0d87ca 100644 --- a/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt +++ b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppSettingsRepositoryImpl.kt @@ -9,7 +9,13 @@ import com.androidvip.sysctlgui.data.utils.RootUtils import com.androidvip.sysctlgui.domain.enums.CommitMode import com.androidvip.sysctlgui.domain.enums.SettingItemType import com.androidvip.sysctlgui.domain.models.AppSetting +import com.androidvip.sysctlgui.domain.models.KEY_CONTRIBUTORS +import com.androidvip.sysctlgui.domain.models.KEY_DELETE_HISTORY +import com.androidvip.sysctlgui.domain.models.KEY_MANAGE_PARAMS +import com.androidvip.sysctlgui.domain.models.KEY_SOURCE_CODE +import com.androidvip.sysctlgui.domain.models.KEY_TRANSLATIONS import com.androidvip.sysctlgui.domain.repository.AppSettingsRepository +import com.androidvip.sysctlgui.domain.usecase.IsTaskerInstalledUseCase import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlin.coroutines.CoroutineContext @@ -18,9 +24,11 @@ class AppSettingsRepositoryImpl( private val context: Context, private val sharedPreferences: SharedPreferences, private val rootUtils: RootUtils, + private val isTaskerInstalled: IsTaskerInstalledUseCase, private val ioContext: CoroutineContext = Dispatchers.IO ) : AppSettingsRepository { override suspend fun getAppSettings(): List> = withContext(ioContext) { + val isTaskerInstalled = isTaskerInstalled() val usingDynamicColors = sharedPreferences.getBoolean(Prefs.DynamicColors.key, false) val supportsDynamicColors = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S val currentCommitMode = sharedPreferences.getString( @@ -54,6 +62,14 @@ class AppSettingsRepositoryImpl( description = context.getString(R.string.prefs_online_docs_description), type = SettingItemType.Switch, ), + AppSetting( + key = KEY_DELETE_HISTORY, + value = Unit, + category = context.getString(R.string.prefs_category_general), + title = context.getString(R.string.pref_search_history_title), + description = context.getString(R.string.pref_search_history_description), + type = SettingItemType.Text, + ), /////////// THEME SETTINGS //////////// @@ -112,12 +128,21 @@ class AppSettingsRepositoryImpl( type = SettingItemType.Switch, ), AppSetting( - key = Prefs.ALLOW_BLANK.key, - value = sharedPreferences.getBoolean(Prefs.ALLOW_BLANK.key, false), + key = Prefs.AllowBlankValues.key, + value = sharedPreferences.getBoolean(Prefs.AllowBlankValues.key, false), category = context.getString(R.string.prefs_category_operations), title = context.getString(R.string.prefs_allow_blank_values_title), type = SettingItemType.Switch, ), + AppSetting( + key = Prefs.ShowTaskerToast.key, + enabled = isTaskerInstalled, + value = sharedPreferences.getBoolean(Prefs.ShowTaskerToast.key, isTaskerInstalled), + category = context.getString(R.string.prefs_category_operations), + title = context.getString(R.string.prefs_show_tasker_toast_title), + description = context.getString(R.string.prefs_show_toast_description), + type = SettingItemType.Switch, + ), /////////// STARTUP SETTINGS //////////// @@ -129,6 +154,14 @@ class AppSettingsRepositoryImpl( description = context.getString(R.string.prefs_run_on_startup_description), type = SettingItemType.Switch, ), + AppSetting( + key = KEY_MANAGE_PARAMS, + value = Unit, + category = context.getString(R.string.prefs_category_startup), + title = context.getString(R.string.prefs_manage_parameters_title), + description = context.getString(R.string.prefs_manage_parameters_description), + type = SettingItemType.Text, + ), AppSetting( key = Prefs.StartupDelay.key, value = sharedPreferences.getInt(Prefs.StartupDelay.key, 0), @@ -138,12 +171,33 @@ class AppSettingsRepositoryImpl( type = SettingItemType.Slider, values = (0..10).toList(), ), + + /////////// OTHERS //////////// AppSetting( - key = "", - value = Unit, - category = context.getString(R.string.prefs_category_startup), - title = context.getString(R.string.prefs_manage_parameters_title), - description = context.getString(R.string.prefs_manage_parameters_description), + key = KEY_SOURCE_CODE, + value = SOURCE_CODE_URL, + category = context.getString(R.string.prefs_category_others), + title = context.getString(R.string.pref_source_code_title), + description = context.getString(R.string.pref_source_code_description), + iconResource = R.drawable.ic_code, + type = SettingItemType.Text, + ), + AppSetting( + key = KEY_CONTRIBUTORS, + value = "$SOURCE_CODE_URL/graphs/contributors", + category = context.getString(R.string.prefs_category_others), + title = context.getString(R.string.pref_contributors_title), + description = "free-bots, mikropsoft (Holi)", + iconResource = R.drawable.ic_group, + type = SettingItemType.Text, + ), + AppSetting( + key = KEY_TRANSLATIONS, + value = "$SOURCE_CODE_URL/blob/develop/TRANSLATING.md", + category = context.getString(R.string.prefs_category_others), + title = context.getString(R.string.pref_translations_title), + description = context.getString(R.string.pref_translations_description), + iconResource = R.drawable.ic_language, type = SettingItemType.Text, ) ) @@ -153,3 +207,4 @@ class AppSettingsRepositoryImpl( const val CONTRAST_LEVEL_NORMAL = 1 const val CONTRAST_LEVEL_MEDIUM = 2 const val CONTRAST_LEVEL_HEIGH = 3 +const val SOURCE_CODE_URL = "https://github.com/Lennoard/SysctlGUI" diff --git a/data/src/main/res/drawable/ic_code.xml b/data/src/main/res/drawable/ic_code.xml new file mode 100644 index 0000000..369840b --- /dev/null +++ b/data/src/main/res/drawable/ic_code.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/data/src/main/res/drawable/ic_group.xml b/data/src/main/res/drawable/ic_group.xml new file mode 100644 index 0000000..e6b060c --- /dev/null +++ b/data/src/main/res/drawable/ic_group.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/data/src/main/res/drawable/ic_language.xml b/data/src/main/res/drawable/ic_language.xml new file mode 100644 index 0000000..643d3fc --- /dev/null +++ b/data/src/main/res/drawable/ic_language.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/data/src/main/res/values-pt-rBR/strings.xml b/data/src/main/res/values-pt-rBR/strings.xml index 53df607..73809c7 100644 --- a/data/src/main/res/values-pt-rBR/strings.xml +++ b/data/src/main/res/values-pt-rBR/strings.xml @@ -27,4 +27,14 @@ Atraso em segundos antes de reaplicar os parâmetros na inicialização Gerenciar parâmetros Gerenciar os parâmetros que serão aplicados na inicialização + Mostrar toast do Tasker + Mostrar uma mensagem quando um parâmetro do Tasker for aplicado + Histórico de pesquisa + Toque para limpar o histórico de pesquisa + Outros + Código fonte + Confira o código fonte no GitHub! + Contribuidores + Traduções + Ajude a traduzir este aplicativo \ No newline at end of file diff --git a/data/src/main/res/values/strings.xml b/data/src/main/res/values/strings.xml index 1d0666e..2b01f67 100644 --- a/data/src/main/res/values/strings.xml +++ b/data/src/main/res/values/strings.xml @@ -27,4 +27,14 @@ Delay in seconds before applying parameters on startup Manage parameters Manage the parameters that will be applied at startup + Show Tasker toast + Show toast when a Tasker parameter is applied + Search history + Tap to clear search history + Others + Source code + Check the sauce code on GitHub! + Contributors + Translations + Help translate this application diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/models/AppSetting.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/models/AppSetting.kt index 7754d4a..e2a5cdb 100644 --- a/domain/src/main/java/com/androidvip/sysctlgui/domain/models/AppSetting.kt +++ b/domain/src/main/java/com/androidvip/sysctlgui/domain/models/AppSetting.kt @@ -18,6 +18,7 @@ import com.androidvip.sysctlgui.domain.enums.SettingItemType * @property category The group or section this setting belongs to, used for organization in the UI. * @property type Defines how the setting is presented and interacted with in the UI (e.g., switch, list). * @property values An optional list of possible values for the setting, typically used for dropdowns or selection lists. + * @property iconResource An optional resource ID for an icon that can be displayed with the setting. */ data class AppSetting( val key: String, @@ -27,5 +28,12 @@ data class AppSetting( val description: String? = null, val category: String, val type: SettingItemType, - val values: List? = null + val values: List? = null, + val iconResource: Int? = null ) + +const val KEY_MANAGE_PARAMS = "manageParams" +const val KEY_DELETE_HISTORY = "deleteHistory" +const val KEY_SOURCE_CODE = "sauce" +const val KEY_CONTRIBUTORS = "contributors" +const val KEY_TRANSLATIONS = "translations" \ No newline at end of file From de76ef88cd8436340ffd56276075c2160491c8e4 Mon Sep 17 00:00:00 2001 From: Lennoard Date: Mon, 18 Aug 2025 00:03:19 -0300 Subject: [PATCH 18/18] release: [3.0.0] versionCode 17 Signed-off-by: Lennoard --- README.md | 41 +++++++++--- TRANSLATING.md | 62 +++++++++++++++++++ app/build.gradle.kts | 11 ++-- app/proguard-kt.pro | 13 ---- app/proguard-rules.pro | 35 +++++------ .../com/androidvip/sysctlgui/SysctlGuiApp.kt | 4 +- common/design/proguard-rules.pro | 7 ++- common/utils/build.gradle.kts | 2 +- common/utils/proguard-rules.pro | 6 +- data/consumer-rules.pro | 1 + data/proguard-rules.pro | 3 +- .../sysctlgui/data/di/DataModule.kt | 8 +-- gradle/libs.versions.toml | 2 + 13 files changed, 137 insertions(+), 58 deletions(-) create mode 100644 TRANSLATING.md delete mode 100644 app/proguard-kt.pro diff --git a/README.md b/README.md index 884dd9b..e2a4226 100644 --- a/README.md +++ b/README.md @@ -23,20 +23,43 @@ A GUI application for Android sysctl to edit kernel variables ## Features - Browse filesystem for specific kernel parameters - Select parameters from a searchable list -- Information about known parameters +- Show documentation for known parameters - Load parameters from a configuration file - Reapply parameters at startup - Mark parameters as favorite for easy access ## Technologies -- MVI / MVVM for user params -- [Jetpack Compose](https://developer.android.com/jetpack/compose) Material 3 UI -- [Jetpack Data Binding](https://developer.android.com/topic/libraries/data-binding) -- [Jetpack View Binding](https://developer.android.com/topic/libraries/view-binding) -- Lifecycle-aware Kotlin Coroutines -- Kotlin Flows -- Dependency injection with [Koin](https://insert-koin.io/) +This project utilizes a modern Android development stack, leveraging a comprehensive suite of libraries and tools: + +- **Core & Architecture:** + - Architectural Patterns: MVI, reactive and maintainable. + - [Kotlin](https://kotlinlang.org/): For modern, concise, and safe programming. + - Android Jetpack: + - [Lifecycle](https://developer.android.com/jetpack/androidx/releases/lifecycle) + - [ViewModel](https://developer.android.com/topic/libraries/architecture/viewmodel) + - [Navigation Component](https://developer.android.com/guide/navigation) + - [Room](https://developer.android.com/training/data-storage/room): For local data persistence. + - [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager): For deferrable, asynchronous tasks. +- **UI Development:** + - [Jetpack Compose](https://developer.android.com/jetpack/compose): For building native UIs with a declarative approach. + - Compose Material 3 & Material Components + - [Jetpack Glance](https://developer.android.com/develop/ui/compose/glance): For creating App Widgets with Jetpack Compose. +- **Asynchronous Programming:** + - [Kotlin Coroutines](https://kotlinlang.org/docs/coroutines-overview.html) & [Flows](https://kotlinlang.org/docs/flow.html): For efficient and structured background tasks and reactive data streams. +- **Utilities:** + - [Koin](https://insert-koin.io/): Dependency injection framework for Kotlin. + - [Ktor Client](https://ktor.io/docs/client-reference.html): For making HTTP requests (used for parameter documentation). + - [Libsu](https://github.com/topjohnwu/libsu): For interacting with root services. + - [Jsoup](https://jsoup.org/): For parsing HTML (used for parameter documentation). + - [Kotlinx Serialization](https://github.com/Kotlin/kotlinx.serialization): For JSON serialization/deserialization. + +## Contributing + +We welcome contributions to SysctlGUI! + +### Translations +If you'd like to help translate the app into other languages, please see the [translation guide](TRANSLATING.md) for instructions on how to get started. Your contributions will help make SysctlGUI accessible to a wider audience. ## Download @@ -47,7 +70,7 @@ A GUI application for Android sysctl to edit kernel variables This project is licensed under the terms of the MIT license. -> Copyright (c) 2019-2024 Lennoard. +> Copyright (c) 2019-2025 Lennoard. > > Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: > diff --git a/TRANSLATING.md b/TRANSLATING.md new file mode 100644 index 0000000..b0758f5 --- /dev/null +++ b/TRANSLATING.md @@ -0,0 +1,62 @@ +# Translating SysctlGUI + +Thank you for your interest in translating SysctlGUI! Your contributions help make the app accessible to a wider audience. + +## How to Contribute + +1. **Fork the Repository:** Start by forking the [SysctlGUI repository](https://github.com/your-github-username/SysctlGUI) (replace `your-github-username/SysctlGUI` with the actual repository URL) to your own GitHub account. +2. **Clone Your Fork:** Clone your forked repository to your local machine. + ```bash + git clone https://github.com/YOUR_USERNAME/SysctlGUI.git + cd SysctlGUI + ``` +3. **Create a New Branch:** Create a new branch for your translation. + ```bash + git checkout -b translate-yourlanguage + ``` +4. **Translate the Files:** + * **String Resources:** These are the primary files for translation. + * `app/src/main/res/values/strings.xml` + * `app/src/main/res/values/params_info.xml` + * `data/src/main/res/values/strings.xml` + + To translate these files, create a new `values-xx` directory in the same `res` folder, where `xx` is the ISO 639-1 code for the language you are translating to (e.g., `values-es` for Spanish, `values-de` for German). Then, copy the original `strings.xml` or `params_info.xml` into this new directory and translate the string values within the XML tags. + + **Example (strings.xml for Spanish):** + Create `app/src/main/res/values-es/strings.xml` and translate the content, preserving special format tags (%s, %1$s, etc) + ```xml + + SysctlGUI + + Undo + Selected file: %s + + Deshacer + Archivo seleccionado: %s + + ``` + + * **Raw Text Files (Optional):** If you feel brave, you can also translate the `.txt` files located in `data/src/main/res/raw/`. + * When translating these files, it is **crucial** to respect their original format. These files often have a specific structure that the app relies on. + * Translate the text content, but leave any special characters, newlines, or formatting intact. + * Place the translated `.txt` files in a new `raw-xx` directory within `data/src/main/res/` (e.g., `data/src/main/res/raw-es/` for Spanish). + +5. **Commit Your Changes:** Commit your translated files with a clear commit message. + ```bash + git add . + git commit -m "Add translation to [Your Language]" + ``` +6. **Push to Your Fork:** Push your changes to your forked repository. + ```bash + git push origin translate-yourlanguage + ``` +7. **Create a Pull Request:** Go to the original SysctlGUI repository on GitHub and create a new Pull Request from your forked branch. Provide a clear description of your changes. + +## Important Notes + +* Ensure your translations are accurate and natural-sounding in the target language. +* Do not translate resource names (e.g., `app_name` in ``). Only translate the text content between the XML tags. +* For `.txt` files, preserving the exact original formatting is critical for the app to function correctly with the translated content. +* If you are unsure about any part of the translation process, feel free to open an issue on the main repository to ask for clarification. + +Thank you for your contribution! diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2e4c304..f94244f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,8 +17,8 @@ android { applicationId = AppConfig.appId minSdk = AppConfig.minSdkVersion targetSdk = AppConfig.targetSdkVersion - versionCode = 16 - versionName = "2.2.2" + versionCode = 17 + versionName = "3.0.0" vectorDrawables.useSupportLibrary = true androidResources { localeFilters += listOf("en", "de", "pt-rBR", "tr") @@ -31,6 +31,7 @@ android { ) } } + multiDexEnabled = true } signingConfigs { @@ -58,8 +59,7 @@ android { signingConfig = signingConfigs.getByName("release") proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro", - "proguard-kt.pro" + "proguard-rules.pro" ) } } @@ -117,6 +117,7 @@ dependencies { implementation(libs.androidx.navigation.compose) implementation(libs.androidx.window) implementation(libs.androidx.work.runtime.ktx) + implementation(libs.androidx.multidex) // Lifecycle implementation(libs.androidx.lifecycle.runtime.ktx) @@ -130,4 +131,4 @@ dependencies { implementation(libs.koin) implementation(libs.koin.compose) implementation(libs.bundles.libsu) -} +} \ No newline at end of file diff --git a/app/proguard-kt.pro b/app/proguard-kt.pro deleted file mode 100644 index b7f8b24..0000000 --- a/app/proguard-kt.pro +++ /dev/null @@ -1,13 +0,0 @@ --dontusemixedcaseclassnames - --dontwarn kotlin.** --keepclassmembers class **$WhenMappings { - ; -} - --assumenosideeffects class kotlin.jvm.internal.Intrinsics { - static void checkParameterIsNotNull(java.lang.Object, java.lang.String); -} - -## Useless option for dex --dontpreverify \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8393bb1..28e9833 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -20,21 +20,20 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile --keep class android.support.v7.widget.SearchView { *; } --keep class androidx.appcompat.widget.SearchView { *; } --keep class android.widget.SearchView { *; } - --keepclassmembers enum * { *; } - -# GSON config --keep public class com.google.gson.** --keep public class com.google.gson.** {public private protected *;} --keepattributes *Annotation*,Signature - -# Gson specific classes --keep class sun.misc.Unsafe { *; } - -# Application classes that will be serialized/deserialized over Gson --keep class com.androidvip.sysctlgui.data.models.KernelParam { *; } --keep class com.androidvip.sysctlgui.data.models.RoomKernelParam { *; } --keep class com.androidvip.sysctlgui.domain.models.DomainKernelParam { *; } \ No newline at end of file +-keepnames class androidx.lifecycle.ViewModel +-keepclassmembers class * extends androidx.lifecycle.ViewModel { (...); } +-keepclassmembers class * implements androidx.lifecycle.LifecycleObserver { (...); } +-keepclassmembers class * implements androidx.lifecycle.LifecycleOwner { (...); } +-keepclassmembers class androidx.lifecycle.Lifecycle$State { *; } +-keepclassmembers class androidx.lifecycle.Lifecycle$Event { *; } +-keep class * implements androidx.lifecycle.LifecycleOwner { public (...); } +-keep class * implements androidx.lifecycle.LifecycleObserver { public (...); } + +-keepclassmembers class com.androidvip.sysctlgui.ui.main.MainViewModel { + static void (); +} + +-keep class org.koin.core.instance.InstanceFactory { *; } +-keep class * extends org.koin.core.module.Module +-keep class org.koin.core.registry.ScopeRegistry { *; } +-keep class org.koin.android.scope.AndroidScopeComponent diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/SysctlGuiApp.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/SysctlGuiApp.kt index 1b909b8..0fb9ede 100644 --- a/app/src/main/kotlin/com/androidvip/sysctlgui/SysctlGuiApp.kt +++ b/app/src/main/kotlin/com/androidvip/sysctlgui/SysctlGuiApp.kt @@ -1,6 +1,6 @@ package com.androidvip.sysctlgui -import android.app.Application +import androidx.multidex.MultiDexApplication import com.androidvip.sysctlgui.data.di.dataModules import com.androidvip.sysctlgui.di.presentationModule import com.androidvip.sysctlgui.domain.di.domainModule @@ -10,7 +10,7 @@ import org.koin.android.ext.android.get import org.koin.android.ext.koin.androidContext import org.koin.core.context.startKoin -class SysctlGuiApp : Application() { +class SysctlGuiApp : MultiDexApplication() { override fun onCreate() { super.onCreate() diff --git a/common/design/proguard-rules.pro b/common/design/proguard-rules.pro index 481bb43..8396c29 100644 --- a/common/design/proguard-rules.pro +++ b/common/design/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 com.androidvip.sysctlgui.design.theme.ColorKt { *; } +-keep class com.androidvip.sysctlgui.design.theme.ThemeKt { *; } +-keep class com.androidvip.sysctlgui.design.theme.TypeKt { *; } +-keep class com.androidvip.sysctlgui.design.utils.UiUtilsKt { *; } diff --git a/common/utils/build.gradle.kts b/common/utils/build.gradle.kts index 532ccf1..68576a4 100644 --- a/common/utils/build.gradle.kts +++ b/common/utils/build.gradle.kts @@ -15,7 +15,7 @@ android { } buildTypes { - release { + getByName("release") { isMinifyEnabled = !AppConfig.devCycle proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), diff --git a/common/utils/proguard-rules.pro b/common/utils/proguard-rules.pro index 481bb43..fa38585 100644 --- a/common/utils/proguard-rules.pro +++ b/common/utils/proguard-rules.pro @@ -18,4 +18,8 @@ # 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 com.androidvip.sysctlgui.utils.BaseViewModel { *; } +-keep class com.androidvip.sysctlgui.utils.ContextUtilsKt { *; } +-keep class com.androidvip.sysctlgui.utils.MiscKt { *; } diff --git a/data/consumer-rules.pro b/data/consumer-rules.pro index e69de29..2e8e82c 100644 --- a/data/consumer-rules.pro +++ b/data/consumer-rules.pro @@ -0,0 +1 @@ +-keep class com.androidvip.sysctlgui.data.models.KernelParamDTO { *; } diff --git a/data/proguard-rules.pro b/data/proguard-rules.pro index fbcf9ce..ff875af 100644 --- a/data/proguard-rules.pro +++ b/data/proguard-rules.pro @@ -20,5 +20,4 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile -# Application classes that will be serialized/deserialized over Gson --keep class com.androidvip.sysctlgui.data.models.RoomKernelParam { *; } \ No newline at end of file +-keep class com.androidvip.sysctlgui.data.models.KernelParamDTO { *; } \ No newline at end of file diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt b/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt index 268600b..7f2c886 100644 --- a/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt +++ b/data/src/main/java/com/androidvip/sysctlgui/data/di/DataModule.kt @@ -1,6 +1,5 @@ package com.androidvip.sysctlgui.data.di -import android.util.Log import androidx.preference.PreferenceManager import com.androidvip.sysctlgui.data.db.ParamDatabase import com.androidvip.sysctlgui.data.db.ParamDatabaseManager @@ -25,9 +24,6 @@ import com.androidvip.sysctlgui.domain.repository.PresetRepository import com.androidvip.sysctlgui.domain.repository.UserRepository import io.ktor.client.HttpClient import io.ktor.client.engine.android.Android -import io.ktor.client.plugins.logging.LogLevel -import io.ktor.client.plugins.logging.Logger -import io.ktor.client.plugins.logging.Logging import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers import org.koin.android.ext.koin.androidApplication @@ -91,14 +87,14 @@ val networkModule = module { socketTimeout = 5000 } - install(Logging) { + /*install(Logging) { logger = object : Logger { override fun log(message: String) { Log.v("KtorHttpClient", message) } } level = LogLevel.BODY - } + }*/ } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b362bae..b18e73f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,6 +17,7 @@ composeBom = "2025.07.00" appcompat = "1.7.1" materialIconsCoreCompose = "1.7.8" material = "1.12.0" +multidex = "2.0.1" navigationCompose = "2.9.3" preference = "1.2.1" room = "2.7.2" @@ -33,6 +34,7 @@ androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" } androidx-material = { module = "androidx.compose.material:material", version.ref = "composeMaterial" } androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "materialIconsCoreCompose" } +androidx-multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" } androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" } androidx-preference = { module = "androidx.preference:preference", version.ref = "preference" } androidx-window = { module = "androidx.window:window", version.ref = "window" }