Merge pull request #358 from OpenHub-Store/clear-cache-enhancment

rainxchzed · web-flow · commit d246298437e4 · 2026-03-26T11:06:29.000+05:00
diff --git a/core/data/src/androidMain/kotlin/zed/rainxch/core/data/services/AndroidDownloader.kt b/core/data/src/androidMain/kotlin/zed/rainxch/core/data/services/AndroidDownloader.kt
@@ -210,7 +210,6 @@ class AndroidDownloader(
     override suspend fun cancelDownload(fileName: String): Boolean =
         withContext(Dispatchers.IO) {
             var cancelled = false
-            var deleted = false
 
             val downloadId = activeFileNames[fileName]
             if (downloadId != null) {
@@ -222,13 +221,16 @@ class AndroidDownloader(
                     activeDownloads.remove(downloadId)
                 }
                 activeFileNames.remove(fileName)
-            }
 
-            val file = File(files.appDownloadsDir(), fileName)
-            if (file.exists()) {
-                deleted = file.delete()
+                // Only delete the file if we cancelled an active download (incomplete file)
+                if (cancelled) {
+                    val file = File(files.appDownloadsDir(), fileName)
+                    if (file.exists()) {
+                        file.delete()
+                    }
+                }
             }
 
-            cancelled || deleted
+            cancelled
         }
 }
