diff options
| author | Charles Lombardo <clombardo169@gmail.com> | 2023-06-20 17:11:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-20 17:11:18 -0400 |
| commit | deb37f084611ac12aa2a0341ecad6eaa885cc8b2 (patch) | |
| tree | fd83a7274fb630315f94bfc37e39335a053dd148 /Source/Android | |
| parent | 27db8d412391dbbc8bc51413cb5867ecddaea539 (diff) | |
| parent | f16381adc53d8fdf53af478688e65d1703759f27 (diff) | |
Merge pull request #11964 from JosJuice/android-hide-infinity
Android: Hide Infinity Base in MenuFragment when not relevant
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.kt | 7 | ||||
| -rw-r--r-- | Source/Android/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" /> <Button - android:id="@+id/menu_infinitybase" + android:id="@+id/menu_infinity_base" android:text="@string/emulate_infinity_base" style="@style/InGameMenuOption" /> |