From f16381adc53d8fdf53af478688e65d1703759f27 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 17 Jun 2023 11:57:00 +0200 Subject: [PATCH] Android: Hide Infinity Base in MenuFragment when not relevant --- .../org/dolphinemu/dolphinemu/fragments/MenuFragment.kt | 7 ++++++- .../app/src/main/res/layout/fragment_ingame_menu.xml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.kt index a90d07930c..b668e08da8 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.kt @@ -58,12 +58,17 @@ class MenuFragment : Fragment(), View.OnClickListener { if (!requireArguments().getBoolean(KEY_WII, true)) { binding.menuRefreshWiimotes.visibility = View.GONE binding.menuSkylanders.visibility = View.GONE + binding.menuInfinityBase.visibility = View.GONE } if (!BooleanSetting.MAIN_EMULATE_SKYLANDER_PORTAL.boolean) { binding.menuSkylanders.visibility = View.GONE } + if (!BooleanSetting.MAIN_EMULATE_INFINITY_BASE.boolean) { + binding.menuInfinityBase.visibility = View.GONE + } + val options = binding.layoutOptions for (childIndex in 0 until options.childCount) { val button = options.getChildAt(childIndex) as Button @@ -191,7 +196,7 @@ class MenuFragment : Fragment(), View.OnClickListener { buttonsActionsMap.append(R.id.menu_settings, EmulationActivity.MENU_ACTION_SETTINGS) buttonsActionsMap.append(R.id.menu_skylanders, EmulationActivity.MENU_ACTION_SKYLANDERS) buttonsActionsMap.append( - R.id.menu_infinitybase, + R.id.menu_infinity_base, EmulationActivity.MENU_ACTION_INFINITY_BASE ) } diff --git a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml index 07e3e42a6c..446706b821 100644 --- a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml +++ b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml @@ -107,7 +107,7 @@ style="@style/InGameMenuOption" />