diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cf50a0c..28a5117 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -18,7 +18,7 @@ android { minSdk = 29 targetSdk = 34 versionCode = 8 - versionName = "1.3.4" + versionName = "1.3.5" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/rxuglr/m3kwoahelper/ui/MainActivity.kt b/app/src/main/java/com/rxuglr/m3kwoahelper/ui/MainActivity.kt index 714973c..3b2b8c5 100644 --- a/app/src/main/java/com/rxuglr/m3kwoahelper/ui/MainActivity.kt +++ b/app/src/main/java/com/rxuglr/m3kwoahelper/ui/MainActivity.kt @@ -44,6 +44,7 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.font.FontWeight @@ -237,7 +238,7 @@ class MainActivity : ComponentActivity() { modifier = Modifier .fillMaxWidth() .padding(bottom = 5.dp), - text = "Version: 1.3.4", + text = "Version: 1.3.5", textAlign = TextAlign.Center ) } @@ -492,7 +493,7 @@ class MainActivity : ComponentActivity() { ) { InfoCard(Modifier .height(200.dp) - .width((pxtodp(625f)).dp)) + .width((pxtodp(625f)).dp), LocalUriHandler.current) DeviceImage(Modifier.width((pxtodp(625f)).dp)) } Column( @@ -529,7 +530,7 @@ class MainActivity : ComponentActivity() { else { Row(horizontalArrangement = Arrangement.spacedBy(if (codename == "nabu") { 10.dp } else 0.dp)) { DeviceImage(Modifier.width((pxtodp(625f)).dp)) - InfoCard(Modifier.height((pxtodp(743f)).dp)) + InfoCard(Modifier.height((pxtodp(743f)).dp), LocalUriHandler.current) } Buttons.BackupButton() Buttons.MountButton() diff --git a/app/src/main/java/com/rxuglr/m3kwoahelper/ui/templates/Buttons.kt b/app/src/main/java/com/rxuglr/m3kwoahelper/ui/templates/Buttons.kt index 85161d6..c7a2eed 100644 --- a/app/src/main/java/com/rxuglr/m3kwoahelper/ui/templates/Buttons.kt +++ b/app/src/main/java/com/rxuglr/m3kwoahelper/ui/templates/Buttons.kt @@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.material3.AlertDialog import androidx.compose.material3.AssistChip -import androidx.compose.material3.Card +import androidx.compose.material3.ElevatedCard import androidx.compose.material3.CardDefaults import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -52,7 +52,7 @@ object Buttons { ) { val showDialog = remember { mutableStateOf(false) } val showSpinner = remember { mutableStateOf(false) } - Card( + ElevatedCard( onClick = { showDialog.value = true }, Modifier .fillMaxWidth(), @@ -83,7 +83,7 @@ object Buttons { Thread { showDialog.value = false showSpinner.value = true - run { command } + command() showSpinner.value = false }.start() }) @@ -126,7 +126,7 @@ object Buttons { fun BackupButton() { val showBackupDialog = remember { mutableStateOf(false) } val showBackupSpinner = remember { mutableStateOf(false) } - Card( + ElevatedCard( onClick = { showBackupDialog.value = true }, Modifier .fillMaxWidth(), @@ -271,7 +271,7 @@ object Buttons { @Composable fun MountButton() { val showMountDialog = remember { mutableStateOf(false) } - Card( + ElevatedCard( onClick = { showMountDialog.value = true }, Modifier .fillMaxWidth(), @@ -350,7 +350,7 @@ object Buttons { fun UEFIButton() { val showUEFIDialog = remember { mutableStateOf(false) } val showUEFISpinner = remember { mutableStateOf(false) } - Card( + ElevatedCard( onClick = { if (!uefilist.contains(99)) { showUEFIDialog.value = true @@ -540,7 +540,7 @@ object Buttons { if (!uefilist.contains(99)) { val showQuickBootDialog = remember { mutableStateOf(false) } val showQuickBootSpinner = remember { mutableStateOf(false) } - Card( + ElevatedCard( onClick = { showQuickBootDialog.value = true }, Modifier .fillMaxWidth(), diff --git a/app/src/main/java/com/rxuglr/m3kwoahelper/ui/templates/Cards.kt b/app/src/main/java/com/rxuglr/m3kwoahelper/ui/templates/Cards.kt index 4790bbd..7886602 100644 --- a/app/src/main/java/com/rxuglr/m3kwoahelper/ui/templates/Cards.kt +++ b/app/src/main/java/com/rxuglr/m3kwoahelper/ui/templates/Cards.kt @@ -11,13 +11,14 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.Message import androidx.compose.material.icons.filled.Book import androidx.compose.material3.AssistChip import androidx.compose.material3.AssistChipDefaults -import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults +import androidx.compose.material3.ElevatedCard import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -26,6 +27,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.UriHandler import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @@ -47,8 +49,8 @@ object Cards { } @Composable - fun InfoCard(modifier: Modifier) { - Card( + fun InfoCard(modifier: Modifier, localUriHandler: UriHandler) { + ElevatedCard( modifier = if (codename == "nabu") { modifier @@ -56,6 +58,7 @@ object Cards { Modifier .height(200.dp) }, + shape = RoundedCornerShape(8.dp), colors = CardDefaults.cardColors( containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation( 12.dp @@ -113,7 +116,7 @@ object Cards { Modifier.align(Alignment.CenterHorizontally), horizontalArrangement = Arrangement.spacedBy(5.dp) ) { - if (codename != "cepheus") { + if ((codename != "cepheus") && (name != "Unknown")) { AssistChip( leadingIcon = { Icon( @@ -124,18 +127,13 @@ object Cards { ) }, onClick = { - woahApp.startActivity( - Intent( - Intent.ACTION_VIEW, - Uri.parse( - when (codename) { - codenames[0], codenames[1] -> "https://github.com/woa-vayu/Port-Windows-11-Poco-X3-pro" - codenames[2] -> "https://github.com/erdilS/Port-Windows-11-Xiaomi-Pad-5" - codenames[3], codenames[4], codenames[6] -> "https://github.com/graphiks/woa-raphael" - else -> "Unknown" - } - ) - ) + localUriHandler.openUri( + when (codename) { + codenames[0], codenames[1] -> "https://github.com/woa-vayu/Port-Windows-11-Poco-X3-pro" + codenames[2] -> "https://github.com/erdilS/Port-Windows-11-Xiaomi-Pad-5" + codenames[3], codenames[4], codenames[6] -> "https://github.com/graphiks/woa-raphael" + else -> "" + } ) }, label = { @@ -146,38 +144,35 @@ object Cards { } ) } - AssistChip( - leadingIcon = { - Icon( - Icons.AutoMirrored.Filled.Message, - contentDescription = null, - Modifier.size(AssistChipDefaults.IconSize), - tint = MaterialTheme.colorScheme.primary - ) - }, - onClick = { - woahApp.startActivity( - Intent( - Intent.ACTION_VIEW, - Uri.parse( - when (codename) { - codenames[0], codenames[1] -> "https://t.me/winonvayualt" - codenames[2] -> "https://t.me/nabuwoa" - codenames[3], codenames[4], codenames[6] -> "https://t.me/woaraphael" - codenames[5] -> "https://t.me/WinOnMi9/" - else -> "Unknown" - } - ) + if (name != "Unknown") { + AssistChip( + leadingIcon = { + Icon( + Icons.AutoMirrored.Filled.Message, + contentDescription = null, + Modifier.size(AssistChipDefaults.IconSize), + tint = MaterialTheme.colorScheme.primary ) - ) - }, - label = { - Text( - LocalContext.current.getString(R.string.group), - fontWeight = FontWeight.Bold, - ) - } - ) + }, + onClick = { + localUriHandler.openUri( + when (codename) { + codenames[0], codenames[1] -> "https://t.me/winonvayualt" + codenames[2] -> "https://t.me/nabuwoa" + codenames[3], codenames[4], codenames[6] -> "https://t.me/woaraphael" + codenames[5] -> "https://t.me/WinOnMi9/" + else -> "" + } + ) + }, + label = { + Text( + LocalContext.current.getString(R.string.group), + fontWeight = FontWeight.Bold, + ) + } + ) + } } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d325983..3ef5d82 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.2.2" +agp = "8.3.1" kotlin = "1.9.22" ksp = "1.9.22-1.0.17" compose-bom = "2024.02.01"