From 5c952c6489c4588712c6b6ffc7d0c1cbc3999c6c Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 8 Dec 2020 10:06:58 +0100 Subject: [PATCH 01/81] update version to 5.32.7 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index fe52e34f8..3e911c967 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.32.4' + implementation 'com.simplemobiletools:commons:5.32.7' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' From 3dd4e18e51f0e2d57656dbd6eb9d4583e2318e4b Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 8 Dec 2020 10:19:03 +0100 Subject: [PATCH 02/81] updating kotlin to 1.4.21 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8183c6bd7..a53733c91 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.4.21' ext.is_proprietary = gradle.startParameter.taskNames.any { task -> task.contains("Proprietary") } repositories { From 3eba8cc361d235e14dba7d835bbb3493f44d4f2c Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 8 Dec 2020 10:28:58 +0100 Subject: [PATCH 03/81] update version to 6.18.0 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3e911c967..4713c7273 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "com.simplemobiletools.gallery.pro" minSdkVersion 21 targetSdkVersion 29 - versionCode 328 - versionName "6.17.3" + versionCode 330 + versionName "6.18.0" setProperty("archivesBaseName", "gallery-$versionCode") vectorDrawables.useSupportLibrary = true } From 8c217ea628755c4ec0ae6983e19b475c303e909a Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 8 Dec 2020 10:29:06 +0100 Subject: [PATCH 04/81] updating changelog --- CHANGELOG.md | 7 +++++++ fastlane/metadata/android/en-US/changelogs/330.txt | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/330.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index d75fcddde..10a312b19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Changelog ========== +Version 6.18.0 *(2020-12-08)* +---------------------------- + + * Added a Video Editor + * Added Stickers and Overlays to the Photo Editor + * Some translation, stability and UI improvements + Version 6.17.3 *(2020-11-10)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/330.txt b/fastlane/metadata/android/en-US/changelogs/330.txt new file mode 100644 index 000000000..d73f420db --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/330.txt @@ -0,0 +1,3 @@ + * Added a Video Editor (not on F-droid) + * Added Stickers and Overlays to the Photo Editor (not on F-droid) + * Some translation, stability and UI improvements From fac5572200476cd74e673757a537b135cd77bf9b Mon Sep 17 00:00:00 2001 From: FTno <16176811+FTno@users.noreply.github.com> Date: Tue, 8 Dec 2020 14:21:14 +0100 Subject: [PATCH 05/81] Update strings.xml Norwegian (nb) translation update --- app/src/main/res/values-nb/strings.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 87bbc384b..42acc8c52 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -77,18 +77,18 @@ Redigering Roter Ugyldig bildebane - Invalid video path + Ugyldig videobane Bilderedigering feilet - Video editing failed + Videoredigering feilet Bilderedigering avbrutt - Video editing cancelled + Videoredigering avbrutt Fil vellykket redigert - Image edited successfully - Video edited successfully + Bilde vellykket redigert + Video vellykket redigert Rediger bilde med: - Edit video with: + Rediger video med: Ingen bilderedigeringsapp funnet - No video editor found + Ingen videoredigeringsapp funnet Ukjent filplassering Kunne ikke overskrive kildefilen Roter til venstre @@ -261,7 +261,7 @@ Penselfarge Redigering Lukke Redigering? - Do you really want to discard the changes? + Vil du forkaste endringene? Ja Nei Avbryt From 31bc9fb8c5ea961645ce92157d041ed239867e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Solatec=20Inform=C3=A0tica?= <35220662+Solatec@users.noreply.github.com> Date: Wed, 9 Dec 2020 10:40:22 +0100 Subject: [PATCH 06/81] 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 2a2a66d67..32a3fa3a1 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -288,7 +288,7 @@ Enfosquir Pantalla Superposició - Lighten + Alleugerir Multiplicar Color cremat Llum suau From b69bd1bdb741d00d77e21d6213b83d3104a17a93 Mon Sep 17 00:00:00 2001 From: AlbatorV Date: Wed, 9 Dec 2020 21:31:30 +0100 Subject: [PATCH 07/81] Update strings.xml --- app/src/main/res/values-fr/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0dfe42f3b..1cf898944 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -30,7 +30,7 @@ Partager une version redimensionnée Hé,\n\nvous avez apparemment fait une mise à niveau à partir de l\'ancienne application gratuite. Vous pouvez maintenant désinstaller l\'ancienne version avec le bouton \'Mettre à niveau vers Pro\' en haut des paramètres de l\'application.\n\nVos éléments de la corbeille seront supprimés, les éléments favoris seront non marqués et vous devrez également restaurer les paramètres de votre application.\n\nMerci ! Basculer vers la recherche de fichiers - Définir comme défaut + Dossier par défaut Oublier le dossier @@ -270,8 +270,8 @@ Exportation… Exportation %s Sticker - Couleur de Sticker - Options de Sticker + Couleur du Sticker + Options du Sticker Ajouter Couleur Supprimer @@ -322,7 +322,7 @@ Vert Aquamarin Couleur de la pipette - Trim + Couper Comment faire de Simple Gallery ma galerie par défaut ? From 6d61aac4ef7863ef7919fe3426ecffd56f63f94d Mon Sep 17 00:00:00 2001 From: bac1 <75886884+bac1@users.noreply.github.com> Date: Sun, 13 Dec 2020 07:39:36 +0000 Subject: [PATCH 08/81] Update strings.xml --- app/src/main/res/values-uk/strings.xml | 102 ++++++++++++------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 44aab35eb..5d5066365 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -82,13 +82,13 @@ Video editing failed Image editing cancelled Video editing cancelled - File edited successfully - Image edited successfully - Video edited successfully + Файл вдало відредагован + Зображення вдало відредаговано + Відео вдало відредаговано Редагувати зображення за допомогою: - Edit video with: + Реданувати відео у: Не знайдено редакторів зображень - No video editor found + Не знайдено редакторів відео Невідоме розташування файлу Не вдалося перезаписати вихідний файл Обернути ліворуч @@ -238,50 +238,50 @@ Linear Mirrored Gaussian - Text - Text Options - Text Color - Font - Add - Edit + Текст + Параметри тексту + Колір тексту + Шрифт + Додати + Редагувати Straighten - Font - Color + Шрифт + Колір BG Color Alignment To Front - Delete - Your text + Видалити + Ваш текст Brush - Color - Size + Колір + Розмір Hardness To Front - Delete - Brush Color - Editor - Close Editor? - Do you really want to discard the changes? - Yes - No - Cancel - Accept - Save + Видалити + Колір пензля + Редактор + Закрити редактор? + Ви дійсно хочете відмінити зміни? + Так + Ні + Відхилити + Прийняти + Зберегти Exporting… Exporting %s. Sticker Sticker Color Sticker Options - Add - Color - Delete + Додати + Колір + Видалити To Front Straighten Replace - Opacity - Contrast - Saturation - Brightness + Прозорість + Контрастність + Насиченість + Яскравість Uploads Overlay Normal @@ -304,23 +304,23 @@ Flip V Undo Redo - Color Picker - Transparent - White - Gray - Black - Light blue - Blue - Purple - Orchid - Pink - Red - Orange - Gold - Yellow - Olive - Green - Aquamarin + Вибрати колір + Прозорий + Білий + Сірий + Чорний + Блакитний + Синій + Фіолетовий + Бузковий + Рожевий + Червоний + Помаранчевий + Золотий + Жовтий + Оливковий + Зелений + Аквамариновий Pipettable color Trim From 706d255cc93dbd48746ec96c04cea14f1a84a2ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20F=C4=B1r=C4=B1nc=C4=B1?= Date: Mon, 14 Dec 2020 20:08:19 +0300 Subject: [PATCH 09/81] Update strings.xml --- app/src/main/res/values-tr/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f27c71691..026a9b136 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -176,7 +176,7 @@ Ekran kenarlarına tıklayarak anında medya değiştirmeye izin ver Derin yakınlaştırma resimlerine izin ver Durum çubuğu gizlendiğinde genişletilmiş ayrıntıları gizle - Ekranın alt kısmındaki bazı eylem düğmelerini göster + Ekranın alt kısmında bazı eylem düğmelerini göster Geri dönüşüm kutusu\'nu klasörler ekranında gösterme Derin yakınlaştırılabilir resimler Resimleri mümkün olan en yüksek kalitede göster From e7002695759393b527041b27afb20a91794d581f Mon Sep 17 00:00:00 2001 From: bac1 <75886884+bac1@users.noreply.github.com> Date: Tue, 15 Dec 2020 07:04:05 +0000 Subject: [PATCH 10/81] Update strings.xml --- app/src/main/res/values-uk/strings.xml | 38 +++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5d5066365..b8d08bb17 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -30,7 +30,7 @@ Поділитися зображенням іншого розміру Агов,\n\nздається, ви оновились зі старого безкоштовного додатка. Тепер ви можете видалити стару версію, у якій є кнопка \"Перейти на Pro\" вгорі налаштувань додатка.\n\nВи втратите лише елементи з Кошика, позначки улюблених елементів, а також потрібно буде скинути ваші налаштування додатка.\n\nДякую! Перейти до пошуку файла в усіх видимих теках - Set as default folder + Встановити теку за замовчуванням Unset as default folder @@ -77,11 +77,11 @@ Редактор Обернути Неприпустимий шлях до зображення - Invalid video path + Неприпустимий шлях до відео Не вдалося редагувати зображення - Video editing failed - Image editing cancelled - Video editing cancelled + Не вдалося редагувати відео + Редагування зображення скасовано + Редагування відео скасовано Файл вдало відредагован Зображення вдало відредаговано Відео вдало відредаговано @@ -191,14 +191,14 @@ Компроміс Запобігати показу пошкоджених файлів Показувати типи файлів зображень - Allow zooming videos with double tapping them - Folder thumbnail style - Show file count on a separate line - Show file count in brackets - Do not show file count - Limit long folder titles to 1 line - Square - Rounded corners + Масштабувати відео подвійним натисканням по ньому + Вид мініатюр тек + Показувати кількість файлів в окремому рядку + Показувати кількість файлів у дужках + Не показувати кількість файлів + Обмежити довгі назви тек одним рядком + Квадрат + Закруглені кути Ескізи @@ -248,11 +248,11 @@ Шрифт Колір BG Color - Alignment + Вирівнювання To Front Видалити Ваш текст - Brush + Пензель Колір Розмір Hardness @@ -300,10 +300,10 @@ Paper Rain Vintage - Flip H - Flip V - Undo - Redo + Горизонтальний переворот + Вертикальний переворот + Скасувати + Повторити Вибрати колір Прозорий Білий From 05e2d308b83ed30cdb008aea2b9c6f18c0c82ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Marques?= Date: Sat, 19 Dec 2020 20:20:04 +0000 Subject: [PATCH 11/81] Update strings.xml --- app/src/main/res/values-pt/strings.xml | 72 +++++++++++++------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 68f0b68e9..f5484f587 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -77,18 +77,18 @@ Editor Rodar Caminho inválido - Invalid video path + Caminho de vídeo inválido Falha na edição da imagem - Video editing failed + Falha na edição do vídeo Edição de imagem cancelada - Video editing cancelled + Edição de vídeo cancelada Imagem editada com sucesso - Image edited successfully - Video edited successfully + Imagem editada com sucesso + Vídeo editado com sucesso Editar imagem com: - Edit video with: - Editor não encontrado - No video editor found + Editar vídeo com: + Editor de imagem não encontrado + Editor de vídeo não encontrado Localização desconhecida Não foi possível substituir o ficheiro original Rodar à esquerda @@ -195,7 +195,7 @@ Estilo de miniatura das pastas Mostrar número de ficherios em linha distinta Mostrar número de ficheiros em chavetas - não mostrar número de ficheiros + Não mostrar número de ficheiros Restringir título das pastas a 1 linha Quadrado Cantos arredondados @@ -261,7 +261,7 @@ Cor do pincel Editor Fechar editor? - Do you really want to discard the changes? + Tem a certeza de que deseja descartar as alterações? Sim Não Cancelar @@ -270,35 +270,35 @@ A exportar… A exportar %s. Sticker - Sticker Color - Sticker Options - Add - Color - Delete - To Front - Straighten - Replace - Opacity - Contrast - Saturation - Brightness - Uploads - Overlay + Cor do sticker + Opções do sticker + Adicionar + Cor + Apagar + Para a frente + Endireitar + Substituir + Opacidade + Contraste + Saturação + Brilho + Carregamentos + Sobreposição Normal - Darken - Screen - Overlay - Lighten - Multiply + Escurecer + Ecrã + Sobreposição + Clarear + Multiplicar Color Burn - Soft Light - Hard Light - None - Golden + Luz suave + Luz forte + Nenhuma + Dourada Lightleak 1 - Mosaic - Paper - Rain + Mosaico + Papel + Chuva Vintage Inversão horizontal Inversão vertical From 28bc8fb10fe793d5a5b1746b5c80718dcdc4ae4d Mon Sep 17 00:00:00 2001 From: Naimul Kabir Date: Tue, 22 Dec 2020 20:58:17 +0600 Subject: [PATCH 12/81] =?UTF-8?q?=F0=9F=93=A6=20new:=20add=20Bangla=20inte?= =?UTF-8?q?rnationalisation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit adds around 50% of the translated Bangla text. --- app/src/main/res/values-bn/strings.xml | 412 +++++++++++++++++++++++++ 1 file changed, 412 insertions(+) create mode 100644 app/src/main/res/values-bn/strings.xml diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml new file mode 100644 index 000000000..57039e615 --- /dev/null +++ b/app/src/main/res/values-bn/strings.xml @@ -0,0 +1,412 @@ + + + সিম্পল গ্যালারি + গ্যালারি + সম্পাদনা + ক্যামেরা খুলুন + (লুকানো) + (বাদ) + ফোল্ডার পিন করুন + ফোল্ডার আনপিন করুন + একদম উপরে পিন করুন + সব ফোল্ডারের ভেতরে কি আছে দেখান + সব ফোল্ডার + ফোল্ডার ভিউতে সুইচ করুন + অন্যান্য ফোল্ডার + মানচিত্রে দেখান + অজানা স্থান + শব্দ + উজ্জ্বলতা + ওরিয়েন্টেশন বন্ধ + ওরিয়েন্টেশন খুলুন + ওরিয়েন্টেশন পরিবর্তন + পোট্রেট ওরিয়েন্টেশন + অবতল ওরিয়েন্টেশন + ডিফল্ট ওরিয়েন্টেশন + তারিখ ঠিক করুন + ঠিক করা হচ্ছে… + তারিখ সফলভাবে ঠিক করা হয়েছে + তোলার তারিখ নেই + পরিবর্তিত একা সংস্করণ নিন + অই,\n\n মনে হচ্ছে আপনি অ্যাপটি পুরোনো মুক্ত সংস্করণ থেকে হালনাগাদ করেছেন, যেটার সেটিংসে \'প্রোতে হালনাগাদ করুন\' বাটন রয়েছে। \n\nধন্যবাদ! + সব দেখা যাওয়া ফোল্ডারে ফাইল সার্চে চলে যান + ডিফল্ট ফোল্ডার হিশেবে সেট করুন + ডিফল্ট ফোল্ডার হিশেবে আর রাখবেন না + + + মিডিয়া ফিল্টার করুন + ছবিসমূহ + ভিডিওসমূহ + গিফসমূহ + র ছবিসমূহ + এসভিজি সমূহ + পোট্রেইট + এ নির্দিষ্ট ফিল্টারে কোন মিডিয়া ফাইল পাওয়া যায়নি। + ফিল্টার পরিবর্তন করুন + + + This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden items\' option in Settings. Continue? + বাদ দিন + বাদ দেওয়া ফোল্ডারসমূহ + বাদ দেওয়া ফোল্ডারগুলোর ব্যবস্থাপনা + This will exclude the selection together with its subfolders from Simple Gallery only. You can manage excluded folders in Settings. + Exclude a parent instead? + Excluding folders will make them together with their subfolders hidden just in Simple Gallery, they will still be visible in other applications.\n\nIf you want to hide them from other apps too, use the Hide function. + সবগুলো সরান + বাদ দেওয়া তালিকা থেকে সমস্ত ফোল্ডার সরাবেন? এটি ফোল্ডারগুলি মুছবে না। + লুকানো ফোল্ডারগুলো + লুকানো ফোল্ডারগুলি পরিচালনা করুন + দেখে মনে হচ্ছে আপনার সাথে কোনও ফোল্ডার লুকানো নেই \".nomedia\" ফাইল। + + + অন্তর্ভুক্ত ফোল্ডার + অন্তর্ভুক্ত ফোল্ডার ব্যবস্থাপনা করুন + ফোল্ডার যোগ করুন + If you have some folders which contain media, but were not recognized by the app, you can add them manually here.\n\nAdding some items here will not exclude any other folder. + No media files have been found. You can solve it by adding the folders containing media files manually. + + + আকার পরিবর্তন + নির্বাচিতগুলোর আকার পরিবর্তন ও সংরক্ষণ করুন। + প্রস্থ + দৈর্ঘ্য + অনুপাত রাখুন + দয়া করে একটি বৈধ রেজোলিউশন দিন। + + + সম্পাদক + ঘোরান + ভুল ছবির পথ + ভুল ভিডিওর পথ + ছবি সম্পাদনা ব্যর্থ + ভিডিও সম্পাদনা ব্যর্থ + ছবি সম্পাদনা বাতিল + ভিডিও সম্পাদনা বাতিল + ফাইল সফলভাবি সম্পাদিত হয়েছে + ছবি সফলভাবি সম্পাদিত হয়েছে + ভিডিও সফলভাবি সম্পাদিত হয়েছে + ছবি সম্পাদনা করুন: + ভিডিও সম্পাদনা করুন: + কোন ছবি সম্পাদক পাওয়া যায়নি + কোন ভিডিও সম্পাদক পাওয়া যায়নি + অজানা অবস্থান ফাইল + উৎস ফাইল প্রতিস্থাপন করা যায়নি + বামে ঘোরান + ডানে ঘোরান + ১৮০º ঘোরান + ঘোরান + অবতলভাবে ঘোরান + খাড়াখাড়িভাবে ঘোরান + মুক্ত + অন্যান্য + + + সিম্পল ওয়ালপেপার + ওয়ালপেপার হিশেবে সেট করুন + ওয়ালপেপার সেট করা ব্যর্থ হয়েছে + ওয়ালপেপার সেট করুন: + ওয়ালপেপার সেট করা হচ্ছে… + সফলভাবে ওয়ালপেপার সেট হয়েছে + খাড়াখারি আকৃতিগত অনুপাত + অবতল আকৃতিগত অনুপাত + হোম স্ক্রিন + লক স্ক্রিন + হোম ও লক স্ক্রিন + + + স্লাইডশো + বিরতি (সেকেন্ডে): + ছবিগুলো যোগ করুন + ভিডিওগুলো যোগ করুন + গিফগুলো যোগ করুন + বিক্ষিপ্তভাবে + পেছনে নিয়ে যান + স্লাইডশো লুপ করুন + অ্যানিমেশন + কিছু না + বিবর্ণ + স্লাইড + স্লাইডশো শেষ হয়েছে + No media for the slideshow have been found + + + Group direct subfolders + + + একত্রিত করুন + Do not group files + ফোল্ডার + শেষ পরিবর্তন করা হয়েছে + শেষ পরিবর্তন (দৈনিক) + শেষ পরিবর্তন (মাসিক) + তোলার তারিখ + তোলার তারিখ (দৈনিক) + তোলার তারিখ (মাসিক) + ফাইল টাইপ + এক্সটেনশন + Please note that grouping and sorting are 2 independent fields + + + উইজেটে দেখানো ফোল্ডার: + ফোল্ডারের নাম দেখান + + + স্বয়ংক্রিয়ভাবে ভিডিও চালান + Remember last video playback position + Toggle filename visibility + Loop videos + Animate GIFs at thumbnails + Max brightness when viewing fullscreen media + Crop thumbnails into squares + Show video durations + Rotate fullscreen media by + System setting + Device rotation + Aspect ratio + Black background at fullscreen media + Scroll thumbnails horizontally + Automatically hide system UI at fullscreen media + Delete empty folders after deleting their content + Allow controlling photo brightness with vertical gestures + Allow controlling video volume and brightness with vertical gestures + Show folder media count on the main view + Show extended details over fullscreen media + Manage extended details + Allow one finger zoom at fullscreen media + Allow instantly changing media by clicking on screen sides + Allow deep zooming images + Hide extended details when status bar is hidden + Show some action buttons at the bottom of the screen + Show the Recycle Bin at the folders screen + Deep zoomable images + Show images in the highest possible quality + Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture + Allow 1:1 zooming in with two double taps + Always open videos on a separate screen with new horizontal gestures + Show a notch if available + Allow rotating images with gestures + File loading priority + Speed + Compromise + Avoid showing invalid files + Show image file types + Allow zooming videos with double tapping them + Folder thumbnail style + Show file count on a separate line + Show file count in brackets + Do not show file count + Limit long folder titles to 1 line + বর্গ + Rounded corners + + + থাম্বনেল + পুরো স্ক্রিনের মিডিয়া + বর্ধিত বিশদ + নিচের অংশের ক্রিয়াগুলো + + + Manage visible bottom actions + Toggle favorite + Toggle file visibility + + + কাস্টম + Reset + বর্গ + Transform + Filter + কিছু না + Adjust + ছায়া + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + ফন্ট + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Editor + Close Editor? + Do you really want to discard the changes? + Yes + No + বাতিল + গ্রহণ + সংরক্ষণ + Exporting… + Exporting %s. + স্টিকার + স্টিকারের রঙ + Sticker Options + যোগ + রঙ + মুছে ফেলা + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + কিছু না + সোনালী + লাইটলিক ১ + মোজাইক + কাগন + বৃষ্টি + Vintage + Flip H + Flip V + Undo + Redo + রঙ নির্বাচক + স্বচ্ছ + শাদা + ধুসর + কালো + হালকা নীল + নীল + বেগুনী + অর্কিড + গোলাপী + লাল + কমলা + সোনালী + হলুদ + জলপাই রঙ + নীল + সামুদ্রিক নীল + পাইপেটেবল রঙ + কাটুন + + + How can I make Simple Gallery the default device gallery? + First you have to find the currently default gallery in the Apps section of your device settings, look for a button that says something like \"Open by default\", click on it, then select \"Clear defaults\". + The next time you will try opening an image or video you should see an app picker, where you can select Simple Gallery and make it the default app. + I locked the app with a password, but I forgot it. What can I do? + You can solve it in 2 ways. You can either reinstall the app, or find the app in your device settings and select \"Clear data\". It will reset all your settings, it will not remove any media files. + How can I make an album always appear at the top? + You can long press the desired album and select the Pin icon at the actions menu, that will pin it to the top. You can pin multiple folders too, pinned items will be sorted by the default sorting method. + How can I fast forward videos? + You can do it by double tapping the side of the screen, or tapping the current or max duration texts near the seekbar. If you enable opening videos on a separate screen in the app settings, you can use horizontal gestures too. + What is the difference between hiding and excluding a folder? + Exclude prevents displaying the folder only in Simple Gallery, while Hide works system-wise and it hides the folder from other galleries too. It works by creating an empty \".nomedia\" file in the given folder, which you can then remove with any file manager too. Note that some devices do not allow hiding folders like Camera, Screenshots and Downloads. + Why do folders with music cover art or stickers show up? + It can happen that you will see some unusual albums show up. You can easily exclude them by long pressing them and selecting Exclude. In the next dialog you can then select the parent folder, chances are it will prevent the other related albums showing up too. + A folder with images isn\'t showing up, or it doesn\'t show all items. What can I do? + That can have multiple reasons, but solving it is easy. Just go in Settings -> Manage Included Folders, select Plus and navigate to the required folder. + What if I want just a few particular folders visible? + Adding a folder at the Included Folders doesn\'t automatically exclude anything. What you can do is go in Settings -> Manage Excluded Folders, exclude the root folder \"/\", then add the desired folders at Settings -> Manage Included Folders. + That will make only the selected folders visible, as both excluding and including are recursive and if a folder is both excluded and included, it will show up. + Can I crop images with this app? + Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. + Can I somehow group media file thumbnails? + Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". + I see some color banding on the images. How can I improve the quality? + The current solution for displaying images works fine in the vast majority of cases, but if you want even better image quality, you can enable the \"Show images in the highest possible quality\" at the app settings, in the \"Deep zoomable images\" section. + I have hidden a file/folder. How can I unhide it? + You can either press the \"Temporarily show hidden items\" menu item at the main screen, or toggle \"Show hidden items\" in the app settings to see the hidden item. If you want to unhide it, just long press it and select \"Unhide\". Folders are hidden by adding a hidden \".nomedia\" file into them, you can delete the file with any file manager too. + Why does the app take up so much space? + App cache can take up to 250MB, it ensures quicker image loading. If the app is taking up even more space, it is most likely caused by you having items in the Recycle Bin. Those files count to the app size. You can clear the Recycle bin by opening it and deleting all files, or from the app settings. Every file in the Bin is deleted automatically after 30 days. + + + + সিম্পল গ্যালারি প্রো - ছবি ম্যানেজার ও সম্পাদক + + কোন বিজ্ঞাপন ছাড়া ছবি, ভিডিও ও গিফ সম্পাদনা, ব্যবস্থাপনার একটি প্রিমিয়াম অ্যাপ + + সিম্পল গ্যালারি প্রো একটি অত্যন্ত সম্পাদনাযোগ্য অফলাইন গ্যালারি। + + অ্যাপটিতে কোনও বিজ্ঞাপন এবং অপ্রয়োজনীয় অনুমতি নেই। অ্যাপ্লিকেশনটিকে যেহেতু ইন্টারনেট সংযোগের প্রয়োজন নেই, তাই আপনার গোপনীয়তা সুরক্ষিত। + + ------------------------------------------------- + সহজ গ্যালারি প্রো - বৈশিষ্ট্যসমূহ + ------------------------------------------------- + + • কোন বিজ্ঞাপন বা পপআপ ছাড়া অফলাইন গ্যালারী + • সাধারণ গ্যলারি ফটো সম্পাদক - ক্রপ করুন, ঘোরান, পুনরায় আকার দিন, অঙ্কন করুন, ফিল্টার প্রয়োগ করুন এবং আরও অনেক কিছু। + • কোন ইন্টারনেট সংযোগ প্রয়োজন নেই + • কোন অপ্রয়োজনীয় অনুমতি চায় না + • ছবি, ভিডিও ও অন্যান্য ফাইলসমূহ দ্রুত অনুসন্ধান করুন + • সিম্পল গ্যালারি প্রো এর ধরন পরিবর্তন করুন + • ৩২টি ভাষায় রয়েছে + • সিম্পল গ্যালারি প্রো উন্মুক্ত উৎসের + … এবং আরও অনেক অনেক বেশী! + + ছবি গ্যালারি সম্পাদক + সিম্পল গ্যালারি প্রো আপনার ছবি যেকোন সময় সম্পাদনা সহজ করে দেয়। আপনার ছবি কাটুন, ফ্লিপ করুন বা আকার পরিবর্তন করুন। আপনি আরেকটু সৃজনশীল হলে, নতুন ফিল্টার যুক্ত করতে পারবেন এবং আপনার ছবির উপর আঁকতেও পারবেন। + + অনেকধরণের ফাইল ঘরানার জন্য সমর্থন রয়েছে + জেপিইজি, পিএনজি, এমপি৪, এমকেভি, আরএডাব্লু, এসভিজি, প্যানোরামিক ফটো, প্যানোরামিক ভিডিও এবং আরও অনেক ফাইল টাইপ সিম্পল গ্যালারি প্রো সমর্থন করে। + + মুছে ফেলা ছবি ও ভিডিও পুনরুদ্ধার করুন + ভুল করে গুরুত্বপূর্ণ ছবি বা ভিডিও মুছে ফেললেন? চিন্তার কারণ নেই। সিম্পল গ্যালারি প্রোর নিজস্ব রিসাইকেল বিন আপনাকে এ বিপদ থেকে বাঁচাবে। + + ছবি, ভিডিও এবং ফাইল লুকান ও নিরাপদ রাখুন: + পিন, প্যাটার্ন, অথবা ফিঙ্গারপ্রিন্ট ব্যবহার করে আপনি আপনার ছবি, ভিডিও এবং পুরো অ্যালবামই নিরাপদে রাখতে পারবেন। আপনি পুরো অ্যাপটাই নিরাপদে রাখতে পারবে, অথবা নির্দিষ্ট কিছু ফাংশনে লক দিতে পারবেন। যেমন ধরুন, ফিঙ্গারপ্রিন্ট ছাড়া কোন ফাইল মুছতে না পারাটা ভুল করে ফাইল হারানো থেকে আপনাকে বাঁচাবে। + + সিম্পল টুলসমূহের পরিপূর্ণ স্যুট: + https://www.simplemobiletools.com + + সিম্পল গ্যালারি প্রোর আলাদা ওয়েবসাইট + https://www.simplemobiletools.com/gallery + + ফেসবুক: + https://www.facebook.com/simplemobiletools + + রেডিট: + https://www.reddit.com/r/SimpleMobileTools + + + + From 6716650438d1bc60842dcd55207974e194fd5492 Mon Sep 17 00:00:00 2001 From: Naimul Kabir Date: Tue, 22 Dec 2020 23:28:11 +0600 Subject: [PATCH 13/81] =?UTF-8?q?=F0=9F=91=8C=20improve:=20add=20new=20wor?= =?UTF-8?q?ds=20to=20the=20strings=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values-bn/strings.xml | 130 ++++++++++++------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 57039e615..171c84fff 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -160,9 +160,9 @@ Crop thumbnails into squares Show video durations Rotate fullscreen media by - System setting + সিস্টেম সেটিংস Device rotation - Aspect ratio + অ্যাস্পেক্ট রেশিও Black background at fullscreen media Scroll thumbnails horizontally Automatically hide system UI at fullscreen media @@ -187,8 +187,8 @@ Show a notch if available Allow rotating images with gestures File loading priority - Speed - Compromise + গতি + সমঝোতা Avoid showing invalid files Show image file types Allow zooming videos with double tapping them @@ -218,7 +218,7 @@ Transform Filter কিছু না - Adjust + সামঞ্জস্য করুন ছায়া Exposure Highlights @@ -226,84 +226,84 @@ Contrast Saturation Clarity - Gamma - Blacks - Whites - Temperature - Sharpness - Reset - Focus - None + গামা + কালো + শাদা + উষ্ণতা + তীক্ষ্ণতা + রিসেট + ফোকাস + কিছু না Radial - Linear - Mirrored - Gaussian - Text - Text Options - Text Color + লিনিয়ার + আয়না + গাউসিয়ান + লেখা + লেখার অপশন + লেখার রঙ ফন্ট - Add - Edit - Straighten - Font - Color - BG Color - Alignment - To Front - Delete - Your text - Brush - Color - Size - Hardness - To Front - Delete - Brush Color - Editor - Close Editor? - Do you really want to discard the changes? - Yes - No + যোগ করুন + সম্পাদনা করুন + সোজা করা + ফন্ট + রঙ + পেছনের রঙ + প্রান্তিককরণ + সামনে আনুন + মুছে ফেলুন + আপনার লেখা + ব্রাশ + রঙ + আয়তন + কঠোরতা + সামনে আনুন + মুছে ফেলুন + ব্রাশের রঙ + সম্পাদক + সম্পাদক বন্ধ করুন? + আপনি কি সত্যিই পরিবর্তনগুলো বাদ দিতে চান? + হ্যাঁ + না বাতিল গ্রহণ সংরক্ষণ - Exporting… - Exporting %s. + এক্সপোর্ট হচ্ছে… + এক্সপোর্ট হচ্ছে %s. স্টিকার স্টিকারের রঙ Sticker Options যোগ রঙ মুছে ফেলা - To Front - Straighten - Replace - Opacity - Contrast - Saturation - Brightness - Uploads - Overlay - Normal - Darken - Screen - Overlay - Lighten - Multiply - Color Burn - Soft Light - Hard Light + সামনে + সোজা করুন + প্রতিস্থাপন + অস্বচ্ছতা + বৈপরীত্য + সম্পৃক্তি + উজ্জ্বলতা + আপলোডসমূহ + ওভারলে + সাধারণ + অন্ধকারাচ্ছন্ন করা + স্ক্রিন + ওভারলে + হালকা করা + গুণ + পোড়া রঙ + নরম আলো + কড়া আলো কিছু না সোনালী লাইটলিক ১ মোজাইক কাগন বৃষ্টি - Vintage - Flip H + ভিন্টেজ + পাশাপাশি ঘুরান Flip V - Undo - Redo + পূর্বাবস্থায় ফেরত যান + পুনরায় আনুন রঙ নির্বাচক স্বচ্ছ শাদা From d04081f23143f13dab73581b8384da5821b3b8a2 Mon Sep 17 00:00:00 2001 From: Naimul Kabir Date: Tue, 22 Dec 2020 23:33:19 +0600 Subject: [PATCH 14/81] =?UTF-8?q?=F0=9F=91=8C=20improve:=20remove=20not=20?= =?UTF-8?q?translated=20strings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values-bn/strings.xml | 106 +++---------------------- 1 file changed, 11 insertions(+), 95 deletions(-) diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 171c84fff..0c8918b33 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -45,13 +45,9 @@ ফিল্টার পরিবর্তন করুন - This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden items\' option in Settings. Continue? বাদ দিন বাদ দেওয়া ফোল্ডারসমূহ বাদ দেওয়া ফোল্ডারগুলোর ব্যবস্থাপনা - This will exclude the selection together with its subfolders from Simple Gallery only. You can manage excluded folders in Settings. - Exclude a parent instead? - Excluding folders will make them together with their subfolders hidden just in Simple Gallery, they will still be visible in other applications.\n\nIf you want to hide them from other apps too, use the Hide function. সবগুলো সরান বাদ দেওয়া তালিকা থেকে সমস্ত ফোল্ডার সরাবেন? এটি ফোল্ডারগুলি মুছবে না। লুকানো ফোল্ডারগুলো @@ -62,8 +58,6 @@ অন্তর্ভুক্ত ফোল্ডার অন্তর্ভুক্ত ফোল্ডার ব্যবস্থাপনা করুন ফোল্ডার যোগ করুন - If you have some folders which contain media, but were not recognized by the app, you can add them manually here.\n\nAdding some items here will not exclude any other folder. - No media files have been found. You can solve it by adding the folders containing media files manually. আকার পরিবর্তন @@ -127,14 +121,10 @@ বিবর্ণ স্লাইড স্লাইডশো শেষ হয়েছে - No media for the slideshow have been found - - - Group direct subfolders + স্লাইডশোর জন্য কোন মিডিয়া পাওয়া যায়নি একত্রিত করুন - Do not group files ফোল্ডার শেষ পরিবর্তন করা হয়েছে শেষ পরিবর্তন (দৈনিক) @@ -144,7 +134,6 @@ তোলার তারিখ (মাসিক) ফাইল টাইপ এক্সটেনশন - Please note that grouping and sorting are 2 independent fields উইজেটে দেখানো ফোল্ডার: @@ -152,53 +141,12 @@ স্বয়ংক্রিয়ভাবে ভিডিও চালান - Remember last video playback position - Toggle filename visibility - Loop videos - Animate GIFs at thumbnails - Max brightness when viewing fullscreen media - Crop thumbnails into squares - Show video durations - Rotate fullscreen media by সিস্টেম সেটিংস Device rotation অ্যাস্পেক্ট রেশিও - Black background at fullscreen media - Scroll thumbnails horizontally - Automatically hide system UI at fullscreen media - Delete empty folders after deleting their content - Allow controlling photo brightness with vertical gestures - Allow controlling video volume and brightness with vertical gestures - Show folder media count on the main view - Show extended details over fullscreen media - Manage extended details - Allow one finger zoom at fullscreen media - Allow instantly changing media by clicking on screen sides - Allow deep zooming images - Hide extended details when status bar is hidden - Show some action buttons at the bottom of the screen - Show the Recycle Bin at the folders screen - Deep zoomable images - Show images in the highest possible quality - Show the Recycle Bin as the last item on the main screen - Allow closing the fullscreen view with a down gesture - Allow 1:1 zooming in with two double taps - Always open videos on a separate screen with new horizontal gestures - Show a notch if available - Allow rotating images with gestures - File loading priority গতি সমঝোতা - Avoid showing invalid files - Show image file types - Allow zooming videos with double tapping them - Folder thumbnail style - Show file count on a separate line - Show file count in brackets - Do not show file count - Limit long folder titles to 1 line বর্গ - Rounded corners থাম্বনেল @@ -213,19 +161,19 @@ কাস্টম - Reset + রিসেট বর্গ - Transform - Filter + রূপান্তর + ফিল্টার কিছু না সামঞ্জস্য করুন ছায়া - Exposure - Highlights - Brightness + অনাবৃত করুন + হাইলাইটসমূহ + উজ্জ্বলতা Contrast - Saturation - Clarity + স্যাচুরেশন + নির্মলতা গামা কালো শাদা @@ -234,7 +182,7 @@ রিসেট ফোকাস কিছু না - Radial + রশ্মীবৎ লিনিয়ার আয়না গাউসিয়ান @@ -301,7 +249,7 @@ বৃষ্টি ভিন্টেজ পাশাপাশি ঘুরান - Flip V + খাড়াখাড়ি ঘুরান পূর্বাবস্থায় ফেরত যান পুনরায় আনুন রঙ নির্বাচক @@ -324,38 +272,6 @@ পাইপেটেবল রঙ কাটুন - - How can I make Simple Gallery the default device gallery? - First you have to find the currently default gallery in the Apps section of your device settings, look for a button that says something like \"Open by default\", click on it, then select \"Clear defaults\". - The next time you will try opening an image or video you should see an app picker, where you can select Simple Gallery and make it the default app. - I locked the app with a password, but I forgot it. What can I do? - You can solve it in 2 ways. You can either reinstall the app, or find the app in your device settings and select \"Clear data\". It will reset all your settings, it will not remove any media files. - How can I make an album always appear at the top? - You can long press the desired album and select the Pin icon at the actions menu, that will pin it to the top. You can pin multiple folders too, pinned items will be sorted by the default sorting method. - How can I fast forward videos? - You can do it by double tapping the side of the screen, or tapping the current or max duration texts near the seekbar. If you enable opening videos on a separate screen in the app settings, you can use horizontal gestures too. - What is the difference between hiding and excluding a folder? - Exclude prevents displaying the folder only in Simple Gallery, while Hide works system-wise and it hides the folder from other galleries too. It works by creating an empty \".nomedia\" file in the given folder, which you can then remove with any file manager too. Note that some devices do not allow hiding folders like Camera, Screenshots and Downloads. - Why do folders with music cover art or stickers show up? - It can happen that you will see some unusual albums show up. You can easily exclude them by long pressing them and selecting Exclude. In the next dialog you can then select the parent folder, chances are it will prevent the other related albums showing up too. - A folder with images isn\'t showing up, or it doesn\'t show all items. What can I do? - That can have multiple reasons, but solving it is easy. Just go in Settings -> Manage Included Folders, select Plus and navigate to the required folder. - What if I want just a few particular folders visible? - Adding a folder at the Included Folders doesn\'t automatically exclude anything. What you can do is go in Settings -> Manage Excluded Folders, exclude the root folder \"/\", then add the desired folders at Settings -> Manage Included Folders. - That will make only the selected folders visible, as both excluding and including are recursive and if a folder is both excluded and included, it will show up. - Can I crop images with this app? - Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. - Can I somehow group media file thumbnails? - Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. - Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? - It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". - I see some color banding on the images. How can I improve the quality? - The current solution for displaying images works fine in the vast majority of cases, but if you want even better image quality, you can enable the \"Show images in the highest possible quality\" at the app settings, in the \"Deep zoomable images\" section. - I have hidden a file/folder. How can I unhide it? - You can either press the \"Temporarily show hidden items\" menu item at the main screen, or toggle \"Show hidden items\" in the app settings to see the hidden item. If you want to unhide it, just long press it and select \"Unhide\". Folders are hidden by adding a hidden \".nomedia\" file into them, you can delete the file with any file manager too. - Why does the app take up so much space? - App cache can take up to 250MB, it ensures quicker image loading. If the app is taking up even more space, it is most likely caused by you having items in the Recycle Bin. Those files count to the app size. You can clear the Recycle bin by opening it and deleting all files, or from the app settings. Every file in the Bin is deleted automatically after 30 days. - সিম্পল গ্যালারি প্রো - ছবি ম্যানেজার ও সম্পাদক From 5b14829581fc88d7509ea6427db7a8c728434631 Mon Sep 17 00:00:00 2001 From: Guzleon <67067702+Guzleon@users.noreply.github.com> Date: Wed, 23 Dec 2020 11:48:09 +0100 Subject: [PATCH 15/81] Update strings.xml --- app/src/main/res/values-es/strings.xml | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 72e819957..bb39a1809 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -28,7 +28,7 @@ Fecha fijada correctamente No se han encontrado valores de fechas tomadas Comparte una versión redimensionada - Oye,\n\nParece que actualizaste de la aplicación gratuita vieja. Ahora puedes desinstalar la versión vieja, que tiene un botón \'Actualizar a Pro\' en la aprte superior de los ajustes de la app.\n\nSolo tendrás los elementos de la Papelera de Reciclaje eliminados, favoritos desmarcados y también tendrás que reiniciar los ajustes de la app.\n\n¡Gracias! + Oye,\n\nParece que actualizaste de la aplicación gratuita vieja. Ahora puedes desinstalar la versión vieja, que tiene un botón \'Actualizar a Pro\' en la aprte superior de los ajustes de la app.\n\nSólo tendrás los elementos de la Papelera de Reciclaje eliminados, favoritos desmarcados y también tendrás que reiniciar los ajustes de la app.\n\n¡Gracias! Cambiar a la búsqueda de archivos en todas las carpetas visibles Poner como carpeta predeterminada Quitar como carpeta predeterminada @@ -38,7 +38,7 @@ Imágenes Videos GIFs - Imagenes RAW + Imágenes RAW SVGs Retratos No se han encontrado ficheros con los filtros seleccionados. @@ -117,7 +117,7 @@ Presentación de diapositivas Intervalo (segundos): Incluir fotos - Incluir vídeos + Incluir videos Incluir GIFs Orden aleatorio Mover hacia atrás @@ -166,21 +166,21 @@ Fondo y barra de estado negra en medios de pantalla completa Desplazar miniaturas horizontalmente Ocultar la interfaz del sistema en pantalla completa - Eliminar carpetas vacias despues de borrar su contenido + Eliminar carpetas vacias después de borrar su contenido Permite controlar el brillo en las fotos con gestos verticales Permite controlar el volumen y el brillo del video con gestos verticales Mostrar el número de archivos dentro de las carpetas en la página principal Mostrar información de los archivos en pantalla completa - Información de lo archivos a mostrar + Información de los archivos a mostrar Permitir zoom con un dedo en pantalla completa - Deslpazarse en los medios haciendo clic en los lados de la pantalla + Desplazarse en los medios haciendo clic en los lados de la pantalla Permitir zoom profundo Ocultar detalles ampliados cuando la barra de estado está oculta Mostrar botones de acción en la parte inferior de la pantalla Mostrar la papelera de reciclaje en la pantalla de carpetas Imágenes ampliables con zoom Mostrar imágenes con la mayor calidad posible - Mostrar la Papelera de reciclaje como el último elemento en la pantalla principal + Mostrar la papelera de reciclaje como el último elemento en la pantalla principal Permite cerrar la vista de pantalla completa con un gesto hacia abajo. Permitir zoom 1:1 con un toque doble Abrir videos en una pantalla separada con nuevos gestos horizontales @@ -192,13 +192,13 @@ Evita mostrar archivos inválidos Mostrar tipos de archivo de imagen Permitir hacer zoom en videos con doble toque - Folder thumbnail style - Show file count on a separate line - Show file count in brackets - Do not show file count - Limit long folder titles to 1 line - Square - Rounded corners + Estilo de las miniaturas de las carpetas + Mostrar el recuento de archivos en una línea separada + Mostrar el recuento de archivos entre paréntesis + No mostrar el recuento de archivos + Limitar los títulos largos de las carpetas a 1 línea + Cuadrado + Esquinas redondeadas Miniaturas @@ -261,7 +261,7 @@ Color del pincel Editor ¿Cerrar editor? - ¿Realmente queires descartar los cambios? + ¿Realmente quieres descartar los cambios? Sí No Cancelar @@ -285,7 +285,7 @@ Subidas Modo de fusión Normal - Más obscuro + Más oscuro Pantalla Superpuesto Más claro From 870b2b7a11cafa397f689f89bb7dac52fbafef6e Mon Sep 17 00:00:00 2001 From: Guillaume Date: Sun, 27 Dec 2020 00:46:22 +0100 Subject: [PATCH 16/81] Dutch --- app/src/main/res/values-nl/strings.xml | 104 ++++++++++++------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 6d8d36991..c966b65b8 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -30,13 +30,13 @@ Verkleinde versie delen Het lijkt erop dat dit een upgrade is vanaf de oude gratis versie. Deze oude versie, met de knop \"Upgraden naar Pro\" bovenaan de instellingen, kan nu gedeïnstalleerd worden.\n\nDe items in de prullenbak zullen dan wel worden verwijderd, favorieten en instellingen zullen ook opnieuw moeten worden geconfigureerd. Zoeken in alle zichtbare mappen - Set as default folder - Unset as default folder + Als standaardmap instellen + Standaardmap herstellen Media filteren Afbeeldingen - Video’s + Video\'s GIF-bestanden RAW-afbeeldingen SVG-vectorafbeeldingen @@ -77,18 +77,18 @@ Bewerken Draaien Ongeldig pad naar afbeelding - Invalid video path + Ongeldig pad naar video Fout bij bewerken van afbeelding - Video editing failed + Videobewerking mislukt Afbeelding bewerken is geannuleerd - Video editing cancelled + Videobewerking is geannuleerd Wijzigingen zijn opgeslagen - Image edited successfully - Video edited successfully + Bewerkte afbeelding is opgeslagen + Bewerkte video is opgeslagen Afbeelding bewerken met: - Edit video with: - Geen app gevonden voor fotobewerking - No video editor found + Video bewerken met: + Geen app voor fotobewerking gevonden + Geen app voor videobewerking gevonden Onbekende bestandslocatie Bronbestand kan niet worden overschreven Linksom draaien @@ -117,7 +117,7 @@ Diavoorstelling Interval (seconden): Afbeeldingen weergeven - Video’s weergeven + Video\'s weergeven GIF-bestanden weergeven Willekeurige volgorde Omgekeerde volgorde @@ -151,10 +151,10 @@ Mapnaam tonen - Video’s automatisch afspelen + Video\'s automatisch afspelen Laatste positie in video’s onthouden Bestandsnamen tonen - Video’s herhalen + Video\'s herhalen GIF-bestanden afspelen in overzicht Maximale helderheid in volledig scherm Miniatuurvoorbeelden bijsnijden @@ -183,7 +183,7 @@ Prullenbak als laatste item tonen Naar beneden vegen om volledig scherm af te sluiten 1:1 zoomen na 2x dubbelklikken - Video’s altijd in apart scherm met horizontale veeggebaren openen + Video\'s altijd in apart scherm met horizontale veeggebaren openen Inkeping scherm tonen indien aanwezig Afbeeldingen met veeggebaren draaien Prioriteit bij inladen bestanden @@ -192,13 +192,13 @@ Ongeldige bestanden verbergen Bestandstypen tonen Bij video\'s inzoomen met dubbelklikken - Folder thumbnail style - Show file count on a separate line - Show file count in brackets - Do not show file count - Limit long folder titles to 1 line - Square - Rounded corners + Stijl voor mapthumbnails + Aantal bestanden op aparte regel tonen + Aantal bestanden tussen rechte haken tonen + Aantal bestanden niet tonen + Lange mapnamen tot 1 regel limiteren + Vierkant + Afgeronde hoeken Miniatuurvoorbeelden @@ -261,7 +261,7 @@ Penseelkleur Bewerken Afsluiten - Do you really want to discard the changes? + Veranderingen niet opslaan? Ja Nee Annuleren @@ -270,35 +270,35 @@ Exporteren… %s exporteren. Sticker - Sticker Color - Sticker Options - Add - Color - Delete - To Front - Straighten - Replace - Opacity + Stickerkleur + Stickeropties + Toevoegen + Kleur + Verwijderen + Naar voorgrond + Rechttrekken + Vervangen + Ondoorzichtigheid Contrast - Saturation - Brightness + Verzadiging + Helderheid Uploads Overlay - Normal - Darken - Screen - Overlay - Lighten - Multiply - Color Burn - Soft Light - Hard Light - None - Golden - Lightleak 1 - Mosaic - Paper - Rain + Normaal + Donkerder + Raster + Bedekken + Lichter + Vermenigvuldigen + Kleur doordrukken + Zwak licht + Fel licht + Geen + Goud + Licht lekken 1 + Mozaïek + Papier + Regen Vintage Spiegelen H Spiegelen V @@ -322,7 +322,7 @@ Groen Aquamarijn Met pipet kiezen - Trim + Titel afkappen Hoe kan ik Eenvoudige Galerij instellen als standaard-app voor foto’s en video’s? @@ -353,7 +353,7 @@ In de meeste gevallen werkt de huidige methode voor het weergeven van afbeeldingen prima, maar met de instelling \"Afbeeldingen in de hoogst mogelijke kwaliteit weergeven\" onder \"Afbeeldingen ver inzoomen\" kan een nog betere kwaliteit worden bewerkstelligd. Ik heb een bestand of map verborgen. Hoe kan ik dit ongedaan maken? Kies het menu-item \"Verborgen items tijdelijk tonen\", of schakel de instelling \"Verborgen items tonen\" in om het verborgen item te kunnen zien. Druk vervolgens lang op het item en kies \"Tonen\" om het verbergen ongedaan te maken. Mappen worden verborgen door het bestand \".nomedia\" in de map te plaatsen; dit bestand kan ook handmatig in een andere app worden verwijderd. - Why does the app take up so much space? + Waarom neemt de app zoveel ruimte in beslag? De cache voor de app kan oplopen tot 250MB; dit garandeert snellere laadtijden van afbeeldingen. Indien de app nog meer ruimte inneemt, komt dat hoogstwaarschijnlijk door de items in de prullenbak. Ook deze bestanden worden meegerekend met de ingenomen ruimte. Verwijder deze items zelf vanuit de prullenbak of vanuit de instellingen van de app. Ieder item in de prullenbak zal na 30 dagen automatisch verwijderd worden. @@ -408,7 +408,7 @@ Kijk ook eens naar de hele collectie apps van Simple Tools: https://www.simplemobiletools.com - Standalone website of Simple Gallery Pro: + Website van Simple Gallery Pro: https://www.simplemobiletools.com/gallery Facebook: From 512578a269516e9b536e8bfefb79bb059b51a558 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 3 Jan 2021 10:42:44 +0100 Subject: [PATCH 17/81] updating commons and photo/video editor --- app/build.gradle | 4 ++-- build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4713c7273..4821983fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.32.7' + implementation 'com.simplemobiletools:commons:5.32.21' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' @@ -96,7 +96,7 @@ dependencies { kapt 'com.github.bumptech.glide:compiler:4.10.0' - kapt 'androidx.room:room-compiler:2.2.5' + kapt 'androidx.room:room-compiler:2.2.6' implementation 'androidx.room:room-runtime:2.2.5' annotationProcessor 'androidx.room:room-compiler:2.2.5' } diff --git a/build.gradle b/build.gradle index a53733c91..b8c5b9336 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { classpath 'com.android.tools.build:gradle:4.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" if (is_proprietary) { - classpath 'ly.img.android.pesdk:plugin:8.0.5' + classpath 'ly.img.android.pesdk:plugin:8.0.7' } // NOTE: Do not place your application dependencies here; they belong From 5450bb261d60d3413e0371b4335cce70d37dd995 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 3 Jan 2021 10:54:46 +0100 Subject: [PATCH 18/81] update commons to 5.32.22 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 4821983fb..787e26bfb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.32.21' + implementation 'com.simplemobiletools:commons:5.32.22' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' From 28ac2035e2f33f852a034b786b30f65729d3776c Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 3 Jan 2021 11:05:41 +0100 Subject: [PATCH 19/81] update version to 6.18.1 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 787e26bfb..ff9537098 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "com.simplemobiletools.gallery.pro" minSdkVersion 21 targetSdkVersion 29 - versionCode 330 - versionName "6.18.0" + versionCode 331 + versionName "6.18.1" setProperty("archivesBaseName", "gallery-$versionCode") vectorDrawables.useSupportLibrary = true } From 1439e6b4c8443f20525c4372384b2530fbf88da6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 3 Jan 2021 11:05:50 +0100 Subject: [PATCH 20/81] updating changelog --- CHANGELOG.md | 6 ++++++ fastlane/metadata/android/en-US/changelogs/331.txt | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/331.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 10a312b19..4f93b04f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changelog ========== +Version 6.18.1 *(2021-01-03)* +---------------------------- + + * Updated the photo and video editor to fix some glitches + * Added some translation and stability improvements + Version 6.18.0 *(2020-12-08)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/331.txt b/fastlane/metadata/android/en-US/changelogs/331.txt new file mode 100644 index 000000000..9bf5de94b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/331.txt @@ -0,0 +1,2 @@ + * Updated the photo and video editor to fix some glitches + * Added some translation and stability improvements From dc6bbf5a6b03f56ccf955699b7fedb9ac7fdbc10 Mon Sep 17 00:00:00 2001 From: Pzqqt <821026875@qq.com> Date: Mon, 4 Jan 2021 16:13:11 +0800 Subject: [PATCH 21/81] Adjust some simplified Chinese translation --- app/src/main/res/values-zh-rCN/strings.xml | 60 +++++++++++----------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 7f47ea8b0..effbd1bee 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -156,13 +156,13 @@ 显示文件名 循环播放视频 GIF 缩略图 - 全屏查看媒体文件时最大亮度 + 全屏时最高亮度 裁剪缩略图为正方形 显示视频时长 - 旋转全屏媒体文件依据 - 系统设置 - 设备旋转 - 高宽比 + 全屏时媒体文件旋转方向 + 跟随系统设置 + 跟随设备旋转 + 根据高宽比 全屏时使用黑色背景和状态栏 水平滚动缩略图 全屏时自动隐藏状态栏 @@ -171,9 +171,9 @@ 使用纵向滑动手势控制视频音量和亮度 在主界面显示文件夹媒体计数 全屏浏览媒体时显示详细信息 - 要显示的详细信息项目 + 管理详细信息项目 单指缩放 - 通过单击屏幕边缘来切换媒体 + 点击屏幕边缘来切换媒体 允许深度放大图像 当状态栏隐藏时隐藏扩展详情 显示底栏 @@ -181,15 +181,15 @@ 深度放大图像 以最高质量显示图像 在主屏幕界面的最后一项显示回收站 - 使用下滑手势关闭全屏视图 + 使用下滑手势退出全屏视图 双击两次后 1:1 放大图像 - 使用新的水平手势在独立页面播放视频 + 在单独的页面播放视频（可以左右滑动屏幕来快进/快退） 显示留海（如果可用） 允许使用手势旋转图像 文件加载优先级 快速 - 折中 - 避免显示无效的文件 + 避免显示空文件 + 避免显示任何无效的文件 显示图片文件类型 允许双击来放大视频 文件夹缩略图样式 @@ -326,29 +326,29 @@ 如何把简易图库设置为设备的默认图库？ - 首先，您需要在设备设置的“应用”菜单中找到您当前的默认图库，找到并点击“默认打开”按钮，然后点击“清除默认值”。下次当您再次打开图片或视频时，您应该会看到一个应用程序选择器，请在这里选择“简易图库”并将其设为默认应用程序。 - 我用密码锁定了本应用，但我忘记了密码。该怎么办？ - 有两种方法。您可以重新安装本应用，也可以在设置中清除此应用的数据，这将会会重置您的所有设置，但不会删除任何媒体文件。 + 首先在系统设置中的“应用”菜单下找到您当前的默认图库，选择并点击“默认打开”按钮，然后点击“清除默认值”。下次再打开图片或视频时，您会看到一个应用程序选择器，在这里选择“简易图库”并将其设为默认应用程序即可。 + 我用密码锁定了本应用，但我忘记密码了。该怎么办？ + 有两种方法。您可以重新安装本应用，也可以在设置中清除此应用的数据，这样会重置您的所有设置，但不会删除任何媒体文件。 如何让某个相册始终显示在最上面？ - 您可以长按该相册并在操作栏中点击图钉图标，这样 就可以将其固定在顶部了。您也可以固定多个文件夹，固定项目将按照默认排序方法排序。 + 您可以长按该相册并在操作栏中点击图钉图标，这样就可以将其固定在顶部了。您也可以固定多个文件夹，已固定的项目会按照默认排序方法进行排序。 如何快进/快退视频？ - 您可以双击屏幕边缘或点击搜索栏附近的当前或总时长的文字。 如果您在应用设置中启用了在独立页面播放视频，则也可以使用水平手势。 + 您可以双击屏幕边缘或点击搜索栏附近的当前时间或总时长的文本。如果您在应用设置中启用了“在单独的页面播放视频”，就可以使用水平手势来快进/快退视频。 文件夹的隐藏和排除有什么区别？ - 排除功能只是防止其在简易图库中显示，而隐藏功能则使用的是系统的方法，这样做也会在其他图库中隐藏。它的工作原理是在给定的文件夹中创建一个空的.nomedia文件，您可以使用任何文件管理器删除它。请注意，某些设备不允许隐藏\"Camera\"，\"Screenshots\"和\"Downloads\"等文件夹。 + 排除功能只是防止其在简易图库中显示，而隐藏功能则使用的是系统提供的方法，这样的话在其他的图库应用中也会隐藏。它的工作原理是在给定的文件夹中创建一个空的.nomedia文件，您可以使用任何文件管理器来删除它。请注意，某些设备不允许隐藏\"Camera\"，\"Screenshots\"和\"Downloads\"等文件夹。 为什么会出现音乐艺术家封面或贴纸文件夹？ - 您可能会看到一些不寻常的相册出现。您可以通过长按它们并选择“排除”来排除它们。在之后的对话框中，您可以选择父文件夹，这样也许就会阻止其他相关的相册出现。 + 您可能会看到一些不寻常的相册出现。可以通过长按并选择“排除”来排除它们。在之后的对话框中，您可以选择父文件夹，这样也许就会阻止其他相关的相册出现。 有的图片文件夹没有显示，怎么回事？ - 原因可能有很多，但解决方法很简单。只需进入设置 -> 管理包含目录，点击+号并选择到所需的文件夹。 + 原因可能有很多，但解决方法很简单。只需进入设置 -> 管理包含目录，点击+号并选择该文件夹。 如果我只想显示几个特定的文件夹，该如何操作？ - 在包含目录中添加文件夹不会自动排除其他的内容。您可以做的：进入设置 -> 管理排除目录，排除根目录\"/\"，然后在设置 -> 管理包含目录中添加所需的文件夹。这样就只显示选定的文件夹了，由于排除和包含都是递归的，所以排除并包含的文件夹是会显示的。 - 可以裁剪图片吗？ - 当然，通过长按图片缩略图并选择编辑，或在全屏视图中选择编辑来打开编辑器。您可以通过拖动图片边角来剪裁图像。 + 在包含目录中添加文件夹不会自动排除其他的内容。您可以这样做：进入设置 -> 管理排除目录，排除根目录\"/\"，然后在设置 -> 管理包含目录中添加所需的文件夹。这样就可以只显示选定的文件夹了，由于排除和包含都是递归的，所以排除并包含的文件夹是会显示的。 + 我可以裁剪图片吗？ + 当然可以，通过长按图片缩略图并选择编辑，或是在全屏视图中选择编辑来打开编辑器。您可以通过拖动图片边角来剪裁图片。 我能将媒体文件缩略图分组吗？ - 当然，只需在缩略图视图中使用\"分组依据\"菜单项即可。您可以依据多个条件对文件进行分组，包括拍摄日期。如果您使用了\"显示所有文件夹内容\"功能，则可以按文件夹对它们进行分组。 + 当然可以，只需在缩略图视图中使用\"分组依据\"菜单项即可。您可以依据多个条件对文件进行分组，包括拍摄日期。如果您使用了\"显示所有文件夹内容\"功能，则可以按文件夹对它们进行分组。 按拍摄日期排序似乎有异常，我该如何解决？ 很可能是因为图片是从某处复制过来的。您可以长按文件缩略图并选择\"修复拍摄日期\"来修复它。 - 我看到图像上有一些色带。如何提高提高质量？ - 目前显示图像的方案在绝大多数情况下都能正常工作，如果您想要更好的图像质量，您可以在设置中启用\"以最高质量显示图像\"。 + 我看到图片上有一些色带。如何提高提高质量？ + 目前显示图片的方案在绝大多数情况下都是正常的，如果您想要更好的图像质量，您可以在设置中启用\"以最高质量显示图像\"。 我隐藏了某个文件/文件夹。如何取消隐藏？ 您可以点击主界面上的\"暂时显示隐藏的项目\"选项，或在设置中开启\"显示隐藏的项目\"。 如果您想取消隐藏它，长按它并选择\"取消隐藏\"即可。 我们是通过向文件夹中添加\".nomedia\"文件来隐藏文件夹的，使用文件管理器删除该文件也可以取消隐藏。 为什么应用占用了这么多的空间？ @@ -360,7 +360,7 @@ 使用此照片和视频库来毫无阻碍地浏览您的回忆 - 简易图库 Pro 是一个高度可定制的图库。管理并编辑您的照片，从回收站中恢复已删除的照片，保护并隐藏文件，查看RAW，SVG等等多种照片和视频格式。 + 简易图库 Pro 是一个高度可定制的图库。你可以管理并编辑您的照片，从回收站中恢复已删除的照片，保护并隐藏文件，查看RAW，SVG等等多种照片和视频格式。 该应用不包含广告和不必要的权限。我们保护您的隐私，因为该应用不需要联网权限。 @@ -392,18 +392,18 @@ 简易图库 Pro 可以轻松地动态编辑图片。支持裁剪、翻转、旋转、或是调整图片大小。如果您希望更有创意的话，可以添加滤镜，或是直接在图片上绘制！ 支持多种文件类型 - 与其他一些图库应用不同，简易图库 Pro 支持多种文件类型，包括JPEG，PNG，MP4，MKV，RAW，SVG，全景照片，全景视频等等。 + 不同于其他一些图库应用，简易图库 Pro 支持多种文件类型，包括JPEG，PNG，MP4，MKV，RAW，SVG，全景照片，全景视频等等。 高度可定制的图库 - 从UI到底部工具栏上的功能按钮，简易图库 Pro 可高度自定义并按您的要求工作。其他图库应用可没有这种灵活性！由于该应用是开源的，所以我们还提供 32 种语言！ + 不论是UI还是底部工具栏上的功能按钮，简易图库 Pro 可按照您的要求高度自定义。其他图库应用可没有这种灵活性！由于该应用是开源的，所以我们还提供 32 种语言！ 恢复已删除的照片和视频 - 意外删除了珍贵的照片或视频？别担心！简易图库 Pro 具有方便的回收站，您可以方便地恢复已删除的照片和视频。 + 不小心删除了珍贵的照片或视频？别担心！简易图库 Pro 具有方便的回收站，您可以轻松地恢复已删除的照片和视频。 保护并隐藏照片、视频和文件 使用密码、图案或指纹保护和隐藏照片、视频、或是整个相册。您也可以保护应用自身或禁用一些特定功能。 例如，只有指纹验证通过才可以删除文件，从而有效地防止您的文件被意外删除。 - 于此查看简易工具系列全套: + 在这里查看全套简易应用系列: https://www.simplemobiletools.com 简易图库 Pro 的独立网站： From 0e026c193452d10ba235d498b8cf224efb83c9fa Mon Sep 17 00:00:00 2001 From: Luis Alfredo Figueroa Bracamontes Date: Thu, 7 Jan 2021 11:56:40 -0600 Subject: [PATCH 22/81] Update strings.xml A tiny correction --- 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 bb39a1809..3d47eab60 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -28,7 +28,7 @@ Fecha fijada correctamente No se han encontrado valores de fechas tomadas Comparte una versión redimensionada - Oye,\n\nParece que actualizaste de la aplicación gratuita vieja. Ahora puedes desinstalar la versión vieja, que tiene un botón \'Actualizar a Pro\' en la aprte superior de los ajustes de la app.\n\nSólo tendrás los elementos de la Papelera de Reciclaje eliminados, favoritos desmarcados y también tendrás que reiniciar los ajustes de la app.\n\n¡Gracias! + Oye,\n\nParece que actualizaste de la aplicación gratuita vieja. Ahora puedes desinstalar la versión vieja, que tiene un botón \'Actualizar a Pro\' en la parte superior de los ajustes de la app.\n\nSólo tendrás los elementos de la Papelera de Reciclaje eliminados, favoritos desmarcados y también tendrás que reiniciar los ajustes de la app.\n\n¡Gracias! Cambiar a la búsqueda de archivos en todas las carpetas visibles Poner como carpeta predeterminada Quitar como carpeta predeterminada From 7957f28b97cac8e999c6d6a33de5424f7a66db81 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 13 Jan 2021 21:02:06 +0100 Subject: [PATCH 23/81] speed up cached folder fetching by not checking .nomedia multiple times --- .../simplemobiletools/gallery/pro/extensions/Context.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt index 03b5ad783..3ecb7fe75 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt @@ -576,7 +576,14 @@ fun Context.getCachedDirectories(getVideosOnly: Boolean = false, getImagesOnly: val hiddenString = resources.getString(R.string.hidden) filteredDirectories.forEach { - it.name = if (it.path.doesThisOrParentHaveNoMedia(noMediaFolders) && !it.path.isThisOrParentIncluded(includedPaths)) { + val noMediaPath = "${it.path}/.nomedia" + val hasNoMedia = if (folderNoMediaStatuses.keys.contains(noMediaPath)) { + folderNoMediaStatuses[noMediaPath]!! + } else { + it.path.doesThisOrParentHaveNoMedia(noMediaFolders) + } + + it.name = if (hasNoMedia && !it.path.isThisOrParentIncluded(includedPaths)) { "${it.name.removeSuffix(hiddenString).trim()} $hiddenString" } else { it.name.removeSuffix(hiddenString).trim() From a77580df503c59c94590cbabd92c6d628726c43f Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 13 Jan 2021 22:42:07 +0100 Subject: [PATCH 24/81] improving the performance at media scrolling --- app/build.gradle | 6 ++-- .../pro/activities/WidgetConfigureActivity.kt | 2 +- .../gallery/pro/adapters/DirectoryAdapter.kt | 2 +- .../gallery/pro/adapters/MediaAdapter.kt | 11 ++++--- .../gallery/pro/extensions/Activity.kt | 2 +- .../gallery/pro/extensions/Context.kt | 30 +++++++++---------- 6 files changed, 26 insertions(+), 27 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ff9537098..d54e516a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.32.22' + implementation 'com.simplemobiletools:commons:5.32.25' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' @@ -97,8 +97,8 @@ dependencies { kapt 'com.github.bumptech.glide:compiler:4.10.0' kapt 'androidx.room:room-compiler:2.2.6' - implementation 'androidx.room:room-runtime:2.2.5' - annotationProcessor 'androidx.room:room-compiler:2.2.5' + implementation 'androidx.room:room-runtime:2.2.6' + annotationProcessor 'androidx.room:room-compiler:2.2.6' } // Apply the PESDKPlugin diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/WidgetConfigureActivity.kt index 34d427655..ac34d9f3c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/WidgetConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/WidgetConfigureActivity.kt @@ -167,7 +167,7 @@ class WidgetConfigureActivity : SimpleActivity() { val path = directoryDao.getDirectoryThumbnail(folderPath) if (path != null) { runOnUiThread { - loadJpg(path, config_image, config.cropThumbnails, ROUNDED_CORNERS_NONE) + loadJpg(path, config_image, config.cropThumbnails, ROUNDED_CORNERS_NONE, 0) } } } 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 f3a041c71..08b042393 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 @@ -710,7 +710,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList ROUNDED_CORNERS_BIG } - activity.loadImage(thumbnailType, directory.tmb, dir_thumbnail, scrollHorizontally, animateGifs, cropThumbnails, roundedCorners) + activity.loadImage(thumbnailType, directory.tmb, dir_thumbnail, scrollHorizontally, animateGifs, cropThumbnails, roundedCorners, directory.modified) } dir_pin.beVisibleIf(pinnedFolders.contains(directory.path)) 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 1f693c96c..ff0ffd1eb 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 @@ -18,10 +18,7 @@ import com.simplemobiletools.commons.dialogs.PropertiesDialog import com.simplemobiletools.commons.dialogs.RenameDialog import com.simplemobiletools.commons.dialogs.RenameItemDialog import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.FAVORITES -import com.simplemobiletools.commons.helpers.VIEW_TYPE_LIST -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.views.FastScroller import com.simplemobiletools.commons.views.MyRecyclerView @@ -544,14 +541,16 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList, callback: out?.flush() - if (fileDocument?.getItemSize(true) == copiedSize && getDoesFilePathExist(destination)) { + if (fileDocument.getItemSize(true) == copiedSize && getDoesFilePathExist(destination)) { mediaDB.updateDeleted("$RECYCLE_BIN$source", System.currentTimeMillis(), source) pathsCnt-- } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt index 3ecb7fe75..099c80e3a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt @@ -398,17 +398,17 @@ fun Context.getFolderNameFromPath(path: String): String { } fun Context.loadImage(type: Int, path: String, target: MySquareImageView, horizontalScroll: Boolean, animateGifs: Boolean, cropThumbnails: Boolean, - roundCorners: Int, skipMemoryCacheAtPaths: ArrayList? = null) { + roundCorners: Int, lastModified: Long, skipMemoryCacheAtPaths: ArrayList? = null) { target.isHorizontalScrolling = horizontalScroll if (type == TYPE_IMAGES || type == TYPE_VIDEOS || type == TYPE_RAWS || type == TYPE_PORTRAITS) { if (type == TYPE_IMAGES && path.isPng()) { - loadPng(path, target, cropThumbnails, roundCorners, skipMemoryCacheAtPaths) + loadPng(path, target, cropThumbnails, roundCorners, lastModified, skipMemoryCacheAtPaths) } else { - loadJpg(path, target, cropThumbnails, roundCorners, skipMemoryCacheAtPaths) + loadJpg(path, target, cropThumbnails, roundCorners, lastModified, skipMemoryCacheAtPaths) } } else if (type == TYPE_GIFS) { if (!animateGifs) { - loadStaticGIF(path, target, cropThumbnails, roundCorners, skipMemoryCacheAtPaths) + loadStaticGIF(path, target, cropThumbnails, roundCorners, lastModified, skipMemoryCacheAtPaths) return } @@ -419,12 +419,12 @@ fun Context.loadImage(type: Int, path: String, target: MySquareImageView, horizo target.scaleType = if (cropThumbnails) ImageView.ScaleType.CENTER_CROP else ImageView.ScaleType.FIT_CENTER } catch (e: Exception) { - loadStaticGIF(path, target, cropThumbnails, roundCorners, skipMemoryCacheAtPaths) + loadStaticGIF(path, target, cropThumbnails, roundCorners, lastModified, skipMemoryCacheAtPaths) } catch (e: OutOfMemoryError) { - loadStaticGIF(path, target, cropThumbnails, roundCorners, skipMemoryCacheAtPaths) + loadStaticGIF(path, target, cropThumbnails, roundCorners, lastModified, skipMemoryCacheAtPaths) } } else if (type == TYPE_SVGS) { - loadSVG(path, target, cropThumbnails, roundCorners) + loadSVG(path, target, cropThumbnails, roundCorners, lastModified) } } @@ -449,9 +449,9 @@ fun Context.getPathLocation(path: String): Int { } } -fun Context.loadPng(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, skipMemoryCacheAtPaths: ArrayList? = null) { +fun Context.loadPng(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, lastModified: Long, skipMemoryCacheAtPaths: ArrayList? = null) { val options = RequestOptions() - .signature(path.getFileSignature()) + .signature(path.getFileSignature(lastModified)) .skipMemoryCache(skipMemoryCacheAtPaths?.contains(path) == true) .diskCacheStrategy(DiskCacheStrategy.RESOURCE) .priority(Priority.LOW) @@ -472,9 +472,9 @@ fun Context.loadPng(path: String, target: MySquareImageView, cropThumbnails: Boo builder.into(target) } -fun Context.loadJpg(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, skipMemoryCacheAtPaths: ArrayList? = null) { +fun Context.loadJpg(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, lastModified: Long, skipMemoryCacheAtPaths: ArrayList? = null) { val options = RequestOptions() - .signature(path.getFileSignature()) + .signature(path.getFileSignature(lastModified)) .skipMemoryCache(skipMemoryCacheAtPaths?.contains(path) == true) .priority(Priority.LOW) .diskCacheStrategy(DiskCacheStrategy.RESOURCE) @@ -494,9 +494,9 @@ fun Context.loadJpg(path: String, target: MySquareImageView, cropThumbnails: Boo builder.into(target) } -fun Context.loadStaticGIF(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, skipMemoryCacheAtPaths: ArrayList? = null) { +fun Context.loadStaticGIF(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, lastModified: Long, skipMemoryCacheAtPaths: ArrayList? = null) { val options = RequestOptions() - .signature(path.getFileSignature()) + .signature(path.getFileSignature(lastModified)) .skipMemoryCache(skipMemoryCacheAtPaths?.contains(path) == true) .priority(Priority.LOW) .diskCacheStrategy(DiskCacheStrategy.RESOURCE) @@ -516,10 +516,10 @@ fun Context.loadStaticGIF(path: String, target: MySquareImageView, cropThumbnail builder.into(target) } -fun Context.loadSVG(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int) { +fun Context.loadSVG(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, lastModified: Long) { target.scaleType = if (cropThumbnails) ImageView.ScaleType.CENTER_CROP else ImageView.ScaleType.FIT_CENTER - val options = RequestOptions().signature(path.getFileSignature()) + val options = RequestOptions().signature(path.getFileSignature(lastModified)) var builder = Glide.with(applicationContext) .`as`(PictureDrawable::class.java) .listener(SvgSoftwareLayerSetter()) From e86e6986c0b935d38f0de7bc90a82ac65911d29d Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 14 Jan 2021 11:03:24 +0100 Subject: [PATCH 25/81] get MediaStore last modified values in more cases, not just on R+ --- .../gallery/pro/activities/MainActivity.kt | 2 +- .../gallery/pro/asynctasks/GetMediaAsynctask.kt | 2 +- .../gallery/pro/extensions/Context.kt | 2 +- .../gallery/pro/helpers/MediaFetcher.kt | 16 ++++++---------- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt index 9234794c1..282f355a0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt @@ -936,7 +936,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { val getProperFileSize = config.directorySorting and SORT_BY_SIZE != 0 val favoritePaths = getFavoritePaths() val dirPathsToRemove = ArrayList() - val lastModifieds = if (isRPlus()) mLastMediaFetcher!!.getLastModifieds() else HashMap() + val lastModifieds = mLastMediaFetcher!!.getLastModifieds() val dateTakens = mLastMediaFetcher!!.getDateTakens() try { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/asynctasks/GetMediaAsynctask.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/asynctasks/GetMediaAsynctask.kt index 9817db535..07cfd49f1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/asynctasks/GetMediaAsynctask.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/asynctasks/GetMediaAsynctask.kt @@ -30,7 +30,7 @@ class GetMediaAsynctask(val context: Context, val mPath: String, val isPickImage val getProperFileSize = fileSorting and SORT_BY_SIZE != 0 val favoritePaths = context.getFavoritePaths() val getVideoDurations = context.config.showThumbnailVideoDuration - val lastModifieds = if (isRPlus() && getProperLastModified) mediaFetcher.getLastModifieds() else HashMap() + val lastModifieds = if (getProperLastModified) mediaFetcher.getLastModifieds() else HashMap() val dateTakens = if (getProperDateTaken) mediaFetcher.getDateTakens() else HashMap() val media = if (showAll) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt index 099c80e3a..5adeba44e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt @@ -931,7 +931,7 @@ fun Context.updateDirectoryPath(path: String) { val getProperFileSize = config.directorySorting and SORT_BY_SIZE != 0 - val lastModifieds = if (isRPlus() && getProperLastModified) mediaFetcher.getFolderLastModifieds(path) else HashMap() + val lastModifieds = if (getProperLastModified) mediaFetcher.getFolderLastModifieds(path) else HashMap() val dateTakens = mediaFetcher.getFolderDateTakens(path) val favoritePaths = getFavoritePaths() val curMedia = mediaFetcher.getFilesFrom(path, getImagesOnly, getVideosOnly, getProperDateTaken, getProperLastModified, getProperFileSize, diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt index 4c4daa180..00fda35a9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt @@ -321,15 +321,11 @@ class MediaFetcher(val context: Context) { } else { var lastModified = 0L if (getProperLastModified) { - if (isRPlus()) { - var newLastModified = lastModifieds.remove(path) - if (newLastModified == null) { - newLastModified = file.lastModified() - } - lastModified = newLastModified - } else { - lastModified = file.lastModified() + var newLastModified = lastModifieds.remove(path) + if (newLastModified == null) { + newLastModified = file.lastModified() } + lastModified = newLastModified } var dateTaken = lastModified @@ -590,7 +586,7 @@ class MediaFetcher(val context: Context) { return } - media.sortWith(Comparator { o1, o2 -> + media.sortWith { o1, o2 -> o1 as Medium o2 as Medium var result = when { @@ -617,7 +613,7 @@ class MediaFetcher(val context: Context) { result *= -1 } result - }) + } } fun groupMedia(media: ArrayList, path: String): ArrayList { From 4339a42eb301f52539241f2cf23e4e26cb93ed02 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 14 Jan 2021 11:23:42 +0100 Subject: [PATCH 26/81] fetch last modified more often, it is needed at cache --- .../gallery/pro/helpers/MediaFetcher.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt index 00fda35a9..867894f2b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt @@ -319,14 +319,16 @@ class MediaFetcher(val context: Context) { media.add(this) } } else { - var lastModified = 0L - if (getProperLastModified) { - var newLastModified = lastModifieds.remove(path) - if (newLastModified == null) { - newLastModified = file.lastModified() + var lastModified: Long + var newLastModified = lastModifieds.remove(path) + if (newLastModified == null) { + newLastModified = if (getProperLastModified) { + file.lastModified() + } else { + 0L } - lastModified = newLastModified } + lastModified = newLastModified var dateTaken = lastModified val videoDuration = if (getVideoDurations && isVideo) context.getDuration(path) ?: 0 else 0 From d45c4cf78404858c286b647f9ab856d3aaa77901 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 14 Jan 2021 17:08:20 +0100 Subject: [PATCH 27/81] update version to 6.18.2 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d54e516a8..55e64871e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "com.simplemobiletools.gallery.pro" minSdkVersion 21 targetSdkVersion 29 - versionCode 331 - versionName "6.18.1" + versionCode 332 + versionName "6.18.2" setProperty("archivesBaseName", "gallery-$versionCode") vectorDrawables.useSupportLibrary = true } From c783ae4b5de2f5af8b720ca979b331d5bec6a63d Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 14 Jan 2021 17:08:39 +0100 Subject: [PATCH 28/81] updating changelog --- CHANGELOG.md | 7 +++++++ fastlane/metadata/android/en-US/changelogs/332.txt | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/332.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f93b04f3..13f66ba5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Changelog ========== +Version 6.18.2 *(2021-01-14)* +---------------------------- + + * Improve the performance at scrolling media thumbnails + * Speed up cached folder fetching + * Some stability and translation improvements + Version 6.18.1 *(2021-01-03)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/332.txt b/fastlane/metadata/android/en-US/changelogs/332.txt new file mode 100644 index 000000000..1f7b2e834 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/332.txt @@ -0,0 +1,3 @@ + * Improve the performance at scrolling media thumbnails + * Speed up cached folder fetching + * Some stability and translation improvements From 60e0a68c1c4cf1398338cf4c4aceee2650130b71 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 14 Jan 2021 18:29:51 +0100 Subject: [PATCH 29/81] speed up fullscreen media showing a bit by providing files last modified too --- .../com/simplemobiletools/gallery/pro/extensions/Activity.kt | 2 +- .../simplemobiletools/gallery/pro/fragments/PhotoFragment.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt index 116c911aa..da42de22e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt @@ -598,7 +598,7 @@ fun Activity.fileRotatedSuccessfully(path: String, lastModified: Long) { updateLastModified(path, lastModified) } - Picasso.get().invalidate(path.getFileKey()) + Picasso.get().invalidate(path.getFileKey(lastModified)) // we cannot refresh a specific image in Glide Cache, so just clear it all val glide = Glide.get(applicationContext) glide.clearDiskCache() diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt index 8a2da324e..7114cfdcf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt @@ -410,7 +410,7 @@ class PhotoFragment : ViewPagerFragment() { private fun loadWithGlide(path: String, addZoomableView: Boolean) { val priority = if (mIsFragmentVisible) Priority.IMMEDIATE else Priority.NORMAL val options = RequestOptions() - .signature(getFilePathToShow().getFileSignature()) + .signature(getFilePathToShow().getFileSignature(mMedium.modified)) .format(DecodeFormat.PREFER_ARGB_8888) .priority(priority) .diskCacheStrategy(DiskCacheStrategy.RESOURCE) @@ -450,7 +450,7 @@ class PhotoFragment : ViewPagerFragment() { val picasso = Picasso.get() .load(pathToLoad) .centerInside() - .stableKey(mMedium.path.getFileKey()) + .stableKey(mMedium.path.getFileKey(mMedium.modified)) .resize(mScreenWidth, mScreenHeight) if (mCurrentRotationDegrees != 0) { From 440aea9eb810a73fadc5cefa2703bedf0b8f3d27 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 14 Jan 2021 18:50:32 +0100 Subject: [PATCH 30/81] use a more advanced cache key by using size too --- .../pro/activities/WidgetConfigureActivity.kt | 4 ++- .../gallery/pro/adapters/DirectoryAdapter.kt | 2 +- .../gallery/pro/adapters/MediaAdapter.kt | 5 +-- .../gallery/pro/extensions/Context.kt | 31 ++++++++++--------- .../gallery/pro/fragments/PhotoFragment.kt | 6 ++-- .../gallery/pro/models/Directory.kt | 3 ++ .../gallery/pro/models/Medium.kt | 13 +++++++- 7 files changed, 41 insertions(+), 23 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/WidgetConfigureActivity.kt index ac34d9f3c..4521e64a1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/WidgetConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/WidgetConfigureActivity.kt @@ -8,6 +8,7 @@ import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.widget.RelativeLayout import android.widget.RemoteViews +import com.bumptech.glide.signature.ObjectKey import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.ensureBackgroundThread @@ -167,7 +168,8 @@ class WidgetConfigureActivity : SimpleActivity() { val path = directoryDao.getDirectoryThumbnail(folderPath) if (path != null) { runOnUiThread { - loadJpg(path, config_image, config.cropThumbnails, ROUNDED_CORNERS_NONE, 0) + val signature = ObjectKey(System.currentTimeMillis().toString()) + loadJpg(path, config_image, config.cropThumbnails, ROUNDED_CORNERS_NONE, signature) } } } 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 08b042393..3aa01dc16 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 @@ -710,7 +710,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList ROUNDED_CORNERS_BIG } - activity.loadImage(thumbnailType, directory.tmb, dir_thumbnail, scrollHorizontally, animateGifs, cropThumbnails, roundedCorners, directory.modified) + activity.loadImage(thumbnailType, directory.tmb, dir_thumbnail, scrollHorizontally, animateGifs, cropThumbnails, roundedCorners, directory.getKey()) } dir_pin.beVisibleIf(pinnedFolders.contains(directory.path)) 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 ff0ffd1eb..7f3128cf3 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 @@ -540,8 +540,9 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList? = null) { + roundCorners: Int, signature: ObjectKey, skipMemoryCacheAtPaths: ArrayList? = null) { target.isHorizontalScrolling = horizontalScroll if (type == TYPE_IMAGES || type == TYPE_VIDEOS || type == TYPE_RAWS || type == TYPE_PORTRAITS) { if (type == TYPE_IMAGES && path.isPng()) { - loadPng(path, target, cropThumbnails, roundCorners, lastModified, skipMemoryCacheAtPaths) + loadPng(path, target, cropThumbnails, roundCorners, signature, skipMemoryCacheAtPaths) } else { - loadJpg(path, target, cropThumbnails, roundCorners, lastModified, skipMemoryCacheAtPaths) + loadJpg(path, target, cropThumbnails, roundCorners, signature, skipMemoryCacheAtPaths) } } else if (type == TYPE_GIFS) { if (!animateGifs) { - loadStaticGIF(path, target, cropThumbnails, roundCorners, lastModified, skipMemoryCacheAtPaths) + loadStaticGIF(path, target, cropThumbnails, roundCorners, signature, skipMemoryCacheAtPaths) return } @@ -419,12 +420,12 @@ fun Context.loadImage(type: Int, path: String, target: MySquareImageView, horizo target.scaleType = if (cropThumbnails) ImageView.ScaleType.CENTER_CROP else ImageView.ScaleType.FIT_CENTER } catch (e: Exception) { - loadStaticGIF(path, target, cropThumbnails, roundCorners, lastModified, skipMemoryCacheAtPaths) + loadStaticGIF(path, target, cropThumbnails, roundCorners, signature, skipMemoryCacheAtPaths) } catch (e: OutOfMemoryError) { - loadStaticGIF(path, target, cropThumbnails, roundCorners, lastModified, skipMemoryCacheAtPaths) + loadStaticGIF(path, target, cropThumbnails, roundCorners, signature, skipMemoryCacheAtPaths) } } else if (type == TYPE_SVGS) { - loadSVG(path, target, cropThumbnails, roundCorners, lastModified) + loadSVG(path, target, cropThumbnails, roundCorners, signature) } } @@ -449,9 +450,9 @@ fun Context.getPathLocation(path: String): Int { } } -fun Context.loadPng(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, lastModified: Long, skipMemoryCacheAtPaths: ArrayList? = null) { +fun Context.loadPng(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, signature: ObjectKey, skipMemoryCacheAtPaths: ArrayList? = null) { val options = RequestOptions() - .signature(path.getFileSignature(lastModified)) + .signature(signature) .skipMemoryCache(skipMemoryCacheAtPaths?.contains(path) == true) .diskCacheStrategy(DiskCacheStrategy.RESOURCE) .priority(Priority.LOW) @@ -472,9 +473,9 @@ fun Context.loadPng(path: String, target: MySquareImageView, cropThumbnails: Boo builder.into(target) } -fun Context.loadJpg(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, lastModified: Long, skipMemoryCacheAtPaths: ArrayList? = null) { +fun Context.loadJpg(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, signature: ObjectKey, skipMemoryCacheAtPaths: ArrayList? = null) { val options = RequestOptions() - .signature(path.getFileSignature(lastModified)) + .signature(signature) .skipMemoryCache(skipMemoryCacheAtPaths?.contains(path) == true) .priority(Priority.LOW) .diskCacheStrategy(DiskCacheStrategy.RESOURCE) @@ -494,9 +495,9 @@ fun Context.loadJpg(path: String, target: MySquareImageView, cropThumbnails: Boo builder.into(target) } -fun Context.loadStaticGIF(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, lastModified: Long, skipMemoryCacheAtPaths: ArrayList? = null) { +fun Context.loadStaticGIF(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, signature: ObjectKey, skipMemoryCacheAtPaths: ArrayList? = null) { val options = RequestOptions() - .signature(path.getFileSignature(lastModified)) + .signature(signature) .skipMemoryCache(skipMemoryCacheAtPaths?.contains(path) == true) .priority(Priority.LOW) .diskCacheStrategy(DiskCacheStrategy.RESOURCE) @@ -516,10 +517,10 @@ fun Context.loadStaticGIF(path: String, target: MySquareImageView, cropThumbnail builder.into(target) } -fun Context.loadSVG(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, lastModified: Long) { +fun Context.loadSVG(path: String, target: MySquareImageView, cropThumbnails: Boolean, roundCorners: Int, signature: ObjectKey) { target.scaleType = if (cropThumbnails) ImageView.ScaleType.CENTER_CROP else ImageView.ScaleType.FIT_CENTER - val options = RequestOptions().signature(path.getFileSignature(lastModified)) + val options = RequestOptions().signature(signature) var builder = Glide.with(applicationContext) .`as`(PictureDrawable::class.java) .listener(SvgSoftwareLayerSetter()) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt index 7114cfdcf..e80dd20dd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt @@ -410,7 +410,7 @@ class PhotoFragment : ViewPagerFragment() { private fun loadWithGlide(path: String, addZoomableView: Boolean) { val priority = if (mIsFragmentVisible) Priority.IMMEDIATE else Priority.NORMAL val options = RequestOptions() - .signature(getFilePathToShow().getFileSignature(mMedium.modified)) + .signature(mMedium.getKey()) .format(DecodeFormat.PREFER_ARGB_8888) .priority(priority) .diskCacheStrategy(DiskCacheStrategy.RESOURCE) @@ -450,7 +450,7 @@ class PhotoFragment : ViewPagerFragment() { val picasso = Picasso.get() .load(pathToLoad) .centerInside() - .stableKey(mMedium.path.getFileKey(mMedium.modified)) + .stableKey(mMedium.getSignature()) .resize(mScreenWidth, mScreenHeight) if (mCurrentRotationDegrees != 0) { @@ -617,7 +617,7 @@ class PhotoFragment : ViewPagerFragment() { val minTileDpi = if (showHighestQuality) -1 else getMinTileDpi() val bitmapDecoder = object : DecoderFactory { - override fun make() = MyGlideImageDecoder(rotation, mMedium.getSignature()) + override fun make() = MyGlideImageDecoder(rotation, mMedium.getKey()) } val regionDecoder = object : DecoderFactory { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Directory.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Directory.kt index 1be81a8bf..5f51940e6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Directory.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Directory.kt @@ -2,6 +2,7 @@ package com.simplemobiletools.gallery.pro.models import android.content.Context import androidx.room.* +import com.bumptech.glide.signature.ObjectKey import com.simplemobiletools.commons.extensions.formatDate import com.simplemobiletools.commons.extensions.formatSize import com.simplemobiletools.commons.helpers.* @@ -39,4 +40,6 @@ data class Directory( fun areFavorites() = path == FAVORITES fun isRecycleBin() = path == RECYCLE_BIN + + fun getKey() = ObjectKey("$path-$modified") } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Medium.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Medium.kt index d392bc1a1..0041b0e28 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Medium.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Medium.kt @@ -15,6 +15,7 @@ import com.simplemobiletools.commons.helpers.SORT_BY_NAME import com.simplemobiletools.commons.helpers.SORT_BY_PATH import com.simplemobiletools.commons.helpers.SORT_BY_SIZE import com.simplemobiletools.gallery.pro.helpers.* +import java.io.File import java.io.Serializable import java.util.* @@ -91,5 +92,15 @@ data class Medium( return calendar.timeInMillis.toString() } - fun getSignature() = ObjectKey("$path-$modified-$size") + fun getSignature(): String { + val lastModified = if (modified > 1) { + modified + } else { + File(path).lastModified() + } + + return "$path-$lastModified-$size" + } + + fun getKey() = ObjectKey(getSignature()) } From e241c2df42f0c32897cc5adc26d7d8c378ff74bd Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 14 Jan 2021 19:03:41 +0100 Subject: [PATCH 31/81] update version to 6.18.3 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 55e64871e..c07608bc0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "com.simplemobiletools.gallery.pro" minSdkVersion 21 targetSdkVersion 29 - versionCode 332 - versionName "6.18.2" + versionCode 334 + versionName "6.18.3" setProperty("archivesBaseName", "gallery-$versionCode") vectorDrawables.useSupportLibrary = true } From 8a13e32f84222340a5b4894ff66e88dff940cef8 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 14 Jan 2021 19:03:49 +0100 Subject: [PATCH 32/81] updating changelog --- CHANGELOG.md | 5 +++++ fastlane/metadata/android/en-US/changelogs/333.txt | 1 + 2 files changed, 6 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/333.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 13f66ba5f..a9c0c92bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========== +Version 6.18.3 *(2021-01-14)* +---------------------------- + + * Speed up fullscreen medium loading a bit too + Version 6.18.2 *(2021-01-14)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/333.txt b/fastlane/metadata/android/en-US/changelogs/333.txt new file mode 100644 index 000000000..6a22b376c --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/333.txt @@ -0,0 +1 @@ + * Speed up fullscreen medium loading a bit too From ce6e3315c02f6b79e3bc43afde1679fb5a0fa3b2 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 16 Jan 2021 23:47:02 +0100 Subject: [PATCH 33/81] animate column count changes --- .../gallery/pro/activities/MainActivity.kt | 6 +++--- .../gallery/pro/activities/MediaActivity.kt | 6 ++++-- .../simplemobiletools/gallery/pro/adapters/MediaAdapter.kt | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt index 282f355a0..622346dba 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt @@ -761,9 +761,9 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { private fun columnCountChanged() { invalidateOptionsMenu() - directories_grid.adapter?.notifyDataSetChanged() - getRecyclerAdapter()?.dirs?.apply { - measureRecyclerViewContent(this) + getRecyclerAdapter()?.apply { + notifyItemRangeChanged(0, dirs.size) + measureRecyclerViewContent(dirs) } } 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 31275b592..d136ee640 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 @@ -774,8 +774,10 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { private fun columnCountChanged() { invalidateOptionsMenu() - media_grid.adapter?.notifyDataSetChanged() - measureRecyclerViewContent(mMedia) + getMediaAdapter()?.apply { + notifyItemRangeChanged(0, media.size) + measureRecyclerViewContent(media) + } } private fun isSetWallpaperIntent() = intent.getBooleanExtra(SET_WALLPAPER_INTENT, false) 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 7f3128cf3..1e0306d42 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 @@ -35,7 +35,7 @@ import kotlinx.android.synthetic.main.photo_video_item_grid.view.* import kotlinx.android.synthetic.main.thumbnail_section.view.* import java.util.* -class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList, val listener: MediaOperationsListener?, val isAGetIntent: Boolean, +class MediaAdapter(activity: BaseSimpleActivity, var media: ArrayList, val listener: MediaOperationsListener?, val isAGetIntent: Boolean, val allowMultiplePicks: Boolean, val path: String, recyclerView: MyRecyclerView, fastScroller: FastScroller? = null, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) { From 560aedfb6e1cd7a6b215db9228d4f4f0ae1c0e3a Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 17 Jan 2021 10:31:22 +0100 Subject: [PATCH 34/81] allow clearing the app cache, related to #1504 --- app/build.gradle | 2 +- .../pro/activities/SettingsActivity.kt | 18 +++++++++++ app/src/main/res/layout/activity_settings.xml | 32 +++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index c07608bc0..c543a4927 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.32.25' + implementation 'com.simplemobiletools:commons:5.32.28' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' 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 84e089a88..274394aaa 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 @@ -90,6 +90,7 @@ class SettingsActivity : SimpleActivity() { setupEmptyRecycleBin() updateTextColors(settings_holder) setupSectionColors() + setupClearCache() setupExportSettings() setupImportSettings() invalidateOptionsMenu() @@ -624,6 +625,23 @@ class SettingsActivity : SimpleActivity() { } } + private fun setupClearCache() { + ensureBackgroundThread { + runOnUiThread { + settings_clear_cache_size.text = cacheDir.getProperSize(true).formatSize() + } + } + + settings_clear_cache_holder.setOnClickListener { + ensureBackgroundThread { + cacheDir.deleteRecursively() + runOnUiThread { + settings_clear_cache_size.text = cacheDir.getProperSize(true).formatSize() + } + } + } + } + private fun setupExportSettings() { settings_export_holder.setOnClickListener { val configItems = LinkedHashMap().apply { diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 399715167..b8bfda998 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1236,6 +1236,38 @@ android:textAllCaps="true" android:textSize="@dimen/smaller_text_size" /> + + + + + + + + Date: Sun, 17 Jan 2021 10:35:46 +0100 Subject: [PATCH 35/81] adding some missing bengali strings --- app/src/main/res/values-bn/strings.xml | 84 ++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 0c8918b33..87ee8609b 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -45,9 +45,13 @@ ফিল্টার পরিবর্তন করুন + This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden items\' option in Settings. Continue? বাদ দিন বাদ দেওয়া ফোল্ডারসমূহ বাদ দেওয়া ফোল্ডারগুলোর ব্যবস্থাপনা + This will exclude the selection together with its subfolders from Simple Gallery only. You can manage excluded folders in Settings. + Exclude a parent instead? + Excluding folders will make them together with their subfolders hidden just in Simple Gallery, they will still be visible in other applications.\n\nIf you want to hide them from other apps too, use the Hide function. সবগুলো সরান বাদ দেওয়া তালিকা থেকে সমস্ত ফোল্ডার সরাবেন? এটি ফোল্ডারগুলি মুছবে না। লুকানো ফোল্ডারগুলো @@ -58,6 +62,8 @@ অন্তর্ভুক্ত ফোল্ডার অন্তর্ভুক্ত ফোল্ডার ব্যবস্থাপনা করুন ফোল্ডার যোগ করুন + If you have some folders which contain media, but were not recognized by the app, you can add them manually here.\n\nAdding some items here will not exclude any other folder. + No media files have been found. You can solve it by adding the folders containing media files manually. আকার পরিবর্তন @@ -123,8 +129,12 @@ স্লাইডশো শেষ হয়েছে স্লাইডশোর জন্য কোন মিডিয়া পাওয়া যায়নি + + Group direct subfolders + একত্রিত করুন + Do not group files ফোল্ডার শেষ পরিবর্তন করা হয়েছে শেষ পরিবর্তন (দৈনিক) @@ -134,6 +144,7 @@ তোলার তারিখ (মাসিক) ফাইল টাইপ এক্সটেনশন + Please note that grouping and sorting are 2 independent fields উইজেটে দেখানো ফোল্ডার: @@ -141,12 +152,53 @@ স্বয়ংক্রিয়ভাবে ভিডিও চালান + Remember last video playback position + Toggle filename visibility + Loop videos + Animate GIFs at thumbnails + Max brightness when viewing fullscreen media + Crop thumbnails into squares + Show video durations + Rotate fullscreen media by সিস্টেম সেটিংস Device rotation অ্যাস্পেক্ট রেশিও + Black background at fullscreen media + Scroll thumbnails horizontally + Automatically hide system UI at fullscreen media + Delete empty folders after deleting their content + Allow controlling photo brightness with vertical gestures + Allow controlling video volume and brightness with vertical gestures + Show folder media count on the main view + Show extended details over fullscreen media + Manage extended details + Allow one finger zoom at fullscreen media + Allow instantly changing media by clicking on screen sides + Allow deep zooming images + Hide extended details when status bar is hidden + Show some action buttons at the bottom of the screen + Show the Recycle Bin at the folders screen + Deep zoomable images + Show images in the highest possible quality + Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture + Allow 1:1 zooming in with two double taps + Always open videos on a separate screen with new horizontal gestures + Show a notch if available + Allow rotating images with gestures + File loading priority গতি সমঝোতা + Avoid showing invalid files + Show image file types + Allow zooming videos with double tapping them + Folder thumbnail style + Show file count on a separate line + Show file count in brackets + Do not show file count + Limit long folder titles to 1 line বর্গ + Rounded corners থাম্বনেল @@ -272,6 +324,38 @@ পাইপেটেবল রঙ কাটুন + + How can I make Simple Gallery the default device gallery? + First you have to find the currently default gallery in the Apps section of your device settings, look for a button that says something like \"Open by default\", click on it, then select \"Clear defaults\". + The next time you will try opening an image or video you should see an app picker, where you can select Simple Gallery and make it the default app. + I locked the app with a password, but I forgot it. What can I do? + You can solve it in 2 ways. You can either reinstall the app, or find the app in your device settings and select \"Clear data\". It will reset all your settings, it will not remove any media files. + How can I make an album always appear at the top? + You can long press the desired album and select the Pin icon at the actions menu, that will pin it to the top. You can pin multiple folders too, pinned items will be sorted by the default sorting method. + How can I fast forward videos? + You can do it by double tapping the side of the screen, or tapping the current or max duration texts near the seekbar. If you enable opening videos on a separate screen in the app settings, you can use horizontal gestures too. + What is the difference between hiding and excluding a folder? + Exclude prevents displaying the folder only in Simple Gallery, while Hide works system-wise and it hides the folder from other galleries too. It works by creating an empty \".nomedia\" file in the given folder, which you can then remove with any file manager too. Note that some devices do not allow hiding folders like Camera, Screenshots and Downloads. + Why do folders with music cover art or stickers show up? + It can happen that you will see some unusual albums show up. You can easily exclude them by long pressing them and selecting Exclude. In the next dialog you can then select the parent folder, chances are it will prevent the other related albums showing up too. + A folder with images isn\'t showing up, or it doesn\'t show all items. What can I do? + That can have multiple reasons, but solving it is easy. Just go in Settings -> Manage Included Folders, select Plus and navigate to the required folder. + What if I want just a few particular folders visible? + Adding a folder at the Included Folders doesn\'t automatically exclude anything. What you can do is go in Settings -> Manage Excluded Folders, exclude the root folder \"/\", then add the desired folders at Settings -> Manage Included Folders. + That will make only the selected folders visible, as both excluding and including are recursive and if a folder is both excluded and included, it will show up. + Can I crop images with this app? + Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. + Can I somehow group media file thumbnails? + Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". + I see some color banding on the images. How can I improve the quality? + The current solution for displaying images works fine in the vast majority of cases, but if you want even better image quality, you can enable the \"Show images in the highest possible quality\" at the app settings, in the \"Deep zoomable images\" section. + I have hidden a file/folder. How can I unhide it? + You can either press the \"Temporarily show hidden items\" menu item at the main screen, or toggle \"Show hidden items\" in the app settings to see the hidden item. If you want to unhide it, just long press it and select \"Unhide\". Folders are hidden by adding a hidden \".nomedia\" file into them, you can delete the file with any file manager too. + Why does the app take up so much space? + App cache can take up to 250MB, it ensures quicker image loading. If the app is taking up even more space, it is most likely caused by you having items in the Recycle Bin. Those files count to the app size. You can clear the Recycle bin by opening it and deleting all files, or from the app settings. Every file in the Bin is deleted automatically after 30 days. + সিম্পল গ্যালারি প্রো - ছবি ম্যানেজার ও সম্পাদক From 42d3f18168331c245b3b684bc4124ef08c749446 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 17 Jan 2021 10:42:20 +0100 Subject: [PATCH 36/81] removing the vertical gesture related settings --- .../pro/activities/SettingsActivity.kt | 18 -------- .../gallery/pro/helpers/Config.kt | 2 +- app/src/main/res/layout/activity_settings.xml | 46 ------------------- 3 files changed, 1 insertion(+), 65 deletions(-) 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 274394aaa..8711fc237 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,8 +64,6 @@ class SettingsActivity : SimpleActivity() { setupAppPasswordProtection() setupFileDeletionPasswordProtection() setupDeleteEmptyFolders() - setupAllowPhotoGestures() - setupAllowVideoGestures() setupAllowDownGesture() setupAllowRotatingWithGestures() setupShowNotch() @@ -375,22 +373,6 @@ class SettingsActivity : SimpleActivity() { } } - private fun setupAllowPhotoGestures() { - settings_allow_photo_gestures.isChecked = config.allowPhotoGestures - settings_allow_photo_gestures_holder.setOnClickListener { - settings_allow_photo_gestures.toggle() - config.allowPhotoGestures = settings_allow_photo_gestures.isChecked - } - } - - private fun setupAllowVideoGestures() { - settings_allow_video_gestures.isChecked = config.allowVideoGestures - settings_allow_video_gestures_holder.setOnClickListener { - settings_allow_video_gestures.toggle() - config.allowVideoGestures = settings_allow_video_gestures.isChecked - } - } - private fun setupAllowDownGesture() { settings_allow_down_gesture.isChecked = config.allowDownGesture settings_allow_down_gesture_holder.setOnClickListener { 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 9f0e82bfd..2384f7298 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 @@ -269,7 +269,7 @@ class Config(context: Context) : BaseConfig(context) { set(deleteEmptyFolders) = prefs.edit().putBoolean(DELETE_EMPTY_FOLDERS, deleteEmptyFolders).apply() var allowPhotoGestures: Boolean - get() = prefs.getBoolean(ALLOW_PHOTO_GESTURES, false) + get() = prefs.getBoolean(ALLOW_PHOTO_GESTURES, true) set(allowPhotoGestures) = prefs.edit().putBoolean(ALLOW_PHOTO_GESTURES, allowPhotoGestures).apply() var allowVideoGestures: Boolean diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index b8bfda998..052fec177 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -310,29 +310,6 @@ - - - - - - - - - - - - Date: Sun, 17 Jan 2021 10:43:13 +0100 Subject: [PATCH 37/81] adding a new string for file thumbnail settings --- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-az/strings.xml | 1 + app/src/main/res/values-bn/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-ne/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-vi/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 + 38 files changed, 38 insertions(+) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 4252008f4..096c4918c 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -193,6 +193,7 @@ إظهار أنواع ملفات الصور Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 5be3581d8..708cf2e4d 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -193,6 +193,7 @@ Show image file types Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 87ee8609b..1a4f93b56 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -193,6 +193,7 @@ Show image file types Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 32a3fa3a1..62b86e30d 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -193,6 +193,7 @@ Mostra els tipus de fitxers d\’imatges Permet fer zoom als vídeos amb dos cops Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index f2c196cee..2de315dc3 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -193,6 +193,7 @@ Zobrazit typ obrázkových souborů Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 227bd429c..13ee2ec84 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -193,6 +193,7 @@ Vis billeders filtyper Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 53c0ef761..ddf91849b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -193,6 +193,7 @@ Bilddateitypen anzeigen Erlaube Zoomen in Videos mit doppeltem Antippen Ordner-Miniaturbildstil + File thumbnail style Zeige Anzahl der Dateien in einer seperaten Zeile an Anzahl der Dateien in Klammern anzeigen Anzahl der Dateien nicht anzeigen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 230ffea25..aff3f846c 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -193,6 +193,7 @@ Εμφάνιση τύπου αρχείου εικόνας Επιτρέπει την μεγέθυνση βίντεο με διπλό πάτημα Στυλ μικρογραφίας φακέλου + File thumbnail style Εμφάνιση πλήθους αρχείων σε ξεχωριστή γραμμή Εμφάνιση πλήθους αρχείων σε αγκύλες Χωρίς εμφάνιση μέτρησης αρχείων diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3d47eab60..d4e6ddb77 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -193,6 +193,7 @@ Mostrar tipos de archivo de imagen Permitir hacer zoom en videos con doble toque Estilo de las miniaturas de las carpetas + File thumbnail style Mostrar el recuento de archivos en una línea separada Mostrar el recuento de archivos entre paréntesis No mostrar el recuento de archivos diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 836a4c0c0..54f4747d3 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -193,6 +193,7 @@ Show image file types Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1cf898944..1cc187a97 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -193,6 +193,7 @@ Afficher les types d\'image Zoomer les vidéos par un double appui Style des miniatures + File thumbnail style Afficher le nombre de fichiers sur une autre ligne Afficher le nombre de fichiers entre parenthèses Ne pas afficher le nombre de fichiers diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 8dede9d61..f59e2f596 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -193,6 +193,7 @@ Mostrar tipos de ficheiros de imaxe Permitir zoom nos vídeos co dobre-toque sobre eles Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index ba760dffe..b2bcf029b 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -193,6 +193,7 @@ Show image file types Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index a9bf048fe..7114788c2 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -193,6 +193,7 @@ Mutassa a kép fájl típusokat A videók nagyításának engedélyezése dupla koppintással Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 813b690a4..331d0fdb1 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -193,6 +193,7 @@ Tampilkan tipe berkas gambar Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index de85d8122..a2c03df58 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -193,6 +193,7 @@ Tampilkan tipe berkas gambar Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 17beb2909..2660f1cca 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -193,6 +193,7 @@ Mostra i tipi di file immagine Permetti l\'ingrandimento dei video con un doppio tocco Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f0b3b3f33..5744ec1fc 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -193,6 +193,7 @@ 画像ファイルの種類を表示 ダブルタップで動画ズームを設定 フォルダサムネイルのスタイル + File thumbnail style ファイル数を別の行に表示 ファイル数を括弧内に表示 ファイル数を非表示 diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index f784d15dd..35930f8d4 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -193,6 +193,7 @@ 사진 파일 종류 표시 Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index fcc53f487..dff0e1b26 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -193,6 +193,7 @@ Show image file types Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 42acc8c52..7cd06ed05 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -193,6 +193,7 @@ Vis bildefiltyper Tillat zooming av videoer ved å dobbelttrykke dem Minibildestil for mapper + File thumbnail style Vis antall filer på en separat linje Vis antall filer i parentes Ikke vis antall filer diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index a3f89bca0..ce986b686 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -193,6 +193,7 @@ तस्बिरको फाईल किसिम देखाउनुहोस Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c966b65b8..91d10896e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -193,6 +193,7 @@ Bestandstypen tonen Bij video\'s inzoomen met dubbelklikken Stijl voor mapthumbnails + File thumbnail style Aantal bestanden op aparte regel tonen Aantal bestanden tussen rechte haken tonen Aantal bestanden niet tonen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b7fe9a05e..72c1422b3 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -193,6 +193,7 @@ Pokazuj rozszerzenia zdjęć Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index c63e3e126..52053a018 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -193,6 +193,7 @@ Exibir tipos de arquivo de imagem Permitir zoom de vídeos com um toque duplo neles Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index f5484f587..419583cc1 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -193,6 +193,7 @@ Mostrar o tipo de imagem Permitir ampliação de vídeos com dois toques Estilo de miniatura das pastas + File thumbnail style Mostrar número de ficherios em linha distinta Mostrar número de ficheiros em chavetas Não mostrar número de ficheiros diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 76d2905e1..f3014e8da 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -193,6 +193,7 @@ Показывать типы файлов изображений Масштабировать видео двойным нажатием по нему Вид миниатюр папок + File thumbnail style Показывать количество файлов отдельной строкой Показывать количество файлов в скобках Не показывать количество файлов diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 25278cbc6..229ca622b 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -193,6 +193,7 @@ Zobraziť typ obrázkových súborov Povoliť približovanie videí dvojitým ťuknutím Štýl miniatúr priečinkov + Štýl miniatúr súborov Zobraziť počet súborov na samostatnom riadku Zobraziť počet súborov v zátvorkách Nezobrazovať počet súborov diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 3a9355789..f2fa89949 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -193,6 +193,7 @@ Show image file types Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index deec05678..10937b16c 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -193,6 +193,7 @@ Show image file types Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 9715dd2a9..0d68f0f8e 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -193,6 +193,7 @@ Show image file types Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 026a9b136..c2897b538 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -193,6 +193,7 @@ Resim dosyası türlerini göster Videoları iki kez dokunarak yakınlaştırmaya izin ver Klasör küçük resim stili + File thumbnail style Dosya sayısını ayrı bir satırda göster Dosya sayısını parantez içinde göster Dosya sayısını gösterme diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index b8d08bb17..a6260efa4 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -193,6 +193,7 @@ Показувати типи файлів зображень Масштабувати відео подвійним натисканням по ньому Вид мініатюр тек + File thumbnail style Показувати кількість файлів в окремому рядку Показувати кількість файлів у дужках Не показувати кількість файлів diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index fb42e97c3..f68d2c01e 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -193,6 +193,7 @@ Hiển thị các loại tệp hình ảnh Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index effbd1bee..b5eb8192f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -193,6 +193,7 @@ 显示图片文件类型 允许双击来放大视频 文件夹缩略图样式 + File thumbnail style 在单独一行中显示计数 在括号中显示计数 不显示计数 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 0e723cc72..2bc0547c3 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -200,6 +200,7 @@ Show image file types Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ec87ab5af..7a78c6696 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -193,6 +193,7 @@ 顯示圖片檔案類型 Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5c5c48d5f..65949caf5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -193,6 +193,7 @@ Show image file types Allow zooming videos with double tapping them Folder thumbnail style + File thumbnail style Show file count on a separate line Show file count in brackets Do not show file count From fc5e996103de7c994ed75ed9615ee5071e3db0fd Mon Sep 17 00:00:00 2001 From: AlbatorV Date: Sun, 17 Jan 2021 10:59:38 +0100 Subject: [PATCH 38/81] Update strings.xml --- app/src/main/res/values-fr/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1cc187a97..e95abd274 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -192,8 +192,8 @@ Éviter l\'affichage de fichiers invalides Afficher les types d\'image Zoomer les vidéos par un double appui - Style des miniatures - File thumbnail style + Style des miniatures des dossiers + Style des miniatures des fichiers Afficher le nombre de fichiers sur une autre ligne Afficher le nombre de fichiers entre parenthèses Ne pas afficher le nombre de fichiers From 2d0a4c6250eb9578f51dea9746823a46a7080447 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 17 Jan 2021 11:50:34 +0100 Subject: [PATCH 39/81] fix #2043, replace the old ExifInterface with androidx ExifInterface --- app/build.gradle | 2 +- .../gallery/pro/activities/EditActivity.kt | 2 +- .../gallery/pro/activities/ViewPagerActivity.kt | 3 +-- .../simplemobiletools/gallery/pro/extensions/Activity.kt | 7 ++----- .../gallery/pro/extensions/ExifInterface.kt | 2 +- .../gallery/pro/fragments/PhotoFragment.kt | 4 ++-- .../gallery/pro/fragments/ViewPagerFragment.kt | 2 +- .../gallery/pro/activities/NewPhotoEditActivity.kt | 2 +- .../gallery/pro/activities/NewVideoEditActivity.kt | 2 +- 9 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c543a4927..35498c56b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.32.28' + implementation 'com.simplemobiletools:commons:5.32.29' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' 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 853264d71..26cea909e 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 @@ -7,7 +7,6 @@ import android.graphics.Bitmap import android.graphics.Bitmap.CompressFormat import android.graphics.Color import android.graphics.Point -import android.media.ExifInterface import android.net.Uri import android.os.Build import android.os.Bundle @@ -16,6 +15,7 @@ import android.provider.MediaStore import android.view.Menu import android.view.MenuItem import android.widget.RelativeLayout +import androidx.exifinterface.media.ExifInterface import androidx.recyclerview.widget.LinearLayoutManager import com.bumptech.glide.Glide import com.bumptech.glide.load.DataSource diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt index 93380634b..264133ecd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt @@ -15,19 +15,18 @@ import android.graphics.Bitmap import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.graphics.drawable.Icon -import android.media.ExifInterface import android.net.Uri import android.os.Build import android.os.Bundle import android.os.Handler import android.provider.MediaStore.Images -import android.text.Html import android.view.Menu import android.view.MenuItem import android.view.View import android.view.WindowManager import android.view.animation.DecelerateInterpolator import android.widget.Toast +import androidx.exifinterface.media.ExifInterface import androidx.print.PrintHelper import androidx.viewpager.widget.ViewPager import com.bumptech.glide.Glide diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt index da42de22e..389f2fb7a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt @@ -10,7 +10,6 @@ import android.graphics.BitmapFactory import android.graphics.Matrix import android.graphics.drawable.Drawable import android.graphics.drawable.LayerDrawable -import android.media.ExifInterface import android.net.Uri import android.os.Build import android.provider.MediaStore @@ -19,6 +18,7 @@ import android.provider.MediaStore.Images import android.util.DisplayMetrics import android.view.View import androidx.appcompat.app.AppCompatActivity +import androidx.exifinterface.media.ExifInterface import com.bumptech.glide.Glide import com.bumptech.glide.load.DecodeFormat import com.bumptech.glide.load.engine.DiskCacheStrategy @@ -36,10 +36,7 @@ import com.simplemobiletools.gallery.pro.dialogs.PickDirectoryDialog import com.simplemobiletools.gallery.pro.helpers.RECYCLE_BIN import com.simplemobiletools.gallery.pro.models.DateTaken import com.squareup.picasso.Picasso -import java.io.File -import java.io.FileOutputStream -import java.io.InputStream -import java.io.OutputStream +import java.io.* import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/ExifInterface.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/ExifInterface.kt index 6c1ba0b0b..26d923fc0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/ExifInterface.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/ExifInterface.kt @@ -1,6 +1,6 @@ package com.simplemobiletools.gallery.pro.extensions -import android.media.ExifInterface +import androidx.exifinterface.media.ExifInterface import java.lang.reflect.Field import java.lang.reflect.Modifier diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt index e80dd20dd..4e22c5b14 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt @@ -9,7 +9,6 @@ import android.graphics.Matrix import android.graphics.drawable.ColorDrawable import android.graphics.drawable.Drawable import android.graphics.drawable.PictureDrawable -import android.media.ExifInterface.* import android.net.Uri import android.os.Build import android.os.Bundle @@ -20,6 +19,7 @@ import android.view.MotionEvent import android.view.View import android.view.ViewGroup import android.widget.RelativeLayout +import androidx.exifinterface.media.ExifInterface.* import com.alexvasilkov.gestures.GestureController import com.alexvasilkov.gestures.State import com.bumptech.glide.Glide @@ -715,7 +715,7 @@ class PhotoFragment : ViewPagerFragment() { val tag = exif.getTag(ExifInterface.TAG_ORIENTATION) tag?.getValueAsInt(defaultOrientation) ?: defaultOrientation } else { - val exif = android.media.ExifInterface(path) + val exif = androidx.exifinterface.media.ExifInterface(path) exif.getAttributeInt(TAG_ORIENTATION, defaultOrientation) } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/ViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/ViewPagerFragment.kt index 535aad447..66fbd8df5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/ViewPagerFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/ViewPagerFragment.kt @@ -1,10 +1,10 @@ package com.simplemobiletools.gallery.pro.fragments -import android.media.ExifInterface import android.provider.MediaStore import android.provider.MediaStore.Files import android.provider.MediaStore.Images import android.view.MotionEvent +import androidx.exifinterface.media.ExifInterface import androidx.fragment.app.Fragment import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.gallery.pro.extensions.config diff --git a/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewPhotoEditActivity.kt b/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewPhotoEditActivity.kt index 00e9ed203..f8c132069 100644 --- a/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewPhotoEditActivity.kt +++ b/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewPhotoEditActivity.kt @@ -3,7 +3,7 @@ package com.simplemobiletools.gallery.pro.activities import android.annotation.TargetApi import android.app.Activity import android.content.Intent -import android.media.ExifInterface +import androidx.exifinterface.media.ExifInterface import android.net.Uri import android.os.Build import android.os.Bundle diff --git a/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewVideoEditActivity.kt b/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewVideoEditActivity.kt index 017e0b7fc..b3f199880 100644 --- a/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewVideoEditActivity.kt +++ b/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewVideoEditActivity.kt @@ -3,11 +3,11 @@ package com.simplemobiletools.gallery.pro.activities import android.annotation.TargetApi import android.app.Activity import android.content.Intent -import android.media.ExifInterface import android.net.Uri import android.os.Build import android.os.Bundle import android.provider.MediaStore +import androidx.exifinterface.media.ExifInterface import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE import com.simplemobiletools.commons.helpers.REAL_FILE_PATH From a4b99e207727896efaf651eac18566a9f0b9628c Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 17 Jan 2021 11:59:04 +0100 Subject: [PATCH 40/81] updating the photo/video editor to 8.0.8 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b8c5b9336..315b6f16f 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { classpath 'com.android.tools.build:gradle:4.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" if (is_proprietary) { - classpath 'ly.img.android.pesdk:plugin:8.0.7' + classpath 'ly.img.android.pesdk:plugin:8.0.8' } // NOTE: Do not place your application dependencies here; they belong From ac0c7b2334c2f73a92ef610fc391c19b05174780 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 17 Jan 2021 12:24:30 +0100 Subject: [PATCH 41/81] adding one more new string for toggling increased spacing between file thumbnails --- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-az/strings.xml | 1 + app/src/main/res/values-bn/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-ne/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-vi/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 + 38 files changed, 38 insertions(+) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 096c4918c..cbef777a8 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 708cf2e4d..d19376769 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 1a4f93b56..fd9f61b7a 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 62b86e30d..a0716366d 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -194,6 +194,7 @@ Permet fer zoom als vídeos amb dos cops Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 2de315dc3..7d24e6e0f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 13ee2ec84..965389064 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ddf91849b..7a4f4338e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -194,6 +194,7 @@ Erlaube Zoomen in Videos mit doppeltem Antippen Ordner-Miniaturbildstil File thumbnail style + Increased spacing Zeige Anzahl der Dateien in einer seperaten Zeile an Anzahl der Dateien in Klammern anzeigen Anzahl der Dateien nicht anzeigen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index aff3f846c..4e8482a47 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -194,6 +194,7 @@ Επιτρέπει την μεγέθυνση βίντεο με διπλό πάτημα Στυλ μικρογραφίας φακέλου File thumbnail style + Increased spacing Εμφάνιση πλήθους αρχείων σε ξεχωριστή γραμμή Εμφάνιση πλήθους αρχείων σε αγκύλες Χωρίς εμφάνιση μέτρησης αρχείων diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d4e6ddb77..87a168ca3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -194,6 +194,7 @@ Permitir hacer zoom en videos con doble toque Estilo de las miniaturas de las carpetas File thumbnail style + Increased spacing Mostrar el recuento de archivos en una línea separada Mostrar el recuento de archivos entre paréntesis No mostrar el recuento de archivos diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 54f4747d3..c3380d986 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e95abd274..3f79b6761 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -194,6 +194,7 @@ Zoomer les vidéos par un double appui Style des miniatures des dossiers Style des miniatures des fichiers + Increased spacing Afficher le nombre de fichiers sur une autre ligne Afficher le nombre de fichiers entre parenthèses Ne pas afficher le nombre de fichiers diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index f59e2f596..fc5934537 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -194,6 +194,7 @@ Permitir zoom nos vídeos co dobre-toque sobre eles Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index b2bcf029b..9fed01aa6 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 7114788c2..146a122b9 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -194,6 +194,7 @@ A videók nagyításának engedélyezése dupla koppintással Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 331d0fdb1..2cd51eff4 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index a2c03df58..16d606edf 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 2660f1cca..ea38da295 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -194,6 +194,7 @@ Permetti l\'ingrandimento dei video con un doppio tocco Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 5744ec1fc..d357cb117 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -194,6 +194,7 @@ ダブルタップで動画ズームを設定 フォルダサムネイルのスタイル File thumbnail style + Increased spacing ファイル数を別の行に表示 ファイル数を括弧内に表示 ファイル数を非表示 diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 35930f8d4..962712b16 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index dff0e1b26..d61a37cfd 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 7cd06ed05..38c664a81 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -194,6 +194,7 @@ Tillat zooming av videoer ved å dobbelttrykke dem Minibildestil for mapper File thumbnail style + Increased spacing Vis antall filer på en separat linje Vis antall filer i parentes Ikke vis antall filer diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index ce986b686..0bbbcee8d 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 91d10896e..ed9f599e3 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -194,6 +194,7 @@ Bij video\'s inzoomen met dubbelklikken Stijl voor mapthumbnails File thumbnail style + Increased spacing Aantal bestanden op aparte regel tonen Aantal bestanden tussen rechte haken tonen Aantal bestanden niet tonen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 72c1422b3..c94196d7f 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 52053a018..775767fc5 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -194,6 +194,7 @@ Permitir zoom de vídeos com um toque duplo neles Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 419583cc1..e583bddbb 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -194,6 +194,7 @@ Permitir ampliação de vídeos com dois toques Estilo de miniatura das pastas File thumbnail style + Increased spacing Mostrar número de ficherios em linha distinta Mostrar número de ficheiros em chavetas Não mostrar número de ficheiros diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f3014e8da..6cdcf7014 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -194,6 +194,7 @@ Масштабировать видео двойным нажатием по нему Вид миниатюр папок File thumbnail style + Increased spacing Показывать количество файлов отдельной строкой Показывать количество файлов в скобках Не показывать количество файлов diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 229ca622b..39ff5dd3e 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -194,6 +194,7 @@ Povoliť približovanie videí dvojitým ťuknutím Štýl miniatúr priečinkov Štýl miniatúr súborov + Zväčšené medzery Zobraziť počet súborov na samostatnom riadku Zobraziť počet súborov v zátvorkách Nezobrazovať počet súborov diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index f2fa89949..1b220f2bf 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 10937b16c..49b0620fa 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0d68f0f8e..252379f9e 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c2897b538..59a069581 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -194,6 +194,7 @@ Videoları iki kez dokunarak yakınlaştırmaya izin ver Klasör küçük resim stili File thumbnail style + Increased spacing Dosya sayısını ayrı bir satırda göster Dosya sayısını parantez içinde göster Dosya sayısını gösterme diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a6260efa4..ba9242d54 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -194,6 +194,7 @@ Масштабувати відео подвійним натисканням по ньому Вид мініатюр тек File thumbnail style + Increased spacing Показувати кількість файлів в окремому рядку Показувати кількість файлів у дужках Не показувати кількість файлів diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index f68d2c01e..ff7a330f8 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index b5eb8192f..284e60542 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -194,6 +194,7 @@ 允许双击来放大视频 文件夹缩略图样式 File thumbnail style + Increased spacing 在单独一行中显示计数 在括号中显示计数 不显示计数 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 2bc0547c3..a9c5a02d9 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -201,6 +201,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 7a78c6696..dfe0eb1bd 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 65949caf5..f96783cf1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -194,6 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style + Increased spacing Show file count on a separate line Show file count in brackets Do not show file count From 509c2d4348ede00dfc73f6a7b282672c693c06ef Mon Sep 17 00:00:00 2001 From: Guillaume Date: Sun, 17 Jan 2021 13:15:02 +0100 Subject: [PATCH 42/81] Dutch --- app/src/main/res/values-nl/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ed9f599e3..c34c52227 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -192,9 +192,9 @@ Ongeldige bestanden verbergen Bestandstypen tonen Bij video\'s inzoomen met dubbelklikken - Stijl voor mapthumbnails - File thumbnail style - Increased spacing + Stijl voor thumbnails mappen + Stijl voor thumbnails bestanden + Afstand vergroten Aantal bestanden op aparte regel tonen Aantal bestanden tussen rechte haken tonen Aantal bestanden niet tonen From 6af70206bfcb175d084f4bf4ac2877b2930c948c Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 17 Jan 2021 17:07:38 +0100 Subject: [PATCH 43/81] update commons to 5.33.0 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 35498c56b..1de013668 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.32.29' + implementation 'com.simplemobiletools:commons:5.33.0' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' From 469415e93ce059150bf3bcdfcdb6a20f2a110f93 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 17 Jan 2021 18:35:32 +0100 Subject: [PATCH 44/81] adding a settings button for changing file thumbnail style --- app/src/main/res/layout/activity_settings.xml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 052fec177..b54160fa3 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -412,6 +412,28 @@ + + + + + + Date: Sun, 17 Jan 2021 18:36:05 +0100 Subject: [PATCH 45/81] renaming thumbnail style dialog to folder thumbnail style --- .../pro/activities/SettingsActivity.kt | 11 ++++- ...kt => ChangeFolderThumbnailStyleDialog.kt} | 46 +++++++++---------- ... dialog_change_folder_thumbnail_style.xml} | 18 ++++---- 3 files changed, 41 insertions(+), 34 deletions(-) rename app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/{ChangeThumbnailStyleDialog.kt => ChangeFolderThumbnailStyleDialog.kt} (70%) rename app/src/main/res/layout/{dialog_change_thumbnail_style.xml => dialog_change_folder_thumbnail_style.xml} (86%) 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 8711fc237..4e7bff317 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 @@ -12,7 +12,7 @@ import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.gallery.pro.R -import com.simplemobiletools.gallery.pro.dialogs.ChangeThumbnailStyleDialog +import com.simplemobiletools.gallery.pro.dialogs.ChangeFolderThumbnailStyleDialog import com.simplemobiletools.gallery.pro.dialogs.ManageBottomActionsDialog import com.simplemobiletools.gallery.pro.dialogs.ManageExtendedDetailsDialog import com.simplemobiletools.gallery.pro.extensions.config @@ -70,6 +70,7 @@ class SettingsActivity : SimpleActivity() { setupBottomActions() setupThumbnailVideoDuration() setupThumbnailFileTypes() + setupFileThumbnailStyle() setupFolderThumbnailStyle() setupKeepLastModified() setupEnablePullToRefresh() @@ -398,10 +399,16 @@ class SettingsActivity : SimpleActivity() { } } + private fun setupFileThumbnailStyle() { + settings_file_thumbnail_style_holder.setOnClickListener { + + } + } + private fun setupFolderThumbnailStyle() { settings_folder_thumbnail_style.text = getFolderStyleText() settings_folder_thumbnail_style_holder.setOnClickListener { - ChangeThumbnailStyleDialog(this) { + ChangeFolderThumbnailStyleDialog(this) { settings_folder_thumbnail_style.text = getFolderStyleText() } } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFolderThumbnailStyleDialog.kt similarity index 70% rename from app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFolderThumbnailStyleDialog.kt index 10e5129da..b41b4b23e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFolderThumbnailStyleDialog.kt @@ -15,16 +15,16 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.gallery.pro.R import com.simplemobiletools.gallery.pro.extensions.config import com.simplemobiletools.gallery.pro.helpers.* -import kotlinx.android.synthetic.main.dialog_change_thumbnail_style.view.* +import kotlinx.android.synthetic.main.dialog_change_folder_thumbnail_style.view.* import kotlinx.android.synthetic.main.directory_item_grid_square.view.* -class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity, val callback: () -> Unit) : DialogInterface.OnClickListener { +class ChangeFolderThumbnailStyleDialog(val activity: BaseSimpleActivity, val callback: () -> Unit) : DialogInterface.OnClickListener { private var config = activity.config private var view: View init { - view = activity.layoutInflater.inflate(R.layout.dialog_change_thumbnail_style, null).apply { - dialog_limit_title.isChecked = config.limitFolderTitle + view = activity.layoutInflater.inflate(R.layout.dialog_change_folder_thumbnail_style, null).apply { + dialog_folder_limit_title.isChecked = config.limitFolderTitle } AlertDialog.Builder(activity) @@ -40,29 +40,29 @@ class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity, val callback: } private fun setupStyle() { - val styleRadio = view.dialog_radio_style + val styleRadio = view.dialog_radio_folder_style styleRadio.setOnCheckedChangeListener { group, checkedId -> updateSample() } val styleBtn = when (config.folderStyle) { - FOLDER_STYLE_SQUARE -> styleRadio.dialog_radio_square - else -> styleRadio.dialog_radio_rounded_corners + FOLDER_STYLE_SQUARE -> styleRadio.dialog_radio_folder_square + else -> styleRadio.dialog_radio_folder_rounded_corners } styleBtn.isChecked = true } private fun setupMediaCount() { - val countRadio = view.dialog_radio_count_holder + val countRadio = view.dialog_radio_folder_count_holder countRadio.setOnCheckedChangeListener { group, checkedId -> updateSample() } val countBtn = when (config.showFolderMediaCount) { - FOLDER_MEDIA_CNT_LINE -> countRadio.dialog_radio_count_line - FOLDER_MEDIA_CNT_BRACKETS -> countRadio.dialog_radio_count_brackets - else -> countRadio.dialog_radio_count_none + FOLDER_MEDIA_CNT_LINE -> countRadio.dialog_radio_folder_count_line + FOLDER_MEDIA_CNT_BRACKETS -> countRadio.dialog_radio_folder_count_brackets + else -> countRadio.dialog_radio_folder_count_none } countBtn.isChecked = true @@ -72,23 +72,23 @@ class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity, val callback: val photoCount = 36 val folderName = "Camera" view.apply { - val useRoundedCornersLayout = dialog_radio_style.checkedRadioButtonId == R.id.dialog_radio_rounded_corners - dialog_sample_holder.removeAllViews() + val useRoundedCornersLayout = dialog_radio_folder_style.checkedRadioButtonId == R.id.dialog_radio_folder_rounded_corners + dialog_folder_sample_holder.removeAllViews() val layout = if (useRoundedCornersLayout) R.layout.directory_item_grid_rounded_corners else R.layout.directory_item_grid_square val sampleView = activity.layoutInflater.inflate(layout, null) - dialog_sample_holder.addView(sampleView) + dialog_folder_sample_holder.addView(sampleView) sampleView.layoutParams.width = activity.resources.getDimension(R.dimen.sample_thumbnail_size).toInt() (sampleView.layoutParams as RelativeLayout.LayoutParams).addRule(RelativeLayout.CENTER_HORIZONTAL) - when (dialog_radio_count_holder.checkedRadioButtonId) { - R.id.dialog_radio_count_line -> { + when (dialog_radio_folder_count_holder.checkedRadioButtonId) { + R.id.dialog_radio_folder_count_line -> { dir_name.text = folderName photo_cnt.text = photoCount.toString() photo_cnt.beVisible() } - R.id.dialog_radio_count_brackets -> { + R.id.dialog_radio_folder_count_brackets -> { photo_cnt.beGone() dir_name.text = "$folderName ($photoCount)" } @@ -115,20 +115,20 @@ class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity, val callback: } override fun onClick(dialog: DialogInterface, which: Int) { - val style = when (view.dialog_radio_style.checkedRadioButtonId) { - R.id.dialog_radio_square -> FOLDER_STYLE_SQUARE + val style = when (view.dialog_radio_folder_style.checkedRadioButtonId) { + R.id.dialog_radio_folder_square -> FOLDER_STYLE_SQUARE else -> FOLDER_STYLE_ROUNDED_CORNERS } - val count = when (view.dialog_radio_count_holder.checkedRadioButtonId) { - R.id.dialog_radio_count_line -> FOLDER_MEDIA_CNT_LINE - R.id.dialog_radio_count_brackets -> FOLDER_MEDIA_CNT_BRACKETS + val count = when (view.dialog_radio_folder_count_holder.checkedRadioButtonId) { + R.id.dialog_radio_folder_count_line -> FOLDER_MEDIA_CNT_LINE + R.id.dialog_radio_folder_count_brackets -> FOLDER_MEDIA_CNT_BRACKETS else -> FOLDER_MEDIA_CNT_NONE } config.folderStyle = style config.showFolderMediaCount = count - config.limitFolderTitle = view.dialog_limit_title.isChecked + config.limitFolderTitle = view.dialog_folder_limit_title.isChecked callback() } } diff --git a/app/src/main/res/layout/dialog_change_thumbnail_style.xml b/app/src/main/res/layout/dialog_change_folder_thumbnail_style.xml similarity index 86% rename from app/src/main/res/layout/dialog_change_thumbnail_style.xml rename to app/src/main/res/layout/dialog_change_folder_thumbnail_style.xml index 34d935527..e29763f1a 100644 --- a/app/src/main/res/layout/dialog_change_thumbnail_style.xml +++ b/app/src/main/res/layout/dialog_change_folder_thumbnail_style.xml @@ -14,19 +14,19 @@ android:paddingRight="@dimen/activity_margin"> Date: Sun, 17 Jan 2021 19:10:57 +0100 Subject: [PATCH 46/81] moving some file thumbnail settings into a separate window --- .../pro/activities/SettingsActivity.kt | 30 +------ .../dialogs/ChangeFileThumbnailStyleDialog.kt | 40 +++++++++ app/src/main/res/layout/activity_settings.xml | 69 --------------- .../dialog_change_file_thumbnail_style.xml | 84 +++++++++++++++++++ 4 files changed, 126 insertions(+), 97 deletions(-) create mode 100644 app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt create mode 100644 app/src/main/res/layout/dialog_change_file_thumbnail_style.xml 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 4e7bff317..7757f501c 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 @@ -12,6 +12,7 @@ import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.dialogs.ChangeFileThumbnailStyleDialog import com.simplemobiletools.gallery.pro.dialogs.ChangeFolderThumbnailStyleDialog import com.simplemobiletools.gallery.pro.dialogs.ManageBottomActionsDialog import com.simplemobiletools.gallery.pro.dialogs.ManageExtendedDetailsDialog @@ -53,7 +54,6 @@ class SettingsActivity : SimpleActivity() { setupRememberLastVideo() setupLoopVideos() setupOpenVideosOnSeparateScreen() - setupAnimateGifs() setupMaxBrightness() setupCropThumbnails() setupDarkBackground() @@ -68,8 +68,6 @@ class SettingsActivity : SimpleActivity() { setupAllowRotatingWithGestures() setupShowNotch() setupBottomActions() - setupThumbnailVideoDuration() - setupThumbnailFileTypes() setupFileThumbnailStyle() setupFolderThumbnailStyle() setupKeepLastModified() @@ -231,14 +229,6 @@ class SettingsActivity : SimpleActivity() { } } - private fun setupAnimateGifs() { - settings_animate_gifs.isChecked = config.animateGifs - settings_animate_gifs_holder.setOnClickListener { - settings_animate_gifs.toggle() - config.animateGifs = settings_animate_gifs.isChecked - } - } - private fun setupMaxBrightness() { settings_max_brightness.isChecked = config.maxBrightness settings_max_brightness_holder.setOnClickListener { @@ -255,22 +245,6 @@ class SettingsActivity : SimpleActivity() { } } - private fun setupThumbnailVideoDuration() { - settings_show_thumbnail_video_duration.isChecked = config.showThumbnailVideoDuration - settings_show_thumbnail_video_duration_holder.setOnClickListener { - settings_show_thumbnail_video_duration.toggle() - config.showThumbnailVideoDuration = settings_show_thumbnail_video_duration.isChecked - } - } - - 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 { @@ -401,7 +375,7 @@ class SettingsActivity : SimpleActivity() { private fun setupFileThumbnailStyle() { settings_file_thumbnail_style_holder.setOnClickListener { - + ChangeFileThumbnailStyleDialog(this) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt new file mode 100644 index 000000000..d47a30150 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt @@ -0,0 +1,40 @@ +package com.simplemobiletools.gallery.pro.dialogs + +import android.content.DialogInterface +import android.view.View +import androidx.appcompat.app.AlertDialog +import com.simplemobiletools.commons.activities.BaseSimpleActivity +import com.simplemobiletools.commons.extensions.setupDialogStuff +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.extensions.config +import kotlinx.android.synthetic.main.dialog_change_file_thumbnail_style.view.* + +class ChangeFileThumbnailStyleDialog(val activity: BaseSimpleActivity) : DialogInterface.OnClickListener { + private var config = activity.config + private var view: View + + init { + view = activity.layoutInflater.inflate(R.layout.dialog_change_file_thumbnail_style, null).apply { + dialog_file_style_animate_gifs.isChecked = config.animateGifs + dialog_file_style_show_thumbnail_video_duration.isChecked = config.showThumbnailVideoDuration + dialog_file_style_show_thumbnail_file_types.isChecked = config.showThumbnailFileTypes + + dialog_file_style_animate_gifs_holder.setOnClickListener { dialog_file_style_animate_gifs.toggle() } + dialog_file_style_show_thumbnail_video_duration_holder.setOnClickListener { dialog_file_style_show_thumbnail_video_duration.toggle() } + dialog_file_style_show_thumbnail_file_types_holder.setOnClickListener { dialog_file_style_show_thumbnail_file_types.toggle() } + } + + AlertDialog.Builder(activity) + .setPositiveButton(R.string.ok, this) + .setNegativeButton(R.string.cancel, null) + .create().apply { + activity.setupDialogStuff(view, this) + } + } + + override fun onClick(dialog: DialogInterface, which: Int) { + config.animateGifs = view.dialog_file_style_animate_gifs.isChecked + config.showThumbnailVideoDuration = view.dialog_file_style_show_thumbnail_video_duration.isChecked + config.showThumbnailFileTypes = view.dialog_file_style_show_thumbnail_file_types.isChecked + } +} diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index b54160fa3..ae582dca5 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -320,29 +320,6 @@ android:textAllCaps="true" android:textSize="@dimen/smaller_text_size" /> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + From f84f4e3098f2db7089cad5dcf518b42828d9622a Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 17 Jan 2021 21:28:09 +0100 Subject: [PATCH 47/81] updating the thumbnail spacing string to make it more dynamic --- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-az/strings.xml | 2 +- app/src/main/res/values-bn/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-gl/strings.xml | 2 +- app/src/main/res/values-hr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-id/strings.xml | 2 +- app/src/main/res/values-in/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko-rKR/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 2 +- app/src/main/res/values-nb/strings.xml | 2 +- app/src/main/res/values-ne/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sl/strings.xml | 2 +- app/src/main/res/values-sr/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rHK/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index cbef777a8..a1ca5707b 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index d19376769..0333af35f 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index fd9f61b7a..0dcc3984e 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index a0716366d..62e46d17f 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -194,7 +194,7 @@ Permet fer zoom als vídeos amb dos cops Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 7d24e6e0f..aa9d59296 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 965389064..6bbafcf90 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7a4f4338e..d42212487 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -194,7 +194,7 @@ Erlaube Zoomen in Videos mit doppeltem Antippen Ordner-Miniaturbildstil File thumbnail style - Increased spacing + Thumbnail spacing Zeige Anzahl der Dateien in einer seperaten Zeile an Anzahl der Dateien in Klammern anzeigen Anzahl der Dateien nicht anzeigen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 4e8482a47..f4a2b705d 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -194,7 +194,7 @@ Επιτρέπει την μεγέθυνση βίντεο με διπλό πάτημα Στυλ μικρογραφίας φακέλου File thumbnail style - Increased spacing + Thumbnail spacing Εμφάνιση πλήθους αρχείων σε ξεχωριστή γραμμή Εμφάνιση πλήθους αρχείων σε αγκύλες Χωρίς εμφάνιση μέτρησης αρχείων diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 87a168ca3..764dbcf7c 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -194,7 +194,7 @@ Permitir hacer zoom en videos con doble toque Estilo de las miniaturas de las carpetas File thumbnail style - Increased spacing + Thumbnail spacing Mostrar el recuento de archivos en una línea separada Mostrar el recuento de archivos entre paréntesis No mostrar el recuento de archivos diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index c3380d986..4c46af20d 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 3f79b6761..f431fc1b9 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -194,7 +194,7 @@ Zoomer les vidéos par un double appui Style des miniatures des dossiers Style des miniatures des fichiers - Increased spacing + Thumbnail spacing Afficher le nombre de fichiers sur une autre ligne Afficher le nombre de fichiers entre parenthèses Ne pas afficher le nombre de fichiers diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index fc5934537..002b595ef 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -194,7 +194,7 @@ Permitir zoom nos vídeos co dobre-toque sobre eles Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 9fed01aa6..61dbb91cc 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 146a122b9..4e54d4201 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -194,7 +194,7 @@ A videók nagyításának engedélyezése dupla koppintással Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 2cd51eff4..885c4d401 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 16d606edf..3b8a0edd4 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ea38da295..1908edd11 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -194,7 +194,7 @@ Permetti l\'ingrandimento dei video con un doppio tocco Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d357cb117..dc46fe46d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -194,7 +194,7 @@ ダブルタップで動画ズームを設定 フォルダサムネイルのスタイル File thumbnail style - Increased spacing + Thumbnail spacing ファイル数を別の行に表示 ファイル数を括弧内に表示 ファイル数を非表示 diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 962712b16..55568d1bf 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index d61a37cfd..2ce6815d9 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 38c664a81..3c3622cf2 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -194,7 +194,7 @@ Tillat zooming av videoer ved å dobbelttrykke dem Minibildestil for mapper File thumbnail style - Increased spacing + Thumbnail spacing Vis antall filer på en separat linje Vis antall filer i parentes Ikke vis antall filer diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 0bbbcee8d..26f0cd5a0 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c34c52227..1e68a8e5f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -194,7 +194,7 @@ Bij video\'s inzoomen met dubbelklikken Stijl voor thumbnails mappen Stijl voor thumbnails bestanden - Afstand vergroten + Thumbnail spacing Aantal bestanden op aparte regel tonen Aantal bestanden tussen rechte haken tonen Aantal bestanden niet tonen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c94196d7f..8ee0ef88d 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 775767fc5..f912ab6bc 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -194,7 +194,7 @@ Permitir zoom de vídeos com um toque duplo neles Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index e583bddbb..4c250cd4a 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -194,7 +194,7 @@ Permitir ampliação de vídeos com dois toques Estilo de miniatura das pastas File thumbnail style - Increased spacing + Thumbnail spacing Mostrar número de ficherios em linha distinta Mostrar número de ficheiros em chavetas Não mostrar número de ficheiros diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 6cdcf7014..c1a539949 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -194,7 +194,7 @@ Масштабировать видео двойным нажатием по нему Вид миниатюр папок File thumbnail style - Increased spacing + Thumbnail spacing Показывать количество файлов отдельной строкой Показывать количество файлов в скобках Не показывать количество файлов diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 39ff5dd3e..ddc2fa82b 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -194,7 +194,7 @@ Povoliť približovanie videí dvojitým ťuknutím Štýl miniatúr priečinkov Štýl miniatúr súborov - Zväčšené medzery + Medzery medzi miniatúrami Zobraziť počet súborov na samostatnom riadku Zobraziť počet súborov v zátvorkách Nezobrazovať počet súborov diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 1b220f2bf..a9a1d4e61 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 49b0620fa..e2b6fe3ce 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 252379f9e..7957d91ea 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 59a069581..a36fa5785 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -194,7 +194,7 @@ Videoları iki kez dokunarak yakınlaştırmaya izin ver Klasör küçük resim stili File thumbnail style - Increased spacing + Thumbnail spacing Dosya sayısını ayrı bir satırda göster Dosya sayısını parantez içinde göster Dosya sayısını gösterme diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index ba9242d54..f33314c29 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -194,7 +194,7 @@ Масштабувати відео подвійним натисканням по ньому Вид мініатюр тек File thumbnail style - Increased spacing + Thumbnail spacing Показувати кількість файлів в окремому рядку Показувати кількість файлів у дужках Не показувати кількість файлів diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index ff7a330f8..b6ba2dcd7 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 284e60542..eee460a12 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -194,7 +194,7 @@ 允许双击来放大视频 文件夹缩略图样式 File thumbnail style - Increased spacing + Thumbnail spacing 在单独一行中显示计数 在括号中显示计数 不显示计数 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index a9c5a02d9..66d5292a1 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -201,7 +201,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index dfe0eb1bd..c2c209025 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f96783cf1..1fa2aa552 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -194,7 +194,7 @@ Allow zooming videos with double tapping them Folder thumbnail style File thumbnail style - Increased spacing + Thumbnail spacing Show file count on a separate line Show file count in brackets Do not show file count From 0feccb46c7ed1826d3e5e24311c237ac9aaf73a4 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Sun, 17 Jan 2021 23:07:16 +0100 Subject: [PATCH 48/81] 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 1e68a8e5f..b5469e360 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -194,7 +194,7 @@ Bij video\'s inzoomen met dubbelklikken Stijl voor thumbnails mappen Stijl voor thumbnails bestanden - Thumbnail spacing + Afstand tussen thumbnails Aantal bestanden op aparte regel tonen Aantal bestanden tussen rechte haken tonen Aantal bestanden niet tonen From 823309c35e4c7a5bfc4ea64db02857375b0fa017 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 17 Jan 2021 23:07:26 +0100 Subject: [PATCH 49/81] change the way grid spacing is handled, make it more dynamic --- .../gallery/pro/activities/MediaActivity.kt | 15 +++++++++++ .../pro/helpers/GridSpacingItemDecoration.kt | 27 +++++++++++++++++++ .../main/res/layout/photo_video_item_grid.xml | 3 +-- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt 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 d136ee640..2a773ec0a 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 @@ -405,6 +405,7 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { } setupLayoutManager() measureRecyclerViewContent(mMedia) + handleGridSpacing() } else if (mLastSearchedText.isEmpty()) { (currAdapter as MediaAdapter).updateMedia(mMedia) measureRecyclerViewContent(mMedia) @@ -723,6 +724,19 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { media_vertical_fastscroller.setScrollToY(media_grid.computeVerticalScrollOffset()) } + private fun handleGridSpacing() { + if (media_grid.itemDecorationCount > 0) { + media_grid.removeItemDecorationAt(0) + } + + val viewType = config.getFolderViewType(if (mShowAll) SHOW_ALL else mPath) + if (viewType == VIEW_TYPE_GRID) { + val spanCount = config.mediaColumnCnt + val spacing = 2 + media_grid.addItemDecoration(GridSpacingItemDecoration(spanCount, spacing, config.scrollHorizontally)) + } + } + private fun initZoomListener() { val viewType = config.getFolderViewType(if (mShowAll) SHOW_ALL else mPath) if (viewType == VIEW_TYPE_GRID) { @@ -773,6 +787,7 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { } private fun columnCountChanged() { + handleGridSpacing() invalidateOptionsMenu() getMediaAdapter()?.apply { notifyItemRangeChanged(0, media.size) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt new file mode 100644 index 000000000..07aa1cc43 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt @@ -0,0 +1,27 @@ +package com.simplemobiletools.gallery.pro.helpers + +import android.graphics.Rect +import android.view.View +import androidx.recyclerview.widget.RecyclerView + +class GridSpacingItemDecoration(val spanCount: Int, val spacing: Int, val isScrollingHorizontally: Boolean) : RecyclerView.ItemDecoration() { + + override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { + val position = parent.getChildAdapterPosition(view) + val column = position % spanCount + + if (isScrollingHorizontally) { + outRect.top = column * spacing / spanCount + outRect.bottom = spacing - (column + 1) * spacing / spanCount + if (position >= spanCount) { + outRect.left = spacing + } + } else { + outRect.left = column * spacing / spanCount + outRect.right = spacing - (column + 1) * spacing / spanCount + if (position >= spanCount) { + outRect.top = spacing + } + } + } +} 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 64dbbf88f..cc3fc718d 100644 --- a/app/src/main/res/layout/photo_video_item_grid.xml +++ b/app/src/main/res/layout/photo_video_item_grid.xml @@ -5,8 +5,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clickable="true" - android:focusable="true" - android:padding="1px"> + android:focusable="true"> Date: Sun, 17 Jan 2021 23:44:48 +0100 Subject: [PATCH 50/81] allow customizing the spacing at file thumbnails --- .../gallery/pro/activities/MediaActivity.kt | 2 +- .../dialogs/ChangeFileThumbnailStyleDialog.kt | 28 +++++++++++ .../gallery/pro/helpers/Config.kt | 4 ++ .../gallery/pro/helpers/Constants.kt | 1 + .../dialog_change_file_thumbnail_style.xml | 47 ++++++++++++++----- 5 files changed, 70 insertions(+), 12 deletions(-) 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 2a773ec0a..22e6b5434 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 @@ -732,7 +732,7 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { val viewType = config.getFolderViewType(if (mShowAll) SHOW_ALL else mPath) if (viewType == VIEW_TYPE_GRID) { val spanCount = config.mediaColumnCnt - val spacing = 2 + val spacing = config.thumbnailSpacing media_grid.addItemDecoration(GridSpacingItemDecoration(spanCount, spacing, config.scrollHorizontally)) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt index d47a30150..8fcf1a6e7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt @@ -4,14 +4,18 @@ import android.content.DialogInterface import android.view.View import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity +import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.setupDialogStuff +import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.gallery.pro.R import com.simplemobiletools.gallery.pro.extensions.config import kotlinx.android.synthetic.main.dialog_change_file_thumbnail_style.view.* +import java.text.DecimalFormat class ChangeFileThumbnailStyleDialog(val activity: BaseSimpleActivity) : DialogInterface.OnClickListener { private var config = activity.config private var view: View + private var thumbnailSpacing = config.thumbnailSpacing init { view = activity.layoutInflater.inflate(R.layout.dialog_change_file_thumbnail_style, null).apply { @@ -22,7 +26,24 @@ class ChangeFileThumbnailStyleDialog(val activity: BaseSimpleActivity) : DialogI dialog_file_style_animate_gifs_holder.setOnClickListener { dialog_file_style_animate_gifs.toggle() } dialog_file_style_show_thumbnail_video_duration_holder.setOnClickListener { dialog_file_style_show_thumbnail_video_duration.toggle() } dialog_file_style_show_thumbnail_file_types_holder.setOnClickListener { dialog_file_style_show_thumbnail_file_types.toggle() } + + dialog_file_style_spacing_holder.setOnClickListener { + val items = arrayListOf( + RadioItem(0, "0x"), + RadioItem(1, "0.5x"), + RadioItem(2, "1x"), + RadioItem(4, "2x"), + RadioItem(8, "4x"), + RadioItem(16, "8x"), + RadioItem(32, "16x")) + + RadioGroupDialog(activity, items, thumbnailSpacing) { + thumbnailSpacing = it as Int + updateThumbnailSpacingText() + } + } } + updateThumbnailSpacingText() AlertDialog.Builder(activity) .setPositiveButton(R.string.ok, this) @@ -36,5 +57,12 @@ class ChangeFileThumbnailStyleDialog(val activity: BaseSimpleActivity) : DialogI config.animateGifs = view.dialog_file_style_animate_gifs.isChecked config.showThumbnailVideoDuration = view.dialog_file_style_show_thumbnail_video_duration.isChecked config.showThumbnailFileTypes = view.dialog_file_style_show_thumbnail_file_types.isChecked + config.thumbnailSpacing = thumbnailSpacing + } + + private fun updateThumbnailSpacingText() { + val number = thumbnailSpacing * 0.5 + val format = DecimalFormat("0.#") + view.dialog_file_style_spacing.text = "${format.format(number)}x" } } 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 2384f7298..1cf352cdc 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 @@ -507,4 +507,8 @@ class Config(context: Context) : BaseConfig(context) { var limitFolderTitle: Boolean get() = prefs.getBoolean(LIMIT_FOLDER_TITLE, false) set(limitFolderTitle) = prefs.edit().putBoolean(LIMIT_FOLDER_TITLE, limitFolderTitle).apply() + + var thumbnailSpacing: Int + get() = prefs.getInt(THUMBNAIL_SPACING, 2) + set(thumbnailSpacing) = prefs.edit().putInt(THUMBNAIL_SPACING, thumbnailSpacing).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 df613f6f8..91b060de3 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 @@ -86,6 +86,7 @@ const val WERE_FAVORITES_MIGRATED = "were_favorites_migrated" const val FOLDER_THUMBNAIL_STYLE = "folder_thumbnail_style" const val FOLDER_MEDIA_COUNT = "folder_media_count" const val LIMIT_FOLDER_TITLE = "folder_limit_title" +const val THUMBNAIL_SPACING = "thumbnail_spacing" // slideshow const val SLIDESHOW_INTERVAL = "slideshow_interval" diff --git a/app/src/main/res/layout/dialog_change_file_thumbnail_style.xml b/app/src/main/res/layout/dialog_change_file_thumbnail_style.xml index 511370a94..06c8deff2 100644 --- a/app/src/main/res/layout/dialog_change_file_thumbnail_style.xml +++ b/app/src/main/res/layout/dialog_change_file_thumbnail_style.xml @@ -13,15 +13,46 @@ android:paddingTop="@dimen/normal_margin"> + android:paddingBottom="@dimen/bigger_margin"> + + + + + + + + + android:padding="@dimen/normal_margin"> + android:padding="@dimen/normal_margin"> Date: Sun, 17 Jan 2021 23:59:16 +0100 Subject: [PATCH 51/81] update thumbnail spacing on resume --- .../gallery/pro/activities/MediaActivity.kt | 6 ++++++ 1 file changed, 6 insertions(+) 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 22e6b5434..9c86330da 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 @@ -76,6 +76,7 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { private var mStoredShowFileTypes = true private var mStoredTextColor = 0 private var mStoredPrimaryColor = 0 + private var mStoredThumbnailSpacing = 0 companion object { var mMedia = ArrayList() @@ -153,6 +154,10 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { media_vertical_fastscroller.updatePrimaryColor() } + if (mStoredThumbnailSpacing != config.thumbnailSpacing) { + handleGridSpacing() + } + media_horizontal_fastscroller.updateBubbleColors() media_vertical_fastscroller.updateBubbleColors() media_refresh_layout.isEnabled = config.enablePullToRefresh @@ -298,6 +303,7 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { mStoredShowFileTypes = showThumbnailFileTypes mStoredTextColor = textColor mStoredPrimaryColor = primaryColor + mStoredThumbnailSpacing = thumbnailSpacing mShowAll = showAll } } From a393e2afb6203b9882d6ead6f5b0fdf9aa8e27d6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 18 Jan 2021 11:49:04 +0100 Subject: [PATCH 52/81] allow setting rounded corners to file thumbnails --- .../pro/activities/SettingsActivity.kt | 6 ++++++ .../gallery/pro/adapters/MediaAdapter.kt | 6 +++++- .../dialogs/ChangeFileThumbnailStyleDialog.kt | 7 ++++++- .../gallery/pro/helpers/Config.kt | 4 ++++ .../gallery/pro/helpers/Constants.kt | 1 + .../dialog_change_file_thumbnail_style.xml | 20 +++++++++++++++++++ 6 files changed, 42 insertions(+), 2 deletions(-) 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 7757f501c..45279a23d 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 @@ -631,6 +631,7 @@ class SettingsActivity : SimpleActivity() { put(ANIMATE_GIFS, config.animateGifs) put(CROP_THUMBNAILS, config.cropThumbnails) put(SHOW_THUMBNAIL_VIDEO_DURATION, config.showThumbnailVideoDuration) + put(SHOW_THUMBNAIL_FILE_TYPES, config.showThumbnailFileTypes) put(SCROLL_HORIZONTALLY, config.scrollHorizontally) put(ENABLE_PULL_TO_REFRESH, config.enablePullToRefresh) put(MAX_BRIGHTNESS, config.maxBrightness) @@ -687,6 +688,8 @@ class SettingsActivity : SimpleActivity() { put(FOLDER_THUMBNAIL_STYLE, config.folderStyle) put(FOLDER_MEDIA_COUNT, config.showFolderMediaCount) put(LIMIT_FOLDER_TITLE, config.limitFolderTitle) + put(THUMBNAIL_SPACING, config.thumbnailSpacing) + put(FILE_ROUNDED_CORNERS, config.fileRoundedCorners) } exportSettings(configItems) @@ -768,6 +771,7 @@ class SettingsActivity : SimpleActivity() { ANIMATE_GIFS -> config.animateGifs = value.toBoolean() CROP_THUMBNAILS -> config.cropThumbnails = value.toBoolean() SHOW_THUMBNAIL_VIDEO_DURATION -> config.showThumbnailVideoDuration = value.toBoolean() + SHOW_THUMBNAIL_FILE_TYPES -> config.showThumbnailFileTypes = value.toBoolean() SCROLL_HORIZONTALLY -> config.scrollHorizontally = value.toBoolean() ENABLE_PULL_TO_REFRESH -> config.enablePullToRefresh = value.toBoolean() MAX_BRIGHTNESS -> config.maxBrightness = value.toBoolean() @@ -823,6 +827,8 @@ class SettingsActivity : SimpleActivity() { FOLDER_THUMBNAIL_STYLE -> config.folderStyle = value.toInt() FOLDER_MEDIA_COUNT -> config.showFolderMediaCount = value.toInt() LIMIT_FOLDER_TITLE -> config.limitFolderTitle = value.toBoolean() + THUMBNAIL_SPACING -> config.thumbnailSpacing = value.toInt() + FILE_ROUNDED_CORNERS -> config.fileRoundedCorners = value.toBoolean() ALBUM_COVERS -> { val existingCovers = config.parseAlbumCovers() val existingCoverPaths = existingCovers.map { it.path }.toMutableList() as ArrayList 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 1e0306d42..621d55c28 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 @@ -539,7 +539,11 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: ArrayList ROUNDED_CORNERS_SMALL + config.fileRoundedCorners -> ROUNDED_CORNERS_BIG + else -> ROUNDED_CORNERS_NONE + } if (loadImageInstantly) { activity.loadImage(medium.type, path, medium_thumbnail, scrollHorizontally, animateGifs, cropThumbnails, roundedCorners, medium.getKey(), diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt index 8fcf1a6e7..6c4b33092 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt @@ -19,10 +19,12 @@ class ChangeFileThumbnailStyleDialog(val activity: BaseSimpleActivity) : DialogI init { view = activity.layoutInflater.inflate(R.layout.dialog_change_file_thumbnail_style, null).apply { + dialog_file_style_rounded_corners.isChecked = config.fileRoundedCorners dialog_file_style_animate_gifs.isChecked = config.animateGifs dialog_file_style_show_thumbnail_video_duration.isChecked = config.showThumbnailVideoDuration dialog_file_style_show_thumbnail_file_types.isChecked = config.showThumbnailFileTypes + dialog_file_style_rounded_corners_holder.setOnClickListener { dialog_file_style_rounded_corners.toggle() } dialog_file_style_animate_gifs_holder.setOnClickListener { dialog_file_style_animate_gifs.toggle() } dialog_file_style_show_thumbnail_video_duration_holder.setOnClickListener { dialog_file_style_show_thumbnail_video_duration.toggle() } dialog_file_style_show_thumbnail_file_types_holder.setOnClickListener { dialog_file_style_show_thumbnail_file_types.toggle() } @@ -35,7 +37,8 @@ class ChangeFileThumbnailStyleDialog(val activity: BaseSimpleActivity) : DialogI RadioItem(4, "2x"), RadioItem(8, "4x"), RadioItem(16, "8x"), - RadioItem(32, "16x")) + RadioItem(32, "16x"), + RadioItem(64, "32x")) RadioGroupDialog(activity, items, thumbnailSpacing) { thumbnailSpacing = it as Int @@ -43,6 +46,7 @@ class ChangeFileThumbnailStyleDialog(val activity: BaseSimpleActivity) : DialogI } } } + updateThumbnailSpacingText() AlertDialog.Builder(activity) @@ -54,6 +58,7 @@ class ChangeFileThumbnailStyleDialog(val activity: BaseSimpleActivity) : DialogI } override fun onClick(dialog: DialogInterface, which: Int) { + config.fileRoundedCorners = view.dialog_file_style_rounded_corners.isChecked config.animateGifs = view.dialog_file_style_animate_gifs.isChecked config.showThumbnailVideoDuration = view.dialog_file_style_show_thumbnail_video_duration.isChecked config.showThumbnailFileTypes = view.dialog_file_style_show_thumbnail_file_types.isChecked 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 1cf352cdc..960559e33 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 @@ -511,4 +511,8 @@ class Config(context: Context) : BaseConfig(context) { var thumbnailSpacing: Int get() = prefs.getInt(THUMBNAIL_SPACING, 2) set(thumbnailSpacing) = prefs.edit().putInt(THUMBNAIL_SPACING, thumbnailSpacing).apply() + + var fileRoundedCorners: Boolean + get() = prefs.getBoolean(FILE_ROUNDED_CORNERS, false) + set(fileRoundedCorners) = prefs.edit().putBoolean(FILE_ROUNDED_CORNERS, fileRoundedCorners).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 91b060de3..7f622edd2 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 @@ -87,6 +87,7 @@ const val FOLDER_THUMBNAIL_STYLE = "folder_thumbnail_style" const val FOLDER_MEDIA_COUNT = "folder_media_count" const val LIMIT_FOLDER_TITLE = "folder_limit_title" const val THUMBNAIL_SPACING = "thumbnail_spacing" +const val FILE_ROUNDED_CORNERS = "file_rounded_corners" // slideshow const val SLIDESHOW_INTERVAL = "slideshow_interval" diff --git a/app/src/main/res/layout/dialog_change_file_thumbnail_style.xml b/app/src/main/res/layout/dialog_change_file_thumbnail_style.xml index 06c8deff2..5c0b8716d 100644 --- a/app/src/main/res/layout/dialog_change_file_thumbnail_style.xml +++ b/app/src/main/res/layout/dialog_change_file_thumbnail_style.xml @@ -46,6 +46,26 @@ + + + + + + Date: Mon, 18 Jan 2021 12:17:44 +0100 Subject: [PATCH 53/81] avoid checking cached folders hidden status unnecessarily --- .../gallery/pro/extensions/Context.kt | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt index a0250270a..4650b2b90 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt @@ -575,19 +575,21 @@ fun Context.getCachedDirectories(getVideosOnly: Boolean = false, getImagesOnly: } }) as ArrayList - val hiddenString = resources.getString(R.string.hidden) - filteredDirectories.forEach { - val noMediaPath = "${it.path}/.nomedia" - val hasNoMedia = if (folderNoMediaStatuses.keys.contains(noMediaPath)) { - folderNoMediaStatuses[noMediaPath]!! - } else { - it.path.doesThisOrParentHaveNoMedia(noMediaFolders) - } + if (shouldShowHidden) { + val hiddenString = resources.getString(R.string.hidden) + filteredDirectories.forEach { + val noMediaPath = "${it.path}/.nomedia" + val hasNoMedia = if (folderNoMediaStatuses.keys.contains(noMediaPath)) { + folderNoMediaStatuses[noMediaPath]!! + } else { + it.path.doesThisOrParentHaveNoMedia(noMediaFolders) + } - it.name = if (hasNoMedia && !it.path.isThisOrParentIncluded(includedPaths)) { - "${it.name.removeSuffix(hiddenString).trim()} $hiddenString" - } else { - it.name.removeSuffix(hiddenString).trim() + it.name = if (hasNoMedia && !it.path.isThisOrParentIncluded(includedPaths)) { + "${it.name.removeSuffix(hiddenString).trim()} $hiddenString" + } else { + it.name.removeSuffix(hiddenString).trim() + } } } From 876e10a2027d9254a03f969573d6b5f0e557aa6a Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 18 Jan 2021 12:29:52 +0100 Subject: [PATCH 54/81] prefill nomedia folders after fetching --- .../com/simplemobiletools/gallery/pro/extensions/Context.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt index 4650b2b90..064e5cab1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt @@ -553,8 +553,12 @@ fun Context.getCachedDirectories(getVideosOnly: Boolean = false, getImagesOnly: val excludedPaths = config.excludedFolders val includedPaths = config.includedFolders - val noMediaFolders = getNoMediaFoldersSync() val folderNoMediaStatuses = HashMap() + val noMediaFolders = getNoMediaFoldersSync() + noMediaFolders.forEach { folder -> + folderNoMediaStatuses[folder] = true + } + var filteredDirectories = directories.filter { it.path.shouldFolderBeVisible(excludedPaths, includedPaths, shouldShowHidden, folderNoMediaStatuses, noMediaFolders) { path, hasNoMedia -> folderNoMediaStatuses[path] = hasNoMedia From 9ff50cc48aebc11f56932c13af042a64db453fe2 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 18 Jan 2021 12:40:39 +0100 Subject: [PATCH 55/81] fixing a glitch at caching nomedia folders --- .../com/simplemobiletools/gallery/pro/extensions/Context.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt index 064e5cab1..8a34e9a53 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt @@ -556,7 +556,7 @@ fun Context.getCachedDirectories(getVideosOnly: Boolean = false, getImagesOnly: val folderNoMediaStatuses = HashMap() val noMediaFolders = getNoMediaFoldersSync() noMediaFolders.forEach { folder -> - folderNoMediaStatuses[folder] = true + folderNoMediaStatuses["$folder/.nomedia"] = true } var filteredDirectories = directories.filter { From 1b5040ebcd727c6d5909e6301293a1cad459edf1 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 18 Jan 2021 13:31:27 +0100 Subject: [PATCH 56/81] highlight selected items at list views too --- .../gallery/pro/adapters/DirectoryAdapter.kt | 4 ++++ .../gallery/pro/adapters/MediaAdapter.kt | 4 ++++ .../main/res/layout/directory_item_list.xml | 20 +++++++++---------- .../main/res/layout/photo_video_item_list.xml | 18 ++++++++--------- 4 files changed, 27 insertions(+), 19 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 3aa01dc16..7cecc3aec 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 @@ -680,6 +680,10 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList - @@ -14,7 +14,7 @@ + android:layout_height="@dimen/list_view_folder_thumbnail_size" /> + android:visibility="gone" /> + android:visibility="gone" /> + android:textSize="@dimen/bigger_text_size" /> + android:textSize="@dimen/smaller_text_size" /> + android:textSize="@dimen/smaller_text_size" /> + android:visibility="gone" /> + android:visibility="gone" /> diff --git a/app/src/main/res/layout/photo_video_item_list.xml b/app/src/main/res/layout/photo_video_item_list.xml index f4c6474aa..7346f892e 100644 --- a/app/src/main/res/layout/photo_video_item_list.xml +++ b/app/src/main/res/layout/photo_video_item_list.xml @@ -1,6 +1,5 @@ - @@ -15,7 +15,7 @@ + android:layout_height="@dimen/list_view_folder_thumbnail_size" /> + android:visibility="gone" /> + tools:text="My photo" /> + android:visibility="gone" /> + tools:text="00:05" /> From 22cab457bb05d6fba78e7ea3991dd0679aeda621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Solatec=20Inform=C3=A0tica?= <35220662+Solatec@users.noreply.github.com> Date: Mon, 18 Jan 2021 16:23:15 +0100 Subject: [PATCH 57/81] Update strings.xml --- app/src/main/res/values-ca/strings.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 62e46d17f..58e0d5c34 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -192,15 +192,15 @@ Eviteu mostrar fitxers no vàlids Mostra els tipus de fitxers d\’imatges Permet fer zoom als vídeos amb dos cops - Folder thumbnail style - File thumbnail style - Thumbnail spacing - Show file count on a separate line - Show file count in brackets - Do not show file count - Limit long folder titles to 1 line - Square - Rounded corners + Estil de miniatura de carpeta + Estil de miniatura del fitxer + Espai entre miniatures + Mostra el recompte de fitxers en una línia diferent + Mostra el recompte de fitxers entre claudàtors + No mostreu el recompte de fitxers + Limiteu els títols de carpeta llarga a 1 línia + Quadrat + Cantonades arrodonides Miniatures From 83b0d7347fb442d32fa1b93c3dd360cd5c8587e7 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 18 Jan 2021 18:53:51 +0100 Subject: [PATCH 58/81] optimize .nomedia checks, avoid doing duplicate work --- app/build.gradle | 2 +- .../gallery/pro/adapters/DirectoryAdapter.kt | 6 +++--- .../gallery/pro/extensions/Context.kt | 18 +++++++++++++----- .../gallery/pro/extensions/String.kt | 9 ++++----- .../gallery/pro/helpers/MediaFetcher.kt | 10 +++++++--- 5 files changed, 28 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1de013668..e2b703bf4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.33.0' + implementation 'com.simplemobiletools:commons:5.33.6' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' 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 7cecc3aec..177bb91e8 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 @@ -156,8 +156,8 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList) { - menu.findItem(R.id.cab_hide).isVisible = selectedPaths.any { !it.doesThisOrParentHaveNoMedia() } - menu.findItem(R.id.cab_unhide).isVisible = selectedPaths.any { it.doesThisOrParentHaveNoMedia() } + menu.findItem(R.id.cab_hide).isVisible = selectedPaths.any { !it.doesThisOrParentHaveNoMedia(HashMap(), null) } + menu.findItem(R.id.cab_unhide).isVisible = selectedPaths.any { it.doesThisOrParentHaveNoMedia(HashMap(), null) } } private fun checkPinBtnVisibility(menu: Menu, selectedPaths: ArrayList) { @@ -327,7 +327,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList() val includedFolders = config.includedFolders val newDirs = dirs.filterIndexed { index, directory -> - val removeDir = directory.path.doesThisOrParentHaveNoMedia() && !includedFolders.contains(directory.path) + val removeDir = directory.path.doesThisOrParentHaveNoMedia(HashMap(), null) && !includedFolders.contains(directory.path) if (removeDir) { affectedPositions.add(index) } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt index 8a34e9a53..f2d55eb95 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt @@ -380,7 +380,12 @@ fun Context.storeDirectoryItems(items: ArrayList) { fun Context.checkAppendingHidden(path: String, hidden: String, includedFolders: MutableSet, noMediaFolders: ArrayList): String { val dirName = getFolderNameFromPath(path) - return if (path.doesThisOrParentHaveNoMedia(noMediaFolders) && !path.isThisOrParentIncluded(includedFolders)) { + val folderNoMediaStatuses = java.util.HashMap() + noMediaFolders.forEach { folder -> + folderNoMediaStatuses["$folder/$NOMEDIA"] = true + } + + return if (path.doesThisOrParentHaveNoMedia(folderNoMediaStatuses, null) && !path.isThisOrParentIncluded(includedFolders)) { "$dirName $hidden" } else { dirName @@ -556,11 +561,11 @@ fun Context.getCachedDirectories(getVideosOnly: Boolean = false, getImagesOnly: val folderNoMediaStatuses = HashMap() val noMediaFolders = getNoMediaFoldersSync() noMediaFolders.forEach { folder -> - folderNoMediaStatuses["$folder/.nomedia"] = true + folderNoMediaStatuses["$folder/$NOMEDIA"] = true } var filteredDirectories = directories.filter { - it.path.shouldFolderBeVisible(excludedPaths, includedPaths, shouldShowHidden, folderNoMediaStatuses, noMediaFolders) { path, hasNoMedia -> + it.path.shouldFolderBeVisible(excludedPaths, includedPaths, shouldShowHidden, folderNoMediaStatuses) { path, hasNoMedia -> folderNoMediaStatuses[path] = hasNoMedia } } as ArrayList @@ -582,11 +587,14 @@ fun Context.getCachedDirectories(getVideosOnly: Boolean = false, getImagesOnly: if (shouldShowHidden) { val hiddenString = resources.getString(R.string.hidden) filteredDirectories.forEach { - val noMediaPath = "${it.path}/.nomedia" + val noMediaPath = "${it.path}/$NOMEDIA" val hasNoMedia = if (folderNoMediaStatuses.keys.contains(noMediaPath)) { folderNoMediaStatuses[noMediaPath]!! } else { - it.path.doesThisOrParentHaveNoMedia(noMediaFolders) + it.path.doesThisOrParentHaveNoMedia(folderNoMediaStatuses) { path, hasNoMedia -> + val newPath = "$path/$NOMEDIA" + folderNoMediaStatuses[newPath] = hasNoMedia + } } it.name = if (hasNoMedia && !it.path.isThisOrParentIncluded(includedPaths)) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/String.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/String.kt index 1c18f2ef0..2a4f646c6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/String.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/String.kt @@ -11,8 +11,7 @@ fun String.isThisOrParentExcluded(excludedPaths: MutableSet) = excludedP // cache which folders contain .nomedia files to avoid checking them over and over again fun String.shouldFolderBeVisible(excludedPaths: MutableSet, includedPaths: MutableSet, showHidden: Boolean, - folderNoMediaStatuses: HashMap, noMediaFolders: ArrayList = ArrayList(), - callback: (path: String, hasNoMedia: Boolean) -> Unit): Boolean { + folderNoMediaStatuses: HashMap, callback: (path: String, hasNoMedia: Boolean) -> Unit): Boolean { if (isEmpty()) { return false } @@ -37,7 +36,7 @@ fun String.shouldFolderBeVisible(excludedPaths: MutableSet, includedPath val containsNoMedia = if (showHidden) { false } else { - noMediaFolders.contains(this) || File(this, NOMEDIA).exists() + folderNoMediaStatuses.getOrElse("$this/$NOMEDIA", { false }) || File(this, NOMEDIA).exists() } return if (!showHidden && containsNoMedia) { @@ -54,14 +53,14 @@ fun String.shouldFolderBeVisible(excludedPaths: MutableSet, includedPath var curPath = this for (i in 0 until count { it == '/' } - 1) { curPath = curPath.substringBeforeLast('/') - val pathToCheck = "$curPath/${NOMEDIA}" + val pathToCheck = "$curPath/$NOMEDIA" if (folderNoMediaStatuses.contains(pathToCheck)) { if (folderNoMediaStatuses[pathToCheck] == true) { containsNoMediaOrDot = true break } } else { - val noMediaExists = noMediaFolders.contains(pathToCheck) || File(pathToCheck).exists() + val noMediaExists = folderNoMediaStatuses.getOrElse(pathToCheck, { false }) || File(pathToCheck).exists() callback(pathToCheck, noMediaExists) if (noMediaExists) { containsNoMediaOrDot = true diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt index 867894f2b..04248ae02 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt @@ -69,7 +69,7 @@ class MediaFetcher(val context: Context) { val excludedPaths = config.excludedFolders val includedPaths = config.includedFolders - val folderNomediaStatuses = HashMap() + val folderNoMediaStatuses = HashMap() val distinctPathsMap = HashMap() val distinctPaths = folders.distinctBy { when { @@ -83,9 +83,13 @@ class MediaFetcher(val context: Context) { } val noMediaFolders = context.getNoMediaFoldersSync() + noMediaFolders.forEach { folder -> + folderNoMediaStatuses["$folder/$NOMEDIA"] = true + } + distinctPaths.filter { - it.shouldFolderBeVisible(excludedPaths, includedPaths, shouldShowHidden, folderNomediaStatuses, noMediaFolders) { path, hasNoMedia -> - folderNomediaStatuses[path] = hasNoMedia + it.shouldFolderBeVisible(excludedPaths, includedPaths, shouldShowHidden, folderNoMediaStatuses) { path, hasNoMedia -> + folderNoMediaStatuses[path] = hasNoMedia } }.toMutableList() as ArrayList } catch (e: Exception) { From 73cf37d46362f9cf0fa5d1a972134c268d5f5918 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 18 Jan 2021 19:33:40 +0100 Subject: [PATCH 59/81] use the currently shown directories --- .../simplemobiletools/gallery/pro/activities/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt index 622346dba..496f0968d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt @@ -524,7 +524,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { invalidateOptionsMenu() setupLayoutManager() directories_grid.adapter = null - setupAdapter(mDirs) + setupAdapter(getRecyclerAdapter()?.dirs ?: mDirs) } } From 92802b292300bbbbd5e30181c97f2f646bf7d653 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 18 Jan 2021 19:44:48 +0100 Subject: [PATCH 60/81] add side margin if file thumbnails have rounded corners --- .../gallery/pro/activities/MediaActivity.kt | 2 +- .../pro/helpers/GridSpacingItemDecoration.kt | 38 ++++++++++++++----- 2 files changed, 30 insertions(+), 10 deletions(-) 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 9c86330da..4eb5b7b06 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 @@ -739,7 +739,7 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { if (viewType == VIEW_TYPE_GRID) { val spanCount = config.mediaColumnCnt val spacing = config.thumbnailSpacing - media_grid.addItemDecoration(GridSpacingItemDecoration(spanCount, spacing, config.scrollHorizontally)) + media_grid.addItemDecoration(GridSpacingItemDecoration(spanCount, spacing, config.scrollHorizontally, config.fileRoundedCorners)) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt index 07aa1cc43..f690443ec 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt @@ -4,23 +4,43 @@ import android.graphics.Rect import android.view.View import androidx.recyclerview.widget.RecyclerView -class GridSpacingItemDecoration(val spanCount: Int, val spacing: Int, val isScrollingHorizontally: Boolean) : RecyclerView.ItemDecoration() { +class GridSpacingItemDecoration(val spanCount: Int, val spacing: Int, val isScrollingHorizontally: Boolean, val addSideSpacing: Boolean) : RecyclerView.ItemDecoration() { override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { val position = parent.getChildAdapterPosition(view) val column = position % spanCount if (isScrollingHorizontally) { - outRect.top = column * spacing / spanCount - outRect.bottom = spacing - (column + 1) * spacing / spanCount - if (position >= spanCount) { - outRect.left = spacing + if (addSideSpacing) { + outRect.top = spacing - column * spacing / spanCount + outRect.bottom = (column + 1) * spacing / spanCount + outRect.right = spacing + + if (position < spanCount) { + outRect.left = spacing + } + } else { + outRect.top = column * spacing / spanCount + outRect.bottom = spacing - (column + 1) * spacing / spanCount + if (position >= spanCount) { + outRect.left = spacing + } } } else { - outRect.left = column * spacing / spanCount - outRect.right = spacing - (column + 1) * spacing / spanCount - if (position >= spanCount) { - outRect.top = spacing + if (addSideSpacing) { + outRect.left = spacing - column * spacing / spanCount + outRect.right = (column + 1) * spacing / spanCount + outRect.bottom = spacing + + if (position < spanCount) { + outRect.top = spacing + } + } else { + outRect.left = column * spacing / spanCount + outRect.right = spacing - (column + 1) * spacing / spanCount + if (position >= spanCount) { + outRect.top = spacing + } } } } From 78a75fe873bd3dafb8289571dc76baa1b28339cb Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 18 Jan 2021 19:48:42 +0100 Subject: [PATCH 61/81] refresh file thumbnails if the rounded corners setting changes --- .../gallery/pro/activities/MediaActivity.kt | 8 ++++++++ 1 file changed, 8 insertions(+) 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 4eb5b7b06..00eff92ec 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 @@ -74,6 +74,7 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { private var mStoredCropThumbnails = true private var mStoredScrollHorizontally = true private var mStoredShowFileTypes = true + private var mStoredRoundedCorners = false private var mStoredTextColor = 0 private var mStoredPrimaryColor = 0 private var mStoredThumbnailSpacing = 0 @@ -158,6 +159,12 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { handleGridSpacing() } + if (mStoredRoundedCorners != config.fileRoundedCorners) { + handleGridSpacing() + media_grid.adapter = null + getMedia() + } + media_horizontal_fastscroller.updateBubbleColors() media_vertical_fastscroller.updateBubbleColors() media_refresh_layout.isEnabled = config.enablePullToRefresh @@ -304,6 +311,7 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { mStoredTextColor = textColor mStoredPrimaryColor = primaryColor mStoredThumbnailSpacing = thumbnailSpacing + mStoredRoundedCorners = fileRoundedCorners mShowAll = showAll } } From efe26e9c58a41a68edd02b53321df7a698becd26 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 18 Jan 2021 23:08:54 +0100 Subject: [PATCH 62/81] use proper grid position at thumbnails with grouping and section titles --- .../gallery/pro/activities/MediaActivity.kt | 4 +++- .../pro/helpers/GridSpacingItemDecoration.kt | 14 +++++++++---- .../gallery/pro/helpers/MediaFetcher.kt | 3 +++ .../gallery/pro/models/Medium.kt | 20 ++++++++++--------- 4 files changed, 27 insertions(+), 14 deletions(-) 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 00eff92ec..77ed679b8 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 @@ -747,7 +747,9 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { if (viewType == VIEW_TYPE_GRID) { val spanCount = config.mediaColumnCnt val spacing = config.thumbnailSpacing - media_grid.addItemDecoration(GridSpacingItemDecoration(spanCount, spacing, config.scrollHorizontally, config.fileRoundedCorners)) + val useGridPosition = mMedia.firstOrNull() is ThumbnailSection + val decoration = GridSpacingItemDecoration(spanCount, spacing, config.scrollHorizontally, config.fileRoundedCorners, mMedia, useGridPosition) + media_grid.addItemDecoration(decoration) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt index f690443ec..d9150bd1b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt @@ -3,12 +3,17 @@ package com.simplemobiletools.gallery.pro.helpers import android.graphics.Rect import android.view.View import androidx.recyclerview.widget.RecyclerView +import com.simplemobiletools.gallery.pro.models.Medium +import com.simplemobiletools.gallery.pro.models.ThumbnailItem -class GridSpacingItemDecoration(val spanCount: Int, val spacing: Int, val isScrollingHorizontally: Boolean, val addSideSpacing: Boolean) : RecyclerView.ItemDecoration() { +class GridSpacingItemDecoration(val spanCount: Int, val spacing: Int, val isScrollingHorizontally: Boolean, val addSideSpacing: Boolean, + val items: ArrayList, val useGridPosition: Boolean) : RecyclerView.ItemDecoration() { override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { val position = parent.getChildAdapterPosition(view) - val column = position % spanCount + val medium = items[position] as? Medium ?: return + val gridPositionToUse = if (useGridPosition) medium.gridPosition else position + val column = gridPositionToUse % spanCount if (isScrollingHorizontally) { if (addSideSpacing) { @@ -32,13 +37,14 @@ class GridSpacingItemDecoration(val spanCount: Int, val spacing: Int, val isScro outRect.right = (column + 1) * spacing / spanCount outRect.bottom = spacing - if (position < spanCount) { + if (position < spanCount && !useGridPosition) { outRect.top = spacing } } else { outRect.left = column * spacing / spanCount outRect.right = spacing - (column + 1) * spacing / spanCount - if (position >= spanCount) { + + if (gridPositionToUse >= spanCount) { outRect.top = spacing } } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt index 04248ae02..86d2e56e1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt @@ -635,12 +635,15 @@ class MediaFetcher(val context: Context) { return thumbnailItems } + var currentGridPosition = 0 val mediumGroups = LinkedHashMap>() media.forEach { val key = it.getGroupingKey(currentGrouping) if (!mediumGroups.containsKey(key)) { mediumGroups[key] = ArrayList() + currentGridPosition = 0 } + it.gridPosition = currentGridPosition++ mediumGroups[key]!!.add(it) } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Medium.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Medium.kt index 0041b0e28..05adfa524 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Medium.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Medium.kt @@ -1,10 +1,7 @@ package com.simplemobiletools.gallery.pro.models import android.content.Context -import androidx.room.ColumnInfo -import androidx.room.Entity -import androidx.room.Index -import androidx.room.PrimaryKey +import androidx.room.* import com.bumptech.glide.signature.ObjectKey import com.simplemobiletools.commons.extensions.formatDate import com.simplemobiletools.commons.extensions.formatSize @@ -25,13 +22,18 @@ data class Medium( @ColumnInfo(name = "filename") var name: String, @ColumnInfo(name = "full_path") var path: String, @ColumnInfo(name = "parent_path") var parentPath: String, - @ColumnInfo(name = "last_modified") val modified: Long, + @ColumnInfo(name = "last_modified") var modified: Long, @ColumnInfo(name = "date_taken") var taken: Long, - @ColumnInfo(name = "size") val size: Long, - @ColumnInfo(name = "type") val type: Int, - @ColumnInfo(name = "video_duration") val videoDuration: Int, + @ColumnInfo(name = "size") var size: Long, + @ColumnInfo(name = "type") var type: Int, + @ColumnInfo(name = "video_duration") var videoDuration: Int, @ColumnInfo(name = "is_favorite") var isFavorite: Boolean, - @ColumnInfo(name = "deleted_ts") var deletedTS: Long) : Serializable, ThumbnailItem() { + @ColumnInfo(name = "deleted_ts") var deletedTS: Long, + + @Ignore var gridPosition: Int = 0 // used at grid view decoration at Grouping enabled +) : Serializable, ThumbnailItem() { + + constructor() : this(null, "", "", "", 0L, 0L, 0L, 0, 0, false, 0L, 0) companion object { private const val serialVersionUID = -6553149366975655L From 146cb1a052df9acb09412195d0f3c70edbc22250 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 18 Jan 2021 23:25:22 +0100 Subject: [PATCH 63/81] add a null check at grid spacing decorator --- .../gallery/pro/helpers/GridSpacingItemDecoration.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt index d9150bd1b..d6d0f7ca7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt @@ -11,7 +11,7 @@ class GridSpacingItemDecoration(val spanCount: Int, val spacing: Int, val isScro override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { val position = parent.getChildAdapterPosition(view) - val medium = items[position] as? Medium ?: return + val medium = items.getOrNull(position) as? Medium ?: return val gridPositionToUse = if (useGridPosition) medium.gridPosition else position val column = gridPositionToUse % spanCount From b5c993ed5153836ab19d028eb734fe5641201504 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 19 Jan 2021 12:36:47 +0100 Subject: [PATCH 64/81] properly handle file thumbnails at search --- .../gallery/pro/activities/SearchActivity.kt | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SearchActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SearchActivity.kt index d79790cb3..24c48600b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SearchActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SearchActivity.kt @@ -26,7 +26,12 @@ import com.simplemobiletools.gallery.pro.interfaces.MediaOperationsListener import com.simplemobiletools.gallery.pro.models.Medium import com.simplemobiletools.gallery.pro.models.ThumbnailItem import com.simplemobiletools.gallery.pro.models.ThumbnailSection +import kotlinx.android.synthetic.main.activity_media.* import kotlinx.android.synthetic.main.activity_search.* +import kotlinx.android.synthetic.main.activity_search.media_empty_text_placeholder +import kotlinx.android.synthetic.main.activity_search.media_grid +import kotlinx.android.synthetic.main.activity_search.media_horizontal_fastscroller +import kotlinx.android.synthetic.main.activity_search.media_vertical_fastscroller import java.io.File class SearchActivity : SimpleActivity(), MediaOperationsListener { @@ -120,6 +125,7 @@ class SearchActivity : SimpleActivity(), MediaOperationsListener { } getMediaAdapter()?.updateMedia(grouped) + handleGridSpacing(grouped) measureRecyclerViewContent(grouped) } } catch (ignored: Exception) { @@ -139,9 +145,11 @@ class SearchActivity : SimpleActivity(), MediaOperationsListener { media_grid.adapter = this } setupLayoutManager() + handleGridSpacing(mAllMedia) measureRecyclerViewContent(mAllMedia) } else if (mLastSearchedText.isEmpty()) { (currAdapter as MediaAdapter).updateMedia(mAllMedia) + handleGridSpacing(mAllMedia) measureRecyclerViewContent(mAllMedia) } else { textChanged(mLastSearchedText) @@ -150,6 +158,20 @@ class SearchActivity : SimpleActivity(), MediaOperationsListener { setupScrollDirection() } + private fun handleGridSpacing(media: ArrayList) { + if (media_grid.itemDecorationCount > 0) { + media_grid.removeItemDecorationAt(0) + } + + val viewType = config.getFolderViewType(SHOW_ALL) + if (viewType == VIEW_TYPE_GRID) { + val spanCount = config.mediaColumnCnt + val spacing = config.thumbnailSpacing + val decoration = GridSpacingItemDecoration(spanCount, spacing, config.scrollHorizontally, config.fileRoundedCorners, media, true) + media_grid.addItemDecoration(decoration) + } + } + private fun getMediaAdapter() = media_grid.adapter as? MediaAdapter private fun toggleFilenameVisibility() { From 8bd9ee1c95b6cffcb6e27a4b3ade4fc5d3a5dfa5 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 19 Jan 2021 23:18:13 +0100 Subject: [PATCH 65/81] fixing some grid spacing related glitches --- .../gallery/pro/activities/MediaActivity.kt | 3 ++- .../gallery/pro/helpers/MediaFetcher.kt | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) 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 77ed679b8..ed1e71546 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 @@ -418,10 +418,11 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { media_grid.adapter = this } setupLayoutManager() - measureRecyclerViewContent(mMedia) handleGridSpacing() + measureRecyclerViewContent(mMedia) } else if (mLastSearchedText.isEmpty()) { (currAdapter as MediaAdapter).updateMedia(mMedia) + handleGridSpacing() measureRecyclerViewContent(mMedia) } else { searchQueryChanged(mLastSearchedText) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt index 86d2e56e1..25d2ffb60 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt @@ -635,15 +635,12 @@ class MediaFetcher(val context: Context) { return thumbnailItems } - var currentGridPosition = 0 val mediumGroups = LinkedHashMap>() media.forEach { val key = it.getGroupingKey(currentGrouping) if (!mediumGroups.containsKey(key)) { mediumGroups[key] = ArrayList() - currentGridPosition = 0 } - it.gridPosition = currentGridPosition++ mediumGroups[key]!!.add(it) } @@ -667,8 +664,14 @@ class MediaFetcher(val context: Context) { val today = formatDate(System.currentTimeMillis().toString(), true) val yesterday = formatDate((System.currentTimeMillis() - DAY_SECONDS * 1000).toString(), true) for ((key, value) in mediumGroups) { + var currentGridPosition = 0 val sectionKey = getFormattedKey(key, currentGrouping, today, yesterday) thumbnailItems.add(ThumbnailSection(sectionKey)) + + value.forEach { + it.gridPosition = currentGridPosition++ + } + thumbnailItems.addAll(value) } From 1d26f03e5ccd276c93244c0bd1a696acfdeca5b7 Mon Sep 17 00:00:00 2001 From: spkprs Date: Wed, 20 Jan 2021 01:53:20 +0200 Subject: [PATCH 66/81] Update strings.xml --- app/src/main/res/values-el/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index f4a2b705d..be972dde6 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -193,8 +193,8 @@ Εμφάνιση τύπου αρχείου εικόνας Επιτρέπει την μεγέθυνση βίντεο με διπλό πάτημα Στυλ μικρογραφίας φακέλου - File thumbnail style - Thumbnail spacing + Στυλ μικρογραφίας αρχείου + Απόσταση μικρογραφιών Εμφάνιση πλήθους αρχείων σε ξεχωριστή γραμμή Εμφάνιση πλήθους αρχείων σε αγκύλες Χωρίς εμφάνιση μέτρησης αρχείων From f635e372ea8cf8aa1e21c7884edf11ec740009e6 Mon Sep 17 00:00:00 2001 From: AlbatorV Date: Wed, 20 Jan 2021 09:00:41 +0100 Subject: [PATCH 67/81] Update strings.xml --- app/src/main/res/values-fr/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f431fc1b9..e87c78775 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -194,7 +194,7 @@ Zoomer les vidéos par un double appui Style des miniatures des dossiers Style des miniatures des fichiers - Thumbnail spacing + Espacement des miniatures Afficher le nombre de fichiers sur une autre ligne Afficher le nombre de fichiers entre parenthèses Ne pas afficher le nombre de fichiers From 23dfea83e6b2309543004b534380359cdb37b92a Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 20 Jan 2021 12:28:02 +0100 Subject: [PATCH 68/81] improve the scrollbar height calculation, take spacing into consideration --- .../gallery/pro/activities/MediaActivity.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 ed1e71546..6f4b09cb1 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 @@ -707,7 +707,8 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { private fun calculateContentWidth(media: ArrayList) { val layoutManager = media_grid.layoutManager as MyGridLayoutManager val thumbnailWidth = layoutManager.getChildAt(0)?.width ?: 0 - val fullWidth = ((media.size - 1) / layoutManager.spanCount + 1) * thumbnailWidth + val spacing = config.thumbnailSpacing + val fullWidth = ((media.size - 1) / layoutManager.spanCount + 1) * (thumbnailWidth + spacing) - spacing media_horizontal_fastscroller.setContentWidth(fullWidth) media_horizontal_fastscroller.setScrollToX(media_grid.computeHorizontalScrollOffset()) } @@ -734,7 +735,8 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { } } - fullHeight += ((curSectionItems - 1) / layoutManager.spanCount + 1) * thumbnailHeight + val spacing = config.thumbnailSpacing + fullHeight += ((curSectionItems - 1) / layoutManager.spanCount + 1) * (thumbnailHeight + spacing) - spacing media_vertical_fastscroller.setContentHeight(fullHeight) media_vertical_fastscroller.setScrollToY(media_grid.computeVerticalScrollOffset()) } From b8e63ae74ee969e3b447e7eedfd5fc863529240b Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 20 Jan 2021 22:49:02 +0100 Subject: [PATCH 69/81] update media thumbnails grid decoration only when needed --- .../gallery/pro/activities/MediaActivity.kt | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) 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 6f4b09cb1..740877462 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 @@ -742,17 +742,25 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { } private fun handleGridSpacing() { - if (media_grid.itemDecorationCount > 0) { - media_grid.removeItemDecorationAt(0) - } - val viewType = config.getFolderViewType(if (mShowAll) SHOW_ALL else mPath) if (viewType == VIEW_TYPE_GRID) { val spanCount = config.mediaColumnCnt val spacing = config.thumbnailSpacing val useGridPosition = mMedia.firstOrNull() is ThumbnailSection - val decoration = GridSpacingItemDecoration(spanCount, spacing, config.scrollHorizontally, config.fileRoundedCorners, mMedia, useGridPosition) - media_grid.addItemDecoration(decoration) + + var currentGridDecoration: GridSpacingItemDecoration? = null + if (media_grid.itemDecorationCount > 0) { + currentGridDecoration = media_grid.getItemDecorationAt(0) as GridSpacingItemDecoration + currentGridDecoration.items = mMedia + } + + val newGridDecoration = GridSpacingItemDecoration(spanCount, spacing, config.scrollHorizontally, config.fileRoundedCorners, mMedia, useGridPosition) + if (currentGridDecoration.toString() != newGridDecoration.toString()) { + if (currentGridDecoration != null) { + media_grid.removeItemDecoration(currentGridDecoration) + } + media_grid.addItemDecoration(newGridDecoration) + } } } From ff4bca1251ce3d17b326554fdb1717f7d54cc140 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 20 Jan 2021 22:49:29 +0100 Subject: [PATCH 70/81] allow interpreting grid decoration as string --- .../gallery/pro/helpers/GridSpacingItemDecoration.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt index d6d0f7ca7..f9c991740 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt @@ -7,7 +7,10 @@ import com.simplemobiletools.gallery.pro.models.Medium import com.simplemobiletools.gallery.pro.models.ThumbnailItem class GridSpacingItemDecoration(val spanCount: Int, val spacing: Int, val isScrollingHorizontally: Boolean, val addSideSpacing: Boolean, - val items: ArrayList, val useGridPosition: Boolean) : RecyclerView.ItemDecoration() { + var items: ArrayList, val useGridPosition: Boolean) : RecyclerView.ItemDecoration() { + + override fun toString() = "spanCount: $spanCount, spacing: $spacing, isScrollingHorizontally: $isScrollingHorizontally, addSideSpacing: $addSideSpacing, " + + "items: ${items.hashCode()}, useGridPosition: $useGridPosition" override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { val position = parent.getChildAdapterPosition(view) From 58a9150db03f6282f2f0ae3a4cf8fa6b4346c461 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 20 Jan 2021 22:49:45 +0100 Subject: [PATCH 71/81] update currently displayed media hashcode if something gets deleted --- .../com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt | 1 + 1 file changed, 1 insertion(+) 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 51e829d66..2fec95f6b 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 @@ -440,6 +440,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: ArrayList Date: Wed, 20 Jan 2021 23:12:39 +0100 Subject: [PATCH 72/81] properly handle grid updating if a thumbnail gets deleted --- .../gallery/pro/activities/MediaActivity.kt | 17 +++++++++++++++++ .../gallery/pro/activities/SearchActivity.kt | 3 +++ .../gallery/pro/adapters/MediaAdapter.kt | 1 + .../pro/interfaces/MediaOperationsListener.kt | 3 +++ 4 files changed, 24 insertions(+) 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 740877462..763295a73 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 @@ -46,6 +46,7 @@ import kotlinx.android.synthetic.main.activity_media.* import java.io.File import java.io.IOException import java.util.* +import kotlin.collections.ArrayList class MediaActivity : SimpleActivity(), MediaOperationsListener { private val LAST_MEDIA_CHECK_PERIOD = 3000L @@ -989,6 +990,22 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { finish() } + override fun updateMediaGridDecoration(media: ArrayList) { + var currentGridPosition = 0 + media.forEach { + if (it is Medium) { + it.gridPosition = currentGridPosition++ + } else if (it is ThumbnailSection) { + currentGridPosition = 0 + } + } + + if (media_grid.itemDecorationCount > 0) { + val currentGridDecoration = media_grid.getItemDecorationAt(0) as GridSpacingItemDecoration + currentGridDecoration.items = media + } + } + private fun setAsDefaultFolder() { config.defaultFolder = mPath invalidateOptionsMenu() diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SearchActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SearchActivity.kt index 24c48600b..6a5b30483 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SearchActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SearchActivity.kt @@ -379,4 +379,7 @@ class SearchActivity : SimpleActivity(), MediaOperationsListener { override fun selectedPaths(paths: ArrayList) { } + + override fun updateMediaGridDecoration(media: ArrayList) { + } } 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 2fec95f6b..fa04937fc 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 @@ -439,6 +439,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: ArrayList) fun selectedPaths(paths: ArrayList) + + fun updateMediaGridDecoration(media: ArrayList) } From c68f8522b857768e1923267c5a43e1d148afe80a Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 20 Jan 2021 23:37:28 +0100 Subject: [PATCH 73/81] adding some search related grid improvements --- .../gallery/pro/activities/MediaActivity.kt | 9 +++++---- .../gallery/pro/activities/SearchActivity.kt | 10 +++++----- .../gallery/pro/adapters/MediaAdapter.kt | 10 ++++------ app/src/main/res/layout/activity_search.xml | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) 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 763295a73..19c361a43 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 @@ -371,6 +371,7 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { media_empty_text_placeholder.beGone() } + handleGridSpacing(grouped) getMediaAdapter()?.updateMedia(grouped) measureRecyclerViewContent(grouped) } @@ -742,20 +743,20 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { media_vertical_fastscroller.setScrollToY(media_grid.computeVerticalScrollOffset()) } - private fun handleGridSpacing() { + private fun handleGridSpacing(media: ArrayList = mMedia) { val viewType = config.getFolderViewType(if (mShowAll) SHOW_ALL else mPath) if (viewType == VIEW_TYPE_GRID) { val spanCount = config.mediaColumnCnt val spacing = config.thumbnailSpacing - val useGridPosition = mMedia.firstOrNull() is ThumbnailSection + val useGridPosition = media.firstOrNull() is ThumbnailSection var currentGridDecoration: GridSpacingItemDecoration? = null if (media_grid.itemDecorationCount > 0) { currentGridDecoration = media_grid.getItemDecorationAt(0) as GridSpacingItemDecoration - currentGridDecoration.items = mMedia + currentGridDecoration.items = media } - val newGridDecoration = GridSpacingItemDecoration(spanCount, spacing, config.scrollHorizontally, config.fileRoundedCorners, mMedia, useGridPosition) + val newGridDecoration = GridSpacingItemDecoration(spanCount, spacing, config.scrollHorizontally, config.fileRoundedCorners, media, useGridPosition) if (currentGridDecoration.toString() != newGridDecoration.toString()) { if (currentGridDecoration != null) { media_grid.removeItemDecoration(currentGridDecoration) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SearchActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SearchActivity.kt index 6a5b30483..769d65e90 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SearchActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SearchActivity.kt @@ -124,8 +124,8 @@ class SearchActivity : SimpleActivity(), MediaOperationsListener { media_empty_text_placeholder.beGone() } - getMediaAdapter()?.updateMedia(grouped) handleGridSpacing(grouped) + getMediaAdapter()?.updateMedia(grouped) measureRecyclerViewContent(grouped) } } catch (ignored: Exception) { @@ -159,12 +159,12 @@ class SearchActivity : SimpleActivity(), MediaOperationsListener { } private fun handleGridSpacing(media: ArrayList) { - if (media_grid.itemDecorationCount > 0) { - media_grid.removeItemDecorationAt(0) - } - val viewType = config.getFolderViewType(SHOW_ALL) if (viewType == VIEW_TYPE_GRID) { + if (media_grid.itemDecorationCount > 0) { + media_grid.removeItemDecorationAt(0) + } + val spanCount = config.mediaColumnCnt val spacing = config.thumbnailSpacing val decoration = GridSpacingItemDecoration(spanCount, spacing, config.scrollHorizontally, config.fileRoundedCorners, media, true) 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 fa04937fc..6f9b3a168 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 @@ -457,12 +457,10 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: ArrayList if (thumbnailItems.hashCode() != currentMediaHash) { currentMediaHash = thumbnailItems.hashCode() - Handler().postDelayed({ - media = thumbnailItems - enableInstantLoad() - notifyDataSetChanged() - finishActMode() - }, 100L) + media = thumbnailItems + enableInstantLoad() + notifyDataSetChanged() + finishActMode() } } diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index cee91220e..6ab0974b7 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/media_holder" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="match_parent"> Date: Thu, 21 Jan 2021 10:52:15 +0100 Subject: [PATCH 74/81] simplify thumbnail spacing calculations --- .../dialogs/ChangeFileThumbnailStyleDialog.kt | 19 ++++++++----------- .../gallery/pro/helpers/Config.kt | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt index 6c4b33092..5498c66b8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFileThumbnailStyleDialog.kt @@ -10,7 +10,6 @@ import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.gallery.pro.R import com.simplemobiletools.gallery.pro.extensions.config import kotlinx.android.synthetic.main.dialog_change_file_thumbnail_style.view.* -import java.text.DecimalFormat class ChangeFileThumbnailStyleDialog(val activity: BaseSimpleActivity) : DialogInterface.OnClickListener { private var config = activity.config @@ -32,13 +31,13 @@ class ChangeFileThumbnailStyleDialog(val activity: BaseSimpleActivity) : DialogI dialog_file_style_spacing_holder.setOnClickListener { val items = arrayListOf( RadioItem(0, "0x"), - RadioItem(1, "0.5x"), - RadioItem(2, "1x"), - RadioItem(4, "2x"), - RadioItem(8, "4x"), - RadioItem(16, "8x"), - RadioItem(32, "16x"), - RadioItem(64, "32x")) + RadioItem(1, "1x"), + RadioItem(2, "2x"), + RadioItem(4, "4x"), + RadioItem(8, "8x"), + RadioItem(16, "16x"), + RadioItem(32, "32x"), + RadioItem(64, "64x")) RadioGroupDialog(activity, items, thumbnailSpacing) { thumbnailSpacing = it as Int @@ -66,8 +65,6 @@ class ChangeFileThumbnailStyleDialog(val activity: BaseSimpleActivity) : DialogI } private fun updateThumbnailSpacingText() { - val number = thumbnailSpacing * 0.5 - val format = DecimalFormat("0.#") - view.dialog_file_style_spacing.text = "${format.format(number)}x" + view.dialog_file_style_spacing.text = "${thumbnailSpacing}x" } } 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 960559e33..bc5e2f9a2 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 @@ -509,7 +509,7 @@ class Config(context: Context) : BaseConfig(context) { set(limitFolderTitle) = prefs.edit().putBoolean(LIMIT_FOLDER_TITLE, limitFolderTitle).apply() var thumbnailSpacing: Int - get() = prefs.getInt(THUMBNAIL_SPACING, 2) + get() = prefs.getInt(THUMBNAIL_SPACING, 1) set(thumbnailSpacing) = prefs.edit().putInt(THUMBNAIL_SPACING, thumbnailSpacing).apply() var fileRoundedCorners: Boolean From fde725e98ea738a8df227523f9b4e4ff811c8fe6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 21 Jan 2021 11:03:40 +0100 Subject: [PATCH 75/81] lets use the new GridDecoration only when needed, not by default --- .../gallery/pro/activities/MediaActivity.kt | 6 +++--- .../gallery/pro/adapters/MediaAdapter.kt | 8 ++++++++ .../gallery/pro/helpers/GridSpacingItemDecoration.kt | 4 ++++ 3 files changed, 15 insertions(+), 3 deletions(-) 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 19c361a43..731ac3e6d 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 @@ -157,13 +157,13 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { } if (mStoredThumbnailSpacing != config.thumbnailSpacing) { - handleGridSpacing() + media_grid.adapter = null + setupAdapter() } if (mStoredRoundedCorners != config.fileRoundedCorners) { - handleGridSpacing() media_grid.adapter = null - getMedia() + setupAdapter() } media_horizontal_fastscroller.updateBubbleColors() 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 6f9b3a168..9139e10f9 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 @@ -499,6 +499,14 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: ArrayList Date: Thu, 21 Jan 2021 11:14:05 +0100 Subject: [PATCH 76/81] update version to 5.33.7 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index e2b703bf4..9e464b755 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.33.6' + implementation 'com.simplemobiletools:commons:5.33.7' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' From 588b144c713006a9358d2ad0bcad90a8e6c78ecc Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 21 Jan 2021 11:14:42 +0100 Subject: [PATCH 77/81] fixing the previous changelog file --- fastlane/metadata/android/en-US/changelogs/{333.txt => 334.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename fastlane/metadata/android/en-US/changelogs/{333.txt => 334.txt} (100%) diff --git a/fastlane/metadata/android/en-US/changelogs/333.txt b/fastlane/metadata/android/en-US/changelogs/334.txt similarity index 100% rename from fastlane/metadata/android/en-US/changelogs/333.txt rename to fastlane/metadata/android/en-US/changelogs/334.txt From 28fb68cd3ed599311dba6c7eca30e216866c6f48 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 21 Jan 2021 11:30:15 +0100 Subject: [PATCH 78/81] update version to 6.19.0 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9e464b755..096eddbd6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "com.simplemobiletools.gallery.pro" minSdkVersion 21 targetSdkVersion 29 - versionCode 334 - versionName "6.18.3" + versionCode 335 + versionName "6.19.0" setProperty("archivesBaseName", "gallery-$versionCode") vectorDrawables.useSupportLibrary = true } From aa110563b376ba80b81a47d59be3d3c0a3da99c5 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 21 Jan 2021 11:30:25 +0100 Subject: [PATCH 79/81] updating changelog --- CHANGELOG.md | 7 +++++++ fastlane/metadata/android/en-US/changelogs/335.txt | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/335.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index a9c0c92bf..8bf95193a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Changelog ========== +Version 6.19.0 *(2021-01-21)* +---------------------------- + + * Allow easily clearing the app cache from the app settings + * Allow customizing the spacing between file thumbnails, or using rounded corners + * Many other performance, UI, UX, translation and stability improvements + Version 6.18.3 *(2021-01-14)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/335.txt b/fastlane/metadata/android/en-US/changelogs/335.txt new file mode 100644 index 000000000..e356cf552 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/335.txt @@ -0,0 +1,3 @@ + * Allow easily clearing the app cache from the app settings + * Allow customizing the spacing between file thumbnails, or using rounded corners + * Many other performance, UI, UX, translation and stability improvements From d50471fa3061060bde3cb26da6fe0c4f617d63aa Mon Sep 17 00:00:00 2001 From: Enara Larraitz Date: Thu, 21 Jan 2021 21:51:55 +0100 Subject: [PATCH 80/81] Created values-eu and started translating. Not finished. --- app/src/main/res/values-eu/strings.xml | 427 +++++++++++++++++++++++++ 1 file changed, 427 insertions(+) create mode 100644 app/src/main/res/values-eu/strings.xml diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml new file mode 100644 index 000000000..c4b2f2d36 --- /dev/null +++ b/app/src/main/res/values-eu/strings.xml @@ -0,0 +1,427 @@ + + + Galeria sinplea + Galeria + Editatu + Ireki kamera + (ezkutatuta) + (baztertuta) + Ainguratu karpeta + Kendu aingura karpetari + Ainguratu goian + Erakutsi karpeta guztien edukia + Karpeta guztiak + Aldatu karpeta-ikuspegira + Bestelako karpeta + Erakutsi mapan + Kokapen ezezaguna + Bolumena + Distira + Blokeatu orientazioa + Desblokeatu orientazioa + Aldatu orientazioa + Behartu bertikala + Behartu horizontala + Erabili lehenetsitako orientazioa + Konpondu ateratze-dataren balioa + Konpontzen… + Datak ongi konpondu dira + Ateratze-dataren baliorik ez da aurkitu + Partekatu tamaina aldatutako bertsioa + Kaixo,\n\nbadirudi doako aplikazio zaharra eguneratu duzula. Orain bertsio zaharra desinstalatu dezakezu aplikazioaren ezarpenen goiko aldean dagoen \'Eskuratu Pro bertsioa\' botoiarekin. Azkenik, zakarrontzian dituzun elementuak ezabatuko dira, gogoko elementuei marka kenduko zaie eta zure azplikazio-ezarpenak berrezarri beharko dituzu.\n\nEskerrik asko! + Aldatu fitxategi-bilaketa ikusgai dauden karpeta guztien artean + Ezarri lehenetsitako karpeta gisa + Kendu karpeta lehenetsitako karpeta gisa + + + Iragazi multimedia + Irudiak + Bideoak + GIFak + RAW irudiak + SVGak + Erretratuak + Hautatutako filtroa duen multimedia fitxategirik ez da aurkitu. + Aldatu filtroak + + + Funtzio honek karpeta \'.nomedia\' fitxategi bat gehituz ezkutatzen du, azpikarpeta guztiak ere ezkutatuko ditu. Ezarpenetako \'Erakutsi ezkutatutako elementuak\' aukera aldatuz ikus ditzakezu. Jarraitu? + Baztertu + Baztertutako karpetak + Kudeatu baztertutako karpetak + Honek hautatutakoa bere azpikarpetekin baztertutako ditu Galeria Sinpletik soilik. Baztertutako karpetak ezarpenetan kudeatu ditzakezu. + Baztertu nagusia horren ordez? + Karpetak baztertzeak hauek eta beren azpikarpetak Galeria Sinplean soilik ezkutatuko ditu, beste aplikazioetan oraindik ikusgai egongo dira.\n\nBeste aplikazioetatik ere ezkutatu nahi badituzu, erabili Ezkutatu funtzioa. + Kendu guztiak + Kendu karpeta guztiak baztertutako zerrendatik? Honek ez ditu karpetak ezabatuko. + Ezkutatutako karpetak + Kudeatu ezkutatutako karpetak + Badirudi \".nomedia\" fitxategia duen ezkutatutako karpetarik ez duzula. + + + Sartutako karpetak + Kudeatu sartutako karpetak + Gehitu karpeta + Multimedia duen karpetarik baduzu, baina aplikazioak ez badu hauteman, hemen eskuz gehitu dezakezu.\n\nHainbat elementu hemen gehitzeak ez du beste karpetarik baztertuko. + Multimedia fitxategirik ez da aurkitu. Fitxategi horiek dituzten karpetak eskuz gehituz konpondu dezakezu. + + + Aldatu tamaina + Aldatu hautatutakoaren tamaina eta gorde + Zabalera + Altuera + Mantendu aspektu-erlazioa + Sartu baliozko bereizmena + + + Editorea + Biratu + Irudiaren bide-izen baliogabea + Bideoaren bide-izen baliogabea + Irudia editatzeak huts egin du + Bideoa editatzeak huts egin du + Irudia editatzea utzi da + Bideoa editatzea utzi da + Fitxategia ongi editatu da + Irudia ongi editatu da + Bideoa ongi editatu da + Editatu irudia honekin: + Editatu bideoa honekin: + Irudi-editorerik ez da aurkitu + Bideo-editorerik ez da aurkitu + Fitxategi kokapen ezezaguna + Ezin izan da jatorrizko fitxategia gainidatzi + Biratu ezkerrera + Biratu eskuinera + Biratu 180º + Irauli + Irauli horizontalki + Irauli bertikalki + Askea + Bestelakoa + + + Horma-paper sinplea + Ezarri horma-paper gisa + Horma-paper gisa ezartzeak huts egin du + Ezarri horma-paper gis honekin: + Horma-papera ezartzen… + Horma-papera ongi ezarri da + Aspektu-erlazio bertikala + Aspektu-erlazio horizontala + Hasierako pantaila + Blokeatutako pantaila + Hasierako eta blokeatutako pantaila + + + Diaporama + Tartea (segunduak): + Sartu argazkiak + Sartu bideoak + Sartu GIFak + Ausazko ordena + Mugitu atzera + Errepikatu diaporama + Animazioa + Batere ez + Lausotu + Diapositiba + Diaporama bukatu da + Diaporamarako multimediarik ez da aurkitu + + + Taldekatu zuzeneko azpikarpetak + + + Taldekatu + Ez taldekatu fitxategiak + Karpeta + Azken aldaketa + Azken aldaketa (egunero) + Azken aldaketa (hilero) + Ateratze-data + Ateratze-data (egunero) + Ateratze-data (hilero) + Fitxategi mota + Luzapena + Kontuan hartu taldekatzea eta ordenatzea bi eremu independente direla. + + + Widgetean erakutsitako karpeta: + Erakutsi karpetaren izena + + + Erreproduzitu bideoak automatikoki + Gogoratu azken bideoaren erreprodukzio-posizioa + Aldatu fitxategi-izenaren ikusgaitasuna + Errepikatu bideoak + Animatu GIFak koadro txikietan + Gehienezko distira multimedia pantaila osoan ikustean + Moztu koadro txikiak karratutan + Erakutsi bideoen iraupena + Biratu pantaila osoko multimedia: + Sistemaren ezarpena + Gailu-biratzea + Aspektu-erlazioa + Hondo beltza pantaila osoko multimediarekin + Scroll thumbnails horizontally + Automatically hide system UI at fullscreen media + Delete empty folders after deleting their content + Allow controlling photo brightness with vertical gestures + Allow controlling video volume and brightness with vertical gestures + Show folder media count on the main view + Show extended details over fullscreen media + Manage extended details + Allow one finger zoom at fullscreen media + Allow instantly changing media by clicking on screen sides + Allow deep zooming images + Hide extended details when status bar is hidden + Show some action buttons at the bottom of the screen + Show the Recycle Bin at the folders screen + Deep zoomable images + Show images in the highest possible quality + Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture + Allow 1:1 zooming in with two double taps + Always open videos on a separate screen with new horizontal gestures + Show a notch if available + Allow rotating images with gestures + File loading priority + Speed + Compromise + Avoid showing invalid files + Show image file types + Allow zooming videos with double tapping them + Folder thumbnail style + File thumbnail style + Thumbnail spacing + Show file count on a separate line + Show file count in brackets + Do not show file count + Limit long folder titles to 1 line + Square + Rounded corners + + + Koadro txikiak + Pantaila osoko multimedia + Extended details + Bottom actions + + + Manage visible bottom actions + Toggle favorite + Toggle file visibility + + + Pertsonalizatu + Berrezarri + Karratua + Eraldatu + Filtroa + Batere ez + Doitu + Itzalak + Esposizio + Eremu distiratsuak + Distira + Kontrastea + Saturazioa + Argitasuna + Gamma + Beltzak + Zuriak + Tenperatura + Zorroztasuna + Berrezarri + Fokatzea + Batere ez + Erradiala + Lineala + Ispilua + Gaussiarra + Testua + Testu-aukerak + Testuaren kolorea + Letra-tipoa + Gehitu + Editatu + Zuzendu + Letra-tipoa + Kolorea + HP kolorea + Lerrokatzea + Aurrera + Ezabatu + Zure testua + Pintzela + Kolorea + Tamaina + Gogortasuna + Aurrera + Ezabatu + Pintzelaren kolorea + Editorea + Itxi editorea? + Ziur zaude aldaketak baztertu nahi dituzula? + Bai + Ez + Utzi + Onartu + Gorde + Esportatzen… + Esportatzen %s. + Eranskailua + Eranskailuaren kolorea + Eranskailu-aukerakSticker Options + Gehitu + Kolorea + Ezabatu + Aurrera + Zuzendu + Ordeztu + Opakutasuna + Kontrastea + Saturazioa + Distira + Igotakoak + Gainjarri + Normala + Ilundu + Pantaila + Gainjarri + Argitu + Biderkatu + Kolore erreta + Argi leuna + Argi gogorra + Batere ez + Urrea + Lightleak 1 + Mosaikoa + Papera + Euria + Vintage + Biratu H + Biratu V + Desegin + Berregin + Kolore-hautatzailea + Gardena + Zuria + Grisa + Beltza + Urdin argia + Urdina + Morea + Orkidea + Arrosa + Gorria + Laranja + Urrea + Horia + Oliba + Berdea + Akuamarinoa + Hautatu kolorea (pipeta) + Moztu + + + How can I make Simple Gallery the default device gallery? + First you have to find the currently default gallery in the Apps section of your device settings, look for a button that says something like \"Open by default\", click on it, then select \"Clear defaults\". + The next time you will try opening an image or video you should see an app picker, where you can select Simple Gallery and make it the default app. + I locked the app with a password, but I forgot it. What can I do? + You can solve it in 2 ways. You can either reinstall the app, or find the app in your device settings and select \"Clear data\". It will reset all your settings, it will not remove any media files. + How can I make an album always appear at the top? + You can long press the desired album and select the Pin icon at the actions menu, that will pin it to the top. You can pin multiple folders too, pinned items will be sorted by the default sorting method. + How can I fast forward videos? + You can do it by double tapping the side of the screen, or tapping the current or max duration texts near the seekbar. If you enable opening videos on a separate screen in the app settings, you can use horizontal gestures too. + What is the difference between hiding and excluding a folder? + Exclude prevents displaying the folder only in Simple Gallery, while Hide works system-wise and it hides the folder from other galleries too. It works by creating an empty \".nomedia\" file in the given folder, which you can then remove with any file manager too. Note that some devices do not allow hiding folders like Camera, Screenshots and Downloads. + Why do folders with music cover art or stickers show up? + It can happen that you will see some unusual albums show up. You can easily exclude them by long pressing them and selecting Exclude. In the next dialog you can then select the parent folder, chances are it will prevent the other related albums showing up too. + A folder with images isn\'t showing up, or it doesn\'t show all items. What can I do? + That can have multiple reasons, but solving it is easy. Just go in Settings -> Manage Included Folders, select Plus and navigate to the required folder. + What if I want just a few particular folders visible? + Adding a folder at the Included Folders doesn\'t automatically exclude anything. What you can do is go in Settings -> Manage Excluded Folders, exclude the root folder \"/\", then add the desired folders at Settings -> Manage Included Folders. + That will make only the selected folders visible, as both excluding and including are recursive and if a folder is both excluded and included, it will show up. + Can I crop images with this app? + Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. + Can I somehow group media file thumbnails? + Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". + I see some color banding on the images. How can I improve the quality? + The current solution for displaying images works fine in the vast majority of cases, but if you want even better image quality, you can enable the \"Show images in the highest possible quality\" at the app settings, in the \"Deep zoomable images\" section. + I have hidden a file/folder. How can I unhide it? + You can either press the \"Temporarily show hidden items\" menu item at the main screen, or toggle \"Show hidden items\" in the app settings to see the hidden item. If you want to unhide it, just long press it and select \"Unhide\". Folders are hidden by adding a hidden \".nomedia\" file into them, you can delete the file with any file manager too. + Why does the app take up so much space? + App cache can take up to 250MB, it ensures quicker image loading. If the app is taking up even more space, it is most likely caused by you having items in the Recycle Bin. Those files count to the app size. You can clear the Recycle bin by opening it and deleting all files, or from the app settings. Every file in the Bin is deleted automatically after 30 days. + + + + Simple Gallery Pro - Photo Manager & Editor + + A premium app for managing and editing your photos, videos, GIFs without ads + + Simple Gallery Pro is a highly customizable offline gallery. Organize & edit your photos, recover deleted files with the recycle bin, protect & hide files and view a huge variety of different photo & video formats including RAW, SVG and much more. + + The app contains no ads and unnecessary permissions. As the app doesn’t require internet access either, your privacy is protected. + + ------------------------------------------------- + SIMPLE GALLERY PRO – FEATURES + ------------------------------------------------- + + • Offline gallery with no ads or popups + • Simple gallery photo editor – crop, rotate, resize, draw, filters & more + • No internet access needed, giving you more privacy and security + • No unnecessary permissions required + • Quickly search images, videos & files + • Open & view many different photo and video types (RAW, SVG, panoramic etc) + • A variety of intuitive gestures to easily edit & organize files + • Lots of ways to filter, group & sort files + • Customize the appearance of Simple Gallery Pro + • Available in 32 languages + • Mark files as favorites for quick access + • Protect your photos & videos with a pattern, pin or fingerprint + • Use pin, pattern & fingerprint to protect the app launch or specific functions too + • Recover deleted photos & videos from the recycle bin + • Toggle visibility of files to hide photos & videos + • Create a customizable slideshow of your files + • View detailed information of your files (resolution, EXIF values etc) + • Simple Gallery Pro is open source + … and much much more! + + PHOTO GALLERY EDITOR + Simple Gallery Pro makes it easy to edit your pictures on the fly. Crop, flip, rotate and resize your pictures. If you’re feeling a little more creative you can add filters and draw on your pictures! + + SUPPORT FOR MANY FILE TYPES + Unlike some other gallery viewers & photo organizers, Simple Gallery Pro supports a huge range of different file types including JPEG, PNG, MP4, MKV, RAW, SVG, Panoramic photos, Panoramic videos and many more. + + HIGHLY CUSTOMIZABLE GALLERY MANAGER + From the UI to the function buttons on the bottom toolbar, Simple Gallery Pro is highly customizable and works the way you want it to. No other gallery manager has this kind of flexibility! Thanks to being open source, we’re also available in 32 languages! + + RECOVER DELETED PHOTOS & VIDEOS + Accidentally deleted a precious photo or video? Don’t worry! Simple Gallery Pro features a handy recycle bin where you can recover deleted photos & videos easily. + + PROTECT & HIDE PHOTOS, VIDEOS & FILES + Using pin, pattern or your device’s fingerprint scanner you can protect and hide photos, videos & entire albums. You can protect the app itself or place locks on specific functions of the app. For example, you can’t delete a file without a fingerprint scan, helping to protect your files from accidental deletion. + + Ikusi Simple Tools-en sorta osoa hemen: + https://www.simplemobiletools.com + + Simple Gallery Pro-ren webgune autonomoa: + https://www.simplemobiletools.com/gallery + + Facebook: + https://www.facebook.com/simplemobiletools + + Reddit: + https://www.reddit.com/r/SimpleMobileTools + + + + From 7e7d62e5e2275881f5d74fde51a455651195ffea Mon Sep 17 00:00:00 2001 From: Enara Larraitz Date: Fri, 22 Jan 2021 15:17:58 +0100 Subject: [PATCH 81/81] Finished translating main strings. FAQ and Playstore descriptions remaining. --- app/src/main/res/values-eu/strings.xml | 102 ++++++++++++------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index c4b2f2d36..6bbac8b15 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -123,7 +123,7 @@ Mugitu atzera Errepikatu diaporama Animazioa - Batere ez + Bat ere ez Lausotu Diapositiba Diaporama bukatu da @@ -155,63 +155,63 @@ Gogoratu azken bideoaren erreprodukzio-posizioa Aldatu fitxategi-izenaren ikusgaitasuna Errepikatu bideoak - Animatu GIFak koadro txikietan + Animatu GIFak iruditxoetan Gehienezko distira multimedia pantaila osoan ikustean - Moztu koadro txikiak karratutan + Moztu iruditxoak karratutan Erakutsi bideoen iraupena Biratu pantaila osoko multimedia: Sistemaren ezarpena Gailu-biratzea Aspektu-erlazioa Hondo beltza pantaila osoko multimediarekin - Scroll thumbnails horizontally - Automatically hide system UI at fullscreen media - Delete empty folders after deleting their content - Allow controlling photo brightness with vertical gestures - Allow controlling video volume and brightness with vertical gestures - Show folder media count on the main view - Show extended details over fullscreen media - Manage extended details - Allow one finger zoom at fullscreen media - Allow instantly changing media by clicking on screen sides - Allow deep zooming images - Hide extended details when status bar is hidden - Show some action buttons at the bottom of the screen - Show the Recycle Bin at the folders screen - Deep zoomable images - Show images in the highest possible quality - Show the Recycle Bin as the last item on the main screen - Allow closing the fullscreen view with a down gesture - Allow 1:1 zooming in with two double taps - Always open videos on a separate screen with new horizontal gestures - Show a notch if available - Allow rotating images with gestures - File loading priority - Speed - Compromise - Avoid showing invalid files - Show image file types - Allow zooming videos with double tapping them - Folder thumbnail style - File thumbnail style - Thumbnail spacing - Show file count on a separate line - Show file count in brackets - Do not show file count - Limit long folder titles to 1 line - Square - Rounded corners + Korritu iruditxoak horizontalki + Automatikoki ezkutatu sistemaren EI pantaila osoko multimediarekin + Ezabatu hutsik dauden karpetak beren edukia ezabatu ondoren + Baimendu argazkiaren distira kontrolatzea keinu bertikalekin + Baimendu bideoaren bolumena eta distira kontrolatzea keinu bertikalekin + Erakutsi karpetaren multimedia-kopurua ikuspegi nagusian + Erakutsi xehetasun hedatuak pantaila osoko multimedian + Kudeatu xehetasun hedatuak + Baimendu zooma hatz bakarrarekin pantaila osoko multimedian + Baimendu multimedia berehala aldatzea pantaila-ertzeetan klik eginez + Baimendu zoom sakona irudietan + Ezkutatu xehetasun hedatuak egoera-barra ezkutatuta dagoenean + Erakutsi ekintza-botoiak pantailaren beheko aldean + Erakutsi zakarrontzia karpeten pantailan + Zoom sakona egin daitezkeen irudiak + Erakutsi irudiak ahal den kalitate handienean + Erakutsi zakarrontzia azken elementu gisa pantaila nagusian + Baimendu pantaila osoko ikuspegia ixtea beherako keinuarekin + Baimendu 1:1 zooma bi aldiz birritan ukitzean + Ireki bideoak beste pantaila betean keinu horizontalekin + Erakutsi koska bat erabilgarri badago + Baimendu irudiak keinuekin biratzea + Fitxategien kargatze-lehentasuna + Abiadura + Konpromisoa + Ekidin fitxategi baliogabeak erakustea + Erakutsi irudi-fitxategi motak + Baimendu bideoen zooma birritan ukitzean + Karpeta-iruditxoaren estiloa + Fitxategi-iruditxoaren estiloa + Iruditxoen arteko tartea + Erakutsi fitxategi kopurua beste lerro batean + Erakutsi fitxategi kopurua parentesi artean + Ez erakutsi fitxategi kopurua + Mugatu karpeten izenburu luzeak lerro batera + Karratua + Ertz biribilduak - Koadro txikiak + Iruditxoak Pantaila osoko multimedia - Extended details - Bottom actions + Xehetasun hedatuak + Beheko ekintzak - Manage visible bottom actions - Toggle favorite - Toggle file visibility + Kudeatu ikusgai dauden beheko ekintzak + Aldatu gogokoa + Aldatu fitxategien ikusgaitasuna Pertsonalizatu @@ -219,7 +219,7 @@ Karratua Eraldatu Filtroa - Batere ez + Bat ere ez Doitu Itzalak Esposizio @@ -235,7 +235,7 @@ Zorroztasuna Berrezarri Fokatzea - Batere ez + Bat ere ez Erradiala Lineala Ispilua @@ -295,15 +295,15 @@ Kolore erreta Argi leuna Argi gogorra - Batere ez + Bat ere ez Urrea - Lightleak 1 + Argi-filtrazioa 1 Mosaikoa Papera Euria Vintage Biratu H - Biratu V + Biratu B Desegin Berregin Kolore-hautatzailea