UI improvements

treehollow · May 16, 2021 · e5b6cbc · e5b6cbc
1 parent 1f3553c
commit e5b6cbc
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 10 deletions.
diff --git a/Source/Hollow.xcodeproj/project.pbxproj b/Source/Hollow.xcodeproj/project.pbxproj
@@ -1861,7 +1861,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Hollow/Hollow.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 50;
 				DEVELOPMENT_TEAM = C5UH93T368;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = Hollow/Info.plist;
@@ -1887,7 +1887,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Hollow/Hollow.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 50;
 				DEVELOPMENT_TEAM = C5UH93T368;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = Hollow/Info.plist;

diff --git a/Source/Hollow.xcodeproj/xcshareddata/xcschemes/HollowMac.xcscheme b/Source/Hollow.xcodeproj/xcshareddata/xcschemes/HollowMac.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1250"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0EC244C1263400C5001AFC4B"
+               BuildableName = "HollowMac.app"
+               BlueprintName = "HollowMac"
+               ReferencedContainer = "container:Hollow.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"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0EC244C1263400C5001AFC4B"
+            BuildableName = "HollowMac.app"
+            BlueprintName = "HollowMac"
+            ReferencedContainer = "container:Hollow.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0EC244C1263400C5001AFC4B"
+            BuildableName = "HollowMac.app"
+            BlueprintName = "HollowMac"
+            ReferencedContainer = "container:Hollow.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Source/Hollow/View/Hierarchy/Hollow/Components/HollowHeaderView.swift b/Source/Hollow/View/Hierarchy/Hollow/Components/HollowHeaderView.swift
@@ -46,7 +46,8 @@ struct _HollowHeaderView<MenuContent: View>: View {
                     resolution: 6,
                     padding: body37 * 0.1,
                     hashValue: postData.hash,
-                    name: String(postData.postId.string.last ?? " ")
+                    name: String(postData.postId.string.last ?? " "),
+                    options: .forceGraphical
                 )
                 // Scale the avatar relative to the font scaling.
                 .frame(width: body37, height: body37)

diff --git a/Source/Hollow/View/Hierarchy/Hollow/Content/HollowCommentContentView.swift b/Source/Hollow/View/Hierarchy/Hollow/Content/HollowCommentContentView.swift
@@ -87,7 +87,7 @@ struct HollowCommentContentView: View {
                         }
 
                         if let commentInfo = commentData.replyToCommentInfo, !compact {
-                            let nameText = Text(verbatim: "\(commentInfo.name) ").bold()
+                            let nameText = Text(verbatim: "\(commentInfo.name): ").bold()
                             Group {
                                 if commentInfo.text != "" {
                                     nameText + Text(commentInfo.text)
@@ -101,12 +101,12 @@ struct HollowCommentContentView: View {
                             .dynamicFont(size: 14)
                             .lineLimit(3)
                             .lineSpacing(0.8)
-                            .padding(4)
+                            .padding(4.5)
                             .padding(.horizontal, 2)
                             .foregroundColor(.hollowCommentQuoteText)
                             .background(Color.hollowCommentQuoteText.opacity(0.09))
-                            .cornerRadius(3)
-                            .padding(.vertical, 2)
+                            .cornerRadius(4)
+                            .padding(.vertical, 4)
                             .makeButton(action: { jumpToReplyingHandler?() })
                             .buttonStyle(PlainButtonStyle())
                         }

diff --git a/Source/Hollow/View/Hierarchy/Hollow/Content/HollowImageView.swift b/Source/Hollow/View/Hierarchy/Hollow/Content/HollowImageView.swift
@@ -51,7 +51,7 @@ struct HollowImageView: View {
                                 .imageSaver(image: image, showSavePhotoAlert: $showSavePhotoAlert, savePhotoError: $savePhotoError)
                         } else {
                             ZStack {
-                                Color.uiColor(.tertiarySystemFill).ignoresSafeArea()
+                                Color.hollowCommentQuoteText.opacity(0.09).ignoresSafeArea()
                                 Image(uiImage: image)
                                     .resizable()
                                     .interpolation(reduceImageQuality ? .none : .low)

diff --git a/Source/Hollow/View/Hierarchy/Hollow/Input/HollowInputComponents.swift b/Source/Hollow/View/Hierarchy/Hollow/Input/HollowInputComponents.swift
@@ -34,7 +34,8 @@ struct HollowInputAvatar: View {
             resolution: 6,
             padding: avatarWidth * 0.1,
             hashValue: hash,
-            name: "N"
+            name: "N",
+            options: .forceGraphical
         )
 
         .frame(width: avatarWidth)

diff --git a/Source/Hollow/View/Hierarchy/iPad/HollowDetailView_iPad.swift b/Source/Hollow/View/Hierarchy/iPad/HollowDetailView_iPad.swift
@@ -28,7 +28,8 @@ struct HollowDetailView_iPad: View {
                             resolution: 6,
                             padding: avatarWidth * 0.1,
                             hashValue: postData.hash,
-                            name: String(store.postDataWrapper.post.postId.string.last ?? " ")
+                            name: String(store.postDataWrapper.post.postId.string.last ?? " "),
+                            options: .forceGraphical
                         )
                         // Scale the avatar relative to the font scaling.
                         .frame(width: avatarWidth, height: avatarWidth)