From 2eb37b81c80614c2c6f556bcf3535f2ae0fd2a08 Mon Sep 17 00:00:00 2001 From: Ushie Date: Sun, 13 Nov 2022 23:07:58 +0300 Subject: [PATCH] refactor: tiny cleanup --- .../manager/ui/component/ContributorsCard.kt | 8 +---- .../manager/ui/component/ExpandableCard.kt | 1 - .../manager/ui/component/GroupHeader.kt | 2 +- .../manager/ui/component/HeadlineWithCard.kt | 4 ++- .../manager/ui/component/PatchCard.kt | 2 +- .../ui/component/PatchCompatibilityDialog.kt | 36 +++++++++++-------- .../manager/ui/component/SocialItem.kt | 6 +++- .../manager/ui/component/SourceItem.kt | 2 -- .../manager/ui/component/SplitAPKDialog.kt | 6 ++-- .../manager/ui/screen/DashboardScreen.kt | 2 -- .../subscreens/ContributorsSubscreen.kt | 2 +- .../ui/screen/subscreens/LicensesSubscreen.kt | 2 +- .../subscreens/SourceSelectorSubscreen.kt | 1 - app/src/main/res/values/strings.xml | 2 ++ 14 files changed, 39 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/app/revanced/manager/ui/component/ContributorsCard.kt b/app/src/main/java/app/revanced/manager/ui/component/ContributorsCard.kt index 244655e..c1d8a2b 100644 --- a/app/src/main/java/app/revanced/manager/ui/component/ContributorsCard.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/ContributorsCard.kt @@ -62,13 +62,7 @@ fun ContributorsCard( .combinedClickable( onClick = { vm.openUserProfile(contributor.username) }, onLongClick = { - Toast - .makeText( - context, - contributor.username, - Toast.LENGTH_SHORT - ) - .show() + Toast.makeText(context, contributor.username, Toast.LENGTH_SHORT).show() } ) ) diff --git a/app/src/main/java/app/revanced/manager/ui/component/ExpandableCard.kt b/app/src/main/java/app/revanced/manager/ui/component/ExpandableCard.kt index 249a1dc..6b55080 100644 --- a/app/src/main/java/app/revanced/manager/ui/component/ExpandableCard.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/ExpandableCard.kt @@ -16,7 +16,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import app.revanced.manager.R -@OptIn(ExperimentalMaterial3Api::class) @Composable fun ExpandableCard( content: @Composable (arrowButton: @Composable () -> Unit) -> Unit, diff --git a/app/src/main/java/app/revanced/manager/ui/component/GroupHeader.kt b/app/src/main/java/app/revanced/manager/ui/component/GroupHeader.kt index de56581..f91b0fe 100644 --- a/app/src/main/java/app/revanced/manager/ui/component/GroupHeader.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/GroupHeader.kt @@ -31,4 +31,4 @@ fun GroupHeader( fontWeight = FontWeight.SemiBold ) } -} +} \ No newline at end of file diff --git a/app/src/main/java/app/revanced/manager/ui/component/HeadlineWithCard.kt b/app/src/main/java/app/revanced/manager/ui/component/HeadlineWithCard.kt index 966a1a5..50f2a30 100644 --- a/app/src/main/java/app/revanced/manager/ui/component/HeadlineWithCard.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/HeadlineWithCard.kt @@ -22,6 +22,8 @@ fun HeadlineWithCard( modifier = Modifier .padding(top = 12.dp) .fillMaxWidth(), - ) { content() } + ) { + content() + } } } \ No newline at end of file diff --git a/app/src/main/java/app/revanced/manager/ui/component/PatchCard.kt b/app/src/main/java/app/revanced/manager/ui/component/PatchCard.kt index 7e80401..76ba3a2 100644 --- a/app/src/main/java/app/revanced/manager/ui/component/PatchCard.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/PatchCard.kt @@ -124,4 +124,4 @@ fun PatchCard(patchClass: PatchClass, isSelected: Boolean, onSelected: () -> Uni } } } -} +} \ No newline at end of file diff --git a/app/src/main/java/app/revanced/manager/ui/component/PatchCompatibilityDialog.kt b/app/src/main/java/app/revanced/manager/ui/component/PatchCompatibilityDialog.kt index 8145887..cd5d73f 100644 --- a/app/src/main/java/app/revanced/manager/ui/component/PatchCompatibilityDialog.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/PatchCompatibilityDialog.kt @@ -17,24 +17,30 @@ import org.koin.androidx.compose.get @Composable fun PatchCompatibilityDialog( - patchClass: PatchClass, patcherUtils: PatcherUtils = get(), onClose: () -> Unit + patchClass: PatchClass, + patcherUtils: PatcherUtils = get(), + onClose: () -> Unit ) { val patch = patchClass.patch val packageName = patcherUtils.getSelectedPackageInfo()?.packageName - AlertDialog(onDismissRequest = onClose, shape = RoundedCornerShape(12.dp), title = { - Text(stringResource(id = R.string.unsupported), textAlign = TextAlign.Center) - }, text = { - (patch.compatiblePackages!!.forEach { p: Package -> - if (p.name == packageName) { - Text( - stringResource(id = R.string.only_compatible) + p.versions.reversed() - .joinToString(", ") - ) + AlertDialog( + onDismissRequest = onClose, + shape = RoundedCornerShape(12.dp), + title = { Text(stringResource(R.string.unsupported), textAlign = TextAlign.Center) }, + text = { + patch.compatiblePackages!!.forEach { p: Package -> + if (p.name == packageName) { + Text( + stringResource(id = R.string.only_compatible) + p.versions.reversed() + .joinToString(", ") + ) + } + } + }, + confirmButton = { + TextButton(onClick = onClose) { + Text(text = "Dismiss") } - }) - }, confirmButton = { - TextButton(onClick = onClose) { - Text(text = "Dismiss") } - }) + ) } \ No newline at end of file diff --git a/app/src/main/java/app/revanced/manager/ui/component/SocialItem.kt b/app/src/main/java/app/revanced/manager/ui/component/SocialItem.kt index 9660159..e35d30d 100644 --- a/app/src/main/java/app/revanced/manager/ui/component/SocialItem.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/SocialItem.kt @@ -15,7 +15,11 @@ import androidx.compose.ui.res.stringResource @OptIn(ExperimentalMaterial3Api::class) @Composable -fun SocialItem(@StringRes label: Int, imageVector: ImageVector? = null, onClick: () -> Unit) { +fun SocialItem( + @StringRes label: Int, + imageVector: ImageVector? = null, + onClick: () -> Unit +) { ListItem( modifier = Modifier.clickable { onClick() }, leadingContent = { diff --git a/app/src/main/java/app/revanced/manager/ui/component/SourceItem.kt b/app/src/main/java/app/revanced/manager/ui/component/SourceItem.kt index 99d55be..d28c7ea 100644 --- a/app/src/main/java/app/revanced/manager/ui/component/SourceItem.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/SourceItem.kt @@ -1,6 +1,5 @@ package app.revanced.manager.ui.component -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.RoundedCornerShape @@ -20,7 +19,6 @@ import androidx.compose.ui.unit.dp import app.revanced.manager.R import coil.compose.AsyncImage -@OptIn(ExperimentalFoundationApi::class) @Composable fun SourceItem() { Row( diff --git a/app/src/main/java/app/revanced/manager/ui/component/SplitAPKDialog.kt b/app/src/main/java/app/revanced/manager/ui/component/SplitAPKDialog.kt index 29815b9..0b00391 100644 --- a/app/src/main/java/app/revanced/manager/ui/component/SplitAPKDialog.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/SplitAPKDialog.kt @@ -18,7 +18,7 @@ fun SplitAPKDialog( ) { AlertDialog(onDismissRequest = onDismiss, shape = RoundedCornerShape(12.dp), title = { - Text(stringResource(id = R.string.warning), textAlign = TextAlign.Center) + Text(stringResource(R.string.warning), textAlign = TextAlign.Center) }, text = { Text(stringResource(R.string.split_apk_warning)) @@ -30,12 +30,12 @@ fun SplitAPKDialog( onDismiss() } ) { - Text(text = "OK") + Text(stringResource(R.string.text_continue)) } }, dismissButton = { OutlinedButton(onClick = onDismiss) { - Text(text = "Cancel") + Text(stringResource(R.string.cancel)) } } ) diff --git a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt index 7d0d361..31c8b85 100644 --- a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt @@ -68,8 +68,6 @@ fun DashboardScreen(viewModel: DashboardViewModel = getViewModel()) { } } Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { - - Text( text = "Patched Applications", style = MaterialTheme.typography.headlineSmall diff --git a/app/src/main/java/app/revanced/manager/ui/screen/subscreens/ContributorsSubscreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/subscreens/ContributorsSubscreen.kt index 4921e2e..d8a5a52 100644 --- a/app/src/main/java/app/revanced/manager/ui/screen/subscreens/ContributorsSubscreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/subscreens/ContributorsSubscreen.kt @@ -89,4 +89,4 @@ fun ContributorsSubscreen( ) } } -} +} \ No newline at end of file diff --git a/app/src/main/java/app/revanced/manager/ui/screen/subscreens/LicensesSubscreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/subscreens/LicensesSubscreen.kt index 09cf3db..36ac0b7 100644 --- a/app/src/main/java/app/revanced/manager/ui/screen/subscreens/LicensesSubscreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/subscreens/LicensesSubscreen.kt @@ -50,7 +50,7 @@ fun LicensesSubscreen( contentColor = MaterialTheme.colorScheme.onBackground, badgeBackgroundColor = MaterialTheme.colorScheme.primary, badgeContentColor = MaterialTheme.colorScheme.onPrimary, - ), + ) ) } } diff --git a/app/src/main/java/app/revanced/manager/ui/screen/subscreens/SourceSelectorSubscreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/subscreens/SourceSelectorSubscreen.kt index 92b588d..05488bb 100644 --- a/app/src/main/java/app/revanced/manager/ui/screen/subscreens/SourceSelectorSubscreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/subscreens/SourceSelectorSubscreen.kt @@ -59,7 +59,6 @@ fun SourceSelectorSubscreen( Toast.makeText(context, "Couldn't load local patch bundle.", Toast.LENGTH_SHORT).show() } - Scaffold( modifier = Modifier .nestedScroll(scrollBehavior.nestedScrollConnection), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fdd9038..05237ff 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -36,4 +36,6 @@ Select sources Sentry Select a bundle from storage + Continue + Cancel \ No newline at end of file