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

[ios] Rename refresh method to mwm_refreshUI.

Browse source
This commit is contained in:
VladiMihaylenko 2016-02-08 15:28:52 +03:00 • committed by Sergey Yershov
parent e84a7a304d
commit 6314f252d4
5 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.h
View file

@ -3,7 +3,7 @@
#include "storage/index.hpp"
@interface MWMMapCountryDownloaderViewController : MWMViewController <UITableViewDelegate, UITableViewDataSource>
@interface MWMBaseMapDownloaderViewController : MWMViewController <UITableViewDelegate, UITableViewDataSource>
@property (weak, nonatomic) IBOutlet UILabel * allMapsLabel;

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

@ -492,7 +492,7 @@ NSString * const kEditorSegue = @"Map2EditorSegue";
- (void)openBookmarks
{
BOOL const oneCategory = (GetFramework().GetBmCategoriesCount() == 1);
TableViewController * vc = oneCategory ? [[BookmarksVC alloc] initWithCategory:0] : [[BookmarksRootVC alloc] init];
MWMTableViewController * vc = oneCategory ? [[BookmarksVC alloc] initWithCategory:0] : [[BookmarksRootVC alloc] init];
[self.navigationController pushViewController:vc animated:YES];
}
@ -606,16 +606,6 @@ NSString * const kEditorSegue = @"Map2EditorSegue";
}
}
#pragma mark - Bookmarks
- (void)openBookmarks
{
BOOL const oneCategory = (GetFramework().GetBmCategoriesCount() == 1);
MWMTableViewController * vc =
oneCategory ? [[BookmarksVC alloc] initWithCategory:0] : [[BookmarksRootVC alloc] init];
[self.navigationController pushViewController:vc animated:YES];
}
#pragma mark - Authorization
- (void)checkAuthorization

2
storage/storage_tests/storage_tests.cpp
View file

@ -824,7 +824,7 @@ UNIT_TEST(StorageTest_DeleteCountrySingleMwm)
TEST(Platform::IsFileExistsByFullPath(bitsPath), (bitsPath));
storage.DeleteCustomCountryVersion(file);
TEST(!map.Exists(), ())
TEST(!map.Exists(), ());
TEST(!Platform::IsFileExistsByFullPath(bitsPath), (bitsPath));
map.Reset();

4
xcode/map/map.xcodeproj/project.pbxproj
View file

@ -69,7 +69,6 @@
67F183781BD5045700AB1840 /* geourl_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CD1B26FCFE001A525C /* geourl_test.cpp */; };
67F183791BD5045700AB1840 /* kmz_unarchive_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CE1B26FCFE001A525C /* kmz_unarchive_test.cpp */; };
67F1837A1BD5045700AB1840 /* mwm_url_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CF1B26FCFE001A525C /* mwm_url_tests.cpp */; };
67F1837B1BD5045700AB1840 /* navigator_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29D01B26FCFE001A525C /* navigator_test.cpp */; };
67F183811BD5049500AB1840 /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F1837D1BD5049500AB1840 /* libagg.a */; };
67F183821BD5049500AB1840 /* liblodepng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F1837E1BD5049500AB1840 /* liblodepng.a */; };
67F183831BD5049500AB1840 /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F1837F1BD5049500AB1840 /* libminizip.a */; };
@ -111,7 +110,6 @@
674A29CD1B26FCFE001A525C /* geourl_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geourl_test.cpp; sourceTree = "<group>"; };
674A29CE1B26FCFE001A525C /* kmz_unarchive_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kmz_unarchive_test.cpp; sourceTree = "<group>"; };
674A29CF1B26FCFE001A525C /* mwm_url_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_url_tests.cpp; sourceTree = "<group>"; };
674A29D01B26FCFE001A525C /* navigator_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = navigator_test.cpp; sourceTree = "<group>"; };
674A29DF1B26FD1C001A525C /* map_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = map_tests; sourceTree = BUILT_PRODUCTS_DIR; };
674A29EE1B26FD5F001A525C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
674A29F11B26FE62001A525C /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../omim-xcode-build/Debug/libalohalitics.a"; sourceTree = "<group>"; };
@ -241,7 +239,6 @@
674A29CD1B26FCFE001A525C /* geourl_test.cpp */,
674A29CE1B26FCFE001A525C /* kmz_unarchive_test.cpp */,
674A29CF1B26FCFE001A525C /* mwm_url_tests.cpp */,
674A29D01B26FCFE001A525C /* navigator_test.cpp */,
674A2A351B27011A001A525C /* working_time_tests.cpp */,
);
name = map_tests;
@ -466,7 +463,6 @@
67F183781BD5045700AB1840 /* geourl_test.cpp in Sources */,
67F183791BD5045700AB1840 /* kmz_unarchive_test.cpp in Sources */,
67F1837A1BD5045700AB1840 /* mwm_url_tests.cpp in Sources */,
67F1837B1BD5045700AB1840 /* navigator_test.cpp in Sources */,
674A29F01B26FD6F001A525C /* testingmain.cpp in Sources */,
674A2A361B27011A001A525C /* working_time_tests.cpp in Sources */,
);

