Skip to content

Commit a5d895a

Browse files
ChrisLaganiereChrisLaganiere
authored
Merge pull request #12 from uclaradio/WednesdayRefactoring
Wednesday Refactoring: About page font corrections + reversed notifications fix
2 parents 4b9820d + 2f3130e commit a5d895a

File tree

6 files changed

+80
-63
lines changed

6 files changed

+80
-63
lines changed

‎UCLA Radio/Pods/Pods.xcodeproj/xcuserdata/Chris.xcuserdatad/xcschemes/xcschememanagement.plist‎

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

‎UCLA Radio/UCLA Radio.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
83B381021CE1ABD000BA22FE /* AudioStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83B381001CE1ABD000BA22FE /* AudioStream.swift */; };
3737
83B381031CE1ABD000BA22FE /* HistoryFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83B381011CE1ABD000BA22FE /* HistoryFetcher.swift */; };
3838
83B8C0761D067EDF00B80802 /* ScheduleSectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83B8C0751D067EDF00B80802 /* ScheduleSectionHeaderView.swift */; };
39+
83C221131E556F1E00DB28AB /* DesignableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83C221121E556F1E00DB28AB /* DesignableLabel.swift */; };
3940
83C28A641D025DED0096D629 /* MenuTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83C28A621D025DED0096D629 /* MenuTableViewCell.swift */; };
4041
83C28A651D025DED0096D629 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83C28A631D025DED0096D629 /* MenuViewController.swift */; };
4142
83C28A6B1D025E500096D629 /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83C28A6A1D025E500096D629 /* AboutViewController.swift */; };
@@ -115,6 +116,7 @@
115116
83B381001CE1ABD000BA22FE /* AudioStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioStream.swift; sourceTree = "<group>"; };
116117
83B381011CE1ABD000BA22FE /* HistoryFetcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HistoryFetcher.swift; sourceTree = "<group>"; };
117118
83B8C0751D067EDF00B80802 /* ScheduleSectionHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduleSectionHeaderView.swift; sourceTree = "<group>"; };
119+
83C221121E556F1E00DB28AB /* DesignableLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DesignableLabel.swift; sourceTree = "<group>"; };
118120
83C28A621D025DED0096D629 /* MenuTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuTableViewCell.swift; sourceTree = "<group>"; };
119121
83C28A631D025DED0096D629 /* MenuViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = "<group>"; };
120122
83C28A6A1D025E500096D629 /* AboutViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
@@ -344,6 +346,7 @@
344346
D808590F1E552819007BD3FF /* apercu_light-webfont.ttf */,
345347
D80859101E552819007BD3FF /* apercu_medium-webfont.ttf */,
346348
D80859111E552819007BD3FF /* apercu_regular-webfont.ttf */,
349+
83C221121E556F1E00DB28AB /* DesignableLabel.swift */,
347350
);
348351
path = fonts;
349352
sourceTree = "<group>";
@@ -584,6 +587,7 @@
584587
835CDF981D0818AD00C3213B /* Global.swift in Sources */,
585588
83C4CC1D1CE25BB900FBA1EC /* Constants.swift in Sources */,
586589
837C71541D9F4CD800E5C472 /* Colorbrewer.swift in Sources */,
590+
83C221131E556F1E00DB28AB /* DesignableLabel.swift in Sources */,
587591
83E4247A1CEECCF700662EDD /* NowPlayingView.swift in Sources */,
588592
83C28A6B1D025E500096D629 /* AboutViewController.swift in Sources */,
589593
83C28A7E1D050FD40096D629 /* ScheduleShowCell.swift in Sources */,

‎UCLA Radio/UCLA Radio/Base.lproj/Main.storyboard‎

Lines changed: 18 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -110,60 +110,20 @@
110110
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f0U-ga-xMf" userLabel="ContentView">
111111
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
112112
<subviews>
113-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cim-tj-Ljo">
114-
<rect key="frame" x="20" y="80" width="335" height="144.5"/>
115-
<attributedString key="attributedText">
116-
<fragment content="UCLA Radio">
117-
<attributes>
118-
<color key="NSColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
119-
<font key="NSFont" size="17" name="Apercu-Bold"/>
120-
<font key="NSOriginalFont" size="17" name="Apercu-Bold"/>
121-
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
122-
</attributes>
123-
</fragment>
124-
<fragment>
125-
<string key="content"> is a completely student-run organization offering cultural content created by 100+ DJs. Please direct any feedback to the web department at </string>
126-
<attributes>
127-
<color key="NSColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
128-
<font key="NSFont" size="17" name="Apercu-Regular"/>
129-
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
130-
</attributes>
131-
</fragment>
132-
<fragment content="radio.web@media.ucla.edu">
133-
<attributes>
134-
<color key="NSColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
135-
<font key="NSFont" size="17" name="Apercu-Regular"/>
136-
<font key="NSOriginalFont" size="17" name="HelveticaNeue-Italic"/>
137-
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
138-
</attributes>
139-
</fragment>
140-
<fragment content="

