Make activities enable popup options they want

Make activities enable popup menu options they want rather than disabling options they don't want

Author: subsymbolic

app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt

@@ -99,9 +99,8 @@ class BrowserActivity : DuckDuckGoActivity(), BookmarkDialogCreationListener {
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_browser)
-
-        createWebView()
         createPopupMenu()
+        createWebView()
         configureObservers()
         configureToolbar()
         configureWebView()
@@ -116,6 +115,15 @@ class BrowserActivity : DuckDuckGoActivity(), BookmarkDialogCreationListener {
 
     private fun createPopupMenu() {
         popupMenu = BrowserPopupMenu(layoutInflater)
+        val view = popupMenu.contentView
+        popupMenu.apply {
+            enableMenuOption(view.forwardPopupMenuItem) { webView.goForward() }
+            enableMenuOption(view.backPopupMenuItem) { webView.goBack() }
+            enableMenuOption(view.refreshPopupMenuItem) { webView.reload() }
+            enableMenuOption(view.bookmarksPopupMenuItem) { launchBookmarks() }
+            enableMenuOption(view.addBookmarksPopupMenuItem) { addBookmark() }
+            enableMenuOption(view.settingsPopupMenuItem) { launchSettings() }
+        }
     }
 
     private fun createWebView() {
@@ -433,42 +441,6 @@ class BrowserActivity : DuckDuckGoActivity(), BookmarkDialogCreationListener {
         popupMenu.show(rootView, toolbar)
     }
 
-    @Suppress("UNUSED_PARAMETER")
-    fun onGoForwardClicked(view: View) {
-        webView.goForward()
-        popupMenu.dismiss()
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    fun onGoBackClicked(view: View) {
-        webView.goBack()
-        popupMenu.dismiss()
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    fun onRefreshClicked(view: View) {
-        webView.reload()
-        popupMenu.dismiss()
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    fun onBookmarksClicked(view: View) {
-        launchBookmarksView()
-        popupMenu.dismiss()
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    fun onAddBookmarkClicked(view: View) {
-        addBookmark()
-        popupMenu.dismiss()
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    fun onSettingsClicked(view: View) {
-        launchSettingsView()
-        popupMenu.dismiss()
-    }
-
     private fun addBookmark() {
 
         val addBookmarkDialog = BookmarkAddEditDialogFragment.createDialogCreationMode(
@@ -479,11 +451,11 @@ class BrowserActivity : DuckDuckGoActivity(), BookmarkDialogCreationListener {
         addBookmarkDialog.show(supportFragmentManager, ADD_BOOKMARK_FRAGMENT_TAG)
     }
 
-    private fun launchSettingsView() {
+    private fun launchSettings() {
         startActivity(SettingsActivity.intent(this))
     }
 
-    private fun launchBookmarksView() {
+    private fun launchBookmarks() {
         startActivity(BookmarksActivity.intent(this))
     }
 

app/src/main/java/com/duckduckgo/app/browser/BrowserPopupMenu.kt

@@ -24,6 +24,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.PopupWindow
+import kotlinx.android.synthetic.main.popup_window_browser_menu.view.*
 
 class BrowserPopupMenu : PopupWindow {
 
@@ -38,9 +39,26 @@ class BrowserPopupMenu : PopupWindow {
             elevation = 6.toFloat()
         }
 
+        disableButtons()
         animationStyle = android.R.style.Animation_Dialog
     }
 
+    private fun disableButtons() {
+        contentView.apply {
+            backPopupMenuItem.isEnabled = false
+            forwardPopupMenuItem.isEnabled = false
+            refreshPopupMenuItem.isEnabled = false
+        }
+    }
+
+    fun enableMenuOption(menuView: View, onClick: () -> Unit) {
+        menuView.isEnabled = true
+        menuView.setOnClickListener {
+            onClick()
+            dismiss()
+        }
+    }
+
     fun show(rootView: View, anchorView: View) {
         val anchorLocation = IntArray(2)
         anchorView.getLocationOnScreen(anchorLocation)
@@ -51,7 +69,7 @@ class BrowserPopupMenu : PopupWindow {
 
     companion object {
 
-        val margin = 30
+        private const val margin = 30
 
         fun inflate(layoutInflater: LayoutInflater): View {
             return layoutInflater.inflate(R.layout.popup_window_browser_menu, null)

app/src/main/java/com/duckduckgo/app/home/HomeActivity.kt

@@ -22,7 +22,6 @@ import android.os.Bundle
 import android.support.v4.app.ActivityOptionsCompat
 import android.view.Menu
 import android.view.MenuItem
-import android.view.View
 import android.webkit.CookieManager
 import com.duckduckgo.app.bookmarks.ui.BookmarksActivity
 import com.duckduckgo.app.browser.BrowserActivity
@@ -66,11 +65,10 @@ class HomeActivity : DuckDuckGoActivity() {
 
     private fun configurePopupMenu() {
         popupMenu = BrowserPopupMenu(layoutInflater)
-        popupMenu.contentView.apply {
-            backPopupMenuItem.isEnabled = false
-            forwardPopupMenuItem.isEnabled = false
-            refreshPopupMenuItem.isEnabled = false
-            addBookmarksPopupMenuItem.isEnabled = false
+        val view = popupMenu.contentView
+        popupMenu.apply {
+            enableMenuOption(view.bookmarksPopupMenuItem) { launchBookmarks() }
+            enableMenuOption(view.settingsPopupMenuItem) { launchSettings() }
         }
     }
 
@@ -132,14 +130,12 @@ class HomeActivity : DuckDuckGoActivity() {
         popupMenu.show(rootView, toolbar)
     }
 
-    fun onBookmarksClicked(view: View) {
+    fun launchBookmarks() {
         startActivity(BookmarksActivity.intent(this))
-        popupMenu.dismiss()
     }
 
-    fun onSettingsClicked(view: View) {
+    fun launchSettings() {
         startActivity(SettingsActivity.intent(this))
-        popupMenu.dismiss()
     }
 
     override fun onDestroy() {

app/src/main/res/layout/popup_window_browser_menu.xml

@@ -35,7 +35,6 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:contentDescription="@string/back"
-            android:onClick="onGoBackClicked"
             android:src="@drawable/ic_arrow_back_24px" />
 
         <ImageButton
@@ -45,7 +44,6 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:contentDescription="@string/forward"
-            android:onClick="onGoForwardClicked"
             android:src="@drawable/ic_arrow_forward_24px" />
 
         <ImageButton
@@ -55,7 +53,6 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:contentDescription="@string/refresh"
-            android:onClick="onRefreshClicked"
             android:src="@drawable/ic_refresh_24px" />
 
     </LinearLayout>
@@ -79,23 +76,23 @@
             style="@style/BrowserTextMenuItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:onClick="onBookmarksClicked"
+            android:enabled="false"
             android:text="@string/bookmarksMenuTitle" />
 
         <TextView
             android:id="@+id/addBookmarksPopupMenuItem"
             style="@style/BrowserTextMenuItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:onClick="onAddBookmarkClicked"
+            android:enabled="false"
             android:text="@string/addBookmarkMenuTitle" />
 
         <TextView
             android:id="@+id/settingsPopupMenuItem"
             style="@style/BrowserTextMenuItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:onClick="onSettingsClicked"
+            android:enabled="false"
             android:text="@string/settingsMenuItemTitle" />
 
     </LinearLayout>