diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5ead87a7..2b5b93a3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -28,31 +28,42 @@ android { buildTypes { release { + isMinifyEnabled = true + proguardFiles += file("proguard-rules.pro") + } + debug { + isDebuggable = true isMinifyEnabled = false - isShrinkResources = false } } flavorDimensions += "abi" + //noinspection ChromeOsAbiSupport productFlavors { - - + packaging { + jniLibs { + excludes += "**/*_neon.so" + } + resources { + excludes += "DebugProbesKt.bin" + excludes += "okhttp3/internal/publicsuffix/**" + excludes += "META-INF/*.version" + excludes += "META-INF/services/**" + excludes += "META-INF/*.kotlin_builtins" + excludes += "META-INF/*.kotlin_module" + } + } create("armv8") { ndk { - abiFilters.add("arm64-v8a") + abiFilters += "arm64-v8a" } dimension = "abi" } create("armv7") { ndk { - abiFilters.add("armeabi-v7a") - } - packaging { - jniLibs { - excludes += "**/*_neon.so" - } + abiFilters += "armeabi-v7a" } dimension = "abi" } @@ -89,7 +100,7 @@ dependencies { implementation(libs.gson) debugImplementation("androidx.compose.ui:ui-tooling:1.4.3") - debugImplementation("androidx.compose.ui:ui-tooling-preview:1.4.3") + implementation("androidx.compose.ui:ui-tooling-preview:1.4.3") implementation(kotlin("reflect")) } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 00000000..09acd6cf --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,2 @@ +-dontwarn de.robv.android.xposed.** +-keep class me.rhunk.** { *; } \ No newline at end of file diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/MainActivity.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/MainActivity.kt index 9b7ea8a4..06d61005 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/MainActivity.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/MainActivity.kt @@ -28,11 +28,7 @@ class MainActivity : ComponentActivity() { } sections = EnumSection.values().toList().associateWith { - runCatching { - it.section.constructors.first().call() - }.onFailure { - it.printStackTrace() - }.getOrThrow() + it.section.constructors.first().call() }.onEach { (section, instance) -> with(instance) { enumSection = section diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/download/DownloadSection.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/download/DownloadSection.kt index b695bd59..89ca1313 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/download/DownloadSection.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/download/DownloadSection.kt @@ -2,10 +2,11 @@ package me.rhunk.snapenhance.ui.manager.sections.download import androidx.compose.runtime.Composable import me.rhunk.snapenhance.ui.manager.Section +import me.rhunk.snapenhance.ui.manager.sections.NotImplemented class DownloadSection : Section() { @Composable override fun Content() { - + NotImplemented() } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2433cc52..81639f1c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ kotlin = "1.8.22" kotlinx-coroutines-android = "1.7.2" kotlin-reflect = "1.8.22" material-icons-extended = "1.6.0-alpha03" -navigation-compose = "2.6.0" +navigation-compose = "2.7.0-rc01" recyclerview = "1.3.1" gson = "2.10.1" ffmpeg-kit = "5.1.LTS"