From f043d6df65b1e50731595dde15c1bb7f74f18f40 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 20 Mar 2017 20:30:08 +0100 Subject: [PATCH] remove the resolution setters from Settings --- .../com/simplemobiletools/camera/Constants.kt | 4 + .../com/simplemobiletools/camera/Preview.kt | 7 +- .../camera/activities/SettingsActivity.kt | 28 ---- app/src/main/res/layout/activity_settings.xml | 137 ------------------ app/src/main/res/values-de/strings.xml | 8 +- app/src/main/res/values-es/strings.xml | 8 +- app/src/main/res/values-fr/strings.xml | 8 +- app/src/main/res/values-it/strings.xml | 8 +- app/src/main/res/values-ja/strings.xml | 8 +- app/src/main/res/values-lt/strings.xml | 8 +- app/src/main/res/values-pt/strings.xml | 8 +- app/src/main/res/values-ru/strings.xml | 8 +- app/src/main/res/values-sv/strings.xml | 8 +- app/src/main/res/values/strings.xml | 8 +- 14 files changed, 45 insertions(+), 211 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt index d087ad5f..e39c3896 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt @@ -10,3 +10,7 @@ val SHOW_PREVIEW = "show_preview" val SOUND = "sound" val LAST_USED_CAMERA = "last_used_camera" val LAST_FLASHLIGHT_STATE = "last_flashlight_state" +val BACK_PHOTO_RESOLUTION_INDEX = "back_photo_resolution_index" +val BACK_VIDEO_RESOLUTION_INDEX = "back_video_resolution_index" +val FRONT_PHOTO_RESOLUTION_INDEX = "front_photo_resolution_index" +val FRONT_VIDEO_RESOLUTION_INDEX = "front_video_resolution_index" diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt index f15c59a8..42e73787 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt @@ -132,8 +132,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan mParameters = mCamera!!.parameters mMaxZoom = mParameters!!.maxZoom mZoomRatios = mParameters!!.zoomRatios - mSupportedPreviewSizes = mParameters!!.supportedPreviewSizes - storePreviewSizes() + mSupportedPreviewSizes = mParameters!!.supportedPreviewSizes.sortedByDescending { it.width * it.height } requestLayout() invalidate() mSetupPreviewAfterMeasure = true @@ -164,10 +163,6 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan return true } - private fun storePreviewSizes() { - mSupportedPreviewSizes = mSupportedPreviewSizes!!.sortedByDescending { it.width * it.height } - } - fun setTargetUri(uri: Uri) { mTargetUri = uri } diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt index a8934fad..9bb1f55c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt @@ -27,10 +27,6 @@ class SettingsActivity : SimpleActivity() { setupSavePhotosFolder() setupShowPreview() setupSound() - setupBackPhotoResolution() - setupFrontPhotoResolution() - setupBackVideoResolution() - setupFrontVideoResolution() updateTextColors(settings_holder) } @@ -85,28 +81,4 @@ class SettingsActivity : SimpleActivity() { config.isSoundEnabled = settings_sound.isChecked } } - - private fun setupBackPhotoResolution() { - settings_back_photo_resolution_holder.setOnClickListener { - - } - } - - private fun setupFrontPhotoResolution() { - settings_front_photo_resolution_holder.setOnClickListener { - - } - } - - private fun setupBackVideoResolution() { - settings_back_video_resolution_holder.setOnClickListener { - - } - } - - private fun setupFrontVideoResolution() { - settings_front_video_resolution_holder.setOnClickListener { - - } - } } diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 047e3390..9e1387f7 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -104,142 +104,5 @@ android:text="@string/shutter_sound"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7fc5fe05..22591e57 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -17,10 +17,10 @@ Save photos and videos to Zeige eine Vorschau des Photos nach der Aufnahme Auslösegeräusch - Back camera photo resolution - Front camera photo resolution - Back camera video resolution - Front camera video resolution + Back camera resolutions + Front camera resolutions + Photo + Video diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 42133f83..5cff3679 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -17,10 +17,10 @@ Guardar fotografías y vídeos en Show a photo preview after capturing Sonido del obturador - Back camera photo resolution - Front camera photo resolution - Back camera video resolution - Front camera video resolution + Back camera resolutions + Front camera resolutions + Photo + Video diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 532d1482..53eb2762 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -17,10 +17,10 @@ Sauvegarder les photos et vidéos vers Apercevoir la photo après la prise Son de l\'obturateur - Back camera photo resolution - Front camera photo resolution - Back camera video resolution - Front camera video resolution + Back camera resolutions + Front camera resolutions + Photo + Video diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index efdd3d74..1e26a93c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -17,10 +17,10 @@ Save photos and videos to Show a photo preview after capturing Suono otturatore - Back camera photo resolution - Front camera photo resolution - Back camera video resolution - Front camera video resolution + Back camera resolutions + Front camera resolutions + Photo + Video diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 32d0e403..9af6e818 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -17,10 +17,10 @@ 写真とビデオの保存先 キャプチャ後に写真のプレビューを表示 シャッター音 - Back camera photo resolution - Front camera photo resolution - Back camera video resolution - Front camera video resolution + Back camera resolutions + Front camera resolutions + Photo + Video diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index aaca5310..46b10a18 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -17,10 +17,10 @@ Išsaugoti nuotraukas ir vaizdo įrašus į Show a photo preview after capturing Užrakto garsas - Back camera photo resolution - Front camera photo resolution - Back camera video resolution - Front camera video resolution + Back camera resolutions + Front camera resolutions + Photo + Video diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 252e7e1e..f6fa9a6e 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -17,10 +17,10 @@ Guardar fotos e vídeos em Mostrar pré-visualização após a captura Som do obturador - Back camera photo resolution - Front camera photo resolution - Back camera video resolution - Front camera video resolution + Back camera resolutions + Front camera resolutions + Photo + Video diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1061dc20..c1d90dfd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -17,10 +17,10 @@ Сохранять фото и видео в Показывать сделанное фото Звук затвора - Back camera photo resolution - Front camera photo resolution - Back camera video resolution - Front camera video resolution + Back camera resolutions + Front camera resolutions + Photo + Video diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 82ee74ef..9edb7371 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -17,10 +17,10 @@ Save photos and videos to Show a photo preview after capturing Slutarljud - Back camera photo resolution - Front camera photo resolution - Back camera video resolution - Front camera video resolution + Back camera resolutions + Front camera resolutions + Photo + Video diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 318631da..a63b7d47 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,10 +17,10 @@ Save photos and videos to Show a photo preview after capturing Shutter sound - Back camera photo resolution - Front camera photo resolution - Back camera video resolution - Front camera video resolution + Back camera resolutions + Front camera resolutions + Photo + Video