Merge pull request #1139 from kiwix/donation-button-ipad

Re-arrange donation button on iPad

Author: kelson42

App/App_iOS.swift

@@ -13,20 +13,21 @@
 // You should have received a copy of the GNU General Public License
 // along with Kiwix; If not, see https://www.gnu.org/licenses/.
 
+#if os(iOS)
 import SwiftUI
+import Combine
 import UserNotifications
 
-#if os(iOS)
 @main
 struct Kiwix: App {
+    
     @Environment(\.scenePhase) private var scenePhase
     @StateObject private var library = LibraryViewModel()
     @StateObject private var navigation = NavigationViewModel()
     @UIApplicationDelegateAdaptor(AppDelegate.self) private var appDelegate
-
     private let fileMonitor: DirectoryMonitor
     private let activityService: ActivityService?
-
+    
     init() {
         fileMonitor = DirectoryMonitor(url: URL.documentDirectory) { LibraryOperations.scanDirectory($0) }
         // MARK: - live activities
@@ -99,6 +100,8 @@ struct Kiwix: App {
                         navigation.navigateToMostRecentTab()
                     }
                 }
+                .modifier(DonationViewModifier())
+                
         }
         .commands {
             CommandGroup(replacing: .undoRedo) {

App/App_macOS.swift

@@ -167,12 +167,12 @@ struct RootView: View {
     @Environment(\.openWindow) var openWindow
     @Environment(\.controlActiveState) var controlActiveState
     @StateObject private var navigation = NavigationViewModel()
-    @State private var currentNavItem: NavigationItem?
+    @State private var currentNavItem: MenuItem?
     @StateObject private var windowTracker = WindowTracker()
     @State private var paymentButtonLabel: PayWithApplePayButtonLabel?
 
-    private let primaryItems: [NavigationItem] = [.bookmarks]
-    private let libraryItems: [NavigationItem] = [.opened, .categories, .downloads, .new]
+    private let primaryItems: [MenuItem] = [.bookmarks]
+    private let libraryItems: [MenuItem] = [.opened, .categories, .downloads, .new]
     private let openURL = NotificationCenter.default.publisher(for: .openURL)
     private let appTerminates = NotificationCenter.default.publisher(for: NSApplication.willTerminateNotification)
     private let tabCloses = NotificationCenter.default.publisher(for: NSWindow.willCloseNotification)
@@ -183,15 +183,15 @@ struct RootView: View {
         NavigationSplitView {
             List(selection: $currentNavItem) {
                 ForEach(
-                    [NavigationItem.tab(objectID: navigation.currentTabId)] + primaryItems,
+                    [MenuItem.tab(objectID: navigation.currentTabId)] + primaryItems,
                     id: \.self
-                ) { navigationItem in
-                    Label(navigationItem.name, systemImage: navigationItem.icon)
+                ) { menuItem in
+                    Label(menuItem.name, systemImage: menuItem.icon)
                 }
                 if FeatureFlags.hasLibrary {
                     Section(LocalString.app_macos_navigation_button_library) {
-                        ForEach(libraryItems, id: \.self) { navigationItem in
-                            Label(navigationItem.name, systemImage: navigationItem.icon)
+                        ForEach(libraryItems, id: \.self) { menuItem in
+                            Label(menuItem.name, systemImage: menuItem.icon)
                         }
                     }
                 }
@@ -232,7 +232,7 @@ struct RootView: View {
         .modifier(SaveContentHandler())
         .environmentObject(navigation)
         .onChange(of: currentNavItem) { newValue in
-            navigation.currentItem = newValue
+            navigation.currentItem = newValue?.navigationItem
         }
         .onOpenURL { url in
             if url.isFileURL {

App/SidebarViewController.swift

@@ -18,9 +18,9 @@ import CoreData
 import SwiftUI
 import UIKit
 
-class SidebarViewController: UICollectionViewController, NSFetchedResultsControllerDelegate {
+final class SidebarViewController: UICollectionViewController, NSFetchedResultsControllerDelegate {
     private lazy var dataSource = {
-        let cellRegistration = UICollectionView.CellRegistration<UICollectionViewListCell, NavigationItem> {
+        let cellRegistration = UICollectionView.CellRegistration<UICollectionViewListCell, MenuItem> {
             [unowned self] cell, indexPath, item in
             configureCell(cell: cell, indexPath: indexPath, item: item)
         }
@@ -29,7 +29,7 @@ class SidebarViewController: UICollectionViewController, NSFetchedResultsControl
         ) { [unowned self] headerView, elementKind, indexPath in
             configureHeader(headerView: headerView, elementKind: elementKind, indexPath: indexPath)
         }
-        let dataSource = UICollectionViewDiffableDataSource<Section, NavigationItem>(collectionView: collectionView) {
+        let dataSource = UICollectionViewDiffableDataSource<Section, MenuItem>(collectionView: collectionView) {
             collectionView, indexPath, item in
             collectionView.dequeueConfiguredReusableCell(using: cellRegistration, for: indexPath, item: item)
         }
@@ -50,16 +50,22 @@ class SidebarViewController: UICollectionViewController, NSFetchedResultsControl
     }
 
     enum Section: String, CaseIterable {
-        case primary
         case tabs
+        case primary
         case library
         case settings
+        case donation
 
         static var allSections: [Section] {
-            if FeatureFlags.hasLibrary {
+            switch (FeatureFlags.hasLibrary, Brand.hideDonation) {
+            case (true, true):
+                allCases.filter { [.donation].contains($0) }
+            case (false, true):
+                allCases.filter { [.donation, .library].contains($0) }
+            case (true, false):
                 allCases
-            } else {
-                allCases.filter { $0 != .library }
+            case (false, false):
+                allCases.filter { [.library].contains($0) }
             }
         }
     }
@@ -84,7 +90,8 @@ class SidebarViewController: UICollectionViewController, NSFetchedResultsControl
     func updateSelection() {
         guard let navigationViewModel,
               let currentItem = navigationViewModel.currentItem,
-              let indexPath = dataSource.indexPath(for: currentItem),
+              let currentMenuItem = MenuItem(from: currentItem),
+              let indexPath = dataSource.indexPath(for: currentMenuItem),
               collectionView.indexPathsForSelectedItems?.first != indexPath else { return }
         collectionView.selectItem(at: indexPath, animated: true, scrollPosition: [])
     }
@@ -124,13 +131,16 @@ class SidebarViewController: UICollectionViewController, NSFetchedResultsControl
         )
 
         // apply initial snapshot
-        var snapshot = NSDiffableDataSourceSnapshot<Section, NavigationItem>()
+        var snapshot = NSDiffableDataSourceSnapshot<Section, MenuItem>()
         snapshot.appendSections(Section.allSections)
         snapshot.appendItems([.bookmarks], toSection: .primary)
-        if FeatureFlags.hasLibrary {
+        if snapshot.sectionIdentifiers.contains(.library) {
             snapshot.appendItems([.opened, .categories, .downloads, .new], toSection: .library)
         }
         snapshot.appendItems([.settings], toSection: .settings)
+        if snapshot.sectionIdentifiers.contains(.donation) {
+            snapshot.appendItems([.donation], toSection: .donation)
+        }
         dataSource.apply(snapshot, animatingDifferences: false)
         try? fetchedResultController.performFetch()
     }
@@ -153,8 +163,8 @@ class SidebarViewController: UICollectionViewController, NSFetchedResultsControl
     ) {
         let tabIds = snapshot.itemIdentifiers
             .compactMap { $0 as? NSManagedObjectID }
-        let tabs = tabIds.map { NavigationItem.tab(objectID: $0) }
-        var tabsSnapshot = NSDiffableDataSourceSectionSnapshot<NavigationItem>()
+        let tabs = tabIds.map { MenuItem.tab(objectID: $0) }
+        var tabsSnapshot = NSDiffableDataSourceSectionSnapshot<MenuItem>()
         tabsSnapshot.append(tabs)
         Task { [tabsSnapshot] in
             await MainActor.run { [tabsSnapshot] in
@@ -173,11 +183,20 @@ class SidebarViewController: UICollectionViewController, NSFetchedResultsControl
             }
         }
     }
+    
+    override func collectionView(_ collectionView: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool {
+        guard dataSource.itemIdentifier(for: indexPath) != .donation else {
+            // trigger the donation pop-up, but do not select the menu item itself
+            NotificationCenter.openDonations()
+            return false
+        }
+        return true
+    }
 
     override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         guard let splitViewController,
               let navigationViewModel,
-              let navigationItem = dataSource.itemIdentifier(for: indexPath) else { return }
+              let navigationItem = dataSource.itemIdentifier(for: indexPath)?.navigationItem else { return }
         if navigationViewModel.currentItem != navigationItem {
             navigationViewModel.currentItem = navigationItem
         }
@@ -192,7 +211,7 @@ class SidebarViewController: UICollectionViewController, NSFetchedResultsControl
 
     // MARK: - Collection View Configuration
 
-    private func configureCell(cell: UICollectionViewListCell, indexPath: IndexPath, item: NavigationItem) {
+    private func configureCell(cell: UICollectionViewListCell, indexPath: IndexPath, item: MenuItem) {
         if case let .tab(objectID) = item,
             let tab = try? Database.shared.viewContext.existingObject(with: objectID) as? Tab {
             var config = cell.defaultContentConfiguration()
@@ -214,9 +233,9 @@ class SidebarViewController: UICollectionViewController, NSFetchedResultsControl
             var config = cell.defaultContentConfiguration()
             config.text = item.name
             config.image = UIImage(systemName: item.icon)
+            config.imageProperties.tintColor = item.iconForegroundColor
             cell.contentConfiguration = config
         }
-
     }
 
     private func configureHeader(headerView: UICollectionViewListCell, elementKind: String, indexPath: IndexPath) {

Support/br.lproj/Localizable.strings

@@ -163,9 +163,7 @@
 "enum.libray_tab_item.categories" = "Rummadoù";
 "enum.libray_tab_item.downloads" = "Pellgargadurioù";
 "enum.libray_tab_item.new" = "Nevez";
-"enum.navigation_item.loading" = "O kargañ";
 "enum.navigation_item.bookmarks" = "Sinedoù";
-"enum.navigation_item.map" = "Kartenn";
 "enum.navigation_item.new_tab" = "Steudenn nevez";
 "enum.navigation_item.opened" = "Digor";
 "enum.navigation_item.categories" = "Rummadoù";

Support/dag.lproj/Localizable.strings

@@ -191,10 +191,8 @@
 "enum.libray_tab_item.categories" = "Pubu nima";
 "enum.libray_tab_item.downloads" = "Deebu";
 "enum.libray_tab_item.new" = "Palli";
-"enum.navigation_item.loading" = "Ʒili";
 "enum.navigation_item.reading" = "Kariŋ";
 "enum.navigation_item.bookmarks" = "Buku'dalima";
-"enum.navigation_item.map" = "Tiŋgbani";
 "enum.navigation_item.new_tab" = "Binshɛɣ'kam palli";
 "enum.navigation_item.opened" = "Yooma";
 "enum.navigation_item.categories" = "Pubu nima";

Support/de.lproj/Localizable.strings

@@ -216,10 +216,8 @@
 "enum.libray_tab_item.categories" = "Kategorien";
 "enum.libray_tab_item.downloads" = "Downloads";
 "enum.libray_tab_item.new" = "Neu";
-"enum.navigation_item.loading" = "Lade …";
 "enum.navigation_item.reading" = "Lese …";
 "enum.navigation_item.bookmarks" = "Lesezeichen";
-"enum.navigation_item.map" = "Karte";
 "enum.navigation_item.new_tab" = "Neuer Tab";
 "enum.navigation_item.opened" = "Geöffnet";
 "enum.navigation_item.categories" = "Kategorien";

Support/en.lproj/Localizable.strings

@@ -261,10 +261,8 @@
 "enum.libray_tab_item.downloads" = "Downloads";
 "enum.libray_tab_item.new" = "New";
 
-"enum.navigation_item.loading" = "Loading";
 "enum.navigation_item.reading" = "Reading";
 "enum.navigation_item.bookmarks" = "Bookmarks";
-"enum.navigation_item.map" = "Map";
 "enum.navigation_item.new_tab" = "New Tab";
 "enum.navigation_item.opened" = "Opened";
 "enum.navigation_item.categories" = "Categories";

Support/es.lproj/Localizable.strings

@@ -216,10 +216,8 @@
 "enum.libray_tab_item.categories" = "Categorías";
 "enum.libray_tab_item.downloads" = "Descargas";
 "enum.libray_tab_item.new" = "Nuevo";
-"enum.navigation_item.loading" = "Cargando…";
 "enum.navigation_item.reading" = "Lectura";
 "enum.navigation_item.bookmarks" = "Marcadores";
-"enum.navigation_item.map" = "Mapa";
 "enum.navigation_item.new_tab" = "Pestaña nueva";
 "enum.navigation_item.opened" = "Abierto";
 "enum.navigation_item.categories" = "Categorías";

Support/fi.lproj/Localizable.strings

@@ -123,7 +123,6 @@
 "enum.external_link_loading_policy.never_load" = "Älä koskaan lataa";
 "enum.library_language_sorting_model.a-z" = "A-Ö";
 "enum.libray_tab_item.new" = "Uusi";
-"enum.navigation_item.loading" = "Ladataan";
 "enum.navigation_item.bookmarks" = "Kirjanmerkit";
 "enum.navigation_item.new_tab" = "Uusi välilehti";
 "enum.navigation_item.opened" = "Avattu";

Support/fr.lproj/Localizable.strings

@@ -226,10 +226,8 @@
 "enum.libray_tab_item.categories" = "Catégories";
 "enum.libray_tab_item.downloads" = "Téléchargements";
 "enum.libray_tab_item.new" = "Nouveau";
-"enum.navigation_item.loading" = "Chargement";
 "enum.navigation_item.reading" = "Lecture";
 "enum.navigation_item.bookmarks" = "Signets";
-"enum.navigation_item.map" = "Carte";
 "enum.navigation_item.new_tab" = "Nouvel onglet";
 "enum.navigation_item.opened" = "Ouvert";
 "enum.navigation_item.categories" = "Catégories";