diff --git a/.github/assets/readme/demo-imessage.png b/.github/assets/readme/demo-imessage.png deleted file mode 100644 index 25ade29..0000000 Binary files a/.github/assets/readme/demo-imessage.png and /dev/null differ diff --git a/.github/assets/readme/demo-notes.png b/.github/assets/readme/demo-notes.png deleted file mode 100644 index b224b98..0000000 Binary files a/.github/assets/readme/demo-notes.png and /dev/null differ diff --git a/.github/assets/readme/demo-slack.png b/.github/assets/readme/demo-slack.png deleted file mode 100644 index c4a5b1f..0000000 Binary files a/.github/assets/readme/demo-slack.png and /dev/null differ diff --git a/Cotabby/Assets.xcassets/AppIcon.appiconset/1024.png b/Cotabby/Assets.xcassets/AppIcon.appiconset/1024.png index a02f982..406c622 100644 Binary files a/Cotabby/Assets.xcassets/AppIcon.appiconset/1024.png and b/Cotabby/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/Cotabby/Assets.xcassets/AppIcon.appiconset/128.png b/Cotabby/Assets.xcassets/AppIcon.appiconset/128.png index c8310e4..289a9a5 100644 Binary files a/Cotabby/Assets.xcassets/AppIcon.appiconset/128.png and b/Cotabby/Assets.xcassets/AppIcon.appiconset/128.png differ diff --git a/Cotabby/Assets.xcassets/AppIcon.appiconset/16.png b/Cotabby/Assets.xcassets/AppIcon.appiconset/16.png index f911301..daa6ec5 100644 Binary files a/Cotabby/Assets.xcassets/AppIcon.appiconset/16.png and b/Cotabby/Assets.xcassets/AppIcon.appiconset/16.png differ diff --git a/Cotabby/Assets.xcassets/AppIcon.appiconset/256.png b/Cotabby/Assets.xcassets/AppIcon.appiconset/256.png index 2d0aa1e..8f60228 100644 Binary files a/Cotabby/Assets.xcassets/AppIcon.appiconset/256.png and b/Cotabby/Assets.xcassets/AppIcon.appiconset/256.png differ diff --git a/Cotabby/Assets.xcassets/AppIcon.appiconset/32.png b/Cotabby/Assets.xcassets/AppIcon.appiconset/32.png index 5cee001..3c6af41 100644 Binary files a/Cotabby/Assets.xcassets/AppIcon.appiconset/32.png and b/Cotabby/Assets.xcassets/AppIcon.appiconset/32.png differ diff --git a/Cotabby/Assets.xcassets/AppIcon.appiconset/512.png b/Cotabby/Assets.xcassets/AppIcon.appiconset/512.png index c8c41e6..1176d13 100644 Binary files a/Cotabby/Assets.xcassets/AppIcon.appiconset/512.png and b/Cotabby/Assets.xcassets/AppIcon.appiconset/512.png differ diff --git a/Cotabby/Assets.xcassets/AppIcon.appiconset/64.png b/Cotabby/Assets.xcassets/AppIcon.appiconset/64.png index e7a167d..31418f0 100644 Binary files a/Cotabby/Assets.xcassets/AppIcon.appiconset/64.png and b/Cotabby/Assets.xcassets/AppIcon.appiconset/64.png differ diff --git a/Cotabby/Assets.xcassets/WelcomeAppIcon.imageset/Contents.json b/Cotabby/Assets.xcassets/CotabbyLogo.imageset/Contents.json similarity index 53% rename from Cotabby/Assets.xcassets/WelcomeAppIcon.imageset/Contents.json rename to Cotabby/Assets.xcassets/CotabbyLogo.imageset/Contents.json index fb63236..c257bd9 100644 --- a/Cotabby/Assets.xcassets/WelcomeAppIcon.imageset/Contents.json +++ b/Cotabby/Assets.xcassets/CotabbyLogo.imageset/Contents.json @@ -1,14 +1,19 @@ { "images" : [ { - "filename" : "welcome-app-icon.png", + "filename" : "CotabbyLogo.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "welcome-app-icon@2x.png", + "filename" : "CotabbyLogo@2x.png", "idiom" : "universal", "scale" : "2x" + }, + { + "filename" : "CotabbyLogo@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/Cotabby/Assets.xcassets/CotabbyLogo.imageset/CotabbyLogo.png b/Cotabby/Assets.xcassets/CotabbyLogo.imageset/CotabbyLogo.png new file mode 100644 index 0000000..012a1f4 Binary files /dev/null and b/Cotabby/Assets.xcassets/CotabbyLogo.imageset/CotabbyLogo.png differ diff --git a/Cotabby/Assets.xcassets/CotabbyLogo.imageset/CotabbyLogo@2x.png b/Cotabby/Assets.xcassets/CotabbyLogo.imageset/CotabbyLogo@2x.png new file mode 100644 index 0000000..0d8bcec Binary files /dev/null and b/Cotabby/Assets.xcassets/CotabbyLogo.imageset/CotabbyLogo@2x.png differ diff --git a/Cotabby/Assets.xcassets/CotabbyLogo.imageset/CotabbyLogo@3x.png b/Cotabby/Assets.xcassets/CotabbyLogo.imageset/CotabbyLogo@3x.png new file mode 100644 index 0000000..ab17066 Binary files /dev/null and b/Cotabby/Assets.xcassets/CotabbyLogo.imageset/CotabbyLogo@3x.png differ diff --git a/Cotabby/Assets.xcassets/MenuBarCatIcon.imageset/Contents.json b/Cotabby/Assets.xcassets/MenuBarCatIcon.imageset/Contents.json new file mode 100644 index 0000000..2a20db6 --- /dev/null +++ b/Cotabby/Assets.xcassets/MenuBarCatIcon.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "MenuBarCatIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "MenuBarCatIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "MenuBarCatIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Cotabby/Assets.xcassets/MenuBarCatIcon.imageset/MenuBarCatIcon.png b/Cotabby/Assets.xcassets/MenuBarCatIcon.imageset/MenuBarCatIcon.png new file mode 100644 index 0000000..3c626dc Binary files /dev/null and b/Cotabby/Assets.xcassets/MenuBarCatIcon.imageset/MenuBarCatIcon.png differ diff --git a/Cotabby/Assets.xcassets/MenuBarCatIcon.imageset/MenuBarCatIcon@2x.png b/Cotabby/Assets.xcassets/MenuBarCatIcon.imageset/MenuBarCatIcon@2x.png new file mode 100644 index 0000000..83ab28d Binary files /dev/null and b/Cotabby/Assets.xcassets/MenuBarCatIcon.imageset/MenuBarCatIcon@2x.png differ diff --git a/Cotabby/Assets.xcassets/MenuBarCatIcon.imageset/MenuBarCatIcon@3x.png b/Cotabby/Assets.xcassets/MenuBarCatIcon.imageset/MenuBarCatIcon@3x.png new file mode 100644 index 0000000..df8589f Binary files /dev/null and b/Cotabby/Assets.xcassets/MenuBarCatIcon.imageset/MenuBarCatIcon@3x.png differ diff --git a/Cotabby/Assets.xcassets/WelcomeAppIcon.imageset/welcome-app-icon.png b/Cotabby/Assets.xcassets/WelcomeAppIcon.imageset/welcome-app-icon.png deleted file mode 100644 index c8c41e6..0000000 Binary files a/Cotabby/Assets.xcassets/WelcomeAppIcon.imageset/welcome-app-icon.png and /dev/null differ diff --git a/Cotabby/Assets.xcassets/WelcomeAppIcon.imageset/welcome-app-icon@2x.png b/Cotabby/Assets.xcassets/WelcomeAppIcon.imageset/welcome-app-icon@2x.png deleted file mode 100644 index c8c41e6..0000000 Binary files a/Cotabby/Assets.xcassets/WelcomeAppIcon.imageset/welcome-app-icon@2x.png and /dev/null differ diff --git a/Cotabby/Services/UI/ActivationIndicatorController.swift b/Cotabby/Services/UI/ActivationIndicatorController.swift index 88e2ba6..4907f77 100644 --- a/Cotabby/Services/UI/ActivationIndicatorController.swift +++ b/Cotabby/Services/UI/ActivationIndicatorController.swift @@ -139,23 +139,16 @@ private final class ActivationIndicatorPanel: NSPanel { } private struct FieldEdgeIconIndicatorView: View { - @Environment(\.colorScheme) private var colorScheme - - private var bgColor: Color { - colorScheme == .dark ? Color(white: 0.15) : Color(white: 0.92) - } - - private var pawColor: Color { - colorScheme == .dark ? .white : Color(white: 0.25) - } - var body: some View { ZStack { RoundedRectangle(cornerRadius: 5, style: .continuous) - .fill(bgColor) - Image(systemName: "pawprint.fill") - .font(.system(size: 11, weight: .medium)) - .foregroundStyle(pawColor) + .fill(Color(red: 0.18, green: 0.19, blue: 0.21)) + Image("MenuBarCatIcon") + .renderingMode(.template) + .resizable() + .scaledToFit() + .frame(height: 13) + .foregroundStyle(.white) } .frame(width: 20, height: 20) .shadow(color: .black.opacity(0.12), radius: 2, y: 1) diff --git a/Cotabby/UI/MenuBarStatusLabelView.swift b/Cotabby/UI/MenuBarStatusLabelView.swift index 14345c5..cbb3d89 100644 --- a/Cotabby/UI/MenuBarStatusLabelView.swift +++ b/Cotabby/UI/MenuBarStatusLabelView.swift @@ -12,9 +12,11 @@ struct MenuBarStatusLabelView: View { var body: some View { HStack(spacing: 2) { - Image(systemName: "pawprint.fill") - .symbolRenderingMode(.monochrome) - .font(.system(size: 13, weight: .semibold)) + Image("MenuBarCatIcon") + .renderingMode(.template) + .resizable() + .scaledToFit() + .frame(height: 16) if let label = WordCountFormatter.compactLabel( for: suggestionCoordinator.totalTabAcceptedWordCount diff --git a/Cotabby/UI/SettingsView.swift b/Cotabby/UI/SettingsView.swift index 3ed686e..b649b6c 100644 --- a/Cotabby/UI/SettingsView.swift +++ b/Cotabby/UI/SettingsView.swift @@ -72,15 +72,11 @@ struct SettingsView: View { private var settingsHeader: some View { Section { HStack(spacing: 10) { - ZStack { - RoundedRectangle(cornerRadius: 10, style: .continuous) - .fill(Color.primary.opacity(0.06)) - - Image(systemName: "pawprint.fill") - .font(.system(size: 16, weight: .semibold)) - .foregroundStyle(.primary) - } - .frame(width: 32, height: 32) + Image("CotabbyLogo") + .resizable() + .scaledToFit() + .frame(width: 32, height: 32) + .clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous)) VStack(alignment: .leading, spacing: 1) { Text("Cotabby") diff --git a/Cotabby/UI/WelcomeView.swift b/Cotabby/UI/WelcomeView.swift index 704d8ad..75d46a2 100644 --- a/Cotabby/UI/WelcomeView.swift +++ b/Cotabby/UI/WelcomeView.swift @@ -108,11 +108,11 @@ private enum WelcomeStep: Int, Comparable { extension WelcomeView { fileprivate var welcomeStep: some View { VStack(spacing: 24) { - Image(systemName: "pawprint.fill") + Image("CotabbyLogo") .resizable() .scaledToFit() .frame(width: 72, height: 72) - .foregroundStyle(.white) + .clipShape(RoundedRectangle(cornerRadius: 16, style: .continuous)) VStack(spacing: 8) { Text("Welcome to Cotabby")