ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10402 from Simonx22/android-design-fixing 

Android: Fix in-game menu font spacing and checkbox margin
This commit is contained in:
JosJuice 2022-01-29 09:56:28 +01:00 committed by GitHub
parent c2d8191fbb 5a4d838e7b
commit fbe7cf675c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Android/app/src/main/res/layout-ldrtl/list_item_cheat.xml
View File

@ -26,12 +26,13 @@
android:id="@+id/checkbox" android:id="@+id/checkbox"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="64dp" android:layout_height="64dp"
app:layout_constraintStart_toEndOf="@id/text_name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:gravity="center"
android:focusable="true" android:focusable="true"
android:nextFocusRight="@id/root" /> android:gravity="center"
android:nextFocusRight="@id/root"
android:buttonTint="@color/dolphin_blue"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/text_name"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

18
Source/Android/app/src/main/res/layout/fragment_cheat_warning.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_marginRight="10dp">
<TextView <TextView
android:id="@+id/text_warning" android:id="@+id/text_warning"
@ -11,10 +11,10 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="@dimen/spacing_large" android:layout_margin="@dimen/spacing_large"
android:text="@string/cheats_disabled_warning" android:text="@string/cheats_disabled_warning"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/button_settings" app:layout_constraintEnd_toStartOf="@id/button_settings"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<Button <Button
android:id="@+id/button_settings" android:id="@+id/button_settings"
@ -23,9 +23,9 @@
android:layout_margin="@dimen/spacing_small" android:layout_margin="@dimen/spacing_small"
android:text="@string/cheats_open_settings" android:text="@string/cheats_open_settings"
android:textColor="@color/dolphin_white" android:textColor="@color/dolphin_white"
app:layout_constraintStart_toEndOf="@id/text_warning" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toEndOf="@id/text_warning"
app:layout_constraintBottom_toBottomOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

40
Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
View File

@ -12,14 +12,15 @@
android:id="@+id/text_game_title" android:id="@+id/text_game_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:text="The Legend of Zelda: The Wind Waker" android:layout_marginBottom="16dp"
android:textColor="@android:color/white"
android:textSize="20sp"
android:maxLines="@integer/game_title_lines"
android:ellipsize="end"
android:layout_marginHorizontal="32dp" android:layout_marginHorizontal="32dp"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:layout_marginBottom="16dp"/> android:ellipsize="end"
android:letterSpacing="0"
android:maxLines="@integer/game_title_lines"
android:textColor="@android:color/white"
android:textSize="20sp"
tools:text="The Legend of Zelda: The Wind Waker" />
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -36,8 +37,9 @@
<Button <Button
android:id="@+id/menu_pause_emulation" android:id="@+id/menu_pause_emulation"
android:text="@string/pause_emulation" style="@style/InGameMenuOption"
style="@style/InGameMenuOption"/> android:letterSpacing="0"
android:text="@string/pause_emulation" />
<Button <Button
android:id="@+id/menu_unpause_emulation" android:id="@+id/menu_unpause_emulation"
@ -47,8 +49,9 @@
<Button <Button
android:id="@+id/menu_take_screenshot" android:id="@+id/menu_take_screenshot"
android:text="@string/emulation_screenshot" style="@style/InGameMenuOption"
style="@style/InGameMenuOption"/> android:letterSpacing="0"
android:text="@string/emulation_screenshot" />
<Button <Button
android:id="@+id/menu_quicksave" android:id="@+id/menu_quicksave"
@ -76,22 +79,26 @@
<Button <Button
android:id="@+id/menu_settings" android:id="@+id/menu_settings"
android:text="@string/grid_menu_settings" style="@style/InGameMenuOption"
style="@style/InGameMenuOption"/> android:letterSpacing="0"
android:text="@string/grid_menu_settings" />
<Button <Button
android:id="@+id/menu_overlay_controls" android:id="@+id/menu_overlay_controls"
android:text="@string/emulation_overlay_controls" style="@style/InGameMenuOption"
style="@style/InGameMenuOption"/> android:letterSpacing="0"
android:text="@string/emulation_overlay_controls" />
<Button <Button
android:id="@+id/menu_refresh_wiimotes" android:id="@+id/menu_refresh_wiimotes"
android:text="@string/emulation_refresh_wiimotes" android:text="@string/emulation_refresh_wiimotes"
android:letterSpacing="0"
style="@style/InGameMenuOption"/> style="@style/InGameMenuOption"/>
<Button <Button
android:id="@+id/menu_change_disc" android:id="@+id/menu_change_disc"
android:text="@string/emulation_change_disc" android:text="@string/emulation_change_disc"
android:letterSpacing="0"
style="@style/InGameMenuOption"/> style="@style/InGameMenuOption"/>
</LinearLayout> </LinearLayout>
@ -108,7 +115,8 @@
<Button <Button
android:id="@+id/menu_exit" android:id="@+id/menu_exit"
android:text="@string/emulation_exit" style="@style/InGameMenuOption"
style="@style/InGameMenuOption"/> android:letterSpacing="0"
android:text="@string/emulation_exit" />
</LinearLayout> </LinearLayout>

13
Source/Android/app/src/main/res/layout/list_item_cheat.xml
View File

@ -26,12 +26,13 @@
android:id="@+id/checkbox" android:id="@+id/checkbox"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="64dp" android:layout_height="64dp"
app:layout_constraintStart_toEndOf="@id/text_name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:gravity="center"
android:focusable="true" android:focusable="true"
android:nextFocusLeft="@id/root" /> android:gravity="center"
android:nextFocusRight="@id/root"
android:buttonTint="@color/dolphin_blue"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/text_name"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

4
Source/Android/app/src/main/res/layout/list_item_setting_checkbox.xml
View File

@ -43,8 +43,10 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/spacing_large" android:layout_marginEnd="@dimen/spacing_large"
android:buttonTint="@color/dolphin_blue"
android:clickable="false" android:clickable="false"
android:focusable="false" android:focusable="false"
android:buttonTint="@color/dolphin_blue"/> android:minHeight="0dp"
android:minWidth="0dp" />
</RelativeLayout> </RelativeLayout>