From a108ede87af8ec18509c23f54203c404c3fc65ef Mon Sep 17 00:00:00 2001
From: eszdman <eszdman2015@gmail.com>
Date: Thu, 11 Jul 2024 23:21:10 +0600
Subject: [PATCH] Add RAW only save, fix 16:9 save

---
 .../assets/shaders/addwatermark_rotate.glsl   | 12 +++++--
 .../photoncamera/api/Settings.java            |  4 +--
 .../opengl/postpipeline/PostPipeline.java     | 11 ++++---
 .../opengl/postpipeline/RotateWatermark.java  | 13 ++++----
 .../processing/processor/HdrxProcessor.java   | 32 ++++++++-----------
 .../processor/UnlimitedProcessor.java         | 13 +++++---
 .../photoncamera/settings/PreferenceKeys.java | 10 ++----
 .../photoncamera/ui/SplashActivity.java       |  4 ++-
 .../ui/camera/CameraUIController.java         |  2 +-
 .../viewmodel/SettingsBarEntryProvider.java   |  5 +--
 app/src/main/res/values-cs/strings.xml        |  2 +-
 app/src/main/res/values-es/strings.xml        |  2 +-
 app/src/main/res/values-hr/strings.xml        |  2 +-
 app/src/main/res/values-in/strings.xml        |  2 +-
 app/src/main/res/values-it/strings.xml        |  2 +-
 app/src/main/res/values-mk/strings.xml        |  2 +-
 app/src/main/res/values-pt-rBR/strings.xml    |  2 +-
 app/src/main/res/values-ro/strings.xml        |  2 +-
 app/src/main/res/values-ru/strings.xml        |  2 +-
 app/src/main/res/values-sv/strings.xml        |  2 +-
 app/src/main/res/values-tr/strings.xml        |  2 +-
 app/src/main/res/values-uk-rUA/strings.xml    |  2 +-
 app/src/main/res/values-zh-rCN/strings.xml    |  2 +-
 app/src/main/res/values-zh-rTW/strings.xml    |  2 +-
 app/src/main/res/values/arrays.xml            | 10 ++++++
 app/src/main/res/values/default_prefs.xml     |  1 +
 app/src/main/res/values/ids.xml               |  1 +
 app/src/main/res/values/strings.xml           |  4 +--
 app/src/main/res/xml/preferences.xml          | 12 ++++---
 app/version.properties                        |  4 +--
 30 files changed, 92 insertions(+), 74 deletions(-)

diff --git a/app/src/main/assets/shaders/addwatermark_rotate.glsl b/app/src/main/assets/shaders/addwatermark_rotate.glsl
index 39b03778f..77c181d1b 100644
--- a/app/src/main/assets/shaders/addwatermark_rotate.glsl
+++ b/app/src/main/assets/shaders/addwatermark_rotate.glsl
@@ -4,6 +4,8 @@ uniform sampler2D InputBuffer;
 uniform sampler2D Watermark;
 uniform int yOffset;
 uniform int rotate;
+uniform ivec2 cropSize;
+uniform ivec2 rawSize;
 out vec4 Output;
 #define WATERMARK 1
 #define watersizek (15.0)
