diff --git a/iphone/Maps/MWMAboutController.mm b/iphone/Maps/MWMAboutController.mm index a5c82fd5f1..ea1094b7bf 100644 --- a/iphone/Maps/MWMAboutController.mm +++ b/iphone/Maps/MWMAboutController.mm @@ -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]; diff --git a/iphone/Maps/MWMAboutControllerHeader.xib b/iphone/Maps/MWMAboutControllerHeader.xib new file mode 100644 index 0000000000..05993bce30 --- /dev/null +++ b/iphone/Maps/MWMAboutControllerHeader.xib @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index a3a4a51a78..dcb7e9a168 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -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 = ""; }; 34A62D4C1C903533007FDCB7 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Fabric.framework; path = Frameworks/Fabric.framework; sourceTree = ""; }; 34A62D4D1C903533007FDCB7 /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Crashlytics.framework; path = Frameworks/Crashlytics.framework; sourceTree = ""; }; + 34AA09D61DC3A14A002E8083 /* MWMAboutControllerHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMAboutControllerHeader.xib; sourceTree = ""; }; 34AA7D9D1D63543E00254037 /* MWMRouterSavedState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRouterSavedState.h; sourceTree = ""; }; 34AA7D9E1D63543E00254037 /* MWMRouterSavedState.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRouterSavedState.mm; sourceTree = ""; }; 34AB04B61CEC95B500CE8B36 /* MWMEditorAdditionalNamePlaceholderTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorAdditionalNamePlaceholderTableViewCell.xib; sourceTree = ""; }; @@ -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 */, diff --git a/iphone/Maps/Mapsme.storyboard b/iphone/Maps/Mapsme.storyboard index d6fd76059e..c9d7e0930b 100644 --- a/iphone/Maps/Mapsme.storyboard +++ b/iphone/Maps/Mapsme.storyboard @@ -1,8 +1,11 @@ - - + + + + + - + @@ -23,7 +26,7 @@ - + @@ -50,7 +53,7 @@ - + @@ -68,20 +71,21 @@ - + - + - + - + - + + @@ -521,13 +544,14 @@ - + - + + @@ -564,13 +589,14 @@ - + - +