Skip to content

Commit a0d79e9

Browse files
joshdomanjoshdoman
authored
Merge pull request #215 from pennlabs/development
Update 4.1
2 parents 7e7c6b0 + 226032b commit a0d79e9

81 files changed

Lines changed: 1136 additions & 235 deletions

File tree

Some content is hidden

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

‎PennMobile.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 18 deletions
Large diffs are not rendered by default.

‎PennMobile.xcodeproj/xcshareddata/xcschemes/Fastlane.xcscheme‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1010"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
buildConfiguration = "Debug"
11+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
12+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
shouldUseLaunchSchemeArgsEnv = "YES">
14+
<Testables>
15+
<TestableReference
16+
skipped = "NO">
17+
<BuildableReference
18+
BuildableIdentifier = "primary"
19+
BlueprintIdentifier = "B6B1E06F214440C600CCBBCD"
20+
BuildableName = "Fastlane.xctest"
21+
BlueprintName = "Fastlane"
22+
ReferencedContainer = "container:PennMobile.xcodeproj">
23+
</BuildableReference>
24+
</TestableReference>
25+
</Testables>
26+
<MacroExpansion>
27+
<BuildableReference
28+
BuildableIdentifier = "primary"
29+
BlueprintIdentifier = "2166405F1EBADADA00746B8E"
30+
BuildableName = "PennMobile.app"
31+
BlueprintName = "PennMobile"
32+
ReferencedContainer = "container:PennMobile.xcodeproj">
33+
</BuildableReference>
34+
</MacroExpansion>
35+
<AdditionalOptions>
36+
</AdditionalOptions>
37+
</TestAction>
38+
<LaunchAction
39+
buildConfiguration = "Debug"
40+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
41+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42+
launchStyle = "0"
43+
useCustomWorkingDirectory = "NO"
44+
ignoresPersistentStateOnLaunch = "NO"
45+
debugDocumentVersioning = "YES"
46+
debugServiceExtension = "internal"
47+
allowLocationSimulation = "YES">
48+
<BuildableProductRunnable
49+
runnableDebuggingMode = "0">
50+
<BuildableReference
51+
BuildableIdentifier = "primary"
52+
BlueprintIdentifier = "2166405F1EBADADA00746B8E"
53+
BuildableName = "PennMobile.app"
54+
BlueprintName = "PennMobile"
55+
ReferencedContainer = "container:PennMobile.xcodeproj">
56+
</BuildableReference>
57+
</BuildableProductRunnable>
58+
<AdditionalOptions>
59+
</AdditionalOptions>
60+
</LaunchAction>
61+
<ProfileAction
62+
buildConfiguration = "Release"
63+
shouldUseLaunchSchemeArgsEnv = "YES"
64+
savedToolIdentifier = ""
65+
useCustomWorkingDirectory = "NO"
66+
debugDocumentVersioning = "YES">
67+
<MacroExpansion>
68+
<BuildableReference
69+
BuildableIdentifier = "primary"
70+
BlueprintIdentifier = "2166405F1EBADADA00746B8E"
71+
BuildableName = "PennMobile.app"
72+
BlueprintName = "PennMobile"
73+
ReferencedContainer = "container:PennMobile.xcodeproj">
74+
</BuildableReference>
75+
</MacroExpansion>
76+
</ProfileAction>
77+
<AnalyzeAction
78+
buildConfiguration = "Debug">
79+
</AnalyzeAction>
80+
<ArchiveAction
81+
buildConfiguration = "Release"
82+
revealArchiveInOrganizer = "YES">
83+
</ArchiveAction>
84+
</Scheme>

‎PennMobile.xcodeproj/xcshareddata/xcschemes/FastlaneUIAutomation.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 = "0940"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎PennMobile.xcodeproj/xcshareddata/xcschemes/PennMobile.xcscheme‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@
8181
isEnabled = "YES">
8282
</CommandLineArgument>
8383
</CommandLineArguments>
84+
<EnvironmentVariables>
85+
<EnvironmentVariable
86+
key = "OS_ACTIVITY_MODE"
87+
value = "disable"
88+
isEnabled = "YES">
89+
</EnvironmentVariable>
90+
</EnvironmentVariables>
8491
<AdditionalOptions>
8592
</AdditionalOptions>
8693
</LaunchAction>

