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

fix inconsistencies when user switches camera mode fast 

- debounce switching by 300ms when toggling between video/photo capture
- setCameraAvailable only when there is no error and the camera state is Type.OPEN
This commit is contained in:
darthpaul 2022-11-11 00:44:53 +00:00
parent 7b7838331e
commit c858e5b908
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
View File

@ -52,6 +52,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
const val PHOTO_MODE_INDEX = 1 const val PHOTO_MODE_INDEX = 1
const val VIDEO_MODE_INDEX = 0 const val VIDEO_MODE_INDEX = 0
private const val MIN_SWIPE_DISTANCE_X = 100 private const val MIN_SWIPE_DISTANCE_X = 100
private const val DELAY_BETWEEN_MODE_SWITCH = 300L
} }
lateinit var mTimerHandler: Handler lateinit var mTimerHandler: Handler
@ -67,10 +68,14 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
private var mIsHardwareShutterHandled = false private var mIsHardwareShutterHandled = false
private var mCurrVideoRecTimer = 0 private var mCurrVideoRecTimer = 0
var mLastHandledOrientation = 0 var mLastHandledOrientation = 0
private val togglePhotoVideoRunnable = Runnable {
handleTogglePhotoVideo()
}
private val tabSelectedListener = object : TabSelectedListener { private val tabSelectedListener = object : TabSelectedListener {
override fun onTabSelected(tab: TabLayout.Tab) { override fun onTabSelected(tab: TabLayout.Tab) {
handleTogglePhotoVideo() camera_mode_tab.removeCallbacks(togglePhotoVideoRunnable)
camera_mode_tab.postDelayed(togglePhotoVideoRunnable, DELAY_BETWEEN_MODE_SWITCH)
} }
} }
@ -382,7 +387,13 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
private fun initModeSwitcher() { private fun initModeSwitcher() {
val gestureDetector = GestureDetector(this, object : GestureDetector.SimpleOnGestureListener() { val gestureDetector = GestureDetectorCompat(this, object : GestureDetector.SimpleOnGestureListener() {
override fun onDown(e: MotionEvent): Boolean {
// we have to return true here so ACTION_UP
// (and onFling) can be dispatched
return true
}
override fun onFling(event1: MotionEvent, event2: MotionEvent, velocityX: Float, velocityY: Float): Boolean { override fun onFling(event1: MotionEvent, event2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
// these can be null even if the docs say they cannot // these can be null even if the docs say they cannot
if (event1 == null || event2 == null) { if (event1 == null || event2 == null) {
@ -404,7 +415,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
} }
}) })
camera_mode_tab.setOnTouchListener { _, event -> bottom_overlay.setOnTouchListener { _, event ->
gestureDetector.onTouchEvent(event) gestureDetector.onTouchEvent(event)
} }
} }

27
app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt
View File

@ -244,20 +244,23 @@ class CameraXPreview(
listener.onChangeCamera(isFrontCameraInUse()) listener.onChangeCamera(isFrontCameraInUse())
camera?.cameraInfo?.cameraState?.observe(activity) { cameraState -> camera?.cameraInfo?.cameraState?.observe(activity) { cameraState ->
when (cameraState.type) { if (cameraState.error == null) {
CameraState.Type.OPEN, when (cameraState.type) {
CameraState.Type.OPENING -> { CameraState.Type.OPEN-> {
listener.setHasFrontAndBackCamera(hasFrontCamera() && hasBackCamera()) listener.setHasFrontAndBackCamera(hasFrontCamera() && hasBackCamera())
listener.setCameraAvailable(true) listener.setCameraAvailable(true)
} }
CameraState.Type.PENDING_OPEN, CameraState.Type.OPENING,
CameraState.Type.CLOSING, CameraState.Type.PENDING_OPEN,
CameraState.Type.CLOSED -> { CameraState.Type.CLOSING,
listener.setCameraAvailable(false) CameraState.Type.CLOSED -> {
listener.setCameraAvailable(false)
}
} }
} else {
listener.setCameraAvailable(false)
cameraErrorHandler.handleCameraError(cameraState.error)
} }
cameraErrorHandler.handleCameraError(cameraState?.error)
} }
} }