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

UI fixes

Browse Source 
- hiding button on 3rd party intent
- disabling option to change resolution when capturing media
This commit is contained in:
darthpaul
2022-08-25 19:09:13 +01:00
parent 0fdb751909
commit 34c0f0bd6a
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,7 +261,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
}
private fun checkVideoCaptureIntent() {
if (intent?.action == MediaStore.ACTION_VIDEO_CAPTURE) {
if (isVideoCaptureIntent()) {
mIsInPhotoMode = false
hideIntentButtons()
shutter.setImageResource(R.drawable.ic_video_rec)
@ -386,6 +386,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
private fun handleShutter() {
if (mIsInPhotoMode) {
toggleBottomButtons(true)
change_resolution.isEnabled = true
mPreview?.tryTakePicture()
shutter_animation.alpha = 1.0f
shutter_animation.animate().alpha(0f).setDuration(CAPTURE_ANIMATION_DURATION).start()
@ -607,6 +608,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
}
override fun onMediaSaved(uri: Uri) {
change_resolution.isEnabled = true
loadLastTakenMedia(uri)
if (isImageCaptureIntent()) {
Intent().apply {
@ -642,6 +644,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
override fun onVideoRecordingStarted() {
shutter.setImageResource(R.drawable.ic_video_stop)
toggle_camera.beInvisible()
change_resolution.isEnabled = false
video_rec_curr_timer.beVisible()
}
@ -649,6 +652,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
shutter.setImageResource(R.drawable.ic_video_rec)
video_rec_curr_timer.text = 0.getFormattedDuration()
video_rec_curr_timer.beGone()
change_resolution.isEnabled = true
toggle_camera.beVisible()
}
@ -680,13 +684,13 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
private fun closeOptions(): Boolean {
if (media_size_toggle_group.isVisible()) {
media_size_toggle_group.beGone()
top_group.beVisible()
showTopIcons()
return true
}
if (flash_toggle_group.isVisible()) {
flash_toggle_group.beGone()
top_group.beVisible()
showTopIcons()
return true
}
return false
@ -739,19 +743,28 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
}
private fun showResolutionOptions() {
top_group.beInvisible()
hideTopIcons()
media_size_toggle_group.beVisible()
media_size_toggle_group.children.map { it as MaterialButton }.forEach(::setButtonColors)
}
override fun showFlashOptions(photoCapture: Boolean) {
flash_auto.beVisibleIf(photoCapture)
top_group.beInvisible()
hideTopIcons()
flash_toggle_group.beVisible()
flash_toggle_group.check(config.flashlightState.toFlashModeId())
flash_toggle_group.children.map { it as MaterialButton }.forEach(::setButtonColors)
}
private fun showTopIcons() {
listOf(toggle_flash, change_resolution).forEach { it.beVisible() }
settings.beVisibleIf(!is3rdPartyIntent())
}
private fun hideTopIcons() {
listOf(toggle_flash, change_resolution, settings).forEach { it.beInvisible() }
}
private fun setButtonColors(button: MaterialButton) {
val primaryColor = getProperPrimaryColor()
val states = arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked))