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

Project structure refactored

Browse source
This commit is contained in:
VladiMihaylenko 2015-03-13 18:20:33 +03:00 • committed by Alex Zolotarev
parent ca8ee9c943
commit 1f76925f6b
2 changed files with 22 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/Maps/Classes/MapViewController.mm
View file

@ -840,7 +840,6 @@
} else {
[self presentDefaultAlertWithType:type];
}
}
- (void)presentDefaultAlertWithType:(MWMAlertType)type {

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

@ -116,9 +116,9 @@
EED10A4511F78D120095FAD4 /* MapViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = EED10A4411F78D120095FAD4 /* MapViewController.mm */; };
EEFE7C1412F8C9E1006AF8C3 /* fonts_blacklist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */; };
EEFE7C1512F8C9E1006AF8C3 /* fonts_whitelist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */; };
F613FA6A1AB1FCA8002394D4 /* MWMDefaultAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F613FA691AB1FCA8002394D4 /* MWMDefaultAlert.mm */; };
F613FA6C1AB1FD97002394D4 /* MWMDefaultAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F613FA6B1AB1FD97002394D4 /* MWMDefaultAlert.xib */; };
F613FA701AB2002F002394D4 /* MWMDefaultAlert+Configure.m in Sources */ = {isa = PBXBuildFile; fileRef = F613FA6F1AB2002F002394D4 /* MWMDefaultAlert+Configure.m */; };
F613FA7A1AB336D6002394D4 /* MWMDefaultAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F613FA781AB336D6002394D4 /* MWMDefaultAlert.mm */; };
F613FA7B1AB336D6002394D4 /* MWMDefaultAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F613FA791AB336D6002394D4 /* MWMDefaultAlert.xib */; };
F613FA7F1AB336F3002394D4 /* MWMDefaultAlert+Configure.m in Sources */ = {isa = PBXBuildFile; fileRef = F613FA7E1AB336F3002394D4 /* MWMDefaultAlert+Configure.m */; };
F62404FB1AAF3DB200B58DB6 /* UILabel+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = F62404FA1AAF3DB200B58DB6 /* UILabel+RuntimeAttributes.m */; };
F63CC8B11AAF0E600019338C /* MWMDownloadAllMapsAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63CC8B01AAF0E600019338C /* MWMDownloadAllMapsAlert.mm */; };
F63CC8B31AAF0E8D0019338C /* MWMDownloadAllMapsAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F63CC8B21AAF0E8D0019338C /* MWMDownloadAllMapsAlert.xib */; };
@ -381,11 +381,11 @@
EED10A4411F78D120095FAD4 /* MapViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapViewController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_blacklist.txt; path = ../../data/fonts_blacklist.txt; sourceTree = "<group>"; };
EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_whitelist.txt; path = ../../data/fonts_whitelist.txt; sourceTree = "<group>"; };
F613FA681AB1FCA8002394D4 /* MWMDefaultAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMDefaultAlert.h; sourceTree = "<group>"; };
F613FA691AB1FCA8002394D4 /* MWMDefaultAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMDefaultAlert.mm; sourceTree = "<group>"; };
F613FA6B1AB1FD97002394D4 /* MWMDefaultAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMDefaultAlert.xib; sourceTree = "<group>"; };
F613FA6E1AB2002F002394D4 /* MWMDefaultAlert+Configure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MWMDefaultAlert+Configure.h"; sourceTree = "<group>"; };
F613FA6F1AB2002F002394D4 /* MWMDefaultAlert+Configure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MWMDefaultAlert+Configure.m"; sourceTree = "<group>"; };
F613FA771AB336D6002394D4 /* MWMDefaultAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMDefaultAlert.h; sourceTree = "<group>"; };
F613FA781AB336D6002394D4 /* MWMDefaultAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMDefaultAlert.mm; sourceTree = "<group>"; };
F613FA791AB336D6002394D4 /* MWMDefaultAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMDefaultAlert.xib; sourceTree = "<group>"; };
F613FA7D1AB336F3002394D4 /* MWMDefaultAlert+Configure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MWMDefaultAlert+Configure.h"; sourceTree = "<group>"; };
F613FA7E1AB336F3002394D4 /* MWMDefaultAlert+Configure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MWMDefaultAlert+Configure.m"; sourceTree = "<group>"; };
F62404F91AAF3DB200B58DB6 /* UILabel+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UILabel+RuntimeAttributes.h"; sourceTree = "<group>"; };
F62404FA1AAF3DB200B58DB6 /* UILabel+RuntimeAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UILabel+RuntimeAttributes.m"; sourceTree = "<group>"; };
F63CC8AF1AAF0E600019338C /* MWMDownloadAllMapsAlert.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = MWMDownloadAllMapsAlert.h; sourceTree = "<group>"; };
@ -557,7 +557,8 @@
46F26CD710F623BA00ECCA39 /* EAGLView.mm */,
1D3623240D0F684500981E51 /* MapsAppDelegate.h */,
1D3623250D0F684500981E51 /* MapsAppDelegate.mm */,
F613FA741AB330AF002394D4 /* MapViewController */,
46F8A2EB10EB63040045521A /* MapViewController.h */,
EED10A4411F78D120095FAD4 /* MapViewController.mm */,
FAF457E415597BC100DCCC49 /* Framework.h */,
FAF457E615597D4600DCCC49 /* Framework.cpp */,
97DEA09018D706C300C5F963 /* Common.h */,
@ -849,35 +850,26 @@
path = Statistics;
sourceTree = "<group>";
};
F613FA671AB1FBD1002394D4 /* DefaultAlert */ = {
F613FA761AB336B8002394D4 /* DefaultAlert */ = {
isa = PBXGroup;
children = (
F613FA681AB1FCA8002394D4 /* MWMDefaultAlert.h */,
F613FA691AB1FCA8002394D4 /* MWMDefaultAlert.mm */,
F613FA6B1AB1FD97002394D4 /* MWMDefaultAlert.xib */,
F613FA6D1AB2000F002394D4 /* Configure */,
F613FA771AB336D6002394D4 /* MWMDefaultAlert.h */,
F613FA781AB336D6002394D4 /* MWMDefaultAlert.mm */,
F613FA791AB336D6002394D4 /* MWMDefaultAlert.xib */,
F613FA7C1AB336E8002394D4 /* Configure */,
);
name = DefaultAlert;
sourceTree = "<group>";
};
F613FA6D1AB2000F002394D4 /* Configure */ = {
F613FA7C1AB336E8002394D4 /* Configure */ = {
isa = PBXGroup;
children = (
F613FA6E1AB2002F002394D4 /* MWMDefaultAlert+Configure.h */,
F613FA6F1AB2002F002394D4 /* MWMDefaultAlert+Configure.m */,
F613FA7D1AB336F3002394D4 /* MWMDefaultAlert+Configure.h */,
F613FA7E1AB336F3002394D4 /* MWMDefaultAlert+Configure.m */,
);
name = Configure;
sourceTree = "<group>";
};
F613FA741AB330AF002394D4 /* MapViewController */ = {
isa = PBXGroup;
children = (
46F8A2EB10EB63040045521A /* MapViewController.h */,
EED10A4411F78D120095FAD4 /* MapViewController.mm */,
);
name = MapViewController;
sourceTree = "<group>";
};
F63CC8AE1AAF0E350019338C /* DownloadAllMaps */ = {
isa = PBXGroup;
children = (
@ -938,7 +930,7 @@
F6DBF9AF1AA85E3500F2EC2C /* MWMAlert.m */,
F63CC8AE1AAF0E350019338C /* DownloadAllMaps */,
F6A85A161AA9CAAD003667A2 /* DownloadTransitMap */,
F613FA671AB1FBD1002394D4 /* DefaultAlert */,
F613FA761AB336B8002394D4 /* DefaultAlert */,
F6A85A1E1AAB1175003667A2 /* MWMAlertDownloaderManager.h */,
F6A85A1F1AAB1175003667A2 /* MWMAlertDownloaderManager.mm */,
F6BAADD91AB058BD0095D0C7 /* Entity */,
@ -1215,6 +1207,7 @@
978F9247183B6671000D6C7C /* Main_iPhone.storyboard in Resources */,
FA459EB414327AF700B5BB3C /* WorldCoasts.mwm in Resources */,
FA85F633145DDDC20090E1A0 /* packed_polygons.bin in Resources */,
F613FA7B1AB336D6002394D4 /* MWMDefaultAlert.xib in Resources */,
FA99CB73147089B100689A9A /* Localizable.strings in Resources */,
F7FDD823147F30CC005900FA /* drules_proto.bin in Resources */,
F6DBF9AD1AA847ED00F2EC2C /* MWMAlertViewController.xib in Resources */,
@ -1241,7 +1234,6 @@
F7E7BA311672328F00B4492E /* pharmacy@2x.png in Resources */,
F7E7BA321672328F00B4492E /* police.png in Resources */,
F7E7BA331672328F00B4492E /* police@2x.png in Resources */,
F613FA6C1AB1FD97002394D4 /* MWMDefaultAlert.xib in Resources */,
F7E7BA341672328F00B4492E /* post.png in Resources */,
F7E7BA351672328F00B4492E /* post@2x.png in Resources */,
F7E7BA361672328F00B4492E /* shop.png in Resources */,
@ -1300,14 +1292,12 @@
EED10A4511F78D120095FAD4 /* MapViewController.mm in Sources */,
A3CC2CD41A1C723900B832E1 /* LocationPredictor.mm in Sources */,
EE7F29811219ECA300EB67A9 /* RenderBuffer.mm in Sources */,
F613FA701AB2002F002394D4 /* MWMDefaultAlert+Configure.m in Sources */,
F62404FB1AAF3DB200B58DB6 /* UILabel+RuntimeAttributes.m in Sources */,
97D092B5190A6E1D00FF645B /* PlacePageEditCell.mm in Sources */,
9750841F199501F100A7457D /* ImageDownloader.m in Sources */,
978F9253183BD530000D6C7C /* NavigationController.mm in Sources */,
974386DD19373EA400FD5659 /* ToastView.m in Sources */,
97C9851E186AE3C500AF7E9E /* Reachability.m in Sources */,
F613FA6A1AB1FCA8002394D4 /* MWMDefaultAlert.mm in Sources */,
977E26B919E2E64200BA2219 /* MapsObservers.mm in Sources */,
EE7F29821219ECA300EB67A9 /* RenderContext.mm in Sources */,
FAFCB63613366E78001A5C59 /* WebViewController.mm in Sources */,
@ -1333,6 +1323,7 @@
978F9240183B660F000D6C7C /* SettingsViewController.mm in Sources */,
B0E1FCDC1A23399E00A8E08B /* RouteOverallInfoView.m in Sources */,
F7B90CD31521E6D200C054EE /* CustomNavigationView.mm in Sources */,
F613FA7F1AB336F3002394D4 /* MWMDefaultAlert+Configure.m in Sources */,
F6DBF9B61AA8779300F2EC2C /* CALayer+RuntimeAttributes.m in Sources */,
FA36B80D15403A4F004560CC /* BookmarksVC.mm in Sources */,
A32B6D4D1A14980500E54A65 /* iosOGLContextFactory.mm in Sources */,
@ -1359,6 +1350,7 @@
F6DBF9B01AA85E3500F2EC2C /* MWMAlert.m in Sources */,
9773DB8F198652E600C4A9E9 /* PlacePageBookmarkDescriptionCell.m in Sources */,
F63CC8B11AAF0E600019338C /* MWMDownloadAllMapsAlert.mm in Sources */,
F613FA7A1AB336D6002394D4 /* MWMDefaultAlert.mm in Sources */,
97ABBA4518C8DF620079333C /* PlacePageView.mm in Sources */,
97F61794183E7445009919E2 /* LinkCell.m in Sources */,
F6DBF9B31AA8611A00F2EC2C /* MWMDownloadTransitMapAlert.mm in Sources */,