[rotation]reverse landscape

ekibun · Mar 12, 2019 · 05f02e3 · 05f02e3
1 parent ce80b66
commit 05f02e3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/app/src/main/java/soko/ekibun/tilesbox/service/RotationQuickTileService.kt b/app/src/main/java/soko/ekibun/tilesbox/service/RotationQuickTileService.kt
@@ -2,6 +2,7 @@ package soko.ekibun.tilesbox.service
 
 import android.content.Intent
 import android.graphics.drawable.Icon
+import android.preference.PreferenceManager
 import android.provider.Settings
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
@@ -39,7 +40,7 @@ class RotationQuickTileService : TileService() {
 
     private fun toggleOrientation(): Int {
         val oldOrientation = OrientationUtil.getCurrentOrientation(this)
-        val newOrientation = OrientationUtil.getOppositeOrientation(oldOrientation)
+        val newOrientation = OrientationUtil.getOppositeOrientation(oldOrientation, PreferenceManager.getDefaultSharedPreferences(this).getBoolean("rotation_reverse_landscape", false))
 
         Settings.System.putInt(contentResolver, Settings.System.ACCELEROMETER_ROTATION, 0)
         Settings.System.putInt(contentResolver, Settings.System.USER_ROTATION, newOrientation)

diff --git a/app/src/main/java/soko/ekibun/tilesbox/util/OrientationUtil.kt b/app/src/main/java/soko/ekibun/tilesbox/util/OrientationUtil.kt
@@ -14,9 +14,9 @@ object OrientationUtil {
     private const val ROTATION_LAND_REVERSE = Surface.ROTATION_270
     const val ROTATION_AUTO = -1
 
-    fun getOppositeOrientation(orientation: Int): Int {
+    fun getOppositeOrientation(orientation: Int, reverse: Boolean): Int {
         return when {
-            isPortrait(orientation) -> ROTATION_LAND
+            isPortrait(orientation) -> if(reverse) ROTATION_LAND_REVERSE else ROTATION_LAND
             isLandscape(orientation) -> ROTATION_PORT
             else -> ROTATION_AUTO
         }

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -57,6 +57,7 @@
     <string name="rotation_portrait">纵向</string>
     <string name="rotation_landscape">横向</string>
     <string name="rotation_auto">自动旋转</string>
+    <string name="rotation_pref_reverse_landscape">横屏反转</string>
 
     <!--round corner-->
     <string name="pref_corner_cate">屏幕圆角</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -57,6 +57,7 @@
     <string name="rotation_portrait">Portrait</string>
     <string name="rotation_landscape">Landscape</string>
     <string name="rotation_auto">Rotation Auto</string>
+    <string name="rotation_pref_reverse_landscape">Reverse Landscape</string>
 
     <!--round corner-->
     <string name="pref_corner_cate">Rounded Corner</string>

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -78,6 +78,11 @@
                     android:key="rotation_permit_float_window"
                     android:title="@string/permit_float_window" />
         </PreferenceCategory>
+        <PreferenceCategory android:title="@string/pref_cate_other">
+            <SwitchPreference
+                    android:key="rotation_reverse_landscape"
+                    android:title="@string/rotation_pref_reverse_landscape" />
+        </PreferenceCategory>
     </PreferenceScreen>
     <PreferenceScreen
             android:title="@string/pref_corner_cate"