Merge pull request #213 from tatsuz0u/develop

Bugfixes
EhPanda-Team · Feb 9, 2022 · 660f82f · 660f82f
2 parents 8f6c90a + ac63fa9
commit 660f82f
Show file tree

Hide file tree

Showing 25 changed files with 379 additions and 322 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -6,7 +6,7 @@ on:
     types: [closed]
 env:
   DEVELOPER_DIR: /Applications/Xcode_13.2.1.app
-  APP_VERSION: '2.1.0'
+  APP_VERSION: '2.1.1'
   SCHEME_NAME: 'EhPanda'
   ALTSTORE_JSON_PATH: './AltStore.json'
   BUILDS_PATH: '/tmp/action-builds'

diff --git a/EhPanda.xcodeproj/project.pbxproj b/EhPanda.xcodeproj/project.pbxproj
@@ -134,7 +134,6 @@
 		ABA732D925A8018A00B3D9AB /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABA732D825A8018A00B3D9AB /* Extensions.swift */; };
 		ABA732DF25A852D800B3D9AB /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABA732DE25A852D800B3D9AB /* Filter.swift */; };
 		ABAC82FE26BC4A96009F5026 /* OpenCC in Frameworks */ = {isa = PBXBuildFile; productRef = ABAC82FD26BC4A96009F5026 /* OpenCC */; };
-		ABAFFE4026A86E3000EE8661 /* MeasureTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABAFFE3F26A86E3000EE8661 /* MeasureTool.swift */; };
 		ABBB2631278E6EF3007B6149 /* SearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABBB2630278E6EF3007B6149 /* SearchView.swift */; };
 		ABBB2633278E6F3B007B6149 /* SearchStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABBB2632278E6F3B007B6149 /* SearchStore.swift */; };
 		ABBB2636278FB888007B6149 /* SwiftUINavigation in Frameworks */ = {isa = PBXBuildFile; productRef = ABBB2635278FB888007B6149 /* SwiftUINavigation */; };
@@ -167,6 +166,9 @@
 		ABC681F326898D46007BBD69 /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = ABC681F126898D46007BBD69 /* Model.xcdatamodeld */; };
 		ABC8355D27B118330091DCDB /* DetailSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC8355C27B118330091DCDB /* DetailSearchView.swift */; };
 		ABC8355F27B118370091DCDB /* DetailSearchStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC8355E27B118370091DCDB /* DetailSearchStore.swift */; };
+		ABC8356127B357C50091DCDB /* GestureHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC8356027B357C50091DCDB /* GestureHandler.swift */; };
+		ABC8356327B366760091DCDB /* PageHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC8356227B366760091DCDB /* PageHandler.swift */; };
+		ABC8356527B36E550091DCDB /* AutoPlayHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC8356427B36E550091DCDB /* AutoPlayHandler.swift */; };
 		ABCA93BE26918DE100A98BC6 /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABCA93BD26918DE100A98BC6 /* Persistence.swift */; };
 		ABCA93C02691925900A98BC6 /* GalleryMO+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABCA93BF2691925900A98BC6 /* GalleryMO+CoreDataClass.swift */; };
 		ABCA93C22691929D00A98BC6 /* GalleryDetailMO+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABCA93C12691929D00A98BC6 /* GalleryDetailMO+CoreDataClass.swift */; };
