Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArsentiy Milchakov <milcars@mapswithme.com>2017-05-02 18:54:09 +0300
committerGitHub <noreply@github.com>2017-05-02 18:54:09 +0300
commit808101409129d862bbb0c150e62f7a3dcb197433 (patch)
treee0e909544e5b5fe784756d8ce2cc1f5208730f02
parentdaf656552e6ffd5816d5bf657f00a581e018aa3d (diff)
parentd4f5f9f6ac1305c6cb9f79c2b843d833117ec9d4 (diff)
Merge pull request #5970 from VladiMihaylenko/vm-masterbeta-789
[ios] New whatsnew and version
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/Contents.json (renamed from iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/Contents.json)6
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style.pngbin0 -> 39567 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style@2x.pngbin0 -> 86418 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style@3x.pngbin0 -> 142029 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/Contents.json23
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration.pngbin0 -> 26690 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration@2x.pngbin0 -> 55625 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration@3x.pngbin0 -> 83135 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1.pngbin23037 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1@2x.pngbin42312 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1@3x.pngbin62767 -> 0 bytes
-rw-r--r--iphone/Maps/UI/Welcome/WhatsNewController.swift11
-rw-r--r--xcode/common.xcconfig2
13 files changed, 35 insertions, 7 deletions
diff --git a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/Contents.json
index cfedf9f15f..15ecbf5eaa 100644
--- a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/Contents.json
@@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
- "filename" : "wn_img_1.png",
+ "filename" : "img_whatsnew_driving_style.png",
"scale" : "1x"
},
{
"idiom" : "universal",
- "filename" : "wn_img_1@2x.png",
+ "filename" : "img_whatsnew_driving_style@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
- "filename" : "wn_img_1@3x.png",
+ "filename" : "img_whatsnew_driving_style@3x.png",
"scale" : "3x"
}
],
diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style.png
new file mode 100644
index 0000000000..9ade1afaf3
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style.png
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style@2x.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style@2x.png
new file mode 100644
index 0000000000..cacfd45caf
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style@2x.png
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style@3x.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style@3x.png
new file mode 100644
index 0000000000..3baaad7aaf
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style@3x.png
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/Contents.json b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/Contents.json
new file mode 100644
index 0000000000..38124679ab
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "img_whatsnew_transliteration.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "img_whatsnew_transliteration@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "img_whatsnew_transliteration@3x.png",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+} \ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration.png
new file mode 100644
index 0000000000..0e25aefeb9
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration.png
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration@2x.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration@2x.png
new file mode 100644
index 0000000000..8123006f07
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration@2x.png
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration@3x.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration@3x.png
new file mode 100644
index 0000000000..f7d6ea9492
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration@3x.png
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1.png b/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1.png
deleted file mode 100644
index edeba2cbd7..0000000000
--- a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1.png
+++ /dev/null
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1@2x.png b/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1@2x.png
deleted file mode 100644
index 4c84b7f2b7..0000000000
--- a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1@2x.png
+++ /dev/null
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1@3x.png b/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1@3x.png
deleted file mode 100644
index 1efa510956..0000000000
--- a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1@3x.png
+++ /dev/null
Binary files differ
diff --git a/iphone/Maps/UI/Welcome/WhatsNewController.swift b/iphone/Maps/UI/Welcome/WhatsNewController.swift
index 3d81f8aa9f..fd05ff11e2 100644
--- a/iphone/Maps/UI/Welcome/WhatsNewController.swift
+++ b/iphone/Maps/UI/Welcome/WhatsNewController.swift
@@ -8,9 +8,14 @@ final class WhatsNewController: MWMViewController, WelcomeProtocol {
// text: "whatsnew_improved_search_text",
// buttonTitle: "whats_new_next_button",
// buttonAction: #selector(nextPage)),
- WelcomeConfig(image: #imageLiteral(resourceName: "wn_img_1"),
- title: "whatsnew_more_info_on_hotels_title",
- text: "whatsnew_more_info_on_hotels_message",
+ WelcomeConfig(image: #imageLiteral(resourceName: "img_whatsnew_driving_style"),
+ title: "whatsnew_driving_style_title",
+ text: "whatsnew_driving_style_message",
+ buttonTitle: "whats_new_next_button",
+ buttonAction: #selector(nextPage)),
+ WelcomeConfig(image: #imageLiteral(resourceName: "img_whatsnew_transliteration"),
+ title: "whatsnew_transliteration_title",
+ text: "whatsnew_transliteration_message",
buttonTitle: "done",
buttonAction: #selector(close))
]
diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig
index 152a64071a..cbdff01fe3 100644
--- a/xcode/common.xcconfig
+++ b/xcode/common.xcconfig
@@ -1,4 +1,4 @@
-CURRENT_PROJECT_VERSION = 7.2.4
+CURRENT_PROJECT_VERSION = 7.3.0
// Paths
OMIM_ROOT = $(PROJECT_DIR)/../..