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:
authorAleksey Belouosv <aleksey@maps.me>2018-10-23 18:07:24 +0300
committerRoman Kuznetsov <r.kuznetsow@gmail.com>2018-10-24 11:24:17 +0300
commit67185059a3813c91b63503bfd5c1e9c20b92b63e (patch)
tree0c1eb3cc21fc0f251a066fbd8aed97bb583a0b70
parent9d30a100990520f69f87504221fb9a801800dce5 (diff)
[iOS] update rutaxi icon and link in search categories
-rw-r--r--iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/Contents.json (renamed from iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/Contents.json)6
-rw-r--r--iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/ic_rutaxi_dark.pngbin0 -> 1725 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/ic_rutaxi_dark@2x.pngbin0 -> 3220 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/ic_rutaxi_dark@3x.pngbin0 -> 5006 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/Contents.json23
-rw-r--r--iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/ic_rutaxi_light.pngbin0 -> 1745 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/ic_rutaxi_light@2x.pngbin0 -> 3285 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/ic_rutaxi_light@3x.pngbin0 -> 5122 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/ic_vezet_light.pngbin706 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/ic_vezet_light@2x.pngbin1244 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/ic_vezet_light@3x.pngbin1697 -> 0 bytes
-rw-r--r--iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm2
-rw-r--r--iphone/Maps/UI/Search/TabbedView/CategoriesTab/SearchBannerCell.swift6
-rw-r--r--iphone/Maps/UI/Search/TabbedView/CategoriesTab/SearchBannerCell.xib7
14 files changed, 38 insertions, 6 deletions
diff --git a/iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/Contents.json
index d27188f00c..9736899ebf 100644
--- a/iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/Contents.json
@@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
- "filename" : "ic_vezet_light.png",
+ "filename" : "ic_rutaxi_dark.png",
"scale" : "1x"
},
{
"idiom" : "universal",
- "filename" : "ic_vezet_light@2x.png",
+ "filename" : "ic_rutaxi_dark@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
- "filename" : "ic_vezet_light@3x.png",
+ "filename" : "ic_rutaxi_dark@3x.png",
"scale" : "3x"
}
],
diff --git a/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/ic_rutaxi_dark.png b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/ic_rutaxi_dark.png
new file mode 100644
index 0000000000..e64e2b0272
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/ic_rutaxi_dark.png
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/ic_rutaxi_dark@2x.png b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/ic_rutaxi_dark@2x.png
new file mode 100644
index 0000000000..05ae15283b
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/ic_rutaxi_dark@2x.png
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/ic_rutaxi_dark@3x.png b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/ic_rutaxi_dark@3x.png
new file mode 100644
index 0000000000..699462fed3
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_dark.imageset/ic_rutaxi_dark@3x.png
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/Contents.json
new file mode 100644
index 0000000000..68aec54157
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "ic_rutaxi_light.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "ic_rutaxi_light@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "ic_rutaxi_light@3x.png",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+} \ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/ic_rutaxi_light.png b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/ic_rutaxi_light.png
new file mode 100644
index 0000000000..f3c01a370a
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/ic_rutaxi_light.png
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/ic_rutaxi_light@2x.png b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/ic_rutaxi_light@2x.png
new file mode 100644
index 0000000000..f8dcb00974
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/ic_rutaxi_light@2x.png
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/ic_rutaxi_light@3x.png b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/ic_rutaxi_light@3x.png
new file mode 100644
index 0000000000..fef989d73a
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Search/Categories/ic_rutaxi_light.imageset/ic_rutaxi_light@3x.png
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/ic_vezet_light.png b/iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/ic_vezet_light.png
deleted file mode 100644
index 8aa7429e32..0000000000
--- a/iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/ic_vezet_light.png
+++ /dev/null
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/ic_vezet_light@2x.png b/iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/ic_vezet_light@2x.png
deleted file mode 100644
index cef3b4688e..0000000000
--- a/iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/ic_vezet_light@2x.png
+++ /dev/null
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/ic_vezet_light@3x.png b/iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/ic_vezet_light@3x.png
deleted file mode 100644
index 7d5899711a..0000000000
--- a/iphone/Maps/Images.xcassets/Search/Categories/ic_vezet_light.imageset/ic_vezet_light@3x.png
+++ /dev/null
Binary files differ
diff --git a/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm b/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm
index 9bf444ce2a..765a4c49d5 100644
--- a/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm
+++ b/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm
@@ -103,7 +103,7 @@ static NSInteger const kRutaxiIndex = 6;
- (void)cellDidPressAction:(MWMSearchBannerCell *)cell
{
[[UIApplication sharedApplication] openURL:
- [NSURL URLWithString:@"https://go.onelink.me/757212956/a81b5d7c"]];
+ [NSURL URLWithString:@"https://go.onelink.me/2944814706/86db6339"]];
}
- (void)cellDidPressClose:(MWMSearchBannerCell *)cell
diff --git a/iphone/Maps/UI/Search/TabbedView/CategoriesTab/SearchBannerCell.swift b/iphone/Maps/UI/Search/TabbedView/CategoriesTab/SearchBannerCell.swift
index 140d0a0d0e..8c8bdffab9 100644
--- a/iphone/Maps/UI/Search/TabbedView/CategoriesTab/SearchBannerCell.swift
+++ b/iphone/Maps/UI/Search/TabbedView/CategoriesTab/SearchBannerCell.swift
@@ -7,8 +7,14 @@ protocol SearchBannerCellDelegate: AnyObject {
@objc(MWMSearchBannerCell)
class SearchBannerCell: MWMTableViewCell {
+ @IBOutlet var taxiImageView: UIImageView!
@objc weak var delegate: SearchBannerCellDelegate?
+ override func awakeFromNib() {
+ super.awakeFromNib()
+ taxiImageView.mwm_name = "ic_rutaxi"
+ }
+
@IBAction private func onInstall(_ sender: UIButton) {
delegate?.cellDidPressAction(self)
}
diff --git a/iphone/Maps/UI/Search/TabbedView/CategoriesTab/SearchBannerCell.xib b/iphone/Maps/UI/Search/TabbedView/CategoriesTab/SearchBannerCell.xib
index 32d8b5c364..848ef932b6 100644
--- a/iphone/Maps/UI/Search/TabbedView/CategoriesTab/SearchBannerCell.xib
+++ b/iphone/Maps/UI/Search/TabbedView/CategoriesTab/SearchBannerCell.xib
@@ -19,7 +19,7 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" image="ic_vezet_light" translatesAutoresizingMaskIntoConstraints="NO" id="a9s-eh-L10" userLabel="Icon">
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" image="ic_rutaxi_light" translatesAutoresizingMaskIntoConstraints="NO" id="a9s-eh-L10" userLabel="Icon">
<rect key="frame" x="16" y="8" width="28" height="28"/>
<constraints>
<constraint firstAttribute="width" constant="28" id="UkL-Ob-9dH"/>
@@ -113,11 +113,14 @@
</userDefinedRuntimeAttributes>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+ <connections>
+ <outlet property="taxiImageView" destination="a9s-eh-L10" id="Lga-SX-Sev"/>
+ </connections>
<point key="canvasLocation" x="52.799999999999997" y="48.575712143928037"/>
</tableViewCell>
</objects>
<resources>
<image name="ic_ad_close" width="8" height="8"/>
- <image name="ic_vezet_light" width="28" height="28"/>
+ <image name="ic_rutaxi_light" width="40" height="40"/>
</resources>
</document>