@@ -370,7 +372,6 @@
 		AB994DBB25986F7A00E9A367 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
 		ABA732D825A8018A00B3D9AB /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
 		ABA732DE25A852D800B3D9AB /* Filter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Filter.swift; sourceTree = "<group>"; };
-		ABAFFE3F26A86E3000EE8661 /* MeasureTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeasureTool.swift; sourceTree = "<group>"; };
 		ABB5013026A41EBA00B542D9 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = "<group>"; };
 		ABB5013126A41EBA00B542D9 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		ABBB2630278E6EF3007B6149 /* SearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchView.swift; sourceTree = "<group>"; };
@@ -406,6 +407,9 @@
 		ABC681F226898D46007BBD69 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
 		ABC8355C27B118330091DCDB /* DetailSearchView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailSearchView.swift; sourceTree = "<group>"; };
 		ABC8355E27B118370091DCDB /* DetailSearchStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailSearchStore.swift; sourceTree = "<group>"; };
+		ABC8356027B357C50091DCDB /* GestureHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GestureHandler.swift; sourceTree = "<group>"; };
+		ABC8356227B366760091DCDB /* PageHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageHandler.swift; sourceTree = "<group>"; };
+		ABC8356427B36E550091DCDB /* AutoPlayHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoPlayHandler.swift; sourceTree = "<group>"; };
 		ABCA93BD26918DE100A98BC6 /* Persistence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Persistence.swift; sourceTree = "<group>"; };
 		ABCA93BF2691925900A98BC6 /* GalleryMO+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GalleryMO+CoreDataClass.swift"; sourceTree = "<group>"; };
 		ABCA93C12691929D00A98BC6 /* GalleryDetailMO+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GalleryDetailMO+CoreDataClass.swift"; sourceTree = "<group>"; };
@@ -566,7 +570,9 @@
 			children = (
 				AB69CB8126B3DAF400699359 /* ControlPanel.swift */,
 				AB69CB7F26B3DABC00699359 /* AdvancedList.swift */,
-				ABAFFE3F26A86E3000EE8661 /* MeasureTool.swift */,
+				ABC8356227B366760091DCDB /* PageHandler.swift */,
+				ABC8356027B357C50091DCDB /* GestureHandler.swift */,
+				ABC8356427B36E550091DCDB /* AutoPlayHandler.swift */,
 			);
 			path = Support;
 			sourceTree = "<group>";
@@ -1355,6 +1361,7 @@
 				AB86ABF92782EC0D00E61E6A /* EhPandaView.swift in Sources */,
 				AB7BF2BA27A96562001865A3 /* Gallery.swift in Sources */,
 				AB0929BE2780032400F107CA /* EhSettingStore.swift in Sources */,
+				ABC8356127B357C50091DCDB /* GestureHandler.swift in Sources */,
 				AB0929D42781EDDC00F107CA /* UserDefaultsClient.swift in Sources */,
 				AB0929D82782A83A00F107CA /* AuthorizationClient.swift in Sources */,
 				ABF45AEF25F3313D00ECB568 /* TorrentsView.swift in Sources */,
@@ -1396,6 +1403,7 @@
 				AB7BF2AB27A642FB001865A3 /* BrowsingCountry.swift in Sources */,
 				ABD49D60277C7722003D1A07 /* TabBarView.swift in Sources */,
 				AB26F59027ABF21000AB3468 /* Model5toModel6.xcmappingmodel in Sources */,
+				ABC8356327B366760091DCDB /* PageHandler.swift in Sources */,
 				AB706FA5278C3DDE0025A48A /* PreviewsView.swift in Sources */,
 				ABF45AE725F3313D00ECB568 /* RatingView.swift in Sources */,
 				AB2CED64268AB6AE003130F7 /* GalleryMO+CoreDataProperties.swift in Sources */,
@@ -1420,7 +1428,6 @@
 				AB7BF2B727A9652F001865A3 /* Greeting.swift in Sources */,
 				ABC8355F27B118370091DCDB /* DetailSearchStore.swift in Sources */,
 				AB4FD2C1268AB83300A95968 /* GalleryDetailMO+CoreDataProperties.swift in Sources */,
-				ABAFFE4026A86E3000EE8661 /* MeasureTool.swift in Sources */,
 				AB26F59427ACC6CD00AB3468 /* TagTranslator.swift in Sources */,
 				AB0929CE2781AADA00F107CA /* DatabaseClient.swift in Sources */,
 				AB6DE897268822390087C579 /* LogsView.swift in Sources */,
