diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/HeaderSetting.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/HeaderSetting.kt index e99b842f9..d2a50f648 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/HeaderSetting.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/HeaderSetting.kt @@ -4,6 +4,6 @@ package org.citra.citra_emu.features.settings.model.view -class HeaderSetting(titleId: Int) : SettingsItem(null, titleId, 0) { +class HeaderSetting(titleId: Int,descId: Int = 0) : SettingsItem(null, titleId, descId) { override val type = TYPE_HEADER } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/HeaderViewHolder.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/HeaderViewHolder.kt index 617348c89..ed794fcfb 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/HeaderViewHolder.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/HeaderViewHolder.kt @@ -18,6 +18,12 @@ class HeaderViewHolder(val binding: ListItemSettingsHeaderBinding, adapter: Sett override fun bind(item: SettingsItem) { binding.textHeaderName.setText(item.nameId) + if (item.descriptionId != 0) { + binding.textHeaderDescription.visibility = View.VISIBLE + binding.textHeaderDescription.setText(item.descriptionId) + }else { + binding.textHeaderDescription.visibility = View.GONE + } } override fun onClick(clicked: View) { 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 e072d3254..539f36409 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 @@ -1,16 +1,33 @@ <?xml version="1.0" encoding="utf-8"?> -<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:focusable="false" + android:clickable="false" + android:paddingVertical="16dp" + > + +<com.google.android.material.textview.MaterialTextView + android:id="@+id/text_header_name" style="@style/TextAppearance.Material3.TitleSmall" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="start|center_vertical" - android:paddingHorizontal="@dimen/spacing_large" - android:paddingVertical="16dp" - android:focusable="false" - android:clickable="false" android:textAlignment="viewStart" android:textColor="?attr/colorPrimary" android:textStyle="bold" tools:text="CPU Settings" /> + <com.google.android.material.textview.MaterialTextView + android:id="@+id/text_header_description" + style="@style/TextAppearance.Material3.BodySmall" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_small" + android:textAlignment="viewStart" + tools:text="@string/app_disclaimer" /> +</LinearLayout> \ No newline at end of file