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

[ios] Minor cleanup

Browse source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2022-01-17 11:15:06 +01:00 • committed by Alexander Borsuk
parent 1b17c167fb
commit 242395cd59
13 changed files with 4 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
#import <Foundation/Foundation.h>
@class PlacePageScheduleData;
@class UgcSummaryRating;
typedef NS_ENUM(NSInteger, PlacePageDataHotelType) {
PlacePageDataHotelTypeHotel,

10
iphone/Maps/Categories/UIColor+MapsMeColor.m
View file

@ -55,11 +55,6 @@ static NSDictionary<NSString *, UIColor *> *night;
@"toastBackground" : [UIColor colorWithWhite:1. alpha:alpha87],
@"statusBarBackground" : [UIColor colorWithWhite:1. alpha:alpha36],
@"border" : [UIColor colorWithWhite:0. alpha:alpha04],
@"discountBackground" : [UIColor colorWithRed:scaled(240) green:scaled(100) blue:scaled(60) alpha:alpha100],
@"discountText" : [UIColor colorWithRed:scaled(60) green:scaled(64) blue:scaled(68) alpha:alpha100],
@"bookmarkSubscriptionBackground" : [UIColor colorWithRed:scaled(240) green:scaled(252) blue:scaled(255) alpha:alpha100],
@"bookmarkSubscriptionScrollBackground" : [UIColor colorWithRed:scaled(137) green:scaled(217) blue:scaled(255) alpha:alpha100],
@"bookmarkSubscriptionFooterBackground" : [UIColor colorWithRed:scaled(47) green:scaled(58) blue:scaled(73) alpha:alpha100],
};
night = @{
@ -109,11 +104,6 @@ static NSDictionary<NSString *, UIColor *> *night;
@"toastBackground": [UIColor colorWithWhite:0. alpha:alpha87],
@"statusBarBackground": [UIColor colorWithWhite:0. alpha:alpha32],
@"border" : [UIColor colorWithWhite:1. alpha:alpha04],
@"discountBackground" : [UIColor colorWithRed:scaled(240) green:scaled(100) blue:scaled(60) alpha:alpha100],
@"discountText" : [UIColor colorWithRed:scaled(60) green:scaled(64) blue:scaled(68) alpha:alpha100],
@"bookmarkSubscriptionBackground" : [UIColor colorWithRed:scaled(60.) green:scaled(64.) blue:scaled(68.) alpha:alpha100],
@"bookmarkSubscriptionScrollBackground" : [UIColor colorWithRed:scaled(137) green:scaled(217) blue:scaled(255) alpha:alpha100],
@"bookmarkSubscriptionFooterBackground" : [UIColor colorWithRed:scaled(47) green:scaled(58) blue:scaled(73) alpha:alpha100],
};
}

3
iphone/Maps/Classes/Components/MWMViewController.h
View file

@ -1,7 +1,4 @@
#import "MWMController.h"
@interface MWMViewController : UIViewController <MWMController>
@property(nonatomic) IBInspectable NSString * localizedTitle;
@end

10
iphone/Maps/Classes/Components/MWMViewController.m
View file

