final 1.7 UI changes

tealbathingsuit · tealbathingsuit · commit 8f657657a72e · 2023-06-27T09:02:21.000-04:00
diff --git a/Accord.xcodeproj/project.pbxproj b/Accord.xcodeproj/project.pbxproj
@@ -95,7 +95,6 @@
 		9EDD136627D5A55A000685E6 /* String++.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EDD136527D5A55A000685E6 /* String++.swift */; };
 		9EDD136827D6F951000685E6 /* Regex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EDD136727D6F951000685E6 /* Regex.swift */; };
 		9EDDB1B32831E4FC00510036 /* Reachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EDDB1B22831E4FC00510036 /* Reachability.swift */; };
-		9EE107C429270F6D007A8426 /* Swizzling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EE107C329270F6D007A8426 /* Swizzling.swift */; };
 		9EE2467E28F192DD004AB87B /* PlatformNavigation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EE2467D28F192DD004AB87B /* PlatformNavigation.swift */; };
 		9EE7E13628EA234D0021BE4F /* UserGuildSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EE7E13528EA234D0021BE4F /* UserGuildSettings.swift */; };
 		9EEC6D6D2890429E0005DF30 /* MessageUpdate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EEC6D6C2890429E0005DF30 /* MessageUpdate.swift */; };
