feat(Update Screen): changelogs & handle states (ReVanced#1464)

Co-authored-by: Ax333l <main@axelen.xyz>
BenjaminHalko · Nov 19, 2023 · bd9778a · bd9778a
1 parent 62a5fce
commit bd9778a
Show file tree

Hide file tree

Showing 15 changed files with 545 additions and 273 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -158,4 +158,7 @@ dependencies {
 
     // Markdown
     implementation(libs.markdown.renderer)
+
+    // Fading Edges
+    implementation(libs.fading.edges)
 }
diff --git a/app/src/main/java/app/revanced/manager/MainActivity.kt b/app/src/main/java/app/revanced/manager/MainActivity.kt
@@ -73,7 +73,7 @@ class MainActivity : ComponentActivity() {
                             TextButton(
                                 onClick = {
                                     vm.dismissUpdateDialog()
-                                    navController.navigate(Destination.Settings(SettingsDestination.UpdateProgress))
+                                    navController.navigate(Destination.Settings(SettingsDestination.Update(false)))
                                 }
                             ) {
                                 Text(stringResource(R.string.update))
@@ -85,8 +85,8 @@ class MainActivity : ComponentActivity() {
                             }
                         },
                         icon = { Icon(Icons.Outlined.Update, null) },
-                        title = { Text(stringResource(R.string.update_available)) },
-                        text = { Text(stringResource(R.string.update_available_description, it)) }
+                        title = { Text(stringResource(R.string.update_available_dialog_title)) },
+                        text = { Text(stringResource(R.string.update_available_dialog_description, it)) }
                     )
                 }
 

