Merge pull request #1178 from Lenkomotive/PAINTROID-525

PAINTROID-525 toolspecific options are hidden after leaving fullscree…
Catrobat · Jan 25, 2023 · 73096f2 · 73096f2
2 parents 429f0d4 + 31ea0dd
commit 73096f2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...oid/src/androidTest/java/org/catrobat/paintroid/test/espresso/LandscapeIntegrationTest.kt b/...oid/src/androidTest/java/org/catrobat/paintroid/test/espresso/LandscapeIntegrationTest.kt
@@ -362,8 +362,8 @@ class LandscapeIntegrationTest {
         setOrientation(SCREEN_ORIENTATION_LANDSCAPE)
         pressBack()
         onToolBarView()
-            .performOpenToolOptionsView()
             .performCloseToolOptionsView()
+            .performOpenToolOptionsView()
     }
 
     @Test
@@ -386,8 +386,8 @@ class LandscapeIntegrationTest {
         setOrientation(SCREEN_ORIENTATION_LANDSCAPE)
         pressBack()
         onToolBarView()
-            .performOpenToolOptionsView()
             .performCloseToolOptionsView()
+            .performOpenToolOptionsView()
     }
 
     @Test
@@ -401,8 +401,8 @@ class LandscapeIntegrationTest {
         setOrientation(SCREEN_ORIENTATION_PORTRAIT)
         pressBack()
         onToolBarView()
-            .performOpenToolOptionsView()
             .performCloseToolOptionsView()
+            .performOpenToolOptionsView()
     }
 
     @Test

diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/presenter/MainActivityPresenter.kt b/Paintroid/src/main/java/org/catrobat/paintroid/presenter/MainActivityPresenter.kt
@@ -151,6 +151,7 @@ open class MainActivityPresenter(
 
     var clippingToolInUseAndUndoRedoClicked = false
     var clippingToolPaint = Paint()
+    var toolOptionsViewWasShown = false
 
     override fun replaceImageClicked() {
         checkIfClippingToolNeedsAdjustment()
@@ -719,9 +720,16 @@ open class MainActivityPresenter(
         bottomNavigationViewHolder.show()
         toolController.enableToolOptionsView()
         perspective.exitFullscreen()
+        if (toolOptionsViewWasShown) {
+            toolController.showToolOptionsView()
+            toolOptionsViewWasShown = false
+        }
     }
 
     private fun enterFullscreen() {
+        if (toolController.toolOptionsViewVisible()) {
+            toolOptionsViewWasShown = true
+        }
         view.hideKeyboard()
         view.enterFullscreen()
         topBarViewHolder.hide()