From 90d1c521fa5861da87d209bbd0521e5608277a74 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 22 Oct 2018 17:10:31 +0200 Subject: [PATCH] make Down gesture closing optional, enabled by default --- .../gallery/activities/SettingsActivity.kt | 9 +++++++ .../gallery/fragments/PhotoFragment.kt | 18 +++++++------- .../gallery/fragments/VideoFragment.kt | 16 +++++++------ .../gallery/helpers/Config.kt | 4 ++++ .../gallery/helpers/Constants.kt | 1 + app/src/main/res/layout/activity_settings.xml | 24 +++++++++++++++++++ app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-az/strings.xml | 1 + app/src/main/res/values-ca/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-gl/strings.xml | 1 + app/src/main/res/values-hr/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko-rKR/strings.xml | 1 + app/src/main/res/values-lt/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sk/strings.xml | 3 ++- app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 36 files changed, 88 insertions(+), 16 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt index 9adc2cbb7..f58789dd1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt @@ -58,6 +58,7 @@ class SettingsActivity : SimpleActivity() { setupDeleteEmptyFolders() setupAllowPhotoGestures() setupAllowVideoGestures() + setupAllowDownGesture() setupBottomActions() setupShowMediaCount() setupKeepLastModified() @@ -302,6 +303,14 @@ class SettingsActivity : SimpleActivity() { } } + private fun setupAllowDownGesture() { + settings_allow_down_gesture.isChecked = config.allowDownGesture + settings_allow_down_gesture_holder.setOnClickListener { + settings_allow_down_gesture.toggle() + config.allowDownGesture = settings_allow_down_gesture.isChecked + } + } + private fun setupShowMediaCount() { settings_show_media_count.isChecked = config.showMediaCount settings_show_media_count_holder.setOnClickListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt index fab869e88..ed82b721c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt @@ -101,16 +101,18 @@ class PhotoFragment : ViewPagerFragment() { } } - gif_view.setOnTouchListener { v, event -> - handleEvent(event) - false - } - - subsampling_view.setOnTouchListener { v, event -> - if (view.subsampling_view.scale == mOriginalSubsamplingScale) { + if (context.config.allowDownGesture) { + gif_view.setOnTouchListener { v, event -> handleEvent(event) + false + } + + subsampling_view.setOnTouchListener { v, event -> + if (view.subsampling_view.scale == mOriginalSubsamplingScale) { + handleEvent(event) + } + false } - false } } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt index b455a2740..ebf15ba00 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt @@ -88,14 +88,16 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener, S mVolumeSideScroll = video_volume_controller mCurrTimeView = video_curr_time - video_preview.setOnTouchListener { v, event -> - handleEvent(event) - true - } + if (context.config.allowDownGesture) { + video_preview.setOnTouchListener { v, event -> + handleEvent(event) + true + } - video_surface.setOnTouchListener { v, event -> - handleEvent(event) - false + video_surface.setOnTouchListener { v, event -> + handleEvent(event) + false + } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt index 7333a1dd6..40838d5cd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt @@ -399,4 +399,8 @@ class Config(context: Context) : BaseConfig(context) { var showRecycleBinLast: Boolean get() = prefs.getBoolean(SHOW_RECYCLE_BIN_LAST, false) set(showRecycleBinLast) = prefs.edit().putBoolean(SHOW_RECYCLE_BIN_LAST, showRecycleBinLast).apply() + + var allowDownGesture: Boolean + get() = prefs.getBoolean(ALLOW_DOWN_GESTURE, true) + set(allowDownGesture) = prefs.edit().putBoolean(ALLOW_DOWN_GESTURE, allowDownGesture).apply() } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt index 1208b47a8..29c738dfa 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt @@ -63,6 +63,7 @@ const val ALLOW_ZOOMING_IMAGES = "allow_zooming_images" const val WAS_SVG_SHOWING_HANDLED = "was_svg_showing_handled" const val LAST_BIN_CHECK = "last_bin_check" const val SHOW_HIGHEST_QUALITY = "show_highest_quality" +const val ALLOW_DOWN_GESTURE = "allow_down_gesture" // slideshow const val SLIDESHOW_INTERVAL = "slideshow_interval" diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index b631f301e..27fd9bd44 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -644,6 +644,30 @@ + + + + + + Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture المصغرات diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 327be5e79..27136947b 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Thumbnails diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 37eb43858..798c31551 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Miniatures diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 97442b076..3da9d775a 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Thumbnails diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 8dbe74752..e29321873 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Thumbnails diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e1fc39111..1339b5dda 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -162,6 +162,7 @@ Stark vergrösserbare Bilder Zeige Bilder in der höchstmöglichen Qualität Zeige den Papierkorb als letztes Element auf dem Hauptbildschirm + Allow closing the fullscreen view with a down gesture Thumbnails diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 6bfd6483f..8dcb0d264 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -162,6 +162,7 @@ Βαθιά μεγέθυνση εικόνων Εμφάνιση εικόνων με την υψηλότερη δυνατή ποιότητα Εμφάνιση του Κάδου ως τελευταίο στοιχείο στην κύρια οθόνη + Allow closing the fullscreen view with a down gesture Εικονίδια diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 90057a8cf..c075a4e4d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Miniaturas diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 9084aa31a..6d86135e3 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Esikatselukuvat diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 8f99120ed..030bb7c4b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Vignettes diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 362c84db6..ef72b9d18 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Iconas diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 69780e427..c6d7d6baa 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Sličice diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 7d4198bbc..fd22bfba8 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Thumbnails diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 21cee6961..5483a5f27 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -162,6 +162,7 @@ Immagini ingrandibili a fondo Mostra le immagini alla massima qualità possibile Mostra il cestino come ultimo elemento nella schermata principale + Allow closing the fullscreen view with a down gesture Miniature diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 06d7b544a..8ee43c035 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -162,6 +162,7 @@ 画像のズームを深くする 可能な限り高品質で画像を表示 ごみ箱をメイン画面の最後に表示 + Allow closing the fullscreen view with a down gesture サムネイル設定 diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 3010341ef..ff6a97400 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture 섬네일 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index eb33a9d4b..138b4f17d 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Miniatiūros diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 540ccff27..dbaa4a07f 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Minibilder diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 63b22808e..46790ef4a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -162,6 +162,7 @@ Afbeeldingen ver inzoomen Afbeeldingen in de hoogst mogelijke kwaliteit weergeven Prullenbak als laatste item tonen + Allow closing the fullscreen view with a down gesture Miniatuurvoorbeelden diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index eeaf4a66f..c64473509 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture    Miniatury diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 1e51da9ad..51aa5c2f7 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Miniaturas diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index fd59f697f..088dd1885 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Mostrar fotos com a melhor qualidade possível Mostrar a reciclagem como o último item do ecrã principal + Allow closing the fullscreen view with a down gesture Miniaturas diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2eb9e31ff..7b7cba427 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -162,6 +162,7 @@ Масштабируемые изображения Показывать изображения с максимально высоким качеством Показывать корзину как последний элемент на главном экране + Allow closing the fullscreen view with a down gesture Миниатюры diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 4c0a92e53..f4cbde3f0 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -146,7 +146,7 @@ Prehliadať miniatúry vodorovne Automaticky skrývať systémové lišty pri celoobrazovkových médiách Odstrániť prázdne priečinky po vymazaní ich obsahu - Allow controlling photo brightness with vertical gestures + Povoliť ovládanie jasu vertikálnymi ťahmi Povoliť ovládanie hlasitosti a jasu videí vertikálnymi ťahmi Zobraziť počet médií v priečinku na hlavnej obrazovke Nahradiť Zdieľanie s Otočením v celoobrazovkovom menu @@ -162,6 +162,7 @@ Hlboko priblížiteľné obrázky Zobrazovať obrázky v najlepšej možnej kvalite Zobraziť odpadkový kôš ako poslednú položku na hlavnej obrazovke + Povoliť zatváranie celoobrazovkového režimu potiahnutím prsta dole Náhľady diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index a5ee7bd35..0eeff1265 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Miniatyrer diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 783118413..765c5f261 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Thumbnails diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e13e793ac..049d23054 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -162,6 +162,7 @@ Глибокомасштабовані зображення Показувати зображення в найвищій можливій якості Показувати \"Кошик\" останнім елементом на головному екрані + Allow closing the fullscreen view with a down gesture Ескізи diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index b7a446090..0e5981b3a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -162,6 +162,7 @@ 深度放大图像 以最高质量显示图像 在主屏幕界面的最后一项显示回收站 + Allow closing the fullscreen view with a down gesture 缩略图 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 9d2a97151..c2b62bb11 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -162,6 +162,7 @@ 可深度縮放的圖片 以最高品質顯示圖片 回收桶顯示在主畫面最後一項 + Allow closing the fullscreen view with a down gesture 縮圖 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 922d1cc58..24264a8ba 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -162,6 +162,7 @@ Deep zoomable images Show images in the highest possible quality Show the Recycle Bin as the last item on the main screen + Allow closing the fullscreen view with a down gesture Thumbnails