gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios][placepage] Add network to place page

Browse source 
Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
This commit is contained in:
David Martinez 2024-06-22 11:52:38 +02:00 • committed by Viktor Havaka
parent 91b2542fe0
commit dc29c0101d
5 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.h
View file

@ -34,6 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly, nullable) NSString *websiteMenu;
@property(nonatomic, readonly, nullable) NSString *selfService;
@property(nonatomic, readonly, nullable) NSString *outdoorSeating;
@property(nonatomic, readonly, nullable) NSString *network;
@end

1
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm
View file

@ -95,6 +95,7 @@ NSString * GetLocalizedMetadataValueString(MapObject::MetadataID metaID, std::st
if (value == "yes")
_outdoorSeating = NSLocalizedString(@"outdoor_seating", nil);
break;
case MetadataID::FMD_NETWORK: _network = [NSString stringWithFormat:NSLocalizedString(@"network", nil), ToNSString(value)]; break;
default:
break;
}

24
iphone/Maps/Images.xcassets/Place Page/ic_placepage_network.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,24 @@
{
"images" : [
{
"filename" : "ic_network_white.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}

4
iphone/Maps/Images.xcassets/Place Page/ic_placepage_network.imageset/ic_network_white.svg vendored Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="28" height="28" version="1.1" viewBox="0 0 28 28" xmlns="http://www.w3.org/2000/svg">
<path d="m22.548 9.2994c1.6915-0.39771 2.9517-1.9167 2.9517-3.7327 0-2.1179-1.7154-3.8333-3.8333-3.8333-2.0796 0-3.771 1.6531-3.8333 3.7135l-8.8071 3.5267c-0.6948-0.6852-1.6435-1.1069-2.6929-1.1069-2.1179 0-3.8333 1.7154-3.8333 3.8333 0 2.1179 1.7154 3.8333 3.8333 3.8333 0.58458 0 1.1404-0.12937 1.634-0.36417l6.9767 6.1046c-0.11496 0.36417-0.1773 0.75709-0.1773 1.1596 0 2.1179 1.7154 3.8333 3.8333 3.8333s3.8333-1.7154 3.8333-3.8333c0-1.3273-0.67084-2.4965-1.6962-3.1817zm-12.559 3.5602c0.10538-0.33063 0.16771-0.68042 0.17729-1.0398l8.8071-3.5219c0.1725 0.16771 0.35459 0.32105 0.55583 0.45521l-1.8112 9.9475c-0.26354 0.06227-0.5175 0.14854-0.75708 0.26355z" fill="#fff"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 822 B

5
iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
View file

@ -130,6 +130,7 @@ class PlacePageInfoViewController: UIViewController {
private var selfServiceView: InfoItemViewController?
private var outdoorSeatingView: InfoItemViewController?
private var driveThroughView: InfoItemViewController?
private var networkView: InfoItemViewController?
var placePageInfoData: PlacePageInfoData!
weak var delegate: PlacePageInfoViewControllerDelegate?
@ -183,6 +184,10 @@ class PlacePageInfoViewController: UIViewController {
if let ppOperator = placePageInfoData.ppOperator {
operatorView = createInfoItem(ppOperator, icon: UIImage(named: "ic_placepage_operator"))
}
if let network = placePageInfoData.network {
networkView = createInfoItem(network, icon: UIImage(named: "ic_placepage_network"))
}
if let website = placePageInfoData.website {
// Strip website url only when the value is displayed, to avoid issues when it's opened or edited.