Merge pull request #4 from DeluxeAlonso/development

Development to master for 1.0.3 version
DeluxeAlonso · Apr 6, 2021 · 2ff187e · 2ff187e
2 parents 6028976 + 712d0ec
commit 2ff187e
Show file tree

Hide file tree

Showing 11 changed files with 312 additions and 258 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,18 @@
-.DS_Store
-
 # Xcode
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
-## Build generated
+## User settings
+xcuserdata/
+
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+*.xcscmblueprint
+*.xccheckout
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
 build/
 DerivedData/
-
-## Various settings
+*.moved-aside
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -17,15 +21,11 @@ DerivedData/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap
+
+## App packaging
 *.ipa
 *.dSYM.zip
 *.dSYM
@@ -40,6 +40,12 @@ playground.xcworkspace
 # Packages/
 # Package.pins
 # Package.resolved
+# *.xcodeproj
+#
+# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
+# hence it is not needed unless you have added a package configuration file to your project
+# .swiftpm
+
 .build/
 
 # CocoaPods
@@ -58,23 +64,27 @@ playground.xcworkspace
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
 # Carthage/Checkouts
 
-Carthage/Build
+Carthage/Build/
+
+# Accio dependency management
+Dependencies/
+.accio/
 
 # fastlane
 #
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
-# screenshots whenever they are needed.
+# It is recommended to not store the screenshots in the git repo.
+# Instead, use fastlane to re-generate the screenshots whenever they are needed.
 # For more information about the recommended setup visit:
 # https://docs.fastlane.tools/best-practices/source-control/#source-control
 
 fastlane/report.xml
 fastlane/Preview.html
-fastlane/screenshots/**/*.png
 fastlane/test_output
 
 # Code Injection
 #
 # After new code Injection tools there's a generated folder /iOSInjectionProject
 # https://github.com/johnno1962/injectionforxcode
 
-iOSInjectionProject/
+iOSInjectionProject/
+.DS_Store
diff --git a/DLAutoSlidePageViewController.podspec b/DLAutoSlidePageViewController.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'DLAutoSlidePageViewController'
-  s.version          = '1.0.2'
+  s.version          = '1.0.3'
   s.summary          = 'An auto slide PageViewController.'
 
   s.description      = <<-DESC

diff --git a/Example/.DS_Store b/Example/.DS_Store
diff --git a/Example/DLAutoSlidePageViewController.xcodeproj/project.pbxproj b/Example/DLAutoSlidePageViewController.xcodeproj/project.pbxproj
@@ -109,6 +109,8 @@
 			dependencies = (
 			);
 			name = "DLAutoSlidePageViewController Example";
+			packageProductDependencies = (
+			);
 			productName = DLAutoSlidePageViewController;
 			productReference = E223006420BB05F800FC7EBE /* DLAutoSlidePageViewController Example.app */;
 			productType = "com.apple.product-type.application";
@@ -138,6 +140,8 @@
 				Base,
 			);
 			mainGroup = E25A02ED1F9487B9002683FC;
+			packageReferences = (
+			);
 			productRefGroup = E25A02F71F9487B9002683FC /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -322,6 +326,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -373,6 +378,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

diff --git a/Example/DLAutoSlidePageViewController.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/DLAutoSlidePageViewController.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "MaterialPageControl",
+        "repositoryURL": "https://github.com/DeluxeAlonso/MaterialPageControl.git",
+        "state": {
+          "branch": null,
+          "revision": "f77350fb15c722d36a6f644032c276502fb71fd2",
+          "version": "0.1.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/...geViewController.xcworkspace/xcuserdata/Alonso.xcuserdatad/UserInterfaceState.xcuserstate b/...geViewController.xcworkspace/xcuserdata/Alonso.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Example/DLAutoSlidePageViewController/AppDelegate.swift b/Example/DLAutoSlidePageViewController/AppDelegate.swift
@@ -11,35 +11,35 @@ import UIKit
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
-  var window: UIWindow?
+    var window: UIWindow?
 
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-    // Override point for customization after application launch.
-    return true
-  }
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        // Override point for customization after application launch.
+        return true
+    }
 