‎PennMobile/About/Controllers/AboutViewController.swift‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ class AboutViewController : UIViewController, UICollectionViewDelegateFlowLayout
9292
let font = UIFont(name: "AvenirNext-Regular", size: 18)!
9393
let boldFont = UIFont(name: "AvenirNext-Bold", size: 18)!
9494

95-
let attributedString = NSMutableAttributedString(string: str, attributes: [NSFontAttributeName : font])
96-
attributedString.addAttribute(NSFontAttributeName, value: boldFont, range: NSMakeRange(10, 9))
97-
attributedString.addAttribute(NSFontAttributeName, value: boldFont, range: NSMakeRange(39, 18))
98-
attributedString.addAttribute(NSFontAttributeName, value: boldFont, range: NSMakeRange(58, 18))
99-
attributedString.addAttribute(NSFontAttributeName, value: boldFont, range: NSMakeRange(81, 20))
95+
let attributedString = NSMutableAttributedString(string: str, attributes: convertToOptionalNSAttributedStringKeyDictionary([convertFromNSAttributedStringKey(NSAttributedString.Key.font) : font]))
96+
attributedString.addAttribute(NSAttributedString.Key.font, value: boldFont, range: NSMakeRange(10, 9))
97+
attributedString.addAttribute(NSAttributedString.Key.font, value: boldFont, range: NSMakeRange(39, 18))
98+
attributedString.addAttribute(NSAttributedString.Key.font, value: boldFont, range: NSMakeRange(58, 18))
99+
attributedString.addAttribute(NSAttributedString.Key.font, value: boldFont, range: NSMakeRange(81, 20))
100100

101101
subtitle.attributedText = attributedString
102102
subtitle.textColor = UIColor.darkGray
@@ -170,7 +170,7 @@ class AboutViewController : UIViewController, UICollectionViewDelegateFlowLayout
170170
}
171171

172172
func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
173-
if (kind == UICollectionElementKindSectionHeader) {
173+
if (kind == UICollectionView.elementKindSectionHeader) {
174174
let section = indexPath.section
175175
let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "AboutPageSectionHeader", for: indexPath) as! AboutPageCollectionViewHeader
176176
header.label.text = (section == 0) ? "Meet the Team" : "Alumni"
@@ -214,7 +214,7 @@ class AboutViewController : UIViewController, UICollectionViewDelegateFlowLayout
214214
self.collectionView?.backgroundColor = .white
215215
self.collectionView?.isScrollEnabled = false
216216
self.collectionView?.register(AboutPageCollectionViewCell.self, forCellWithReuseIdentifier: "AboutPageCell")
217-
self.collectionView?.register(AboutPageCollectionViewHeader.self, forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, withReuseIdentifier: "AboutPageSectionHeader")
217+
self.collectionView?.register(AboutPageCollectionViewHeader.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "AboutPageSectionHeader")
218218

219219
collectionView?.translatesAutoresizingMaskIntoConstraints = false
220220
collectionView?.widthAnchor.constraint(equalToConstant: 300).isActive = true
@@ -265,3 +265,14 @@ class AboutViewController : UIViewController, UICollectionViewDelegateFlowLayout
265265

266266
}
267267
}
268+
269+
// Helper function inserted by Swift 4.2 migrator.
270+
fileprivate func convertToOptionalNSAttributedStringKeyDictionary(_ input: [String: Any]?) -> [NSAttributedString.Key: Any]? {
271+
guard let input = input else { return nil }
272+
return Dictionary(uniqueKeysWithValues: input.map { key, value in (NSAttributedString.Key(rawValue: key), value)})
273+
}
274+
275+
// Helper function inserted by Swift 4.2 migrator.
276+
fileprivate func convertFromNSAttributedStringKey(_ input: NSAttributedString.Key) -> String {
277+
return input.rawValue
278+
}

‎PennMobile/Assets.xcassets/GSR-Booking/Contents.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}

‎PennMobile/Assets.xcassets/GSR-Booking/lid-1-gid-1.imageset/Contents.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "Huntsman.jpg",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎PennMobile/Assets.xcassets/GSR-Booking/lid-1-gid-1.imageset/Huntsman.jpg‎

60.5 KB
Loading

‎PennMobile/Assets.xcassets/GSR-Booking/lid-1086-gid-1889.imageset/Contents.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "Weigle.jpg",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎PennMobile/Assets.xcassets/GSR-Booking/lid-1086-gid-1889.imageset/Weigle.jpg‎

56.8 KB
Loading

0 commit comments

Comments
 (0)