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 345dfaed..633fc051 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,18 +1,11 @@ - + - - - - - - - - - + + 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 index 7a12ecd8..7a2bdb02 100644 --- a/app/android/app/src/main/res/drawable/ic_launcher_monochrome.xml +++ b/app/android/app/src/main/res/drawable/ic_launcher_monochrome.xml @@ -1,18 +1,11 @@ - + - - - - - - - - - + + 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 2ee976d9..8027df7b 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,18 +1,11 @@ - + - - - - - - - - - + + 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 8d48e1a9..ef51a6bd 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 e4642e69..b17a99dd 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 0f7db90f..a5c6f6ed 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 581a16d8..1ca7b488 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 0e85022e..a70af616 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/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 3bb86a8a..1657f1df 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 3c6981a2..9aa80fc9 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 df3a6efb..18aacfaa 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 80064b4e..4199e7f3 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 571e77df..8bdabeac 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 2bf54cd4..b9a56754 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 dbbb522e..1d25c1ba 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 df3a6efb..18aacfaa 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 2660d86e..b8f5bce5 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 dd83b98e..a48beb07 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 dd83b98e..a48beb07 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 e5db39b6..d2e7fa39 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 5d2b1d59..9c8bccbd 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 39a18e79..856ceb53 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 6c415afd..7632dc5c 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 index b7108486..66128300 100644 --- a/app/tool/app_icon/README.md +++ b/app/tool/app_icon/README.md @@ -1,7 +1,8 @@ # App icon -The Pipelines mark: one stage forking into two parallel stages that rejoin in -a finished (ring) stage, on the dark app background. +The Pipelines app icon: the Pipelines tab glyph (Material `account_tree`, +outlined, extracted from Flutter's MaterialIcons font) in white 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 diff --git a/app/tool/app_icon/make_icon.py b/app/tool/app_icon/make_icon.py index 421e0643..fcd2bcec 100644 --- a/app/tool/app_icon/make_icon.py +++ b/app/tool/app_icon/make_icon.py @@ -1,77 +1,59 @@ -"""Generates the Pipelines mark as SVG variants and the Android vector drawables.""" -import sys, os +"""Generates the Pipelines app icon: the Pipelines tab glyph (Material +account_tree, outlined) in white on the dark app background. + + python3 make_icon.py OUTDIR + +Writes rounded.svg (web, legacy Android), square.svg (iOS), maskable.svg (PWA) +and the Android vectors: adaptive foreground, themed monochrome and the +status-bar icon. +""" +import os +import sys + OUT = sys.argv[1] +# Material Icons "account_tree" (outlined), 24-unit grid. +# Extracted from Flutter's MaterialIcons-Regular.otf (U+EE36). +GLYPH = 'M21.984 11.016V3H15V6H9V3H2.016V11.016H9V8.016H11.016V18H15V21H21.984V12.984H15V15.984H12.984V8.016H15V11.016H21.984ZM6.984 9H3.984V5.016H6.984V9ZM17.016 15H20.016V18.984H17.016V15ZM17.016 5.016H20.016V9H17.016V5.016Z' +WHITE = '#FFFFFF' -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)' +def svg(glyph_size=34.0, rounded=True): + rx = ' rx="14"' if rounded else '' + s = glyph_size / 24 + t = 32 - 12 * s 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' +def vector(size, glyph_size, comment): + s = glyph_size / 24 + t = size / 2 - 12 * s 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).')) + +for name, body in { + 'rounded.svg': svg(), + 'square.svg': svg(rounded=False), + 'maskable.svg': svg(glyph_size=28, rounded=False), +}.items(): + open(os.path.join(OUT, name), 'w').write(body) +# Adaptive canvas 108dp: the glyph at ~46dp sits well inside the 66dp safe zone. +open(os.path.join(OUT, 'ic_launcher_foreground.xml'), 'w').write(vector(108, 46, 'Adaptive icon foreground.')) +open(os.path.join(OUT, 'ic_launcher_monochrome.xml'), 'w').write(vector(108, 46, 'Themed (monochrome) icon.')) +open(os.path.join(OUT, 'ic_stat_pipelines.xml'), 'w').write(vector(24, 22, 'Status bar icon (Android tints it).')) print('ok') diff --git a/app/tool/app_icon/mark.svg b/app/tool/app_icon/mark.svg index 06ebbe2f..7278679d 100644 --- a/app/tool/app_icon/mark.svg +++ b/app/tool/app_icon/mark.svg @@ -1,16 +1,5 @@ - - - - - - - - - - - - + diff --git a/app/web/favicon.ico b/app/web/favicon.ico index 93f0ad5c..9f411299 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 68d44dd5..0007b8fd 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 06ebbe2f..7278679d 100644 --- a/app/web/favicon.svg +++ b/app/web/favicon.svg @@ -1,16 +1,5 @@ - - - - - - - - - - - - + diff --git a/app/web/icons/Icon-192.png b/app/web/icons/Icon-192.png index 0e85022e..a70af616 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 480486de..8df1f55e 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 9f0da15a..11edfc12 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 5957b1a3..424fc382 100644 Binary files a/app/web/icons/Icon-maskable-512.png and b/app/web/icons/Icon-maskable-512.png differ