From 9b780d6b7e1fc44347491ca15af24c9f4c22eee1 Mon Sep 17 00:00:00 2001
From: Maurice <mauriceboe@icloud.com>
Date: Fri, 6 Nov 2026 20:48:16 +0100
Subject: [PATCH] fix(native): whole initials in the group avatars, a smooth
 glow across the world map

---
 client/ios/App/TREKWidgets/AtlasContent.swift | 25 ++++++++++++++++---
 .../ios/App/TREKWidgets/CollabContent.swift   |  4 +--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/client/ios/App/TREKWidgets/AtlasContent.swift b/client/ios/App/TREKWidgets/AtlasContent.swift
index 494152b71..df9604ef6 100644
--- a/client/ios/App/TREKWidgets/AtlasContent.swift
+++ b/client/ios/App/TREKWidgets/AtlasContent.swift
@@ -1,4 +1,9 @@
 import SwiftUI
+#if canImport(UIKit)
+import UIKit
+#elseif canImport(AppKit)
+import AppKit
+#endif
 
 /// The Atlas on the home screen: the world as dots, the visited countries
 /// glowing, the latest one ringed, and how many there are.
@@ -156,10 +161,24 @@ struct DotWorld: View {
         }
     }
 
-    /// The accent at a point from west (0) to east (1).
+    /// The accent at a point from west (0) to east (1), blended between its colours.
     private func blend(_ t: CGFloat) -> Color {
-        guard accent.count > 1 else { return accent.first ?? .white }
-        return t < 0.5 ? accent[0] : accent[accent.count - 1]
+        guard accent.count > 1, let from = rgb(accent[0]), let to = rgb(accent[accent.count - 1]) else { return accent.first ?? .white }
+        let k = Double(max(0, min(1, t)))
+        return Color(.sRGB, red: from.0 + (to.0 - from.0) * k, green: from.1 + (to.1 - from.1) * k, blue: from.2 + (to.2 - from.2) * k)
+    }
+
+    private func rgb(_ color: Color) -> (Double, Double, Double)? {
+        #if canImport(UIKit)
+        var r: CGFloat = 0, g: CGFloat = 0, b: CGFloat = 0, a: CGFloat = 0
+        guard UIColor(color).getRed(&r, green: &g, blue: &b, alpha: &a) else { return nil }
+        return (Double(r), Double(g), Double(b))
+        #elseif canImport(AppKit)
+        guard let c = NSColor(color).usingColorSpace(.sRGB) else { return nil }
+        return (Double(c.redComponent), Double(c.greenComponent), Double(c.blueComponent))
+        #else
+        return nil
+        #endif
     }
 }
 
diff --git a/client/ios/App/TREKWidgets/CollabContent.swift b/client/ios/App/TREKWidgets/CollabContent.swift
index 7f66fd19c..ce815222b 100644
--- a/client/ios/App/TREKWidgets/CollabContent.swift
+++ b/client/ios/App/TREKWidgets/CollabContent.swift
@@ -114,12 +114,12 @@ struct AvatarStack: View {
     let scheme: ColorScheme
 
     var body: some View {
-        HStack(spacing: -size * 0.3) {
+        HStack(spacing: -size * 0.18) {
             ForEach(Array(members.prefix(4).enumerated()), id: \.offset) { _, member in
                 Circle()
                     .fill(LinearGradient(colors: [Trek.personColor(member.name), Trek.personColor(member.name).opacity(0.75)], startPoint: .top, endPoint: .bottom))
                     .frame(width: size, height: size)
-                    .overlay(Text(member.initials).font(.system(size: size * 0.38, weight: .heavy)).foregroundStyle(.white))
+                    .overlay(Text(member.initials).font(.system(size: size * 0.34, weight: .heavy)).minimumScaleFactor(0.7).lineLimit(1).foregroundStyle(.white).padding(.horizontal, size * 0.1))
                     .overlay(Circle().stroke(scheme == .dark ? Color(hex: 0x111115) : Color(hex: 0xF4F2EE), lineWidth: 2))
             }
             if members.count > 4 {