revert navbutton android

lazaronixon · Sep 30, 2023 · b725046 · b725046
1 parent a3dfe56
commit b725046
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 56 deletions.
diff --git a/...ack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/web/WebFragment.kt.tt b/...ack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/web/WebFragment.kt.tt
@@ -25,7 +25,6 @@ open class WebFragment : TurboWebFragment(), NavDestination {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setupMenu()
         viewLifecycleOwner.lifecycle.addObserver(bridgeDelegate)
     }
 
@@ -60,8 +59,4 @@ open class WebFragment : TurboWebFragment(), NavDestination {
     override fun createErrorView(statusCode: Int): View {
         return layoutInflater.inflate(R.layout.error_web, null)
     }
-
-    private fun setupMenu() {
-        toolbarForNavigation()?.inflateMenu(R.menu.web)
-    }
 }
diff --git a/...ck/app/src/main/java/dev/hotwire/turbo/turbonativeproject/strada/NavButtonComponent.kt.tt b/...ck/app/src/main/java/dev/hotwire/turbo/turbonativeproject/strada/NavButtonComponent.kt.tt
@@ -1,20 +1,26 @@
 package <%= package_name %>.strada
 
 import android.util.Log
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import dev.hotwire.strada.BridgeComponent
 import dev.hotwire.strada.BridgeDelegate
 import dev.hotwire.strada.Message
 import <%= package_name %>.R
 import <%= package_name %>.base.NavDestination
+import <%= package_name %>.databinding.NavButtonComponentBinding
 import kotlinx.serialization.Serializable
 
 class NavButtonComponent(
     name: String,
     private val delegate: BridgeDelegate<NavDestination>
 ) : BridgeComponent<NavDestination>(name, delegate) {
 
+    private val navButtonItemId = 10
+    private var navButtonMenuItem: MenuItem? = null
     private val fragment: Fragment
         get() = delegate.destination.fragment
     private val toolbar: Toolbar?
@@ -34,26 +40,27 @@ class NavButtonComponent(
     }
 
     private fun showToolbarButton(data: MessageData) {
-        val toolbar = toolbar ?: return
+        val menu = toolbar?.menu ?: return
+        val inflater = LayoutInflater.from(fragment.requireContext())
+        val binding = NavButtonComponentBinding.inflate(inflater)
+        val order = 999 // Show as the right-most button
 
-        toolbar.menu.findItem(R.id.nav_button)?.apply {
-            isVisible = true
-            title = data.title
+        binding.navButton.apply {
+            text = data.title
+            setOnClickListener {
+                performAction()
+            }
         }
 
-        toolbar.setOnMenuItemClickListener {
-            when (it.itemId) {
-                R.id.nav_button -> {
-                    performClick()
-                    true
-                }
-                else -> false
-            }
+        menu.removeItem(navButtonItemId)
+        navButtonMenuItem = menu.add(Menu.NONE, navButtonItemId, order, data.title).apply {
+            actionView = binding.root
+            setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
         }
     }
 
-    private fun performClick() {
-        replyTo("connect")
+    private fun performAction(): Boolean {
+        return replyTo("connect")
     }
 
     @Serializable

diff --git a/...initializer/templates/android_stack/base/app/src/main/res/layout/nav_button_component.xml b/...initializer/templates/android_stack/base/app/src/main/res/layout/nav_button_component.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="end|center_vertical"
+    android:paddingEnd="16dp">
+
+    <com.google.android.material.button.MaterialButton
+        style="@style/Widget.Material3.Button.TextButton"
+        android:id="@+id/nav_button"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:minWidth="0dip" />
+</FrameLayout>
diff --git a/lib/turbo_native_initializer/templates/android_stack/base/app/src/main/res/menu/web.xml b/lib/turbo_native_initializer/templates/android_stack/base/app/src/main/res/menu/web.xml
diff --git a/...abs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/web/WebFragment.kt.tt b/...abs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/web/WebFragment.kt.tt
@@ -22,7 +22,6 @@ open class WebFragment : TurboWebFragment(), NavDestination {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setupMenu()
         viewLifecycleOwner.lifecycle.addObserver(bridgeDelegate)
     }
 
@@ -50,8 +49,4 @@ open class WebFragment : TurboWebFragment(), NavDestination {
     override fun createErrorView(statusCode: Int): View {
         return layoutInflater.inflate(R.layout.error_web, null)
     }
-
-    private fun setupMenu() {
-        toolbarForNavigation()?.inflateMenu(R.menu.web)
-    }
 }
diff --git a/...bs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/strada/NavButtonComponent.kt.tt b/...bs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/strada/NavButtonComponent.kt.tt
@@ -1,20 +1,26 @@
 package <%= package_name %>.strada
 
 import android.util.Log
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import dev.hotwire.strada.BridgeComponent
 import dev.hotwire.strada.BridgeDelegate
 import dev.hotwire.strada.Message
 import <%= package_name %>.R
 import <%= package_name %>.base.NavDestination
+import <%= package_name %>.databinding.NavButtonComponentBinding
 import kotlinx.serialization.Serializable
 
 class NavButtonComponent(
     name: String,
     private val delegate: BridgeDelegate<NavDestination>
 ) : BridgeComponent<NavDestination>(name, delegate) {
 
+    private val navButtonItemId = 10
+    private var navButtonMenuItem: MenuItem? = null
     private val fragment: Fragment
         get() = delegate.destination.fragment
     private val toolbar: Toolbar?
@@ -34,26 +40,27 @@ class NavButtonComponent(
     }
 
     private fun showToolbarButton(data: MessageData) {
-        val toolbar = toolbar ?: return
+        val menu = toolbar?.menu ?: return
+        val inflater = LayoutInflater.from(fragment.requireContext())
+        val binding = NavButtonComponentBinding.inflate(inflater)
+        val order = 999 // Show as the right-most button
 
-        toolbar.menu.findItem(R.id.nav_button)?.apply {
-            isVisible = true
-            title = data.title
+        binding.navButton.apply {
+            text = data.title
+            setOnClickListener {
+                performAction()
+            }
         }
 
-        toolbar.setOnMenuItemClickListener {
-            when (it.itemId) {
-                R.id.nav_button -> {
-                    performClick()
-                    true
-                }
-                else -> false
-            }
+        menu.removeItem(navButtonItemId)
+        navButtonMenuItem = menu.add(Menu.NONE, navButtonItemId, order, data.title).apply {
+            actionView = binding.root
+            setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
         }
     }
 
-    private fun performClick() {
-        replyTo("connect")
+    private fun performAction(): Boolean {
+        return replyTo("connect")
     }
 
     @Serializable

diff --git a/..._initializer/templates/android_tabs/base/app/src/main/res/layout/nav_button_component.xml b/..._initializer/templates/android_tabs/base/app/src/main/res/layout/nav_button_component.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="end|center_vertical"
+    android:paddingEnd="16dp">
+
+    <com.google.android.material.button.MaterialButton
+        style="@style/Widget.Material3.Button.TextButton"
+        android:id="@+id/nav_button"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:minWidth="0dip" />
+</FrameLayout>
diff --git a/lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/menu/web.xml b/lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/menu/web.xml