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

[ios] Add capacity tag to Place Page

Browse source 
Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
This commit is contained in:
David Martinez 2023-12-30 16:52:21 +01:00 • committed by Viktor Govako
parent 0a73e3de94
commit 2e7f582f07
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

@ -28,6 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly, nullable) NSString *wifiAvailable;
@property(nonatomic, readonly, nullable) NSString *level;
@property(nonatomic, readonly, nullable) NSString *atm;
@property(nonatomic, readonly, nullable) NSString *capacity;
@end

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

@ -75,6 +75,7 @@ using namespace osm;
? NSLocalizedString(@"no_available", nil) : NSLocalizedString(@"yes_available", nil);
break;
case MetadataID::FMD_LEVEL: _level = ToNSString(value); break;
case MetadataID::FMD_CAPACITY: _capacity = ToNSString(value); break;
default:
break;
}

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

@ -0,0 +1,24 @@
{
"images" : [
{
"filename" : "ic_capacity_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_capacity.imageset/ic_capacity_white.svg vendored Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="48" height="48" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
<path d="m10.6 17.792a0.59986 0.60011 0 0 0-0.59959 0.59959v11.217a0.59986 0.60011 0 0 0 0.59959 0.59959h1.1699a0.59986 0.60011 0 0 0 0.59959-0.59959v-5.162l1.4824 5.3241a0.59986 0.60011 0 0 0 0.57811 0.43749h1.0957a0.59986 0.60011 0 0 0 0.57616-0.43554l1.5019-5.2655v5.1014a0.59986 0.60011 0 0 0 0.5996 0.59959h1.1699a0.59986 0.60011 0 0 0 0.47655-0.25585 0.59986 0.60011 0 0 0 0.4785 0.25585h1.2929a0.59986 0.60011 0 0 0 0.5742-0.42772l0.88279-2.9687h2.953l0.93748 2.9765a0.59986 0.60011 0 0 0 0.57225 0.41991h1.3925a0.59986 0.60011 0 0 0 0.02734-2e-3 0.59986 0.60011 0 0 0 0.01172 2e-3h1.4589a0.59986 0.60011 0 0 0 0.51561-0.29491l2.2402-3.789 2.1933 3.7851a0.59986 0.60011 0 0 0 0.51952 0.29882h1.5a0.59986 0.60011 0 0 0 0.51756-0.90427l-3.2987-5.619 3.0409-4.9803a0.59986 0.60011 0 0 0-0.5117-0.91209h-1.3164a0.59986 0.60011 0 0 0-0.50975 0.28124l-1.8574 2.9745c-0.07044 0.11201-0.13749 0.2228-0.20312 0.33202-0.07681-0.13777-0.14364-0.26029-0.23242-0.41405l-1.6757-2.8769a0.59986 0.60011 0 0 0-0.51757-0.29687h-1.4433a0.59986 0.60011 0 0 0-0.51756 0.90232l2.955 5.0624-2.7245 4.4784-3.3671-10.035a0.59986 0.60011 0 0 0-0.56834-0.40819h-1.3086a0.59986 0.60011 0 0 0-0.57225 0.41991l-3.3163 10.529v-10.349a0.59986 0.60011 0 0 0-0.59959-0.59959h-1.6367a0.59986 0.60011 0 0 0-0.57811 0.43749l-2.1054 7.4607-2.0488-7.4568a0.59986 0.60011 0 0 0-0.57616-0.4414zm13.937 4.1893c0.0096 0.031 0.01763 0.0585 0.02734 0.08985l0.71873 2.33h-1.4882z" fill="#fff"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

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

@ -93,6 +93,7 @@ class PlacePageInfoViewController: UIViewController {
private var addressView: InfoItemViewController?
private var levelView: InfoItemViewController?
private var coordinatesView: InfoItemViewController?
private var capacityView: InfoItemViewController?
var placePageInfoData: PlacePageInfoData!
weak var delegate: PlacePageInfoViewControllerDelegate?
@ -190,6 +191,10 @@ class PlacePageInfoViewController: UIViewController {
if let level = placePageInfoData.level {
levelView = createInfoItem(level, icon: UIImage(named: "ic_placepage_level"))
}
if let capacity = placePageInfoData.capacity {
capacityView = createInfoItem(capacity, icon: UIImage(named: "ic_placepage_capacity"))
}
if let email = placePageInfoData.email {
emailView = createInfoItem(email,