Merge branch 'master' into feat/always-on-torch

2025-03-15 16:10:07 +01:00 · 2022-10-28 15:31:50 +02:00 · 2022-10-28 15:31:50 +02:00 · 2420b7dc31
commit 2420b7dc31
parent 4d7149cb95 b7a3ca088b
49 changed files with 297 additions and 134 deletions
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
@ -1,5 +1,6 @@
 package com.simplemobiletools.camera.activities

+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.content.res.ColorStateList
@ -41,7 +42,10 @@ import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.commons.models.Release
 import java.util.concurrent.TimeUnit
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.layout_flash.*
+import kotlinx.android.synthetic.main.layout_flash.flash_auto
+import kotlinx.android.synthetic.main.layout_flash.flash_off
+import kotlinx.android.synthetic.main.layout_flash.flash_on
+import kotlinx.android.synthetic.main.layout_flash.flash_toggle_group
 import kotlinx.android.synthetic.main.layout_top.change_resolution
 import kotlinx.android.synthetic.main.layout_top.default_icons
 import kotlinx.android.synthetic.main.layout_top.settings
@ -52,6 +56,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
        const val CAPTURE_ANIMATION_DURATION = 500L
        const val PHOTO_MODE_INDEX = 1
        const val VIDEO_MODE_INDEX = 0
+        private const val MIN_SWIPE_DISTANCE_X = 100
    }

    lateinit var mTimerHandler: Handler
@ -291,6 +296,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
    private fun initializeCamera() {
        setContentView(R.layout.activity_main)
        initButtons()
+        initModeSwitcher()
        defaultScene = Scene(top_options, default_icons)
        flashModeScene = Scene(top_options, flash_toggle_group)

@ -383,6 +389,43 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
        flash_always_on.setOnClickListener { selectFlashMode(FLASH_ALWAYS_ON) }
    }

+    @SuppressLint("ClickableViewAccessibility")
+    private fun initModeSwitcher(){
+        val gestureDetector = GestureDetector(this, object : GestureDetector.SimpleOnGestureListener() {
+            override fun onFling(event1: MotionEvent, event2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
+                val deltaX = event1.x - event2.x
+                val deltaXAbs = abs(deltaX)
+
+                if (deltaXAbs >= MIN_SWIPE_DISTANCE_X) {
+                    if (deltaX > 0) {
+                        onSwipeLeft()
+                    } else {
+                        onSwipeRight()
+                    }
+                }
+
+                return true
+            }
+        })
+
+        camera_mode_tab.setOnTouchListener { _, event ->
+            gestureDetector.onTouchEvent(event)
+        }
+    }
+
+    private fun onSwipeLeft() {
+        if (!is3rdPartyIntent() && camera_mode_tab.isVisible()) {
+            selectPhotoTab(triggerListener = true)
+        }
+    }
+
+    private fun onSwipeRight() {
+        if (!is3rdPartyIntent() && camera_mode_tab.isVisible()) {
+            selectVideoTab(triggerListener = true)
+        }
+    }
+
+
    private fun selectFlashMode(flashMode: Int) {
        closeOptions()
        mPreview?.setFlashlightState(flashMode)
@ -723,18 +766,6 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
        mFocusCircleView.drawFocusCircle(xPos, yPos)
    }

-    override fun onSwipeLeft() {
-        if (!is3rdPartyIntent() && camera_mode_tab.isVisible()) {
-            selectPhotoTab(triggerListener = true)
-        }
-    }
-
-    override fun onSwipeRight() {
-        if (!is3rdPartyIntent() && camera_mode_tab.isVisible()) {
-            selectVideoTab(triggerListener = true)
-        }
-    }
-
    override fun onTouchPreview() {
        closeOptions()
    }
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
@ -5,6 +5,7 @@ import android.os.Bundle
 import com.simplemobiletools.camera.BuildConfig
 import com.simplemobiletools.camera.R
 import com.simplemobiletools.camera.extensions.config
+import com.simplemobiletools.camera.models.CaptureMode
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.*
@ -13,9 +14,9 @@ import com.simplemobiletools.commons.helpers.NavigationIcon
 import com.simplemobiletools.commons.helpers.isTiramisuPlus
 import com.simplemobiletools.commons.models.FAQItem
 import com.simplemobiletools.commons.models.RadioItem
-import kotlinx.android.synthetic.main.activity_settings.*
-import java.util.*
+import java.util.Locale
 import kotlin.system.exitProcess
+import kotlinx.android.synthetic.main.activity_settings.*

 class SettingsActivity : SimpleActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
