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

Merge pull request #5218 from igrechuhin/storyboard

Browse source 
[storyboard] [ios] Storyboard menagement cleanup.
This commit is contained in:
Vlad Mihaylenko 2017-01-18 12:44:36 +03:00 • committed by GitHub
commit b0023612ff
17 changed files with 103 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Categories/UIViewController+Navigation.h
View file

@ -6,6 +6,4 @@
- (UIBarButtonItem *)buttonWithImage:(UIImage *)image action:(SEL)action;
- (NSArray<UIBarButtonItem *> *)alignedNavBarButtonItems:(NSArray<UIBarButtonItem *> *)items;
+ (UIStoryboard *)mainStoryboard;
@end

2
iphone/Maps/Categories/UIViewController+Navigation.mm
View file

@ -45,5 +45,5 @@ CGFloat constexpr kButtonExtraWidth = 16.0;
}
- (void)backTap { [self.navigationController popViewControllerAnimated:YES]; }
+ (UIStoryboard *)mainStoryboard { return [UIStoryboard storyboardWithName:@"Mapsme" bundle:nil]; }
@end

2
iphone/Maps/MAPSME.plist
View file

@ -191,7 +191,7 @@
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Mapsme</string>
<string>Main</string>
<key>UIPrerenderedIcon</key>
<true/>
<key>UIStatusBarHidden</key>

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

