Add avatar CommitListItemView and other fixes

Author: Angelk90

CodeEdit/Features/Git/Client/GitClient+CommitHistory.swift

@@ -31,7 +31,7 @@ extension GitClient {
         dateFormatter.dateFormat = "EEE, dd MMM yyyy HH:mm:ss Z"
 
         let output = try await run(
-            "log --pretty=%h¦%H¦%s¦%aN¦%ae¦%cn¦%ce¦%aD¦ \(maxCountString) \(branchNameString) \(fileLocalPath)"
+            "log --pretty=%h¦%H¦%s¦%aN¦%ae¦%cn¦%ce¦%aD¦%b¦%D¦ \(maxCountString) \(branchNameString) \(fileLocalPath)"
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         )
         let remote = try await run("ls-remote --get-url")
@@ -41,6 +41,20 @@ extension GitClient {
             .split(separator: "\n")
             .map { line -> GitCommit in
                 let parameters = line.components(separatedBy: "¦")
+                let infoRef = parameters[safe: 9]
+                
+                var ref = ""
+                var tag = ""
+                
+                if let infoRef = infoRef {
+                    if infoRef.contains("tag:") {
+                        tag = infoRef.components(separatedBy: "tag:")[1].trimmingCharacters(in: .whitespaces)
+                    } else {
+                        let refs = infoRef.split(separator: ",")
+                        ref = refs.count > 1 ? String(refs[1]).trimmingCharacters(in: .whitespaces) : ""
+                    }
+                }
+
                 return GitCommit(
                     hash: parameters[safe: 0] ?? "",
                     commitHash: parameters[safe: 1] ?? "",
@@ -49,6 +63,9 @@ extension GitClient {
                     authorEmail: parameters[safe: 4] ?? "",
                     committer: parameters[safe: 5] ?? "",
                     committerEmail: parameters[safe: 6] ?? "",
+                    body: parameters[safe: 8] ?? "",
+                    ref: ref,
+                    tag: tag,
                     remoteURL: remoteURL,
                     date: dateFormatter.date(from: parameters[safe: 7] ?? "") ?? Date()
                 )

CodeEdit/Features/Git/Client/Models/GitCommit.swift

@@ -17,6 +17,9 @@ struct GitCommit: Equatable, Hashable, Identifiable {
     let authorEmail: String
     let committer: String
     let committerEmail: String
+    let body: String
+    let ref: String
+    let tag: String
     let remoteURL: URL?
     let date: Date
 

CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/CommitDetailsHeaderView.swift

@@ -98,8 +98,20 @@ struct CommitDetailsHeaderView: View {
                     )
                     .padding(.horizontal, 2.5)
             }
+            .padding(.horizontal, 16)
+
+            Divider()
+            
             Text(commitDetails())
+                .fontWeight(.bold)
+                .padding(.horizontal, 16)
                 .frame(alignment: .leading)
+            
+            if !commit.body.isEmpty {
+                Text(commit.body)
+                    .padding(.horizontal, 16)
+                    .frame(alignment: .leading)
+            }
         }
     }
 }

CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/CommitDetailsView.swift

@@ -41,7 +41,6 @@ struct CommitDetailsView: View {
 
             if let commit = commit {
                 CommitDetailsHeaderView(commit: commit)
-                    .padding(.horizontal, 16)
                     .padding(.vertical, 16)
                 Divider()
 

CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/CommitListItemView.swift

@@ -10,6 +10,38 @@ import SwiftUI
 struct CommitListItemView: View {
 
     var commit: GitCommit
+    
+    private var defaultAvatar: some View {
+        Image(systemName: "person.crop.circle.fill")
+            .symbolRenderingMode(.hierarchical)
+            .resizable()
+            .foregroundColor(avatarColor)
+            .frame(width: 32, height: 32)
+    }
+    
+    private func generateAvatarHash() -> String {
+        let hash = commit.authorEmail.md5(trim: true, caseSensitive: false)
+        return "\(hash)?d=404&s=64" // send 404 if no image available, image size 64x64 (32x32 @2x)
+    }
+    
+    private var avatarColor: Color {
+        let hash = generateAvatarHash().hash
+        switch hash % 12 {
+        case 0: return .red
+        case 1: return .orange
+        case 2: return .yellow
+        case 3: return .green
+        case 4: return .mint
+        case 5: return .teal
+        case 6: return .cyan
+        case 7: return .blue
+        case 8: return .indigo
+        case 9: return .purple
+        case 10: return .brown
+        case 11: return .pink
+        default: return .teal
+        }
+    }
 
     @Environment(\.openURL)
     private var openCommit
@@ -20,11 +52,58 @@ struct CommitListItemView: View {
 
     var body: some View {
         HStack(alignment: .top) {
+            AsyncImage(url: URL(string: "https://www.gravatar.com/avatar/\(generateAvatarHash())")) { phase in
+                if let image = phase.image {
+                    image
+                        .resizable()
+                        .clipShape(Circle())
+                        .frame(width: 32, height: 32)
+                } else if phase.error != nil {
+                    defaultAvatar
+                } else {
+                    defaultAvatar
+                }
+            }
             VStack(alignment: .leading, spacing: 0) {
                 Text(commit.author)
                     .fontWeight(.bold)
                     .font(.system(size: 11))
-                Text(commit.message)
+              
+                if !commit.ref.isEmpty {
+                    HStack {
+                        Image.branch
+                            .imageScale(.small)
+                            .foregroundColor(.primary)
+                        Text(commit.ref)
+                            .font(.system(size: 10, design: .monospaced))
+                    }
+                    .background(
+                        RoundedRectangle(cornerRadius: 3)
+                            .padding(.vertical, -1)
+                            .padding(.horizontal, -2.5)
+                            .foregroundColor(Color(nsColor: .quaternaryLabelColor))
+                    )
+                    .padding(.trailing, 2.5)
+                }
+                
+                if !commit.tag.isEmpty {
+                    HStack {
+                        Image.breakpoint
+                            .imageScale(.small)
+                            .foregroundColor(.primary)
+                        Text(commit.tag)
+                            .font(.system(size: 10, design: .monospaced))
+                    }
+                    .background(
+                        RoundedRectangle(cornerRadius: 3)
+                            .padding(.vertical, -1)
+                            .padding(.horizontal, -2.5)
+                            .foregroundColor(Color(nsColor: .selectedContentBackgroundColor))
+                    )
+                    .padding(.trailing, 2.5)
+                }
+                
+                Text("\(commit.message) \(commit.body)")
                     .font(.system(size: 11))
                     .lineLimit(2)
             }