From 8939274b5cbef7cd8e0c0c0e771f1ae54025baf3 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Mon, 25 Dec 2023 22:58:05 -0500
Subject: [PATCH] Simplify storage usage bar UI implementation

---
 .../settings/screen/SettingsDataScreen.kt     |  1 -
 .../more/settings/screen/data/StorageInfo.kt  | 65 ++++---------------
 2 files changed, 11 insertions(+), 55 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt
index aef277da05..752031c740 100644
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt
@@ -214,7 +214,6 @@ object SettingsDataScreen : SearchableSettings {
                     title = stringResource(MR.strings.pref_storage_usage),
                 ) {
                     BasePreferenceWidget(
-                        title = stringResource(MR.strings.pref_storage_usage),
                         subcomponent = {
                             StorageInfo(
                                 modifier = Modifier.padding(horizontal = PrefsHorizontalPadding),
diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/data/StorageInfo.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/data/StorageInfo.kt
index c634216894..e45b6bafca 100644
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/data/StorageInfo.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/data/StorageInfo.kt
@@ -1,30 +1,24 @@
 package eu.kanade.presentation.more.settings.screen.data
 
 import android.text.format.Formatter
-import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.CornerRadius
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.geometry.RoundRect
-import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import eu.kanade.tachiyomi.util.storage.DiskUtil
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource
+import tachiyomi.presentation.core.theme.header
+import tachiyomi.presentation.core.util.secondaryItemAlpha
 import java.io.File
 
 @Composable
@@ -49,69 +43,32 @@ private fun StorageInfo(
     file: File,
 ) {
     val context = LocalContext.current
-    val layoutDirection = LocalLayoutDirection.current
 
     val available = remember(file) { DiskUtil.getAvailableStorageSpace(file) }
     val availableText = remember(available) { Formatter.formatFileSize(context, available) }
     val total = remember(file) { DiskUtil.getTotalStorageSpace(file) }
     val totalText = remember(total) { Formatter.formatFileSize(context, total) }
 
-    val cornerRadius = CornerRadius(100f, 100f)
-    val usedBarColor = MaterialTheme.colorScheme.primary
-    val totalBarColor = MaterialTheme.colorScheme.surfaceVariant
-
     Column(
         verticalArrangement = Arrangement.spacedBy(4.dp),
     ) {
         Text(
             text = file.absolutePath,
-            fontWeight = FontWeight.Medium,
+            style = MaterialTheme.typography.header,
         )
 
-        Canvas(
+        LinearProgressIndicator(
             modifier = Modifier
+                .clip(MaterialTheme.shapes.small)
                 .fillMaxWidth()
                 .height(12.dp),
-        ) {
-            drawRoundRect(
-                color = totalBarColor,
-                cornerRadius = cornerRadius,
-            )
-
-            drawPath(
-                path = Path().apply {
-                    val pathSize = Size(
-                        width = (1 - (available / total.toFloat())) * size.width,
-                        height = size.height,
-                    )
-                    addRoundRect(
-                        if (layoutDirection == LayoutDirection.Ltr) {
-                            RoundRect(
-                                rect = Rect(
-                                    offset = Offset(0f, 0f),
-                                    size = pathSize,
-                                ),
-                                topLeft = cornerRadius,
-                                bottomLeft = cornerRadius,
-                            )
-                        } else {
-                            RoundRect(
-                                rect = Rect(
-                                    offset = Offset(size.width - pathSize.width, 0f),
-                                    size = pathSize,
-                                ),
-                                topRight = cornerRadius,
-                                bottomRight = cornerRadius,
-                            )
-                        },
-                    )
-                },
-                color = usedBarColor,
-            )
-        }
+            progress = { (1 - (available / total.toFloat())) },
+        )
 
         Text(
             text = stringResource(MR.strings.available_disk_space_info, availableText, totalText),
+            modifier = Modifier.secondaryItemAlpha(),
+            style = MaterialTheme.typography.bodySmall,
         )
     }
 }