Merge pull request #141 from nohana/release/0.9.11

0.9.11
nohana · Mar 31, 2022 · 6b2bfcb · 6b2bfcb
2 parents 052ecd3 + 6fb92c2
commit 6b2bfcb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/NohanaImagePicker/AssetListSelectableDateSectionController.swift b/NohanaImagePicker/AssetListSelectableDateSectionController.swift
@@ -60,6 +60,7 @@ class AssetListSelectableDateSectionController: UICollectionViewController, UICo
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         setToolbarTitle(nohanaImagePickerController)
+        updateDoneBarButtonColor()
         collectionView?.reloadData()
     }
 
@@ -73,6 +74,13 @@ class AssetListSelectableDateSectionController: UICollectionViewController, UICo
         }
     }
 
+    private func updateDoneBarButtonColor() {
+        parent?.navigationItem.rightBarButtonItem?.setTitleTextAttributes([
+            .foregroundColor: nohanaImagePickerController.config.color.navigationBarDoneBarButtonItem,
+            .font: UIFont.systemFont(ofSize: 17, weight: .semibold)
+        ], for: .normal)
+    }
+
     // MARK: - UICollectionViewDataSource
 
     override func numberOfSections(in collectionView: UICollectionView) -> Int {
@@ -242,6 +250,7 @@ class AssetListSelectableDateSectionController: UICollectionViewController, UICo
 extension AssetListSelectableDateSectionController: AssetDateSectionHeaderViewDelegate {
     func didPushPickButton() {
         collectionView.reloadItems(at: collectionView.indexPathsForVisibleItems)
+        updateDoneBarButtonColor()
     }
 }
 
@@ -263,5 +272,6 @@ extension AssetListSelectableDateSectionController: AssetCellDelegate {
                 }
             }
         }
+        updateDoneBarButtonColor()
     }
 }
diff --git a/NohanaImagePicker/NohanaImagePickerController.swift b/NohanaImagePicker/NohanaImagePickerController.swift
@@ -172,6 +172,7 @@ extension NohanaImagePickerController {
             public var separator: UIColor?
             public var navigationBarBackground: UIColor = .white
             public var navigationBarForeground: UIColor = .black
+            public var navigationBarDoneBarButtonItem: UIColor = .black
         }
         public var color = Color()
 

diff --git a/NohanaImagePicker/RootViewController.swift b/NohanaImagePicker/RootViewController.swift
@@ -88,7 +88,7 @@ class RootViewController: UIViewController {
         // FIXME: The settings of UIBarButtonItemAppearance may not be reflected.
         // Probably, this problem occurs when the settings are set to reflect the entire application.
         navigationItem.rightBarButtonItem?.setTitleTextAttributes([
-            .foregroundColor: nohanaImagePickerController.config.color.navigationBarForeground,
+            .foregroundColor: nohanaImagePickerController.config.color.navigationBarDoneBarButtonItem,
             .font: UIFont.systemFont(ofSize: 17, weight: .semibold)
         ], for: .normal)
     }