From 067798e5c2a941dde3ee381793635d020ebb4056 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 5 Sep 2017 16:06:42 +0200 Subject: [PATCH] use different toggles for photos and gifs at the slideshow setup --- .../gallery/activities/ViewPagerActivity.kt | 6 ++++- .../gallery/dialogs/SlideshowDialog.kt | 7 ++++++ .../gallery/helpers/Config.kt | 4 ++++ .../gallery/helpers/Constants.kt | 1 + app/src/main/res/layout/dialog_slideshow.xml | 23 ++++++++++++++++++- app/src/main/res/values-ca/strings.xml | 3 ++- app/src/main/res/values-cs/strings.xml | 3 ++- app/src/main/res/values-de/strings.xml | 3 ++- app/src/main/res/values-es/strings.xml | 3 ++- app/src/main/res/values-fr/strings.xml | 3 ++- app/src/main/res/values-hu/strings.xml | 3 ++- app/src/main/res/values-it/strings.xml | 3 ++- app/src/main/res/values-ja/strings.xml | 3 ++- app/src/main/res/values-pl/strings.xml | 3 ++- app/src/main/res/values-pt-rBR/strings.xml | 3 ++- app/src/main/res/values-pt/strings.xml | 3 ++- app/src/main/res/values-ru/strings.xml | 3 ++- app/src/main/res/values-sk/strings.xml | 3 ++- app/src/main/res/values-sv/strings.xml | 3 ++- app/src/main/res/values-tr/strings.xml | 3 ++- app/src/main/res/values-zh-rCN/strings.xml | 3 ++- app/src/main/res/values-zh-rTW/strings.xml | 3 ++- app/src/main/res/values/strings.xml | 3 ++- 23 files changed, 75 insertions(+), 20 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt index 5b09bcf6d..71cb64e7a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt @@ -361,13 +361,17 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View private fun getMediaForSlideshow(): Boolean { mSlideshowMedia = mMedia.toMutableList() if (!config.slideshowIncludePhotos) { - mSlideshowMedia = mSlideshowMedia.filter { !it.isImage() && !it.isGif() } as MutableList + mSlideshowMedia = mSlideshowMedia.filter { !it.isImage() } as MutableList } if (!config.slideshowIncludeVideos) { mSlideshowMedia = mSlideshowMedia.filter { it.isImage() || it.isGif() } as MutableList } + if (!config.slideshowIncludeGIFs) { + mSlideshowMedia = mSlideshowMedia.filter { !it.isGif() } as MutableList + } + if (config.slideshowRandomOrder) { Collections.shuffle(mSlideshowMedia) mPos = 0 diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SlideshowDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SlideshowDialog.kt index f28d8ef62..60923a220 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SlideshowDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SlideshowDialog.kt @@ -42,6 +42,11 @@ class SlideshowDialog(val activity: SimpleActivity, val callback: () -> Unit) { include_videos.toggle() } + include_gifs_holder.setOnClickListener { + interval_value.clearFocus() + include_gifs.toggle() + } + random_order_holder.setOnClickListener { interval_value.clearFocus() random_order.toggle() @@ -74,6 +79,7 @@ class SlideshowDialog(val activity: SimpleActivity, val callback: () -> Unit) { interval_value.setText(config.slideshowInterval.toString()) include_photos.isChecked = config.slideshowIncludePhotos include_videos.isChecked = config.slideshowIncludeVideos + include_gifs.isChecked = config.slideshowIncludeGIFs random_order.isChecked = config.slideshowRandomOrder use_fade.isChecked = config.slideshowUseFade move_backwards.isChecked = config.slideshowMoveBackwards @@ -89,6 +95,7 @@ class SlideshowDialog(val activity: SimpleActivity, val callback: () -> Unit) { slideshowInterval = interval.toInt() slideshowIncludePhotos = view.include_photos.isChecked slideshowIncludeVideos = view.include_videos.isChecked + slideshowIncludeGIFs = view.include_gifs.isChecked slideshowRandomOrder = view.random_order.isChecked slideshowUseFade = view.use_fade.isChecked slideshowMoveBackwards = view.move_backwards.isChecked 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 f8b61b8f8..882a9ddef 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt @@ -257,6 +257,10 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(SLIDESHOW_INCLUDE_VIDEOS, false) set(slideshowIncludeVideos) = prefs.edit().putBoolean(SLIDESHOW_INCLUDE_VIDEOS, slideshowIncludeVideos).apply() + var slideshowIncludeGIFs: Boolean + get() = prefs.getBoolean(SLIDESHOW_INCLUDE_GIFS, false) + set(slideshowIncludeGIFs) = prefs.edit().putBoolean(SLIDESHOW_INCLUDE_GIFS, slideshowIncludeGIFs).apply() + var slideshowRandomOrder: Boolean get() = prefs.getBoolean(SLIDESHOW_RANDOM_ORDER, false) set(slideshowRandomOrder) = prefs.edit().putBoolean(SLIDESHOW_RANDOM_ORDER, slideshowRandomOrder).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 55ec434db..3e3cb7285 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt @@ -41,6 +41,7 @@ val ALLOW_VIDEO_GESTURES = "allow_video_gestures" val SLIDESHOW_INTERVAL = "slideshow_interval" val SLIDESHOW_INCLUDE_PHOTOS = "slideshow_include_photos" val SLIDESHOW_INCLUDE_VIDEOS = "slideshow_include_videos" +val SLIDESHOW_INCLUDE_GIFS = "slideshow_include_gifs" val SLIDESHOW_RANDOM_ORDER = "slideshow_random_order" val SLIDESHOW_USE_FADE = "slideshow_use_fade" val SLIDESHOW_MOVE_BACKWARDS = "slideshow_move_backwards" diff --git a/app/src/main/res/layout/dialog_slideshow.xml b/app/src/main/res/layout/dialog_slideshow.xml index d057acf77..570c48c03 100644 --- a/app/src/main/res/layout/dialog_slideshow.xml +++ b/app/src/main/res/layout/dialog_slideshow.xml @@ -78,7 +78,7 @@ + + + + + + Slideshow Interval (seconds): - Include photos and GIFs + Include photos Include videos + Include GIFs Random order Use fade animations Move backwards diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 064f7380e..ed1a567f2 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -92,8 +92,9 @@ Slideshow Interval (seconds): - Include photos and GIFs + Include photos Include videos + Include GIFs Random order Use fade animations Move backwards diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8ceb1f74e..2caeb213e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -92,8 +92,9 @@ Diashow Intervall (Sekunden): - Bilder/GIFs verwenden + Bilder verwenden Videos verwenden + GIF verwenden Zufällige Reihenfolge Übergänge animieren Rückwärts abspielen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 779ea07d3..86d314cb3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -92,8 +92,9 @@ Slideshow Interval (seconds): - Include photos and GIFs + Include photos Include videos + Include GIFs Random order Use fade animations Move backwards diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index fe09d0460..fdc3cd59d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -92,8 +92,9 @@ Diaporama Intervalle​ (secondes): - Inclure photos et GIFs + Inclure photos Inclure vidéos + Inclure GIFs Ordre aléatoire Utiliser un fondu Revenir en arrière diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f8bbce01f..8be078b61 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -92,8 +92,9 @@ Slideshow Interval (seconds): - Include photos and GIFs + Include photos Include videos + Include GIFs Random order Use fade animations Move backwards diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 1af0bd606..4a1ddc1a9 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -92,8 +92,9 @@ Presentazione Intervallo (secondi): - Includi foto e GIF + Includi foto Includi video + Includi GIF Ordine sparso Usa animazioni a dissolvenza Scorri al contrario diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 5bb6e82f2..24d9db9de 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -92,8 +92,9 @@ Slideshow Interval (seconds): - Include photos and GIFs + Include photos Include videos + Include GIFs Random order Use fade animations Move backwards diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 25af3d4ee..675aa2838 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -92,8 +92,9 @@ Pokaz slajdów Przedział (sekundy): - Dołączaj zdjęcia i GIFy + Dołączaj zdjęcia Dołączaj filmy + Dołączaj GIFy Losowa kolejność Używaj płynnych przejść    Odwrotna kolejność diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 17816a8f7..9c1991111 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -92,8 +92,9 @@ Slideshow Interval (seconds): - Include photos and GIFs + Include photos Include videos + Include GIFs Random order Use fade animations Move backwards diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d43d3e4ca..3542bb452 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -92,8 +92,9 @@ Apresentação Intervalo (segundos): - Incluir fotos e GIFs + Incluir fotos Incluir vídeos + Incluir GIFs Ordem aleatória Usar animações Mover para trás diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 26d1ef055..04f9a508a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -92,8 +92,9 @@ Slideshow Interval (seconds): - Include photos and GIFs + Include photos Include videos + Include GIFs Random order Use fade animations Move backwards diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 2cf132f11..d3c9d326e 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -92,8 +92,9 @@ Prezentácia Interval (sekundy): - Zahrnúť fotky a GIF súbory + Zahrnúť fotky Zahrnúť videá + Zahrnúť GIFy Náhodné poradie Používať miznúce animácie Ísť opačným smerom diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 043f1f72e..fc94187c0 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -92,8 +92,9 @@ Slideshow Interval (seconds): - Include photos and GIFs + Include photos Include videos + Include GIFs Random order Use fade animations Move backwards diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index aade22087..3fc8b0e18 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -92,8 +92,9 @@ Slideshow Interval (seconds): - Include photos and GIFs + Include photos Include videos + Include GIFs Random order Use fade animations Move backwards diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c8a8b6900..a1170b885 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -92,8 +92,9 @@ 幻灯片 间隔（秒）: - 包含照片和动态图 + Include photos 包含视频 + Include GIFs 随机顺序 使用渐变动画 倒播 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 66b15f9e1..822c72607 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -92,8 +92,9 @@ 投影片 間隔 (秒): - 包含照片和GIF + Include photos 包含影片 + Include GIFs 隨機順序 使用淡入淡出動畫 反向播放 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6acb28aed..7d3ec4a59 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -92,8 +92,9 @@ Slideshow Interval (seconds): - Include photos and GIFs + Include photos Include videos + Include GIFs Random order Use fade animations Move backwards