Fixed cell offset bug: when XIB loaded JXBanner with Pagecount equal …

…to 1 JXBanner/Classes/Banner/Banner/JXBannerLayout.swift
Coder-TanJX · Sep 21, 2020 · 43f76b4 · 43f76b4
1 parent f08b0e6
commit 43f76b4
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 23 deletions.
diff --git a/Example/JXBanner.xcodeproj/project.pbxproj b/Example/JXBanner.xcodeproj/project.pbxproj
@@ -632,7 +632,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -652,7 +652,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Example/JXBanner/Info.plist b/Example/JXBanner/Info.plist
@@ -2,11 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>NSAppTransportSecurity</key>
-    <dict>
-    <key>NSAllowsArbitraryLoads</key>
-    <true/>
-    </dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -29,6 +24,11 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -41,6 +41,7 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 </dict>
 </plist>
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/JXBanner.podspec b/JXBanner.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'JXBanner'
-  s.version          = '0.3.1'
+  s.version          = '0.3.2'
   s.summary          = 'A multifunctional framework for banner unlimited rollover diagrams'
 
 # This description is used to generate tags and improve search results.

diff --git a/JXBanner/Classes/Banner/Banner/JXBannerLayout.swift b/JXBanner/Classes/Banner/Banner/JXBannerLayout.swift
@@ -21,19 +21,28 @@ class JXBannerLayout: UICollectionViewFlowLayout {
     var params: JXBannerLayoutParams? {
         didSet {
             if let params = params {
+                shouldInvalidateLayout = true
                 itemSize = params.itemSize ?? collectionView?.bounds.size ?? CGSize(width: 2, height: 2)
                 minimumLineSpacing = params.itemSpacing
                 minimumInteritemSpacing = params.itemSpacing
             }
         }
     }
-
+
+    /// Fixed cell offset bug:  when XIB loaded JXBanner with Pagecount equal to 1
+    var shouldInvalidateLayout = true
+
     var isPagingEnabled: Bool = true
 
     override func shouldInvalidateLayout(forBoundsChange newBounds: CGRect) ->
         Bool {
-        if let _ = params?.layoutType { return true }
-        return super.shouldInvalidateLayout(forBoundsChange: newBounds)
+
+            if shouldInvalidateLayout || params?.layoutType != nil {
+                shouldInvalidateLayout = false
+                return true
+            }
+
+            return super.shouldInvalidateLayout(forBoundsChange: newBounds)
     }
 
     override func prepare() {