Skip to content
This repository was archived by the owner on Nov 4, 2022. It is now read-only.

Commit bab7560

Browse files
apptekstudiosapptekstudios
authored
V2: Merge pull request #199 from apptekstudios/v1.8.0WIP
V2
2 parents d920a10 + ff2dc85 commit bab7560

File tree

58 files changed

+1826
-846
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1826
-846
lines changed

‎.gitignore‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,94 @@
11
Demo/BuildTools/.build
2+
3+
.DS_Store
4+
5+
# Xcode
6+
#
7+
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
8+
9+
## User settings
10+
xcuserdata/
11+
12+
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
13+
*.xcscmblueprint
14+
*.xccheckout
15+
16+
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
17+
build/
18+
DerivedData/
19+
*.moved-aside
20+
*.pbxuser
21+
!default.pbxuser
22+
*.mode1v3
23+
!default.mode1v3
24+
*.mode2v3
25+
!default.mode2v3
26+
*.perspectivev3
27+
!default.perspectivev3
28+
29+
## Obj-C/Swift specific
30+
*.hmap
31+
32+
## App packaging
33+
*.ipa
34+
*.dSYM.zip
35+
*.dSYM
36+
37+
## Playgrounds
38+
timeline.xctimeline
39+
playground.xcworkspace
40+
41+
# Swift Package Manager
42+
#
43+
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
44+
# Packages/
45+
# Package.pins
46+
# Package.resolved
47+
# *.xcodeproj
48+
#
49+
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
50+
# hence it is not needed unless you have added a package configuration file to your project
51+
.swiftpm
52+
53+
.build/
54+
55+
# CocoaPods
56+
#
57+
# We recommend against adding the Pods directory to your .gitignore. However
58+
# you should judge for yourself, the pros and cons are mentioned at:
59+
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
60+
#
61+
# Pods/
62+
#
63+
# Add this line if you want to avoid checking in source code from the Xcode workspace
64+
# *.xcworkspace
65+
66+
# Carthage
67+
#
68+
# Add this line if you want to avoid checking in source code from Carthage dependencies.
69+
# Carthage/Checkouts
70+
71+
Carthage/Build/
72+
73+
# Accio dependency management
74+
Dependencies/
75+
.accio/
76+
77+
# fastlane
78+
#
79+
# It is recommended to not store the screenshots in the git repo.
80+
# Instead, use fastlane to re-generate the screenshots whenever they are needed.
81+
# For more information about the recommended setup visit:
82+
# https://docs.fastlane.tools/best-practices/source-control/#source-control
83+
84+
fastlane/report.xml
85+
fastlane/Preview.html
86+
fastlane/screenshots/**/*.png
87+
fastlane/test_output
88+
89+
# Code Injection
90+
#
91+
# After new code Injection tools there's a generated folder /iOSInjectionProject
92+
# https://github.com/johnno1962/injectionforxcode
93+
94+
iOSInjectionProject/

‎ASCollectionView-SwiftUI.podspec‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Pod::Spec.new do |s|
33
s.name = 'ASCollectionView-SwiftUI'
4-
s.version = '1.7.1'
4+
s.version = '1.8.0'
55
s.summary = 'A SwiftUI collection view with support for custom layouts, preloading, and more. '
66

77
s.description = <<-DESC
@@ -11,7 +11,6 @@ Pod::Spec.new do |s|
1111
- supports autosizing of cells.
1212
- supports the new UICollectionViewCompositionalLayout, and any other UICollectionViewLayout
1313
- supports removing separators for ASTableView.
14-
- supports directly using FetchedResults as a data source
1514
DESC
1615

1716
s.homepage = 'https://github.com/apptekstudios/ASCollectionView'

