Skip to content

Commit 607932a

Browse files
haejinjonathanmsmith
haejinjo
authored and
nathanmsmith
committed
Added Call Buttons (#31)
* removed recently playing horizontal scroll view from nowplayingviewcontroller * the last one was practice. removed recently playing horizontal scroll view from NowPlayingViewController. Also replaced depracated instances of M_PI to Double.pi to get rid of warnings. * got the two call buttons to show up completely unconstrained, now focusing on functionality * call buttons function properly. next job: programmatic stack view * programmed stackview for call buttons. looks neat. still need to clean up code * Fix a cocoapod error
1 parent 6628ae2 commit 607932a

File tree

83 files changed

+15712
-135
lines changed

Some content is hidden

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

83 files changed

+15712
-135
lines changed

‎Podfile.lock‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
PODS:
2-
- Alamofire (4.0.1)
3-
- ASHorizontalScrollView (1.3)
2+
- Alamofire (4.5.1)
3+
- ASHorizontalScrollView (1.5.1)
44
- DynamicColor (3.1.0)
5-
- FirebaseAnalytics (3.4.2):
5+
- FirebaseAnalytics (3.9.0):
6+
- FirebaseCore (~> 3.6)
67
- FirebaseInstanceID (~> 1.0)
7-
- GoogleInterchangeUtilities (~> 1.2)
8-
- GoogleSymbolUtilities (~> 1.1)
9-
- GoogleUtilities (~> 1.2)
10-
- FirebaseInstanceID (1.0.8)
11-
- Google/Analytics (3.0.3):
8+
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
9+
- FirebaseCore (3.6.0):
10+
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
11+
- FirebaseInstanceID (1.0.10):
12+
- FirebaseCore (~> 3.6)
13+
- Google/Analytics (3.1.0):
1214
- Google/Core
1315
- GoogleAnalytics (~> 3.12)
14-
- Google/Core (3.0.3):
16+
- Google/Core (3.1.0):
1517
- FirebaseAnalytics (~> 3.2)
1618
- GoogleAnalytics (3.17.0)
17-
- GoogleInterchangeUtilities (1.2.1):
18-
- GoogleSymbolUtilities (~> 1.0)
19-
- GoogleSymbolUtilities (1.1.1)
20-
- GoogleUtilities (1.3.1):
21-
- GoogleSymbolUtilities (~> 1.0)
19+
- GoogleToolboxForMac/Defines (2.1.3)
20+
- GoogleToolboxForMac/NSData+zlib (2.1.3):
21+
- GoogleToolboxForMac/Defines (= 2.1.3)
2222
- KRLCollectionViewGridLayout (0.4.1)
23-
- SDWebImage (3.8.1):
24-
- SDWebImage/Core (= 3.8.1)
25-
- SDWebImage/Core (3.8.1)
23+
- SDWebImage (3.8.2):
24+
- SDWebImage/Core (= 3.8.2)
25+
- SDWebImage/Core (3.8.2)
2626

2727
DEPENDENCIES:
2828
- Alamofire (~> 4.0)
@@ -33,19 +33,18 @@ DEPENDENCIES:
3333
- SDWebImage (~> 3.8)
3434

3535
SPEC CHECKSUMS:
36-
Alamofire: 7682d43245de14874acd142ec137b144aa1dd335
37-
ASHorizontalScrollView: b2648d6b3f13de7e5328fcac2a20c2a68ce829ab
36+
Alamofire: 2d95912bf4c34f164fdfc335872e8c312acaea4a
37+
ASHorizontalScrollView: 9c98b9226509540075b6398c92f68fb474bea7e9
3838
DynamicColor: 4dec283a881f7f9d9f3bc88fb5f306724242575f
39-
FirebaseAnalytics: 3f5358d9104adf159cc8d99b7b501e50099a39ad
40-
FirebaseInstanceID: ba1e640935235e5fac39dfa816fe7660e72e1a8a
41-
Google: 813c467362eabc11385f5a5cc9ad0cb651a58f4e
39+
FirebaseAnalytics: e5fe8486efc01bec33f6bf82e2fa9fce4b124052
40+
FirebaseCore: 9691ee2ade70c098d7cf92440f4303f16d83ca75
41+
FirebaseInstanceID: b9eedd6846fb5e1f0f7279e1deaa7a7e4cf8392e
42+
Google: 98da4b1a60ed0beb80a290387a28333406a1eb90
4243
GoogleAnalytics: f42cc53a87a51fe94334821868d9c8481ff47a7b
43-
GoogleInterchangeUtilities: def8415a862effc67d549d5b5b0b9c7a2f97d4de
44-
GoogleSymbolUtilities: 33117db1b5f290c6fbf259585e4885b4c84b98d7
45-
GoogleUtilities: 56c5ac05b7aa5dc417a1bb85221a9516e04d7032
44+
GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20
4645
KRLCollectionViewGridLayout: 6363dc7e3d91cf1f97e19ed20846764566659596
47-
SDWebImage: 35f9627a3e44b4f292a8a8ce6a531fa488239b91
46+
SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
4847

4948
PODFILE CHECKSUM: ad5128740de8fa73fef49f8e0d5a04c42e52e86b
5049

51-
COCOAPODS: 1.0.0.rc.2
50+
COCOAPODS: 1.3.1

‎UCLA Radio.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232
8365ECF71CE9945C001B96BF /* ContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8365ECF61CE9945C001B96BF /* ContainerViewController.swift */; };
3333
837C71541D9F4CD800E5C472 /* Colorbrewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 837C71501D9F4CD800E5C472 /* Colorbrewer.swift */; };
3434
837C71561D9F4CD800E5C472 /* TrianglifyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 837C71521D9F4CD800E5C472 /* TrianglifyView.swift */; };
35-
83A8ED6E1CE30248003D4286 /* RecentTrackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83A8ED6D1CE30248003D4286 /* RecentTrackView.swift */; };
3635
83B381021CE1ABD000BA22FE /* AudioStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83B381001CE1ABD000BA22FE /* AudioStream.swift */; };
37-
83B381031CE1ABD000BA22FE /* HistoryFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83B381011CE1ABD000BA22FE /* HistoryFetcher.swift */; };
3836
83B8C0761D067EDF00B80802 /* ScheduleSectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83B8C0751D067EDF00B80802 /* ScheduleSectionHeaderView.swift */; };
3937
83C221131E556F1E00DB28AB /* DesignableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83C221121E556F1E00DB28AB /* DesignableLabel.swift */; };
4038
83C28A641D025DED0096D629 /* MenuTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83C28A621D025DED0096D629 /* MenuTableViewCell.swift */; };
@@ -112,9 +110,7 @@
112110
8365ECF61CE9945C001B96BF /* ContainerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContainerViewController.swift; sourceTree = "<group>"; };
113111
837C71501D9F4CD800E5C472 /* Colorbrewer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Colorbrewer.swift; sourceTree = "<group>"; };
114112
837C71521D9F4CD800E5C472 /* TrianglifyView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TrianglifyView.swift; sourceTree = "<group>"; };
115-
83A8ED6D1CE30248003D4286 /* RecentTrackView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RecentTrackView.swift; path = ../RecentTrackView.swift; sourceTree = "<group>"; };
116113
83B381001CE1ABD000BA22FE /* AudioStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioStream.swift; sourceTree = "<group>"; };
117-
83B381011CE1ABD000BA22FE /* HistoryFetcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HistoryFetcher.swift; sourceTree = "<group>"; };
118114
83B8C0751D067EDF00B80802 /* ScheduleSectionHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduleSectionHeaderView.swift; sourceTree = "<group>"; };
119115
83C221121E556F1E00DB28AB /* DesignableLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DesignableLabel.swift; sourceTree = "<group>"; };
120116
83C28A621D025DED0096D629 /* MenuTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuTableViewCell.swift; sourceTree = "<group>"; };
@@ -287,7 +283,6 @@
287283
83C28A701D0263350096D629 /* DJ.swift */,
288284
8356DDFC1DA03A3A00B2B63B /* Giveaway.swift */,
289285
83B381001CE1ABD000BA22FE /* AudioStream.swift */,
290-
83B381011CE1ABD000BA22FE /* HistoryFetcher.swift */,
291286
83C28A6C1D025FB10096D629 /* RadioAPI.swift */,
292287
83C28A761D02CB980096D629 /* Schedule.swift */,
293288
);
@@ -324,7 +319,6 @@
324319
isa = PBXGroup;
325320
children = (
326321
8365ECF41CE99265001B96BF /* SlidingViewController.swift */,
327-
83A8ED6D1CE30248003D4286 /* RecentTrackView.swift */,
328322
83E424791CEECCF700662EDD /* NowPlayingView.swift */,
329323
832F7EC81DA19D87001462C6 /* BaseViewController.swift */,
330324
);
@@ -367,12 +361,12 @@
367361
isa = PBXNativeTarget;
368362
buildConfigurationList = 832C66041CD0800200B3479E /* Build configuration list for PBXNativeTarget "UCLA Radio" */;
369363
buildPhases = (
370-
EF00B5B0562A19365C2F71C7 /* 📦 Check Pods Manifest.lock */,
364+
EF00B5B0562A19365C2F71C7 /* [CP] Check Pods Manifest.lock */,
371365
832C65D81CD0800200B3479E /* Sources */,
372366
832C65D91CD0800200B3479E /* Frameworks */,
373367
832C65DA1CD0800200B3479E /* Resources */,
374-
99EB4CE62D2F234E48363279 /* 📦 Embed Pods Frameworks */,
375-
296E7CC0708044067E2A801A /* 📦 Copy Pods Resources */,
368+
99EB4CE62D2F234E48363279 /* [CP] Embed Pods Frameworks */,
369+
296E7CC0708044067E2A801A /* [CP] Copy Pods Resources */,
376370
);
377371
buildRules = (
378372
);
@@ -431,7 +425,7 @@
431425
TargetAttributes = {
432426
832C65DB1CD0800200B3479E = {
433427
CreatedOnToolsVersion = 7.3;
434-
DevelopmentTeam = V4Z45C29H6;
428+
DevelopmentTeam = 928WARTLH8;
435429
LastSwiftMigration = 0800;
436430
ProvisioningStyle = Automatic;
437431
SystemCapabilities = {
@@ -505,49 +499,65 @@
505499
/* End PBXResourcesBuildPhase section */
506500

507501
/* Begin PBXShellScriptBuildPhase section */
508-
296E7CC0708044067E2A801A /* 📦 Copy Pods Resources */ = {
502+
296E7CC0708044067E2A801A /* [CP] Copy Pods Resources */ = {
509503
isa = PBXShellScriptBuildPhase;
510504
buildActionMask = 2147483647;
511505
files = (
512506
);
513507
inputPaths = (
514508
);
515-
name = "📦 Copy Pods Resources";
509+
name = "[CP] Copy Pods Resources";
516510
outputPaths = (
517511
);
518512
runOnlyForDeploymentPostprocessing = 0;
519513
shellPath = /bin/sh;
520514
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-UCLA Radio/Pods-UCLA Radio-resources.sh\"\n";
521515
showEnvVarsInLog = 0;
522516
};
523-
99EB4CE62D2F234E48363279 /* 📦 Embed Pods Frameworks */ = {
517+
99EB4CE62D2F234E48363279 /* [CP] Embed Pods Frameworks */ = {
524518
isa = PBXShellScriptBuildPhase;
525519
buildActionMask = 2147483647;
526520
files = (
527521
);
528522
inputPaths = (
529-
);
530-
name = "📦 Embed Pods Frameworks";
523+
"${SRCROOT}/Pods/Target Support Files/Pods-UCLA Radio/Pods-UCLA Radio-frameworks.sh",
524+
"${BUILT_PRODUCTS_DIR}/ASHorizontalScrollView/ASHorizontalScrollView.framework",
525+
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
526+
"${BUILT_PRODUCTS_DIR}/DynamicColor/DynamicColor.framework",
527+
"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
528+
"${BUILT_PRODUCTS_DIR}/KRLCollectionViewGridLayout/KRLCollectionViewGridLayout.framework",
529+
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
530+
);
531+
name = "[CP] Embed Pods Frameworks";
531532
outputPaths = (
533+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ASHorizontalScrollView.framework",
534+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
535+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DynamicColor.framework",
536+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework",
537+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KRLCollectionViewGridLayout.framework",
538+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
532539
);
533540
runOnlyForDeploymentPostprocessing = 0;
534541
shellPath = /bin/sh;
535542
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-UCLA Radio/Pods-UCLA Radio-frameworks.sh\"\n";
536543
showEnvVarsInLog = 0;
537544
};
538-
EF00B5B0562A19365C2F71C7 /* 📦 Check Pods Manifest.lock */ = {
545+
EF00B5B0562A19365C2F71C7 /* [CP] Check Pods Manifest.lock */ = {
539546
isa = PBXShellScriptBuildPhase;
540547
buildActionMask = 2147483647;
541548
files = (
542549
);
543550
inputPaths = (
551+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
552+
"${PODS_ROOT}/Manifest.lock",
544553
);
545-
name = "📦 Check Pods Manifest.lock";
554+
name = "[CP] Check Pods Manifest.lock";
546555
outputPaths = (
556+
"$(DERIVED_FILE_DIR)/Pods-UCLA Radio-checkManifestLockResult.txt",
547557
);
548558
runOnlyForDeploymentPostprocessing = 0;
549559
shellPath = /bin/sh;
550-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
560+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
551561
showEnvVarsInLog = 0;
552562
};
553563
/* End PBXShellScriptBuildPhase section */
@@ -566,7 +576,6 @@
566576
8365ECF71CE9945C001B96BF /* ContainerViewController.swift in Sources */,
567577
D80C7AA51DF7D7B0003375F6 /* DateFormatter+ShowDate.swift in Sources */,
568578
D80C7AA71DF7D92B003375F6 /* NotificationManager.swift in Sources */,
569-
83A8ED6E1CE30248003D4286 /* RecentTrackView.swift in Sources */,
570579
832C65E21CD0800200B3479E /* NowPlayingViewController.swift in Sources */,
571580
836279271DA88501008C2B1D /* DJCollectionViewCell.swift in Sources */,
572581
D865CBB21E0F0C0E008C050E /* AnalyticsManager.swift in Sources */,
@@ -583,7 +592,6 @@
583592
8356DDFF1DA043E900B2B63B /* MenuSectionHeaderView.swift in Sources */,
584593
83B381021CE1ABD000BA22FE /* AudioStream.swift in Sources */,
585594
D86773E81E0A2C180014EC0F /* NotificationViewController.swift in Sources */,
586-
83B381031CE1ABD000BA22FE /* HistoryFetcher.swift in Sources */,
587595
835CDF981D0818AD00C3213B /* Global.swift in Sources */,
588596
83C4CC1D1CE25BB900FBA1EC /* Constants.swift in Sources */,
589597
837C71541D9F4CD800E5C472 /* Colorbrewer.swift in Sources */,
@@ -743,11 +751,10 @@
743751
isa = XCBuildConfiguration;
744752
baseConfigurationReference = 6DA6C14DE284BA7CD5A4FD5A /* Pods-UCLA Radio.debug.xcconfig */;
745753
buildSettings = {
746-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
747754
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
748755
CODE_SIGN_IDENTITY = "iPhone Developer";
749756
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
750-
DEVELOPMENT_TEAM = V4Z45C29H6;
757+
DEVELOPMENT_TEAM = 928WARTLH8;
751758
INFOPLIST_FILE = "UCLA Radio/Info.plist";
752759
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
753760
PRODUCT_BUNDLE_IDENTIFIER = com.uclastudentmedia.UCLARadio;
@@ -764,11 +771,10 @@
764771
isa = XCBuildConfiguration;
765772
baseConfigurationReference = 3FFD9ADD0DCADD1878E89FDE /* Pods-UCLA Radio.release.xcconfig */;
766773
buildSettings = {
767-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
768774
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
769775
CODE_SIGN_IDENTITY = "iPhone Developer";
770776
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
771-
DEVELOPMENT_TEAM = V4Z45C29H6;
777+
DEVELOPMENT_TEAM = 928WARTLH8;
772778
INFOPLIST_FILE = "UCLA Radio/Info.plist";
773779
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
774780
PRODUCT_BUNDLE_IDENTIFIER = com.uclastudentmedia.UCLARadio;

‎UCLA Radio/AppDelegate.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1717

1818
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
1919
// Override point for customization after application launch.
20-
HistoryFetcher.fetchRecentTracks()
2120
RadioAPI.fetchNowPlaying()
2221
RadioAPI.fetchGiveaways(nil)
2322

‎UCLA Radio/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@
4747
"idiom" : "iphone",
4848
"filename" : "squarepink_180.png",
4949
"scale" : "3x"
50+
},
51+
{
52+
"idiom" : "ios-marketing",
53+
"size" : "1024x1024",
54+
"scale" : "1x"
5055
}
5156
],
5257
"info" : {

0 commit comments

Comments
 (0)