Skip to content

Commit 45cb3c5

Browse files
tibbitibbi
committed
use separate file icons depending on the extension
1 parent fb8b384 commit 45cb3c5

File tree

7 files changed

+49
-34
lines changed

7 files changed

+49
-34
lines changed

‎app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt‎

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
5858
private val TYPE_FILE_DIR = 1
5959
private val TYPE_SECTION = 2
6060
private lateinit var folderDrawable: Drawable
61-
private lateinit var fileDrawable: Drawable
6261
private var currentItemsHash = listItems.hashCode()
6362
private var textToHighlight = ""
6463
private val hasOTGConnected = activity.hasOTGConnected()
@@ -154,9 +153,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
154153

155154
fun initDrawables() {
156155
folderDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_folder_vector, textColor)
157-
fileDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_file_vector, textColor)
158156
folderDrawable.alpha = 180
159-
fileDrawable.alpha = 180
160157
}
161158

162159
private fun isOneFileSelected() = isOneItemSelected() && getItemWithKey(selectedKeys.first())?.isDirectory == false
@@ -713,7 +710,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
713710
val options = RequestOptions()
714711
.signature(listItem.mPath.getFileSignature())
715712
.diskCacheStrategy(DiskCacheStrategy.RESOURCE)
716-
.error(fileDrawable)
713+
.error(getFileIcon(fileName.substringAfterLast(".").toLowerCase()))
717714
.centerCrop()
718715

719716
val itemToLoad = getImagePathToLoad(listItem.path)
@@ -753,4 +750,42 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
753750

754751
return itemToLoad
755752
}
753+
754+
private fun getFileIcon(extension: String): Drawable {
755+
val id = when (extension) {
756+
"aep" -> R.drawable.ic_file_after_effects
757+
"ai" -> R.drawable.ic_file_ai
758+
"avi" -> R.drawable.ic_file_avi
759+
"css" -> R.drawable.ic_file_css
760+
"csv" -> R.drawable.ic_file_csv
761+
"dbf" -> R.drawable.ic_file_dbf
762+
"doc", "docx" -> R.drawable.ic_file_doc
763+
"dwg" -> R.drawable.ic_file_dwg
764+
"exe" -> R.drawable.ic_file_exe
765+
"fla" -> R.drawable.ic_file_fla
766+
"flv" -> R.drawable.ic_file_flash
767+
"htm", "html" -> R.drawable.ic_file_html
768+
"indd" -> R.drawable.ic_file_indesign
769+
"iso" -> R.drawable.ic_file_iso
770+
"jpg", "jpeg" -> R.drawable.ic_file_jpg
771+
"js" -> R.drawable.ic_file_javascript
772+
"json" -> R.drawable.ic_file_json
773+
"mp3" -> R.drawable.ic_file_mp3
774+
"mp4" -> R.drawable.ic_file_mp4
775+
"pdf" -> R.drawable.ic_file_pdf
776+
"plproj" -> R.drawable.ic_file_prelude
777+
"prproj" -> R.drawable.ic_file_premiere
778+
"psd" -> R.drawable.ic_file_psd
779+
"rtf" -> R.drawable.ic_file_rtf
780+
"sesx" -> R.drawable.ic_file_audition
781+
"svg" -> R.drawable.ic_file_svg
782+
"txt" -> R.drawable.ic_file_txt
783+
"xls" -> R.drawable.ic_file_xls
784+
"xml" -> R.drawable.ic_file_xml
785+
"zip" -> R.drawable.ic_file_zip
786+
else -> R.drawable.ic_file_generic
787+
}
788+
789+
return resources.getDrawable(id)
790+
}
756791
}

