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

fix back button

Browse Source
This commit is contained in:
darthpaul
2022-09-22 00:48:50 +01:00
parent 1450f87e0f
commit 58bf7fded0
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -705,6 +705,8 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
) { ) {
val transitionSet = createTransition(isClosing = true) val transitionSet = createTransition(isClosing = true)
TransitionManager.go(defaultScene, transitionSet) TransitionManager.go(defaultScene, transitionSet)
media_size_toggle_group.beGone()
flash_toggle_group.beGone()
return true return true
} }
@ -762,6 +764,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
private fun showResolutionOptions() { private fun showResolutionOptions() {
val transitionSet = createTransition() val transitionSet = createTransition()
TransitionManager.go(mediaSizeScene, transitionSet) TransitionManager.go(mediaSizeScene, transitionSet)
media_size_toggle_group.beVisible()
media_size_toggle_group.children.map { it as MaterialButton }.forEach(::setButtonColors) media_size_toggle_group.children.map { it as MaterialButton }.forEach(::setButtonColors)
} }

5
app/src/main/res/layout/layout_flash.xml
View File

@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.button.MaterialButtonToggleGroup xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.button.MaterialButtonToggleGroup xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/flash_toggle_group" android:id="@+id/flash_toggle_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"
app:selectionRequired="true" app:selectionRequired="true"
app:singleSelection="true"> app:singleSelection="true"
tools:visibility="visible">
<Button <Button

3
app/src/main/res/layout/layout_media_size.xml
View File

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.button.MaterialButtonToggleGroup xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.button.MaterialButtonToggleGroup xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/media_size_toggle_group" android:id="@+id/media_size_toggle_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:selectionRequired="true" app:selectionRequired="true"
android:visibility="gone"
tools:visibility="visible"
app:singleSelection="true" /> app:singleSelection="true" />