From e29717da20c70e7fde212081ba33fe5c84ec0fd6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 19 Mar 2017 18:43:51 +0100 Subject: [PATCH] remove the previous weird way of setting photo/video resolution --- .../com/simplemobiletools/camera/Preview.java | 63 ++--------------- .../com/simplemobiletools/camera/Config.kt | 12 ---- .../com/simplemobiletools/camera/Constants.kt | 11 --- .../com/simplemobiletools/camera/Utils.kt | 10 --- .../camera/activities/SettingsActivity.kt | 67 ++----------------- app/src/main/res/layout/activity_settings.xml | 26 +------ app/src/main/res/values-de/strings.xml | 5 -- app/src/main/res/values-es/strings.xml | 5 -- app/src/main/res/values-fr/strings.xml | 5 -- app/src/main/res/values-it/strings.xml | 5 -- app/src/main/res/values-ja/strings.xml | 5 -- app/src/main/res/values-lt/strings.xml | 5 -- app/src/main/res/values-pt-rPT/strings.xml | 5 -- app/src/main/res/values-ru/strings.xml | 5 -- app/src/main/res/values-sv/strings.xml | 5 -- app/src/main/res/values/array.xml | 16 ----- app/src/main/res/values/strings.xml | 5 -- 17 files changed, 12 insertions(+), 243 deletions(-) delete mode 100644 app/src/main/res/values/array.xml diff --git a/app/src/main/java/com/simplemobiletools/camera/Preview.java b/app/src/main/java/com/simplemobiletools/camera/Preview.java index be9acf7d..f7db6a05 100644 --- a/app/src/main/java/com/simplemobiletools/camera/Preview.java +++ b/app/src/main/java/com/simplemobiletools/camera/Preview.java @@ -5,7 +5,6 @@ import android.graphics.Point; import android.graphics.Rect; import android.hardware.Camera; import android.media.AudioManager; -import android.media.CamcorderProfile; import android.media.MediaPlayer; import android.media.MediaRecorder; import android.media.MediaScannerConnection; @@ -37,7 +36,6 @@ public class Preview extends ViewGroup public static final int PHOTO_PREVIEW_LENGTH = 1000; private static final String TAG = Preview.class.getSimpleName(); private static final int FOCUS_AREA_SIZE = 100; - private static final float RATIO_TOLERANCE = 0.1f; private static SurfaceHolder mSurfaceHolder; private static Camera mCamera; @@ -159,7 +157,6 @@ public class Preview extends ViewGroup } mConfig = Config.Companion.newInstance(mContext); - mForceAspectRatio = mConfig.getForceRatioEnabled(); return true; } @@ -224,8 +221,8 @@ public class Preview extends ViewGroup int rotation = Utils.Companion.getMediaRotation(mActivity, mCurrCameraId); rotation += Utils.Companion.compensateDeviceRotation(mCurrCameraId, mCallback.getCurrentOrientation()); - final Camera.Size maxSize = getOptimalPictureSize(); - mParameters.setPictureSize(maxSize.width, maxSize.height); + /*final Camera.Size maxSize = getOptimalPictureSize(); + mParameters.setPictureSize(maxSize.width, maxSize.height);*/ mParameters.setRotation(rotation % 360); if (mConfig.isSoundEnabled()) { @@ -274,58 +271,6 @@ public class Preview extends ViewGroup mCanTakePicture = true; } - private Camera.Size getOptimalPictureSize() { - final int maxResolution = mConfig.getMaxPhotoResolution(); - final List sizes = mParameters.getSupportedPictureSizes(); - Collections.sort(sizes, new SizesComparator()); - Camera.Size maxSize = sizes.get(0); - for (Camera.Size size : sizes) { - final boolean isProperRatio = isProperRatio(size); - final boolean isProperResolution = isProperResolution(size, maxResolution); - if (isProperResolution && isProperRatio) { - maxSize = size; - break; - } - } - return maxSize; - } - - private boolean isProperResolution(Camera.Size size, int maxRes) { - return maxRes == 0 || size.width * size.height < maxRes; - } - - private boolean isProperRatio(Camera.Size size) { - final float currRatio = (float) size.height / size.width; - float wantedRatio = (float) 3 / 4; - if (mForceAspectRatio || mIsVideoMode) - wantedRatio = (float) 9 / 16; - - final float diff = Math.abs(currRatio - wantedRatio); - return diff < RATIO_TOLERANCE; - } - - private Camera.Size getOptimalVideoSize() { - final int maxResolution = Utils.Companion.getMaxVideoResolution(mConfig); - final List sizes = getSupportedVideoSizes(); - Collections.sort(sizes, new SizesComparator()); - Camera.Size maxSize = sizes.get(0); - final int cnt = sizes.size(); - for (int i = 0; i < cnt; i++) { - Camera.Size size = sizes.get(i); - final boolean isProperRatio = !mForceAspectRatio || isProperRatio(size); - final boolean isProperResolution = isProperResolution(size, maxResolution); - if (isProperResolution && isProperRatio) { - maxSize = size; - break; - } - - if (i == cnt - 1) { - Utils.Companion.showToast(mContext, R.string.no_valid_resolution_found); - } - } - return maxSize; - } - public List getSupportedVideoSizes() { if (mParameters.getSupportedVideoSizes() != null) { return mParameters.getSupportedVideoSizes(); @@ -575,11 +520,11 @@ public class Preview extends ViewGroup return false; } - final Camera.Size videoSize = getOptimalVideoSize(); + /*final Camera.Size videoSize = getOptimalVideoSize(); final CamcorderProfile cpHigh = CamcorderProfile.get(CamcorderProfile.QUALITY_HIGH); cpHigh.videoFrameWidth = videoSize.width; cpHigh.videoFrameHeight = videoSize.height; - mRecorder.setProfile(cpHigh); + mRecorder.setProfile(cpHigh);*/ if (Utils.Companion.needsStupidWritePermissions(getContext(), mCurrVideoPath)) { if (mConfig.getTreeUri().isEmpty()) { diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt index 8b28286f..ec7ff4c6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt @@ -26,18 +26,6 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(SHOW_PREVIEW, false) set(enabled) = prefs.edit().putBoolean(SHOW_PREVIEW, enabled).apply() - var forceRatioEnabled: Boolean - get() = prefs.getBoolean(FORCE_RATIO, true) - set(enabled) = prefs.edit().putBoolean(FORCE_RATIO, enabled).apply() - - var maxPhotoResolution: Int - get() = prefs.getInt(MAX_PHOTO_RESOLUTION, FIVE_MPX) - set(maxRes) = prefs.edit().putInt(MAX_PHOTO_RESOLUTION, maxRes).apply() - - var maxVideoResolution: Int - get() = prefs.getInt(MAX_VIDEO_RESOLUTION, P720) - set(maxRes) = prefs.edit().putInt(MAX_VIDEO_RESOLUTION, maxRes).apply() - var isSoundEnabled: Boolean get() = prefs.getBoolean(SOUND, true) set(enabled) = prefs.edit().putBoolean(SOUND, enabled).apply() diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt index 347053eb..513aa9ca 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt @@ -6,20 +6,9 @@ object Constants { val ORIENT_LANDSCAPE_RIGHT = 2 } -val TWO_MPX = 3000000 -val FIVE_MPX = 6000000 -val EIGHT_MPX = 9000000 - -val P480 = 400000 -val P720 = 1000000 -val P1080 = 2100000 - // shared preferences val SAVE_PHOTOS = "save_photos" val SHOW_PREVIEW = "show_preview" val SOUND = "sound" -val FORCE_RATIO = "force_ratio" -val MAX_PHOTO_RESOLUTION = "max_photo_resolution" -val MAX_VIDEO_RESOLUTION = "max_video_resolution" val LAST_USED_CAMERA = "last_used_camera" val LAST_FLASHLIGHT_STATE = "last_flashlight_state" diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Utils.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Utils.kt index 87019197..f0a2caca 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Utils.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/Utils.kt @@ -156,15 +156,5 @@ class Utils { rotation += Utils.compensateDeviceRotation(currCameraId, deviceOrientation) return rotation % 360 } - - - fun getMaxVideoResolution(config: Config): Int { - return when (config.maxVideoResolution) { - 0 -> 400000 - 1 -> 1000000 - 2 -> 2100000 - else -> 0 - } - } } } 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 ae6ef0fa..b3518216 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt @@ -3,7 +3,8 @@ package com.simplemobiletools.camera.activities import android.os.Bundle import android.view.Menu import android.view.MenuItem -import com.simplemobiletools.camera.* +import com.simplemobiletools.camera.BuildConfig +import com.simplemobiletools.camera.R import com.simplemobiletools.camera.extensions.config import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.extensions.humanizePath @@ -25,7 +26,6 @@ class SettingsActivity : SimpleActivity() { setupSavePhotosFolder() setupShowPreview() setupSound() - setupForceRatio() setupMaxPhotoResolution() setupMaxVideoResolution() updateTextColors(settings_holder) @@ -77,72 +77,17 @@ class SettingsActivity : SimpleActivity() { } } - private fun setupForceRatio() { - settings_force_ratio.isChecked = config.forceRatioEnabled - settings_force_ratio_holder.setOnClickListener { - settings_force_ratio.toggle() - config.forceRatioEnabled = settings_force_ratio.isChecked - } - } - private fun setupMaxPhotoResolution() { - /*settings_max_photo_resolution.setSelection(getMaxPhotoSelection()) - settings_max_photo_resolution.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { - config.maxPhotoResolution = getMaxPhotoPx(settings_max_photo_resolution.selectedItemPosition) - } + settings_max_photo_resolution.text = "" + settings_max_photo_resolution_holder.setOnClickListener { - override fun onNothingSelected(parent: AdapterView<*>?) { - } - }*/ - } - - private fun getMaxPhotoSelection(): Int { - val maxRes = config.maxPhotoResolution - return when (maxRes) { - TWO_MPX -> 0 - FIVE_MPX -> 1 - EIGHT_MPX -> 2 - else -> 3 - } - } - - private fun getMaxPhotoPx(index: Int): Int { - return when (index) { - 0 -> TWO_MPX - 1 -> FIVE_MPX - 2 -> EIGHT_MPX - else -> -1 } } private fun setupMaxVideoResolution() { - /*settings_max_video_resolution.setSelection(getMaxVideoSelection()) - settings_max_video_resolution.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onNothingSelected(parent: AdapterView<*>?) { - } + settings_max_photo_resolution.text = "" + settings_max_photo_resolution_holder.setOnClickListener { - override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { - config.maxVideoResolution = getMaxVideoPx(settings_max_video_resolution.selectedItemPosition) - } - }*/ - } - - private fun getMaxVideoSelection(): Int { - return when (config.maxVideoResolution) { - P480 -> 0 - P720 -> 1 - P1080 -> 2 - else -> 3 - } - } - - private fun getMaxVideoPx(index: Int): Int { - return when (index) { - 0 -> P480 - 1 -> P720 - 2 -> P1080 - else -> -1 } } } diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index ba61f6f2..2acc9c77 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -105,26 +105,6 @@ - - - - - - + android:paddingRight="@dimen/medium_margin"/> + android:paddingRight="@dimen/medium_margin"/> Ohne Zugriff auf Kamera und Speicher ist hier nicht viel zu tun Wir benötigen Zugriff auf das Mirkofon um Videos aufnehmen zu können Keine Galerie App verfügbar - Keine gültige Auflösung mit gewähltem Seitenverhältnis gefunden, nutze maximale Auflösung Save photos and videos to - Erzwinge 16:9 Format Zeige eine Vorschau des Photos nach der Aufnahme - Maximale Fotoauflösung - Maximale Videoauflösung - Kein Limit Auslösegeräusch diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 75e4a9f1..ac40b949 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -12,15 +12,10 @@ No hay mucho que hacer sin los permisos para acceder a la cámara y al almacenamiento Se necesita el permiso de micrófono para grabar vídeos No hay disponible una aplicación de galería - Resolución no válida con la proporción de aspecto seleccionada, usando máxima resolución Guardar fotografías y vídeos en - Usar proporción de aspecto 16:9 Show a photo preview after capturing - Resolución máxima para fotografía - Resolución máxima para vídeo - Sin límite Sonido del obturador diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index bed238e1..ecad65e1 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -12,15 +12,10 @@ Peu de choses à faire sans accès à ni la caméra ni la mémoire Nous avons besoin de l\'autorisation sur l\'audio pour enregistrer des vidéos Pas d\'application album disponible - Pas de résolution valide trouvé avec le ratio sélectionné; utilisation de la résolution maximale Sauvegarder les photos et vidéos vers - Ratio 16:9 Apercevoir la photo après la prise - Limite max de résolution des photos - Limite max de résolution de vidéo - aucun Son de l\'obturateur diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 78f5a696..ed03b00f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -12,15 +12,10 @@ Non c\'è molto da fare senza l\'accesso alla fotocamera e all\'archiviazione È necessario l\'accesso al microfono per registrare i video Nessuna app galleria disponibile - No valid resolution with selected aspect ratio found, using max resolution Save photos and videos to - Forza proporzione 16:9 Show a photo preview after capturing - Limite risoluzione foto - Video resolution limit - nessuno Suono otturatore diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 023d7b47..80c10433 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -12,15 +12,10 @@ お使いのカメラやストレージにアクセスしないと、ほとんど行うことはありません ビデオを記録するためにオーディオのアクセス許可が必要です 利用可能なギャラリーアプリがありません - 選択したアスペクト比で有効な解像度が見つかりません。最大解像度を使用しています 写真とビデオの保存先 - 強制的に 16:9 レシオにする キャプチャ後に写真のプレビューを表示 - 写真解像度の限度 - ビデオ解像度の限度 - なし シャッター音 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 8430c83e..5964c643 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -12,15 +12,10 @@ Nėra ką daryti kai kamera ir saugykla neprieinama Mums reikia audio leidimo, kad įrašyti vaizdo bylas Nėra galerijos programėlės - Nerasta tinkamos raiškos su with pasirinktu kraštinių santykiu, naudojant maksimalią raišką Išsaugoti nuotraukas ir vaizdo įrašus į - Naudoti 16:9 santykį Show a photo preview after capturing - Maksimalios nuotraukos raiškos limitas - Maksimalios vaizdo įrašo raiškos limitas - nieko Užrakto garsas diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 16bdc2ac..d4e92c46 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -12,15 +12,10 @@ É necessária a permissão para aceder à câmara e ao armazenamento Necessitamos da permissão de áudio para gravar os vídeos Nenhuma aplicação de galeria disponível - Nenhuma resolução encontrada que seja compatível com o rácio selecionado, a utilizar a resolução máxima Guardar fotos e vídeos em - Utilizar rácio 16:9 Mostrar pré-visualização após a captura - Resolução máxima das fotos - Resolução máxima dos vídeos - sem limite Som do obturador diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 66b169f3..4d46ed6b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -12,15 +12,10 @@ Не так много можно сделать без доступа к камере и хранилищу Нам нужно аудио разрешение для записи видео Нет доступного приложения-галереи - Для выбранного соотношения сторон не существует подходящего разрешения. Будет использовано максимально возможное Сохранять фото и видео в - Принудительное соотношение сторон 16:9 Показывать сделанное фото - Лимит разрешения фото - Лимит разрешения видео - нет Звук затвора diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 465d1951..2abd3d36 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -12,15 +12,10 @@ Inte mycket att göra utan tillgång till din kamera och lagring För att spela in video krävs ljudrättigheter Ingen galleri-app finns tillgänglig - No valid resolution with selected aspect ratio found, using max resolution Save photos and videos to - Tvinga 16:9-förhållande Show a photo preview after capturing - Bildupplösningsgräns - Video resolution limit - inga Slutarljud diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml deleted file mode 100644 index df996e54..00000000 --- a/app/src/main/res/values/array.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - 2 MP - 5 MP - 8 MP - @string/no_limit - - - - 480p - 720p - 1080p - @string/no_limit - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 197b499a..b0e97765 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,15 +12,10 @@ Not much to do without accessing your camera and storage We need the audio permission for recording videos No gallery app available - No valid resolution with selected aspect ratio found, using max resolution Save photos and videos to - Use 16:9 ratio Show a photo preview after capturing - Max photo resolution limit - Max video resolution limit - none Shutter sound