Skip to content

Commit 17d9283

Browse files
lucdionlucdion
committed
Split the Example project in 2 projects:
* FlexLayoutSample: Use cocoapods as dependency manager * FlexLayoutSample-SPM: Use SPM (Swift Packager Manager) as dependency manager
1 parent 49bc9c0 commit 17d9283

File tree

15 files changed

+856
-268
lines changed

15 files changed

+856
-268
lines changed

‎Example/FlexLayoutSample/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 52 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,67 +2,92 @@
22
"images" : [
33
{
44
"idiom" : "iphone",
5-
"size" : "29x29",
6-
"scale" : "2x"
5+
"scale" : "2x",
6+
"size" : "20x20"
77
},
88
{
99
"idiom" : "iphone",
10-
"size" : "29x29",
11-
"scale" : "3x"
10+
"scale" : "3x",
11+
"size" : "20x20"
1212
},
1313
{
1414
"idiom" : "iphone",
15-
"size" : "40x40",
16-
"scale" : "2x"
15+
"scale" : "2x",
16+
"size" : "29x29"
1717
},
1818
{
1919
"idiom" : "iphone",
20-
"size" : "40x40",
21-
"scale" : "3x"
20+
"scale" : "3x",
21+
"size" : "29x29"
2222
},
2323
{
2424
"idiom" : "iphone",
25-
"size" : "60x60",
26-
"scale" : "2x"
25+
"scale" : "2x",
26+
"size" : "40x40"
2727
},
2828
{
2929
"idiom" : "iphone",
30-
"size" : "60x60",
31-
"scale" : "3x"
30+
"scale" : "3x",
31+
"size" : "40x40"
32+
},
33+
{
34+
"idiom" : "iphone",
35+
"scale" : "2x",
36+
"size" : "60x60"
37+
},
38+
{
39+
"idiom" : "iphone",
40+
"scale" : "3x",
41+
"size" : "60x60"
42+
},
43+
{
44+
"idiom" : "ipad",
45+
"scale" : "2x",
46+
"size" : "20x20"
3247
},
3348
{
3449
"idiom" : "ipad",
35-
"size" : "29x29",
36-
"scale" : "1x"
50+
"scale" : "1x",
51+
"size" : "29x29"
3752
},
3853
{
3954
"idiom" : "ipad",
40-
"size" : "29x29",
41-
"scale" : "2x"
55+
"scale" : "2x",
56+
"size" : "29x29"
4257
},
4358
{
4459
"idiom" : "ipad",
45-
"size" : "40x40",
46-
"scale" : "1x"
60+
"scale" : "1x",
61+
"size" : "40x40"
4762
},
4863
{
4964
"idiom" : "ipad",
50-
"size" : "40x40",
51-
"scale" : "2x"
65+
"scale" : "2x",
66+
"size" : "40x40"
5267
},
5368
{
5469
"idiom" : "ipad",
55-
"size" : "76x76",
56-
"scale" : "1x"
70+
"scale" : "1x",
71+
"size" : "76x76"
5772
},
5873
{
5974
"idiom" : "ipad",
60-
"size" : "76x76",
61-
"scale" : "2x"
75+
"scale" : "2x",
76+
"size" : "76x76"
77+
},
78+
{
79+
"idiom" : "ipad",
80+
"scale" : "2x",
81+
"size" : "83.5x83.5"
82+
},
83+
{
84+
"idiom" : "ios-marketing",
85+
"scale" : "1x",
86+
"size" : "1024x1024"
6287
}
6388
],
6489
"info" : {
65-
"version" : 1,
66-
"author" : "xcode"
90+
"author" : "xcode",
91+
"version" : 1
6792
}
68-
}
93+
}

‎Example/FlexLayoutSample/UI/Examples/RaywenderlichTutorial/RaywenderlichTutorialViewController.swift‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ class RayWenderlichTutorialViewController: BaseViewController {
2222
init(pageType: PageType) {
2323
super.init()
2424
title = pageType.text
25-
26-
// This property is used only on iOS 7/8/9/10. See https://developer.apple.com/documentation/uikit/uiviewcontroller/1621372-automaticallyadjustsscrollviewin
27-
if #available(iOS 11.0, *) {
28-
} else {
29-
automaticallyAdjustsScrollViewInsets = false
30-
}
3125
}
3226

3327
required init?(coder aDecoder: NSCoder) {

‎Example/SPM/FlexLayoutSample-SPM.xcodeproj/project.pbxproj‎

Lines changed: 699 additions & 0 deletions
Large diffs are not rendered by default.

‎Example/SPM/FlexLayoutSample-SPM.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/SPM/FlexLayoutSample-SPM.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Example/cocoapods/.swiftlint.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
opt_in_rules: # some rules are only opt-in
2+
- closure_end_indentation
3+
- closure_spacing
4+
- explicit_init
5+
- number_separator
6+
- operator_usage_whitespace
7+
- overridden_super_call
8+
- private_outlet
9+
- prohibited_super_call
10+
- redundant_nil_coalescing
11+
12+
disabled_rules: # rule identifiers to exclude from running
13+
- function_body_length
14+
- trailing_whitespace
15+
- force_cast
16+
- type_name
17+
- file_length
18+
- type_body_length
19+
- cyclomatic_complexity
20+
- identifier_name
21+
- line_length
22+
23+
excluded: # paths to ignore during linting. overridden by `included`.
24+
- Pods
25+
- Carthage
26+
- fastlane

Example/FlexLayoutSample.xcodeproj/project.pbxproj renamed to Example/cocoapods/FlexLayoutSample.xcodeproj/project.pbxproj

Lines changed: 8 additions & 232 deletions
Large diffs are not rendered by default.

Example/FlexLayoutSample.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to Example/cocoapods/FlexLayoutSample.xcodeproj/project.xcworkspace/contents.xcworkspacedata

File renamed without changes.

‎Example/cocoapods/FlexLayoutSample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

Example/FlexLayoutSample.xcodeproj/xcshareddata/xcschemes/FlexLayoutSample.xcscheme renamed to Example/cocoapods/FlexLayoutSample.xcodeproj/xcshareddata/xcschemes/FlexLayoutSample.xcscheme

File renamed without changes.

0 commit comments

Comments
 (0)