forked from organicmaps/organicmaps
[iOS] Place page of outdoor track
[iOS] Track difficulty popup https://jira.mail.ru/browse/MAPSME-12956 https://jira.mail.ru/browse/MAPSME-12955
This commit is contained in:
Alexander Boriskov
Aleksey Belousov
parent
4c50122b53
commit
ee5e36bc05
87 changed files with 2391 additions and 1030 deletions
|
|
@ -112,6 +112,8 @@
|
|||
993F54F3237C5D1100545511 /* PromoAfterBookingCampaignAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 993F54EF237C5D1000545511 /* PromoAfterBookingCampaignAdapter.mm */; };
|
||||
993F54F4237C5D1100545511 /* PromoDiscoveryCampaignAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 993F54F0237C5D1000545511 /* PromoDiscoveryCampaignAdapter.mm */; };
|
||||
993F54F5237C5D1100545511 /* PromoAfterBookingCampaignAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 993F54F1237C5D1000545511 /* PromoAfterBookingCampaignAdapter.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
9940622023EAC57900493D1A /* ElevationHeightPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 9940621E23EAC57900493D1A /* ElevationHeightPoint.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
9940622123EAC57900493D1A /* ElevationHeightPoint.m in Sources */ = {isa = PBXBuildFile; fileRef = 9940621F23EAC57900493D1A /* ElevationHeightPoint.m */; };
|
||||
99447849238559F2004DAEE5 /* DeeplinkParsingResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 99447847238559F2004DAEE5 /* DeeplinkParsingResult.h */; };
|
||||
9957FACE237AB01400855F48 /* DeepLinkParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 9957FACC237AB01400855F48 /* DeepLinkParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
9957FACF237AB01400855F48 /* DeepLinkParser.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9957FACD237AB01400855F48 /* DeepLinkParser.mm */; };
|
||||
|
|
@ -119,6 +121,9 @@
|
|||
9957FADC237ACB1100855F48 /* DeepLinkSearchData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9957FADA237ACB1100855F48 /* DeepLinkSearchData.mm */; };
|
||||
9957FAE8237AE5B000855F48 /* Logger.h in Headers */ = {isa = PBXBuildFile; fileRef = 9957FAE6237AE5B000855F48 /* Logger.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
9957FAE9237AE5B000855F48 /* Logger.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9957FAE7237AE5B000855F48 /* Logger.mm */; };
|
||||
9974CA2923DF1968003FE824 /* ElevationProfileData.h in Headers */ = {isa = PBXBuildFile; fileRef = 9974CA2723DF1968003FE824 /* ElevationProfileData.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
9974CA2A23DF1968003FE824 /* ElevationProfileData.m in Sources */ = {isa = PBXBuildFile; fileRef = 9974CA2823DF1968003FE824 /* ElevationProfileData.m */; };
|
||||
9974CA2D23DF197B003FE824 /* ElevationProfileData+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 9974CA2B23DF197B003FE824 /* ElevationProfileData+Core.h */; };
|
||||
999D3A64237B097C00C5F7A8 /* DeepLinkSubscriptionData.h in Headers */ = {isa = PBXBuildFile; fileRef = 999D3A62237B097C00C5F7A8 /* DeepLinkSubscriptionData.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
999D3A65237B097C00C5F7A8 /* DeepLinkSubscriptionData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 999D3A63237B097C00C5F7A8 /* DeepLinkSubscriptionData.mm */; };
|
||||
99F31EB823D5DD9000CE2CE1 /* PromoAfterBookingData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 99F31EB523D5DD8F00CE2CE1 /* PromoAfterBookingData.mm */; };
|
||||
|
|
@ -240,6 +245,8 @@
|
|||
993F54EF237C5D1000545511 /* PromoAfterBookingCampaignAdapter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PromoAfterBookingCampaignAdapter.mm; sourceTree = "<group>"; };
|
||||
993F54F0237C5D1000545511 /* PromoDiscoveryCampaignAdapter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PromoDiscoveryCampaignAdapter.mm; sourceTree = "<group>"; };
|
||||
993F54F1237C5D1000545511 /* PromoAfterBookingCampaignAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromoAfterBookingCampaignAdapter.h; sourceTree = "<group>"; };
|
||||
9940621E23EAC57900493D1A /* ElevationHeightPoint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ElevationHeightPoint.h; sourceTree = "<group>"; };
|
||||
9940621F23EAC57900493D1A /* ElevationHeightPoint.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ElevationHeightPoint.m; sourceTree = "<group>"; };
|
||||
99447847238559F2004DAEE5 /* DeeplinkParsingResult.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeeplinkParsingResult.h; sourceTree = "<group>"; };
|
||||
9957FACC237AB01400855F48 /* DeepLinkParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeepLinkParser.h; sourceTree = "<group>"; };
|
||||
9957FACD237AB01400855F48 /* DeepLinkParser.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DeepLinkParser.mm; sourceTree = "<group>"; };
|
||||
|
|
@ -247,6 +254,9 @@
|
|||
9957FADA237ACB1100855F48 /* DeepLinkSearchData.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DeepLinkSearchData.mm; sourceTree = "<group>"; };
|
||||
9957FAE6237AE5B000855F48 /* Logger.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Logger.h; sourceTree = "<group>"; };
|
||||
9957FAE7237AE5B000855F48 /* Logger.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = Logger.mm; sourceTree = "<group>"; };
|
||||
9974CA2723DF1968003FE824 /* ElevationProfileData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ElevationProfileData.h; sourceTree = "<group>"; };
|
||||
9974CA2823DF1968003FE824 /* ElevationProfileData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ElevationProfileData.m; sourceTree = "<group>"; };
|
||||
9974CA2B23DF197B003FE824 /* ElevationProfileData+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ElevationProfileData+Core.h"; sourceTree = "<group>"; };
|
||||
999D3A62237B097C00C5F7A8 /* DeepLinkSubscriptionData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeepLinkSubscriptionData.h; sourceTree = "<group>"; };
|
||||
999D3A63237B097C00C5F7A8 /* DeepLinkSubscriptionData.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DeepLinkSubscriptionData.mm; sourceTree = "<group>"; };
|
||||
99F31EB523D5DD8F00CE2CE1 /* PromoAfterBookingData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PromoAfterBookingData.mm; sourceTree = "<group>"; };
|
||||
|
|
@ -429,6 +439,7 @@
|
|||
47942D89237D629D00DEFAE3 /* Catalog */,
|
||||
47942D5B237CC3B500DEFAE3 /* Common */,
|
||||
47942D65237CC3B500DEFAE3 /* Booking */,
|
||||
9974CA2623DF1931003FE824 /* ElevationProfile */,
|
||||
47942D69237CC3B500DEFAE3 /* UGC */,
|
||||
);
|
||||
path = PlacePageData;
|
||||
|
|
@ -612,6 +623,18 @@
|
|||
path = Logger;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
9974CA2623DF1931003FE824 /* ElevationProfile */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
9974CA2723DF1968003FE824 /* ElevationProfileData.h */,
|
||||
9974CA2823DF1968003FE824 /* ElevationProfileData.m */,
|
||||
9974CA2B23DF197B003FE824 /* ElevationProfileData+Core.h */,
|
||||
9940621E23EAC57900493D1A /* ElevationHeightPoint.h */,
|
||||
9940621F23EAC57900493D1A /* ElevationHeightPoint.m */,
|
||||
);
|
||||
path = ElevationProfile;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXGroup section */
|
||||
|
||||
/* Begin PBXHeadersBuildPhase section */
|
||||
|
|
@ -626,12 +649,14 @@
|
|||
471AB99123AB931000F56D49 /* MWMMapSearchResult+Core.h in Headers */,
|
||||
4738A8E0239FACE7007C0F43 /* CoreBanner.h in Headers */,
|
||||
47942D6D237CC3E300DEFAE3 /* PlacePagePreviewData.h in Headers */,
|
||||
9940622023EAC57900493D1A /* ElevationHeightPoint.h in Headers */,
|
||||
3D40DED523ED9C7F00A0153A /* WebApi.h in Headers */,
|
||||
47A65CAF235008E100DCD85F /* CoreApi-swift.h in Headers */,
|
||||
9957FACE237AB01400855F48 /* DeepLinkParser.h in Headers */,
|
||||
993F54F5237C5D1100545511 /* PromoAfterBookingCampaignAdapter.h in Headers */,
|
||||
47942D7D237CC42B00DEFAE3 /* UgcData.h in Headers */,
|
||||
47942D77237CC41A00DEFAE3 /* HotelRooms.h in Headers */,
|
||||
9974CA2D23DF197B003FE824 /* ElevationProfileData+Core.h in Headers */,
|
||||
479834F223426CCC00724D1E /* MWMTag+Convenience.h in Headers */,
|
||||
47942D78237CC41A00DEFAE3 /* HotelRooms+Core.h in Headers */,
|
||||
479F704F234FB60400011E2E /* MWMCatalogObserver.h in Headers */,
|
||||
|
|
@ -646,6 +671,7 @@
|
|||
4718C4322355FC3C00640DF1 /* MWMNetworkPolicy.h in Headers */,
|
||||
99103843237EDFA200893C9F /* DeepLinkData.h in Headers */,
|
||||
47F4F1FD23A3D1AC0022FD56 /* MWMMapNodeAttributes+Core.h in Headers */,
|
||||
9974CA2923DF1968003FE824 /* ElevationProfileData.h in Headers */,
|
||||
47C637DD2354B79B00E12DE0 /* MWMSearchFrameworkHelper.h in Headers */,
|
||||
47942D70237CC40400DEFAE3 /* PlacePageInfoData+Core.h in Headers */,
|
||||
47942DA0237D954400DEFAE3 /* PlacePageBookmarkData+Core.h in Headers */,
|
||||
|
|
@ -681,7 +707,7 @@
|
|||
47942D75237CC41A00DEFAE3 /* HotelBookingData+Core.h in Headers */,
|
||||
47938905239A932D006ECACC /* UgcSummaryRatingType.h in Headers */,
|
||||
47942D72237CC40B00DEFAE3 /* OpeningHours.h in Headers */,
|
||||
47C637D72354AEBE00E12DE0 /* MWMTrafficManager.h in Headers */,
|
||||
47C637D72354AEBE00E12DE0 /* MWMMapOverlayManager.h in Headers */,
|
||||
47942D6B237CC3D600DEFAE3 /* PlacePageData.h in Headers */,
|
||||
47942D8C237D634300DEFAE3 /* CatalogPromoData.h in Headers */,
|
||||
47942D90237D654B00DEFAE3 /* CatalogPromoData+Core.h in Headers */,
|
||||
|
|
@ -776,6 +802,7 @@
|
|||
47942D9D237D927800DEFAE3 /* PlacePageBookmarkData.mm in Sources */,
|
||||
4738A8E1239FACE7007C0F43 /* CoreBanner.mm in Sources */,
|
||||
47942D86237CC55500DEFAE3 /* MWMOpeningHoursCommon.mm in Sources */,
|
||||
9974CA2A23DF1968003FE824 /* ElevationProfileData.m in Sources */,
|
||||
47942D82237CC52A00DEFAE3 /* MWMOpeningHours.mm in Sources */,
|
||||
47942D73237CC41400DEFAE3 /* OpeningHours.mm in Sources */,
|
||||
47C637DC2354B79B00E12DE0 /* MWMSearchFrameworkHelper.mm in Sources */,
|
||||
|
|
@ -802,6 +829,7 @@
|
|||
4718C4332355FC3C00640DF1 /* MWMNetworkPolicy.mm in Sources */,
|
||||
993F54F3237C5D1100545511 /* PromoAfterBookingCampaignAdapter.mm in Sources */,
|
||||
47F701F0238C86F000D18E95 /* PlacePageButtonsData.mm in Sources */,
|
||||
9940622123EAC57900493D1A /* ElevationHeightPoint.m in Sources */,
|
||||
47EEAFF42350CEDB005CF316 /* AppInfo.mm in Sources */,
|
||||
47E8163623B1889C008FD836 /* MWMStorage.mm in Sources */,
|
||||
9957FAE9237AE5B000855F48 /* Logger.mm in Sources */,
|
||||
|
|
|
|||
|
|
@ -51,3 +51,4 @@ FOUNDATION_EXPORT const unsigned char CoreApiVersionString[];
|
|||
#import <CoreApi/HotelRoom.h>
|
||||
#import <CoreApi/UgcData.h>
|
||||
#import <CoreApi/UgcSummaryRating.h>
|
||||
#import <CoreApi/ElevationProfileData.h>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
#import <Foundation/Foundation.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface ElevationHeightPoint : NSObject
|
||||
|
||||
@property(nonatomic, readonly) double distance;
|
||||
@property(nonatomic, readonly) double height;
|
||||
|
||||
- (instancetype)initWithDistance:(double)distance andHeight:(double)height;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
#import "ElevationHeightPoint.h"
|
||||
|
||||
@implementation ElevationHeightPoint
|
||||
|
||||
- (instancetype)initWithDistance:(double)distance andHeight:(double)height {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
_distance = distance;
|
||||
_height = height;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
#import "ElevationProfileData.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface ElevationProfileData (Core)
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
#import <Foundation/Foundation.h>
|
||||
#import "ElevationHeightPoint.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
typedef NS_ENUM(NSInteger, ElevationDifficulty) {
|
||||
ElevationDifficultyEasy,
|
||||
ElevationDifficultyModerate,
|
||||
ElevationDifficultyHard
|
||||
};
|
||||
|
||||
@interface ElevationProfileData : NSObject
|
||||
|
||||
@property(nonatomic, readonly) NSString* serverId;
|
||||
@property(nonatomic, readonly) NSString* ascent;
|
||||
@property(nonatomic, readonly) NSString* descent;
|
||||
@property(nonatomic, readonly) NSString* maxAttitude;
|
||||
@property(nonatomic, readonly) NSString* minAttitude;
|
||||
@property(nonatomic, readonly) ElevationDifficulty difficulty;
|
||||
@property(nonatomic, readonly) NSString* trackTime;
|
||||
@property(nonatomic, readonly, nullable) NSString* extendedDifficultyGrade;
|
||||
@property(nonatomic, readonly, nullable) NSString* extendedDifficultyDescription;
|
||||
@property(nonatomic, readonly) NSArray<ElevationHeightPoint*>* points;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
#import "ElevationProfileData.h"
|
||||
|
||||
@implementation ElevationProfileData
|
||||
|
||||
- (instancetype)init {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
_serverId = @"0";
|
||||
_ascent = @"10000 m";
|
||||
_descent = @"20000 m";
|
||||
_maxAttitude = @"1213 m";
|
||||
_minAttitude = @"22134 m";
|
||||
_difficulty = ElevationDifficultyModerate;
|
||||
_trackTime = @"3h 12m";
|
||||
_extendedDifficultyGrade = @"S5";
|
||||
_extendedDifficultyDescription =
|
||||
@"On a S2 trail you will face bigger roots and stones (but never the Rolling Stones). Usually the ground isn’t "
|
||||
@"compact and you will find steps and stairs. Oftentimes there are narrow turns and the steepness in some spots "
|
||||
@"can be up to 70%.";
|
||||
|
||||
NSMutableArray<ElevationHeightPoint *> *randPoints = [[NSMutableArray alloc] init];
|
||||
for (int i = 0; i < 100; i++) {
|
||||
[randPoints addObject:[[ElevationHeightPoint alloc] initWithDistance:arc4random() % 100
|
||||
andHeight:arc4random() % 200]];
|
||||
}
|
||||
_points = randPoints;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -11,6 +11,7 @@
|
|||
@class HotelBookingData;
|
||||
@class HotelRooms;
|
||||
@class UgcData;
|
||||
@class ElevationProfileData;
|
||||
|
||||
typedef NS_ENUM(NSInteger, PlacePageSponsoredType) {
|
||||
PlacePageSponsoredTypeNone,
|
||||
|
|
@ -37,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
|
||||
@property(nonatomic, readonly, nullable) PlacePageButtonsData *buttonsData;
|
||||
@property(nonatomic, readonly) PlacePagePreviewData *previewData;
|
||||
@property(nonatomic, readonly) PlacePageInfoData *infoData;
|
||||
@property(nonatomic, readonly, nullable) PlacePageInfoData *infoData;
|
||||
@property(nonatomic, readonly, nullable) PlacePageBookmarkData *bookmarkData;
|
||||
@property(nonatomic, readonly) PlacePageSponsoredType sponsoredType;
|
||||
@property(nonatomic, readonly) PlacePageTaxiProvider taxiProvider;
|
||||
|
|
@ -46,6 +47,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
@property(nonatomic, readonly, nullable) HotelBookingData *hotelBooking;
|
||||
@property(nonatomic, readonly, nullable) HotelRooms *hotelRooms;
|
||||
@property(nonatomic, readonly, nullable) UgcData *ugcData;
|
||||
@property(nonatomic, readonly, nullable) ElevationProfileData *elevationProfileData;
|
||||
@property(nonatomic, readonly, nullable) NSString *bookingSearchUrl;
|
||||
@property(nonatomic, readonly) BOOL isLargeToponim;
|
||||
@property(nonatomic, readonly) BOOL isSightseeing;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
#import "HotelBookingData+Core.h"
|
||||
#import "HotelRooms+Core.h"
|
||||
#import "UgcData+Core.h"
|
||||
#import "ElevationProfileData+Core.h"
|
||||
|
||||
#include <CoreApi/CoreApi.h>
|
||||
#include "platform/network_policy.hpp"
|
||||
|
|
@ -108,6 +109,8 @@ static PlacePageTaxiProvider convertTaxiProvider(taxi::Provider::Type providerTy
|
|||
_sponsoredReviewURL = @(rawData().GetSponsoredReviewUrl().c_str());
|
||||
_sponsoredDeeplink = @(rawData().GetSponsoredDeepLink().c_str());
|
||||
}
|
||||
|
||||
// _elevationProfileData = [[ElevationProfileData alloc] init];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ class AllPassSubscriptionViewController: BaseSubscriptionViewController {
|
|||
//MARK:outlets
|
||||
@IBOutlet private var backgroundImageView: ImageViewCrossDisolve!
|
||||
@IBOutlet private var annualSubscriptionButton: BookmarksSubscriptionButton!
|
||||
@IBOutlet private var annualDiscountLabel: BookmarksSubscriptionDiscountLabel!
|
||||
@IBOutlet private var annualDiscountLabel: InsetsLabel!
|
||||
@IBOutlet private var monthlySubscriptionButton: BookmarksSubscriptionButton!
|
||||
@IBOutlet private var pageIndicator: PageIndicator!
|
||||
@IBOutlet private var descriptionPageScrollView: UIScrollView!
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<device id="retina4_0" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TaY-K1-Hdb">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="781.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="782.5"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="try to subscribe" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v4o-CM-FZh">
|
||||
<rect key="frame" x="24" y="62" width="272" height="14.5"/>
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="All Pass Premium" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PQG-Je-4JN">
|
||||
<rect key="frame" x="24" y="84.5" width="272" height="29.5"/>
|
||||
<rect key="frame" x="24" y="84.5" width="272" height="30.5"/>
|
||||
<fontDescription key="fontDescription" name="FredokaOne-Regular" family="Fredoka One" pointSize="25"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" directionalLockEnabled="YES" bounces="NO" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pyJ-8x-bjL">
|
||||
<rect key="frame" x="0.0" y="114" width="320" height="230"/>
|
||||
<rect key="frame" x="0.0" y="115" width="320" height="230"/>
|
||||
<subviews>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="dDh-cr-cQb">
|
||||
<rect key="frame" x="0.0" y="0.0" width="960" height="230"/>
|
||||
|
|
@ -192,11 +192,11 @@
|
|||
</connections>
|
||||
</scrollView>
|
||||
<view contentMode="scaleToFill" placeholderIntrinsicWidth="106" placeholderIntrinsicHeight="16" translatesAutoresizingMaskIntoConstraints="NO" id="2G3-Jk-HS0" customClass="PageIndicator" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="107" y="344" width="106" height="16"/>
|
||||
<rect key="frame" x="107" y="345" width="106" height="16"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
</view>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="kgh-BN-Pin">
|
||||
<rect key="frame" x="20" y="430" width="280" height="144"/>
|
||||
<rect key="frame" x="20" y="431" width="280" height="144"/>
|
||||
<subviews>
|
||||
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lg7-Sn-MNZ" userLabel="Continue" customClass="BookmarksSubscriptionButton" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="280" height="64"/>
|
||||
|
|
@ -238,8 +238,8 @@
|
|||
</button>
|
||||
</subviews>
|
||||
</stackView>
|
||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="- $38" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HUV-kf-oUo" customClass="BookmarksSubscriptionDiscountLabel" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="28" y="407" width="48.5" height="35"/>
|
||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="- $38" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HUV-kf-oUo" customClass="InsetsLabel" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="28" y="408" width="48.5" height="35"/>
|
||||
<color key="backgroundColor" systemColor="systemPurpleColor" red="0.68627450980000004" green="0.32156862749999998" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="35" id="BYp-RT-R6I"/>
|
||||
|
|
@ -252,7 +252,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wL2-uQ-ivp" userLabel="Restore">
|
||||
<rect key="frame" x="50" y="584" width="220" height="50"/>
|
||||
<rect key="frame" x="50" y="585" width="220" height="50"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.button_next2"/>
|
||||
<constraints>
|
||||
|
|
@ -271,7 +271,7 @@
|
|||
</connections>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="justified" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Frp-JY-kuq">
|
||||
<rect key="frame" x="20" y="642" width="280" height="75.5"/>
|
||||
<rect key="frame" x="20" y="643" width="280" height="75.5"/>
|
||||
<string key="text">Payment will be charged to your iTunes account at confirmation of purchase. The subscription will automatically renew unless auto-renew is turned off at least 24 hours before the end of the current period. Your account will be charged according to your plan for renewal within 24 hours prior to the end of the current period. You can manage or turn off auto-renew in your Apple ID account settings at any time of your purchase.</string>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="9"/>
|
||||
<color key="textColor" white="0.0" alpha="0.31555008559999997" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
|
|
@ -282,7 +282,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2O1-n3-hBU" userLabel="TermsOfUse">
|
||||
<rect key="frame" x="20" y="717.5" width="66" height="44"/>
|
||||
<rect key="frame" x="20" y="718.5" width="66" height="44"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.button_next2"/>
|
||||
<constraints>
|
||||
|
|
@ -301,7 +301,7 @@
|
|||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalCompressionResistancePriority="749" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FUY-sv-eiY" userLabel="PrivacyPolicy">
|
||||
<rect key="frame" x="231" y="717.5" width="69" height="44"/>
|
||||
<rect key="frame" x="231" y="718.5" width="69" height="44"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.button_next2"/>
|
||||
<constraints>
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ class BaseSubscriptionViewController: MWMViewController {
|
|||
}
|
||||
|
||||
func configure(buttons: [SubscriptionPeriod: BookmarksSubscriptionButton],
|
||||
discountLabels: [SubscriptionPeriod: BookmarksSubscriptionDiscountLabel]) {
|
||||
discountLabels: [SubscriptionPeriod: InsetsLabel]) {
|
||||
subscriptionManager?.getAvailableSubscriptions { [weak self] (subscriptions, error) in
|
||||
guard let subscriptions = subscriptions, subscriptions.count >= buttons.count else {
|
||||
MWMAlertViewController.activeAlert().presentInfoAlert(L("price_error_title"),
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
import Foundation
|
||||
|
||||
class BookmarksSubscriptionDiscountLabel: UILabel {
|
||||
let offsetX:CGFloat = 10
|
||||
|
||||
override func drawText(in rect: CGRect) {
|
||||
let insets = UIEdgeInsets(top: 0, left: offsetX, bottom: 0, right: offsetX)
|
||||
super.drawText(in: rect.inset(by: insets));
|
||||
}
|
||||
|
||||
override var intrinsicContentSize: CGSize {
|
||||
return CGSize(width: super.intrinsicContentSize.width + offsetX*2, height: super.intrinsicContentSize.height)
|
||||
}
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@ import SafariServices
|
|||
@objc class BookmarksSubscriptionViewController: BaseSubscriptionViewController {
|
||||
//MARK: outlets
|
||||
@IBOutlet private var annualSubscriptionButton: BookmarksSubscriptionButton!
|
||||
@IBOutlet private var annualDiscountLabel: BookmarksSubscriptionDiscountLabel!
|
||||
@IBOutlet private var annualDiscountLabel: InsetsLabel!
|
||||
@IBOutlet private var monthlySubscriptionButton: BookmarksSubscriptionButton!
|
||||
@IBOutlet private var contentView: UIView!
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<device id="retina6_1" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
|
|
@ -18,11 +20,11 @@
|
|||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<scrollView multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" contentInsetAdjustmentBehavior="always" translatesAutoresizingMaskIntoConstraints="NO" id="0eE-hs-sId">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Eiz-QQ-h0b">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="1014.5"/>
|
||||
|
|
@ -200,7 +202,7 @@
|
|||
</button>
|
||||
</subviews>
|
||||
</stackView>
|
||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="- $38" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YH0-h4-ZEb" customClass="BookmarksSubscriptionDiscountLabel" customModule="maps_me" customModuleProvider="target">
|
||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="- $38" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YH0-h4-ZEb" customClass="InsetsLabel" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="28" y="541" width="48.5" height="35"/>
|
||||
<color key="backgroundColor" systemColor="systemPurpleColor" red="0.68627450980000004" green="0.32156862749999998" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
|
|
@ -288,7 +290,7 @@
|
|||
</constraints>
|
||||
</imageView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MPt-NS-DbA">
|
||||
<rect key="frame" x="0.0" y="1014.5" width="414" height="736"/>
|
||||
<rect key="frame" x="0.0" y="1014.5" width="414" height="896"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="BookmarkSubscriptionFooterBackground"/>
|
||||
|
|
@ -366,10 +368,10 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</scrollView>
|
||||
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BHb-cU-Ze3">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
||||
<subviews>
|
||||
<activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="XZg-yN-Jtv">
|
||||
<rect key="frame" x="188.5" y="349.5" width="37" height="37"/>
|
||||
<rect key="frame" x="188.5" y="429.5" width="37" height="37"/>
|
||||
<color key="color" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
</activityIndicatorView>
|
||||
</subviews>
|
||||
|
|
@ -415,6 +417,6 @@
|
|||
<image name="bookmarksSubscriptionBullet" width="16" height="16"/>
|
||||
<image name="bookmarksSubscriptionClose" width="24" height="24"/>
|
||||
<image name="bookmarksSubscriptionFooter" width="375" height="208"/>
|
||||
<image name="bookmarksSubscriptionHeader" width="375" height="212.33332824707031"/>
|
||||
<image name="bookmarksSubscriptionHeader" width="375" height="212.5"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
14
iphone/Maps/Classes/InsetsLabel.swift
Normal file
14
iphone/Maps/Classes/InsetsLabel.swift
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
import Foundation
|
||||
|
||||
class InsetsLabel: UILabel {
|
||||
var insets = UIEdgeInsets.zero
|
||||
|
||||
override func drawText(in rect: CGRect) {
|
||||
super.drawText(in: rect.inset(by: insets));
|
||||
}
|
||||
|
||||
override var intrinsicContentSize: CGSize {
|
||||
return CGSize(width: super.intrinsicContentSize.width + insets.left + insets.right,
|
||||
height: super.intrinsicContentSize.height + insets.top + insets.bottom)
|
||||
}
|
||||
}
|
||||
|
|
@ -98,7 +98,7 @@ NSString * const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
|
|||
|
||||
@property(nonatomic) BOOL needDeferFocusNotification;
|
||||
@property(nonatomic) BOOL deferredFocusValue;
|
||||
@property(nonatomic) PlacePageViewController *placePageVC;
|
||||
@property(nonatomic) UIViewController *placePageVC;
|
||||
@property(nonatomic) IBOutlet UIView *placePageContainer;
|
||||
|
||||
@end
|
||||
|
|
@ -112,8 +112,7 @@ NSString * const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
|
|||
|
||||
- (void)showPlacePage {
|
||||
self.controlsManager.trafficButtonHidden = YES;
|
||||
self.placePageVC = (PlacePageViewController *)[[UIStoryboard instance:MWMStoryboardPlacePage] instantiateInitialViewController];
|
||||
self.placePageVC.placePageData = [[PlacePageData alloc] init];
|
||||
self.placePageVC = [PlacePageBuilder buildWithData:[[PlacePageData alloc] init]];
|
||||
[self addChildViewController:self.placePageVC];
|
||||
self.placePageContainer.hidden = NO;
|
||||
[self.placePageContainer addSubview:self.placePageVC.view];
|
||||
|
|
|
|||
|
|
@ -76,7 +76,6 @@ static NSString * const kStatCancel = @"cancel";
|
|||
static NSString * const kStatCatalogOpen = @"Bookmarks_Downloaded_Catalogue_open";
|
||||
static NSString * const kStatCatalogue = @"catalogue";
|
||||
static NSString * const kStatCataloguePath = @"guides_page";
|
||||
static NSString * const kStatDone = @"done";
|
||||
static NSString * const kStatCard = @"card";
|
||||
static NSString * const kStatCarplay = @"carplay";
|
||||
static NSString * const kStatCarplayActivated = @"CarPlay_activated";
|
||||
|
|
@ -136,6 +135,7 @@ static NSString * const kStatDiscovery = @"discovery";
|
|||
static NSString * const kStatDiscoveryButtonItemShow = @"DiscoveryButton_Item_Show";
|
||||
static NSString * const kStatDiscoveryButtonOpen = @"DiscoveryButton_Open";
|
||||
static NSString * const kStatDisk = @"disk";
|
||||
static NSString * const kStatDone = @"done";
|
||||
static NSString * const kStatDownload = @"download";
|
||||
static NSString * const kStatDownloadError = @"download_error";
|
||||
static NSString * const kStatDownloadGroup = @"download_group";
|
||||
|
|
@ -181,6 +181,12 @@ static NSString * const kStatEditorProblemReport = @"Editor_Problem_report";
|
|||
static NSString * const kStatEditorRegRequest = @"Editor_Reg_request";
|
||||
static NSString * const kStatEditorSecondTimeShareClick = @"Editor_SecondTimeShare_click";
|
||||
static NSString * const kStatEditorSecondTimeShareShow = @"Editor_SecondTimeShare_show";
|
||||
static NSString * const kStatElevationProfilePageOpen = @"ElevationProfilePage_open";
|
||||
static NSString * const kStatElevationProfilePageDrag = @"ElevationProfilePage_drag";
|
||||
static NSString * const kStatElevationProfilePageZoom = @"ElevationProfilePage_zoom";
|
||||
static NSString * const kStatElevationProfilePageNavigationAction = @"ElevationProfilePage_Navigation_action";
|
||||
static NSString * const kStatElevationProfilePageDetailsOpen = @"ElevationProfilePage_Details_open";
|
||||
static NSString * const kStatElevationProfilePageClose = @"ElevationProfilePage_close";
|
||||
static NSString * const kStatEnergySavingChange = @"Settings_EnergySaving_change";
|
||||
static NSString * const kStatError = @"error";
|
||||
static NSString * const kStatErrorCode = @"error_code";
|
||||
|
|
@ -263,6 +269,7 @@ static NSString * const kStatMapsmeInAppSuggestionShown = @"MapsMe_InAppSuggesti
|
|||
static NSString * const kStatMaxim = @"Maxim";
|
||||
static NSString * const kStatMegafon = @"Megafon";
|
||||
static NSString * const kStatMenu = @"menu";
|
||||
static NSString * const kStatMethod = @"method";
|
||||
static NSString * const kStatMiles = @"Miles";
|
||||
static NSString * const kStatMobile = @"mobile";
|
||||
static NSString * const kStatMobileInternet = @"Mobile Internet";
|
||||
|
|
@ -454,6 +461,7 @@ static NSString * const kStatSharingOptionsUploadError = @"Bookmarks_SharingOpti
|
|||
static NSString * const kStatSharingOptionsUploadSuccess = @"Bookmarks_SharingOptions_upload_success";
|
||||
static NSString * const kStatShowBig2SmallMWM = @"Big mwms to small mwms dialog appearing counter";
|
||||
static NSString * const kStatShowOnMap = @"Show on map";
|
||||
static NSString * const kStatSide = @"side";
|
||||
static NSString * const kStatSignup = @"Signup";
|
||||
static NSString * const kStatSimplifiedColors = @"Simplified colors scheme";
|
||||
static NSString * const kStatSocial = @"Social";
|
||||
|
|
|
|||
|
|
@ -46,5 +46,6 @@
|
|||
var semibold14: UIFont { get }
|
||||
var semibold15: UIFont { get }
|
||||
var semibold16: UIFont { get }
|
||||
var semibold18: UIFont { get }
|
||||
var fredokaRegular25: UIFont { get }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -138,6 +138,9 @@ class FontStyleSheet: IStyleSheet {
|
|||
theme.add(styleName: "semibold16") { (s) -> (Void) in
|
||||
s.font = fonts.semibold16
|
||||
}
|
||||
theme.add(styleName: "semibold18") { (s) -> (Void) in
|
||||
s.font = fonts.semibold18
|
||||
}
|
||||
theme.add(styleName: "fredokaRegular25") { (s) -> (Void) in
|
||||
s.font = fonts.fredokaRegular25
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,5 +45,6 @@ class Fonts: IFonts {
|
|||
var semibold14 = UIFont.systemFont(ofSize: 14, weight:UIFont.Weight.semibold)
|
||||
var semibold15 = UIFont.systemFont(ofSize: 15, weight:UIFont.Weight.semibold)
|
||||
var semibold16 = UIFont.systemFont(ofSize: 16, weight:UIFont.Weight.semibold)
|
||||
var semibold18 = UIFont.systemFont(ofSize: 18, weight:UIFont.Weight.semibold)
|
||||
var fredokaRegular25 = UIFont(name: "FredokaOne-Regular", size: 25) ?? UIFont.boldSystemFont(ofSize: 48)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,6 +70,12 @@ class GlobalStyleSheet: IStyleSheet {
|
|||
s.onTintColor = colors.ratingYellow
|
||||
s.offTintColor = colors.blackDividers
|
||||
}
|
||||
|
||||
theme.add(styleName: "DifficultyView") { (s) -> (Void) in
|
||||
s.colors = [colors.ratingGreen, colors.ratingYellow, colors.ratingRed]
|
||||
s.offTintColor = colors.blackSecondaryText
|
||||
s.backgroundColor = colors.clear
|
||||
}
|
||||
|
||||
//MARK: Global styles
|
||||
theme.add(styleName: "Divider") { (s) -> (Void) in
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ class MainTheme: Theme {
|
|||
self.registerStyleSheet(MapStyleSheet.self)
|
||||
self.registerStyleSheet(AuthStyleSheet.self)
|
||||
self.registerStyleSheet(SubscriptionsStyleSheet.self)
|
||||
self.registerStyleSheet(PlacePageStyleSheet.self)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -125,68 +125,5 @@ class MapStyleSheet: IStyleSheet {
|
|||
s.shadowOpacity = 1
|
||||
s.backgroundColor = colors.white
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
theme.add(styleName: "RouteBasePreview") { (s) -> (Void) in
|
||||
s.borderColor = colors.blackDividers
|
||||
s.borderWidth = 1
|
||||
s.backgroundColor = colors.white
|
||||
}
|
||||
|
||||
theme.add(styleName: "RoutePreview") { (s) -> (Void) in
|
||||
s.shadowRadius = 2
|
||||
s.shadowColor = colors.blackDividers
|
||||
s.shadowOpacity = 1
|
||||
s.shadowOffset = CGSize(width: 3, height: 0)
|
||||
s.backgroundColor = colors.pressBackground
|
||||
}
|
||||
|
||||
theme.add(styleName: "RatingSummaryView24") { (s) -> (Void) in
|
||||
s.font = fonts.bold16
|
||||
s.fontColorHighlighted = colors.ratingYellow //filled color
|
||||
s.fontColorDisabled = colors.blackDividers //empty color
|
||||
s.colors = [
|
||||
colors.blackSecondaryText, //noValue
|
||||
colors.ratingRed, //horrible
|
||||
colors.ratingOrange, //bad
|
||||
colors.ratingYellow, //normal
|
||||
colors.ratingLightGreen, //good
|
||||
colors.ratingGreen //exellent
|
||||
]
|
||||
s.images = [
|
||||
"ic_24px_rating_normal", //noValue
|
||||
"ic_24px_rating_horrible", //horrible
|
||||
"ic_24px_rating_bad", //bad
|
||||
"ic_24px_rating_normal", //normal
|
||||
"ic_24px_rating_good", //good
|
||||
"ic_24px_rating_excellent" //exellent
|
||||
]
|
||||
}
|
||||
|
||||
theme.add(styleName: "RatingSummaryView12", from: "RatingSummaryView24") { (s) -> (Void) in
|
||||
s.font = fonts.bold12
|
||||
s.images = [
|
||||
"ic_12px_rating_normal",
|
||||
"ic_12px_rating_horrible",
|
||||
"ic_12px_rating_bad",
|
||||
"ic_12px_rating_normal",
|
||||
"ic_12px_rating_good",
|
||||
"ic_12px_rating_excellent"
|
||||
]
|
||||
}
|
||||
|
||||
theme.add(styleName: "RatingSummaryView12User", from: "RatingSummaryView12") { (s) -> (Void) in
|
||||
s.colors?[0] = colors.linkBlue
|
||||
s.images?[0] = "ic_12px_radio_on"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
78
iphone/Maps/Core/Theme/PlacePageStyleSheet.swift
Normal file
78
iphone/Maps/Core/Theme/PlacePageStyleSheet.swift
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
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
|
||||
}
|
||||
|
||||
theme.add(styleName: "ElevationProfileDescriptionCell") { (s) -> (Void) in
|
||||
s.backgroundColor = colors.blackOpaque
|
||||
s.cornerRadius = 6
|
||||
}
|
||||
|
||||
theme.add(styleName: "ElevationProfileExtendedDifficulty") { (s) -> (Void) in
|
||||
s.backgroundColor = colors.blackSecondaryText
|
||||
s.fontColor = colors.white
|
||||
s.font = fonts.medium14
|
||||
s.textContainerInset = UIEdgeInsets(top: 4, left: 6, bottom: 4, right: 6)
|
||||
}
|
||||
|
||||
theme.add(styleName: "RouteBasePreview") { (s) -> (Void) in
|
||||
s.borderColor = colors.blackDividers
|
||||
s.borderWidth = 1
|
||||
s.backgroundColor = colors.white
|
||||
}
|
||||
|
||||
theme.add(styleName: "RoutePreview") { (s) -> (Void) in
|
||||
s.shadowRadius = 2
|
||||
s.shadowColor = colors.blackDividers
|
||||
s.shadowOpacity = 1
|
||||
s.shadowOffset = CGSize(width: 3, height: 0)
|
||||
s.backgroundColor = colors.pressBackground
|
||||
}
|
||||
|
||||
theme.add(styleName: "RatingSummaryView24") { (s) -> (Void) in
|
||||
s.font = fonts.bold16
|
||||
s.fontColorHighlighted = colors.ratingYellow //filled color
|
||||
s.fontColorDisabled = colors.blackDividers //empty color
|
||||
s.colors = [
|
||||
colors.blackSecondaryText, //noValue
|
||||
colors.ratingRed, //horrible
|
||||
colors.ratingOrange, //bad
|
||||
colors.ratingYellow, //normal
|
||||
colors.ratingLightGreen, //good
|
||||
colors.ratingGreen //exellent
|
||||
]
|
||||
s.images = [
|
||||
"ic_24px_rating_normal", //noValue
|
||||
"ic_24px_rating_horrible", //horrible
|
||||
"ic_24px_rating_bad", //bad
|
||||
"ic_24px_rating_normal", //normal
|
||||
"ic_24px_rating_good", //good
|
||||
"ic_24px_rating_excellent" //exellent
|
||||
]
|
||||
}
|
||||
|
||||
theme.add(styleName: "RatingSummaryView12", from: "RatingSummaryView24") { (s) -> (Void) in
|
||||
s.font = fonts.bold12
|
||||
s.images = [
|
||||
"ic_12px_rating_normal",
|
||||
"ic_12px_rating_horrible",
|
||||
"ic_12px_rating_bad",
|
||||
"ic_12px_rating_normal",
|
||||
"ic_12px_rating_good",
|
||||
"ic_12px_rating_excellent"
|
||||
]
|
||||
}
|
||||
|
||||
theme.add(styleName: "RatingSummaryView12User", from: "RatingSummaryView12") { (s) -> (Void) in
|
||||
s.colors?[0] = colors.linkBlue
|
||||
s.images?[0] = "ic_12px_radio_on"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
import Foundation
|
||||
extension DifficultyView {
|
||||
@objc override func applyTheme() {
|
||||
if styleName.isEmpty {
|
||||
styleName = "DifficultyView"
|
||||
}
|
||||
for style in StyleManager.shared.getStyle(styleName)
|
||||
where !style.isEmpty && !style.hasExclusion(view: self) {
|
||||
DifficultyViewRenderer.render(self, style: style)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class DifficultyViewRenderer: UIViewRenderer {
|
||||
class func render(_ control: DifficultyView, style: Style) {
|
||||
super.render(control, style: style)
|
||||
if let colors = style.colors {
|
||||
control.colors = colors
|
||||
}
|
||||
if let emptyColor = style.offTintColor {
|
||||
control.emptyColor = emptyColor
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
17
iphone/Maps/Core/Theme/Renderers/InsetsLabelRenderer.swift
Normal file
17
iphone/Maps/Core/Theme/Renderers/InsetsLabelRenderer.swift
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
extension InsetsLabel {
|
||||
@objc override func applyTheme() {
|
||||
for style in StyleManager.shared.getStyle(styleName)
|
||||
where !style.isEmpty && !style.hasExclusion(view: self) {
|
||||
InsetsLabelRenderer.render(self, style: style)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class InsetsLabelRenderer: UILabelRenderer {
|
||||
class func render(_ control: InsetsLabel, style: Style) {
|
||||
super.render(control, style: style)
|
||||
if let insets = style.textContainerInset {
|
||||
control.insets = insets
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -30,6 +30,7 @@ class SubscriptionsStyleSheet: IStyleSheet {
|
|||
s.shadowOpacity = 0.62
|
||||
s.fontColor = UIColor.white
|
||||
s.font = fonts.bold17
|
||||
s.textContainerInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 10)
|
||||
}
|
||||
|
||||
theme.add(styleName: "BookmarksSubscriptionDiscount", forType: .light) { (s) -> (Void) in
|
||||
|
|
@ -37,6 +38,7 @@ class SubscriptionsStyleSheet: IStyleSheet {
|
|||
s.cornerRadius = 6
|
||||
s.fontColor = UIColor.white
|
||||
s.font = fonts.bold17
|
||||
s.textContainerInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 10)
|
||||
}
|
||||
|
||||
theme.add(styleName: "AllPassSubscriptionYearlyButton") { (s) -> (Void) in
|
||||
|
|
@ -105,6 +107,7 @@ class SubscriptionsStyleSheet: IStyleSheet {
|
|||
s.font = fonts.bold17
|
||||
s.fontColor = colors.discountText
|
||||
s.backgroundColor = colors.allPassSubscriptionDiscountBackground
|
||||
s.textContainerInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 10)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
BIN
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_ascent_24.imageset/Ascent.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_ascent_24.imageset/Ascent.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 391 B |
BIN
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_ascent_24.imageset/Ascent@2x.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_ascent_24.imageset/Ascent@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 711 B |
BIN
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_ascent_24.imageset/Ascent@3x.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_ascent_24.imageset/Ascent@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 954 B |
26
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_ascent_24.imageset/Contents.json
vendored
Normal file
26
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_ascent_24.imageset/Contents.json
vendored
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "Ascent.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "Ascent@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "Ascent@3x.png",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
},
|
||||
"properties" : {
|
||||
"template-rendering-intent" : "template"
|
||||
}
|
||||
}
|
||||
26
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_descent_24.imageset/Contents.json
vendored
Normal file
26
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_descent_24.imageset/Contents.json
vendored
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "Descent.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "Descent@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "Descent@3x.png",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
},
|
||||
"properties" : {
|
||||
"template-rendering-intent" : "template"
|
||||
}
|
||||
}
|
||||
BIN
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_descent_24.imageset/Descent.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_descent_24.imageset/Descent.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 427 B |
BIN
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_descent_24.imageset/Descent@2x.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_descent_24.imageset/Descent@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 791 B |
BIN
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_descent_24.imageset/Descent@3x.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Place Page/ElevationProfile/ic_em_descent_24.imageset/Descent@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "maxAltitude.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "maxAltitude@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "maxAltitude@3x.png",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
},
|
||||
"properties" : {
|
||||
"template-rendering-intent" : "template"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 296 B |
Binary file not shown.
|
After Width: | Height: | Size: 489 B |
Binary file not shown.
|
After Width: | Height: | Size: 627 B |
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "minAltitude.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "minAltitude@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "minAltitude@3x.png",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
},
|
||||
"properties" : {
|
||||
"template-rendering-intent" : "template"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 291 B |
Binary file not shown.
|
After Width: | Height: | Size: 481 B |
Binary file not shown.
|
After Width: | Height: | Size: 664 B |
File diff suppressed because it is too large
Load diff
|
|
@ -54,7 +54,7 @@ class ActionBarViewController: UIViewController {
|
|||
if placePageData.bookingSearchUrl != nil {
|
||||
buttons.append(.bookingSearch)
|
||||
}
|
||||
if placePageData.infoData.phone != nil, AppInfo.shared().canMakeCalls {
|
||||
if placePageData.infoData?.phone != nil, AppInfo.shared().canMakeCalls {
|
||||
buttons.append(.call)
|
||||
}
|
||||
if !isRoutePlanning {
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
@objc class ElevationDetailsBuilder: NSObject {
|
||||
@objc static func build(data: PlacePageData) -> UIViewController {
|
||||
guard let elevationProfileData = data.elevationProfileData else {
|
||||
fatalError()
|
||||
}
|
||||
let viewController = ElevationDetailsViewController(nibName: toString(ElevationDetailsViewController.self), bundle: nil)
|
||||
let router = ElevationDetailsRouter(viewController: viewController)
|
||||
let presenter = ElevationDetailsPresenter(view: viewController, router: router, data: elevationProfileData)
|
||||
|
||||
viewController.presenter = presenter
|
||||
|
||||
return viewController
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
protocol ElevationDetailsPresenterProtocol: class {
|
||||
func configure()
|
||||
func onOkButtonPressed()
|
||||
}
|
||||
|
||||
class ElevationDetailsPresenter {
|
||||
private weak var view: ElevationDetailsViewProtocol?
|
||||
private let router: ElevationDetailsRouterProtocol
|
||||
private let data: ElevationProfileData
|
||||
|
||||
init(view: ElevationDetailsViewProtocol,
|
||||
router: ElevationDetailsRouterProtocol,
|
||||
data: ElevationProfileData) {
|
||||
self.view = view
|
||||
self.router = router
|
||||
self.data = data
|
||||
}
|
||||
}
|
||||
|
||||
extension ElevationDetailsPresenter: ElevationDetailsPresenterProtocol {
|
||||
func configure() {
|
||||
view?.setDifficulty(data.difficulty)
|
||||
view?.setExtendedDifficultyGrade(data.extendedDifficultyGrade ?? "")
|
||||
view?.setDifficultyDescription(data.extendedDifficultyDescription ?? "")
|
||||
|
||||
Statistics.logEvent(kStatElevationProfilePageDetailsOpen, withParameters: [kStatType: data.difficulty.rawValue]);
|
||||
}
|
||||
|
||||
func onOkButtonPressed() {
|
||||
router.close()
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
protocol ElevationDetailsRouterProtocol: class {
|
||||
func close()
|
||||
}
|
||||
|
||||
class ElevationDetailsRouter {
|
||||
private weak var viewController: UIViewController?
|
||||
|
||||
init(viewController: UIViewController) {
|
||||
self.viewController = viewController
|
||||
}
|
||||
}
|
||||
|
||||
extension ElevationDetailsRouter: ElevationDetailsRouterProtocol {
|
||||
func close() {
|
||||
viewController?.dismiss(animated: true, completion: nil)
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
protocol ElevationDetailsViewProtocol: class {
|
||||
var presenter: ElevationDetailsPresenterProtocol? { get set }
|
||||
|
||||
func setExtendedDifficultyGrade (_ value: String)
|
||||
func setDifficulty(_ value: ElevationDifficulty)
|
||||
func setDifficultyDescription(_ value: String)
|
||||
}
|
||||
|
||||
class ElevationDetailsViewController: MWMViewController {
|
||||
private let transitioning = FadeTransitioning<AlertPresentationController>()
|
||||
var presenter: ElevationDetailsPresenterProtocol?
|
||||
@IBOutlet var headerTitle: UILabel!
|
||||
@IBOutlet var difficultyView: DifficultyView!
|
||||
@IBOutlet var difficultyLabel: UILabel!
|
||||
@IBOutlet private var extendedDifficultyGradeLabel: UILabel!
|
||||
@IBOutlet var difficultyDescriptionLabel: UILabel!
|
||||
|
||||
override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
|
||||
super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
|
||||
transitioningDelegate = transitioning
|
||||
modalPresentationStyle = .custom
|
||||
}
|
||||
|
||||
required init?(coder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
presenter?.configure()
|
||||
}
|
||||
|
||||
@IBAction func onOkButtonPressed(_ sender: Any) {
|
||||
presenter?.onOkButtonPressed()
|
||||
}
|
||||
}
|
||||
|
||||
extension ElevationDetailsViewController: ElevationDetailsViewProtocol {
|
||||
func setExtendedDifficultyGrade (_ value: String) {
|
||||
extendedDifficultyGradeLabel.text = value
|
||||
}
|
||||
|
||||
func setDifficulty(_ value: ElevationDifficulty) {
|
||||
difficultyView.difficulty = value
|
||||
switch value {
|
||||
case .easy:
|
||||
difficultyLabel.text = L("elevation_profile_diff_level_easy")
|
||||
case .moderate:
|
||||
difficultyLabel.text = L("elevation_profile_diff_level_moderate")
|
||||
case .hard:
|
||||
difficultyLabel.text = L("elevation_profile_diff_level_hard")
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
func setDifficultyDescription(_ value: String) {
|
||||
difficultyDescriptionLabel.text = value
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,120 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<device id="retina6_1" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ElevationDetailsViewController">
|
||||
<connections>
|
||||
<outlet property="difficultyDescriptionLabel" destination="7Ed-wc-w74" id="9Bw-DB-bu8"/>
|
||||
<outlet property="difficultyLabel" destination="kDg-1H-1c1" id="azu-cC-qCf"/>
|
||||
<outlet property="difficultyView" destination="sd4-IT-eto" id="eB9-Dr-I51"/>
|
||||
<outlet property="extendedDifficultyGradeLabel" destination="Dke-As-9Jm" id="Tcj-7G-nQ6"/>
|
||||
<outlet property="headerTitle" destination="AUN-AX-DfY" id="taz-UO-a7n"/>
|
||||
<outlet property="view" destination="iN0-l3-epB" id="qok-Te-Q7Q"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="SolidTouchView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="312" height="484"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Difficulty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AUN-AX-DfY">
|
||||
<rect key="frame" x="16" y="68" width="280" height="21"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="elevation_profile_diff_level"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="semibold18:blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sd4-IT-eto" customClass="DifficultyView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="16" y="105" width="40" height="10"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="40" id="Nq9-uQ-GCS"/>
|
||||
<constraint firstAttribute="height" constant="10" id="gSS-Bl-tXK"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Moderate difficulty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kDg-1H-1c1">
|
||||
<rect key="frame" x="16" y="125" width="280" height="17"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="S1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dke-As-9Jm" customClass="InsetsLabel" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="16" y="158" width="15.5" height="17"/>
|
||||
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="ElevationProfileExtendedDifficulty"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Ed-wc-w74">
|
||||
<rect key="frame" x="16" y="183" width="280" height="221"/>
|
||||
<string key="text">Vivamus eu mattis lectus. Phasellus eu ex risus. Quisque ornare augue lectus, eget dignissim turpis ultrices quis. In sit amet sapien laoreet, gravida lorem eget, pharetra ipsum. Morbi ut massa dui. Aenean placerat libero ac ante finibus semper. Nullam semper nibh eget mauris vestibulum, eu cursus nunc finibus. Aliquam fringilla fermentum libero fringilla dictum. Donec eu semper ipsum. Sed in purus neque.</string>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vDr-Ie-c5L">
|
||||
<rect key="frame" x="16" y="420" width="280" height="48"/>
|
||||
<color key="backgroundColor" systemColor="linkColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="48" id="DsE-3h-I1o"/>
|
||||
<constraint firstAttribute="width" constant="280" id="JhA-fQ-QGN"/>
|
||||
</constraints>
|
||||
<state key="normal" title="Button">
|
||||
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
</state>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="ok"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="onOkButtonPressed:" destination="-1" eventType="touchUpInside" id="V2n-kF-R7p"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="vDr-Ie-c5L" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="16" id="03I-DI-Xet"/>
|
||||
<constraint firstItem="sd4-IT-eto" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="16" id="4Fs-jA-Nr5"/>
|
||||
<constraint firstItem="kDg-1H-1c1" firstAttribute="top" secondItem="sd4-IT-eto" secondAttribute="bottom" constant="10" id="590-Gb-F57"/>
|
||||
<constraint firstItem="AUN-AX-DfY" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="24" id="5Df-xg-87e"/>
|
||||
<constraint firstItem="7Ed-wc-w74" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="16" id="6RJ-WV-Wku"/>
|
||||
<constraint firstItem="vDr-Ie-c5L" firstAttribute="top" secondItem="7Ed-wc-w74" secondAttribute="bottom" constant="16" id="6ma-Oj-SbC"/>
|
||||
<constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="vDr-Ie-c5L" secondAttribute="bottom" constant="16" id="93T-wX-CAW"/>
|
||||
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="vDr-Ie-c5L" secondAttribute="trailing" constant="16" id="KPu-Wp-KPH"/>
|
||||
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="7Ed-wc-w74" secondAttribute="trailing" constant="16" id="NxM-48-Xf1"/>
|
||||
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="kDg-1H-1c1" secondAttribute="trailing" constant="16" id="PrX-vn-5lX"/>
|
||||
<constraint firstItem="Dke-As-9Jm" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="16" id="TA1-c3-FjG"/>
|
||||
<constraint firstItem="Dke-As-9Jm" firstAttribute="top" secondItem="kDg-1H-1c1" secondAttribute="bottom" constant="16" id="fIj-xm-f9G"/>
|
||||
<constraint firstItem="kDg-1H-1c1" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="16" id="fuT-eE-uMX"/>
|
||||
<constraint firstItem="sd4-IT-eto" firstAttribute="top" secondItem="AUN-AX-DfY" secondAttribute="bottom" constant="16" id="heF-rz-x1k"/>
|
||||
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="AUN-AX-DfY" secondAttribute="trailing" constant="16" id="kmB-vg-oQY"/>
|
||||
<constraint firstItem="7Ed-wc-w74" firstAttribute="top" secondItem="Dke-As-9Jm" secondAttribute="bottom" constant="8" id="mRe-aS-Zva"/>
|
||||
<constraint firstItem="AUN-AX-DfY" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="16" id="wm3-Eh-4No"/>
|
||||
</constraints>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<point key="canvasLocation" x="131.8840579710145" y="291.29464285714283"/>
|
||||
</view>
|
||||
</objects>
|
||||
</document>
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
class ElevationProfileBuilder {
|
||||
static func build(data: PlacePageData, delegate: ElevationProfileViewControllerDelegate?) -> ElevationProfileViewController {
|
||||
guard let elevationProfileData = data.elevationProfileData else {
|
||||
fatalError()
|
||||
}
|
||||
let storyboard = UIStoryboard.instance(.placePage)
|
||||
let viewController = storyboard.instantiateViewController(ofType: ElevationProfileViewController.self);
|
||||
let presenter = ElevationProfilePresenter(view: viewController,
|
||||
data: elevationProfileData,
|
||||
delegate: delegate)
|
||||
|
||||
viewController.presenter = presenter
|
||||
|
||||
return viewController
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
class ElevationProfileDescriptionCell: UICollectionViewCell {
|
||||
@IBOutlet private var titleLabel: UILabel!
|
||||
@IBOutlet private var valueLabel: UILabel!
|
||||
@IBOutlet var imageView: UIImageView!
|
||||
|
||||
func configure(title: String, value: String, imageName: String) {
|
||||
titleLabel.text = title
|
||||
valueLabel.text = value
|
||||
imageView.image = UIImage(named: imageName)
|
||||
}
|
||||
|
||||
override func prepareForReuse() {
|
||||
super.prepareForReuse()
|
||||
titleLabel.text = ""
|
||||
valueLabel.text = ""
|
||||
imageView.image = nil
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,125 @@
|
|||
protocol ElevationProfilePresenterProtocol: UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
|
||||
func configure()
|
||||
func onAppear()
|
||||
func onDissapear()
|
||||
|
||||
func onDifficultyButtonPressed()
|
||||
func onDragBegin()
|
||||
func onZoomBegin()
|
||||
func onNavigateBegin()
|
||||
}
|
||||
|
||||
protocol ElevationProfileViewControllerDelegate: AnyObject {
|
||||
func openDifficultyPopup()
|
||||
}
|
||||
|
||||
fileprivate struct DescriptionsViewModel {
|
||||
let title: String
|
||||
let value: String
|
||||
let imageName: String
|
||||
}
|
||||
|
||||
class ElevationProfilePresenter: NSObject {
|
||||
private weak var view: ElevationProfileViewProtocol?
|
||||
private let data: ElevationProfileData
|
||||
private let delegate: ElevationProfileViewControllerDelegate?
|
||||
|
||||
|
||||
private let cellSpacing: CGFloat = 8
|
||||
private let descriptionModels: [DescriptionsViewModel]
|
||||
|
||||
init(view: ElevationProfileViewProtocol,
|
||||
data: ElevationProfileData,
|
||||
delegate: ElevationProfileViewControllerDelegate?) {
|
||||
self.view = view
|
||||
self.data = data
|
||||
self.delegate = delegate
|
||||
|
||||
descriptionModels = [
|
||||
DescriptionsViewModel(title: L("elevation_profile_ascent"), value: data.ascent, imageName: "ic_em_ascent_24"),
|
||||
DescriptionsViewModel(title: L("elevation_profile_descent"), value: data.descent, imageName: "ic_em_descent_24"),
|
||||
DescriptionsViewModel(title: L("elevation_profile_maxaltitude"), value: data.maxAttitude, imageName: "ic_em_max_attitude_24"),
|
||||
DescriptionsViewModel(title: L("elevation_profile_minaltitude"), value: data.minAttitude, imageName: "ic_em_min_attitude_24")
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
|
||||
func configure() {
|
||||
view?.setDifficulty(data.difficulty)
|
||||
view?.setTrackTime(data.trackTime)
|
||||
if let extendedDifficultyGrade = data.extendedDifficultyGrade {
|
||||
view?.isExtendedDifficultyLabelHidden = false
|
||||
view?.setExtendedDifficultyGrade(extendedDifficultyGrade)
|
||||
} else {
|
||||
view?.isExtendedDifficultyLabelHidden = true
|
||||
}
|
||||
}
|
||||
|
||||
func onAppear() {
|
||||
Statistics.logEvent(kStatElevationProfilePageOpen,
|
||||
withParameters: [kStatServerId: data.serverId,
|
||||
kStatMethod: "info|track",
|
||||
kStatState: "preview"])
|
||||
}
|
||||
|
||||
func onDissapear() {
|
||||
Statistics.logEvent(kStatElevationProfilePageClose,
|
||||
withParameters: [kStatServerId: data.serverId,
|
||||
kStatMethod: "swipe"])
|
||||
}
|
||||
|
||||
func onDifficultyButtonPressed() {
|
||||
delegate?.openDifficultyPopup()
|
||||
}
|
||||
|
||||
func onDragBegin() {
|
||||
Statistics.logEvent(kStatElevationProfilePageDrag,
|
||||
withParameters: [kStatServerId: data.serverId,
|
||||
kStatAction: "zoom_in|zoom_out|drag",
|
||||
kStatSide: "left|right|all"])
|
||||
}
|
||||
|
||||
|
||||
func onZoomBegin() {
|
||||
Statistics.logEvent(kStatElevationProfilePageZoom,
|
||||
withParameters: [kStatServerId: data.serverId,
|
||||
kStatIsZoomIn: true])
|
||||
}
|
||||
|
||||
func onNavigateBegin() {
|
||||
Statistics.logEvent(kStatElevationProfilePageNavigationAction,
|
||||
withParameters: [kStatServerId: data.serverId])
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - UICollectionDataSource
|
||||
|
||||
extension ElevationProfilePresenter {
|
||||
func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
|
||||
return descriptionModels.count
|
||||
}
|
||||
|
||||
func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
|
||||
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "ElevationProfileDescriptionCell", for: indexPath) as! ElevationProfileDescriptionCell
|
||||
let model = descriptionModels[indexPath.row]
|
||||
cell.configure(title: model.title, value: model.value, imageName: model.imageName)
|
||||
return cell
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - UICollectionViewDelegateFlowLayout
|
||||
|
||||
extension ElevationProfilePresenter {
|
||||
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
|
||||
let width = collectionView.width
|
||||
let cellHeight = collectionView.height
|
||||
let modelsCount = CGFloat(descriptionModels.count)
|
||||
let cellWidth = (width - cellSpacing * (modelsCount - 1)) / modelsCount
|
||||
return CGSize(width: cellWidth, height: cellHeight)
|
||||
}
|
||||
|
||||
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat {
|
||||
return cellSpacing
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
protocol ElevationProfileViewProtocol: class {
|
||||
var presenter: ElevationProfilePresenterProtocol? { get set }
|
||||
|
||||
var isExtendedDifficultyLabelHidden: Bool { get set }
|
||||
func setExtendedDifficultyGrade(_ value: String)
|
||||
func setTrackTime(_ value: String?)
|
||||
func setDifficulty(_ value: ElevationDifficulty)
|
||||
}
|
||||
|
||||
class ElevationProfileViewController: UIViewController {
|
||||
var presenter: ElevationProfilePresenterProtocol?
|
||||
|
||||
@IBOutlet private var graphViewContainer: UIView!
|
||||
@IBOutlet private var descriptionCollectionView: UICollectionView!
|
||||
@IBOutlet private var difficultyView: DifficultyView!
|
||||
@IBOutlet private var extendedDifficultyGradeLabel: UILabel!
|
||||
@IBOutlet private var trackTimeLabel: UILabel!
|
||||
@IBOutlet private var extendedGradeButton: UIButton!
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
descriptionCollectionView.dataSource = presenter
|
||||
descriptionCollectionView.delegate = presenter
|
||||
presenter?.configure()
|
||||
}
|
||||
|
||||
override func viewDidAppear(_ animated: Bool) {
|
||||
super.viewDidAppear(animated)
|
||||
presenter?.onAppear()
|
||||
}
|
||||
|
||||
override func viewDidDisappear(_ animated: Bool) {
|
||||
super.viewDidDisappear(animated)
|
||||
presenter?.onDissapear()
|
||||
}
|
||||
|
||||
@IBAction func onExtendedDifficultyButtonPressed(_ sender: Any) {
|
||||
presenter?.onDifficultyButtonPressed()
|
||||
}
|
||||
|
||||
func getPreviewHeight() -> CGFloat {
|
||||
return view.height - descriptionCollectionView.frame.minY
|
||||
}
|
||||
}
|
||||
|
||||
extension ElevationProfileViewController: ElevationProfileViewProtocol {
|
||||
var isExtendedDifficultyLabelHidden: Bool {
|
||||
get { return extendedDifficultyGradeLabel.isHidden }
|
||||
set {
|
||||
extendedDifficultyGradeLabel.isHidden = newValue
|
||||
extendedGradeButton.isHidden = newValue
|
||||
}
|
||||
}
|
||||
|
||||
func setExtendedDifficultyGrade(_ value: String) {
|
||||
extendedDifficultyGradeLabel.text = value
|
||||
}
|
||||
func setTrackTime(_ value: String?) {
|
||||
trackTimeLabel.text = value
|
||||
}
|
||||
func setDifficulty(_ value: ElevationDifficulty) {
|
||||
difficultyView.difficulty = value
|
||||
}
|
||||
}
|
||||
|
|
@ -15,7 +15,7 @@ final class PhotoCell: UICollectionViewCell {
|
|||
}
|
||||
|
||||
protocol HotelPhotosViewControllerDelegate: AnyObject {
|
||||
func didSelectItemAt(_ index: Int, lastItemIndex: Int)
|
||||
func didSelectItemAt(_ hotelPhotosViewController: HotelPhotosViewController, index: Int, lastItemIndex: Int)
|
||||
}
|
||||
|
||||
final class HotelPhotosViewController: UIViewController {
|
||||
|
|
@ -56,6 +56,6 @@ extension HotelPhotosViewController: UICollectionViewDataSource {
|
|||
|
||||
extension HotelPhotosViewController: UICollectionViewDelegate {
|
||||
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
|
||||
delegate?.didSelectItemAt(indexPath.item, lastItemIndex: collectionView.numberOfItems(inSection: 0) - 1)
|
||||
delegate?.didSelectItemAt(self, index: indexPath.item, lastItemIndex: collectionView.numberOfItems(inSection: 0) - 1)
|
||||
}
|
||||
}
|
||||
|
|
@ -106,6 +106,7 @@
|
|||
</view>
|
||||
<connections>
|
||||
<outlet property="actionBarContainerView" destination="inM-UW-vpv" id="Jph-SJ-GHF"/>
|
||||
<outlet property="actionBarHeightConstraint" destination="xwz-cT-wns" id="Gpq-zW-Lcu"/>
|
||||
<outlet property="scrollView" destination="dJ0-97-CDh" id="8Wc-yy-2yF"/>
|
||||
<outlet property="stackView" destination="bsv-S8-EiF" id="zK0-FZ-JXe"/>
|
||||
</connections>
|
||||
|
|
@ -180,7 +181,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view hidden="YES" contentMode="scaleToFill" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="yrY-oi-L2J" customClass="DirectionView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="343" y="0.0" width="57.333333333333314" height="50"/>
|
||||
<rect key="frame" x="343" y="0.0" width="57.666666666666686" height="50"/>
|
||||
<subviews>
|
||||
<imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_direction_light" translatesAutoresizingMaskIntoConstraints="NO" id="OGW-Uh-yEF">
|
||||
<rect key="frame" x="0.0" y="16" width="18" height="18"/>
|
||||
|
|
@ -193,7 +194,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="1000" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="300 m" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5GQ-ZR-KBq" userLabel="Distance">
|
||||
<rect key="frame" x="20.000000000000004" y="0.0" width="37.333333333333343" height="50"/>
|
||||
<rect key="frame" x="19.999999999999996" y="0.0" width="37.666666666666657" height="50"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -2333,7 +2334,7 @@
|
|||
<rect key="frame" x="8" y="8" width="156" height="150"/>
|
||||
<subviews>
|
||||
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZI4-Rc-va0">
|
||||
<rect key="frame" x="0.0" y="23.333333333333307" width="156" height="103.33333333333331"/>
|
||||
<rect key="frame" x="0.0" y="23.333333333333321" width="156" height="103.66666666666669"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Государственный музей изобразительных искусств имени А.С. Пушкина" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2op-Ba-YTM">
|
||||
<rect key="frame" x="0.0" y="0.0" width="156" height="83.666666666666671"/>
|
||||
|
|
@ -2345,7 +2346,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ArrivalGuides" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0YD-vJ-HhG">
|
||||
<rect key="frame" x="0.0" y="88.666666666666686" width="156" height="14.666666666666671"/>
|
||||
<rect key="frame" x="0.0" y="88.666666666666686" width="156" height="15"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -2538,7 +2539,7 @@
|
|||
<rect key="frame" x="0.0" y="46" width="54" height="24"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="PRO" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zxq-2r-GKi">
|
||||
<rect key="frame" x="12" y="1.6666666666666643" width="34" height="20.666666666666668"/>
|
||||
<rect key="frame" x="12" y="1.6666666666666643" width="34" height="21"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
|
|
@ -2783,6 +2784,192 @@
|
|||
</objects>
|
||||
<point key="canvasLocation" x="929" y="-703"/>
|
||||
</scene>
|
||||
<!--Elevation Profile View Controller-->
|
||||
<scene sceneID="0yF-nr-ALU">
|
||||
<objects>
|
||||
<viewController storyboardIdentifier="ElevationProfileViewController" id="d1y-Na-lDm" customClass="ElevationProfileViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController">
|
||||
<view key="view" contentMode="scaleToFill" id="7Mx-au-yIa">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="303"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jKi-gT-ZfM">
|
||||
<rect key="frame" x="16" y="0.0" width="343" height="160"/>
|
||||
<color key="backgroundColor" systemColor="systemBrownColor" red="0.63529411759999999" green="0.51764705879999995" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="160" id="utH-YA-2pe"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Xc9-ED-V4K">
|
||||
<rect key="frame" x="16" y="176" width="343" height="68"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="68" id="AM4-tj-liE"/>
|
||||
</constraints>
|
||||
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="gL4-id-6En">
|
||||
<size key="itemSize" width="50" height="50"/>
|
||||
<size key="headerReferenceSize" width="0.0" height="0.0"/>
|
||||
<size key="footerReferenceSize" width="0.0" height="0.0"/>
|
||||
<inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
</collectionViewFlowLayout>
|
||||
<cells>
|
||||
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ElevationProfileDescriptionCell" id="ubO-dg-082" customClass="ElevationProfileDescriptionCell" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="69" height="68"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="CH9-Og-i2q">
|
||||
<rect key="frame" x="0.0" y="0.0" width="69" height="68"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7Xw-zI-6aP">
|
||||
<rect key="frame" x="22.666666666666671" y="6" width="24" height="24"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="24" id="9eF-wN-2uC"/>
|
||||
<constraint firstAttribute="width" constant="24" id="ct1-1m-XeC"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mAR-lR-4BZ">
|
||||
<rect key="frame" x="1" y="33" width="67" height="12"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="10"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular10:blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8rf-1Z-YJM">
|
||||
<rect key="frame" x="1" y="45" width="67" height="17"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" systemColor="opaqueSeparatorColor" red="0.77647058820000003" green="0.77647058820000003" blue="0.7843137255" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="8rf-1Z-YJM" firstAttribute="centerX" secondItem="mAR-lR-4BZ" secondAttribute="centerX" id="2bV-Eg-iTv"/>
|
||||
<constraint firstItem="8rf-1Z-YJM" firstAttribute="leading" secondItem="CH9-Og-i2q" secondAttribute="leading" constant="1" id="2zh-El-kBm"/>
|
||||
<constraint firstAttribute="trailing" secondItem="mAR-lR-4BZ" secondAttribute="trailing" constant="1" id="Brm-sc-JFK"/>
|
||||
<constraint firstAttribute="trailing" secondItem="8rf-1Z-YJM" secondAttribute="trailing" constant="1" id="FJf-4o-P8q"/>
|
||||
<constraint firstItem="7Xw-zI-6aP" firstAttribute="top" secondItem="CH9-Og-i2q" secondAttribute="top" constant="6" id="Wpx-pf-pO9"/>
|
||||
<constraint firstItem="mAR-lR-4BZ" firstAttribute="top" secondItem="7Xw-zI-6aP" secondAttribute="bottom" constant="3" id="Xq7-6S-AJb"/>
|
||||
<constraint firstItem="8rf-1Z-YJM" firstAttribute="top" secondItem="mAR-lR-4BZ" secondAttribute="bottom" id="kyB-4q-1Ms"/>
|
||||
<constraint firstItem="mAR-lR-4BZ" firstAttribute="leading" secondItem="CH9-Og-i2q" secondAttribute="leading" constant="1" id="rOY-yv-hrs"/>
|
||||
<constraint firstItem="mAR-lR-4BZ" firstAttribute="centerX" secondItem="CH9-Og-i2q" secondAttribute="centerX" id="u1A-tO-NFc"/>
|
||||
<constraint firstItem="7Xw-zI-6aP" firstAttribute="centerX" secondItem="CH9-Og-i2q" secondAttribute="centerX" id="yNO-Ee-f6X"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="ElevationProfileDescriptionCell"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</collectionViewCellContentView>
|
||||
<size key="customSize" width="69" height="68"/>
|
||||
<connections>
|
||||
<outlet property="imageView" destination="7Xw-zI-6aP" id="Mih-v4-OqB"/>
|
||||
<outlet property="titleLabel" destination="mAR-lR-4BZ" id="Yd1-qq-FYk"/>
|
||||
<outlet property="valueLabel" destination="8rf-1Z-YJM" id="voz-9x-ymv"/>
|
||||
</connections>
|
||||
</collectionViewCell>
|
||||
</cells>
|
||||
</collectionView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" text="Difficulty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FIo-No-CbK">
|
||||
<rect key="frame" x="16" y="265" width="68.666666666666671" height="20.666666666666686"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="elevation_profile_difficulty"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bc9-z0-p88" customClass="DifficultyView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="91.666666666666671" y="271.66666666666669" width="40.000000000000014" height="10"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="10" id="2Tg-JW-8Tr"/>
|
||||
<constraint firstAttribute="width" constant="40" id="Sor-5l-zjy"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1h 10m" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dQJ-fW-QVh">
|
||||
<rect key="frame" x="301" y="265" width="58" height="20.666666666666686"/>
|
||||
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold17:blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Time:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hoy-lg-Wl9">
|
||||
<rect key="frame" x="249" y="264.66666666666669" width="43" height="21"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="elevation_profile_time"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g6D-fD-0Ug">
|
||||
<rect key="frame" x="134" y="260.33333333333331" width="30" height="30"/>
|
||||
<connections>
|
||||
<action selector="onExtendedDifficultyButtonPressed:" destination="d1y-Na-lDm" eventType="touchUpInside" id="4zH-m2-OSE"/>
|
||||
</connections>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="S1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GPk-XR-oL1" customClass="InsetsLabel" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="139.33333333333334" y="265" width="19.333333333333343" height="20.666666666666686"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="ElevationProfileExtendedDifficulty"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
<constraints>
|
||||
<constraint firstItem="hoy-lg-Wl9" firstAttribute="baseline" secondItem="FIo-No-CbK" secondAttribute="baseline" id="7IY-jn-lps"/>
|
||||
<constraint firstItem="bc9-z0-p88" firstAttribute="leading" secondItem="FIo-No-CbK" secondAttribute="trailing" constant="7" id="CDd-Zf-CvI"/>
|
||||
<constraint firstItem="Xc9-ED-V4K" firstAttribute="top" secondItem="jKi-gT-ZfM" secondAttribute="bottom" constant="16" id="Izs-S0-cku"/>
|
||||
<constraint firstItem="ezp-sJ-36x" firstAttribute="trailing" secondItem="dQJ-fW-QVh" secondAttribute="trailing" constant="16" id="L0f-4H-Rdv"/>
|
||||
<constraint firstItem="g6D-fD-0Ug" firstAttribute="centerY" secondItem="GPk-XR-oL1" secondAttribute="centerY" id="P9X-9S-8dI"/>
|
||||
<constraint firstItem="dQJ-fW-QVh" firstAttribute="leading" secondItem="hoy-lg-Wl9" secondAttribute="trailing" constant="9" id="TRv-Jp-YEl"/>
|
||||
<constraint firstItem="GPk-XR-oL1" firstAttribute="leading" secondItem="bc9-z0-p88" secondAttribute="trailing" constant="7.6666666666666856" id="W9l-Ip-nhH"/>
|
||||
<constraint firstItem="g6D-fD-0Ug" firstAttribute="centerX" secondItem="GPk-XR-oL1" secondAttribute="centerX" id="YFV-Au-wTO"/>
|
||||
<constraint firstItem="hoy-lg-Wl9" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="GPk-XR-oL1" secondAttribute="trailing" constant="8" id="eP3-qC-a2f"/>
|
||||
<constraint firstItem="FIo-No-CbK" firstAttribute="leading" secondItem="ezp-sJ-36x" secondAttribute="leading" constant="16" id="eg2-uX-NgT"/>
|
||||
<constraint firstItem="jKi-gT-ZfM" firstAttribute="leading" secondItem="ezp-sJ-36x" secondAttribute="leading" constant="16" id="kKJ-Jg-wRO"/>
|
||||
<constraint firstItem="dQJ-fW-QVh" firstAttribute="baseline" secondItem="FIo-No-CbK" secondAttribute="baseline" id="kvI-gM-iyU"/>
|
||||
<constraint firstItem="ezp-sJ-36x" firstAttribute="trailing" secondItem="Xc9-ED-V4K" secondAttribute="trailing" constant="16" id="mxE-Mk-VH2"/>
|
||||
<constraint firstItem="bc9-z0-p88" firstAttribute="bottom" secondItem="FIo-No-CbK" secondAttribute="baseline" id="opM-hk-CFP"/>
|
||||
<constraint firstItem="ezp-sJ-36x" firstAttribute="bottom" secondItem="Xc9-ED-V4K" secondAttribute="bottom" constant="59" id="vaG-aV-kw5"/>
|
||||
<constraint firstItem="Xc9-ED-V4K" firstAttribute="leading" secondItem="ezp-sJ-36x" secondAttribute="leading" constant="16" id="vpI-N0-eIg"/>
|
||||
<constraint firstItem="jKi-gT-ZfM" firstAttribute="top" secondItem="ezp-sJ-36x" secondAttribute="top" id="ySA-vA-GW9"/>
|
||||
<constraint firstItem="GPk-XR-oL1" firstAttribute="centerY" secondItem="FIo-No-CbK" secondAttribute="centerY" id="yey-Sw-JqF"/>
|
||||
<constraint firstItem="FIo-No-CbK" firstAttribute="top" secondItem="Xc9-ED-V4K" secondAttribute="bottom" constant="21" id="zDN-ZF-3Ex"/>
|
||||
<constraint firstItem="ezp-sJ-36x" firstAttribute="trailing" secondItem="jKi-gT-ZfM" secondAttribute="trailing" constant="16" id="zN2-OH-sDZ"/>
|
||||
</constraints>
|
||||
<viewLayoutGuide key="safeArea" id="ezp-sJ-36x"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<size key="freeformSize" width="375" height="303"/>
|
||||
<connections>
|
||||
<outlet property="descriptionCollectionView" destination="Xc9-ED-V4K" id="dHB-dH-HYE"/>
|
||||
<outlet property="difficultyView" destination="bc9-z0-p88" id="p5u-Au-7i2"/>
|
||||
<outlet property="extendedDifficultyGradeLabel" destination="GPk-XR-oL1" id="SpR-XZ-6ou"/>
|
||||
<outlet property="extendedGradeButton" destination="g6D-fD-0Ug" id="8br-bF-NqA"/>
|
||||
<outlet property="graphViewContainer" destination="jKi-gT-ZfM" id="SUq-a3-G5F"/>
|
||||
<outlet property="trackTimeLabel" destination="dQJ-fW-QVh" id="LxB-Xa-NrL"/>
|
||||
</connections>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="mfQ-ai-TWx" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="926.81159420289862" y="2501.4945652173915"/>
|
||||
</scene>
|
||||
<!--More Reviews View Controller-->
|
||||
<scene sceneID="Mgr-vZ-eCK">
|
||||
<objects>
|
||||
|
|
|
|||
25
iphone/Maps/UI/PlacePage/PlacePageBuilder.swift
Normal file
25
iphone/Maps/UI/PlacePage/PlacePageBuilder.swift
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
@objc class PlacePageBuilder: NSObject {
|
||||
@objc static func build(data: PlacePageData) -> UIViewController {
|
||||
let storyboard = UIStoryboard.instance(.placePage)
|
||||
guard let viewController = storyboard.instantiateInitialViewController() as? PlacePageViewController else {
|
||||
fatalError()
|
||||
}
|
||||
let interactor = PlacePageInteractor(viewController: viewController, data: data)
|
||||
let layout:IPlacePageLayout
|
||||
if data.elevationProfileData != nil {
|
||||
layout = PlacePageElevationLayout(interactor: interactor, storyboard: storyboard, data: data)
|
||||
} else {
|
||||
layout = PlacePageCommonLayout(interactor: interactor, storyboard: storyboard, data: data)
|
||||
}
|
||||
let presenter = PlacePagePresenter(view: viewController,
|
||||
interactor: interactor,
|
||||
layout: layout,
|
||||
isPreviewPlus: data.isPreviewPlus)
|
||||
|
||||
interactor.presenter = presenter
|
||||
viewController.presenter = presenter
|
||||
layout.presenter = presenter
|
||||
|
||||
return viewController
|
||||
}
|
||||
}
|
||||
240
iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
Normal file
240
iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
Normal file
|
|
@ -0,0 +1,240 @@
|
|||
protocol PlacePageInteractorProtocol: class {
|
||||
|
||||
}
|
||||
|
||||
class PlacePageInteractor {
|
||||
weak var presenter: PlacePagePresenterProtocol?
|
||||
weak var viewController: UIViewController?
|
||||
|
||||
private var placePageData: PlacePageData
|
||||
|
||||
init (viewController: UIViewController, data: PlacePageData) {
|
||||
self.placePageData = data
|
||||
self.viewController = viewController
|
||||
}
|
||||
}
|
||||
|
||||
extension PlacePageInteractor: PlacePageInteractorProtocol {
|
||||
|
||||
}
|
||||
|
||||
// MARK: - PlacePagePreviewViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: PlacePagePreviewViewControllerDelegate {
|
||||
func previewDidPressRemoveAds() {
|
||||
MWMPlacePageManagerHelper.showRemoveAds()
|
||||
}
|
||||
|
||||
func previewDidPressAddReview() {
|
||||
MWMPlacePageManagerHelper.showUGCAddReview(placePageData, rating: .none, from: .placePagePreview)
|
||||
}
|
||||
|
||||
func previewDidPressSimilarHotels() {
|
||||
MWMPlacePageManagerHelper.searchSimilar(placePageData)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - PlacePageInfoViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: PlacePageInfoViewControllerDelegate {
|
||||
func didPressCall() {
|
||||
MWMPlacePageManagerHelper.call(placePageData)
|
||||
}
|
||||
|
||||
func didPressWebsite() {
|
||||
MWMPlacePageManagerHelper.openWebsite(placePageData)
|
||||
}
|
||||
|
||||
func didPressEmail() {
|
||||
|
||||
}
|
||||
|
||||
func didPressLocalAd() {
|
||||
MWMPlacePageManagerHelper.openLocalAdsURL(placePageData)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - WikiDescriptionViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: WikiDescriptionViewControllerDelegate {
|
||||
func didPressMore() {
|
||||
MWMPlacePageManagerHelper.showPlaceDescription(placePageData.wikiDescriptionHtml)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - TaxiViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: TaxiViewControllerDelegate {
|
||||
func didPressOrder() {
|
||||
MWMPlacePageManagerHelper.orderTaxi(placePageData)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - AddReviewViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: AddReviewViewControllerDelegate {
|
||||
func didRate(_ rating: UgcSummaryRatingType) {
|
||||
MWMPlacePageManagerHelper.showUGCAddReview(placePageData, rating: rating, from: .placePage)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - PlacePageReviewsViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: PlacePageReviewsViewControllerDelegate {
|
||||
func didPressMoreReviews() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - PlacePageButtonsViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: PlacePageButtonsViewControllerDelegate {
|
||||
func didPressHotels() {
|
||||
MWMPlacePageManagerHelper.openDescriptionUrl(placePageData)
|
||||
}
|
||||
|
||||
func didPressAddPlace() {
|
||||
MWMPlacePageManagerHelper.addPlace(placePageData.locationCoordinate)
|
||||
}
|
||||
|
||||
func didPressEditPlace() {
|
||||
MWMPlacePageManagerHelper.editPlace()
|
||||
}
|
||||
|
||||
func didPressAddBusiness() {
|
||||
MWMPlacePageManagerHelper.addBusiness()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - HotelPhotosViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: HotelPhotosViewControllerDelegate {
|
||||
func didSelectItemAt(_ hotelPhotosViewController: HotelPhotosViewController, index: Int, lastItemIndex: Int) {
|
||||
guard let photos = placePageData.hotelBooking?.photos else { return }
|
||||
if index == lastItemIndex {
|
||||
let galleryController = GalleryViewController.instance(photos: photos)
|
||||
galleryController.title = placePageData.previewData.title
|
||||
MapViewController.shared()?.navigationController?.pushViewController(galleryController, animated: true)
|
||||
} else {
|
||||
let currentPhoto = photos[index]
|
||||
let view = hotelPhotosViewController.viewForPhoto(currentPhoto)
|
||||
let photoVC = PhotosViewController(photos: photos, initialPhoto: currentPhoto, referenceView: view)
|
||||
|
||||
photoVC.referenceViewForPhotoWhenDismissingHandler = {
|
||||
hotelPhotosViewController.viewForPhoto($0)
|
||||
}
|
||||
viewController?.present(photoVC, animated: true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - HotelDescriptionViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: HotelDescriptionViewControllerDelegate {
|
||||
func hotelDescriptionDidPressMore() {
|
||||
MWMPlacePageManagerHelper.openMoreUrl(placePageData)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - HotelFacilitiesViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: HotelFacilitiesViewControllerDelegate {
|
||||
func facilitiesDidPressMore() {
|
||||
MWMPlacePageManagerHelper.showAllFacilities(placePageData)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - HotelReviewsViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: HotelReviewsViewControllerDelegate {
|
||||
func hotelReviewsDidPressMore() {
|
||||
MWMPlacePageManagerHelper.openReviewUrl(placePageData)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - CatalogSingleItemViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: CatalogSingleItemViewControllerDelegate {
|
||||
func catalogPromoItemDidPressView() {
|
||||
MWMPlacePageManagerHelper.openCatalogSingleItem(placePageData, at: 0)
|
||||
}
|
||||
|
||||
func catalogPromoItemDidPressMore() {
|
||||
MWMPlacePageManagerHelper.openCatalogSingleItem(placePageData, at: 0)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - CatalogGalleryViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: CatalogGalleryViewControllerDelegate {
|
||||
func promoGalleryDidPressMore() {
|
||||
MWMPlacePageManagerHelper.openCatalogMoreItems(placePageData)
|
||||
}
|
||||
|
||||
func promoGalleryDidSelectItemAtIndex(_ index: Int) {
|
||||
MWMPlacePageManagerHelper.openCatalogSingleItem(placePageData, at: index)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - PlacePageBookmarkViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: PlacePageBookmarkViewControllerDelegate {
|
||||
func bookmarkDidPressEdit() {
|
||||
MWMPlacePageManagerHelper.editBookmark()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - ActionBarViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: ActionBarViewControllerDelegate {
|
||||
func actionBarDidPressButton(_ type: ActionBarButtonType) {
|
||||
switch type {
|
||||
case .booking:
|
||||
MWMPlacePageManagerHelper.book(placePageData)
|
||||
case .bookingSearch:
|
||||
MWMPlacePageManagerHelper.searchSimilar(placePageData)
|
||||
case .bookmark:
|
||||
if placePageData.bookmarkData != nil {
|
||||
MWMPlacePageManagerHelper.removeBookmark(placePageData)
|
||||
} else {
|
||||
MWMPlacePageManagerHelper.addBookmark(placePageData)
|
||||
}
|
||||
case .call:
|
||||
MWMPlacePageManagerHelper.call(placePageData)
|
||||
case .download:
|
||||
fatalError()
|
||||
case .opentable:
|
||||
fatalError("Opentable is not supported and will be deleted")
|
||||
case .partner:
|
||||
MWMPlacePageManagerHelper.openPartner(placePageData)
|
||||
case .routeAddStop:
|
||||
MWMPlacePageManagerHelper.routeAddStop(placePageData)
|
||||
case .routeFrom:
|
||||
MWMPlacePageManagerHelper.route(from: placePageData)
|
||||
case .routeRemoveStop:
|
||||
MWMPlacePageManagerHelper.routeRemoveStop(placePageData)
|
||||
case .routeTo:
|
||||
MWMPlacePageManagerHelper.route(to: placePageData)
|
||||
case .share:
|
||||
MWMPlacePageManagerHelper.share(placePageData)
|
||||
case .avoidToll:
|
||||
MWMPlacePageManagerHelper.avoidToll()
|
||||
case .avoidDirty:
|
||||
MWMPlacePageManagerHelper.avoidDirty()
|
||||
case .avoidFerry:
|
||||
MWMPlacePageManagerHelper.avoidFerry()
|
||||
case .more:
|
||||
fatalError("More button should've been handled in ActionBarViewContoller")
|
||||
@unknown default:
|
||||
fatalError()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - ElevationProfileViewControllerDelegate
|
||||
|
||||
extension PlacePageInteractor: ElevationProfileViewControllerDelegate {
|
||||
func openDifficultyPopup() {
|
||||
MWMPlacePageManagerHelper.openElevationDifficultPopup(placePageData)
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
enum PlacePageState {
|
||||
case closed(CGFloat)
|
||||
case preview(CGFloat)
|
||||
case previewPlus(CGFloat)
|
||||
case expanded(CGFloat)
|
||||
|
||||
var offset: CGFloat {
|
||||
switch self {
|
||||
case .closed(let value):
|
||||
return value
|
||||
case .preview(let value):
|
||||
return value
|
||||
case .previewPlus(let value):
|
||||
return value
|
||||
case .expanded(let value):
|
||||
return value
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protocol IPlacePageLayout: class {
|
||||
var presenter: PlacePagePresenterProtocol? { get set }
|
||||
var viewControllers: [UIViewController] { get }
|
||||
var actionBar: UIViewController? { get }
|
||||
var adState: AdBannerState { get set }
|
||||
|
||||
func calculateSteps(inScrollView scrollView: UIScrollView) -> [PlacePageState]
|
||||
}
|
||||
|
|
@ -0,0 +1,322 @@
|
|||
class PlacePageCommonLayout: NSObject, IPlacePageLayout {
|
||||
private var placePageData: PlacePageData
|
||||
private var interactor: PlacePageInteractor
|
||||
private let storyboard: UIStoryboard
|
||||
weak var presenter: PlacePagePresenterProtocol?
|
||||
|
||||
lazy var viewControllers: [UIViewController] = {
|
||||
return configureViewControllers()
|
||||
}()
|
||||
|
||||
var actionBar: UIViewController? {
|
||||
return actionBarViewController
|
||||
}
|
||||
|
||||
var adState: AdBannerState = .unset {
|
||||
didSet {
|
||||
previewViewController.adView.state = self.adState
|
||||
}
|
||||
}
|
||||
|
||||
lazy var previewViewController: PlacePagePreviewViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: PlacePagePreviewViewController.self)
|
||||
vc.placePagePreviewData = placePageData.previewData
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var catalogSingleItemViewController: CatalogSingleItemViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: CatalogSingleItemViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var catalogGalleryViewController: CatalogGalleryViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: CatalogGalleryViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var wikiDescriptionViewController: WikiDescriptionViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: WikiDescriptionViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var bookmarkViewController: PlacePageBookmarkViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: PlacePageBookmarkViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var infoViewController: PlacePageInfoViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: PlacePageInfoViewController.self)
|
||||
vc.placePageInfoData = placePageData.infoData
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var taxiViewController: TaxiViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: TaxiViewController.self)
|
||||
vc.taxiProvider = placePageData.taxiProvider
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var ratingSummaryViewController: RatingSummaryViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: RatingSummaryViewController.self)
|
||||
vc.view.isHidden = true
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var addReviewViewController: AddReviewViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: AddReviewViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var reviewsViewController: PlacePageReviewsViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: PlacePageReviewsViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var buttonsViewController: PlacePageButtonsViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: PlacePageButtonsViewController.self)
|
||||
vc.buttonsData = placePageData.buttonsData!
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var hotelPhotosViewController: HotelPhotosViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: HotelPhotosViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var hotelDescriptionViewController: HotelDescriptionViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: HotelDescriptionViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var hotelFacilitiesViewController: HotelFacilitiesViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: HotelFacilitiesViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var hotelReviewsViewController: HotelReviewsViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: HotelReviewsViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var actionBarViewController: ActionBarViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: ActionBarViewController.self)
|
||||
vc.placePageData = placePageData
|
||||
vc.canAddStop = MWMRouter.canAddIntermediatePoint()
|
||||
vc.isRoutePlanning = MWMNavigationDashboardManager.shared().state != .hidden
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
|
||||
init(interactor: PlacePageInteractor, storyboard: UIStoryboard, data: PlacePageData) {
|
||||
self.interactor = interactor
|
||||
self.storyboard = storyboard
|
||||
self.placePageData = data
|
||||
}
|
||||
|
||||
private func configureViewControllers() -> [UIViewController] {
|
||||
var viewControllers = [UIViewController]()
|
||||
viewControllers.append(previewViewController)
|
||||
if placePageData.isPromoCatalog {
|
||||
viewControllers.append(catalogSingleItemViewController)
|
||||
viewControllers.append(catalogGalleryViewController)
|
||||
placePageData.loadCatalogPromo(completion: onLoadCatalogPromo)
|
||||
}
|
||||
|
||||
viewControllers.append(wikiDescriptionViewController)
|
||||
if let wikiDescriptionHtml = placePageData.wikiDescriptionHtml {
|
||||
wikiDescriptionViewController.descriptionHtml = wikiDescriptionHtml
|
||||
if placePageData.bookmarkData?.bookmarkDescription == nil && !placePageData.isPromoCatalog {
|
||||
wikiDescriptionViewController.view.isHidden = false
|
||||
}
|
||||
}
|
||||
|
||||
viewControllers.append(bookmarkViewController)
|
||||
if let bookmarkData = placePageData.bookmarkData {
|
||||
bookmarkViewController.bookmarkData = bookmarkData
|
||||
bookmarkViewController.view.isHidden = false
|
||||
}
|
||||
|
||||
viewControllers.append(hotelPhotosViewController)
|
||||
viewControllers.append(hotelDescriptionViewController)
|
||||
viewControllers.append(hotelFacilitiesViewController)
|
||||
viewControllers.append(hotelReviewsViewController)
|
||||
|
||||
if placePageData.infoData != nil {
|
||||
viewControllers.append(infoViewController)
|
||||
}
|
||||
|
||||
if placePageData.taxiProvider != .none {
|
||||
viewControllers.append(taxiViewController)
|
||||
}
|
||||
|
||||
if placePageData.previewData.showUgc {
|
||||
viewControllers.append(ratingSummaryViewController)
|
||||
viewControllers.append(addReviewViewController)
|
||||
viewControllers.append(reviewsViewController)
|
||||
placePageData.loadUgc(completion: onLoadUgc)
|
||||
}
|
||||
|
||||
if placePageData.previewData.hasBanner,
|
||||
let banners = placePageData.previewData.banners {
|
||||
BannersCache.cache.get(coreBanners: banners, cacheOnly: false, loadNew: true, completion: onGetBanner)
|
||||
}
|
||||
|
||||
if placePageData.buttonsData != nil {
|
||||
viewControllers.append(buttonsViewController)
|
||||
}
|
||||
|
||||
placePageData.loadOnlineData(completion: onLoadOnlineData)
|
||||
|
||||
MWMLocationManager.add(observer: self)
|
||||
if let lastLocation = MWMLocationManager.lastLocation() {
|
||||
onLocationUpdate(lastLocation)
|
||||
}
|
||||
if let lastHeading = MWMLocationManager.lastHeading() {
|
||||
onHeadingUpdate(lastHeading)
|
||||
}
|
||||
|
||||
return viewControllers
|
||||
}
|
||||
|
||||
func calculateSteps(inScrollView scrollView: UIScrollView) -> [PlacePageState] {
|
||||
var steps: [PlacePageState] = []
|
||||
let scrollHeight = scrollView.height
|
||||
steps.append(.closed(-scrollHeight))
|
||||
guard let preview = previewViewController.view else {
|
||||
return steps
|
||||
}
|
||||
let previewFrame = scrollView.convert(preview.bounds, from: preview)
|
||||
steps.append(.preview(previewFrame.maxY - scrollHeight))
|
||||
if placePageData.isPreviewPlus {
|
||||
steps.append(.previewPlus(-scrollHeight * 0.55))
|
||||
}
|
||||
steps.append(.expanded(-scrollHeight * 0.3))
|
||||
return steps
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// MARK: - PlacePageData async callbacks for loaders
|
||||
|
||||
extension PlacePageCommonLayout {
|
||||
func onLoadOnlineData() {
|
||||
if let bookingData = self.placePageData.hotelBooking {
|
||||
previewViewController.updateBooking(bookingData, rooms: self.placePageData.hotelRooms)
|
||||
presenter?.layoutIfNeeded()
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration) {
|
||||
if !bookingData.photos.isEmpty {
|
||||
self.hotelPhotosViewController.photos = bookingData.photos
|
||||
self.hotelPhotosViewController.view.isHidden = false
|
||||
}
|
||||
self.hotelDescriptionViewController.hotelDescription = bookingData.hotelDescription
|
||||
self.hotelDescriptionViewController.view.isHidden = false
|
||||
if bookingData.facilities.count > 0 {
|
||||
self.hotelFacilitiesViewController.facilities = bookingData.facilities
|
||||
self.hotelFacilitiesViewController.view.isHidden = false
|
||||
}
|
||||
if bookingData.reviews.count > 0 {
|
||||
self.hotelReviewsViewController.reviewCount = bookingData.scoreCount
|
||||
self.hotelReviewsViewController.totalScore = bookingData.score
|
||||
self.hotelReviewsViewController.reviews = bookingData.reviews
|
||||
self.hotelReviewsViewController.view.isHidden = false
|
||||
}
|
||||
self.presenter?.layoutIfNeeded()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func onLoadUgc() {
|
||||
if let ugcData = self.placePageData.ugcData {
|
||||
previewViewController.updateUgc(ugcData)
|
||||
|
||||
if !ugcData.isTotalRatingEmpty {
|
||||
ratingSummaryViewController.ugcData = ugcData
|
||||
ratingSummaryViewController.view.isHidden = false
|
||||
}
|
||||
if ugcData.isUpdateEmpty {
|
||||
addReviewViewController.view.isHidden = false
|
||||
}
|
||||
if !ugcData.isEmpty {
|
||||
reviewsViewController.ugcData = ugcData
|
||||
reviewsViewController.view.isHidden = false
|
||||
}
|
||||
presenter?.updatePreviewOffset()
|
||||
}
|
||||
}
|
||||
|
||||
func onLoadCatalogPromo() {
|
||||
guard let catalogPromo = self.placePageData.catalogPromo else {
|
||||
if self.placePageData.wikiDescriptionHtml != nil {
|
||||
wikiDescriptionViewController.view.isHidden = false
|
||||
}
|
||||
return
|
||||
}
|
||||
if catalogPromo.promoItems.count == 1 {
|
||||
catalogSingleItemViewController.promoItem = catalogPromo.promoItems.first!
|
||||
catalogSingleItemViewController.view.isHidden = false
|
||||
} else {
|
||||
catalogGalleryViewController.promoData = catalogPromo
|
||||
catalogGalleryViewController.view.isHidden = false
|
||||
if self.placePageData.wikiDescriptionHtml != nil {
|
||||
wikiDescriptionViewController.view.isHidden = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func onGetBanner(banner: MWMBanner, loadNew: Bool) -> Void {
|
||||
previewViewController.updateBanner(banner)
|
||||
presenter?.updatePreviewOffset()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - MWMLocationObserver
|
||||
|
||||
extension PlacePageCommonLayout: MWMLocationObserver {
|
||||
func onHeadingUpdate(_ heading: CLHeading) {
|
||||
if heading.trueHeading < 0 {
|
||||
return
|
||||
}
|
||||
|
||||
let rad = heading.trueHeading * Double.pi / 180
|
||||
previewViewController.updateHeading(CGFloat(rad))
|
||||
}
|
||||
|
||||
func onLocationUpdate(_ location: CLLocation) {
|
||||
let ppLocation = CLLocation(latitude: placePageData.locationCoordinate.latitude,
|
||||
longitude: placePageData.locationCoordinate.longitude)
|
||||
let distance = location.distance(from: ppLocation)
|
||||
let distanceFormatter = MKDistanceFormatter()
|
||||
distanceFormatter.unitStyle = .abbreviated
|
||||
let formattedDistance = distanceFormatter.string(fromDistance: distance)
|
||||
previewViewController.updateDistance(formattedDistance)
|
||||
}
|
||||
|
||||
func onLocationError(_ locationError: MWMLocationStatus) {
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
class PlacePageElevationLayout: IPlacePageLayout {
|
||||
private var placePageData: PlacePageData
|
||||
private var interactor: PlacePageInteractor
|
||||
private let storyboard: UIStoryboard
|
||||
weak var presenter: PlacePagePresenterProtocol?
|
||||
|
||||
lazy var viewControllers: [UIViewController] = {
|
||||
return configureViewControllers()
|
||||
}()
|
||||
|
||||
var actionBar: UIViewController? = nil
|
||||
var adState: AdBannerState = .unset
|
||||
|
||||
lazy var previewViewController: PlacePagePreviewViewController = {
|
||||
let vc = storyboard.instantiateViewController(ofType: PlacePagePreviewViewController.self)
|
||||
vc.placePagePreviewData = placePageData.previewData
|
||||
vc.delegate = interactor
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var elevationMapViewController: ElevationProfileViewController = {
|
||||
let vc = ElevationProfileBuilder.build(data: placePageData, delegate: interactor)
|
||||
return vc
|
||||
} ()
|
||||
|
||||
init(interactor: PlacePageInteractor, storyboard: UIStoryboard, data: PlacePageData) {
|
||||
self.interactor = interactor
|
||||
self.storyboard = storyboard
|
||||
self.placePageData = data
|
||||
}
|
||||
|
||||
private func configureViewControllers() -> [UIViewController] {
|
||||
var viewControllers = [UIViewController]()
|
||||
viewControllers.append(previewViewController)
|
||||
viewControllers.append(elevationMapViewController)
|
||||
|
||||
return viewControllers
|
||||
}
|
||||
|
||||
func calculateSteps(inScrollView scrollView: UIScrollView) -> [PlacePageState] {
|
||||
var steps: [PlacePageState] = []
|
||||
let scrollHeight = scrollView.height
|
||||
let previewHeight = elevationMapViewController.getPreviewHeight()
|
||||
steps.append(.closed(-scrollHeight))
|
||||
guard let previewView = elevationMapViewController.view else {
|
||||
return steps
|
||||
}
|
||||
let previewFrame = scrollView.convert(previewView.bounds, from: previewView)
|
||||
steps.append(.preview(previewFrame.maxY - scrollHeight - previewHeight))
|
||||
steps.append(.expanded(previewFrame.maxY - scrollHeight))
|
||||
return steps
|
||||
}
|
||||
}
|
||||
|
|
@ -478,6 +478,11 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type)
|
|||
[[MapViewController sharedController] showRemoveAds];
|
||||
}
|
||||
|
||||
- (void)openElevationDifficultPopup:(PlacePageData *)data {
|
||||
auto difficultyPopup = [ElevationDetailsBuilder buildWithData:data];
|
||||
[[MapViewController sharedController] presentViewController:difficultyPopup animated:YES completion:nil];
|
||||
}
|
||||
|
||||
#pragma mark - AvailableArea / PlacePageArea
|
||||
|
||||
- (void)updateAvailableArea:(CGRect)frame
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
#import <CoreApi/UgcSummaryRatingType.h>
|
||||
|
||||
@class PlacePageData;
|
||||
@class ElevationProfileData;
|
||||
|
||||
@interface MWMPlacePageManagerHelper : NSObject
|
||||
|
||||
|
|
@ -38,5 +39,6 @@
|
|||
+ (void)avoidFerry;
|
||||
+ (void)avoidToll;
|
||||
+ (void)showRemoveAds;
|
||||
+ (void)openElevationDifficultPopup:(PlacePageData *)data;
|
||||
|
||||
@end
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
- (void)avoidFerry;
|
||||
- (void)avoidToll;
|
||||
- (void)showRemoveAds;
|
||||
- (void)openElevationDifficultPopup:(PlacePageData *)data;
|
||||
|
||||
@end
|
||||
|
||||
|
|
@ -172,4 +173,8 @@
|
|||
[[MWMMapViewControlsManager manager].placePageManager showRemoveAds];
|
||||
}
|
||||
|
||||
+ (void)openElevationDifficultPopup:(PlacePageData *)data {
|
||||
[[MWMMapViewControlsManager manager].placePageManager openElevationDifficultPopup:data];
|
||||
}
|
||||
|
||||
@end
|
||||
103
iphone/Maps/UI/PlacePage/PlacePagePresenter.swift
Normal file
103
iphone/Maps/UI/PlacePage/PlacePagePresenter.swift
Normal file
|
|
@ -0,0 +1,103 @@
|
|||
protocol PlacePagePresenterProtocol: class {
|
||||
var maxOffset: CGFloat { get }
|
||||
|
||||
func configure()
|
||||
func setAdState(_ state: AdBannerState)
|
||||
func updatePreviewOffset()
|
||||
func layoutIfNeeded()
|
||||
func findNextStop(_ offset: CGFloat, velocity: CGFloat) -> PlacePageState
|
||||
}
|
||||
|
||||
class PlacePagePresenter: NSObject {
|
||||
private weak var view: PlacePageViewProtocol!
|
||||
private let interactor: PlacePageInteractorProtocol
|
||||
private let isPreviewPlus: Bool
|
||||
private let layout: IPlacePageLayout
|
||||
private var scrollSteps:[PlacePageState] = []
|
||||
|
||||
|
||||
init(view: PlacePageViewProtocol,
|
||||
interactor: PlacePageInteractorProtocol,
|
||||
layout: IPlacePageLayout,
|
||||
isPreviewPlus: Bool) {
|
||||
self.view = view
|
||||
self.interactor = interactor
|
||||
self.layout = layout
|
||||
self.isPreviewPlus = isPreviewPlus
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - PlacePagePresenterProtocol
|
||||
|
||||
extension PlacePagePresenter: PlacePagePresenterProtocol {
|
||||
var maxOffset: CGFloat {
|
||||
get {
|
||||
return scrollSteps.last?.offset ?? 0
|
||||
}
|
||||
}
|
||||
|
||||
func configure() {
|
||||
for viewController in layout.viewControllers {
|
||||
view.addToStack(viewController)
|
||||
}
|
||||
|
||||
if let actionBar = layout.actionBar {
|
||||
view.hideActionBar(false)
|
||||
view.addActionBar(actionBar)
|
||||
} else {
|
||||
view.hideActionBar(true)
|
||||
}
|
||||
}
|
||||
|
||||
func setAdState(_ state: AdBannerState) {
|
||||
layout.adState = state
|
||||
}
|
||||
|
||||
func updatePreviewOffset() {
|
||||
layoutIfNeeded()
|
||||
scrollSteps = layout.calculateSteps(inScrollView: view.scrollView)
|
||||
let state = isPreviewPlus ? scrollSteps[2] : scrollSteps[1]
|
||||
view.scrollTo(CGPoint(x: 0, y: state.offset))
|
||||
}
|
||||
|
||||
func layoutIfNeeded() {
|
||||
view.layoutIfNeeded()
|
||||
}
|
||||
|
||||
private func findNearestStop(_ offset: CGFloat) -> PlacePageState{
|
||||
var result = scrollSteps[0]
|
||||
scrollSteps.suffix(from: 1).forEach { ppState in
|
||||
if abs(result.offset - offset) > abs(ppState.offset - offset) {
|
||||
result = ppState
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func findNextStop(_ offset: CGFloat, velocity: CGFloat) -> PlacePageState {
|
||||
if velocity == 0 {
|
||||
return findNearestStop(offset)
|
||||
}
|
||||
|
||||
var result: PlacePageState
|
||||
if velocity < 0 {
|
||||
guard let first = scrollSteps.first else { return .closed(-view.scrollView.height) }
|
||||
result = first
|
||||
scrollSteps.suffix(from: 1).forEach {
|
||||
if offset > $0.offset {
|
||||
result = $0
|
||||
}
|
||||
}
|
||||
} else {
|
||||
guard let last = scrollSteps.last else { return .closed(-view.scrollView.height) }
|
||||
result = last
|
||||
scrollSteps.reversed().suffix(from: 1).forEach {
|
||||
if offset < $0.offset {
|
||||
result = $0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +1,14 @@
|
|||
protocol PlacePageViewProtocol: class {
|
||||
var presenter: PlacePagePresenterProtocol! { get set }
|
||||
var scrollView: UIScrollView! { get set }
|
||||
|
||||
func addToStack(_ viewController: UIViewController)
|
||||
func addActionBar(_ actionBarViewController: UIViewController)
|
||||
func hideActionBar(_ value: Bool)
|
||||
func scrollTo(_ point: CGPoint)
|
||||
func layoutIfNeeded()
|
||||
}
|
||||
|
||||
final class PlacePageScrollView: UIScrollView {
|
||||
override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
|
||||
return point.y > 0
|
||||
|
|
@ -15,294 +26,31 @@ final class TouchTransparentView: UIView {
|
|||
}
|
||||
}
|
||||
|
||||
enum PlacePageState {
|
||||
case closed(CGFloat)
|
||||
case preview(CGFloat)
|
||||
case previewPlus(CGFloat)
|
||||
case expanded(CGFloat)
|
||||
|
||||
var offset: CGFloat {
|
||||
switch self {
|
||||
case .closed(let value):
|
||||
return value
|
||||
case .preview(let value):
|
||||
return value
|
||||
case .previewPlus(let value):
|
||||
return value
|
||||
case .expanded(let value):
|
||||
return value
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@objc final class PlacePageViewController: UIViewController {
|
||||
@IBOutlet var scrollView: UIScrollView!
|
||||
@IBOutlet var stackView: UIStackView!
|
||||
@IBOutlet var actionBarContainerView: UIView!
|
||||
|
||||
@objc var placePageData: PlacePageData!
|
||||
@IBOutlet var actionBarHeightConstraint: NSLayoutConstraint!
|
||||
|
||||
var presenter: PlacePagePresenterProtocol!
|
||||
|
||||
var beginDragging = false
|
||||
var scrollSteps: [PlacePageState] = []
|
||||
var rootViewController: MapViewController {
|
||||
MapViewController.shared()
|
||||
}
|
||||
|
||||
// MARK: - UI Components
|
||||
|
||||
lazy var previewViewController: PlacePagePreviewViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: PlacePagePreviewViewController.self)
|
||||
vc.placePagePreviewData = placePageData.previewData
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var catalogSingleItemViewController: CatalogSingleItemViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: CatalogSingleItemViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var catalogGalleryViewController: CatalogGalleryViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: CatalogGalleryViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var wikiDescriptionViewController: WikiDescriptionViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: WikiDescriptionViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var bookmarkViewController: PlacePageBookmarkViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: PlacePageBookmarkViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var infoViewController: PlacePageInfoViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: PlacePageInfoViewController.self)
|
||||
vc.placePageInfoData = placePageData.infoData
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var taxiViewController: TaxiViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: TaxiViewController.self)
|
||||
vc.taxiProvider = placePageData.taxiProvider
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var ratingSummaryViewController: RatingSummaryViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: RatingSummaryViewController.self)
|
||||
vc.view.isHidden = true
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var addReviewViewController: AddReviewViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: AddReviewViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var reviewsViewController: PlacePageReviewsViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: PlacePageReviewsViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var buttonsViewController: PlacePageButtonsViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: PlacePageButtonsViewController.self)
|
||||
vc.buttonsData = placePageData.buttonsData!
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var hotelPhotosViewController: HotelPhotosViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: HotelPhotosViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var hotelDescriptionViewController: HotelDescriptionViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: HotelDescriptionViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var hotelFacilitiesViewController: HotelFacilitiesViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: HotelFacilitiesViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var hotelReviewsViewController: HotelReviewsViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: HotelReviewsViewController.self)
|
||||
vc.view.isHidden = true
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
|
||||
lazy var actionBarViewController: ActionBarViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: ActionBarViewController.self)
|
||||
vc.placePageData = placePageData
|
||||
vc.canAddStop = MWMRouter.canAddIntermediatePoint()
|
||||
vc.isRoutePlanning = MWMNavigationDashboardManager.shared().state != .hidden
|
||||
vc.delegate = self
|
||||
return vc
|
||||
} ()
|
||||
let kActionBarHeight:CGFloat = 50
|
||||
|
||||
// MARK: - VC Lifecycle
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
presenter?.configure()
|
||||
|
||||
if let touchTransparentView = view as? TouchTransparentView {
|
||||
touchTransparentView.targetView = scrollView
|
||||
}
|
||||
|
||||
addToStack(previewViewController)
|
||||
|
||||
if placePageData.isPromoCatalog {
|
||||
addToStack(catalogSingleItemViewController)
|
||||
addToStack(catalogGalleryViewController)
|
||||
placePageData.loadCatalogPromo { [weak self] in
|
||||
guard let self = self else { return }
|
||||
guard let catalogPromo = self.placePageData.catalogPromo else {
|
||||
if self.placePageData.wikiDescriptionHtml != nil {
|
||||
self.wikiDescriptionViewController.view.isHidden = false
|
||||
}
|
||||
return
|
||||
}
|
||||
if catalogPromo.promoItems.count == 1 {
|
||||
self.catalogSingleItemViewController.promoItem = catalogPromo.promoItems.first!
|
||||
self.catalogSingleItemViewController.view.isHidden = false
|
||||
} else {
|
||||
self.catalogGalleryViewController.promoData = catalogPromo
|
||||
self.catalogGalleryViewController.view.isHidden = false
|
||||
if self.placePageData.wikiDescriptionHtml != nil {
|
||||
self.wikiDescriptionViewController.view.isHidden = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
addToStack(wikiDescriptionViewController)
|
||||
if let wikiDescriptionHtml = placePageData.wikiDescriptionHtml {
|
||||
wikiDescriptionViewController.descriptionHtml = wikiDescriptionHtml
|
||||
if placePageData.bookmarkData?.bookmarkDescription == nil && !placePageData.isPromoCatalog {
|
||||
wikiDescriptionViewController.view.isHidden = false
|
||||
}
|
||||
}
|
||||
|
||||
addToStack(bookmarkViewController)
|
||||
if let bookmarkData = placePageData.bookmarkData {
|
||||
bookmarkViewController.bookmarkData = bookmarkData
|
||||
bookmarkViewController.view.isHidden = false
|
||||
}
|
||||
|
||||
addToStack(hotelPhotosViewController)
|
||||
addToStack(hotelDescriptionViewController)
|
||||
addToStack(hotelFacilitiesViewController)
|
||||
addToStack(hotelReviewsViewController)
|
||||
|
||||
addToStack(infoViewController)
|
||||
|
||||
if placePageData.taxiProvider != .none {
|
||||
addToStack(taxiViewController)
|
||||
}
|
||||
|
||||
if placePageData.previewData.showUgc {
|
||||
addToStack(ratingSummaryViewController)
|
||||
addToStack(addReviewViewController)
|
||||
addToStack(reviewsViewController)
|
||||
placePageData.loadUgc { [weak self] in
|
||||
if let self = self, let ugcData = self.placePageData.ugcData {
|
||||
self.previewViewController.updateUgc(ugcData)
|
||||
|
||||
if !ugcData.isTotalRatingEmpty {
|
||||
self.ratingSummaryViewController.ugcData = ugcData
|
||||
self.ratingSummaryViewController.view.isHidden = false
|
||||
}
|
||||
if ugcData.isUpdateEmpty {
|
||||
self.addReviewViewController.view.isHidden = false
|
||||
}
|
||||
if !ugcData.isEmpty {
|
||||
self.reviewsViewController.ugcData = ugcData
|
||||
self.reviewsViewController.view.isHidden = false
|
||||
}
|
||||
self.updatePreviewOffset()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if placePageData.previewData.hasBanner,
|
||||
let banners = placePageData.previewData.banners {
|
||||
BannersCache.cache.get(coreBanners: banners,
|
||||
cacheOnly: false,
|
||||
loadNew: true) { [weak self] (banner, _) in
|
||||
self?.previewViewController.updateBanner(banner)
|
||||
self?.updatePreviewOffset()
|
||||
}
|
||||
}
|
||||
|
||||
if placePageData.buttonsData != nil {
|
||||
addToStack(buttonsViewController)
|
||||
}
|
||||
|
||||
placePageData.loadOnlineData { [weak self] in
|
||||
if let self = self, let bookingData = self.placePageData.hotelBooking {
|
||||
self.previewViewController.updateBooking(bookingData, rooms: self.placePageData.hotelRooms)
|
||||
self.stackView.layoutIfNeeded()
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration) {
|
||||
if !bookingData.photos.isEmpty {
|
||||
self.hotelPhotosViewController.photos = bookingData.photos
|
||||
self.hotelPhotosViewController.view.isHidden = false
|
||||
}
|
||||
self.hotelDescriptionViewController.hotelDescription = bookingData.hotelDescription
|
||||
self.hotelDescriptionViewController.view.isHidden = false
|
||||
if bookingData.facilities.count > 0 {
|
||||
self.hotelFacilitiesViewController.facilities = bookingData.facilities
|
||||
self.hotelFacilitiesViewController.view.isHidden = false
|
||||
}
|
||||
if bookingData.reviews.count > 0 {
|
||||
self.hotelReviewsViewController.reviewCount = bookingData.scoreCount
|
||||
self.hotelReviewsViewController.totalScore = bookingData.score
|
||||
self.hotelReviewsViewController.reviews = bookingData.reviews
|
||||
self.hotelReviewsViewController.view.isHidden = false
|
||||
}
|
||||
self.stackView.layoutIfNeeded()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
actionBarViewController.view.translatesAutoresizingMaskIntoConstraints = false
|
||||
actionBarContainerView.addSubview(actionBarViewController.view)
|
||||
NSLayoutConstraint.activate([
|
||||
actionBarViewController.view.leadingAnchor.constraint(equalTo: actionBarContainerView.leadingAnchor),
|
||||
actionBarViewController.view.topAnchor.constraint(equalTo: actionBarContainerView.topAnchor),
|
||||
actionBarViewController.view.trailingAnchor.constraint(equalTo: actionBarContainerView.trailingAnchor),
|
||||
actionBarViewController.view.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor)
|
||||
])
|
||||
|
||||
MWMLocationManager.add(observer: self)
|
||||
if let lastLocation = MWMLocationManager.lastLocation() {
|
||||
onLocationUpdate(lastLocation)
|
||||
}
|
||||
if let lastHeading = MWMLocationManager.lastHeading() {
|
||||
onHeadingUpdate(lastHeading)
|
||||
}
|
||||
|
||||
let bgView = UIView()
|
||||
bgView.styleName = "Background"
|
||||
stackView.insertSubview(bgView, at: 0)
|
||||
|
|
@ -320,256 +68,41 @@ enum PlacePageState {
|
|||
override func viewDidAppear(_ animated: Bool) {
|
||||
super.viewDidAppear(animated)
|
||||
if !beginDragging {
|
||||
updatePreviewOffset()
|
||||
presenter?.updatePreviewOffset()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Private
|
||||
|
||||
private func calculateSteps() -> [PlacePageState] {
|
||||
var steps: [PlacePageState] = []
|
||||
steps.append(.closed(-self.scrollView.height))
|
||||
let previewFrame = scrollView.convert(previewViewController.view.bounds, from: previewViewController.view)
|
||||
steps.append(.preview(previewFrame.maxY - self.scrollView.height))
|
||||
if placePageData.isPreviewPlus {
|
||||
steps.append(.previewPlus(-self.scrollView.height * 0.55))
|
||||
}
|
||||
steps.append(.expanded(-self.scrollView.height * 0.3))
|
||||
return steps
|
||||
extension PlacePageViewController: PlacePageViewProtocol {
|
||||
func hideActionBar(_ value: Bool) {
|
||||
actionBarHeightConstraint.constant = !value ? kActionBarHeight : 0
|
||||
}
|
||||
|
||||
private func updatePreviewOffset() {
|
||||
self.view.layoutIfNeeded()
|
||||
scrollSteps = calculateSteps()
|
||||
if traitCollection.horizontalSizeClass != .compact || beginDragging {
|
||||
return
|
||||
}
|
||||
let state = placePageData.isPreviewPlus ? scrollSteps[2] : scrollSteps[1]
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration) {
|
||||
self.scrollView.contentOffset = CGPoint(x: 0, y: state.offset)
|
||||
}
|
||||
}
|
||||
|
||||
private func addToStack(_ viewController: UIViewController) {
|
||||
func addToStack(_ viewController: UIViewController) {
|
||||
addChild(viewController)
|
||||
stackView.addArrangedSubview(viewController.view)
|
||||
viewController.didMove(toParent: self)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - PlacePagePreviewViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: PlacePagePreviewViewControllerDelegate {
|
||||
func previewDidPressRemoveAds() {
|
||||
MWMPlacePageManagerHelper.showRemoveAds()
|
||||
func addActionBar(_ actionBarViewController: UIViewController) {
|
||||
actionBarViewController.view.translatesAutoresizingMaskIntoConstraints = false
|
||||
actionBarContainerView.addSubview(actionBarViewController.view)
|
||||
NSLayoutConstraint.activate([
|
||||
actionBarViewController.view.leadingAnchor.constraint(equalTo: actionBarContainerView.leadingAnchor),
|
||||
actionBarViewController.view.topAnchor.constraint(equalTo: actionBarContainerView.topAnchor),
|
||||
actionBarViewController.view.trailingAnchor.constraint(equalTo: actionBarContainerView.trailingAnchor),
|
||||
actionBarViewController.view.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor)
|
||||
])
|
||||
}
|
||||
|
||||
func previewDidPressAddReview() {
|
||||
MWMPlacePageManagerHelper.showUGCAddReview(placePageData, rating: .none, from: .placePagePreview)
|
||||
}
|
||||
|
||||
func previewDidPressSimilarHotels() {
|
||||
MWMPlacePageManagerHelper.searchSimilar(placePageData)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - PlacePageInfoViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: PlacePageInfoViewControllerDelegate {
|
||||
func didPressCall() {
|
||||
MWMPlacePageManagerHelper.call(placePageData)
|
||||
}
|
||||
|
||||
func didPressWebsite() {
|
||||
MWMPlacePageManagerHelper.openWebsite(placePageData)
|
||||
}
|
||||
|
||||
func didPressEmail() {
|
||||
|
||||
}
|
||||
|
||||
func didPressLocalAd() {
|
||||
MWMPlacePageManagerHelper.openLocalAdsURL(placePageData)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - WikiDescriptionViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: WikiDescriptionViewControllerDelegate {
|
||||
func didPressMore() {
|
||||
MWMPlacePageManagerHelper.showPlaceDescription(placePageData.wikiDescriptionHtml)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - TaxiViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: TaxiViewControllerDelegate {
|
||||
func didPressOrder() {
|
||||
MWMPlacePageManagerHelper.orderTaxi(placePageData)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - AddReviewViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: AddReviewViewControllerDelegate {
|
||||
func didRate(_ rating: UgcSummaryRatingType) {
|
||||
MWMPlacePageManagerHelper.showUGCAddReview(placePageData, rating: rating, from: .placePage)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - PlacePageReviewsViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: PlacePageReviewsViewControllerDelegate {
|
||||
func didPressMoreReviews() {
|
||||
let moreReviews = storyboard!.instantiateViewController(ofType: MoreReviewsViewController.self)
|
||||
moreReviews.ugcData = placePageData.ugcData
|
||||
moreReviews.title = placePageData.previewData.title
|
||||
MapViewController.shared()?.navigationController?.pushViewController(moreReviews, animated: true)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - PlacePageButtonsViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: PlacePageButtonsViewControllerDelegate {
|
||||
func didPressHotels() {
|
||||
MWMPlacePageManagerHelper.openDescriptionUrl(placePageData)
|
||||
}
|
||||
|
||||
func didPressAddPlace() {
|
||||
MWMPlacePageManagerHelper.addPlace(placePageData.locationCoordinate)
|
||||
}
|
||||
|
||||
func didPressEditPlace() {
|
||||
MWMPlacePageManagerHelper.editPlace()
|
||||
}
|
||||
|
||||
func didPressAddBusiness() {
|
||||
MWMPlacePageManagerHelper.addBusiness()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - HotelPhotosViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: HotelPhotosViewControllerDelegate {
|
||||
func didSelectItemAt(_ index: Int, lastItemIndex: Int) {
|
||||
guard let photos = placePageData.hotelBooking?.photos else { return }
|
||||
if index == lastItemIndex {
|
||||
let galleryController = GalleryViewController.instance(photos: photos)
|
||||
galleryController.title = placePageData.previewData.title
|
||||
MapViewController.shared()?.navigationController?.pushViewController(galleryController, animated: true)
|
||||
} else {
|
||||
let currentPhoto = photos[index]
|
||||
let view = hotelPhotosViewController.viewForPhoto(currentPhoto)
|
||||
let photoVC = PhotosViewController(photos: photos, initialPhoto: currentPhoto, referenceView: view)
|
||||
|
||||
photoVC.referenceViewForPhotoWhenDismissingHandler = { [weak self] in
|
||||
self?.hotelPhotosViewController.viewForPhoto($0)
|
||||
}
|
||||
present(photoVC, animated: true)
|
||||
func scrollTo(_ point: CGPoint) {
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration) { [weak scrollView] in
|
||||
scrollView?.contentOffset = point
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - HotelDescriptionViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: HotelDescriptionViewControllerDelegate {
|
||||
func hotelDescriptionDidPressMore() {
|
||||
MWMPlacePageManagerHelper.openMoreUrl(placePageData)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - HotelFacilitiesViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: HotelFacilitiesViewControllerDelegate {
|
||||
func facilitiesDidPressMore() {
|
||||
MWMPlacePageManagerHelper.showAllFacilities(placePageData)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - HotelReviewsViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: HotelReviewsViewControllerDelegate {
|
||||
func hotelReviewsDidPressMore() {
|
||||
MWMPlacePageManagerHelper.openReviewUrl(placePageData)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - CatalogSingleItemViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: CatalogSingleItemViewControllerDelegate {
|
||||
func catalogPromoItemDidPressView() {
|
||||
MWMPlacePageManagerHelper.openCatalogSingleItem(placePageData, at: 0)
|
||||
}
|
||||
|
||||
func catalogPromoItemDidPressMore() {
|
||||
MWMPlacePageManagerHelper.openCatalogSingleItem(placePageData, at: 0)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - CatalogGalleryViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: CatalogGalleryViewControllerDelegate {
|
||||
func promoGalleryDidPressMore() {
|
||||
MWMPlacePageManagerHelper.openCatalogMoreItems(placePageData)
|
||||
}
|
||||
|
||||
func promoGalleryDidSelectItemAtIndex(_ index: Int) {
|
||||
MWMPlacePageManagerHelper.openCatalogSingleItem(placePageData, at: index)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - PlacePageBookmarkViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: PlacePageBookmarkViewControllerDelegate {
|
||||
func bookmarkDidPressEdit() {
|
||||
MWMPlacePageManagerHelper.editBookmark()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - ActionBarViewControllerDelegate
|
||||
|
||||
extension PlacePageViewController: ActionBarViewControllerDelegate {
|
||||
func actionBarDidPressButton(_ type: ActionBarButtonType) {
|
||||
switch type {
|
||||
case .booking:
|
||||
MWMPlacePageManagerHelper.book(placePageData)
|
||||
case .bookingSearch:
|
||||
MWMPlacePageManagerHelper.searchSimilar(placePageData)
|
||||
case .bookmark:
|
||||
if placePageData.bookmarkData != nil {
|
||||
MWMPlacePageManagerHelper.removeBookmark(placePageData)
|
||||
} else {
|
||||
MWMPlacePageManagerHelper.addBookmark(placePageData)
|
||||
}
|
||||
case .call:
|
||||
MWMPlacePageManagerHelper.call(placePageData)
|
||||
case .download:
|
||||
fatalError()
|
||||
case .opentable:
|
||||
fatalError("Opentable is not supported and will be deleted")
|
||||
case .partner:
|
||||
MWMPlacePageManagerHelper.openPartner(placePageData)
|
||||
case .routeAddStop:
|
||||
MWMPlacePageManagerHelper.routeAddStop(placePageData)
|
||||
case .routeFrom:
|
||||
MWMPlacePageManagerHelper.route(from: placePageData)
|
||||
case .routeRemoveStop:
|
||||
MWMPlacePageManagerHelper.routeRemoveStop(placePageData)
|
||||
case .routeTo:
|
||||
MWMPlacePageManagerHelper.route(to: placePageData)
|
||||
case .share:
|
||||
MWMPlacePageManagerHelper.share(placePageData)
|
||||
case .avoidToll:
|
||||
MWMPlacePageManagerHelper.avoidToll()
|
||||
case .avoidDirty:
|
||||
MWMPlacePageManagerHelper.avoidDirty()
|
||||
case .avoidFerry:
|
||||
MWMPlacePageManagerHelper.avoidFerry()
|
||||
case .more:
|
||||
fatalError("More button should've been handled in ActionBarViewContoller")
|
||||
@unknown default:
|
||||
fatalError()
|
||||
}
|
||||
func layoutIfNeeded() {
|
||||
view.layoutIfNeeded()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -589,91 +122,27 @@ extension PlacePageViewController: UIScrollViewDelegate {
|
|||
func scrollViewWillEndDragging(_ scrollView: UIScrollView,
|
||||
withVelocity velocity: CGPoint,
|
||||
targetContentOffset: UnsafeMutablePointer<CGPoint>) {
|
||||
guard let maxOffset = scrollSteps.last else { return }
|
||||
if targetContentOffset.pointee.y > maxOffset.offset {
|
||||
previewViewController.adView.state = .detailed
|
||||
let maxOffset = presenter.maxOffset
|
||||
if targetContentOffset.pointee.y > maxOffset {
|
||||
presenter?.setAdState(.detailed)
|
||||
return
|
||||
}
|
||||
|
||||
let targetState = findNextStop(scrollView.contentOffset.y, velocity: velocity.y)
|
||||
let targetState = presenter.findNextStop(scrollView.contentOffset.y, velocity: velocity.y)
|
||||
if targetState.offset > scrollView.contentSize.height - scrollView.contentInset.top {
|
||||
previewViewController.adView.state = .detailed
|
||||
presenter?.setAdState(.detailed)
|
||||
return
|
||||
}
|
||||
switch targetState {
|
||||
case .closed(_):
|
||||
fallthrough
|
||||
case .preview(_):
|
||||
previewViewController.adView.state = .compact
|
||||
presenter?.setAdState(.compact)
|
||||
case .previewPlus(_):
|
||||
fallthrough
|
||||
case .expanded(_):
|
||||
previewViewController.adView.state = .detailed
|
||||
presenter?.setAdState(.detailed)
|
||||
}
|
||||
targetContentOffset.pointee = CGPoint(x: 0, y: targetState.offset)
|
||||
}
|
||||
|
||||
private func findNearestStop(_ offset: CGFloat) -> PlacePageState{
|
||||
var result = scrollSteps[0]
|
||||
scrollSteps.suffix(from: 1).forEach { ppState in
|
||||
if abs(result.offset - offset) > abs(ppState.offset - offset) {
|
||||
result = ppState
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
private func findNextStop(_ offset: CGFloat, velocity: CGFloat) -> PlacePageState {
|
||||
if velocity == 0 {
|
||||
return findNearestStop(offset)
|
||||
}
|
||||
|
||||
var result: PlacePageState
|
||||
if velocity < 0 {
|
||||
guard let first = scrollSteps.first else { return .closed(-scrollView.height) }
|
||||
result = first
|
||||
scrollSteps.suffix(from: 1).forEach {
|
||||
if offset > $0.offset {
|
||||
result = $0
|
||||
}
|
||||
}
|
||||
} else {
|
||||
guard let last = scrollSteps.last else { return .closed(-scrollView.height) }
|
||||
result = last
|
||||
scrollSteps.reversed().suffix(from: 1).forEach {
|
||||
if offset < $0.offset {
|
||||
result = $0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - MWMLocationObserver
|
||||
|
||||
extension PlacePageViewController: MWMLocationObserver {
|
||||
func onHeadingUpdate(_ heading: CLHeading) {
|
||||
if heading.trueHeading < 0 {
|
||||
return
|
||||
}
|
||||
|
||||
let rad = heading.trueHeading * Double.pi / 180
|
||||
previewViewController.updateHeading(CGFloat(rad))
|
||||
}
|
||||
|
||||
func onLocationUpdate(_ location: CLLocation) {
|
||||
let ppLocation = CLLocation(latitude: placePageData.locationCoordinate.latitude,
|
||||
longitude: placePageData.locationCoordinate.longitude)
|
||||
let distance = location.distance(from: ppLocation)
|
||||
let distanceFormatter = MKDistanceFormatter()
|
||||
distanceFormatter.unitStyle = .abbreviated
|
||||
let formattedDistance = distanceFormatter.string(fromDistance: distance)
|
||||
previewViewController.updateDistance(formattedDistance)
|
||||
}
|
||||
|
||||
func onLocationError(_ locationError: MWMLocationStatus) {
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
65
iphone/Maps/UI/PlacePage/Views/DifficultyView.swift
Normal file
65
iphone/Maps/UI/PlacePage/Views/DifficultyView.swift
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
class DifficultyView: UIView {
|
||||
private let stackView = UIStackView()
|
||||
private var views:[UIView] = []
|
||||
var difficulty: ElevationDifficulty = .easy {
|
||||
didSet {
|
||||
updateView()
|
||||
}
|
||||
}
|
||||
var colors: [UIColor] = [.green, .orange, .red]
|
||||
{
|
||||
didSet {
|
||||
updateView()
|
||||
}
|
||||
}
|
||||
var emptyColor: UIColor = UIColor.gray {
|
||||
didSet {
|
||||
updateView()
|
||||
}
|
||||
}
|
||||
|
||||
private let bulletSize = CGSize(width: 10, height: 10)
|
||||
private let bulletSpacing: CGFloat = 5
|
||||
private let difficultyLevelCount = 3
|
||||
|
||||
override init(frame: CGRect) {
|
||||
super.init(frame: frame)
|
||||
initComponent()
|
||||
}
|
||||
|
||||
required init?(coder: NSCoder) {
|
||||
super.init(coder: coder)
|
||||
initComponent()
|
||||
}
|
||||
|
||||
private func initComponent() {
|
||||
self.addSubview(stackView)
|
||||
stackView.frame = bounds
|
||||
stackView.distribution = .fillEqually
|
||||
stackView.axis = .horizontal
|
||||
stackView.spacing = bulletSpacing
|
||||
stackView.alignment = .fill
|
||||
|
||||
for _ in 0..<difficultyLevelCount {
|
||||
let view = UIView()
|
||||
stackView.addArrangedSubview(view)
|
||||
view.layer.cornerRadius = bulletSize.height / 2
|
||||
views.append(view)
|
||||
}
|
||||
}
|
||||
|
||||
private func updateView() {
|
||||
guard colors.count > difficulty.rawValue else {
|
||||
assertionFailure("No fill color")
|
||||
return
|
||||
}
|
||||
let fillColor = colors[difficulty.rawValue]
|
||||
for (idx, view) in views.enumerated() {
|
||||
if idx <= difficulty.rawValue {
|
||||
view.backgroundColor = fillColor
|
||||
} else {
|
||||
view.backgroundColor = emptyColor
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue