From e8d8621f06751a6aa099931cba1d8f4e4f28ddb6 Mon Sep 17 00:00:00 2001 From: arkon Date: Fri, 23 Apr 2021 22:37:43 -0400 Subject: [PATCH] Remove "Locked" orientation, replace with explicit orientations Portrait/Landscape allow sensor, Locked Portrait/Landscape don't. --- .../java/eu/kanade/tachiyomi/Migrations.kt | 4 +++ .../tachiyomi/ui/reader/ReaderActivity.kt | 7 ++-- .../ui/reader/setting/OrientationType.kt | 35 +++++-------------- .../ui/setting/SettingsReaderController.kt | 7 ++-- .../ic_stay_current_landscape_24dp.xml | 9 +++++ .../ic_stay_current_portrait_24dp.xml | 9 +++++ app/src/main/res/values/arrays.xml | 4 ++- app/src/main/res/values/strings.xml | 7 ++-- 8 files changed, 45 insertions(+), 37 deletions(-) create mode 100644 app/src/main/res/drawable/ic_stay_current_landscape_24dp.xml create mode 100644 app/src/main/res/drawable/ic_stay_current_portrait_24dp.xml diff --git a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt index d3d929b43..dcb414666 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt @@ -139,6 +139,10 @@ object Migrations { } } } + if (oldVersion < 59) { + // Reset rotation to Free after replacing Lock + preferences.rotation().set(1) + } return true } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 804397630..327da24c5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -372,8 +372,7 @@ class ReaderActivity : BaseRxActivity() setTooltip(R.string.pref_rotation_type) setOnClickListener { - val newOrientation = - OrientationType.getNextOrientation(preferences.rotation().get(), resources) + val newOrientation = OrientationType.getNextOrientation(preferences.rotation().get()) preferences.rotation().set(newOrientation.prefValue) setOrientation(newOrientation.flag) @@ -422,7 +421,7 @@ class ReaderActivity : BaseRxActivity() } private fun updateRotationShortcut(preference: Int) { - val orientation = OrientationType.fromPreference(preference, resources) + val orientation = OrientationType.fromPreference(preference) binding.actionRotation.setImageResource(orientation.iconRes) } @@ -768,7 +767,7 @@ class ReaderActivity : BaseRxActivity() * Forces the user preferred [orientation] on the activity. */ private fun setOrientation(orientation: Int) { - val newOrientation = OrientationType.fromPreference(orientation, resources) + val newOrientation = OrientationType.fromPreference(orientation) if (newOrientation.flag != requestedOrientation) { requestedOrientation = newOrientation.flag } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/OrientationType.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/OrientationType.kt index f5f79027a..5f358a670 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/OrientationType.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/OrientationType.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.ui.reader.setting import android.content.pm.ActivityInfo -import android.content.res.Configuration -import android.content.res.Resources import androidx.annotation.DrawableRes import androidx.annotation.StringRes import eu.kanade.tachiyomi.R @@ -10,33 +8,18 @@ import eu.kanade.tachiyomi.util.lang.next enum class OrientationType(val prefValue: Int, val flag: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) { FREE(1, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED, R.string.rotation_free, R.drawable.ic_screen_rotation_24dp), - LOCKED_PORTRAIT(2, ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT, R.string.rotation_lock, R.drawable.ic_screen_lock_rotation_24dp), - LOCKED_LANDSCAPE(2, ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, R.string.rotation_lock, R.drawable.ic_screen_lock_rotation_24dp), - PORTRAIT(3, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, R.string.rotation_force_portrait, R.drawable.ic_screen_lock_portrait_24dp), - LANDSCAPE(4, ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, R.string.rotation_force_landscape, R.drawable.ic_screen_lock_landscape_24dp); + PORTRAIT(2, ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT, R.string.rotation_portrait, R.drawable.ic_stay_current_portrait_24dp), + LANDSCAPE(3, ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, R.string.rotation_landscape, R.drawable.ic_stay_current_landscape_24dp), + LOCKED_PORTRAIT(4, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, R.string.rotation_force_portrait, R.drawable.ic_screen_lock_portrait_24dp), + LOCKED_LANDSCAPE(5, ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, R.string.rotation_force_landscape, R.drawable.ic_screen_lock_landscape_24dp), + ; companion object { - fun fromPreference(preference: Int, resources: Resources): OrientationType = when (preference) { - 2 -> { - val currentOrientation = resources.configuration.orientation - if (currentOrientation == Configuration.ORIENTATION_PORTRAIT) { - LOCKED_PORTRAIT - } else { - LOCKED_LANDSCAPE - } - } - 3 -> PORTRAIT - 4 -> LANDSCAPE - else -> FREE - } + fun fromPreference(preference: Int): OrientationType = + values().find { it.prefValue == preference } ?: FREE - fun getNextOrientation(preference: Int, resources: Resources): OrientationType { - val current = if (preference == 2) { - // Avoid issue due to 2 types having the same prefValue - LOCKED_LANDSCAPE - } else { - fromPreference(preference, resources) - } + fun getNextOrientation(preference: Int): OrientationType { + val current = fromPreference(preference) return current.next() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt index a3e0aa065..6524d3b81 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt @@ -78,11 +78,12 @@ class SettingsReaderController : SettingsController() { titleRes = R.string.pref_rotation_type entriesRes = arrayOf( R.string.rotation_free, - R.string.rotation_lock, + R.string.rotation_portrait, + R.string.rotation_landscape, R.string.rotation_force_portrait, - R.string.rotation_force_landscape + R.string.rotation_force_landscape, ) - entryValues = arrayOf("1", "2", "3", "4") + entryValues = arrayOf("1", "2", "3", "4", "5") defaultValue = "1" summary = "%s" } diff --git a/app/src/main/res/drawable/ic_stay_current_landscape_24dp.xml b/app/src/main/res/drawable/ic_stay_current_landscape_24dp.xml new file mode 100644 index 000000000..ac185cda4 --- /dev/null +++ b/app/src/main/res/drawable/ic_stay_current_landscape_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_stay_current_portrait_24dp.xml b/app/src/main/res/drawable/ic_stay_current_portrait_24dp.xml new file mode 100644 index 000000000..23e9f4f26 --- /dev/null +++ b/app/src/main/res/drawable/ic_stay_current_portrait_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 7dafac408..9479f9422 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -62,7 +62,8 @@ @string/rotation_free - @string/rotation_lock + @string/rotation_portrait + @string/rotation_landscape @string/rotation_force_portrait @string/rotation_force_landscape @@ -72,6 +73,7 @@ 2 3 4 + 5 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aac4233be..786ebbea8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -332,9 +332,10 @@ Fast Rotation Free - Lock - Force portrait - Force landscape + Portrait + Landscape + Locked portrait + Locked landscape R G B