Skip to content

Commit

Permalink
Show size of app backups in Backup Status screen
Browse files Browse the repository at this point in the history
  • Loading branch information
grote committed Jan 17, 2024
1 parent c362da8 commit 599240c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ data class AppStatus(
val icon: Drawable,
val name: String,
val time: Long,
val size: Long?,
val status: AppBackupState,
val isSpecial: Boolean = false,
) : AppListItem()
Expand Down Expand Up @@ -87,6 +88,7 @@ internal class AppListRetriever(
icon = getIcon(packageName),
name = context.getString(stringId),
time = metadata?.time ?: 0,
size = metadata?.size,
status = status,
isSpecial = true
)
Expand All @@ -111,6 +113,7 @@ internal class AppListRetriever(
icon = getIcon(it.packageName),
name = getAppName(context, it.packageName).toString(),
time = time,
size = metadata?.size,
status = status
)
}.sortedBy { it.name.lowercase(locale) }
Expand All @@ -125,6 +128,7 @@ internal class AppListRetriever(
icon = getIcon(it.packageName),
name = getAppName(context, it.packageName).toString(),
time = 0,
size = null,
status = FAILED_NOT_ALLOWED
)
}.sortedBy { it.name.lowercase(locale) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.stevesoltys.seedvault.settings
import android.content.Intent
import android.net.Uri
import android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS
import android.text.format.Formatter.formatShortFileSize
import android.view.LayoutInflater
import android.view.View
import android.view.View.GONE
Expand Down Expand Up @@ -116,7 +117,12 @@ internal class AppStatusAdapter(private val toggleListener: AppStatusToggleListe
setState(item.status, false)
}
if (item.status == SUCCEEDED) {
appInfo.text = item.time.toRelativeTime(context)
appInfo.text = if (item.size == null) {
item.time.toRelativeTime(context)
} else {
item.time.toRelativeTime(context).toString() +
" (${formatShortFileSize(v.context, item.size)})"
}
appInfo.visibility = VISIBLE
}
switchView.visibility = INVISIBLE
Expand Down

0 comments on commit 599240c

Please sign in to comment.