add more screen rotating options

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

@@ -8,9 +8,7 @@ import com.simplemobiletools.commons.extensions.updateTextColors
 import com.simplemobiletools.commons.models.RadioItem
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.extensions.config
-import com.simplemobiletools.gallery.helpers.IMAGES
+import com.simplemobiletools.gallery.helpers.*
-import com.simplemobiletools.gallery.helpers.IMAGES_AND_VIDEOS
-import com.simplemobiletools.gallery.helpers.VIDEOS
 import kotlinx.android.synthetic.main.activity_settings.*
 
 class SettingsActivity : SimpleActivity() {
@@ -34,7 +32,7 @@ class SettingsActivity : SimpleActivity() {
         setupAnimateGifs()
         setupMaxBrightness()
         setupCropThumbnails()
-        setupAutoRotateScreen()
+        setupScreenRotation()
         setupShowMedia()
         updateTextColors(settings_holder)
     }
@@ -105,13 +103,26 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
-    private fun setupAutoRotateScreen() {
+    private fun setupScreenRotation() {
-        settings_auto_rotate_screen.isChecked = config.autoRotateScreen
+        settings_screen_rotation.text = getScreenRotationText()
-        settings_auto_rotate_screen_holder.setOnClickListener {
+        settings_screen_rotation_holder.setOnClickListener {
-            settings_auto_rotate_screen.toggle()
+            val items = arrayListOf(
-            config.autoRotateScreen = settings_auto_rotate_screen.isChecked
+                    RadioItem(ROTATE_BY_SYSTEM_SETTING, res.getString(R.string.screen_rotation_system_setting)),
+                    RadioItem(ROTATE_BY_DEVICE_ROTATION, res.getString(R.string.screen_rotation_device_rotation)),
+                    RadioItem(ROTATE_BY_ASPECT_RATIO, res.getString(R.string.screen_rotation_aspect_ratio)))
+
+            RadioGroupDialog(this@SettingsActivity, items, config.screenRotation) {
+                config.screenRotation = it as Int
+                settings_screen_rotation.text = getScreenRotationText()
             }
         }
+    }
+
+    private fun getScreenRotationText() = getString(when (config.screenRotation) {
+        ROTATE_BY_SYSTEM_SETTING -> R.string.screen_rotation_system_setting
+        ROTATE_BY_DEVICE_ROTATION -> R.string.screen_rotation_device_rotation
+        else -> R.string.screen_rotation_aspect_ratio
+    })
 
     private fun setupShowMedia() {
         settings_show_media.text = getShowMediaText()
@@ -133,5 +144,4 @@ class SettingsActivity : SimpleActivity() {
         IMAGES -> R.string.images
         else -> R.string.videos
     })
-
 }

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

@@ -2,7 +2,6 @@ package com.simplemobiletools.gallery.activities
 
 import android.app.Activity
 import android.content.Intent
-import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.database.Cursor
 import android.graphics.Bitmap
@@ -403,14 +402,14 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
     }
 
     private fun checkOrientation() {
-        if (config.autoRotateScreen) {
+        /*if (config.screenRotation) {
             val res = getCurrentFile().getResolution()
             if (res.x > res.y) {
                 requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
             } else if (res.x < res.y) {
                 requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
             }
-        }
+        }*/
     }
 
     override fun fragmentClicked() {

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

@@ -136,9 +136,9 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getBoolean(CROP_THUMBNAILS, true)
         set(cropThumbnails) = prefs.edit().putBoolean(CROP_THUMBNAILS, cropThumbnails).apply()
 
-    var autoRotateScreen: Boolean
+    var screenRotation: Int
-        get() = prefs.getBoolean(AUTO_ROTATE_SCREEN, false)
+        get() = prefs.getInt(SCREEN_ROTATION, ROTATE_BY_SYSTEM_SETTING)
-        set(autoRotateScreen) = prefs.edit().putBoolean(AUTO_ROTATE_SCREEN, autoRotateScreen).apply()
+        set(screenRotation) = prefs.edit().putInt(SCREEN_ROTATION, screenRotation).apply()
 
     var loopVideos: Boolean
         get() = prefs.getBoolean(LOOP_VIDEOS, false)

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

@@ -11,7 +11,7 @@ val LOOP_VIDEOS = "loop_videos"
 val ANIMATE_GIFS = "animate_gifs"
 val MAX_BRIGHTNESS = "max_brightness"
 val CROP_THUMBNAILS = "crop_thumbnails"
-val AUTO_ROTATE_SCREEN = "auto_rotate_screen"
+val SCREEN_ROTATION = "screen_rotation"
 val DISPLAY_FILE_NAMES = "display_file_names"
 val PINNED_FOLDERS = "pinned_folders"
 val DIR_COLUMN_CNT = "dir_column_cnt"
@@ -40,3 +40,8 @@ val REQUEST_SET_WALLPAPER = 2
 val IMAGES_AND_VIDEOS = 0
 val IMAGES = 1
 val VIDEOS = 2
+
+// rotations
+val ROTATE_BY_SYSTEM_SETTING = 0
+val ROTATE_BY_DEVICE_ROTATION = 1
+val ROTATE_BY_ASPECT_RATIO = 2

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

@@ -189,22 +189,37 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/settings_auto_rotate_screen_holder"
+            android:id="@+id/settings_screen_rotation_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:padding="@dimen/activity_margin">
+            android:paddingBottom="@dimen/bigger_margin"
+            android:paddingLeft="@dimen/activity_margin"
+            android:paddingRight="@dimen/activity_margin"
+            android:paddingTop="@dimen/bigger_margin">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_auto_rotate_screen"
+                android:id="@+id/settings_screen_rotation_label"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
+                android:layout_centerVertical="true"
-                android:clickable="false"
+                android:layout_toLeftOf="@+id/settings_screen_rotation"
+                android:layout_toStartOf="@+id/settings_screen_rotation"
                 android:paddingLeft="@dimen/medium_margin"
-                android:paddingStart="@dimen/medium_margin"
+                android:paddingRight="@dimen/medium_margin"
-                android:text="@string/auto_rotate_screen"/>
+                android:text="@string/screen_rotation_by"/>
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/settings_screen_rotation"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginEnd="@dimen/small_margin"
+                android:layout_marginRight="@dimen/small_margin"
+                android:background="@null"
+                android:clickable="false"/>
 
         </RelativeLayout>
 

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

@@ -86,9 +86,12 @@
     <string name="images_and_videos">Obrázky i videa</string>
     <string name="loop_videos">Přehrávat videa ve smyčce</string>
     <string name="animate_gifs">Animovat náhledy souborů GIF</string>
-    <string name="max_brightness">Nastavit jas obrazovky na maximum při zobrazení médií</string>
+    <string name="max_brightness">Nastavit jas obrazovky na max při zobrazení médií</string>
     <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="auto_rotate_screen">Auto-rotate screen at fullscreen view</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -86,9 +86,12 @@
     <string name="images_and_videos">Bilder und Videos</string>
     <string name="loop_videos">Video Endlos-Schleife</string>
     <string name="animate_gifs">Animate gifs at thumbnails</string>
-    <string name="max_brightness">Maximum brightness when viewing media</string>
+    <string name="max_brightness">Max brightness when viewing media</string>
     <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="auto_rotate_screen">Auto-rotate screen at fullscreen view</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -88,7 +88,10 @@
     <string name="animate_gifs">Animar las miniaturas de gifs</string>
     <string name="max_brightness">Brillo máximo cuando se muestran los medios</string>
     <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="auto_rotate_screen">Auto-rotate screen at fullscreen view</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -86,9 +86,12 @@
     <string name="images_and_videos">Images et vidéos</string>
     <string name="loop_videos">Tourner en boucle les vidéos</string>
     <string name="animate_gifs">Animate gifs at thumbnails</string>
-    <string name="max_brightness">Maximum brightness when viewing media</string>
+    <string name="max_brightness">Max brightness when viewing media</string>
     <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="auto_rotate_screen">Auto-rotate screen at fullscreen view</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -86,9 +86,12 @@
     <string name="images_and_videos">Images and videos</string>
     <string name="loop_videos">Loop videos</string>
     <string name="animate_gifs">Animate gifs at thumbnails</string>
-    <string name="max_brightness">Maximum brightness when viewing media</string>
+    <string name="max_brightness">Max brightness when viewing media</string>
     <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="auto_rotate_screen">Auto-rotate screen at fullscreen view</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -88,7 +88,10 @@
     <string name="animate_gifs">Animate gifs at thumbnails</string>
     <string name="max_brightness">Maximum brightness when viewing media</string>
     <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="auto_rotate_screen">Auto-rotate screen at fullscreen view</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -86,9 +86,12 @@
     <string name="images_and_videos">Images and videos</string>
     <string name="loop_videos">Loop videos</string>
     <string name="animate_gifs">Animate gifs at thumbnails</string>
-    <string name="max_brightness">Maximum brightness when viewing media</string>
+    <string name="max_brightness">Max brightness when viewing media</string>
     <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="auto_rotate_screen">Auto-rotate screen at fullscreen view</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -86,9 +86,12 @@
     <string name="images_and_videos">Obrazy i wideo</string>
     <string name="loop_videos">Pętla wideo</string>
     <string name="animate_gifs">Animowanie gify z miniaturkami</string>
-    <string name="max_brightness">Maximum brightness when viewing media</string>
+    <string name="max_brightness">Max brightness when viewing media</string>
     <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="auto_rotate_screen">Auto-rotate screen at fullscreen view</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -88,7 +88,10 @@
     <string name="animate_gifs">Animação de gifs nas miniaturas</string>
     <string name="max_brightness">Brilho máximo ao visualizar midia</string>
     <string name="crop_thumbnails">Recortar miniaturas em quadrados</string>
-    <string name="auto_rotate_screen">Girar automaticamente quando em tela cheia</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -88,7 +88,10 @@
     <string name="animate_gifs">Animação de gifs nas miniaturas</string>
     <string name="max_brightness">Brilho máximo permitido</string>
     <string name="crop_thumbnails">Recortar miniaturas em quadrados</string>
-    <string name="auto_rotate_screen">Rodar automaticamente se em ecrã completo</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -88,7 +88,10 @@
     <string name="animate_gifs">Анимировать эскизы gif-файлов</string>
     <string name="max_brightness">Максимальная яркость при просмотре файлов</string>
     <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="auto_rotate_screen">Auto-rotate screen at fullscreen view</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -88,7 +88,10 @@
     <string name="animate_gifs">Animovať gif súbory pri náhľade</string>
     <string name="max_brightness">Maximálny jas pri prezeraní médií</string>
     <string name="crop_thumbnails">Orezať náhľady na štvorce</string>
-    <string name="auto_rotate_screen">Automaticky otáčať obrazovku pri celoobrazovkovom zobrazení</string>
+    <string name="screen_rotation_by">Otáčať obrazovku podľa Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">Systémového nastavenia</string>
+    <string name="screen_rotation_device_rotation">Otočenia zariadenia</string>
+    <string name="screen_rotation_aspect_ratio">Pomeru strán</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -86,9 +86,12 @@
     <string name="images_and_videos">Bilder och videos</string>
     <string name="loop_videos">Återspela videos</string>
     <string name="animate_gifs">Animate gifs at thumbnails</string>
-    <string name="max_brightness">Maximum brightness when viewing media</string>
+    <string name="max_brightness">Max brightness when viewing media</string>
     <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="auto_rotate_screen">Auto-rotate screen at fullscreen view</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -88,7 +88,10 @@
     <string name="animate_gifs">Küçük resimlerde gif\'leri canlandırın</string>
     <string name="max_brightness">Ortam görüntülerken azami parlaklık</string>
     <string name="crop_thumbnails">Küçük resimleri karelere kırp</string>
-    <string name="auto_rotate_screen">Ekranı tam ekran görünümde otomatik döndür</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -86,9 +86,12 @@
     <string name="images_and_videos">图像和视频</string>
     <string name="loop_videos">循环播放视频</string>
     <string name="animate_gifs">Animate gifs at thumbnails</string>
-    <string name="max_brightness">Maximum brightness when viewing media</string>
+    <string name="max_brightness">Max brightness when viewing media</string>
     <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="auto_rotate_screen">Auto-rotate screen at fullscreen view</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -86,9 +86,12 @@
     <string name="images_and_videos">圖片和影片</string>
     <string name="loop_videos">迴圈播放影片</string>
     <string name="animate_gifs">Animate gifs at thumbnails</string>
-    <string name="max_brightness">Maximum brightness when viewing media</string>
+    <string name="max_brightness">Max brightness when viewing media</string>
     <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="auto_rotate_screen">Auto-rotate screen at fullscreen view</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->

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

@@ -86,9 +86,12 @@
     <string name="images_and_videos">Images and videos</string>
     <string name="loop_videos">Loop videos</string>
     <string name="animate_gifs">Animate gifs at thumbnails</string>
-    <string name="max_brightness">Maximum brightness when viewing media</string>
+    <string name="max_brightness">Max brightness when viewing media</string>
     <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="auto_rotate_screen">Auto-rotate screen at fullscreen view</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->