From f91c632a52967608d8a6b606039fb4928a3eb0ba Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 23 Apr 2020 10:23:24 +0200 Subject: [PATCH] moving the file type icons into Commons --- app/build.gradle | 2 +- .../filemanager/pro/adapters/ItemsAdapter.kt | 50 +------------------ app/src/main/res/drawable/ic_file_aep.xml | 11 ---- app/src/main/res/drawable/ic_file_ai.xml | 9 ---- app/src/main/res/drawable/ic_file_avi.xml | 11 ---- app/src/main/res/drawable/ic_file_css.xml | 11 ---- app/src/main/res/drawable/ic_file_csv.xml | 10 ---- app/src/main/res/drawable/ic_file_dbf.xml | 10 ---- app/src/main/res/drawable/ic_file_doc.xml | 21 -------- app/src/main/res/drawable/ic_file_dwg.xml | 15 ------ app/src/main/res/drawable/ic_file_exe.xml | 13 ----- app/src/main/res/drawable/ic_file_fla.xml | 13 ----- app/src/main/res/drawable/ic_file_flv.xml | 10 ---- app/src/main/res/drawable/ic_file_generic.xml | 9 ---- app/src/main/res/drawable/ic_file_html.xml | 12 ----- app/src/main/res/drawable/ic_file_ics.xml | 10 ---- app/src/main/res/drawable/ic_file_indd.xml | 11 ---- app/src/main/res/drawable/ic_file_iso.xml | 13 ----- app/src/main/res/drawable/ic_file_jpg.xml | 11 ---- app/src/main/res/drawable/ic_file_js.xml | 12 ----- app/src/main/res/drawable/ic_file_json.xml | 14 ------ app/src/main/res/drawable/ic_file_m4a.xml | 10 ---- app/src/main/res/drawable/ic_file_mp3.xml | 10 ---- app/src/main/res/drawable/ic_file_mp4.xml | 11 ---- app/src/main/res/drawable/ic_file_ogg.xml | 10 ---- app/src/main/res/drawable/ic_file_pdf.xml | 10 ---- app/src/main/res/drawable/ic_file_plproj.xml | 14 ------ app/src/main/res/drawable/ic_file_png.xml | 11 ---- app/src/main/res/drawable/ic_file_ppt.xml | 14 ------ app/src/main/res/drawable/ic_file_prproj.xml | 14 ------ app/src/main/res/drawable/ic_file_psd.xml | 10 ---- app/src/main/res/drawable/ic_file_rtf.xml | 21 -------- app/src/main/res/drawable/ic_file_sesx.xml | 11 ---- app/src/main/res/drawable/ic_file_svg.xml | 10 ---- app/src/main/res/drawable/ic_file_txt.xml | 21 -------- app/src/main/res/drawable/ic_file_vcf.xml | 8 --- app/src/main/res/drawable/ic_file_wav.xml | 10 ---- app/src/main/res/drawable/ic_file_wmv.xml | 11 ---- app/src/main/res/drawable/ic_file_xls.xml | 10 ---- app/src/main/res/drawable/ic_file_xml.xml | 14 ------ app/src/main/res/drawable/ic_file_zip.xml | 11 ---- 41 files changed, 3 insertions(+), 516 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_file_aep.xml delete mode 100644 app/src/main/res/drawable/ic_file_ai.xml delete mode 100644 app/src/main/res/drawable/ic_file_avi.xml delete mode 100644 app/src/main/res/drawable/ic_file_css.xml delete mode 100644 app/src/main/res/drawable/ic_file_csv.xml delete mode 100644 app/src/main/res/drawable/ic_file_dbf.xml delete mode 100644 app/src/main/res/drawable/ic_file_doc.xml delete mode 100644 app/src/main/res/drawable/ic_file_dwg.xml delete mode 100644 app/src/main/res/drawable/ic_file_exe.xml delete mode 100644 app/src/main/res/drawable/ic_file_fla.xml delete mode 100644 app/src/main/res/drawable/ic_file_flv.xml delete mode 100644 app/src/main/res/drawable/ic_file_generic.xml delete mode 100644 app/src/main/res/drawable/ic_file_html.xml delete mode 100644 app/src/main/res/drawable/ic_file_ics.xml delete mode 100644 app/src/main/res/drawable/ic_file_indd.xml delete mode 100644 app/src/main/res/drawable/ic_file_iso.xml delete mode 100644 app/src/main/res/drawable/ic_file_jpg.xml delete mode 100644 app/src/main/res/drawable/ic_file_js.xml delete mode 100644 app/src/main/res/drawable/ic_file_json.xml delete mode 100644 app/src/main/res/drawable/ic_file_m4a.xml delete mode 100644 app/src/main/res/drawable/ic_file_mp3.xml delete mode 100644 app/src/main/res/drawable/ic_file_mp4.xml delete mode 100644 app/src/main/res/drawable/ic_file_ogg.xml delete mode 100644 app/src/main/res/drawable/ic_file_pdf.xml delete mode 100644 app/src/main/res/drawable/ic_file_plproj.xml delete mode 100644 app/src/main/res/drawable/ic_file_png.xml delete mode 100644 app/src/main/res/drawable/ic_file_ppt.xml delete mode 100644 app/src/main/res/drawable/ic_file_prproj.xml delete mode 100644 app/src/main/res/drawable/ic_file_psd.xml delete mode 100644 app/src/main/res/drawable/ic_file_rtf.xml delete mode 100644 app/src/main/res/drawable/ic_file_sesx.xml delete mode 100644 app/src/main/res/drawable/ic_file_svg.xml delete mode 100644 app/src/main/res/drawable/ic_file_txt.xml delete mode 100644 app/src/main/res/drawable/ic_file_vcf.xml delete mode 100644 app/src/main/res/drawable/ic_file_wav.xml delete mode 100644 app/src/main/res/drawable/ic_file_wmv.xml delete mode 100644 app/src/main/res/drawable/ic_file_xls.xml delete mode 100644 app/src/main/res/drawable/ic_file_xml.xml delete mode 100644 app/src/main/res/drawable/ic_file_zip.xml diff --git a/app/build.gradle b/app/build.gradle index 45dfa99b..60ad4f0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,7 +58,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.26.20' + implementation 'com.simplemobiletools:commons:5.26.21' implementation 'com.github.Stericson:RootTools:df729dcb13' implementation 'com.github.Stericson:RootShell:1.6' implementation 'com.alexvasilkov:gesture-views:2.5.2' diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt index 1d4e6714..95910e8a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt @@ -24,10 +24,7 @@ import com.bumptech.glide.request.RequestOptions import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.dialogs.* import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.CONFLICT_OVERWRITE -import com.simplemobiletools.commons.helpers.CONFLICT_SKIP -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.helpers.isOreoPlus +import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.FileDirItem import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.commons.views.FastScroller @@ -753,49 +750,6 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList().apply { - put("aep", R.drawable.ic_file_aep) - put("ai", R.drawable.ic_file_ai) - put("avi", R.drawable.ic_file_avi) - put("css", R.drawable.ic_file_css) - put("csv", R.drawable.ic_file_csv) - put("dbf", R.drawable.ic_file_dbf) - put("doc", R.drawable.ic_file_doc) - put("docx", R.drawable.ic_file_doc) - put("dwg", R.drawable.ic_file_dwg) - put("exe", R.drawable.ic_file_exe) - put("fla", R.drawable.ic_file_fla) - put("flv", R.drawable.ic_file_flv) - put("htm", R.drawable.ic_file_html) - put("html", R.drawable.ic_file_html) - put("ics", R.drawable.ic_file_ics) - put("indd", R.drawable.ic_file_indd) - put("iso", R.drawable.ic_file_iso) - put("jpg", R.drawable.ic_file_jpg) - put("jpeg", R.drawable.ic_file_jpg) - put("js", R.drawable.ic_file_js) - put("json", R.drawable.ic_file_json) - put("m4a", R.drawable.ic_file_m4a) - put("mp3", R.drawable.ic_file_mp3) - put("mp4", R.drawable.ic_file_mp4) - put("ogg", R.drawable.ic_file_ogg) - put("pdf", R.drawable.ic_file_pdf) - put("plproj", R.drawable.ic_file_plproj) - put("prproj", R.drawable.ic_file_prproj) - put("psd", R.drawable.ic_file_psd) - put("rtf", R.drawable.ic_file_rtf) - put("sesx", R.drawable.ic_file_sesx) - put("svg", R.drawable.ic_file_svg) - put("txt", R.drawable.ic_file_txt) - put("vcf", R.drawable.ic_file_vcf) - put("wav", R.drawable.ic_file_wav) - put("wmv", R.drawable.ic_file_wmv) - put("xls", R.drawable.ic_file_xls) - put("xml", R.drawable.ic_file_xml) - put("zip", R.drawable.ic_file_zip) - }.forEach { (key, value) -> - fileDrawables.put(key, resources.getDrawable(value)) - } + fileDrawables = getFilePlaceholderDrawables(activity) } } diff --git a/app/src/main/res/drawable/ic_file_aep.xml b/app/src/main/res/drawable/ic_file_aep.xml deleted file mode 100644 index 257bdd7d..00000000 --- a/app/src/main/res/drawable/ic_file_aep.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_ai.xml b/app/src/main/res/drawable/ic_file_ai.xml deleted file mode 100644 index 02dffd66..00000000 --- a/app/src/main/res/drawable/ic_file_ai.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_avi.xml b/app/src/main/res/drawable/ic_file_avi.xml deleted file mode 100644 index a2468b1d..00000000 --- a/app/src/main/res/drawable/ic_file_avi.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_css.xml b/app/src/main/res/drawable/ic_file_css.xml deleted file mode 100644 index 0c8d00d5..00000000 --- a/app/src/main/res/drawable/ic_file_css.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_csv.xml b/app/src/main/res/drawable/ic_file_csv.xml deleted file mode 100644 index 7ae6a391..00000000 --- a/app/src/main/res/drawable/ic_file_csv.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_dbf.xml b/app/src/main/res/drawable/ic_file_dbf.xml deleted file mode 100644 index b7a13514..00000000 --- a/app/src/main/res/drawable/ic_file_dbf.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_doc.xml b/app/src/main/res/drawable/ic_file_doc.xml deleted file mode 100644 index 78b23951..00000000 --- a/app/src/main/res/drawable/ic_file_doc.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_dwg.xml b/app/src/main/res/drawable/ic_file_dwg.xml deleted file mode 100644 index b9429ff6..00000000 --- a/app/src/main/res/drawable/ic_file_dwg.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_exe.xml b/app/src/main/res/drawable/ic_file_exe.xml deleted file mode 100644 index e6c0f6cc..00000000 --- a/app/src/main/res/drawable/ic_file_exe.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_fla.xml b/app/src/main/res/drawable/ic_file_fla.xml deleted file mode 100644 index 107def66..00000000 --- a/app/src/main/res/drawable/ic_file_fla.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_flv.xml b/app/src/main/res/drawable/ic_file_flv.xml deleted file mode 100644 index ebfd249c..00000000 --- a/app/src/main/res/drawable/ic_file_flv.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_generic.xml b/app/src/main/res/drawable/ic_file_generic.xml deleted file mode 100644 index d8b49ab3..00000000 --- a/app/src/main/res/drawable/ic_file_generic.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_html.xml b/app/src/main/res/drawable/ic_file_html.xml deleted file mode 100644 index 675a55da..00000000 --- a/app/src/main/res/drawable/ic_file_html.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_ics.xml b/app/src/main/res/drawable/ic_file_ics.xml deleted file mode 100644 index 231ca366..00000000 --- a/app/src/main/res/drawable/ic_file_ics.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_indd.xml b/app/src/main/res/drawable/ic_file_indd.xml deleted file mode 100644 index bf5eb753..00000000 --- a/app/src/main/res/drawable/ic_file_indd.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_iso.xml b/app/src/main/res/drawable/ic_file_iso.xml deleted file mode 100644 index 4e83ff5a..00000000 --- a/app/src/main/res/drawable/ic_file_iso.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_jpg.xml b/app/src/main/res/drawable/ic_file_jpg.xml deleted file mode 100644 index 5316e2ba..00000000 --- a/app/src/main/res/drawable/ic_file_jpg.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_js.xml b/app/src/main/res/drawable/ic_file_js.xml deleted file mode 100644 index 48f9dd71..00000000 --- a/app/src/main/res/drawable/ic_file_js.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_json.xml b/app/src/main/res/drawable/ic_file_json.xml deleted file mode 100644 index 387f7c1e..00000000 --- a/app/src/main/res/drawable/ic_file_json.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_m4a.xml b/app/src/main/res/drawable/ic_file_m4a.xml deleted file mode 100644 index ba8cdb06..00000000 --- a/app/src/main/res/drawable/ic_file_m4a.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_mp3.xml b/app/src/main/res/drawable/ic_file_mp3.xml deleted file mode 100644 index 8753da56..00000000 --- a/app/src/main/res/drawable/ic_file_mp3.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_mp4.xml b/app/src/main/res/drawable/ic_file_mp4.xml deleted file mode 100644 index 0afe5681..00000000 --- a/app/src/main/res/drawable/ic_file_mp4.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_ogg.xml b/app/src/main/res/drawable/ic_file_ogg.xml deleted file mode 100644 index 9e2cce47..00000000 --- a/app/src/main/res/drawable/ic_file_ogg.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_pdf.xml b/app/src/main/res/drawable/ic_file_pdf.xml deleted file mode 100644 index a7646cdd..00000000 --- a/app/src/main/res/drawable/ic_file_pdf.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_plproj.xml b/app/src/main/res/drawable/ic_file_plproj.xml deleted file mode 100644 index 40f4535e..00000000 --- a/app/src/main/res/drawable/ic_file_plproj.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_png.xml b/app/src/main/res/drawable/ic_file_png.xml deleted file mode 100644 index 3888de90..00000000 --- a/app/src/main/res/drawable/ic_file_png.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_ppt.xml b/app/src/main/res/drawable/ic_file_ppt.xml deleted file mode 100644 index 8251ed43..00000000 --- a/app/src/main/res/drawable/ic_file_ppt.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_prproj.xml b/app/src/main/res/drawable/ic_file_prproj.xml deleted file mode 100644 index 5f0f7501..00000000 --- a/app/src/main/res/drawable/ic_file_prproj.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_psd.xml b/app/src/main/res/drawable/ic_file_psd.xml deleted file mode 100644 index c55d6cf7..00000000 --- a/app/src/main/res/drawable/ic_file_psd.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_rtf.xml b/app/src/main/res/drawable/ic_file_rtf.xml deleted file mode 100644 index 791289c4..00000000 --- a/app/src/main/res/drawable/ic_file_rtf.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_sesx.xml b/app/src/main/res/drawable/ic_file_sesx.xml deleted file mode 100644 index 95a213c9..00000000 --- a/app/src/main/res/drawable/ic_file_sesx.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_svg.xml b/app/src/main/res/drawable/ic_file_svg.xml deleted file mode 100644 index cf85a8c5..00000000 --- a/app/src/main/res/drawable/ic_file_svg.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_txt.xml b/app/src/main/res/drawable/ic_file_txt.xml deleted file mode 100644 index a7321a99..00000000 --- a/app/src/main/res/drawable/ic_file_txt.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_vcf.xml b/app/src/main/res/drawable/ic_file_vcf.xml deleted file mode 100644 index b213ad4c..00000000 --- a/app/src/main/res/drawable/ic_file_vcf.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_wav.xml b/app/src/main/res/drawable/ic_file_wav.xml deleted file mode 100644 index a350bbf2..00000000 --- a/app/src/main/res/drawable/ic_file_wav.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_wmv.xml b/app/src/main/res/drawable/ic_file_wmv.xml deleted file mode 100644 index 411a3d14..00000000 --- a/app/src/main/res/drawable/ic_file_wmv.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_xls.xml b/app/src/main/res/drawable/ic_file_xls.xml deleted file mode 100644 index 25ff4e6c..00000000 --- a/app/src/main/res/drawable/ic_file_xls.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_xml.xml b/app/src/main/res/drawable/ic_file_xml.xml deleted file mode 100644 index d71e925c..00000000 --- a/app/src/main/res/drawable/ic_file_xml.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_file_zip.xml b/app/src/main/res/drawable/ic_file_zip.xml deleted file mode 100644 index efec1ee0..00000000 --- a/app/src/main/res/drawable/ic_file_zip.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - -