From f0a045f9b97cae1b7ed5180ec90981d02b40de8e Mon Sep 17 00:00:00 2001 From: "codrut.topliceanu" Date: Thu, 13 Aug 2020 10:01:55 +0300 Subject: [PATCH] For #13390 - Fix for stuck readerMode appearance controls --- .../mozilla/fenix/browser/readermode/ReaderModeController.kt | 5 ++++- .../browser/readermode/DefaultReaderModeControllerTest.kt | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/browser/readermode/ReaderModeController.kt b/app/src/main/java/org/mozilla/fenix/browser/readermode/ReaderModeController.kt index a148f65e7..4f1de82d0 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/readermode/ReaderModeController.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/readermode/ReaderModeController.kt @@ -27,7 +27,10 @@ class DefaultReaderModeController( private val isPrivate: Boolean = false ) : ReaderModeController { override fun hideReaderView() { - readerViewFeature.withFeature { it.hideReaderView() } + readerViewFeature.withFeature { + it.hideReaderView() + it.hideControls() + } } override fun showReaderView() { diff --git a/app/src/test/java/org/mozilla/fenix/browser/readermode/DefaultReaderModeControllerTest.kt b/app/src/test/java/org/mozilla/fenix/browser/readermode/DefaultReaderModeControllerTest.kt index 56a48b4c1..bb8e3e3a5 100644 --- a/app/src/test/java/org/mozilla/fenix/browser/readermode/DefaultReaderModeControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/browser/readermode/DefaultReaderModeControllerTest.kt @@ -54,6 +54,7 @@ class DefaultReaderModeControllerTest { every { readerViewFeature.hideReaderView() } returns Unit every { readerViewFeature.showReaderView() } returns Unit every { readerViewFeature.showControls() } returns Unit + every { readerViewFeature.hideControls() } returns Unit } @Test @@ -61,6 +62,7 @@ class DefaultReaderModeControllerTest { val controller = DefaultReaderModeController(featureWrapper, readerViewControlsBar) controller.hideReaderView() verify { readerViewFeature.hideReaderView() } + verify { readerViewFeature.hideControls() } } @Test