Bottom navbar items now toggle drawers instead of just opening them

CookieJarApps · Jan 22, 2022 · 913c81e · 913c81e
1 parent 75941b3
commit 913c81e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/app/src/main/java/com/cookiegames/smartcookie/browser/activity/BrowserActivity.kt b/app/src/main/java/com/cookiegames/smartcookie/browser/activity/BrowserActivity.kt
@@ -812,12 +812,12 @@ abstract class BrowserActivity : ThemableBrowserActivity(), BrowserView, UIContr
                 when(item.itemId) {
                     R.id.tabs -> {
                         drawer_layout.closeDrawer(getBookmarkDrawer())
-                        drawer_layout.openDrawer(getTabDrawer())
+                        toggleDrawer(drawer_layout, getTabDrawer())
                         true
                     }
                     R.id.bookmarks -> {
                         drawer_layout.closeDrawer(getTabDrawer())
-                        drawer_layout.openDrawer(getBookmarkDrawer())
+                        toggleDrawer(drawer_layout, getBookmarkDrawer())
                         true
                     }
                     R.id.forward -> {
@@ -838,6 +838,15 @@ abstract class BrowserActivity : ThemableBrowserActivity(), BrowserView, UIContr
         }
     }
 
+    private fun toggleDrawer(layout: DrawerLayout, drawer: View) {
+        if(layout.isDrawerOpen(drawer)){
+            layout.closeDrawer(drawer)
+        }
+        else{
+            layout.openDrawer(drawer)
+        }
+    }
+
     public override fun onWindowVisibleToUserAfterResume() {
         super.onWindowVisibleToUserAfterResume()
         toolbar_layout.translationY = 0f

diff --git a/app/src/main/java/com/cookiegames/smartcookie/popup/PopUpClass.kt b/app/src/main/java/com/cookiegames/smartcookie/popup/PopUpClass.kt
@@ -103,6 +103,7 @@ class PopUpClass {
             when(userPreferences.useTheme){
                 AppTheme.DARK -> popupView.findViewById<ConstraintLayout>(R.id.transparent_container).setBackgroundResource(R.drawable.toolbar_dark)
                 AppTheme.BLACK -> popupView.findViewById<ConstraintLayout>(R.id.transparent_container).setBackgroundResource(R.drawable.toolbar_black)
+                else -> {}
             }
         }
 

diff --git a/app/src/main/java/com/cookiegames/smartcookie/utils/Utils.kt b/app/src/main/java/com/cookiegames/smartcookie/utils/Utils.kt
@@ -176,6 +176,7 @@ object Utils {
         var reloadButtonCode = "<button onclick=\"reload();\" id=\"reload-button\" class=\"blue-button text-button reload\">$reload</button>"
         when(showButton){
             false -> reloadButtonCode = ""
+            else -> {}
         }
 
         return "<html>" +
@@ -209,6 +210,7 @@ object Utils {
         val goBackButton = "<button onclick=\"window.history.back();\" id=\"reload-button\" class=\"blue-button text-button reload\">$goBackString</button>"
         when(showProceedButton){
             false -> proceedButton = ""
+            else -> {}
         }
 
         return "<html>" +