Improve user item

inline-chat · Dec 13, 2024 · 8686814 · 8686814
1 parent 6d2f70a
commit 8686814
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 5 deletions.
diff --git a/apple/InlineKit/Sources/InlineKit/Models/User.swift b/apple/InlineKit/Sources/InlineKit/Models/User.swift
@@ -112,4 +112,9 @@ public extension User {
   static func fromTimestamp(from: Int) -> Date {
     return Date(timeIntervalSince1970: Double(from))
   }
+
+  func isCurrentUser() -> Bool {
+    return self.id == Auth.shared.getCurrentUserId()
+  }
 }
+
diff --git a/apple/InlineMac/Views/Sidebar/UserItem.swift b/apple/InlineMac/Views/Sidebar/UserItem.swift
@@ -24,15 +24,30 @@ struct UserItem: View {
         UserAvatar(user: user, size: Theme.sidebarIconSize)
           .padding(.trailing, Theme.sidebarIconSpacing)
 
-        VStack(alignment: .leading, spacing: 0) {
+        HStack(spacing: 3) {
           if selected {
             text.foregroundColor(.white)
           } else {
             text.foregroundStyle(
               appearsActive ? .primary : .tertiary
             )
           }
-        }.animation(.easeInOut(duration: 0.1), value: selected)
+
+          // Should we show this in home? probably not, but in space we need it
+          if user.isCurrentUser() {
+            if selected {
+              Text("(You)").foregroundColor(.white.opacity(0.6))
+            } else {
+              Text("(You)").foregroundStyle(
+                appearsActive ? .tertiary : .quaternary
+              )
+            }
+          }
+        }
+        .transaction { transaction in
+          transaction.disablesAnimations = true
+        }
+
         Spacer()
       }
       .onHover { isHovered = $0 }
@@ -74,13 +89,20 @@ struct UserItemButtonStyle: ButtonStyle {
       .contentShape(.interaction, .rect(cornerRadius: Theme.sidebarItemRadius))
       .padding(.horizontal, Theme.sidebarItemPadding)
       .background {
-        RoundedRectangle(cornerRadius: Theme.sidebarItemRadius)
-          .fill(backgroundColor(configuration))
+        Group {
+          RoundedRectangle(cornerRadius: Theme.sidebarItemRadius)
+            .fill(backgroundColor(configuration))
+        }.transaction { transaction in
+          if selected {
+            transaction.disablesAnimations = true
+            transaction.animation = .none
+          }
+        }
       }
       // Optional: Add subtle scale effect when pressed
       .scaleEffect(!selected && configuration.isPressed ? 0.98 : 1.0)
       // Optional: Add smooth animation for press state
-      .animation(.easeInOut(duration: 0.1), value: configuration.isPressed)
+      .animation(.easeInOut(duration: 0.15), value: configuration.isPressed)
   }
 
   private func backgroundColor(_ configuration: Configuration) -> Color {