From bff6d36badf58363b540aba68c170cff75e63ff5 Mon Sep 17 00:00:00 2001
From: iChris4 <christophe.guibourd@orange.fr>
Date: Thu, 24 Sep 2026 04:53:12 +0200
Subject: [PATCH] feat: Add foreground drawable for MiiBlock and update
 background tile

---
 .../app/src/main/res/drawable/bg_mii_tile.xml |  9 ++---
 .../app/src/main/res/drawable/fg_mii_tile.xml | 35 +++++++++++++++++++
 android/app/src/main/res/layout/item_mii.xml  |  7 ++--
 3 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 android/app/src/main/res/drawable/fg_mii_tile.xml

diff --git a/android/app/src/main/res/drawable/bg_mii_tile.xml b/android/app/src/main/res/drawable/bg_mii_tile.xml
index bae6b3b..ac5fee3 100644
--- a/android/app/src/main/res/drawable/bg_mii_tile.xml
+++ b/android/app/src/main/res/drawable/bg_mii_tile.xml
@@ -1,38 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- WheelWizard's MiiBlock: selected in the primary colour, a favourite in gold. -->
+<!-- WheelWizard's MiiBlock, its fill. Its border is fg_mii_tile, drawn over the Mii so the
+     shoulders on the tile's bottom edge stay inside it, as the PC draws its picture inside the
+     border. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true">
         <shape android:shape="rectangle">
             <solid android:color="@color/neutral_800" />
-            <stroke android:width="2dp" android:color="@color/primary_400" />
             <corners android:radius="8dp" />
         </shape>
     </item>
     <item android:state_activated="true">
         <shape android:shape="rectangle">
             <solid android:color="@color/neutral_900" />
-            <stroke android:width="2dp" android:color="@color/warning_500" />
             <corners android:radius="8dp" />
         </shape>
     </item>
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
             <solid android:color="@color/neutral_700" />
-            <stroke android:width="1dp" android:color="@color/neutral_500" />
             <corners android:radius="8dp" />
         </shape>
     </item>
     <item android:state_hovered="true">
         <shape android:shape="rectangle">
             <solid android:color="@color/neutral_700" />
-            <stroke android:width="1dp" android:color="@color/neutral_500" />
             <corners android:radius="8dp" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/neutral_900" />
-            <stroke android:width="1dp" android:color="@color/neutral_600" />
             <corners android:radius="8dp" />
         </shape>
     </item>
diff --git a/android/app/src/main/res/drawable/fg_mii_tile.xml b/android/app/src/main/res/drawable/fg_mii_tile.xml
new file mode 100644
index 0000000..3f2992e
--- /dev/null
+++ b/android/app/src/main/res/drawable/fg_mii_tile.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- WheelWizard's MiiBlock, its border: selected in the primary colour, a favourite in gold. The
+     tile's foreground, so it frames the Mii whose shoulders reach the tile's bottom edge. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape android:shape="rectangle">
+            <stroke android:width="2dp" android:color="@color/primary_400" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+    <item android:state_activated="true">
+        <shape android:shape="rectangle">
+            <stroke android:width="2dp" android:color="@color/warning_500" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <stroke android:width="1dp" android:color="@color/neutral_500" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+    <item android:state_hovered="true">
+        <shape android:shape="rectangle">
+            <stroke android:width="1dp" android:color="@color/neutral_500" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <stroke android:width="1dp" android:color="@color/neutral_600" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+</selector>
diff --git a/android/app/src/main/res/layout/item_mii.xml b/android/app/src/main/res/layout/item_mii.xml
index a939ef9..e8f0c96 100644
--- a/android/app/src/main/res/layout/item_mii.xml
+++ b/android/app/src/main/res/layout/item_mii.xml
@@ -15,7 +15,8 @@
         android:layout_height="100dp"
         android:background="@drawable/bg_mii_tile"
         android:clipToOutline="true"
-        android:duplicateParentState="true">
+        android:duplicateParentState="true"
+        android:foreground="@drawable/fg_mii_tile">
 
         <ImageView
             android:id="@+id/mii_placeholder"
@@ -36,8 +37,8 @@
             android:tint="@color/neutral_500"
             android:visibility="gone" />
 
-        <!-- Wider than the tile and raised, the shoulders on its bottom edge: WheelWizard's
-             ImageOnlyMargin (-4,-9,-4,0) on its 90-pixel tile. -->
+        <!-- Wider than the tile and raised, the shoulders on its bottom edge under the border (the
+             tile's foreground): WheelWizard's ImageOnlyMargin (-4,-9,-4,0) on its 90-pixel tile. -->
         <ImageView
             android:id="@+id/mii_picture"
             android:layout_width="109dp"