neoagent 2.4.1-beta.23 → 2.4.1-beta.24

package/flutter_app/tool/generate_desktop_branding.py

@@ -4,10 +4,11 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from PIL import Image, ImageDraw, ImageFilter
+from PIL import Image, ImageDraw
 
 
 ROOT = Path(__file__).resolve().parents[1]
+SOURCE_DIR = ROOT / "tool" / "branding_source"
 BRANDING_DIR = ROOT / "assets" / "branding"
 WEB_DIR = ROOT / "web"
 WEB_ICONS_DIR = WEB_DIR / "icons"
@@ -19,294 +20,146 @@ SERVER_PUBLIC_DIR = ROOT.parent / "server" / "public"
 SERVER_PUBLIC_ICONS_DIR = SERVER_PUBLIC_DIR / "icons"
 STATIC_IMG_DIR = ROOT.parent / "static" / "img"
 LANDING_LOGO_PATH = ROOT.parent / "landing" / "assets" / "logo.svg"
-EXTENSION_LOGO_PATH = ROOT.parent / "extensions" / "chrome-browser" / "icons" / "logo.svg"
+EXTENSION_ICON_DIR = ROOT.parent / "extensions" / "chrome-browser" / "icons"
+EXTENSION_LOGO_PATH = EXTENSION_ICON_DIR / "logo.svg"
 
-ACCENT = (104, 78, 44)
-ACCENT_ALT = (35, 92, 82)
-ACCENT_DARK = (158, 128, 82)
-ACCENT_ALT_DARK = (67, 144, 129)
-SYMBOL_LIGHT = (255, 247, 232, 255)
-WHITE = (255, 255, 255, 255)
+SOURCE_SVG = SOURCE_DIR / "neoagent-icon.svg"
+SOURCE_PNG_SIZES = (16, 32, 48, 64, 128, 180, 192, 256, 512, 1024)
 TRANSPARENT = (0, 0, 0, 0)
+WHITE = (255, 255, 255, 255)
+BLACK = (0, 0, 0, 255)
 
 
-def lerp(a: float, b: float, t: float) -> float:
-    return a + (b - a) * t
-
-
-def mix_channel(value: int, target: int, amount: float) -> int:
-    return max(0, min(255, round(lerp(value, target, amount))))
-
-
-def mix_color(color: tuple[int, int, int], target: int, amount: float) -> tuple[int, int, int]:
-    return (
-        mix_channel(color[0], target, amount),
-        mix_channel(color[1], target, amount),
-        mix_channel(color[2], target, amount),
-    )
+def ensure_dirs() -> None:
+    BRANDING_DIR.mkdir(parents=True, exist_ok=True)
+    WEB_ICONS_DIR.mkdir(parents=True, exist_ok=True)
+    MAC_ICON_DIR.mkdir(parents=True, exist_ok=True)
+    LINUX_ICON_DIR.mkdir(parents=True, exist_ok=True)
+    SERVER_PUBLIC_ICONS_DIR.mkdir(parents=True, exist_ok=True)
+    STATIC_IMG_DIR.mkdir(parents=True, exist_ok=True)
+    LANDING_LOGO_PATH.parent.mkdir(parents=True, exist_ok=True)
+    EXTENSION_ICON_DIR.mkdir(parents=True, exist_ok=True)
 
 
-def gradient_background(
-    size: int,
-    start: tuple[int, int, int],
-    end: tuple[int, int, int],
-) -> Image.Image:
-    img = Image.new("RGBA", (size, size), TRANSPARENT)
-    px = img.load()
-    for y in range(size):
-      for x in range(size):
-        tx = x / max(size - 1, 1)
-        ty = y / max(size - 1, 1)
-        diagonal = (tx * 0.58) + (ty * 0.42)
-        glow = max(0.0, 1.0 - (((tx - 0.25) ** 2 + (ty - 0.18) ** 2) ** 0.5) / 0.58)
-        shade = max(0.0, 1.0 - (((tx - 0.86) ** 2 + (ty - 0.94) ** 2) ** 0.5) / 0.72)
-        t = min(1.0, max(0.0, diagonal + glow * 0.12 - shade * 0.08))
-        base = (
-            int(lerp(start[0], end[0], t)),
-            int(lerp(start[1], end[1], t)),
-            int(lerp(start[2], end[2], t)),
-        )
-        lit = mix_color(base, 255, glow * 0.14)
-        final = mix_color(lit, 0, shade * 0.16)
-        px[x, y] = (
-            final[0],
-            final[1],
-            final[2],
-            255,
-        )
-    return img
+def source_png_path(size: int) -> Path:
+    return SOURCE_DIR / f"neoagent-icon-{size}.png"
 
 
-def logo_paths(size: int, padding_ratio: float = 0.16):
-    pad = size * padding_ratio
-    inner = size - pad * 2
-    def point(x: float, y: float) -> tuple[float, float]:
-        return (pad + inner * x, pad + inner * y)
+def load_source_icon(size: int) -> Image.Image:
+    if size in SOURCE_PNG_SIZES and source_png_path(size).exists():
+        return Image.open(source_png_path(size)).convert("RGBA")
+    source = Image.open(source_png_path(1024)).convert("RGBA")
+    return source.resize((size, size), Image.Resampling.LANCZOS)
 
