From 792c029905710a0bbc99178c7f6a3a603c1bc0f5 Mon Sep 17 00:00:00 2001 From: crueter Date: Sun, 3 Aug 2025 22:05:11 -0400 Subject: [PATCH 1/4] [android] Don't set NetPlayRoomAddress pref on create Signed-off-by: crueter --- .../src/main/java/org/yuzu/yuzu_emu/dialogs/NetPlayDialog.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/NetPlayDialog.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/NetPlayDialog.kt index 99ab3ebab2..73452b4b69 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/NetPlayDialog.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/NetPlayDialog.kt @@ -552,7 +552,7 @@ class NetPlayDialog(context: Context) : BottomSheetDialog(context) { if (result == 0) { StringSetting.WEB_USERNAME.setString(username) NetPlayManager.setRoomPort(activity, portStr) - NetPlayManager.setRoomAddress(activity, ipAddress) + if (!isCreateRoom) NetPlayManager.setRoomAddress(activity, ipAddress) Toast.makeText( -- 2.39.5 From f612a62eabb74c772b3af935973a9b0ba94ec32f Mon Sep 17 00:00:00 2001 From: crueter Date: Mon, 4 Aug 2025 00:01:32 -0400 Subject: [PATCH 2/4] [android] fix regressions intr. `f72783e017` - Fixed per-game config not properly unloading - Fixed invisible thumb on switch setting - Fixed north app bar not coloring Signed-off-by: crueter --- .../java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt | 1 + src/android/app/src/main/res/layout-land/fragment_games.xml | 1 + src/android/app/src/main/res/layout-w600dp/activity_main.xml | 2 +- src/android/app/src/main/res/values/eden_colors.xml | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt index 516ed22f6f..e80237b5a9 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt @@ -211,6 +211,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { if (shouldUseCustom) { SettingsFile.loadCustomConfig(game!!) + NativeConfig.unloadPerGameConfig() Log.info("[EmulationFragment] Loading custom settings for ${game!!.title}") } else { Log.info("[EmulationFragment] Using global settings") diff --git a/src/android/app/src/main/res/layout-land/fragment_games.xml b/src/android/app/src/main/res/layout-land/fragment_games.xml index 9bd60c6f89..b1c18060c4 100644 --- a/src/android/app/src/main/res/layout-land/fragment_games.xml +++ b/src/android/app/src/main/res/layout-land/fragment_games.xml @@ -4,6 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="?attr/colorSurface" android:clipChildren="false" > diff --git a/src/android/app/src/main/res/layout-w600dp/activity_main.xml b/src/android/app/src/main/res/layout-w600dp/activity_main.xml index 99d24f3e65..d4188e7c9d 100644 --- a/src/android/app/src/main/res/layout-w600dp/activity_main.xml +++ b/src/android/app/src/main/res/layout-w600dp/activity_main.xml @@ -6,7 +6,7 @@ android:id="@+id/coordinator_main" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/eden_background_gradient"> + android:background="?attr/colorSurface"> #80FF8000 - #333333 - #555555 + #7c757f + #948b98 #FF0080 #00FFFF -- 2.39.5 From 98db830a289f52d23bfb582da41563e3c68d5147 Mon Sep 17 00:00:00 2001 From: crueter Date: Mon, 4 Aug 2025 14:27:21 -0400 Subject: [PATCH 3/4] [android] fix inconsistencies b/t land/portrait in fragment_games Signed-off-by: crueter --- .../main/res/layout-land/fragment_games.xml | 35 ++++++++----------- .../src/main/res/layout/fragment_games.xml | 2 ++ 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/android/app/src/main/res/layout-land/fragment_games.xml b/src/android/app/src/main/res/layout-land/fragment_games.xml index b1c18060c4..d264f58baf 100644 --- a/src/android/app/src/main/res/layout-land/fragment_games.xml +++ b/src/android/app/src/main/res/layout-land/fragment_games.xml @@ -22,7 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/app_name" - android:textAppearance="@style/TextAppearance.Material3.HeadlineLarge" + style="@style/SynthwaveText.Title" android:textSize="27sp" android:textStyle="bold" /> @@ -41,13 +41,11 @@ @@ -99,13 +100,11 @@ @@ -125,13 +124,11 @@ diff --git a/src/android/app/src/main/res/layout/fragment_games.xml b/src/android/app/src/main/res/layout/fragment_games.xml index c77a34ab67..1f151955d9 100644 --- a/src/android/app/src/main/res/layout/fragment_games.xml +++ b/src/android/app/src/main/res/layout/fragment_games.xml @@ -4,6 +4,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="?attr/colorSurface" + android:clipChildren="false" > Date: Mon, 4 Aug 2025 18:46:47 -0400 Subject: [PATCH 4/4] [android] fix inconsistent coloring Signed-off-by: crueter --- src/android/app/src/main/res/layout-w600dp/activity_main.xml | 3 ++- src/android/app/src/main/res/layout/activity_main.xml | 3 ++- .../app/src/main/res/layout/fragment_home_settings.xml | 1 + src/android/app/src/main/res/values/eden_colors.xml | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/android/app/src/main/res/layout-w600dp/activity_main.xml b/src/android/app/src/main/res/layout-w600dp/activity_main.xml index d4188e7c9d..b0960223a7 100644 --- a/src/android/app/src/main/res/layout-w600dp/activity_main.xml +++ b/src/android/app/src/main/res/layout-w600dp/activity_main.xml @@ -6,7 +6,8 @@ android:id="@+id/coordinator_main" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/colorSurface"> + android:background="@drawable/eden_background_gradient" + > + android:background="@drawable/eden_background_gradient" + > #00000000 - #00FF0080 - #0000FFFF + #05FF0080 + #0500FFFF #33FF0080 -- 2.39.5