Skip to content

Commit f91c632

Browse files
committed
moving the file type icons into Commons
1 parent 41f5f78 commit f91c632

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+3
-516
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ android {
5858
}
5959

6060
dependencies {
61-
implementation 'com.simplemobiletools:commons:5.26.20'
61+
implementation 'com.simplemobiletools:commons:5.26.21'
6262
implementation 'com.github.Stericson:RootTools:df729dcb13'
6363
implementation 'com.github.Stericson:RootShell:1.6'
6464
implementation 'com.alexvasilkov:gesture-views:2.5.2'

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

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ import com.bumptech.glide.request.RequestOptions
2424
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
2525
import com.simplemobiletools.commons.dialogs.*
2626
import com.simplemobiletools.commons.extensions.*
27-
import com.simplemobiletools.commons.helpers.CONFLICT_OVERWRITE
28-
import com.simplemobiletools.commons.helpers.CONFLICT_SKIP
29-
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
30-
import com.simplemobiletools.commons.helpers.isOreoPlus
27+
import com.simplemobiletools.commons.helpers.*
3128
import com.simplemobiletools.commons.models.FileDirItem
3229
import com.simplemobiletools.commons.models.RadioItem
3330
import com.simplemobiletools.commons.views.FastScroller
@@ -753,49 +750,6 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
753750
folderDrawable = resources.getColoredDrawableWithColor(R.drawable.ic_folder_vector, textColor)
754751
folderDrawable.alpha = 180
755752
fileDrawable = resources.getDrawable(R.drawable.ic_file_generic)
756-
757-
hashMapOf<String, Int>().apply {
758-
put("aep", R.drawable.ic_file_aep)
759-
put("ai", R.drawable.ic_file_ai)
760-
put("avi", R.drawable.ic_file_avi)
761-
put("css", R.drawable.ic_file_css)
762-
put("csv", R.drawable.ic_file_csv)
763-
put("dbf", R.drawable.ic_file_dbf)
764-
put("doc", R.drawable.ic_file_doc)
765-
put("docx", R.drawable.ic_file_doc)
766-
put("dwg", R.drawable.ic_file_dwg)
767-
put("exe", R.drawable.ic_file_exe)
768-
put("fla", R.drawable.ic_file_fla)
769-
put("flv", R.drawable.ic_file_flv)
770-
put("htm", R.drawable.ic_file_html)
771-
put("html", R.drawable.ic_file_html)
772-
put("ics", R.drawable.ic_file_ics)
773-
put("indd", R.drawable.ic_file_indd)
774-
put("iso", R.drawable.ic_file_iso)
775-
put("jpg", R.drawable.ic_file_jpg)
776-
put("jpeg", R.drawable.ic_file_jpg)
777-
put("js", R.drawable.ic_file_js)
778-
put("json", R.drawable.ic_file_json)
779-
put("m4a", R.drawable.ic_file_m4a)
780-
put("mp3", R.drawable.ic_file_mp3)
781-
put("mp4", R.drawable.ic_file_mp4)
782-
put("ogg", R.drawable.ic_file_ogg)
783-
put("pdf", R.drawable.ic_file_pdf)
784-
put("plproj", R.drawable.ic_file_plproj)
785-
put("prproj", R.drawable.ic_file_prproj)
786-
put("psd", R.drawable.ic_file_psd)
787-
put("rtf", R.drawable.ic_file_rtf)
788-
put("sesx", R.drawable.ic_file_sesx)
789-
put("svg", R.drawable.ic_file_svg)
790-
put("txt", R.drawable.ic_file_txt)
791-
put("vcf", R.drawable.ic_file_vcf)
792-
put("wav", R.drawable.ic_file_wav)
793-
put("wmv", R.drawable.ic_file_wmv)
794-
put("xls", R.drawable.ic_file_xls)
795-
put("xml", R.drawable.ic_file_xml)
796-
put("zip", R.drawable.ic_file_zip)
797-
}.forEach { (key, value) ->
798-
fileDrawables.put(key, resources.getDrawable(value))
799-
}
753+
fileDrawables = getFilePlaceholderDrawables(activity)
800754
}
801755
}

app/src/main/res/drawable/ic_file_aep.xml

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

app/src/main/res/drawable/ic_file_ai.xml

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

app/src/main/res/drawable/ic_file_avi.xml

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

app/src/main/res/drawable/ic_file_css.xml

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

0 commit comments

Comments
 (0)