Skip to content

Commit

Permalink
Add internal storage option, and improve StorageInfoCard layout
Browse files Browse the repository at this point in the history 
Also (hint) rearrange presented external dirs as per app default preference. Not guaranteed though.
  • Loading branch information
@nain-F49FF806
nain-F49FF806 committed Oct 10, 2024
1 parent e3cb169 commit d247e91
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 11 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ android {
defaultConfig {
minSdk = rootProject.extra["minSdkVersion"] as Int
targetSdk = rootProject.extra["targetSdkVersion"] as Int
versionCode = 1727982000
versionName = "2024.10.03"
versionCode = 1728545000
versionName = "2024.10.10"
applicationId = "alt.nainapps.aer"
vectorDrawables {
useSupportLibrary = true
Expand Down
71 changes: 62 additions & 9 deletions app/src/main/java/alt/nainapps/aer/config/StorageConfigActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.sizeIn
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
Expand All @@ -30,6 +34,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Scaffold
import androidx.compose.material3.SuggestionChip
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
Expand All @@ -39,11 +44,14 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import sh.calvin.reorderable.ReorderableItem
import sh.calvin.reorderable.rememberReorderableLazyListState
import java.io.File
Expand All @@ -67,8 +75,18 @@ class StorageConfigActivity : ComponentActivity() {
}
)
}) { innerPadding ->
val storageInfos by rememberSaveable { mutableStateOf(fetchExternalStorageDirectories(this.applicationContext)) }
var selectedStorageDir by rememberSaveable { mutableStateOf(getPreferredStorageDir(sharedPrefs)) }
var storageInfos = fetchExternalStorageDirectories(this.applicationContext)
val internalStorageInfo = StorageInfo(
filesDir.toString(),
getTotalSpace(filesDir),
getFreeSpace(filesDir),
isEmulated = false,
isRemoveAble = false,
isInternal = true
)
storageInfos = listOf(*storageInfos.toTypedArray(), internalStorageInfo)

Column (Modifier.padding(paddingValues = innerPadding)) {
selectedStorageDir?.let {
Card(modifier = Modifier.padding(8.dp)) {
Expand Down Expand Up @@ -157,18 +175,49 @@ fun StorageInfoCard(
onClick: () -> Unit = {}
) {
Card(onClick = onClick, modifier = (longPressDraggableModifier ?: Modifier).padding(horizontal = 8.dp)) {
Row {
Row (Modifier.padding(4.dp)) {
(draggableModifier ?: longPressDraggableModifier)?.let {
IconButton( modifier = it, onClick = {}) {
Icon(Icons.AutoMirrored.Rounded.List, contentDescription = "Reorder")
}
}

Column(modifier = Modifier.padding(4.dp)) {
Text(text = "Location: ${info.dir}")
Text(text = "Total Space: ${ bytesToHumanReadableSize(info.totalSpace) }")
Text(text = "Free Space: ${ bytesToHumanReadableSize(info.freeSpace) }")
Text(text = "Is Emulated: ${if (info.isEmulated) "Yes" else "No"}")
Column {
Row (
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.fillMaxWidth()
) {
Text(text = if (info.isInternal) "Internal" else "External", fontWeight = FontWeight.Bold )
Row {
if (info.isRemoveAble) {
SuggestionChip(
onClick = { },
modifier = Modifier.sizeIn(maxHeight = 20.dp).padding(horizontal = 2.dp),
label = { Text(text = "Removable", fontSize = 10.sp)}

)
}
if (info.isEmulated) {
SuggestionChip(
onClick = { },
modifier = Modifier.sizeIn(maxHeight = 20.dp).padding(horizontal = 2.dp),
label = { Text(text = "Emulated", fontSize = 10.sp )}
)
}
}

}
val totalSpace = bytesToHumanReadableSize(info.totalSpace)
val freeSpace = bytesToHumanReadableSize(info.freeSpace)
Column (Modifier.padding(vertical = 4.dp)) {
Text(text = info.dir, fontWeight = FontWeight.Medium)
Text(text = "Total Space: $totalSpace")
Text(text = "Free Space: $freeSpace")
Spacer(Modifier.size(2.dp))
}


}
}
}
Expand All @@ -190,20 +239,24 @@ data class StorageInfo(
val totalSpace: Long,
val freeSpace: Long,
val isEmulated: Boolean,
val isRemoveAble: Boolean,
val isInternal: Boolean
)

fun fetchExternalStorageDirectories(context: Context): List<StorageInfo> {
val directories = mutableListOf<StorageInfo>()
val externalDirs = context.getExternalFilesDirs(null)

for (dir in externalDirs) {
for (dir in externalDirs.reversed()) {
if (dir != null) {
val totalSpace = getTotalSpace(dir)
val freeSpace = getFreeSpace(dir)

val isEmulated = Environment.isExternalStorageEmulated(dir)
val isRemovable = Environment.isExternalStorageRemovable(dir)
val isInternal = false

directories.add(StorageInfo(dir.path, totalSpace, freeSpace, isEmulated))
directories.add(StorageInfo(dir.path, totalSpace, freeSpace, isEmulated, isRemovable, isInternal))
}
}

Expand Down

0 comments on commit d247e91

Please sign in to comment.