Improve alarm time label aesthetics. Closes #25.

SwitchaBLE · Nov 20, 2013 · d55b668 · d55b668
1 parent e367aa0
commit d55b668
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 19 deletions.
diff --git a/SwitchaBLE/Base.lproj/Main_iPhone.storyboard b/SwitchaBLE/Base.lproj/Main_iPhone.storyboard
@@ -24,16 +24,26 @@
                                             <rect key="frame" x="233" y="29" width="51" height="31"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         </switch>
-                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="100" contentMode="redraw" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fKa-hf-jzs">
-                                            <rect key="frame" x="20" y="13" width="49" height="52"/>
+                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="100" contentMode="redraw" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fKa-hf-jzs">
+                                            <rect key="frame" x="20" y="8" width="51" height="54"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <rect key="contentStretch" x="0.0" y="0.0" width="1" height="0.0"/>
-                                            <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="44"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="54" id="13P-FG-1Bf"/>
+                                            </constraints>
+                                            <attributedString key="attributedText">
+                                                <fragment content="12">
+                                                    <attributes>
+                                                        <color key="NSColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                        <font key="NSFont" size="45" name="HelveticaNeue-Thin"/>
+                                                        <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
+                                                    </attributes>
+                                                </fragment>
+                                            </attributedString>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="100" contentMode="redraw" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="PM" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="37w-SQ-ark">
-                                            <rect key="frame" x="140" y="36" width="28" height="24"/>
+                                            <rect key="frame" x="144" y="33" width="28" height="24"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="24" id="p8i-Ll-Yqg"/>
@@ -43,44 +53,44 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Device Name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cUU-i7-swD">
-                                            <rect key="frame" x="20" y="60" width="96" height="21"/>
+                                            <rect key="frame" x="27" y="59" width="207" height="21"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="17"/>
                                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=":" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="146-Qf-yeZ">
-                                            <rect key="frame" x="70" y="20" width="13" height="36"/>
+                                            <rect key="frame" x="71" y="15" width="14" height="36"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="36" id="uXz-OL-8p8"/>
                                             </constraints>
-                                            <fontDescription key="fontDescription" name="AvenirNext-UltraLight" family="Avenir Next" pointSize="44"/>
+                                            <fontDescription key="fontDescription" name="AvenirNext-UltraLight" family="Avenir Next" pointSize="50"/>
                                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="00" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xl7-8X-c9q">
-                                            <rect key="frame" x="83" y="20" width="49" height="38"/>
+                                            <rect key="frame" x="85" y="8" width="51" height="54"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <constraints>
-                                                <constraint firstAttribute="height" constant="38" id="rOj-we-oaE"/>
+                                                <constraint firstAttribute="height" constant="54" id="rOj-we-oaE"/>
                                             </constraints>
-                                            <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="44"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="45"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
                                     <constraints>
+                                        <constraint firstItem="fKa-hf-jzs" firstAttribute="top" secondItem="Ilc-lH-n4C" secondAttribute="top" constant="8" id="BDB-wv-VMM"/>
                                         <constraint firstItem="Xl7-8X-c9q" firstAttribute="leading" secondItem="146-Qf-yeZ" secondAttribute="trailing" id="Cb2-bx-ie2"/>
-                                        <constraint firstItem="146-Qf-yeZ" firstAttribute="leading" secondItem="fKa-hf-jzs" secondAttribute="trailing" constant="1" id="Tr7-If-shI"/>
-                                        <constraint firstItem="37w-SQ-ark" firstAttribute="top" secondItem="Ilc-lH-n4C" secondAttribute="top" constant="36" id="Y3B-ub-9Ct"/>
-                                        <constraint firstItem="146-Qf-yeZ" firstAttribute="top" secondItem="Ilc-lH-n4C" secondAttribute="top" constant="20" id="ZFs-WF-unN"/>
+                                        <constraint firstItem="146-Qf-yeZ" firstAttribute="leading" secondItem="fKa-hf-jzs" secondAttribute="trailing" id="Tr7-If-shI"/>
+                                        <constraint firstItem="37w-SQ-ark" firstAttribute="top" secondItem="Ilc-lH-n4C" secondAttribute="top" constant="33" id="Y3B-ub-9Ct"/>
+                                        <constraint firstItem="146-Qf-yeZ" firstAttribute="top" secondItem="Ilc-lH-n4C" secondAttribute="top" constant="15" id="ZFs-WF-unN"/>
                                         <constraint firstItem="jLp-JN-mwK" firstAttribute="top" secondItem="Ilc-lH-n4C" secondAttribute="top" constant="29" id="a8O-gF-xJu"/>
                                         <constraint firstAttribute="trailing" secondItem="jLp-JN-mwK" secondAttribute="trailing" constant="5" id="k94-a8-KmF"/>
                                         <constraint firstItem="fKa-hf-jzs" firstAttribute="leading" secondItem="Ilc-lH-n4C" secondAttribute="leading" constant="20" id="kW5-dC-osT"/>
                                         <constraint firstAttribute="bottom" secondItem="jLp-JN-mwK" secondAttribute="bottom" constant="30" id="lDM-mw-aoX"/>
                                         <constraint firstItem="37w-SQ-ark" firstAttribute="leading" secondItem="Xl7-8X-c9q" secondAttribute="trailing" constant="8" id="qpr-DA-AKi"/>
