Optimize the UI of the detail page

isaced · isaced · commit e44143b1ba4c · 2023-02-11T10:29:17.000+08:00
diff --git a/V2exOS.xcodeproj/xcshareddata/xcschemes/V2exOSiOS.xcscheme b/V2exOS.xcodeproj/xcshareddata/xcschemes/V2exOSiOS.xcscheme
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1420"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0D2334CD2996944500DF4B73"
+               BuildableName = "V2exOSiOS.app"
+               BlueprintName = "V2exOSiOS"
+               ReferencedContainer = "container:V2exOS.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = "zh-Hans"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0D2334CD2996944500DF4B73"
+            BuildableName = "V2exOSiOS.app"
+            BlueprintName = "V2exOSiOS"
+            ReferencedContainer = "container:V2exOS.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0D2334CD2996944500DF4B73"
+            BuildableName = "V2exOSiOS.app"
+            BlueprintName = "V2exOSiOS"
+            ReferencedContainer = "container:V2exOS.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/V2exOS.xcodeproj/xcuserdata/isaced.xcuserdatad/xcschemes/xcschememanagement.plist b/V2exOS.xcodeproj/xcuserdata/isaced.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -17,11 +17,16 @@
 		<key>V2exOSiOS.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>2</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
+		<key>0D2334CD2996944500DF4B73</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>0DA7FA63298799B300374B3A</key>
 		<dict>
 			<key>primary</key>
diff --git a/V2exOS/Views/Components/UserName.swift b/V2exOS/Views/Components/UserName.swift
@@ -17,22 +17,30 @@ struct UserName: View {
     }
     
     var body: some View {
-#if os(macOS)
+#if os(macOS) || os(iOS)
         Button {
             if let url = URL(string: "https://www.v2ex.com/member/\(username)") {
+                
+#if os(iOS)
+                UIApplication.shared.open(url)
+#endif
+#if os(macOS)
                 NSWorkspace.shared.open(url)
+#endif
             }
         } label: {
             Text(username)
                 .foregroundColor(.secondary)
-                .fontWeight(.bold)
+            //                .fontWeight(.bold)
+#if os(macOS)
                 .onHover { inside in
                     if inside {
                         NSCursor.pointingHand.push()
                     } else {
                         NSCursor.pop()
                     }
                 }
+#endif
         }
         .buttonStyle(PlainButtonStyle())
 #elseif os(tvOS)
diff --git a/V2exOS/Views/TopicDetail/CommentListView.swift b/V2exOS/Views/TopicDetail/CommentListView.swift
@@ -19,8 +19,9 @@ struct CommentListView: View {
     
     var body: some View {
         Label("\(commentCount ?? 0) 条回复", systemImage: "bubble.middle.bottom.fill")
+            .foregroundColor(.secondary)
 #if os(tvOS)
-                    .focusable()
+            .focusable()
 #endif
         
         if let commentList {
@@ -75,7 +76,7 @@ struct CommentListView: View {
                                         range: nil
                                     )
                             )
-#if !os(tvOS)
+#if os(macOS)
                             .markdownStyle(MarkdownStyle(font: .system(size: settingsConfig.fontSize)))
 #endif
                         }
diff --git a/V2exOS/Views/TopicDetail/TopicDetailView.swift b/V2exOS/Views/TopicDetail/TopicDetailView.swift
@@ -45,8 +45,11 @@ struct TopicDetailView: View {
                     }
 #if !os(tvOS)
                     Link(destination: URL(string: "https://www.v2ex.com/t/\(topic.id)")!) {
-                        Image(systemName: "safari")
-                        Text("在网页中打开")
+                        
+                        HStack(alignment: .bottom, spacing: 5) {
+                            Image(systemName: "safari")
+                            Text("在浏览器中打开")
+                        }
                     }
 #endif
                     
@@ -56,7 +59,7 @@ struct TopicDetailView: View {
                 Spacer()
                 
                 Markdown(topic.content ?? "")
-#if !os(tvOS)
+#if os(macOS)
                     .markdownStyle(MarkdownStyle(font: .system(size: settingsConfig.fontSize)))
 #endif
 #if os(tvOS)
@@ -79,6 +82,9 @@ struct TopicDetailView: View {
                 }
             }
         }
+#if os(iOS)
+        .listStyle(.plain)
+#endif
         .task {
             loadComments(page: 1)
         }
@@ -106,6 +112,7 @@ struct TopicDetailView_Previews: PreviewProvider {
                             PreviewData.comment,
                             PreviewData.comment
                         ])
+        .environmentObject(SettingsConfig.shared)
         .previewLayout(.fixed(width: 300, height: .infinity))
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,9 @@ struct CommentListView: View {`
`19`	`19`
`20`	`20`	`var body: some View {`
`21`	`21`	`Label("\(commentCount ?? 0) 条回复", systemImage: "bubble.middle.bottom.fill")`
	`22`	`+ .foregroundColor(.secondary)`
`22`	`23`	`#if os(tvOS)`
`23`		`- .focusable()`
	`24`	`+ .focusable()`
`24`	`25`	`#endif`
`25`	`26`
`26`	`27`	`if let commentList {`
`@@ -75,7 +76,7 @@ struct CommentListView: View {`
`75`	`76`	`range: nil`
`76`	`77`	`)`
`77`	`78`	`)`
`78`		`-#if !os(tvOS)`
	`79`	`+#if os(macOS)`
`79`	`80`	`.markdownStyle(MarkdownStyle(font: .system(size: settingsConfig.fontSize)))`
`80`	`81`	`#endif`
`81`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,11 @@ struct TopicDetailView: View {`
`45`	`45`	`}`
`46`	`46`	`#if !os(tvOS)`
`47`	`47`	`Link(destination: URL(string: "https://www.v2ex.com/t/\(topic.id)")!) {`
`48`		`- Image(systemName: "safari")`
`49`		`- Text("在网页中打开")`
	`48`	`+`
	`49`	`+ HStack(alignment: .bottom, spacing: 5) {`
	`50`	`+ Image(systemName: "safari")`
	`51`	`+ Text("在浏览器中打开")`
	`52`	`+ }`
`50`	`53`	`}`
`51`	`54`	`#endif`
`52`	`55`
`@@ -56,7 +59,7 @@ struct TopicDetailView: View {`
`56`	`59`	`Spacer()`
`57`	`60`
`58`	`61`	`Markdown(topic.content ?? "")`
`59`		`-#if !os(tvOS)`
	`62`	`+#if os(macOS)`
`60`	`63`	`.markdownStyle(MarkdownStyle(font: .system(size: settingsConfig.fontSize)))`
`61`	`64`	`#endif`
`62`	`65`	`#if os(tvOS)`
`@@ -79,6 +82,9 @@ struct TopicDetailView: View {`
`79`	`82`	`}`
`80`	`83`	`}`
`81`	`84`	`}`
	`85`	`+#if os(iOS)`
	`86`	`+ .listStyle(.plain)`
	`87`	`+#endif`
`82`	`88`	`.task {`
`83`	`89`	`loadComments(page: 1)`
`84`	`90`	`}`
`@@ -106,6 +112,7 @@ struct TopicDetailView_Previews: PreviewProvider {`
`106`	`112`	`PreviewData.comment,`
`107`	`113`	`PreviewData.comment`
`108`	`114`	`])`
	`115`	`+ .environmentObject(SettingsConfig.shared)`
`109`	`116`	`.previewLayout(.fixed(width: 300, height: .infinity))`
`110`	`117`	`}`
`111`	`118`	`}`