Use List to resolve scrolling issue

List to the rescue!
treehollow · May 27, 2021 · e6de27e · e6de27e
1 parent 62908df
commit e6de27e
Show file tree

Hide file tree

Showing 19 changed files with 179 additions and 207 deletions.
diff --git a/Source/Hollow.xcodeproj/project.pbxproj b/Source/Hollow.xcodeproj/project.pbxproj
@@ -368,6 +368,7 @@
 		0EDA263125D2465100B67292 /* LoadingIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EDA263025D2465100B67292 /* LoadingIndicator.swift */; };
 		0EDEC0E52650E5A6003112BA /* View+makeButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EDEC0E42650E5A6003112BA /* View+makeButton.swift */; };
 		0EE60EFD25FCCCD700D97E7A /* CheckmarkButtonImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE60EFC25FCCCD700D97E7A /* CheckmarkButtonImage.swift */; };
+		0EEA957B265FE11400689E78 /* Introspect in Frameworks */ = {isa = PBXBuildFile; productRef = 0EEA957A265FE11400689E78 /* Introspect */; };
 		0EF10F6626330F29004D6538 /* HollowDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EF10F6526330F29004D6538 /* HollowDetailViewController.swift */; };
 		0EFA3DDE25D3A03D0003C76B /* LoadingLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFA3DDD25D3A03D0003C76B /* LoadingLabel.swift */; };
 		0EFB4F222639790000530B5F /* ImageTitledStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFB4F212639790000530B5F /* ImageTitledStack.swift */; };
@@ -651,6 +652,7 @@
 				0E42905C263A742D008DA046 /* WaterfallGrid in Frameworks */,
 				0E429070263A8557008DA046 /* ImageScrollView in Frameworks */,
 				0E429067263A84CA008DA046 /* AppCenterAnalytics in Frameworks */,
+				0EEA957B265FE11400689E78 /* Introspect in Frameworks */,
 				0E429065263A84CA008DA046 /* AppCenterCrashes in Frameworks */,
 				0E42906D263A853E008DA046 /* Connectivity in Frameworks */,
 			);
@@ -1388,6 +1390,7 @@
 				0E42906C263A853E008DA046 /* Connectivity */,
 				0E42906F263A8557008DA046 /* ImageScrollView */,
 				0E429072263A8572008DA046 /* Cache */,
+				0EEA957A265FE11400689E78 /* Introspect */,
 			);
 			productName = Hollow;
 			productReference = 0E415A7025CD769B00351672 /* Hollow.app */;
@@ -1481,6 +1484,7 @@
 				0E42906B263A853E008DA046 /* XCRemoteSwiftPackageReference "Connectivity" */,
 				0E42906E263A8557008DA046 /* XCRemoteSwiftPackageReference "ImageScrollView" */,
 				0E429071263A8572008DA046 /* XCRemoteSwiftPackageReference "Cache" */,
+				0EEA9579265FE11400689E78 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */,
 			);
 			productRefGroup = 0E415A7125CD769B00351672 /* Products */;
 			projectDirPath = "";
@@ -2048,7 +2052,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Hollow/Hollow.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 54;
+				CURRENT_PROJECT_VERSION = 58;
 				DEVELOPMENT_TEAM = C5UH93T368;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = Hollow/Info.plist;
@@ -2074,7 +2078,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Hollow/Hollow.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 54;
+				CURRENT_PROJECT_VERSION = 58;
 				DEVELOPMENT_TEAM = C5UH93T368;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = Hollow/Info.plist;
@@ -2099,7 +2103,7 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_ENTITLEMENTS = HollowWidget/HollowWidgetExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 54;
+				CURRENT_PROJECT_VERSION = 58;
 				DEVELOPMENT_TEAM = C5UH93T368;
 				INFOPLIST_FILE = HollowWidget/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
@@ -2127,7 +2131,7 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_ENTITLEMENTS = HollowWidget/HollowWidgetExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 54;
+				CURRENT_PROJECT_VERSION = 58;
 				DEVELOPMENT_TEAM = C5UH93T368;
 				INFOPLIST_FILE = HollowWidget/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
@@ -2306,6 +2310,14 @@
 				minimumVersion = 6.0.1;
 			};
 		};
+		0EEA9579265FE11400689E78 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/siteline/SwiftUI-Introspect.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.1.3;
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -2404,6 +2416,11 @@
 			package = 0E429060263A7568008DA046 /* XCRemoteSwiftPackageReference "Alamofire" */;
 			productName = Alamofire;
 		};
+		0EEA957A265FE11400689E78 /* Introspect */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 0EEA9579265FE11400689E78 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
+			productName = Introspect;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 0E415A6825CD769B00351672 /* Project object */;

