From 64ced202d2fc10c80cee994ef0b17a3a7114c4af Mon Sep 17 00:00:00 2001 From: Nixon Date: Sat, 30 Sep 2023 11:42:27 -0300 Subject: [PATCH] cleanup --- .../turbonativeproject/strada/NavButtonComponent.kt.tt | 4 ++-- .../android_stack/base/app/src/main/res/menu/web.xml | 9 +++------ .../turbonativeproject/strada/NavButtonComponent.kt.tt | 4 ++-- .../android_tabs/base/app/src/main/res/menu/web.xml | 9 +++------ .../TurboNativeProject.xcodeproj/project.pbxproj.tt | 8 ++++---- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/lib/turbo_native_initializer/templates/android_stack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/strada/NavButtonComponent.kt.tt b/lib/turbo_native_initializer/templates/android_stack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/strada/NavButtonComponent.kt.tt index 69444f6..5914ebf 100644 --- a/lib/turbo_native_initializer/templates/android_stack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/strada/NavButtonComponent.kt.tt +++ b/lib/turbo_native_initializer/templates/android_stack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/strada/NavButtonComponent.kt.tt @@ -36,14 +36,14 @@ class NavButtonComponent( private fun showToolbarButton(data: MessageData) { val toolbar = toolbar ?: return - toolbar.menu.findItem(R.id.navButton)?.apply { + toolbar.menu.findItem(R.id.nav_button)?.apply { isVisible = true title = data.title } toolbar.setOnMenuItemClickListener { when (it.itemId) { - R.id.navButton -> { + R.id.nav_button -> { performClick() true } 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 index 73e64d2..cd2e590 100644 --- 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 @@ -1,12 +1,9 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> + app:showAsAction="always" /> diff --git a/lib/turbo_native_initializer/templates/android_tabs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/strada/NavButtonComponent.kt.tt b/lib/turbo_native_initializer/templates/android_tabs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/strada/NavButtonComponent.kt.tt index 69444f6..5914ebf 100644 --- a/lib/turbo_native_initializer/templates/android_tabs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/strada/NavButtonComponent.kt.tt +++ b/lib/turbo_native_initializer/templates/android_tabs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/strada/NavButtonComponent.kt.tt @@ -36,14 +36,14 @@ class NavButtonComponent( private fun showToolbarButton(data: MessageData) { val toolbar = toolbar ?: return - toolbar.menu.findItem(R.id.navButton)?.apply { + toolbar.menu.findItem(R.id.nav_button)?.apply { isVisible = true title = data.title } toolbar.setOnMenuItemClickListener { when (it.itemId) { - R.id.navButton -> { + R.id.nav_button -> { performClick() true } 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 index 73e64d2..cd2e590 100644 --- 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 @@ -1,12 +1,9 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> + app:showAsAction="always" /> diff --git a/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject.xcodeproj/project.pbxproj.tt b/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject.xcodeproj/project.pbxproj.tt index d546990..dc94791 100644 --- a/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject.xcodeproj/project.pbxproj.tt +++ b/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject.xcodeproj/project.pbxproj.tt @@ -15,7 +15,7 @@ 5D8AB2FC2ABC117F00C6A82F /* BridgeComponent+App.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D8AB2FA2ABC117F00C6A82F /* BridgeComponent+App.swift */; }; 5D8AB2FE2ABC119900C6A82F /* WKWebViewConfiguration+App.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D8AB2FD2ABC119900C6A82F /* WKWebViewConfiguration+App.swift */; }; 5D8AB3012ABC127300C6A82F /* Strada in Frameworks */ = {isa = PBXBuildFile; productRef = 5D8AB3002ABC127300C6A82F /* Strada */; }; - 5DA9C9312AC7E7C400FEA7E6 /* MenuComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DA9C9302AC7E7C400FEA7E6 /* MenuComponent.swift */; }; + 5DA9C9352AC874D200FEA7E6 /* MenuComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DA9C9342AC874D200FEA7E6 /* MenuComponent.swift */; }; 5DCC50D42A959DF900B529A0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DCC50D32A959DF900B529A0 /* AppDelegate.swift */; }; 5DCC50D62A959DF900B529A0 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DCC50D52A959DF900B529A0 /* SceneDelegate.swift */; }; 5DCC50D82A959DF900B529A0 /* TurboWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DCC50D72A959DF900B529A0 /* TurboWebViewController.swift */; }; @@ -37,8 +37,8 @@ 5D8AB2F92ABC117F00C6A82F /* FormComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FormComponent.swift; sourceTree = ""; }; 5D8AB2FA2ABC117F00C6A82F /* BridgeComponent+App.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BridgeComponent+App.swift"; sourceTree = ""; }; 5D8AB2FD2ABC119900C6A82F /* WKWebViewConfiguration+App.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "WKWebViewConfiguration+App.swift"; sourceTree = ""; }; + 5DA9C9342AC874D200FEA7E6 /* MenuComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuComponent.swift; sourceTree = ""; }; 5DCC50D02A959DF900B529A0 /* <%= name %>.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = <%= name %>.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 5DA9C9302AC7E7C400FEA7E6 /* MenuComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MenuComponent.swift; path = "../../../turbo-native-initializer/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Strada/MenuComponent.swift"; sourceTree = ""; }; 5DCC50D32A959DF900B529A0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 5DCC50D52A959DF900B529A0 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; 5DCC50D72A959DF900B529A0 /* TurboWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TurboWebViewController.swift; sourceTree = ""; }; @@ -81,7 +81,7 @@ 5D8AB2F92ABC117F00C6A82F /* FormComponent.swift */, 5D1F2EC02ABEB12300B2819A /* NavButtonComponent.swift */, 5D2381402AC53D8900FABA1F /* FlashMessageComponent.swift */, - 5DA9C9302AC7E7C400FEA7E6 /* MenuComponent.swift */, + 5DA9C9342AC874D200FEA7E6 /* MenuComponent.swift */, ); path = Strada; sourceTree = ""; @@ -227,7 +227,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5DA9C9312AC7E7C400FEA7E6 /* MenuComponent.swift in Sources */, + 5DA9C9352AC874D200FEA7E6 /* MenuComponent.swift in Sources */, 5DCC50D82A959DF900B529A0 /* TurboWebViewController.swift in Sources */, 5DDD58812AA9A8BE00FAC961 /* NumbersViewController.swift in Sources */, 5D2381412AC53D8900FABA1F /* FlashMessageComponent.swift in Sources */,