organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

Close open in place page #4254

Closed
pravalgautam wants to merge 2 commits from CloseOpenInPlacePage into master
pull from: CloseOpenInPlacePage
merge into: organicmaps:master
Conversation 0 Commits 2 Files changed 2 +20 -10
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -4514,11 +4514,11 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_ENTITLEMENTS = "OMaps-Release.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Z6432XD7L;
DEVELOPMENT_TEAM = D5M38GX662;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@ -4527,7 +4527,7 @@
MARKETING_VERSION = 2022.11.17;
OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps;
PROVISIONING_PROFILE_SPECIFIER = "CarPlay Release";
PROVISIONING_PROFILE_SPECIFIER = "";
};
name = Release;
};

22
iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift
View file

@ -165,7 +165,7 @@ final class PlacePagePreviewViewController: UIViewController {
details = nil;
}
setScheduleLabel(state: L("editor_time_open"),
setScheduleLabel(state: L(""),
stateColor: UIColor.systemGreen,
details: details);
@ -202,7 +202,7 @@ final class PlacePagePreviewViewController: UIViewController {
details = nil;
}
setScheduleLabel(state: L("closed_now"),
setScheduleLabel(state: L(""),
stateColor: UIColor.systemRed,
details: details);
@ -232,10 +232,20 @@ final class PlacePagePreviewViewController: UIViewController {
attributedString.append(stateString);
if (details != nil)
{
let detailsString = NSAttributedString(string: " • " + details!,
attributes: [NSAttributedString.Key.font: UIFont.regular14(),
NSAttributedString.Key.foregroundColor: UIColor.blackSecondaryText()]);
attributedString.append(detailsString);
if (placePagePreviewData.schedule.state == .closed){
let detailsString = NSAttributedString(string: "" + details!,
attributes: [NSAttributedString.Key.font: UIFont.regular14(),
NSAttributedString.Key.foregroundColor: UIColor.systemRed]);
attributedString.append(detailsString);
}
else if (placePagePreviewData.schedule.state == .open){
let detailsString = NSAttributedString(string: "" + details!,
attributes: [NSAttributedString.Key.font: UIFont.regular14(),
NSAttributedString.Key.foregroundColor: UIColor.systemGreen]);
attributedString.append(detailsString);
}
}
scheduleLabel.attributedText = attributedString;
}