From c7eea6495708841fa98e22aa47a792ed30db7249 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Wed, 18 May 2022 12:04:55 +0600
Subject: [PATCH] 5460-Set_default_preview_size_to_WYSIWYG

issue: https://gitlab.e.foundation/e/backlog/-/issues/5460
---
 app/src/main/java/net/sourceforge/opencamera/MainActivity.java  | 2 +-
 .../java/net/sourceforge/opencamera/MyApplicationInterface.java | 2 +-
 .../opencamera/preview/BasicApplicationInterface.java           | 2 +-
 .../main/java/net/sourceforge/opencamera/ui/DrawPreview.java    | 2 +-
 app/src/main/res/xml/preferences.xml                            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/net/sourceforge/opencamera/MainActivity.java b/app/src/main/java/net/sourceforge/opencamera/MainActivity.java
index 257b507e8..d71461520 100644
--- a/app/src/main/java/net/sourceforge/opencamera/MainActivity.java
+++ b/app/src/main/java/net/sourceforge/opencamera/MainActivity.java
@@ -664,7 +664,7 @@ public class MainActivity extends Activity {
      */
     public boolean isInFullScreenMode() {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        String preview_size = sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_display");
+        String preview_size = sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_wysiwyg");
         return !(preview_size.equals("preference_preview_size_wysiwyg") || preview.isVideo());
     }
 
diff --git a/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java b/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java
index 3623718d8..2726706fa 100644
--- a/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java
+++ b/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java
@@ -1029,7 +1029,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
 
     @Override
     public String getPreviewSizePref() {
-        return sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_display");
+        return sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_wysiwyg");
     }
 
     @Override
diff --git a/app/src/main/java/net/sourceforge/opencamera/preview/BasicApplicationInterface.java b/app/src/main/java/net/sourceforge/opencamera/preview/BasicApplicationInterface.java
index 9695e8908..58395005f 100644
--- a/app/src/main/java/net/sourceforge/opencamera/preview/BasicApplicationInterface.java
+++ b/app/src/main/java/net/sourceforge/opencamera/preview/BasicApplicationInterface.java
@@ -185,7 +185,7 @@ public abstract class BasicApplicationInterface implements ApplicationInterface
 
     @Override
     public String getPreviewSizePref() {
-        return "preference_preview_size_display";
+        return "preference_preview_size_wysiwyg";
     }
 
     @Override
diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java b/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
index 269cf8813..717d5111a 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
@@ -537,7 +537,7 @@ public class DrawPreview {
         show_geo_direction_pref = sharedPreferences.getBoolean(PreferenceKeys.ShowGeoDirectionPreferenceKey, false);
 
         take_photo_border_pref = sharedPreferences.getBoolean(PreferenceKeys.TakePhotoBorderPreferenceKey, true);
-        preview_size_wysiwyg_pref = sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_display").equals("preference_preview_size_wysiwyg");
+        preview_size_wysiwyg_pref = sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_wysiwyg").equals("preference_preview_size_wysiwyg");
         store_location_pref = sharedPreferences.getBoolean(PreferenceKeys.LocationPreferenceKey, false);
 
         show_angle_line_pref = sharedPreferences.getBoolean(PreferenceKeys.ShowAngleLinePreferenceKey, false);
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index d941e947c..d7df2bd87 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -329,7 +329,7 @@
                 android:summary="%s"
                 android:entries="@array/preference_preview_size_entries"
                 android:entryValues="@array/preference_preview_size_values"
-                android:defaultValue="preference_preview_size_display"
+                android:defaultValue="preference_preview_size_wysiwyg"
                 />
 
             <ListPreference
-- 
GitLab