Follow ">
141-
<attributes>
142-
<color key="NSColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
143-
<font key="NSFont" size="17" name="Apercu-Regular"/>
144-
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
145-
</attributes>
146-
</fragment>
147-
<fragment content="@uclaradio">
148-
<attributes>
149-
<color key="NSColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
150-
<font key="NSFont" size="17" name="Apercu-Bold"/>
151-
<font key="NSOriginalFont" size="17" name="Apercu-Bold"/>
152-
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
153-
</attributes>
154-
</fragment>
155-
<fragment content=" on social media!">
156-
<attributes>
157-
<color key="NSColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
158-
<font key="NSFont" size="17" name="Apercu-Regular"/>
159-
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
160-
</attributes>
161-
</fragment>
162-
</attributedString>
113+
<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="139"/>
115+
<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
116+
117+
Follow @uclaradio on social media!</string>
118+
<fontDescription key="fontDescription" name="Apercu-Regular" family="Apercu" pointSize="17"/>
119+
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
163120
<nil key="highlightedColor"/>
121+
<userDefinedRuntimeAttributes>
122+
<userDefinedRuntimeAttribute type="string" keyPath="boldSubstrings" value="@uclaradio,UCLA Radio"/>
123+
</userDefinedRuntimeAttributes>
164124
</label>
165125
<stackView opaque="NO" contentMode="scaleAspectFit" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="cc9-sz-B5m">
166-
<rect key="frame" x="45" y="244.5" width="285" height="60"/>
126+
<rect key="frame" x="45" y="239" width="285" height="60"/>
167127
<subviews>
168128
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9h7-JI-paf">
169129
<rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
@@ -439,10 +399,10 @@
439399
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
440400
<subviews>
441401
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7bt-nd-bKf" userLabel="Content View">
442-
<rect key="frame" x="0.0" y="0.0" width="375" height="541.5"/>
402+
<rect key="frame" x="0.0" y="0.0" width="375" height="542"/>
443403
<subviews>
444404
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Def-ft-YzS" userLabel="Column View">
445-
<rect key="frame" x="12.5" y="0.0" width="350" height="541.5"/>
405+
<rect key="frame" x="13" y="0.0" width="350" height="542"/>
446406
<subviews>
447407
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wCz-He-7M3" userLabel="Time View">
448408
<rect key="frame" x="8" y="15" width="127" height="34"/>
@@ -455,7 +415,7 @@
455415
</constraints>
456416
</imageView>
457417
<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">
458-
<rect key="frame" x="37" y="7.5" width="85" height="20"/>
418+
<rect key="frame" x="37" y="8" width="85" height="20"/>
459419
<constraints>
460420
<constraint firstAttribute="width" constant="85" id="8vW-y1-fqr"/>
461421
</constraints>
@@ -475,7 +435,7 @@
475435
</constraints>
476436
</view>
477437
<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">
478-
<rect key="frame" x="289.5" y="22.5" width="45.5" height="20"/>
438+
<rect key="frame" x="289" y="23" width="46" height="20"/>
479439
<fontDescription key="fontDescription" name="Apercu-Regular" family="Apercu" pointSize="16"/>
480440
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
481441
<nil key="highlightedColor"/>
@@ -487,19 +447,19 @@
487447
</constraints>
488448
</imageView>
489449
<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">
490-
<rect key="frame" x="0.0" y="422" width="350" height="25.5"/>
450+
<rect key="frame" x="0.0" y="422" width="350" height="26"/>
491451
<fontDescription key="fontDescription" name="Apercu-Regular" family="Apercu" pointSize="21"/>
492452
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
493453
<nil key="highlightedColor"/>
494454
</label>
495455
<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">
496-
<rect key="frame" x="0.0" y="455.5" width="350" height="22"/>
456+
<rect key="frame" x="0.0" y="456" width="350" height="22"/>
497457
<fontDescription key="fontDescription" name="Apercu-Regular" family="Apercu" pointSize="18"/>
498458
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
499459
<nil key="highlightedColor"/>
500460
</label>
501461
<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">
502-
<rect key="frame" x="15" y="485.5" width="320" height="41"/>
462+
<rect key="frame" x="15" y="486" width="320" height="41"/>
503463
<fontDescription key="fontDescription" name="Apercu-Regular" family="Apercu" pointSize="17"/>
504464
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
505465
<nil key="highlightedColor"/>

0 commit comments

Comments
 (0)