fenix
/
Simple-Camera
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove the resolution setters from Settings

This commit is contained in:
tibbi 2017-03-20 20:30:08 +01:00
parent 2e43f53af2
commit f043d6df65
14 changed files with 45 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt
View File

@ -10,3 +10,7 @@ val SHOW_PREVIEW = "show_preview"
val SOUND = "sound" val SOUND = "sound"
val LAST_USED_CAMERA = "last_used_camera" val LAST_USED_CAMERA = "last_used_camera"
val LAST_FLASHLIGHT_STATE = "last_flashlight_state" 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"

7
app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt
View File

@ -132,8 +132,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
mParameters = mCamera!!.parameters mParameters = mCamera!!.parameters
mMaxZoom = mParameters!!.maxZoom mMaxZoom = mParameters!!.maxZoom
mZoomRatios = mParameters!!.zoomRatios mZoomRatios = mParameters!!.zoomRatios
mSupportedPreviewSizes = mParameters!!.supportedPreviewSizes mSupportedPreviewSizes = mParameters!!.supportedPreviewSizes.sortedByDescending { it.width * it.height }
storePreviewSizes()
requestLayout() requestLayout()
invalidate() invalidate()
mSetupPreviewAfterMeasure = true mSetupPreviewAfterMeasure = true
@ -164,10 +163,6 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
return true return true
} }
private fun storePreviewSizes() {
mSupportedPreviewSizes = mSupportedPreviewSizes!!.sortedByDescending { it.width * it.height }
}
fun setTargetUri(uri: Uri) { fun setTargetUri(uri: Uri) {
mTargetUri = uri mTargetUri = uri
} }

28
app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
View File

@ -27,10 +27,6 @@ class SettingsActivity : SimpleActivity() {
setupSavePhotosFolder() setupSavePhotosFolder()
setupShowPreview() setupShowPreview()
setupSound() setupSound()
setupBackPhotoResolution()
setupFrontPhotoResolution()
setupBackVideoResolution()
setupFrontVideoResolution()
updateTextColors(settings_holder) updateTextColors(settings_holder)
} }
@ -85,28 +81,4 @@ class SettingsActivity : SimpleActivity() {
config.isSoundEnabled = settings_sound.isChecked 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 {
}
}
} }

137
app/src/main/res/layout/activity_settings.xml
View File

@ -104,142 +104,5 @@
android:text="@string/shutter_sound"/> android:text="@string/shutter_sound"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:id="@+id/settings_back_photo_resolution_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingBottom="@dimen/bigger_margin"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"
android:paddingTop="@dimen/bigger_margin">
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_back_photo_resolution_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/settings_back_photo_resolution"
android:layout_toStartOf="@+id/settings_back_photo_resolution"
android:paddingLeft="@dimen/medium_margin"
android:paddingRight="@dimen/medium_margin"
android:text="@string/back_camera_photo_resolution"/>
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_back_photo_resolution"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/small_margin"
android:layout_marginRight="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_front_photo_resolution_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingBottom="@dimen/bigger_margin"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"
android:paddingTop="@dimen/bigger_margin">
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_front_photo_resolution_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/settings_front_photo_resolution"
android:layout_toStartOf="@+id/settings_front_photo_resolution"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/front_camera_photo_resolution"/>
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_front_photo_resolution"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/small_margin"
android:layout_marginRight="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_back_video_resolution_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingBottom="@dimen/bigger_margin"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"
android:paddingTop="@dimen/bigger_margin">
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_back_video_resolution_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/settings_back_video_resolution"
android:layout_toStartOf="@+id/settings_back_video_resolution"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/back_camera_video_resolution"/>
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_back_video_resolution"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/small_margin"
android:layout_marginRight="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_front_video_resolution_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingBottom="@dimen/bigger_margin"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"
android:paddingTop="@dimen/bigger_margin">
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_front_video_resolution_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/settings_front_video_resolution"
android:layout_toStartOf="@+id/settings_front_video_resolution"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/front_camera_video_resolution"/>
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_front_video_resolution"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/small_margin"
android:layout_marginRight="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
</RelativeLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

8
app/src/main/res/values-de/strings.xml
View File

@ -17,10 +17,10 @@
<string name="save_photos">Save photos and videos to</string> <string name="save_photos">Save photos and videos to</string>
<string name="show_preview">Zeige eine Vorschau des Photos nach der Aufnahme</string> <string name="show_preview">Zeige eine Vorschau des Photos nach der Aufnahme</string>
<string name="shutter_sound">Auslösegeräusch</string> <string name="shutter_sound">Auslösegeräusch</string>
<string name="back_camera_photo_resolution">Back camera photo resolution</string> <string name="back_camera">Back camera resolutions</string>
<string name="front_camera_photo_resolution">Front camera photo resolution</string> <string name="front_camera">Front camera resolutions</string>
<string name="back_camera_video_resolution">Back camera video resolution</string> <string name="photo_resolution">Photo</string>
<string name="front_camera_video_resolution">Front camera video resolution</string> <string name="video_resolution">Video</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have --> <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars --> <!-- Short description has to have less than 80 chars -->

