Skip to content

Commit 0df9732

Browse files
bsakhujanathanmsmith
authored andcommitted
Support DJ bios (#30)
* Added functionality to display DJ bios Implemented pod 'Presentr' to create a popup display of a new DJPopupViewController which displays the DJ name, DJ real name, and DJ biography. Had to modify DJ.swift to support the retrieval of DJ bios. * Forgot to update readme earlier! Also fixed an issue where the DJ bio would automatically scroll to the bottom if there was enough text. Text now starts at the top. * Stop tracking pods * Resubmitting branch /support-dj-bios on new branch brian/support-dj-bios * readme presentr was formatted incorrectly. * Fixed bug where the image isn't cropped when you background app and go back. Bear image cropping is still odd. * Fixed bugs associated with DJ images Bugs included not resizing images when backgrounding app and returning to app. And bear would not resize correctly. * Synced up
1 parent 607932a commit 0df9732

File tree

12 files changed

+434
-32
lines changed

12 files changed

+434
-32
lines changed

Podfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ target 'UCLA Radio' do
88
pod "KRLCollectionViewGridLayout", "~> 0.4.1"
99
pod 'DynamicColor', '~> 3.1.0'
1010
pod 'Google/Analytics'
11-
11+
pod 'Presentr'
12+
1213
# potentially useful for schedule
1314
# pod 'HTHorizontalSelectionList', '~> 0.7.0'
15+
1416
end

Podfile.lock

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ PODS:
2020
- GoogleToolboxForMac/NSData+zlib (2.1.3):
2121
- GoogleToolboxForMac/Defines (= 2.1.3)
2222
- KRLCollectionViewGridLayout (0.4.1)
23+
- Presentr (1.3)
2324
- SDWebImage (3.8.2):
2425
- SDWebImage/Core (= 3.8.2)
2526
- SDWebImage/Core (3.8.2)
@@ -30,6 +31,7 @@ DEPENDENCIES:
3031
- DynamicColor (~> 3.1.0)
3132
- Google/Analytics
3233
- KRLCollectionViewGridLayout (~> 0.4.1)
34+
- Presentr
3335
- SDWebImage (~> 3.8)
3436

3537
SPEC CHECKSUMS:
@@ -43,8 +45,9 @@ SPEC CHECKSUMS:
4345
GoogleAnalytics: f42cc53a87a51fe94334821868d9c8481ff47a7b
4446
GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20
4547
KRLCollectionViewGridLayout: 6363dc7e3d91cf1f97e19ed20846764566659596
48+
Presentr: 3f0825a42cb32ecd8fc6b6d0b0de87d7d0b42482
4649
SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
4750

48-
PODFILE CHECKSUM: ad5128740de8fa73fef49f8e0d5a04c42e52e86b
51+
PODFILE CHECKSUM: baee7e121859edcfc87d29f7799d9e3b2235317e
4952

5053
COCOAPODS: 1.3.1

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ Written in Swift, fetching from [an API](https://github.com/uclaradio/uclaradio)
1414
* [ASHorizontalScrollView](https://github.com/terenceLuffy/AppStoreStyleHorizontalScrollView)
1515
* [KRLCollectionViewGridLayout](https://github.com/klundberg/KRLCollectionViewGridLayout)
1616
* [DynamicColor](https://github.com/yannickl/DynamicColor)
17+
* [Presentr](https://github.com/IcaliaLabs/Presentr)
1718
* TO DO: I created an iOS clone of the Javascript package [Trianglify](http://qrohlf.com/trianglify/) for this app and plan to release it on CocoaPods!
1819

1920
### Copyright
2021

21-
Copyright © UCLA Student Media 2016
22+
Copyright © UCLA Student Media 2017

UCLA Radio.xcodeproj/project.pbxproj

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

99
/* Begin PBXBuildFile section */
10+
061295941FB2812700C848CE /* DJPopupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 061295931FB2812700C848CE /* DJPopupViewController.swift */; };
1011
80C4FF0BDD1724D747148CEA /* Pods_UCLA_Radio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65514855D8EABCF7CD92BD49 /* Pods_UCLA_Radio.framework */; };
1112
832C65E01CD0800200B3479E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 832C65DF1CD0800200B3479E /* AppDelegate.swift */; };
1213
832C65E21CD0800200B3479E /* NowPlayingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 832C65E11CD0800200B3479E /* NowPlayingViewController.swift */; };
@@ -76,6 +77,7 @@
7677
/* End PBXContainerItemProxy section */
7778

7879
/* Begin PBXFileReference section */
80+
061295931FB2812700C848CE /* DJPopupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DJPopupViewController.swift; sourceTree = "<group>"; };
7981
3FFD9ADD0DCADD1878E89FDE /* Pods-UCLA Radio.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UCLA Radio.release.xcconfig"; path = "Pods/Target Support Files/Pods-UCLA Radio/Pods-UCLA Radio.release.xcconfig"; sourceTree = "<group>"; };
8082
65514855D8EABCF7CD92BD49 /* Pods_UCLA_Radio.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_UCLA_Radio.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8183
6DA6C14DE284BA7CD5A4FD5A /* Pods-UCLA Radio.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UCLA Radio.debug.xcconfig"; path = "Pods/Target Support Files/Pods-UCLA Radio/Pods-UCLA Radio.debug.xcconfig"; sourceTree = "<group>"; };
@@ -263,6 +265,7 @@
263265
children = (
264266
836279251DA88501008C2B1D /* DJCollectionViewCell.swift */,
265267
836279261DA88501008C2B1D /* DJListViewController.swift */,
268+
061295931FB2812700C848CE /* DJPopupViewController.swift */,
266269
);
267270
path = DJs;
268271
sourceTree = "<group>";
@@ -420,12 +423,12 @@
420423
isa = PBXProject;
421424
attributes = {
422425
LastSwiftUpdateCheck = 0730;
423-
LastUpgradeCheck = 0820;
426+
LastUpgradeCheck = 0900;
424427
ORGANIZATIONNAME = "UCLA Student Media";
425428
TargetAttributes = {
426429
832C65DB1CD0800200B3479E = {
427430
CreatedOnToolsVersion = 7.3;
428-
DevelopmentTeam = 928WARTLH8;
431+
DevelopmentTeam = 7J53V2CVLJ;
429432
LastSwiftMigration = 0800;
430433
ProvisioningStyle = Automatic;
431434
SystemCapabilities = {
@@ -436,11 +439,13 @@
436439
};
437440
832C65EF1CD0800200B3479E = {
438441
CreatedOnToolsVersion = 7.3;
442+
DevelopmentTeam = DUCAN2M87U;
439443
LastSwiftMigration = 0800;
440444
TestTargetID = 832C65DB1CD0800200B3479E;
441445
};
442446
832C65FA1CD0800200B3479E = {
443447
CreatedOnToolsVersion = 7.3;
448+
DevelopmentTeam = DUCAN2M87U;
444449
LastSwiftMigration = 0800;
445450
TestTargetID = 832C65DB1CD0800200B3479E;
446451
};
@@ -526,6 +531,7 @@
526531
"${BUILT_PRODUCTS_DIR}/DynamicColor/DynamicColor.framework",
527532
"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
528533
"${BUILT_PRODUCTS_DIR}/KRLCollectionViewGridLayout/KRLCollectionViewGridLayout.framework",
534+
"${BUILT_PRODUCTS_DIR}/Presentr/Presentr.framework",
529535
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
530536
);
531537
name = "[CP] Embed Pods Frameworks";
@@ -535,6 +541,7 @@
535541
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DynamicColor.framework",
536542
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework",
537543
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KRLCollectionViewGridLayout.framework",
544+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Presentr.framework",
538545
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
539546
);
540547
runOnlyForDeploymentPostprocessing = 0;
@@ -582,6 +589,7 @@
582589
83C28A6F1D02627A0096D629 /* Show.swift in Sources */,
583590
832C65E01CD0800200B3479E /* AppDelegate.swift in Sources */,
584591
83B8C0761D067EDF00B80802 /* ScheduleSectionHeaderView.swift in Sources */,
592+
061295941FB2812700C848CE /* DJPopupViewController.swift in Sources */,
585593
83C28A7C1D050F3B0096D629 /* ScheduleViewController.swift in Sources */,
586594
835CDF961D08016A00C3213B /* ShowViewController.swift in Sources */,
587595
832F7EC91DA19D87001462C6 /* BaseViewController.swift in Sources */,
@@ -668,20 +676,27 @@
668676
CLANG_CXX_LIBRARY = "libc++";
669677
CLANG_ENABLE_MODULES = YES;
670678
CLANG_ENABLE_OBJC_ARC = YES;
679+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
671680
CLANG_WARN_BOOL_CONVERSION = YES;
681+
CLANG_WARN_COMMA = YES;
672682
CLANG_WARN_CONSTANT_CONVERSION = YES;
673683
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
674684
CLANG_WARN_EMPTY_BODY = YES;
675685
CLANG_WARN_ENUM_CONVERSION = YES;
676686
CLANG_WARN_INFINITE_RECURSION = YES;
677687
CLANG_WARN_INT_CONVERSION = YES;
688+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
689+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
678690
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
691+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
692+
CLANG_WARN_STRICT_PROTOTYPES = YES;
679693
CLANG_WARN_SUSPICIOUS_MOVE = YES;
680694
CLANG_WARN_UNREACHABLE_CODE = YES;
681695
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
682696
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
683697
COPY_PHASE_STRIP = NO;
684698
DEBUG_INFORMATION_FORMAT = dwarf;
699+
DEVELOPMENT_TEAM = DUCAN2M87U;
685700
ENABLE_STRICT_OBJC_MSGSEND = YES;
686701
ENABLE_TESTABILITY = YES;
687702
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -715,20 +730,27 @@
715730
CLANG_CXX_LIBRARY = "libc++";
716731
CLANG_ENABLE_MODULES = YES;
717732
CLANG_ENABLE_OBJC_ARC = YES;
733+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
718734
CLANG_WARN_BOOL_CONVERSION = YES;
735+
CLANG_WARN_COMMA = YES;
719736
CLANG_WARN_CONSTANT_CONVERSION = YES;
720737
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
721738
CLANG_WARN_EMPTY_BODY = YES;
722739
CLANG_WARN_ENUM_CONVERSION = YES;
723740
CLANG_WARN_INFINITE_RECURSION = YES;
724741
CLANG_WARN_INT_CONVERSION = YES;
742+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
743+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
725744
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
745+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
746+
CLANG_WARN_STRICT_PROTOTYPES = YES;
726747
CLANG_WARN_SUSPICIOUS_MOVE = YES;
727748
CLANG_WARN_UNREACHABLE_CODE = YES;
728749
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
729750
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
730751
COPY_PHASE_STRIP = NO;
731752
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
753+
DEVELOPMENT_TEAM = DUCAN2M87U;
732754
ENABLE_NS_ASSERTIONS = NO;
733755
ENABLE_STRICT_OBJC_MSGSEND = YES;
734756
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -754,10 +776,10 @@
754776
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
755777
CODE_SIGN_IDENTITY = "iPhone Developer";
756778
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
757-
DEVELOPMENT_TEAM = 928WARTLH8;
779+
DEVELOPMENT_TEAM = 7J53V2CVLJ;
758780
INFOPLIST_FILE = "UCLA Radio/Info.plist";
759781
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
760-
PRODUCT_BUNDLE_IDENTIFIER = com.uclastudentmedia.UCLARadio;
782+
PRODUCT_BUNDLE_IDENTIFIER = com.blah.UCLARadio;
761783
PRODUCT_NAME = "$(TARGET_NAME)";
762784
PROVISIONING_PROFILE = "";
763785
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -774,10 +796,10 @@
774796
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
775797
CODE_SIGN_IDENTITY = "iPhone Developer";
776798
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
777-
DEVELOPMENT_TEAM = 928WARTLH8;
799+
DEVELOPMENT_TEAM = 7J53V2CVLJ;
778800
INFOPLIST_FILE = "UCLA Radio/Info.plist";
779801
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
780-
PRODUCT_BUNDLE_IDENTIFIER = com.uclastudentmedia.UCLARadio;
802+
PRODUCT_BUNDLE_IDENTIFIER = com.blah.UCLARadio;
781803
PRODUCT_NAME = "$(TARGET_NAME)";
782804
PROVISIONING_PROFILE = "";
783805
PROVISIONING_PROFILE_SPECIFIER = "";
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "bearpink.pdf"
6+
}
7+
],
8+
"info" : {
9+
"version" : 1,
10+
"author" : "xcode"
11+
},
12+
"properties" : {
13+
"preserves-vector-representation" : true
14+
}
15+
}
198 KB
Binary file not shown.