3
xcode/platform/platform.xcodeproj/project.pbxproj
View file

@ -81,7 +81,6 @@
675343D91A3F5D5A00A0A8C3 /* wifi_info_windows.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343AE1A3F5D5A00A0A8C3 /* wifi_info_windows.cpp */; };
675343DA1A3F5D5A00A0A8C3 /* wifi_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343AF1A3F5D5A00A0A8C3 /* wifi_info.hpp */; };
675343DB1A3F5D5A00A0A8C3 /* wifi_location_service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343B01A3F5D5A00A0A8C3 /* wifi_location_service.cpp */; };
676C84201C64CD3300DC9603 /* mwm_traits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 676C841E1C64CD3300DC9603 /* mwm_traits.cpp */; };
676C84211C64CD3300DC9603 /* mwm_traits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 676C841F1C64CD3300DC9603 /* mwm_traits.hpp */; };
67A2526A1BB40E100063F8A8 /* platform_qt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753439C1A3F5D5A00A0A8C3 /* platform_qt.cpp */; };
67A2526B1BB40E520063F8A8 /* platform_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6753439B1A3F5D5A00A0A8C3 /* platform_mac.mm */; };
@ -186,7 +185,6 @@
675343AE1A3F5D5A00A0A8C3 /* wifi_info_windows.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wifi_info_windows.cpp; sourceTree = "<group>"; };
675343AF1A3F5D5A00A0A8C3 /* wifi_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = wifi_info.hpp; sourceTree = "<group>"; };
675343B01A3F5D5A00A0A8C3 /* wifi_location_service.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wifi_location_service.cpp; sourceTree = "<group>"; };
676C841E1C64CD3300DC9603 /* mwm_traits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_traits.cpp; sourceTree = "<group>"; };
676C841F1C64CD3300DC9603 /* mwm_traits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_traits.hpp; sourceTree = "<group>"; };
67AB92DA1B7B3D7300AB5194 /* mwm_version.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_version.cpp; sourceTree = "<group>"; };
67AB92DB1B7B3D7300AB5194 /* mwm_version.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_version.hpp; sourceTree = "<group>"; };
@ -538,7 +536,6 @@
files = (
675343D11A3F5D5A00A0A8C3 /* servers_list.cpp in Sources */,
675343C91A3F5D5A00A0A8C3 /* platform_unix_impl.cpp in Sources */,
676C84201C64CD3300DC9603 /* mwm_traits.cpp in Sources */,
67AB92DC1B7B3D7300AB5194 /* mwm_version.cpp in Sources */,
67A2526B1BB40E520063F8A8 /* platform_mac.mm in Sources */,
6741250A1B4C00CC00A3E828 /* country_file.cpp in Sources */,