diff --git a/assets/icon.svg b/assets/icon.svg index b8f3ae9..93d4050 100644 --- a/assets/icon.svg +++ b/assets/icon.svg @@ -1,30 +1,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/public/shift-icon.png b/public/shift-icon.png index 0f94054..49ae47d 100644 Binary files a/public/shift-icon.png and b/public/shift-icon.png differ diff --git a/scripts/build-icons.py b/scripts/build-icons.py new file mode 100644 index 0000000..05fdc6a --- /dev/null +++ b/scripts/build-icons.py @@ -0,0 +1,242 @@ +#!/usr/bin/env python3 +"""Draw every Shift icon from one mark. + + scripts/build-icons.py # tray PNG + assets/icon.svg + scripts/build-icons.py --tauri # ... then the full platform set + +Both icons are the same drawing — a six-wedge ring around a hub with a plus +punched out of it, which is the radial ring the app itself paints — and they +differ only in what is allowed to be on screen behind it. The shell tints the +tray mark, so that file carries no colour at all: its only real channel is +alpha, because macOS renders a *template* image black or white to match the +menu bar and the Windows notification area simply shrinks whatever it is +given. At 16-18 px the old colour wheel was a blob, which is what "use a +black/white system icon" was about. The app icon is the same mark with its +colour turned on, because a Dock tile is not tinted by anything and needs a +ground of its own; it is flat and warm, and deliberately not a second +gradient, since the layered rainbow treatment is what made the two icons look +like they belonged to different products. + +The geometry lives once, in the constants below. The tray file is rasterised +here; the app icon is written as an SVG master that `tauri icon` turns into +the .icns / .ico / Windows tiles / android / ios set, which is worth using +over hand-rolling: its icon.icns and icon.ico carry the same size ladders the +repository already ships, verified against the committed files. + +Only Pillow is needed for the default run. +""" + +import argparse +import math +import pathlib +import subprocess +import sys + +from PIL import Image, ImageDraw + +# --- the mark, in units where the wedge ring's outer radius is 38 ----------- +# These are the numbers the ring is specified in, not a size: each consumer +# scales them. Changing GAP or PLUS_BAR changes both icons together, which is +# the whole point of this file. +OUTER = 38.0 # wedge ring, outer radius +INNER = 21.0 # wedge ring, inner radius +HUB = 12.6 # solid centre disc the plus is cut out of +GAP = 5.2 # degrees of air between wedges +PLUS_ARM = 7.8 # half-length of the cross cut out of the hub +PLUS_BAR = 2.8 # half-thickness of that cross +WHEEL = 2 * OUTER # the mark's own diameter in these units + +# --- tray ------------------------------------------------------------------ +TRAY_EDGE = 88 # tray-icon renders the image 18 pt tall, so this is > 4x +TRAY_SS = 4 # supersample on top of TRAY_EDGE for smooth wedge edges +TRAY_TINT = (128, 128, 128) # unread by macOS; only a base for Windows + +# --- app icon -------------------------------------------------------------- +MASTER = 1024 # the master canvas `tauri icon` downsamples from +TILE = 820 # tile edge; the committed icon.png is 410 of 512, i.e. 0.801 +TILE_CORNER = TILE * 228 / 1024 # same 0.222 corner ratio as the committed set +WHEEL_R = 326 # wheel radius in master units +WEDGE_INK = "#FFB25C" # the warm amber the old master already carried +HUB_INK = "#F04F24" # the accent every button in the app is painted with +TILE_INK = "#37221A" # the espresso tile the plus is punched out of + +ROOT = pathlib.Path(__file__).resolve().parent.parent + + +def ring_segment(center, radius_out, radius_in, start, stop): + """Corners of a filled annular sector, outer arc forward then inner back.""" + steps = max(2, int(stop - start) + 1) + arc = lambda radius, index: ( + center + radius * math.cos(math.radians(start + (stop - start) * index / steps)), + center + radius * math.sin(math.radians(start + (stop - start) * index / steps)), + ) + points = [arc(radius_out, i) for i in range(steps + 1)] + points += [arc(radius_in, i) for i in range(steps, -1, -1)] + return points + + +def punch_cross(draw, center, scale): + """Clear the plus out of whatever has been drawn, leaving the ground to show.""" + width = int(PLUS_BAR * scale) + draw.line( + [center - PLUS_ARM * scale, center, center + PLUS_ARM * scale, center], + fill=0, + width=width, + ) + draw.line( + [center, center - PLUS_ARM * scale, center, center + PLUS_ARM * scale], + fill=0, + width=width, + ) + + +def render_tray_mask(): + """The mark as an alpha mask at TRAY_EDGE, drawn at TRAY_SS for one smooth pass.""" + canvas = TRAY_EDGE * TRAY_SS + center = canvas / 2 + mask = Image.new("L", (canvas, canvas), 0) + draw = ImageDraw.Draw(mask) + for wedge in range(6): + start = -90 + wedge * 60 + GAP / 2 + stop = -90 + (wedge + 1) * 60 - GAP / 2 + draw.polygon( + ring_segment(center, OUTER * TRAY_SS, INNER * TRAY_SS, start, stop), fill=255 + ) + hub = HUB * TRAY_SS + draw.ellipse([center - hub, center - hub, center + hub, center + hub], fill=255) + punch_cross(draw, center, TRAY_SS) + return mask.resize((TRAY_EDGE, TRAY_EDGE), Image.LANCZOS) + + +def _shown(path: pathlib.Path) -> str: + # Repo-relative when it is inside the repo; `--tray-out` may point anywhere. + path = path.resolve() + try: + return str(path.relative_to(ROOT)) + except ValueError: + return str(path) + + +def build_tray(path: pathlib.Path) -> None: + icon = Image.new("RGBA", (TRAY_EDGE, TRAY_EDGE), TRAY_TINT + (0,)) + icon.putalpha(render_tray_mask()) + path.parent.mkdir(parents=True, exist_ok=True) + path.write_bytes(_png_bytes(icon)) + print(f"wrote {_shown(path)} ({TRAY_EDGE}x{TRAY_EDGE}, alpha-only monochrome mark)") + + +def _png_bytes(image: Image.Image) -> bytes: + import io + + buffer = io.BytesIO() + image.save(buffer, format="PNG") + return buffer.getvalue() + + +def build_master_svg() -> str: + """The app icon: the tray mark, with its colour turned on. + + What makes the two icons the same drawing is the geometry and the rule + about how it is filled — six wedges, the same angular gaps, the same ring + and hub radii, the plus punched out of the hub as negative space, and flat + solid fills throughout. Colour is not the thing they have to agree about, + and the tray is the one that cannot have any: macOS tints a template image + and the Windows notification area just shrinks what it is given. A Dock + tile sits on the user's wallpaper with nothing behind it, so it needs a + ground of its own and gets to be warm. + + Three flat colours and nothing else. No gradient, no drop shadow, no + radial shine and no per-wedge pastel tint, because that layered treatment + is a different visual language and is exactly why the old rainbow tile and + the crisp new mark read as two unrelated products. The hues are the app's + own rather than invented for the icon: `#FFB25C` is the tone the previous + master already carried and `#F04F24` is the accent every button in the + interface is painted with, and keeping the darker warm disc inside the + lighter ring preserves which end of the mark is which, so the Dock does not + invert on upgrade. + + The plus is drawn in the tile's own colour instead of cut through to + transparency: on a Dock tile the two read identically, and a real hole + would be filled in by the platform wherever `tauri icon` composes the iOS + and Android layers. + + The wheel is sized to 652 of the 820 tile because that is the ratio the + icon this replaces was drawn at (r=326 in an 820 tile), so the new mark + holds the same optical weight in the Dock rather than arriving larger. + """ + scale = WHEEL_R / OUTER + center = MASTER / 2 + offset = (MASTER - TILE) / 2 + bar = PLUS_BAR * scale + arm = PLUS_ARM * scale + wedges = [] + for wedge in range(6): + start = -90 + wedge * 60 + GAP / 2 + stop = -90 + (wedge + 1) * 60 - GAP / 2 + outer_start = _point(center, OUTER * scale, start) + outer_end = _point(center, OUTER * scale, stop) + inner_start = _point(center, INNER * scale, stop) + inner_end = _point(center, INNER * scale, start) + wedges.append( + f' ' + ) + return ( + f'\n' + f" \n' + f' \n' + "\n".join(wedges) + "\n \n" + f' \n' + f' \n' + "\n" + ) + + +def _point(center, radius, angle): + return ( + f"{center + radius * math.cos(math.radians(angle)):.2f} " + f"{center + radius * math.sin(math.radians(angle)):.2f}" + ) + + +def main() -> int: + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument( + "--tray-out", + type=pathlib.Path, + default=ROOT / "src-tauri" / "icons" / "tray-template.png", + ) + parser.add_argument("--master-out", type=pathlib.Path, default=ROOT / "assets" / "icon.svg") + parser.add_argument( + "--tauri", + action="store_true", + help="also run `tauri icon` on the master to regenerate the platform set", + ) + args = parser.parse_args() + + build_tray(args.tray_out) + args.master_out.parent.mkdir(parents=True, exist_ok=True) + args.master_out.write_text(build_master_svg(), encoding="utf-8") + print(f"wrote {_shown(args.master_out)} (flat three-colour master)") + + if args.tauri: + # Full-bleed would be wrong: `tauri icon` scales the master rather than + # padding it, so the tile has to sit inside the canvas the way it does + # in the committed set. That is why the rect above is inset. + subprocess.run( + ["pnpm", "tauri", "icon", str(args.master_out)], check=True, cwd=ROOT + ) + # The brand mark in the window title bars is the same file at 26 px, so + # it is a copy of the icon rather than a second drawing to keep in step. + brand = ROOT / "public" / "shift-icon.png" + brand.write_bytes((ROOT / "src-tauri" / "icons" / "icon.png").read_bytes()) + print(f"wrote {_shown(brand)} (same mark, shown at 26 px in the title bar)") + return 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/scripts/build-tray-icon.py b/scripts/build-tray-icon.py deleted file mode 100755 index 07c0fea..0000000 --- a/scripts/build-tray-icon.py +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/env python3 -"""Redraw src-tauri/icons/tray-template.png, the mark the system tray shows. - - scripts/build-tray-icon.py [--out PATH] - -The tray is drawn by the shell, not by Shift, and at 16-18 px the app's colour -wheel is a blob: macOS tints a *template* image black or white to match the menu -bar, and the Windows notification area simply shrinks whatever it is given. So -this file is a flat single-tint mark whose only real channel is alpha — the same -shape as the radial ring the app itself draws, so the two read as one product. - -Only Pillow is needed. The mark is drawn at 4x and averaged down so the wedge -edges and the cross arms stay smooth at every size the shell asks for. -""" - -import argparse -import math -import pathlib - -from PIL import Image, ImageDraw - -SIZE = 88 # source edge in px; tray-icon renders the image 18 pt tall -SS = 4 # supersample on top of SIZE -CANVAS = SIZE * SS -CENTER = CANVAS / 2 - -OUTER = 38.0 # wedge ring, outer radius -INNER = 21.0 # wedge ring, inner radius -HUB = 12.6 # solid centre disc -GAP = 5.2 # degrees of air between wedges -PLUS_ARM = 7.8 # half-length of the cross cut out of the hub -PLUS_BAR = 2.8 # half-thickness of that cross -TINT = (128, 128, 128) # unread by macOS, ignored except as a base for Windows - - -def ring_segment(radius_out, radius_in, start, stop): - """Corners of a filled annular sector, outer arc forward then inner back.""" - steps = max(2, int(stop - start) + 1) - points = [ - (CENTER + radius_out * math.cos(math.radians(a)), CENTER + radius_out * math.sin(math.radians(a))) - for a in [start + (stop - start) * i / steps for i in range(steps + 1)] - ] - points += [ - (CENTER + radius_in * math.cos(math.radians(a)), CENTER + radius_in * math.sin(math.radians(a))) - for a in [start + (stop - start) * i / steps for i in range(steps, -1, -1)] - ] - return points - - -def render_mask() -> Image.Image: - mask = Image.new("L", (CANVAS, CANVAS), 0) - draw = ImageDraw.Draw(mask) - for wedge in range(6): - start = -90 + wedge * 60 + GAP / 2 - stop = -90 + (wedge + 1) * 60 - GAP / 2 - draw.polygon(ring_segment(OUTER * SS, INNER * SS, start, stop), fill=255) - draw.ellipse( - [CENTER - HUB * SS, CENTER - HUB * SS, CENTER + HUB * SS, CENTER + HUB * SS], fill=255 - ) - width = int(PLUS_BAR * SS) - draw.line( - [CENTER - PLUS_ARM * SS, CENTER, CENTER + PLUS_ARM * SS, CENTER], fill=0, width=width - ) - draw.line( - [CENTER, CENTER - PLUS_ARM * SS, CENTER, CENTER + PLUS_ARM * SS], fill=0, width=width - ) - return mask.resize((SIZE, SIZE), Image.LANCZOS) - - -def main() -> None: - parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument( - "--out", - type=pathlib.Path, - default=pathlib.Path(__file__).resolve().parent.parent - / "src-tauri" - / "icons" - / "tray-template.png", - ) - args = parser.parse_args() - - icon = Image.new("RGBA", (SIZE, SIZE), TINT + (0,)) - icon.putalpha(render_mask()) - args.out.parent.mkdir(parents=True, exist_ok=True) - icon.save(args.out) - print(f"wrote {args.out} ({SIZE}x{SIZE}, alpha-only monochrome mark)") - - -if __name__ == "__main__": - main() diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png index ba768dd..e8bc4d8 100644 Binary files a/src-tauri/icons/128x128.png and b/src-tauri/icons/128x128.png differ diff --git a/src-tauri/icons/128x128@2x.png b/src-tauri/icons/128x128@2x.png index f81c839..d077f43 100644 Binary files a/src-tauri/icons/128x128@2x.png and b/src-tauri/icons/128x128@2x.png differ diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png index 42ab92f..e283bed 100644 Binary files a/src-tauri/icons/32x32.png and b/src-tauri/icons/32x32.png differ diff --git a/src-tauri/icons/64x64.png b/src-tauri/icons/64x64.png index a709984..c3d6509 100644 Binary files a/src-tauri/icons/64x64.png and b/src-tauri/icons/64x64.png differ diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png index 18e4580..1434011 100644 Binary files a/src-tauri/icons/Square107x107Logo.png and b/src-tauri/icons/Square107x107Logo.png differ diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png index 2b51640..7c24941 100644 Binary files a/src-tauri/icons/Square142x142Logo.png and b/src-tauri/icons/Square142x142Logo.png differ diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png index dc61e4a..31f6087 100644 Binary files a/src-tauri/icons/Square150x150Logo.png and b/src-tauri/icons/Square150x150Logo.png differ diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png index a9401f6..316c2ec 100644 Binary files a/src-tauri/icons/Square284x284Logo.png and b/src-tauri/icons/Square284x284Logo.png differ diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png index 7ca98e9..0b0de41 100644 Binary files a/src-tauri/icons/Square30x30Logo.png and b/src-tauri/icons/Square30x30Logo.png differ diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png index d64aed1..57671ef 100644 Binary files a/src-tauri/icons/Square310x310Logo.png and b/src-tauri/icons/Square310x310Logo.png differ diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png index 61a8f9d..696793d 100644 Binary files a/src-tauri/icons/Square44x44Logo.png and b/src-tauri/icons/Square44x44Logo.png differ diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png index 3154b05..5f7a630 100644 Binary files a/src-tauri/icons/Square71x71Logo.png and b/src-tauri/icons/Square71x71Logo.png differ diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png index fa0bcd9..8752fa1 100644 Binary files a/src-tauri/icons/Square89x89Logo.png and b/src-tauri/icons/Square89x89Logo.png differ diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png index 772c832..d2b61e5 100644 Binary files a/src-tauri/icons/StoreLogo.png and b/src-tauri/icons/StoreLogo.png differ diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png index 81eccf0..fba16f9 100644 Binary files a/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png differ diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png index 976e696..26c8901 100644 Binary files a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png index 70eb035..0ae4123 100644 Binary files a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png differ diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png index 8d308c4..16f0bb6 100644 Binary files a/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png differ diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png index 716aa28..fa04b2c 100644 Binary files a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png index 293503d..308ec0c 100644 Binary files a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png differ diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png index acee994..daaca74 100644 Binary files a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png differ diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png index 4624068..f48abae 100644 Binary files a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png index 48b6161..e548b3e 100644 Binary files a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png index c718e42..b0a742f 100644 Binary files a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png index a40bd35..07c3021 100644 Binary files a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png index 58c8584..67a591d 100644 Binary files a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png index 66b4778..ac9054f 100644 Binary files a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png index dffa69a..efa7333 100644 Binary files a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png index c75f4fd..b76e750 100644 Binary files a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns index a97e37a..910892d 100644 Binary files a/src-tauri/icons/icon.icns and b/src-tauri/icons/icon.icns differ diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico index 11c4ac1..020a24e 100644 Binary files a/src-tauri/icons/icon.ico and b/src-tauri/icons/icon.ico differ diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png index 0f94054..49ae47d 100644 Binary files a/src-tauri/icons/icon.png and b/src-tauri/icons/icon.png differ diff --git a/src-tauri/icons/ios/AppIcon-20x20@1x.png b/src-tauri/icons/ios/AppIcon-20x20@1x.png index 47459bd..2a240a0 100644 Binary files a/src-tauri/icons/ios/AppIcon-20x20@1x.png and b/src-tauri/icons/ios/AppIcon-20x20@1x.png differ diff --git a/src-tauri/icons/ios/AppIcon-20x20@2x-1.png b/src-tauri/icons/ios/AppIcon-20x20@2x-1.png index 80730e6..8d99ff4 100644 Binary files a/src-tauri/icons/ios/AppIcon-20x20@2x-1.png and b/src-tauri/icons/ios/AppIcon-20x20@2x-1.png differ diff --git a/src-tauri/icons/ios/AppIcon-20x20@2x.png b/src-tauri/icons/ios/AppIcon-20x20@2x.png index 80730e6..8d99ff4 100644 Binary files a/src-tauri/icons/ios/AppIcon-20x20@2x.png and b/src-tauri/icons/ios/AppIcon-20x20@2x.png differ diff --git a/src-tauri/icons/ios/AppIcon-20x20@3x.png b/src-tauri/icons/ios/AppIcon-20x20@3x.png index 97f3945..95409e4 100644 Binary files a/src-tauri/icons/ios/AppIcon-20x20@3x.png and b/src-tauri/icons/ios/AppIcon-20x20@3x.png differ diff --git a/src-tauri/icons/ios/AppIcon-29x29@1x.png b/src-tauri/icons/ios/AppIcon-29x29@1x.png index 7e43965..7b56f0a 100644 Binary files a/src-tauri/icons/ios/AppIcon-29x29@1x.png and b/src-tauri/icons/ios/AppIcon-29x29@1x.png differ diff --git a/src-tauri/icons/ios/AppIcon-29x29@2x-1.png b/src-tauri/icons/ios/AppIcon-29x29@2x-1.png index d1dcaef..06eba3f 100644 Binary files a/src-tauri/icons/ios/AppIcon-29x29@2x-1.png and b/src-tauri/icons/ios/AppIcon-29x29@2x-1.png differ diff --git a/src-tauri/icons/ios/AppIcon-29x29@2x.png b/src-tauri/icons/ios/AppIcon-29x29@2x.png index d1dcaef..06eba3f 100644 Binary files a/src-tauri/icons/ios/AppIcon-29x29@2x.png and b/src-tauri/icons/ios/AppIcon-29x29@2x.png differ diff --git a/src-tauri/icons/ios/AppIcon-29x29@3x.png b/src-tauri/icons/ios/AppIcon-29x29@3x.png index fdb6b6e..301efee 100644 Binary files a/src-tauri/icons/ios/AppIcon-29x29@3x.png and b/src-tauri/icons/ios/AppIcon-29x29@3x.png differ diff --git a/src-tauri/icons/ios/AppIcon-40x40@1x.png b/src-tauri/icons/ios/AppIcon-40x40@1x.png index 80730e6..8d99ff4 100644 Binary files a/src-tauri/icons/ios/AppIcon-40x40@1x.png and b/src-tauri/icons/ios/AppIcon-40x40@1x.png differ diff --git a/src-tauri/icons/ios/AppIcon-40x40@2x-1.png b/src-tauri/icons/ios/AppIcon-40x40@2x-1.png index 656b1d4..0111696 100644 Binary files a/src-tauri/icons/ios/AppIcon-40x40@2x-1.png and b/src-tauri/icons/ios/AppIcon-40x40@2x-1.png differ diff --git a/src-tauri/icons/ios/AppIcon-40x40@2x.png b/src-tauri/icons/ios/AppIcon-40x40@2x.png index 656b1d4..0111696 100644 Binary files a/src-tauri/icons/ios/AppIcon-40x40@2x.png and b/src-tauri/icons/ios/AppIcon-40x40@2x.png differ diff --git a/src-tauri/icons/ios/AppIcon-40x40@3x.png b/src-tauri/icons/ios/AppIcon-40x40@3x.png index eb017e2..1314760 100644 Binary files a/src-tauri/icons/ios/AppIcon-40x40@3x.png and b/src-tauri/icons/ios/AppIcon-40x40@3x.png differ diff --git a/src-tauri/icons/ios/AppIcon-512@2x.png b/src-tauri/icons/ios/AppIcon-512@2x.png index 3dc0710..74bfb82 100644 Binary files a/src-tauri/icons/ios/AppIcon-512@2x.png and b/src-tauri/icons/ios/AppIcon-512@2x.png differ diff --git a/src-tauri/icons/ios/AppIcon-60x60@2x.png b/src-tauri/icons/ios/AppIcon-60x60@2x.png index eb017e2..1314760 100644 Binary files a/src-tauri/icons/ios/AppIcon-60x60@2x.png and b/src-tauri/icons/ios/AppIcon-60x60@2x.png differ diff --git a/src-tauri/icons/ios/AppIcon-60x60@3x.png b/src-tauri/icons/ios/AppIcon-60x60@3x.png index 9766c6e..b6c034c 100644 Binary files a/src-tauri/icons/ios/AppIcon-60x60@3x.png and b/src-tauri/icons/ios/AppIcon-60x60@3x.png differ diff --git a/src-tauri/icons/ios/AppIcon-76x76@1x.png b/src-tauri/icons/ios/AppIcon-76x76@1x.png index 84ded58..7e54b92 100644 Binary files a/src-tauri/icons/ios/AppIcon-76x76@1x.png and b/src-tauri/icons/ios/AppIcon-76x76@1x.png differ diff --git a/src-tauri/icons/ios/AppIcon-76x76@2x.png b/src-tauri/icons/ios/AppIcon-76x76@2x.png index c75a976..a327d6c 100644 Binary files a/src-tauri/icons/ios/AppIcon-76x76@2x.png and b/src-tauri/icons/ios/AppIcon-76x76@2x.png differ diff --git a/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png b/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png index 627321f..a1c81ea 100644 Binary files a/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png and b/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png differ diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index c6f54f9..17f8cd4 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -226,7 +226,8 @@ pub fn refresh_tray_language(app: &AppHandle) -> Result<(), String> { } /// The wheel mark, drawn flat and alpha-only so the shell can tint it. -/// Regenerate with `scripts/build-tray-icon.py`. +/// Regenerate with `scripts/build-icons.py`, which draws the app icon from the +/// same geometry so the two cannot drift apart. const TRAY_ICON: &[u8] = include_bytes!("../icons/tray-template.png"); fn setup_tray(app: &AppHandle) -> tauri::Result<()> {