8
app/src/main/res/values-es/strings.xml
View File

@ -17,10 +17,10 @@
<string name="save_photos">Guardar fotografías y vídeos en</string> <string name="save_photos">Guardar fotografías y vídeos en</string>
<string name="show_preview">Show a photo preview after capturing</string> <string name="show_preview">Show a photo preview after capturing</string>
<string name="shutter_sound">Sonido del obturador</string> <string name="shutter_sound">Sonido del obturador</string>
<string name="back_camera_photo_resolution">Back camera photo resolution</string> <string name="back_camera">Back camera resolutions</string>
<string name="front_camera_photo_resolution">Front camera photo resolution</string> <string name="front_camera">Front camera resolutions</string>
<string name="back_camera_video_resolution">Back camera video resolution</string> <string name="photo_resolution">Photo</string>
<string name="front_camera_video_resolution">Front camera video resolution</string> <string name="video_resolution">Video</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have --> <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars --> <!-- Short description has to have less than 80 chars -->

8
app/src/main/res/values-fr/strings.xml
View File

@ -17,10 +17,10 @@
<string name="save_photos">Sauvegarder les photos et vidéos vers</string> <string name="save_photos">Sauvegarder les photos et vidéos vers</string>
<string name="show_preview">Apercevoir la photo après la prise</string> <string name="show_preview">Apercevoir la photo après la prise</string>
<string name="shutter_sound">Son de l\'obturateur</string> <string name="shutter_sound">Son de l\'obturateur</string>
<string name="back_camera_photo_resolution">Back camera photo resolution</string> <string name="back_camera">Back camera resolutions</string>
<string name="front_camera_photo_resolution">Front camera photo resolution</string> <string name="front_camera">Front camera resolutions</string>
<string name="back_camera_video_resolution">Back camera video resolution</string> <string name="photo_resolution">Photo</string>
<string name="front_camera_video_resolution">Front camera video resolution</string> <string name="video_resolution">Video</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have --> <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars --> <!-- Short description has to have less than 80 chars -->

8
app/src/main/res/values-it/strings.xml
View File

@ -17,10 +17,10 @@
<string name="save_photos">Save photos and videos to</string> <string name="save_photos">Save photos and videos to</string>
<string name="show_preview">Show a photo preview after capturing</string> <string name="show_preview">Show a photo preview after capturing</string>
<string name="shutter_sound">Suono otturatore</string> <string name="shutter_sound">Suono otturatore</string>
<string name="back_camera_photo_resolution">Back camera photo resolution</string> <string name="back_camera">Back camera resolutions</string>
<string name="front_camera_photo_resolution">Front camera photo resolution</string> <string name="front_camera">Front camera resolutions</string>
<string name="back_camera_video_resolution">Back camera video resolution</string> <string name="photo_resolution">Photo</string>
<string name="front_camera_video_resolution">Front camera video resolution</string> <string name="video_resolution">Video</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have --> <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars --> <!-- Short description has to have less than 80 chars -->

8
app/src/main/res/values-ja/strings.xml
View File

@ -17,10 +17,10 @@
<string name="save_photos">写真とビデオの保存先</string> <string name="save_photos">写真とビデオの保存先</string>
<string name="show_preview">キャプチャ後に写真のプレビューを表示</string> <string name="show_preview">キャプチャ後に写真のプレビューを表示</string>
<string name="shutter_sound">シャッター音</string> <string name="shutter_sound">シャッター音</string>
<string name="back_camera_photo_resolution">Back camera photo resolution</string> <string name="back_camera">Back camera resolutions</string>
<string name="front_camera_photo_resolution">Front camera photo resolution</string> <string name="front_camera">Front camera resolutions</string>
<string name="back_camera_video_resolution">Back camera video resolution</string> <string name="photo_resolution">Photo</string>
<string name="front_camera_video_resolution">Front camera video resolution</string> <string name="video_resolution">Video</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have --> <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars --> <!-- Short description has to have less than 80 chars -->

8
app/src/main/res/values-lt/strings.xml
View File