@ -111,6 +111,27 @@
3406FA191C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3406FA171C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib */; };
340837131B7243CE00B5C185 /* MWMActivityViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837121B7243CE00B5C185 /* MWMActivityViewController.mm */; };
340837161B72451A00B5C185 /* MWMShareActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837151B72451A00B5C185 /* MWMShareActivityItem.mm */; };
340E1EEB1E2F614400CE49BF /* Authorization.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE41E2F614400CE49BF /* Authorization.storyboard */; };
340E1EEC1E2F614400CE49BF /* Authorization.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE41E2F614400CE49BF /* Authorization.storyboard */; };
340E1EED1E2F614400CE49BF /* Authorization.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE41E2F614400CE49BF /* Authorization.storyboard */; };
340E1EEE1E2F614400CE49BF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE51E2F614400CE49BF /* LaunchScreen.storyboard */; };
340E1EEF1E2F614400CE49BF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE51E2F614400CE49BF /* LaunchScreen.storyboard */; };
340E1EF01E2F614400CE49BF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE51E2F614400CE49BF /* LaunchScreen.storyboard */; };
340E1EF11E2F614400CE49BF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE61E2F614400CE49BF /* Main.storyboard */; };
340E1EF21E2F614400CE49BF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE61E2F614400CE49BF /* Main.storyboard */; };
340E1EF31E2F614400CE49BF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE61E2F614400CE49BF /* Main.storyboard */; };
340E1EF41E2F614400CE49BF /* SearchFilters.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE71E2F614400CE49BF /* SearchFilters.storyboard */; };
340E1EF51E2F614400CE49BF /* SearchFilters.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE71E2F614400CE49BF /* SearchFilters.storyboard */; };
340E1EF61E2F614400CE49BF /* SearchFilters.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE71E2F614400CE49BF /* SearchFilters.storyboard */; };
340E1EF71E2F614400CE49BF /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE81E2F614400CE49BF /* Settings.storyboard */; };
340E1EF81E2F614400CE49BF /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE81E2F614400CE49BF /* Settings.storyboard */; };
340E1EF91E2F614400CE49BF /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE81E2F614400CE49BF /* Settings.storyboard */; };
340E1EFA1E2F614400CE49BF /* Storyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340E1EE91E2F614400CE49BF /* Storyboard.swift */; };
340E1EFB1E2F614400CE49BF /* Storyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340E1EE91E2F614400CE49BF /* Storyboard.swift */; };
340E1EFC1E2F614400CE49BF /* Storyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340E1EE91E2F614400CE49BF /* Storyboard.swift */; };
340E1EFD1E2F614400CE49BF /* Welcome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EEA1E2F614400CE49BF /* Welcome.storyboard */; };
340E1EFE1E2F614400CE49BF /* Welcome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EEA1E2F614400CE49BF /* Welcome.storyboard */; };
340E1EFF1E2F614400CE49BF /* Welcome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EEA1E2F614400CE49BF /* Welcome.storyboard */; };
3411387D1C15AE73002E3B3E /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3411387C1C15AE73002E3B3E /* libeditor.a */; };
341522BF1B666A550077AA8F /* MWMAPIBarView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 341522BE1B666A550077AA8F /* MWMAPIBarView.mm */; };
341876B41C28026D005A0C9A /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 454040681AD2D8D2007A9B12 /* CoreVideo.framework */; };
@ -229,9 +250,6 @@
3490D2E11CE9DD2500D0B838 /* MWMSideButtonsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3490D2DC1CE9DD2500D0B838 /* MWMSideButtonsView.mm */; };
3490D2E21CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3490D2DD1CE9DD2500D0B838 /* MWMSideButtonsView.xib */; };
3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3490D2DD1CE9DD2500D0B838 /* MWMSideButtonsView.xib */; };
34943BB21E2620C600B14F84 /* Welcome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34943BB11E2620C600B14F84 /* Welcome.storyboard */; };
34943BB31E2620C600B14F84 /* Welcome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34943BB11E2620C600B14F84 /* Welcome.storyboard */; };
34943BB41E2620C600B14F84 /* Welcome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34943BB11E2620C600B14F84 /* Welcome.storyboard */; };
34943BB61E26222300B14F84 /* WelcomeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34943BB51E26222300B14F84 /* WelcomeProtocol.swift */; };
34943BB71E26222300B14F84 /* WelcomeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34943BB51E26222300B14F84 /* WelcomeProtocol.swift */; };
34943BB81E26222300B14F84 /* WelcomeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34943BB51E26222300B14F84 /* WelcomeProtocol.swift */; };
@ -296,8 +314,6 @@
34ABA62C1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA62B1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm */; };
34ABA62D1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA62B1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm */; };
34ABA6301C2D58F300FE1BEC /* MWMInputEmailValidator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA62F1C2D58F300FE1BEC /* MWMInputEmailValidator.mm */; };
34B7D4E11DE5903E00BE2309 /* Authorization.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34B7D4E01DE5903E00BE2309 /* Authorization.storyboard */; };
34B7D4E21DE5903E00BE2309 /* Authorization.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34B7D4E01DE5903E00BE2309 /* Authorization.storyboard */; };
34B924421DC8A29C0008D971 /* MWMMailViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B924411DC8A29C0008D971 /* MWMMailViewController.mm */; };
34B924431DC8A29C0008D971 /* MWMMailViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B924411DC8A29C0008D971 /* MWMMailViewController.mm */; };
34BC72241B0DECAE0012A34B /* MWMMapViewControlsManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */; };
@ -314,9 +330,6 @@
34CA57191C292F50004D9C89 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C9864B186C5EAA00AF7E9E /* MediaPlayer.framework */; };
34D15BA81BD8F93C00C8BCBE /* AddSetTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34D15BA61BD8F93C00C8BCBE /* AddSetTableViewCell.mm */; };
34D15BA91BD8F93C00C8BCBE /* AddSetTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D15BA71BD8F93C00C8BCBE /* AddSetTableViewCell.xib */; };
34D4FA5A1E2642FB003F53EF /* Storyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA591E2642FB003F53EF /* Storyboard.swift */; };
34D4FA5B1E2642FB003F53EF /* Storyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA591E2642FB003F53EF /* Storyboard.swift */; };
34D4FA5C1E2642FB003F53EF /* Storyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA591E2642FB003F53EF /* Storyboard.swift */; };
34D4FA621E26572D003F53EF /* FirstLaunchController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA611E26572D003F53EF /* FirstLaunchController.swift */; };
34D4FA631E26572D003F53EF /* FirstLaunchController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA611E26572D003F53EF /* FirstLaunchController.swift */; };
34D4FA641E26572D003F53EF /* FirstLaunchController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA611E26572D003F53EF /* FirstLaunchController.swift */; };
@ -513,7 +526,6 @@
849CF5E61DE842290024A8A5 /* patterns.txt in Resources */ = {isa = PBXBuildFile; fileRef = 451950391B7A3E070085DA05 /* patterns.txt */; };
849CF5E71DE842290024A8A5 /* MWMSearchNoResultsAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346225901DDC5FBA001E8752 /* MWMSearchNoResultsAlert.xib */; };
849CF5E81DE842290024A8A5 /* MWMPlaceDoesntExistAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6FE3C3A1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib */; };
849CF5E91DE842290024A8A5 /* Authorization.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34B7D4E01DE5903E00BE2309 /* Authorization.storyboard */; };
849CF5EA1DE842290024A8A5 /* sound-strings in Resources */ = {isa = PBXBuildFile; fileRef = 5605022E1B6211E100169CAD /* sound-strings */; };
849CF5EC1DE842290024A8A5 /* colors.txt in Resources */ = {isa = PBXBuildFile; fileRef = 452FCA3A1B6A3DF7007019AB /* colors.txt */; };
849CF5ED1DE842290024A8A5 /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0511D6AC0D00645242 /* classificator.txt */; };
@ -1011,12 +1023,6 @@
F6E2FE301E097BA00083EBEC /* MWMStreetEditorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC871E097B9F0083EBEC /* MWMStreetEditorViewController.mm */; };
F6E2FE311E097BA00083EBEC /* MWMStreetEditorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC871E097B9F0083EBEC /* MWMStreetEditorViewController.mm */; };
F6E2FE321E097BA00083EBEC /* MWMStreetEditorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC871E097B9F0083EBEC /* MWMStreetEditorViewController.mm */; };
F6E2FE331E097BA00083EBEC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC881E097B9F0083EBEC /* LaunchScreen.storyboard */; };
F6E2FE341E097BA00083EBEC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC881E097B9F0083EBEC /* LaunchScreen.storyboard */; };
F6E2FE351E097BA00083EBEC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC881E097B9F0083EBEC /* LaunchScreen.storyboard */; };
F6E2FE361E097BA00083EBEC /* Mapsme.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC891E097B9F0083EBEC /* Mapsme.storyboard */; };
F6E2FE371E097BA00083EBEC /* Mapsme.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC891E097B9F0083EBEC /* Mapsme.storyboard */; };
F6E2FE381E097BA00083EBEC /* Mapsme.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC891E097B9F0083EBEC /* Mapsme.storyboard */; };
F6E2FE391E097BA00083EBEC /* MWMMigrationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC8C1E097B9F0083EBEC /* MWMMigrationView.mm */; };
F6E2FE3A1E097BA00083EBEC /* MWMMigrationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC8C1E097B9F0083EBEC /* MWMMigrationView.mm */; };
F6E2FE3B1E097BA00083EBEC /* MWMMigrationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC8C1E097B9F0083EBEC /* MWMMigrationView.mm */; };
@ -1158,9 +1164,6 @@
F6E2FEC31E097BA00083EBEC /* MWMSearchFilterPresentationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCE71E097B9F0083EBEC /* MWMSearchFilterPresentationController.mm */; };
F6E2FEC41E097BA00083EBEC /* MWMSearchFilterPresentationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCE71E097B9F0083EBEC /* MWMSearchFilterPresentationController.mm */; };
F6E2FEC51E097BA00083EBEC /* MWMSearchFilterPresentationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCE71E097B9F0083EBEC /* MWMSearchFilterPresentationController.mm */; };
F6E2FEC61E097BA00083EBEC /* MWMSearchFilters.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCE81E097B9F0083EBEC /* MWMSearchFilters.storyboard */; };
F6E2FEC71E097BA00083EBEC /* MWMSearchFilters.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCE81E097B9F0083EBEC /* MWMSearchFilters.storyboard */; };
F6E2FEC81E097BA00083EBEC /* MWMSearchFilters.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCE81E097B9F0083EBEC /* MWMSearchFilters.storyboard */; };
F6E2FEC91E097BA00083EBEC /* MWMSearchFilterTransitioning.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEA1E097B9F0083EBEC /* MWMSearchFilterTransitioning.mm */; };
F6E2FECA1E097BA00083EBEC /* MWMSearchFilterTransitioning.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEA1E097B9F0083EBEC /* MWMSearchFilterTransitioning.mm */; };
F6E2FECB1E097BA00083EBEC /* MWMSearchFilterTransitioning.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEA1E097B9F0083EBEC /* MWMSearchFilterTransitioning.mm */; };
@ -1323,9 +1326,6 @@
F6E2FF681E097BA00083EBEC /* MWMUnitsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD4D1E097BA00083EBEC /* MWMUnitsController.mm */; };
F6E2FF691E097BA00083EBEC /* MWMUnitsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD4D1E097BA00083EBEC /* MWMUnitsController.mm */; };
F6E2FF6A1E097BA00083EBEC /* MWMUnitsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD4D1E097BA00083EBEC /* MWMUnitsController.mm */; };
F6E2FF6B1E097BA00083EBEC /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD4E1E097BA00083EBEC /* Settings.storyboard */; };
F6E2FF6C1E097BA00083EBEC /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD4E1E097BA00083EBEC /* Settings.storyboard */; };
F6E2FF6D1E097BA00083EBEC /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD4E1E097BA00083EBEC /* Settings.storyboard */; };
F6F7787A1DABC6D800B603E7 /* MWMTaxiCollectionLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6F778791DABC6D800B603E7 /* MWMTaxiCollectionLayout.mm */; };
F6FE3C381CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm */; };
F6FE3C391CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm */; };
@ -1461,6 +1461,13 @@
340837141B72451A00B5C185 /* MWMShareActivityItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMShareActivityItem.h; sourceTree = "<group>"; };
340837151B72451A00B5C185 /* MWMShareActivityItem.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMShareActivityItem.mm; sourceTree = "<group>"; };
340DC82B1C4E72C700EAA2CC /* liboauthcpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liboauthcpp.a; path = "../../../omim-xcode-build/Debug/liboauthcpp.a"; sourceTree = "<group>"; };
340E1EE41E2F614400CE49BF /* Authorization.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Authorization.storyboard; sourceTree = "<group>"; };
340E1EE51E2F614400CE49BF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
340E1EE61E2F614400CE49BF /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
340E1EE71E2F614400CE49BF /* SearchFilters.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SearchFilters.storyboard; sourceTree = "<group>"; };
340E1EE81E2F614400CE49BF /* Settings.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Settings.storyboard; sourceTree = "<group>"; };
340E1EE91E2F614400CE49BF /* Storyboard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Storyboard.swift; sourceTree = "<group>"; };
340E1EEA1E2F614400CE49BF /* Welcome.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Welcome.storyboard; sourceTree = "<group>"; };
3411387C1C15AE73002E3B3E /* libeditor.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeditor.a; path = "../../../omim-xcode-build/Debug/libeditor.a"; sourceTree = "<group>"; };
341522BD1B666A550077AA8F /* MWMAPIBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAPIBarView.h; sourceTree = "<group>"; };
341522BE1B666A550077AA8F /* MWMAPIBarView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAPIBarView.mm; sourceTree = "<group>"; };
@ -1547,7 +1554,6 @@
3490D2DB1CE9DD2500D0B838 /* MWMSideButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSideButtonsView.h; sourceTree = "<group>"; };
3490D2DC1CE9DD2500D0B838 /* MWMSideButtonsView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSideButtonsView.mm; sourceTree = "<group>"; };
3490D2DD1CE9DD2500D0B838 /* MWMSideButtonsView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSideButtonsView.xib; sourceTree = "<group>"; };
34943BB11E2620C600B14F84 /* Welcome.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Welcome.storyboard; sourceTree = "<group>"; };
34943BB51E26222300B14F84 /* WelcomeProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WelcomeProtocol.swift; sourceTree = "<group>"; };
34943BB91E2626B200B14F84 /* WelcomePageController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WelcomePageController.swift; sourceTree = "<group>"; };
3497A9361B5CF8A900F51E55 /* MWMNavigationDashboardManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardManager.h; sourceTree = "<group>"; };
@ -1594,7 +1600,6 @@
34ABA62B1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMInputPasswordValidator.mm; sourceTree = "<group>"; };
34ABA62E1C2D58F300FE1BEC /* MWMInputEmailValidator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMInputEmailValidator.h; sourceTree = "<group>"; };
34ABA62F1C2D58F300FE1BEC /* MWMInputEmailValidator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMInputEmailValidator.mm; sourceTree = "<group>"; };
34B7D4E01DE5903E00BE2309 /* Authorization.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Authorization.storyboard; sourceTree = "<group>"; };
34B924401DC8A29C0008D971 /* MWMMailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMailViewController.h; sourceTree = "<group>"; };
34B924411DC8A29C0008D971 /* MWMMailViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMailViewController.mm; sourceTree = "<group>"; };
34BC72101B0DECAE0012A34B /* MWMMapViewControlsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapViewControlsManager.h; sourceTree = "<group>"; };
@ -1612,7 +1617,6 @@
34D15BA51BD8F93C00C8BCBE /* AddSetTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddSetTableViewCell.h; sourceTree = "<group>"; };
34D15BA61BD8F93C00C8BCBE /* AddSetTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AddSetTableViewCell.mm; sourceTree = "<group>"; };
34D15BA71BD8F93C00C8BCBE /* AddSetTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddSetTableViewCell.xib; sourceTree = "<group>"; };
34D4FA591E2642FB003F53EF /* Storyboard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Storyboard.swift; sourceTree = "<group>"; };
34D4FA611E26572D003F53EF /* FirstLaunchController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirstLaunchController.swift; sourceTree = "<group>"; };
34D4FA651E265749003F53EF /* WhatsNewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WhatsNewController.swift; sourceTree = "<group>"; };
34F73F601E082FF700AC1FD6 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@ -1978,8 +1982,6 @@
F6E2FC851E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMStreetEditorEditTableViewCell.xib; sourceTree = "<group>"; };
F6E2FC861E097B9F0083EBEC /* MWMStreetEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMStreetEditorViewController.h; sourceTree = "<group>"; };
F6E2FC871E097B9F0083EBEC /* MWMStreetEditorViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMStreetEditorViewController.mm; sourceTree = "<group>"; };
F6E2FC881E097B9F0083EBEC /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
F6E2FC891E097B9F0083EBEC /* Mapsme.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Mapsme.storyboard; sourceTree = "<group>"; };
F6E2FC8B1E097B9F0083EBEC /* MWMMigrationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMigrationView.h; sourceTree = "<group>"; };
F6E2FC8C1E097B9F0083EBEC /* MWMMigrationView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMigrationView.mm; sourceTree = "<group>"; };
F6E2FC8D1E097B9F0083EBEC /* MWMMigrationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMigrationViewController.h; sourceTree = "<group>"; };
@ -2056,7 +2058,6 @@
F6E2FCE41E097B9F0083EBEC /* MWMConsole.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMConsole.mm; sourceTree = "<group>"; };
F6E2FCE61E097B9F0083EBEC /* MWMSearchFilterPresentationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchFilterPresentationController.h; sourceTree = "<group>"; };
F6E2FCE71E097B9F0083EBEC /* MWMSearchFilterPresentationController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchFilterPresentationController.mm; sourceTree = "<group>"; };
F6E2FCE81E097B9F0083EBEC /* MWMSearchFilters.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MWMSearchFilters.storyboard; sourceTree = "<group>"; };
F6E2FCE91E097B9F0083EBEC /* MWMSearchFilterTransitioning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchFilterTransitioning.h; sourceTree = "<group>"; };
F6E2FCEA1E097B9F0083EBEC /* MWMSearchFilterTransitioning.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchFilterTransitioning.mm; sourceTree = "<group>"; };
F6E2FCEB1E097B9F0083EBEC /* MWMSearchFilterTransitioningManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchFilterTransitioningManager.h; sourceTree = "<group>"; };
@ -2150,7 +2151,6 @@
F6E2FD4B1E097BA00083EBEC /* MWMTTSSettingsViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTTSSettingsViewController.mm; sourceTree = "<group>"; };
F6E2FD4C1E097BA00083EBEC /* MWMUnitsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMUnitsController.h; sourceTree = "<group>"; };
F6E2FD4D1E097BA00083EBEC /* MWMUnitsController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMUnitsController.mm; sourceTree = "<group>"; };
F6E2FD4E1E097BA00083EBEC /* Settings.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Settings.storyboard; sourceTree = "<group>"; };
F6F778781DABC6D800B603E7 /* MWMTaxiCollectionLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTaxiCollectionLayout.h; sourceTree = "<group>"; };
F6F778791DABC6D800B603E7 /* MWMTaxiCollectionLayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTaxiCollectionLayout.mm; sourceTree = "<group>"; };
F6FE3C361CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlaceDoesntExistAlert.h; sourceTree = "<group>"; };
@ -2432,7 +2432,6 @@
6B653B931C7F2DE4007BEFC5 /* cuisine-strings */,
4A300ED31C6DCFD400140018 /* countries-strings */,
5605022E1B6211E100169CAD /* sound-strings */,
34B7D4E01DE5903E00BE2309 /* Authorization.storyboard */,
);
name = Resources;
sourceTree = "<group>";
@ -2678,6 +2677,20 @@
path = Share;
sourceTree = "<group>";
};
340E1EE31E2F614400CE49BF /* Storyboard */ = {
isa = PBXGroup;
children = (
340E1EE41E2F614400CE49BF /* Authorization.storyboard */,
340E1EE51E2F614400CE49BF /* LaunchScreen.storyboard */,
340E1EE61E2F614400CE49BF /* Main.storyboard */,
340E1EE71E2F614400CE49BF /* SearchFilters.storyboard */,
340E1EE81E2F614400CE49BF /* Settings.storyboard */,
340E1EE91E2F614400CE49BF /* Storyboard.swift */,
340E1EEA1E2F614400CE49BF /* Welcome.storyboard */,
);
path = Storyboard;
sourceTree = "<group>";
};
3454D7981E07F045004AF2AD /* Categories */ = {
isa = PBXGroup;
children = (
@ -2861,7 +2874,6 @@
34943BB01E2620C600B14F84 /* Welcome */ = {
isa = PBXGroup;
children = (
34943BB11E2620C600B14F84 /* Welcome.storyboard */,
34943BB51E26222300B14F84 /* WelcomeProtocol.swift */,
34943BB91E2626B200B14F84 /* WelcomePageController.swift */,
34D4FA611E26572D003F53EF /* FirstLaunchController.swift */,
@ -3264,13 +3276,11 @@
F6E2FBFC1E097B9F0083EBEC /* Downloader */,
F6E2FC291E097B9F0083EBEC /* EditBookmark */,
F6E2FC321E097B9F0083EBEC /* Editor */,
F6E2FC881E097B9F0083EBEC /* LaunchScreen.storyboard */,
F6E2FC891E097B9F0083EBEC /* Mapsme.storyboard */,
F6E2FC8A1E097B9F0083EBEC /* Migration */,
F6E2FC8F1E097B9F0083EBEC /* PlacePage */,
F6E2FCE11E097B9F0083EBEC /* Search */,
F6E2FD361E097BA00083EBEC /* Settings */,
34D4FA591E2642FB003F53EF /* Storyboard.swift */,
340E1EE31E2F614400CE49BF /* Storyboard */,
349D1AB51E2CB407004A2006 /* VisibleArea */,
34943BB01E2620C600B14F84 /* Welcome */,
);
@ -3726,7 +3736,6 @@
children = (
F6E2FCE61E097B9F0083EBEC /* MWMSearchFilterPresentationController.h */,
F6E2FCE71E097B9F0083EBEC /* MWMSearchFilterPresentationController.mm */,
F6E2FCE81E097B9F0083EBEC /* MWMSearchFilters.storyboard */,
F6E2FCE91E097B9F0083EBEC /* MWMSearchFilterTransitioning.h */,
F6E2FCEA1E097B9F0083EBEC /* MWMSearchFilterTransitioning.mm */,
F6E2FCEB1E097B9F0083EBEC /* MWMSearchFilterTransitioningManager.h */,
@ -3854,7 +3863,6 @@
F6E2FD4B1E097BA00083EBEC /* MWMTTSSettingsViewController.mm */,
F6E2FD4C1E097BA00083EBEC /* MWMUnitsController.h */,
F6E2FD4D1E097BA00083EBEC /* MWMUnitsController.mm */,
F6E2FD4E1E097BA00083EBEC /* Settings.storyboard */,
);
path = Settings;
sourceTree = "<group>";
@ -4125,9 +4133,7 @@
F6E2FEED1E097BA00083EBEC /* MWMSearchView.xib in Resources */,
F6E2FDA91E097BA00083EBEC /* MWMButtonCell.xib in Resources */,
F6FE3C3B1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib in Resources */,
34B7D4E11DE5903E00BE2309 /* Authorization.storyboard in Resources */,
5605022F1B6211E100169CAD /* sound-strings in Resources */,
34943BB21E2620C600B14F84 /* Welcome.storyboard in Resources */,
452FCA3B1B6A3DF7007019AB /* colors.txt in Resources */,
EE026F0611D6AC0D00645242 /* classificator.txt in Resources */,
F6E2FD6D1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.xib in Resources */,
@ -4136,7 +4142,7 @@
4A23D15C1B8B4DD700D4EB6F /* resources-6plus_clear in Resources */,
EE583CBB12F773F00042CBE3 /* unicode_blocks.txt in Resources */,
F6E2FDDC1E097BA00083EBEC /* MWMEditorTextTableViewCell.xib in Resources */,
F6E2FE331E097BA00083EBEC /* LaunchScreen.storyboard in Resources */,
340E1EF41E2F614400CE49BF /* SearchFilters.storyboard in Resources */,
F6E2FE8A1E097BA00083EBEC /* PlacePageInfoCell.xib in Resources */,
EEFE7C1412F8C9E1006AF8C3 /* fonts_blacklist.txt in Resources */,
F68FCB8C1DA7BD20007CC7D7 /* MWMTaxiPreviewCell.xib in Resources */,
@ -4157,10 +4163,10 @@
340475051E08199E00C92850 /* HockeySDKResources.bundle in Resources */,
FAFF422A1347F101009BBB14 /* World.mwm in Resources */,
F607C1891C032A8800B53A87 /* resources-hdpi_dark in Resources */,
F6E2FE361E097BA00083EBEC /* Mapsme.storyboard in Resources */,
F6E2FDBE1E097BA00083EBEC /* MWMEditorAdditionalNameTableViewCell.xib in Resources */,
EEA61601134C496A003A9827 /* 01_dejavusans.ttf in Resources */,
F6E2FD611E097BA00083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.xib in Resources */,
340E1EEB1E2F614400CE49BF /* Authorization.storyboard in Resources */,
F6E2FDFA1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */,
341C2A571B72092A00AD41A1 /* 02_droidsans-fallback.ttf in Resources */,
F6E2FE1B1E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.xib in Resources */,
@ -4173,12 +4179,12 @@
EEA61604134C496A003A9827 /* 04_padauk.ttf in Resources */,
F6E2FEAE1E097BA00083EBEC /* _MWMPPPExternalTitle.xib in Resources */,
3406FA181C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib in Resources */,
340E1EFD1E2F614400CE49BF /* Welcome.storyboard in Resources */,
349B92701DF0526D007779DD /* MWMToast.xib in Resources */,
EEA61605134C496A003A9827 /* 05_khmeros.ttf in Resources */,
3476B8E01BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */,
34F73FA21E08300E00AC1FD6 /* Images.xcassets in Resources */,
A367C93B1B17334800E2B6E7 /* resources-default in Resources */,
F6E2FEC61E097BA00083EBEC /* MWMSearchFilters.storyboard in Resources */,
EE164811135CEE4A003B8A3E /* 06_code2000.ttf in Resources */,
FAAFD697139D9BE2000AE70C /* categories.txt in Resources */,
FA64D9A913F975AD00350ECF /* types.txt in Resources */,
@ -4227,6 +4233,7 @@
F61579361AC2CEB60032D8E9 /* MWMRateAlert.xib in Resources */,
F6B97B291CD0CB170009B612 /* MWMBookmarkNameCell.xib in Resources */,
F6E2FEA51E097BA00083EBEC /* MWMPPView.xib in Resources */,
340E1EEE1E2F614400CE49BF /* LaunchScreen.storyboard in Resources */,
F6E2FDE51E097BA00083EBEC /* MWMNoteCell.xib in Resources */,
349D1AD41E2E325B004A2006 /* MWMBottomMenuCollectionViewPortraitCell.xib in Resources */,
F6E2FF501E097BA00083EBEC /* MWMAboutControllerHeader.xib in Resources */,
@ -4263,10 +4270,11 @@
F6E2FE061E097BA00083EBEC /* MWMOpeningHoursDaysSelectorTableViewCell.xib in Resources */,
F607C1871C032A8800B53A87 /* resources-hdpi_clear in Resources */,
F6E2FD731E097BA00083EBEC /* MWMMapDownloaderTableViewCell.xib in Resources */,
F6E2FF6B1E097BA00083EBEC /* Settings.storyboard in Resources */,
F64F4B6F1B46A5380081A24A /* MWMDownloaderDialogCell.xib in Resources */,
340E1EF71E2F614400CE49BF /* Settings.storyboard in Resources */,
F6E2FE7E1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.xib in Resources */,
F6E2FE001E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.xib in Resources */,
340E1EF11E2F614400CE49BF /* Main.storyboard in Resources */,
4A23D15E1B8B4DD700D4EB6F /* resources-xhdpi_clear in Resources */,
F64F199A1AB81A00006EAF7E /* MWMAlertViewController.xib in Resources */,
FAF30A95173AB23900818BF6 /* 07_roboto_medium.ttf in Resources */,
@ -4284,7 +4292,6 @@
F6FE3C3C1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib in Resources */,
F6E2FD951E097BA00083EBEC /* MWMBookmarkColorViewController.xib in Resources */,
F6E2FF061E097BA00083EBEC /* MWMSearchHistoryClearCell.xib in Resources */,
34B7D4E21DE5903E00BE2309 /* Authorization.storyboard in Resources */,
671182E51C7F0DDB00CB8177 /* packed_polygons_obsolete.bin in Resources */,
676507601C10559800830BB3 /* patterns.txt in Resources */,
6741A9421BF340DE002C974C /* sound-strings in Resources */,
@ -4294,10 +4301,10 @@
F6E2FEAC1E097BA00083EBEC /* _MWMPPPBooking.xib in Resources */,
6741A9491BF340DE002C974C /* countries.txt in Resources */,
6741A94A1BF340DE002C974C /* resources-6plus_clear in Resources */,
340E1EF51E2F614400CE49BF /* SearchFilters.storyboard in Resources */,
F6E2FE0D1E097BA00083EBEC /* MWMOpeningHoursDeleteScheduleTableViewCell.xib in Resources */,
F6E2FF421E097BA00083EBEC /* MWMSearchTableViewController.xib in Resources */,
F6E2FDE61E097BA00083EBEC /* MWMNoteCell.xib in Resources */,
34943BB31E2620C600B14F84 /* Welcome.storyboard in Resources */,
6741A94B1BF340DE002C974C /* unicode_blocks.txt in Resources */,
6741A94C1BF340DE002C974C /* fonts_blacklist.txt in Resources */,
F6E2FF2A1E097BA00083EBEC /* MWMSearchTabButtonsView.xib in Resources */,
@ -4318,9 +4325,9 @@
6B653B951C7F2DE4007BEFC5 /* cuisine-strings in Resources */,
F6E2FF151E097BA00083EBEC /* MWMSearchHistoryRequestCell.xib in Resources */,
F6E2FE6A1E097BA00083EBEC /* MWMPlacePageButtonCell.xib in Resources */,
340E1EEC1E2F614400CE49BF /* Authorization.storyboard in Resources */,
F6E2FE161E097BA00083EBEC /* MWMOpeningHoursTimeSelectorTableViewCell.xib in Resources */,
6741A9521BF340DE002C974C /* World.mwm in Resources */,
F6E2FF6C1E097BA00083EBEC /* Settings.storyboard in Resources */,
F6E2FF001E097BA00083EBEC /* MWMSearchCategoryCell.xib in Resources */,
F6E2FE581E097BA00083EBEC /* MWMPlacePageActionBar.xib in Resources */,
F607C18A1C032A8800B53A87 /* resources-hdpi_dark in Resources */,
@ -4331,12 +4338,12 @@
F6E2FE011E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.xib in Resources */,
671182E61C7F0DDD00CB8177 /* countries_obsolete.txt in Resources */,
F6E2FE7F1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.xib in Resources */,
340E1EFE1E2F614400CE49BF /* Welcome.storyboard in Resources */,
F6E2FEE81E097BA00083EBEC /* MWMSearchNoResults.xib in Resources */,
F6E2FDD71E097BA00083EBEC /* MWMEditorSwitchTableViewCell.xib in Resources */,
349B92711DF0526D007779DD /* MWMToast.xib in Resources */,
6741A9571BF340DE002C974C /* 03_jomolhari-id-a3d.ttf in Resources */,
6741A9581BF340DE002C974C /* 04_padauk.ttf in Resources */,
F6E2FEC71E097BA00083EBEC /* MWMSearchFilters.storyboard in Resources */,
6741A9591BF340DE002C974C /* 05_khmeros.ttf in Resources */,
677A2DE21C0DD50900635A00 /* resources-default in Resources */,
F6E2FE641E097BA00083EBEC /* MWMBookmarkCell.xib in Resources */,
@ -4365,7 +4372,6 @@
6741A96C1BF340DE002C974C /* MWMDownloadTransitMapAlert.xib in Resources */,
F6E2FDAA1E097BA00083EBEC /* MWMButtonCell.xib in Resources */,
F6E2FE461E097BA00083EBEC /* MWMDirectionView.xib in Resources */,
F6E2FE371E097BA00083EBEC /* Mapsme.storyboard in Resources */,
6741A96D1BF340DE002C974C /* MWMLocationAlert.xib in Resources */,
F623DA6C1C9C2731006A3436 /* opening_hours_how_to_edit.html in Resources */,
F6E2FE2E1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */,
@ -4386,6 +4392,7 @@
6741A9781BF340DE002C974C /* AddSetTableViewCell.xib in Resources */,
F6E2FE5E1E097BA00083EBEC /* MWMPPPreviewBannerCell.xib in Resources */,
F6E2FDB01E097BA00083EBEC /* MWMEditorAddAdditionalNameTableViewCell.xib in Resources */,
340E1EEF1E2F614400CE49BF /* LaunchScreen.storyboard in Resources */,
6741A97D1BF340DE002C974C /* synonyms.txt in Resources */,
349D1AD51E2E325B004A2006 /* MWMBottomMenuCollectionViewPortraitCell.xib in Resources */,
F6E2FEEE1E097BA00083EBEC /* MWMSearchView.xib in Resources */,
@ -4412,7 +4419,6 @@
6741A9901BF340DE002C974C /* resources-mdpi_dark in Resources */,
6741A9911BF340DE002C974C /* MWMFacebookAlert.xib in Resources */,
F607C1881C032A8800B53A87 /* resources-hdpi_clear in Resources */,
F6E2FE341E097BA00083EBEC /* LaunchScreen.storyboard in Resources */,
F6E2FD591E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.xib in Resources */,
F6E2FE521E097BA00083EBEC /* MWMActionBarButton.xib in Resources */,
349D1AE11E2E325C004A2006 /* MWMBottomMenuViewController.xib in Resources */,
@ -4424,8 +4430,10 @@
F6E2FEBB1E097BA00083EBEC /* _MWMPPPTitle.xib in Resources */,
6741A9951BF340DE002C974C /* MWMDownloaderDialogCell.xib in Resources */,
F6BD1D241CA412E40047B8E8 /* MWMOsmAuthAlert.xib in Resources */,
340E1EF81E2F614400CE49BF /* Settings.storyboard in Resources */,
6741A9981BF340DE002C974C /* resources-xhdpi_clear in Resources */,
6741A9991BF340DE002C974C /* MWMAlertViewController.xib in Resources */,
340E1EF21E2F614400CE49BF /* Main.storyboard in Resources */,
6741A99F1BF340DE002C974C /* 07_roboto_medium.ttf in Resources */,
F6E2FEA61E097BA00083EBEC /* MWMPPView.xib in Resources */,
F6E2FF511E097BA00083EBEC /* MWMAboutControllerHeader.xib in Resources */,
@ -4436,13 +4444,13 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
340E1EF61E2F614400CE49BF /* SearchFilters.storyboard in Resources */,
F6E2FDD21E097BA00083EBEC /* MWMEditorSelectTableViewCell.xib in Resources */,
849CF5E61DE842290024A8A5 /* patterns.txt in Resources */,
849CF5E71DE842290024A8A5 /* MWMSearchNoResultsAlert.xib in Resources */,
F6E2FDFC1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */,
849CF5E81DE842290024A8A5 /* MWMPlaceDoesntExistAlert.xib in Resources */,
F6E2FD6F1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.xib in Resources */,
849CF5E91DE842290024A8A5 /* Authorization.storyboard in Resources */,
849CF5EA1DE842290024A8A5 /* sound-strings in Resources */,
849CF5EC1DE842290024A8A5 /* colors.txt in Resources */,
F6E2FEAA1E097BA00083EBEC /* _MWMPPPAddress.xib in Resources */,
@ -4454,7 +4462,6 @@
849CF5F51DE842290024A8A5 /* packed_polygons_obsolete.bin in Resources */,
F6E2FD5A1E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.xib in Resources */,
F6E2FDAB1E097BA00083EBEC /* MWMButtonCell.xib in Resources */,
F6E2FE381E097BA00083EBEC /* Mapsme.storyboard in Resources */,
849CF5F61DE842290024A8A5 /* resources-6plus_clear in Resources */,
849CF5F81DE842290024A8A5 /* unicode_blocks.txt in Resources */,
849CF5F91DE842290024A8A5 /* fonts_blacklist.txt in Resources */,
@ -4466,7 +4473,6 @@
F6E2FDB11E097BA00083EBEC /* MWMEditorAddAdditionalNameTableViewCell.xib in Resources */,
F6E2FDC01E097BA00083EBEC /* MWMEditorAdditionalNameTableViewCell.xib in Resources */,
F6E2FEA71E097BA00083EBEC /* MWMPPView.xib in Resources */,
34943BB41E2620C600B14F84 /* Welcome.storyboard in Resources */,
F6E2FEB31E097BA00083EBEC /* _MWMPPPSchedule.xib in Resources */,
349D1AD31E2E325B004A2006 /* MWMBottomMenuCollectionViewLandscapeCell.xib in Resources */,
F6E2FF341E097BA00083EBEC /* MWMSearchCommonCell.xib in Resources */,
@ -4485,6 +4491,7 @@
F6E2FEB91E097BA00083EBEC /* _MWMPPPSubtitle.xib in Resources */,
F6E2FDF01E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.xib in Resources */,
F6E2FDDE1E097BA00083EBEC /* MWMEditorTextTableViewCell.xib in Resources */,
340E1EED1E2F614400CE49BF /* Authorization.storyboard in Resources */,
F6E2FDC61E097BA00083EBEC /* MWMEditorCategoryCell.xib in Resources */,
849CF6061DE842290024A8A5 /* resources-xxhdpi_dark in Resources */,
F6E2FF1C1E097BA00083EBEC /* MWMSearchTabbedCollectionViewCell.xib in Resources */,
@ -4498,14 +4505,15 @@
849CF60D1DE842290024A8A5 /* MWMMapDownloadDialog.xib in Resources */,
F6E2FDCC1E097BA00083EBEC /* MWMEditorNotesFooter.xib in Resources */,
849CF6101DE842290024A8A5 /* 05_khmeros.ttf in Resources */,
340E1EF01E2F614400CE49BF /* LaunchScreen.storyboard in Resources */,
349D1AD61E2E325C004A2006 /* MWMBottomMenuCollectionViewPortraitCell.xib in Resources */,
F6E2FEAD1E097BA00083EBEC /* _MWMPPPBooking.xib in Resources */,
F6E2FF6D1E097BA00083EBEC /* Settings.storyboard in Resources */,
849CF6111DE842290024A8A5 /* tts-how-to-set-up-voice-img in Resources */,
F6E2FEF51E097BA00083EBEC /* MWMSearchBookmarksCell.xib in Resources */,
849CF6141DE842290024A8A5 /* resources-default in Resources */,
F6E2FE0E1E097BA00083EBEC /* MWMOpeningHoursDeleteScheduleTableViewCell.xib in Resources */,
F6E2FE861E097BA00083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib in Resources */,
340E1EF91E2F614400CE49BF /* Settings.storyboard in Resources */,
849CF6151DE842290024A8A5 /* 06_code2000.ttf in Resources */,
849CF6161DE842290024A8A5 /* categories.txt in Resources */,
849CF6171DE842290024A8A5 /* types.txt in Resources */,
@ -4530,9 +4538,7 @@
3454E0611DF00DC100F40F46 /* banners.txt in Resources */,
F6E2FDB41E097BA00083EBEC /* MWMEditorAdditionalNamePlaceholderTableViewCell.xib in Resources */,
849CF6381DE842290024A8A5 /* MWMiPadRoutePreview.xib in Resources */,
F6E2FE351E097BA00083EBEC /* LaunchScreen.storyboard in Resources */,
849CF6391DE842290024A8A5 /* copyright.html in Resources */,
F6E2FEC81E097BA00083EBEC /* MWMSearchFilters.storyboard in Resources */,
F6E2FEB01E097BA00083EBEC /* _MWMPPPExternalTitle.xib in Resources */,
F6E2FE2F1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */,
849CF63D1DE842290024A8A5 /* WorldCoasts_obsolete.mwm in Resources */,
@ -4571,10 +4577,12 @@
34F73F9D1E082FF800AC1FD6 /* InfoPlist.strings in Resources */,
F6E2FDD81E097BA00083EBEC /* MWMEditorSwitchTableViewCell.xib in Resources */,
849CF66D1DE842290024A8A5 /* MWMEditorViralAlert.xib in Resources */,
340E1EFF1E2F614400CE49BF /* Welcome.storyboard in Resources */,
F6E2FE771E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */,
F6E2FF011E097BA00083EBEC /* MWMSearchCategoryCell.xib in Resources */,
849CF66E1DE842290024A8A5 /* resources-mdpi_dark in Resources */,
F6E2FEEF1E097BA00083EBEC /* MWMSearchView.xib in Resources */,
340E1EF31E2F614400CE49BF /* Main.storyboard in Resources */,
849CF66F1DE842290024A8A5 /* MWMFacebookAlert.xib in Resources */,
F6E2FE021E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.xib in Resources */,
F6E2FD961E097BA00083EBEC /* MWMBookmarkColorViewController.xib in Resources */,
@ -4669,7 +4677,6 @@
files = (
34845DB61E166084003D55B9 /* Common.swift in Sources */,
1D60589B0D05DD56006BFB54 /* main.mm in Sources */,
34D4FA5A1E2642FB003F53EF /* Storyboard.swift in Sources */,
340837161B72451A00B5C185 /* MWMShareActivityItem.mm in Sources */,
F6E2FF0B1E097BA00083EBEC /* MWMSearchHistoryMyPositionCell.mm in Sources */,
F6E2FDCD1E097BA00083EBEC /* MWMEditorSelectTableViewCell.mm in Sources */,
@ -4804,6 +4811,7 @@
F6E2FDF11E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.mm in Sources */,
F6E2FD821E097BA00083EBEC /* MWMMapDownloaderSearchDataSource.mm in Sources */,
3454D7C11E07F045004AF2AD /* NSString+Categories.mm in Sources */,
340E1EFA1E2F614400CE49BF /* Storyboard.swift in Sources */,
F6E2FE7B1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.mm in Sources */,
F6E2FF351E097BA00083EBEC /* MWMSearchSuggestionCell.mm in Sources */,
F6E2FE391E097BA00083EBEC /* MWMMigrationView.mm in Sources */,
@ -4921,7 +4929,6 @@
files = (
34845DB71E166084003D55B9 /* Common.swift in Sources */,
6741A9A31BF340DE002C974C /* main.mm in Sources */,
34D4FA5B1E2642FB003F53EF /* Storyboard.swift in Sources */,
F67E751E1DB76DFC00D6741F /* MWMTaxiCollectionLayout.mm in Sources */,
F6E2FF0C1E097BA00083EBEC /* MWMSearchHistoryMyPositionCell.mm in Sources */,
F6E2FDCE1E097BA00083EBEC /* MWMEditorSelectTableViewCell.mm in Sources */,
@ -5056,6 +5063,7 @@
F6E2FD831E097BA00083EBEC /* MWMMapDownloaderSearchDataSource.mm in Sources */,
3490D2E11CE9DD2500D0B838 /* MWMSideButtonsView.mm in Sources */,
F6E2FE7C1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.mm in Sources */,
340E1EFB1E2F614400CE49BF /* Storyboard.swift in Sources */,
F6E2FF361E097BA00083EBEC /* MWMSearchSuggestionCell.mm in Sources */,
F6E2FE3A1E097BA00083EBEC /* MWMMigrationView.mm in Sources */,
F6E2FF3C1E097BA00083EBEC /* MWMSearchTableView.mm in Sources */,
@ -5173,7 +5181,6 @@
files = (
34845DB81E166084003D55B9 /* Common.swift in Sources */,
849CF6821DE842290024A8A5 /* main.mm in Sources */,
34D4FA5C1E2642FB003F53EF /* Storyboard.swift in Sources */,
3454D7D51E07F045004AF2AD /* UIImageView+Coloring.mm in Sources */,
F6E2FF0D1E097BA00083EBEC /* MWMSearchHistoryMyPositionCell.mm in Sources */,
F6E2FDCF1E097BA00083EBEC /* MWMEditorSelectTableViewCell.mm in Sources */,
@ -5308,6 +5315,7 @@
F6E2FDF31E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.mm in Sources */,
F6E2FD841E097BA00083EBEC /* MWMMapDownloaderSearchDataSource.mm in Sources */,
849CF6F61DE842290024A8A5 /* MWMNavigationDashboardEntity.mm in Sources */,
340E1EFC1E2F614400CE49BF /* Storyboard.swift in Sources */,
F6E2FE7D1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.mm in Sources */,
F6E2FF371E097BA00083EBEC /* MWMSearchSuggestionCell.mm in Sources */,
F6E2FE3B1E097BA00083EBEC /* MWMMigrationView.mm in Sources */,

5
iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsViewController.mm
View file

@ -1,13 +1,14 @@
#import "MWMNoMapsViewController.h"
#import "MWMMapViewControlsManager.h"
#import "UIViewController+Navigation.h"
#import "SwiftBridge.h"
@implementation MWMNoMapsViewController
+ (MWMNoMapsViewController *)controller
{
return
[[UIViewController mainStoryboard] instantiateViewControllerWithIdentifier:[self className]];
auto storyboard = [UIStoryboard instance:MWMStoryboardMain];
return [storyboard instantiateViewControllerWithIdentifier:[self className]];
}
- (IBAction)downloadMaps

3
iphone/Maps/UI/Search/Filters/MWMSearchFilterViewController.mm
View file

@ -1,4 +1,5 @@
#import "MWMSearchFilterViewController_Protected.h"
#import "SwiftBridge.h"
@implementation MWMSearchFilterViewController
@ -11,7 +12,7 @@
+ (MWMSearchFilterViewController *)controllerWithIdentifier:(NSString *)identifier
{
auto storyboard = [UIStoryboard storyboardWithName:@"MWMSearchFilters" bundle:nil];
auto storyboard = [UIStoryboard instance:MWMStoryboardSearchFilters];
return [storyboard instantiateViewControllerWithIdentifier:identifier];
}

2
iphone/Maps/UI/Search/SearchNoResultsViewController.swift
View file

@ -3,7 +3,7 @@ import UIKit
final class SearchNoResultsViewController: MWMViewController {
static var controller: SearchNoResultsViewController {
let storyboard = UIViewController.mainStoryboard()!
let storyboard = UIStoryboard.instance(.Main)
let id = String(describing: self)
return storyboard.instantiateViewController(withIdentifier: id) as! SearchNoResultsViewController
}

16
iphone/Maps/UI/Storyboard.swift
View file

@ -1,16 +0,0 @@
import UIKit
enum Storyboard {
case LaunchScreen
case Mapsme
case Welcome
var instance: UIStoryboard {
switch self {
case .LaunchScreen: return UIStoryboard(name: "LaunchScreen", bundle: Bundle.main)
case .Mapsme: return UIStoryboard(name: "Mapsme", bundle: Bundle.main)
case .Welcome: return UIStoryboard(name: "Welcome", bundle: Bundle.main)
}
}
}

0
iphone/Maps/Authorization.storyboard → iphone/Maps/UI/Storyboard/Authorization.storyboard
View file

0
iphone/Maps/UI/LaunchScreen.storyboard → iphone/Maps/UI/Storyboard/LaunchScreen.storyboard
View file

0
iphone/Maps/UI/Mapsme.storyboard → iphone/Maps/UI/Storyboard/Main.storyboard
View file

0
iphone/Maps/UI/Search/Filters/MWMSearchFilters.storyboard → iphone/Maps/UI/Storyboard/SearchFilters.storyboard
View file

0
iphone/Maps/UI/Settings/Settings.storyboard → iphone/Maps/UI/Storyboard/Settings.storyboard
View file

29
iphone/Maps/UI/Storyboard/Storyboard.swift Normal file
View file

@ -0,0 +1,29 @@
import UIKit
@objc(MWMStoryboard)
enum Storyboard: Int {
case Authorization
case LaunchScreen
case Main
case SearchFilters
case Settings
case Welcome
}
extension UIStoryboard {
static func instance(_ id: Storyboard) -> UIStoryboard {
let name: String
switch id {
case .Authorization: name = "Authorization"
case .LaunchScreen: name = "LaunchScreen"
case .Main: name = "Main"
case .SearchFilters: name = "SearchFilters"
case .Settings: name = "Settings"
case .Welcome: name = "Welcome"
}
return UIStoryboard(name: name, bundle: nil)
}
}

0
iphone/Maps/UI/Welcome/Welcome.storyboard → iphone/Maps/UI/Storyboard/Welcome.storyboard
View file

2
iphone/Maps/UI/Welcome/WelcomePageController.swift
View file

@ -37,7 +37,7 @@ final class WelcomePageController: UIPageViewController {
let pagesCount = isFirstSession ? FirstLaunchController.pagesCount : WhatsNewController.pagesCount
let id = pagesCount == 1 ? "WelcomePageCurlController" : "WelcomePageScrollController"
let sb = Storyboard.Welcome.instance
let sb = UIStoryboard.instance(.Welcome)
let vc = sb.instantiateViewController(withIdentifier: id) as! WelcomePageController
vc.config(parent)
vc.show()

2
iphone/Maps/UI/Welcome/WelcomeProtocol.swift
View file

@ -25,7 +25,7 @@ extension WelcomeProtocolBase {
static var key: String { return "\(self)" + AppInfo.shared().bundleVersion! }
static func controller(_ pageIndex: Int) -> UIViewController {
let sb = Storyboard.Welcome.instance
let sb = UIStoryboard.instance(.Welcome)
let id = String(describing: self)
let vc = sb.instantiateViewController(withIdentifier: id)
(vc as! Self).pageIndex = pageIndex