From 71f289c145d55bf39cad78b61446fd662200deb7 Mon Sep 17 00:00:00 2001 From: spkprs Date: Sun, 6 Nov 2022 19:14:27 +0200 Subject: [PATCH 1/7] Update strings.xml --- app/src/main/res/values-el/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 6b41d31d..2125eb44 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2,9 +2,9 @@ Απλή Κάμερα Κάμερα - Capture mode - Maximize quality - Minimize latency + Λειτουργία καταγραφής + Μέγιστη ποιότητα + Ελαχιστοποίηση καθυστέρησης Μη διαθέσιμη κάμερα Παρουσιάστηκε σφάλμα κατά την πρόσβαση στην κάμερα @@ -28,7 +28,7 @@ Αλλαγή ανάλυσης Προβολή των τελευταίων αποθηκευμένων πολυμέσων Εναλλαγή εμπρός/πίσω κάμερας - Εναλλαγή της λειτουργίας φακού + Εναλλαγή λειτουργίας φακού Ποια ποιότητα συμπίεσης φωτογραφιών πρέπει να ορίσω; @@ -45,7 +45,7 @@ Εστίαση πριν τη λήψη Χρήση κουμπιών έντασης ως κλείστρο Απενεργοποίηση φλας κατά την εκκίνηση - Οριζόντια αναστροφή φωτογραφιών μπροστινής κάμερας + Οριζόντια αναστροφή φωτογραφιών εμπρός κάμερας Διατήρηση εμφανών κουμπιών ρύθμισης Πάντα άνοιγμα της εφαρμογής με την πίσω κάμερα Αποθήκευση μεταδεδομένων exif φωτογραφίας From 7b7838331e11c16c3ab53c0c21ea2fc19e3f2f74 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Wed, 9 Nov 2022 10:09:47 +0000 Subject: [PATCH 2/7] persist/restore torch state for video and image capture --- .../camera/activities/MainActivity.kt | 29 +++++++------------ .../camera/implementations/CameraXPreview.kt | 1 + 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt index 9b1a89fa..307f33da 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt @@ -40,11 +40,11 @@ import com.simplemobiletools.camera.views.FocusCircleView import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.Release +import java.util.concurrent.TimeUnit +import kotlin.math.abs import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.layout_flash.* import kotlinx.android.synthetic.main.layout_top.* -import java.util.concurrent.TimeUnit -import kotlin.math.abs class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, CameraXPreviewListener { private companion object { @@ -345,10 +345,6 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera mTimerHandler = Handler(Looper.getMainLooper()) setupPreviewImage(true) - - val initialFlashlightState = if (mIsInPhotoMode && config.flashlightState != FLASH_ALWAYS_ON) config.flashlightState else FLASH_OFF - mPreview!!.setFlashlightState(initialFlashlightState) - updateFlashlightState(initialFlashlightState) initFlashModeTransitionNames() } @@ -453,18 +449,6 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera } } - private fun updateFlashlightState(state: Int) { - config.flashlightState = state - val flashDrawable = when (state) { - FLASH_OFF -> R.drawable.ic_flash_off_vector - FLASH_ON -> R.drawable.ic_flash_on_vector - FLASH_AUTO -> R.drawable.ic_flash_auto_vector - else -> R.drawable.ic_flashlight_vector - } - toggle_flash.setShadowIcon(flashDrawable) - toggle_flash.transitionName = "${getString(R.string.toggle_flash)}$state" - } - private fun shutterPressed() { if (checkCameraAvailable()) { handleShutter() @@ -727,7 +711,14 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera } override fun onChangeFlashMode(flashMode: Int) { - updateFlashlightState(flashMode) + val flashDrawable = when (flashMode) { + FLASH_OFF -> R.drawable.ic_flash_off_vector + FLASH_ON -> R.drawable.ic_flash_on_vector + FLASH_AUTO -> R.drawable.ic_flash_auto_vector + else -> R.drawable.ic_flashlight_vector + } + toggle_flash.setShadowIcon(flashDrawable) + toggle_flash.transitionName = "${getString(R.string.toggle_flash)}$flashMode" } override fun onVideoRecordingStarted() { diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt b/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt index 50c40428..07497ee8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt @@ -175,6 +175,7 @@ class CameraXPreview( previewUseCase.setSurfaceProvider(previewView.surfaceProvider) preview = previewUseCase setupZoomAndFocus() + setFlashlightState(config.flashlightState) } private fun displaySelectedResolution(resolutionOption: ResolutionOption) { From c05874b8d1ff48f31dea540bdb1b53ad0b63660e Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 9 Nov 2022 14:44:53 +0100 Subject: [PATCH 3/7] catching a weird exception --- .../simplemobiletools/camera/activities/MainActivity.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt index 307f33da..209ad740 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt @@ -384,8 +384,12 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera private fun initModeSwitcher() { val gestureDetector = GestureDetector(this, object : GestureDetector.SimpleOnGestureListener() { override fun onFling(event1: MotionEvent, event2: MotionEvent, velocityX: Float, velocityY: Float): Boolean { - // these can be null even if the docs say they cannot - if (event1 == null || event2 == null) { + // these can be null even if the docs say they cannot, getting event1.x in itself can cause crashes + try { + if (event1 == null || event2 == null || event1.x == null || event2.x == null) { + return true + } + } catch (e: NullPointerException) { return true } From e7dab886d9fddc2045d6c6d1831295c3830440cf Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 30 Oct 2022 17:56:46 +0000 Subject: [PATCH 4/7] Translated using Weblate (Croatian) Currently translated at 100.0% (44 of 44 strings) Translation: Simple Mobile Tools/Simple Camera Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-camera/hr/ --- app/src/main/res/values-hr/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index c6e08029..2ae6c64b 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -2,9 +2,9 @@ Jednostavna kamera Kamera - Capture mode - Maximize quality - Minimize latency + Način snimanja + Povećajte kvalitetu + Smanjite latenciju Kamera nije dostupna Dogodila se greška prilikom pristupanja kameri @@ -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 --> - + \ No newline at end of file From 26570ebb99560112fe661fb8746064bf54f50582 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 31 Oct 2022 19:34:42 +0000 Subject: [PATCH 5/7] Translated using Weblate (Croatian) Currently translated at 100.0% (8 of 8 strings) Translation: Simple Mobile Tools/Simple Camera metadata Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-camera-metadata/hr/ --- fastlane/metadata/android/hr/full_description.txt | 2 +- fastlane/metadata/android/hr/short_description.txt | 2 +- fastlane/metadata/android/hr/title.txt | 2 +- fastlane/metadata/android/hr/video.txt | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fastlane/metadata/android/hr/full_description.txt b/fastlane/metadata/android/hr/full_description.txt index f80fae3d..81e75024 100644 --- a/fastlane/metadata/android/hr/full_description.txt +++ b/fastlane/metadata/android/hr/full_description.txt @@ -26,4 +26,4 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools Telegram: -https://t.me/SimpleMobileTools \ No newline at end of file +https://t.me/SimpleMobileTools diff --git a/fastlane/metadata/android/hr/short_description.txt b/fastlane/metadata/android/hr/short_description.txt index 9d7e02e0..849e33a9 100644 --- a/fastlane/metadata/android/hr/short_description.txt +++ b/fastlane/metadata/android/hr/short_description.txt @@ -1 +1 @@ -Brza foto i video kamera s bljeskalicom, prilagodljiv format \ No newline at end of file +Brza foto i video kamera s bljeskalicom, prilagodljiv format diff --git a/fastlane/metadata/android/hr/title.txt b/fastlane/metadata/android/hr/title.txt index 1786de47..86ff9d9f 100644 --- a/fastlane/metadata/android/hr/title.txt +++ b/fastlane/metadata/android/hr/title.txt @@ -1 +1 @@ -Jednostavna kamera \ No newline at end of file +Kamera jednostavna diff --git a/fastlane/metadata/android/hr/video.txt b/fastlane/metadata/android/hr/video.txt index e69de29b..8d8c3507 100644 --- a/fastlane/metadata/android/hr/video.txt +++ b/fastlane/metadata/android/hr/video.txt @@ -0,0 +1 @@ +video.txt:1 From 46e99044a33989534c5bd91a4329b9432043a55c Mon Sep 17 00:00:00 2001 From: bgo-eiu Date: Mon, 31 Oct 2022 01:03:05 +0000 Subject: [PATCH 6/7] Translated using Weblate (Punjabi (Pakistan)) Currently translated at 61.3% (27 of 44 strings) Translation: Simple Mobile Tools/Simple Camera Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-camera/pa_PK/ --- app/src/main/res/values-pa-rPK/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index d933a21c..a6f6c3a2 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -2,7 +2,7 @@ Simple Camera Camera - Capture mode + تصویر کھچݨی Maximize quality Minimize latency @@ -20,7 +20,7 @@ An error occurred while configuring the camera Camera is disabled by the admin "Do Not Disturb" mode is enabled. Please disable and try again - Photo capture failed + غلطی آئی اے، فوٹو کھچ نہیں سکدی Video recording failed due to insufficient storage Toggle photo/video mode @@ -37,15 +37,15 @@ Shutter sound Back camera resolutions Front camera resolutions - Photo - Video + فوٹو + ویڈیو Focus before capture Use volume buttons as shutter Turn flash off at startup Flip front camera photos horizontally Keep the setting buttons visible Always open the app with the Back camera - Save photo exif metadata + ایکسیف میٹاڈیٹا سامبھو Photo compression quality Shutter - + \ No newline at end of file From 1d3b466114cf09efeea7176f0462ed58cfd1a3e4 Mon Sep 17 00:00:00 2001 From: solokot Date: Sat, 5 Nov 2022 10:26:47 +0000 Subject: [PATCH 7/7] Translated using Weblate (Russian) Currently translated at 87.5% (7 of 8 strings) Translation: Simple Mobile Tools/Simple Camera metadata Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-camera-metadata/ru/ --- fastlane/metadata/android/ru-RU/full_description.txt | 10 +++++----- fastlane/metadata/android/ru-RU/short_description.txt | 2 +- fastlane/metadata/android/ru-RU/title.txt | 2 +- fastlane/metadata/android/ru-RU/video.txt | 0 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 fastlane/metadata/android/ru-RU/video.txt diff --git a/fastlane/metadata/android/ru-RU/full_description.txt b/fastlane/metadata/android/ru-RU/full_description.txt index 5aac4cb1..ab48ee10 100644 --- a/fastlane/metadata/android/ru-RU/full_description.txt +++ b/fastlane/metadata/android/ru-RU/full_description.txt @@ -6,7 +6,7 @@ После того, как вы сделаете снимок, вы увидите новую миниатюру фотографии, нажав которую, вы можете быстро открыть ее в предпочитаемой вами галерее с помощью этого открытого приложения камеры. Вы увидите четкое указание, когда фотография будет сделана, гарантируя, что файл был сохранен. -Если вы хотите запустить это простое открытое приложение камеры при нажатии аппаратной кнопки камеры вашего устройства, возможно, вам придется отключить встроенное приложение «Камера» в «Настройки» -> «Приложения» -> «Камера» -> «Отключить». +Если вы хотите запустить это простое открытое приложение камеры при нажатии аппаратной кнопки камеры вашего устройства, возможно, вам придется отключить встроенное приложение «Камера» в «Настройки» → «Приложения» → «Камера» → «Отключить». Вы можете настроить его на использование кнопок громкости в качестве затвора или на включение фонарика по умолчанию при запуске. @@ -19,11 +19,11 @@ Ознакомьтесь с полным набором простых инструментов здесь: https://www.simplemobiletools.com -Фейсбук: +Facebook: https://www.facebook.com/simplemobiletools -Реддит: +Reddit: https://www.reddit.com/r/SimpleMobileTools -Телеграмма: -https://t.me/SimpleMobileTools \ No newline at end of file +Telegram: +https://t.me/SimpleMobileTools diff --git a/fastlane/metadata/android/ru-RU/short_description.txt b/fastlane/metadata/android/ru-RU/short_description.txt index 69a44e02..b62ac5ba 100644 --- a/fastlane/metadata/android/ru-RU/short_description.txt +++ b/fastlane/metadata/android/ru-RU/short_description.txt @@ -1 +1 @@ -Быстрая фото- и видеокамера со вспышкой, настраиваемое соотношение сторон \ No newline at end of file +Быстрая фото- и видеокамера со вспышкой, настраиваемое соотношение сторон diff --git a/fastlane/metadata/android/ru-RU/title.txt b/fastlane/metadata/android/ru-RU/title.txt index f14b88bc..2fdfa1c7 100644 --- a/fastlane/metadata/android/ru-RU/title.txt +++ b/fastlane/metadata/android/ru-RU/title.txt @@ -1 +1 @@ -Простая камера \ No newline at end of file +Простая камера diff --git a/fastlane/metadata/android/ru-RU/video.txt b/fastlane/metadata/android/ru-RU/video.txt deleted file mode 100644 index e69de29b..00000000