Merge pull request #1118 from kiwix/1116-ios-library-scroll-no-viewmodifier-fix-p2

Replace viewModifiers with inline, use system colours

Author: kelson42

Views/BuildingBlocks/ArticleCell.swift

@@ -57,12 +57,14 @@ struct ArticleCell: View {
         }
         .foregroundColor(.primary)
         .padding(12)
-        .modifier(CellBackground(isHovering: isHovering))
+        .background(CellBackground.colorFor(isHovering: isHovering))
+        .clipShape(CellBackground.clipShapeRectangle)
         .onHover { self.isHovering = $0 }
     }
 }
 
 struct ArticleCell_Previews: PreviewProvider {
+    
     static let result: SearchResult = {
         let result = SearchResult(zimFileID: UUID(), path: "", title: "Article Title")!
         result.snippet = NSAttributedString(string: """

Views/BuildingBlocks/DownloadTaskCell.swift

@@ -63,7 +63,8 @@ struct DownloadTaskCell: View {
             }.font(.caption).foregroundColor(.secondary)
         }
         .padding()
-        .modifier(CellBackground(isHovering: isHovering))
+        .background(CellBackground.colorFor(isHovering: isHovering))
+        .clipShape(CellBackground.clipShapeRectangle)
         .onHover { self.isHovering = $0 }
         .onReceive(DownloadService.shared.progress.publisher) { states in
             if let state = states[downloadZimFile.fileID] {

Views/BuildingBlocks/ZimFileCell.swift

@@ -81,7 +81,8 @@ struct ZimFileCell: View {
             }
         }
         .padding()
-        .modifier(CellBackground(isHovering: isHovering || isLoading))
+        .background(CellBackground.colorFor(isHovering: isHovering))
+        .clipShape(CellBackground.clipShapeRectangle)
         .modifier(LoadingOverlay(isLoading: isLoading))
         .onHover { self.isHovering = $0 }
     }

Views/Library/ZimFileDetail.swift

@@ -123,6 +123,9 @@ struct ZimFileDetail: View {
                 #endif
             }
             #if os(macOS)
+            .buttonStyle(.borderedProminent)
+            #endif
+            #if os(macOS)
             Action(title: LocalString.zim_file_action_reveal_in_finder_title) {
                 guard let url = await ZimFileService.shared.getFileURL(zimFileID: zimFile.id) else { return }
                 NSWorkspace.shared.activateFileViewerSelecting([url])
@@ -209,6 +212,9 @@ struct ZimFileDetail: View {
                 secondaryButton: .cancel()
             )
         }
+        #if os(macOS)
+        .buttonStyle(.borderedProminent)
+        #endif
     }
 
     @ViewBuilder
@@ -371,30 +377,3 @@ private struct ServiceWorkerWarning: View {
         }
     }
 }
-
-struct ZimFileDetail_Previews: PreviewProvider {
-    static let context = NSManagedObjectContext(concurrencyType: .mainQueueConcurrencyType)
-    static let zimFile: ZimFile = {
-        let zimFile = ZimFile(context: context)
-        zimFile.articleCount = 1000000
-        zimFile.category = "wikipedia"
-        zimFile.created = Date()
-        zimFile.downloadURL = URL(string: "https://www.example.com")
-        zimFile.fileID = UUID()
-        zimFile.fileDescription = "A very long description"
-        zimFile.flavor = "max"
-        zimFile.hasDetails = true
-        zimFile.hasPictures = false
-        zimFile.hasVideos = true
-        zimFile.languageCode = "en"
-        zimFile.mediaCount = 100
-        zimFile.name = "Wikipedia Zim File Name"
-        zimFile.persistentID = ""
-        zimFile.size = 1000000000
-        return zimFile
-    }()
-
-    static var previews: some View {
-        ZimFileDetail(zimFile: zimFile, dismissParent: nil).frame(width: 300).previewLayout(.sizeThatFits)
-    }
-}

Views/Library/ZimFileDetailPreview.swift

@@ -0,0 +1,44 @@
+// This file is part of Kiwix for iOS & macOS.
+//
+// Kiwix is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// any later version.
+//
+// Kiwix is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Kiwix; If not, see https://www.gnu.org/licenses/.
+
+import SwiftUI
+import CoreData
+
+struct ZimFileDetail_Previews: PreviewProvider {
+    static let context = NSManagedObjectContext(concurrencyType: .mainQueueConcurrencyType)
+    static let zimFile: ZimFile = {
+        let zimFile = ZimFile(context: context)
+        zimFile.articleCount = 1000000
+        zimFile.category = "wikipedia"
+        zimFile.created = Date()
+        zimFile.downloadURL = URL(string: "https://www.example.com")
+        zimFile.fileID = UUID()
+        zimFile.fileDescription = "A very long description"
+        zimFile.flavor = "max"
+        zimFile.hasDetails = true
+        zimFile.hasPictures = false
+        zimFile.hasVideos = true
+        zimFile.languageCode = "en"
+        zimFile.mediaCount = 100
+        zimFile.name = "Wikipedia Zim File Name"
+        zimFile.persistentID = ""
+        zimFile.size = 1000000000
+        return zimFile
+    }()
+
+    static var previews: some View {
+        ZimFileDetail(zimFile: zimFile, dismissParent: nil).frame(width: 300).previewLayout(.sizeThatFits)
+    }
+}

Views/ViewModifiers/CellBackground.swift

@@ -15,35 +15,18 @@
 
 import SwiftUI
 
-struct CellBackground: ViewModifier {
-    @Environment(\.colorScheme) var colorScheme: ColorScheme
-
-    let isHovering: Bool
-
-    func body(content: Content) -> some View {
-        content
-            .background(backgroundColor)
-            .clipShape(RoundedRectangle(cornerRadius: 12, style: .continuous))
-    }
-
-    private var backgroundColor: Color {
-        switch (colorScheme, isHovering) {
-        case (.dark, true):
-            #if os(macOS)
-            return Color.background
-            #elseif os(iOS)
-            return Color.secondaryBackground
-            #endif
-        case (.dark, false):
-            return Color.tertiaryBackground
-        case (.light, true):
-            return Color(white: 0.9)
-        case (.light, false), (_, _):
-            #if os(macOS)
-            return Color.white
-            #elseif os(iOS)
-            return Color(white: 0.96)
-            #endif
-        }
+enum CellBackground {
+    #if os(macOS)
+    private static let normal: Color = Color(nsColor: NSColor.controlBackgroundColor)
+    private static let hover: Color = Color(nsColor: NSColor.selectedControlColor)
+    #else
+    private static let normal: Color = .secondaryBackground
+    private static let hover: Color = .tertiaryBackground
+    #endif
+    
+    static func colorFor(isHovering: Bool) -> Color {
+        isHovering ? hover : normal
     }
+    
+    static let clipShapeRectangle = RoundedRectangle(cornerRadius: 12, style: .continuous)
 }