Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[android, ui] remove the wash (white tint) of focused game cards (#4285)

xbzk5b86242313ec
diff --git a/src/android/app/src/main/res/color/game_card_ripple.xml b/src/android/app/src/main/res/color/game_card_ripple.xml
new file mode 100644
index 0000000000..84a5dab29e
--- /dev/null
+++ b/src/android/app/src/main/res/color/game_card_ripple.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true" android:color="?attr/colorControlHighlight" />
+ <item android:state_focused="true" android:color="@android:color/transparent" />
+ <item android:state_selected="true" android:color="@android:color/transparent" />
+ <item android:state_hovered="true" android:color="@android:color/transparent" />
+ <item android:color="@android:color/transparent" />
+</selector>
diff --git a/src/android/app/src/main/res/layout-land/card_game_carousel.xml b/src/android/app/src/main/res/layout-land/card_game_carousel.xml
index 4d8e5fd148..866b189042 100644
--- a/src/android/app/src/main/res/layout-land/card_game_carousel.xml
+++ b/src/android/app/src/main/res/layout-land/card_game_carousel.xml
@@ -10,6 +10,7 @@
android:clipChildren="true"
android:layout_margin="0dp"
app:cardBackgroundColor="@color/eden_card_background"
+ app:rippleColor="@color/game_card_ripple"
app:strokeWidth="1dp"
app:strokeColor="@color/eden_border">
diff --git a/src/android/app/src/main/res/layout/card_game_carousel.xml b/src/android/app/src/main/res/layout/card_game_carousel.xml
index 424d6cadde..4e92a3e209 100644
--- a/src/android/app/src/main/res/layout/card_game_carousel.xml
+++ b/src/android/app/src/main/res/layout/card_game_carousel.xml
@@ -11,6 +11,7 @@
app:cardCornerRadius="16dp"
app:cardPreventCornerOverlap="true"
android:clipChildren="true"
+ app:rippleColor="@color/game_card_ripple"
android:layout_margin="4dp">
<androidx.constraintlayout.widget.ConstraintLayout
diff --git a/src/android/app/src/main/res/layout/card_game_grid.xml b/src/android/app/src/main/res/layout/card_game_grid.xml
index 647f3235c8..69e1919f1c 100644
--- a/src/android/app/src/main/res/layout/card_game_grid.xml
+++ b/src/android/app/src/main/res/layout/card_game_grid.xml
@@ -22,6 +22,7 @@
android:focusable="true"
android:transitionName="card_game"
app:cardCornerRadius="16dp"
+ app:rippleColor="@color/game_card_ripple"
android:foreground="@color/eden_border_gradient_start">
<androidx.constraintlayout.widget.ConstraintLayout
diff --git a/src/android/app/src/main/res/layout/card_game_grid_compact.xml b/src/android/app/src/main/res/layout/card_game_grid_compact.xml
index 5752c9828a..5a86cf6899 100644
--- a/src/android/app/src/main/res/layout/card_game_grid_compact.xml
+++ b/src/android/app/src/main/res/layout/card_game_grid_compact.xml
@@ -22,6 +22,7 @@
android:focusable="true"
android:transitionName="card_game_compact"
app:cardCornerRadius="16dp"
+ app:rippleColor="@color/game_card_ripple"
android:foreground="@color/eden_border_gradient_start">
<androidx.constraintlayout.widget.ConstraintLayout
diff --git a/src/android/app/src/main/res/layout/card_game_list.xml b/src/android/app/src/main/res/layout/card_game_list.xml
index 02aa446e32..8612b51752 100644
--- a/src/android/app/src/main/res/layout/card_game_list.xml
+++ b/src/android/app/src/main/res/layout/card_game_list.xml
@@ -12,6 +12,7 @@
app:cardCornerRadius="16dp"
app:cardElevation="0dp"
app:cardBackgroundColor="@android:color/transparent"
+ app:rippleColor="@color/game_card_ripple"
app:strokeWidth="0dp">
<androidx.constraintlayout.widget.ConstraintLayout