diff --git a/iphone/Maps/Bookmarks/BookmarksRootVC.mm b/iphone/Maps/Bookmarks/BookmarksRootVC.mm index dd7af59ae4..a0d6c634d7 100644 --- a/iphone/Maps/Bookmarks/BookmarksRootVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksRootVC.mm @@ -88,7 +88,7 @@ { // Invert visibility bool visible = !cat->IsVisible(); - cell.imageView.image = [UIImage imageNamed:(visible ? @"eye" : @"empty")]; + cell.imageView.image = [UIImage imageNamed:(visible ? @"ic_show_light" : @"ic_hide_light")]; cat->SetVisible(visible); cat->SaveToKMLFile(); } @@ -115,7 +115,7 @@ { NSString * title = @(cat->GetName().c_str()); cell.textLabel.text = [self truncateString:title toWidth:(self.tableView.width - 122) withFont:cell.textLabel.font]; - cell.imageView.image = [UIImage imageNamed:(cat->IsVisible() ? @"eye" : @"empty")]; + cell.imageView.image = [UIImage imageNamed:(cat->IsVisible() ? @"ic_show_light" : @"ic_hide_light")]; cell.detailTextLabel.text = [NSString stringWithFormat:@"%ld", cat->GetBookmarksCount() + cat->GetTracksCount()]; } return cell; diff --git a/iphone/Maps/Bookmarks/empty.png b/iphone/Maps/Bookmarks/empty.png deleted file mode 100644 index 7c9f6fbb72..0000000000 Binary files a/iphone/Maps/Bookmarks/empty.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/empty@2x.png b/iphone/Maps/Bookmarks/empty@2x.png deleted file mode 100644 index c0d89c3418..0000000000 Binary files a/iphone/Maps/Bookmarks/empty@2x.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/eye.png b/iphone/Maps/Bookmarks/eye.png deleted file mode 100644 index cc2cb96b3c..0000000000 Binary files a/iphone/Maps/Bookmarks/eye.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/eye@2x.png b/iphone/Maps/Bookmarks/eye@2x.png deleted file mode 100644 index 0f1dd67266..0000000000 Binary files a/iphone/Maps/Bookmarks/eye@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/BottomMenuCellSeparator.imageset/BasicSpacer.png b/iphone/Maps/Images.xcassets/Bottom Menu/BottomMenuCellSeparator.imageset/BasicSpacer.png deleted file mode 100644 index 975258667f..0000000000 Binary files a/iphone/Maps/Images.xcassets/Bottom Menu/BottomMenuCellSeparator.imageset/BasicSpacer.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/BottomMenuCellSeparator.imageset/BottomMenuCellSeparator@2x.png b/iphone/Maps/Images.xcassets/Bottom Menu/BottomMenuCellSeparator.imageset/BottomMenuCellSeparator@2x.png deleted file mode 100644 index e6a4f6505d..0000000000 Binary files a/iphone/Maps/Images.xcassets/Bottom Menu/BottomMenuCellSeparator.imageset/BottomMenuCellSeparator@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/BottomMenuCellSeparator.imageset/Contents.json b/iphone/Maps/Images.xcassets/Bottom Menu/BottomMenuCellSeparator.imageset/Contents.json deleted file mode 100644 index d5471b5bff..0000000000 --- a/iphone/Maps/Images.xcassets/Bottom Menu/BottomMenuCellSeparator.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "BottomMenuCellSeparator@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x", - "filename" : "BasicSpacer.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Downloader/Contents.json b/iphone/Maps/Images.xcassets/Downloader/Contents.json new file mode 100644 index 0000000000..da4a164c91 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Downloader/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Downloader/MapCellSeparator.imageset/Contents.json b/iphone/Maps/Images.xcassets/Downloader/MapCellSeparator.imageset/Contents.json deleted file mode 100644 index 0cf9481592..0000000000 --- a/iphone/Maps/Images.xcassets/Downloader/MapCellSeparator.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "MapCellSeparator@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x", - "filename" : "MapCellSeparator@3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Downloader/MapCellSeparator.imageset/MapCellSeparator@2x.png b/iphone/Maps/Images.xcassets/Downloader/MapCellSeparator.imageset/MapCellSeparator@2x.png deleted file mode 100644 index 1b476cd1c1..0000000000 Binary files a/iphone/Maps/Images.xcassets/Downloader/MapCellSeparator.imageset/MapCellSeparator@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Downloader/MapCellSeparator.imageset/MapCellSeparator@3x.png b/iphone/Maps/Images.xcassets/Downloader/MapCellSeparator.imageset/MapCellSeparator@3x.png deleted file mode 100644 index 299dc6d3a3..0000000000 Binary files a/iphone/Maps/Images.xcassets/Downloader/MapCellSeparator.imageset/MapCellSeparator@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Old Place Page/ColorSelectorBackground.imageset/Contents.json b/iphone/Maps/Images.xcassets/Old Place Page/ColorSelectorBackground.imageset/Contents.json index e9ff07aca0..3023300153 100644 --- a/iphone/Maps/Images.xcassets/Old Place Page/ColorSelectorBackground.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Old Place Page/ColorSelectorBackground.imageset/Contents.json @@ -6,13 +6,13 @@ }, { "idiom" : "universal", - "scale" : "2x", - "filename" : "ColorSelectorBackgound@2x.png" + "filename" : "ColorSelectorBackgound@2x.png", + "scale" : "2x" }, { "idiom" : "universal", - "scale" : "3x", - "filename" : "ColorSelectorBackgound@3x.png" + "filename" : "ColorSelectorBackgound@3x.png", + "scale" : "3x" } ], "info" : { diff --git a/iphone/Maps/Images.xcassets/Old Place Page/Contents.json b/iphone/Maps/Images.xcassets/Old Place Page/Contents.json new file mode 100644 index 0000000000..da4a164c91 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Old Place Page/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Search/Contents.json b/iphone/Maps/Images.xcassets/Search/Contents.json new file mode 100644 index 0000000000..da4a164c91 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Search/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Search/SearchFieldBackground.imageset/Contents.json b/iphone/Maps/Images.xcassets/Search/SearchFieldBackground.imageset/Contents.json deleted file mode 100644 index 55b501ecbf..0000000000 --- a/iphone/Maps/Images.xcassets/Search/SearchFieldBackground.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "SearchFieldBackground@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x", - "filename" : "SearchFieldBackground@3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Search/SearchFieldBackground.imageset/SearchFieldBackground@2x.png b/iphone/Maps/Images.xcassets/Search/SearchFieldBackground.imageset/SearchFieldBackground@2x.png deleted file mode 100644 index b1e56e92bc..0000000000 Binary files a/iphone/Maps/Images.xcassets/Search/SearchFieldBackground.imageset/SearchFieldBackground@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Search/SearchFieldBackground.imageset/SearchFieldBackground@3x.png b/iphone/Maps/Images.xcassets/Search/SearchFieldBackground.imageset/SearchFieldBackground@3x.png deleted file mode 100644 index 4031476b9d..0000000000 Binary files a/iphone/Maps/Images.xcassets/Search/SearchFieldBackground.imageset/SearchFieldBackground@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Search/SearchViewTopBackground.imageset/Contents.json b/iphone/Maps/Images.xcassets/Search/SearchViewTopBackground.imageset/Contents.json deleted file mode 100644 index 2bf54934fe..0000000000 --- a/iphone/Maps/Images.xcassets/Search/SearchViewTopBackground.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "SearchViewTopBackground@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x", - "filename" : "NavigationBarBackground7@3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Search/SearchViewTopBackground.imageset/NavigationBarBackground7@3x.png b/iphone/Maps/Images.xcassets/Search/SearchViewTopBackground.imageset/NavigationBarBackground7@3x.png deleted file mode 100644 index e3eda6a3bd..0000000000 Binary files a/iphone/Maps/Images.xcassets/Search/SearchViewTopBackground.imageset/NavigationBarBackground7@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Search/SearchViewTopBackground.imageset/SearchViewTopBackground@2x.png b/iphone/Maps/Images.xcassets/Search/SearchViewTopBackground.imageset/SearchViewTopBackground@2x.png deleted file mode 100644 index edd7d51097..0000000000 Binary files a/iphone/Maps/Images.xcassets/Search/SearchViewTopBackground.imageset/SearchViewTopBackground@2x.png and /dev/null differ diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 59c2e1ab2c..959a259b16 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -315,10 +315,6 @@ F785EB4016386FC4003A38A8 /* BookmarkCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F785EB3F16386FC4003A38A8 /* BookmarkCell.mm */; }; F7FDD823147F30CC005900FA /* drules_proto.bin in Resources */ = {isa = PBXBuildFile; fileRef = F7FDD822147F30CC005900FA /* drules_proto.bin */; }; FA054612155C465E001F4E37 /* SelectSetVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA054611155C465E001F4E37 /* SelectSetVC.mm */; }; - FA140651162A6288002BC1ED /* empty@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA14064D162A6288002BC1ED /* empty@2x.png */; }; - FA140653162A6288002BC1ED /* empty.png in Resources */ = {isa = PBXBuildFile; fileRef = FA14064E162A6288002BC1ED /* empty.png */; }; - FA140655162A6288002BC1ED /* eye.png in Resources */ = {isa = PBXBuildFile; fileRef = FA14064F162A6288002BC1ED /* eye.png */; }; - FA140657162A6288002BC1ED /* eye@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA140650162A6288002BC1ED /* eye@2x.png */; }; FA29FDAA141E77F8004ADF66 /* Preferences.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA29FDA9141E77F8004ADF66 /* Preferences.mm */; }; FA36B80D15403A4F004560CC /* BookmarksVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA36B80615403A4F004560CC /* BookmarksVC.mm */; }; FA459EB414327AF700B5BB3C /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = FA459EB314327AF700B5BB3C /* WorldCoasts.mwm */; }; @@ -821,10 +817,6 @@ F7FDD822147F30CC005900FA /* drules_proto.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto.bin; path = ../../data/drules_proto.bin; sourceTree = ""; }; FA054610155C465E001F4E37 /* SelectSetVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectSetVC.h; path = Bookmarks/SelectSetVC.h; sourceTree = SOURCE_ROOT; }; FA054611155C465E001F4E37 /* SelectSetVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SelectSetVC.mm; path = Bookmarks/SelectSetVC.mm; sourceTree = SOURCE_ROOT; }; - FA14064D162A6288002BC1ED /* empty@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "empty@2x.png"; path = "Bookmarks/empty@2x.png"; sourceTree = SOURCE_ROOT; }; - FA14064E162A6288002BC1ED /* empty.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = empty.png; path = Bookmarks/empty.png; sourceTree = SOURCE_ROOT; }; - FA14064F162A6288002BC1ED /* eye.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = eye.png; path = Bookmarks/eye.png; sourceTree = SOURCE_ROOT; }; - FA140650162A6288002BC1ED /* eye@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "eye@2x.png"; path = "Bookmarks/eye@2x.png"; sourceTree = SOURCE_ROOT; }; FA29FDA8141E77F8004ADF66 /* Preferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Preferences.h; path = Settings/Preferences.h; sourceTree = ""; }; FA29FDA9141E77F8004ADF66 /* Preferences.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = Preferences.mm; path = Settings/Preferences.mm; sourceTree = ""; }; FA36B80515403A4F004560CC /* BookmarksVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = BookmarksVC.h; path = Bookmarks/BookmarksVC.h; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; @@ -2055,7 +2047,6 @@ children = ( F785EB3E16386FC4003A38A8 /* BookmarkCell.h */, F785EB3F16386FC4003A38A8 /* BookmarkCell.mm */, - FA36B8171540466A004560CC /* Images */, FAA614B6155F16950031C345 /* AddSetVC.h */, FAA614B7155F16950031C345 /* AddSetVC.mm */, FA054610155C465E001F4E37 /* SelectSetVC.h */, @@ -2069,17 +2060,6 @@ path = Classes; sourceTree = ""; }; - FA36B8171540466A004560CC /* Images */ = { - isa = PBXGroup; - children = ( - FA14064E162A6288002BC1ED /* empty.png */, - FA14064D162A6288002BC1ED /* empty@2x.png */, - FA14064F162A6288002BC1ED /* eye.png */, - FA140650162A6288002BC1ED /* eye@2x.png */, - ); - name = Images; - sourceTree = ""; - }; FA4135DF120A25B90062D5B4 /* Settings */ = { isa = PBXGroup; children = ( @@ -2316,14 +2296,10 @@ 4A00DBDF1AB704C400113624 /* drules_proto_dark.bin in Resources */, 4A23D15D1B8B4DD700D4EB6F /* resources-mdpi_clear in Resources */, F6FE2C111B03A016009814AA /* PlacePageNavigationBar.xib in Resources */, - FA140651162A6288002BC1ED /* empty@2x.png in Resources */, F61579361AC2CEB60032D8E9 /* MWMRateAlert.xib in Resources */, - FA140653162A6288002BC1ED /* empty.png in Resources */, 34634B1B1BB42D270013573C /* MWMBottomMenuCollectionViewLandscapeCell.xib in Resources */, - FA140655162A6288002BC1ED /* eye.png in Resources */, 347FDDA11BB59B4E00871410 /* Mapsme.storyboard in Resources */, 3438CDF91B8616760051AA78 /* MWMSearchShowOnMapCell.xib in Resources */, - FA140657162A6288002BC1ED /* eye@2x.png in Resources */, 34BAB6EE1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewPortraitCell.xib in Resources */, 349A358D1B53EABC009677EE /* MWMSearchDownloadMapRequest.xib in Resources */, 4A23D15B1B8B4DD700D4EB6F /* drules_proto_clear.bin in Resources */,