From 70d68d1a4ade30b36b4f56ce0d4257b003755678 Mon Sep 17 00:00:00 2001 From: Roland Kister Date: Mon, 26 Oct 2020 09:15:53 +0100 Subject: [PATCH 01/37] Added default folder option --- .../gallery/pro/activities/MainActivity.kt | 27 +++++++++++++++++++ .../gallery/pro/activities/MediaActivity.kt | 17 ++++++++++++ .../gallery/pro/helpers/Config.kt | 4 +++ .../gallery/pro/helpers/Constants.kt | 1 + app/src/main/res/menu/menu_main.xml | 4 +++ app/src/main/res/menu/menu_media.xml | 8 ++++++ app/src/main/res/values-ar/strings.xml | 2 ++ app/src/main/res/values-az/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 ++ 43 files changed, 135 insertions(+) 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 6d9362de0..316041b11 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 @@ -93,6 +93,8 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { appLaunched(BuildConfig.APPLICATION_ID) if (savedInstanceState == null) { + openDefaultFolder() + config.temporarilyShowHidden = false config.tempSkipDeleteConfirmation = false removeTempFolder() @@ -290,6 +292,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { findItem(R.id.reduce_column_count).isVisible = config.viewTypeFolders == VIEW_TYPE_GRID && config.dirColumnCnt > 1 findItem(R.id.hide_the_recycle_bin).isVisible = useBin && config.showRecycleBinAtFolders findItem(R.id.show_the_recycle_bin).isVisible = useBin && !config.showRecycleBinAtFolders + findItem(R.id.set_as_default_folder).isVisible = config.defaultFolder != null setupSearch(this) } } @@ -315,6 +318,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { R.id.hide_the_recycle_bin -> toggleRecycleBin(false) R.id.increase_column_count -> increaseColumnCount() R.id.reduce_column_count -> reduceColumnCount() + R.id.set_as_default_folder -> setAsDefaultFolder() R.id.settings -> launchSettings() R.id.about -> launchAbout() else -> return super.onOptionsItemSelected(item) @@ -1393,4 +1397,27 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { checkWhatsNew(this, BuildConfig.VERSION_CODE) } } + + private fun setAsDefaultFolder() { + config.defaultFolder = null + invalidateOptionsMenu() + } + + private fun openDefaultFolder() { + if (config.defaultFolder == null) { + return; + } + + val defaultDir = File(config.defaultFolder!!) + + if (!defaultDir.exists() || !defaultDir.isDirectory) { + config.defaultFolder = null + return; + } + + Intent(this, MediaActivity::class.java).apply { + putExtra(DIRECTORY, defaultDir.path) + handleMediaIntent(this) + } + } } 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 532af9486..93e394b3d 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 @@ -219,6 +219,8 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.menu_media, menu) + val isDefaultFolder = config.defaultFolder != null && File(config.defaultFolder!!).compareTo(File(mPath)) == 0 + menu.apply { findItem(R.id.group).isVisible = !config.scrollHorizontally @@ -234,6 +236,9 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { findItem(R.id.temporarily_show_hidden).isVisible = !config.shouldShowHidden findItem(R.id.stop_showing_hidden).isVisible = config.temporarilyShowHidden + findItem(R.id.set_as_default_folder).isVisible = !isDefaultFolder + findItem(R.id.unset_as_default_folder).isVisible = isDefaultFolder + val viewType = config.getFolderViewType(if (mShowAll) SHOW_ALL else mPath) findItem(R.id.increase_column_count).isVisible = viewType == VIEW_TYPE_GRID && config.mediaColumnCnt < MAX_COLUMN_COUNT findItem(R.id.reduce_column_count).isVisible = viewType == VIEW_TYPE_GRID && config.mediaColumnCnt > 1 @@ -262,6 +267,8 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden() R.id.increase_column_count -> increaseColumnCount() R.id.reduce_column_count -> reduceColumnCount() + R.id.set_as_default_folder -> setAsDefaultFolder() + R.id.unset_as_default_folder -> unsetAsDefaultFolder() R.id.slideshow -> startSlideshow() R.id.settings -> launchSettings() R.id.about -> launchAbout() @@ -937,4 +944,14 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { } finish() } + + private fun setAsDefaultFolder() { + config.defaultFolder = mPath + invalidateOptionsMenu() + } + + private fun unsetAsDefaultFolder() { + config.defaultFolder = null + invalidateOptionsMenu() + } } 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 9d70eb98c..b294ef35e 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 @@ -198,6 +198,10 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getInt(getDirectoryColumnsField(), getDefaultDirectoryColumnCount()) set(dirColumnCnt) = prefs.edit().putInt(getDirectoryColumnsField(), dirColumnCnt).apply() + var defaultFolder: String? + get() = prefs.getString(DEFAULT_FOLDER, null) + set(defaultFolder) = prefs.edit().putString(DEFAULT_FOLDER, defaultFolder).apply() + var allowInstantChange: Boolean get() = prefs.getBoolean(ALLOW_INSTANT_CHANGE, false) set(allowInstantChange) = prefs.edit().putBoolean(ALLOW_INSTANT_CHANGE, allowInstantChange).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 34497c889..568971649 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 @@ -23,6 +23,7 @@ const val DISPLAY_FILE_NAMES = "display_file_names" const val BLACK_BACKGROUND = "dark_background" const val PINNED_FOLDERS = "pinned_folders" const val FILTER_MEDIA = "filter_media" +const val DEFAULT_FOLDER = "default_folder" const val DIR_COLUMN_CNT = "dir_column_cnt" const val DIR_LANDSCAPE_COLUMN_CNT = "dir_landscape_column_cnt" const val DIR_HORIZONTAL_COLUMN_CNT = "dir_horizontal_column_cnt" diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index f8b02c0de..b67c649d6 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -58,6 +58,10 @@ android:id="@+id/reduce_column_count" android:title="@string/reduce_column_count" app:showAsAction="never"/> + + + موقع غير معروف زيادة عدد الأعمدة تقليل عدد الأعمدة + تعيين كمجلد افتراضي تغيير صورة الغلاف تحديد صورة الصوت @@ -375,6 +376,7 @@ موقع رديت: https://www.reddit.com/r/SimpleMobileTools + غير محدد كمجلد افتراضي Filter media From 7d07ae54dc4fd57d3e37e2519eb85b79e29f53e9 Mon Sep 17 00:00:00 2001 From: FTno <16176811+FTno@users.noreply.github.com> Date: Sat, 7 Nov 2020 11:22:29 +0100 Subject: [PATCH 05/37] Update strings.xml Norwegian (nb) translation update --- app/src/main/res/values-nb/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 199c0f9b2..87ab058f5 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -183,13 +183,13 @@ Unngå visning av ugyldige filer Vis bildefiltyper Tillat zooming av videoer ved å dobbelttrykke dem - Folder thumbnail style - Show file count on a separate line - Show file count in brackets - Do not show file count - Limit folder title to 1 line - Square - Rounded corners + Minibildestil for mapper + Vis antall filer på en separat linje + Vis antall filer i parentes + Ikke vis antall filer + Begrens mappetittel til 1 linje + Firkantet + Avrundede hjørner Minibilder From b35b22d0ebbfc0936b5d169f09a50d9d9ad892d1 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Nov 2020 11:45:33 +0100 Subject: [PATCH 06/37] preparing some folder customization things --- app/build.gradle | 4 +- .../pro/activities/SettingsActivity.kt | 37 +++++++++++-------- .../gallery/pro/helpers/Config.kt | 12 ++++++ .../gallery/pro/helpers/Constants.kt | 10 +++++ app/src/main/res/layout/activity_settings.xml | 27 +++++++++----- 5 files changed, 64 insertions(+), 26 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f8424da7e..7b3c48802 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,11 +77,11 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.31.19' + implementation 'com.simplemobiletools:commons:5.31.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' - implementation 'androidx.constraintlayout:constraintlayout:2.0.1' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'com.google.android.exoplayer:exoplayer-core:2.9.6' implementation 'com.google.vr:sdk-panowidget:1.180.0' implementation 'com.google.vr:sdk-videowidget:1.180.0' 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 b53113727..ce98d4286 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 @@ -14,7 +14,10 @@ import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.gallery.pro.R import com.simplemobiletools.gallery.pro.dialogs.ManageBottomActionsDialog import com.simplemobiletools.gallery.pro.dialogs.ManageExtendedDetailsDialog -import com.simplemobiletools.gallery.pro.extensions.* +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.extensions.emptyTheRecycleBin +import com.simplemobiletools.gallery.pro.extensions.mediaDB +import com.simplemobiletools.gallery.pro.extensions.showRecycleBinEmptyingDialog import com.simplemobiletools.gallery.pro.helpers.* import com.simplemobiletools.gallery.pro.models.AlbumCover import kotlinx.android.synthetic.main.activity_settings.* @@ -68,7 +71,7 @@ class SettingsActivity : SimpleActivity() { setupBottomActions() setupThumbnailVideoDuration() setupThumbnailFileTypes() - setupShowMediaCount() + setupFolderThumbnailStyle() setupKeepLastModified() setupEnablePullToRefresh() setupAllowZoomingImages() @@ -107,8 +110,8 @@ class SettingsActivity : SimpleActivity() { private fun setupSectionColors() { val adjustedPrimaryColor = getAdjustedPrimaryColor() arrayListOf(visibility_label, videos_label, thumbnails_label, scrolling_label, fullscreen_media_label, security_label, - file_operations_label, deep_zoomable_images_label, extended_details_label, bottom_actions_label, recycle_bin_label, - migrating_label).forEach { + file_operations_label, deep_zoomable_images_label, extended_details_label, bottom_actions_label, recycle_bin_label, + migrating_label).forEach { it.setTextColor(adjustedPrimaryColor) } } @@ -139,9 +142,9 @@ class SettingsActivity : SimpleActivity() { settings_file_loading_priority.text = getFileLoadingPriorityText() settings_file_loading_priority_holder.setOnClickListener { val items = arrayListOf( - RadioItem(PRIORITY_SPEED, getString(R.string.speed)), - RadioItem(PRIORITY_COMPROMISE, getString(R.string.compromise)), - RadioItem(PRIORITY_VALIDITY, getString(R.string.avoid_showing_invalid_files))) + RadioItem(PRIORITY_SPEED, getString(R.string.speed)), + RadioItem(PRIORITY_COMPROMISE, getString(R.string.compromise)), + RadioItem(PRIORITY_VALIDITY, getString(R.string.avoid_showing_invalid_files))) RadioGroupDialog(this@SettingsActivity, items, config.fileLoadingPriority) { config.fileLoadingPriority = it as Int @@ -411,14 +414,18 @@ class SettingsActivity : SimpleActivity() { } } - private fun setupShowMediaCount() { - settings_show_media_count.isChecked = config.showMediaCount - settings_show_media_count_holder.setOnClickListener { - settings_show_media_count.toggle() - config.showMediaCount = settings_show_media_count.isChecked + private fun setupFolderThumbnailStyle() { + settings_folder_thumbnail_style.text = getFolderStyleText() + settings_folder_thumbnail_style_holder.setOnClickListener { + } } + private fun getFolderStyleText() = getString(when (config.folderStyle) { + FOLDER_STYLE_SQUARE -> R.string.square + else -> R.string.rounded_corners + }) + private fun setupKeepLastModified() { settings_keep_last_modified.isChecked = config.keepLastModified settings_keep_last_modified_holder.setOnClickListener { @@ -517,9 +524,9 @@ class SettingsActivity : SimpleActivity() { settings_screen_rotation.text = getScreenRotationText() settings_screen_rotation_holder.setOnClickListener { val items = arrayListOf( - RadioItem(ROTATE_BY_SYSTEM_SETTING, getString(R.string.screen_rotation_system_setting)), - RadioItem(ROTATE_BY_DEVICE_ROTATION, getString(R.string.screen_rotation_device_rotation)), - RadioItem(ROTATE_BY_ASPECT_RATIO, getString(R.string.screen_rotation_aspect_ratio))) + RadioItem(ROTATE_BY_SYSTEM_SETTING, getString(R.string.screen_rotation_system_setting)), + RadioItem(ROTATE_BY_DEVICE_ROTATION, getString(R.string.screen_rotation_device_rotation)), + RadioItem(ROTATE_BY_ASPECT_RATIO, getString(R.string.screen_rotation_aspect_ratio))) RadioGroupDialog(this@SettingsActivity, items, config.screenRotation) { config.screenRotation = it as Int 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 2ef341feb..1f4f5e20c 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 @@ -495,4 +495,16 @@ class Config(context: Context) : BaseConfig(context) { var wereFavoritesMigrated: Boolean get() = prefs.getBoolean(WERE_FAVORITES_MIGRATED, false) set(wereFavoritesMigrated) = prefs.edit().putBoolean(WERE_FAVORITES_MIGRATED, wereFavoritesMigrated).apply() + + var showFolderMediaCount: Int + get() = prefs.getInt(FOLDER_MEDIA_COUNT, FOLDER_MEDIA_CNT_LINE) + set(showFolderMediaCount) = prefs.edit().putInt(FOLDER_MEDIA_COUNT, showFolderMediaCount).apply() + + var folderStyle: Int + get() = prefs.getInt(FOLDER_THUMBNAIL_STYLE, FOLDER_STYLE_SQUARE) + set(folderStyle) = prefs.edit().putInt(FOLDER_THUMBNAIL_STYLE, folderStyle).apply() + + var limitFolderTitle: Boolean + get() = prefs.getBoolean(LIMIT_FOLDER_TITLE, false) + set(limitFolderTitle) = prefs.edit().putBoolean(LIMIT_FOLDER_TITLE, limitFolderTitle).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 956df3884..c3a5e7ffd 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 @@ -83,6 +83,9 @@ const val EDITOR_BRUSH_COLOR = "editor_brush_color" const val EDITOR_BRUSH_HARDNESS = "editor_brush_hardness" const val EDITOR_BRUSH_SIZE = "editor_brush_size" 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" // slideshow const val SLIDESHOW_INTERVAL = "slideshow_interval" @@ -224,3 +227,10 @@ const val HIGH_TILE_DPI = 280 const val ROUNDED_CORNERS_NONE = 1 const val ROUNDED_CORNERS_SMALL = 2 const val ROUNDED_CORNERS_BIG = 3 + +const val FOLDER_MEDIA_CNT_LINE = 1 +const val FOLDER_MEDIA_CNT_BRACKETS = 2 +const val FOLDER_MEDIA_CNT_NONE = 3 + +const val FOLDER_STYLE_SQUARE = 1 +const val FOLDER_STYLE_ROUNDED_CORNERS = 2 diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 71b45e925..399715167 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -436,25 +436,34 @@ + android:paddingBottom="@dimen/bigger_margin"> - + android:paddingEnd="@dimen/medium_margin" + android:text="@string/folder_thumbnail_style" /> + + From 20ef1924a796e6e18e2e4ee3e429b428e9df047b Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Nov 2020 15:31:56 +0100 Subject: [PATCH 07/37] creating the thumbnail customization dialog --- .../pro/activities/SettingsActivity.kt | 3 +- .../pro/dialogs/ChangeThumbnailStyleDialog.kt | 29 +++++++ .../layout/dialog_change_thumbnail_style.xml | 85 +++++++++++++++++++ 3 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt create mode 100644 app/src/main/res/layout/dialog_change_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 ce98d4286..657f1e791 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.ChangeThumbnailStyleDialog import com.simplemobiletools.gallery.pro.dialogs.ManageBottomActionsDialog import com.simplemobiletools.gallery.pro.dialogs.ManageExtendedDetailsDialog import com.simplemobiletools.gallery.pro.extensions.config @@ -417,7 +418,7 @@ class SettingsActivity : SimpleActivity() { private fun setupFolderThumbnailStyle() { settings_folder_thumbnail_style.text = getFolderStyleText() settings_folder_thumbnail_style_holder.setOnClickListener { - + ChangeThumbnailStyleDialog(this) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt new file mode 100644 index 000000000..065dd83a3 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt @@ -0,0 +1,29 @@ +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 + +class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity) : DialogInterface.OnClickListener { + private var config = activity.config + private var view: View = activity.layoutInflater.inflate(R.layout.dialog_change_thumbnail_style, null).apply { + + } + + init { + 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) { + + } +} diff --git a/app/src/main/res/layout/dialog_change_thumbnail_style.xml b/app/src/main/res/layout/dialog_change_thumbnail_style.xml new file mode 100644 index 000000000..b09888c63 --- /dev/null +++ b/app/src/main/res/layout/dialog_change_thumbnail_style.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 01efb1bf81f39c42a4c4c3d83f8d2e263cc5cb32 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Nov 2020 15:49:34 +0100 Subject: [PATCH 08/37] store the selected customization related values --- .../pro/activities/SettingsActivity.kt | 4 +- .../pro/dialogs/ChangeThumbnailStyleDialog.kt | 50 +++++++++++++++++-- 2 files changed, 49 insertions(+), 5 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 657f1e791..536b2fabb 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 @@ -418,7 +418,9 @@ class SettingsActivity : SimpleActivity() { private fun setupFolderThumbnailStyle() { settings_folder_thumbnail_style.text = getFolderStyleText() settings_folder_thumbnail_style_holder.setOnClickListener { - ChangeThumbnailStyleDialog(this) + ChangeThumbnailStyleDialog(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/ChangeThumbnailStyleDialog.kt index 065dd83a3..0d66e44e3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt @@ -7,23 +7,65 @@ 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 com.simplemobiletools.gallery.pro.helpers.* +import kotlinx.android.synthetic.main.dialog_change_thumbnail_style.view.* -class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity) : DialogInterface.OnClickListener { +class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity, val callback: () -> Unit) : DialogInterface.OnClickListener { private var config = activity.config - private var view: View = activity.layoutInflater.inflate(R.layout.dialog_change_thumbnail_style, null).apply { - - } + private var view: View init { + view = activity.layoutInflater.inflate(R.layout.dialog_change_thumbnail_style, null).apply { + dialog_limit_title.isChecked = config.limitFolderTitle + } + AlertDialog.Builder(activity) .setPositiveButton(R.string.ok, this) .setNegativeButton(R.string.cancel, null) .create().apply { activity.setupDialogStuff(view, this) } + + setupStyle() + setupMediaCount() + } + + private fun setupStyle() { + val styleRadio = view.dialog_radio_style + val styleBtn = when (config.folderStyle) { + FOLDER_STYLE_SQUARE -> styleRadio.dialog_radio_square + else -> styleRadio.dialog_radio_rounded_corners + } + + styleBtn.isChecked = true + } + + private fun setupMediaCount() { + val countRadio = view.dialog_radio_count_holder + 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 + } + + countBtn.isChecked = true } override fun onClick(dialog: DialogInterface, which: Int) { + val style = when (view.dialog_radio_style.checkedRadioButtonId) { + R.id.dialog_radio_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 + else -> FOLDER_MEDIA_CNT_NONE + } + + config.folderStyle = style + config.showFolderMediaCount = count + config.limitFolderTitle = view.dialog_limit_title.isChecked + callback() } } From 5218f8f359e9577f9f94aad894b16f6f3366957c Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Nov 2020 18:40:45 +0100 Subject: [PATCH 09/37] adding a sample image at thumbnail style customizatation dialog --- .../pro/dialogs/ChangeThumbnailStyleDialog.kt | 38 +++++++++++++++++++ .../layout/dialog_change_thumbnail_style.xml | 14 +++++++ .../main/res/layout/directory_item_grid.xml | 7 +++- 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt index 0d66e44e3..cb5560687 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt @@ -3,12 +3,17 @@ package com.simplemobiletools.gallery.pro.dialogs import android.content.DialogInterface import android.view.View import androidx.appcompat.app.AlertDialog +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions import com.simplemobiletools.commons.activities.BaseSimpleActivity +import com.simplemobiletools.commons.extensions.beGone +import com.simplemobiletools.commons.extensions.beVisible 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.directory_item_grid.view.* class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity, val callback: () -> Unit) : DialogInterface.OnClickListener { private var config = activity.config @@ -28,6 +33,7 @@ class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity, val callback: setupStyle() setupMediaCount() + updateSample() } private fun setupStyle() { @@ -42,6 +48,10 @@ class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity, val callback: private fun setupMediaCount() { val countRadio = view.dialog_radio_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 @@ -51,6 +61,34 @@ class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity, val callback: countBtn.isChecked = true } + private fun updateSample() { + val photoCount = 36 + val folderName = "Camera" + view.apply { + when (dialog_radio_count_holder.checkedRadioButtonId) { + R.id.dialog_radio_count_line -> { + dir_name.text = folderName + photo_cnt.text = photoCount.toString() + photo_cnt.beVisible() + } + R.id.dialog_radio_count_brackets -> { + photo_cnt.beGone() + dir_name.text = "${dir_name.text} ($photoCount)" + } + else -> { + dir_name.text = folderName + photo_cnt.beGone() + } + } + + val options = RequestOptions().centerCrop() + Glide.with(activity) + .load(R.drawable.sample_logo) + .apply(options) + .into(dir_thumbnail) + } + } + override fun onClick(dialog: DialogInterface, which: Int) { val style = when (view.dialog_radio_style.checkedRadioButtonId) { R.id.dialog_radio_square -> FOLDER_STYLE_SQUARE diff --git a/app/src/main/res/layout/dialog_change_thumbnail_style.xml b/app/src/main/res/layout/dialog_change_thumbnail_style.xml index b09888c63..b675a42d6 100644 --- a/app/src/main/res/layout/dialog_change_thumbnail_style.xml +++ b/app/src/main/res/layout/dialog_change_thumbnail_style.xml @@ -13,10 +13,24 @@ android:paddingTop="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin"> + + + + + + + android:textSize="@dimen/normal_text_size" + tools:src="Camera" /> + android:textSize="@dimen/normal_text_size" + tools:text="36" /> From fe5cb84cccfa821d030dc8662bfd295455b2acde Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Nov 2020 18:41:55 +0100 Subject: [PATCH 10/37] show proper folder name at style sample --- .../gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt index cb5560687..f1ebe0fa3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt @@ -73,7 +73,7 @@ class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity, val callback: } R.id.dialog_radio_count_brackets -> { photo_cnt.beGone() - dir_name.text = "${dir_name.text} ($photoCount)" + dir_name.text = "$folderName ($photoCount)" } else -> { dir_name.text = folderName From 781adcfa1081c07a2d35bd6f789fe7dd4e5d0964 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Nov 2020 19:15:05 +0100 Subject: [PATCH 11/37] renaming the directory thumbnail file, append square --- .../simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt | 2 +- app/src/main/res/layout/dialog_change_thumbnail_style.xml | 2 +- .../{directory_item_grid.xml => directory_item_grid_square.xml} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename app/src/main/res/layout/{directory_item_grid.xml => directory_item_grid_square.xml} (100%) 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 c85b0927c..06d5e574b 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 @@ -61,7 +61,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList diff --git a/app/src/main/res/layout/directory_item_grid.xml b/app/src/main/res/layout/directory_item_grid_square.xml similarity index 100% rename from app/src/main/res/layout/directory_item_grid.xml rename to app/src/main/res/layout/directory_item_grid_square.xml From 627781b452b0d5e356ba91285754968928d118fd Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Nov 2020 19:40:21 +0100 Subject: [PATCH 12/37] updating a string to make it clearer --- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-az/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 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index f65ab2bc9..c4b03b12e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 2788dacbd..2f8df97fb 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 80898f313..96e0d299d 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 0f7066c0c..ee613d6e1 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index b846125a3..89f0a8062 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 91e479727..d3f3238f7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 36f4f369d..45e6acaf7 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f4b7a19d6..33c294ced 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index fed06d1f6..c1f02a950 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5d3a7a4a1..31374644b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 7c00ddd43..7075a6c32 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index b6f820ac1..3454bdd25 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 8aa1753a9..c50da101b 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 948645ae9..5fae1acca 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index dc9b09881..e30bf40e6 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index fad2b6c18..d59bcb533 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 1b0f81137..575b06975 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 2a5038e69..1baad8c76 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 5fa2e4661..33520bc4c 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 87ab058f5..97ec2b005 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -187,7 +187,7 @@ Vis antall filer på en separat linje Vis antall filer i parentes Ikke vis antall filer - Begrens mappetittel til 1 linje + Limit long folder titles to 1 line Firkantet Avrundede hjørner diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index e3ba19aab..fba8a6684 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 87b9638f0..7ca2db40a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 7c23bb807..b57e8b69d 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 8f95f95a2..99b17c49f 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 58f2b8be9..956cc0370 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f3eb854aa..fce836016 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -187,7 +187,7 @@ Показывать количество файлов отдельной строкой Показывать количество файлов в скобках Не показывать количество файлов - Заголовок папки одной строкой + Limit long folder titles to 1 line Квадраты Закруглённые углы diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index a58487c92..d2b2fd904 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -187,7 +187,7 @@ Zobraziť počet súborov na samostatnom riadku Zobraziť počet súborov v zátvorkách Nezobrazovať počet súborov - Obmedziť názov priečinka na 1 riadok + Obmedziť názvy dlhých priečinkov na 1 riadok Štvorec Zaoblené rohy diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 108b0a8a8..c62c55218 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 57e2c1849..2e47376f5 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index ef33d76d2..bcb68778e 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 44d6a9c5a..4967d51b4 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 06a009c59..23a000f9b 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index b4b360154..1c97d5e6f 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 28edc12be..6d7ea1647 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 1686f2a2e..4a96cd879 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -194,7 +194,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 833320b29..9b3ffa0e7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c596d6f9c..f50415fac 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -187,7 +187,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners From b613ab02ab5e8691c03ee1fc89502d09ea225a8e Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Nov 2020 19:42:07 +0100 Subject: [PATCH 13/37] finishing up the thumbnail customizer dialog --- .../gallery/pro/adapters/DirectoryAdapter.kt | 12 +-- .../pro/dialogs/ChangeThumbnailStyleDialog.kt | 41 ++++++-- .../main/res/drawable-hdpi/sample_logo.png | Bin 0 -> 4679 bytes .../main/res/drawable-xhdpi/sample_logo.png | Bin 0 -> 8617 bytes .../main/res/drawable-xxhdpi/sample_logo.png | Bin 0 -> 13031 bytes .../main/res/drawable-xxxhdpi/sample_logo.png | Bin 0 -> 15818 bytes .../layout/dialog_change_thumbnail_style.xml | 12 +-- .../directory_item_grid_rounded_corners.xml | 97 ++++++++++++++++++ app/src/main/res/values/dimens.xml | 1 + 9 files changed, 138 insertions(+), 25 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/sample_logo.png create mode 100644 app/src/main/res/drawable-xhdpi/sample_logo.png create mode 100644 app/src/main/res/drawable-xxhdpi/sample_logo.png create mode 100644 app/src/main/res/drawable-xxxhdpi/sample_logo.png create mode 100644 app/src/main/res/layout/directory_item_grid_rounded_corners.xml 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 06d5e574b..67998cebc 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 @@ -29,12 +29,12 @@ import com.simplemobiletools.gallery.pro.helpers.* import com.simplemobiletools.gallery.pro.interfaces.DirectoryOperationsListener import com.simplemobiletools.gallery.pro.models.AlbumCover import com.simplemobiletools.gallery.pro.models.Directory -import kotlinx.android.synthetic.main.directory_item_grid.view.dir_check -import kotlinx.android.synthetic.main.directory_item_grid.view.dir_location -import kotlinx.android.synthetic.main.directory_item_grid.view.dir_lock -import kotlinx.android.synthetic.main.directory_item_grid.view.dir_name -import kotlinx.android.synthetic.main.directory_item_grid.view.dir_pin -import kotlinx.android.synthetic.main.directory_item_grid.view.dir_thumbnail +import kotlinx.android.synthetic.main.directory_item_grid_square.view.dir_check +import kotlinx.android.synthetic.main.directory_item_grid_square.view.dir_location +import kotlinx.android.synthetic.main.directory_item_grid_square.view.dir_lock +import kotlinx.android.synthetic.main.directory_item_grid_square.view.dir_name +import kotlinx.android.synthetic.main.directory_item_grid_square.view.dir_pin +import kotlinx.android.synthetic.main.directory_item_grid_square.view.dir_thumbnail import kotlinx.android.synthetic.main.directory_item_list.view.* import java.io.File diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt index f1ebe0fa3..cf6f7b5e5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt @@ -2,8 +2,11 @@ package com.simplemobiletools.gallery.pro.dialogs import android.content.DialogInterface import android.view.View +import android.widget.RelativeLayout import androidx.appcompat.app.AlertDialog import com.bumptech.glide.Glide +import com.bumptech.glide.load.resource.bitmap.CenterCrop +import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.request.RequestOptions import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.beGone @@ -13,7 +16,7 @@ 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.directory_item_grid.view.* +import kotlinx.android.synthetic.main.directory_item_grid_square.view.* class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity, val callback: () -> Unit) : DialogInterface.OnClickListener { private var config = activity.config @@ -28,16 +31,20 @@ class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity, val callback: .setPositiveButton(R.string.ok, this) .setNegativeButton(R.string.cancel, null) .create().apply { - activity.setupDialogStuff(view, this) + activity.setupDialogStuff(view, this) { + setupStyle() + setupMediaCount() + updateSample() + } } - - setupStyle() - setupMediaCount() - updateSample() } private fun setupStyle() { val styleRadio = view.dialog_radio_style + styleRadio.setOnCheckedChangeListener { group, checkedId -> + updateSample() + } + val styleBtn = when (config.folderStyle) { FOLDER_STYLE_SQUARE -> styleRadio.dialog_radio_square else -> styleRadio.dialog_radio_rounded_corners @@ -65,6 +72,16 @@ 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 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) + + 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 -> { dir_name.text = folderName @@ -77,15 +94,21 @@ class ChangeThumbnailStyleDialog(val activity: BaseSimpleActivity, val callback: } else -> { dir_name.text = folderName - photo_cnt.beGone() + photo_cnt?.beGone() } } val options = RequestOptions().centerCrop() - Glide.with(activity) + var builder = Glide.with(activity) .load(R.drawable.sample_logo) .apply(options) - .into(dir_thumbnail) + + if (useRoundedCornersLayout) { + val cornerRadius = resources.getDimension(R.dimen.rounded_corner_radius_big).toInt() + builder = builder.transform(CenterCrop(), RoundedCorners(cornerRadius)) + } + + builder.into(dir_thumbnail) } } diff --git a/app/src/main/res/drawable-hdpi/sample_logo.png b/app/src/main/res/drawable-hdpi/sample_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..6ef81904cdb918d74c9f7aafe469e89a6e807ba4 GIT binary patch literal 4679 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

