diff options
author | v.mikhaylenko <v.mikhaylenko@corp.mail.ru> | 2015-08-05 12:14:33 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:59:07 +0300 |
commit | cef2199732dbaf613ec0aab301a1001fb6523a65 (patch) | |
tree | c087da47e1b9d5b21799e652898c816d6818f3d4 /iphone/Maps/Classes/CustomAlert | |
parent | 2922b55e0c9d19340b94941aa210298976d4e9ad (diff) |
[ios] Redesign dialogs.
Diffstat (limited to 'iphone/Maps/Classes/CustomAlert')
11 files changed, 32 insertions, 16 deletions
diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm index cf3e401b61..6a22079826 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm @@ -89,14 +89,13 @@ case routing::IRouter::InconsistentMWMandRoute: return [MWMDefaultAlert routeNotFoundAlert]; case routing::IRouter::RouteFileNotExist: + case routing::IRouter::FileTooOld: return [MWMDefaultAlert routeFileNotExistAlert]; case routing::IRouter::InternalError: return [MWMDefaultAlert internalErrorAlert]; case routing::IRouter::Cancelled: case routing::IRouter::NoError: case routing::IRouter::NeedMoreMaps: - //TODO (mikhaylenko, grechuhin) Make proper flag processing. - case routing::IRouter::FileTooOld: return nil; } } diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib index 123ac1c2e1..c46389c645 100644 --- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib @@ -61,6 +61,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="ok"/> + <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="buttonBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="leftButtonTap" destination="iN0-l3-epB" eventType="touchUpInside" id="xE7-aE-OzM"/> @@ -80,6 +81,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="ok"/> + <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="buttonBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="rightButtonTap" destination="iN0-l3-epB" eventType="touchUpInside" id="UO8-7c-q1i"/> @@ -94,7 +96,7 @@ </constraints> </view> </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.88" colorSpace="calibratedRGB"/> <constraints> <constraint firstItem="Grl-z5-2cE" firstAttribute="top" secondItem="zso-DD-6SG" secondAttribute="top" constant="20" id="5iy-IL-Non"/> <constraint firstAttribute="bottom" secondItem="RSB-i6-pEP" secondAttribute="bottom" id="7PX-qC-iuH"/> @@ -126,6 +128,7 @@ <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> <integer key="value" value="4"/> </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm index 6c859ee524..09625d9bd9 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm @@ -356,7 +356,7 @@ static CGFloat const kMinimumOffset = 20.; - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section { UIView * view = [[UIView alloc] init]; - view.backgroundColor = self.missedFiles.count == 2 && section == 0 ? UIColor.blackDividers : UIColor.clearColor; + view.backgroundColor = self.missedFiles.count == 2 && section == 0 ? UIColor.blackDividers : [UIColor colorWithWhite:0. alpha:0.06]; return view; } diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib index 91a2b5bf74..7d27145a23 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib @@ -49,13 +49,13 @@ </label> <tableView clipsSubviews="YES" contentMode="scaleToFill" verticalHuggingPriority="1000" alwaysBounceVertical="YES" scrollEnabled="NO" style="grouped" separatorStyle="none" rowHeight="32" sectionHeaderHeight="44" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="1lL-cj-2oS"> <rect key="frame" x="0.0" y="98" width="280" height="88"/> - <color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="height" constant="88" id="92H-Th-Xgt"/> </constraints> <color key="separatorColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <color key="sectionIndexBackgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="sectionIndexTrackingBackgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="sectionIndexTrackingBackgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <connections> <outlet property="dataSource" destination="jqI-GQ-yDh" id="8mP-kY-rEz"/> <outlet property="delegate" destination="jqI-GQ-yDh" id="9Fy-MW-IYa"/> @@ -83,6 +83,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="download"/> + <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="buttonBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="downloadButtonTap:" destination="jqI-GQ-yDh" eventType="touchUpInside" id="L2t-kQ-AzL"/> @@ -102,6 +103,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="later"/> + <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="buttonBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="notNowButtonTap:" destination="jqI-GQ-yDh" eventType="touchUpInside" id="6pb-Gg-9sN"/> @@ -116,7 +118,7 @@ </constraints> </view> </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="backgroundColor" white="1" alpha="0.88" colorSpace="calibratedWhite"/> <constraints> <constraint firstItem="dhS-fg-rNl" firstAttribute="top" secondItem="1lL-cj-2oS" secondAttribute="bottom" id="2aT-au-ilL"/> <constraint firstAttribute="bottom" secondItem="dhS-fg-rNl" secondAttribute="bottom" id="2bS-ac-iDr"/> @@ -150,6 +152,7 @@ <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> <integer key="value" value="4"/> </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib index 0f1117101d..15a85ef61c 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib @@ -23,7 +23,7 @@ <nil key="highlightedColor"/> </label> </subviews> - <color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="centerX" secondItem="1B4-T1-g4X" secondAttribute="centerX" id="2AW-qe-sgg"/> <constraint firstAttribute="centerY" secondItem="1B4-T1-g4X" secondAttribute="centerY" id="TD9-6y-WM8"/> @@ -31,7 +31,7 @@ <constraint firstItem="1B4-T1-g4X" firstAttribute="leading" secondItem="gf8-bS-tvq" secondAttribute="leading" constant="20" id="sZo-pt-LJL"/> </constraints> </tableViewCellContentView> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.059999999999999998" colorSpace="custom" customColorSpace="sRGB"/> <connections> <outlet property="titleLabel" destination="1B4-T1-g4X" id="m4n-H9-1Ta"/> </connections> diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib index f11fded203..a5d6f2a046 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib @@ -56,7 +56,7 @@ </connections> </button> </subviews> - <color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="calibratedRGB"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.059999999999999998" colorSpace="calibratedRGB"/> <constraints> <constraint firstAttribute="bottom" secondItem="eIt-Yb-1Yl" secondAttribute="bottom" id="61x-d3-FtO"/> <constraint firstAttribute="trailing" secondItem="eqn-NQ-zOk" secondAttribute="trailing" constant="14" id="8Xd-cJ-b0r"/> diff --git a/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib b/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib index fb4a988b12..e460341483 100644 --- a/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib @@ -67,6 +67,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="later"/> + <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="buttonBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="notNowButtonTap:" destination="Eeb-Gs-Fip" eventType="touchUpInside" id="FEJ-y8-uMY"/> @@ -86,6 +87,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="share"/> + <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="buttonBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="shareButtonTap:" destination="Eeb-Gs-Fip" eventType="touchUpInside" id="NBE-Bo-lM3"/> @@ -100,7 +102,7 @@ </constraints> </view> </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="backgroundColor" white="1" alpha="0.88" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="bottom" secondItem="RGP-EG-eOe" secondAttribute="bottom" constant="1" id="2L1-qn-SL5"/> <constraint firstAttribute="bottom" secondItem="Wp2-fW-sfI" secondAttribute="bottom" id="2cC-jr-6fM"/> @@ -129,6 +131,7 @@ <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> <integer key="value" value="4"/> </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/FeedbackAlert/MWMFeedbackAlert.xib b/iphone/Maps/Classes/CustomAlert/FeedbackAlert/MWMFeedbackAlert.xib index 5a639ae884..b6c5d363c0 100644 --- a/iphone/Maps/Classes/CustomAlert/FeedbackAlert/MWMFeedbackAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/FeedbackAlert/MWMFeedbackAlert.xib @@ -97,13 +97,14 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="later"/> + <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="buttonBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="notNowButtonTap:" destination="5Qh-Eb-f57" eventType="touchUpInside" id="Yx7-AX-VSc"/> </connections> </button> </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="backgroundColor" white="1" alpha="0.88" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="centerX" secondItem="HkY-pH-oLW" secondAttribute="centerX" id="8eR-Mw-Ga1"/> <constraint firstAttribute="width" constant="280" id="HPO-37-NMh"/> @@ -131,6 +132,7 @@ <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> <integer key="value" value="4"/> </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib b/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib index 87155e6144..eeeb6bb9e1 100644 --- a/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib @@ -80,6 +80,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="ok"/> + <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="buttonBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="settingsTap" destination="mnY-7K-ids" eventType="touchUpInside" id="y48-t3-n6f"/> @@ -145,7 +146,7 @@ <nil key="highlightedColor"/> </label> </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="backgroundColor" white="1" alpha="0.88" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="bottom" secondItem="opl-lk-5kD" secondAttribute="bottom" id="0Mz-4Z-230"/> <constraint firstAttribute="width" secondItem="oy8-sO-eim" secondAttribute="width" id="3MR-Nx-zJb"/> @@ -189,6 +190,7 @@ <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> <integer key="value" value="4"/> </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib index 681d2ba040..946fcc7c63 100644 --- a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib @@ -168,6 +168,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="later"/> + <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="buttonBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="notNowTap" destination="rvp-tn-CXj" eventType="touchUpInside" id="C51-Jm-q13"/> @@ -181,7 +182,7 @@ </constraints> </view> </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="backgroundColor" white="1" alpha="0.88" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="centerX" secondItem="w1i-if-5aJ" secondAttribute="centerX" id="0cw-Qe-tNn"/> <constraint firstAttribute="centerX" secondItem="NX8-QL-ibo" secondAttribute="centerX" id="2re-A3-YeS"/> @@ -208,6 +209,7 @@ <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> <integer key="value" value="4"/> </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib index 3e6ca62d8f..372d573f9e 100644 --- a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib @@ -72,13 +72,14 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="ok"/> + <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="buttonBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="okTap" destination="Ie9-JJ-hnZ" eventType="touchUpInside" id="vfz-Rd-Kh6"/> </connections> </button> </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="backgroundColor" white="1" alpha="0.88" colorSpace="calibratedWhite"/> <constraints> <constraint firstItem="lbr-Xd-hLF" firstAttribute="top" secondItem="S3s-j7-v6E" secondAttribute="bottom" constant="11" id="20T-2E-mmf"/> <constraint firstAttribute="width" secondItem="XIL-q9-MMp" secondAttribute="width" id="3m7-Ha-HlN"/> @@ -102,6 +103,7 @@ <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> <integer key="value" value="4"/> </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> |