reload translated result in original webview when long pressing close…

… button
plateaukao · Sep 20, 2021 · a418d0d · a418d0d
1 parent 75bb651
commit a418d0d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt b/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt
@@ -632,6 +632,7 @@ open class BrowserActivity : AppCompatActivity(), BrowserController, OnClickList
                     binding.twoPanelLayout,
                     { showTranslation() },
                     { if (ninjaWebView.isReaderModeOn) ninjaWebView.toggleReaderMode() },
+                    { url -> ninjaWebView.loadUrl(url)},
             )
         }
     }

diff --git a/app/src/main/java/de/baumann/browser/view/viewControllers/TranslationViewController.kt b/app/src/main/java/de/baumann/browser/view/viewControllers/TranslationViewController.kt
@@ -33,6 +33,7 @@ class TranslationViewController(
     private val twoPaneLayout: TwoPaneLayout,
     private val showTranslationAction: () -> Unit,
     private val onTranslationClosed: () -> Unit,
+    private val loadTranslationUrl: (String) -> Unit
 ) {
     private val config: ConfigManager by lazy { ConfigManager(activity) }
     private val webView: NinjaWebView by lazy {
@@ -63,7 +64,11 @@ class TranslationViewController(
         translationViewBinding.translationFontMinus.setOnClickListener { decreaseFontSize() }
 
         translationViewBinding.translationClose.setOnClickListener { toggleTranslationWindow(false, onTranslationClosed) }
-        translationViewBinding.translationClose.setOnLongClickListener{ hideControlButtons(); true }
+        translationViewBinding.translationClose.setOnLongClickListener{
+            webView.url?.let { loadTranslationUrl(it) }
+            toggleTranslationWindow(false)
+            true
+        }
 
         translationViewBinding.translationOrientation.setOnClickListener {
             val orientation = if (twoPaneLayout.getOrientation() == Orientation.Vertical) Orientation.Horizontal else Orientation.Vertical
@@ -356,7 +361,7 @@ class TranslationViewController(
 
     private fun toggleTranslationWindow(
         isEnabled: Boolean,
-        onTranslationClosed: () -> Unit
+        onTranslationClosed: () -> Unit = {}
     ) {
         if (config.translationMode == TranslationMode.ONYX) {
             ViewUnit.toggleMultiWindow(activity, isEnabled)