diff --git a/app/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/android/app/src/main/res/drawable/ic_launcher_foreground.xml index 060e17ab..345dfaed 100644 --- a/app/android/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/android/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,21 +1,18 @@ - + - - + + + + + + + + + diff --git a/app/android/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/android/app/src/main/res/drawable/ic_launcher_monochrome.xml new file mode 100644 index 00000000..7a12ecd8 --- /dev/null +++ b/app/android/app/src/main/res/drawable/ic_launcher_monochrome.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/app/android/app/src/main/res/drawable/ic_stat_pipelines.xml b/app/android/app/src/main/res/drawable/ic_stat_pipelines.xml index 59018a0a..2ee976d9 100644 --- a/app/android/app/src/main/res/drawable/ic_stat_pipelines.xml +++ b/app/android/app/src/main/res/drawable/ic_stat_pipelines.xml @@ -1,12 +1,18 @@ - + - + + + + + + + + + + diff --git a/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 0b0d585e..10bc7a5d 100644 --- a/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -2,5 +2,5 @@ - + diff --git a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index ddd04c3e..8d48e1a9 100644 Binary files a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 081cbd10..e4642e69 100644 Binary files a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index e8134786..0f7db90f 100644 Binary files a/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 4a03a2d3..581a16d8 100644 Binary files a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index f42f52f8..0e85022e 100644 Binary files a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/android/app/src/main/res/values/ic_launcher_background.xml b/app/android/app/src/main/res/values/ic_launcher_background.xml index 2cacd08d..0d8bd329 100644 --- a/app/android/app/src/main/res/values/ic_launcher_background.xml +++ b/app/android/app/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - #101013 + #15151C diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index dc9ada47..3bb86a8a 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 7353c41e..3c6981a2 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index 797d452e..df3a6efb 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index 6ed2d933..80064b4e 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index 4cd7b009..571e77df 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index fe730945..2bf54cd4 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 321773cd..dbbb522e 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index 797d452e..df3a6efb 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 502f463a..2660d86e 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index 0ec30343..dd83b98e 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index 0ec30343..dd83b98e 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index e9f5fea2..e5db39b6 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 84ac32ae..5d2b1d59 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index 8953cba0..39a18e79 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 0467bf12..6c415afd 100644 Binary files a/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/app/tool/app_icon/README.md b/app/tool/app_icon/README.md new file mode 100644 index 00000000..b7108486 --- /dev/null +++ b/app/tool/app_icon/README.md @@ -0,0 +1,13 @@ +# App icon + +The Pipelines mark: one stage forking into two parallel stages that rejoin in +a finished (ring) stage, on the dark app background. + +- `make_icon.py OUTDIR` writes the SVG variants (`rounded.svg` for web and + legacy Android, `square.svg` for iOS, `maskable.svg` for the PWA) and the + Android vectors (adaptive foreground, themed monochrome, status-bar icon). +- `render.sh SVG SIZE OUT.png` renders an SVG with headless Chrome. + +Regenerate the PNGs at the sizes listed in `web/`, `android/app/src/main/res/mipmap-*` +and `ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json` (iOS icons +are flattened onto the background: they must be opaque). diff --git a/app/tool/app_icon/make_icon.py b/app/tool/app_icon/make_icon.py new file mode 100644 index 00000000..421e0643 --- /dev/null +++ b/app/tool/app_icon/make_icon.py @@ -0,0 +1,77 @@ +"""Generates the Pipelines mark as SVG variants and the Android vector drawables.""" +import sys, os +OUT = sys.argv[1] + +def graph(color=True, mono='#FFFFFF'): + c = (lambda v: v) if color else (lambda v: mono) + return f''' + + + + + + + + + ''' + +def svg(scale=1.12, rounded=True, background=True, color=True): + bg = '' + if background: + rx = ' rx="14"' if rounded else '' + bg = f''' + ''' + t = f'translate(32 32) scale({scale}) translate(-32 -32)' + return f''' + {bg} + + {graph(color)} + + +''' + +variants = { + 'rounded.svg': svg(), # favicon, web icons, legacy Android + 'square.svg': svg(rounded=False), # iOS (the OS masks corners) + 'maskable.svg': svg(scale=0.92, rounded=False), # PWA maskable: inside the 80% safe circle +} +for name, body in variants.items(): + open(os.path.join(OUT, name), 'w').write(body) + +# Android vectors share one path set. The 64-unit graph is placed in the 108dp +# adaptive canvas inside the 66dp safe zone (scale 66/64*0.92 about the centre). +def vector(color=True, size=108, scale=None, comment=''): + s = scale if scale is not None else (66 / 64) * 1.12 + tx = size / 2 - 32 * s + def col(v): return v if color else '#FFFFFFFF' + def stroke(d, colr, w=3.6): + return f''' ''' + def dot(cx, cy, r, colr): + d = f'M{cx - r},{cy}a{r},{r} 0,1 0,{2 * r},0a{r},{r} 0,1 0,{-2 * r},0' + return f''' ''' + ring = 'M49,32m-4.3,0a4.3,4.3 0,1 0,8.6,0a4.3,4.3 0,1 0,-8.6,0' + return f''' + + + +{stroke('M17,32 C24,32 24,21 31,21', '#FF8FA8FF')} +{stroke('M17,32 C24,32 24,43 31,43', '#FF8FA8FF')} +{stroke('M33,21 C39.5,21 39.5,32 43.6,32', '#FF5FD3B8')} +{stroke('M33,43 C39.5,43 39.5,32 43.6,32', '#FFC59BFF')} +{dot(15, 32, 6, '#FF8FA8FF')} +{dot(32, 21, 5.2, '#FF5FD3B8')} +{dot(32, 43, 5.2, '#FFC59BFF')} +{stroke(ring, '#FF7BE39B', 3.4)} + + +''' + +open(os.path.join(OUT, 'ic_launcher_foreground.xml'), 'w').write(vector(comment='Adaptive icon foreground: the graph in the 66dp safe zone.')) +open(os.path.join(OUT, 'ic_launcher_monochrome.xml'), 'w').write(vector(color=False, comment='Themed (monochrome) icon: the same graph in one colour.')) +# Notification small icon: 24dp, white, the graph filling most of the canvas. +open(os.path.join(OUT, 'ic_stat_pipelines.xml'), 'w').write(vector(color=False, size=24, scale=24 / 64 * 1.12, comment='Status bar icon (white; Android tints it).')) +print('ok') diff --git a/app/tool/app_icon/mark.svg b/app/tool/app_icon/mark.svg new file mode 100644 index 00000000..06ebbe2f --- /dev/null +++ b/app/tool/app_icon/mark.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/app/tool/app_icon/render.sh b/app/tool/app_icon/render.sh new file mode 100755 index 00000000..5b783afc --- /dev/null +++ b/app/tool/app_icon/render.sh @@ -0,0 +1,7 @@ +#!/bin/bash +# render.sh [bg] — renders an SVG at size×size with headless Chrome (transparent by default). +svg=$1; size=$2; out=$3; bg=${4:-transparent} +html=$(mktemp "${TMPDIR:-/tmp}/icon-render.XXXXXX.html") +printf '' "$bg" "$svg" "$size" "$size" > "$html" +"/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" --headless=new --disable-gpu --hide-scrollbars --default-background-color=00000000 --force-device-scale-factor=1 --allow-file-access-from-files --window-size=$size,$((size+0)) --screenshot="$out" "file://$html" >/dev/null 2>&1 +rm -f "$html" diff --git a/app/web/favicon.ico b/app/web/favicon.ico index b0227f09..93f0ad5c 100644 Binary files a/app/web/favicon.ico and b/app/web/favicon.ico differ diff --git a/app/web/favicon.png b/app/web/favicon.png index 9dec08dc..68d44dd5 100644 Binary files a/app/web/favicon.png and b/app/web/favicon.png differ diff --git a/app/web/favicon.svg b/app/web/favicon.svg index 18f48e0b..06ebbe2f 100644 --- a/app/web/favicon.svg +++ b/app/web/favicon.svg @@ -1,4 +1,16 @@ - - + + + + + + + + + + + + + + diff --git a/app/web/icons/Icon-192.png b/app/web/icons/Icon-192.png index f42f52f8..0e85022e 100644 Binary files a/app/web/icons/Icon-192.png and b/app/web/icons/Icon-192.png differ diff --git a/app/web/icons/Icon-512.png b/app/web/icons/Icon-512.png index 0c50daf2..480486de 100644 Binary files a/app/web/icons/Icon-512.png and b/app/web/icons/Icon-512.png differ diff --git a/app/web/icons/Icon-maskable-192.png b/app/web/icons/Icon-maskable-192.png index 99c7f392..9f0da15a 100644 Binary files a/app/web/icons/Icon-maskable-192.png and b/app/web/icons/Icon-maskable-192.png differ diff --git a/app/web/icons/Icon-maskable-512.png b/app/web/icons/Icon-maskable-512.png index c75b9627..5957b1a3 100644 Binary files a/app/web/icons/Icon-maskable-512.png and b/app/web/icons/Icon-maskable-512.png differ