UCLA Radio/Base.lproj/Main.storyboard

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
112112
<subviews>
113113
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cim-tj-Ljo" customClass="DesignableLabel" customModule="UCLA_Radio" customModuleProvider="target">
114-
<rect key="frame" x="20" y="80" width="335" height="143.5"/>
114+
<rect key="frame" x="20" y="80" width="335" height="139"/>
115115
<string key="text">UCLA Radio is a completely student-run organization offering cultural content created by 100+ DJs. Please direct any feedback to the web department at radio.web@media.ucla.edu
116116

117117
Follow @uclaradio on social media!</string>
@@ -123,7 +123,7 @@ Follow @uclaradio on social media!</string>
123123
</userDefinedRuntimeAttributes>
124124
</label>
125125
<stackView opaque="NO" contentMode="scaleAspectFit" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="cc9-sz-B5m">
126-
<rect key="frame" x="45" y="243.5" width="285" height="60"/>
126+
<rect key="frame" x="45" y="239" width="285" height="60"/>
127127
<subviews>
128128
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9h7-JI-paf">
129129
<rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
@@ -400,10 +400,10 @@ Follow @uclaradio on social media!</string>
400400
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
401401
<subviews>
402402
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7bt-nd-bKf" userLabel="Content View">
403-
<rect key="frame" x="0.0" y="0.0" width="375" height="541.5"/>
403+
<rect key="frame" x="0.0" y="0.0" width="375" height="538.5"/>
404404
<subviews>
405405
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Def-ft-YzS" userLabel="Column View">
406-
<rect key="frame" x="13" y="0.0" width="350" height="541.5"/>
406+
<rect key="frame" x="13" y="0.0" width="350" height="538.5"/>
407407
<subviews>
408408
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wCz-He-7M3" userLabel="Time View">
409409
<rect key="frame" x="8" y="15" width="127" height="34"/>
@@ -416,7 +416,7 @@ Follow @uclaradio on social media!</string>
416416
</constraints>
417417
</imageView>
418418
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Day Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wug-EO-bPi">
419-
<rect key="frame" x="37" y="7" width="85" height="20"/>
419+
<rect key="frame" x="37" y="7.5" width="85" height="19"/>
420420
<constraints>
421421
<constraint firstAttribute="width" constant="85" id="8vW-y1-fqr"/>
422422
</constraints>
@@ -436,7 +436,7 @@ Follow @uclaradio on social media!</string>
436436
</constraints>
437437
</view>
438438
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Genre" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cue-Gc-Mmx">
439-
<rect key="frame" x="289.5" y="22.5" width="45.5" height="19"/>
439+
<rect key="frame" x="291.5" y="22.5" width="43.5" height="19"/>
440440
<fontDescription key="fontDescription" name="Apercu-Regular" family="Apercu" pointSize="16"/>
441441
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
442442
<nil key="highlightedColor"/>
@@ -448,19 +448,19 @@ Follow @uclaradio on social media!</string>
448448
</constraints>
449449
</imageView>
450450
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v9q-ek-3Nv">
451-
<rect key="frame" x="0.0" y="422" width="350" height="25.5"/>
451+
<rect key="frame" x="0.0" y="422" width="350" height="24.5"/>
452452
<fontDescription key="fontDescription" name="Apercu-Regular" family="Apercu" pointSize="21"/>
453453
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
454454
<nil key="highlightedColor"/>
455455
</label>
456456
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Djs" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vKc-nU-KpX">
457-
<rect key="frame" x="0.0" y="455.5" width="350" height="22"/>
457+
<rect key="frame" x="0.0" y="454.5" width="350" height="21"/>
458458
<fontDescription key="fontDescription" name="Apercu-Regular" family="Apercu" pointSize="18"/>
459459
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
460460
<nil key="highlightedColor"/>
461461
</label>
462462
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Blurb blurb blurb blurb blurb blurb blurb blurb blurb blurb" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cnT-mJ-wpD">
463-
<rect key="frame" x="15" y="485.5" width="320" height="41"/>
463+
<rect key="frame" x="15" y="483.5" width="320" height="40"/>
464464
<fontDescription key="fontDescription" name="Apercu-Regular" family="Apercu" pointSize="17"/>
465465
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
466466
<nil key="highlightedColor"/>

0 commit comments

Comments
 (0)