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

let the user know if the photo wasnt saved because he quit too early

Browse Source
This commit is contained in:
tibbi
2017-06-16 21:52:55 +02:00
parent 811cfbf668
commit 048dbffd03
14 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,8 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
private var mIsFocusing = false
private var autoFocusHandler = Handler()
var isWaitingForTakePictureCallback = false
constructor(context: Context) : super(context)
constructor(activity: MainActivity, surfaceView: SurfaceView, previewListener: PreviewListener) : super(activity) {
@ -275,6 +277,15 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
val selectedResolution = getSelectedResolution()
mParameters!!.setPictureSize(selectedResolution.width, selectedResolution.height);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
mCamera!!.enableShutterSound(false)
}
mRotationAtCapture = MainActivity.mLastHandledOrientation
mCamera!!.parameters = mParameters
isWaitingForTakePictureCallback = true
mCamera!!.takePicture(null, null, takePictureCallback)
if (config.isSoundEnabled) {
val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
val volume = audioManager.getStreamVolume(AudioManager.STREAM_SYSTEM)
@ -283,20 +294,13 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
mp?.start()
}
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
mCamera!!.enableShutterSound(false)
}
mRotationAtCapture = MainActivity.mLastHandledOrientation
mCamera!!.parameters = mParameters
mCamera!!.takePicture(null, null, takePictureCallback)
}
mCanTakePicture = false
mIsFocusing = false
}
private val takePictureCallback = Camera.PictureCallback { data, cam ->
isWaitingForTakePictureCallback = false
if (config.isShowPreviewEnabled) {
mIsPreviewShown = true
if (!config.wasPhotoPreviewHintShown) {

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

@ -501,6 +501,10 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
hideTimer()
mPreview?.releaseCamera()
mOrientationEventListener.disable()
if (mPreview?.isWaitingForTakePictureCallback == true) {
toast(R.string.photo_not_saved)
}
}
private fun setupOrientationEventListener() {