diff options
author | v.mikhaylenko <v.mikhaylenko@corp.mail.ru> | 2015-07-16 18:19:33 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:56:45 +0300 |
commit | dad7e3bf7b386adb1d4376eec2037a1e73590658 (patch) | |
tree | 90c513ae96d95c151c6326e239bc97ca7698c973 /iphone/Maps/Classes/CustomAlert | |
parent | 0022919fe978c146940a8d483953eb2dae842ad1 (diff) |
[ios] Fixed bugs with wrong font in iOS7.
Diffstat (limited to 'iphone/Maps/Classes/CustomAlert')
8 files changed, 26 insertions, 22 deletions
diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib index aa8ccfe0f4..123ac1c2e1 100644 --- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib @@ -7,6 +7,7 @@ <customFonts key="customFonts"> <mutableArray key="HelveticaNeue.ttc"> <string>HelveticaNeue-Medium</string> + <string>HelveticaNeue-Medium</string> </mutableArray> </customFonts> <objects> @@ -35,7 +36,7 @@ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="dG8-qs-ZWQ"/> <constraint firstAttribute="width" constant="240" id="wbf-hD-V6a"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> @@ -52,7 +53,7 @@ <constraint firstAttribute="width" constant="140" id="4bW-b0-naB"/> <constraint firstAttribute="height" constant="44" id="RRQ-jI-El3"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="17"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="left"> <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> @@ -71,7 +72,7 @@ <constraint firstAttribute="width" constant="140" id="C3i-gd-pxv"/> <constraint firstAttribute="height" constant="44" id="dta-cI-rDi"/> </constraints> - <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/> + <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="right"> <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib index deafd6cd78..91a2b5bf74 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib @@ -7,6 +7,7 @@ <customFonts key="customFonts"> <mutableArray key="HelveticaNeue.ttc"> <string>HelveticaNeue-Medium</string> + <string>HelveticaNeue-Medium</string> </mutableArray> </customFonts> <objects> @@ -39,7 +40,7 @@ <constraint firstAttribute="width" constant="234" id="YLG-PG-WHS"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="17" id="iOI-5t-pEY"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> @@ -74,7 +75,7 @@ <constraint firstAttribute="width" constant="140" id="1Io-1t-Odn"/> <constraint firstAttribute="height" constant="44" id="CeP-fJ-qZs"/> </constraints> - <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/> + <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="right"> <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> @@ -93,7 +94,7 @@ <constraint firstAttribute="height" constant="44" id="7gw-Uu-UEK"/> <constraint firstAttribute="width" constant="140" id="EMA-LM-Zje"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="17"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="left"> <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib index c3ae896803..0f1117101d 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib @@ -18,7 +18,7 @@ <constraints> <constraint firstAttribute="height" constant="17" id="u5A-6l-INO"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib index da92bffbf5..f11fded203 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib @@ -17,7 +17,7 @@ <constraint firstAttribute="width" constant="160" id="4WE-p5-RdF"/> <constraint firstAttribute="height" constant="16" id="FQE-Zk-gXr"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> @@ -41,7 +41,7 @@ <constraint firstAttribute="height" constant="16" id="7Hg-8z-e56"/> <constraint firstAttribute="width" constant="64" id="hct-Jz-zGl"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> diff --git a/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib b/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib index 8a02f958ca..fb4a988b12 100644 --- a/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib @@ -7,6 +7,7 @@ <customFonts key="customFonts"> <mutableArray key="HelveticaNeue.ttc"> <string>HelveticaNeue-Medium</string> + <string>HelveticaNeue-Medium</string> </mutableArray> </customFonts> <objects> @@ -38,7 +39,7 @@ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="3IZ-v6-CRJ"/> <constraint firstAttribute="width" constant="240" id="jJb-tA-140"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> @@ -58,7 +59,7 @@ <constraint firstAttribute="width" constant="140" id="VDv-Qe-qnS"/> <constraint firstAttribute="height" constant="44" id="q1N-JQ-1lI"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="17"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="left"> <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> @@ -77,7 +78,7 @@ <constraint firstAttribute="height" constant="44" id="A9k-kj-upS"/> <constraint firstAttribute="width" constant="140" id="BkJ-6q-bGV"/> </constraints> - <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/> + <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="right"> <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> diff --git a/iphone/Maps/Classes/CustomAlert/FeedbackAlert/MWMFeedbackAlert.xib b/iphone/Maps/Classes/CustomAlert/FeedbackAlert/MWMFeedbackAlert.xib index 43ae41db30..5a639ae884 100644 --- a/iphone/Maps/Classes/CustomAlert/FeedbackAlert/MWMFeedbackAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/FeedbackAlert/MWMFeedbackAlert.xib @@ -39,7 +39,7 @@ <constraint firstAttribute="width" constant="240" id="JLh-Dt-33i"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="QcM-hl-oy7"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> @@ -89,7 +89,7 @@ <constraints> <constraint firstAttribute="height" constant="44" id="V8r-6h-00E"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="17"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="left"> <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> diff --git a/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib b/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib index 9716b13b5f..87155e6144 100644 --- a/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib @@ -7,6 +7,7 @@ <customFonts key="customFonts"> <mutableArray key="HelveticaNeue.ttc"> <string>HelveticaNeue-Medium</string> + <string>HelveticaNeue-Medium</string> </mutableArray> </customFonts> <objects> @@ -35,7 +36,7 @@ <constraint firstAttribute="width" constant="240" id="bjX-A8-pbd"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="kX0-pg-KbR"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> @@ -52,7 +53,7 @@ <constraint firstAttribute="width" constant="140" id="Ant-We-sLi"/> <constraint firstAttribute="height" constant="44" id="eOg-pv-nif"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="17"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="left"> <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> @@ -71,7 +72,7 @@ <constraint firstAttribute="width" constant="140" id="5wg-5d-hPp"/> <constraint firstAttribute="height" constant="44" id="Mdl-Ix-DGD"/> </constraints> - <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/> + <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="right"> <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> @@ -119,7 +120,7 @@ <constraint firstAttribute="width" constant="204" id="4JO-6s-aaI"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="jD6-K3-YYh"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> @@ -129,7 +130,7 @@ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="AAw-Ri-mbT"/> <constraint firstAttribute="width" constant="204" id="cNm-sH-jni"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> @@ -139,7 +140,7 @@ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="bIH-9x-S0s"/> <constraint firstAttribute="width" constant="204" id="qBs-0m-j1B"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> diff --git a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib index 7524d9930d..79c41ce2b6 100644 --- a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib @@ -38,7 +38,7 @@ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="1Yg-tK-x6N"/> <constraint firstAttribute="width" constant="240" id="Glz-r1-VJI"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> @@ -160,7 +160,7 @@ <constraints> <constraint firstAttribute="height" constant="44" id="kL9-Iu-9e1"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="17"/> + <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="left"> <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> |