@@ -1436,6 +1443,7 @@
 				AB706F8A278A4CC50025A48A /* PopularStore.swift in Sources */,
 				ABD49D64277C7AD5003D1A07 /* TabBarStore.swift in Sources */,
 				ABF45AF025F3313D00ECB568 /* CommentsView.swift in Sources */,
+				ABC8356527B36E550091DCDB /* AutoPlayHandler.swift in Sources */,
 				ABBB2671279AFA61007B6149 /* EnvironmentKeys.swift in Sources */,
 				AB7BF2DA27AA78CF001865A3 /* Reducer_Extension.swift in Sources */,
 				ABBD2B602768D7AD0072AED2 /* GalleryRankingCell.swift in Sources */,

diff --git a/EhPanda/Models/Gallery/GalleryState.swift b/EhPanda/Models/Gallery/GalleryState.swift
@@ -23,7 +23,7 @@ struct GalleryState: Codable {
 }
 extension GalleryState: CustomStringConvertible {
     var description: String {
-        .init(describing: [
+        let params = String(describing: [
             "gid": gid,
             "tagsCount": tags.count,
             "readingProgress": readingProgress,
@@ -34,6 +34,7 @@ extension GalleryState: CustomStringConvertible {
             "originalImageURLsCount": originalImageURLs.count,
             "thumbnailURLsCount": thumbnailURLs.count
         ])
+        return "GalleryState(\(params))"
     }
 }
 

diff --git a/EhPanda/Models/Persistent/AppEnv.swift b/EhPanda/Models/Persistent/AppEnv.swift
@@ -18,12 +18,13 @@ struct AppEnv: Codable {
 
 extension AppEnv: CustomStringConvertible {
     var description: String {
-        .init(describing: [
+        let params = String(describing: [
             "user": user,
             "setting": setting,
             "tagTranslator": tagTranslator,
             "historyKeywordsCount": historyKeywords.count,
             "quickSearchWordsCount": quickSearchWords.count
         ])
+        return "AppEnv(\(params))"
     }
 }
diff --git a/EhPanda/Models/Persistent/TagTranslator.swift b/EhPanda/Models/Persistent/TagTranslator.swift
@@ -34,11 +34,12 @@ struct TagTranslator: Codable, Equatable {
 
 extension TagTranslator: CustomStringConvertible {
     var description: String {
-        .init(describing: [
+        let params = String(describing: [
             "language": language as Any,
             "updatedDate": updatedDate,
             "contentsCount": contents.count,
             "hasCustomTranslations": hasCustomTranslations
         ])
+        return "TagTranslator(\(params))"
     }
 }
diff --git a/EhPanda/View/Detail/DetailSearchView.swift b/EhPanda/View/Detail/DetailSearchView.swift
@@ -56,8 +56,7 @@ struct DetailSearchView: View {
                     blurRadius: blurRadius, tagTranslator: tagTranslator
                 )
             }
-            .autoBlur(radius: blurRadius)
-            .environment(\.inSheet, true)
+            .autoBlur(radius: blurRadius).environment(\.inSheet, true).navigationViewStyle(.stack)
         }
         .sheet(unwrapping: viewStore.binding(\.$route), case: /DetailSearchState.Route.quickSearch) { _ in
             QuickSearchView(

diff --git a/EhPanda/View/Favorites/FavoritesView.swift b/EhPanda/View/Favorites/FavoritesView.swift
@@ -67,9 +67,7 @@ struct FavoritesView: View {
                         blurRadius: blurRadius, tagTranslator: tagTranslator
                     )
                 }
-                .autoBlur(radius: blurRadius)
-                .environment(\.inSheet, true)
-                .navigationViewStyle(.stack)
+                .autoBlur(radius: blurRadius).environment(\.inSheet, true).navigationViewStyle(.stack)
             }
             .sheet(unwrapping: viewStore.binding(\.$route), case: /FavoritesState.Route.quickSearch) { _ in
                 QuickSearchView(

diff --git a/EhPanda/View/Home/FrontpageView.swift b/EhPanda/View/Home/FrontpageView.swift
@@ -55,8 +55,7 @@ struct FrontpageView: View {
                     blurRadius: blurRadius, tagTranslator: tagTranslator
                 )
             }
-            .autoBlur(radius: blurRadius)
-            .environment(\.inSheet, true)
+            .autoBlur(radius: blurRadius).environment(\.inSheet, true).navigationViewStyle(.stack)
         }
         .sheet(unwrapping: viewStore.binding(\.$route), case: /FrontpageState.Route.filters) { _ in
             FiltersView(store: store.scope(state: \.filtersState, action: FrontpageAction.filters))

diff --git a/EhPanda/View/Home/HistoryView.swift b/EhPanda/View/Home/HistoryView.swift
@@ -53,8 +53,7 @@ struct HistoryView: View {
                     blurRadius: blurRadius, tagTranslator: tagTranslator
                 )
             }
-            .autoBlur(radius: blurRadius)
-            .environment(\.inSheet, true)
+            .autoBlur(radius: blurRadius).environment(\.inSheet, true).navigationViewStyle(.stack)
         }
         .searchable(text: viewStore.binding(\.$keyword), prompt: R.string.localizable.searchablePromptFilter())
         .onAppear {

diff --git a/EhPanda/View/Home/HomeView.swift b/EhPanda/View/Home/HomeView.swift
@@ -99,8 +99,7 @@ struct HomeView: View {
                         blurRadius: blurRadius, tagTranslator: tagTranslator
                     )
                 }
-                .autoBlur(radius: blurRadius)
-                .environment(\.inSheet, true)
+                .autoBlur(radius: blurRadius).environment(\.inSheet, true).navigationViewStyle(.stack)
             }
             .animation(.default, value: viewStore.popularLoadingState)
             .onAppear {

diff --git a/EhPanda/View/Home/PopularView.swift b/EhPanda/View/Home/PopularView.swift
@@ -52,8 +52,7 @@ struct PopularView: View {
                     blurRadius: blurRadius, tagTranslator: tagTranslator
                 )
             }
-            .autoBlur(radius: blurRadius)
-            .environment(\.inSheet, true)
+            .autoBlur(radius: blurRadius).environment(\.inSheet, true).navigationViewStyle(.stack)
         }
         .sheet(unwrapping: viewStore.binding(\.$route), case: /PopularState.Route.filters) { _ in
             FiltersView(store: store.scope(state: \.filtersState, action: PopularAction.filters))

diff --git a/EhPanda/View/Home/ToplistsView.swift b/EhPanda/View/Home/ToplistsView.swift
@@ -58,8 +58,7 @@ struct ToplistsView: View {
                     blurRadius: blurRadius, tagTranslator: tagTranslator
                 )
             }
-            .autoBlur(radius: blurRadius)
-            .environment(\.inSheet, true)
+            .autoBlur(radius: blurRadius).environment(\.inSheet, true).navigationViewStyle(.stack)
         }
         .jumpPageAlert(
             index: viewStore.binding(\.$jumpPageIndex),

diff --git a/EhPanda/View/Home/WatchedView.swift b/EhPanda/View/Home/WatchedView.swift
@@ -60,8 +60,7 @@ struct WatchedView: View {
                     blurRadius: blurRadius, tagTranslator: tagTranslator
                 )
             }
-            .autoBlur(radius: blurRadius)
-            .environment(\.inSheet, true)
+            .autoBlur(radius: blurRadius).environment(\.inSheet, true).navigationViewStyle(.stack)
         }
         .sheet(unwrapping: viewStore.binding(\.$route), case: /WatchedState.Route.quickSearch) { _ in
             QuickSearchView(