-                                        <constraint firstItem="Xl7-8X-c9q" firstAttribute="top" secondItem="Ilc-lH-n4C" secondAttribute="top" constant="20" id="rUm-K8-oI8"/>
-                                        <constraint firstItem="fKa-hf-jzs" firstAttribute="top" secondItem="Ilc-lH-n4C" secondAttribute="top" constant="13" id="yUi-fl-Wt6"/>
+                                        <constraint firstItem="Xl7-8X-c9q" firstAttribute="top" secondItem="Ilc-lH-n4C" secondAttribute="top" constant="8" id="rUm-K8-oI8"/>
                                     </constraints>
                                 </tableViewCellContentView>
                                 <connections>
@@ -765,9 +775,13 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
                                     <rect key="frame" x="0.0" y="0.0" width="273" height="90"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="70x70placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="LUl-0Y-dhV">
+                                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="DeviceIconDefault" translatesAutoresizingMaskIntoConstraints="NO" id="LUl-0Y-dhV">
                                             <rect key="frame" x="15" y="10" width="70" height="70"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="70" id="aUn-kP-8f0"/>
+                                                <constraint firstAttribute="height" constant="70" id="wQG-9C-emU"/>
+                                            </constraints>
                                         </imageView>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Device Nickname" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lbY-6T-hpf">
                                             <rect key="frame" x="99" y="20" width="185" height="29"/>
@@ -784,6 +798,10 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
+                                    <constraints>
+                                        <constraint firstItem="LUl-0Y-dhV" firstAttribute="leading" secondItem="gft-pa-P5T" secondAttribute="leading" constant="15" id="eVM-kL-W8h"/>
+                                        <constraint firstItem="LUl-0Y-dhV" firstAttribute="top" secondItem="gft-pa-P5T" secondAttribute="top" constant="10" id="jS8-Qv-eWA"/>
+                                    </constraints>
                                 </tableViewCellContentView>
                                 <connections>
                                     <outlet property="imageView" destination="LUl-0Y-dhV" id="hXd-md-7S7"/>
@@ -825,7 +843,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
         </scene>
     </scenes>
     <resources>
-        <image name="70x70placeholder" width="70" height="70"/>
         <image name="AlarmIcon" width="30" height="30"/>
         <image name="DeviceIcon" width="30" height="30"/>
         <image name="DeviceIconDefault" width="101" height="208"/>

diff --git a/SwitchaBLE/KSSAlarmDetailViewController.m b/SwitchaBLE/KSSAlarmDetailViewController.m
@@ -32,6 +32,10 @@ - (void)viewDidLoad
     }
 }
 
+- (void)viewDidAppear:(BOOL)animated {
+    [self.tableView deselectRowAtIndexPath:self.tableView.indexPathForSelectedRow animated:YES];
+}
+
 - (void)didReceiveMemoryWarning
 {
     [super didReceiveMemoryWarning];

diff --git a/SwitchaBLE/KSSAlarmTableViewCell.m b/SwitchaBLE/KSSAlarmTableViewCell.m
@@ -17,6 +17,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         // Initialization code
     }
     return self;
+
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated

diff --git a/SwitchaBLE/KSSAlarmsViewController.m b/SwitchaBLE/KSSAlarmsViewController.m
@@ -119,7 +119,9 @@ - (void)toggleAlarmSet:(UISwitch *)sender {
 - (void)formatCell:(KSSAlarmTableViewCell *)cell withAlarm:(Alarm *)alarm {
 
     dateFormatter.dateFormat = @"h";
-    cell.hoursLabel.text = [dateFormatter stringFromDate:alarm.time];
+    NSMutableAttributedString *hours = [[NSMutableAttributedString alloc] initWithString:[dateFormatter stringFromDate:alarm.time]];
+    [hours addAttribute:NSKernAttributeName value:@-3 range:NSMakeRange(0, hours.length)];
+    cell.hoursLabel.attributedText = hours;
     [cell.hoursLabel sizeToFit];
 
     dateFormatter.dateFormat = @"mm";
-Original file line number
+Diff line change
@@ Expand Up @@
             // Initialization code
         }
         return self;
     }
     - (void)setSelected:(BOOL)selected animated:(BOOL)animated
@@ Expand Down @@