commit 2740519ec8d212dce4b29f0fe594f51259b37dc5 parent e9f954e6042d1180a6e83ee750cdd3fa3ab26905 Author: rhunk <101876869+rhunk@users.noreply.github.com> Date: Wed, 1 Nov 2023 00:29:46 +0100 build: compose bom Diffstat:
9 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts @@ -134,6 +134,7 @@ dependencies { implementation(libs.osmdroid.android) implementation(libs.rhino) implementation(libs.androidx.activity.ktx) + fullImplementation(platform(libs.androidx.compose.bom)) fullImplementation(libs.bcprov.jdk18on) fullImplementation(libs.androidx.navigation.compose) fullImplementation(libs.androidx.material.icons.core) @@ -151,7 +152,6 @@ dependencies { afterEvaluate { properties["debug_assemble_task"]?.let { tasks.findByName(it.toString()) }?.doLast { runCatching { - val apkDebugFile = android.applicationVariants.find { it.buildType.name == "debug" && it.flavorName == properties["debug_flavor"] }?.outputs?.first()?.outputFile ?: return@doLast exec { commandLine("adb", "shell", "am", "force-stop", "com.snapchat.android") } diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Navigation.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Navigation.kt @@ -6,7 +6,7 @@ import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -80,7 +80,7 @@ class Navigation( IconButton( onClick = { navHostController.popBackStack() } ) { - Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null) + Icon(Icons.Filled.ArrowBack, contentDescription = null) } } }, actions = { diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/features/FeaturesSection.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/features/FeaturesSection.kt @@ -12,7 +12,7 @@ import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.KeyboardActions import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.OpenInNew +import androidx.compose.material.icons.filled.OpenInNew import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.FolderOpen import androidx.compose.material.icons.filled.MoreVert @@ -245,7 +245,7 @@ class FeaturesSection : Section() { } } else { IconButton(onClick = it) { - Icon(Icons.AutoMirrored.Filled.OpenInNew, contentDescription = null) + Icon(Icons.Filled.OpenInNew, contentDescription = null) } } } diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/home/HomeSection.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/home/HomeSection.kt @@ -7,7 +7,7 @@ import androidx.compose.foundation.ScrollState import androidx.compose.foundation.layout.* import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.OpenInNew +import androidx.compose.material.icons.filled.OpenInNew import androidx.compose.material.icons.filled.* import androidx.compose.material3.* import androidx.compose.runtime.Composable @@ -156,7 +156,7 @@ class HomeSection : Section() { Button(onClick = { context.checkForRequirements(Requirements.LANGUAGE) }, modifier = Modifier.height(40.dp)) { - Icon(Icons.AutoMirrored.Filled.OpenInNew, contentDescription = null) + Icon(Icons.Filled.OpenInNew, contentDescription = null) } } } diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/home/SettingsSection.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/home/SettingsSection.kt @@ -5,7 +5,7 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.OpenInNew +import androidx.compose.material.icons.filled.OpenInNew import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.Text @@ -72,7 +72,7 @@ class SettingsSection : Section() { Text(text = title, modifier = Modifier.padding(start = 26.dp)) IconButton(onClick = { takeAction() }) { Icon( - imageVector = Icons.AutoMirrored.Filled.OpenInNew, + imageVector = Icons.Filled.OpenInNew, contentDescription = null, modifier = Modifier.size(24.dp) ) diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/setup/SetupActivity.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/setup/SetupActivity.kt @@ -9,7 +9,7 @@ import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowForwardIos +import androidx.compose.material.icons.filled.ArrowForwardIos import androidx.compose.material.icons.filled.Check import androidx.compose.material3.FilledIconButton import androidx.compose.material3.Icon @@ -122,7 +122,7 @@ class SetupActivity : ComponentActivity() { imageVector = if (requiredScreens.size <= 1 && canGoNext) { Icons.Default.Check } else { - Icons.AutoMirrored.Default.ArrowForwardIos + Icons.Default.ArrowForwardIos }, contentDescription = null ) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml @@ -9,13 +9,12 @@ kotlinx-coroutines-android = "1.7.3" activity-ktx = "1.8.0" androidx-documentfile = "1.1.0-alpha01" -material-icons-core = "1.5.3" -material-icons-extended = "1.6.0-alpha07" coil-compose = "2.4.0" navigation-compose = "2.7.4" osmdroid-android = "6.1.17" -recyclerview = "1.3.1" +recyclerview = "1.3.2" +compose-bom = "2023.10.01" bcprov-jdk18on = "1.76" dexlib2 = "2.5.2" ffmpeg-kit = "5.1.LTS" # DO NOT UPDATE FFMPEG-KIT TO "5.1" it breaks stuff :3 @@ -24,19 +23,19 @@ junit = "4.13.2" material3 = "1.1.2" okhttp = "5.0.0-alpha.11" rhino = "1.7.14" -ui-tooling-preview = "1.5.3" [libraries] +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" } androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity-ktx" } androidx-documentfile = { group = "androidx.documentfile", name = "documentfile", version.ref = "androidx-documentfile" } androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" } -androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "material-icons-core" } -androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "material-icons-extended" } -androidx-material-ripple = { module = "androidx.compose.material:material-ripple", version.ref = "material-icons-core" } +androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core" } +androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" } +androidx-material-ripple = { module = "androidx.compose.material:material-ripple" } androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation-compose" } -androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "ui-tooling-preview" } -androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "ui-tooling-preview" } +androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } +androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } apksig = { module = "com.android.tools.build:apksig", version.ref = "apksig" } bcprov-jdk18on = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bcprov-jdk18on" } coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil-compose" } diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts @@ -42,7 +42,12 @@ android { proguardFiles += file("proguard-rules.pro") } debug { - isMinifyEnabled = false + (properties["debug_assemble_task"] == null).also { + isDebuggable = !it + isMinifyEnabled = it + isShrinkResources = it + } + proguardFiles += file("proguard-rules.pro") } } @@ -78,6 +83,7 @@ dependencies { implementation(libs.gson) implementation(libs.jsoup) implementation(libs.okhttp) + implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.material3) implementation(libs.androidx.activity.ktx) implementation(libs.androidx.navigation.compose) diff --git a/manager/src/main/kotlin/me/rhunk/snapenhance/manager/ui/tab/impl/HomeTab.kt b/manager/src/main/kotlin/me/rhunk/snapenhance/manager/ui/tab/impl/HomeTab.kt @@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.OpenInNew +import androidx.compose.material.icons.filled.OpenInNew import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Home @@ -80,7 +80,7 @@ class HomeTab : Tab("home", true, icon = Icons.Default.Home) { Text(text = "Not installed", fontSize = 16.sp, color = MaterialTheme.colorScheme.onSurface) } - Icon(imageVector = Icons.AutoMirrored.Default.OpenInNew, contentDescription = null, Modifier.padding(10.dp)) + Icon(imageVector = Icons.Default.OpenInNew, contentDescription = null, Modifier.padding(10.dp)) } } }