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

show the Toggle Camera button only if the user has multiple cameras

Browse Source
This commit is contained in:
tibbi 2017-03-25 18:23:07 +01:00
parent 726ab0acd2
commit ba979443ad
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt
View File

@ -92,7 +92,7 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId
return "" return ""
} }
fun rotate(bitmap: Bitmap, degree: Int): Bitmap { private fun rotate(bitmap: Bitmap, degree: Int): Bitmap {
val width = bitmap.width val width = bitmap.width
val height = bitmap.height val height = bitmap.height

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

@ -274,7 +274,7 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho
showTimer() showTimer()
} else { } else {
shutter.setImageDrawable(mRes.getDrawable(R.drawable.ic_video_rec)) shutter.setImageDrawable(mRes.getDrawable(R.drawable.ic_video_rec))
toggle_camera.beVisible() showToggleCameraIfNeeded()
hideTimer() hideTimer()
} }
} }
@ -318,7 +318,7 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho
disableFlash() disableFlash()
hideTimer() hideTimer()
mIsInPhotoMode = !mIsInPhotoMode mIsInPhotoMode = !mIsInPhotoMode
toggle_camera.beVisible() showToggleCameraIfNeeded()
} }
private fun checkButtons() { private fun checkButtons() {
@ -348,7 +348,7 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho
private fun initVideoButtons() { private fun initVideoButtons() {
toggle_photo_video.setImageDrawable(mRes.getDrawable(R.drawable.ic_camera)) toggle_photo_video.setImageDrawable(mRes.getDrawable(R.drawable.ic_camera))
toggle_camera.beVisible() showToggleCameraIfNeeded()
shutter.setImageDrawable(mRes.getDrawable(R.drawable.ic_video_rec)) shutter.setImageDrawable(mRes.getDrawable(R.drawable.ic_video_rec))
checkFlash() checkFlash()
setupPreviewImage(false) setupPreviewImage(false)
@ -447,7 +447,7 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho
} }
private fun resumeCameraItems() { private fun resumeCameraItems() {
toggle_camera.beVisibleIf(Camera.getNumberOfCameras() > 1) showToggleCameraIfNeeded()
if (mPreview?.setCamera(mCurrCameraId) == true) { if (mPreview?.setCamera(mCurrCameraId) == true) {
hideNavigationBarIcons() hideNavigationBarIcons()
checkFlash() checkFlash()
@ -463,6 +463,10 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho
} }
} }
private fun showToggleCameraIfNeeded() {
toggle_camera.beInvisibleIf(Camera.getNumberOfCameras() > 1)
}
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)