-    top = [point(0.5, 0.08), point(0.92, 0.35), point(0.5, 0.53), point(0.08, 0.35)]
-    middle = [point(0.5, 0.43), point(0.9, 0.64), point(0.5, 0.76), point(0.1, 0.64)]
-    bottom = [point(0.5, 0.67), point(0.86, 0.86), point(0.5, 0.96), point(0.14, 0.86)]
-    return top, middle, bottom
 
+def save_icon(path: Path, size: int) -> None:
+    path.parent.mkdir(parents=True, exist_ok=True)
+    image = load_source_icon(size)
+    if image.size != (size, size):
+        image = image.resize((size, size), Image.Resampling.LANCZOS)
+    image.save(path, format="PNG")
 
-def draw_logo(draw: ImageDraw.ImageDraw, size: int, color: tuple[int, int, int, int]) -> None:
-    top, middle, bottom = logo_paths(size)
-    draw.polygon(top, fill=color)
-    draw.polygon(middle, fill=color)
-    draw.polygon(bottom, fill=color)
 
+def write_source_svg(path: Path) -> None:
+    path.parent.mkdir(parents=True, exist_ok=True)
+    svg = SOURCE_SVG.read_text(encoding="utf-8")
+    svg = svg.replace(
+        'stroke="rgba(255,255,255,0.16)"',
+        'stroke="#ffffff" stroke-opacity="0.16"',
+    )
+    path.write_text(svg, encoding="utf-8")
 
-def make_app_icon(size: int, *, light: bool = False) -> Image.Image:
-    canvas = Image.new("RGBA", (size, size), TRANSPARENT)
-    start = ACCENT if light else ACCENT_DARK
-    end = ACCENT_ALT if light else ACCENT_ALT_DARK
-    symbol = SYMBOL_LIGHT if light else WHITE
 
