Skip to content

Commit

Permalink
Merge pull request #6 from DeluxeAlonso/development
Browse files Browse the repository at this point in the history
Development to master for 1.1.0 version
  • Loading branch information
DeluxeAlonso authored Apr 7, 2021
2 parents 2ff187e + c82ed6e commit e4b02c5
Show file tree
Hide file tree
Showing 28 changed files with 430 additions and 638 deletions.
9 changes: 2 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ playground.xcworkspace
#
# 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
.swiftpm

.build/

Expand Down Expand Up @@ -81,10 +81,5 @@ fastlane/report.xml
fastlane/Preview.html
fastlane/test_output

# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/
*.xcuserstate
.DS_Store
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

7 changes: 0 additions & 7 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

This file was deleted.

4 changes: 2 additions & 2 deletions DLAutoSlidePageViewController.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'DLAutoSlidePageViewController'
s.version = '1.0.3'
s.version = '1.1.0'
s.summary = 'An auto slide PageViewController.'

s.description = <<-DESC
Expand All @@ -13,7 +13,7 @@ An auto slide PageViewController with a customizable time interval.
s.source = { :git => 'https://github.com/DeluxeAlonso/DLAutoSlidePageViewController.git', :tag => s.version.to_s }

s.ios.deployment_target = '10.0'
s.source_files = 'Sources/DLAutoSlidePageViewController.swift'
s.source_files = 'Sources/*.swift'
s.swift_version = "5.0"
s.swift_versions = ['4.0', '4.2', '5.0']

Expand Down
Binary file removed Example/.DS_Store
Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
9 changes: 5 additions & 4 deletions Example/DLAutoSlidePageViewController/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ class ViewController: UIViewController {

private func setupPageViewController() {
let pages: [UIViewController] = setupPages()
let pageViewController = DLAutoSlidePageViewController(pages: pages,
timeInterval: 3.0,
transitionStyle: .scroll,
interPageSpacing: 0.0)

// Configure default auto slide page configuration
DefaultAutoSlideConfiguration.shared.timeInterval = 2.0
let pageViewController = DLAutoSlidePageViewController(pages: pages)

addChild(pageViewController)
containerView.addSubview(pageViewController.view)
pageViewController.view.frame = containerView.bounds
Expand Down
6 changes: 3 additions & 3 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- DLAutoSlidePageViewController (0.6.0)
- DLAutoSlidePageViewController (1.0.3)

DEPENDENCIES:
- DLAutoSlidePageViewController (from `../`)
Expand All @@ -9,8 +9,8 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
DLAutoSlidePageViewController: e256d091393a7b443c0ef10d96cce67971bbef26
DLAutoSlidePageViewController: f1953070b17dd5cb2a261e43d8f07c02a4df055a

PODFILE CHECKSUM: 3191da1128129c5e1073225fabaaa8682e5bec43

COCOAPODS: 1.8.4
COCOAPODS: 1.10.1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e4b02c5

Please sign in to comment.