diff --git a/android/res/layout/fragment_editor.xml b/android/res/layout/fragment_editor.xml
index 5d87189527..f7216333ed 100644
--- a/android/res/layout/fragment_editor.xml
+++ b/android/res/layout/fragment_editor.xml
@@ -135,9 +135,45 @@
android:text="@string/details"
android:textAppearance="@style/MwmTextAppearance.Body3"
tools:ignore="UnusedAttribute"/>
+
+
+
+
+
+
+
+
+
@@ -167,9 +203,40 @@
android:textAppearance="@style/MwmTextAppearance.Body1"
android:textColor="?colorAccent"/>
+
+
+
+
+
+
+
+
+
+
+
+
@@ -188,64 +255,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -64,15 +74,7 @@
-
-
-
-
-
-
-
-
-
+
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
index dd7f739866..5b28c424a9 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
@@ -109,6 +109,12 @@ class PlacePageInfoViewController: UIViewController {
rawOpeningHoursView?.infoLabel.numberOfLines = 0
}
+ if let cuisine = placePageInfoData.cuisine {
+ cuisineView = createInfoItem(cuisine, icon: UIImage(named: "ic_placepage_cuisine"))
+ }
+
+ /// @todo Entrance is missing compared with Android. It's shown in title, but anyway ..
+
if let phone = placePageInfoData.phone {
var cellStyle: Style = .regular
if let phoneUrl = placePageInfoData.phoneUrl, UIApplication.shared.canOpenURL(phoneUrl) {
@@ -119,12 +125,24 @@ class PlacePageInfoViewController: UIViewController {
}
}
+ if let ppOperator = placePageInfoData.ppOperator {
+ operatorView = createInfoItem(ppOperator, icon: UIImage(named: "ic_placepage_operator"))
+ }
+
if let website = placePageInfoData.website {
websiteView = createInfoItem(website, icon: UIImage(named: "ic_placepage_website"), style: .link) { [weak self] in
self?.delegate?.didPressWebsite()
}
}
+ if let wifi = placePageInfoData.wifiAvailable {
+ wifiView = createInfoItem(wifi, icon: UIImage(named: "ic_placepage_wifi"))
+ }
+
+ if let level = placePageInfoData.level {
+ levelView = createInfoItem(level, icon: UIImage(named: "ic_placepage_level"))
+ }
+
if let email = placePageInfoData.email {
emailView = createInfoItem(email, icon: UIImage(named: "ic_placepage_email"), style: .link) { [weak self] in
self?.delegate?.didPressEmail()
@@ -155,26 +173,10 @@ class PlacePageInfoViewController: UIViewController {
}
}
- if let cuisine = placePageInfoData.cuisine {
- cuisineView = createInfoItem(cuisine, icon: UIImage(named: "ic_placepage_cuisine"))
- }
-
- if let ppOperator = placePageInfoData.ppOperator {
- operatorView = createInfoItem(ppOperator, icon: UIImage(named: "ic_placepage_operator"))
- }
-
- if let wifi = placePageInfoData.wifiAvailable {
- wifiView = createInfoItem(wifi, icon: UIImage(named: "ic_placepage_wifi"))
- }
-
if let address = placePageInfoData.address {
addressView = createInfoItem(address, icon: UIImage(named: "ic_placepage_adress"))
addressView?.canShowMenu = true
}
-
- if let level = placePageInfoData.level {
- levelView = createInfoItem(level, icon: UIImage(named: "ic_placepage_level"))
- }
if let formattedCoordinates = placePageInfoData.formattedCoordinates,
let rawCoordinates = placePageInfoData.rawCoordinates {