[android] fix regressions from redesign + room (#197)

- Don't set room address during creation - Fixed per-game config not properly unloading - Fixed invisible thumb on switch setting - Fixed north app bar not coloring Signed-off-by: crueter <crueter@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/197 Reviewed-by: Shinmegumi <shinmegumi@eden-emu.dev>
6 months ago · ae89b5e1b9
8 changed files with 29 additions and 27 deletions
--- 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(
--- 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")
--- 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"
    >

@ -21,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"
            />
@ -40,13 +41,11 @@

            <com.google.android.material.card.MaterialCardView
                android:id="@+id/search_background"
-                style="?attr/materialCardViewFilledStyle"
+                style="@style/EdenCard"
                android:layout_width="match_parent"
                android:layout_height="48dp"
                app:cardCornerRadius="24dp"
-                app:cardBackgroundColor="?attr/colorSurfaceVariant"
-                app:strokeColor="?attr/colorOutline"
-                app:strokeWidth="1dp"
+                android:padding="4dp"
                >

                <LinearLayout
@ -64,7 +63,7 @@
                        android:layout_gravity="center_vertical"
                        android:layout_marginEnd="18dp"
                        android:src="@drawable/ic_search"
-                        app:tint="?attr/colorOnSurfaceVariant"
+                        app:tint="?attr/colorSecondary"
                        />

                    <EditText
@ -76,6 +75,9 @@
                        android:inputType="text"
                        android:maxLines="1"
                        android:imeOptions="flagNoFullscreen"
+                        android:textColor="?attr/colorOnBackground"
+                        android:textColorHint="?attr/colorOnSurfaceVariant"
+                        android:fontFamily="monospace"
                        />

                </LinearLayout>
@ -98,13 +100,11 @@

        <com.google.android.material.card.MaterialCardView
            android:id="@+id/view_button"
-            style="?attr/materialCardViewFilledStyle"
+            style="@style/EdenCard"
            android:layout_width="42dp"
            android:layout_height="42dp"
            app:cardCornerRadius="21dp"
-            app:cardBackgroundColor="@color/eden_surface_variant"
-            app:strokeColor="@color/eden_border"
-            app:strokeWidth="1dp"
+            android:padding="8dp"
            >

            <ImageView
@ -112,7 +112,7 @@
                android:layout_height="18dp"
                android:layout_gravity="center"
                android:src="@drawable/ic_eye"
-                app:tint="?attr/colorOnSurfaceVariant"
+                app:tint="?attr/colorSecondary"
                />

        </com.google.android.material.card.MaterialCardView>
@ -124,13 +124,11 @@

        <com.google.android.material.card.MaterialCardView
            android:id="@+id/filter_button"
-            style="?attr/materialCardViewFilledStyle"
+            style="@style/EdenCard"
            android:layout_width="42dp"
            android:layout_height="42dp"
            app:cardCornerRadius="21dp"
-            app:cardBackgroundColor="@color/eden_surface_variant"
-            app:strokeColor="@color/eden_border"
-            app:strokeWidth="1dp"
+            android:padding="8dp"
            >

            <ImageView
@ -150,13 +148,11 @@

        <com.google.android.material.card.MaterialCardView
            android:id="@+id/settings_button"
-            style="?attr/materialCardViewFilledStyle"
+            style="@style/EdenCard"
            android:layout_width="42dp"
            android:layout_height="42dp"
            app:cardCornerRadius="21dp"
-            app:cardBackgroundColor="@color/eden_surface_variant"
-            app:strokeColor="@color/eden_border"
-            app:strokeWidth="1dp"
+            android:padding="8dp"
            >

            <ImageView
@ -164,7 +160,7 @@
                android:layout_height="18dp"
                android:layout_gravity="center"
                android:src="@drawable/ic_settings"
-                app:tint="?attr/colorOnSurfaceVariant"
+                app:tint="?attr/colorTertiary"
                />

        </com.google.android.material.card.MaterialCardView>
--- 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="@drawable/eden_background_gradient">
+    android:background="@drawable/eden_background_gradient"
+    >

    <androidx.fragment.app.FragmentContainerView
        android:id="@+id/fragment_container"
--- a/src/android/app/src/main/res/layout/activity_main.xml
+++ b/src/android/app/src/main/res/layout/activity_main.xml
@ -6,7 +6,8 @@
    android:id="@+id/coordinator_main"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?android:attr/colorBackground">
+    android:background="@drawable/eden_background_gradient"
+    >

    <androidx.fragment.app.FragmentContainerView
        android:id="@+id/fragment_container"
--- 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"
    >

    <LinearLayout
--- a/src/android/app/src/main/res/layout/fragment_home_settings.xml
+++ b/src/android/app/src/main/res/layout/fragment_home_settings.xml
@ -7,6 +7,7 @@
    android:scrollbars="vertical"
    android:fadeScrollbars="false"
    android:clipToPadding="false"
+    android:background="?attr/colorSurface"
    android:defaultFocusHighlightEnabled="false">

    <androidx.appcompat.widget.LinearLayoutCompat
--- a/src/android/app/src/main/res/values/eden_colors.xml
+++ b/src/android/app/src/main/res/values/eden_colors.xml
@ -36,8 +36,8 @@
    <color name="eden_glow_orange">#80FF8000</color> <!-- Orange glow -->

    <!-- Neon Border Colors -->
-    <color name="eden_border">#333333</color> <!-- Subtle border -->
-    <color name="eden_border_light">#555555</color> <!-- Lighter border -->
+    <color name="eden_border">#7c757f</color> <!-- Subtle border -->
+    <color name="eden_border_light">#948b98</color> <!-- Lighter border -->
    <color name="eden_border_gradient_start">#FF0080</color> <!-- Neon magenta -->
    <color name="eden_border_gradient_end">#00FFFF</color> <!-- Electric cyan -->

@ -73,8 +73,8 @@

    <!-- Transparent versions for gradients -->
    <color name="eden_transparent">#00000000</color>
-    <color name="eden_primary_transparent">#00FF0080</color>
-    <color name="eden_secondary_transparent">#0000FFFF</color>
+    <color name="eden_primary_transparent">#05FF0080</color>
+    <color name="eden_secondary_transparent">#0500FFFF</color>

    <!-- Additional Synthwave Colors -->
    <color name="eden_scan_line">#33FF0080</color> <!-- Scan line effect -->