diff --git a/apps/mobile/app.config.ts b/apps/mobile/app.config.ts index b488362..5607e20 100644 --- a/apps/mobile/app.config.ts +++ b/apps/mobile/app.config.ts @@ -1,31 +1,50 @@ import type { ConfigContext, ExpoConfig } from "expo/config" export default ({ config }: ConfigContext): ExpoConfig => { - const variant = process.env.APP_VARIANT ?? "production" - if (!["development", "preview", "production"].includes(variant)) { + const variant = + process.env.APP_VARIANT ?? process.env.EAS_BUILD_PROFILE ?? "production" + if ( + variant !== "development" && + variant !== "preview" && + variant !== "production" + ) { throw new Error(`Unsupported APP_VARIANT: ${variant}`) } const suffix = variant === "production" ? "" : `.${variant}` + const iconSuffix = variant === "production" ? "" : `-${variant}` const nameSuffix = variant === "development" ? " (Development)" : variant === "preview" ? " (Preview)" : "" + const composer = { + development: "oTunes Dev", + preview: "oTunes Preview", + production: "oTunes", + }[variant] return { ...config, name: `${config.name}${nameSuffix}`, slug: config.slug!, scheme: variant === "production" ? "otunes" : `otunes-${variant}`, + icon: `./assets/icon${iconSuffix}.png`, ios: { ...config.ios, bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`, + icon: `./assets/${composer}.icon`, }, android: { ...config.android, package: `${config.android!.package}${suffix}`, + icon: `./assets/android-icon${iconSuffix}.png`, + adaptiveIcon: { + monochromeImage: "./assets/android-icon-monochrome.png", + foregroundImage: `./assets/android-icon-foreground${iconSuffix}.png`, + backgroundImage: `./assets/android-icon-background${iconSuffix}.png`, + }, }, } } diff --git a/apps/mobile/app.json b/apps/mobile/app.json index 03cbba5..c43ce32 100644 --- a/apps/mobile/app.json +++ b/apps/mobile/app.json @@ -26,10 +26,11 @@ "adaptiveIcon": { "monochromeImage": "./assets/android-icon-monochrome.png", "foregroundImage": "./assets/android-icon-foreground.png", - "backgroundColor": "#C60322" + "backgroundImage": "./assets/android-icon-background.png" }, "userInterfaceStyle": "dark", - "softwareKeyboardLayoutMode": "resize" + "softwareKeyboardLayoutMode": "resize", + "icon": "./assets/android-icon.png" }, "plugins": [ "expo-router", diff --git a/apps/mobile/assets/android-icon-background-development.png b/apps/mobile/assets/android-icon-background-development.png new file mode 100644 index 0000000..446e6fd Binary files /dev/null and b/apps/mobile/assets/android-icon-background-development.png differ diff --git a/apps/mobile/assets/android-icon-background-preview.png b/apps/mobile/assets/android-icon-background-preview.png new file mode 100644 index 0000000..f048993 Binary files /dev/null and b/apps/mobile/assets/android-icon-background-preview.png differ diff --git a/apps/mobile/assets/android-icon-background.png b/apps/mobile/assets/android-icon-background.png new file mode 100644 index 0000000..fbf3df3 Binary files /dev/null and b/apps/mobile/assets/android-icon-background.png differ diff --git a/apps/mobile/assets/android-icon-development.png b/apps/mobile/assets/android-icon-development.png new file mode 100644 index 0000000..2802721 Binary files /dev/null and b/apps/mobile/assets/android-icon-development.png differ diff --git a/apps/mobile/assets/android-icon-foreground-development.png b/apps/mobile/assets/android-icon-foreground-development.png new file mode 100644 index 0000000..fb5a735 Binary files /dev/null and b/apps/mobile/assets/android-icon-foreground-development.png differ diff --git a/apps/mobile/assets/android-icon-foreground-preview.png b/apps/mobile/assets/android-icon-foreground-preview.png new file mode 100644 index 0000000..fb5a735 Binary files /dev/null and b/apps/mobile/assets/android-icon-foreground-preview.png differ diff --git a/apps/mobile/assets/android-icon-foreground.png b/apps/mobile/assets/android-icon-foreground.png index fabda62..fb5a735 100644 Binary files a/apps/mobile/assets/android-icon-foreground.png and b/apps/mobile/assets/android-icon-foreground.png differ diff --git a/apps/mobile/assets/android-icon-monochrome.png b/apps/mobile/assets/android-icon-monochrome.png index 9306ee6..1ecd4e8 100644 Binary files a/apps/mobile/assets/android-icon-monochrome.png and b/apps/mobile/assets/android-icon-monochrome.png differ diff --git a/apps/mobile/assets/android-icon-preview.png b/apps/mobile/assets/android-icon-preview.png new file mode 100644 index 0000000..1d9aadc Binary files /dev/null and b/apps/mobile/assets/android-icon-preview.png differ diff --git a/apps/mobile/assets/android-icon.png b/apps/mobile/assets/android-icon.png new file mode 100644 index 0000000..525ab4a Binary files /dev/null and b/apps/mobile/assets/android-icon.png differ diff --git a/apps/mobile/assets/favicon.png b/apps/mobile/assets/favicon.png index ae634f1..28a10a1 100644 Binary files a/apps/mobile/assets/favicon.png and b/apps/mobile/assets/favicon.png differ diff --git a/apps/mobile/assets/icon-dark.png b/apps/mobile/assets/icon-dark.png index 1cfbe1b..1734712 100644 Binary files a/apps/mobile/assets/icon-dark.png and b/apps/mobile/assets/icon-dark.png differ diff --git a/apps/mobile/assets/icon-development.png b/apps/mobile/assets/icon-development.png new file mode 100644 index 0000000..74886ab Binary files /dev/null and b/apps/mobile/assets/icon-development.png differ diff --git a/apps/mobile/assets/icon-preview.png b/apps/mobile/assets/icon-preview.png new file mode 100644 index 0000000..0f11114 Binary files /dev/null and b/apps/mobile/assets/icon-preview.png differ diff --git a/apps/mobile/assets/icon.png b/apps/mobile/assets/icon.png index 5b551c5..064a933 100644 Binary files a/apps/mobile/assets/icon.png and b/apps/mobile/assets/icon.png differ diff --git a/apps/mobile/assets/ios-icon-dark.png b/apps/mobile/assets/ios-icon-dark.png index 1beeeb2..1734712 100644 Binary files a/apps/mobile/assets/ios-icon-dark.png and b/apps/mobile/assets/ios-icon-dark.png differ diff --git a/apps/mobile/assets/ios-icon.png b/apps/mobile/assets/ios-icon.png index 5ab36c8..064a933 100644 Binary files a/apps/mobile/assets/ios-icon.png and b/apps/mobile/assets/ios-icon.png differ diff --git a/apps/mobile/assets/oTunes Dev.icon/Assets/music.note.png b/apps/mobile/assets/oTunes Dev.icon/Assets/music.note.png new file mode 100644 index 0000000..83a5047 Binary files /dev/null and b/apps/mobile/assets/oTunes Dev.icon/Assets/music.note.png differ diff --git a/apps/mobile/assets/oTunes Dev.icon/icon.json b/apps/mobile/assets/oTunes Dev.icon/icon.json new file mode 100644 index 0000000..ddacd43 --- /dev/null +++ b/apps/mobile/assets/oTunes Dev.icon/icon.json @@ -0,0 +1,53 @@ +{ + "fill" : { + "linear-gradient" : [ + "display-p3:0.00000,0.55106,0.91748,1.00000", + "display-p3:0.00320,0.24546,0.91602,1.00000" + ] + }, + "groups" : [ + { + "layers" : [ + { + "fill-specializations" : [ + { + "value" : "automatic" + }, + { + "appearance" : "dark", + "value" : { + "linear-gradient" : [ + "display-p3:0.00000,0.55106,0.91748,1.00000", + "display-p3:0.00320,0.24546,0.91602,1.00000" + ] + } + } + ], + "image-name" : "music.note.png", + "name" : "music.note", + "position" : { + "scale" : 1.5, + "translation-in-points" : [ + 0, + 0 + ] + } + } + ], + "shadow" : { + "kind" : "neutral", + "opacity" : 0.6 + }, + "translucency" : { + "enabled" : false, + "value" : 0.2 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file diff --git a/apps/mobile/assets/oTunes Preview.icon/Assets/music.note.png b/apps/mobile/assets/oTunes Preview.icon/Assets/music.note.png new file mode 100644 index 0000000..83a5047 Binary files /dev/null and b/apps/mobile/assets/oTunes Preview.icon/Assets/music.note.png differ diff --git a/apps/mobile/assets/oTunes Preview.icon/icon.json b/apps/mobile/assets/oTunes Preview.icon/icon.json new file mode 100644 index 0000000..4e50b13 --- /dev/null +++ b/apps/mobile/assets/oTunes Preview.icon/icon.json @@ -0,0 +1,53 @@ +{ + "fill" : { + "linear-gradient" : [ + "display-p3:0.03297,0.65562,0.91748,1.00000", + "display-p3:0.01787,0.85470,0.91602,1.00000" + ] + }, + "groups" : [ + { + "layers" : [ + { + "fill-specializations" : [ + { + "value" : "automatic" + }, + { + "appearance" : "dark", + "value" : { + "linear-gradient" : [ + "display-p3:0.03297,0.65562,0.91748,1.00000", + "display-p3:0.01787,0.85470,0.91602,1.00000" + ] + } + } + ], + "image-name" : "music.note.png", + "name" : "music.note", + "position" : { + "scale" : 1.5, + "translation-in-points" : [ + 0, + 0 + ] + } + } + ], + "shadow" : { + "kind" : "neutral", + "opacity" : 0.6 + }, + "translucency" : { + "enabled" : false, + "value" : 0.2 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file diff --git a/apps/mobile/assets/oTunes.icon/icon.json b/apps/mobile/assets/oTunes.icon/icon.json index ad24795..e786cbc 100644 --- a/apps/mobile/assets/oTunes.icon/icon.json +++ b/apps/mobile/assets/oTunes.icon/icon.json @@ -26,7 +26,7 @@ "image-name" : "music.note.png", "name" : "music.note", "position" : { - "scale" : 1, + "scale" : 1.5, "translation-in-points" : [ 0, 0 diff --git a/apps/web/app/favicon.png b/apps/web/app/favicon.png index 1cc9ca1..25bfa48 100644 Binary files a/apps/web/app/favicon.png and b/apps/web/app/favicon.png differ diff --git a/apps/web/public/favicon-dark.png b/apps/web/public/favicon-dark.png index df2780f..78b6dd9 100644 Binary files a/apps/web/public/favicon-dark.png and b/apps/web/public/favicon-dark.png differ diff --git a/apps/web/public/favicon.png b/apps/web/public/favicon.png index 1cc9ca1..25bfa48 100644 Binary files a/apps/web/public/favicon.png and b/apps/web/public/favicon.png differ diff --git a/apps/web/public/logo-dark.png b/apps/web/public/logo-dark.png index 1beeeb2..1734712 100644 Binary files a/apps/web/public/logo-dark.png and b/apps/web/public/logo-dark.png differ diff --git a/apps/web/public/logo.png b/apps/web/public/logo.png index 5ab36c8..064a933 100644 Binary files a/apps/web/public/logo.png and b/apps/web/public/logo.png differ diff --git a/favicon.png b/favicon.png index 1cc9ca1..28a10a1 100644 Binary files a/favicon.png and b/favicon.png differ diff --git a/scripts/generate-icons.py b/scripts/generate-icons.py new file mode 100644 index 0000000..0634b38 --- /dev/null +++ b/scripts/generate-icons.py @@ -0,0 +1,79 @@ +"""Export Composer artwork with Xcode, then resize with Pillow. + +Run on macOS with Xcode and Pillow installed: python3 scripts/generate-icons.py +""" +import json +from pathlib import Path +import shutil +import subprocess +import tempfile +from PIL import Image + +ROOT = Path(__file__).resolve().parents[1] +ASSETS = ROOT / "apps/mobile/assets" +ICTOOL = "/Applications/Xcode.app/Contents/Applications/Icon Composer.app/Contents/Executables/ictool" + + +def export(source, output, rendition="Default"): + subprocess.run([ + ICTOOL, str(source), "--export-image", "--output-file", str(output), + "--platform", "iOS", "--rendition", rendition, + "--width", "1024", "--height", "1024", "--scale", "1", + ], check=True) + return Image.open(output).convert("RGBA") + + +def save(image, path, size=1024): + image.resize((size, size), Image.Resampling.LANCZOS).save(ROOT / path) + + +with tempfile.TemporaryDirectory(prefix="otunes-icons-") as directory: + temp = Path(directory) + for variant, composer in [("production", "oTunes"), ("development", "oTunes Dev"), ("preview", "oTunes Preview")]: + source = ASSETS / f"{composer}.icon" + icon = export(source, temp / "icon.png") + dark = export(source, temp / "dark.png", "Dark") + suffix = "" if variant == "production" else f"-{variant}" + save(icon, f"apps/mobile/assets/icon{suffix}.png") + + # Android uses the Composer artwork without Apple's rounded glass base. + document = json.loads((source / "icon.json").read_text()) + layer = document["groups"][0]["layers"][0] + artwork = Image.open(source / "Assets" / layer["image-name"]).convert("RGBA") + position = layer["position"] + scale = position["scale"] + artwork = artwork.resize(tuple(round(size * scale) for size in artwork.size), Image.Resampling.LANCZOS) + x, y = position["translation-in-points"] + foreground = Image.new("RGBA", (1024, 1024)) + foreground.alpha_composite(artwork, (round((1024 - artwork.width) / 2 + x), round((1024 - artwork.height) / 2 + y))) + # Android's adaptive canvas includes an outer area reserved for motion. + adaptive = Image.new("RGBA", (1024, 1024)) + adaptive.alpha_composite(foreground.resize((682, 682), Image.Resampling.LANCZOS), (171, 171)) + save(adaptive, f"apps/mobile/assets/android-icon-foreground{suffix}.png") + # Use the rendered background's center column to retain Composer colors. + background_source = temp / "background.icon" + shutil.copytree(source, background_source, dirs_exist_ok=True) + document = json.loads((source / "icon.json").read_text()) + document["groups"] = [] + (background_source / "icon.json").write_text(json.dumps(document)) + background = export(background_source, temp / "background.png") + background = background.crop((512, 0, 513, 1024)).resize((1024, 1024)) + save(background, f"apps/mobile/assets/android-icon-background{suffix}.png") + save(Image.alpha_composite(background, foreground), f"apps/mobile/assets/android-icon{suffix}.png") + if variant != "production": + continue + monochrome = Image.new("RGBA", adaptive.size, "white") + monochrome.putalpha(adaptive.getchannel("A")) + save(monochrome, "apps/mobile/assets/android-icon-monochrome.png") + for name, image in [("icon-dark", dark), ("ios-icon", icon), ("ios-icon-dark", dark)]: + save(image, f"apps/mobile/assets/{name}.png") + for name, image in [("logo", icon), ("logo-dark", dark)]: + save(image, f"apps/web/public/{name}.png") + for path, size, image in [ + ("favicon.png", 64, icon), + ("apps/mobile/assets/favicon.png", 64, icon), + ("apps/web/app/favicon.png", 128, icon), + ("apps/web/public/favicon.png", 128, icon), + ("apps/web/public/favicon-dark.png", 128, dark), + ]: + save(image, path, size)