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

View File

@ -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"

View File

@ -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
}

View File

@ -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 {
}
}
}