From 2ae0ddd9e7b7ebf7bc9b03e612815d74681af06c Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Tue, 9 Jan 2024 17:00:21 +0100
Subject: [PATCH] Add option to always rotate

---
 CHANGELOG.md                                                  | 1 +
 .../java/protect/card_locker/LoyaltyCardViewActivity.java     | 4 +++-
 app/src/main/res/values/settings.xml                          | 2 ++
 app/src/main/res/values/strings.xml                           | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b97301b8..cef5fed53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Fix edge case causing invalid UI state when toggling showing archive
 - Use theme or card colour for navigation bar (Android 8.1+)
 - Updated validity and expiry date selector
+- Add option to always rotate (ignoring system settings)
 
 ## v2.26.0 - 131 (2023-09-14)
 
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 9a013bfc7..634d28d76 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -226,7 +226,9 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         settings = new Settings(this);
 
         String cardOrientation = settings.getCardViewOrientation();
-        if (cardOrientation.equals(getString(R.string.settings_key_lock_on_opening_orientation))) {
+        if (cardOrientation.equals(getString(R.string.settings_key_follow_sensor_orientation))) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+        } else if (cardOrientation.equals(getString(R.string.settings_key_lock_on_opening_orientation))) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
         } else if (cardOrientation.equals(getString(R.string.settings_key_portrait_orientation))) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml
index 9f804e0d7..a0eabe327 100644
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -118,6 +118,7 @@
 
     <string-array name="card_orientation_values">
         <item>@string/settings_key_follow_system_orientation</item>
+        <item>@string/settings_key_follow_sensor_orientation</item>
         <item>@string/settings_key_lock_on_opening_orientation</item>
         <item>@string/settings_key_portrait_orientation</item>
         <item>@string/settings_key_landscape_orientation</item>
@@ -125,6 +126,7 @@
 
     <string-array name="card_orientation_values_strings">
         <item>@string/settings_follow_system_orientation</item>
+        <item>@string/settings_follow_sensor_orientation</item>
         <item>@string/settings_lock_on_opening_orientation</item>
         <item>@string/settings_portrait_orientation</item>
         <item>@string/settings_landscape_orientation</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 26192f127..66ecc3683 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,6 +99,8 @@
     <string name="settings_key_card_orientation" translatable="false">pref_card_orientation</string>
     <string name="settings_follow_system_orientation">Follow system</string>
     <string name="settings_key_follow_system_orientation" translatable="false">follow_system</string>
+    <string name="settings_follow_sensor_orientation">Always rotate (ignores system settings)</string>
+    <string name="settings_key_follow_sensor_orientation" translatable="false">follow_sensor</string>
     <string name="settings_portrait_orientation">Portrait</string>
     <string name="settings_key_portrait_orientation" translatable="false">portrait</string>
     <string name="settings_landscape_orientation">Landscape</string>