Skip to content

Commit 0029e51

Browse files
authored
fix: UX improvements (#147)
1 parent 42bb8bf commit 0029e51

14 files changed

Lines changed: 996 additions & 810 deletions

app/src/main/java/app/revanced/manager/ui/screen/home/ExpertModeDialog.kt

Lines changed: 181 additions & 170 deletions
Large diffs are not rendered by default.

app/src/main/java/app/revanced/manager/ui/screen/home/InstalledAppInfoDialog.kt

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@ import android.annotation.SuppressLint
44
import android.content.pm.PackageInfo
55
import androidx.activity.compose.rememberLauncherForActivityResult
66
import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
7-
import androidx.compose.animation.AnimatedVisibility
7+
import androidx.compose.animation.*
88
import androidx.compose.animation.core.tween
9-
import androidx.compose.animation.expandVertically
10-
import androidx.compose.animation.fadeIn
11-
import androidx.compose.animation.fadeOut
12-
import androidx.compose.animation.shrinkVertically
139
import androidx.compose.foundation.background
1410
import androidx.compose.foundation.layout.*
1511
import androidx.compose.foundation.shape.RoundedCornerShape
1612
import androidx.compose.material.icons.Icons
13+
import androidx.compose.material.icons.automirrored.outlined.Launch
1714
import androidx.compose.material.icons.automirrored.outlined.List
1815
import androidx.compose.material.icons.outlined.*
1916
import androidx.compose.material3.CircularProgressIndicator
@@ -388,7 +385,7 @@ private fun PatchUpdateAvailableBanner(
388385

389386
// Patch button
390387
ActionButton(
391-
text = stringResource(R.string.patch),
388+
text = stringResource(R.string.repatch),
392389
icon = Icons.Outlined.Refresh,
393390
onClick = onPatchClick,
394391
isPrimary = true,
@@ -563,7 +560,7 @@ private fun ActionsSection(
563560
primaryActions.add(
564561
ActionItem(
565562
text = stringResource(R.string.patch),
566-
icon = Icons.Outlined.AutoAwesome,
563+
icon = Icons.Outlined.AutoFixHigh,
567564
onClick = onPatchClick,
568565
enabled = availablePatches > 0
569566
)
@@ -574,7 +571,7 @@ private fun ActionsSection(
574571
primaryActions.add(
575572
ActionItem(
576573
text = stringResource(R.string.repatch),
577-
icon = Icons.Outlined.Build,
574+
icon = Icons.Outlined.Refresh,
578575
onClick = onRepatchClick
579576
)
580577
)
@@ -585,7 +582,7 @@ private fun ActionsSection(
585582
secondaryActions.add(
586583
ActionItem(
587584
text = stringResource(R.string.open),
588-
icon = Icons.Outlined.PlayArrow,
585+
icon = Icons.AutoMirrored.Outlined.Launch,
589586
onClick = { viewModel.launch() }
590587
)
591588
)
@@ -611,7 +608,7 @@ private fun ActionsSection(
611608
secondaryActions.add(
612609
ActionItem(
613610
text = installText,
614-
icon = Icons.Outlined.Download,
611+
icon = Icons.Outlined.InstallMobile,
615612
onClick = { if (viewModel.mountWarning != null) onMountWarning() else viewModel.installSavedApp() },
616613
isLoading = isInstalling
617614
)
@@ -622,7 +619,7 @@ private fun ActionsSection(
622619
secondaryActions.add(
623620
ActionItem(
624621
text = if (viewModel.isMounted) stringResource(R.string.remount) else stringResource(R.string.mount),
625-
icon = if (viewModel.isMounted) Icons.Outlined.Refresh else Icons.Outlined.Check,
622+
icon = if (viewModel.isMounted) Icons.Outlined.Refresh else Icons.Outlined.Link,
626623
onClick = { if (viewModel.isMounted) viewModel.remountSavedInstallation() else viewModel.mountOrUnmount() },
627624
isLoading = isMountLoading
628625
)

app/src/main/java/app/revanced/manager/ui/screen/patcher/PatcherBottomActionBar.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import androidx.compose.material.icons.Icons
66
import androidx.compose.material.icons.filled.Close
77
import androidx.compose.material.icons.filled.Error
88
import androidx.compose.material.icons.filled.Home
9-
import androidx.compose.material.icons.outlined.FileDownload
9+
import androidx.compose.material.icons.outlined.Save
1010
import androidx.compose.material3.MaterialTheme
1111
import androidx.compose.runtime.Composable
1212
import androidx.compose.ui.Alignment
@@ -73,7 +73,7 @@ fun PatcherBottomActionBar(
7373
if (showSaveButton || showErrorButton) {
7474
BottomActionButton(
7575
onClick = if (showErrorButton) onErrorClick else onSaveClick,
76-
icon = if (showErrorButton) Icons.Default.Error else Icons.Outlined.FileDownload,
76+
icon = if (showErrorButton) Icons.Default.Error else Icons.Outlined.Save,
7777
text = if (showErrorButton) stringResource(R.string.error_)
7878
else stringResource(R.string.save),
7979
modifier = Modifier.weight(1f),

app/src/main/java/app/revanced/manager/ui/screen/patcher/PatcherStates.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import androidx.compose.foundation.layout.*
77
import androidx.compose.foundation.shape.CircleShape
88
import androidx.compose.foundation.shape.RoundedCornerShape
99
import androidx.compose.material.icons.Icons
10-
import androidx.compose.material.icons.automirrored.outlined.OpenInNew
10+
import androidx.compose.material.icons.automirrored.outlined.Launch
1111
import androidx.compose.material.icons.filled.Check
1212
import androidx.compose.material.icons.filled.Close
13-
import androidx.compose.material.icons.filled.Delete
13+
import androidx.compose.material.icons.filled.DeleteForever
1414
import androidx.compose.material.icons.filled.Error
15-
import androidx.compose.material.icons.outlined.FileDownload
16-
import androidx.compose.material.icons.outlined.FolderOpen
15+
import androidx.compose.material.icons.outlined.InstallMobile
16+
import androidx.compose.material.icons.outlined.Link
1717
import androidx.compose.material.icons.rounded.Info
1818
import androidx.compose.material3.*
1919
import androidx.compose.runtime.*
@@ -560,11 +560,11 @@ private fun InstallActionButton(
560560
} else {
561561
Icon(
562562
imageVector = when {
563-
isInstalled -> Icons.AutoMirrored.Outlined.OpenInNew
564-
isConflict -> Icons.Default.Delete
565-
isError -> Icons.Outlined.FileDownload
566-
usingMountInstall -> Icons.Outlined.FolderOpen
567-
else -> Icons.Outlined.FileDownload
563+
isInstalled -> Icons.AutoMirrored.Outlined.Launch
564+
isConflict -> Icons.Default.DeleteForever
565+
isError -> Icons.Outlined.InstallMobile
566+
usingMountInstall -> Icons.Outlined.Link
567+
else -> Icons.Outlined.InstallMobile
568568
},
569569
contentDescription = null,
570570
modifier = Modifier.size(24.dp)

0 commit comments

Comments
 (0)