@ -38,6 +39,7 @@ class SettingsActivity : SimpleActivity() {
        setupSavePhotoMetadata()
        setupSavePhotosFolder()
        setupPhotoQuality()
+        setupCaptureMode()
        updateTextColors(settings_holder)

        val properPrimaryColor = getProperPrimaryColor()
@ -209,4 +211,23 @@ class SettingsActivity : SimpleActivity() {
    private fun updatePhotoQuality(quality: Int) {
        settings_photo_quality.text = "$quality%"
    }
+
+    private fun setupCaptureMode() {
+        updateCaptureMode(config.captureMode)
+        settings_capture_mode_holder.setOnClickListener {
+            val items = CaptureMode.values().mapIndexed { index, captureMode ->
+                RadioItem(index, getString(captureMode.stringResId), captureMode)
+            }
+
+            RadioGroupDialog(this@SettingsActivity, ArrayList(items), config.captureMode.ordinal) {
+                config.captureMode = it as CaptureMode
+                updateCaptureMode(it)
+            }
+        }
+    }
+
+    private fun updateCaptureMode(captureMode: CaptureMode) {
+        settings_capture_mode.text = getString(captureMode.stringResId)
+    }
+
 }
--- a/app/src/main/kotlin/com/simplemobiletools/camera/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/Config.kt
@ -3,6 +3,7 @@ package com.simplemobiletools.camera.helpers
 import android.content.Context
 import android.os.Environment
 import androidx.camera.core.CameraSelector
+import com.simplemobiletools.camera.models.CaptureMode
 import com.simplemobiletools.commons.helpers.BaseConfig
 import java.io.File

@ -73,4 +74,9 @@ class Config(context: Context) : BaseConfig(context) {
    var photoQuality: Int
        get() = prefs.getInt(PHOTO_QUALITY, 80)
        set(photoQuality) = prefs.edit().putInt(PHOTO_QUALITY, photoQuality).apply()
+
+    var captureMode: CaptureMode
+        get() = CaptureMode.values()[prefs.getInt(CAPTURE_MODE, CaptureMode.MINIMIZE_LATENCY.ordinal)]
+        set(captureMode) = prefs.edit().putInt(CAPTURE_MODE, captureMode.ordinal).apply()
+
 }
--- a/app/src/main/kotlin/com/simplemobiletools/camera/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/Constants.kt
@ -19,6 +19,7 @@ const val FRONT_PHOTO_RESOLUTION_INDEX = "front_photo_resolution_index_3"
 const val FRONT_VIDEO_RESOLUTION_INDEX = "front_video_resolution_index_3"
 const val SAVE_PHOTO_METADATA = "save_photo_metadata"
 const val PHOTO_QUALITY = "photo_quality"
+const val CAPTURE_MODE = "capture_mode"

 const val FLASH_OFF = 0
 const val FLASH_ON = 1
--- a/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt
@ -26,12 +26,12 @@ import com.simplemobiletools.camera.R
 import com.simplemobiletools.camera.extensions.*
 import com.simplemobiletools.camera.helpers.*
 import com.simplemobiletools.camera.interfaces.MyPreview
+import com.simplemobiletools.camera.models.CaptureMode
 import com.simplemobiletools.camera.models.MediaOutput
 import com.simplemobiletools.camera.models.MySize
 import com.simplemobiletools.camera.models.ResolutionOption
 import com.simplemobiletools.commons.extensions.toast
 import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import kotlin.math.abs

 class CameraXPreview(
    private val activity: AppCompatActivity,
@ -46,7 +46,6 @@ class CameraXPreview(
        // Auto focus is 1/6 of the area.
        private const val AF_SIZE = 1.0f / 6.0f
        private const val AE_SIZE = AF_SIZE * 1.5f
-        private const val MIN_SWIPE_DISTANCE_X = 100
    }

    private val config = activity.config
@ -211,7 +210,7 @@ class CameraXPreview(

    private fun buildImageCapture(resolution: Size, rotation: Int): ImageCapture {
        return Builder()
-            .setCaptureMode(CAPTURE_MODE_MINIMIZE_LATENCY)
+            .setCaptureMode(getCaptureMode())
            .setFlashMode(flashMode)
            .setJpegQuality(config.photoQuality)
            .setTargetRotation(rotation)
@ -219,14 +218,23 @@ class CameraXPreview(
            .build()
    }

+    private fun getCaptureMode(): Int {
+        return when (config.captureMode) {
+            CaptureMode.MINIMIZE_LATENCY -> CAPTURE_MODE_MINIMIZE_LATENCY
+            CaptureMode.MAXIMIZE_QUALITY -> CAPTURE_MODE_MAXIMIZE_QUALITY
+        }
+    }
+
    private fun buildVideoCapture(): VideoCapture<Recorder> {
        val qualitySelector = QualitySelector.from(
            videoQualityManager.getUserSelectedQuality(cameraSelector).toCameraXQuality(),
            FallbackStrategy.higherQualityOrLowerThan(Quality.SD),
        )
+
        val recorder = Recorder.Builder()
            .setQualitySelector(qualitySelector)
            .build()
+
        return VideoCapture.withOutput(recorder)
    }

@ -293,21 +301,6 @@ class CameraXPreview(
                    true
                } ?: false
            }
-
-            override fun onFling(event1: MotionEvent, event2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
-                val deltaX = event1.x - event2.x
-                val deltaXAbs = abs(deltaX)
-
-                if (deltaXAbs >= MIN_SWIPE_DISTANCE_X) {
-                    if (deltaX > 0) {
-                        listener.onSwipeLeft()
-                    } else {
-                        listener.onSwipeRight()
-                    }
-                }
-
-                return true
-            }
        })
        previewView.setOnTouchListener { _, event ->
            val handledGesture = gestureDetector.onTouchEvent(event)
--- a/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreviewListener.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreviewListener.kt
@ -18,8 +18,6 @@ interface CameraXPreviewListener {
    fun onVideoRecordingStopped()
    fun onVideoDurationChanged(durationNanos: Long)
    fun onFocusCamera(xPos: Float, yPos: Float)
-    fun onSwipeLeft()
-    fun onSwipeRight()
    fun onTouchPreview()
    fun displaySelectedResolution(resolutionOption: ResolutionOption)
    fun showImageSizes(
--- a/app/src/main/kotlin/com/simplemobiletools/camera/models/CaptureMode.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/models/CaptureMode.kt
@ -0,0 +1,9 @@
+package com.simplemobiletools.camera.models
+
+import androidx.annotation.StringRes
+import com.simplemobiletools.camera.R
+
+enum class CaptureMode(@StringRes val stringResId: Int) {
+    MINIMIZE_LATENCY(R.string.minimize_latency),
+    MAXIMIZE_QUALITY(R.string.maximize_quality)
+}
--- a/app/src/main/kotlin/com/simplemobiletools/camera/views/ShadowDrawable.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/views/ShadowDrawable.kt
@ -82,8 +82,6 @@ class ShadowDrawable(context: Context, private val drawable: Drawable, @StyleRes
        }
        shadowPaint.isAntiAlias = true
        shadowPaint.isFilterBitmap = true
-        shadowPaint.isAntiAlias = true
-        shadowPaint.isFilterBitmap = true
    }

    override fun draw(canvas: Canvas) {
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@ -265,7 +265,7 @@
                    style="@style/SettingsHolderTextViewStyle"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:background="@drawable/ripple_bottom_corners">
+                    android:background="@drawable/ripple_background">

                    <com.simplemobiletools.commons.views.MyTextView
                        android:id="@+id/settings_photo_quality_label"
@ -283,6 +283,30 @@
                        tools:text="80%" />

                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/settings_capture_mode_holder"
+                    style="@style/SettingsHolderTextViewStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_bottom_corners">
+
+                    <com.simplemobiletools.commons.views.MyTextView
+                        android:id="@+id/settings_capture_mode_label"
+                        style="@style/SettingsTextLabelStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/capture_mode" />
+
+                    <com.simplemobiletools.commons.views.MyTextView
+                        android:id="@+id/settings_capture_mode"
+                        style="@style/SettingsTextValueStyle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/settings_capture_mode_label"
+                        tools:text="@string/minimize_latency" />
+
+                </RelativeLayout>
            </LinearLayout>
        </LinearLayout>
    </androidx.core.widget.NestedScrollView>
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -2,9 +2,9 @@
 <resources>
    <string name="app_name">الكاميرا البسيطة</string>
    <string name="app_launcher_name">الكاميرا</string>
-    <string name="capture_mode">Capture mode</string>
-    <string name="maximize_quality">Maximize quality</string>
-    <string name="minimize_latency">Minimize latency</string>
+    <string name="capture_mode">وضع الالتقاط</string>
+    <string name="maximize_quality">زيادة الجودة</string>
+    <string name="minimize_latency">تقليل التأخير</string>
    <!-- Errors -->
    <string name="camera_unavailable">الكاميرا غير متاحة</string>
    <string name="camera_open_error">تعذر الوصول إلى الكاميرا</string>
@ -52,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -2,9 +2,9 @@
 <resources>
    <string name="app_name">Simple Camera</string>
    <string name="app_launcher_name">Càmera</string>
-    <string name="capture_mode">Capture mode</string>
-    <string name="maximize_quality">Maximize quality</string>
-    <string name="minimize_latency">Minimize latency</string>
+    <string name="capture_mode">Mode de captura</string>
+    <string name="maximize_quality">Maximitza la qualitat</string>
+    <string name="minimize_latency">Minimitza la latència</string>
    <!--  Errors -->
    <string name="camera_unavailable">Càmera no disponible</string>
    <string name="camera_open_error">S\'ha produït un error en accedir a la càmera</string>
@ -52,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@ -16,24 +16,21 @@
    <string name="photo_not_saved">The photo could not be saved</string>
    <string name="setting_resolution_failed">Setting proper resolution failed</string>
    <string name="video_recording_failed">Video recording failed, try using a different resolution</string>
-    <string name="camera_in_use_error">Camera is in use by another app, please close the app and try again</string>
-    <string name="camera_configure_error">An error occurred while configuring the camera</string>
-    <string name="camera_disabled_by_admin_error">Camera is disabled by the admin</string>
+    <string name="camera_in_use_error">Kameron uzas alia aplikaĵo, fermu aplikaĵon kaj provu ree</string>
+    <string name="camera_configure_error">Okazis eraro dum agordado de kamerao</string>
+    <string name="camera_disabled_by_admin_error">Kamero estas elŝaltita de administrulo</string>
    <string name="camera_dnd_error">"Do Not Disturb" mode is enabled. Please disable and try again</string>
-    <string name="photo_capture_failed">Photo capture failed</string>
+    <string name="photo_capture_failed">Fotografado malsukcesis</string>
    <string name="video_capture_insufficient_storage_error">Video recording failed due to insufficient storage</string>
-
    <!-- Camera Screen Icons Content Description -->
    <string name="toggle_photo_video">Toggle photo/video mode</string>
    <string name="change_resolution">Change Resolution</string>
    <string name="view_last_media">View last captured media</string>
    <string name="toggle_camera">Toggle front/back camera</string>
    <string name="toggle_flash">Toggle the flashlight mode</string>
-
    <!-- FAQ -->
    <string name="faq_1_title">What photo compression quality should I set?</string>
    <string name="faq_1_text">It depends on your goal. For generic purposes most people advise using 75%-80%, when the image is still really good quality, but the file size is reduced drastically compared to 100%.</string>
-
    <!-- Settings -->
    <string name="save_photos">Save photos and videos to</string>
    <string name="show_preview">Show a photo preview after capturing</string>
@ -55,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -2,9 +2,9 @@
 <resources>
    <string name="app_name">Cámara Simple</string>
    <string name="app_launcher_name">Cámara</string>
-    <string name="capture_mode">Capture mode</string>
-    <string name="maximize_quality">Maximize quality</string>
-    <string name="minimize_latency">Minimize latency</string>
+    <string name="capture_mode">Modo de captura</string>
+    <string name="maximize_quality">Maximiza la calidad</string>
+    <string name="minimize_latency">Minimizar la latencia</string>
    <!-- Errors -->
    <string name="camera_unavailable">Cámara no disponible</string>
    <string name="camera_open_error">Ha ocurrido un error al acceder a la cámara</string>
@ -52,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@ -2,9 +2,9 @@
 <resources>
    <string name="app_name">Lihtne kaamera</string>
    <string name="app_launcher_name">Kaamera</string>
-    <string name="capture_mode">Capture mode</string>
-    <string name="maximize_quality">Maximize quality</string>
-    <string name="minimize_latency">Minimize latency</string>
+    <string name="capture_mode">Pildistamisrežiim</string>
+    <string name="maximize_quality">Eelista parimat kvaliteeti</string>
+    <string name="minimize_latency">Eelista väiksemat viivitust</string>
    <!-- Errors -->
    <string name="camera_unavailable">Kaamera pole kasutatav</string>
    <string name="camera_open_error">Kaameraühenduse loomisel tekki viga</string>
@ -52,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -2,9 +2,9 @@
 <resources>
    <string name="app_name">Cámara sinxela</string>
    <string name="app_launcher_name">Cámara</string>
-    <string name="capture_mode">Capture mode</string>
-    <string name="maximize_quality">Maximize quality</string>
-    <string name="minimize_latency">Minimize latency</string>
+    <string name="capture_mode">Modo de captura</string>
+    <string name="maximize_quality">Maximizala calidade</string>
+    <string name="minimize_latency">Minimizala latencia</string>
    <!-- Errors -->
    <string name="camera_unavailable">Cámara non dispoñible</string>
    <string name="camera_open_error">Fallou o acceso á cámara</string>
@ -52,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -2,9 +2,9 @@
 <resources>
    <string name="app_name">Simple Camera</string>
    <string name="app_launcher_name">Kamera</string>
-    <string name="capture_mode">Capture mode</string>
-    <string name="maximize_quality">Maximize quality</string>
-    <string name="minimize_latency">Minimize latency</string>
+    <string name="capture_mode">Mode tangkapan</string>
+    <string name="maximize_quality">Tingkatkan kualitas</string>
+    <string name="minimize_latency">Kurangi latensi</string>
    <!-- Errors -->
    <string name="camera_unavailable">Kamera tidak tersedia</string>
    <string name="camera_open_error">Terjadi kesalahan saat mengakses kamera</string>
@ -22,14 +22,12 @@
    <string name="camera_dnd_error">Mode Jangan Ganggu diaktifkan. Silakan nonaktifkan dan coba lagi</string>
    <string name="photo_capture_failed">Gagal mengambil foto</string>
    <string name="video_capture_insufficient_storage_error">Gagal merekam video karena penyimpanan tidak cukup</string>
-
    <!-- Camera Screen Icons Content Description -->
-    <string name="toggle_photo_video">Toggle photo/video mode</string>
-    <string name="change_resolution">Change Resolution</string>
-    <string name="view_last_media">View last captured media</string>
-    <string name="toggle_camera">Toggle front/back camera</string>
-    <string name="toggle_flash">Toggle the flashlight mode</string>
-
+    <string name="toggle_photo_video">Ubah mode foto/video</string>
+    <string name="change_resolution">Ubah Resolusi</string>
+    <string name="view_last_media">Lihat media yang terakhir kali ditangkap</string>
+    <string name="toggle_camera">Ubah kamera depan/belakang</string>
+    <string name="toggle_flash">Saklar mode senter</string>
    <!-- FAQ -->
    <string name="faq_1_title">Kualitas kompresi foto mana yang harus saya gunakan?</string>
    <string name="faq_1_text">Tergantung tujuan anda. Untuk hal-hal yang umum direkomendasikan menggunakan 75%-80%, kualitas gambar masih sangat bagus, tetapi ukuran berkas berkurang signifikan dibandingkan dengan 100%.</string>
@ -54,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -2,9 +2,9 @@
 <resources>
    <string name="app_name">Fotocamera Semplice</string>
    <string name="app_launcher_name">Fotocamera</string>
-    <string name="capture_mode">Capture mode</string>
-    <string name="maximize_quality">Maximize quality</string>
-    <string name="minimize_latency">Minimize latency</string>
+    <string name="capture_mode">Modalità di cattura</string>
+    <string name="maximize_quality">Massimizza la qualità</string>
+    <string name="minimize_latency">Minimizza la latenza</string>
    <!-- Errors -->
    <string name="camera_unavailable">Fotocamera non disponibile</string>
    <string name="camera_open_error">Impossibile accedere alla telecamera</string>
@ -52,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -2,44 +2,44 @@
 <resources>
    <string name="app_name">シンプル カメラ</string>
    <string name="app_launcher_name">カメラ</string>
-    <string name="capture_mode">Capture mode</string>
-    <string name="maximize_quality">Maximize quality</string>
-    <string name="minimize_latency">Minimize latency</string>
+    <string name="capture_mode">撮影モード</string>
+    <string name="maximize_quality">品質の最大化</string>
+    <string name="minimize_latency">遅延時間の最小化</string>
    <!-- Errors -->
    <string name="camera_unavailable">カメラは利用できません</string>
    <string name="camera_open_error">カメラへのアクセス時にエラーが発生しました</string>
-    <string name="video_creating_error">ビデオファイルの作成時にエラーが発生しました</string>
-    <string name="video_mode_error">ビデオモードへの切り替えに失敗しました</string>
+    <string name="video_creating_error">動画ファイルの作成時にエラーが発生しました</string>
+    <string name="video_mode_error">動画モードへの切り替えに失敗しました</string>
    <string name="save_error_internal_storage">エラーが発生しました。保存フォルダは内部ストレージに変更されました</string>
    <string name="camera_switch_error">カメラの切り替えに失敗しました</string>
    <string name="click_to_resume_preview">プレビューを再開するには画像をタップ</string>
-    <string name="photo_not_saved">この画像は保存されていません</string>
+    <string name="photo_not_saved">写真を保存できませんでした</string>
    <string name="setting_resolution_failed">適切な解像度の設定に失敗しました</string>
    <string name="video_recording_failed">動画の録画に失敗しました。別の解像度を試してください</string>
    <string name="camera_in_use_error">カメラは別のアプリで使用されています。アプリを閉じて、もう一度やり直してください</string>
    <string name="camera_configure_error">カメラの設定中にエラーが発生しました</string>
    <string name="camera_disabled_by_admin_error">カメラは管理者によって無効にされています</string>
    <string name="camera_dnd_error">サイレントモードが有効になっています。 無効にしてから、もう一度やり直してください</string>
-    <string name="photo_capture_failed">写真のキャプチャに失敗しました</string>
-    <string name="video_capture_insufficient_storage_error">ストレージが不足しているため、ビデオ録画に失敗しました</string>
+    <string name="photo_capture_failed">写真の撮影に失敗しました</string>
+    <string name="video_capture_insufficient_storage_error">ストレージが不足しているため、動画の録画に失敗しました</string>
    <!-- Camera Screen Icons Content Description -->
-    <string name="toggle_photo_video">Toggle photo/video mode</string>
-    <string name="change_resolution">Change Resolution</string>
-    <string name="view_last_media">View last captured media</string>
-    <string name="toggle_camera">Toggle front/back camera</string>
-    <string name="toggle_flash">Toggle the flashlight mode</string>
+    <string name="toggle_photo_video">写真/動画モードの切り替え</string>
+    <string name="change_resolution">解像度の変更</string>
+    <string name="view_last_media">最後に撮影したメディアを表示</string>
+    <string name="toggle_camera">前面/背面カメラの切り替え</string>
+    <string name="toggle_flash">フラッシュライトモードへ切り替え</string>
    <!-- FAQ -->
    <string name="faq_1_title">写真の圧縮品質はどのように設定すればよいですか？</string>
    <string name="faq_1_text">これはあなたの求める目標によります。一般的な用途には、75%～80%の使用をおすすめします。この設定でも画像は十分に良い品質ですが、ファイルサイズは100%と比べて大幅に削減することができます。</string>
    <!-- Settings -->
-    <string name="save_photos">写真とビデオの保存先</string>
-    <string name="show_preview">キャプチャ後に写真のプレビューを表示</string>
+    <string name="save_photos">写真と動画の保存先</string>
+    <string name="show_preview">撮影後に写真のプレビューを表示</string>
    <string name="shutter_sound">シャッター音</string>
    <string name="back_camera">背面カメラ解像度</string>
    <string name="front_camera">前面カメラ解像度</string>
-    <string name="photo">画像</string>
+    <string name="photo">写真</string>
    <string name="video">動画</string>
-    <string name="focus_before_capture">キャプチャ前に再度焦点を合わせる</string>
+    <string name="focus_before_capture">撮影前に再度焦点を合わせる</string>
    <string name="volume_buttons_as_shutter">音量ボタンで撮影</string>
    <string name="turn_flash_off_at_startup">起動時にライトをオンにする</string>
    <string name="flip_front_camera_photos_horizontally">前面カメラの写真を左右に反転</string>
@ -52,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -2,9 +2,9 @@
 <resources>
    <string name="app_name">Eenvoudige Camera</string>
    <string name="app_launcher_name">Camera</string>
-    <string name="capture_mode">Capture mode</string>
-    <string name="maximize_quality">Maximize quality</string>
-    <string name="minimize_latency">Minimize latency</string>
+    <string name="capture_mode">Opnamemodus</string>
+    <string name="maximize_quality">Kwaliteit maximaliseren</string>
+    <string name="minimize_latency">Vertraging minimaliseren</string>
    <!-- Errors -->
    <string name="camera_unavailable">Camera niet beschikbaar</string>
    <string name="camera_open_error">Fout opgetreden bij toegang verkrijgen tot de camera</string>
@ -52,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -2,9 +2,9 @@
 <resources>
    <string name="app_name">Prosty aparat</string>
    <string name="app_launcher_name">Aparat</string>
-    <string name="capture_mode">Capture mode</string>
-    <string name="maximize_quality">Maximize quality</string>
-    <string name="minimize_latency">Minimize latency</string>
+    <string name="capture_mode">Tryb przechwytywania</string>
+    <string name="maximize_quality">Maksymalizuj jakość</string>
+    <string name="minimize_latency">Minimalizuj opóźnienie</string>
    <!-- Errors -->
    <string name="camera_unavailable">Aparat niedostępny</string>
    <string name="camera_open_error">Nie udało się uzyskać dostępu do aparatu</string>
@ -52,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -2,9 +2,9 @@
 <resources>
    <string name="app_name">Простая камера</string>
    <string name="app_launcher_name">Камера</string>
-    <string name="capture_mode">Capture mode</string>
-    <string name="maximize_quality">Maximize quality</string>
-    <string name="minimize_latency">Minimize latency</string>
+    <string name="capture_mode">Режим съёмки</string>
+    <string name="maximize_quality">Максимальное качество</string>
+    <string name="minimize_latency">Минимальная задержка</string>
    <!-- Errors -->
    <string name="camera_unavailable">Камера недоступна</string>
    <string name="camera_open_error">Невозможно получить доступ к камере</string>
@ -52,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Enostavna kamera</string>
+    <string name="app_launcher_name">Kamera</string>
+    <string name="capture_mode">Način slikanja</string>
+    <string name="maximize_quality">Povečanje kakovosti</string>
+    <string name="minimize_latency">Zmanjšanje zakasnitve</string>
+    <!-- Errors -->
+    <string name="camera_unavailable">Kamera ni na razpolago</string>
+    <string name="camera_open_error">Prišlo je do napake pri dostopu do kamere</string>
+    <string name="video_creating_error">Pri ustvarjanju video datoteke je prišlo do napake</string>
+    <string name="video_mode_error">Ni uspel preklop na video način</string>
+    <string name="save_error_internal_storage">Prišlo je do napake, mapa za shranjevanje se je spremenila v notranji pomnilnik</string>
+    <string name="camera_switch_error">Ni uspel preklop kamere</string>
+    <string name="click_to_resume_preview">Za nadaljevanje predogleda kliknite na sliko</string>
+    <string name="photo_not_saved">Ni bilo mogoče shraniti fotografije</string>
+    <string name="setting_resolution_failed">Ni uspela nastavitev pravilne ločljivosti</string>
+    <string name="video_recording_failed">P oskusite uporabiti drugo ločljivost, ker snemanje videoposnetka ni uspelo</string>
+    <string name="camera_in_use_error">Kamero uporablja druga aplikacija, zato zaprite aplikacijo in poskusite znova</string>
+    <string name="camera_configure_error">Do napake je prišlo med konfiguriranjem kamere</string>
+    <string name="camera_disabled_by_admin_error">Kamero je onemogočil upravitelj</string>
+    <string name="camera_dnd_error">Omogočen je način Ne moti. Prosimo, da ga onemogočite in poskusite znova</string>
+    <string name="photo_capture_failed">Ni uspel zajem fotografije</string>
+    <string name="video_capture_insufficient_storage_error">Ni uspelo snemanje videoposnetka zaradi nezadostne količine pomnilnika</string>
+    <!-- Camera Screen Icons Content Description -->
+    <string name="toggle_photo_video">Preklapljanje med fotografskim ter video načinom</string>
+    <string name="change_resolution">Spremenite resolucijo</string>
+    <string name="view_last_media">Oglejte si najnovejše zajete medije</string>
+    <string name="toggle_camera">Preklopite med sprednjo in zadnjo kamero</string>
+    <string name="toggle_flash">Preklopite načina svetilke</string>
+    <!-- FAQ -->
+    <string name="faq_1_title">Kakšno kakovost stiskanja fotografij nastavim\?</string>
+    <string name="faq_1_text">Odvisno od vašega cilja. Za splošne namene svetuje večina ljudi uporabo 75–80 %, ko je slika še vedno zelo dobre kakovosti, vendar se velikost datoteke drastično zmanjša v primerjavi s 100 % .</string>
+    <!-- Settings -->
+    <string name="save_photos">Shranite fotografije in videoposnetke v</string>
+    <string name="show_preview">Pokažite po zajemu predogled fotografije</string>
+    <string name="shutter_sound">Zvok zaklopa</string>
+    <string name="back_camera">Več ločljivosti zadnje kamere</string>
+    <string name="front_camera">Ločljivosti sprednje kamere</string>
+    <string name="photo">Fotografija</string>
+    <string name="video">Videoposnetek</string>
+    <string name="focus_before_capture">Ostrenje pred zajemom</string>
+    <string name="volume_buttons_as_shutter">Gumbi za glasnost se uporabijo kot zaklop</string>
+    <string name="turn_flash_off_at_startup">Izklopite bliskavico ob zagonu</string>
+    <string name="flip_front_camera_photos_horizontally">Obrnite fotografije sprednje kamere vodoravno</string>
+    <string name="keep_settings_visible">Ohranite vidne gumbe za nastavitve</string>
+    <string name="always_open_back_camera">Aplikacijo odprite vedno z zadnjo kamero</string>
+    <string name="save_photo_metadata">Shranite exif metapodatke fotografije</string>
+    <string name="photo_compression_quality">Kakovost stiskanja fotografij</string>
+    <string name="shutter">Zaklopka</string>
+</resources>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -2,9 +2,9 @@
 <resources>
    <string name="app_name">Basit Kamera</string>
    <string name="app_launcher_name">Kamera</string>
-    <string name="capture_mode">Capture mode</string>
-    <string name="maximize_quality">Maximize quality</string>
-    <string name="minimize_latency">Minimize latency</string>
+    <string name="capture_mode">Çekim modu</string>
+    <string name="maximize_quality">Kaliteyi en üst düzeye çıkar</string>
+    <string name="minimize_latency">Gecikmeyi en aza indir</string>
    <!-- Errors -->
    <string name="camera_unavailable">Kamera kullanılamıyor</string>
    <string name="camera_open_error">Kameraya erişilemedi</string>
@ -52,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -2,9 +2,9 @@
 <resources>
    <string name="app_name">简单相机</string>
    <string name="app_launcher_name">相机</string>
-    <string name="capture_mode">Capture mode</string>
-    <string name="maximize_quality">Maximize quality</string>
-    <string name="minimize_latency">Minimize latency</string>
+    <string name="capture_mode">拍照模式</string>
+    <string name="maximize_quality">最高画质</string>
+    <string name="minimize_latency">最小延迟</string>
    <!-- Errors -->
    <string name="camera_unavailable">相机不可用</string>
    <string name="camera_open_error">访问相机出错</string>
@ -52,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/fastlane/metadata/android/ca/full_description.txt
+++ b/fastlane/metadata/android/ca/full_description.txt
@ -26,4 +26,4 @@ Reddit:
 https://www.reddit.com/r/SimpleMobileTools

 Telegram:
-https://t.me/SimpleMobileTools
+https://t.me/SimpleMobileTools
--- a/fastlane/metadata/android/ca/short_description.txt
+++ b/fastlane/metadata/android/ca/short_description.txt
@ -1 +1 @@
-Càmera ràpida de fotos i vídeo amb flaix, resolució personalitzable
+Càmera ràpida de fotos i vídeo amb flaix, resolució personalitzable
--- a/fastlane/metadata/android/ca/title.txt
+++ b/fastlane/metadata/android/ca/title.txt
@ -1 +1 @@
-Simple Camera
+Simple Camera
--- a/fastlane/metadata/android/ca/video.txt
+++ b/fastlane/metadata/android/ca/video.txt
@ -0,0 +1 @@
+  
--- a/fastlane/metadata/android/de-DE/full_description.txt
+++ b/fastlane/metadata/android/de-DE/full_description.txt
@ -26,4 +26,4 @@ Reddit:
 https://www.reddit.com/r/SimpleMobileTools

 Telegram:
-https://t.me/SimpleMobileTools
+https://t.me/SimpleMobileTools
--- a/fastlane/metadata/android/de-DE/short_description.txt
+++ b/fastlane/metadata/android/de-DE/short_description.txt
@ -1 +1 @@
-Schnelle Foto- und Videokamera mit Blitz, anpassbarer Auflösung
+Schnelle Foto- und Videokamera mit Blitz, anpassbarer Auflösung
--- a/fastlane/metadata/android/de-DE/title.txt
+++ b/fastlane/metadata/android/de-DE/title.txt
@ -1 +1 @@
-Einfache Kamera
+Einfache Kamera
--- a/fastlane/metadata/android/de-DE/video.txt
+++ b/fastlane/metadata/android/de-DE/video.txt
@ -0,0 +1 @@
+ 
--- a/fastlane/metadata/android/eo/short_description.txt
+++ b/fastlane/metadata/android/eo/short_description.txt
@ -0,0 +1 @@
+Rapida fota- kaj video- kamerao kun fulmbrilo, agordebla rejŝo de ekranflankoj
--- a/fastlane/metadata/android/eo/title.txt
+++ b/fastlane/metadata/android/eo/title.txt
@ -0,0 +1 @@
+Simpla Kamerao
--- a/fastlane/metadata/android/es-ES/full_description.txt
+++ b/fastlane/metadata/android/es-ES/full_description.txt
@ -26,4 +26,4 @@ Reddit:
 https://www.reddit.com/r/SimpleMobileTools

 Telegram:
-https://t.me/SimpleMobileTools
+https://t.me/SimpleMobileTools
--- a/fastlane/metadata/android/es-ES/short_description.txt
+++ b/fastlane/metadata/android/es-ES/short_description.txt
@ -1 +1 @@
-Cámara de fotos y vídeo rápido con flash, relación del aspecto personalizable
+Cámara de fotos y vídeo rápido con flash, relación del aspecto personalizable
--- a/fastlane/metadata/android/es-ES/title.txt
+++ b/fastlane/metadata/android/es-ES/title.txt
@ -1 +1 @@
-Cámara simple
+Cámara Sencilla
--- a/fastlane/metadata/android/es-ES/video.txt
+++ b/fastlane/metadata/android/es-ES/video.txt
--- a/fastlane/metadata/android/gl-ES/full_description.txt
+++ b/fastlane/metadata/android/gl-ES/full_description.txt
@ -28,4 +28,4 @@ Reddit:
 https://www.reddit.com/r/SimpleMobileTools

 Telegram:
-https://t.me/SimpleMobileTools
+https://t.me/SimpleMobileTools
--- a/fastlane/metadata/android/gl-ES/short_description.txt
+++ b/fastlane/metadata/android/gl-ES/short_description.txt
@ -1 +1 @@
-Cámara de fotos e vídeo rápida, resolución personalizable e sen anuncios
+Cámara de fotos e vídeo rápida, resolución personalizable e sen anuncios
--- a/fastlane/metadata/android/gl-ES/title.txt
+++ b/fastlane/metadata/android/gl-ES/title.txt
@ -1 +1 @@
-Cámara simple: Fotos
+Cámara Sinxela
--- a/fastlane/metadata/android/gl-ES/video.txt
+++ b/fastlane/metadata/android/gl-ES/video.txt
--- a/fastlane/metadata/android/pl-PL/full_description.txt
+++ b/fastlane/metadata/android/pl-PL/full_description.txt
@ -26,4 +26,4 @@ Reddit:
 https://www.reddit.com/r/SimpleMobileTools

 Telegram:
-https://t.me/SimpleMobileTools
+https://t.me/SimpleMobileTools
--- a/fastlane/metadata/android/pl-PL/short_description.txt
+++ b/fastlane/metadata/android/pl-PL/short_description.txt
@ -1 +1 @@
-Szybki aparat do zdjęć i wideo z lampą błyskową i konfigurowalną rozdzielczością
+Szybki aparat do zdjęć i wideo z lampą błyskową i konfigurowalną rozdzielczością
--- a/fastlane/metadata/android/pl-PL/title.txt
+++ b/fastlane/metadata/android/pl-PL/title.txt
@ -1 +1 @@
-Prosty aparat
+Prosty aparat
--- a/fastlane/metadata/android/pl-PL/video.txt
+++ b/fastlane/metadata/android/pl-PL/video.txt
@ -0,0 +1 @@
+ 
--- a/fastlane/metadata/android/sl/full_description.txt
+++ b/fastlane/metadata/android/sl/full_description.txt
@ -0,0 +1,29 @@
+Priročna aplikacija za kamero je uporabna za slike in videoposnetke. V aplikaciji za kamero lahko preklapljate med kamerama, spremenite pot shranjevanja ali omejite ločljivost okvirjev fotografij. Nikoli več ne boste zamudili pomembnih trenutkov življenja. Na voljo je precej nastavitev, s katerimi bo kamera še bolj prilagojena vašim potrebam. Naštejmo nekaj izmed njih.
+
+Bliskavico lahko preklapljate ali jo uporabite kot uporabno svetilko, kar je redko. Med slikanjem s ščipanjem zaslona povečate in pomanjšate sliko ali preklopite na vodoravno sliko. Z aplikacijo se osredotočite na glavni predmet na sliki, namesto da bi dovolili drugim šumom pojavljanje v sliko-
+
+S kliki lahko spremenite izhodno ločljivost, kakovost ali razmerje stranic, kot bi pričakovali od odprte aplikacije. To velja za fotografije in videoposnetke. Kakovost slik in videoposnetkov lahko preprosto spremenite glede na svoje zahteve.
+
+Ko posnamete fotografijo, se prikaže majhna fotografija, in jo s pritiskom lahko odprete v želeni galeriji z aplikacijo odprte kamere. Videli boste jasen prikaz, kdaj je bila fotografija zajeta in da je bila datoteka shranjena.
+
+Če želite preprosto aplikacijo kamere zagnati s pritiskom na strojni gumb v napravi, boste morali vgrajeno aplikacijo kamere onemogočiti v Nastavitve -> Aplikacije -> Kamera -> Onemogoči.
+
+Nastavite jo lahko tako, da gumbe za glasnost uporablja kot zaklop ali da ob zagonu privzeto vklopi svetilko.
+
+Ima še več nastavitev, povezanih z zvokom zaklopa, bliskavico, metapodatki in kakovostjo fotografij itd. Pot izhodne datoteke lahko prilagodite, tako da se lahko odločite, kam želite shraniti svoj medij. Podpira tako notranji pomnilnik kot kartice SD.
+
+Privzeto je opremljen z materialno zasnovo in temno temo, kar zagotavlja odlično uporabniško izkušnjo za enostavno uporabo. Zaradi odsotnosti dostopa do interneta vam zagotavlja več zasebnosti, varnosti in stabilnosti kot druge aplikacije.
+
+Ne vsebuje oglasov ali nepotrebnih dovoljenj. Je popolnoma odprta izvorna kamera, zagotavlja prilagodljive barve.
+
+Celoten nabor preprostih orodij si oglejte tukaj:
+https://www.simplemobiletools.com.
+
+Facebook:
+https://www.facebook.com/simplemobiletools
+
+Reddit:
+https://www.reddit.com/r/SimpleMobileTools
+
+Telegram:
+https://t.me/SimpleMobileTools
--- a/fastlane/metadata/android/sl/short_description.txt
+++ b/fastlane/metadata/android/sl/short_description.txt
@ -0,0 +1 @@
+Fotografska in videokamera z bliskavico in razmerje stranic
--- a/fastlane/metadata/android/sl/title.txt
+++ b/fastlane/metadata/android/sl/title.txt
@ -0,0 +1 @@
+Kamera enostavna
				`@ -0,0 +1 @@`
				`Rapida fota- kaj video- kamerao kun fulmbrilo, agordebla rejŝo de ekranflankoj`
				`@ -0,0 +1 @@`
				`Fotografska in videokamera z bliskavico in razmerje stranic`