‎Demo/ASCollectionViewDemo.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
5708D2572504FCC50014C671 /* OnChange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5708D2562504FCC50014C671 /* OnChange.swift */; };
1011
B8268B522363EF03008C99A3 /* RemindersScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8268B512363EF03008C99A3 /* RemindersScreen.swift */; };
1112
B8268B542363EF1B008C99A3 /* GroupLarge.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8268B532363EF1B008C99A3 /* GroupLarge.swift */; };
1213
B8268B562363EF25008C99A3 /* GroupSmall.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8268B552363EF25008C99A3 /* GroupSmall.swift */; };
@@ -43,6 +44,7 @@
4344
/* End PBXBuildFile section */
4445

4546
/* Begin PBXFileReference section */
47+
5708D2562504FCC50014C671 /* OnChange.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnChange.swift; sourceTree = "<group>"; };
4648
B8268B512363EF03008C99A3 /* RemindersScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemindersScreen.swift; sourceTree = "<group>"; };
4749
B8268B532363EF1B008C99A3 /* GroupLarge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupLarge.swift; sourceTree = "<group>"; };
4850
B8268B552363EF25008C99A3 /* GroupSmall.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupSmall.swift; sourceTree = "<group>"; };
@@ -158,10 +160,11 @@
158160
B86C6F30234B0B9D00522AEF /* Support */ = {
159161
isa = PBXGroup;
160162
children = (
161-
B86C6F31234B0B9D00522AEF /* ASRemoteImageView.swift */,
162163
B86C6F32234B0B9D00522AEF /* ASCache.swift */,
163164
B86C6F33234B0B9D00522AEF /* ASRemoteImageManager.swift */,
165+
B86C6F31234B0B9D00522AEF /* ASRemoteImageView.swift */,
164166
B86C6F34234B0B9D00522AEF /* LoremSwiftum.swift */,
167+
5708D2562504FCC50014C671 /* OnChange.swift */,
165168
);
166169
path = Support;
167170
sourceTree = "<group>";
@@ -267,10 +270,10 @@
267270
isa = PBXNativeTarget;
268271
buildConfigurationList = B86C6F27234B078800522AEF /* Build configuration list for PBXNativeTarget "ASCollectionViewDemo" */;
269272
buildPhases = (
273+
B8E6691323C2C8700034A9C1 /* SwiftFormat */,
270274
B86C6F0F234B078600522AEF /* Sources */,
271275
B86C6F10234B078600522AEF /* Frameworks */,
272276
B86C6F11234B078600522AEF /* Resources */,
273-
B8E6691323C2C8700034A9C1 /* SwiftFormat */,
274277
);
275278
buildRules = (
276279
);
@@ -292,7 +295,7 @@
292295
isa = PBXProject;
293296
attributes = {
294297
LastSwiftUpdateCheck = 1110;
295-
LastUpgradeCheck = 1110;
298+
LastUpgradeCheck = 1200;
296299
ORGANIZATIONNAME = "Apptek Studios";
297300
TargetAttributes = {
298301
B86C6F12234B078600522AEF = {
@@ -362,6 +365,7 @@
362365
files = (
363366
B8C00A972376350B0066348C /* AdjustableGridScreen.swift in Sources */,
364367
B8268B542363EF1B008C99A3 /* GroupLarge.swift in Sources */,
368+
5708D2572504FCC50014C671 /* OnChange.swift in Sources */,
365369
B86C6F44234B0B9D00522AEF /* ASCache.swift in Sources */,
366370
B86C6F4B234B0B9D00522AEF /* AppViews.swift in Sources */,
367371
B89129FE235DB71900D8BA90 /* TagsScreen.swift in Sources */,
@@ -431,6 +435,7 @@
431435
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
432436
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
433437
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
438+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
434439
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
435440
CLANG_WARN_STRICT_PROTOTYPES = YES;
436441
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -491,6 +496,7 @@
491496
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
492497
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
493498
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
499+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
494500
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
495501
CLANG_WARN_STRICT_PROTOTYPES = YES;
496502
CLANG_WARN_SUSPICIOUS_MOVE = YES;

‎Demo/ASCollectionViewDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Demo/ASCollectionViewDemo.xcodeproj/xcshareddata/xcschemes/ASCollectionViewDemo-ReleaseConfig.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1120"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Demo/ASCollectionViewDemo.xcodeproj/xcshareddata/xcschemes/ASCollectionViewDemo.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1120"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Demo/ASCollectionViewDemo.xcodeproj/xcuserdata/tobybrennan.xcuserdatad/xcschemes/xcschememanagement.plist‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,27 @@
1414
<key>orderHint</key>
1515
<integer>0</integer>
1616
</dict>
17+
<key>DifferenceKit (Playground) 1.xcscheme</key>
18+
<dict>
19+
<key>isShown</key>
20+
<false/>
21+
<key>orderHint</key>
22+
<integer>5</integer>
23+
</dict>
24+
<key>DifferenceKit (Playground) 2.xcscheme</key>
25+
<dict>
26+
<key>isShown</key>
27+
<false/>
28+
<key>orderHint</key>
29+
<integer>6</integer>
30+
</dict>
31+
<key>DifferenceKit (Playground).xcscheme</key>
32+
<dict>
33+
<key>isShown</key>
34+
<false/>
35+
<key>orderHint</key>
36+
<integer>4</integer>
37+
</dict>
1738
</dict>
1839
<key>SuppressBuildableAutocreation</key>
1940
<dict>

‎Demo/ASCollectionViewDemo/Screens/AdjustableLayout/AdjustableGridScreen.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ struct AdjustableGridScreen: View
8181
})
8282
{
8383
Text("Toggle config")
84-
})
84+
})
8585
}
8686