-  func applicationWillResignActive(_ application: UIApplication) {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
-  }
+    func applicationWillResignActive(_ application: UIApplication) {
+        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+        // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+    }
 
-  func applicationDidEnterBackground(_ application: UIApplication) {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-  }
+    func applicationDidEnterBackground(_ application: UIApplication) {
+        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+    }
 
-  func applicationWillEnterForeground(_ application: UIApplication) {
-    // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
-  }
+    func applicationWillEnterForeground(_ application: UIApplication) {
+        // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+    }
 
-  func applicationDidBecomeActive(_ application: UIApplication) {
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-  }
+    func applicationDidBecomeActive(_ application: UIApplication) {
+        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    }
 
-  func applicationWillTerminate(_ application: UIApplication) {
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-  }
+    func applicationWillTerminate(_ application: UIApplication) {
+        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    }
 
 
 }

diff --git a/Example/DLAutoSlidePageViewController/Base.lproj/Main.storyboard b/Example/DLAutoSlidePageViewController/Base.lproj/Main.storyboard
@@ -1,48 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="DLAutoSlidePageViewController" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="DLAutoSlidePageViewController_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="03X-Cc-7LE">
-                                <rect key="frame" x="-0.5" y="166.5" width="375" height="333.5"/>
+                                <rect key="frame" x="0.0" y="167" width="375" height="333.5"/>
                             </containerView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c9l-1t-INW" customClass="MaterialPageControl" customModule="MaterialPageControl">
+                                <rect key="frame" x="16" y="516.5" width="343" height="36"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="36" id="87w-Bn-eJm"/>
+                                </constraints>
+                            </view>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="03X-Cc-7LE" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="3A5-5m-yXg"/>
+                            <constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="c9l-1t-INW" secondAttribute="trailing" constant="16" id="8ve-yq-Gok"/>
                             <constraint firstItem="03X-Cc-7LE" firstAttribute="height" secondItem="8bC-Xf-vdC" secondAttribute="height" multiplier="0.5" id="dA5-qs-oV0"/>
+                            <constraint firstItem="c9l-1t-INW" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="16" id="lVF-cP-mp8"/>
                             <constraint firstItem="03X-Cc-7LE" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="pO2-JF-GZK"/>
+                            <constraint firstItem="c9l-1t-INW" firstAttribute="top" secondItem="03X-Cc-7LE" secondAttribute="bottom" constant="16" id="vpa-WI-6tY"/>
                             <constraint firstItem="03X-Cc-7LE" firstAttribute="width" secondItem="8bC-Xf-vdC" secondAttribute="width" id="yda-Gc-UoF"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                     </view>
                     <connections>
                         <outlet property="containerView" destination="03X-Cc-7LE" id="ext-fb-MuP"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="138" y="129"/>
         </scene>
         <!--Image View Controller-->
         <scene sceneID="CD1-O8-Fkm">
             <objects>
-                <viewController storyboardIdentifier="ImageViewController" id="KBG-gl-lV1" customClass="ImageViewController" customModule="DLAutoSlidePageViewController" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="ImageViewController" id="KBG-gl-lV1" customClass="ImageViewController" customModule="DLAutoSlidePageViewController_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="zwx-nx-2cz">
                         <rect key="frame" x="0.0" y="0.0" width="200" height="200"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -51,14 +60,14 @@
                                 <rect key="frame" x="8" y="8" width="184" height="184"/>
                             </imageView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="17e-Bs-Byb"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="MPA-h1-PQJ" firstAttribute="top" secondItem="zwx-nx-2cz" secondAttribute="top" constant="8" id="CzJ-W2-mdv"/>
                             <constraint firstItem="MPA-h1-PQJ" firstAttribute="leading" secondItem="zwx-nx-2cz" secondAttribute="leading" constant="8" id="bfC-4y-lMe"/>
                             <constraint firstAttribute="trailing" secondItem="MPA-h1-PQJ" secondAttribute="trailing" constant="8" id="hqQ-NT-eMU"/>
                             <constraint firstAttribute="bottom" secondItem="MPA-h1-PQJ" secondAttribute="bottom" constant="8" id="k51-1O-55g"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="17e-Bs-Byb"/>
                     </view>
                     <size key="freeformSize" width="200" height="200"/>
                     <connections>
@@ -72,5 +81,8 @@
     </scenes>
     <resources>
         <image name="ChromeIcon" width="150" height="150"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/Example/DLAutoSlidePageViewController/ImageViewController.swift b/Example/DLAutoSlidePageViewController/ImageViewController.swift
@@ -9,22 +9,22 @@
 import UIKit
 
 class ImageViewController: UIViewController {
-  
-  @IBOutlet weak public var logoImageView: UIImageView!
-  
-  var logoImage: UIImage?
-  
-  // MARK: - Lifecycle
-  
-  override func viewDidLoad() {
-    super.viewDidLoad()
-    logoImageView.image = logoImage
-  }
-  
-  // MARK: - Public
-  
-  func setupElements(image: UIImage) {
-    logoImage = image
-  }
-  
+
+    @IBOutlet weak public var logoImageView: UIImageView!
+
+    private var logoImage: UIImage?
+
+    // MARK: - Lifecycle
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        logoImageView.image = logoImage
+    }
+
+    // MARK: - Public
+
+    func setupElements(image: UIImage) {
+        logoImage = image
+    }
+
 }