pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Fixed settings «about» section layout. (#4589)

Browse source 
* [ios] Fixed settings «about» section layout.

* [ios] Fixed layout warnings.
This commit is contained in:
Илья Гречухин 2016-10-31 11:19:50 +03:00 • committed by Vlad Mihaylenko
parent f173aacda0
commit 7e2c86c579
4 changed files with 444 additions and 405 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
iphone/Maps/MWMAboutController.mm
View file

@ -26,6 +26,8 @@ extern NSString * const kAlohalyticsTapEventKey;
@property(weak, nonatomic) IBOutlet LinkCell * rateCell;
@property(weak, nonatomic) IBOutlet LinkCell * copyrightCell;
@property(nonatomic) IBOutlet UIView * headerView;
@end
@implementation MWMAboutController
@ -35,6 +37,9 @@ extern NSString * const kAlohalyticsTapEventKey;
[super viewDidLoad];
self.title = L(@"about_menu_title");
[[NSBundle mainBundle] loadNibNamed:@"MWMAboutControllerHeader" owner:self options:nil];
self.tableView.tableHeaderView = self.headerView;
AppInfo * appInfo = [AppInfo sharedInfo];
self.versionLabel.text = [NSString stringWithFormat:L(@"version"), appInfo.bundleVersion];

85
iphone/Maps/MWMAboutControllerHeader.xib Normal file
View file

@ -0,0 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMAboutController">
<connections>
<outlet property="headerView" destination="nNn-As-qvg" id="kwi-x5-YnF"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="nNn-As-qvg">
<rect key="frame" x="0.0" y="0.0" width="375" height="276"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="imgLogo" translatesAutoresizingMaskIntoConstraints="NO" id="MNH-d1-GMj">
<rect key="frame" x="128" y="24" width="120" height="120"/>
<constraints>
<constraint firstAttribute="height" constant="120" id="9ug-0X-yk5"/>
<constraint firstAttribute="width" constant="120" id="ClZ-bc-wQ3"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Версия 6.3.0.318" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eX4-Y6-p2e">
<rect key="frame" x="119" y="156" width="137" height="21"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Дата 16.08.2016" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2UY-CN-bbR">
<rect key="frame" x="137" y="181" width="101" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular13"/>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Объединив усилия Mail.Ru Group и данные OpenStreetMap, мы создаем незаменимое приложение для путешествий." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GEL-Bz-rHg">
<rect key="frame" x="8" y="205" width="359" height="47"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular13"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="about_description"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="MNH-d1-GMj" firstAttribute="top" secondItem="nNn-As-qvg" secondAttribute="top" constant="24" id="4Yk-N8-0X2"/>
<constraint firstItem="GEL-Bz-rHg" firstAttribute="centerX" secondItem="nNn-As-qvg" secondAttribute="centerX" id="6vn-WQ-qNy"/>
<constraint firstAttribute="trailing" secondItem="GEL-Bz-rHg" secondAttribute="trailing" constant="8" id="8IJ-ww-y0j"/>
<constraint firstItem="GEL-Bz-rHg" firstAttribute="top" secondItem="2UY-CN-bbR" secondAttribute="bottom" constant="8" id="AXP-EC-LMU"/>
<constraint firstItem="GEL-Bz-rHg" firstAttribute="leading" secondItem="nNn-As-qvg" secondAttribute="leading" constant="8" id="Fho-8h-fz5"/>
<constraint firstItem="MNH-d1-GMj" firstAttribute="centerX" secondItem="nNn-As-qvg" secondAttribute="centerX" id="ORf-Qo-mSu"/>
<constraint firstAttribute="bottom" secondItem="GEL-Bz-rHg" secondAttribute="bottom" constant="24" id="OgM-Is-GbO"/>
<constraint firstItem="2UY-CN-bbR" firstAttribute="top" secondItem="eX4-Y6-p2e" secondAttribute="bottom" constant="4" id="XUm-iH-rab"/>
<constraint firstItem="eX4-Y6-p2e" firstAttribute="centerX" secondItem="nNn-As-qvg" secondAttribute="centerX" id="jgK-Ga-gbr"/>
<constraint firstItem="eX4-Y6-p2e" firstAttribute="top" secondItem="MNH-d1-GMj" secondAttribute="bottom" constant="12" id="tbq-yy-OGh"/>
<constraint firstItem="2UY-CN-bbR" firstAttribute="centerX" secondItem="nNn-As-qvg" secondAttribute="centerX" id="zBm-aI-8kB"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/>
</userDefinedRuntimeAttributes>
<point key="canvasLocation" x="131" y="-39"/>
</view>
</objects>
<resources>
<image name="imgLogo" width="120" height="120"/>
</resources>
</document>

6
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -227,6 +227,8 @@
34A62D4F1C903533007FDCB7 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A62D4C1C903533007FDCB7 /* Fabric.framework */; };
34A62D501C903533007FDCB7 /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A62D4D1C903533007FDCB7 /* Crashlytics.framework */; };
34A62D511C903533007FDCB7 /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A62D4D1C903533007FDCB7 /* Crashlytics.framework */; };
34AA09D71DC3A14A002E8083 /* MWMAboutControllerHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AA09D61DC3A14A002E8083 /* MWMAboutControllerHeader.xib */; };
34AA09D81DC3A14A002E8083 /* MWMAboutControllerHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AA09D61DC3A14A002E8083 /* MWMAboutControllerHeader.xib */; };
34AA7D9F1D63543E00254037 /* MWMRouterSavedState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AA7D9E1D63543E00254037 /* MWMRouterSavedState.mm */; };
34AA7DA01D63543E00254037 /* MWMRouterSavedState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AA7D9E1D63543E00254037 /* MWMRouterSavedState.mm */; };
34AB04B71CEC95B500CE8B36 /* MWMEditorAdditionalNamePlaceholderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB04B61CEC95B500CE8B36 /* MWMEditorAdditionalNamePlaceholderTableViewCell.xib */; };
@ -1171,6 +1173,7 @@
349CCECD1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MWMWhatsNewProfileBookingController.mm; path = Welcome/MWMWhatsNewProfileBookingController.mm; sourceTree = "<group>"; };
34A62D4C1C903533007FDCB7 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Fabric.framework; path = Frameworks/Fabric.framework; sourceTree = "<group>"; };
34A62D4D1C903533007FDCB7 /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Crashlytics.framework; path = Frameworks/Crashlytics.framework; sourceTree = "<group>"; };
34AA09D61DC3A14A002E8083 /* MWMAboutControllerHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMAboutControllerHeader.xib; sourceTree = "<group>"; };
34AA7D9D1D63543E00254037 /* MWMRouterSavedState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRouterSavedState.h; sourceTree = "<group>"; };
34AA7D9E1D63543E00254037 /* MWMRouterSavedState.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRouterSavedState.mm; sourceTree = "<group>"; };
34AB04B61CEC95B500CE8B36 /* MWMEditorAdditionalNamePlaceholderTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorAdditionalNamePlaceholderTableViewCell.xib; sourceTree = "<group>"; };
@ -3364,6 +3367,7 @@
34B104211D6EE45700C8B577 /* MWMUnitsController.mm */,
34B104241D6F040E00C8B577 /* MWMAboutController.h */,
34B104251D6F040E00C8B577 /* MWMAboutController.mm */,
34AA09D61DC3A14A002E8083 /* MWMAboutControllerHeader.xib */,
348C26031D701B9F00813924 /* MWMHelpController.h */,
348C26041D701B9F00813924 /* MWMHelpController.mm */,
);
@ -3579,6 +3583,7 @@
34F9FB921C43AF2400F71201 /* MWMStreetEditorEditTableViewCell.xib in Resources */,
F634C8F01D79994900BE04E2 /* _MWMPPPTitle.xib in Resources */,
6B653B941C7F2DE4007BEFC5 /* cuisine-strings in Resources */,
34AA09D71DC3A14A002E8083 /* MWMAboutControllerHeader.xib in Resources */,
34B6CF5D1BBBFC6B009203C6 /* LaunchScreen.storyboard in Resources */,
3476B8DC1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */,
978D4A31199A11E600D72CA7 /* faq.html in Resources */,
@ -3737,6 +3742,7 @@
345FD7E41CEC7B0C00F58045 /* MWMEditorAddAdditionalNameTableViewCell.xib in Resources */,
6B9978361C89A316003B8AA0 /* editor.config in Resources */,
9DA46A151C47E95700EF52BA /* resources-6plus_legacy in Resources */,
34AA09D81DC3A14A002E8083 /* MWMAboutControllerHeader.xib in Resources */,
347FD8721C60B2CE002FB65E /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */,
34F9FB931C43AF2400F71201 /* MWMStreetEditorEditTableViewCell.xib in Resources */,
6741A9651BF340DE002C974C /* LocalNotifications.plist in Resources */,

753
iphone/Maps/Mapsme.storyboard
View file

File diff suppressed because it is too large Load diff