Merge pull request #19 from shinrenpan/develop

v0.9.5
shinrenpan · Jun 14, 2024 · 072beed · 072beed
2 parents 78fbbe9 + a3999a2
commit 072beed
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 16 deletions.
diff --git a/Comic.xcodeproj/project.pbxproj b/Comic.xcodeproj/project.pbxproj
@@ -629,7 +629,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 20240614;
+				CURRENT_PROJECT_VERSION = 20240615;
 				DEVELOPMENT_TEAM = VZWPMD258L;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -640,7 +640,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.4;
+				MARKETING_VERSION = 0.9.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.shinrenpan.Comic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -655,7 +655,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 20240614;
+				CURRENT_PROJECT_VERSION = 20240615;
 				DEVELOPMENT_TEAM = VZWPMD258L;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -666,7 +666,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.4;
+				MARKETING_VERSION = 0.9.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.shinrenpan.Comic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/Sources/MVVVR/Reader/ReaderVC.swift b/Sources/MVVVR/Reader/ReaderVC.swift
@@ -70,12 +70,11 @@ private extension ReaderVC {
 
     func setupSelf() {
         view.backgroundColor = vo.mainView.backgroundColor
-        navigationItem.rightBarButtonItem = makeEpisodePickerItem()
 
         setToolbarItems([
             vo.prevItem,
             .init(systemItem: .flexibleSpace),
-            vo.directionItem,
+            vo.moreItem,
             .init(systemItem: .flexibleSpace),
             vo.nextItem,
         ], animated: false)
@@ -114,10 +113,7 @@ private extension ReaderVC {
             doLoadPrev()
         }
 
-        vo.directionItem.primaryAction = .init { [weak self] _ in
-            guard let self else { return }
-            horizontalRead.toggle()
-        }
+        vo.moreItem.menu = makeMoreItemMenu()
 
         vo.nextItem.primaryAction = .init(title: "下一話") { [weak self] _ in
             guard let self else { return }
@@ -145,7 +141,6 @@ private extension ReaderVC {
         vo.list.setCollectionViewLayout(layout, animated: false)
         layout.invalidateLayout()
         vo.list.reloadData()
-        vo.directionItem.title = horizontalRead ? "橫向閱讀" : "直式閱讀"
     }
 
     // MARK: - Handle State
@@ -202,13 +197,54 @@ private extension ReaderVC {
         }
     }
 
-    func makeEpisodePickerItem() -> UIBarButtonItem {
-        let action = UIAction { [weak self] _ in
+    func makeReaderDirectionAction() -> UIAction {
+        let title: String = horizontalRead ? "直式閱讀" : "橫向閱讀"
+
+        return .init(title: title) { [weak self] _ in
+            guard let self else { return }
+            horizontalRead.toggle()
+        }.setup(\.attributes, value: .disabled)
+    }
+
+    func makeEpisodePickAction() -> UIAction {
+        .init(title: "選取集數", image: .init(systemName: "list.number")) { [weak self] _ in
             guard let self else { return }
             router.showEpisodePicker(comic: vm.model.comic)
         }
+    }
+
+    func makeFaveriteAction() -> UIAction {
+        let title: String = vm.model.comic.favorited ? "取消收藏" : "加入收藏"
+        let image: UIImage? = vm.model.comic.favorited ? .init(systemName: "star.fill") : .init(systemName: "star")
+
+        return .init(title: title, image: image) { [weak self] _ in
+            guard let self else { return }
+            vm.model.comic.favorited.toggle()
+        }
+    }
+
+    func makeMoreItemMenu() -> UIMenu {
+        let readerDirection = UIDeferredMenuElement.uncached { [weak self] completion in
+            guard let self else { return }
+            let action = makeReaderDirectionAction()
+
+            DispatchQueue.main.async {
+                completion([action])
+            }
+        }
+
+        let episodePick = makeEpisodePickAction()
+
+        let favorite = UIDeferredMenuElement.uncached { [weak self] completion in
+            guard let self else { return }
+            let action = makeFaveriteAction()
+
+            DispatchQueue.main.async {
+                completion([action])
+            }
+        }
 
-        return .init(image: .init(systemName: "list.number"), primaryAction: action)
+        return .init(title: "更多...", children: [readerDirection, favorite, episodePick])
     }
 
     // MARK: - Do Something

diff --git a/Sources/MVVVR/Reader/ReaderVO.swift b/Sources/MVVVR/Reader/ReaderVO.swift
@@ -17,8 +17,9 @@ final class ReaderVO {
     let prevItem = UIBarButtonItem(title: "上一話")
         .setup(\.isEnabled, value: false)
 
-    let directionItem = UIBarButtonItem(title: "")
+    let moreItem = UIBarButtonItem(title: "更多...")
         .setup(\.isEnabled, value: false)
+
     let nextItem = UIBarButtonItem(title: "下一話")
         .setup(\.isEnabled, value: false)
 
@@ -48,6 +49,8 @@ extension ReaderVO {
         mainView.isHidden = false
         list.reloadData()
         mainView.isUserInteractionEnabled = true
+        moreItem.isEnabled = true
+
         prevItem.isEnabled = model.hasPrev
         prevItem.title = model.prevEpisode?.title ?? "上一話"
         nextItem.isEnabled = model.hasNext
@@ -63,7 +66,7 @@ extension ReaderVO {
         mainView.isHidden = true
         prevItem.isEnabled = false
         prevLabel.isHidden = true
-        directionItem.isEnabled = false
+        moreItem.isEnabled = false
         nextItem.isEnabled = false
         nextLabel.isHidden = true
     }