From b5c2a0f619f645412780d873f17c4333c787ae30 Mon Sep 17 00:00:00 2001 From: Dustin Mierau Date: Fri, 10 May 2024 11:21:02 -0700 Subject: Few new icons. New Server Message icon and font weight. --- .../Classic/176.imageset/176@2x.png | Bin 0 -> 2278 bytes .../Classic/176.imageset/176@3x.png | Bin 0 -> 3776 bytes .../Classic/176.imageset/Contents.json | 2 ++ .../Classic/206.imageset/239@2x.png | Bin 0 -> 798 bytes .../Classic/206.imageset/239@3x.png | Bin 0 -> 1125 bytes .../Classic/206.imageset/Contents.json | 2 ++ .../Classic/239.imageset/239@2x.png | Bin 0 -> 798 bytes .../Classic/239.imageset/239@3x.png | Bin 0 -> 1125 bytes .../Classic/239.imageset/Contents.json | 2 ++ .../Server Message.imageset/4016.png | Bin 0 -> 827 bytes .../Server Message.imageset/4016@2x.png | Bin 0 -> 1611 bytes .../Server Message.imageset/4016@3x.png | Bin 0 -> 2430 bytes .../Server Message.imageset/Contents.json | 23 +++++++++++++++++++++ Hotline/macOS/ServerMessageView.swift | 7 ++++--- 14 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 Hotline/Assets.xcassets/Classic/176.imageset/176@2x.png create mode 100644 Hotline/Assets.xcassets/Classic/176.imageset/176@3x.png create mode 100644 Hotline/Assets.xcassets/Classic/206.imageset/239@2x.png create mode 100644 Hotline/Assets.xcassets/Classic/206.imageset/239@3x.png create mode 100644 Hotline/Assets.xcassets/Classic/239.imageset/239@2x.png create mode 100644 Hotline/Assets.xcassets/Classic/239.imageset/239@3x.png create mode 100644 Hotline/Assets.xcassets/Server Message.imageset/4016.png create mode 100644 Hotline/Assets.xcassets/Server Message.imageset/4016@2x.png create mode 100644 Hotline/Assets.xcassets/Server Message.imageset/4016@3x.png create mode 100644 Hotline/Assets.xcassets/Server Message.imageset/Contents.json diff --git a/Hotline/Assets.xcassets/Classic/176.imageset/176@2x.png b/Hotline/Assets.xcassets/Classic/176.imageset/176@2x.png new file mode 100644 index 0000000..929e7f0 Binary files /dev/null and b/Hotline/Assets.xcassets/Classic/176.imageset/176@2x.png differ diff --git a/Hotline/Assets.xcassets/Classic/176.imageset/176@3x.png b/Hotline/Assets.xcassets/Classic/176.imageset/176@3x.png new file mode 100644 index 0000000..ae03a1d Binary files /dev/null and b/Hotline/Assets.xcassets/Classic/176.imageset/176@3x.png differ diff --git a/Hotline/Assets.xcassets/Classic/176.imageset/Contents.json b/Hotline/Assets.xcassets/Classic/176.imageset/Contents.json index 31a0a9a..2aeb27d 100644 --- a/Hotline/Assets.xcassets/Classic/176.imageset/Contents.json +++ b/Hotline/Assets.xcassets/Classic/176.imageset/Contents.json @@ -6,10 +6,12 @@ "scale" : "1x" }, { + "filename" : "176@2x.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "176@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Hotline/Assets.xcassets/Classic/206.imageset/239@2x.png b/Hotline/Assets.xcassets/Classic/206.imageset/239@2x.png new file mode 100644 index 0000000..35a7348 Binary files /dev/null and b/Hotline/Assets.xcassets/Classic/206.imageset/239@2x.png differ diff --git a/Hotline/Assets.xcassets/Classic/206.imageset/239@3x.png b/Hotline/Assets.xcassets/Classic/206.imageset/239@3x.png new file mode 100644 index 0000000..7d43736 Binary files /dev/null and b/Hotline/Assets.xcassets/Classic/206.imageset/239@3x.png differ diff --git a/Hotline/Assets.xcassets/Classic/206.imageset/Contents.json b/Hotline/Assets.xcassets/Classic/206.imageset/Contents.json index 6261857..fb5b4aa 100644 --- a/Hotline/Assets.xcassets/Classic/206.imageset/Contents.json +++ b/Hotline/Assets.xcassets/Classic/206.imageset/Contents.json @@ -6,10 +6,12 @@ "scale" : "1x" }, { + "filename" : "239@2x.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "239@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Hotline/Assets.xcassets/Classic/239.imageset/239@2x.png b/Hotline/Assets.xcassets/Classic/239.imageset/239@2x.png new file mode 100644 index 0000000..35a7348 Binary files /dev/null and b/Hotline/Assets.xcassets/Classic/239.imageset/239@2x.png differ diff --git a/Hotline/Assets.xcassets/Classic/239.imageset/239@3x.png b/Hotline/Assets.xcassets/Classic/239.imageset/239@3x.png new file mode 100644 index 0000000..7d43736 Binary files /dev/null and b/Hotline/Assets.xcassets/Classic/239.imageset/239@3x.png differ diff --git a/Hotline/Assets.xcassets/Classic/239.imageset/Contents.json b/Hotline/Assets.xcassets/Classic/239.imageset/Contents.json index f7b039d..b131969 100644 --- a/Hotline/Assets.xcassets/Classic/239.imageset/Contents.json +++ b/Hotline/Assets.xcassets/Classic/239.imageset/Contents.json @@ -6,10 +6,12 @@ "scale" : "1x" }, { + "filename" : "239@2x.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "239@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Hotline/Assets.xcassets/Server Message.imageset/4016.png b/Hotline/Assets.xcassets/Server Message.imageset/4016.png new file mode 100644 index 0000000..97e96a7 Binary files /dev/null and b/Hotline/Assets.xcassets/Server Message.imageset/4016.png differ diff --git a/Hotline/Assets.xcassets/Server Message.imageset/4016@2x.png b/Hotline/Assets.xcassets/Server Message.imageset/4016@2x.png new file mode 100644 index 0000000..bb97e20 Binary files /dev/null and b/Hotline/Assets.xcassets/Server Message.imageset/4016@2x.png differ diff --git a/Hotline/Assets.xcassets/Server Message.imageset/4016@3x.png b/Hotline/Assets.xcassets/Server Message.imageset/4016@3x.png new file mode 100644 index 0000000..d17f423 Binary files /dev/null and b/Hotline/Assets.xcassets/Server Message.imageset/4016@3x.png differ diff --git a/Hotline/Assets.xcassets/Server Message.imageset/Contents.json b/Hotline/Assets.xcassets/Server Message.imageset/Contents.json new file mode 100644 index 0000000..7011bdf --- /dev/null +++ b/Hotline/Assets.xcassets/Server Message.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "4016.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "4016@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "4016@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Hotline/macOS/ServerMessageView.swift b/Hotline/macOS/ServerMessageView.swift index 373c2a6..742703f 100644 --- a/Hotline/macOS/ServerMessageView.swift +++ b/Hotline/macOS/ServerMessageView.swift @@ -5,12 +5,13 @@ struct ServerMessageView: View { var body: some View { HStack(alignment: .center, spacing: 8) { - Image(systemName: "exclamationmark.triangle.fill") + Image("Server Message") .symbolRenderingMode(.multicolor) .resizable() .scaledToFit() - .frame(width: 16, height: 16) - Text("**\(message)**") + .frame(width: 20, height: 20) + Text(message) + .fontWeight(.semibold) .lineSpacing(4) .multilineTextAlignment(.leading) .textSelection(.enabled) -- cgit