diff options
| author | Siqi LIU <me@siqi.fr> | 2013-08-10 00:39:05 +0800 |
|---|---|---|
| committer | Siqi LIU <me@siqi.fr> | 2013-08-12 00:47:33 +0800 |
| commit | 4cde47377cec9d64f51c848bc27981278fe77be0 (patch) | |
| tree | 4a6f84f4d7a743deaf578c4499116b2eda1bfa68 | |
| parent | 8d1842d4d549125a942c0ea17c2889881530f1c0 (diff) | |
final tune for Styling on iOS5/6
Change-Id: Iec53837bd2780439569b3af81ea84c724309e9fd
29 files changed, 130 insertions, 132 deletions
diff --git a/ios/iosremote/PopoverView.m b/ios/iosremote/PopoverView.m index 1bf43b566a11..2fac1839d7fc 100755 --- a/ios/iosremote/PopoverView.m +++ b/ios/iosremote/PopoverView.m @@ -158,7 +158,7 @@ - (void)showAtPoint:(CGPoint)point inView:(UIView *)view withText:(NSString *)text { - UIFont *font = kTextFont; + UIFont *font = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? kTextFontPad : kTextFontPhone; CGSize screenSize = [self screenSize]; CGSize textSize = [text sizeWithFont:font constrainedToSize:CGSizeMake(screenSize.width - kHorizontalMargin*4.f, 1000.f) lineBreakMode:UILineBreakModeWordWrap]; @@ -177,7 +177,7 @@ - (void)showAtPoint:(CGPoint)point inView:(UIView *)view withTitle:(NSString *)title withText:(NSString *)text { - UIFont *font = kTextFont; + UIFont *font = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? kTextFontPad : kTextFontPhone; CGSize screenSize = [self screenSize]; CGSize textSize = [text sizeWithFont:font constrainedToSize:CGSizeMake(screenSize.width - kHorizontalMargin*4.f, 1000.f) lineBreakMode:UILineBreakModeWordWrap]; @@ -269,10 +269,10 @@ UIView *container = [[UIView alloc] initWithFrame:CGRectZero]; //Create a label for the title text. - CGSize titleSize = [title sizeWithFont:kTitleFont]; + CGSize titleSize = [title sizeWithFont: UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? kTitleFontPad : kTitleFontPhone]; UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0.f, 0.f, titleSize.width, titleSize.height)]; titleLabel.backgroundColor = [UIColor clearColor]; - titleLabel.font = kTitleFont; + titleLabel.font = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? kTitleFontPad : kTitleFontPhone; titleLabel.textAlignment = UITextAlignmentCenter; titleLabel.textColor = kTitleColor; titleLabel.text = title; @@ -353,7 +353,7 @@ { NSMutableArray *labelArray = [[NSMutableArray alloc] initWithCapacity:stringArray.count]; - UIFont *font = kTextFont; + UIFont *font = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? kTextFontPad : kTextFontPhone; for (NSString *string in stringArray) { CGSize textSize = [string sizeWithFont:font]; @@ -378,7 +378,7 @@ { NSMutableArray *labelArray = [[NSMutableArray alloc] initWithCapacity:stringArray.count]; - UIFont *font = kTextFont; + UIFont *font = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? kTextFontPad : kTextFontPhone; for (NSString *string in stringArray) { CGSize textSize = [string sizeWithFont:font]; @@ -422,7 +422,7 @@ { NSMutableArray *tempViewArray = [[NSMutableArray alloc] initWithCapacity:stringArray.count]; - UIFont *font = kTextFont; + UIFont *font = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? kTextFontPad : kTextFontPhone; for (int i = 0; i < stringArray.count; i++) { NSString *string = [stringArray objectAtIndex:i]; diff --git a/ios/iosremote/PopoverView_Configuration.h b/ios/iosremote/PopoverView_Configuration.h index f59ac941e241..586d9da7806f 100755 --- a/ios/iosremote/PopoverView_Configuration.h +++ b/ios/iosremote/PopoverView_Configuration.h @@ -83,7 +83,10 @@ // FONTS //normal text font -#define kTextFont [UIFont fontWithName:@"HelveticaNeue" size:16.f] +#define kTextFontPhone [UIFont fontWithName:@"HelveticaNeue" size:16.f] + +//normal text font +#define kTextFontPad [UIFont fontWithName:@"HelveticaNeue" size:20.f] //normal text color #define kTextColor [UIColor colorWithRed:0.329 green:0.341 blue:0.353 alpha:1] @@ -94,7 +97,9 @@ #define kTextAlignment UITextAlignmentCenter //title font -#define kTitleFont [UIFont fontWithName:@"HelveticaNeue-Bold" size:16.f] +#define kTitleFontPhone [UIFont fontWithName:@"HelveticaNeue-Bold" size:16.f] + +#define kTitleFontPad [UIFont fontWithName:@"HelveticaNeue-Bold" size:22.f] //title text color #define kTitleColor [UIColor colorWithRed:0.329 green:0.341 blue:0.353 alpha:1] diff --git a/ios/iosremote/iPad_autosize.storyboard b/ios/iosremote/iPad_autosize.storyboard index 4883c1be0df5..1c261b3c8202 100644 --- a/ios/iosremote/iPad_autosize.storyboard +++ b/ios/iosremote/iPad_autosize.storyboard @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> + <development version="4600" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Server list vc ipad - Connect--> <scene sceneID="ydU-fu-qHI"> <objects> - <viewController storyboardIdentifier="" id="5QV-E7-KNT" customClass="server_list_vc_ipad" sceneMemberID="viewController"> + <viewController id="5QV-E7-KNT" customClass="server_list_vc_ipad" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="singleLineEtched" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> <rect key="frame" x="0.0" y="64" width="540" height="556"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> @@ -20,15 +21,15 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY"> - <rect key="frame" x="10" y="11" width="35" height="21"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/> + <rect key="frame" x="10" y="11" width="32" height="22"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Fsp-wI-AAW"> - <rect key="frame" x="424" y="11" width="44" height="21"/> - <fontDescription key="fontDescription" type="system" pointSize="17"/> - <color key="textColor" red="0.21960784310000001" green="0.3294117647" blue="0.52941176469999995" alpha="1" colorSpace="calibratedRGB"/> + <rect key="frame" x="424" y="11" width="44" height="22"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> + <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> @@ -53,7 +54,7 @@ </connections> </barButtonItem> </navigationItem> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackTranslucent"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> <connections> <outlet property="serverTable" destination="0vt-Sx-o55" id="Szp-pH-0rk"/> <segue destination="m26-i1-eiL" kind="push" identifier="pinValidation" id="yUv-cB-P15"/> @@ -94,7 +95,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> </view> <navigationItem key="navigationItem" id="V5z-WP-qrM"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackTranslucent"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> <connections> <outlet property="pinLabel" destination="Bp1-Dv-nt4" id="6xd-P5-J5U"/> <outlet property="statusLabel" destination="VVO-s2-eCV" id="Uhy-iy-HAW"/> @@ -114,7 +115,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> - <tableViewSection footerTitle="Register a new server and remeber it for future connection" id="CVG-Eq-rLd"> + <tableViewSection footerTitle="" id="CVG-Eq-rLd"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="b8A-jh-k26" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="30" width="540" height="45"/> @@ -149,7 +150,7 @@ </connections> </barButtonItem> </navigationItem> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackTranslucent"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> </tableViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="JK3-FB-UoN" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> @@ -167,7 +168,7 @@ <rect key="frame" x="0.0" y="0.0" width="540" height="281"/> <subviews> <view contentMode="scaleToFill" id="Is1-dX-SaP"> - <rect key="frame" x="36" y="53" width="468" height="208"/> + <rect key="frame" x="36" y="52.999999999999986" width="468" height="208.00000000000003"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title of the presentation(TODO)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JEW-I6-sw5"> @@ -222,7 +223,7 @@ </connections> </tableView> <navigationItem key="navigationItem" id="4ju-ge-QPw"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackTranslucent"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> <connections> <outlet property="optionsTable" destination="Pc5-8o-PrW" id="18R-Zo-CBq"/> <outlet property="titleLabel" destination="JEW-I6-sw5" id="1AH-TC-z10"/> @@ -244,7 +245,7 @@ <rect key="frame" x="0.0" y="0.0" width="768" height="459"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> - <imageView userInteractionEnabled="NO" tag="19" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" image="Default-568h@2x.png" id="x7C-rs-s4K"> + <imageView userInteractionEnabled="NO" tag="19" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" image="Default.png" id="x7C-rs-s4K"> <rect key="frame" x="0.0" y="0.0" width="768" height="459"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -315,7 +316,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <tableView contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Iok-mu-c0T" customClass="HorizontalTableView"> - <rect key="frame" x="0.0" y="458" width="129" height="768"/> + <rect key="frame" x="-488" y="-333" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -368,7 +369,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38"> - <rect key="frame" x="683.5" y="898.5" width="97" height="59"/> + <rect key="frame" x="683" y="898" width="97" height="59"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" backgroundImage="gear.png"> @@ -390,16 +391,16 @@ <rect key="frame" x="264" y="95" width="240" height="248"/> <autoresizingMask key="autoresizingMask" widthSizable="YES"/> </imageView> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="1Yr-C2-huW"> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="1Yr-C2-huW"> <rect key="frame" x="294" y="610" width="180" height="77"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="28"/> - <state key="normal" title="Connect"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> + <state key="normal" title="Connect" backgroundImage="navBarButtonNormal.png"> + <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> </state> <connections> <action selector="startConnectionModal:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="8aS-7k-5Ga"/> @@ -444,30 +445,15 @@ </objects> <point key="canvasLocation" x="-611" y="487"/> </scene> - <!--Navigation Controller--> - <scene sceneID="uu7-eo-v6A"> - <objects> - <navigationController storyboardIdentifier="slidesTable" id="Z0a-WL-DOn" sceneMemberID="viewController"> - <navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="238-WF-42z"> - <autoresizingMask key="autoresizingMask"/> - </navigationBar> - <connections> - <segue destination="VQa-vM-8pF" kind="relationship" relationship="rootViewController" id="hqy-57-zTC"/> - </connections> - </navigationController> - <placeholder placeholderIdentifier="IBFirstResponder" id="bhU-cc-Ssa" userLabel="First Responder" sceneMemberID="firstResponder"/> - </objects> - <point key="canvasLocation" x="-611" y="-493"/> - </scene> <!--Main Split View Controller--> <scene sceneID="myh-dM-403"> <objects> <splitViewController id="XiK-Ye-iB8" customClass="MainSplitViewController" sceneMemberID="viewController"> <toolbarItems/> <connections> - <segue destination="Z0a-WL-DOn" kind="relationship" relationship="masterViewController" id="2YO-8l-YoY"/> <segue destination="TYh-Hw-m1Q" kind="relationship" relationship="detailViewController" id="qi1-27-bFk"/> <segue destination="KDH-tS-eoR" kind="modal" identifier="connectionModalUp" modalPresentationStyle="formSheet" modalTransitionStyle="flipHorizontal" id="pYZ-nF-jdE"/> + <segue destination="VQa-vM-8pF" kind="relationship" relationship="masterViewController" id="uc4-BV-mye"/> </connections> </splitViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="TtW-hD-5Ub" userLabel="First Responder" sceneMemberID="firstResponder"/> @@ -479,7 +465,7 @@ <objects> <tableViewController clearsSelectionOnViewWillAppear="NO" id="VQa-vM-8pF" customClass="slideShowSwipeInList_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="170" sectionHeaderHeight="22" sectionFooterHeight="22" id="U9c-sP-NVQ"> - <rect key="frame" x="0.0" y="64" width="320" height="788"/> + <rect key="frame" x="0.0" y="20" width="320" height="832"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <prototypes> @@ -490,11 +476,11 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h@2x.png" id="dn1-99-Dde"> - <rect key="frame" x="44" y="7" width="233" height="163"/> + <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> + <rect key="frame" x="44" y="6" width="233" height="163"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7"> - <rect key="frame" x="291" y="156" width="29" height="21"/> + <rect key="frame" x="-605" y="154" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -507,6 +493,7 @@ </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> <connections> @@ -515,11 +502,11 @@ </connections> </tableView> <navigationItem key="navigationItem" id="tG3-aQ-qyu"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackTranslucent"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> </tableViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="EJg-kN-O5N" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="-145" y="-493"/> + <point key="canvasLocation" x="-589" y="-500"/> </scene> <!--Auto Dismiss Keyboard Navigation View Controller--> <scene sceneID="tvQ-2n-hpX"> @@ -541,11 +528,12 @@ </scene> </scenes> <resources> - <image name="Default-568h@2x.png" width="640" height="1136"/> - <image name="add.png" width="24" height="24"/> + <image name="Default.png" width="320" height="480"/> + <image name="add.png" width="30" height="30"/> <image name="gear.png" width="55" height="35"/> <image name="gear_pressed" width="16" height="16"/> <image name="libO_icon.png" width="598" height="598"/> + <image name="navBarButtonNormal.png" width="30" height="20"/> <image name="nextButton_normal.png" width="42" height="230"/> <image name="nextButton_pressed.png" width="42" height="230"/> <image name="previousButton_normal.png" width="42" height="230"/> @@ -558,6 +546,7 @@ <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> <relationships> <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="popOverUp:"/> <relationship kind="action" name="previousSlideAction:"/> <relationship kind="action" name="startConnectionModal:"/> <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> @@ -634,7 +623,7 @@ </class> </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> - <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackTranslucent"/> + <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> <simulatedScreenMetrics key="destination"/> </simulatedMetricsContainer> diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj index 6ba9a7c29280..a11fc1b506fa 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj +++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj @@ -488,8 +488,6 @@ 8C26E5CA17A57C20007DA4B7 /* ControlVariables.h */, 8C26E5CE17A58703007DA4B7 /* HorizontalSlideCell.h */, 8C26E5CF17A58703007DA4B7 /* HorizontalSlideCell.m */, - 8C26E5D517A68154007DA4B7 /* stopWatch.h */, - 8C26E5D617A68154007DA4B7 /* stopWatch.m */, 8C0323A917A943720037432E /* UIImageView+setImageAnimated.h */, 8C0323AA17A943720037432E /* UIImageView+setImageAnimated.m */, 8C19F42917B04EC6005BDB61 /* UINavigationController+Theme.h */, @@ -507,6 +505,8 @@ 8C1A170717A28DE800B4BB3C /* Models */ = { isa = PBXGroup; children = ( + 8C26E5D517A68154007DA4B7 /* stopWatch.h */, + 8C26E5D617A68154007DA4B7 /* stopWatch.m */, 57C6E426175E076900E8BC5F /* Client.h */, 57C6E427175E076900E8BC5F /* Client.m */, 57C6E428175E076900E8BC5F /* CommunicationManager.h */, @@ -612,7 +612,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = libreoffice.sdremote; - LastUpgradeCheck = 0460; + LastUpgradeCheck = 0500; ORGANIZATIONNAME = libreoffice; }; buildConfigurationList = 57C6E3EA175E06E800E8BC5F /* Build configuration list for PBXProject "iosremote" */; @@ -837,6 +837,7 @@ "\"$(SRCROOT)/TestFlightSDK1.2.6\"", ); PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; @@ -859,6 +860,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; diff --git a/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcschemes/iosremote.xcscheme b/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcschemes/iosremote.xcscheme index 5d04313e5d82..4a08173bc0d5 100644 --- a/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcschemes/iosremote.xcscheme +++ b/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcschemes/iosremote.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0460" + LastUpgradeVersion = "0500" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/ios/iosremote/iosremote/.DS_Store b/ios/iosremote/iosremote/.DS_Store Binary files differindex 8c01359dcb17..463e52b37748 100644 --- a/ios/iosremote/iosremote/.DS_Store +++ b/ios/iosremote/iosremote/.DS_Store diff --git a/ios/iosremote/iosremote/AppDelegate.m b/ios/iosremote/iosremote/AppDelegate.m index 0475bb60082e..0d89754415cb 100644 --- a/ios/iosremote/iosremote/AppDelegate.m +++ b/ios/iosremote/iosremote/AppDelegate.m @@ -7,6 +7,7 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/. #import "AppDelegate.h" +#import "ControlVariables.h" #import "UINavigationController+Theme.h" @implementation AppDelegate @@ -28,34 +29,17 @@ ofType:@"plist"]; NSDictionary *appDefaults = [NSDictionary dictionaryWithContentsOfFile:defaultsPath]; [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults]; - - // Override point for customization after application launch. - /** - * If ever we need some iOS6-only storyboard based features and we want to keep backward compatibility, we should uncomment these code to pick the right storyboard based on the existence on certains classes. - */ -// UIStoryboard *mainStoryboard = nil; -// if (NSClassFromString(@"NSLayoutConstraint")) { -// mainStoryboard = [UIStoryboard storyboardWithName:@"iPhone_autolayout" bundle:nil]; -// NSLog(@"loading autolayout storyboard"); -// } else { -// UIStoryboard * mainStoryboard = [UIStoryboard storyboardWithName:@"iPhone_autosize" bundle:nil]; -// NSLog(@"Doesn't support autolayout, loading autosize"); -// } -// -// self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; -// self.window.rootViewController = [mainStoryboard instantiateInitialViewController]; -// [(UINavigationController *)self.window.rootViewController loadTheme]; -// [self.window makeKeyAndVisible]; + [[UIBarButtonItem appearanceWhenContainedIn:[UINavigationBar class], nil] setBackgroundImage:[UIImage imageNamed:@"navBarButtonNormal"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; NSDictionary *attributes = [NSDictionary dictionaryWithObjects: - [NSArray arrayWithObjects: [UIFont boldSystemFontOfSize:15], [UIColor colorWithRed:1.0 green:0.231372549 blue:0.188235294 alpha:1.0], [UIColor clearColor], nil] + [NSArray arrayWithObjects: [UIFont boldSystemFontOfSize:15], kTintColor, [UIColor clearColor], nil] forKeys: [NSArray arrayWithObjects:UITextAttributeFont, UITextAttributeTextColor, UITextAttributeTextShadowColor, nil]]; [[UIBarButtonItem appearance] setTitleTextAttributes:attributes forState:UIControlStateNormal]; attributes = [NSDictionary dictionaryWithObjects: - [NSArray arrayWithObjects: [UIFont boldSystemFontOfSize:15], [UIColor grayColor], [UIColor clearColor], nil] + [NSArray arrayWithObjects: kAppTextFont, [UIColor grayColor], [UIColor clearColor], nil] forKeys: [NSArray arrayWithObjects:UITextAttributeFont, UITextAttributeTextColor, UITextAttributeTextShadowColor, nil]]; [[UIBarButtonItem appearance] setTitleTextAttributes:attributes forState:UIControlStateHighlighted]; diff --git a/ios/iosremote/iosremote/Communication/pinValidation_vc.m b/ios/iosremote/iosremote/Communication/pinValidation_vc.m index 5956d41a978a..efbec7b5cba9 100644 --- a/ios/iosremote/iosremote/Communication/pinValidation_vc.m +++ b/ios/iosremote/iosremote/Communication/pinValidation_vc.m @@ -38,6 +38,10 @@ // Do any additional setup after loading the view. self.comManager = [CommunicationManager sharedComManager]; [self.pinLabel setText:[NSString stringWithFormat:@"%@", [self.comManager getPairingPin]]]; + + UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:@"Connect" style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)]; + [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; + self.navigationItem.leftBarButtonItem = backButton; } - (void) viewDidAppear:(BOOL)animated diff --git a/ios/iosremote/iosremote/ControlVariables.h b/ios/iosremote/iosremote/ControlVariables.h index 93767259025f..5df82217aa8b 100644 --- a/ios/iosremote/iosremote/ControlVariables.h +++ b/ios/iosremote/iosremote/ControlVariables.h @@ -29,9 +29,6 @@ // Horizontal padding for the embedded table view within the row #define kRowHorizontalPadding 1 -// The background color of the vertical table view -#define kVerticalTableBackgroundColor [UIColor colorWithRed:0.58823529 green:0.58823529 blue:0.58823529 alpha:1.0] - // Background color for the horizontal table view (the one embedded inside the rows of our vertical table) #define kHorizontalTableBackgroundColor [UIColor blackColor] @@ -40,4 +37,12 @@ #define kHorizontalTableCellHighlightedBackgroundColor [UIColor colorWithRed:0 green:0.4745098 blue:0.29019808 alpha:0.9] +#define kTintColor [UIColor colorWithRed:0 green:0.462745098 blue:1 alpha:1.0] + +#define kAppTitleFont [UIFont fontWithName:@"HelveticaNeue-Medium" size:20.0f] + +#define kAppTextFont [UIFont fontWithName:@"HelveticaNeue-Medium" size:16.0f] + +#define kAppSmallTextFont [UIFont fontWithName:@"HelveticaNeue" size:14.0f] + #endif diff --git a/ios/iosremote/iosremote/MainSplitViewController.m b/ios/iosremote/iosremote/MainSplitViewController.m index bf4e462922e3..a7f97357e16d 100644 --- a/ios/iosremote/iosremote/MainSplitViewController.m +++ b/ios/iosremote/iosremote/MainSplitViewController.m @@ -73,7 +73,7 @@ [self.detailViewController hideMaster:NO]; [self dismissViewControllerAnimated:YES completion:nil]; // [(UITableView *)[(slideShowSwipeInList_ipad *)[[self viewControllers] objectAtIndex:2] view] reloadData]; - [(slideShowSwipeInList_ipad *)[(UINavigationController *)[[self viewControllers] objectAtIndex:0] topViewController] didReceivePresentationStarted]; + [(slideShowSwipeInList_ipad *)[[self viewControllers] objectAtIndex:0] didReceivePresentationStarted]; [(BasePresentationViewController *)[[self viewControllers] objectAtIndex:1] setWelcomePageVisible:NO]; } diff --git a/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.h b/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.h index 1414480be22c..02495863c730 100755 --- a/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.h +++ b/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.h @@ -26,6 +26,7 @@ #import <UIKit/UIKit.h> +#import "stopWatch.h" @class SWRevealViewController; @protocol SWRevealViewControllerDelegate; @@ -56,7 +57,7 @@ typedef enum } FrontViewPosition; -@interface SWRevealViewController : UIViewController +@interface SWRevealViewController : UIViewController <StopWatchDelegate> // Object instance init and rear view setting - (id)initWithRearViewController:(UIViewController *)rearViewController frontViewController:(UIViewController *)frontViewController; diff --git a/ios/iosremote/iosremote/UIViewController+LibOStyling.m b/ios/iosremote/iosremote/UIViewController+LibOStyling.m index c6b69343780a..26c0e5164c60 100644 --- a/ios/iosremote/iosremote/UIViewController+LibOStyling.m +++ b/ios/iosremote/iosremote/UIViewController+LibOStyling.m @@ -7,6 +7,7 @@ // #import "UIViewController+LibOStyling.h" +#import "ControlVariables.h" @implementation UIViewController (LibOStyling) @@ -16,10 +17,10 @@ if (!titleView) { titleView = [[UILabel alloc] initWithFrame:CGRectZero]; titleView.backgroundColor = [UIColor clearColor]; - titleView.font = [UIFont boldSystemFontOfSize:20.0]; + titleView.font = kAppTitleFont; titleView.shadowColor = nil; - titleView.textColor = [UIColor colorWithRed:1.0 green:0.231372549 blue:0.188235294 alpha:1.0]; + titleView.textColor = [UIColor blackColor]; self.navigationItem.titleView = titleView; } diff --git a/ios/iosremote/iosremote/add.png b/ios/iosremote/iosremote/add.png Binary files differindex 94dc1a79182f..1847ffea3d65 100644 --- a/ios/iosremote/iosremote/add.png +++ b/ios/iosremote/iosremote/add.png diff --git a/ios/iosremote/iosremote/add@2x.png b/ios/iosremote/iosremote/add@2x.png Binary files differindex 473c1021a61d..685d204017ab 100644 --- a/ios/iosremote/iosremote/add@2x.png +++ b/ios/iosremote/iosremote/add@2x.png diff --git a/ios/iosremote/iosremote/backButton.png b/ios/iosremote/iosremote/backButton.png Binary files differindex 8babb852bdd4..f6a3193cbad3 100644 --- a/ios/iosremote/iosremote/backButton.png +++ b/ios/iosremote/iosremote/backButton.png diff --git a/ios/iosremote/iosremote/backButton@2x.png b/ios/iosremote/iosremote/backButton@2x.png Binary files differindex e123e62c83ca..9c8b1327e91b 100644 --- a/ios/iosremote/iosremote/backButton@2x.png +++ b/ios/iosremote/iosremote/backButton@2x.png diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard index 4135bbc21ab4..b0ef430a458a 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> + <deployment defaultVersion="1552" identifier="iOS"/> + <development version="4600" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> @@ -10,7 +12,7 @@ <viewController id="2" customClass="server_list_vc" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="naQ-T4-jWV"> <rect key="frame" x="0.0" y="64" width="320" height="504"/> - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> + <color key="backgroundColor" red="0.93333713500000004" green="0.92603786499999996" blue="0.92826186129999999" alpha="1" colorSpace="calibratedRGB"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="Rg3-PU-OuS" detailTextLabel="9Mc-gD-acc" style="IBUITableViewCellStyleValue1" id="Pvl-Uw-Ghs"> <rect key="frame" x="0.0" y="46" width="320" height="45"/> @@ -20,15 +22,15 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rg3-PU-OuS"> - <rect key="frame" x="10" y="11" width="35" height="21"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/> + <rect key="frame" x="10" y="11" width="32" height="22"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9Mc-gD-acc"> - <rect key="frame" x="246" y="11" width="44" height="21"/> - <fontDescription key="fontDescription" type="system" pointSize="17"/> - <color key="textColor" red="0.21960784310000001" green="0.3294117647" blue="0.52941176469999995" alpha="1" colorSpace="calibratedRGB"/> + <rect key="frame" x="246" y="11" width="44" height="22"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> + <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> @@ -43,7 +45,6 @@ </tableView> <navigationItem key="navigationItem" title="Impress Remote" id="yR1-m8-JWN"> <barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg"> - <color key="tintColor" red="0.92156862745098034" green="0.4392156862745098" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <connections> <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/> </connections> @@ -106,7 +107,7 @@ <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="VUL-K7-xsS"> <rect key="frame" x="0.0" y="64" width="320" height="504"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> + <color key="backgroundColor" red="0.93333713500000004" green="0.92603786499999996" blue="0.92826186129999999" alpha="1" colorSpace="calibratedRGB"/> <sections> <tableViewSection footerTitle="" id="46W-NE-CYW"> <cells> @@ -182,14 +183,14 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsJ-ic-uyC"> - <rect key="frame" x="11" y="0.0" width="220" height="60"/> + <rect key="frame" x="11" y="0.0" width="220" height="59.5"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="39"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Fmn-lt-vBn"> - <rect key="frame" x="61" y="77" width="44" height="44"/> + <rect key="frame" x="61" y="76" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_start_btn.png"> @@ -201,7 +202,7 @@ </state> </button> <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> - <rect key="frame" x="130" y="77" width="44" height="44"/> + <rect key="frame" x="130" y="76" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_clear_btn.png"> @@ -213,21 +214,21 @@ </state> </button> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3UQ-XJ-SDP"> - <rect key="frame" x="44" y="48" width="33" height="21"/> + <rect key="frame" x="44" y="48" width="33" height="20.5"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="10"/> <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Minutes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TqG-sM-lAC"> - <rect key="frame" x="97" y="48" width="43" height="21"/> + <rect key="frame" x="97" y="48" width="43" height="20.5"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="10"/> <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Seconds" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6jG-LW-J7Q"> - <rect key="frame" x="152" y="48" width="47" height="21"/> + <rect key="frame" x="152" y="48" width="47" height="20.5"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="10"/> <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> @@ -245,11 +246,11 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="131"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h@2x.png" id="del-Hz-TZI"> - <rect key="frame" x="31" y="5" width="182" height="122"/> + <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h.png" id="del-Hz-TZI"> + <rect key="frame" x="31" y="4.5" width="182" height="122"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF"> - <rect key="frame" x="184" y="106" width="29" height="21"/> + <rect key="frame" x="184" y="105" width="29" height="21"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> <accessibilityTraits key="traits" none="YES" selected="YES" staticText="YES"/> @@ -289,7 +290,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000" id="bZq-z2-OKU"> - <rect key="frame" x="3" y="8" width="220" height="167"/> + <rect key="frame" x="3" y="8" width="220.00000000000003" height="167"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </imageView> @@ -344,7 +345,7 @@ <accessibilityTraits key="traits" none="YES" notEnabled="YES"/> </accessibility> </view> - <imageView hidden="YES" alpha="0.0" contentMode="scaleAspectFit" image="ic_launcher@2x.png" id="ExH-sw-Z1i"> + <imageView hidden="YES" alpha="0.0" contentMode="scaleAspectFit" image="ic_launcher.png" id="ExH-sw-Z1i"> <rect key="frame" x="0.0" y="148" width="320" height="253"/> <autoresizingMask key="autoresizingMask" widthSizable="YES"/> </imageView> @@ -432,16 +433,16 @@ <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="rWA-v3-wtf"> <rect key="frame" x="0.0" y="64" width="320" height="504"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> + <color key="backgroundColor" red="0.93333713503649562" green="0.9260378649635036" blue="0.92826186131386856" alpha="1" colorSpace="calibratedRGB"/> <view key="tableHeaderView" contentMode="scaleToFill" id="nOZ-aL-o5J"> <rect key="frame" x="0.0" y="0.0" width="320" height="157"/> <subviews> <view contentMode="scaleToFill" id="9RB-yM-BkW"> - <rect key="frame" x="13" y="17" width="295" height="140"/> + <rect key="frame" x="0.0" y="17" width="320" height="140"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title of the presentation(TODO)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wJK-w7-Zs9"> - <rect key="frame" x="20" y="20" width="255" height="100"/> + <rect key="frame" x="20" y="20" width="280" height="100"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> @@ -522,9 +523,9 @@ </scene> </scenes> <resources> - <image name="Default-568h@2x.png" width="640" height="1136"/> + <image name="Default-568h.png" width="640" height="1136"/> <image name="add.png" width="30" height="30"/> - <image name="ic_launcher@2x.png" width="16" height="16"/> + <image name="ic_launcher.png" width="16" height="16"/> <image name="pointer.png" width="143" height="147"/> <image name="pointer_pushed.png" width="143" height="147"/> <image name="pushed_next_button.png" width="315" height="220"/> diff --git a/ios/iosremote/iosremote/gear_transparent_bg.png b/ios/iosremote/iosremote/gear_transparent_bg.png Binary files differindex 4c8725374e5d..3305afa1fa77 100644 --- a/ios/iosremote/iosremote/gear_transparent_bg.png +++ b/ios/iosremote/iosremote/gear_transparent_bg.png diff --git a/ios/iosremote/iosremote/gear_transparent_bg@2x.png b/ios/iosremote/iosremote/gear_transparent_bg@2x.png Binary files differindex 8e1e154c2b6b..e80cdd97944c 100644 --- a/ios/iosremote/iosremote/gear_transparent_bg@2x.png +++ b/ios/iosremote/iosremote/gear_transparent_bg@2x.png diff --git a/ios/iosremote/iosremote/main.m b/ios/iosremote/iosremote/main.m index 20d3bcaa357f..e5914154395d 100644 --- a/ios/iosremote/iosremote/main.m +++ b/ios/iosremote/iosremote/main.m @@ -9,7 +9,6 @@ #import <UIKit/UIKit.h> #import "AppDelegate.h" -#import "AppDelegate_ipad.h" int main(int argc, char *argv[]) { diff --git a/ios/iosremote/iosremote/more_icon.png b/ios/iosremote/iosremote/more_icon.png Binary files differindex 31e3d8af1f08..f71327ca32b5 100644 --- a/ios/iosremote/iosremote/more_icon.png +++ b/ios/iosremote/iosremote/more_icon.png diff --git a/ios/iosremote/iosremote/more_icon@2x.png b/ios/iosremote/iosremote/more_icon@2x.png Binary files differindex 781a99c147e0..d687668db07b 100644 --- a/ios/iosremote/iosremote/more_icon@2x.png +++ b/ios/iosremote/iosremote/more_icon@2x.png diff --git a/ios/iosremote/iosremote/newServer_vc.h b/ios/iosremote/iosremote/newServer_vc.h index 2894238a20d3..0fb1ce5bf615 100644 --- a/ios/iosremote/iosremote/newServer_vc.h +++ b/ios/iosremote/iosremote/newServer_vc.h @@ -15,9 +15,8 @@ // Constants representing the book's fields. // enum { - ServerName, ServerAddr, - ServerStore + ServerName }; // Constants representing the various sections of our grouped table view. diff --git a/ios/iosremote/iosremote/newServer_vc.m b/ios/iosremote/iosremote/newServer_vc.m index d57bb9d7c6c7..eb02ebd5a12b 100644 --- a/ios/iosremote/iosremote/newServer_vc.m +++ b/ios/iosremote/iosremote/newServer_vc.m @@ -100,16 +100,16 @@ - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - - NSUInteger indexes[] = { 0, 0 }; - NSIndexPath *indexPath = [NSIndexPath indexPathWithIndexes:indexes - length:2]; - + + [self.comManager setDelegate:self]; +} + +- (void)viewDidAppear:(BOOL)animated +{ EditableTableViewCell *cell = (EditableTableViewCell *)[[self tableView] - cellForRowAtIndexPath:indexPath]; + cellForRowAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:0]]; [[cell textField] becomeFirstResponder]; - [self.comManager setDelegate:self]; } // Force textfields to resign firstResponder so that our implementation of @@ -169,7 +169,7 @@ switch ([textField tag]) { case ServerName: [self.server setServerName:text]; break; - case ServerAddr: [self.server setServerAddress:text]; break; + case ServerAddr: [self.server setServerAddress:text]; break; } } diff --git a/ios/iosremote/iosremote/serverList_vc.m b/ios/iosremote/iosremote/serverList_vc.m index 6a9d357d8ec5..8f4bb9d166bc 100644 --- a/ios/iosremote/iosremote/serverList_vc.m +++ b/ios/iosremote/iosremote/serverList_vc.m @@ -11,6 +11,7 @@ #import "newServer_vc.h" #import "Server.h" #import "Client.h" +#import "ControlVariables.h" #include <sys/socket.h> #include <netinet/in.h> @@ -58,6 +59,7 @@ delegate:self cancelButtonTitle:@"OK" otherButtonTitles:nil]; + [self disableSpinner]; [message show]; } @@ -80,8 +82,6 @@ - (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didNotSearch:(NSDictionary *)errorDict { NSLog(@"search error"); -// UITableViewCell * cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]]; -// [(UIActivityIndicatorView *)[cell viewWithTag:5] stopAnimating]; [self.serviceBrowser searchForServicesOfType:@"_impressRemote._tcp" inDomain:@"local"]; } @@ -285,10 +285,9 @@ sectionHeader = [[UILabel alloc] initWithFrame:CGRectMake(25, 10, 200, 40)]; } sectionHeader.backgroundColor = [UIColor clearColor]; - sectionHeader.font = [UIFont boldSystemFontOfSize:18]; + sectionHeader.font = kAppTextFont; sectionHeader.textColor = [UIColor darkTextColor]; sectionHeader.text = sectionName; - sectionHeader UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, tableView.bounds.size.width, [self tableView:tableView heightForHeaderInSection:section])]; [view addSubview:sectionHeader]; @@ -301,8 +300,8 @@ [sectionFooter setLineBreakMode:NSLineBreakByWordWrapping]; [sectionFooter setNumberOfLines:5]; sectionFooter.backgroundColor = [UIColor clearColor]; - sectionFooter.font = [UIFont systemFontOfSize:14]; - sectionFooter.textColor = [UIColor colorWithRed:0.22 green:0.33 blue:0.53 alpha:1.0]; + sectionFooter.font = kAppSmallTextFont; + sectionFooter.textColor = kTintColor; sectionFooter.text = @"In case your computer does not appear in the section above, manually add a computer with its IP address."; UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, tableView.bounds.size.width, [self tableView:tableView heightForHeaderInSection:section])]; diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc.m b/ios/iosremote/iosremote/slideShowPreviewTable_vc.m index 1747ca062ac9..c39e449d2ffc 100644 --- a/ios/iosremote/iosremote/slideShowPreviewTable_vc.m +++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc.m @@ -10,6 +10,7 @@ #import "CommunicationManager.h" #import "CommandTransmitter.h" #import "CommandInterpreter.h" +#import "ControlVariables.h" #import "SlideShow.h" @interface slideShowPreviewTable_vc () @@ -105,7 +106,8 @@ - (UIButton *)startButton{ if (_startButton == nil) { - _startButton = [UIButton buttonWithType:UIButtonTypeRoundedRect]; + _startButton = [UIButton buttonWithType:UIButtonTypeCustom]; + [_startButton setBackgroundImage:[UIImage imageNamed:@"navBarButtonNormal"] forState:UIControlStateNormal]; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) { _startButton.frame = CGRectMake(10.0, 30.0, 300.0, 50.0); } else { @@ -113,6 +115,8 @@ _startButton.frame = CGRectMake(30.0, 50.0, 470.0, 50.0); } [_startButton setTitle:@"Start Presentation" forState:UIControlStateNormal]; + [_startButton setTitleColor:kTintColor forState:UIControlStateNormal]; + [_startButton setTitleColor:[UIColor lightGrayColor] forState:UIControlStateHighlighted]; [_startButton addTarget:self action:@selector(startPresentationAction:) forControlEvents:UIControlEventTouchUpInside]; _startButton.tag = 1; diff --git a/ios/iosremote/iosremote/slideShow_vc_iphone.m b/ios/iosremote/iosremote/slideShow_vc_iphone.m index 15a352ab56c4..b53be8715bab 100644 --- a/ios/iosremote/iosremote/slideShow_vc_iphone.m +++ b/ios/iosremote/iosremote/slideShow_vc_iphone.m @@ -333,7 +333,7 @@ NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; NSOperationQueue *mainQueue = [NSOperationQueue mainQueue]; - [[(slideShowSwipeInList *)self.revealViewController.rearViewController stopWatch] setBarItem:self.navigationController.navigationBar.topItem]; + [[(slideShowSwipeInList *)self.revealViewController.rearViewController stopWatch] setDelegate:self.revealViewController]; self.slideShowImageNoteReadyObserver =[center addObserverForName:MSG_SLIDE_CHANGED object:nil diff --git a/ios/iosremote/iosremote/stopWatch.h b/ios/iosremote/iosremote/stopWatch.h index 9cb716bc2e1b..a77f55ab7362 100644 --- a/ios/iosremote/iosremote/stopWatch.h +++ b/ios/iosremote/iosremote/stopWatch.h @@ -12,13 +12,19 @@ #define TIMER_STATE_PAUSED 1 #define TIMER_STATE_CLEARED 2 +@protocol StopWatchDelegate <NSObject> + +- (void) setTitle:(NSString *) title; + +@end + @interface stopWatch : NSObject // StopWatch @property (strong, nonatomic) NSTimer *stopWatchTimer; @property (strong, nonatomic) NSDate *startDate; @property BOOL set; -@property (weak, nonatomic) UINavigationItem * barItem; +@property (weak, nonatomic) id<StopWatchDelegate> delegate; - (stopWatch *) initWithStartButton:(UIButton *)startButton ClearButton:(UIButton *)clearButton diff --git a/ios/iosremote/iosremote/stopWatch.m b/ios/iosremote/iosremote/stopWatch.m index 3f66c9b614a9..9c68544286e3 100644 --- a/ios/iosremote/iosremote/stopWatch.m +++ b/ios/iosremote/iosremote/stopWatch.m @@ -22,7 +22,6 @@ @synthesize startButton = _startButton; @synthesize clearButton = _clearButton; @synthesize timeLabel = _timeLabel; -@synthesize barItem = _barItem; @synthesize lastInterval = _lastInterval; @@ -81,7 +80,7 @@ // Format the elapsed time and set it to the label NSString *timeString = [dateFormatter stringFromDate:timerDate]; self.timeLabel.text = timeString; - self.barItem.title = timeString; + [self.delegate setTitle:timeString]; } @@ -148,7 +147,7 @@ [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn"] forState:UIControlStateNormal]; [self updateTimer]; - self.barItem.title = @""; + [self.delegate setTitle:@""]; } @end |