diff --git a/core/data/src/jvmMain/kotlin/zed/rainxch/core/data/services/DesktopDownloader.kt b/core/data/src/jvmMain/kotlin/zed/rainxch/core/data/services/DesktopDownloader.kt
@@ -197,8 +197,6 @@ class DesktopDownloader(
     override suspend fun cancelDownload(fileName: String): Boolean =
         withContext(Dispatchers.IO) {
             var cancelled = false
-            var deleted = false
-
             val downloadId = nameToId[fileName]
             if (downloadId != null) {
                 activeDownloads[downloadId]?.let { call ->
@@ -209,14 +207,17 @@ class DesktopDownloader(
                 }
                 activeDownloads.remove(downloadId)
                 nameToId.remove(fileName)
-            }
 
-            val file = File(files.userDownloadsDir(), fileName)
-            if (file.exists()) {
-                deleted = file.delete()
+                // Only delete the file if we cancelled an active download (incomplete file)
+                if (cancelled) {
+                    val file = File(files.userDownloadsDir(), fileName)
+                    if (file.exists()) {
+                        file.delete()
+                    }
+                }
             }
 
-            cancelled || deleted
+            cancelled
         }
 
     companion object {
diff --git a/core/presentation/src/androidMain/kotlin/zed/rainxch/core/presentation/components/ScrollbarContainer.android.kt b/core/presentation/src/androidMain/kotlin/zed/rainxch/core/presentation/components/ScrollbarContainer.android.kt
@@ -1,5 +1,6 @@
 package zed.rainxch.core.presentation.components
 
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState
 import androidx.compose.runtime.Composable
@@ -10,22 +11,21 @@ actual fun ScrollbarContainer(
     listState: LazyListState,
     enabled: Boolean,
     modifier: Modifier,
-    content: `@Composable` () -> Unit,
+    content: @Composable () -> Unit,
 ) {
     Box(modifier = modifier) {
         content()
     }
 }
 
-`@Composable`
+@Composable
 actual fun ScrollbarContainer(
     gridState: LazyStaggeredGridState,
     enabled: Boolean,
     modifier: Modifier,
-    content: `@Composable` () -> Unit,
+    content: @Composable () -> Unit,
 ) {
     Box(modifier = modifier) {
         content()
     }
 }
-}
diff --git a/core/presentation/src/commonMain/composeResources/values/strings.xml b/core/presentation/src/commonMain/composeResources/values/strings.xml
@@ -486,8 +486,15 @@
     <string name="no_github_link_in_clipboard">No GitHub link found in clipboard</string>
 
     <string name="storage">Storage</string>
-    <string name="clear_cache">Clear cache</string>
+    <string name="downloaded_packages">Downloaded Packages</string>
+    <string name="downloaded_packages_description">APKs and installers from GitHub releases</string>
     <string name="current_size">Current size:</string>
+    <string name="delete_all">Delete All</string>
+    <string name="delete_downloads_confirmation_title">Delete all downloads?</string>
+    <string name="delete_downloads_confirmation_message">This will permanently remove all downloaded APKs and installers (%1$s). You can re-download them anytime.</string>
+    <string name="downloads_cleared">All downloaded packages have been deleted.</string>
+    <!-- Legacy keys kept for compatibility -->
+    <string name="clear_cache">Clear cache</string>
     <string name="clear">Clear</string>
     <string name="cache_cleared">The cache is gradually cleared.</string>
 
diff --git a/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileAction.kt b/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileAction.kt
@@ -36,6 +36,10 @@ sealed interface ProfileAction {
 
     data object OnClearCacheClick : ProfileAction
 
+    data object OnClearDownloadsConfirm : ProfileAction
+
+    data object OnClearDownloadsDismiss : ProfileAction
+
     data class OnFontThemeSelected(
         val fontTheme: FontTheme,
     ) : ProfileAction
diff --git a/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileRoot.kt b/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileRoot.kt
@@ -32,6 +32,7 @@ import zed.rainxch.core.presentation.locals.LocalBottomNavigationLiquid
 import zed.rainxch.core.presentation.theme.GithubStoreTheme
 import zed.rainxch.core.presentation.utils.ObserveAsEvents
 import zed.rainxch.githubstore.core.presentation.res.*
+import zed.rainxch.profile.presentation.components.ClearDownloadsDialog
 import zed.rainxch.profile.presentation.components.LogoutDialog
 import zed.rainxch.profile.presentation.components.sections.about
 import zed.rainxch.profile.presentation.components.sections.logout
@@ -83,7 +84,7 @@ fun ProfileRoot(
 
             ProfileEvent.OnCacheCleared -> {
                 coroutineScope.launch {
-                    snackbarState.showSnackbar(getString(Res.string.cache_cleared))
+                    snackbarState.showSnackbar(getString(Res.string.downloads_cleared))
                 }
             }
 
@@ -147,6 +148,18 @@ fun ProfileRoot(
             },
         )
     }
+
+    if (state.isClearDownloadsDialogVisible) {
+        ClearDownloadsDialog(
+            cacheSize = state.cacheSize,
+            onDismissRequest = {
+                viewModel.onAction(ProfileAction.OnClearDownloadsDismiss)
+            },
+            onConfirm = {
+                viewModel.onAction(ProfileAction.OnClearDownloadsConfirm)
+            },
+        )
+    }
 }
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
diff --git a/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileState.kt b/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileState.kt
@@ -24,6 +24,7 @@ data class ProfileState(
     val isProxyPasswordVisible: Boolean = false,
     val autoDetectClipboardLinks: Boolean = true,
     val cacheSize: String = "",
+    val isClearDownloadsDialogVisible: Boolean = false,
     val installerType: InstallerType = InstallerType.DEFAULT,
     val shizukuAvailability: ShizukuAvailability = ShizukuAvailability.UNAVAILABLE,
     val autoUpdateEnabled: Boolean = false,
diff --git a/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileViewModel.kt b/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileViewModel.kt
@@ -300,6 +300,11 @@ class ProfileViewModel(
             }
 
             ProfileAction.OnClearCacheClick -> {
+                _state.update { it.copy(isClearDownloadsDialogVisible = true) }
+            }
+
+            ProfileAction.OnClearDownloadsConfirm -> {
+                _state.update { it.copy(isClearDownloadsDialogVisible = false) }
                 viewModelScope.launch {
                     runCatching {
                         profileRepository.clearCache()
@@ -309,13 +314,17 @@ class ProfileViewModel(
                     }.onFailure { error ->
                         _events.send(
                             ProfileEvent.OnCacheClearError(
-                                error.message ?: "Failed to clear cache",
+                                error.message ?: "Failed to clear downloads",
                             ),
                         )
                     }
                 }
             }
 
+            ProfileAction.OnClearDownloadsDismiss -> {
+                _state.update { it.copy(isClearDownloadsDialogVisible = false) }
+            }
+
             is ProfileAction.OnThemeColorSelected -> {
                 viewModelScope.launch {
                     tweaksRepository.setThemeColor(action.themeColor)
diff --git a/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/components/ClearDownloadsDialog.kt b/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/components/ClearDownloadsDialog.kt
@@ -0,0 +1,97 @@
+package zed.rainxch.profile.presentation.components
+
+import androidx.compose.foundation.background
+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.shape.RoundedCornerShape
+import androidx.compose.material3.BasicAlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.DialogProperties
+import org.jetbrains.compose.resources.stringResource
+import zed.rainxch.githubstore.core.presentation.res.*
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ClearDownloadsDialog(
+    cacheSize: String,
+    onDismissRequest: () -> Unit,
+    onConfirm: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    BasicAlertDialog(
+        onDismissRequest = onDismissRequest,
+        properties =
+            DialogProperties(
+                dismissOnClickOutside = true,
+                usePlatformDefaultWidth = false,
+            ),
+        modifier =
+            modifier
+                .padding(16.dp)
+                .clip(RoundedCornerShape(24.dp))
+                .background(MaterialTheme.colorScheme.surfaceContainerHigh)
+                .padding(16.dp),
+    ) {
+        Column(
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            Text(
+                text = stringResource(Res.string.delete_downloads_confirmation_title),
+                style = MaterialTheme.typography.titleLarge,
+                color = MaterialTheme.colorScheme.onSurface,
+                fontWeight = FontWeight.Bold,
+            )
+
+            Text(
+                text = stringResource(Res.string.delete_downloads_confirmation_message, cacheSize),
+                style = MaterialTheme.typography.bodyLarge,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
+            ) {
+                TextButton(
+                    onClick = onDismissRequest,
+                ) {
+                    Text(
+                        text = stringResource(Res.string.cancel),
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.onSurface,
+                    )
+                }
+
+                Button(
+                    onClick = onConfirm,
+                    colors =
+                        ButtonDefaults.buttonColors(
+                            containerColor = MaterialTheme.colorScheme.errorContainer,
+                            contentColor = MaterialTheme.colorScheme.onErrorContainer,
+                        ),
+                ) {
+                    Text(
+                        text = stringResource(Res.string.delete_all),
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.onErrorContainer,
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/components/sections/Others.kt b/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/components/sections/Others.kt
@@ -13,10 +13,11 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Storage
-import androidx.compose.material3.Button
+import androidx.compose.material.icons.outlined.DeleteOutline
+import androidx.compose.material.icons.outlined.Inventory2
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -51,12 +52,12 @@ fun LazyListScope.othersSection(
                 modifier =
                     Modifier
                         .fillMaxWidth()
-                        .padding(horizontal = 16.dp, vertical = 8.dp),
+                        .padding(horizontal = 16.dp, vertical = 12.dp),
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.spacedBy(12.dp),
             ) {
                 Icon(
-                    imageVector = Icons.Outlined.Storage,
+                    imageVector = Icons.Outlined.Inventory2,
                     contentDescription = null,
                     modifier =
                         Modifier
@@ -72,33 +73,40 @@ fun LazyListScope.othersSection(
                     horizontalAlignment = Alignment.Start,
                 ) {
                     Text(
-                        text = stringResource(Res.string.clear_cache),
+                        text = stringResource(Res.string.downloaded_packages),
                         style = MaterialTheme.typography.titleMedium,
                         color = MaterialTheme.colorScheme.onSurface,
                     )
 
+                    Text(
+                        text = stringResource(Res.string.downloaded_packages_description),
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+
                     Text(
                         text = "${stringResource(Res.string.current_size)} ${state.cacheSize}",
-                        style = MaterialTheme.typography.titleSmall,
+                        style = MaterialTheme.typography.bodySmall,
                         color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        fontWeight = FontWeight.SemiBold,
                     )
                 }
 
-                Button(
+                FilledTonalButton(
                     onClick = {
                         onAction(ProfileAction.OnClearCacheClick)
                     },
                     shape = RoundedCornerShape(12.dp),
                     colors =
-                        ButtonDefaults.buttonColors(
-                            containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
-                            contentColor = MaterialTheme.colorScheme.onSurface,
+                        ButtonDefaults.filledTonalButtonColors(
+                            containerColor = MaterialTheme.colorScheme.errorContainer,
+                            contentColor = MaterialTheme.colorScheme.onErrorContainer,
                         ),
                 ) {
-                    Text(
-                        text = stringResource(Res.string.clear),
-                        style = MaterialTheme.typography.titleMediumEmphasized,
-                        fontWeight = FontWeight.Bold,
+                    Icon(
+                        imageVector = Icons.Outlined.DeleteOutline,
+                        contentDescription = null,
+                        modifier = Modifier.size(18.dp),
                     )
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,11 @@ class ProfileViewModel(`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`ProfileAction.OnClearCacheClick -> {`
	`303`	`+ _state.update { it.copy(isClearDownloadsDialogVisible = true) }`
	`304`	`+ }`
	`305`	`+`
	`306`	`+ ProfileAction.OnClearDownloadsConfirm -> {`
	`307`	`+ _state.update { it.copy(isClearDownloadsDialogVisible = false) }`
`303`	`308`	`viewModelScope.launch {`
`304`	`309`	`runCatching {`
`305`	`310`	`profileRepository.clearCache()`
`@@ -309,13 +314,17 @@ class ProfileViewModel(`
`309`	`314`	`}.onFailure { error ->`
`310`	`315`	`_events.send(`
`311`	`316`	`ProfileEvent.OnCacheClearError(`
`312`		`- error.message ?: "Failed to clear cache",`
	`317`	`+ error.message ?: "Failed to clear downloads",`
`313`	`318`	`),`
`314`	`319`	`)`
`315`	`320`	`}`
`316`	`321`	`}`
`317`	`322`	`}`
`318`	`323`
	`324`	`+ ProfileAction.OnClearDownloadsDismiss -> {`
	`325`	`+ _state.update { it.copy(isClearDownloadsDialogVisible = false) }`
	`326`	`+ }`
	`327`	`+`
`319`	`328`	`is ProfileAction.OnThemeColorSelected -> {`
`320`	`329`	`viewModelScope.launch {`
`321`	`330`	`tweaksRepository.setThemeColor(action.themeColor)`