diff --git a/iphone/Maps/Classes/Share/MWMShareActivityItem.mm b/iphone/Maps/Classes/Share/MWMShareActivityItem.mm
index 0f02fbc6e..15b3cab03 100644
--- a/iphone/Maps/Classes/Share/MWMShareActivityItem.mm
+++ b/iphone/Maps/Classes/Share/MWMShareActivityItem.mm
@@ -109,7 +109,7 @@ NSString * httpGe0Url(NSString * shortUrl)
LPLinkMetadata * metadata = [[LPLinkMetadata alloc] init];
metadata.originalURL = [NSURL URLWithString:httpGe0Url([self url:NO])];
metadata.title = self.isMyPosition ? L(@"core_my_position") : self.data.previewData.title;
- metadata.iconProvider = [[NSItemProvider alloc] initWithObject:[UIImage imageNamed:@"imgLogo"]];
+ metadata.iconProvider = [[NSItemProvider alloc] initWithObject:[UIImage imageNamed:@"Logo"]];
return metadata;
}
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/dark_icon.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/dark_icon.png
deleted file mode 100644
index c459e7353..000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/dark_icon.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/icon.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/icon.png
deleted file mode 100644
index c1c96dbef..000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/icon.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/tinted_icon.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/tinted_icon.png
deleted file mode 100644
index 593cc7198..000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/tinted_icon.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/Contents.json b/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/Contents.json
deleted file mode 100644
index f21cdfb84..000000000
--- a/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/Contents.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "images" : [
- {
- "filename" : "debug_icon.png",
- "idiom" : "universal",
- "platform" : "ios",
- "size" : "1024x1024"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/debug_icon.png b/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/debug_icon.png
deleted file mode 100644
index 348bd0938..000000000
Binary files a/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/debug_icon.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Debug Icon.appiconset/Contents.json b/iphone/Maps/Images.xcassets/Debug Icon.appiconset/Contents.json
new file mode 100644
index 000000000..d511af7d3
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Debug Icon.appiconset/Contents.json
@@ -0,0 +1,38 @@
+{
+ "images" : [
+ {
+ "filename" : "Light-Debug.png",
+ "idiom" : "universal",
+ "platform" : "ios",
+ "size" : "1024x1024"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "filename" : "Dark-Debug.png",
+ "idiom" : "universal",
+ "platform" : "ios",
+ "size" : "1024x1024"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "tinted"
+ }
+ ],
+ "filename" : "Tinted-Debug.png",
+ "idiom" : "universal",
+ "platform" : "ios",
+ "size" : "1024x1024"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/iphone/Maps/Images.xcassets/Debug Icon.appiconset/Dark-Debug.png b/iphone/Maps/Images.xcassets/Debug Icon.appiconset/Dark-Debug.png
new file mode 100644
index 000000000..23df5b3ba
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Debug Icon.appiconset/Dark-Debug.png differ
diff --git a/iphone/Maps/Images.xcassets/Debug Icon.appiconset/Light-Debug.png b/iphone/Maps/Images.xcassets/Debug Icon.appiconset/Light-Debug.png
new file mode 100644
index 000000000..b1272e6dd
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Debug Icon.appiconset/Light-Debug.png differ
diff --git a/iphone/Maps/Images.xcassets/Debug Icon.appiconset/Tinted-Debug.png b/iphone/Maps/Images.xcassets/Debug Icon.appiconset/Tinted-Debug.png
new file mode 100644
index 000000000..a632a4624
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Debug Icon.appiconset/Tinted-Debug.png differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json b/iphone/Maps/Images.xcassets/Icon.appiconset/Contents.json
similarity index 85%
rename from iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json
rename to iphone/Maps/Images.xcassets/Icon.appiconset/Contents.json
index 7d6e18976..2617752b9 100644
--- a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Icon.appiconset/Contents.json
@@ -1,7 +1,7 @@
{
"images" : [
{
- "filename" : "icon.png",
+ "filename" : "Light.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
@@ -13,7 +13,7 @@
"value" : "dark"
}
],
- "filename" : "dark_icon.png",
+ "filename" : "Dark.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
@@ -25,7 +25,7 @@
"value" : "tinted"
}
],
- "filename" : "tinted_icon.png",
+ "filename" : "Tinted.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
diff --git a/iphone/Maps/Images.xcassets/Icon.appiconset/Dark.png b/iphone/Maps/Images.xcassets/Icon.appiconset/Dark.png
new file mode 100644
index 000000000..dca37669b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Icon.appiconset/Dark.png differ
diff --git a/iphone/Maps/Images.xcassets/Icon.appiconset/Light.png b/iphone/Maps/Images.xcassets/Icon.appiconset/Light.png
new file mode 100644
index 000000000..073f33900
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Icon.appiconset/Light.png differ
diff --git a/iphone/Maps/Images.xcassets/Icon.appiconset/Tinted.png b/iphone/Maps/Images.xcassets/Icon.appiconset/Tinted.png
new file mode 100644
index 000000000..a632a4624
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Icon.appiconset/Tinted.png differ
diff --git a/iphone/Maps/Images.xcassets/logo.imageset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Logo.imageset/Contents.json
similarity index 55%
rename from iphone/Maps/Images.xcassets/logo.imageset/Contents.json
rename to iphone/Maps/Images.xcassets/Interface/Logo.imageset/Contents.json
index ad42a58df..4b2b2a361 100644
--- a/iphone/Maps/Images.xcassets/logo.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Interface/Logo.imageset/Contents.json
@@ -1,12 +1,15 @@
{
"images" : [
{
- "filename" : "logo.svg",
+ "filename" : "Logo.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
+ },
+ "properties" : {
+ "preserves-vector-representation" : true
}
}
diff --git a/iphone/Maps/Images.xcassets/Interface/Logo.imageset/Logo.svg b/iphone/Maps/Images.xcassets/Interface/Logo.imageset/Logo.svg
new file mode 100644
index 000000000..5e1fcf68f
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Logo.imageset/Logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Settings/Contents.json b/iphone/Maps/Images.xcassets/Settings/Contents.json
deleted file mode 100644
index 73c00596a..000000000
--- a/iphone/Maps/Images.xcassets/Settings/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/Contents.json b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/Contents.json
deleted file mode 100644
index 97804fb11..000000000
--- a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "imgLogo.png",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "filename" : "imgLogo@2x.png",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "filename" : "imgLogo@3x.png",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo.png b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo.png
deleted file mode 100644
index 86064aafe..000000000
Binary files a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo@2x.png b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo@2x.png
deleted file mode 100644
index ab133350f..000000000
Binary files a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo@3x.png b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo@3x.png
deleted file mode 100644
index 64156b334..000000000
Binary files a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/logo.imageset/logo.svg b/iphone/Maps/Images.xcassets/logo.imageset/logo.svg
deleted file mode 100644
index e20461781..000000000
--- a/iphone/Maps/Images.xcassets/logo.imageset/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index fec4a0128..5d69af8cd 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -5142,7 +5142,7 @@
6741AA571BF340DE002C974C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
+ ASSETCATALOG_COMPILER_APPICON_NAME = "Debug Icon";
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color";
CODE_SIGN_ENTITLEMENTS = "CoMaps-Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
@@ -5177,7 +5177,7 @@
6741AA5A1BF340DE002C974C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_APPICON_NAME = Icon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color";
CODE_SIGN_ENTITLEMENTS = "CoMaps-Release.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
diff --git a/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.xib b/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.xib
index 6c6d3f871..accd97bad 100644
--- a/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.xib
+++ b/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.xib
@@ -1,9 +1,9 @@
-
+
-
+
@@ -24,9 +24,9 @@
-
+
-
+
@@ -45,7 +45,7 @@
-
+
diff --git a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib
index c37e66abb..4794d09f2 100644
--- a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib
+++ b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib
@@ -39,7 +39,7 @@
-
+
@@ -157,9 +157,9 @@
+
-
diff --git a/iphone/Maps/UI/Help/AboutController/AboutController.swift b/iphone/Maps/UI/Help/AboutController/AboutController.swift
index afad1d987..e176a9f76 100644
--- a/iphone/Maps/UI/Help/AboutController/AboutController.swift
+++ b/iphone/Maps/UI/Help/AboutController/AboutController.swift
@@ -105,7 +105,9 @@ private extension AboutController {
func setupLogo() {
logoImageView.contentMode = .scaleAspectFit
- logoImageView.image = UIImage(named: "logo")
+ logoImageView.image = UIImage(named: "Logo")
+ logoImageView.layer.cornerRadius = 12
+ logoImageView.layer.masksToBounds = true
}
func setupHeaderTitle() {