fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-02-19 21:01:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

do not show an error toast at focus fail either

Browse Source
This commit is contained in:
tibbi 2017-11-04 23:56:41 +01:00
parent 78949bb0a8
commit 7103b447bc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,25 +219,25 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
mScaleGestureDetector = ScaleGestureDetector(mActivity, object : ScaleGestureDetector.SimpleOnScaleGestureListener() { mScaleGestureDetector = ScaleGestureDetector(mActivity, object : ScaleGestureDetector.SimpleOnScaleGestureListener() {
override fun onScale(detector: ScaleGestureDetector): Boolean { override fun onScale(detector: ScaleGestureDetector): Boolean {
val zoomFactor = mParameters!!.zoom val zoomFactor = mParameters!!.zoom
var zoomRatio = mZoomRatios!![zoomFactor] / 100f var zoomRatio = mZoomRatios[zoomFactor] / 100f
zoomRatio *= detector.scaleFactor zoomRatio *= detector.scaleFactor
var newZoomFactor = zoomFactor var newZoomFactor = zoomFactor
if (zoomRatio <= 1f) { if (zoomRatio <= 1f) {
newZoomFactor = 0 newZoomFactor = 0
} else if (zoomRatio >= mZoomRatios!![mMaxZoom] / 100f) { } else if (zoomRatio >= mZoomRatios[mMaxZoom] / 100f) {
newZoomFactor = mMaxZoom newZoomFactor = mMaxZoom
} else { } else {
if (detector.scaleFactor > 1f) { if (detector.scaleFactor > 1f) {
for (i in zoomFactor..mZoomRatios!!.size - 1) { for (i in zoomFactor until mZoomRatios.size) {
if (mZoomRatios!![i] / 100.0f >= zoomRatio) { if (mZoomRatios[i] / 100.0f >= zoomRatio) {
newZoomFactor = i newZoomFactor = i
break break
} }
} }
} else { } else {
for (i in zoomFactor downTo 0) { for (i in zoomFactor downTo 0) {
if (mZoomRatios!![i] / 100.0f <= zoomRatio) { if (mZoomRatios[i] / 100.0f <= zoomRatio) {
newZoomFactor = i newZoomFactor = i
break break
} }
@ -348,8 +348,9 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
} }
private fun focusArea(takePictureAfter: Boolean, showFocusRect: Boolean = true) { private fun focusArea(takePictureAfter: Boolean, showFocusRect: Boolean = true) {
if (mCamera == null || (mIsFocusingBeforeCapture && !takePictureAfter)) if (mCamera == null || (mIsFocusingBeforeCapture && !takePictureAfter)) {
return return
}
if (takePictureAfter) if (takePictureAfter)
mIsFocusingBeforeCapture = true mIsFocusingBeforeCapture = true
@ -389,8 +390,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
rescheduleAutofocus() rescheduleAutofocus()
} }
} }
} catch (e: Exception) { } catch (ignored: Exception) {
mActivity.showErrorToast(e)
} }
} }