Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Pad menu fragment when expanding to cutout area

Browse Source
This commit is contained in:
Charles Lombardo committed 2022-12-04 12:39:51 -05:00
1 parent 385dfb60a0
commit 2a0939ab98
7 files changed
+119 -66
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Android/app/src/main/res/layout/activity_emulation.xml
+1 -1
View File
@@ -22,7 +22,7 @@
<FrameLayout
android:id="@+id/frame_menu"
android:layout_width="260dp"
android:layout_width="@dimen/menu_width"
android:layout_height="match_parent"
tools:layout="@layout/fragment_ingame_menu"/>
Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
+24 -33
View File
@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="16dp"
android:background="?attr/colorSurface"
tools:layout_width="250dp">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorSurface"
tools:layout_width="250dp">
<TextView
android:id="@+id/text_game_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="32dp"
android:layout_marginVertical="24dp"
android:ellipsize="end"
android:letterSpacing="0"
android:maxLines="@integer/game_title_lines"
@@ -22,11 +21,16 @@
android:textColor="?attr/colorOnSurface"
tools:text="The Legend of Zelda: The Wind Waker" />
<com.google.android.material.divider.MaterialDivider
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:scrollbarSize="8dp"
android:scrollbarSize="4dp"
android:fadeScrollbars="false">
<LinearLayout
@@ -38,73 +42,62 @@
<Button
android:id="@+id/menu_pause_emulation"
style="@style/InGameMenuOption"
android:letterSpacing="0"
android:text="@string/pause_emulation" />
<Button
android:id="@+id/menu_unpause_emulation"
style="@style/InGameMenuOption"
android:letterSpacing="0"
android:text="@string/unpause_emulation"
android:visibility="gone"/>
android:visibility="gone" />
<Button
android:id="@+id/menu_take_screenshot"
style="@style/InGameMenuOption"
android:letterSpacing="0"
android:text="@string/emulation_screenshot" />
<Button
android:id="@+id/menu_quicksave"
style="@style/InGameMenuOption"
android:letterSpacing="0"
android:text="@string/emulation_quicksave"
android:visibility="gone"/>
android:visibility="gone" />
<Button
android:id="@+id/menu_quickload"
style="@style/InGameMenuOption"
android:letterSpacing="0"
android:text="@string/emulation_quickload"
android:visibility="gone"/>
android:visibility="gone" />
<Button
android:id="@+id/menu_emulation_save_root"
style="@style/InGameMenuOption"
android:letterSpacing="0"
android:text="@string/emulation_savestate"
android:visibility="gone"/>
android:visibility="gone" />
<Button
android:id="@+id/menu_emulation_load_root"
style="@style/InGameMenuOption"
android:letterSpacing="0"
android:text="@string/emulation_loadstate"
android:visibility="gone"/>
android:visibility="gone" />
<Button
android:id="@+id/menu_settings"
style="@style/InGameMenuOption"
android:letterSpacing="0"
android:text="@string/grid_menu_settings" />
<Button
android:id="@+id/menu_overlay_controls"
style="@style/InGameMenuOption"
android:letterSpacing="0"
android:text="@string/emulation_overlay_controls" />
<Button
android:id="@+id/menu_refresh_wiimotes"
android:text="@string/emulation_refresh_wiimotes"
android:letterSpacing="0"
style="@style/InGameMenuOption"/>
style="@style/InGameMenuOption" />
<Button
android:id="@+id/menu_change_disc"
android:text="@string/emulation_change_disc"
android:letterSpacing="0"
style="@style/InGameMenuOption"/>
style="@style/InGameMenuOption" />
</LinearLayout>
@@ -113,14 +106,12 @@
<com.google.android.material.divider.MaterialDivider
android:id="@+id/divider_2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_marginBottom="16dp" />
android:layout_height="wrap_content" />
<Button
android:id="@+id/menu_exit"
style="@style/InGameMenuOption"
android:letterSpacing="0"
android:layout_marginTop="@dimen/spacing_large"
android:text="@string/emulation_exit" />
</LinearLayout>
Source/Android/app/src/main/res/values/dimens.xml
+1
View File
@@ -2,5 +2,6 @@
<dimen name="spacing_small">4dp</dimen>
<dimen name="spacing_medlarge">12dp</dimen>
<dimen name="spacing_large">16dp</dimen>
<dimen name="menu_width">256dp</dimen>
<dimen name="card_width">135dp</dimen>
</resources>
Source/Android/app/src/main/res/values/styles.xml
+2 -4
View File
@@ -2,16 +2,14 @@
<resources>
<!-- Custom button styles -->
<style name="InGameMenuOption" parent="Widget.Material3.Button.TextButton">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">48dp</item>
<item name="android:textColor">?attr/colorOnSurface</item>
<item name="android:textSize">16sp</item>
<item name="android:fontFamily">sans-serif-condensed</item>
<item name="android:textAllCaps">false</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">48dp</item>
<item name="android:gravity">center_vertical|left</item>
<item name="android:paddingLeft">32dp</item>
<item name="android:paddingRight">32dp</item>
<item name="android:layout_margin">0dp</item>
</style>
<style name="OverlayInGameMenuOption" parent="InGameMenuOption">