fenix
/
Simple-File-Manager
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adding Others to the storage analyzer

This commit is contained in:
tibbi 2021-10-12 14:09:05 +02:00
parent 91db92b51d
commit 46fa498acc
2 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/StorageFragment.kt
View File

@ -22,6 +22,7 @@ class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
private val AUDIO = "audio" private val AUDIO = "audio"
private val DOCUMENTS = "documents" private val DOCUMENTS = "documents"
private val ARCHIVES = "archives" private val ARCHIVES = "archives"
private val OTHERS = "others"
private val SIZE_DIVIDER = 100000 private val SIZE_DIVIDER = 100000
@ -43,6 +44,7 @@ class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
val audioSize = filesSize[AUDIO]!! val audioSize = filesSize[AUDIO]!!
val documentsSize = filesSize[DOCUMENTS]!! val documentsSize = filesSize[DOCUMENTS]!!
val archivesSize = filesSize[ARCHIVES]!! val archivesSize = filesSize[ARCHIVES]!!
val othersSize = filesSize[OTHERS]!!
activity.runOnUiThread { activity.runOnUiThread {
images_size.text = imagesSize.formatSize() images_size.text = imagesSize.formatSize()
@ -59,6 +61,9 @@ class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
archives_size.text = archivesSize.formatSize() archives_size.text = archivesSize.formatSize()
archives_progressbar.progress = (archivesSize / SIZE_DIVIDER).toInt() archives_progressbar.progress = (archivesSize / SIZE_DIVIDER).toInt()
others_size.text = othersSize.formatSize()
others_progressbar.progress = (othersSize / SIZE_DIVIDER).toInt()
} }
} }
} }
@ -79,25 +84,28 @@ class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
videos_progressbar.setIndicatorColor(greenColor) videos_progressbar.setIndicatorColor(greenColor)
videos_progressbar.trackColor = greenColor.adjustAlpha(0.3f) videos_progressbar.trackColor = greenColor.adjustAlpha(0.3f)
val blueColor = context.resources.getColor(R.color.md_blue_700) val lightBlueColor = context.resources.getColor(R.color.md_light_blue_700)
audio_progressbar.setIndicatorColor(blueColor) audio_progressbar.setIndicatorColor(lightBlueColor)
audio_progressbar.trackColor = blueColor.adjustAlpha(0.3f) audio_progressbar.trackColor = lightBlueColor.adjustAlpha(0.3f)
val yellowColor = context.resources.getColor(R.color.md_yellow_700) val yellowColor = context.resources.getColor(R.color.md_yellow_700)
documents_progressbar.setIndicatorColor(yellowColor) documents_progressbar.setIndicatorColor(yellowColor)
documents_progressbar.trackColor = yellowColor.adjustAlpha(0.3f) documents_progressbar.trackColor = yellowColor.adjustAlpha(0.3f)
val greyColor = context.resources.getColor(R.color.md_grey_700) val whiteColor = context.resources.getColor(R.color.md_grey_white)
archives_progressbar.setIndicatorColor(greyColor) archives_progressbar.setIndicatorColor(whiteColor)
archives_progressbar.trackColor = greyColor.adjustAlpha(0.3f) archives_progressbar.trackColor = whiteColor.adjustAlpha(0.3f)
val pinkColor = context.resources.getColor(R.color.md_pink_700)
others_progressbar.setIndicatorColor(pinkColor)
others_progressbar.trackColor = pinkColor.adjustAlpha(0.3f)
} }
private fun getSizesByMimeType(): HashMap<String, Long> { private fun getSizesByMimeType(): HashMap<String, Long> {
val uri = MediaStore.Files.getContentUri("external") val uri = MediaStore.Files.getContentUri("external")
val projection = arrayOf( val projection = arrayOf(
MediaStore.Files.FileColumns.SIZE, MediaStore.Files.FileColumns.SIZE,
MediaStore.Files.FileColumns.MIME_TYPE, MediaStore.Files.FileColumns.MIME_TYPE
MediaStore.Files.FileColumns.DISPLAY_NAME
) )
var imagesSize = 0L var imagesSize = 0L
@ -105,12 +113,12 @@ class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
var audioSize = 0L var audioSize = 0L
var documentsSize = 0L var documentsSize = 0L
var archivesSize = 0L var archivesSize = 0L
var othersSize = 0L
try { try {
context.queryCursor(uri, projection) { cursor -> context.queryCursor(uri, projection) { cursor ->
try { try {
val mimeType = cursor.getStringValue(MediaStore.Files.FileColumns.MIME_TYPE)?.lowercase(Locale.getDefault()) ?: return@queryCursor val mimeType = cursor.getStringValue(MediaStore.Files.FileColumns.MIME_TYPE)?.lowercase(Locale.getDefault()) ?: return@queryCursor
val size = cursor.getLongValue(MediaStore.Files.FileColumns.SIZE) val size = cursor.getLongValue(MediaStore.Files.FileColumns.SIZE)
val name = cursor.getStringValue(MediaStore.Files.FileColumns.DISPLAY_NAME)
when (mimeType.substringBefore("/")) { when (mimeType.substringBefore("/")) {
"image" -> imagesSize += size "image" -> imagesSize += size
"video" -> videosSize += size "video" -> videosSize += size
@ -121,6 +129,7 @@ class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
extraDocumentMimeTypes.contains(mimeType) -> documentsSize += size extraDocumentMimeTypes.contains(mimeType) -> documentsSize += size
extraAudioMimeTypes.contains(mimeType) -> audioSize += size extraAudioMimeTypes.contains(mimeType) -> audioSize += size
archiveMimeTypes.contains(mimeType) -> archivesSize += size archiveMimeTypes.contains(mimeType) -> archivesSize += size
else -> othersSize += size
} }
} }
} }
@ -136,6 +145,7 @@ class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
put(AUDIO, audioSize) put(AUDIO, audioSize)
put(DOCUMENTS, documentsSize) put(DOCUMENTS, documentsSize)
put(ARCHIVES, archivesSize) put(ARCHIVES, archivesSize)
put(OTHERS, othersSize)
} }
return mimeTypeSizes return mimeTypeSizes
@ -158,7 +168,7 @@ class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
activity.runOnUiThread { activity.runOnUiThread {
arrayOf( arrayOf(
main_storage_usage_progressbar, images_progressbar, videos_progressbar, audio_progressbar, documents_progressbar, main_storage_usage_progressbar, images_progressbar, videos_progressbar, audio_progressbar, documents_progressbar,
archives_progressbar archives_progressbar, others_progressbar
).forEach { ).forEach {
it.max = (totalSpace / SIZE_DIVIDER).toInt() it.max = (totalSpace / SIZE_DIVIDER).toInt()
} }

30
app/src/main/res/layout/storage_fragment.xml
View File

@ -197,4 +197,34 @@
android:max="100" android:max="100"
app:trackThickness="2dp" /> app:trackThickness="2dp" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/others_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/archives_progressbar"
android:layout_marginTop="@dimen/big_margin"
android:text="@string/others"
android:textSize="@dimen/bigger_text_size" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/others_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/archives_progressbar"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/big_margin"
android:alpha="0.7"
android:textSize="@dimen/normal_text_size"
tools:text="20 GB" />
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/others_progressbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/others_label"
android:layout_marginTop="@dimen/medium_margin"
android:layout_marginBottom="@dimen/medium_margin"
android:max="100"
app:trackThickness="2dp" />
</com.simplemobiletools.filemanager.pro.fragments.StorageFragment> </com.simplemobiletools.filemanager.pro.fragments.StorageFragment>