@ -12,16 +12,6 @@
@implementation MWMViewController
- (NSString *)localizedTitle
{
return L(self.title);
}
- (void)setLocalizedTitle:(NSString *)localizedTitle
{
self.title = L(localizedTitle);
}
- (BOOL)prefersStatusBarHidden
{
return NO;

1
iphone/Maps/Classes/Share/MWMShareActivityItem.h
View file

@ -6,7 +6,6 @@ class LatLon;
@protocol MWMPlacePageObject<NSObject>
- (BOOL)isMyPosition;
- (BOOL)isBooking;
- (NSString *)title;
- (NSString *)subtitle;
- (NSString *)address;

2
iphone/Maps/Common/WebViewController.m
View file

@ -59,7 +59,7 @@
self.webView = [[WKWebView alloc] initWithFrame:CGRectZero];
self.webView.backgroundColor = UIColor.clearColor;
self.webView.opaque = false;
self.webView.opaque = NO;
self.webView.navigationDelegate = self;
[view addSubview:self.webView];

26
iphone/Maps/Core/Theme/Colors.swift
View file

@ -37,11 +37,6 @@ class DayColors: IColors {
var statusBarBackground = UIColor(255, 255, 255, alpha36)
var searchPromoBackground = UIColor(249, 251, 231, alpha100)
var border = UIColor(0, 0, 0, alpha04)
var discountBackground = UIColor(240, 100, 60, alpha100)
var discountText = UIColor(60, 64, 68, alpha100)
var bookmarkSubscriptionBackground = UIColor(240, 252, 255, alpha100)
var bookmarkSubscriptionScrollBackground = UIColor(137, 217, 255, alpha100)
var bookmarkSubscriptionFooterBackground = UIColor(47, 58, 73, alpha100)
var bookingBackground = UIColor(25, 69, 125, alpha100)
var opentableBackground = UIColor(218, 55, 67, alpha100)
var transparentGreen = UIColor(233, 244, 233, alpha26)
@ -52,14 +47,6 @@ class DayColors: IColors {
var ratingGreen = UIColor(67, 160, 71, alpha100)
var facebookButtonBackground = UIColor(59, 89, 152, alpha100);
var facebookButtonBackgroundDisabled = UIColor(59, 89, 152, alpha70);
var allPassSubscriptionTitle = UIColor(0, 0, 0, alpha100)
var allPassSubscriptionSubTitle = UIColor(0, 0, 0, alpha87)
var allPassSubscriptionDescription = UIColor(255, 255, 255, alpha100)
var allPassSubscriptionMonthlyBackground = UIColor(224, 224, 224, alpha80)
var allPassSubscriptionYearlyBackground = UIColor(30, 150, 240, alpha100)
var allPassSubscriptionMonthlyTitle = UIColor(255, 255, 255, alpha100)
var allPassSubscriptionDiscountBackground = UIColor(245, 210, 12, alpha100)
var allPassSubscriptionTermsTitle = UIColor(255, 255, 255, alpha70)
var fadeBackground = UIColor(0, 0, 0, alpha80)
var blackStatusBarBackground = UIColor(0, 0, 0, alpha80)
var elevationPreviewTint = UIColor(193, 209, 224, alpha30)
@ -111,11 +98,6 @@ class NightColors: IColors {
var statusBarBackground = UIColor(0, 0, 0, alpha32)
var searchPromoBackground = UIColor(71, 75, 79, alpha100)
var border = UIColor(255, 255, 255, alpha04)
var discountBackground = UIColor(240, 100, 60, alpha100)
var discountText = UIColor(60, 64, 68, alpha100)
var bookmarkSubscriptionBackground = UIColor(60, 64, 68, alpha100)
var bookmarkSubscriptionScrollBackground = UIColor(137, 217, 255, alpha100)
var bookmarkSubscriptionFooterBackground = UIColor(47, 58, 73, alpha100)
var bookingBackground = UIColor(25, 69, 125, alpha100)
var opentableBackground = UIColor(218, 55, 67, alpha100)
var transparentGreen = UIColor(233, 244, 233, alpha26)
@ -126,14 +108,6 @@ class NightColors: IColors {
var ratingGreen = UIColor(67, 160, 71, alpha100)
var facebookButtonBackground = UIColor(59, 89, 152, alpha100);
var facebookButtonBackgroundDisabled = UIColor(59, 89, 152, alpha70);
var allPassSubscriptionTitle = UIColor(0, 0, 0, alpha100)
var allPassSubscriptionSubTitle = UIColor(0, 0, 0, alpha87)
var allPassSubscriptionDescription = UIColor(255, 255, 255, alpha100)
var allPassSubscriptionMonthlyBackground = UIColor(224, 224, 224, alpha80)
var allPassSubscriptionYearlyBackground = UIColor(30, 150, 240, alpha100)
var allPassSubscriptionMonthlyTitle = UIColor(255, 255, 255, alpha100)
var allPassSubscriptionDiscountBackground = UIColor(245, 210, 12, alpha100)
var allPassSubscriptionTermsTitle = UIColor(255, 255, 255, alpha70)
var fadeBackground = UIColor(0, 0, 0, alpha80)
var blackStatusBarBackground = UIColor(0, 0, 0, alpha80)
var elevationPreviewTint = UIColor(0, 0, 0, alpha54)

13
iphone/Maps/Core/Theme/Components/IColors.swift
View file

@ -47,11 +47,6 @@ let alpha100: CGFloat = 1.0
var statusBarBackground: UIColor { get }
var searchPromoBackground: UIColor { get }
var border: UIColor { get }
var discountBackground: UIColor { get }
var discountText: UIColor { get }
var bookmarkSubscriptionBackground: UIColor { get }
var bookmarkSubscriptionScrollBackground: UIColor { get }
var bookmarkSubscriptionFooterBackground: UIColor { get }
var bookingBackground: UIColor { get }
var opentableBackground: UIColor { get }
var transparentGreen: UIColor { get }
@ -62,14 +57,6 @@ let alpha100: CGFloat = 1.0
var ratingGreen: UIColor { get }
var facebookButtonBackground: UIColor { get }
var facebookButtonBackgroundDisabled: UIColor { get }
var allPassSubscriptionTitle: UIColor { get }
var allPassSubscriptionSubTitle: UIColor { get }
var allPassSubscriptionDescription: UIColor { get }
var allPassSubscriptionMonthlyBackground: UIColor { get }
var allPassSubscriptionYearlyBackground: UIColor { get }
var allPassSubscriptionMonthlyTitle: UIColor { get }
var allPassSubscriptionDiscountBackground: UIColor { get }
var allPassSubscriptionTermsTitle: UIColor { get }
var fadeBackground: UIColor { get }
var blackStatusBarBackground: UIColor { get }
var elevationPreviewSelector: UIColor { get }

5
iphone/Maps/Core/Theme/PlacePageStyleSheet.swift
View file

@ -1,10 +1,5 @@
class PlacePageStyleSheet: IStyleSheet {
static func register(theme: Theme, colors: IColors, fonts: IFonts) {
theme.add(styleName: "PPReviewDiscountView") { (s) -> (Void) in
s.backgroundColor = colors.linkBlue
s.round = true
}
theme.add(styleName: "PPTitlePopularView") { (s) -> (Void) in
s.backgroundColor = colors.linkBlueHighlighted
s.cornerRadius = 10

11
iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarInteractor.swift
View file

@ -11,16 +11,11 @@ class BottomTabBarInteractor {
private weak var viewController: UIViewController?
private weak var mapViewController: MapViewController?
private weak var controlsManager: MWMMapViewControlsManager?
private weak var searchManager = MWMSearchManager.manager()
private var isPoint2PointSelected = false
init(viewController: UIViewController,
mapViewController: MapViewController,
controlsManager: MWMMapViewControlsManager) {
init(viewController: UIViewController, mapViewController: MapViewController, controlsManager: MWMMapViewControlsManager) {
self.viewController = viewController
self.mapViewController = mapViewController
self.controlsManager = controlsManager
@ -35,7 +30,7 @@ extension BottomTabBarInteractor: BottomTabBarInteractorProtocol {
searchManager?.state = .hidden
}
}
func openPoint2Point() {
isPoint2PointSelected.toggle()
MWMRouter.enableAutoAddLastLocation(false)

9
iphone/Maps/UI/PlacePage/Components/ActionBarViewController.swift
View file

@ -104,15 +104,6 @@ class ActionBarViewController: UIViewController {
if isRoutePlanning {
buttons.append(.routeFrom)
}
// if placePageData.previewData.isBookingPlace {
// buttons.append(.booking)
// }
// if placePageData.isPartner {
// buttons.append(.partner)
// }
// if placePageData.bookingSearchUrl != nil {
// buttons.append(.bookingSearch)
// }
if placePageData.infoData?.phone != nil, AppInfo.shared().canMakeCalls {
buttons.append(.call)
}

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

@ -20,10 +20,6 @@ final class PlacePagePreviewViewController: UIViewController {
addReviewButton.setTitle("+ \(L("leave_a_review"))", for: .normal)
}
}
@IBOutlet var priceLabel: UILabel!
@IBOutlet var discountView: UIView!
@IBOutlet var discountLabel: UILabel!
@IBOutlet var ugcContainerView: UIStackView!
@IBOutlet var addressLabel: UILabel!
@IBOutlet var addressContainerView: UIStackView!
@IBOutlet var scheduleContainerView: UIStackView!

8
iphone/Maps/UI/Storyboard/Main.storyboard
View file

@ -68,10 +68,6 @@
</mask>
</variation>
</view>
<view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QNg-zA-Jne" customClass="GuidesNavigationBarArea" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="44" y="0.0" width="808" height="393"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
<view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="awj-9E-eBS" customClass="PlacePageArea" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="44" y="0.0" width="808" height="393"/>
<color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
@ -195,7 +191,6 @@
<constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="TdT-ia-GP9" secondAttribute="trailing" id="Rsb-fB-8bn"/>
<constraint firstItem="jio-3T-E6G" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="SAj-bF-qrr"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="xJx-UU-IdV" secondAttribute="bottom" id="SDX-4J-Jz5"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="QNg-zA-Jne" secondAttribute="bottom" id="TGG-JD-3dN"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="FFY-Dy-Wou" secondAttribute="bottom" id="TZk-MH-pMV"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="xJx-UU-IdV" secondAttribute="bottom" priority="100" id="VfU-Zk-8IU"/>
<constraint firstItem="rbx-Oj-jeo" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" constant="8" id="W0l-NG-7lt"/>
@ -203,7 +198,6 @@
<constraint firstItem="aPn-pa-nCx" firstAttribute="leading" secondItem="USG-6L-Uhw" secondAttribute="leading" id="YFX-ma-vAf"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="FFY-Dy-Wou" secondAttribute="bottom" id="YUs-MJ-9w8"/>
<constraint firstItem="rL1-9E-4b7" firstAttribute="leading" secondItem="USG-6L-Uhw" secondAttribute="leading" id="Z1s-Q9-zX6"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="QNg-zA-Jne" secondAttribute="trailing" id="Zbf-l3-Uhw"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="awj-9E-eBS" secondAttribute="bottom" priority="100" id="aqR-pe-LgT"/>
<constraint firstItem="at1-V1-pzl" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="dVq-df-YMe"/>
<constraint firstItem="QKu-4A-UgP" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="f2R-LX-JVU"/>
@ -225,11 +219,9 @@
<constraint firstAttribute="trailing" secondItem="jio-3T-E6G" secondAttribute="trailing" id="t9l-Ud-h6j"/>
<constraint firstAttribute="bottom" secondItem="aPn-pa-nCx" secondAttribute="bottom" id="tB3-eX-gUV"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="rbx-Oj-jeo" secondAttribute="bottom" constant="70" id="u9s-KY-yCt"/>
<constraint firstItem="QNg-zA-Jne" firstAttribute="top" secondItem="utd-Jy-pE5" secondAttribute="top" id="vCA-75-hd4"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="xJx-UU-IdV" secondAttribute="bottom" id="veF-Rn-BEm"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="65S-M4-TnM" secondAttribute="top" priority="100" id="vfQ-ZT-Dlc"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="awj-9E-eBS" secondAttribute="trailing" id="wGo-EW-X9f"/>
<constraint firstItem="QNg-zA-Jne" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="wPh-dY-Ufn"/>
<constraint firstAttribute="trailing" secondItem="rL1-9E-4b7" secondAttribute="trailing" priority="100" id="xUq-Vo-ETR"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="65S-M4-TnM" secondAttribute="trailing" id="xyN-jr-oU5"/>
</constraints>