diff --git a/app/src/main/java/app/revanced/manager/di/ViewModelModule.kt b/app/src/main/java/app/revanced/manager/di/ViewModelModule.kt
@@ -14,7 +14,7 @@ val viewModelModule = module {
     viewModelOf(::AppSelectorViewModel)
     viewModelOf(::VersionSelectorViewModel)
     viewModelOf(::InstallerViewModel)
-    viewModelOf(::UpdateProgressViewModel)
+    viewModelOf(::UpdateViewModel)
     viewModelOf(::ChangelogsViewModel)
     viewModelOf(::ImportExportViewModel)
     viewModelOf(::ContributorViewModel)

diff --git a/app/src/main/java/app/revanced/manager/service/InstallService.kt b/app/src/main/java/app/revanced/manager/service/InstallService.kt
@@ -29,6 +29,7 @@ class InstallService : Service() {
             else -> {
                 sendBroadcast(Intent().apply {
                     action = APP_INSTALL_ACTION
+                    `package` = packageName
                     putExtra(EXTRA_INSTALL_STATUS, extraStatus)
                     putExtra(EXTRA_INSTALL_STATUS_MESSAGE, extraStatusMessage)
                     putExtra(EXTRA_PACKAGE_NAME, extraPackageName)

diff --git a/app/src/main/java/app/revanced/manager/service/UninstallService.kt b/app/src/main/java/app/revanced/manager/service/UninstallService.kt
@@ -31,7 +31,7 @@ class UninstallService : Service() {
             else -> {
                 sendBroadcast(Intent().apply {
                     action = APP_UNINSTALL_ACTION
-
+                    `package` = packageName
                     putExtra(EXTRA_UNINSTALL_STATUS, extraStatus)
                     putExtra(EXTRA_UNINSTALL_STATUS_MESSAGE, extraStatusMessage)
                 })

diff --git a/app/src/main/java/app/revanced/manager/ui/component/settings/Changelog.kt b/app/src/main/java/app/revanced/manager/ui/component/settings/Changelog.kt
@@ -0,0 +1,95 @@
+package app.revanced.manager.ui.component.settings
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.CalendarToday
+import androidx.compose.material.icons.outlined.Campaign
+import androidx.compose.material.icons.outlined.FileDownload
+import androidx.compose.material.icons.outlined.Sell
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import app.revanced.manager.ui.component.Markdown
+
+@Composable
+fun Changelog(
+    markdown: String,
+    version: String,
+    downloadCount: String,
+    publishDate: String
+) {
+    Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 0.dp),
+            horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.Start),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                imageVector = Icons.Outlined.Campaign,
+                contentDescription = null,
+                tint = MaterialTheme.colorScheme.primary,
+                modifier = Modifier
+                    .size(32.dp)
+            )
+            Text(
+                version.removePrefix("v"),
+                style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight(800)),
+                color = MaterialTheme.colorScheme.primary,
+            )
+        }
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(16.dp),
+            modifier = Modifier
+                .fillMaxWidth()
+        ) {
+            Tag(
+                Icons.Outlined.Sell,
+                version
+            )
+            Tag(
+                Icons.Outlined.FileDownload,
+                downloadCount
+            )
+            Tag(
+                Icons.Outlined.CalendarToday,
+                publishDate
+            )
+        }
+    }
+    Markdown(
+        markdown,
+    )
+}
+
+@Composable
+private fun Tag(icon: ImageVector, text: String) {
+    Row(
+        horizontalArrangement = Arrangement.spacedBy(6.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Icon(
+            imageVector = icon,
+            contentDescription = null,
+            modifier = Modifier.size(16.dp),
+            tint = MaterialTheme.colorScheme.outline,
+        )
+        Text(
+            text,
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.outline,
+        )
+    }
+}
diff --git a/app/src/main/java/app/revanced/manager/ui/destination/SettingsDestination.kt b/app/src/main/java/app/revanced/manager/ui/destination/SettingsDestination.kt
@@ -27,7 +27,7 @@ sealed interface SettingsDestination : Parcelable {
     object About : SettingsDestination
 
     @Parcelize
-    object UpdateProgress : SettingsDestination
+    data class Update(val downloadOnScreenEntry: Boolean) : SettingsDestination
 
     @Parcelize
     object Changelogs : SettingsDestination
@@ -37,5 +37,4 @@ sealed interface SettingsDestination : Parcelable {
 
     @Parcelize
     object Licenses: SettingsDestination
-
 }
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
@@ -28,15 +28,17 @@ import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.NotificationCard
+import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.destination.SettingsDestination
 import app.revanced.manager.ui.screen.settings.*
 import app.revanced.manager.ui.screen.settings.update.ChangelogsScreen
-import app.revanced.manager.ui.screen.settings.update.UpdateProgressScreen
+import app.revanced.manager.ui.screen.settings.update.UpdateScreen
 import app.revanced.manager.ui.screen.settings.update.UpdatesSettingsScreen
 import app.revanced.manager.ui.viewmodel.SettingsViewModel
 import dev.olshevski.navigation.reimagined.*
 import org.koin.androidx.compose.getViewModel
-import app.revanced.manager.ui.component.settings.SettingsListItem
+import org.koin.core.parameter.parametersOf
+import org.koin.androidx.compose.getViewModel as getComposeViewModel
 
 @SuppressLint("BatteryLife")
 @OptIn(ExperimentalMaterial3Api::class)
@@ -96,7 +98,6 @@ fun SettingsScreen(
         controller = navController
     ) { destination ->
         when (destination) {
-
             is SettingsDestination.General -> GeneralSettingsScreen(
                 onBackClick = backClick,
                 viewModel = viewModel
@@ -109,7 +110,7 @@ fun SettingsScreen(
             is SettingsDestination.Updates -> UpdatesSettingsScreen(
                 onBackClick = backClick,
                 onChangelogClick = { navController.navigate(SettingsDestination.Changelogs) },
-                onUpdateClick = { navController.navigate(SettingsDestination.UpdateProgress) }
+                onUpdateClick = { navController.navigate(SettingsDestination.Update(false)) }
             )
 
             is SettingsDestination.Downloads -> DownloadsSettingsScreen(
@@ -126,8 +127,13 @@ fun SettingsScreen(
                 onLicensesClick = { navController.navigate(SettingsDestination.Licenses) }
             )
 
-            is SettingsDestination.UpdateProgress -> UpdateProgressScreen(
+            is SettingsDestination.Update -> UpdateScreen(
                 onBackClick = backClick,
+                vm = getComposeViewModel {
+                    parametersOf(
+                        destination.downloadOnScreenEntry
+                    )
+                }
             )
 
             is SettingsDestination.Changelogs -> ChangelogsScreen(

diff --git a/app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsScreen.kt
@@ -1,37 +1,27 @@
 package app.revanced.manager.ui.screen.settings.update
 
+
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.CalendarToday
-import androidx.compose.material.icons.outlined.Campaign
-import androidx.compose.material.icons.outlined.FileDownload
-import androidx.compose.material.icons.outlined.Sell
 import androidx.compose.material3.Divider
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.LoadingIndicator
-import app.revanced.manager.ui.component.Markdown
+import app.revanced.manager.ui.component.settings.Changelog
 import app.revanced.manager.ui.viewmodel.ChangelogsViewModel
 import app.revanced.manager.util.formatNumber
 import app.revanced.manager.util.relativeTime
@@ -103,76 +93,4 @@ fun ChangelogItem(
             )
         }
     }
-}
-
-@Composable
-private fun Changelog(
-    markdown: String,
-    version: String,
-    downloadCount: String,
-    publishDate: String
-) {
-    Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(bottom = 0.dp),
-            horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.Start),
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Icon(
-                imageVector = Icons.Outlined.Campaign,
-                contentDescription = null,
-                tint = MaterialTheme.colorScheme.primary,
-                modifier = Modifier
-                    .size(32.dp)
-            )
-            Text(
-                version.removePrefix("v"),
-                style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight(800)),
-                color = MaterialTheme.colorScheme.primary,
-            )
-        }
-        Row(
-            horizontalArrangement = Arrangement.spacedBy(16.dp),
-            modifier = Modifier
-                .fillMaxWidth()
-        ) {
-            Tag(
-                Icons.Outlined.Sell,
-                version
-            )
-            Tag(
-                Icons.Outlined.FileDownload,
-                downloadCount
-            )
-            Tag(
-                Icons.Outlined.CalendarToday,
-                publishDate
-            )
-        }
-    }
-    Markdown(
-        markdown,
-    )
-}
-
-@Composable
-private fun Tag(icon: ImageVector, text: String) {
-    Row(
-        horizontalArrangement = Arrangement.spacedBy(6.dp),
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        Icon(
-            imageVector = icon,
-            contentDescription = null,
-            modifier = Modifier.size(16.dp),
-            tint = MaterialTheme.colorScheme.outline,
-        )
-        Text(
-            text,
-            style = MaterialTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.outline,
-        )
-    }
 }