Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 267a2bd7 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '5460-Set_default_preview_size_to_WYSIWYG' into 'master' 

5460-Set_default_preview_size_to_WYSIWYG

See merge request !38
parents 4e137eb2 c7eea649

app/src/main/java/net/sourceforge/opencamera/MainActivity.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -664,7 +664,7 @@ public class MainActivity extends Activity { 
     */

     */

    public boolean isInFullScreenMode() {

    public boolean isInFullScreenMode() {

        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);

        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());

        return !(preview_size.equals("preference_preview_size_wysiwyg") || preview.isVideo());

    }

    }

app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1029,7 +1029,7 @@ public class MyApplicationInterface extends BasicApplicationInterface { 




    @Override

    @Override

    public String getPreviewSizePref() {

    public String getPreviewSizePref() {

        return sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_display");

        return sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_wysiwyg");

    }

    }





    @Override

    @Override

app/src/main/java/net/sourceforge/opencamera/preview/BasicApplicationInterface.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -185,7 +185,7 @@ public abstract class BasicApplicationInterface implements ApplicationInterface 




    @Override

    @Override

    public String getPreviewSizePref() {

    public String getPreviewSizePref() {

        return "preference_preview_size_display";

        return "preference_preview_size_wysiwyg";

    }

    }





    @Override

    @Override

app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -537,7 +537,7 @@ public class DrawPreview { 
        show_geo_direction_pref = sharedPreferences.getBoolean(PreferenceKeys.ShowGeoDirectionPreferenceKey, false);

        show_geo_direction_pref = sharedPreferences.getBoolean(PreferenceKeys.ShowGeoDirectionPreferenceKey, false);





        take_photo_border_pref = sharedPreferences.getBoolean(PreferenceKeys.TakePhotoBorderPreferenceKey, true);

        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);

        store_location_pref = sharedPreferences.getBoolean(PreferenceKeys.LocationPreferenceKey, false);





        show_angle_line_pref = sharedPreferences.getBoolean(PreferenceKeys.ShowAngleLinePreferenceKey, false);

        show_angle_line_pref = sharedPreferences.getBoolean(PreferenceKeys.ShowAngleLinePreferenceKey, false);

app/src/main/res/xml/preferences.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -329,7 +329,7 @@ 
                android:summary="%s"

                android:summary="%s"

                android:entries="@array/preference_preview_size_entries"

                android:entries="@array/preference_preview_size_entries"

                android:entryValues="@array/preference_preview_size_values"

                android:entryValues="@array/preference_preview_size_values"

                android:defaultValue="preference_preview_size_display"

                android:defaultValue="preference_preview_size_wysiwyg"

                />

                />





            <ListPreference

            <ListPreference