‎app/src/main/res/drawable/ic_file_bridge.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎app/src/main/res/drawable/ic_file_dreamweaver.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎app/src/main/res/drawable/ic_file_fireworks.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎app/src/main/res/drawable/ic_file_illustrator.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎app/src/main/res/drawable/ic_file_photoshop.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎app/src/main/res/drawable/ic_file_psd.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector android:height="24dp" android:viewportHeight="56"
2+
android:viewportWidth="56" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
3+
<path android:fillColor="#E9E9E0" android:pathData="M36.985,0H7.963C7.155,0 6.5,0.655 6.5,1.926V55c0,0.345 0.655,1 1.463,1h40.074c0.808,0 1.463,-0.655 1.463,-1V12.978c0,-0.696 -0.093,-0.92 -0.257,-1.085L37.607,0.257C37.442,0.093 37.218,0 36.985,0z"/>
4+
<path android:fillColor="#5889C4" android:pathData="M48.037,56H7.963C7.155,56 6.5,55.345 6.5,54.537V39h43v15.537C49.5,55.345 48.845,56 48.037,56z"/>
5+
<path android:fillColor="#FFFFFF" android:pathData="M17.385,53h-1.641V42.924h2.898c0.428,0 0.852,0.068 1.271,0.205c0.419,0.137 0.795,0.342 1.128,0.615c0.333,0.273 0.602,0.604 0.807,0.991s0.308,0.822 0.308,1.306c0,0.511 -0.087,0.973 -0.26,1.388c-0.173,0.415 -0.415,0.764 -0.725,1.046c-0.31,0.282 -0.684,0.501 -1.121,0.656s-0.921,0.232 -1.449,0.232h-1.217V53zM17.385,44.168v3.992h1.504c0.2,0 0.398,-0.034 0.595,-0.103c0.196,-0.068 0.376,-0.18 0.54,-0.335c0.164,-0.155 0.296,-0.371 0.396,-0.649c0.1,-0.278 0.15,-0.622 0.15,-1.032c0,-0.164 -0.023,-0.354 -0.068,-0.567c-0.046,-0.214 -0.139,-0.419 -0.28,-0.615c-0.142,-0.196 -0.34,-0.36 -0.595,-0.492c-0.255,-0.132 -0.593,-0.198 -1.012,-0.198H17.385z"/>
6+
<path android:fillColor="#FFFFFF" android:pathData="M29.73,50.238c0,0.364 -0.075,0.718 -0.226,1.06s-0.362,0.643 -0.636,0.902s-0.611,0.467 -1.012,0.622c-0.401,0.155 -0.857,0.232 -1.367,0.232c-0.219,0 -0.444,-0.012 -0.677,-0.034s-0.467,-0.062 -0.704,-0.116c-0.237,-0.055 -0.463,-0.13 -0.677,-0.226c-0.214,-0.096 -0.399,-0.212 -0.554,-0.349l0.287,-1.176c0.127,0.073 0.289,0.144 0.485,0.212c0.196,0.068 0.398,0.132 0.608,0.191c0.209,0.06 0.419,0.107 0.629,0.144c0.209,0.036 0.405,0.055 0.588,0.055c0.556,0 0.982,-0.13 1.278,-0.39c0.296,-0.26 0.444,-0.645 0.444,-1.155c0,-0.31 -0.105,-0.574 -0.314,-0.793c-0.21,-0.219 -0.472,-0.417 -0.786,-0.595s-0.654,-0.355 -1.019,-0.533c-0.365,-0.178 -0.707,-0.388 -1.025,-0.629c-0.319,-0.241 -0.583,-0.526 -0.793,-0.854c-0.21,-0.328 -0.314,-0.738 -0.314,-1.23c0,-0.446 0.082,-0.843 0.246,-1.189s0.385,-0.641 0.663,-0.882c0.278,-0.241 0.602,-0.426 0.971,-0.554s0.759,-0.191 1.169,-0.191c0.419,0 0.843,0.039 1.271,0.116c0.428,0.077 0.774,0.203 1.039,0.376c-0.055,0.118 -0.119,0.248 -0.191,0.39c-0.073,0.142 -0.142,0.273 -0.205,0.396c-0.064,0.123 -0.119,0.226 -0.164,0.308c-0.046,0.082 -0.073,0.128 -0.082,0.137c-0.055,-0.027 -0.116,-0.063 -0.185,-0.109s-0.167,-0.091 -0.294,-0.137c-0.128,-0.046 -0.296,-0.077 -0.506,-0.096c-0.21,-0.019 -0.479,-0.014 -0.807,0.014c-0.183,0.019 -0.355,0.07 -0.52,0.157s-0.31,0.193 -0.438,0.321c-0.128,0.128 -0.228,0.271 -0.301,0.431c-0.073,0.159 -0.109,0.313 -0.109,0.458c0,0.364 0.104,0.658 0.314,0.882c0.209,0.224 0.469,0.419 0.779,0.588c0.31,0.169 0.647,0.333 1.012,0.492c0.364,0.159 0.704,0.354 1.019,0.581s0.576,0.513 0.786,0.854C29.625,49.261 29.73,49.7 29.73,50.238z"/>
7+
<path android:fillColor="#FFFFFF" android:pathData="M39.629,47.682c0,0.829 -0.089,1.538 -0.267,2.126s-0.403,1.08 -0.677,1.477s-0.581,0.709 -0.923,0.937s-0.672,0.398 -0.991,0.513c-0.319,0.114 -0.611,0.187 -0.875,0.219C35.632,52.984 35.436,53 35.309,53h-3.814V42.924h3.035c0.848,0 1.593,0.135 2.235,0.403s1.176,0.627 1.6,1.073s0.74,0.955 0.95,1.524C39.524,46.494 39.629,47.08 39.629,47.682zM34.762,51.797c1.112,0 1.914,-0.355 2.406,-1.066s0.738,-1.741 0.738,-3.09c0,-0.419 -0.05,-0.834 -0.15,-1.244c-0.101,-0.41 -0.294,-0.781 -0.581,-1.114s-0.677,-0.602 -1.169,-0.807s-1.13,-0.308 -1.914,-0.308h-0.957v7.629H34.762z"/>
8+
<path android:fillColor="#C8BDB8" android:pathData="M38.894,11.163c-0.463,-0.301 -1.082,-0.171 -1.384,0.291c-1.433,2.196 -3.979,5.164 -5.19,6.375l-2.788,2.788l-2.828,-2.828L29.49,15c1.771,-1.771 6.271,-5.442 8.116,-6.102c0.04,-0.006 0.091,-0.015 0.112,-0.02c0.521,-0.117 0.827,-0.617 0.735,-1.143c-0.093,-0.526 -0.616,-0.885 -1.143,-0.814l-0.283,0.062c-2.439,0.813 -7.457,5.108 -8.952,6.604l-7.185,7.185c-0.095,-0.004 -0.189,-0.014 -0.285,-0.014c-2.971,0 -5.463,2.125 -5.983,5.016l-0.108,0.073l-0.02,0.536c-0.034,0.942 -0.302,4.052 -2.343,4.546c-0.517,0.129 -0.858,0.625 -0.793,1.152L11.52,33h6.98l0.02,0v0l2.086,-0.03c3.367,0 6.107,-2.74 6.107,-6.107c0,-0.193 -0.011,-0.383 -0.029,-0.572l7.049,-7.048c1.305,-1.305 3.925,-4.358 5.451,-6.696C39.486,12.084 39.356,11.465 38.894,11.163zM20.606,30.97h-3.739L16.882,31h-1.661c0.887,-1.341 1.161,-3.037 1.244,-4.045l0.082,-0.504c0.213,-2.106 1.958,-3.694 4.06,-3.694c0.121,0 0.235,0.025 0.354,0.036l0.167,0.021c1.045,0.134 1.956,0.655 2.6,1.411c0.058,0.069 0.118,0.135 0.171,0.208c0.082,0.11 0.155,0.227 0.226,0.345c0.05,0.085 0.097,0.172 0.142,0.26c0.063,0.126 0.124,0.254 0.174,0.387c0.03,0.08 0.052,0.164 0.077,0.247c0.045,0.147 0.091,0.294 0.12,0.449l0.005,0.026c0.041,0.234 0.072,0.471 0.072,0.716C24.713,29.127 22.871,30.97 20.606,30.97zM25.516,23.247c-0.007,-0.009 -0.013,-0.017 -0.02,-0.026c-0.605,-0.811 -1.405,-1.465 -2.332,-1.895l2.123,-2.123l2.828,2.828l-2.071,2.07C25.893,23.801 25.715,23.516 25.516,23.247z"/>
9+
<path android:fillColor="#D9D7CA" android:pathData="M37.5,0.151l0,11.849l11.849,0z"/>
10+
</vector>

0 commit comments

Comments
 (0)