@@ -19,18 +21,22 @@ void main() {
     xy+=ivec2(0,yOffset)+ivec2(OFFSET);
     switch(rotate){
         case 0:
+        xy += ivec2(0,(rawSize.y-cropSize.y));
         cr = (vec2(xy+ivec2(0,-texSize.y))/(texS));
-        Output = texelFetch(InputBuffer, (xy), 0);
+        Output = texelFetch(InputBuffer, xy, 0);
         break;
         case 1:
-        cr = (vec2(xy+ivec2(0,-texSize.x))/(texS));
+        xy += ivec2((rawSize.y-cropSize.y),0);
+        cr = (vec2(xy+ivec2(-(rawSize.y-cropSize.y),-cropSize.x))/(texS));
         Output = texelFetch(InputBuffer, ivec2(texSize.x-xy.y,xy.x), 0);
         break;
         case 2:
-        cr = (vec2(xy+ivec2(0,-texSize.y))/(texS));
+        //xy += ivec2(0,-(texSize.y-rotatedSize.y)/4);
+        cr = (vec2(xy+ivec2(0,-cropSize.y))/(texS));
         Output = texelFetch(InputBuffer, ivec2(texSize.x-xy.x,texSize.y-xy.y), 0);
         break;
         case 3:
+        //xy += ivec2(-(texSize.x-rotatedSize.x)/4,0);
         cr = (vec2(xy+ivec2(0,-texSize.x))/(texS));
         Output = texelFetch(InputBuffer, ivec2(xy.y,texSize.y-xy.x),0);
         break;
diff --git a/app/src/main/java/com/particlesdevs/photoncamera/api/Settings.java b/app/src/main/java/com/particlesdevs/photoncamera/api/Settings.java
index a748f568b..9b0547ed5 100644
--- a/app/src/main/java/com/particlesdevs/photoncamera/api/Settings.java
+++ b/app/src/main/java/com/particlesdevs/photoncamera/api/Settings.java
@@ -30,7 +30,7 @@ public class Settings {
     public double compressor;
     public double gain;
     public double shadows;
-    public boolean rawSaver;
+    public int rawSaver;
     public boolean QuadBayer;
     public int cfaPattern;
     public int theme;
@@ -73,7 +73,7 @@ public void loadCache() {
         shadows = PreferenceKeys.getFloat(PreferenceKeys.Key.KEY_SHADOWS_SEEKBAR);
         hdrx = PreferenceKeys.isHdrxNrOn();
         cfaPattern = PreferenceKeys.getCFAValue();
-        rawSaver = PreferenceKeys.isSaveRawOn();
+        rawSaver = PreferenceKeys.isSaveRaw();
         remosaic = PreferenceKeys.isRemosaicOn();
         eisPhoto = PreferenceKeys.isEisPhotoOn();
         QuadBayer = PreferenceKeys.isQuadBayerOn();
diff --git a/app/src/main/java/com/particlesdevs/photoncamera/processing/opengl/postpipeline/PostPipeline.java b/app/src/main/java/com/particlesdevs/photoncamera/processing/opengl/postpipeline/PostPipeline.java
index 93c3948e1..a667b9241 100644
--- a/app/src/main/java/com/particlesdevs/photoncamera/processing/opengl/postpipeline/PostPipeline.java
+++ b/app/src/main/java/com/particlesdevs/photoncamera/processing/opengl/postpipeline/PostPipeline.java
@@ -29,6 +29,7 @@ public class PostPipeline extends GLBasePipeline {
     public GLTexture GainMap;
     public ArrayList<Bitmap> debugData = new ArrayList<>();
     public ArrayList<ImageFrame> SAGAIN;
+    public Point cropSize;
     public float[] analyzedBL = new float[]{0.f, 0.f, 0.f};
     ;
     float regenerationSense = 1.f;
@@ -85,23 +86,25 @@ public Bitmap Run(ByteBuffer inBuffer, Parameters parameters) {
         noiseO = Math.max(noiseO, Float.MIN_NORMAL);
         noiseS = Math.max(noiseS, Float.MIN_NORMAL);
         Point rawSliced = parameters.rawSize;
+        cropSize = new Point(parameters.rawSize);
         if (PhotonCamera.getSettings().aspect169) {
             if (rawSliced.x > rawSliced.y) {
                 rawSliced = new Point(rawSliced.x, rawSliced.x * 9 / 16);
             } else {
                 rawSliced = new Point(rawSliced.y * 9 / 16, rawSliced.y);
             }
+            cropSize =  new Point(rawSliced);
         }
-        Point rotated = getRotatedCoords(rawSliced);
+        Point rotatedSize = getRotatedCoords(rawSliced);
         if (PhotonCamera.getSettings().energySaving || mParameters.rawSize.x * mParameters.rawSize.y < ResolutionSolution.smallRes) {
             GLDrawParams.TileSize = 8;
         } else {
             GLDrawParams.TileSize = 256;
         }
         GLFormat format = new GLFormat(GLFormat.DataType.SIMPLE_8, 4);
-        GLImage output = new GLImage(rotated, format);
+        GLImage output = new GLImage(rotatedSize, format);
 
-        GLCoreBlockProcessing glproc = new GLCoreBlockProcessing(rotated, output, format);
+        GLCoreBlockProcessing glproc = new GLCoreBlockProcessing(rotatedSize, output, format);
         glint = new GLInterface(glproc);
         stackFrame = inBuffer;
         glint.parameters = parameters;
@@ -132,7 +135,7 @@ private void BuildDefaultPipeline() {
                 //add(new ESD3DBayerCS());
                 //}
                 if(mSettings.alignAlgorithm != 2) {
-                    add(new Demosaic2());
+                    add(new Demosaic3());
                 }
 
                 //add(new ImpulsePixelFilter());
diff --git a/app/src/main/java/com/particlesdevs/photoncamera/processing/opengl/postpipeline/RotateWatermark.java b/app/src/main/java/com/particlesdevs/photoncamera/processing/opengl/postpipeline/RotateWatermark.java
index fda9a0f98..c1559bb7b 100644
--- a/app/src/main/java/com/particlesdevs/photoncamera/processing/opengl/postpipeline/RotateWatermark.java
+++ b/app/src/main/java/com/particlesdevs/photoncamera/processing/opengl/postpipeline/RotateWatermark.java
@@ -1,20 +1,13 @@
 package com.particlesdevs.photoncamera.processing.opengl.postpipeline;
 
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Point;
-import android.opengl.GLUtils;
 import android.util.Log;
 
-import com.particlesdevs.photoncamera.R;
 import com.particlesdevs.photoncamera.app.PhotonCamera;
 import com.particlesdevs.photoncamera.processing.opengl.GLImage;
 import com.particlesdevs.photoncamera.processing.opengl.GLTexture;
 import com.particlesdevs.photoncamera.processing.opengl.nodes.Node;
 import com.particlesdevs.photoncamera.settings.PreferenceKeys;
-import com.particlesdevs.photoncamera.util.FileManager;
 
-import java.io.File;
 import java.io.IOException;
 
 import static android.opengl.GLES20.GL_CLAMP_TO_EDGE;
@@ -42,6 +35,7 @@ public void Run() {
 
         //else lutbm = BitmapFactory.decodeResource(PhotonCamera.getResourcesStatic(), R.drawable.neutral_lut);
         glProg.setDefine("WATERMARK",watermarkNeeded);
+
         glProg.useAssetProgram("addwatermark_rotate");
         try {
             watermark = new GLImage(PhotonCamera.getAssetLoader().getInputStream("watermark/photoncamera_watermark.png"));
@@ -73,5 +67,10 @@ public void Run() {
         }
         Log.d(Name,"selected rotation:"+rot);
         glProg.setVar("rotate",rot);
+        glProg.setVar("cropSize",((PostPipeline)basePipeline).cropSize);
+        glProg.setVar("rawSize",basePipeline.mParameters.rawSize);
+        Log.d(Name,"Crop size:"+((PostPipeline)basePipeline).cropSize);
+        Log.d(Name,"Raw size:"+basePipeline.mParameters.rawSize);
+
     }
 }
diff --git a/app/src/main/java/com/particlesdevs/photoncamera/processing/processor/HdrxProcessor.java b/app/src/main/java/com/particlesdevs/photoncamera/processing/processor/HdrxProcessor.java
index 5b2fca248..d27cd4cd9 100644
--- a/app/src/main/java/com/particlesdevs/photoncamera/processing/processor/HdrxProcessor.java
+++ b/app/src/main/java/com/particlesdevs/photoncamera/processing/processor/HdrxProcessor.java
@@ -36,7 +36,7 @@ public class HdrxProcessor extends ProcessorBase {
     private int imageFormat;
     /* config */
     private int alignAlgorithm;
-    private boolean saveRAW;
+    private int saveRAW;
     private CameraMode cameraMode;
     private ArrayList<GyroBurst> BurstShakiness;
 
@@ -45,7 +45,7 @@ public HdrxProcessor(ProcessingEventsListener processingEventsListener) {
         super(processingEventsListener);
     }
 
-    public void configure(int alignAlgorithm, boolean saveRAW, CameraMode cameraMode) {
+    public void configure(int alignAlgorithm, int saveRAW, CameraMode cameraMode) {
         this.alignAlgorithm = alignAlgorithm;
         this.saveRAW = saveRAW;
         this.cameraMode = cameraMode;
@@ -255,14 +255,8 @@ private void ApplyHdrX() {
             Wrapper.outputBuffer(output);
             Wrapper.processFrame(NoiseS, NoiseO, 1.5f, 1, 0.f, 0.f, 0.f, processingParameters.whiteLevel
                     , processingParameters.whitePoint[0], processingParameters.whitePoint[1], processingParameters.whitePoint[2], processingParameters.cfaPattern);
-            if (saveRAW){
-                for (int i = 1; i < images.size(); i++) {
-                    images.get(i).image.close();
-                }
-            } else {
-                for (int i = 1; i < images.size(); i++) {
-                    images.get(i).image.close();
-                }
+            for (int i = 1; i < images.size(); i++) {
+                images.get(i).image.close();
             }
         } else {
             WrapperGPU.loadInterpolatedGainMap(interpolateGainMap.Output);
@@ -272,14 +266,8 @@ private void ApplyHdrX() {
             Log.d(TAG, "Packing");
             WrapperGPU.packImages();
             Log.d(TAG, "Packed");
-            if (saveRAW){
-                for (int i = 1; i < images.size(); i++) {
-                    images.get(i).image.close();
-                }
-            } else {
-                for (int i = 1; i < images.size(); i++) {
-                    images.get(i).image.close();
-                }
+            for (int i = 1; i < images.size(); i++) {
+                images.get(i).image.close();
             }
             if(alignAlgorithm == 1) {
                 float bl = processingParameters.blackLevel[0]+processingParameters.blackLevel[1]+processingParameters.blackLevel[2]+processingParameters.blackLevel[3];
@@ -305,7 +293,7 @@ private void ApplyHdrX() {
         } else {
             result = output;
         }
-        if (saveRAW && alignAlgorithm != 2) {
+        if ((saveRAW >= 1) && alignAlgorithm != 2) {
             int patchWL = (int) FAKE_WL;
 
             Camera2ApiAutoFix.patchWL(characteristics, captureResult, patchWL);
@@ -326,6 +314,12 @@ private void ApplyHdrX() {
             parameters.blackLevel[1] -= bl;
             parameters.blackLevel[2] -= bl;
             parameters.blackLevel[3] = 0.f;*/
+            if (saveRAW == 2) {
+                processingEventsListener.onProcessingFinished("HdrX RAW Processing Finished");
+                callback.onFinished();
+                images.get(0).image.close();
+                return;
+            }
         }
         /*else {
             if(alignAlgorithm == 0) {
diff --git a/app/src/main/java/com/particlesdevs/photoncamera/processing/processor/UnlimitedProcessor.java b/app/src/main/java/com/particlesdevs/photoncamera/processing/processor/UnlimitedProcessor.java
index cef04efa7..f11d514d1 100644
--- a/app/src/main/java/com/particlesdevs/photoncamera/processing/processor/UnlimitedProcessor.java
+++ b/app/src/main/java/com/particlesdevs/photoncamera/processing/processor/UnlimitedProcessor.java
@@ -31,13 +31,13 @@ public class UnlimitedProcessor extends ProcessorBase {
     private boolean fillParams = false;
 
     /* config */
-    private boolean saveRAW;
+    private int saveRAW;
 
     public UnlimitedProcessor(ProcessingEventsListener processingEventsListener) {
         super(processingEventsListener);
     }
 
-    public void configure(boolean saveRAW) {
+    public void configure(int saveRAW) {
         this.saveRAW = saveRAW;
     }
 
@@ -111,7 +111,7 @@ private void processUnlimited(Image image) {
         image.getPlanes()[0].getBuffer().position(0);
         averageRaw.close();
         averageRaw = null;
-        if (saveRAW) {
+        if (saveRAW >= 1) {
 
             processingEventsListener.onProcessingFinished("Unlimited rawSaver Processing Finished");
 
@@ -123,8 +123,11 @@ private void processUnlimited(Image image) {
             Camera2ApiAutoFix.resetWL(characteristics, captureResult, (int) FAKE_WL);
 
             processingEventsListener.notifyImageSavedStatus(imageSaved, dngFile);
-
-            return;
+            if (saveRAW == 2) {
+                processingEventsListener.onProcessingFinished("Unlimited RAW Processing Finished");
+                callback.onFinished();
+                return;
+            }
         }
 
         IncreaseWLBL();
diff --git a/app/src/main/java/com/particlesdevs/photoncamera/settings/PreferenceKeys.java b/app/src/main/java/com/particlesdevs/photoncamera/settings/PreferenceKeys.java
index 4fff645ae..08f8162ce 100644
--- a/app/src/main/java/com/particlesdevs/photoncamera/settings/PreferenceKeys.java
+++ b/app/src/main/java/com/particlesdevs/photoncamera/settings/PreferenceKeys.java
@@ -3,7 +3,6 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
-import android.hardware.camera2.CameraManager;
 import android.util.Log;
 
 import androidx.annotation.StringRes;
@@ -12,7 +11,6 @@
 import com.google.gson.GsonBuilder;
 import com.hunter.library.debug.HunterDebug;
 import com.particlesdevs.photoncamera.R;
-import com.particlesdevs.photoncamera.api.CameraManager2;
 import com.particlesdevs.photoncamera.app.PhotonCamera;
 
 import java.util.Arrays;
@@ -21,8 +19,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import static android.content.Context.CAMERA_SERVICE;
-
 /**
  * Created by Vibhor 06/09/2020
  */
@@ -190,8 +186,8 @@ public static boolean isHdrxNrOn() {
         return preferenceKeys.settingsManager.getBoolean(SCOPE_GLOBAL, Key.KEY_HDRX_NR);
     }
 
-    public static boolean isSaveRawOn() {
-        return preferenceKeys.settingsManager.getBoolean(SCOPE_GLOBAL, Key.KEY_SAVE_RAW);
+    public static int isSaveRaw() {
+        return preferenceKeys.settingsManager.getInteger(SCOPE_GLOBAL, Key.KEY_SAVE_RAW);
     }
 
     public static boolean isBatterySaverOn(){
@@ -204,7 +200,7 @@ public static boolean isAspect169On(){
     public static void setBatterySaver(boolean value) {
         preferenceKeys.settingsManager.set(SCOPE_GLOBAL, Key.KEY_ENERGY_SAVING,value);
     }
-    public static void setSaveRaw(boolean value) {
+    public static void setSaveRaw(int value) {
         preferenceKeys.settingsManager.set(SCOPE_GLOBAL, Key.KEY_SAVE_RAW,value);
     }
 
diff --git a/app/src/main/java/com/particlesdevs/photoncamera/ui/SplashActivity.java b/app/src/main/java/com/particlesdevs/photoncamera/ui/SplashActivity.java
index b891fcb6e..04346df4f 100644
--- a/app/src/main/java/com/particlesdevs/photoncamera/ui/SplashActivity.java
+++ b/app/src/main/java/com/particlesdevs/photoncamera/ui/SplashActivity.java
@@ -1,11 +1,13 @@
 package com.particlesdevs.photoncamera.ui;
 
 import android.annotation.SuppressLint;
+import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.particlesdevs.photoncamera.AiPhoto;
+import com.particlesdevs.photoncamera.ui.camera.CameraActivity;
 import com.particlesdevs.photoncamera.util.FileManager;
 
 import java.io.File;
@@ -30,7 +32,7 @@ protected void onCreate(Bundle savedInstanceState) {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        AiPhoto.initAi(this);
+        startActivity(new Intent(SplashActivity.this, CameraActivity.class));
         finish();
     }
 }
diff --git a/app/src/main/java/com/particlesdevs/photoncamera/ui/camera/CameraUIController.java b/app/src/main/java/com/particlesdevs/photoncamera/ui/camera/CameraUIController.java
index 99197fcfb..f126bd323 100644
--- a/app/src/main/java/com/particlesdevs/photoncamera/ui/camera/CameraUIController.java
+++ b/app/src/main/java/com/particlesdevs/photoncamera/ui/camera/CameraUIController.java
@@ -245,7 +245,7 @@ public void onChanged(TopBarSettingsData<?, ?> topBarSettingsData) {
                         PreferenceKeys.setEisPhoto(value.equals(1));
                         break;
                     case RAW:
-                        PreferenceKeys.setSaveRaw(value.equals(1));
+                        PreferenceKeys.setSaveRaw((Integer) value);
                         break;
                     case BATTERY_SAVER:
                         PreferenceKeys.setBatterySaver(value.equals(1));
diff --git a/app/src/main/java/com/particlesdevs/photoncamera/ui/camera/viewmodel/SettingsBarEntryProvider.java b/app/src/main/java/com/particlesdevs/photoncamera/ui/camera/viewmodel/SettingsBarEntryProvider.java
index 0ee0f2ca4..b0888f91e 100644
--- a/app/src/main/java/com/particlesdevs/photoncamera/ui/camera/viewmodel/SettingsBarEntryProvider.java
+++ b/app/src/main/java/com/particlesdevs/photoncamera/ui/camera/viewmodel/SettingsBarEntryProvider.java
@@ -79,7 +79,7 @@ public void updateAllEntries() {
         updateEntry(eisEntry, PreferenceKeys.isEisPhotoOn());
         updateEntry(fpsEntry, PreferenceKeys.isFpsPreviewOn());
         updateEntry(quadEntry, PreferenceKeys.isQuadBayerOn());
-        updateEntry(saveRawEntry, PreferenceKeys.isSaveRawOn());
+        updateEntry(saveRawEntry, PreferenceKeys.isSaveRaw());
         updateEntry(batterySaverEntry, PreferenceKeys.isBatterySaverOn());
     }
 
@@ -120,7 +120,8 @@ private void createEisEntry() {
     private void  createSaveRawEntry() {
         saveRawEntry.addSettingsBarButtonModels(
                 SettingsBarButtonModel.newButtonModel(R.id.raw_off_button, R.drawable.ic_raw_off, R.string.jpg_only, 0, saveRawEntry),
-                SettingsBarButtonModel.newButtonModel(R.id.raw_on_button, R.drawable.ic_raw, R.string.raw_plus_jpg, 1, saveRawEntry)
+                SettingsBarButtonModel.newButtonModel(R.id.raw_on_button, R.drawable.ic_raw, R.string.raw_plus_jpg, 1, saveRawEntry),
+                SettingsBarButtonModel.newButtonModel(R.id.raw_only_button, R.drawable.ic_raw, R.string.raw_string, 2, saveRawEntry)
         );
     }
 
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d38bb9b02..44ec565f1 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -16,7 +16,7 @@
     <string name="saturation">Sytost barev</string>
     <string name="sharpness">Ostrost</string>
     <string name="turn_on_grid">Zobrazit mřížku</string>
-    <string name="raw">Uložit RAW + JPEG</string>
+    <string name="raw">Uložit</string>
     <string name="turn_on_round_edges">Zaoblené rohy</string>
     <string name="enable_remosaic">Povolit Re-Mosaikování</string>
     <string name="general">Obecné</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7cc2acd84..008009aff 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -16,7 +16,7 @@
     <string name="saturation">Saturacion</string>
     <string name="sharpness">Nitidez</string>
     <string name="turn_on_grid">Mostrar cuadricula</string>
-    <string name="raw">Guardar RAW + JPEG</string>
+    <string name="raw">Guardar</string>
     <string name="turn_on_round_edges">Activar bordes redondos</string>
     <string name="enable_remosaic">Activar remosaico</string>
     <string name="general">General</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 088c81fb7..dd967cdc6 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -16,7 +16,7 @@
     <string name="saturation">Zasićenje bojom</string>
     <string name="sharpness">Oštrina</string>
     <string name="turn_on_grid">Pokaži rešetku</string>
-    <string name="raw">Spremi RAW + JPEG</string>
+    <string name="raw">Spremi</string>
     <string name="turn_on_round_edges">Omogući zakrivljene rubove:</string>
     <string name="enable_remosaic">Omogući Remosaic</string>
     <string name="general">Općenito</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index a512086ce..b3eb01806 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -16,7 +16,7 @@
     <string name="saturation">Saturasi</string>
     <string name="sharpness">Ketajaman Gambar</string>
     <string name="turn_on_grid">Perlihatkan Garis Penanda</string>
-    <string name="raw">Simpan dokumen RAW + JPEG</string>
+    <string name="raw">Simpan dokumen</string>
     <string name="turn_on_round_edges">Aktifkan garis tepi membulat</string>
     <string name="enable_remosaic">Aktifkan Remosaic</string>
     <string name="general">Umum</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ffc669207..3fe65d33c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -15,7 +15,7 @@
     <string name="saturation">Saturazione</string>
     <string name="sharpness">Nitidezza</string>
     <string name="turn_on_round_edges">Mostra angoli curvi</string>
-    <string name="raw">Salva RAW + JPEG</string>
+    <string name="raw">Salva</string>
     <string name="general">Generali</string>
     <string name="hdrxNR">Riduzione del rumore</string>
     <string name="turn_on_watermark">Abilita filigrana</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 8dee54dc6..6d66a7c7b 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -16,7 +16,7 @@
     <string name="saturation">Заситеност</string>
     <string name="sharpness">Острина</string>
     <string name="turn_on_grid">Прикажи линии</string>
-    <string name="raw">Зачувај во RAW + JPEG</string>
+    <string name="raw">Зачувај во</string>
     <string name="turn_on_round_edges">Уклучи Заоблени ќошеви</string>
     <string name="enable_remosaic">Уклучи Remosaic</string>
     <string name="general">Генерално</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 091a717ac..9a8fd3cea 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -16,7 +16,7 @@
     <string name="saturation">Saturação</string>
     <string name="sharpness">Nitidez</string>
     <string name="turn_on_grid">Mostrar grade</string>
-    <string name="raw">Salvar RAW + JPEG</string>
+    <string name="raw">Salvar</string>
     <string name="turn_on_round_edges">"Habilitar cantos arredondados "</string>
     <string name="enable_remosaic">"Habilitar Remosaico "</string>
     <string name="general">"Geral "</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index dd7b14825..cb8a8fcfe 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -16,7 +16,7 @@
     <string name="saturation">Saturaţie</string>
     <string name="sharpness">Acuitate</string>
     <string name="turn_on_grid">Arată grila</string>
-    <string name="raw">Salvează RAW + JPEG</string>
+    <string name="raw">Salvează</string>
     <string name="turn_on_round_edges">Permite colţuri rotunjite</string>
     <string name="enable_remosaic">Permite Remosaic</string>
     <string name="general">General</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a79d64666..9a23785b7 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -32,7 +32,7 @@
     <string name="cancel">Отмена</string>
     <string name="sure_delete">Вы уверены, что хотите удалить?</string>
     <string name="general">Основные</string>
-    <string name="raw">Сохранить RAW + JPEG</string>
+    <string name="raw">Сохранить</string>
     <string name="close">Закрыть</string>
     <string name="unknown">Неизвестно</string>
     <string name="theme">Тема</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 6711c17c3..9599c866a 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -16,7 +16,7 @@
     <string name="saturation">Mättnad</string>
     <string name="sharpness">Skärpa</string>
     <string name="turn_on_grid">Visa Rutmönster</string>
-    <string name="raw">Spara RAW + JPEG</string>
+    <string name="raw">Spara</string>
     <string name="turn_on_round_edges">Aktivera runda kanter</string>
     <string name="enable_remosaic">Aktivera Remosaik</string>
     <string name="general">Generellt</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 02d5dbc23..181195cbc 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -16,7 +16,7 @@
     <string name="saturation">Doygunluk</string>
     <string name="sharpness">Keskinlik</string>
     <string name="turn_on_grid">Izgarayı göster</string>
-    <string name="raw">RAW + JPEG kaydet</string>
+    <string name="raw">Kaydet</string>
     <string name="turn_on_round_edges">Yuvarlak kenarları etkinleştir</string>
     <string name="enable_remosaic">Remosaic etkinleştir</string>
     <string name="general">Genel</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 94a97d1e9..139824466 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -20,7 +20,7 @@
     <string name="turn_on_grid">Показати сітку</string>
     <string name="noise_reduction_str">Потужність зменшення шуму</string>
     <string name="noise_merge_str">Сила злиття шумів</string>
-    <string name="raw">Зберегти RAW + JPEG</string>
+    <string name="raw">Зберегти</string>
     <string name="turn_on_round_edges">Увімкнути круглі краї</string>
     <string name="enable_remosaic">Ввімкнути Remosaic</string>
     <string name="general">Загальні</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9726c1db6..6ba8624ee 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -20,7 +20,7 @@
     <string name="turn_on_grid">网格</string>
     <string name="noise_reduction_str">降噪强度</string>
     <string name="noise_merge_str">降噪合并强度</string>
-    <string name="raw">保存为 RAW + JPEG</string>
+    <string name="raw">保存为</string>
     <string name="turn_on_round_edges">圆角</string>
     <string name="enable_remosaic">启用 Remosaic</string>
     <string name="general">通用</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 400ae2991..cb264c5f1 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -20,7 +20,7 @@
     <string name="turn_on_grid">顯示網格</string>
     <string name="noise_reduction_str">降噪強度</string>
     <string name="noise_merge_str">合併降噪強度</string>
-    <string name="raw">儲存為 RAW + JPEG</string>
+    <string name="raw">儲存為</string>
     <string name="turn_on_round_edges">啟用圓角</string>
     <string name="enable_remosaic">啟用 Remosaic</string>
     <string name="general">通用</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index fa94dd9be..c5c8cd4ff 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -81,6 +81,16 @@
         <item>4</item>
         <item>1</item>
     </string-array>
+    <string-array name="raw_mode_entries">
+        <item>JPEG</item>
+        <item>RAW + JPEG</item>
+        <item>RAW</item>
+    </string-array>
+    <string-array name="raw_mode_entryvalues">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
     <string-array name="vf_grid_entries">
         <item>@string/off</item>
         <item>@string/three_x3</item>
diff --git a/app/src/main/res/values/default_prefs.xml b/app/src/main/res/values/default_prefs.xml
index 137601985..49ef7a82b 100644
--- a/app/src/main/res/values/default_prefs.xml
+++ b/app/src/main/res/values/default_prefs.xml
@@ -72,4 +72,5 @@
     <string name="pref_theme_accent_default_value" translatable="false">default</string>
     <bool name="pref_show_gradient_def_value">true</bool>
     <string name="pref_af_mode_default_value" translatable="false">1</string>
+    <string name="pref_raw_mode_default_value" translatable="false">0</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 4ec4ff2aa..913cb6963 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -34,6 +34,7 @@
     <item name="saveraw_entry_layout" type="id"/>
     <item name="raw_off_button" type="id"/>
     <item name="raw_on_button" type="id"/>
+    <item name="raw_only_button" type="id"/>
     <item name="btsvr_on_button" type="id"/>
     <item name="btsvr_off_button" type="id"/>
     <item name="batterysaver_entry_layout" type="id"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f3a88435d..8b3a4ac3a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,7 +28,7 @@
     <string name="turn_on_grid">Show Grid</string>
     <string name="noise_reduction_str">Noise Reduction Strength</string>
     <string name="noise_merge_str">Noise Merge Strength</string>
-    <string name="raw">Save RAW + JPEG</string>
+    <string name="raw">Save</string>
     <string name="turn_on_round_edges">Enable Round Edges</string>
     <string name="enable_remosaic">Enable Remosaic</string>
     <string name="general">General</string>
@@ -116,7 +116,7 @@
     <string name="t_10s">10s</string>
     <string name="raw_string" translatable="false">RAW</string>
     <string name="raw_plus_jpg" translatable="false">RAW + JPEG</string>
-    <string name="jpg_only">JPEG Only</string>
+    <string name="jpg_only" translatable="false">JPEG</string>
     <string name="off">Off</string>
     <string name="golden_ratio">Golden Ratio</string>
     <string name="diag_triangle">Diag. Triangles</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index f8617030e..9567fb106 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -149,14 +149,16 @@
             android:layout="@layout/preference_category_layout"
             android:key="@string/pref_category_hdrx_key"
             android:title="@string/hdrx">
-        <com.particlesdevs.photoncamera.ui.settings.custompreferences.ManagedSwitchPreference
-                android:key="@string/pref_save_raw_key"
-                android:defaultValue="@bool/pref_save_raw_default"
+        <ListPreference
                 android:layout="@layout/preference_with_margin"
+                android:key="@string/pref_save_raw_key"
                 android:title="@string/raw"
-                android:summary=""
+                app:useSimpleSummaryProvider="true"
                 android:icon="@drawable/ic_raw"
-                />
+                android:summary=""
+                android:entries="@array/raw_mode_entries"
+                android:entryValues="@array/raw_mode_entryvalues"
+                android:defaultValue="@string/pref_raw_mode_default_value"/>
         <com.particlesdevs.photoncamera.ui.settings.custompreferences.ManagedSwitchPreference
                 android:key="@string/pref_hdrx_nr_key"
                 android:defaultValue="@bool/pref_hdrx_nr_default"
diff --git a/app/version.properties b/app/version.properties
index e178f5a04..0c806bd17 100644
--- a/app/version.properties
+++ b/app/version.properties
@@ -1,2 +1,2 @@
-#Thu Jul 04 03:41:10 KGT 2024
-VERSION_BUILD=16739
+#Thu Jul 11 23:16:51 KGT 2024
+VERSION_BUILD=17060