VERY experimental Nintendo Switch 2 emulator
C++
android: Rework InstallableProperty view with icon
t89569a66cd6fe0a
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GamePropertiesAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GamePropertiesAdapter.ktindex ff6270fa87..95841d7863 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GamePropertiesAdapter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GamePropertiesAdapter.kt@@ -14,7 +14,7 @@ import androidx.lifecycle.lifecycleScopeimport androidx.lifecycle.repeatOnLifecycleimport androidx.recyclerview.widget.RecyclerViewimport kotlinx.coroutines.launch-import org.yuzu.yuzu_emu.databinding.CardInstallableBinding+import org.yuzu.yuzu_emu.databinding.CardInstallableIconBindingimport org.yuzu.yuzu_emu.databinding.CardSimpleOutlinedBindingimport org.yuzu.yuzu_emu.model.GamePropertyimport org.yuzu.yuzu_emu.model.InstallableProperty@@ -42,7 +42,7 @@ class GamePropertiesAdapter(}else -> InstallablePropertyViewHolder(- CardInstallableBinding.inflate(+ CardInstallableIconBinding.inflate(inflater,parent,false@@ -107,13 +107,20 @@ class GamePropertiesAdapter(}}- inner class InstallablePropertyViewHolder(val binding: CardInstallableBinding) :+ inner class InstallablePropertyViewHolder(val binding: CardInstallableIconBinding) :GamePropertyViewHolder(binding.root) {override fun bind(property: GameProperty) {val installableProperty = property as InstallablePropertybinding.title.setText(installableProperty.titleId)binding.description.setText(installableProperty.descriptionId)+ binding.icon.setImageDrawable(+ ResourcesCompat.getDrawable(+ binding.icon.context.resources,+ installableProperty.iconId,+ binding.icon.context.theme+ )+ )if (installableProperty.install != null) {binding.buttonInstall.visibility = View.VISIBLEdiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.ktindex 6ede3f85c0..b1d3c0040a 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt@@ -194,6 +194,7 @@ class GamePropertiesFragment : Fragment() {InstallableProperty(R.string.save_data,R.string.save_data_description,+ R.drawable.ic_save,{MessageDialogFragment.newInstance(requireActivity(),diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GameProperties.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GameProperties.ktindex bb3df5bd00..0135a95beb 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GameProperties.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GameProperties.kt@@ -10,17 +10,18 @@ import kotlinx.coroutines.flow.StateFlowinterface GameProperty {@get:StringResval titleId: Int- get() = -1@get:StringResval descriptionId: Int- get() = -1++ @get:DrawableRes+ val iconId: Int}data class SubmenuProperty(override val titleId: Int,override val descriptionId: Int,- @DrawableRes val iconId: Int,+ override val iconId: Int,val details: (() -> String)? = null,val detailsFlow: StateFlow<String>? = null,val action: () -> Unit@@ -29,6 +30,7 @@ data class SubmenuProperty(data class InstallableProperty(override val titleId: Int,override val descriptionId: Int,+ override val iconId: Int,val install: (() -> Unit)? = null,val export: (() -> Unit)? = null) : GamePropertydiff --git a/src/android/app/src/main/res/drawable/ic_save.xml b/src/android/app/src/main/res/drawable/ic_save.xmlindex a9af3d9cf2..5acc2bbab8 100644--- a/src/android/app/src/main/res/drawable/ic_save.xml+++ b/src/android/app/src/main/res/drawable/ic_save.xml@@ -1,10 +1,9 @@<vector xmlns:android="http://schemas.android.com/apk/res/android"android:width="24dp"android:height="24dp"- android:viewportWidth="960"- android:viewportHeight="960"- android:tint="?attr/colorControlNormal">+ android:viewportWidth="24"+ android:viewportHeight="24"><path- android:fillColor="@android:color/white"- android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L647,120Q663,120 677.5,126Q692,132 703,143L817,257Q828,268 834,282.5Q840,297 840,313L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM760,314L646,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L760,760Q760,760 760,760Q760,760 760,760L760,314ZM480,720Q530,720 565,685Q600,650 600,600Q600,550 565,515Q530,480 480,480Q430,480 395,515Q360,550 360,600Q360,650 395,685Q430,720 480,720ZM280,400L560,400Q577,400 588.5,388.5Q600,377 600,360L600,280Q600,263 588.5,251.5Q577,240 560,240L280,240Q263,240 251.5,251.5Q240,263 240,280L240,360Q240,377 251.5,388.5Q263,400 280,400ZM200,314L200,760Q200,760 200,760Q200,760 200,760L200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200L200,200L200,314Z"/>+ android:fillColor="?attr/colorControlNormal"+ android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z" /></vector>diff --git a/src/android/app/src/main/res/layout-w1000dp/card_installable_icon.xml b/src/android/app/src/main/res/layout-w1000dp/card_installable_icon.xmlnew file mode 100644index 0000000000..59ee1aad30--- /dev/null+++ b/src/android/app/src/main/res/layout-w1000dp/card_installable_icon.xml@@ -0,0 +1,82 @@+<?xml version="1.0" encoding="utf-8"?>+<com.google.android.material.card.MaterialCardView 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"+ style="?attr/materialCardViewOutlinedStyle"+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:layout_marginHorizontal="16dp"+ android:layout_marginVertical="12dp">++ <LinearLayout+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:layout_gravity="center"+ android:orientation="horizontal"+ android:gravity="center_vertical"+ android:paddingHorizontal="24dp"+ android:paddingVertical="16dp">++ <ImageView+ android:id="@+id/icon"+ android:layout_width="24dp"+ android:layout_height="24dp"+ android:layout_marginEnd="20dp"+ android:layout_gravity="center_vertical"+ app:tint="?attr/colorOnSurface"+ tools:src="@drawable/ic_settings" />++ <LinearLayout+ android:layout_width="0dp"+ android:layout_height="wrap_content"+ android:layout_marginEnd="16dp"+ android:layout_weight="1"+ android:orientation="vertical">++ <com.google.android.material.textview.MaterialTextView+ android:id="@+id/title"+ style="@style/TextAppearance.Material3.TitleMedium"+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:text="@string/user_data"+ android:textAlignment="viewStart" />++ <com.google.android.material.textview.MaterialTextView+ android:id="@+id/description"+ style="@style/TextAppearance.Material3.BodyMedium"+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:layout_marginTop="6dp"+ android:text="@string/user_data_description"+ android:textAlignment="viewStart" />++ </LinearLayout>++ <Button+ android:id="@+id/button_export"+ style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_gravity="center_vertical"+ android:contentDescription="@string/export"+ android:tooltipText="@string/export"+ android:visibility="gone"+ app:icon="@drawable/ic_export"+ tools:visibility="visible" />++ <Button+ android:id="@+id/button_install"+ style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_gravity="center_vertical"+ android:layout_marginStart="12dp"+ android:contentDescription="@string/string_import"+ android:tooltipText="@string/string_import"+ android:visibility="gone"+ app:icon="@drawable/ic_import"+ tools:visibility="visible" />++ </LinearLayout>++</com.google.android.material.card.MaterialCardView>diff --git a/src/android/app/src/main/res/layout/card_installable_icon.xml b/src/android/app/src/main/res/layout/card_installable_icon.xmlnew file mode 100644index 0000000000..4ae5423b10--- /dev/null+++ b/src/android/app/src/main/res/layout/card_installable_icon.xml@@ -0,0 +1,89 @@+<?xml version="1.0" encoding="utf-8"?>+<com.google.android.material.card.MaterialCardView 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"+ style="?attr/materialCardViewOutlinedStyle"+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:layout_marginHorizontal="16dp"+ android:layout_marginVertical="12dp">++ <LinearLayout+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:layout_gravity="center"+ android:orientation="horizontal"+ android:gravity="center_vertical"+ android:paddingHorizontal="24dp"+ android:paddingVertical="16dp">++ <ImageView+ android:id="@+id/icon"+ android:layout_width="24dp"+ android:layout_height="24dp"+ android:layout_marginEnd="20dp"+ android:layout_gravity="center_vertical"+ app:tint="?attr/colorOnSurface"+ tools:src="@drawable/ic_settings" />++ <LinearLayout+ android:layout_width="0dp"+ android:layout_height="wrap_content"+ android:layout_marginEnd="16dp"+ android:layout_weight="1"+ android:orientation="vertical">++ <com.google.android.material.textview.MaterialTextView+ android:id="@+id/title"+ style="@style/TextAppearance.Material3.TitleMedium"+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:text="@string/user_data"+ android:textAlignment="viewStart" />++ <com.google.android.material.textview.MaterialTextView+ android:id="@+id/description"+ style="@style/TextAppearance.Material3.BodyMedium"+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:layout_marginTop="6dp"+ android:text="@string/user_data_description"+ android:textAlignment="viewStart" />++ </LinearLayout>++ <LinearLayout+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:orientation="vertical">++ <Button+ android:id="@+id/button_install"+ style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_gravity="center_vertical"+ android:contentDescription="@string/string_import"+ android:tooltipText="@string/string_import"+ android:visibility="gone"+ app:icon="@drawable/ic_import"+ tools:visibility="visible" />++ <Button+ android:id="@+id/button_export"+ style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_gravity="center_vertical"+ android:layout_marginTop="8dp"+ android:contentDescription="@string/export"+ android:tooltipText="@string/export"+ android:visibility="gone"+ app:icon="@drawable/ic_export"+ tools:visibility="visible" />++ </LinearLayout>++ </LinearLayout>++</com.google.android.material.card.MaterialCardView>