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

Android: Replace Checkbox with MaterialSwitch

Browse Source
This commit is contained in:
Charles Lombardo committed 2022-12-10 00:23:07 -05:00
1 parent 61c10a5644
commit 2555e3720b
15 files changed
+159 -159
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Android/app/src/main/res/layout-ldrtl/list_item_cheat.xml
+9 -7
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Set nextFocusLeft so checkbox functionality is maintained in rtl layouts -->
<!-- Set nextFocusLeft so switch functionality is maintained in rtl layouts -->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
@@ -9,27 +9,29 @@
android:focusable="true"
android:clickable="true"
android:background="?android:attr/selectableItemBackground"
android:nextFocusLeft="@id/checkbox">
android:nextFocusLeft="@id/cheat_switch">
<TextView
android:id="@+id/text_name"
style="@style/TextAppearance.MaterialComponents.Headline5"
android:layout_width="wrap_content"
android:layout_height="64dp"
android:layout_height="76dp"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:gravity="center_vertical"
android:layout_marginEnd="@dimen/spacing_large"
android:layout_marginStart="@dimen/spacing_large"
android:layout_toStartOf="@+id/cheat_switch"
android:gravity="center_vertical|end"
android:textSize="16sp"
tools:text="Hyrule Field Speed Hack" />
<CheckBox
android:id="@+id/checkbox"
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/cheat_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/spacing_small"
android:layout_marginEnd="24dp"
android:focusable="true"
android:nextFocusRight="@id/root" />
Source/Android/app/src/main/res/layout/fragment_convert.xml
+10 -7
View File
@@ -77,20 +77,23 @@
<TextView
android:id="@+id/label_remove_junk_data"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_large"
android:gravity="center_vertical"
android:text="@string/convert_remove_junk_data"
android:layout_marginStart="@dimen/spacing_small"
app:layout_constraintTop_toTopOf="@id/checkbox_remove_junk_data"
app:layout_constraintBottom_toBottomOf="@id/checkbox_remove_junk_data"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintBottom_toBottomOf="@id/switch_remove_junk_data"
app:layout_constraintEnd_toStartOf="@+id/switch_remove_junk_data"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/switch_remove_junk_data" />
<CheckBox
android:id="@+id/checkbox_remove_junk_data"
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switch_remove_junk_data"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintTop_toBottomOf="@id/compression_level" />
Source/Android/app/src/main/res/layout/list_item_cheat.xml
+7 -7
View File
@@ -8,29 +8,29 @@
android:focusable="true"
android:clickable="true"
android:background="?android:attr/selectableItemBackground"
android:nextFocusRight="@id/checkbox">
android:nextFocusRight="@id/cheat_switch">
<TextView
android:id="@+id/text_name"
style="@style/TextAppearance.MaterialComponents.Headline5"
android:layout_width="wrap_content"
android:layout_height="64dp"
android:layout_height="76dp"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/spacing_large"
android:layout_marginEnd="@dimen/spacing_large"
android:layout_toStartOf="@+id/checkbox"
android:gravity="center_vertical"
android:layout_toStartOf="@id/cheat_switch"
android:gravity="center_vertical|start"
android:textSize="16sp"
tools:text="Hyrule Field Speed Hack" />
<CheckBox
android:id="@+id/checkbox"
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/cheat_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/spacing_small"
android:layout_marginEnd="20dp"
android:focusable="true"
android:nextFocusRight="@id/root" />
Source/Android/app/src/main/res/layout/list_item_setting_checkbox.xml → Source/Android/app/src/main/res/layout/list_item_setting_switch.xml
+7 -7
View File
@@ -16,10 +16,10 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginEnd="@dimen/spacing_large"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/spacing_large"
android:layout_marginTop="@dimen/spacing_large"
android:layout_toStartOf="@+id/checkbox"
android:layout_toStartOf="@+id/setting_switch"
android:textSize="16sp"
tools:text="@string/overclock_enable"/>
@@ -31,19 +31,19 @@
android:layout_alignStart="@+id/text_setting_name"
android:layout_below="@+id/text_setting_name"
android:layout_marginBottom="@dimen/spacing_large"
android:layout_marginEnd="@dimen/spacing_large"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/spacing_large"
android:layout_marginTop="@dimen/spacing_small"
android:layout_toStartOf="@+id/checkbox"
android:layout_toStartOf="@+id/setting_switch"
tools:text="@string/overclock_enable_description"/>
<CheckBox
android:id="@+id/checkbox"
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/setting_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/spacing_large"
android:layout_marginEnd="24dp"
android:clickable="false"
android:focusable="false"
android:minHeight="0dp"