Fix iPhone 13 bug

(Bump ASCollectionView version)
XKCDY · Oct 2, 2021 · 22fcd2b · 22fcd2b
1 parent f58ca42
commit 22fcd2b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/XKCDY.xcodeproj/project.pbxproj b/XKCDY.xcodeproj/project.pbxproj
@@ -968,7 +968,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1025,7 +1025,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -1052,7 +1052,7 @@
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphonesimulator14.0]" = arm64;
 				INFOPLIST_FILE = XKCDY/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1083,7 +1083,7 @@
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphonesimulator14.0]" = arm64;
 				INFOPLIST_FILE = XKCDY/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1245,7 +1245,7 @@
 				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = RSMU2QR9ZN;
 				INFOPLIST_FILE = XKCDYIntents/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1270,7 +1270,7 @@
 				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = RSMU2QR9ZN;
 				INFOPLIST_FILE = XKCDYIntents/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1350,8 +1350,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/apptekstudios/ASCollectionView";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.7.1;
+				kind = exactVersion;
+				version = 2.1.1;
 			};
 		};
 		6A5430E524994A6500C92B78 /* XCRemoteSwiftPackageReference "realm-cocoa" */ = {

diff --git a/XKCDY.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/XKCDY.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/apptekstudios/ASCollectionView",
         "state": {
           "branch": null,
-          "revision": "4550cd5b5cfc3f437f8ff838939c6be21edfe992",
-          "version": "1.7.1"
+          "revision": "4288744ba484c1062c109c0f28d72b629d321d55",
+          "version": "2.1.1"
         }
       },
       {

diff --git a/XKCDY/Views/ComicPager.swift b/XKCDY/Views/ComicPager.swift
@@ -89,13 +89,17 @@ struct ComicPager: View {
         self.showSheet = true
     }
 
-    func setPage() {
-        self.page = self.store.filteredComics.firstIndex(where: { $0.id == self.store.currentComicId }) ?? 0
+    func updatePage() {
+        let newIndex = self.store.filteredComics.firstIndex(where: { $0.id == self.store.currentComicId }) ?? 0
+
+        if newIndex != self.page {
+            self.page = newIndex
+        }
     }
 
     func handleShuffle() {
         self.store.shuffle {
-            self.setPage()
+            self.updatePage()
         }
     }
 
@@ -150,7 +154,7 @@ struct ComicPager: View {
                         }
                     })
                     .allowsDragging(!self.isZoomed)
-                    .itemSpacing(self.offset == .zero ? 30 : 1000)
+                    .itemSpacing(self.offset == .zero ? 0 : 1000)
                     .onPageChanged({ newIndex in
                         if newIndex == -1 {
                             return
@@ -217,7 +221,7 @@ struct ComicPager: View {
             }
         }
         .onAppear {
-            self.setPage()
+            self.updatePage()
 
             self.hidden = true
 
@@ -230,7 +234,7 @@ struct ComicPager: View {
             }
         }
         .onReceive(self.store.$debouncedCurrentComicId) { _ in
-            self.setPage()
+            self.updatePage()
         }
         .onReceive(NotificationCenter.default.publisher(for: UIApplication.willResignActiveNotification)) { _ in
             self.offset = .zero