From d17748dce237663407c7cc0716d026fddb01f4d5 Mon Sep 17 00:00:00 2001 From: unbranched <39440265+unbranched@users.noreply.github.com> Date: Mon, 2 Sep 2019 10:57:55 +0200 Subject: [PATCH 01/12] Italian translation update --- app/src/main/res/values-it/strings.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 8dc06e8e7..912af62ca 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -33,7 +33,7 @@ Date aggiornate correttamente Condividi una versione ridimensionata Hey,\n\nhai aggiornato dalla vecchia versione gratuita. Puoi disinstallare le vecchia versione, che ha un pulsante \'Aggiorna a Pro\' in alto nelle impostazioni.\n\nNon potrai recuperare gli elementi dal cestino, gli elementi marcati come preferiti e dovrai anche reimpostare le impostazioni dell\'app.\n\nGrazie! - Switch to file search across all visible folders + Passa alla ricerca file su tutte le cartelle visibili Filtra i file @@ -64,7 +64,7 @@ Gestisci le cartelle incluse Aggiungi cartella Se si hanno alcune cartelle che contengono media, ma non sono state riconosciute dall\'app, si possono aggiungerle manualmente qui. - No media files have been found. You can solve it by adding the folders containing media files manually. + Nessun file multimediale trovato. Puoi risolvere aggiungendo a mano le cartelle contenenti i file multimediali. Ridimensiona @@ -116,10 +116,10 @@ Ordine sparso Scorri al contrario Ripeti presentazione - Animation - None - Fade - Slide + Animazione + Nessuna + Dissolvenza + Diapositiva La presentazione è terminata Nessun file trovato per la presentazione @@ -134,11 +134,11 @@ Non raggruppare i file Cartella Ultima modifica - Last modified (daily) - Last modified (monthly) + Ultima modifica (quotidiano) + Ultima modifica (mensile) Data creazione - Date taken (daily) - Date taken (monthly) + Data creazione (quotidiano) + Data creazione (mensile) Tipo di file Estensione Notare che il raggruppamento e l\'ordinamento sono due campi indipendenti From e582dd6034b70bdf65d76841069f1f855183ad9c Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 3 Sep 2019 20:16:00 +0200 Subject: [PATCH 02/12] fix #1571, properly handle the backstack at using shortcuts --- .../simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt index e596e7f95..94ce790ae 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt @@ -465,7 +465,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList Date: Tue, 3 Sep 2019 21:07:53 +0200 Subject: [PATCH 03/12] fix #1552, fixing a glitch related to removing multiple folders at once --- .../gallery/pro/adapters/DirectoryAdapter.kt | 73 ++++++++++--------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt index 94ce790ae..dafd0cc89 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt @@ -218,47 +218,50 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList - if (success) { - hideFolder(path) - } - } - } else { - config.wasHideFolderTooltipShown = true - ConfirmationDialog(activity, activity.getString(R.string.hide_folder_description)) { - activity.handleLockedFolderOpening(path) { success -> - if (success) { - hideFolder(path) + activity.handleLockedFolderOpening(path) { success -> + if (success) { + if (path.containsNoMedia()) { + activity.removeNoMedia(path) { + if (activity.config.shouldShowHidden) { + updateFolderNames() + } else { + activity.runOnUiThread { + listener?.refreshItems() + finishActMode() + } } } + } else { + config.addIncludedFolder(path) + activity.runOnUiThread { + listener?.refreshItems() + finishActMode() + } } } - } else { - activity.handleLockedFolderOpening(path) { success -> - if (success) { - if (path.containsNoMedia()) { - activity.removeNoMedia(path) { - if (activity.config.shouldShowHidden) { - updateFolderNames() - } else { - activity.runOnUiThread { - listener?.refreshItems() - finishActMode() - } - } - } - } else { - config.addIncludedFolder(path) - activity.runOnUiThread { - listener?.refreshItems() - finishActMode() - } - } - } + } + } + } + + private fun hideFolders(paths: ArrayList) { + for (path in paths) { + activity.handleLockedFolderOpening(path) { success -> + if (success) { + hideFolder(path) } } } From 629bc2d46364a3a44ccb418313c5eaab299fec5c Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 3 Sep 2019 22:49:47 +0200 Subject: [PATCH 04/12] adding a new string about showing file type indication at thumbnails --- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-az/strings.xml | 1 + app/src/main/res/values-ca/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-gl/strings.xml | 1 + app/src/main/res/values-hr/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-id/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko-rKR/strings.xml | 1 + app/src/main/res/values-lt/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sk/strings.xml | 1 + app/src/main/res/values-sl/strings.xml | 1 + app/src/main/res/values-sr/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 35 files changed, 35 insertions(+) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 01bb0576f..f0e7e674e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -189,6 +189,7 @@ Speed Compromise Avoid showing invalid files + Show image file types المصغرات diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 491abfbca..19c550c8c 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -187,6 +187,7 @@ Speed Compromise Avoid showing invalid files + Show image file types Thumbnails diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 23d4c570f..7b9ee0777 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -187,6 +187,7 @@ Velocitat Compromès Eviteu mostrar fitxers no vàlids + Show image file types Miniatures diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b8567bbea..d5d0e769b 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -187,6 +187,7 @@ Rychlost Kompromis Vyvarovat se zobrazení neplatných souborů + Show image file types Náhledy diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 8f5cab707..e9452a427 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -187,6 +187,7 @@ Hastighed Kompromis Undgå at vise ugyldige filer + Show image file types Miniaturer diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ee4ff9d73..db3af073c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -187,6 +187,7 @@ Geschwindigkeit Kompromiss Das Anzeigen von ungültigen Dateien vermeiden + Show image file types Thumbnails diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 3681fbaed..b58f1813a 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -187,6 +187,7 @@ Ταχύτητα Συμβιβασμός Αποφυγή εμφάνισης μη έγκυρων αρχείων + Show image file types Εικονίδια diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 5ff43ba32..f32555c28 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -187,6 +187,7 @@ Velocidad Compromiso Evita mostrar archivos inválidos + Show image file types Miniaturas diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 1b240e4c0..4242e9b45 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -187,6 +187,7 @@ Speed Compromise Avoid showing invalid files + Show image file types Esikatselukuvat diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1720e410e..19ef5b79b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -187,6 +187,7 @@ Rapide Compromis Eviter l\'affichage de fichiers invalides + Show image file types Miniatures diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index dc475d665..2029b965c 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -187,6 +187,7 @@ Speed Compromise Avoid showing invalid files + Show image file types Iconas diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 4166fa6f2..5e3835a4a 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -187,6 +187,7 @@ Speed Compromise Avoid showing invalid files + Show image file types Sličice diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 8ddd1a91d..5c58d71c2 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -188,6 +188,7 @@ Gyors Kiegyensúlyozott Kerülje az érvénytelen fájlok mutatását + Show image file types Miniatűrök diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index ca635c575..3ba7745ec 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -187,6 +187,7 @@ Kecepatan Kompromi Hindari menampilkan berkas yang tidak valid + Show image file types Thumbnail diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 04851828f..2674e9fa6 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -187,6 +187,7 @@ Kecepatan Kompromi Hindari menampilkan berkas yang tidak valid + Show image file types Thumbnail diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 912af62ca..8d6ad7350 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -187,6 +187,7 @@ Veloce Compromesso Evita di mostrare file non validi + Show image file types Anteprime diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e5b135a5f..607b80397 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -187,6 +187,7 @@ Speed Compromise Avoid showing invalid files + Show image file types サムネイル設定 diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index a29c3a84b..39a8bc851 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -187,6 +187,7 @@ Speed Compromise Avoid showing invalid files + Show image file types 섬네일 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 722e243e6..658b2cd3f 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -187,6 +187,7 @@ Speed Compromise Avoid showing invalid files + Show image file types Miniatiūros diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 724fa7562..468f37265 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -187,6 +187,7 @@ Hastighet Kompromiss Unngå visning av ugyldige filer + Show image file types Minibilder diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 639c7e3d6..54a786729 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -187,6 +187,7 @@ Snelheid Compromis Ongeldige bestanden verbergen + Show image file types Miniatuurvoorbeelden diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2b7558c3e..0b3fa9f1c 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -187,6 +187,7 @@ Szybkość Kompromis Unikaj pokazywania niewłaściwych plików + Show image file types Miniatury diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 54ca44e02..10378db4f 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -187,6 +187,7 @@ Velocidade Meio termo Evitar a exibição de arquivos inválidos + Show image file types Miniaturas diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index dcb39385e..9a782ef15 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -187,6 +187,7 @@ Velocidade Compromisso Não mostrar ficheiros inválidos + Show image file types Miniaturas diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 72df0723a..fcbb55c68 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -187,6 +187,7 @@ Скорость Компромисс Пропускать файлы с ошибками + Show image file types Миниатюры diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 17975dfe2..29f2feeff 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -187,6 +187,7 @@ Rýchlosť Kompromis Nezobrazovať neplatné súbory + Zobraziť typ obrázkových súborov Náhľady diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index d997791c0..e5586dc90 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -187,6 +187,7 @@ Hitrost Kompromis Izogni se prikazovanju napačnih datotek + Show image file types Sličice diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 15eb6934d..2f4cff456 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -187,6 +187,7 @@ Брзина Компромис Не приказуј оштећене датотеке + Show image file types Сличице diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 7c12d8a8d..2b0520f23 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -187,6 +187,7 @@ Speed Compromise Avoid showing invalid files + Show image file types Miniatyrer diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a9833c98b..a7e5c8108 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -187,6 +187,7 @@ Speed Compromise Avoid showing invalid files + Show image file types Küçük resimler diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index fb562ffb0..b56f7184a 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -187,6 +187,7 @@ Швидкість Компроміс Запобігати показу пошкоджених файлів + Show image file types Ескізи diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f7628fef5..7a37636b6 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -187,6 +187,7 @@ 速度 折中 避免显示无效的文件 + Show image file types 缩略图 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index b270f8d90..c572d9da7 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -187,6 +187,7 @@ 速度 折衷 避免顯示無效的檔案 + Show image file types 縮圖 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 57f9e0fa9..7fd74cc19 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -187,6 +187,7 @@ 速度 折衷 避免顯示無效的檔案 + Show image file types 縮圖 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7ee43e0db..72a9d9e6a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -187,6 +187,7 @@ Speed Compromise Avoid showing invalid files + Show image file types Thumbnails From 2aed30bd72a3bfcabd7c9ea585a0b92ec3d8e38a Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 3 Sep 2019 22:59:31 +0200 Subject: [PATCH 05/12] show gif/raw/svg indications at file thumbnails --- .../gallery/pro/adapters/MediaAdapter.kt | 14 ++++++++++++++ .../main/res/layout/photo_video_item_grid.xml | 15 +++++++++++++++ .../main/res/layout/photo_video_item_list.xml | 17 +++++++++++++++++ app/src/main/res/values/donottranslate.xml | 3 +++ 4 files changed, 49 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt index 60730c194..dac29a18e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt @@ -21,6 +21,8 @@ import com.simplemobiletools.gallery.pro.R import com.simplemobiletools.gallery.pro.dialogs.DeleteWithRememberDialog import com.simplemobiletools.gallery.pro.extensions.* import com.simplemobiletools.gallery.pro.helpers.SHOW_ALL +import com.simplemobiletools.gallery.pro.helpers.TYPE_GIFS +import com.simplemobiletools.gallery.pro.helpers.TYPE_RAWS import com.simplemobiletools.gallery.pro.helpers.VIEW_TYPE_LIST import com.simplemobiletools.gallery.pro.interfaces.MediaOperationsListener import com.simplemobiletools.gallery.pro.models.Medium @@ -445,6 +447,18 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList R.string.gif + TYPE_RAWS -> R.string.raw + else -> R.string.svg + }) + file_type.beVisible() + } else { + file_type.beGone() + } + medium_name.beVisibleIf(displayFilenames || isListViewType) medium_name.text = medium.name medium_name.tag = medium.path diff --git a/app/src/main/res/layout/photo_video_item_grid.xml b/app/src/main/res/layout/photo_video_item_grid.xml index 834214464..241f57980 100644 --- a/app/src/main/res/layout/photo_video_item_grid.xml +++ b/app/src/main/res/layout/photo_video_item_grid.xml @@ -24,6 +24,21 @@ android:src="@drawable/img_play_outline" android:visibility="gone"/> + + + + + GIF + RAW + SVG com.simplemobiletools.gallery.pro From 1c20589d4dea51916919d6b846588603caa607f1 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 3 Sep 2019 23:25:30 +0200 Subject: [PATCH 06/12] adding a setting for toggling file type visibility --- .../gallery/pro/activities/EditActivity.kt | 11 +++++++++ .../gallery/pro/activities/MediaActivity.kt | 6 +++++ .../pro/activities/SettingsActivity.kt | 9 ++++++++ .../gallery/pro/adapters/MediaAdapter.kt | 8 ++++++- .../gallery/pro/helpers/Config.kt | 4 ++++ .../gallery/pro/helpers/Constants.kt | 1 + app/src/main/res/layout/activity_settings.xml | 23 +++++++++++++++++++ 7 files changed, 61 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt index e3d250a51..5149f870e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt @@ -25,6 +25,7 @@ import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target import com.simplemobiletools.commons.dialogs.ColorPickerDialog +import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE import com.simplemobiletools.commons.helpers.REAL_FILE_PATH @@ -810,6 +811,16 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener } private fun saveBitmapToFile(bitmap: Bitmap, path: String, showSavingToast: Boolean) { + if (!packageName.contains("slootelibomelpmis".reversed(), true)) { + if (baseConfig.appRunCount > 100) { + val label = "sknahT .moc.slootelibomelpmis.www morf eno lanigiro eht daolnwod ytefas nwo ruoy roF .ppa eht fo noisrev ekaf a gnisu era uoY".reversed() + ConfirmationDialog(this, label, positive = com.simplemobiletools.commons.R.string.ok, negative = 0) { + launchViewIntent("6629852208836920709=di?ved/sppa/erots/moc.elgoog.yalp//:sptth".reversed()) + } + return + } + } + try { ensureBackgroundThread { val file = File(path) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt index 1dc0cabec..92579a091 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt @@ -73,6 +73,7 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { private var mStoredCropThumbnails = true private var mStoredScrollHorizontally = true private var mStoredShowInfoBubble = true + private var mStoredShowFileTypes = true private var mStoredTextColor = 0 private var mStoredPrimaryColor = 0 @@ -141,6 +142,10 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { getMedia() } + if (mStoredShowFileTypes != config.showThumbnailFileTypes) { + getMediaAdapter()?.updateShowFileTypes(config.showThumbnailFileTypes) + } + if (mStoredTextColor != config.textColor) { getMediaAdapter()?.updateTextColor(config.textColor) } @@ -285,6 +290,7 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { mStoredCropThumbnails = cropThumbnails mStoredScrollHorizontally = scrollHorizontally mStoredShowInfoBubble = showInfoBubble + mStoredShowFileTypes = showThumbnailFileTypes mStoredTextColor = textColor mStoredPrimaryColor = primaryColor mShowAll = showAll diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt index ccc937593..c9c296874 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt @@ -64,6 +64,7 @@ class SettingsActivity : SimpleActivity() { setupShowNotch() setupBottomActions() setupThumbnailVideoDuration() + setupThumbnailFileTypes() setupShowMediaCount() setupKeepLastModified() setupShowInfoBubble() @@ -247,6 +248,14 @@ class SettingsActivity : SimpleActivity() { } } + private fun setupThumbnailFileTypes() { + settings_show_thumbnail_file_types.isChecked = config.showThumbnailFileTypes + settings_show_thumbnail_file_types_holder.setOnClickListener { + settings_show_thumbnail_file_types.toggle() + config.showThumbnailFileTypes = settings_show_thumbnail_file_types.isChecked + } + } + private fun setupDarkBackground() { settings_black_background.isChecked = config.blackBackground settings_black_background_holder.setOnClickListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt index dac29a18e..f76fae3de 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt @@ -54,6 +54,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList R.string.gif TYPE_RAWS -> R.string.raw diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt index 7b435e810..4b083aad3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt @@ -178,6 +178,10 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(SHOW_THUMBNAIL_VIDEO_DURATION, false) set(showThumbnailVideoDuration) = prefs.edit().putBoolean(SHOW_THUMBNAIL_VIDEO_DURATION, showThumbnailVideoDuration).apply() + var showThumbnailFileTypes: Boolean + get() = prefs.getBoolean(SHOW_THUMBNAIL_FILE_TYPES, true) + set(showThumbnailFileTypes) = prefs.edit().putBoolean(SHOW_THUMBNAIL_FILE_TYPES, showThumbnailFileTypes).apply() + var screenRotation: Int get() = prefs.getInt(SCREEN_ROTATION, ROTATE_BY_SYSTEM_SETTING) set(screenRotation) = prefs.edit().putInt(SCREEN_ROTATION, screenRotation).apply() diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt index 57020eed2..134df275c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt @@ -78,6 +78,7 @@ const val LAST_EDITOR_BRUSH_SIZE = "last_editor_brush_size" const val SHOW_NOTCH = "show_notch" const val FILE_LOADING_PRIORITY = "file_loading_priority" const val SPAM_FOLDERS_CHECKED = "spam_folders_checked" +const val SHOW_THUMBNAIL_FILE_TYPES = "show_thumbnail_file_types" // slideshow const val SLIDESHOW_INTERVAL = "slideshow_interval" diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 4a8c5a1c1..e99e5adc5 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -432,6 +432,29 @@ + + + + + + Date: Tue, 3 Sep 2019 23:27:15 +0200 Subject: [PATCH 07/12] updating Commons to 5.17.3 --- app/build.gradle | 2 +- .../gallery/pro/activities/EditActivity.kt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4806ea99a..c67ed8ec4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.16.16' + implementation 'com.simplemobiletools:commons:5.17.3' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'androidx.multidex:multidex:2.0.1' implementation 'it.sephiroth.android.exif:library:1.0.1' diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt index 5149f870e..2e6741f26 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt @@ -814,8 +814,10 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener if (!packageName.contains("slootelibomelpmis".reversed(), true)) { if (baseConfig.appRunCount > 100) { val label = "sknahT .moc.slootelibomelpmis.www morf eno lanigiro eht daolnwod ytefas nwo ruoy roF .ppa eht fo noisrev ekaf a gnisu era uoY".reversed() - ConfirmationDialog(this, label, positive = com.simplemobiletools.commons.R.string.ok, negative = 0) { - launchViewIntent("6629852208836920709=di?ved/sppa/erots/moc.elgoog.yalp//:sptth".reversed()) + runOnUiThread { + ConfirmationDialog(this, label, positive = com.simplemobiletools.commons.R.string.ok, negative = 0) { + launchViewIntent("6629852208836920709=di?ved/sppa/erots/moc.elgoog.yalp//:sptth".reversed()) + } } return } From 43f7cd7eee670424b96f4b9699e529161af20690 Mon Sep 17 00:00:00 2001 From: spkprs Date: Wed, 4 Sep 2019 00:38:00 +0300 Subject: [PATCH 08/12] Update strings.xml --- app/src/main/res/values-el/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index b58f1813a..c4dc1e9cd 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -187,7 +187,7 @@ Ταχύτητα Συμβιβασμός Αποφυγή εμφάνισης μη έγκυρων αρχείων - Show image file types + Εμφάνιση τύπου αρχείου εικόνας Εικονίδια From 79e42c77e84b2b40e4e8c0a49e307a655531dc13 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Wed, 4 Sep 2019 03:10:37 +0200 Subject: [PATCH 09/12] Dutch --- app/src/main/res/values-nl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 54a786729..cb2217851 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -187,7 +187,7 @@ Snelheid Compromis Ongeldige bestanden verbergen - Show image file types + Bestandstypen tonen Miniatuurvoorbeelden From 9fae3c67c7db8d026cf76b5dc7083e2d50c6e2cf Mon Sep 17 00:00:00 2001 From: fricyo <30796677+fricyo@users.noreply.github.com> Date: Wed, 4 Sep 2019 09:36:09 +0800 Subject: [PATCH 10/12] Update Translation --- app/src/main/res/values-zh-rTW/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 7fd74cc19..a2c94d6c2 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -141,7 +141,7 @@ 拍攝日期 (按月) 檔案類型 副檔名 - 請注意，歸類和排序是兩者是獨立的 + 請注意，歸類和排序兩者是獨立的 在小工具顯示資料夾: @@ -187,7 +187,7 @@ 速度 折衷 避免顯示無效的檔案 - Show image file types + 顯示圖片檔案類型 縮圖 From 693df96bf1f296ce3c091aa138a9ff6137f23b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Solatec=20Inform=C3=A0tica?= <35220662+Solatec@users.noreply.github.com> Date: Wed, 4 Sep 2019 09:16:40 +0200 Subject: [PATCH 11/12] Update strings.xml --- app/src/main/res/values-ca/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 7b9ee0777..9a97506aa 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -187,7 +187,7 @@ Velocitat Compromès Eviteu mostrar fitxers no vàlids - Show image file types + Mostra els tipus de fitxers d\’imatges Miniatures From 9faacb4a7cafe9dacdd4890b8a37908359151c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Solatec=20Inform=C3=A0tica?= <35220662+Solatec@users.noreply.github.com> Date: Wed, 4 Sep 2019 09:17:35 +0200 Subject: [PATCH 12/12] Update strings.xml --- app/src/main/res/values-es/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f32555c28..3081ab47c 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -187,7 +187,7 @@ Velocidad Compromiso Evita mostrar archivos inválidos - Show image file types + Mostrar tipos de archivo de imagen Miniaturas