add a new slideshow setup toggle for including photos

app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt

@@ -317,6 +317,10 @@ 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
+        }
+
         if (!config.slideshowIncludeVideos) {
             mSlideshowMedia = mSlideshowMedia.filter { it.isImage() || it.isGif() } as MutableList
         }

app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SlideshowDialog.kt

@@ -32,6 +32,11 @@ class SlideshowDialog(val activity: SimpleActivity, val callback: () -> Unit) {
                     activity.hideKeyboard(v)
             }
 
+            include_photos_holder.setOnClickListener {
+                interval_value.clearFocus()
+                include_photos.toggle()
+            }
+
             include_videos_holder.setOnClickListener {
                 interval_value.clearFocus()
                 include_videos.toggle()
@@ -67,6 +72,7 @@ class SlideshowDialog(val activity: SimpleActivity, val callback: () -> Unit) {
         val config = activity.config
         view.apply {
             interval_value.setText(config.slideshowInterval.toString())
+            include_photos.isChecked = config.slideshowIncludePhotos
             include_videos.isChecked = config.slideshowIncludeVideos
             random_order.isChecked = config.slideshowRandomOrder
             use_fade.isChecked = config.slideshowUseFade
@@ -81,6 +87,7 @@ class SlideshowDialog(val activity: SimpleActivity, val callback: () -> Unit) {
 
         activity.config.apply {
             slideshowInterval = interval.toInt()
+            slideshowIncludePhotos = view.include_photos.isChecked
             slideshowIncludeVideos = view.include_videos.isChecked
             slideshowRandomOrder = view.random_order.isChecked
             slideshowUseFade = view.use_fade.isChecked

app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt

@@ -237,6 +237,10 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getInt(SLIDESHOW_INTERVAL, SLIDESHOW_DEFAULT_INTERVAL)
         set(slideshowInterval) = prefs.edit().putInt(SLIDESHOW_INTERVAL, slideshowInterval).apply()
 
+    var slideshowIncludePhotos: Boolean
+        get() = prefs.getBoolean(SLIDESHOW_INCLUDE_PHOTOS, true)
+        set(slideshowIncludePhotos) = prefs.edit().putBoolean(SLIDESHOW_INCLUDE_PHOTOS, slideshowIncludePhotos).apply()
+
     var slideshowIncludeVideos: Boolean
         get() = prefs.getBoolean(SLIDESHOW_INCLUDE_VIDEOS, false)
         set(slideshowIncludeVideos) = prefs.edit().putBoolean(SLIDESHOW_INCLUDE_VIDEOS, slideshowIncludeVideos).apply()

app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt

@@ -36,6 +36,7 @@ val REPLACE_SHARE_WITH_ROTATE = "replace_share_with_rotate"
 
 // slideshow
 val SLIDESHOW_INTERVAL = "slideshow_interval"
+val SLIDESHOW_INCLUDE_PHOTOS = "slideshow_include_photos"
 val SLIDESHOW_INCLUDE_VIDEOS = "slideshow_include_videos"
 val SLIDESHOW_RANDOM_ORDER = "slideshow_random_order"
 val SLIDESHOW_USE_FADE = "slideshow_use_fade"

app/src/main/res/layout/dialog_slideshow.xml

@@ -36,7 +36,7 @@
             android:textCursorDrawable="@null"/>
 
         <RelativeLayout
-            android:id="@+id/include_videos_holder"
+            android:id="@+id/include_photos_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/interval_label"
@@ -46,6 +46,27 @@
             android:paddingStart="@dimen/medium_margin"
             android:paddingTop="@dimen/activity_margin">
 
+            <com.simplemobiletools.commons.views.MySwitchCompat
+                android:id="@+id/include_photos"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:text="@string/include_photos"/>
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/include_videos_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/include_photos_holder"
+            android:background="?attr/selectableItemBackground"
+            android:paddingBottom="@dimen/activity_margin"
+            android:paddingLeft="@dimen/medium_margin"
+            android:paddingStart="@dimen/medium_margin"
+            android:paddingTop="@dimen/activity_margin">
+
             <com.simplemobiletools.commons.views.MySwitchCompat
                 android:id="@+id/include_videos"
                 android:layout_width="match_parent"

app/src/main/res/values-cs/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values-de/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values-es/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values-fr/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values-hu/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values-it/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values-ja/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values-pl/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -83,6 +83,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values-pt/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values-ru/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values-sk/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Prezentácia</string>
     <string name="interval">Interval (sekundy):</string>
+    <string name="include_photos">Zahrnúť fotky a GIF súbory</string>
     <string name="include_videos">Zahrnúť videá</string>
     <string name="random_order">Náhodné poradie</string>
     <string name="use_fade">Používať miznúce animácie</string>

app/src/main/res/values-sv/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values-tr/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>

app/src/main/res/values/strings.xml

@@ -82,6 +82,7 @@
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
     <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos and GIFs</string>
     <string name="include_videos">Include videos</string>
     <string name="random_order">Random order</string>
     <string name="use_fade">Use fade animations</string>