diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da906df..3816d65 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,6 +78,10 @@ jobs: fi "$sdkmanager" "platforms;android-36" "build-tools;36.0.0" - run: bundle exec fastlane android checks + - name: Check branding vector conversion + env: + MESSAGE487_TEST_ANDROID_VECTORS: "1" + run: python3 -m unittest discover -s scripts/tests -p test_generate_branding.py - name: Publish test and lint reports if: always() uses: actions/upload-artifact@v7 diff --git a/.gitignore b/.gitignore index 2012478..3ff7794 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ __pycache__/ dist/ .playwright-cli/ test-results/ +**/*.tmp diff --git a/README.md b/README.md index ec91830..4e93d72 100644 --- a/README.md +++ b/README.md @@ -231,7 +231,9 @@ unsigned release APK links are kept in the PR description. See [testing](docs/en For signed APK releases, see [Releases](docs/en/releases.md) and [release automation](docs/en/release-automation.md), and [release testing](docs/en/release-testing.md). English and Russian store descriptions for F-Droid and Google Play share the canonical [Fastlane metadata](fastlane/metadata/android). Store graphics and their provenance are documented -in [Branding](assets/branding/README.md). +in [Branding](assets/branding/README.md). Edit `assets/branding/branding.ai` and run +`./scripts/generate-branding.py` on macOS with Illustrator to regenerate SVG, PNG and Android +icon resources. Ordinary builds use the committed resources and do not require Illustrator. See the [project context](docs/en/project-context.md) for remaining product decisions. This project succeeds [sms487](https://github.com/andre487/sms487). diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index ae3397f..b68d68e 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,12 +1,5 @@ - - - - - - - - - - - + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 2beb164..7456b2c 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,8 +1,8 @@ - - - - - - + + + + + + diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml index a81c434..14f3db3 100644 --- a/app/src/main/res/drawable/ic_notification.xml +++ b/app/src/main/res/drawable/ic_notification.xml @@ -1,3 +1,3 @@ - + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 0b0f1ab..6370e34 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 5b34bbd..024cb75 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index 317738f..2c15bdf 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index de36c53..54f3cea 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index d95ec0f..3e1ed41 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 01f1f83..9394fad 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 15f9f7a..3ef3cf2 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index a884d97..79a5ff1 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index ddf9a89..c95ca7b 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 79492df..07c5a47 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/assets/branding/README.md b/assets/branding/README.md index 7943add..53beed4 100644 --- a/assets/branding/README.md +++ b/assets/branding/README.md @@ -2,53 +2,108 @@ | Asset | Use | | --- | --- | -| [icon.svg](icon.svg) · [PNG](icon.png) | Canonical square artwork for web and PNG exports | +| [branding.ai](branding.ai) | Editable Illustrator master for all four artboards | +| [icon.svg](icon.svg) · [PNG](icon.png) | Exported square artwork for web and launcher/store resources | | [icon-round.svg](icon-round.svg) · [PNG](icon-round.png) | Circular artwork used in the project README and round launcher PNGs | | [status-icon.svg](status-icon.svg) · [PNG](status-icon.png) | Simplified monochrome monitor/phone mark for small sizes | -| [feature.svg](feature.svg) · [PNG](feature.png) | Canonical store banner artwork, 1024×500 | +| [feature.svg](feature.svg) · [PNG](feature.png) | Exported store banner artwork, 1024×500 | | [icon.png](../../fastlane/metadata/android/en-US/images/icon.png) | Store app icon, 512×512 RGB PNG | | [featureGraphic.png](../../fastlane/metadata/android/en-US/images/featureGraphic.png) | Store feature graphic, 1024×500 opaque RGB PNG; shared by both locales | | `fastlane/metadata/android/{en-US,ru-RU}/images/phoneScreenshots/` | Actual phone screenshots in English and Russian, 1080×1920 | -The selected design shows an open envelope on a monitor and a closed envelope on a phone, -with a cyan/blue/violet/magenta gradient inspired by AndroidMegaProxy. The initial concepts -were created with the built-in `image_gen` tool, then reconstructed as native vectors. -The final design prompt was: “Monitor with a small open envelope and phone with a small closed -envelope on a cyan/blue/violet/magenta gradient; preserve generous margins in a circular crop.” +The current launcher artwork shows an open envelope on a monitor and a closed envelope +on a phone, in white on a dark purple background. The editable master is +[`branding.ai`](branding.ai), containing the square, round, status and banner artwork. Each SVG has a matching PNG beside it for sharing where SVG is unsupported. Sizes: square/round icon 512×512, status icon 24×24, feature graphic 1024×500. The round and status PNGs retain transparency; the white status mark needs a contrasting background. Android adaptive layers live in `app/src/main/res/drawable/ic_launcher_{background,foreground}.xml`. -The adaptive foreground follows the square SVG at scale `0.73` about the center of its -1254-unit viewport. The separate round SVG retains scale `0.65` for extra circular-mask padding. -Both SVGs share the Android paths and gradient, cropped to the central 836×836 viewport. -The SVG files remain separate editable sources; regenerate derived files after editing them. +The adaptive foreground and background are derived from the square SVG. Its artboard is +kept as the visible icon area; a 1.5× viewport provides Android adaptive-icon overscan. +The round artboard has its own layout and clipping and is exported to a separate SVG. +The SVG files remain separate exports; edit the Illustrator master and regenerate them. The themed launcher and notification small icon share `ic_notification.xml`, the simplified white monitor/phone silhouette without envelopes or gradient. Update notifications use this small icon. The app UI retains its purple Material theme and standard Material icons. -Generate all derived assets from the **separate** SVG sources: +Save your edits in **branding.ai**, then generate all SVG, PNG and Android XML assets +from the repository root: ```sh -python3 scripts/generate-branding.py +./scripts/generate-branding.py ``` -Requires `rsvg-convert` and ImageMagick's `magick`. Run from any directory. -Use `--output-root /tmp/message487-branding` to inspect exports without overwriting repository files. +To install the regenerated resources on the development emulator afterwards: -| Source | Generated assets | +```sh +./scripts/run-without-debugging.sh +``` + +Generation requires macOS, Adobe Illustrator, Python 3, `rsvg-convert`, ImageMagick's +`magick`, JDK 21 and the project's Gradle dependencies (downloaded by a normal Android +build). The Android SDK must be configured as for a normal build. Allow macOS Automation +access to Illustrator when prompted on the first run. The exporter reads the saved file, +not unsaved editor changes. It configures SVG export options automatically. + +To inspect all exports without overwriting repository assets: + +```sh +./scripts/generate-branding.py --output-root /tmp/message487-branding +``` + +The script resolves the master and build tools relative to the repository, so it can also +be invoked by its absolute path from another directory. + +The master must contain exactly one artboard with each of these names and dimensions: + +| Artboard | Size | | --- | --- | -| `icon.svg` | Square branding PNG, opaque RGB store icon, square launcher PNGs, adaptive foreground/background XML | -| `icon-round.svg` | Transparent round branding PNG, round launcher PNGs | -| `status-icon.svg` | Transparent 24×24 PNG and `ic_notification.xml` | -| `feature.svg` | Branding banner PNG and opaque RGB store feature graphic | +| `icon` | 512×512 | +| `icon-round` | 512×512 | +| `status-icon` | 24×24 | +| `feature` | 1024×500 | + +The exporter works on a temporary disk copy, exports each artboard independently, and +expands symbols only in temporary export documents. The master and its symbol links remain +unchanged. Keep intended artwork visible and unlocked so Illustrator can select it. +SVG export uses presentation attributes, outlined text and seven decimal places; random +Illustrator IDs are normalized for repeatable exports. Artboard positions and padding are +preserved without snapping. SVGs are refreshed alongside the generated PNG/XML assets. +Asset generation always uses Illustrator. CI and ordinary Android builds use the committed +generated resources and do not require Illustrator or run the asset generator. + +`run-without-debugging.sh` builds and installs the existing resources; it does not regenerate +them from the Illustrator master. Commit `branding.ai` and all generated SVG, PNG and XML +files together. Screenshots are captured separately and are not generated by this script. + +| Master artboard | Exported SVG | Other generated assets | +| --- | --- | --- | +| `icon` | `icon.svg` | Square branding PNG, opaque RGB store icon, square launcher PNGs, adaptive foreground/background XML | +| `icon-round` | `icon-round.svg` | Transparent round branding PNG, round launcher PNGs | +| `status-icon` | `status-icon.svg` | Transparent 24×24 PNG and `ic_notification.xml` | +| `feature` | `feature.svg` | Branding banner PNG and opaque RGB store feature graphic | Launcher PNG sizes: mdpi 48, hdpi 72, xhdpi 96, xxhdpi 144, xxxhdpi 192. -The script preserves each source's layout, including the square/round scale difference. -The Android vector exporter supports the existing path fill/stroke attributes, the square -artwork's `translate(x y) scale(s)` transform, and its diagonal background gradient. -Unsupported path features or gradient changes cause an error instead of silently losing details. +The script preserves each artboard's layout, including any square/round scale differences. +Each PNG is rasterized directly at its target resolution, without resizing another PNG. +Adaptive viewport offsets are applied as Android group translations to avoid rounding +path coordinates just to reposition the artwork. Explicit transforms inside the source +are still handled by the Android importer and may introduce coordinate rounding. +This preserves geometry; it does not snap curves or strokes to the pixel grid, and +anti-aliasing can differ between SVG renderers and Android launchers. +Android XML is converted by the SVG importer bundled with the Android Gradle Plugin, +through `convertBrandingVectors` (offline). Nested groups, arbitrary IDs, solid backgrounds, +clipping paths and transforms are handled by that importer; unsupported SVG features fail +before repository outputs are written. No specific layer names or ID values are required. +The first drawable shape in `icon.svg` is the background; the remaining shapes form the +foreground. Keep the background as a single full-artboard shape, behind the artwork. +The square SVG must have a positive square `viewBox`; it determines the visible icon area. +Transparent margins inside that artboard are preserved, so a smaller clipping rectangle +does not automatically crop the export or remove padding. +Full-artboard rectangular clipping paths are expanded for adaptive-icon overscan; internal +clipping paths are retained. Each generation refreshes the exported SVG files as well. + Adaptive-icon and monochrome-inset XML files only reference these generated drawables and remain static. Samsung previews are optional and use the separate command below. @@ -59,12 +114,14 @@ Preview the adaptive artwork with an approximate Samsung-style rounded-square ma ```sh python3 scripts/preview-samsung-icon.py --source assets/branding/icon.svg /tmp/message487-samsung.png -# Edit the source SVG, then rerun the same command to regenerate the PNG. +python3 scripts/preview-samsung-icon.py --transparent /tmp/message487-samsung-transparent.png +# After editing branding.ai, run generate-branding.py, then rerun the preview. # Use an .svg output path instead to generate a masked vector preview. ``` Output defaults to 140×140 pixels, approximately the icon size in the supplied screenshot. Use `--size 512` for a larger preview. +The preview has a white background by default; use `--transparent` to disable it. SVG output uses only Python's standard library; PNG output also needs `rsvg-convert`. Use `--source` to choose another SVG; its `viewBox` defines the mask bounds. By default the preview reuses `icon.svg`, which shares the adaptive foreground's scale and @@ -77,6 +134,30 @@ and shade are a visual approximation, not a recovered Samsung bevel algorithm. Use `--bevel 0.3` to adjust edge strength (0–1), or `--flat` for the mask alone. Themes, night-mode tint and animations are not reproduced. +Check the generator and preview with: + +```sh +python3 -m unittest discover -s scripts/tests -p test_generate_branding.py +python3 -m unittest discover -s scripts/tests -p test_preview_samsung_icon.py +``` + +The default generator tests check SVG layer preparation without Android build tools or +Illustrator. To also check Android conversion and PNG exports, prepare the generation +dependencies above and run: + +```sh +MESSAGE487_TEST_ANDROID_VECTORS=1 python3 -m unittest discover -s scripts/tests -p test_generate_branding.py +``` + +CI runs Android conversion checks in the Android job after the build has populated the +Gradle cache. PNG export checks additionally require `rsvg-convert` and `magick`. +To also verify real Illustrator export, repeatability and preservation of the master +file on macOS, use: + +```sh +MESSAGE487_TEST_ILLUSTRATOR=1 python3 -m unittest discover -s scripts/tests -p test_generate_branding.py +``` + For a device-rendered reference, [One UI Icon Extractor](https://github.com/Palmoe/OneUI-Icon-Extractor) uses Samsung's `semGetApplicationIconForIconTray` / `semGetActivityIconForIconTray` APIs on a Samsung device, retaining One UI effects. Compare its export from the target phone diff --git a/assets/branding/branding.ai b/assets/branding/branding.ai new file mode 100644 index 0000000..308e899 --- /dev/null +++ b/assets/branding/branding.ai @@ -0,0 +1,4000 @@ +%PDF-1.6 % +1 0 obj <> endobj 2 0 obj <>stream + + + + + + + + + 256 + 56 + JPEG + /9j/4AAQSkZJRgABAgEAAAAAAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAAAAAAAAEA AQAAAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAOAEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A41m5a3Yq7FXYq7FXYq7F X375c/5R7S/+YSD/AJNLmolzLYmORV5v+aX52aB5IBsIk/SOvsoZbFGokQbdWnffjUbhR8R9ga5f iwGW/RBL5u80/nH+YfmSZzd6tLa2zH4bKyZreED+WiHk4/12OZsMMY9GNsMd3di7sWc7lmNSfpOW qm2iecPNWhyK+katd2PGnwQyuqGnZkrwYexGRlAHmFe3/lz/AM5NytNFp3naNeLkKmsQJx4nxniX an+VGNv5e+YuTS9YpBfQdvcQXMEdxbyLNbzKJIpYyGR0YVVlYbEEZhEMlTFXYqkH5hSSReQfMssT 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 bZrdirsVdirsVdirsVdirsVdirsVdirsVdir/9k= + + 0 + + + + + + + Cyan + Magenta + Yellow + Black + + + + + + + + + + branding + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endstream endobj 3 0 obj <> endobj 7 0 obj <>>>/TrimBox[0.0 0.0 1024.0 500.0]/Type/Page/PieceInfo<>>> endobj 8 0 obj <>stream +H1@ DާM$$( +/6DiyHEX> endobj 11 0 obj <> endobj 13 0 obj <> endobj 14 0 obj <>stream +%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 24.0 %%AI8_CreatorVersion: 30.8.1 %%Title: (~ai-d4a586c3-da59-4a45-b4f2-a3f61c748939_.tmp) %%CreationDate: 19.10.2026 23:10 %%Canvassize: 16383 %%BoundingBox: 549 13 2872 525 %%HiResBoundingBox: 549 13 2872 525 %%DocumentProcessColors: Cyan Magenta Yellow Black %AI5_FileFormat 14.0 %AI12_BuildNumber: 1 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%RGBProcessColor: 0 0 0 ([Registration]) %AI3_Cropmarks: 1847.65095334201 18.9379652576154 2871.65095334201 518.937965257615 %AI3_TemplateBox: 255.5 256.7677165354 255.5 256.7677165354 %AI3_TileBox: 1956.65095334201 -10.5620347423846 2739.65095334201 548.437965257615 %AI3_DocumentPreview: None %AI5_ArtSize: 14400 14400 %AI5_RulerUnits: 6 %AI24_LargeCanvasScale: 1 %AI9_ColorModel: 1 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 4 %AI17_Begin_Content_if_version_gt:24 4 %AI10_OpenToVie: 558.778823316117 1136.45591414787 0.529375092079839 0 9436.45516483318 8062.69714993624 1484 912 18 0 0 6 49 0 0 0 1 1 1 1 1 0 1 %AI17_Alternate_Content %AI9_OpenToView: 558.778823316117 1136.45591414787 0.529375092079839 1484 912 18 0 0 6 49 0 0 0 1 1 1 1 1 0 1 %AI17_End_Versioned_Content %AI5_OpenViewLayers: 7777 %AI17_Begin_Content_if_version_gt:24 4 %AI17_Alternate_Content %AI17_End_Versioned_Content %%PageOrigin:46 186.2677165354 %AI7_GridSettings: 72 8 72 8 0 0 0.800000011920929 0.800000011920929 0.800000011920929 0.899999976158142 0.899999976158142 0.899999976158142 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 15 0 obj <>stream +%AI24_ZStandard_Data(/X5lG'D0Ge("H ܔ%-  + +I 3Ǿg\=;=((_uYf/2ٓ)Τe_E~z4q$io<:e۴cg7%g2vW(Zm3ds]ooXl^Y¡9=L~ ~H| ڹVJ+1hV6Fp?3T'?+_vN[)y[X PpoaݟYY7^۷?uU5N_7vf[f~/Xx}\:gXD*⸃Lhu1./85nWR&GnG^7$K2޽~ u5.y2ܨ\[ƒY%G +xݎ;`&qkNk;w NVv +LΡR7tb>?/ Q˶J*ے|fL忲7ŴkqtMeR"ёܚU"cy@jSXMUSOsѻ&uQk]7EߢxN?2gS$^'w;euYr>d{)rQky$Gsskm>ɒ!-KIs$.Mnz7ߥǽ5i!9ّ(jң=7Envs;M˱suǏ{&E^nݽESq }}qދf7y}<~w?|$Yw֍yG"ע)vrЏ]@77&EoۇI]֦Ǿmz{7XzSw?"qK}[,GrXzqe'.C9WɑܦMr[zsq!\.Ky:y/M\p"jKғK]]q}4pw(ͮ5A;Nq(\eGMq^{QfȻ;;;9OGɱ#Hs,-rQ}䝹ͲS4(%)9}Yr{uS9Gɐ+8݋{=]KS E׺^=\^ܡ9]]bّw\Mrsg;L3}qܾF-"wv{.h[ԢEm;,;vяc9=ߢXv!E&q47-Qۜ\L}磨9M8rqK_қdOi#Gݵ=},ISZ<i4EN#Za;;Hmrj7z ;ٻޏ!׽c9e/ғG;4I6J7n9j#m;ܽM^z=mݻKO{sg}or,7Irocno4&Er,Mn3p${i$uyhy{я]!79OGry߹+^=R~bCw}9K-ꑛhv7ɽ)j1djwͭuŰ|x@酞Hnv7|}S\69TS(ܓbަ>j轨XV2ZݣlLOG7 NݗU2bӚt|Nw|\ӣTӭUt3t47 i.Muwmz=%'M#^ywK,=;7n5ɽ.Is-w礨CmwCy/jS$I^>\Ӝ\DTӜ} W)>H^fo.fs*JM[첩'Nݴ%:?o_~XS\VMR `nl?G^ߪ Nc۶ͨڟߪ̶/64̦a9$:Eh߷[lfs*rCn9%7n.+ d.;l,r_ ͟${7}'su1Ǒ>֟ŷ9m3\{5{k34;^l4wGqRWe)೧q9u?W;߾Mqw"'.=rR{7Erӝ/5z,c,-n?bHrorM,CsgOopEe?rYٷ=H=Ȝo+eqZikl~oSeqy|S8{3FZ"i+}ACg|14whv.bלCwˊc]d#pҸKwr#Csw[s KCi ~cE}YVGt}e,m^qRXZ[fynNk-yԴt޶./K?8{WX4vSߋG/Myqˮ|NXYN}ޏ;k=^ܗU9|MT7iDXcStmt4T\l@{vfK u?M8S;,vuu:{J$XMAc!nEn 6a #5N}(CDf # +1 4xpGbXP3yц 0&!AV9ȅ9r gI q*J ط +EAUhD Jq%*Dh(O!IB FB R PӚYa, (`0!& + 1>nc`B .6% $FH/Tl" ~!ay!W@NMS)BB`!`$|\;~4=9A)5Kˁ-x g̞ <4 My}ys4< m2Ulq Qf) YtzMr]6YXuT,AnNHrAx+yA`i:ϋ9;y^PhIyJj3a8Q"e,$)>@?V ͅϼB bô/,'JQa鋉E C%fA;3,QFf2z҄MRil?34F_{cg}ҜX Hcdg_e6l&i+`+7ΰZ~*_6Hce4iseKY8=1l~-6koܣ/t&I3u6K҄_QeM榞Lu{o*ڍ]gMew oo*Z@L=t޹/^ʶ[@L,4@!ӑ,SFaA]lQ >s_vmNlRk F~XCLcbc$ձK.6wI|Y&{]ñcԓw#Ǵc[leLTMuYj>Zro-mUU_ulx71 HqjO ++C&X,@~D5*ofF$aOئ#]( EV |ģ2P/ê[t"MF6:{LOIQ$VqglhyrUsX +aZސC*qqiu>Χ@a{9mf,&4 Q wzPD78K'y%‚f('̀b`m>0J)&53Aʉyaw `tI!V +!1cM$7"=ǩcȚGpZ_ U#va4|"ckY9TrPWK)T^/:>2}Mڍ;ҕ(΂LHoh91pRG0zV#EfbZlF/F+!K oPLJM&&T`a' +YfQ&T.#=n +ތ1W|j݋ e%8/.4$ً;%h6"|r2U(5I-E}SFMaVV.'<-5E2ب"ˮ`l٩ @yLlyuJPjrBQsįXjkՁ@ tyՖIǝf`&:'H4D[JQRԉ2IY!U畫ݳ,ʝؼ0&S2-J#B--iԂ=@–ג0NF, ̵\Y-^y`&ك ƦW-ԺJCR?4Y +C)La$EL)&>N$Y(!vHfӎ RMYYL0bJK͘X]KtcM6B:" c 1nUk%|Ѕ%P +# +LV b1pTV9y[1XfEA|"Ul&<3ku|G ґWDGO3NkV"q—p@Ĩ7؜ʴ1P(*IEM#RZ,hΎךXЏЏA 2#Q< 'Xb"a+)Aoǂ`A u)o (@)Ce"CRCDKTXaEPv+ q; +^ֺLP}$}HfGi'9 UJ0Ct4k&~B%KrI.%nFxL: /bͭ$&\4#[ 9qp,&ۋqM`xeVb̆wQD1U!5JԲ Vr+1wJg `{cVcb=E~6ݒ2\b7'#U%9|\4P-J,į@n @%nY摂[l xƄ w-N)DهH{#r/wSY(< +PhdQn$LLw6ߧ!F3J 8ɔdo3T23*PgLgLrg#<#L*Kf4.^h,e4T) GWtM Oz J_ xlďˤ^gL&\X Յ!q=AtVE4b4,NT(]CSȑ2 $0eej.\A(v䕯_>2LuXxNSO +et"at'&l  c1 Ӱ +R)aa PXr&&L)Sʔ:`BQ~IxLIc2 8{Ω!;{©n:9[Ln|ILF&R%P/%Y# >E}$ b\ Pa\%zbz\sB>ԝ"d:`EeN R7J*",RYa<Ta*:NbRCWOGxƴ C%Ξ**aϘ a&JZ ,০$`*~>l,ƲPCFH!6Jpb0D4!b6DL*)~@=dJyb,qg&o׉oh8k"&BI9R(&h үj"T283M7|4;4鈁G4ql#95mo=?S㾄?SSp.*Ca ]lq$&)"*7Xe1>Ӥs܇IL6 +^er+$&0Tj6x,J) 7Lf̛k-cRĪ52F["nk< ]G!_7Wi٤e ,EwE}4M|!e< +a% ,p|"0$]E1q%˟9 +p 3:tPqI}P|kzrkq+Dq{i$ PC(:f0 +X +!-~( +a1K*`616c gC~܇H#!ݗ%(ŶҚ%7re ,n/-2^BxȯE1V{0$o%8lj+O\ӘTh۲U+tD\#%CL:I>&K%u#1Ge~J)&l RNhZWơ;WU9<&([H4fŃD_'Px ,RBmMƔQeaգ%PILrXD7h̍2qqhTGL(Ǟ'3tj5epŰDHrVzfV쪍4bDUAZ1q[xX5b"fc$C$5JYԵu( BFFfd@ (J84 FFD40$0&0 qFrTIdA8B<;&Hk:NF M XA (1Q͈ :b掆2"Dic;$2zv)&Mm7+u̓y;$x/4h3NTTeVINB`OHRu5WC|krdp.ũxn73 +qqR%"7]$cYBp5!ꐙR__8 |(E24ZJA +.:H =}M9N~X2 vz?'$靎[ jjߦAS _t:g +M3QU_&Qm %`Szf) Y_{[,&Ԇf!v-Cc#C8EC*RѸKgB0:FpUt?<#4r4%;ڥ0sK""}:$]oꁛ OQ$G*OρKՒsKTuwx~B&55M㮾@@k)u>*D>*5[ ꜘ!p8nOwHA7\26#ȃ5Rǹ2L;-d~08,ԪFƶ6Ya,"!)ִ[ jKv]߉dE*n1^=KJF JW]vVPƹ~XP63 m5ld*D(ʄÁ&mJ4*ᣆC/b)< 3[_ uv2 PUl)߀KMd<zOb$Lxw*3f쭉H\j+Т,a͎GM7=y;py}4D2EOC'kYl0y/5iT(:͞@ +]E/٨c[3๊,=H}RC ;HfPRIMVA$҅O/s7Wލ1]3l`o`ʖnK(~%F$": Ra%f +(0pJ*f(:Z)ZR_Rʉ7Bt3)Ņ_?g[1JruZuM~(Q0{ï 3UZ*(lį?2N1J悜9=ǯGt#ƽ6#(u#n~]b*^ǿL=;%I0J( Zsɯ:q~ȋt]xîQRŽ~'"E]Wbm7Iz&cM]VF:$/mF}NXj^n2dHC4^` ~Z3&Fws=%Mҁ3ő2묛%}i΍ep Q"ԨpU+t>Xk#\&wZ[ǴLnp&7GĭqU#) 5\=<6} +ߐv~2M*kStZKU1n2atedxdtkkdĽ7xO|wsшi"nA׿y"na:;Fqc9b|#^Q q׸X \NT*vybfLL(>},o$gb%t+ [e0LLډ~} +LXd7؝LQatm=O]{sfyе9Pk_Z.̻y (a7e + +vwAuJd%B +%޺.KB޼?ua[Iԑ,jL0,2:wYq|`5v.rBy+yC&Sv^f!ܹ'X/@Pa + V~ϣ)l;a+KnKڙ/0=5: +6t;إr u@$%ىmG٭W9-ްol+KltR;Y:]9Y:JKq l>xCL6:ų~bLĞAmn}H^F}{ƽ/0Ư6yzi=*.*g ƇmnC|_G b ^dN:Xb&}õ,UdJylxrZI܉܎G&y$eqd-%@I˵5+"M#¿ԓY6qzzp',YU"rݑ ̡&(d4ئHط+AU:=җS@O8+V0vń~۵q4I:Q%lX$XROki{*sҎ)Љ~ ȿR;+x6v8_5܊z~kqǰ-̐u|t;2-n~KZf jpZ Lbϱ"" [&cHӟUjِ෹YXsTwfq)}c``w-0>s[[B9ʟzx7E[g( Nv vW +͈Հ~!5 Po.\|l v +EV[C J(*@YWn\2: X]|*ё)/g&Lr.aq$4"ATpщ|I)ݲX9iȖD P5({_Nԓ{qFv'9Jv(i%6e(GduFkQ.793|ЫZxXp6|NK mϴ~',ZŽ д6Ć9QՒ@]>$d/tnA]FVTճj'(V{KU,I׭Tx I8%9bM#(z)r}W ɍ*Wf$ާA1H/sZX<"CdhlL4&s֨)HviΗ DHp5ƺԖ,7wӕk+we-Mi !>q l?fA^I3y.W?2?Y ]L]XH9)uۥ*/fx(!!,H9,v꒽_HW:|.IKwI|reZ+ o*'Gkj.+9zeWAj1a(iqT<؟Vy{j_Xu^A=i߉.1XypO͏6Ψݓ 6G;ڭn0õ$P\'齃:IG;2%*_ԂEpJJaqGqB{t)u{| +mx:Z2; w2U&t5#k9`7qv7%m+2X?K_? 3hSD|1-8A!fTumn%ߎgR5wfyUbFZ;ΕZĸEKM# +VL>gy@9,~^>Q{);//4V --D[Hr8]]wV0Z1?AE-&0gV=Ĺ'vsԘVn-eZ'Y5#[y߶2Pn9{`Ck|f~rQnDbn9j.wN܊nU[4Xu9e +Xcso;3"Z/(YP}߈f37Hp&$`t2v)l#ƠFo@+=[t@ +E9ݙ3?n !)P_,0%"Z/- w=U3o5٥=7S(@sbH'!>?Yhܗlm\Fr1p6y͉K` +_9@qu.v0b~\:tO"2VnuJ>uIPMR2W~b-}guh}O)Tlejhͭ6ǭd1!ܐV 0, >wi:r`w@Pb{1r8r2q29Ņ A$jmkyPW +ʛ21x0tPpT䔲UòxYyI\.8h\Bg0gSbY +) mqH,h/.]?̓h-$щXҁ `ƢLݾ2`*q!@3j wbZml(@XF\[xPq1FRREKǵ^TZ؆}=t9Yfe./fAlxfci6H\^½9lbҷǬ*3r Y?kڍz1x]T#7,Z n173<>Pp K*qf6U>G]ND,ynΜ^*C4@ K_ hQW}h ,LTѓu#&)Ǝ Y +NBz &LەYLVJz Rܷ5z#Nyq`c̶ ڀ"gK$})Br DZXpa,2ڸNPڔIxp1(jHw@QKs;rGRMb]nոhRc%|(3r s Boއ*f1+0~$D1~tE)74gKпF#cY"҆y ˇk S3ǔoĺV{>ٳ:95[w|H݈$taa +Yn H -N +oԼ|>uv1u6&0, +ۋffu׸iPR@Q'FubD[,.f|QuBg@jI;/W(εV%GWCTP]"UFH@H*o MRT E]*rY 7BX)`}΂+$d=> f6Ud Y!y,Jԥj|K9mzX۱Zß.i>"v,bmgFbr|)|#䟙v{|š-#I|*JsC4g07Ȩ Ϝ53gh`//vЌvg~>WO9V̄X2YY r΅?{`!+W#?Cz +86WiEsd84_nw*͟f0:3 higFlk +OϜܘ.?ݸT?i"i5׷`} +oN? yCg)jՊe|&M^t ܂I$ ZM50 +*/:Osocfs}ir&!aQIיܱ'H_c4cR_V$<,&)X\L_1?ԃU(viv%oU46fpD=LŨ]b;`S.ȉoH{~ccoc'?+YrM 4?̪ck5 if9l>x~; IjM^/!L?{9P9Cn$<7[O-gɣujhsn↺rȔql@)>tlRPÍ\~-lԢ9c:;nOhh9s[F^+jo +C. 0{ TT,&$ˏbf]#N3  9j(na n_3뷢څ&wStiUUHإ +fPL#iTFgHլ CI,Xx% +hS-`b8Xgqͫ=7Ј3Xr}@G5,L`6,WFٟfI⡔aFh)M7x\ {j&kYO ~ )^:`5 +z3Ro{r@(Jk=fziU"! +\mڿyXbj2ʟ0&3y5(q.q4̗+IG]С)NܤZLJ~8{$s0yC7oob͗N eV6}^y7aaA ] ̭-3s +VAj2*TNi2;?KhЍqfQeN,CE?(Kԩ*<_im aaCd{!MnlUHCS( `偬?:+wF~<pw94u7NC%# %ǃN8M]c^Ot?  (Bp6~dJ: L$&0j/YVy.1>fm105 ڃ#Jm88$SF6Y_IZeahB Z1n=* j>3@zX$v#oW2jμzHdPaR!Gd]h#>\m4㈑,'<Kg^O.s'|VoNxQ}u`bO24§_rr`(|l} +E̱AD0'.`9t(˘bP؄iiM_GZ*ZS3j%iV"ri="?ΔxS8 eᗁܴ!c#jTRpk5'*QM-,栲hB=9sk=cX&]z0t_5h2`WՉ$!5s6V TE +^Fg+ge3n"-:ׯA}#(sEz)A8@N dj +γ'PNc=M:؄3RF0C\u*V`[# +5Z !ҿ0A6K *>o)8'WB~@   ++pe:%vU(”h(WFw%-^0sCIğ଒vCRh1|!G[sSda"jk-7NK3埵 smB+gOX5MPƜ`+\f4=N`Wd$/Xzc[1D=IZd)>!SÏ4]1KhkɎDPfoIur2.g!Aγf!;.g[Ȼ/xADGw1-gL^S4d 5}0{(o1w8+ӮM=c8c˕1?(+GPZtQuT$'.uj 5p2#N|?S1O0cm|uh+q,ay<} ?t77Ȗ[ĤoÚ@2љ ՁP_$ҐC(tNl0(͚E^2گPɼCwsR4*D+|'ǵh +b(;K/WlaK̡ea V +Icy2lQW;ms2aӶ5Yc3[ݪ6F7#B)$ ivM܏Z4 '{1!,=g_gW)5SB^q P)_}X0TiX%HeX+.,~ZT0Q7-IqS1YbTF$("r +QȜZjVB< " U މ-)FHf͉F}g9=  jLFeUŴ*a\? Y8Il`b~ۉӰp32 2)Z9Ĺ 0!Ė,+o'MZ=1iseA}[D?Ȉ!xtX~4β:IU3-v98̋ D8/,FV_wl*pmr7PL`NI8t :)l&U:'[\a^e}S(1 + ʹ9t,]XW* 1*e gF׽!64?9"*Z $GXxl5ԯ.eXaG"ZИM]ZDs~j(e%xtKL|ZL)Wߨ@ 5 ) xo'caރ'Ra0(6>c O5 +Bn4 Zq kJU8g`BJk'K7 DZ<`)^IJPA6Ei{2 +SJ~# =n0bϺ! Mn@gvSœ*"ͦ(L3JE^.)(ijxkLޣ [{2E|1c^OH>z9:Ts+Y*w҂=Sb:R)Wκ@Vclb皔k]%4.=5m'3(|67I` b LJܐa[\9r{q| 4Դwk9[acbdc!Jɋ1fBA|RNq(sTvZL7Y~E6Y.?n= 6deX5k)үbQ骔 rK$} ֲ!=j=@Hj^ f*7$^m#"Rf|SYp1yBFnƎ)LB,L>z\UE*;!s [ɱ3]=6^+5Vt#-{2u[ ֕C!6jy@d ڜ s|jL7?lq I~F'j aA 8Xڿ Z(G#k9g栟?zJ\֮Z&j驓{U-cd/X]Owu)9#D>0{ 5y;S p"]`5 [XFm'i%z}  +$l+ " xz4<dRwKFXbOu1c%76PX& 2 E0.0LXJR,Ծ!JyBޗubP+1Y^x*K +mC]`Cc.C`S_#Q׺bPa,{HD579zfa<\ڀgkA\& Պ-Q%3!Ӛ m,I35x-*Oj, Hl0ZhXVg_!/\G鍯XZzre\Nv/̂514{¶A*Vd(5'9U:4D^ߝ8G3s)bΩ$(-XIn8"e7ٓG'/=kɾ[PI 2m1OR9&+Ň ].e gR?EacS"'V&}Gjê:q^rHzڤ|쑘{6({!gɺ.G>Ron1`,@<5xm:NYHsD!E 2UZԘ_alg>ve&=B6dhpZ$z{_pE@8G,OIUBz"bC2Sgޱ{彿W$$ NM }3O9KSM ~iҸM@Z5v1dT%SÔN~ϝ>݀}:1J0} +-ua#_<{Aم=b|Us*DuB`AN=)JOFp\m-[ rʒֹZ79@3)AaB ̝|=:c:ee;h-uh0BXͼ;̼K2;VGf-Uu8hQHPD@"LT{{hkM0^^]ƿ}K菅5FPk\t[½<ǏE .c]U+*֪Ga' A|k)24P" *p6«C@Z]׈q6&X +D U  JX9pxഐ}Quɫ#'lPKHp{xdȡ/ +Z(!,T.Y,sHӍǺsʧϾTa Kf݀Le +OW:q0u Qz:F}VFVA &04-"lB,?띶Zc\5pɕLQBIRh+?T =TErf`,A;򈖡;cmOH7_P$ _'>P$ ? +`.A>NEL@F}ek<>pJQ/7~۪~(f헶k";3KJu^)!(їd,,}s\3ˌj 3 :RWsh6d]g];*e%Dlz ft'Nu.kʜtsvv겝5jJiBN wk!8ț@Xu$o^,LJF[1=-jZoKMk]eq 0Ե eSVT,deNЊYL\hJ7HQu{./ @ȁ+YuC<0%)20=Lk4j ɵI34#lN`p'$NSSI*U +@554\R ГOK[6.a^6#Y'5_ՉnG-XY^hTB ٣mSQu9vi-$Wųn Bvlify_v^lX J*ɀcIMW5o\BVv!X/ħ&$/9.O!7(G/E 綡ϋj r@7ֱ.)sPITx]L1 + ~Kjnbiy1iآK k:BX$vۃ!S1%a7(xعqo 0]ymK^T{^Ke孢mehp!kYv\קKO@jQU=vӲd)Ό`@2#63z2v4ƽRy`vMk՞gvT(ҭ9;@C7U +2ҭXUOLlȥVGlE-_.feMgeB HS lLa?|#=y3<39%&쀇d+_ЗG-Гa4Y{%&o&p ͪ|}`R`9:^=Τ`UPUe^. + +a:^di<.{DABˬtj؃52zaNNe+҃+jKug=iqghISF(xO|za{/7ش" bJ;ԂR[)njh'ӨN'B_!oBpEg5X͛5/Sd p%ݽ82U{V$%nn8^H݈U +C<6:q=Bywil!W,hxGtAG.flL>N״4DwcygMcb12 +n +4f@CC$m]sesЋXΈS╌y.r<zVDPt".C BJgu ボNuޙoHDK%UtwM_s#!96Er)\V]ReK( 5+iJ\"^#O%s:mXUFGYֺ2j)0Tй6|`uZ "E |nIf'Vx%t&3n,iS2@a[ Fn\CsH'/n >SS[Ng&Sݔ51:jjM^M%,Nbm˦v!ϕ>NucJIe?c}Γ?񡺮 1(xfȪn53* bVa 3SP®@.kF72qN2F%0Z +x[ugE` !(rjo$ P\8EaآA(e+&`|2/do?u~G~1 +A@#D B=:d ,bFȏ[:~5zY'xԌIٜה&u nx`cr\}nuJYP+128)Mr\`z!0&O@)/^J{)[ )R<,@ޮoKixǸḅ Lo"O ACH+v,`! (P'90=>t$<)n[lVd49VXyoirCЕNqîw[L1K5Nir<-S0͕Jؽxr `["I철fЯiՈXS\Á ב>-&ց^_&לjnxzs['Mh A ˆݵ|;S(PGHe߅YIL5(s{D;ZQ L #0a2Pz2Dʤސ"1pF:]e}s{3 zR007W!p6'iP ;~_> +{a'#Bt9W^Bpؾ9]j\x,0]t929˲Gjz9}sk"i `{18IA= h}zS0^iHqpaVPv(X{`%PLƐ1Ͳ=,!T9$ $fys$Ԫ$mYSc}}x9\ĢnZۍh ;]Cj< %h[I VqǩpiuyaRNJ-R)2,ϫVbj +e$}n5:!(z{ZK ^ b3HK7GB)Q˺BL`L[u?J^>h=$&%_4A?G)Ci2G M4CQ;Wf8 LFBxCxY<$"!H[@,ȗ9Y}_#A_GPeus|[r&@- +_"N~isA@y7)c7z{\ϑ0L֍ +"#U(͙@f>lJA%X댰hM<3{ hlF*2ň",>et֬딾SL;)vJp> I*m5!C ߾,*qs`hɛ@8zKn` c4F.8y(ľZ3yCSz~&M?2KxoJD?ḌqYare csqSE֓x* eR_RySR$&HPe'kGw<`"&&)ʃ&dVb0nnYE |>"[,NÏ'iRlKOUZ|?GixK[<,~b;y?톌 qEF!UZ{11DxLѶaa6jCe{ϑDK4rs3iC1%uа+_ss!Y Zmz9t ZfsFNQ13uE`D7u^Nem\,BՉ b M3DŽH4)Qq5`֯-,n,! d>4׀7`XC[UjQD ]6Td<[LL:PieC#%-|Ig}(I;a2eվ&G8gՍ" CngFU7Tʹ 6Lm\QU+7Wf.\Z.G9 &1Pr'"fd7w;7Vss2Ik%7,06.&S Ca,·r iϬ3+w0J/#Ӫ$0iF4ΔxT/FkBH\7gFPZs7xNEa;#`/کo})ƅBs|%a"ц +8l ﻠFǹkX%=l\k-3(d0Ue!Q PoȀ:N5HeڹP\Ix'na0t2(bHV\HB3|0)]F)q-o 5ؾ9T3kXha1:Kvonnk)ht|@JXܠ/¸j4ʳqCR(%LCi2N PCHO`_ ,>WaH0nBˋ+vm A QJZ{!CV18yTz1|?u&G4[cgs( `T#ZAgV¸0OQ @PuDŽ"T y<VXo.&OP&/YtXR l?&!_祺yCQg@T# + 361 D54yQ-ה&_ۏ*oR4&O}(o}ȀleiYL؂Jhs c15{HB3'eVi\4 1̈ȈiH0ᦧKD$BB>"$ 80q@ Y:A¡"߽4ld kϭEJl8עY}UMw6;R P¤{Pzm좻IR o](Q+X YtrYܫcJJ=zE[q'`ߠ^p(8NaSE)DRRp7\Rgz̐YИh7`e-e""?YeN=E_> +u}Wv_~;.TV{(E-OG5+ [Uml'-Mq-ׯzJRpckevuا a"==\ bei HzA3gv>er. c p+oҷDTNY)<)ʭey~NVB ua +ucM,XR ?QyPxlՇa~ W$83X])5gZ!DZ79H rRKjc=NG[T*Se"3n&0L 2h5 4^>4,ګH2/&{geW +! iO(WSz'Ѽ9_]:4ԼQY64"gRf &72''6*89FF9n0Hgܛ*+ΏM-Ao$b9Q{vzc\< +A7A籵I`҂5h1eiySObn!3[V-)oNѡE.ʳqsKU3~9Q۝Adeffc:d !Ms?˚{LD xBXF!8=2*MyLf dڣ-84ٙ%)_M0R3ڱG},DtƍpfHk2֦Ceb(ZzԜ/.{iBPQڜ-,d[^V5ʷYK#%iwȋ<0J-llq@<)$Gi} +:1#=ZWT#2=7GTapNr:;>Z0Bܶ3X*%3"Li3ѷT5S;i57CѵJ'ĵR +CReY!2*}Β24}T:J;'G[\@|`LzF5im- o퍤~iI1RfLD]?XA7ރwKQ 0X%oF.nKevErwSv$@qw`7TjZM*Xʓ`*7i)9R(+FSnoijɇw'Q"rν"i۔X[ "35-Ũm Sm%aH߳eO^G{A0rJǮ59si=/^>ߕrKܒ*%|l:hQ"!"_3tIH:FX'@CSqSD{E }=LdCL]:s|.~WkA<'|pi/dC5#=G\zܱk\5CU"kwdlFaA,g #kQo &Q$<;󼽚Kq{xOz,5;$gȵZX$դob pK:PؘB[,L#sͣdbPθ5UPq, + QNa0TxdDY.>- (r!)acʀ ƿvNF +AiYK@Ԉε?~DK8Ÿo&F-8IQ^AT> !DLcZP>~܎LORL[lZ7~V{[XѬy~2FT!,_YtIAUgws tc[oYC="O:yynՔЬ̈́.F#'5;ZEnCަ +rѥ + cbKmZ;N;,ff[hNT^As_FGRJ2ርX3t<瑏. ga½  opЗDAܹ]_%O_. M:OJ>xe-dj ^ + @%ʓpE"Qժ.bEB }kBfW;oiܩx#Z3!x0u-4(`bϥ%ƀ5 +wijaE2@+s]C]qd\! 4F9bx/*Zw蟩3zKg+Faɐ;ir+Z?;DvE?aＡXp +l>^{D$3KIh3RC #]Y#E$dĝgF|I}5NiL#`9|WNW- /)gƙhST~ +q(ۦAݺۚkZ[ Ґ䠹TBAկZOWٝ #lXl t+wiD<^H;BY"&Y fZb-(`& + 8?۵36:!W ,:0ni"EҵF 4p !>Q-Bp$?r,4a&Ĉ&2.VYBTqhCGW*k{٫DR3f0Ðҍ]R[)# uK +HinɦGs her91~={Tg~ރ!s-nM*5(^:]Mcb ?+i]RtWa&(ݥ~H&8w*uF(;tOhu+r\sDj"^,yaQ:pmP|UfuGÔ%QTI'3'%9meAghhm*/i5&F.*eESN81m9T\|/; $Loze CSd[XQ遣x@\Fh* 3ǁc1Ϩ/1phf јp"S%jRc7p '߰_/8ҩZxɄcf>0o] ̼QjtVf{u΍zzig4yңjGz`B8EϷ6О&[DGCLt"kjf$y'Ox?ewΡId-ggYRl-:nJj|6x9ϓ^mx/_`!5IŨ V=^p2da\gV6?+0(?5 `rZuϱж@,I-°W#k 2C@{ VbQ˕s9m7}}=l3ej%̥& Ic:q Ss-OS`kw@a\or!0j?k18vj 8L{Hr"rՕ݈9\&Y-*}L)r:`OǏO%B0P`5Tj\D 𔀵 +-_e.0gCFF+z SΓ\APqS\LG,mUY. ,%u*3fpFs]B%Q_#Ò >[:zV2*B{+aG`mӗ/dlb42R_znc{6Ƃ*roGy;,$Ml@jr]EgV--X}\,DIs&3_[4 +(U F/Xq85Dҁzr>~8eMJ馴r/6,%W韙K(buM (fmG&|AM>A;]\{)M`J$sPXbJvtV2eSvi@J-YN1ݱk4$z4r-Ȏ])*3EsRե՞5$TL(!/!m)q}Ev}_S]\`sM.H 724]쒾$vK7 |$> Z?q1ZyܻbqnsR`60Ǭm Q9, +e+,D`.0K e(a/pewwID(4lAuxx9Ty hFe08878'T@!j$60"$B`j>e܂:L@QɅjD!$ 0ᤃcsN +8=q${Me#$'HF &̎)l1 BWt#˴T`:a)t47E+OaZc>DNR8ɕɚ]Mcl >a$05WcZ|8q$F܏=1ǻ^OPU< cB"L<_QLe# a8U)] 9\RtpN}Pp9i@D0 J)j+O~6VZؕ&D@L,[Y|P0jBT&׃ +(LŽ&SޤzP5ITa +M^JqҀ1XXys  +z90 I Z>(π0BҴBa{ux +{0ryŪI+L`E0Ob( aBPnSyl1$dL!٬NT(0bD!":AܱDSh@~Btel@aD SɑIcNU8B↔sR"Qq;8W +Hcz0)̬4,%l@aBʤrnA͑N#f8MƉ)`^3zd>ajLM ՘ Md|SuE5y9W"IX{>ES(݀Wp,0]8X] Ij/sIBbpSa8 &';B+ hHVxQZgHVA`?d6DlFh1:xht) QLx 1Js6 +;R PQ 4R*SX81@X03F2>pQЛ Ǡh/ju0J$쎑I9 tXC_\u |t4b_ h0*_ WH*,\"i$#'K&Nzg€1`yKs噄_D($9oa2 EXͨ9 +AJeEi^1(,P@TcuEg8BbH 5Wl2{ / yODB%=% +y6Uo9v;3_uKg>!+^WYvz~[)Ɨfx<[]{Қ1xu>uf,HX<\ثfWUk6Ɲc؅ +fU̚f{km `B &k^I9!+ۤiOw9rEm[go{}ڜzkW`yӷiv9)xxV~΋LvguY]lllպlܩd[iPm*.RzV+!` jp̧@Jx&i JY'쌼N7 2x(A$^+lHpspQzD4'K x?L@1>jtcz0g8^IEN扊u1L:A'kŮ|+nsYI<ً4|P,ЀG%2htQfqEBbp8,,mcb5k&$R2V-H$jf ^YmM۟fA[mqjmqW۴+Yg[ sg7Xo/SߟgvW_b;k>7u~3=+޷yܬӮZK͙mf<[`[ĿM:_6:~Ym~֯[~L3=yZ)~_6_l냟گ~{b`eęi{o΍z}{j1wlk3[딕f7\g}ǝ >{n;=ۗ߾kQ\Slد߯T,zT K&EL=%E "%`Xj+&W}OoS74?ŖRշi_Ltؾ6L.Wvnmk~s}:s9)Ŵz6}ZzkuK3>oӦſa:kc~lKڸM) Өӹu ͌$Ihp@,dX@ay8 qQA 0 D08}X A@l3 Lzdwjfpf˾znG$GG4ǭIC4Ȉ*3~yS&T0{=FƲpvYZD6 GǙ|H[ IO uP#APUKѣ!4|kO !GJޛ5#c_0{ #2R Nb*䐒*ĘnPLǨqJq0^ԯ׊T%I'f%uw./ْ'ةI 2<JkVJe& 줏`!IזBg0f呠Wl1KxT 1ـƜgp.3`9+/_h]s r)BQ2$2h$H5[To\5N4G%&*PF.| +|W5ؾ,˙^:F~Ȱ^ r78$  3x4zKUW2޵B unFb UI^Hn*E6NU5} %MӪvsL Wa*CFwwsl JSԔ+mtM#1YY2"\J. Q .|nzc&Y[8uo&{4ۚ1(\ipYܼYg۴ @ԜJ} T5cn +"-B~(uW'9pV>R2q;gd|rBF1` pN88^v4 i0KJ^t`Pf#p;~Ov)Ն60 c |t1\֚تEȀwrJ1A Z;h/4P%.еWԚh;F<%Tj8N52&š zV-|4Tjbe b[SqUpwA8 CS^Y+-v2jr앋 WCUUJBcPoj"BD/4+B'jtz8nL"8!ehL7D-9lqCQxQ~;N:V܂9֛1T$M +"%Fpw(2`nfv:RZEiq+`Ѷ4\ pz39Bk2m qEECV4 F\0ǿ{vW~y_?40{i8u"aҶvCc`oZ0!i(3n_:ذW`JFti a7;MwA@&ѬQMlP1S,2/ liUB729;mɊ> iFL] +q=*d٭rpOyI9qX}5Y(sȓZ-QʖSKX +kRWM eLR/W- kL!y !"W2c + +r>65#9yJ6 wdF9FEFblHZ|l$k>qFVFxۡFb#5^#eIQYRLF:WE R)>Y|~&G: +/A z37j#x^0գa|TYEߥ-1%ۃY\ţhU,Zʰɢ={,iS`O)]z%!$grv&| +3$+W+n˧H{<5*Q*ъD!bNT>tR){M_|iɦ+Tg.1]j3i/>eܸOw<ː_Z k(SosTXtA:{u}cS6KJPNA!ڄmqcrz=K P95k`Sz P?eYSBwZgḭē!<8vng"D(g~pHH )=&9 R#+ײ\.xt@j*T\蚾\hCi00SK\+4b6`f!(wZ=!H)2S2pP_Shʚ+2 .R㚂BpjtXbEô'; NߏIޒ ʑAW`AA9kWdBObD /}@pL꒜@VSqRQB %,Zh}\ꮺ(v JUXc2iAqj(Ή7Phп8\"`XZYH-sGoi cn1nLi͏?,~([0D~F/ŁzqjCH/kT$O7⡑PD"[.ٔ~S^cHaH;`șar7?Q 5Qɬ1l6@M8H7&G *5ƶ! RbbH܉=vGF|vR_l}"G=UĭP}IY\XTXD ?hh?%wcpgƀh'U;ǑYlzf[%7i 5tS% ON& SneWC"R@)^{_(uE;iܺPEё Fj; +DDب~p.,.tumSX7|M +%$N]nr$\7гy.YnTЫ5M׆mQx㕛2&Vh᎛@C@/|ԛ(  jwo”s{zUn${>4VʡNr Rb(Sݍ!x{!r$%AEwoPƷIm }፰fv3]#a-w݉uW ﹓><&^._vUo!vHaES PR{<H`辨,#VP|2孀APVu%*QOrO?`9C +q];<%B79O&2pZ/E Y|9 bA]γϻߘ3Dy/Z43ݘ\ ~X{Ȓ dܬm@G>/ExtGState<>/Font<>/ProcSet[/PDF/Text]>>/Subtype/Form>>stream +BT +/CS0 cs 0 0 0 scn +/GS0 gs +/T1_0 1 Tf +0 Tc 0 Tw 0 Ts 100 Tz 0 Tr 12 0 0 -12 -103.0967 -61.2773 Tm +[(T)7 (his is an A)11.9 (dobe\256 I)-10 (llustr)5.1 (a)4 (t)5.9 (or\256 F)25.9 (ile tha)4 (t w)4 (as)]TJ +0 -1.2 Td +[(sa)8 (v)10 (ed without PDF C)11 (on)4 (t)6 (en)4 (t)3 (.)]TJ +0 -1.2 Td +[(T)71 (o P)5 (lac)6 (e or open this \037le in other)]TJ +0 -1.2 Td +[(applica)4 (tions)10.9 (, it should be r)10 (e)-28 (-sa)8 (v)10 (ed fr)10 (om)]TJ +0 -1.2 Td +[(A)12 (dobe I)-10.1 (llustr)5 (a)4 (t)6 (or with the ")3 (C)3.1 (r)9.9 (ea)4 (t)6 (e PDF)]TJ +0 -1.2 Td +[(C)11 (ompa)4 (tible F)26 (ile" option tur)-4 (ned on. )41 (T)7 (his)]TJ +0 -1.2 Td +[(option is in the I)-10 (llustr)5 (a)4 (t)6 (or Na)4 (tiv)10 (e F)31 (or)-4 (ma)4.1 (t)]TJ +0 -1.2 Td +[(Options dialog bo)14 (x, which appears when)]TJ +0 -1.2 Td +[(sa)8 (ving an A)12 (dobe I)-10 (llustr)5 (a)4 (t)6.1 (or \037le using the)]TJ +0 -1.2 Td +[(S)-3 (a)8 (v)10 (e A)6 (s c)6.1 (ommand)10 (.)]TJ +ET + endstream endobj 18 0 obj <> endobj 19 0 obj <> endobj 20 0 obj <> endobj 21 0 obj <>stream +H|TiPYjPfPƪTpdP9WdETZmFW4tXDECKQ@DnedËa\'fga̟"22_2cwoܹu#@KvT\5/q~!?VO>y evZL0:!DV89XMIih%Y|(}2#HeZW# +kKHlB-S)Jfdj202@R*d*B*W§MK}RvGLueFsd s4 >N(1Ÿ3߈'k10粶6Qk0ϭlM1͸y&u'7ATQǀ6C-Q,yTh~/D p }7D5 e)@Xkǿ +,=AjؘB +CԲuuk΃ 4&ppBktvORBA]xǻOF4O5A F,ZX_yrLân}(Ģ@By#rx6HK+̫gnreyZ}Vy3w$sÞtƅJ懶6ic82!m2Tu)ig5#-i,o~Z_Ru|sC1hUv0Ppo*=vٺ=P5S?O'O 5 nR>Ww2M,WUK]2Yn{؏&.(Ϯc>w$hk2R ~j*,b J{f8Tq}Bq7ϓVYt=?9[᝻!8ڤo*F(-,22- ` FgN&{A(3αy-U+$ڱvXVNܑcx娈xITA0K]A*_;řYdah s2/qdGtMU\9 +#To1Fz=. aaS9dT-bӄJ3DRirCNfqI,~GXŏ͓[t]V'% ʗp <8d# Z.%wrKXm8.Hdl3\jz(;#;`U>8,gS;ӿ?yv9db)>q&=p,8Uh7oFn9i/![ :`K7MaSzffD2kIgMuE\H}+f6_wi̮ :A$2 Arv9*ؓZ;fo@GÞks،cZ)$O7QY3[9u71*vwPɈ?BmTTHͶ*PbKFw`oNHtp:$@]R^Px5+$ީSI' +8RW`oB dzg:$t!,6Fm3Q潆C5C$Idk.\y[sh*%ڪcp|Th#=8{Yx6}K \6`,tk‡-S-ckm(]ǦHdAX@hՑ̈́{όds'sKfrEh9 9NAS:|b(0l;qi *5.`q~0 A!|=S/B[(ky {+ IZqo#<=eۇ ƚ_o]By趃륷/ 5/,S}E, HV +DA˓Dd4Uy7QHKvJ=vEo9&|*o';NKdi'q7،DRix!'_-O!n1Nsc-A]31 +wgRΒoBw׆S'oabW'~ r=,QEVQSή8 /̏0"%˼<E{\ZuN z-m($ ΠXH +W !PƇ +fhPfQ/RқIؕ.Ў{[tMK:6}M#1k8))˜,?`K* :H@> Hը (30x au x՗٫ `jZvb` p{r~Ex$M(f`FN!ꐁ;яԌg&PԄ|7GH*[x7v)q,9زr*a!)W߽&@xx~ 𡜱Ahjh5(TYwMV[r(u$JAtwuZmCY | Q,#)NƃP^F(Xv.];s&B7B*3Xd +A݂9tr^%` +@/R& i.UQL5f̆ps̳P` 9# endstream endobj 17 0 obj <> endobj 16 0 obj [/ICCBased 22 0 R] endobj 22 0 obj <>stream +HyTSwoɞc [5laQIBHADED2mtFOE.c}08׎8GNg9w߽'0 ֠Jb  + 2y.-;!KZ ^i"L0- @8(r;q7Ly&Qq4j|9 +V)gB0iW8#8wթ8_٥ʨQQj@&A)/g>'Kt;\ ӥ$պFZUn(4T%)뫔0C&Zi8bxEB;Pӓ̹A om?W= +x-[0}y)7ta>jT7@tܛ`q2ʀ&6ZLĄ?_yxg)˔zçLU*uSkSeO4?׸c. R ߁-25 S>ӣVd`rn~Y&+`;A4 A9=-tl`;~p Gp| [`L`< "A YA+Cb(R,*T2B- +ꇆnQt}MA0alSx k&^>0|>_',G!"F$H:R!zFQd?r 9\A&G rQ hE]a4zBgE#H *B=0HIpp0MxJ$D1D, VĭKĻYdE"EI2EBGt4MzNr!YK ?%_&#(0J:EAiQ(()ӔWT6U@P+!~mD eԴ!hӦh/']B/ҏӿ?a0nhF!X8܌kc&5S6lIa2cKMA!E#ƒdV(kel }}Cq9 +N')].uJr + wG xR^[oƜchg`>b$*~ :Eb~,m,-ݖ,Y¬*6X[ݱF=3뭷Y~dó ti zf6~`{v.Ng#{}}jc1X6fm;'_9 r:8q:˜O:ϸ8uJqnv=MmR 4 +n3ܣkGݯz=[==<=GTB(/S,]6*-W:#7*e^YDY}UjAyT`#D="b{ų+ʯ:!kJ4Gmt}uC%K7YVfFY .=b?SƕƩȺy چ k5%4m7lqlioZlG+Zz͹mzy]?uuw|"űNwW&e֥ﺱ*|j5kyݭǯg^ykEklD_p߶7Dmo꿻1ml{Mś nLl<9O[$h՛BdҞ@iءG&vVǥ8nRĩ7u\ЭD-u`ֲK³8%yhYѹJº;.! +zpg_XQKFAǿ=ȼ:ɹ8ʷ6˶5̵5͵6ζ7ϸ9к<Ѿ?DINU\dlvۀ܊ݖޢ)߯6DScs 2F[p(@Xr4Pm8Ww)Km endstream endobj 12 0 obj [/ICCBased 22 0 R] endobj 23 0 obj <> endobj xref +0 24 +0000000000 65535 f +0000000016 00000 n +0000000076 00000 n +0000379221 00000 n +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000379272 00000 n +0000379611 00000 n +0000379814 00000 n +0000425416 00000 n +0000379875 00000 n +0000433572 00000 n +0000379949 00000 n +0000380090 00000 n +0000381692 00000 n +0000430889 00000 n +0000430776 00000 n +0000426600 00000 n +0000427115 00000 n +0000427199 00000 n +0000427581 00000 n +0000430924 00000 n +0000433607 00000 n +trailer <]>> startxref 433795 %%EOF \ No newline at end of file diff --git a/assets/branding/feature.png b/assets/branding/feature.png index 321a65c..079b7d0 100644 Binary files a/assets/branding/feature.png and b/assets/branding/feature.png differ diff --git a/assets/branding/feature.svg b/assets/branding/feature.svg index 15b6949..a3e79c3 100644 --- a/assets/branding/feature.svg +++ b/assets/branding/feature.svg @@ -1,28 +1,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + + diff --git a/assets/branding/icon-round.png b/assets/branding/icon-round.png index c691353..2b88127 100644 Binary files a/assets/branding/icon-round.png and b/assets/branding/icon-round.png differ diff --git a/assets/branding/icon-round.svg b/assets/branding/icon-round.svg index 2d0a3bd..96c6453 100644 --- a/assets/branding/icon-round.svg +++ b/assets/branding/icon-round.svg @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/assets/branding/icon.png b/assets/branding/icon.png index 7fc0b0b..eb1c73d 100644 Binary files a/assets/branding/icon.png and b/assets/branding/icon.png differ diff --git a/assets/branding/icon.svg b/assets/branding/icon.svg index bb6a00d..f8370b6 100644 --- a/assets/branding/icon.svg +++ b/assets/branding/icon.svg @@ -1,17 +1,12 @@ - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/assets/branding/status-icon.png b/assets/branding/status-icon.png index 3e885ec..478fbc1 100644 Binary files a/assets/branding/status-icon.png and b/assets/branding/status-icon.png differ diff --git a/assets/branding/status-icon.svg b/assets/branding/status-icon.svg index 7b6e403..9ea3965 100644 --- a/assets/branding/status-icon.svg +++ b/assets/branding/status-icon.svg @@ -1,3 +1,6 @@ - - + + + + + diff --git a/build.gradle.kts b/build.gradle.kts index 022c030..fe5855b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,3 +3,16 @@ plugins { id("org.jetbrains.kotlin.android") version "2.0.21" apply false id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false } + +// Reuse Android Studio's SVG importer from the already-installed Android Gradle Plugin. +tasks.register("convertBrandingVectors") { + doLast { + val directory = file(providers.gradleProperty("brandingVectorDir").get()) + directory.listFiles { file -> file.extension == "svg" }!!.sortedBy { it.name }.forEach { svg -> + val output = java.io.ByteArrayOutputStream() + val errors = com.android.ide.common.vectordrawable.Svg2Vector.parseSvgToXml(svg.toPath(), output) + check(errors.isBlank()) { "Cannot convert ${svg.name}:\n$errors" } + directory.resolve(svg.nameWithoutExtension + ".xml").writeBytes(output.toByteArray()) + } + } +} diff --git a/fastlane/README.md b/fastlane/README.md index 038e950..c788bce 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -55,6 +55,14 @@ Run instrumentation tests on a disposable emulator (never a personal device) Build, sign and verify release APK and checksums +### android virus_total + +```sh +[bundle exec] fastlane android virus_total +``` + +Scan signed release APKs with VirusTotal before publication + ### android release_prepare ```sh diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png index 1b64f8c..ec6f46b 100644 Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png index 48e4684..e1675b8 100644 Binary files a/fastlane/metadata/android/en-US/images/icon.png and b/fastlane/metadata/android/en-US/images/icon.png differ diff --git a/scripts/export-branding.applescript b/scripts/export-branding.applescript new file mode 100644 index 0000000..12c8832 --- /dev/null +++ b/scripts/export-branding.applescript @@ -0,0 +1,10 @@ +on run argv + set scriptFile to POSIX file (item 1 of argv) as alias + set sourceFile to item 2 of argv + set outputDirectory to item 3 of argv + with timeout of 600 seconds + tell application "Adobe Illustrator" + return do javascript scriptFile with arguments {sourceFile, outputDirectory} + end tell + end timeout +end run diff --git a/scripts/export-branding.jsx b/scripts/export-branding.jsx new file mode 100644 index 0000000..5d9ff7c --- /dev/null +++ b/scripts/export-branding.jsx @@ -0,0 +1,66 @@ +// Called by generate-branding.py through Illustrator's AppleScript interface. +(function (sourcePath, outputPath) { + var previousInteraction = app.userInteractionLevel; + var source = null; + var output = null; + var sizes = {icon: [512, 512], 'icon-round': [512, 512], + 'status-icon': [24, 24], feature: [1024, 500]}; + try { + app.userInteractionLevel = UserInteractionLevel.DONTDISPLAYALERTS; + source = app.open(new File(sourcePath)); + // Validate the whole document before exporting any artboards. + var indices = {}; + for (var i = 0; i < source.artboards.length; i++) { + var board = source.artboards[i]; + if (!sizes.hasOwnProperty(board.name)) continue; + if (indices.hasOwnProperty(board.name)) throw new Error('Duplicate artboard: ' + board.name); + var bounds = board.artboardRect; + var size = sizes[board.name]; + if (Math.abs(bounds[2] - bounds[0] - size[0]) > 0.01 || + Math.abs(bounds[1] - bounds[3] - size[1]) > 0.01) { + throw new Error(board.name + ' must be ' + size[0] + 'x' + size[1]); + } + indices[board.name] = i; + } + var options = new ExportOptionsSVG(); + options.coordinatePrecision = 7; + options.cssProperties = SVGCSSPropertyLocation.PRESENTATIONATTRIBUTES; + options.fontType = SVGFontType.OUTLINEFONT; + options.documentEncoding = SVGDocumentEncoding.UTF8; + options.preserveEditability = false; + options.saveMultipleArtboards = true; + options.artboardRange = '1'; + for (var name in sizes) { + if (!sizes.hasOwnProperty(name)) continue; + if (!indices.hasOwnProperty(name)) throw new Error('Missing artboard: ' + name); + source.activate(); + source.selection = null; + source.artboards.setActiveArtboardIndex(indices[name]); + source.selectObjectsOnActiveArtboard(); + var selected = source.selection; + if (!selected.length) throw new Error('Empty artboard: ' + name); + var rect = source.artboards[indices[name]].artboardRect; + output = app.documents.add(DocumentColorSpace.RGB, sizes[name][0], sizes[name][1]); + var origin = output.artboards[0].artboardRect; + for (var j = 0; j < selected.length; j++) { + var before = selected[j].geometricBounds; + var item = selected[j].duplicate(output.layers[0], ElementPlacement.PLACEATEND); + var after = item.geometricBounds; + item.translate(origin[0] + before[0] - rect[0] - after[0], + origin[1] + before[1] - rect[1] - after[1]); + } + // Expand only export copies; the editable source keeps its shared symbols. + while (output.symbolItems.length) output.symbolItems[0].breakLink(); + var folder = new Folder(outputPath + '/' + name); + if (!folder.create() && !folder.exists) throw new Error('Cannot create ' + folder.fsName); + output.exportFile(new File(folder.fsName + '/export'), ExportType.SVG, options); + output.close(SaveOptions.DONOTSAVECHANGES); + output = null; + } + return 'Exported four branding artboards'; + } finally { + if (output) output.close(SaveOptions.DONOTSAVECHANGES); + if (source) source.close(SaveOptions.DONOTSAVECHANGES); + app.userInteractionLevel = previousInteraction; + } +}(arguments[0], arguments[1])); diff --git a/scripts/generate-branding.py b/scripts/generate-branding.py old mode 100644 new mode 100755 index ad84d4e..1656ef2 --- a/scripts/generate-branding.py +++ b/scripts/generate-branding.py @@ -1,6 +1,9 @@ -"""Export the separate branding SVG sources to PNG and Android vector resources.""" +#!/usr/bin/env python3 +"""Export branding.ai artboards to SVG, PNG and Android vector resources.""" import argparse +import copy +import math import re import shutil import subprocess @@ -13,137 +16,220 @@ ANDROID = 'http://schemas.android.com/apk/res/android' AAPT = 'http://schemas.android.com/aapt' NS = {'s': 'http://www.w3.org/2000/svg'} +DRAWABLES = { + 'path', + 'rect', + 'circle', + 'ellipse', + 'polygon', + 'polyline', + 'line', + 'text', + 'image', + 'use', +} -def color(value): - if value == 'none': - return '#00000000' - if value == 'white': - return '#FFFFFFFF' - if re.fullmatch(r'#[0-9a-fA-F]{3}', value): - return '#FF' + ''.join(c * 2 for c in value[1:]) - if re.fullmatch(r'#[0-9a-fA-F]{6}', value): - return '#FF' + value[1:] - raise ValueError(f'Unsupported SVG color: {value}') - - -def vector(size, viewport): - return ET.Element( - 'vector', - { - f'{{{ANDROID}}}width': f'{size}dp', - f'{{{ANDROID}}}height': f'{size}dp', - f'{{{ANDROID}}}viewportWidth': str(viewport), - f'{{{ANDROID}}}viewportHeight': str(viewport), - }, - ) +def drawable_elements(root): + for element in root: + name = element.tag.rsplit('}', 1)[-1] + if name in ('defs', 'clipPath', 'mask', 'symbol'): + continue + if name in DRAWABLES: + yield element + else: + yield from drawable_elements(element) -def paths(parent, elements): - attributes = { - 'd': 'pathData', - 'fill': 'fillColor', - 'fill-rule': 'fillType', - 'stroke': 'strokeColor', - 'stroke-width': 'strokeWidth', - 'stroke-linecap': 'strokeLineCap', - 'stroke-linejoin': 'strokeLineJoin', - } - # ponytail: handles our path-only artwork; reject new SVG features rather than silently dropping them. - for source in elements: - if ( - source.tag != f"{{{NS['s']}}}path" - or source.attrib.keys() - attributes.keys() - ): +def android_sources(branding=BRANDING): + """Split the first painted shape (background) from the remaining artwork.""" + source = ET.parse(branding / 'icon.svg').getroot() + box = tuple(map(float, source.attrib['viewBox'].replace(',', ' ').split())) + if ( + len(box) != 4 + or not all(map(math.isfinite, box)) + or box[2] <= 0 + or box[2] != box[3] + ): + raise ValueError('icon.svg must have a positive square viewBox') + x, y, width, height = box + # Android expands adaptive layers by 1.5; the SVG artboard must remain the visible center. + expanded = (x - width / 4, y - height / 4, width * 1.5, height * 1.5) + result = {} + for background, name in [ + (False, 'ic_launcher_foreground'), + (True, 'ic_launcher_background'), + ]: + root = copy.deepcopy(source) + shapes = list(drawable_elements(root)) + if len(shapes) < 2: raise ValueError( - 'Android export supports only paths with fill/stroke attributes' + 'icon.svg needs a background shape followed by foreground artwork' ) - target = ET.SubElement(parent, 'path') - target.set(f'{{{ANDROID}}}fillColor', '#FF000000') - for key, value in source.attrib.items(): - if key in ('fill', 'stroke'): - value = color(value) - elif key == 'fill-rule': - value = {'evenodd': 'evenOdd', 'nonzero': 'nonZero'}[value] - target.set(f'{{{ANDROID}}}{attributes[key]}', value) - - -def android_vectors(): - square_icon = ET.parse(BRANDING / 'icon.svg').getroot() - artwork = square_icon.find('s:g', NS) - transform = re.fullmatch( - r'translate\(([-\d.]+) ([-\d.]+)\) scale\(([-\d.]+)\)', - artwork.attrib['transform'], - ) - if transform is None: - raise ValueError('Expected translate(x y) scale(s) on square icon artwork') - tx, ty, scale = transform.groups() - foreground = vector(108, 1254) - group = ET.SubElement( - foreground, - 'group', - { - f'{{{ANDROID}}}translateX': tx, - f'{{{ANDROID}}}translateY': ty, - f'{{{ANDROID}}}scaleX': scale, - f'{{{ANDROID}}}scaleY': scale, - }, - ) - paths(group, artwork) - background = vector(108, 108) - path = ET.SubElement( - background, 'path', {f'{{{ANDROID}}}pathData': 'M0,0H108V108H0Z'} - ) - attr = ET.SubElement(path, f'{{{AAPT}}}attr', {'name': 'android:fillColor'}) - gradient = ET.SubElement( - attr, - 'gradient', - { - f'{{{ANDROID}}}type': 'linear', - f'{{{ANDROID}}}startX': '0', - f'{{{ANDROID}}}startY': '0', - f'{{{ANDROID}}}endX': '108', - f'{{{ANDROID}}}endY': '108', - }, - ) - source_gradient = square_icon.find('s:defs/s:linearGradient', NS) - if source_gradient.attrib != { - 'id': 'background', - 'gradientUnits': 'userSpaceOnUse', - 'x1': '0', - 'y1': '0', - 'x2': '1254', - 'y2': '1254', - }: - raise ValueError( - 'Android background expects the existing diagonal linear gradient' + parents = {child: parent for parent in root.iter() for child in parent} + for shape in (shapes[1:] if background else shapes[:1]): + parents[shape].remove(shape) + # Illustrator may clip the whole artboard; extend only that rectangular clip for overscan. + for clip in root.findall('.//s:clipPath', NS): + if ( + len(clip) != 1 + or clip[0].tag != f"{{{NS['s']}}}rect" + or clip.get('clipPathUnits', 'userSpaceOnUse') != 'userSpaceOnUse' + ): + continue + rect = clip[0] + if ( + 'transform' in clip.attrib + or 'transform' in rect.attrib + or float(rect.get('rx', '0')) + or float(rect.get('ry', '0')) + ): + continue + bounds = tuple( + float(rect.get(key, '0')) for key in ('x', 'y', 'width', 'height') + ) + if all(math.isclose(a, b) for a, b in zip(bounds, box)): + rect.attrib.update( + { + key: f'{value:g}' + for key, value in zip(('x', 'y', 'width', 'height'), expanded) + } + ) + root.set('viewBox', ' '.join(f'{value:g}' for value in expanded)) + root.set('width', '108') + root.set('height', '108') + result[name] = root + status = ET.parse(branding / 'status-icon.svg').getroot() + status.set('width', '24') + status.set('height', '24') + result['ic_notification'] = status + return result + + +def android_vectors(branding=BRANDING): + ET.register_namespace('', NS['s']) + with tempfile.TemporaryDirectory(prefix='message487-vectors-') as temp: + directory = Path(temp) + sources = android_sources(branding) + offsets = {} + for name, root in sources.items(): + x, y, width, height = root.get('viewBox').split() + offsets[name] = (-float(x), -float(y)) + # Avoid the importer's path rewriting/rounding for a viewBox translation. + # Apply this translation as an Android group after conversion instead. + root.set('viewBox', f'0 0 {width} {height}') + ET.ElementTree(root).write( + directory / f'{name}.svg', encoding='utf-8', xml_declaration=True + ) + subprocess.run( + [ + 'bash', + '-ec', + 'source "$1"; shift; exec "$@"', + 'branding', + str(ROOT / 'scripts/java-toolchain.sh'), + str(ROOT / 'gradlew'), + '--offline', + '--console=plain', + '-q', + 'convertBrandingVectors', + f'-PbrandingVectorDir={directory}', + ], + check=True, + cwd=ROOT, ) - for stop in source_gradient: - ET.SubElement( - gradient, - 'item', - { - f'{{{ANDROID}}}offset': stop.get('offset', '0'), - f'{{{ANDROID}}}color': color(stop.attrib['stop-color']), - }, + result = {} + for name in sources: + vector = ET.parse(directory / f'{name}.xml').getroot() + dx, dy = offsets[name] + if dx or dy: + group = ET.Element( + 'group', + { + f'{{{ANDROID}}}translateX': f'{dx:.15g}', + f'{{{ANDROID}}}translateY': f'{dy:.15g}', + }, + ) + for child in list(vector): + vector.remove(child) + group.append(child) + vector.append(group) + result[f'{name}.xml'] = vector + return result + + +def export_illustrator(source, destination): + """Export a disk snapshot without modifying the user's open Illustrator document.""" + if not shutil.which('osascript'): + raise RuntimeError('Illustrator export requires macOS and Adobe Illustrator') + with tempfile.TemporaryDirectory(prefix='message487-illustrator-') as temp: + directory = Path(temp) + snapshot = directory / 'source.ai' + shutil.copyfile(source, snapshot) + subprocess.run( + [ + 'osascript', + str(ROOT / 'scripts/export-branding.applescript'), + str(ROOT / 'scripts/export-branding.jsx'), + str(snapshot), + str(directory), + ], + check=True, ) - status = ET.parse(BRANDING / 'status-icon.svg').getroot() - if status.attrib['viewBox'] != '0 0 24 24': - raise ValueError('Status icon must retain its 24×24 viewBox') - notification = vector(24, 24) - paths(notification, status) - return { - 'ic_launcher_foreground.xml': foreground, - 'ic_launcher_background.xml': background, - 'ic_notification.xml': notification, - } - - -def generate(output_root): + exports = {} + for name, size in [ + ('icon', (512, 512)), + ('icon-round', (512, 512)), + ('status-icon', (24, 24)), + ('feature', (1024, 500)), + ]: + files = list((directory / name).glob('*.svg')) + if len(files) != 1: + raise ValueError(f'Expected one Illustrator SVG export for {name}') + root = ET.parse(files[0]).getroot() + box = tuple(map(float, root.attrib['viewBox'].split())) + if box != (0, 0, *size): + raise ValueError(f'Unexpected artboard bounds for {name}: {box}') + # Illustrator invents random ID suffixes on every export. Keep diffs stable. + ids = {} + counts = {} + for element in root.iter(): + old = element.get('id') + if old is None: + continue + base = re.sub(r'_\d{20,}_$', '', old) + if re.fullmatch(r'SVGID_\d+_', base): + base = 'clip' + counts[base] = counts.get(base, 0) + 1 + ids[old] = f'{base}-{counts[base]}' + element.set('id', ids[old]) + for element in root.iter(): + for key, value in list(element.attrib.items()): + if key.endswith('}href') or key == 'href': + if value.startswith('#') and value[1:] in ids: + value = '#' + ids[value[1:]] + value = re.sub( + r'url\(#([^)]+)\)', + lambda match: f'url(#{ids.get(match[1], match[1])})', + value, + ) + element.set(key, value) + ET.register_namespace('', NS['s']) + ET.register_namespace('xlink', 'http://www.w3.org/1999/xlink') + ET.indent(root, space=' ') + exports[name] = ( + ET.tostring(root, encoding='utf-8', xml_declaration=True) + b'\n' + ) + destination.mkdir(parents=True, exist_ok=True) + for name, data in exports.items(): + (destination / f'{name}.svg').write_bytes(data) + + +def generate(output_root, branding=BRANDING): for tool in ('rsvg-convert', 'magick'): if not shutil.which(tool): raise RuntimeError(f'Required tool is missing: {tool}') - vectors = android_vectors() + vectors = android_vectors(branding) ET.register_namespace('android', ANDROID) ET.register_namespace('aapt', AAPT) @@ -152,7 +238,7 @@ def render(source, destination, size=None, opaque=False): destination.parent.mkdir(parents=True, exist_ok=True) with tempfile.TemporaryDirectory() as temp: raster = Path(temp) / 'render.png' - command = ['rsvg-convert', str(BRANDING / source), '-o', str(raster)] + command = ['rsvg-convert', str(branding / source), '-o', str(raster)] if size: command += ['-w', str(size), '-h', str(size)] subprocess.run(command, check=True) @@ -169,6 +255,8 @@ def render(source, destination, size=None, opaque=False): 'off', '-type', 'TrueColor', + '-define', + 'png:color-type=2', '-strip', str(destination), ], @@ -177,10 +265,15 @@ def render(source, destination, size=None, opaque=False): else: shutil.copyfile(raster, destination) - for name in ('icon', 'icon-round', 'status-icon', 'feature'): - render(f'{name}.svg', f'assets/branding/{name}.png') + for name, size in [ + ('icon', 512), + ('icon-round', 512), + ('status-icon', 24), + ('feature', None), + ]: + render(f'{name}.svg', f'assets/branding/{name}.png', size) store = 'fastlane/metadata/android/en-US/images' - render('icon.svg', f'{store}/icon.png', opaque=True) + render('icon.svg', f'{store}/icon.png', 512, opaque=True) render('feature.svg', f'{store}/featureGraphic.png', opaque=True) for density, size in [ ('mdpi', 48), @@ -209,4 +302,11 @@ def render(source, destination, size=None, opaque=False): default=ROOT, help='Export root (default: repository)', ) - generate(parser.parse_args().output_root) + args = parser.parse_args() + with tempfile.TemporaryDirectory(prefix='message487-branding-') as temp: + sources = Path(temp) + export_illustrator(BRANDING / 'branding.ai', sources) + generate(args.output_root, sources) + destination = args.output_root / 'assets/branding' + for source in sources.glob('*.svg'): + shutil.copyfile(source, destination / source.name) diff --git a/scripts/preview-samsung-icon.py b/scripts/preview-samsung-icon.py old mode 100644 new mode 100755 index 0ce309f..713b01d --- a/scripts/preview-samsung-icon.py +++ b/scripts/preview-samsung-icon.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 """Preview the adaptive artwork with an approximate Samsung-style mask.""" import argparse @@ -10,7 +11,7 @@ SVG = 'http://www.w3.org/2000/svg' -def preview_svg(source, bevel=0.18, effects=True): +def preview_svg(source, bevel=0.18, effects=True, transparent=False): tree = ET.parse(source) root = tree.getroot() x, y, width, height = map(float, root.attrib['viewBox'].split()) @@ -97,6 +98,20 @@ def preview_svg(source, bevel=0.18, effects=True): root.remove(child) wrapper.append(child) root.append(wrapper) + if not transparent: + root.insert( + 0, + ET.Element( + f'{{{SVG}}}rect', + { + 'x': str(x), + 'y': str(y), + 'width': str(width), + 'height': str(height), + 'fill': 'white', + }, + ), + ) ET.register_namespace('', SVG) return ET.tostring(tree.getroot(), encoding='unicode') @@ -110,6 +125,9 @@ def main(): help='Editable source SVG (default: assets/branding/icon.svg)', ) parser.add_argument('--flat', action='store_true', help='Disable shadow and bevel') + parser.add_argument( + '--transparent', action='store_true', help='Disable the white background' + ) parser.add_argument( '--bevel', type=float, @@ -128,7 +146,12 @@ def main(): if args.size <= 0: parser.error('--size must be positive') svg_root = ET.fromstring( - preview_svg(args.source, bevel=args.bevel, effects=not args.flat) + preview_svg( + args.source, + bevel=args.bevel, + effects=not args.flat, + transparent=args.transparent, + ) ) svg_root.set('width', str(args.size)) svg_root.set('height', str(args.size)) diff --git a/scripts/tests/test_generate_branding.py b/scripts/tests/test_generate_branding.py index b3ff3fa..665b32e 100644 --- a/scripts/tests/test_generate_branding.py +++ b/scripts/tests/test_generate_branding.py @@ -1,5 +1,7 @@ """Check vector conversion and the full export without modifying repository assets.""" +import os +import re import runpy import shutil import struct @@ -10,31 +12,145 @@ ROOT = Path(__file__).resolve().parents[2] GENERATOR = runpy.run_path(str(ROOT / 'scripts/generate-branding.py')) +ANDROID_VECTORS = ( + os.environ.get('MESSAGE487_TEST_ANDROID_VECTORS') == '1' + or os.environ.get('MESSAGE487_TEST_ILLUSTRATOR') == '1' +) class BrandingExportTest(unittest.TestCase): - def test_android_paths_and_transform_follow_separate_sources(self): + @unittest.skipUnless( + os.environ.get('MESSAGE487_TEST_ILLUSTRATOR') == '1', + 'Set MESSAGE487_TEST_ILLUSTRATOR=1 on a Mac with Illustrator', + ) + def test_illustrator_exports_all_artboards_reproducibly_without_changing_source( + self, + ): + source = ROOT / 'assets/branding/branding.ai' + before = source.read_bytes() + with tempfile.TemporaryDirectory() as temp: + output = Path(temp) + GENERATOR['export_illustrator'](source, output) + first = {p.name: p.read_bytes() for p in output.glob('*.svg')} + self.assertEqual( + set(first), + {'icon.svg', 'icon-round.svg', 'status-icon.svg', 'feature.svg'}, + ) + for path in output.glob('*.svg'): + self.assertTrue( + list(GENERATOR['drawable_elements'](ET.parse(path).getroot())) + ) + GENERATOR['export_illustrator'](source, output) + self.assertEqual( + first, {p.name: p.read_bytes() for p in output.glob('*.svg')} + ) + GENERATOR['generate'](output, output) + self.assertEqual(before, source.read_bytes()) + + @unittest.skipUnless( + ANDROID_VECTORS, + 'Set MESSAGE487_TEST_ANDROID_VECTORS=1 with Android build tools', + ) + def test_viewport_translation_preserves_fractional_path_coordinates(self): + path = 'M113.43 106.12h256.15v90.57h-30Z' + svg = f''' + + ''' + with tempfile.TemporaryDirectory() as temp: + source = Path(temp) + (source / 'icon.svg').write_text(svg) + shutil.copy( + ROOT / 'assets/branding/status-icon.svg', source / 'status-icon.svg' + ) + foreground = GENERATOR['android_vectors'](source)[ + 'ic_launcher_foreground.xml' + ] + android = '{' + GENERATOR['ANDROID'] + '}' + tokens = r'[a-zA-Z]|[-+]?(?:\d*\.\d+|\d+\.?\d*)(?:[eE][-+]?\d+)?' + self.assertEqual( + re.findall(tokens, next(foreground.iter('path')).get(android + 'pathData')), + re.findall(tokens, path), + ) + + def test_layers_follow_the_current_svg_without_requiring_ids_or_transforms(self): + ns = GENERATOR['NS'] + sources = GENERATOR['android_sources']() + original = ET.parse(ROOT / 'assets/branding/icon.svg').getroot() + shapes = list(GENERATOR['drawable_elements'](original)) + foreground = sources['ic_launcher_foreground'] + background = sources['ic_launcher_background'] + self.assertEqual( + [p.attrib for p in GENERATOR['drawable_elements'](foreground)], + [p.attrib for p in shapes[1:]], + ) + self.assertEqual( + [p.attrib for p in GENERATOR['drawable_elements'](background)], + [shapes[0].attrib], + ) + x, y, width, height = map(float, original.attrib['viewBox'].split()) + self.assertEqual( + tuple(map(float, foreground.attrib['viewBox'].split())), + (x - width / 4, y - height / 4, width * 1.5, height * 1.5), + ) + self.assertEqual(foreground.get('width'), '108') + self.assertEqual(sources['ic_notification'].get('viewBox'), '0 0 24 24') + + def test_nested_illustrator_groups_and_arbitrary_clip_ids(self): + svg = ''' + + + + + ''' + with tempfile.TemporaryDirectory() as temp: + source = Path(temp) + (source / 'icon.svg').write_text(svg) + shutil.copy( + ROOT / 'assets/branding/status-icon.svg', source / 'status-icon.svg' + ) + layers = GENERATOR['android_sources'](source) + ns = GENERATOR['NS'] + layer = layers['ic_launcher_foreground'] + self.assertIsNotNone(layer.find('.//s:g[@id="random-artwork"]/s:path', ns)) + self.assertEqual( + layer.find('.//s:g', ns).get('clip-path'), 'url(#random-export-id)' + ) + clip = layer.find('.//s:clipPath[@id="random-export-id"]/s:rect', ns) + self.assertEqual(clip.get('x'), '-128') + self.assertEqual(clip.get('width'), '768') + self.assertEqual( + layer.find('.//s:clipPath[@id="internal"]/s:rect', ns).get('width'), '20' + ) + + def test_legacy_gradient_and_transformed_group_remain_supported(self): + svg = ''' + + + + ''' + with tempfile.TemporaryDirectory() as temp: + source = Path(temp) + (source / 'icon.svg').write_text(svg) + shutil.copy( + ROOT / 'assets/branding/status-icon.svg', source / 'status-icon.svg' + ) + layers = GENERATOR['android_sources'](source) ns = GENERATOR['NS'] - android = GENERATOR['ANDROID'] - vectors = GENERATOR['android_vectors']() - source = ET.parse(ROOT / 'assets/branding/icon.svg').find('s:g', ns) - group = vectors['ic_launcher_foreground.xml'].find('group') - self.assertEqual(group.get(f'{{{android}}}scaleX'), '0.73') - self.assertEqual(group.get(f'{{{android}}}translateX'), '169.29') self.assertEqual( - [p.get(f'{{{android}}}pathData') for p in group], - [p.get('d') for p in source], + layers['ic_launcher_foreground'].get('viewBox'), '0 0 1254 1254' + ) + self.assertEqual( + layers['ic_launcher_foreground'].find('s:g', ns).get('transform'), + 'translate(169.29 169.29) scale(0.73)', ) - status = ET.parse(ROOT / 'assets/branding/status-icon.svg').getroot() self.assertEqual( - vectors['ic_notification.xml'][0].get(f'{{{android}}}pathData'), - status[0].get('d'), + layers['ic_launcher_background'].find('s:path', ns).get('fill'), + 'url(#any-name)', ) - with self.assertRaises(ValueError): - GENERATOR['paths'](ET.Element('group'), [ET.Element('rect')]) @unittest.skipUnless( - shutil.which('rsvg-convert') and shutil.which('magick'), 'Export tools required' + ANDROID_VECTORS and shutil.which('rsvg-convert') and shutil.which('magick'), + 'Set MESSAGE487_TEST_ANDROID_VECTORS=1 with Android and PNG export tools', ) def test_export_sizes_and_store_opacity(self): with tempfile.TemporaryDirectory() as temp: @@ -65,6 +181,31 @@ def test_export_sizes_and_store_opacity(self): if 'fastlane' in str(png): self.assertEqual(data[25], 2) # PNG RGB, without an alpha channel. self.assertEqual(len(list(output.rglob('*.xml'))), 3) + android = '{' + GENERATOR['ANDROID'] + '}' + foreground = ET.parse( + output / 'app/src/main/res/drawable/ic_launcher_foreground.xml' + ).getroot() + self.assertEqual(foreground.get(android + 'width'), '108dp') + self.assertEqual( + float(foreground.get(android + 'viewportWidth')), + float( + ET.parse(ROOT / 'assets/branding/icon.svg') + .getroot() + .get('viewBox') + .split()[2] + ) + * 1.5, + ) + self.assertTrue(list(foreground.iter('path'))) + x, y, _, _ = map( + float, + GENERATOR['android_sources']()['ic_launcher_foreground'] + .get('viewBox') + .split(), + ) + self.assertEqual(float(foreground[0].get(android + 'translateX')), -x) + self.assertEqual(float(foreground[0].get(android + 'translateY')), -y) + first = { p.relative_to(output): p.read_bytes() for p in output.rglob('*') diff --git a/scripts/tests/test_preview_samsung_icon.py b/scripts/tests/test_preview_samsung_icon.py index 31bf96b..328497a 100644 --- a/scripts/tests/test_preview_samsung_icon.py +++ b/scripts/tests/test_preview_samsung_icon.py @@ -8,15 +8,33 @@ class SamsungPreviewTest(unittest.TestCase): - def test_mask_preserves_adaptive_artwork(self): + def test_background_defaults_to_white_and_can_be_disabled(self): root = Path(__file__).resolve().parents[2] script = runpy.run_path(str(root / 'scripts/preview-samsung-icon.py')) - preview = ET.fromstring( - script['preview_svg']( - root / 'assets/branding/icon-round.svg', effects=False + source = root / 'assets/branding/icon.svg' + for effects in (False, True): + opaque = ET.fromstring(script['preview_svg'](source, effects=effects)) + transparent = ET.fromstring( + script['preview_svg'](source, effects=effects, transparent=True) ) - ) - source = ET.parse(root / 'assets/branding/icon-round.svg').getroot() + background = opaque[0] + self.assertEqual(background.tag, '{http://www.w3.org/2000/svg}rect') + self.assertEqual(background.get('fill'), 'white') + opaque.remove(background) + self.assertEqual(ET.tostring(opaque), ET.tostring(transparent)) + + def test_mask_preserves_adaptive_artwork(self): + root = Path(__file__).resolve().parents[2] + script = runpy.run_path(str(root / 'scripts/preview-samsung-icon.py')) + svg = ''' + + + ''' + with tempfile.TemporaryDirectory() as temp: + path = Path(temp) / 'round.svg' + path.write_text(svg) + preview = ET.fromstring(script['preview_svg'](path, effects=False)) + source = ET.fromstring(svg) ns = {'s': 'http://www.w3.org/2000/svg'} self.assertEqual(preview.attrib, source.attrib) self.assertEqual( @@ -24,7 +42,7 @@ def test_mask_preserves_adaptive_artwork(self): ET.tostring(source.find('s:g', ns)), ) clip = preview.find('.//s:clipPath', ns) - self.assertEqual(clip.attrib['id'], 'circle') + self.assertEqual(clip.attrib['id'], source.find('.//s:clipPath', ns).get('id')) self.assertEqual(len(clip), 1) self.assertTrue(clip[0].tag.endswith('}path'))