diff options
6 files changed, 24 insertions, 23 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt index bd5bfca5e..5b4272a74 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt @@ -77,7 +77,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) } private fun addConfigSettings(sl: ArrayList<SettingsItem>) { - settingsActivity.setToolbarTitle(settingsActivity.getString(R.string.preferences_settings)) + settingsActivity.setToolbarTitle(settingsActivity.getString(R.string.preferences_advanced_settings)) sl.apply { add( SubmenuSetting( diff --git a/src/android/app/src/main/res/layout/activity_settings.xml b/src/android/app/src/main/res/layout/activity_settings.xml index 6bb9ee9d2..14ae83b04 100644 --- a/src/android/app/src/main/res/layout/activity_settings.xml +++ b/src/android/app/src/main/res/layout/activity_settings.xml @@ -35,6 +35,7 @@ android:id="@+id/frame_content" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_marginHorizontal="12dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> <View diff --git a/src/android/app/src/main/res/layout/list_item_setting.xml b/src/android/app/src/main/res/layout/list_item_setting.xml index 4ff794338..ec896342b 100644 --- a/src/android/app/src/main/res/layout/list_item_setting.xml +++ b/src/android/app/src/main/res/layout/list_item_setting.xml @@ -3,29 +3,29 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?android:attr/selectableItemBackground" android:clickable="true" android:focusable="true" android:gravity="center_vertical" android:minHeight="72dp" - android:paddingBottom="@dimen/spacing_large" - android:paddingTop="@dimen/spacing_large"> + android:padding="@dimen/spacing_large"> - <TextView - android:id="@+id/text_setting_name" + <com.google.android.material.textview.MaterialTextView style="@style/TextAppearance.Material3.HeadlineMedium" + android:id="@+id/text_setting_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_alignParentStart="true" android:layout_alignParentTop="true" - android:layout_marginEnd="@dimen/spacing_large" - android:layout_marginStart="@dimen/spacing_large" android:textSize="16sp" android:textAlignment="viewStart" + app:lineHeight="28dp" tools:text="Setting Name" /> <TextView + style="@style/TextAppearance.Material3.BodySmall" android:id="@+id/text_setting_description" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -33,8 +33,6 @@ android:layout_alignParentStart="true" android:layout_alignStart="@+id/text_setting_name" android:layout_below="@+id/text_setting_name" - android:layout_marginEnd="@dimen/spacing_large" - android:layout_marginStart="@dimen/spacing_large" android:layout_marginTop="@dimen/spacing_small" android:visibility="visible" android:textAlignment="viewStart" diff --git a/src/android/app/src/main/res/layout/list_item_setting_switch.xml b/src/android/app/src/main/res/layout/list_item_setting_switch.xml index dbed0948c..599d845ad 100644 --- a/src/android/app/src/main/res/layout/list_item_setting_switch.xml +++ b/src/android/app/src/main/res/layout/list_item_setting_switch.xml @@ -3,35 +3,37 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?android:attr/selectableItemBackground" android:clickable="true" android:focusable="true" - android:minHeight="72dp"> + android:minHeight="72dp" + android:paddingStart="@dimen/spacing_large" + android:paddingEnd="24dp" + android:paddingVertical="@dimen/spacing_large"> <com.google.android.material.materialswitch.MaterialSwitch android:id="@+id/switch_widget" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_centerVertical="true" - android:layout_marginEnd="24dp" /> + android:layout_centerVertical="true" /> - <TextView + <com.google.android.material.textview.MaterialTextView + style="@style/TextAppearance.Material3.BodySmall" android:id="@+id/text_setting_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentStart="true" 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_marginStart="@dimen/spacing_large" android:layout_marginTop="@dimen/spacing_small" android:layout_toStartOf="@+id/switch_widget" android:textAlignment="viewStart" tools:text="@string/frame_limit_enable_description" /> - <TextView + <com.google.android.material.textview.MaterialTextView style="@style/TextAppearance.Material3.HeadlineMedium" android:id="@+id/text_setting_name" android:layout_width="0dp" @@ -39,11 +41,10 @@ android:layout_alignParentStart="true" android:layout_alignParentTop="true" android:layout_marginEnd="@dimen/spacing_large" - android:layout_marginStart="@dimen/spacing_large" - android:layout_marginTop="@dimen/spacing_large" android:layout_toStartOf="@+id/switch_widget" android:textSize="16sp" android:textAlignment="viewStart" + app:lineHeight="28dp" tools:text="@string/frame_limit_enable" /> </RelativeLayout> diff --git a/src/android/app/src/main/res/layout/list_item_settings_header.xml b/src/android/app/src/main/res/layout/list_item_settings_header.xml index 9debb7ba5..abd24df6f 100644 --- a/src/android/app/src/main/res/layout/list_item_settings_header.xml +++ b/src/android/app/src/main/res/layout/list_item_settings_header.xml @@ -2,16 +2,16 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="48dp"> + android:layout_height="48dp" + android:paddingVertical="4dp" + android:paddingHorizontal="@dimen/spacing_large"> - <TextView + <com.google.android.material.textview.MaterialTextView + style="@style/TextAppearance.Material3.TitleSmall" android:id="@+id/text_header_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="start|center_vertical" - android:layout_marginHorizontal="@dimen/spacing_large" - android:layout_marginBottom="@dimen/spacing_small" - android:layout_marginTop="@dimen/spacing_small" android:textColor="?attr/colorPrimary" android:textAlignment="viewStart" android:textStyle="bold" diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index ed72e571b..e171cf799 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -162,6 +162,7 @@ <string name="installing_driver">Installing driver…</string> <!-- Preferences Screen --> + <string name="preferences_advanced_settings">Advanced Settings</string> <string name="preferences_settings">Settings</string> <string name="preferences_general">General</string> <string name="preferences_system">System</string> |