using AssociatedIcon, plus color tweaks to match inline avatar

mlemgroup · Oct 3, 2023 · 8006a6d · 8006a6d
1 parent c79f4af
commit 8006a6d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/Mlem/Enums/AvatarType.swift b/Mlem/Enums/AvatarType.swift
@@ -11,3 +11,23 @@ import Foundation
 enum AvatarType {
     case user, community
 }
+
+extension AvatarType: AssociatedIcon {
+    var iconName: String {
+        switch self {
+        case .user:
+            return Icons.user
+        case .community:
+            return Icons.community
+        }
+    }
+
+    var iconNameFill: String {
+        switch self {
+        case .user:
+            return Icons.userFill
+        case .community:
+            return Icons.communityFill
+        }
+    }
+}
diff --git a/Mlem/Views/Tabs/Feeds/Components/Sidebar Header Avatar.swift b/Mlem/Views/Tabs/Feeds/Components/Sidebar Header Avatar.swift
@@ -13,15 +13,6 @@ struct SidebarHeaderAvatar: View {
     @State var shouldClipAvatar: Bool = false
     @State var imageUrl: URL?
     let avatarType: AvatarType
-
-    var imageName: String {
-        switch avatarType {
-        case .user:
-            return Icons.user
-        case .community:
-            return Icons.community
-        }
-    }
 
     var body: some View {
         avatar
@@ -47,8 +38,9 @@ struct SidebarHeaderAvatar: View {
 
     func fallbackAvatar() -> AnyView {
         AnyView(
-            Image(systemName: imageName)
+            Image(systemName: avatarType.iconNameFill)
                 .font(.system(size: AppConstants.hugeAvatarSize)) // SF Symbols are apparently font
+                .background(.white)
                 .foregroundStyle(Color.gray.gradient)
         )
     }