@@ -1298,7 +1297,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-                MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.7;
 				OTHER_LDFLAGS = "";
 				OTHER_SWIFT_FLAGS = "";
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
@@ -1349,7 +1348,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-                MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.7;
 				OTHER_LDFLAGS = "";
 				OTHER_SWIFT_FLAGS = "";
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
diff --git a/Accord/App/ContentView.swift b/Accord/App/ContentView.swift
@@ -86,6 +86,7 @@ struct ContentView: View {
                                     switch completion {
                                     case .finished: break
                                     case let .failure(error):
+                                        AccordApp.error(error, text: "Gateway failed to connect", additionalDescription: String(describing: error), reconnectOption: true)
                                         failedToConnect(error)
                                     }
                                 }) { d in
diff --git a/Accord/UI/Base/Guild/GuildView.swift b/Accord/UI/Base/Guild/GuildView.swift
@@ -78,7 +78,11 @@ extension ServerListView {
                         )
                         .onReceive(self.appModel.$selectedGuild, perform: { [weak appModel] guild in
                             if let guild, let value = UserDefaults.standard.object(forKey: "AccordChannelIn\(guild.id)") as? String, channel.id == value {
-                                appModel?.selectedChannel = channel
+                                DispatchQueue.main.async {
+                                    DispatchQueue.main.async {
+                                        appModel?.selectedChannel = channel
+                                    }
+                                }
                             }
                         })
                         .foregroundColor({ () -> Color? in
diff --git a/Accord/UI/Base/Guild/PrivateChannelsView.swift b/Accord/UI/Base/Guild/PrivateChannelsView.swift
@@ -64,6 +64,17 @@ struct PrivateChannelsView: View {
                     }
                 }
             )
+            .onReceive(self.appModel.$selectedGuild, perform: { [weak appModel] guild in
+                if guild == nil,
+                    let value = UserDefaults.standard.object(forKey: "AccordChannelDMs") as? String,
+                    channel.id == value {
+                    DispatchQueue.main.async {
+                        DispatchQueue.main.async {
+                            appModel?.selectedChannel = channel
+                        }
+                    }
+                }
+            })
             .contextMenu {
                 Button("Copy Channel ID") {
                     NSPasteboard.general.clearContents()
diff --git a/Accord/UI/Base/Icons/DMButton.swift b/Accord/UI/Base/Icons/DMButton.swift
@@ -40,8 +40,8 @@ struct DMButton: View {
                 appModel.selectedChannel = nil
             }
         }) {
-            Image(systemName: "bubble.right.fill")
-                .font(.system(size: 16))
+            Image(systemName: "message.fill")
+                .font(.system(size: 20))
                 .padding()
                 .frame(width: 50, height: 50)
                 .background(selectedServer == "@me" || iconHovered ? Color.accentColor.opacity(0.5) : Color(NSColor.secondaryLabelColor).opacity(0.2))
diff --git a/Accord/UI/Chat/ChannelView/Accessories/EmotesView.swift b/Accord/UI/Chat/ChannelView/Accessories/EmotesView.swift
@@ -52,7 +52,43 @@ struct EmotesView: View, Equatable {
                             self.onSelect(DiscordEmote(id: "stock", name: self.search))
                             self.presentationMode.wrappedValue.dismiss()
                         }
-                    TabView(selection: self.$selection) {
+                    HStack {
+                        Button {
+                            withAnimation(.easeInOut) {
+                                self.selection = .emotes
+                            }
+                        } label: {
+                            Text("Emotes")
+                                .fontWeight(.medium)
+                                .padding(5)
+                                .padding(.horizontal, 3)
+                                .if(self.selection == .emotes, transform: {
+                                    $0
+                                        .background(RoundedRectangle(cornerRadius: 5).fill(Color.secondary.opacity(0.5)))
+                                })
+                        }
+                        .buttonStyle(.plain)
+                        .foregroundColor(.primary)
+                        Button {
+                            withAnimation(.easeInOut) {
+                                self.selection = .stickers
+                            }
+                        } label: {
+                            Text("Stickers")
+                                .fontWeight(.medium)
+                                .padding(5)
+                                .padding(.horizontal, 3)
+                                .if(self.selection == .stickers, transform: {
+                                    $0
+                                        .background(RoundedRectangle(cornerRadius: 5).fill(Color.secondary.opacity(0.5)))
+                                })
+                        }
+                        .buttonStyle(.plain)
+                        .foregroundColor(.primary)
+                    }
+                    .padding(1)
+                    .background(RoundedRectangle(cornerRadius: 10).fill(Color(NSColor.windowBackgroundColor)))
+                    if self.selection == .emotes {
                         ScrollView {
                             LazyVStack(alignment: .leading) {
                                 if search.isEmpty {
@@ -82,7 +118,7 @@ struct EmotesView: View, Equatable {
                                             }
                                         }
                                     }
-
+                                    
                                 } else {
                                     LazyVGrid(columns: columns) {
                                         ForEach(Storage.emotes.values.flatMap { $0 }.filter { $0.name.contains(search) }, id: \.id) { emote in
@@ -104,10 +140,9 @@ struct EmotesView: View, Equatable {
                             }
                         }
                         .padding()
-                        .tabItem({Text("Emotes")})
+                    } else {
                         if #available(macOS 12.0, *) {
                             StickersView()
-                                .tabItem({Text("Stickers")})
                         }
                     }
                 }
diff --git a/Accord/UI/Chat/ChannelView/ChannelViewViewModel.swift b/Accord/UI/Chat/ChannelView/ChannelViewViewModel.swift
@@ -253,6 +253,7 @@ final class ChannelViewViewModel: ObservableObject, Equatable {
 
         wss.memberChunkSubject
             .receive(on: webSocketQueue)
+            .debounce(for: .seconds(0.5), scheduler: RunLoop.main)
             .sink { [weak self] msg in
                 guard let chunk = try? JSONDecoder().decode(GuildMemberChunkResponse.self, from: msg),
                       let users = chunk.d?.members,
diff --git a/Accord/UI/Chat/ChannelView/MessageCell/Components/Reference/ReplyView.swift b/Accord/UI/Chat/ChannelView/MessageCell/Components/Reference/ReplyView.swift
@@ -49,7 +49,7 @@ struct ReplyView: View {
             })
             .buttonStyle(.borderless)
         }
-        .padding(.bottom, -3)
+        .padding(.bottom, -2)
         .padding(.leading, 15)
     }
 }
diff --git a/Accord/UI/Chat/ChannelView/MessageCell/MessageCellView.swift b/Accord/UI/Chat/ChannelView/MessageCell/MessageCellView.swift
@@ -42,7 +42,7 @@ struct MessageCellView: View, Equatable {
     @AppStorage("GifProfilePictures")
     var gifPfp: Bool = false
 
-    private let leftPadding: Double = 44.5
+    private let leftPadding: Double = 47
 
     @EnvironmentObject
     var appModel: AppGlobals
@@ -224,7 +224,7 @@ struct MessageCellView: View, Equatable {
                 }
             }
             .if(self.message.content.isEmpty, transform: {
-                $0.padding(.top, -10)
+                $0.padding(.top, -8)
             })
         }
         .contextMenu {
diff --git a/Accord/UI/Profile/PopoverProfileView.swift b/Accord/UI/Profile/PopoverProfileView.swift
@@ -210,9 +210,15 @@ struct PopoverProfileView: View {
                     Text(self.guildMember?.nick ?? user?.username ?? "")
                         .font(.title2)
                         .fontWeight(.bold)
-                    Text("\(user?.username ?? "")#\(user?.discriminator ?? "")")
-                        .font(.subheadline)
-                        .foregroundColor(Color.secondary)
+                    if user?.discriminator == "0" {
+                        Text(user?.username ?? "")
+                            .font(.subheadline)
+                            .foregroundColor(Color.secondary)
+                    } else {
+                        Text("\(user?.username ?? "")#\(user?.discriminator ?? "")")
+                            .font(.subheadline)
+                            .foregroundColor(Color.secondary)
+                    }
 
                     if let bio = self.fullUser?.bio, !bio.isEmpty {
                         Divider()

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ struct ContentView: View {`
`86`	`86`	`switch completion {`
`87`	`87`	`case .finished: break`
`88`	`88`	`case let .failure(error):`
	`89`	`+ AccordApp.error(error, text: "Gateway failed to connect", additionalDescription: String(describing: error), reconnectOption: true)`
`89`	`90`	`failedToConnect(error)`
`90`	`91`	`}`
`91`	`92`	`}) { d in`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,11 @@ extension ServerListView {`
`78`	`78`	`)`
`79`	`79`	`.onReceive(self.appModel.$selectedGuild, perform: { [weak appModel] guild in`
`80`	`80`	`if let guild, let value = UserDefaults.standard.object(forKey: "AccordChannelIn\(guild.id)") as? String, channel.id == value {`
`81`		`- appModel?.selectedChannel = channel`
	`81`	`+ DispatchQueue.main.async {`
	`82`	`+ DispatchQueue.main.async {`
	`83`	`+ appModel?.selectedChannel = channel`
	`84`	`+ }`
	`85`	`+ }`
`82`	`86`	`}`
`83`	`87`	`})`
`84`	`88`	`.foregroundColor({ () -> Color? in`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,17 @@ struct PrivateChannelsView: View {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`)`
	`67`	`+ .onReceive(self.appModel.$selectedGuild, perform: { [weak appModel] guild in`
	`68`	`+ if guild == nil,`
	`69`	`+ let value = UserDefaults.standard.object(forKey: "AccordChannelDMs") as? String,`
	`70`	`+ channel.id == value {`
	`71`	`+ DispatchQueue.main.async {`
	`72`	`+ DispatchQueue.main.async {`
	`73`	`+ appModel?.selectedChannel = channel`
	`74`	`+ }`
	`75`	`+ }`
	`76`	`+ }`
	`77`	`+ })`
`67`	`78`	`.contextMenu {`
`68`	`79`	`Button("Copy Channel ID") {`
`69`	`80`	`NSPasteboard.general.clearContents()`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ struct ReplyView: View {`
`49`	`49`	`})`
`50`	`50`	`.buttonStyle(.borderless)`
`51`	`51`	`}`
`52`		`- .padding(.bottom, -3)`
	`52`	`+ .padding(.bottom, -2)`
`53`	`53`	`.padding(.leading, 15)`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ struct MessageCellView: View, Equatable {`
`42`	`42`	`@AppStorage("GifProfilePictures")`
`43`	`43`	`var gifPfp: Bool = false`
`44`	`44`
`45`		`- private let leftPadding: Double = 44.5`
	`45`	`+ private let leftPadding: Double = 47`
`46`	`46`
`47`	`47`	`@EnvironmentObject`
`48`	`48`	`var appModel: AppGlobals`
`@@ -224,7 +224,7 @@ struct MessageCellView: View, Equatable {`
`224`	`224`	`}`
`225`	`225`	`}`
`226`	`226`	`.if(self.message.content.isEmpty, transform: {`
`227`		`- $0.padding(.top, -10)`
	`227`	`+ $0.padding(.top, -8)`
`228`	`228`	`})`
`229`	`229`	`}`
`230`	`230`	`.contextMenu {`