ADFA-4385: Make it easy to navigate to your point of origin when in the help activity

common/src/main/java/com/itsaky/androidide/activities/editor/HelpActivity.kt

@@ -21,6 +21,8 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
 import android.view.View
 import android.webkit.WebViewClient
 import androidx.activity.OnBackPressedCallback
@@ -29,6 +31,7 @@ import androidx.core.view.WindowCompat
 import org.adfa.constants.CONTENT_KEY
 import com.itsaky.androidide.resources.R
 import com.itsaky.androidide.app.BaseIDEActivity
+import com.itsaky.androidide.common.R as CommonR
 import com.itsaky.androidide.common.databinding.ActivityHelpBinding
 import com.itsaky.androidide.utils.DeviceFormFactorUtils
 import com.itsaky.androidide.utils.isSystemInDarkMode
@@ -102,6 +105,12 @@ class HelpActivity : BaseIDEActivity() {
 
                 override fun onPageFinished(view: android.webkit.WebView?, url: String?) {
                     super.onPageFinished(view, url)
+                    invalidateOptionsMenu()
+                }
+
+                override fun doUpdateVisitedHistory(view: android.webkit.WebView?, url: String?, isReload: Boolean) {
+                    super.doUpdateVisitedHistory(view, url, isReload)
+                    invalidateOptionsMenu()
                 }
 
                 override fun shouldOverrideUrlLoading(view: android.webkit.WebView?, url: String?): Boolean {
@@ -165,6 +174,27 @@ class HelpActivity : BaseIDEActivity() {
         }
     }
 
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(CommonR.menu.menu_help, menu)
+        return true
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu): Boolean {
+        menu.findItem(CommonR.id.action_close_help)?.isVisible =
+            _binding != null && binding.webView.canGoBack()
+        return super.onPrepareOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            CommonR.id.action_close_help -> {
+                finish()
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
     private fun handleBackNavigation() {
         if (binding.webView.canGoBack()) {
             binding.webView.goBack()

common/src/main/res/menu/menu_help.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_close_help"
+        android:icon="@drawable/ic_close"
+        android:title="@string/close"
+        app:showAsAction="always" />
+
+</menu>