0.3.13 Update markdown

ElectricS01 · Nov 12, 2024 · 03a6737 · 03a6737
1 parent 600df24
commit 03a6737
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 14 deletions.
diff --git a/TPU_Mac.xcodeproj/project.pbxproj b/TPU_Mac.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
 		C4060AC42B8C10A600236E0E /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4060AC32B8C10A600236E0E /* HomeView.swift */; };
 		C40BC9892B8C8F9800444B56 /* NukeUI in Frameworks */ = {isa = PBXBuildFile; productRef = C40BC9882B8C8F9800444B56 /* NukeUI */; };
 		C428DE892B709ADB00A13E4A /* ApolloWebSocket in Frameworks */ = {isa = PBXBuildFile; productRef = C428DE882B709ADB00A13E4A /* ApolloWebSocket */; };
+		C4300EAE2CE3141F000AE0B5 /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = C4300EAD2CE3141F000AE0B5 /* MarkdownUI */; };
 		C44156622CB3F86100EE1F96 /* SDWebImageSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = C44156612CB3F86100EE1F96 /* SDWebImageSwiftUI */; };
 		C45099152ACFFA7F00FA9247 /* TPU_MacApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C45099142ACFFA7F00FA9247 /* TPU_MacApp.swift */; };
 		C45099172ACFFA7F00FA9247 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C45099162ACFFA7F00FA9247 /* ContentView.swift */; };
@@ -79,6 +80,7 @@
 				C40BC9892B8C8F9800444B56 /* NukeUI in Frameworks */,
 				C4DD4D492C4892AE00DF1A22 /* ApolloSQLite in Frameworks */,
 				C4569DF12AD17A2A00F17C06 /* PrivateUploaderAPI in Frameworks */,
+				C4300EAE2CE3141F000AE0B5 /* MarkdownUI in Frameworks */,
 				C44156622CB3F86100EE1F96 /* SDWebImageSwiftUI in Frameworks */,
 				C428DE892B709ADB00A13E4A /* ApolloWebSocket in Frameworks */,
 				C48C2E9E2AD0417B0000A362 /* Apollo in Frameworks */,
@@ -201,6 +203,7 @@
 				C40BC9882B8C8F9800444B56 /* NukeUI */,
 				C4DD4D482C4892AE00DF1A22 /* ApolloSQLite */,
 				C44156612CB3F86100EE1F96 /* SDWebImageSwiftUI */,
+				C4300EAD2CE3141F000AE0B5 /* MarkdownUI */,
 			);
 			productName = "TPU Mac";
 			productReference = C45099112ACFFA7F00FA9247 /* TPU Mac.app */;
@@ -280,6 +283,7 @@
 				C4FE71522AD3F084003E4DC0 /* XCRemoteSwiftPackageReference "keychain-swift" */,
 				C40BC9872B8C8F9800444B56 /* XCRemoteSwiftPackageReference "Nuke" */,
 				C44156602CB3F86100EE1F96 /* XCRemoteSwiftPackageReference "SDWebImageSwiftUI" */,
+				C4300EAC2CE3141F000AE0B5 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */,
 			);
 			productRefGroup = C45099122ACFFA7F00FA9247 /* Products */;
 			projectDirPath = "";
@@ -519,7 +523,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 0.3.12;
+				MARKETING_VERSION = 0.3.13;
 				PRODUCT_BUNDLE_IDENTIFIER = "ElectricS01.TPU-Mac";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -562,7 +566,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 0.3.12;
+				MARKETING_VERSION = 0.3.13;
 				PRODUCT_BUNDLE_IDENTIFIER = "ElectricS01.TPU-Mac";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -720,6 +724,14 @@
 				minimumVersion = 12.4.0;
 			};
 		};
+		C4300EAC2CE3141F000AE0B5 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/gonzalezreal/swift-markdown-ui?tab=readme-ov-file#installation";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 2.4.1;
+			};
+		};
 		C44156602CB3F86100EE1F96 /* XCRemoteSwiftPackageReference "SDWebImageSwiftUI" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/SDWebImage/SDWebImageSwiftUI";
@@ -757,6 +769,11 @@
 			package = C48C2E9C2AD0417B0000A362 /* XCRemoteSwiftPackageReference "apollo-ios" */;
 			productName = ApolloWebSocket;
 		};
+		C4300EAD2CE3141F000AE0B5 /* MarkdownUI */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = C4300EAC2CE3141F000AE0B5 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */;
+			productName = MarkdownUI;
+		};
 		C44156612CB3F86100EE1F96 /* SDWebImageSwiftUI */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = C44156602CB3F86100EE1F96 /* XCRemoteSwiftPackageReference "SDWebImageSwiftUI" */;

