feat: Pan & Zoom feature, quite buggy now

EhPanda-Team · May 23, 2021 · 12f6c6f · 12f6c6f
1 parent 875ba81
commit 12f6c6f
Show file tree

Hide file tree

Showing 6 changed files with 162 additions and 64 deletions.
diff --git a/EhPanda/App/Defaults.swift b/EhPanda/App/Defaults.swift
@@ -23,6 +23,7 @@ struct Defaults {
         static var avatarScale: CGFloat = 1/1
         static var headerScale: CGFloat = 8/11
         static var previewScale: CGFloat = 32/45
+        static var contentHScale: CGFloat = 7/10
 
         static var rowW: CGFloat = rowH * rowScale
         static var rowH: CGFloat = 110

diff --git a/EhPanda/DataFlow/AppAction.swift b/EhPanda/DataFlow/AppAction.swift
@@ -18,6 +18,7 @@ enum AppAction {
     case initiateSetting
     case cleanDetailViewCommentContent
     case cleanCommentViewCommentContent
+    case saveAspectBox(gid: String, box: [Int: CGFloat])
     case saveReadingProgress(gid: String, tag: Int)
     case updateDiskImageCacheSize(size: String)
     case updateAppIconType(iconType: IconType)

diff --git a/EhPanda/DataFlow/AppState.swift b/EhPanda/DataFlow/AppState.swift
@@ -356,6 +356,9 @@ extension AppState {
                 items?[gid]?.contents?.sort { $0.tag < $1.tag }
             }
         }
+        mutating func insertAspectBox(gid: String, box: [Int: CGFloat]) {
+            items?[gid]?.detail?.aspectBox = box
+        }
         mutating func insertReadingProgress(gid: String, progress: Int) {
             items?[gid]?.detail?.readingProgress = progress
         }

diff --git a/EhPanda/DataFlow/Store.swift b/EhPanda/DataFlow/Store.swift
@@ -41,6 +41,8 @@ final class Store: ObservableObject {
             appState.settings.filter = Filter()
         case .initiateSetting:
             appState.settings.setting = Setting()
+        case .saveAspectBox(let gid, let box):
+            appState.cachedList.insertAspectBox(gid: gid, box: box)
         case .saveReadingProgress(let gid, let tag):
             appState.cachedList.insertReadingProgress(gid: gid, progress: tag)
         case .updateDiskImageCacheSize(let size):

diff --git a/EhPanda/Models/Manga.swift b/EhPanda/Models/Manga.swift
@@ -75,6 +75,7 @@ struct MangaDetail: Codable {
     var readingProgress: Int?
     var currentPageNum = 0
     var pageNumMaximum = 1
+    var aspectBox = [Int: CGFloat]()
 
     var isFavored: Bool
     var archiveURL: String?