From 6527e66c0790a22e87d9c0b0b7a858b1f6090679 Mon Sep 17 00:00:00 2001
From: Dorian <dorian@Dorians-MacBook-Air.local>
Date: Fri, 19 Jun 2026 18:12:38 +0100
Subject: [PATCH] fix(android): visible metallic icon ring at circle edge

Move the badge ring into the background layer (brightened grey->white so it
reads on #0A0A0A) at ~0.96 so it sits at the masked-circle edge; foreground is
just the white grid. Also honor SHIP_COMPANION in the pre-push hook.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .githooks/pre-push                            |  3 ++
 .../res/drawable/ic_launcher_background.xml   | 34 +++++++++++++++++--
 .../res/drawable/ic_launcher_foreground.xml   | 30 +++-------------
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/.githooks/pre-push b/.githooks/pre-push
index 973aa11a..4c840e35 100755
--- a/.githooks/pre-push
+++ b/.githooks/pre-push
@@ -11,6 +11,9 @@ set -euo pipefail
 ROOT="$(git rev-parse --show-toplevel)"
 cd "$ROOT"
 
+# ship-companion.sh already (re)published the APK for this push — don't redo it.
+[ -n "${SHIP_COMPANION:-}" ] && exit 0
+
 PUSH_MAIN=0; RANGE_OLD=""; RANGE_NEW=""
 while read -r _local_ref local_sha remote_ref remote_sha; do
   if [ "${remote_ref##*/}" = "main" ]; then
diff --git a/Android/app/src/main/res/drawable/ic_launcher_background.xml b/Android/app/src/main/res/drawable/ic_launcher_background.xml
index 539a3dc0..46594f87 100644
--- a/Android/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/Android/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,10 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Dark fill + the badge's metallic gradient ring, drawn in the background so
+     it sits at the masked-circle edge and isn't affected by foreground
+     parallax. Ring brightened (grey→white) so it actually reads on #0A0A0A. -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
+    android:viewportWidth="752"
+    android:viewportHeight="752">
+
     <path
         android:fillColor="#0A0A0A"
-        android:pathData="M0,0h108v108H0z" />
+        android:pathData="M0,0h752v752H0z" />
+
+    <group
+        android:pivotX="376"
+        android:pivotY="376"
+        android:scaleX="0.96"
+        android:scaleY="0.96">
+        <path
+            android:fillColor="#0A0A0A"
+            android:strokeWidth="20"
+            android:pathData="M11.441,375.669a364.227,364.227 0 1,0 728.454,0a364.227,364.227 0 1,0 -728.454,0z">
+            <aapt:attr name="android:strokeColor">
+                <gradient
+                    android:type="linear"
+                    android:startX="751.337"
+                    android:startY="751.338"
+                    android:endX="0"
+                    android:endY="0">
+                    <item android:offset="0" android:color="#FF4A4A4A" />
+                    <item android:offset="1" android:color="#FFF0F0F0" />
+                </gradient>
+            </aapt:attr>
+        </path>
+    </group>
 </vector>
diff --git a/Android/app/src/main/res/drawable/ic_launcher_foreground.xml b/Android/app/src/main/res/drawable/ic_launcher_foreground.xml
index fcd986e4..95acf404 100644
--- a/Android/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/Android/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Full Archipelago badge (from logo.svg): dark circle + black→grey gradient
-     ring + white pixel grid. Scaled to ~0.93 so the ring sits just inside the
-     launcher's circle/squircle mask and shows cleanly at the edge. -->
+<!-- White Archipelago pixel grid only — centered within the adaptive safe zone.
+     The dark circle + metallic gradient ring live in the background layer. -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="752"
@@ -12,28 +10,8 @@
     <group
         android:pivotX="376"
         android:pivotY="376"
-        android:scaleX="0.93"
-        android:scaleY="0.93">
-
-        <!-- Ringed circle -->
-        <path
-            android:fillColor="#0A0A0A"
-            android:strokeWidth="22.8834"
-            android:pathData="M11.441,375.669a364.227,364.227 0 1,0 728.454,0a364.227,364.227 0 1,0 -728.454,0z">
-            <aapt:attr name="android:strokeColor">
-                <gradient
-                    android:type="linear"
-                    android:startX="751.337"
-                    android:startY="751.338"
-                    android:endX="0"
-                    android:endY="0">
-                    <item android:offset="0" android:color="#FF000000" />
-                    <item android:offset="1" android:color="#FF888888" />
-                </gradient>
-            </aapt:attr>
-        </path>
-
-        <!-- White Archipelago pixel grid -->
+        android:scaleX="0.96"
+        android:scaleY="0.96">
         <path
             android:fillColor="#FFFFFF"
             android:pathData="M253.805,278.37V222.28H309.853V278.37H253.805ZM315.797,278.37V222.28H372.694V278.37H315.797ZM378.639,278.37V222.28H435.536V278.37H378.639ZM441.481,278.37V222.28H497.529V278.37H441.481ZM441.481,341.259V284.319H497.529V341.259H441.481ZM503.473,341.259V284.319H560.37V341.259H503.473ZM190.963,404.148V347.208H247.86V404.148H190.963ZM253.805,404.148V347.208H309.853V404.148H253.805ZM315.797,404.148V347.208H372.694V404.148H315.797ZM378.639,404.148V347.208H435.536V404.148H378.639ZM441.481,404.148V347.208H497.529V404.148H441.481ZM503.473,404.148V347.208H560.37V404.148H503.473ZM190.963,466.187V410.097H247.86V466.187H190.963ZM253.805,466.187V410.097H309.853V466.187H253.805ZM441.481,466.187V410.097H497.529V466.187H441.481ZM503.473,466.187V410.097H560.37V466.187H503.473ZM253.805,529.076V472.136H309.853V529.076H253.805ZM315.797,529.076V472.136H372.694V529.076H315.797ZM378.639,529.076V472.136H435.536V529.076H378.639ZM441.481,529.076V472.136H497.529V529.076H441.481Z" />