mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-12-30 17:11:50 +01:00
Simplify storage usage bar UI implementation
This commit is contained in:
parent
087da2b2f3
commit
8939274b5c
app/src/main/java/eu/kanade/presentation/more/settings/screen
@ -214,7 +214,6 @@ object SettingsDataScreen : SearchableSettings {
|
|||||||
title = stringResource(MR.strings.pref_storage_usage),
|
title = stringResource(MR.strings.pref_storage_usage),
|
||||||
) {
|
) {
|
||||||
BasePreferenceWidget(
|
BasePreferenceWidget(
|
||||||
title = stringResource(MR.strings.pref_storage_usage),
|
|
||||||
subcomponent = {
|
subcomponent = {
|
||||||
StorageInfo(
|
StorageInfo(
|
||||||
modifier = Modifier.padding(horizontal = PrefsHorizontalPadding),
|
modifier = Modifier.padding(horizontal = PrefsHorizontalPadding),
|
||||||
|
@ -1,30 +1,24 @@
|
|||||||
package eu.kanade.presentation.more.settings.screen.data
|
package eu.kanade.presentation.more.settings.screen.data
|
||||||
|
|
||||||
import android.text.format.Formatter
|
import android.text.format.Formatter
|
||||||
import androidx.compose.foundation.Canvas
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.material3.LinearProgressIndicator
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.geometry.CornerRadius
|
import androidx.compose.ui.draw.clip
|
||||||
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.platform.LocalContext
|
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 androidx.compose.ui.unit.dp
|
||||||
import eu.kanade.tachiyomi.util.storage.DiskUtil
|
import eu.kanade.tachiyomi.util.storage.DiskUtil
|
||||||
import tachiyomi.i18n.MR
|
import tachiyomi.i18n.MR
|
||||||
import tachiyomi.presentation.core.i18n.stringResource
|
import tachiyomi.presentation.core.i18n.stringResource
|
||||||
|
import tachiyomi.presentation.core.theme.header
|
||||||
|
import tachiyomi.presentation.core.util.secondaryItemAlpha
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
@ -49,69 +43,32 @@ private fun StorageInfo(
|
|||||||
file: File,
|
file: File,
|
||||||
) {
|
) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
val layoutDirection = LocalLayoutDirection.current
|
|
||||||
|
|
||||||
val available = remember(file) { DiskUtil.getAvailableStorageSpace(file) }
|
val available = remember(file) { DiskUtil.getAvailableStorageSpace(file) }
|
||||||
val availableText = remember(available) { Formatter.formatFileSize(context, available) }
|
val availableText = remember(available) { Formatter.formatFileSize(context, available) }
|
||||||
val total = remember(file) { DiskUtil.getTotalStorageSpace(file) }
|
val total = remember(file) { DiskUtil.getTotalStorageSpace(file) }
|
||||||
val totalText = remember(total) { Formatter.formatFileSize(context, total) }
|
val totalText = remember(total) { Formatter.formatFileSize(context, total) }
|
||||||
|
|
||||||
val cornerRadius = CornerRadius(100f, 100f)
|
|
||||||
val usedBarColor = MaterialTheme.colorScheme.primary
|
|
||||||
val totalBarColor = MaterialTheme.colorScheme.surfaceVariant
|
|
||||||
|
|
||||||
Column(
|
Column(
|
||||||
verticalArrangement = Arrangement.spacedBy(4.dp),
|
verticalArrangement = Arrangement.spacedBy(4.dp),
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = file.absolutePath,
|
text = file.absolutePath,
|
||||||
fontWeight = FontWeight.Medium,
|
style = MaterialTheme.typography.header,
|
||||||
)
|
)
|
||||||
|
|
||||||
Canvas(
|
LinearProgressIndicator(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
|
.clip(MaterialTheme.shapes.small)
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.height(12.dp),
|
.height(12.dp),
|
||||||
) {
|
progress = { (1 - (available / total.toFloat())) },
|
||||||
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,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Text(
|
Text(
|
||||||
text = stringResource(MR.strings.available_disk_space_info, availableText, totalText),
|
text = stringResource(MR.strings.available_disk_space_info, availableText, totalText),
|
||||||
|
modifier = Modifier.secondaryItemAlpha(),
|
||||||
|
style = MaterialTheme.typography.bodySmall,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user