Skip to content

Commit

Permalink
Merge branch 'refactor'
Browse files Browse the repository at this point in the history
  • Loading branch information
pronebird committed Aug 7, 2022
2 parents bfdad04 + 52d45f9 commit ff0c2b0
Show file tree
Hide file tree
Showing 24 changed files with 513 additions and 568 deletions.
28 changes: 2 additions & 26 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,26 +1,2 @@
# Xcode
#
build/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
*.moved-aside
DerivedData
*.hmap
*.ipa
*.xcuserstate

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
#
# Pods/
## User settings
xcuserdata/
6 changes: 3 additions & 3 deletions .jazzy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ github_url: https://github.com/pronebird/UIScrollView-InfiniteScroll
github_file_prefix: https://github.com/pronebird/UIScrollView-InfiniteScroll/tree/9cddbf4d89

module: UIScrollView_InfiniteScroll
module_version: 1.1.0
module_version: 1.3.0

clean: true
theme: fullwidth
objc: true
sdk: iphonesimulator

framework_root: Classes
umbrella_header: Classes/UIScrollView+InfiniteScroll.h
framework_root: Sources/UIScrollView_InfiniteScroll
umbrella_header: Sources/UIScrollView_InfiniteScroll/UIScrollView+InfiniteScroll.h
12 changes: 12 additions & 0 deletions .swiftformat
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# general options
--swiftversion 5.5

# format options
--indent 4
--maxwidth 100
--wraparguments before-first
--wrapparameters before-first
--wrapternary before-operators
--redundanttype inferred
--ifdef no-indent
--disable initCoderUnavailable, redundantReturn, unusedArguments, trailingCommas, redundantRawValues, preferKeyPath
2 changes: 1 addition & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= Unreleased
= 1.3.0 (2022-08-07)

* Handle scrolling when voiceOver is running (@r-dent)

Expand Down
24 changes: 0 additions & 24 deletions InfiniteScrollViewDemo-tvOS/Base.lproj/LaunchScreen.storyboard

This file was deleted.

108 changes: 22 additions & 86 deletions InfiniteScrollViewDemoSwift.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
7 changes: 4 additions & 3 deletions InfiniteScrollViewDemoSwift/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ import UIKit

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDelegate {

var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
func application(
_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
return true
}
}

Loading

0 comments on commit ff0c2b0

Please sign in to comment.