@ -17,10 +17,10 @@
<string name="save_photos">Išsaugoti nuotraukas ir vaizdo įrašus į</string> <string name="save_photos">Išsaugoti nuotraukas ir vaizdo įrašus į</string>
<string name="show_preview">Show a photo preview after capturing</string> <string name="show_preview">Show a photo preview after capturing</string>
<string name="shutter_sound">Užrakto garsas</string> <string name="shutter_sound">Užrakto garsas</string>
<string name="back_camera_photo_resolution">Back camera photo resolution</string> <string name="back_camera">Back camera resolutions</string>
<string name="front_camera_photo_resolution">Front camera photo resolution</string> <string name="front_camera">Front camera resolutions</string>
<string name="back_camera_video_resolution">Back camera video resolution</string> <string name="photo_resolution">Photo</string>
<string name="front_camera_video_resolution">Front camera video resolution</string> <string name="video_resolution">Video</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have --> <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars --> <!-- Short description has to have less than 80 chars -->

8
app/src/main/res/values-pt/strings.xml
View File

@ -17,10 +17,10 @@
<string name="save_photos">Guardar fotos e vídeos em</string> <string name="save_photos">Guardar fotos e vídeos em</string>
<string name="show_preview">Mostrar pré-visualização após a captura</string> <string name="show_preview">Mostrar pré-visualização após a captura</string>
<string name="shutter_sound">Som do obturador</string> <string name="shutter_sound">Som do obturador</string>
<string name="back_camera_photo_resolution">Back camera photo resolution</string> <string name="back_camera">Back camera resolutions</string>
<string name="front_camera_photo_resolution">Front camera photo resolution</string> <string name="front_camera">Front camera resolutions</string>
<string name="back_camera_video_resolution">Back camera video resolution</string> <string name="photo_resolution">Photo</string>
<string name="front_camera_video_resolution">Front camera video resolution</string> <string name="video_resolution">Video</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have --> <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars --> <!-- Short description has to have less than 80 chars -->

8
app/src/main/res/values-ru/strings.xml
View File

@ -17,10 +17,10 @@
<string name="save_photos">Сохранять фото и видео в</string> <string name="save_photos">Сохранять фото и видео в</string>
<string name="show_preview">Показывать сделанное фото</string> <string name="show_preview">Показывать сделанное фото</string>
<string name="shutter_sound">Звук затвора</string> <string name="shutter_sound">Звук затвора</string>
<string name="back_camera_photo_resolution">Back camera photo resolution</string> <string name="back_camera">Back camera resolutions</string>
<string name="front_camera_photo_resolution">Front camera photo resolution</string> <string name="front_camera">Front camera resolutions</string>
<string name="back_camera_video_resolution">Back camera video resolution</string> <string name="photo_resolution">Photo</string>
<string name="front_camera_video_resolution">Front camera video resolution</string> <string name="video_resolution">Video</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have --> <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars --> <!-- Short description has to have less than 80 chars -->

8
app/src/main/res/values-sv/strings.xml
View File

@ -17,10 +17,10 @@
<string name="save_photos">Save photos and videos to</string> <string name="save_photos">Save photos and videos to</string>
<string name="show_preview">Show a photo preview after capturing</string> <string name="show_preview">Show a photo preview after capturing</string>
<string name="shutter_sound">Slutarljud</string> <string name="shutter_sound">Slutarljud</string>
<string name="back_camera_photo_resolution">Back camera photo resolution</string> <string name="back_camera">Back camera resolutions</string>
<string name="front_camera_photo_resolution">Front camera photo resolution</string> <string name="front_camera">Front camera resolutions</string>
<string name="back_camera_video_resolution">Back camera video resolution</string> <string name="photo_resolution">Photo</string>
<string name="front_camera_video_resolution">Front camera video resolution</string> <string name="video_resolution">Video</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have --> <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars --> <!-- Short description has to have less than 80 chars -->

8
app/src/main/res/values/strings.xml
View File

@ -17,10 +17,10 @@
<string name="save_photos">Save photos and videos to</string> <string name="save_photos">Save photos and videos to</string>
<string name="show_preview">Show a photo preview after capturing</string> <string name="show_preview">Show a photo preview after capturing</string>
<string name="shutter_sound">Shutter sound</string> <string name="shutter_sound">Shutter sound</string>
<string name="back_camera_photo_resolution">Back camera photo resolution</string> <string name="back_camera">Back camera resolutions</string>
<string name="front_camera_photo_resolution">Front camera photo resolution</string> <string name="front_camera">Front camera resolutions</string>
<string name="back_camera_video_resolution">Back camera video resolution</string> <string name="photo_resolution">Photo</string>
<string name="front_camera_video_resolution">Front camera video resolution</string> <string name="video_resolution">Video</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have --> <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars --> <!-- Short description has to have less than 80 chars -->