diff --git a/TPU_Mac.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/TPU_Mac.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,13 +1,13 @@
 {
-  "originHash" : "32de2e6f1ca705660f7b87d82a1831f853f4c9bc74bfe58ee88fe567972e6a9c",
+  "originHash" : "3ac8319d3ffafff56eee79acf550f2a56c08a076f51ef6246b00b471162074b0",
   "pins" : [
     {
       "identity" : "apollo-ios",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apollographql/apollo-ios.git",
       "state" : {
-        "revision" : "7122421c2ba9ce2d252943cef055c74ef56ea431",
-        "version" : "1.15.2"
+        "revision" : "c3f48d45ec1300bc95243bf19f67284f9dc0d14a",
+        "version" : "1.15.3"
       }
     },
     {
@@ -19,6 +19,15 @@
         "version" : "20.0.0"
       }
     },
+    {
+      "identity" : "networkimage",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/gonzalezreal/NetworkImage",
+      "state" : {
+        "revision" : "2849f5323265386e200484b0d0f896e73c3411b9",
+        "version" : "6.0.1"
+      }
+    },
     {
       "identity" : "nuke",
       "kind" : "remoteSourceControl",
@@ -33,17 +42,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/SDWebImage/SDWebImage.git",
       "state" : {
-        "revision" : "8a1be70a625683bc04d6903e2935bf23f3c6d609",
-        "version" : "5.19.7"
+        "revision" : "10d06f6a33bafae8c164fbfd1f03391f6d4692b3",
+        "version" : "5.20.0"
       }
     },
     {
       "identity" : "sdwebimageswiftui",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/SDWebImage/SDWebImageSwiftUI",
       "state" : {
-        "revision" : "5aa947356f4ea49a0c3b9968564267f6ea5abea7",
-        "version" : "3.1.2"
+        "revision" : "451c6dfd5ecec2cf626d1d9ca81c2d4a60355172",
+        "version" : "3.1.3"
       }
     },
     {
@@ -54,6 +63,24 @@
         "revision" : "a95fc6df17d108bd99210db5e8a9bac90fe984b8",
         "version" : "0.15.3"
       }
+    },
+    {
+      "identity" : "swift-cmark",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/swiftlang/swift-cmark",
+      "state" : {
+        "revision" : "3ccff77b2dc5b96b77db3da0d68d28068593fa53",
+        "version" : "0.5.0"
+      }
+    },
+    {
+      "identity" : "swift-markdown-ui?tab=readme-ov-file#installation",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/gonzalezreal/swift-markdown-ui?tab=readme-ov-file#installation",
+      "state" : {
+        "revision" : "5f613358148239d0292c0cef674a3c2314737f9e",
+        "version" : "2.4.1"
+      }
     }
   ],
   "version" : 3

diff --git a/TPU_Mac/ChatView.swift b/TPU_Mac/ChatView.swift
@@ -6,6 +6,7 @@
 //
 
 import Apollo
+import MarkdownUI
 import NukeUI
 import PrivateUploaderAPI
 import SDWebImageSwiftUI
@@ -279,20 +280,27 @@ struct ChatView: View {
                   if dontMerge {
                     HStack {
                       Text(message.user?.username ?? "User has been deleted")
-                      Text(DateUtils.dateFormat(message.createdAt))
+                      Text(DateUtils.dateFormat(message.createdAt)).foregroundColor(.secondary)
                     }.frame(minWidth: 0,
                             maxWidth: .infinity,
                             minHeight: 0,
                             maxHeight: 10,
                             alignment: .topLeading)
                   }
                   if editingId != message.id {
-                    Text(.init(message.content ?? "Message has been deleted"))
+                    Markdown(message.content ?? "Message has been deleted")
+                      .markdownSoftBreakMode(.lineBreak)
                       .textSelection(.enabled)
+                      .markdownBlockStyle(\.blockquote) { configuration in
+                        configuration.label
+                          .padding(EdgeInsets(top: 2, leading: 8, bottom: 2, trailing: 2))
+                          .overlay(alignment: .leading) {
+                            Rectangle().frame(width: 2)
+                          }
+                      }
                       .frame(minWidth: 0,
                              maxWidth: .infinity,
                              alignment: .leading)
-                      .lineLimit(nil)
                   } else {
                     TextField("Keep it civil!", text: $editingMessage)
                       .focused($focusedField, equals: .editing)

diff --git a/TPU_Mac/ContentView.swift b/TPU_Mac/ContentView.swift
@@ -252,7 +252,7 @@ struct SettingsView: View {
         Text("Coming soon")
       #else
         Text("TPU iOS").font(.system(size: 32, weight: .semibold))
-        Text("Version " + (Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "") + " (21/10/2024)")
+        Text("Version " + (Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "") + " (12/11/2024)")
         Text("Made by ElectricS01")
         Text("[Give it a Star on GitHub](https://github.com/ElectricS01/TPU-Mac)")
       #endif
@@ -272,7 +272,7 @@ struct AboutView: View {
       Text("About")
         .navigationTitle("About")
       Text("TPU Mac").font(.system(size: 32, weight: .semibold))
-      Text("Version " + (Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "") + " (21/10/2024)")
+      Text("Version " + (Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "") + " (12/11/2024)")
       Text("Made by ElectricS01")
       Text("[Give it a Star on GitHub](https://github.com/ElectricS01/TPU-Mac)")
     }