diff --git a/Source/Hollow.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Source/Hollow.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -73,6 +73,15 @@
           "version": "1.8.1"
         }
       },
+      {
+        "package": "Introspect",
+        "repositoryURL": "https://github.com/siteline/SwiftUI-Introspect.git",
+        "state": {
+          "branch": null,
+          "revision": "2e09be8af614401bc9f87d40093ec19ce56ccaf2",
+          "version": "0.1.3"
+        }
+      },
       {
         "package": "WaterfallGrid",
         "repositoryURL": "https://github.com/paololeonardi/WaterfallGrid.git",

diff --git a/Source/Hollow/App/AppDelegate.swift b/Source/Hollow/App/AppDelegate.swift
@@ -15,8 +15,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         Defaults[.customColorSet] = Defaults[.tempCustomColorSet]
         Defaults[.applyCustomColorSet] = Defaults[.customColorSet] != nil
         setupApplication(application)
-        let appearance = UITableView.appearance(whenContainedInInstancesOf: [HollowDetailViewController.self, HollowDetailViewController_iPad.self])
-        appearance.backgroundColor = UIColor(Color.hollowCardBackground)
         return true
     }
 

diff --git a/Source/Hollow/View/Components/MyTextField.swift b/Source/Hollow/View/Components/MyTextField.swift
@@ -15,6 +15,7 @@ struct MyTextField<Content>: View where Content: View {
     var footer: String? = nil
     var isSecureContent = false
     var backgroundColor: Color = .hollowCardBackground
+    var disabled = false
     var content: (() -> Content)? = nil
 
     var body: some View {
@@ -36,6 +37,8 @@ struct MyTextField<Content>: View where Content: View {
                 .autocapitalization(.none)
                 .disableAutocorrection(true)
                 .dynamicFont(size: 16)
+                .foregroundColor(disabled ? .secondary : nil)
+                .disabled(disabled)
                 Spacer()
                 if let content = content {
                     content()

diff --git a/Source/Hollow/View/Components/SearchBar.swift b/Source/Hollow/View/Components/SearchBar.swift
@@ -14,7 +14,7 @@ struct SearchBar: View {
     var body: some View {
         Button(action:{
             // Navigate to search view
-            withAnimation(.defaultSpring) {
+            withAnimation {
                 isSearching = true
             }
         }) {

diff --git a/Source/Hollow/View/Components/Toast.swift b/Source/Hollow/View/Components/Toast.swift
@@ -82,6 +82,7 @@ struct Toast: View {
             .lineSpacing(2)
             .lineLimit(4)
         }
+        .animation(.none)
         .foregroundColor(configuration.style.fontColor)
         .padding()
         .padding(.horizontal, 5)
@@ -94,13 +95,11 @@ struct Toast: View {
         .opacity(opacity)
         .padding()
         .padding(.horizontal)
-        .animation(.default)
-        .transition(.move(edge: .bottom))
 
         .onClickGesture(perform: configuration.onTap ?? dismiss)
 
         .onAppear {
-            withAnimation(.spring()) {
+            withAnimation(.easeInOut) {
                 opacity = 1
             }
             DispatchQueue.main.asyncAfter(deadline: .now() + 1.5, execute: dismiss)
@@ -110,7 +109,7 @@ struct Toast: View {
 
     func dismiss() {
         guard presented else { return }
-        withAnimation(.spring()) {
+        withAnimation(.easeInOut) {
             self.opacity = 0
         }
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) {

diff --git a/Source/Hollow/View/Hierarchy/Account/SettingsSubViews.swift b/Source/Hollow/View/Hierarchy/Account/SettingsSubViews.swift
@@ -497,40 +497,13 @@ struct OtherSettingsView: View {
     }
 
     private struct ExperimentalFeaturesView: View {
-        @Default(.reduceImageQuality) var reduceImageQuality
-        @Default(.useListInDetail) var useListInDetail
 
         var body: some View {
             List {
                 ImageTitledStack(systemImageName: "curlybraces") {
                     Text("SETTINGSVIEW_OTHER_EXP_FEAT_DESCRIPTION")
                 }
                 .padding(.vertical)
-
-                Section(
-                    footer: Text("SETTINGSVIEW_OTHER_EXP_REDUCE_IMG_QUALITY_FOOTER").padding(.horizontal)) {
-                    HStack {
-                        Text("SETTINGSVIEW_OTHER_EXP_REDUCE_IMG_QUALITY_LABEL")
-                        Spacer()
-
-                        Toggle("", isOn: $reduceImageQuality)
-                            .defaultToggleStyle()
-                    }
-
-                }
-
-                #if !targetEnvironment(macCatalyst)
-                Section(footer: Text("SETTINGSVIEW_OTHER_EXP_FIX_SCROLL_FOOTER").padding(.horizontal)) {
-                    HStack {
-                        Text("SETTINGSVIEW_OTHER_EXP_FIX_SCROLL_LABEL")
-                        Spacer()
-
-                        Toggle("", isOn: $useListInDetail)
-                            .defaultToggleStyle()
-                    }
-
-                }
-                #endif
 
             }
             .defaultListStyle()

diff --git a/Source/Hollow/View/Hierarchy/Hollow/Content/HollowImageView.swift b/Source/Hollow/View/Hierarchy/Hollow/Content/HollowImageView.swift
@@ -36,7 +36,6 @@ struct HollowImageView: View {
     }
 
     @ScaledMetric private var reloadButtonSize: CGFloat = 50
-    @Default(.reduceImageQuality) var reduceImageQuality
 
     var body: some View {
         Group {
@@ -46,15 +45,15 @@ struct HollowImageView: View {
                         if imageAspectRatio >= aspectRatio - 0.001 {
                             Image(uiImage: image)
                                 .resizable()
-                                .interpolation(reduceImageQuality ? .none : .low)
+                                .interpolation(.low)
                                 .aspectRatio(contentMode: .fit)
                                 .imageSaver(image: image, showSavePhotoAlert: $showSavePhotoAlert, savePhotoError: $savePhotoError)
                         } else {
                             ZStack {
                                 Color.hollowCommentQuoteText.opacity(0.09).ignoresSafeArea()
                                 Image(uiImage: image)
                                     .resizable()
-                                    .interpolation(reduceImageQuality ? .none : .low)
+                                    .interpolation(.low)
                                     .aspectRatio(contentMode: .fit)
                                     .imageSaver(image: image, showSavePhotoAlert: $showSavePhotoAlert, savePhotoError: $savePhotoError)
                             }
@@ -63,7 +62,6 @@ struct HollowImageView: View {
                         }
                     }
 
-                    .animation(.default)
                     .contentShape(RoundedRectangle(cornerRadius: 4))
                     .onChange(of: showSavePhotoAlert) { show in
                         if show {

diff --git a/Source/Hollow/View/Hierarchy/Hollow/Content/HollowTextView.swift b/Source/Hollow/View/Hierarchy/Hollow/Content/HollowTextView.swift
@@ -8,6 +8,7 @@
 
 import SwiftUI
 import Defaults
+import Introspect
 
 struct HollowTextView: View {
     var text: String
@@ -56,12 +57,15 @@ struct HollowTextView: View {
             if highlight {
                 Text.highlightLinksAndCitation(text, modifiers: {
                     $0.underline()
-                        .foregroundColor(.tint)
+                        .foregroundColor(.hollowContentText)
                 })
+
             } else {
                 Text(text)
+
             }
         }
+
         .modifier(TextModifier(inDetail: inDetail, compactLineLimit: compactLineLimit))
     }
 

diff --git a/Source/Hollow/View/Hierarchy/Hollow/Detail/HollowDetailSubViews.swift b/Source/Hollow/View/Hierarchy/Hollow/Detail/HollowDetailSubViews.swift
@@ -55,9 +55,10 @@ extension HollowDetailView {
         .background(Color.hollowCardBackground)
         .lineLimit(1)
 
-        ForEach(comments) { comment in
+        ForEach(comments, id: \.commentId) { comment in
             commentView(for: comment)
                 .fixedSize(horizontal: false, vertical: true)
+                .id(comment.commentId)
         }
 
         if store.isLoading, postData.replyNumber > postData.comments.count {
@@ -66,6 +67,7 @@ extension HollowDetailView {
                     .padding(.horizontal)
                     .padding(.top, postData.comments.isEmpty ? 0 : 15)
                     .padding(.bottom, postData.comments.isEmpty ? 15 : 0)
+                    .background(Color.hollowCardBackground)
             }
         }
 
@@ -114,11 +116,7 @@ extension HollowDetailView {
                 Group {
                     highlighted ? Color.background : Color.hollowCardBackground
                 }
-                .roundedCorner(highlighted ? 10 : 0)
-                .padding(.horizontal, highlighted ? 10 : 0)
-//                .transition(.opacity)
             )
-            .contentShape(RoundedRectangle(cornerRadius: 10, style: .continuous))
             .onClickGesture {
                 guard !store.isSendingComment && !store.isLoading else { return }
                 UIImpactFeedbackGenerator(style: .soft).impactOccurred()
@@ -175,8 +173,6 @@ extension HollowDetailView {
                     commentId: comment.commentId
                 )
             }
-            .id(comment.commentId)
-
         }}
 
     }