-    shadow = Image.new("RGBA", (size, size), TRANSPARENT)
-    shadow_draw = ImageDraw.Draw(shadow)
-    corner = round(size * 0.3)
-    shadow_draw.rounded_rectangle(
-        (size * 0.075, size * 0.09, size * 0.925, size * 0.94),
-        radius=corner,
-        fill=(0, 0, 0, 64 if light else 86),
-    )
-    shadow = shadow.filter(ImageFilter.GaussianBlur(radius=max(2, size * 0.035)))
-    canvas.alpha_composite(shadow)
-
-    base_mask = Image.new("L", (size, size), 0)
-    mask_draw = ImageDraw.Draw(base_mask)
-    base_rect = (size * 0.08, size * 0.08, size * 0.92, size * 0.92)
-    mask_draw.rounded_rectangle(base_rect, radius=corner, fill=255)
-
-    base = gradient_background(size, start, end)
-    clipped = Image.new("RGBA", (size, size), TRANSPARENT)
-    clipped.paste(base, mask=base_mask)
-    canvas.alpha_composite(clipped)
-
-    shine = Image.new("RGBA", (size, size), TRANSPARENT)
-    shine_draw = ImageDraw.Draw(shine)
-    shine_draw.ellipse(
-        (size * -0.12, size * -0.18, size * 0.78, size * 0.58),
-        fill=(255, 255, 255, 30 if light else 42),
-    )
-    shine.putalpha(Image.composite(shine.getchannel("A"), Image.new("L", (size, size), 0), base_mask))
-    canvas.alpha_composite(shine)
-
-    lower_glaze = Image.new("RGBA", (size, size), TRANSPARENT)
-    lower_draw = ImageDraw.Draw(lower_glaze)
-    lower_draw.rounded_rectangle(
-        base_rect,
-        radius=corner,
-        fill=(0, 0, 0, 18 if light else 12),
-    )
-    lower_mask = Image.new("L", (size, size), 0)
-    lower_mask_draw = ImageDraw.Draw(lower_mask)
-    lower_mask_draw.rectangle((0, size * 0.55, size, size), fill=255)
-    lower_glaze.putalpha(Image.composite(lower_glaze.getchannel("A"), Image.new("L", (size, size), 0), lower_mask))
-    canvas.alpha_composite(lower_glaze)
-
-    ring = Image.new("RGBA", (size, size), TRANSPARENT)
-    ring_draw = ImageDraw.Draw(ring)
-    ring_draw.rounded_rectangle(
-        base_rect,
-        radius=corner,
-        outline=(255, 255, 255, 58 if light else 48),
-        width=max(1, round(size * 0.012)),
-    )
-    inset = size * 0.018
-    ring_draw.rounded_rectangle(
+def draw_scaled_circle(
+    draw: ImageDraw.ImageDraw,
+    size: int,
+    center_x: float,
+    center_y: float,
+    radius: float,
+    color: tuple[int, int, int, int],
+) -> None:
+    scale = size / 100
+    draw.ellipse(
         (
-            base_rect[0] + inset,
-            base_rect[1] + inset,
-            base_rect[2] - inset,
-            base_rect[3] - inset,
+            (center_x - radius) * scale,
+            (center_y - radius) * scale,
+            (center_x + radius) * scale,
+            (center_y + radius) * scale,
         ),
-        radius=max(1, corner - round(inset)),
-        outline=(0, 0, 0, 26 if light else 20),
-        width=max(1, round(size * 0.006)),
-    )
-    canvas.alpha_composite(ring)
-
-    glyph_shadow = Image.new("RGBA", (size, size), TRANSPARENT)
-    shadow_draw = ImageDraw.Draw(glyph_shadow)
-    draw_logo(shadow_draw, size, (0, 0, 0, 76 if light else 58))
-    glyph_shadow = glyph_shadow.transform(
-        glyph_shadow.size,
-        Image.Transform.AFFINE,
-        (1, 0, 0, 0, 1, size * 0.018),
-        resample=Image.Resampling.BICUBIC,
+        fill=color,
     )
-    glyph_shadow = glyph_shadow.filter(ImageFilter.GaussianBlur(radius=max(1, size * 0.006)))
-    canvas.alpha_composite(glyph_shadow)
-
-    glyph = Image.new("RGBA", (size, size), TRANSPARENT)
-    draw = ImageDraw.Draw(glyph)
-    draw_logo(draw, size, symbol)
-    canvas.alpha_composite(glyph)
-
-    glyph_highlight = Image.new("RGBA", (size, size), TRANSPARENT)
-    highlight_draw = ImageDraw.Draw(glyph_highlight)
-    draw_logo(highlight_draw, size, (255, 255, 255, 26 if light else 34))
-    glyph_highlight = glyph_highlight.transform(
-        glyph_highlight.size,
-        Image.Transform.AFFINE,
-        (1, 0, 0, 0, 1, -size * 0.012),
-        resample=Image.Resampling.BICUBIC,
-    )
-    canvas.alpha_composite(glyph_highlight)
-    return canvas
 
 
 def make_tray_template(
     size: int = 64,
-    color: tuple[int, int, int, int] = (0, 0, 0, 255),
+    color: tuple[int, int, int, int] = BLACK,
 ) -> Image.Image:
     img = Image.new("RGBA", (size, size), TRANSPARENT)
     draw = ImageDraw.Draw(img)
-    draw_logo(draw, size, color)
-    return img
-
+    scale = size / 100
+    width = max(2, round(size * 0.078))
+    center = 50 * scale
 
-def ensure_dirs() -> None:
-    BRANDING_DIR.mkdir(parents=True, exist_ok=True)
-    WEB_ICONS_DIR.mkdir(parents=True, exist_ok=True)
-    MAC_ICON_DIR.mkdir(parents=True, exist_ok=True)
-    LINUX_ICON_DIR.mkdir(parents=True, exist_ok=True)
-    SERVER_PUBLIC_ICONS_DIR.mkdir(parents=True, exist_ok=True)
-    STATIC_IMG_DIR.mkdir(parents=True, exist_ok=True)
-    LANDING_LOGO_PATH.parent.mkdir(parents=True, exist_ok=True)
-    EXTENSION_LOGO_PATH.parent.mkdir(parents=True, exist_ok=True)
+    draw.arc(
+        (
+            (50 - 30) * scale,
+            (50 - 30) * scale,
+            (50 + 30) * scale,
+            (50 + 30) * scale,
+        ),
+        start=158,
+        end=444,
+        fill=color,
+        width=width,
+    )
+    draw.arc(
+        (
+            (50 - 17) * scale,
+            (50 - 17) * scale,
+            (50 + 17) * scale,
+            (50 + 17) * scale,
+        ),
+        start=68,
+        end=330,
+        fill=color,
+        width=width,
+    )
+    draw_scaled_circle(draw, size, 50, 50, 7, color)
+    draw_scaled_circle(draw, size, 50, 20, 5.6, color)
+
+    # Slightly round arc ends so the template keeps the supplied logo's soft tube feel.
+    end_radius = width / 2
+    for x, y in ((77.2, 74.8), (80.0, 41.2), (32.0, 29.7), (68.8, 39.2)):
+        draw.ellipse(
+            (
+                x * scale - end_radius,
+                y * scale - end_radius,
+                x * scale + end_radius,
+                y * scale + end_radius,
+            ),
+            fill=color,
+        )
 
+    # Keep the symbol optically centered inside the menu-bar bounds.
+    return img.crop((0, 2, size, size + 2))
 
-def write_text(path: Path, content: str) -> None:
-    path.write_text(content, encoding="utf-8")
 
+def main() -> None:
+    ensure_dirs()
 
-def copy_png(image: Image.Image, path: Path, size: int) -> None:
-    path.parent.mkdir(parents=True, exist_ok=True)
-    save_png(image, path, size)
-
-
-def write_favicon_svg(path: Path, *, light: bool = False) -> None:
-    start = ACCENT if light else ACCENT_DARK
-    end = ACCENT_ALT if light else ACCENT_ALT_DARK
-    symbol = "#fff9ed" if light else "#ffffff"
-    stroke = "#000000" if light else "#ffffff"
-    stroke_opacity = "0.24" if light else "0.16"
-    glow = "#ffffff" if light else "#fff4d8"
-    top_opacity = "0.20" if light else "0.24"
-    shade_opacity = "0.12" if light else "0.08"
-    svg = f"""<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <defs>
-    <linearGradient id="bg" x1="0%" y1="0%" x2="100%" y2="100%">
-      <stop offset="0%" stop-color="#{start[0]:02x}{start[1]:02x}{start[2]:02x}"/>
-      <stop offset="100%" stop-color="#{end[0]:02x}{end[1]:02x}{end[2]:02x}"/>
-    </linearGradient>
-    <radialGradient id="shine" cx="24%" cy="15%" r="70%">
-      <stop offset="0%" stop-color="{glow}" stop-opacity="{top_opacity}"/>
-      <stop offset="100%" stop-color="{glow}" stop-opacity="0"/>
-    </radialGradient>
-  </defs>
-  <rect x="2.5" y="2.5" width="27" height="27" rx="9" ry="9" fill="url(#bg)" stroke="{stroke}" stroke-opacity="{stroke_opacity}" stroke-width="1"/>
-  <rect x="2.5" y="2.5" width="27" height="27" rx="9" ry="9" fill="url(#shine)"/>
-  <path d="M2.5 17h27v3.5c0 5-4 9-9 9h-9c-5 0-9-4-9-9Z" fill="#000000" opacity="{shade_opacity}"/>
-  <rect x="3" y="3" width="26" height="26" rx="8.5" ry="8.5" fill="none" stroke="#ffffff" stroke-opacity="0.18" stroke-width="1"/>
-  <path d="M16 6.25 26.15 12.3 16 16.3 5.85 12.3Z" fill="#000000" opacity="0.20" transform="translate(0 0.65)"/>
-  <path d="M16 14.75 25.85 19.45 16 22.25 6.15 19.45Z" fill="#000000" opacity="0.20" transform="translate(0 0.65)"/>
-  <path d="M16 20.45 24.85 24.75 16 26.85 7.15 24.75Z" fill="#000000" opacity="0.20" transform="translate(0 0.65)"/>
-  <path d="M16 5.7 26.8 12.1 16 16.5 5.2 12.1Z" fill="{symbol}"/>
-  <path d="M16 14.2 26.5 19.3 16 22.4 5.5 19.3Z" fill="{symbol}"/>
-  <path d="M16 20 25.4 24.6 16 27 6.6 24.6Z" fill="{symbol}"/>
-</svg>
-"""
-    write_text(path, svg)
-
-
-def save_png(image: Image.Image, path: Path, size: int) -> None:
-    image.resize((size, size), Image.Resampling.LANCZOS).save(path, format="PNG")
+    for size in (1024, 512, 256, 192, 128, 64, 32):
+        save_icon(BRANDING_DIR / f"app_icon_{size}.png", size)
+        save_icon(BRANDING_DIR / f"app_icon_light_{size}.png", size)
 
+    make_tray_template(64).save(BRANDING_DIR / "tray_icon_template.png", format="PNG")
+    make_tray_template(64, WHITE).save(BRANDING_DIR / "tray_icon_light_template.png", format="PNG")
 
-def main() -> None:
-    ensure_dirs()
-    master = make_app_icon(1024)
-    light_master = make_app_icon(1024, light=True)
-
-    save_png(master, BRANDING_DIR / "app_icon_1024.png", 1024)
-    save_png(master, BRANDING_DIR / "app_icon_512.png", 512)
-    save_png(master, BRANDING_DIR / "app_icon_256.png", 256)
-    save_png(master, BRANDING_DIR / "app_icon_192.png", 192)
-    save_png(master, BRANDING_DIR / "app_icon_128.png", 128)
-    save_png(master, BRANDING_DIR / "app_icon_64.png", 64)
-    save_png(master, BRANDING_DIR / "app_icon_32.png", 32)
-    save_png(light_master, BRANDING_DIR / "app_icon_light_1024.png", 1024)
-    save_png(light_master, BRANDING_DIR / "app_icon_light_512.png", 512)
-    save_png(light_master, BRANDING_DIR / "app_icon_light_256.png", 256)
-    save_png(light_master, BRANDING_DIR / "app_icon_light_192.png", 192)
-    save_png(light_master, BRANDING_DIR / "app_icon_light_128.png", 128)
-    save_png(light_master, BRANDING_DIR / "app_icon_light_64.png", 64)
-    save_png(light_master, BRANDING_DIR / "app_icon_light_32.png", 32)
-
-    tray = make_tray_template(64)
-    save_png(tray, BRANDING_DIR / "tray_icon_template.png", 64)
-    light_tray = make_tray_template(64, WHITE)
-    save_png(light_tray, BRANDING_DIR / "tray_icon_light_template.png", 64)
-
-    icon_sizes = {
-        16: "app_icon_16.png",
-        32: "app_icon_32.png",
-        64: "app_icon_64.png",
-        128: "app_icon_128.png",
-        256: "app_icon_256.png",
-        512: "app_icon_512.png",
-        1024: "app_icon_1024.png",
-    }
-    for size, filename in icon_sizes.items():
-        save_png(master, MAC_ICON_DIR / filename, size)
+    for size in (16, 32, 64, 128, 256, 512, 1024):
+        save_icon(MAC_ICON_DIR / f"app_icon_{size}.png", size)
 
-    save_png(master, LINUX_ICON_DIR / "app_icon.png", 256)
+    save_icon(LINUX_ICON_DIR / "app_icon.png", 256)
 
-    master_for_ico = master.resize((256, 256), Image.Resampling.LANCZOS)
-    master_for_ico.save(
+    load_source_icon(256).save(
         WINDOWS_ICON_PATH,
         format="ICO",
         sizes=[(16, 16), (24, 24), (32, 32), (48, 48), (64, 64), (128, 128), (256, 256)],
@@ -317,26 +170,33 @@ def main() -> None:
         512: "Icon-512.png",
     }
     for size, filename in web_icon_sizes.items():
-        copy_png(master, WEB_ICONS_DIR / filename, size)
-        copy_png(master, WEB_ICONS_DIR / filename.replace("Icon-", "Icon-maskable-"), size)
-        copy_png(light_master, WEB_ICONS_DIR / filename.replace(".png", "-light.png"), size)
-        copy_png(light_master, WEB_ICONS_DIR / filename.replace("Icon-", "Icon-maskable-").replace(".png", "-light.png"), size)
-        copy_png(master, SERVER_PUBLIC_ICONS_DIR / filename, size)
-        copy_png(master, SERVER_PUBLIC_ICONS_DIR / filename.replace("Icon-", "Icon-maskable-"), size)
-
-    copy_png(master, WEB_DIR / "favicon.png", 32)
-    copy_png(master, SERVER_PUBLIC_DIR / "favicon.png", 32)
-    write_favicon_svg(WEB_DIR / "favicon.svg")
-    write_favicon_svg(WEB_DIR / "favicon_light.svg", light=True)
-    write_favicon_svg(SERVER_PUBLIC_DIR / "favicon.svg")
-    write_favicon_svg(SERVER_PUBLIC_DIR / "favicon_light.svg", light=True)
-    write_favicon_svg(LANDING_LOGO_PATH, light=True)
-    write_favicon_svg(EXTENSION_LOGO_PATH)
-    copy_png(master, STATIC_IMG_DIR / "app_icon.png", 512)
-    copy_png(light_master, STATIC_IMG_DIR / "app_icon_light.png", 512)
-    copy_png(master, SERVER_PUBLIC_DIR / "assets" / "assets" / "branding" / "app_icon_256.png", 256)
-    copy_png(tray, SERVER_PUBLIC_DIR / "assets" / "assets" / "branding" / "tray_icon_template.png", 64)
-    copy_png(master, SERVER_PUBLIC_DIR / "assets" / "web" / "icons" / "Icon-192.png", 192)
+        save_icon(WEB_ICONS_DIR / filename, size)
+        save_icon(WEB_ICONS_DIR / filename.replace("Icon-", "Icon-maskable-"), size)
+        save_icon(WEB_ICONS_DIR / filename.replace(".png", "-light.png"), size)
+        save_icon(WEB_ICONS_DIR / filename.replace("Icon-", "Icon-maskable-").replace(".png", "-light.png"), size)
+        save_icon(SERVER_PUBLIC_ICONS_DIR / filename, size)
+        save_icon(SERVER_PUBLIC_ICONS_DIR / filename.replace("Icon-", "Icon-maskable-"), size)
+
+    save_icon(WEB_DIR / "favicon.png", 32)
+    save_icon(SERVER_PUBLIC_DIR / "favicon.png", 32)
+    write_source_svg(WEB_DIR / "favicon.svg")
+    write_source_svg(WEB_DIR / "favicon_light.svg")
+    write_source_svg(SERVER_PUBLIC_DIR / "favicon.svg")
+    write_source_svg(SERVER_PUBLIC_DIR / "favicon_light.svg")
+    write_source_svg(LANDING_LOGO_PATH)
+    write_source_svg(EXTENSION_LOGO_PATH)
+
+    for size in (16, 48, 128):
+        save_icon(EXTENSION_ICON_DIR / f"icon{size}.png", size)
+
+    save_icon(STATIC_IMG_DIR / "app_icon.png", 512)
+    save_icon(STATIC_IMG_DIR / "app_icon_light.png", 512)
+    save_icon(SERVER_PUBLIC_DIR / "assets" / "assets" / "branding" / "app_icon_256.png", 256)
+    make_tray_template(64).save(
+        SERVER_PUBLIC_DIR / "assets" / "assets" / "branding" / "tray_icon_template.png",
+        format="PNG",
+    )
+    save_icon(SERVER_PUBLIC_DIR / "assets" / "web" / "icons" / "Icon-192.png", 192)
 
     android_icon_sizes = {
         "mipmap-mdpi": 48,
@@ -346,7 +206,7 @@ def main() -> None:
         "mipmap-xxxhdpi": 192,
     }
     for folder, size in android_icon_sizes.items():
-        copy_png(master, ANDROID_RES_DIR / folder / "ic_launcher.png", size)
+        save_icon(ANDROID_RES_DIR / folder / "ic_launcher.png", size)
 
 
 if __name__ == "__main__":

package/flutter_app/web/favicon.svg

@@ -1,22 +1,43 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 100 100">
   <defs>
-    <linearGradient id="bg" x1="0%" y1="0%" x2="100%" y2="100%">
-      <stop offset="0%" stop-color="#9e8052"/>
-      <stop offset="100%" stop-color="#439081"/>
+    <linearGradient id="tile" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" stop-color="#705331"></stop>
+      <stop offset="100%" stop-color="#22564c"></stop>
     </linearGradient>
-    <radialGradient id="shine" cx="24%" cy="15%" r="70%">
-      <stop offset="0%" stop-color="#fff4d8" stop-opacity="0.24"/>
-      <stop offset="100%" stop-color="#fff4d8" stop-opacity="0"/>
+    <radialGradient id="shine" cx="26%" cy="14%" r="72%">
+      <stop offset="0%" stop-color="#ffffff" stop-opacity="0.22"></stop>
+      <stop offset="100%" stop-color="#ffffff" stop-opacity="0"></stop>
     </radialGradient>
+    <radialGradient id="core" cx="38%" cy="32%" r="75%">
+      <stop offset="0%" stop-color="#fffdf6"></stop>
+      <stop offset="48%" stop-color="#eee3cc"></stop>
+      <stop offset="100%" stop-color="#b5a888"></stop>
+    </radialGradient>
+    <radialGradient id="node" cx="36%" cy="30%" r="80%">
+      <stop offset="0%" stop-color="#f8dca8"></stop>
+      <stop offset="52%" stop-color="#d3a85f"></stop>
+      <stop offset="100%" stop-color="#9b6f2f"></stop>
+    </radialGradient>
+    <linearGradient id="tube" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#fffaf0"></stop>
+      <stop offset="52%" stop-color="#efe7d6"></stop>
+      <stop offset="100%" stop-color="#cabf9f"></stop>
+    </linearGradient>
+    <filter id="sh" x="-30%" y="-30%" width="160%" height="160%">
+      <feDropShadow dx="0" dy="1.1" stdDeviation="1.1" flood-color="#000000" flood-opacity="0.45"></feDropShadow>
+    </filter>
+    <clipPath id="tc"><rect x="0" y="0" width="100" height="100" rx="22.5"></rect></clipPath>
   </defs>
-  <rect x="2.5" y="2.5" width="27" height="27" rx="9" ry="9" fill="url(#bg)" stroke="#ffffff" stroke-opacity="0.16" stroke-width="1"/>
-  <rect x="2.5" y="2.5" width="27" height="27" rx="9" ry="9" fill="url(#shine)"/>
-  <path d="M2.5 17h27v3.5c0 5-4 9-9 9h-9c-5 0-9-4-9-9Z" fill="#000000" opacity="0.08"/>
-  <rect x="3" y="3" width="26" height="26" rx="8.5" ry="8.5" fill="none" stroke="#ffffff" stroke-opacity="0.18" stroke-width="1"/>
-  <path d="M16 6.25 26.15 12.3 16 16.3 5.85 12.3Z" fill="#000000" opacity="0.20" transform="translate(0 0.65)"/>
-  <path d="M16 14.75 25.85 19.45 16 22.25 6.15 19.45Z" fill="#000000" opacity="0.20" transform="translate(0 0.65)"/>
-  <path d="M16 20.45 24.85 24.75 16 26.85 7.15 24.75Z" fill="#000000" opacity="0.20" transform="translate(0 0.65)"/>
-  <path d="M16 5.7 26.8 12.1 16 16.5 5.2 12.1Z" fill="#ffffff"/>
-  <path d="M16 14.2 26.5 19.3 16 22.4 5.5 19.3Z" fill="#ffffff"/>
-  <path d="M16 20 25.4 24.6 16 27 6.6 24.6Z" fill="#ffffff"/>
-</svg>
+  <g clip-path="url(#tc)">
+    <rect x="0" y="0" width="100" height="100" fill="url(#tile)"></rect>
+    <rect x="0" y="0" width="100" height="100" fill="url(#shine)"></rect>
+    <g fill="none" stroke="url(#tube)" stroke-linecap="round" filter="url(#sh)">
+      <circle cx="50" cy="50" r="17" stroke-width="5" stroke-dasharray="78 29" transform="rotate(-35 50 50)" stroke-opacity="0.92"></circle>
+      <circle cx="50" cy="50" r="30" stroke-width="5" stroke-dasharray="150 39" transform="rotate(70 50 50)" stroke-opacity="0.8"></circle>
+    </g>
+    <circle cx="50" cy="50" r="7" fill="url(#core)"></circle>
+    <circle cx="50" cy="20" r="5.6" fill="url(#node)"></circle>
+    <circle cx="48" cy="18.4" r="1.7" fill="#fff7e6" fill-opacity="0.8"></circle>
+  </g>
+  <rect x="0.6" y="0.6" width="98.8" height="98.8" rx="22" fill="none" stroke="#ffffff" stroke-opacity="0.16" stroke-width="1.2"></rect>
+</svg>

package/flutter_app/web/favicon_light.svg

@@ -1,22 +1,43 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 100 100">
   <defs>
-    <linearGradient id="bg" x1="0%" y1="0%" x2="100%" y2="100%">
-      <stop offset="0%" stop-color="#684e2c"/>
-      <stop offset="100%" stop-color="#235c52"/>
+    <linearGradient id="tile" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" stop-color="#705331"></stop>
+      <stop offset="100%" stop-color="#22564c"></stop>
     </linearGradient>
-    <radialGradient id="shine" cx="24%" cy="15%" r="70%">
-      <stop offset="0%" stop-color="#ffffff" stop-opacity="0.20"/>
-      <stop offset="100%" stop-color="#ffffff" stop-opacity="0"/>
+    <radialGradient id="shine" cx="26%" cy="14%" r="72%">
+      <stop offset="0%" stop-color="#ffffff" stop-opacity="0.22"></stop>
+      <stop offset="100%" stop-color="#ffffff" stop-opacity="0"></stop>
     </radialGradient>
+    <radialGradient id="core" cx="38%" cy="32%" r="75%">
+      <stop offset="0%" stop-color="#fffdf6"></stop>
+      <stop offset="48%" stop-color="#eee3cc"></stop>
+      <stop offset="100%" stop-color="#b5a888"></stop>
+    </radialGradient>
+    <radialGradient id="node" cx="36%" cy="30%" r="80%">
+      <stop offset="0%" stop-color="#f8dca8"></stop>
+      <stop offset="52%" stop-color="#d3a85f"></stop>
+      <stop offset="100%" stop-color="#9b6f2f"></stop>
+    </radialGradient>
+    <linearGradient id="tube" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#fffaf0"></stop>
+      <stop offset="52%" stop-color="#efe7d6"></stop>
+      <stop offset="100%" stop-color="#cabf9f"></stop>
+    </linearGradient>
+    <filter id="sh" x="-30%" y="-30%" width="160%" height="160%">
+      <feDropShadow dx="0" dy="1.1" stdDeviation="1.1" flood-color="#000000" flood-opacity="0.45"></feDropShadow>
+    </filter>
+    <clipPath id="tc"><rect x="0" y="0" width="100" height="100" rx="22.5"></rect></clipPath>
   </defs>
-  <rect x="2.5" y="2.5" width="27" height="27" rx="9" ry="9" fill="url(#bg)" stroke="#000000" stroke-opacity="0.24" stroke-width="1"/>
-  <rect x="2.5" y="2.5" width="27" height="27" rx="9" ry="9" fill="url(#shine)"/>
-  <path d="M2.5 17h27v3.5c0 5-4 9-9 9h-9c-5 0-9-4-9-9Z" fill="#000000" opacity="0.12"/>
-  <rect x="3" y="3" width="26" height="26" rx="8.5" ry="8.5" fill="none" stroke="#ffffff" stroke-opacity="0.18" stroke-width="1"/>
-  <path d="M16 6.25 26.15 12.3 16 16.3 5.85 12.3Z" fill="#000000" opacity="0.20" transform="translate(0 0.65)"/>
-  <path d="M16 14.75 25.85 19.45 16 22.25 6.15 19.45Z" fill="#000000" opacity="0.20" transform="translate(0 0.65)"/>
-  <path d="M16 20.45 24.85 24.75 16 26.85 7.15 24.75Z" fill="#000000" opacity="0.20" transform="translate(0 0.65)"/>
-  <path d="M16 5.7 26.8 12.1 16 16.5 5.2 12.1Z" fill="#fff9ed"/>
-  <path d="M16 14.2 26.5 19.3 16 22.4 5.5 19.3Z" fill="#fff9ed"/>
-  <path d="M16 20 25.4 24.6 16 27 6.6 24.6Z" fill="#fff9ed"/>
-</svg>
+  <g clip-path="url(#tc)">
+    <rect x="0" y="0" width="100" height="100" fill="url(#tile)"></rect>
+    <rect x="0" y="0" width="100" height="100" fill="url(#shine)"></rect>
+    <g fill="none" stroke="url(#tube)" stroke-linecap="round" filter="url(#sh)">
+      <circle cx="50" cy="50" r="17" stroke-width="5" stroke-dasharray="78 29" transform="rotate(-35 50 50)" stroke-opacity="0.92"></circle>
+      <circle cx="50" cy="50" r="30" stroke-width="5" stroke-dasharray="150 39" transform="rotate(70 50 50)" stroke-opacity="0.8"></circle>
+    </g>
+    <circle cx="50" cy="50" r="7" fill="url(#core)"></circle>
+    <circle cx="50" cy="20" r="5.6" fill="url(#node)"></circle>
+    <circle cx="48" cy="18.4" r="1.7" fill="#fff7e6" fill-opacity="0.8"></circle>
+  </g>
+  <rect x="0.6" y="0.6" width="98.8" height="98.8" rx="22" fill="none" stroke="#ffffff" stroke-opacity="0.16" stroke-width="1.2"></rect>
+</svg>