Changeset c6dde93 in orbit for iOS


Ignore:
Timestamp:
01/01/14 00:24:04 (6 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo
Children:
c1a500d
Parents:
ef63b5f
Message:
  • further storyboard tweaks for iPhone 5
Location:
iOS/Orbit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • iOS/Orbit/Orbit/controllers/FlightViewController.m

    rf45b70a rc6dde93  
    279279- (void) displayScore 
    280280{ 
    281    self.scoresDisplay.text = [NSString stringWithFormat:@"Scores        Current: %i    Last: %i    High: %i", (int)scoreCurrent, (int)scoreLast, (int)scoreHigh]; 
     281    
     282   NSString* newScore = [NSString stringWithFormat:@"Scores      Current: %i    Last: %i    High: %i", (int)scoreCurrent, (int)scoreLast, (int)scoreHigh]; 
     283    
     284   if (newScore.length >= 50) 
     285      newScore = [NSString stringWithFormat:@"Scores  Current: %i  Last: %i  High: %i", (int)scoreCurrent, (int)scoreLast, (int)scoreHigh]; 
     286 
     287   if (newScore.length >= 50) 
     288      newScore = [NSString stringWithFormat:@"Scores Current: %i Last: %i High: %i", (int)scoreCurrent, (int)scoreLast, (int)scoreHigh]; 
     289 
     290   self.scoresDisplay.text = newScore; 
    282291} 
    283292 
  • iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard

    ref63b5f rc6dde93  
    348348                                    </progressView> 
    349349                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bZn-rG-svm" userLabel="Attention %"> 
    350                                         <rect key="frame" x="268" y="22" width="36" height="18"/> 
     350                                        <rect key="frame" x="264.00000004470343" y="22" width="40" height="18"/> 
    351351                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
    352352                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     
    383383                                    </progressView> 
    384384                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rhw-9S-ZP1" userLabel="Meditation %"> 
    385                                         <rect key="frame" x="268" y="22" width="36" height="18"/> 
     385                                        <rect key="frame" x="264" y="22" width="40" height="18"/> 
    386386                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
    387387                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     
    418418                                    </progressView> 
    419419                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yYn-76-IoI" userLabel="Signal %"> 
    420                                         <rect key="frame" x="268" y="19" width="36" height="18"/> 
     420                                        <rect key="frame" x="266.00000004881008" y="17" width="40" height="18"/> 
    421421                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
    422422                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     
    437437                                    </progressView> 
    438438                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ah9-c0-kCb" userLabel="Power %"> 
    439                                         <rect key="frame" x="268" y="48" width="36" height="18"/> 
     439                                        <rect key="frame" x="266" y="47" width="40" height="18"/> 
    440440                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
    441441                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     
    474474                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 
    475475                                <subviews> 
    476                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Scores        Current: 0    Last: 0    High: 0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="N4q-gC-eyc"> 
     476                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Scores      Current: 0    Last: 0    High: 0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="N4q-gC-eyc"> 
    477477                                        <rect key="frame" x="4" y="3" width="302" height="20"/> 
    478478                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 
Note: See TracChangeset for help on using the changeset viewer.