Skip to content

Commit

Permalink
add app+data size to sort+filter sheet
Browse files Browse the repository at this point in the history
  • Loading branch information
@hg42
hg42 committed Oct 9, 2024
1 parent d192e22 commit 1e0b043
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 28 deletions.
78 changes: 56 additions & 22 deletions src/main/java/com/machiav3lli/backup/sheets/SortFilterSheet.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
*/
package com.machiav3lli.backup.sheets

import android.text.format.Formatter
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
Expand All @@ -44,6 +46,8 @@ import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.machiav3lli.backup.BACKUP_FILTER_DEFAULT
import com.machiav3lli.backup.CHIP_SIZE_APP
import com.machiav3lli.backup.CHIP_SIZE_DATA
import com.machiav3lli.backup.MAIN_FILTER_DEFAULT
import com.machiav3lli.backup.OABX
import com.machiav3lli.backup.R
Expand All @@ -69,9 +73,11 @@ import com.machiav3lli.backup.ui.compose.item.ElevatedActionButton
import com.machiav3lli.backup.ui.compose.item.ExpandableBlock
import com.machiav3lli.backup.ui.compose.item.RoundButton
import com.machiav3lli.backup.ui.compose.item.SwitchChip
import com.machiav3lli.backup.ui.compose.recycler.InfoChipsBlock
import com.machiav3lli.backup.ui.compose.recycler.MultiSelectableChipGroup
import com.machiav3lli.backup.ui.compose.recycler.SelectableChipGroup
import com.machiav3lli.backup.ui.item.ChipItem
import com.machiav3lli.backup.ui.item.InfoChipItem
import com.machiav3lli.backup.updatedFilterChipItems
import com.machiav3lli.backup.utils.applyFilter
import com.machiav3lli.backup.utils.getStats
Expand Down Expand Up @@ -101,28 +107,56 @@ fun SortFilterSheet(onDismiss: () -> Unit) {
containerColor = Color.Transparent,
),
headlineContent = {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 8.dp),
horizontalArrangement = Arrangement.spacedBy(4.dp),
verticalAlignment = Alignment.CenterVertically
) {
DoubleVerticalText(
upperText = currentStats().first.toString(),
bottomText = stringResource(id = R.string.stats_apps),
modifier = Modifier.weight(1f)
)
DoubleVerticalText(
upperText = currentStats().second.toString(),
bottomText = stringResource(id = R.string.stats_backups),
modifier = Modifier.weight(1f)
)
DoubleVerticalText(
upperText = currentStats().third.toString(),
bottomText = stringResource(id = R.string.stats_updated),
modifier = Modifier.weight(1f)
)
Column {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 8.dp),
horizontalArrangement = Arrangement.spacedBy(4.dp),
verticalAlignment = Alignment.CenterVertically
) {
val stats = currentStats()
DoubleVerticalText(
upperText = stats.nApps.toString(),
bottomText = stringResource(id = R.string.stats_apps),
modifier = Modifier.weight(1f)
)
DoubleVerticalText(
upperText = stats.nBackups.toString(),
bottomText = stringResource(id = R.string.stats_backups),
modifier = Modifier.weight(1f)
)
DoubleVerticalText(
upperText = stats.nUpdated.toString(),
bottomText = stringResource(id = R.string.stats_updated),
modifier = Modifier.weight(1f)
)
}
Row(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 8.dp),
horizontalArrangement = Arrangement.spacedBy(4.dp),
verticalAlignment = Alignment.CenterVertically
) {
val stats = currentStats()
InfoChipsBlock(list = listOf(
InfoChipItem(
flag = CHIP_SIZE_APP,
text = stringResource(id = R.string.app_size) + " " + Formatter.formatFileSize(
LocalContext.current,
stats.szApps ?: 0
),
),
InfoChipItem(
flag = CHIP_SIZE_DATA,
text = stringResource(id = R.string.data_size) + " " + Formatter.formatFileSize(
LocalContext.current,
stats.szData ?: 0
),
),
))
}
}
},
trailingContent = {
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/machiav3lli/backup/ui/compose/item/MainPackageItem.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ fun Confirmation(
fun DataPartsSelector(
result: MutableIntState,
) {
//TODO hg42 add sizes

batchModes.forEach { (mode, name) ->
DropdownMenuItem(
leadingIcon = {
Expand Down
24 changes: 18 additions & 6 deletions src/main/java/com/machiav3lli/backup/utils/ItemUtils.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,28 @@ import com.machiav3lli.backup.ui.compose.theme.ColorUpdated
import com.machiav3lli.backup.ui.compose.theme.ColorUser
import com.machiav3lli.backup.ui.item.InfoChipItem

fun getStats(appsList: List<Package>): Triple<Int, Int, Int> {
var backupsNumber = 0
var updatedNumber = 0
data class AppStats(
val nApps: Int,
val nBackups: Int,
val nUpdated: Int,
val szApps: Long,
val szData: Long
)

fun getStats(appsList: List<Package>): AppStats { //TODO hg42 we actually want the separate parts, need to find an api
var nBackups = 0
var nUpdated = 0
var szApps = 0L
var szData = 0L
appsList.forEach {
if (it.hasBackups) {
backupsNumber += it.numberOfBackups
if (it.isUpdated) updatedNumber += 1
nBackups += it.numberOfBackups
if (it.isUpdated) nUpdated += 1
}
szApps += it.appBytes
szData += it.dataBytes
}
return Triple(appsList.size, backupsNumber, updatedNumber)
return AppStats(appsList.size, nBackups, nUpdated, szApps, szData)
}

fun PackageManager.getInstalledPackageInfosWithPermissions() =
Expand Down

0 comments on commit 1e0b043

Please sign in to comment.