8787
func onCellEvent(_ event: CellEvent<Post>)

‎Demo/ASCollectionViewDemo/Screens/AppStore/AppStoreScreen.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ struct AppStoreScreen: View
3535
data: sectionData.apps,
3636
onCellEvent: {
3737
self.onCellEvent($0, sectionID: sectionID)
38-
})
38+
})
3939
{ item, _ in
4040
if sectionID == 0
4141
{

‎Demo/ASCollectionViewDemo/Screens/InstaFeed/InstaFeedScreen.swift‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,17 @@ struct InstaFeedScreen: View
1919
onCellEvent: onCellEventStories)
2020
{ item, _ in
2121
StoryView(post: item)
22-
})
22+
})
2323
.layout(scrollDirection: .horizontal)
24-
{
25-
.list(itemSize: .absolute(100), sectionInsets: NSDirectionalEdgeInsets(top: 0, leading: 10, bottom: 0, trailing: 10))
26-
}
27-
.onReachedBoundary { boundary in
28-
print("Reached the \(boundary) boundary")
29-
}
30-
.scrollIndicatorsEnabled(horizontal: false, vertical: false)
31-
.frame(height: 100)
24+
{
25+
.list(itemSize: .absolute(100), sectionInsets: NSDirectionalEdgeInsets(top: 0, leading: 10, bottom: 0, trailing: 10))
26+
}
27+
.onReachedBoundary
28+
{ boundary in
29+
print("Reached the \(boundary) boundary")
30+
}
31+
.scrollIndicatorsEnabled(horizontal: false, vertical: false)
32+
.frame(height: 100)
3233
}
3334

3435
var storiesSection: ASTableViewSection<Int>
@@ -68,7 +69,8 @@ struct InstaFeedScreen: View
6869

6970
var body: some View
7071
{
71-
ASTableView {
72+
ASTableView
73+
{
7274
storiesSection // An ASSection
7375
postSections // An array of ASSection's
7476
}
@@ -77,9 +79,11 @@ struct InstaFeedScreen: View
7779
self.loadMoreContent() // REACHED BOTTOM, LOADING MORE CONTENT
7880
}
7981
.separatorsEnabled(false)
80-
.onPullToRefresh { endRefreshing in
82+
.onPullToRefresh
83+
{ endRefreshing in
8184
print("PULL TO REFRESH")
82-
Timer.scheduledTimer(withTimeInterval: 2, repeats: false) { _ in
85+
Timer.scheduledTimer(withTimeInterval: 2, repeats: false)
86+
{ _ in
8387
endRefreshing()
8488
}
8589
}

0 commit comments

Comments
 (0)