feat: Add foreground drawable for MiiBlock and update background tile

This commit is contained in:
iChris4 committed 2026-09-24 04:53:12 +02:00
1 parent e1bd3c6f94
commit bff6d36bad
3 files changed
+42 -9

No files matched your search

@@ -1,38 +1,35 @@
<?xml version="1.0" encoding="utf-8"?> <?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"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"> <item android:state_selected="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/neutral_800" /> <solid android:color="@color/neutral_800" />
<stroke android:width="2dp" android:color="@color/primary_400" />
<corners android:radius="8dp" /> <corners android:radius="8dp" />
</shape> </shape>
</item> </item>
<item android:state_activated="true"> <item android:state_activated="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/neutral_900" /> <solid android:color="@color/neutral_900" />
<stroke android:width="2dp" android:color="@color/warning_500" />
<corners android:radius="8dp" /> <corners android:radius="8dp" />
</shape> </shape>
</item> </item>
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/neutral_700" /> <solid android:color="@color/neutral_700" />
<stroke android:width="1dp" android:color="@color/neutral_500" />
<corners android:radius="8dp" /> <corners android:radius="8dp" />
</shape> </shape>
</item> </item>
<item android:state_hovered="true"> <item android:state_hovered="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/neutral_700" /> <solid android:color="@color/neutral_700" />
<stroke android:width="1dp" android:color="@color/neutral_500" />
<corners android:radius="8dp" /> <corners android:radius="8dp" />
</shape> </shape>
</item> </item>
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/neutral_900" /> <solid android:color="@color/neutral_900" />
<stroke android:width="1dp" android:color="@color/neutral_600" />
<corners android:radius="8dp" /> <corners android:radius="8dp" />
</shape> </shape>
</item> </item>
@@ -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>
+4 -3
View File
@@ -15,7 +15,8 @@
android:layout_height="100dp" android:layout_height="100dp"
android:background="@drawable/bg_mii_tile" android:background="@drawable/bg_mii_tile"
android:clipToOutline="true" android:clipToOutline="true"
android:duplicateParentState="true"> android:duplicateParentState="true"
android:foreground="@drawable/fg_mii_tile">
<ImageView <ImageView
android:id="@+id/mii_placeholder" android:id="@+id/mii_placeholder"
@@ -36,8 +37,8 @@
android:tint="@color/neutral_500" android:tint="@color/neutral_500"
android:visibility="gone" /> android:visibility="gone" />
<!-- Wider than the tile and raised, the shoulders on its bottom edge: WheelWizard's <!-- Wider than the tile and raised, the shoulders on its bottom edge under the border (the
ImageOnlyMargin (-4,-9,-4,0) on its 90-pixel tile. --> tile's foreground): WheelWizard's ImageOnlyMargin (-4,-9,-4,0) on its 90-pixel tile. -->
<ImageView <ImageView
android:id="@+id/mii_picture" android:id="@+id/mii_picture"
android:layout_width="109dp" android:layout_width="109dp"