T~Q;HO3Vp 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/sample_logo.png b/app/src/main/res/drawable-xxhdpi/sample_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..aeebc03d5e52edecb9790e2ffbaf8fa203b1a44c GIT binary patch literal 13031 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 LRfkt9SiJu~SR|)N literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/sample_logo.png b/app/src/main/res/drawable-xxxhdpi/sample_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..589331642514a91b5e18ccc60b26ed8e1e1837ac GIT binary patch literal 15818 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 z zr>QTS6Xn9;Oc6eJMA2^e-{#+rk-nIzX)ca&mATI9Em(;)hT_QTZa9_QFDw$`yTPLh zARhj2miqIi4}fAnrQVuhrWai1y$%)d3i8E+o_c*<$(i%p!t@$g)B1hfU~%fS^53)-~2fh>IRKCAH(!H78G0gueaQtUMJw8Kf+A z%`lA55!Y4ntSABL^@7F+;teE~IAVN&f%BE5ps!(vk3k&;@r4%l;-CX{4Y7Q&&^h8^ zbq4j!I~-61B>}*1S(-nnR$l@9bo15@-R{$8&xJ45A-T)U^!$-zP7#db+! zQ|+aB-FS8S3?A9Wxx;Oy2cK~S=Ebx`X!}4JEy95 zaUccv1Q=!^U{jnGD+wc@g}V2Z23&C}Rw5jflt*_p5HcsSbS2Uc!Pf(Ss`k`=LKd+k zQ4R!zYrdc~oE6vsQ6i$??sB?C+@F}*H0MwLsV4^iic;s8)l7NaXiC<9Bmhc}6!Zrs zjwzHchxEdT&HZ?d7iq4nBn{=Ou?ETTW3ziYj@Lf-sIK_Q30;&3ZN1u;6CMFvVmjDG zI|5IGTgu(;Pd@;?kjd{}-m*R7`MV+nKD-$+5~q0B??b!1x3j;YM^FC#sON!6+_{J6 zI{Nh-V#>Kxw!OYn6U$4+;4jGcqeZU72GTL3EaoTL>E-qCDMstC)6OeT9(i~cx_pko z`nS0~xPckjTzuABqWhdjOt{w-vsQq5#(1tJw3X>&oyk>(AhwXk-;P4p2p%n6VdRJ) zw&blPZr;^p-nUCqVXfbJ--{CJ7NlsE^+UG)9Ir7jqhyLa+KFlDn-)i+uig`(*QdI2 z=eab91pt4b)Mk?{EIGWqb?jTx+3g&5QW8WkUrg%?d`SoID0G}sg?W6e(-lI($v*R) zk7-NKGcf>4YK@8B(2|z#VI*=}YUYuGVphRTj9_?;twCpyBW?BWurECl`zh#kF`a_o zYH90dasAa>HWY{eG@~Hsmz<{1?gMNH>6VnOW5I_&~ ze=nRI&KEqRh2WEd7;f(PXM?i$f#3?EO zQ8MCht@t!LSIZx$_LYIINE)ag3pi{^~(?jpAh_jToSIc^Zzh{jhoN5 zpm-?y!sFca*3g=62kb-1V6u~cC~S5Alin34HnN3c7~8R_YB%#C=|?~l!s0mj@H1EQXss~K*!`9gE>BDhYa0< z<|spRbYOsUL~cM386<-ns{i%hh7QnVt+NgD!DR4R3N)D?6xKy9{x=zPSJf+?O}=Ml z$(KwAUSI$B8r2Qt%2?hUqF#(XJLHi1{l_mCw!yU;Yo3vH8-Q)E1{s>W^;sexZ)_Hblg(xUf z;wjERTZfw6u<2)4$_{{E1T{=>|N84d|2t@(ou~s%_ux94e%56m^Yx6TLr|AcX9l!X za1BiV@$PK;4*;OB;D5sf(C~k7pX;sbhW304f$;BMR4f0>AKQ6rTlo%M=wG0O3i#Zr zB_t|~sXLOXEsF%(MY2L*xpzYSW$|aj zl}XUB#M!W}5`oZEoYwj6_Wxs$DZu(hI?-ns6hK`D+PM%0YXsmgs2ZGI|It}_S^Nx} zVh9_XY-o!0S#>x0Y^73RnyT6vF>kI!vO$M|w%&!u(8UM%2vVgx&nB92Ws_Z3;vH@zzRa2U3R|tc|bi#ta5~({<0INs3-|iVn%SVjhh!(%?=$~ z4^}^hR+nh@W&RMf<8!YO>r;)0rv(hNrwiQ!2q)(fd3W@NqVg3S3RGSpKEY{{e%e9Gn0E literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/dialog_change_thumbnail_style.xml b/app/src/main/res/layout/dialog_change_thumbnail_style.xml index 3221e5bb1..34d935527 100644 --- a/app/src/main/res/layout/dialog_change_thumbnail_style.xml +++ b/app/src/main/res/layout/dialog_change_thumbnail_style.xml @@ -16,21 +16,13 @@ - - - - + android:layout_height="wrap_content" /> + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 78b30b24b..48dd76ef1 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -23,4 +23,5 @@ 110dp 40dp 30dp + 180dp From 042e50d8debde7c5cfc1a269fae4cf2e4c25bb2b Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Nov 2020 20:04:39 +0100 Subject: [PATCH 14/37] properly handle exporting and importing thumbnail style related values --- .../gallery/pro/activities/MainActivity.kt | 6 ------ .../gallery/pro/activities/SettingsActivity.kt | 8 ++++++-- .../gallery/pro/adapters/DirectoryAdapter.kt | 9 ++------- .../com/simplemobiletools/gallery/pro/helpers/Config.kt | 4 ---- .../simplemobiletools/gallery/pro/helpers/Constants.kt | 1 - 5 files changed, 8 insertions(+), 20 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 42ef17836..93887d220 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 @@ -82,7 +82,6 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { private var mStoredAnimateGifs = true private var mStoredCropThumbnails = true private var mStoredScrollHorizontally = true - private var mStoredShowMediaCount = true private var mStoredTextColor = 0 private var mStoredPrimaryColor = 0 @@ -174,10 +173,6 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { getRecyclerAdapter()?.updateCropThumbnails(config.cropThumbnails) } - if (mStoredShowMediaCount != config.showMediaCount) { - getRecyclerAdapter()?.updateShowMediaCount(config.showMediaCount) - } - if (mStoredScrollHorizontally != config.scrollHorizontally) { mLoadedInitialPhotos = false directories_grid.adapter = null @@ -332,7 +327,6 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { mStoredAnimateGifs = animateGifs mStoredCropThumbnails = cropThumbnails mStoredScrollHorizontally = scrollHorizontally - mStoredShowMediaCount = showMediaCount mStoredTextColor = textColor mStoredPrimaryColor = primaryColor } 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 536b2fabb..84e089a88 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 @@ -650,7 +650,6 @@ class SettingsActivity : SimpleActivity() { put(ANIMATE_GIFS, config.animateGifs) put(CROP_THUMBNAILS, config.cropThumbnails) put(SHOW_THUMBNAIL_VIDEO_DURATION, config.showThumbnailVideoDuration) - put(SHOW_MEDIA_COUNT, config.showMediaCount) put(SCROLL_HORIZONTALLY, config.scrollHorizontally) put(ENABLE_PULL_TO_REFRESH, config.enablePullToRefresh) put(MAX_BRIGHTNESS, config.maxBrightness) @@ -704,6 +703,9 @@ class SettingsActivity : SimpleActivity() { put(EDITOR_BRUSH_HARDNESS, config.editorBrushHardness) put(EDITOR_BRUSH_SIZE, config.editorBrushSize) put(ALBUM_COVERS, config.albumCovers) + put(FOLDER_THUMBNAIL_STYLE, config.folderStyle) + put(FOLDER_MEDIA_COUNT, config.showFolderMediaCount) + put(LIMIT_FOLDER_TITLE, config.limitFolderTitle) } exportSettings(configItems) @@ -785,7 +787,6 @@ class SettingsActivity : SimpleActivity() { ANIMATE_GIFS -> config.animateGifs = value.toBoolean() CROP_THUMBNAILS -> config.cropThumbnails = value.toBoolean() SHOW_THUMBNAIL_VIDEO_DURATION -> config.showThumbnailVideoDuration = value.toBoolean() - SHOW_MEDIA_COUNT -> config.showMediaCount = value.toBoolean() SCROLL_HORIZONTALLY -> config.scrollHorizontally = value.toBoolean() ENABLE_PULL_TO_REFRESH -> config.enablePullToRefresh = value.toBoolean() MAX_BRIGHTNESS -> config.maxBrightness = value.toBoolean() @@ -838,6 +839,9 @@ class SettingsActivity : SimpleActivity() { EDITOR_BRUSH_COLOR -> config.editorBrushColor = value.toInt() EDITOR_BRUSH_HARDNESS -> config.editorBrushHardness = value.toString().toFloat() EDITOR_BRUSH_SIZE -> config.editorBrushSize = value.toString().toFloat() + FOLDER_THUMBNAIL_STYLE -> config.folderStyle = value.toInt() + FOLDER_MEDIA_COUNT -> config.showFolderMediaCount = value.toInt() + LIMIT_FOLDER_TITLE -> config.limitFolderTitle = 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/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt index 67998cebc..08120ab54 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 @@ -46,7 +46,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList Date: Sun, 8 Nov 2020 20:20:35 +0100 Subject: [PATCH 15/37] use proper folder name with all settings --- .../gallery/pro/adapters/DirectoryAdapter.kt | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 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 08120ab54..c672f54ca 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 @@ -656,9 +656,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList 1) "${directory.name} (${directory.subfoldersCount})" else directory.name dir_path?.text = "${directory.path.substringBeforeLast("/")}/" - photo_cnt.text = directory.subfoldersMediaCount.toString() val thumbnailType = when { directory.tmb.isVideoFast() -> TYPE_VIDEOS directory.tmb.isGif() -> TYPE_GIFS @@ -688,8 +686,22 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList 1) { + nameCount += " [${directory.subfoldersCount}]" + } + } + + dir_name.text = nameCount + if (isListViewType) { dir_name.setTextColor(textColor) dir_path.setTextColor(textColor) From 650c04d3c36d6dccfd66e4dd84f3414bd484eb8b Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Nov 2020 20:44:58 +0100 Subject: [PATCH 16/37] adding a couple customization fixes --- .../gallery/pro/activities/MainActivity.kt | 28 ++++++++++++++++--- .../gallery/pro/adapters/DirectoryAdapter.kt | 22 +++++++++++++-- 2 files changed, 44 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 93887d220..ebe559cf0 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 @@ -654,16 +654,36 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { private fun calculateContentWidth(directories: ArrayList) { val layoutManager = directories_grid.layoutManager as MyGridLayoutManager - val thumbnailWidth = layoutManager.getChildAt(0)?.width ?: 0 - val fullWidth = ((directories.size - 1) / layoutManager.spanCount + 1) * thumbnailWidth + + val fullWidth = if (config.folderStyle == FOLDER_STYLE_SQUARE) { + val thumbnailWidth = layoutManager.getChildAt(0)?.width ?: 0 + ((directories.size - 1) / layoutManager.spanCount + 1) * thumbnailWidth + } else { + val thumbnailWidth = (layoutManager.getChildAt(0)?.width ?: 0) + resources.getDimension(R.dimen.medium_margin).toInt() * 2 + val columnCount = (directories.size - 1) / layoutManager.spanCount + 1 + columnCount * thumbnailWidth + } + directories_horizontal_fastscroller.setContentWidth(fullWidth) directories_horizontal_fastscroller.setScrollToX(directories_grid.computeHorizontalScrollOffset()) } private fun calculateContentHeight(directories: ArrayList) { val layoutManager = directories_grid.layoutManager as MyGridLayoutManager - val thumbnailHeight = layoutManager.getChildAt(0)?.height ?: 0 - val fullHeight = ((directories.size - 1) / layoutManager.spanCount + 1) * thumbnailHeight + + val fullHeight = if (config.folderStyle == FOLDER_STYLE_SQUARE) { + val thumbnailHeight = layoutManager.getChildAt(0)?.height ?: 0 + ((directories.size - 1) / layoutManager.spanCount + 1) * thumbnailHeight + } else { + var thumbnailHeight = (layoutManager.getChildAt(0)?.height ?: 0) + if (config.viewTypeFolders == VIEW_TYPE_GRID) { + thumbnailHeight += resources.getDimension(R.dimen.medium_margin).toInt() * 2 + } + + val rowCount = (directories.size - 1) / layoutManager.spanCount + 1 + rowCount * thumbnailHeight + } + directories_vertical_fastscroller.setContentHeight(fullHeight) directories_vertical_fastscroller.setScrollToY(directories_grid.computeVerticalScrollOffset()) } 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 c672f54ca..d59bd4eab 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 @@ -9,6 +9,7 @@ import android.graphics.drawable.Icon import android.view.Menu import android.view.View import android.view.ViewGroup +import android.widget.RelativeLayout import com.bumptech.glide.Glide import com.google.gson.Gson import com.simplemobiletools.commons.activities.BaseSimpleActivity @@ -61,7 +62,14 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList ROUNDED_CORNERS_SMALL + config.folderStyle == FOLDER_STYLE_SQUARE -> ROUNDED_CORNERS_NONE + else -> ROUNDED_CORNERS_BIG + } + activity.loadImage(thumbnailType, directory.tmb, dir_thumbnail, scrollHorizontally, animateGifs, cropThumbnails, roundedCorners) } From d6ff95e9236132e3463b211770e6c262b8e69f95 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Nov 2020 20:49:58 +0100 Subject: [PATCH 17/37] align folder name to bottom by default at rounded corners --- app/src/main/res/layout/directory_item_grid_rounded_corners.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/directory_item_grid_rounded_corners.xml b/app/src/main/res/layout/directory_item_grid_rounded_corners.xml index e59014668..b42803047 100644 --- a/app/src/main/res/layout/directory_item_grid_rounded_corners.xml +++ b/app/src/main/res/layout/directory_item_grid_rounded_corners.xml @@ -61,6 +61,7 @@ android:layout_height="wrap_content" android:layout_below="@+id/dir_thumbnail" android:layout_alignStart="@+id/dir_thumbnail" + android:layout_alignParentBottom="true" android:layout_toStartOf="@+id/dir_location" android:ellipsize="middle" android:paddingTop="@dimen/medium_margin" From 5573a4eb18c1c334398c60d64be7a00452a28c49 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Nov 2020 21:05:50 +0100 Subject: [PATCH 18/37] fixing some additional customization glitches --- .../gallery/pro/adapters/DirectoryAdapter.kt | 15 ++++++++++++++- .../directory_item_grid_rounded_corners.xml | 1 - 2 files changed, 14 insertions(+), 2 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 d59bd4eab..afab96942 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 @@ -679,8 +679,21 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList Date: Sun, 8 Nov 2020 21:10:37 +0100 Subject: [PATCH 19/37] add handling for limiting long folder titles to 1 line --- .../gallery/pro/adapters/DirectoryAdapter.kt | 6 ++++++ .../main/res/layout/directory_item_grid_rounded_corners.xml | 2 -- app/src/main/res/layout/directory_item_grid_square.xml | 2 -- 3 files changed, 6 insertions(+), 4 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 afab96942..f1eb345d3 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 @@ -6,6 +6,7 @@ import android.content.pm.ShortcutInfo import android.content.pm.ShortcutManager import android.graphics.drawable.ColorDrawable import android.graphics.drawable.Icon +import android.text.TextUtils import android.view.Menu import android.view.View import android.view.ViewGroup @@ -720,6 +721,11 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList diff --git a/app/src/main/res/layout/directory_item_grid_square.xml b/app/src/main/res/layout/directory_item_grid_square.xml index d7b84af77..216398756 100644 --- a/app/src/main/res/layout/directory_item_grid_square.xml +++ b/app/src/main/res/layout/directory_item_grid_square.xml @@ -83,8 +83,6 @@ android:id="@+id/dir_name" android:layout_width="match_parent" android:layout_height="wrap_content" - android:ellipsize="end" - android:maxLines="2" android:paddingBottom="@dimen/small_margin" android:shadowColor="@color/default_background_color" android:shadowRadius="4" From c2ee93e0399de3f8d4bcc44615f28048abf0b285 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Nov 2020 21:30:26 +0100 Subject: [PATCH 20/37] recreate the directory adapter if something thumbnail style related changes --- .../gallery/pro/activities/MainActivity.kt | 11 ++++++++-- .../gallery/pro/adapters/DirectoryAdapter.kt | 21 ++++++++++--------- 2 files changed, 20 insertions(+), 12 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 ebe559cf0..2b39e9974 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 @@ -84,6 +84,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { private var mStoredScrollHorizontally = true private var mStoredTextColor = 0 private var mStoredPrimaryColor = 0 + private var mStoredStyleString = "" override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -189,6 +190,11 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { directories_horizontal_fastscroller.updatePrimaryColor() } + val styleString = "${config.folderStyle}${config.showFolderMediaCount}${config.limitFolderTitle}" + if (mStoredStyleString != styleString) { + setupAdapter(mDirs, forceRecreate = true) + } + directories_horizontal_fastscroller.updateBubbleColors() directories_vertical_fastscroller.updateBubbleColors() directories_refresh_layout.isEnabled = config.enablePullToRefresh @@ -329,6 +335,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { mStoredScrollHorizontally = scrollHorizontally mStoredTextColor = textColor mStoredPrimaryColor = primaryColor + mStoredStyleString = "$folderStyle$showFolderMediaCount$limitFolderTitle" } } @@ -1141,13 +1148,13 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { directories_grid.beVisibleIf(directories_empty_placeholder.isGone()) } - private fun setupAdapter(dirs: ArrayList, textToSearch: String = "") { + private fun setupAdapter(dirs: ArrayList, textToSearch: String = "", forceRecreate: Boolean = false) { val currAdapter = directories_grid.adapter val distinctDirs = dirs.distinctBy { it.path.getDistinctPath() }.toMutableList() as ArrayList val sortedDirs = getSortedDirectories(distinctDirs) var dirsToShow = getDirsToShow(sortedDirs, mDirs, mCurrentPathPrefix).clone() as ArrayList - if (currAdapter == null) { + if (currAdapter == null || forceRecreate) { initZoomListener() val fastscroller = if (config.scrollHorizontally) directories_horizontal_fastscroller else directories_vertical_fastscroller DirectoryAdapter(this, dirsToShow, this, directories_grid, isPickIntent(intent) || isGetAnyContentIntent(intent), fastscroller) { 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 f1eb345d3..18275b9e8 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 @@ -48,13 +48,16 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList() + private var showMediaCount = config.showFolderMediaCount + private var folderStyle = config.folderStyle + private var limitFolderTitle = config.limitFolderTitle + init { setupDragListener(true) fillLockedFolders() @@ -63,12 +66,10 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList R.layout.directory_item_list + folderStyle == FOLDER_STYLE_SQUARE -> R.layout.directory_item_grid_square + else -> R.layout.directory_item_grid_rounded_corners } return createViewHolder(layoutType, parent) @@ -679,7 +680,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList ROUNDED_CORNERS_SMALL - config.folderStyle == FOLDER_STYLE_SQUARE -> ROUNDED_CORNERS_NONE + folderStyle == FOLDER_STYLE_SQUARE -> ROUNDED_CORNERS_NONE else -> ROUNDED_CORNERS_BIG } @@ -721,7 +722,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList Date: Sun, 8 Nov 2020 21:39:16 +0100 Subject: [PATCH 21/37] updating photo editor to 8.0.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8791cd7a1..82b889196 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { classpath 'com.android.tools.build:gradle:4.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" if (is_proprietary) { - classpath 'ly.img.android.pesdk:plugin:8.0.2' + classpath 'ly.img.android.pesdk:plugin:8.0.3' } // NOTE: Do not place your application dependencies here; they belong From 425d1f77b51e6db7f4352a4a238226dab9c25844 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Nov 2020 21:39:39 +0100 Subject: [PATCH 22/37] use the local config variable at folders --- .../gallery/pro/adapters/DirectoryAdapter.kt | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 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 18275b9e8..ceee1c1ab 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 @@ -178,7 +178,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList + val paths = getSelectedPaths().filter { !activity.isAStorageRootFolder(it) && !config.isFolderProtected(it) } as ArrayList RenameItemsDialog(activity, paths) { listener?.refreshItems() } @@ -243,13 +243,13 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList if (success) { if (path.containsNoMedia()) { activity.removeNoMedia(path) { - if (activity.config.shouldShowHidden) { + if (config.shouldShowHidden) { updateFolderNames() } else { activity.runOnUiThread { @@ -308,7 +308,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList - Unset as default folder - Set as default folder Filter media @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Unset as default folder - Set as default folder Filtre d’arxius @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Unset as default folder - Set as default folder Filtr médií @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Unset as default folder - Set as default folder Filtrer medier @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Unset as default folder - Set as default folder Filter @@ -375,8 +377,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Unset as default folder - Set as default folder Φιλτράρισμα πολυμέσων @@ -377,8 +379,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Unset as default folder - Set as default folder Filtro de medios @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Unset as default folder - Set as default folder Suodata media @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Unset as default folder - Set as default folder Filtrer les médias @@ -374,8 +376,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Filtrar medios @@ -375,8 +377,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Filtriranje medija @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Média szűrő @@ -376,8 +378,6 @@ Ezzel csak a kiválasztott mappák láthatók, mivel a kizárás és a befoglal Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Filter media @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Filter media @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Filtra i file @@ -376,8 +378,7 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder + 表示する形式 @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder 필터 설정 @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Filtruoti mediją @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Filtrer media @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Filter media @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Media filteren @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Filtruj multimedia @@ -374,8 +376,6 @@ ... i/lub naszego subreddita: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Filtrar mídia @@ -375,8 +377,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Filtrar multimédia @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Фильтр медиа @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Filter médií @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Filtriranje datotek @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Филтрирај медију @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Filtrera media @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Medyayı filtrele @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Фільтр мультимедійних файлів @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder Lọc @@ -393,8 +395,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder 筛选媒体文件 @@ -374,8 +376,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder 篩選媒體檔案 @@ -383,8 +385,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder 篩選媒體檔案 @@ -376,8 +378,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Set as default folder - Unset as default folder + + Adding some folder thumbnail customization at the app settings\n + Allow setting a default folder to be opened at app launch + Allow fast forwarding videos by double clicking on screen sides Fully replaced the photo editor with a powerful third party library (for resizing images use Menu -> Resize from the fullscreen view, until it gets added in the editor) From 05376ef104819082afd5810904760b3a2fccb11a Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 9 Nov 2020 17:28:18 +0100 Subject: [PATCH 29/37] update version to 6.17.2 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7c887d41a..99b085ecb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "com.simplemobiletools.gallery.pro" minSdkVersion 21 targetSdkVersion 29 - versionCode 326 - versionName "6.17.1" + versionCode 327 + versionName "6.17.2" setProperty("archivesBaseName", "gallery-$versionCode") vectorDrawables.useSupportLibrary = true } From 670c5d1f9c02d37c640c59310f7500e4c148c3e6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 9 Nov 2020 17:28:26 +0100 Subject: [PATCH 30/37] updating changelog --- CHANGELOG.md | 7 +++++++ fastlane/metadata/android/en-US/changelogs/327.txt | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/327.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 38dadd51b..e26e039db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Changelog ========== +Version 6.17.2 *(2020-11-09)* +---------------------------- + + * Adding some folder thumbnail customization at the app settings + * Allow setting a default folder to be opened at app launch (by roland-kister) + * Updated the photo editor to fix some glitches + Version 6.17.1 *(2020-11-03)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/327.txt b/fastlane/metadata/android/en-US/changelogs/327.txt new file mode 100644 index 000000000..05a3f098d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/327.txt @@ -0,0 +1,3 @@ + * Adding some folder thumbnail customization at the app settings + * Allow setting a default folder to be opened at app launch (by roland-kister) + * Updated the photo editor to fix some glitches From 9c84ba05eeea690f05932d1f727724dd972d395e Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 9 Nov 2020 19:13:51 +0100 Subject: [PATCH 31/37] updating the Paypal sponsor url --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index bef563799..9bad22a9b 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,3 @@ github: [tibbi] patreon: tiborkaputa -custom: ["https://www.paypal.me/SimpleMobileTools", "https://www.simplemobiletools.com/donate"] +custom: ["https://www.paypal.com/paypalme/simplemobiletools", "https://www.simplemobiletools.com/donate"] From 3e134c4e37afb7d10933bec775f25af6e1e6825f Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 10 Nov 2020 10:07:44 +0100 Subject: [PATCH 32/37] fixing some thumbnail coloring issues --- .../gallery/pro/adapters/DirectoryAdapter.kt | 10 +++++++--- .../gallery/pro/dialogs/ChangeThumbnailStyleDialog.kt | 2 ++ 2 files changed, 9 insertions(+), 3 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 ceee1c1ab..f3a041c71 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 @@ -740,10 +740,14 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList Date: Tue, 10 Nov 2020 10:15:50 +0100 Subject: [PATCH 33/37] update version to 6.17.3 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 99b085ecb..f234f2bf7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "com.simplemobiletools.gallery.pro" minSdkVersion 21 targetSdkVersion 29 - versionCode 327 - versionName "6.17.2" + versionCode 328 + versionName "6.17.3" setProperty("archivesBaseName", "gallery-$versionCode") vectorDrawables.useSupportLibrary = true } From e56aba74f618150bd67291c17353805ce8b33456 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 10 Nov 2020 10:16:17 +0100 Subject: [PATCH 34/37] updating changelog --- CHANGELOG.md | 5 +++++ fastlane/metadata/android/en-US/changelogs/328.txt | 1 + 2 files changed, 6 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/328.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index e26e039db..d75fcddde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========== +Version 6.17.3 *(2020-11-10)* +---------------------------- + + * Properly update the folder thumbnail text colors + Version 6.17.2 *(2020-11-09)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/328.txt b/fastlane/metadata/android/en-US/changelogs/328.txt new file mode 100644 index 000000000..f6e221dac --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/328.txt @@ -0,0 +1 @@ + * Properly update the folder thumbnail text colors From 81e85c9911abcdcf5cf68168dbd699e7dcff9d8e Mon Sep 17 00:00:00 2001 From: AlbatorV Date: Tue, 10 Nov 2020 18:28:56 +0100 Subject: [PATCH 35/37] Update strings.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wher I can find these strings ? Définir comme dossier par défaut Ne plus définir comme dossier par défaut --- app/src/main/res/values-fr/strings.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 55cc15900..4ada4fbdc 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -30,8 +30,8 @@ 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 - Set as default folder - Unset as default folder + Définir comme dossier par défaut + Ne plus définir comme dossier par défaut Filtrer les médias @@ -185,13 +185,13 @@ Éviter l\'affichage de fichiers invalides Afficher les types d\'image Zoomer les vidéos par un double appui - 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 + Style 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 + Limiter à une ligne les noms de fichiers + Carré + Arrondi Miniatures From 743793c787bfb9562ed84eadee622a9e47db64ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20F=C4=B1r=C4=B1nc=C4=B1?= Date: Wed, 11 Nov 2020 02:32:58 +0300 Subject: [PATCH 36/37] Update strings.xml --- app/src/main/res/values-tr/strings.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index eae1c3f08..174308f18 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -30,8 +30,8 @@ Yeniden boyutlandırılmış sürümü paylaş Merhaba,\n\neski ücretsiz uygulamadan yükseltmiş gibisiniz. Artık uygulama ayarlarının en üst kısmında \'Pro\'ya Yükselt\' düğmesi olan eski sürümü kaldırabilirsiniz.\n\nYalnızca Geri Dönüşüm Kutusu öğelerinin silinmesi, sık kullanılanların işaretlerinin kaldırılması ve uygulama ayarlarınızı sıfırlamanız gerekir.\n\nTeşekkürler! Tüm görünür klasörler arasında dosya aramaya geç - Set as default folder - Unset as default folder + Varsayılan klasör olarak ayarla + Varsayılan klasör olarak ayarlama Medyayı filtrele @@ -78,7 +78,7 @@ Döndür Geçersiz resim yolu Resim düzenleme başarısız - Image editing cancelled + Resim düzenleme iptal edildi Dosya başarıyla düzenlendi Resmi şununla düzenle: Resim düzenleyici bulunamadı @@ -185,13 +185,13 @@ Geçersiz dosyaları göstermekten kaçın Resim dosyası türlerini göster Videoları iki kez dokunarak yakınlaştırmaya izin ver - 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 + Klasör küçük resim stili + 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 + Uzun klasör başlıklarını 1 satırla sınırla + Kare + Yuvarlatılmış köşeler Küçük resimler From d69979b8100f8e60b0c53b7a808886681e379871 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 11 Nov 2020 18:26:31 +0100 Subject: [PATCH 37/37] Update German strings --- app/src/main/res/values-de/strings.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2f6659898..81dff8518 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -26,12 +26,12 @@ Aufnahmedatum korrigieren Korrigiere… Datum erfolgreich korrigiert. - No Date Taken values have been found + Es wurden keine Werte für das Aufnahmedatum gefunden Teile eine verkleinerte Version Hey,\n\nes sieht so aus, als hättest du von der alten kostenlosen App geupgraded. Du kannst nun die alte Version deinstallieren, die oben in den App-Einstellungen einen \'Upgrade auf Pro\' Button hat.\n\nEs wird nur der Papierkorb gelöscht, die Markierungen von Favoriten entfernt und die App-Einstellungen zurückgesetzt.\n\nDanke! Zur Dateisuche in allen sichtbaren Ordnern wechseln - Set as default folder - Unset as default folder + Als Standardordner festlegen + Nicht mehr als Standardordner festlegen Filter @@ -78,7 +78,7 @@ Drehen Ungültiger Dateipfad Bildbearbeitung fehlgeschlagen - Image editing cancelled + Bildbearbeitung abgebrochen Datei erfolgreich bearbeitet Bild bearbeiten mit: Keine Bildeditor-App gefunden @@ -184,17 +184,17 @@ Kompromiss Das Anzeigen von ungültigen Dateien vermeiden Bilddateitypen anzeigen - 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 + Erlaube Zoomen in Videos mit doppeltem Antippen + Ordner-Miniaturbildstil + Zeige Anzahl der Dateien in einer seperaten Zeile an + Anzahl der Dateien in Klammern anzeigen + Anzahl der Dateien nicht anzeigen + Begrenze lange Ordnertitel auf 1 Zeile + Quadrat + Abgerundete Ecken - Thumbnails + Vorschaubilder Vollbild-Anzeige von Medien Erweiterte Details Funktionen am unteren Bildschirmrand