From 30c6399ec8e47103582e1e6fa8a82e477b3e3f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerry=20Wei=C3=9Fbach?= Date: Sun, 13 Sep 2020 19:11:27 +0200 Subject: [PATCH] Add WatchKit marketing and missing WatchKit icon sizes. --- convertappicon/Config.swift | 12 +++++++++--- convertappicon/main.swift | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/convertappicon/Config.swift b/convertappicon/Config.swift index 8a70027..d6d3164 100644 --- a/convertappicon/Config.swift +++ b/convertappicon/Config.swift @@ -10,11 +10,11 @@ import Foundation enum Idiom: String, Encodable { - case phone = "iphone" case pad = "ipad" case marketing = "ios-marketing" case watch = "watch" + case watchMarketing = "watch-marketing" } enum Role: String, Encodable { @@ -98,12 +98,18 @@ struct Configuration { Config(size: 24, idiom: .watch, scale: 2, role: .notificationCenter, subtype: "38mm"), Config(size: 27.5, idiom: .watch, scale: 2, role: .notificationCenter, subtype: "42mm"), + Config(size: 29, idiom: .watch, scale: 2, role: .companionSettings), Config(size: 29, idiom: .watch, scale: 3, role: .companionSettings), - Config(size: 40, idiom: .watch, scale: 2, role: .appLauncher, subtype: "38mm"), - Config(size: 44, idiom: .watch, scale: 2, role: .longLook, subtype: "42mm"), + Config(size: 86, idiom: .watch, scale: 2, role: .quickLook, subtype: "38mm"), Config(size: 98, idiom: .watch, scale: 2, role: .quickLook, subtype: "42mm"), + Config(size: 108, idiom: .watch, scale: 2, role: .quickLook, subtype: "44mm"), + + Config(size: 40, idiom: .watch, scale: 2, role: .appLauncher, subtype: "38mm"), + Config(size: 44, idiom: .watch, scale: 2, role: .appLauncher, subtype: "40mm"), + Config(size: 50, idiom: .watch, scale: 2, role: .appLauncher, subtype: "44mm"), + Config(size: 1024, idiom: .watchMarketing, scale: 1), Config(size: 1024, idiom: .marketing, scale: 1)] } diff --git a/convertappicon/main.swift b/convertappicon/main.swift index 9b44b33..80ce361 100644 --- a/convertappicon/main.swift +++ b/convertappicon/main.swift @@ -60,7 +60,7 @@ if options.contains("-s") { configs.append(contentsOf: Configuration.list.filter { $0.idiom == .marketing } ) } if options.contains("watch") { - configs.append(contentsOf: Configuration.list.filter { $0.idiom == .watch } ) + configs.append(contentsOf: Configuration.list.filter { $0.idiom == .watch || $0.idiom == .watchMarketing } ) } if configs.isEmpty { print("Warning: -s given but no category found.")