From e9fcf8c3b14e77479a6fb471bb51cd82a008147c Mon Sep 17 00:00:00 2001 From: Dustin Mierau Date: Mon, 13 May 2024 16:57:56 -0700 Subject: Show generic user icon in user list if user's icon can not be found. --- .../Assets.xcassets/Classic/148.imageset/148.png | Bin 1539 -> 0 bytes .../Classic/148.imageset/148@2x.png | Bin 596 -> 0 bytes .../Classic/148.imageset/148@3x.png | Bin 777 -> 0 bytes .../Classic/148.imageset/Contents.json | 6 +++--- .../Assets.xcassets/Classic/148.imageset/User.png | Bin 0 -> 479 bytes .../Classic/148.imageset/User@2x.png | Bin 0 -> 824 bytes .../Classic/148.imageset/User@3x.png | Bin 0 -> 1202 bytes .../Classic/414.imageset/148@2x.png | Bin 596 -> 0 bytes .../Classic/414.imageset/148@3x.png | Bin 777 -> 0 bytes .../Assets.xcassets/Classic/414.imageset/414.png | Bin 1539 -> 0 bytes .../Classic/414.imageset/Contents.json | 6 +++--- .../Assets.xcassets/Classic/414.imageset/User.png | Bin 0 -> 479 bytes .../Classic/414.imageset/User@2x.png | Bin 0 -> 824 bytes .../Classic/414.imageset/User@3x.png | Bin 0 -> 1202 bytes .../Assets.xcassets/User.imageset/Contents.json | 23 +++++++++++++++++++++ Hotline/Assets.xcassets/User.imageset/User.png | Bin 0 -> 479 bytes Hotline/Assets.xcassets/User.imageset/User@2x.png | Bin 0 -> 824 bytes Hotline/Assets.xcassets/User.imageset/User@3x.png | Bin 0 -> 1202 bytes Hotline/macOS/ServerView.swift | 2 +- 19 files changed, 30 insertions(+), 7 deletions(-) delete mode 100644 Hotline/Assets.xcassets/Classic/148.imageset/148.png delete mode 100644 Hotline/Assets.xcassets/Classic/148.imageset/148@2x.png delete mode 100644 Hotline/Assets.xcassets/Classic/148.imageset/148@3x.png create mode 100644 Hotline/Assets.xcassets/Classic/148.imageset/User.png create mode 100644 Hotline/Assets.xcassets/Classic/148.imageset/User@2x.png create mode 100644 Hotline/Assets.xcassets/Classic/148.imageset/User@3x.png delete mode 100644 Hotline/Assets.xcassets/Classic/414.imageset/148@2x.png delete mode 100644 Hotline/Assets.xcassets/Classic/414.imageset/148@3x.png delete mode 100644 Hotline/Assets.xcassets/Classic/414.imageset/414.png create mode 100644 Hotline/Assets.xcassets/Classic/414.imageset/User.png create mode 100644 Hotline/Assets.xcassets/Classic/414.imageset/User@2x.png create mode 100644 Hotline/Assets.xcassets/Classic/414.imageset/User@3x.png create mode 100644 Hotline/Assets.xcassets/User.imageset/Contents.json create mode 100644 Hotline/Assets.xcassets/User.imageset/User.png create mode 100644 Hotline/Assets.xcassets/User.imageset/User@2x.png create mode 100644 Hotline/Assets.xcassets/User.imageset/User@3x.png diff --git a/Hotline/Assets.xcassets/Classic/148.imageset/148.png b/Hotline/Assets.xcassets/Classic/148.imageset/148.png deleted file mode 100644 index 4ed5df4..0000000 Binary files a/Hotline/Assets.xcassets/Classic/148.imageset/148.png and /dev/null differ diff --git a/Hotline/Assets.xcassets/Classic/148.imageset/148@2x.png b/Hotline/Assets.xcassets/Classic/148.imageset/148@2x.png deleted file mode 100644 index b2d2efc..0000000 Binary files a/Hotline/Assets.xcassets/Classic/148.imageset/148@2x.png and /dev/null differ diff --git a/Hotline/Assets.xcassets/Classic/148.imageset/148@3x.png b/Hotline/Assets.xcassets/Classic/148.imageset/148@3x.png deleted file mode 100644 index c910f93..0000000 Binary files a/Hotline/Assets.xcassets/Classic/148.imageset/148@3x.png and /dev/null differ diff --git a/Hotline/Assets.xcassets/Classic/148.imageset/Contents.json b/Hotline/Assets.xcassets/Classic/148.imageset/Contents.json index ac683bd..0260694 100644 --- a/Hotline/Assets.xcassets/Classic/148.imageset/Contents.json +++ b/Hotline/Assets.xcassets/Classic/148.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "148.png", + "filename" : "User.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "148@2x.png", + "filename" : "User@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "148@3x.png", + "filename" : "User@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Hotline/Assets.xcassets/Classic/148.imageset/User.png b/Hotline/Assets.xcassets/Classic/148.imageset/User.png new file mode 100644 index 0000000..b675f22 Binary files /dev/null and b/Hotline/Assets.xcassets/Classic/148.imageset/User.png differ diff --git a/Hotline/Assets.xcassets/Classic/148.imageset/User@2x.png b/Hotline/Assets.xcassets/Classic/148.imageset/User@2x.png new file mode 100644 index 0000000..a5d59af Binary files /dev/null and b/Hotline/Assets.xcassets/Classic/148.imageset/User@2x.png differ diff --git a/Hotline/Assets.xcassets/Classic/148.imageset/User@3x.png b/Hotline/Assets.xcassets/Classic/148.imageset/User@3x.png new file mode 100644 index 0000000..cd58773 Binary files /dev/null and b/Hotline/Assets.xcassets/Classic/148.imageset/User@3x.png differ diff --git a/Hotline/Assets.xcassets/Classic/414.imageset/148@2x.png b/Hotline/Assets.xcassets/Classic/414.imageset/148@2x.png deleted file mode 100644 index b2d2efc..0000000 Binary files a/Hotline/Assets.xcassets/Classic/414.imageset/148@2x.png and /dev/null differ diff --git a/Hotline/Assets.xcassets/Classic/414.imageset/148@3x.png b/Hotline/Assets.xcassets/Classic/414.imageset/148@3x.png deleted file mode 100644 index c910f93..0000000 Binary files a/Hotline/Assets.xcassets/Classic/414.imageset/148@3x.png and /dev/null differ diff --git a/Hotline/Assets.xcassets/Classic/414.imageset/414.png b/Hotline/Assets.xcassets/Classic/414.imageset/414.png deleted file mode 100644 index 90628d1..0000000 Binary files a/Hotline/Assets.xcassets/Classic/414.imageset/414.png and /dev/null differ diff --git a/Hotline/Assets.xcassets/Classic/414.imageset/Contents.json b/Hotline/Assets.xcassets/Classic/414.imageset/Contents.json index 48058f0..0260694 100644 --- a/Hotline/Assets.xcassets/Classic/414.imageset/Contents.json +++ b/Hotline/Assets.xcassets/Classic/414.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "414.png", + "filename" : "User.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "148@2x.png", + "filename" : "User@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "148@3x.png", + "filename" : "User@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Hotline/Assets.xcassets/Classic/414.imageset/User.png b/Hotline/Assets.xcassets/Classic/414.imageset/User.png new file mode 100644 index 0000000..b675f22 Binary files /dev/null and b/Hotline/Assets.xcassets/Classic/414.imageset/User.png differ diff --git a/Hotline/Assets.xcassets/Classic/414.imageset/User@2x.png b/Hotline/Assets.xcassets/Classic/414.imageset/User@2x.png new file mode 100644 index 0000000..a5d59af Binary files /dev/null and b/Hotline/Assets.xcassets/Classic/414.imageset/User@2x.png differ diff --git a/Hotline/Assets.xcassets/Classic/414.imageset/User@3x.png b/Hotline/Assets.xcassets/Classic/414.imageset/User@3x.png new file mode 100644 index 0000000..cd58773 Binary files /dev/null and b/Hotline/Assets.xcassets/Classic/414.imageset/User@3x.png differ diff --git a/Hotline/Assets.xcassets/User.imageset/Contents.json b/Hotline/Assets.xcassets/User.imageset/Contents.json new file mode 100644 index 0000000..0260694 --- /dev/null +++ b/Hotline/Assets.xcassets/User.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "User.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "User@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "User@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Hotline/Assets.xcassets/User.imageset/User.png b/Hotline/Assets.xcassets/User.imageset/User.png new file mode 100644 index 0000000..b675f22 Binary files /dev/null and b/Hotline/Assets.xcassets/User.imageset/User.png differ diff --git a/Hotline/Assets.xcassets/User.imageset/User@2x.png b/Hotline/Assets.xcassets/User.imageset/User@2x.png new file mode 100644 index 0000000..a5d59af Binary files /dev/null and b/Hotline/Assets.xcassets/User.imageset/User@2x.png differ diff --git a/Hotline/Assets.xcassets/User.imageset/User@3x.png b/Hotline/Assets.xcassets/User.imageset/User@3x.png new file mode 100644 index 0000000..cd58773 Binary files /dev/null and b/Hotline/Assets.xcassets/User.imageset/User@3x.png differ diff --git a/Hotline/macOS/ServerView.swift b/Hotline/macOS/ServerView.swift index 9b4c044..acd3ac2 100644 --- a/Hotline/macOS/ServerView.swift +++ b/Hotline/macOS/ServerView.swift @@ -394,7 +394,7 @@ struct ServerView: View { .padding(.leading, 4) } else { - Text("") + Image("User") .frame(width: 16, height: 16) .padding(.leading, 4) } -- cgit