moving the forcePortrait config in the app itself, from Commons

Author: tibbi

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/BrightDisplayActivity.kt

@@ -35,10 +35,7 @@ class BrightDisplayActivity : SimpleActivity() {
         super.onResume()
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         toggleBrightness(true)
-
-        if (config.forcePortrait) {
-            requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-        }
+        requestedOrientation = if (config.forcePortraitMode) ActivityInfo.SCREEN_ORIENTATION_PORTRAIT else ActivityInfo.SCREEN_ORIENTATION_SENSOR
     }
 
     override fun onPause() {

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt

@@ -71,9 +71,7 @@ class MainActivity : SimpleActivity() {
             changeIconColor(config.backgroundColor.getContrastColor(), stroboscope_btn)
         }
 
-        if (config.forcePortrait) {
-            requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-        }
+        requestedOrientation = if (config.forcePortraitMode) ActivityInfo.SCREEN_ORIENTATION_PORTRAIT else ActivityInfo.SCREEN_ORIENTATION_SENSOR
     }
 
     override fun onStart() {

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

@@ -98,10 +98,10 @@ class SettingsActivity : SimpleActivity() {
     }
 
     private fun setupForcePortrait() {
-        settings_force_portrait.isChecked = config.forcePortrait
+        settings_force_portrait.isChecked = config.forcePortraitMode
         settings_force_portrait_holder.setOnClickListener {
             settings_force_portrait.toggle()
-            config.forcePortrait = settings_force_portrait.isChecked
+            config.forcePortraitMode = settings_force_portrait.isChecked
         }
     }
 }

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

@@ -32,4 +32,8 @@ class Config(context: Context) : BaseConfig(context) {
     var brightDisplayColor: Int
         get() = prefs.getInt(BRIGHT_DISPLAY_COLOR, Color.WHITE)
         set(brightDisplayColor) = prefs.edit().putInt(BRIGHT_DISPLAY_COLOR, brightDisplayColor).apply()
+
+    var forcePortraitMode: Boolean
+        get() = prefs.getBoolean(FORCE_PORTRAIT_MODE, true)
+        set(forcePortraitMode) = prefs.edit().putBoolean(FORCE_PORTRAIT_MODE, forcePortraitMode).apply()
 }

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

@@ -9,3 +9,4 @@ const val TOGGLE = "toggle"
 const val TOGGLE_WIDGET_UI = "toggle_widget_ui"
 const val STROBOSCOPE_FREQUENCY = "stroboscope_frequency"
 const val STROBOSCOPE_PROGRESS = "stroboscope_progress"
+const val FORCE_PORTRAIT_MODE = "force_portrait_mode"