forked from organicmaps/organicmaps
[iOS] CodeStyle
This commit is contained in:
Alexander Boriskov
Aleksey Belousov
parent
3e5246a68b
commit
98b14e9318
5 changed files with 535 additions and 681 deletions
|
|
@ -1,8 +1,7 @@
|
|||
#import "MWMNavigationDashboardManager.h"
|
||||
#import "MWMRouterType.h"
|
||||
|
||||
namespace routing
|
||||
{
|
||||
namespace routing {
|
||||
class FollowingInfo;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,48 +14,44 @@
|
|||
|
||||
#include "geometry/distance_on_sphere.hpp"
|
||||
|
||||
namespace
|
||||
{
|
||||
UIImage * image(routing::turns::CarDirection t, bool isNextTurn)
|
||||
{
|
||||
namespace {
|
||||
UIImage *image(routing::turns::CarDirection t, bool isNextTurn) {
|
||||
if (![MWMLocationManager lastLocation])
|
||||
return nil;
|
||||
|
||||
|
||||
using namespace routing::turns;
|
||||
NSString * imageName;
|
||||
switch (t)
|
||||
{
|
||||
case CarDirection::ExitHighwayToRight: imageName = @"ic_exit_highway_to_right"; break;
|
||||
case CarDirection::TurnSlightRight: imageName = @"slight_right"; break;
|
||||
case CarDirection::TurnRight: imageName = @"simple_right"; break;
|
||||
case CarDirection::TurnSharpRight: imageName = @"sharp_right"; break;
|
||||
case CarDirection::ExitHighwayToLeft: imageName = @"ic_exit_highway_to_left"; break;
|
||||
case CarDirection::TurnSlightLeft: imageName = @"slight_left"; break;
|
||||
case CarDirection::TurnLeft: imageName = @"simple_left"; break;
|
||||
case CarDirection::TurnSharpLeft: imageName = @"sharp_left"; break;
|
||||
case CarDirection::UTurnLeft: imageName = @"uturn_left"; break;
|
||||
case CarDirection::UTurnRight: imageName = @"uturn_right"; break;
|
||||
case CarDirection::ReachedYourDestination: imageName = @"finish_point"; break;
|
||||
case CarDirection::LeaveRoundAbout:
|
||||
case CarDirection::EnterRoundAbout: imageName = @"round"; break;
|
||||
case CarDirection::GoStraight: imageName = @"straight"; break;
|
||||
case CarDirection::StartAtEndOfStreet:
|
||||
case CarDirection::StayOnRoundAbout:
|
||||
case CarDirection::Count:
|
||||
case CarDirection::None: imageName = isNextTurn ? nil : @"straight"; break;
|
||||
NSString *imageName;
|
||||
switch (t) {
|
||||
case CarDirection::ExitHighwayToRight: imageName = @"ic_exit_highway_to_right"; break;
|
||||
case CarDirection::TurnSlightRight: imageName = @"slight_right"; break;
|
||||
case CarDirection::TurnRight: imageName = @"simple_right"; break;
|
||||
case CarDirection::TurnSharpRight: imageName = @"sharp_right"; break;
|
||||
case CarDirection::ExitHighwayToLeft: imageName = @"ic_exit_highway_to_left"; break;
|
||||
case CarDirection::TurnSlightLeft: imageName = @"slight_left"; break;
|
||||
case CarDirection::TurnLeft: imageName = @"simple_left"; break;
|
||||
case CarDirection::TurnSharpLeft: imageName = @"sharp_left"; break;
|
||||
case CarDirection::UTurnLeft: imageName = @"uturn_left"; break;
|
||||
case CarDirection::UTurnRight: imageName = @"uturn_right"; break;
|
||||
case CarDirection::ReachedYourDestination: imageName = @"finish_point"; break;
|
||||
case CarDirection::LeaveRoundAbout:
|
||||
case CarDirection::EnterRoundAbout: imageName = @"round"; break;
|
||||
case CarDirection::GoStraight: imageName = @"straight"; break;
|
||||
case CarDirection::StartAtEndOfStreet:
|
||||
case CarDirection::StayOnRoundAbout:
|
||||
case CarDirection::Count:
|
||||
case CarDirection::None: imageName = isNextTurn ? nil : @"straight"; break;
|
||||
}
|
||||
if (!imageName)
|
||||
return nil;
|
||||
return [UIImage imageNamed:isNextTurn ? [imageName stringByAppendingString:@"_then"] : imageName];
|
||||
}
|
||||
|
||||
UIImage * image(routing::turns::PedestrianDirection t)
|
||||
{
|
||||
UIImage *image(routing::turns::PedestrianDirection t) {
|
||||
if (![MWMLocationManager lastLocation])
|
||||
return nil;
|
||||
|
||||
|
||||
using namespace routing::turns;
|
||||
NSString * imageName;
|
||||
NSString *imageName;
|
||||
switch (t)
|
||||
{
|
||||
case PedestrianDirection::TurnRight: imageName = @"simple_right"; break;
|
||||
|
|
@ -70,17 +66,14 @@ UIImage * image(routing::turns::PedestrianDirection t)
|
|||
return [UIImage imageNamed:imageName];
|
||||
}
|
||||
|
||||
NSAttributedString * estimate(NSTimeInterval time, NSAttributedString * dot, NSString * distance,
|
||||
NSString * distanceUnits, NSDictionary * primaryAttributes,
|
||||
NSDictionary * secondaryAttributes, BOOL isWalk)
|
||||
{
|
||||
NSString * eta = [NSDateComponentsFormatter etaStringFrom:time];
|
||||
NSAttributedString *estimate(NSTimeInterval time, NSAttributedString *dot, NSString *distance, NSString *distanceUnits,
|
||||
NSDictionary *primaryAttributes, NSDictionary *secondaryAttributes, BOOL isWalk) {
|
||||
NSString *eta = [NSDateComponentsFormatter etaStringFrom:time];
|
||||
auto result = [[NSMutableAttributedString alloc] initWithString:eta attributes:primaryAttributes];
|
||||
[result appendAttributedString:dot];
|
||||
|
||||
if (isWalk)
|
||||
{
|
||||
UIFont * font = primaryAttributes[NSFontAttributeName];
|
||||
if (isWalk) {
|
||||
UIFont *font = primaryAttributes[NSFontAttributeName];
|
||||
auto textAttachment = [[NSTextAttachment alloc] init];
|
||||
auto image = [UIImage imageNamed:@"ic_walk"];
|
||||
textAttachment.image = image;
|
||||
|
|
@ -89,16 +82,14 @@ NSAttributedString * estimate(NSTimeInterval time, NSAttributedString * dot, NSS
|
|||
auto const width = image.size.width * height / image.size.height;
|
||||
textAttachment.bounds = CGRectIntegral({{0, y}, {width, height}});
|
||||
|
||||
NSMutableAttributedString * attrStringWithImage =
|
||||
[NSAttributedString attributedStringWithAttachment:textAttachment].mutableCopy;
|
||||
[attrStringWithImage addAttributes:secondaryAttributes
|
||||
range:NSMakeRange(0, attrStringWithImage.length)];
|
||||
NSMutableAttributedString *attrStringWithImage =
|
||||
[NSAttributedString attributedStringWithAttachment:textAttachment].mutableCopy;
|
||||
[attrStringWithImage addAttributes:secondaryAttributes range:NSMakeRange(0, attrStringWithImage.length)];
|
||||
[result appendAttributedString:attrStringWithImage];
|
||||
}
|
||||
|
||||
auto target = [NSString stringWithFormat:@"%@ %@", distance, distanceUnits];
|
||||
[result appendAttributedString:[[NSAttributedString alloc] initWithString:target
|
||||
attributes:secondaryAttributes]];
|
||||
[result appendAttributedString:[[NSAttributedString alloc] initWithString:target attributes:secondaryAttributes]];
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
@ -106,20 +97,20 @@ NSAttributedString * estimate(NSTimeInterval time, NSAttributedString * dot, NSS
|
|||
|
||||
@interface MWMNavigationDashboardEntity ()
|
||||
|
||||
@property(copy, nonatomic, readwrite) NSArray<MWMRouterTransitStepInfo *> * transitSteps;
|
||||
@property(copy, nonatomic, readwrite) NSAttributedString * estimate;
|
||||
@property(copy, nonatomic, readwrite) NSString * distanceToTurn;
|
||||
@property(copy, nonatomic, readwrite) NSString * streetName;
|
||||
@property(copy, nonatomic, readwrite) NSString * targetDistance;
|
||||
@property(copy, nonatomic, readwrite) NSString * targetUnits;
|
||||
@property(copy, nonatomic, readwrite) NSString * turnUnits;
|
||||
@property(copy, nonatomic, readwrite) NSArray<MWMRouterTransitStepInfo *> *transitSteps;
|
||||
@property(copy, nonatomic, readwrite) NSAttributedString *estimate;
|
||||
@property(copy, nonatomic, readwrite) NSString *distanceToTurn;
|
||||
@property(copy, nonatomic, readwrite) NSString *streetName;
|
||||
@property(copy, nonatomic, readwrite) NSString *targetDistance;
|
||||
@property(copy, nonatomic, readwrite) NSString *targetUnits;
|
||||
@property(copy, nonatomic, readwrite) NSString *turnUnits;
|
||||
@property(nonatomic, readwrite) BOOL isValid;
|
||||
@property(nonatomic, readwrite) CGFloat progress;
|
||||
@property(nonatomic, readwrite) CLLocation * pedestrianDirectionPosition;
|
||||
@property(nonatomic, readwrite) CLLocation *pedestrianDirectionPosition;
|
||||
@property(nonatomic, readwrite) NSUInteger roundExitNumber;
|
||||
@property(nonatomic, readwrite) NSUInteger timeToTarget;
|
||||
@property(nonatomic, readwrite) UIImage * nextTurnImage;
|
||||
@property(nonatomic, readwrite) UIImage * turnImage;
|
||||
@property(nonatomic, readwrite) UIImage *nextTurnImage;
|
||||
@property(nonatomic, readwrite) UIImage *turnImage;
|
||||
|
||||
@end
|
||||
|
||||
|
|
@ -131,9 +122,9 @@ NSAttributedString * estimate(NSTimeInterval time, NSAttributedString * dot, NSS
|
|||
|
||||
@interface MWMNavigationDashboardManager ()
|
||||
|
||||
@property(copy, nonatomic) NSDictionary * etaAttributes;
|
||||
@property(copy, nonatomic) NSDictionary * etaSecondaryAttributes;
|
||||
@property(nonatomic) MWMNavigationDashboardEntity * entity;
|
||||
@property(copy, nonatomic) NSDictionary *etaAttributes;
|
||||
@property(copy, nonatomic) NSDictionary *etaSecondaryAttributes;
|
||||
@property(nonatomic) MWMNavigationDashboardEntity *entity;
|
||||
|
||||
- (void)onNavigationInfoUpdated;
|
||||
|
||||
|
|
@ -142,15 +133,13 @@ NSAttributedString * estimate(NSTimeInterval time, NSAttributedString * dot, NSS
|
|||
@implementation MWMNavigationDashboardManager (Entity)
|
||||
|
||||
- (void)updateFollowingInfo:(routing::FollowingInfo const &)info type:(MWMRouterType)type {
|
||||
if ([MWMRouter isRouteFinished])
|
||||
{
|
||||
if ([MWMRouter isRouteFinished]) {
|
||||
[MWMRouter stopRouting];
|
||||
AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
|
||||
return;
|
||||
}
|
||||
|
||||
if (auto entity = self.entity)
|
||||
{
|
||||
if (auto entity = self.entity) {
|
||||
entity.isValid = YES;
|
||||
entity.timeToTarget = info.m_time;
|
||||
entity.targetDistance = @(info.m_distToTarget.c_str());
|
||||
|
|
@ -160,20 +149,18 @@ NSAttributedString * estimate(NSTimeInterval time, NSAttributedString * dot, NSS
|
|||
entity.turnUnits = [self localizedUnitLength:@(info.m_turnUnitsSuffix.c_str())];
|
||||
entity.streetName = @(info.m_displayedStreetName.c_str());
|
||||
|
||||
entity.estimate =
|
||||
estimate(entity.timeToTarget, entity.estimateDot, entity.targetDistance, entity.targetUnits,
|
||||
self.etaAttributes, self.etaSecondaryAttributes, NO);
|
||||
entity.estimate = estimate(entity.timeToTarget, entity.estimateDot, entity.targetDistance, entity.targetUnits,
|
||||
self.etaAttributes, self.etaSecondaryAttributes, NO);
|
||||
|
||||
if (type == MWMRouterTypePedestrian) {
|
||||
entity.turnImage = image(info.m_pedestrianTurn);
|
||||
} else {
|
||||
if (type == MWMRouterTypePedestrian) {
|
||||
entity.turnImage = image(info.m_pedestrianTurn);
|
||||
} else {
|
||||
using namespace routing::turns;
|
||||
CarDirection const turn = info.m_turn;
|
||||
entity.turnImage = image(turn, false);
|
||||
entity.nextTurnImage = image(info.m_nextTurn, true);
|
||||
BOOL const isRound = turn == CarDirection::EnterRoundAbout ||
|
||||
turn == CarDirection::StayOnRoundAbout ||
|
||||
turn == CarDirection::LeaveRoundAbout;
|
||||
BOOL const isRound = turn == CarDirection::EnterRoundAbout || turn == CarDirection::StayOnRoundAbout ||
|
||||
turn == CarDirection::LeaveRoundAbout;
|
||||
if (isRound)
|
||||
entity.roundExitNumber = info.m_exitNum;
|
||||
else
|
||||
|
|
@ -184,17 +171,14 @@ NSAttributedString * estimate(NSTimeInterval time, NSAttributedString * dot, NSS
|
|||
[self onNavigationInfoUpdated];
|
||||
}
|
||||
|
||||
- (void)updateTransitInfo:(TransitRouteInfo const &)info
|
||||
{
|
||||
if (auto entity = self.entity)
|
||||
{
|
||||
- (void)updateTransitInfo:(TransitRouteInfo const &)info {
|
||||
if (auto entity = self.entity) {
|
||||
entity.isValid = YES;
|
||||
entity.estimate = estimate(info.m_totalTimeInSec, entity.estimateDot,
|
||||
@(info.m_totalPedestrianDistanceStr.c_str()),
|
||||
@(info.m_totalPedestrianUnitsSuffix.c_str()), self.etaAttributes,
|
||||
self.etaSecondaryAttributes, YES);
|
||||
NSMutableArray<MWMRouterTransitStepInfo *> * transitSteps = [@[] mutableCopy];
|
||||
for (auto const & stepInfo : info.m_steps)
|
||||
entity.estimate =
|
||||
estimate(info.m_totalTimeInSec, entity.estimateDot, @(info.m_totalPedestrianDistanceStr.c_str()),
|
||||
@(info.m_totalPedestrianUnitsSuffix.c_str()), self.etaAttributes, self.etaSecondaryAttributes, YES);
|
||||
NSMutableArray<MWMRouterTransitStepInfo *> *transitSteps = [@[] mutableCopy];
|
||||
for (auto const &stepInfo : info.m_steps)
|
||||
[transitSteps addObject:[[MWMRouterTransitStepInfo alloc] initWithStepInfo:stepInfo]];
|
||||
entity.transitSteps = transitSteps;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,8 +14,7 @@
|
|||
|
||||
#include "geometry/angles.hpp"
|
||||
|
||||
namespace
|
||||
{
|
||||
namespace {
|
||||
CGFloat const kTurnsiPhoneWidth = 96;
|
||||
CGFloat const kTurnsiPadWidth = 140;
|
||||
|
||||
|
|
@ -30,81 +29,81 @@ CGFloat const kShiftedTurnsTopOffset = 8;
|
|||
NSTimeInterval constexpr kCollapseSearchTimeout = 5.0;
|
||||
|
||||
std::map<NavigationSearchState, NSString *> const kSearchStateButtonImageNames{
|
||||
{NavigationSearchState::Maximized, @"ic_routing_search"},
|
||||
{NavigationSearchState::MinimizedNormal, @"ic_routing_search"},
|
||||
{NavigationSearchState::MinimizedSearch, @"ic_routing_search_off"},
|
||||
{NavigationSearchState::MinimizedGas, @"ic_routing_fuel_off"},
|
||||
{NavigationSearchState::MinimizedParking, @"ic_routing_parking_off"},
|
||||
{NavigationSearchState::MinimizedEat, @"ic_routing_eat_off"},
|
||||
{NavigationSearchState::MinimizedFood, @"ic_routing_food_off"},
|
||||
{NavigationSearchState::MinimizedATM, @"ic_routing_atm_off"}};
|
||||
{NavigationSearchState::Maximized, @"ic_routing_search"},
|
||||
{NavigationSearchState::MinimizedNormal, @"ic_routing_search"},
|
||||
{NavigationSearchState::MinimizedSearch, @"ic_routing_search_off"},
|
||||
{NavigationSearchState::MinimizedGas, @"ic_routing_fuel_off"},
|
||||
{NavigationSearchState::MinimizedParking, @"ic_routing_parking_off"},
|
||||
{NavigationSearchState::MinimizedEat, @"ic_routing_eat_off"},
|
||||
{NavigationSearchState::MinimizedFood, @"ic_routing_food_off"},
|
||||
{NavigationSearchState::MinimizedATM, @"ic_routing_atm_off"}};
|
||||
|
||||
std::map<NavigationSearchState, NSString *> const kSearchButtonRequest{
|
||||
{NavigationSearchState::MinimizedGas, L(@"fuel")},
|
||||
{NavigationSearchState::MinimizedParking, L(@"parking")},
|
||||
{NavigationSearchState::MinimizedEat, L(@"eat")},
|
||||
{NavigationSearchState::MinimizedFood, L(@"food")},
|
||||
{NavigationSearchState::MinimizedATM, L(@"atm")}};
|
||||
{NavigationSearchState::MinimizedGas, L(@"fuel")},
|
||||
{NavigationSearchState::MinimizedParking, L(@"parking")},
|
||||
{NavigationSearchState::MinimizedEat, L(@"eat")},
|
||||
{NavigationSearchState::MinimizedFood, L(@"food")},
|
||||
{NavigationSearchState::MinimizedATM, L(@"atm")}};
|
||||
|
||||
BOOL defaultOrientation(CGSize const & size)
|
||||
{
|
||||
CGSize const & mapViewSize = [MapViewController sharedController].view.frame.size;
|
||||
BOOL defaultOrientation(CGSize const &size) {
|
||||
CGSize const &mapViewSize = [MapViewController sharedController].view.frame.size;
|
||||
CGFloat const minWidth = MIN(mapViewSize.width, mapViewSize.height);
|
||||
return IPAD || (size.height > size.width && size.width >= minWidth);
|
||||
}
|
||||
} // namespace
|
||||
|
||||
@interface MWMNavigationInfoView ()<MWMLocationObserver>
|
||||
@interface MWMNavigationInfoView () <MWMLocationObserver>
|
||||
|
||||
@property(weak, nonatomic) IBOutlet UIView * streetNameView;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * streetNameViewHideOffset;
|
||||
@property(weak, nonatomic) IBOutlet UILabel * streetNameLabel;
|
||||
@property(weak, nonatomic) IBOutlet UIView * turnsView;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * turnsViewHideOffset;
|
||||
@property(weak, nonatomic) IBOutlet UIImageView * nextTurnImageView;
|
||||
@property(weak, nonatomic) IBOutlet UILabel * roundTurnLabel;
|
||||
@property(weak, nonatomic) IBOutlet UILabel * distanceToNextTurnLabel;
|
||||
@property(weak, nonatomic) IBOutlet UIView * secondTurnView;
|
||||
@property(weak, nonatomic) IBOutlet UIImageView * secondTurnImageView;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * turnsWidth;
|
||||
@property(weak, nonatomic) IBOutlet UIView *streetNameView;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *streetNameViewHideOffset;
|
||||
@property(weak, nonatomic) IBOutlet UILabel *streetNameLabel;
|
||||
@property(weak, nonatomic) IBOutlet UIView *turnsView;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *turnsViewHideOffset;
|
||||
@property(weak, nonatomic) IBOutlet UIImageView *nextTurnImageView;
|
||||
@property(weak, nonatomic) IBOutlet UILabel *roundTurnLabel;
|
||||
@property(weak, nonatomic) IBOutlet UILabel *distanceToNextTurnLabel;
|
||||
@property(weak, nonatomic) IBOutlet UIView *secondTurnView;
|
||||
@property(weak, nonatomic) IBOutlet UIImageView *secondTurnImageView;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *turnsWidth;
|
||||
|
||||
@property(weak, nonatomic) IBOutlet UIView * searchButtonsView;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton * searchMainButton;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton * bookmarksButton;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * searchButtonsViewHeight;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * searchButtonsViewWidth;
|
||||
@property(nonatomic) IBOutletCollection(NSLayoutConstraint) NSArray * searchLandscapeConstraints;
|
||||
@property(nonatomic) IBOutletCollection(UIButton) NSArray * searchButtons;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * searchButtonsSideSize;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton * searchGasButton;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton * searchParkingButton;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton * searchEatButton;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton * searchFoodButton;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton * searchATMButton;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * turnsTopOffset;
|
||||
@property(weak, nonatomic) IBOutlet UIView *searchButtonsView;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton *searchMainButton;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton *bookmarksButton;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *searchButtonsViewHeight;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *searchButtonsViewWidth;
|
||||
@property(nonatomic) IBOutletCollection(NSLayoutConstraint) NSArray *searchLandscapeConstraints;
|
||||
@property(nonatomic) IBOutletCollection(UIButton) NSArray *searchButtons;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *searchButtonsSideSize;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton *searchGasButton;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton *searchParkingButton;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton *searchEatButton;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton *searchFoodButton;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton *searchATMButton;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *turnsTopOffset;
|
||||
|
||||
@property(weak, nonatomic) IBOutlet MWMNavigationAddPointToastView * toastView;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * toastViewHideOffset;
|
||||
@property(weak, nonatomic) IBOutlet MWMNavigationAddPointToastView *toastView;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *toastViewHideOffset;
|
||||
|
||||
@property(nonatomic, readwrite) NavigationSearchState searchState;
|
||||
@property(nonatomic) BOOL isVisible;
|
||||
|
||||
@property(weak, nonatomic) MWMNavigationDashboardEntity * navigationInfo;
|
||||
@property(weak, nonatomic) MWMNavigationDashboardEntity *navigationInfo;
|
||||
|
||||
@property(nonatomic) BOOL hasLocation;
|
||||
|
||||
@property(nonatomic) NSLayoutConstraint * topConstraint;
|
||||
@property(nonatomic) NSLayoutConstraint * leftConstraint;
|
||||
@property(nonatomic) NSLayoutConstraint * widthConstraint;
|
||||
@property(nonatomic) NSLayoutConstraint * heightConstraint;
|
||||
@property(nonatomic) NSLayoutConstraint *topConstraint;
|
||||
@property(nonatomic) NSLayoutConstraint *leftConstraint;
|
||||
@property(nonatomic) NSLayoutConstraint *widthConstraint;
|
||||
@property(nonatomic) NSLayoutConstraint *heightConstraint;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMNavigationInfoView
|
||||
|
||||
- (void)setMapSearch { [self setSearchState:NavigationSearchState::MinimizedSearch animated:YES]; }
|
||||
- (void)updateToastView
|
||||
{
|
||||
- (void)setMapSearch {
|
||||
[self setSearchState:NavigationSearchState::MinimizedSearch animated:YES];
|
||||
}
|
||||
- (void)updateToastView {
|
||||
// -S-F-L -> Start
|
||||
// -S-F+L -> Finish
|
||||
// -S+F-L -> Start
|
||||
|
|
@ -118,8 +117,7 @@ BOOL defaultOrientation(CGSize const & size)
|
|||
BOOL const hasFinish = ([MWMRouter finishPoint] != nil);
|
||||
self.hasLocation = ([MWMLocationManager lastLocation] != nil);
|
||||
|
||||
if (hasStart && hasFinish)
|
||||
{
|
||||
if (hasStart && hasFinish) {
|
||||
[self setToastViewHidden:YES];
|
||||
return;
|
||||
}
|
||||
|
|
@ -128,14 +126,12 @@ BOOL defaultOrientation(CGSize const & size)
|
|||
|
||||
auto toastView = self.toastView;
|
||||
|
||||
if (hasStart)
|
||||
{
|
||||
if (hasStart) {
|
||||
[toastView configWithIsStart:NO withLocationButton:NO];
|
||||
return;
|
||||
}
|
||||
|
||||
if (hasFinish)
|
||||
{
|
||||
if (hasFinish) {
|
||||
[toastView configWithIsStart:YES withLocationButton:self.hasLocation];
|
||||
return;
|
||||
}
|
||||
|
|
@ -146,73 +142,61 @@ BOOL defaultOrientation(CGSize const & size)
|
|||
[toastView configWithIsStart:YES withLocationButton:NO];
|
||||
}
|
||||
|
||||
- (IBAction)openSearch
|
||||
{
|
||||
- (IBAction)openSearch {
|
||||
BOOL const isStart = self.toastView.isStart;
|
||||
auto const type = isStart ? kStatRoutingPointTypeStart : kStatRoutingPointTypeFinish;
|
||||
[Statistics logEvent:kStatRoutingTooltipClicked withParameters:@{kStatRoutingPointType : type}];
|
||||
[Statistics logEvent:kStatRoutingTooltipClicked withParameters:@{kStatRoutingPointType: type}];
|
||||
auto searchManager = [MWMSearchManager manager];
|
||||
|
||||
searchManager.routingTooltipSearch = isStart ? MWMSearchManagerRoutingTooltipSearchStart
|
||||
: MWMSearchManagerRoutingTooltipSearchFinish;
|
||||
searchManager.routingTooltipSearch =
|
||||
isStart ? MWMSearchManagerRoutingTooltipSearchStart : MWMSearchManagerRoutingTooltipSearchFinish;
|
||||
searchManager.state = MWMSearchManagerStateDefault;
|
||||
}
|
||||
|
||||
- (IBAction)addLocationRoutePoint
|
||||
{
|
||||
- (IBAction)addLocationRoutePoint {
|
||||
NSAssert(![MWMRouter startPoint], @"Action button is active while start point is available");
|
||||
NSAssert([MWMLocationManager lastLocation],
|
||||
@"Action button is active while my location is not available");
|
||||
NSAssert([MWMLocationManager lastLocation], @"Action button is active while my location is not available");
|
||||
|
||||
[MWMRouter
|
||||
buildFromPoint:[[MWMRoutePoint alloc] initWithLastLocationAndType:MWMRoutePointTypeStart
|
||||
intermediateIndex:0]
|
||||
bestRouter:NO];
|
||||
[MWMRouter buildFromPoint:[[MWMRoutePoint alloc] initWithLastLocationAndType:MWMRoutePointTypeStart
|
||||
intermediateIndex:0]
|
||||
bestRouter:NO];
|
||||
}
|
||||
|
||||
#pragma mark - Search
|
||||
|
||||
- (IBAction)searchMainButtonTouchUpInside
|
||||
{
|
||||
switch (self.searchState)
|
||||
{
|
||||
case NavigationSearchState::Maximized:
|
||||
[MWMSearchManager manager].state = MWMSearchManagerStateDefault;
|
||||
[self setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
|
||||
[Statistics logEvent:kStatRoutingSearchClicked
|
||||
withParameters:@{kStatMode: kStatRoutingModeOnRoute}];
|
||||
break;
|
||||
case NavigationSearchState::MinimizedNormal:
|
||||
if (self.state == MWMNavigationInfoViewStatePrepare)
|
||||
{
|
||||
- (IBAction)searchMainButtonTouchUpInside {
|
||||
switch (self.searchState) {
|
||||
case NavigationSearchState::Maximized:
|
||||
[MWMSearchManager manager].state = MWMSearchManagerStateDefault;
|
||||
[Statistics logEvent:kStatRoutingSearchClicked
|
||||
withParameters:@{kStatMode: kStatRoutingModePlanning}];
|
||||
}
|
||||
else
|
||||
{
|
||||
[self setSearchState:NavigationSearchState::Maximized animated:YES];
|
||||
}
|
||||
break;
|
||||
case NavigationSearchState::MinimizedSearch:
|
||||
case NavigationSearchState::MinimizedGas:
|
||||
case NavigationSearchState::MinimizedParking:
|
||||
case NavigationSearchState::MinimizedEat:
|
||||
case NavigationSearchState::MinimizedFood:
|
||||
case NavigationSearchState::MinimizedATM:
|
||||
[MWMSearch clear];
|
||||
[MWMSearchManager manager].state = MWMSearchManagerStateHidden;
|
||||
[self setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
|
||||
break;
|
||||
[self setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
|
||||
[Statistics logEvent:kStatRoutingSearchClicked withParameters:@{kStatMode: kStatRoutingModeOnRoute}];
|
||||
break;
|
||||
case NavigationSearchState::MinimizedNormal:
|
||||
if (self.state == MWMNavigationInfoViewStatePrepare) {
|
||||
[MWMSearchManager manager].state = MWMSearchManagerStateDefault;
|
||||
[Statistics logEvent:kStatRoutingSearchClicked withParameters:@{kStatMode: kStatRoutingModePlanning}];
|
||||
} else {
|
||||
[self setSearchState:NavigationSearchState::Maximized animated:YES];
|
||||
}
|
||||
break;
|
||||
case NavigationSearchState::MinimizedSearch:
|
||||
case NavigationSearchState::MinimizedGas:
|
||||
case NavigationSearchState::MinimizedParking:
|
||||
case NavigationSearchState::MinimizedEat:
|
||||
case NavigationSearchState::MinimizedFood:
|
||||
case NavigationSearchState::MinimizedATM:
|
||||
[MWMSearch clear];
|
||||
[MWMSearchManager manager].state = MWMSearchManagerStateHidden;
|
||||
[self setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
- (IBAction)searchButtonTouchUpInside:(MWMButton *)sender
|
||||
{
|
||||
- (IBAction)searchButtonTouchUpInside:(MWMButton *)sender {
|
||||
auto const body = ^(NavigationSearchState state) {
|
||||
[MWMSearch setSearchOnMap:YES];
|
||||
NSString * query = [kSearchButtonRequest.at(state) stringByAppendingString:@" "];
|
||||
NSString * locale = [[AppInfo sharedInfo] languageId];
|
||||
NSString *query = [kSearchButtonRequest.at(state) stringByAppendingString:@" "];
|
||||
NSString *locale = [[AppInfo sharedInfo] languageId];
|
||||
[MWMSearch searchQuery:query forInputLocale:locale];
|
||||
[self setSearchState:state animated:YES];
|
||||
};
|
||||
|
|
@ -229,107 +213,81 @@ BOOL defaultOrientation(CGSize const & size)
|
|||
body(NavigationSearchState::MinimizedATM);
|
||||
}
|
||||
|
||||
- (IBAction)bookmarksButtonTouchUpInside
|
||||
{
|
||||
- (IBAction)bookmarksButtonTouchUpInside {
|
||||
BOOL const isOnRoute = (self.state == MWMNavigationInfoViewStateNavigation);
|
||||
[Statistics logEvent:kStatRoutingBookmarksClicked
|
||||
withParameters:@{
|
||||
kStatMode: (isOnRoute ? kStatRoutingModeOnRoute : kStatRoutingModePlanning)
|
||||
}];
|
||||
withParameters:@{kStatMode: (isOnRoute ? kStatRoutingModeOnRoute : kStatRoutingModePlanning)}];
|
||||
[[MapViewController sharedController].bookmarksCoordinator open];
|
||||
}
|
||||
|
||||
- (void)collapseSearchOnTimer
|
||||
{
|
||||
- (void)collapseSearchOnTimer {
|
||||
[self setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
|
||||
}
|
||||
|
||||
- (void)layoutSearch
|
||||
{
|
||||
- (void)layoutSearch {
|
||||
BOOL const defaultView = defaultOrientation(self.availableArea.size);
|
||||
CGFloat alpha = 0;
|
||||
CGFloat searchButtonsSideSize = 0;
|
||||
self.searchButtonsViewWidth.constant = 0;
|
||||
self.searchButtonsViewHeight.constant = 0;
|
||||
if (self.searchState == NavigationSearchState::Maximized)
|
||||
{
|
||||
if (self.searchState == NavigationSearchState::Maximized) {
|
||||
alpha = 1;
|
||||
searchButtonsSideSize = kSearchButtonsSideSize;
|
||||
self.searchButtonsViewWidth.constant =
|
||||
defaultView ? kSearchButtonsViewWidthPortrait : kSearchButtonsViewWidthLandscape;
|
||||
defaultView ? kSearchButtonsViewWidthPortrait : kSearchButtonsViewWidthLandscape;
|
||||
self.searchButtonsViewHeight.constant =
|
||||
defaultView ? kSearchButtonsViewHeightPortrait : kSearchButtonsViewHeightLandscape;
|
||||
defaultView ? kSearchButtonsViewHeightPortrait : kSearchButtonsViewHeightLandscape;
|
||||
}
|
||||
for (UIButton * searchButton in self.searchButtons)
|
||||
for (UIButton *searchButton in self.searchButtons)
|
||||
searchButton.alpha = alpha;
|
||||
UILayoutPriority const priority =
|
||||
(defaultView ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh);
|
||||
for (NSLayoutConstraint * constraint in self.searchLandscapeConstraints)
|
||||
UILayoutPriority const priority = (defaultView ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh);
|
||||
for (NSLayoutConstraint *constraint in self.searchLandscapeConstraints)
|
||||
constraint.priority = priority;
|
||||
self.searchButtonsSideSize.constant = searchButtonsSideSize;
|
||||
}
|
||||
|
||||
#pragma mark - MWMNavigationDashboardManager
|
||||
|
||||
- (void)onNavigationInfoUpdated:(MWMNavigationDashboardEntity *)info
|
||||
{
|
||||
- (void)onNavigationInfoUpdated:(MWMNavigationDashboardEntity *)info {
|
||||
self.navigationInfo = info;
|
||||
if (self.state != MWMNavigationInfoViewStateNavigation)
|
||||
return;
|
||||
if (info.streetName.length != 0)
|
||||
{
|
||||
if (info.streetName.length != 0) {
|
||||
[self setStreetNameVisible:YES];
|
||||
self.streetNameLabel.text = info.streetName;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
[self setStreetNameVisible:NO];
|
||||
}
|
||||
if (info.turnImage)
|
||||
{
|
||||
if (info.turnImage) {
|
||||
[self setTurnsViewVisible:YES];
|
||||
self.nextTurnImageView.image = info.turnImage;
|
||||
|
||||
if (info.roundExitNumber == 0)
|
||||
{
|
||||
if (info.roundExitNumber == 0) {
|
||||
self.roundTurnLabel.hidden = YES;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
self.roundTurnLabel.hidden = NO;
|
||||
self.roundTurnLabel.text = @(info.roundExitNumber).stringValue;
|
||||
}
|
||||
|
||||
NSDictionary * turnNumberAttributes = @{
|
||||
NSForegroundColorAttributeName : [UIColor white],
|
||||
NSFontAttributeName : IPAD ? [UIFont bold36] : [UIFont bold28]
|
||||
};
|
||||
NSDictionary * turnLegendAttributes = @{
|
||||
NSForegroundColorAttributeName : [UIColor white],
|
||||
NSFontAttributeName : IPAD ? [UIFont bold24] : [UIFont bold16]
|
||||
};
|
||||
NSDictionary *turnNumberAttributes =
|
||||
@{NSForegroundColorAttributeName: [UIColor white], NSFontAttributeName: IPAD ? [UIFont bold36] : [UIFont bold28]};
|
||||
NSDictionary *turnLegendAttributes =
|
||||
@{NSForegroundColorAttributeName: [UIColor white], NSFontAttributeName: IPAD ? [UIFont bold24] : [UIFont bold16]};
|
||||
|
||||
NSMutableAttributedString * distance =
|
||||
[[NSMutableAttributedString alloc] initWithString:info.distanceToTurn
|
||||
attributes:turnNumberAttributes];
|
||||
[distance
|
||||
appendAttributedString:[[NSAttributedString alloc]
|
||||
initWithString:[NSString stringWithFormat:@" %@", info.turnUnits]
|
||||
attributes:turnLegendAttributes]];
|
||||
NSMutableAttributedString *distance = [[NSMutableAttributedString alloc] initWithString:info.distanceToTurn
|
||||
attributes:turnNumberAttributes];
|
||||
[distance appendAttributedString:[[NSAttributedString alloc]
|
||||
initWithString:[NSString stringWithFormat:@" %@", info.turnUnits]
|
||||
attributes:turnLegendAttributes]];
|
||||
|
||||
self.distanceToNextTurnLabel.attributedText = distance;
|
||||
if (info.nextTurnImage)
|
||||
{
|
||||
if (info.nextTurnImage) {
|
||||
self.secondTurnView.hidden = NO;
|
||||
self.secondTurnImageView.image = info.nextTurnImage;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
self.secondTurnView.hidden = YES;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
[self setTurnsViewVisible:NO];
|
||||
}
|
||||
[self setNeedsLayout];
|
||||
|
|
@ -337,8 +295,7 @@ BOOL defaultOrientation(CGSize const & size)
|
|||
|
||||
#pragma mark - MWMLocationObserver
|
||||
|
||||
- (void)onLocationUpdate:(CLLocation *)location
|
||||
{
|
||||
- (void)onLocationUpdate:(CLLocation *)location {
|
||||
BOOL const hasLocation = ([MWMLocationManager lastLocation] != nil);
|
||||
if (self.hasLocation != hasLocation)
|
||||
[self updateToastView];
|
||||
|
|
@ -346,39 +303,34 @@ BOOL defaultOrientation(CGSize const & size)
|
|||
|
||||
#pragma mark - SolidTouchView
|
||||
|
||||
- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
|
||||
{
|
||||
- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
|
||||
if (self.searchState == NavigationSearchState::Maximized)
|
||||
return;
|
||||
[super touchesBegan:touches withEvent:event];
|
||||
}
|
||||
|
||||
- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
|
||||
{
|
||||
- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
|
||||
if (self.searchState == NavigationSearchState::Maximized)
|
||||
return;
|
||||
[super touchesMoved:touches withEvent:event];
|
||||
}
|
||||
|
||||
- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
|
||||
{
|
||||
- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
|
||||
if (self.searchState == NavigationSearchState::Maximized)
|
||||
[self setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
|
||||
else
|
||||
[super touchesEnded:touches withEvent:event];
|
||||
}
|
||||
|
||||
- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
|
||||
{
|
||||
- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event {
|
||||
if (self.searchState == NavigationSearchState::Maximized)
|
||||
[self setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
|
||||
else
|
||||
[super touchesCancelled:touches withEvent:event];
|
||||
}
|
||||
|
||||
- (void)configLayout
|
||||
{
|
||||
UIView * ov = self.superview;
|
||||
- (void)configLayout {
|
||||
UIView *ov = self.superview;
|
||||
self.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
|
||||
self.topConstraint = [self.topAnchor constraintEqualToAnchor:ov.topAnchor];
|
||||
|
|
@ -391,8 +343,7 @@ BOOL defaultOrientation(CGSize const & size)
|
|||
self.heightConstraint.active = YES;
|
||||
}
|
||||
|
||||
- (void)refreshLayout
|
||||
{
|
||||
- (void)refreshLayout {
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
auto const availableArea = self.availableArea;
|
||||
[self animateConstraintsWithAnimations:^{
|
||||
|
|
@ -402,114 +353,96 @@ BOOL defaultOrientation(CGSize const & size)
|
|||
self.heightConstraint.constant = availableArea.size.height;
|
||||
|
||||
[self layoutSearch];
|
||||
self.turnsTopOffset.constant =
|
||||
availableArea.origin.y > 0 ? kShiftedTurnsTopOffset : kBaseTurnsTopOffset;
|
||||
self.turnsTopOffset.constant = availableArea.origin.y > 0 ? kShiftedTurnsTopOffset : kBaseTurnsTopOffset;
|
||||
self.searchButtonsView.layer.cornerRadius =
|
||||
(defaultOrientation(availableArea.size) ? kSearchButtonsViewHeightPortrait
|
||||
: kSearchButtonsViewHeightLandscape) /
|
||||
2;
|
||||
(defaultOrientation(availableArea.size) ? kSearchButtonsViewHeightPortrait
|
||||
: kSearchButtonsViewHeightLandscape) /
|
||||
2;
|
||||
}];
|
||||
});
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (void)setAvailableArea:(CGRect)availableArea
|
||||
{
|
||||
- (void)setAvailableArea:(CGRect)availableArea {
|
||||
if (CGRectEqualToRect(_availableArea, availableArea))
|
||||
return;
|
||||
_availableArea = availableArea;
|
||||
[self refreshLayout];
|
||||
}
|
||||
|
||||
- (void)setSearchState:(NavigationSearchState)searchState animated:(BOOL)animated
|
||||
{
|
||||
- (void)setSearchState:(NavigationSearchState)searchState animated:(BOOL)animated {
|
||||
self.searchState = searchState;
|
||||
auto block = ^{
|
||||
[self layoutSearch];
|
||||
[self layoutIfNeeded];
|
||||
};
|
||||
if (animated)
|
||||
{
|
||||
if (animated) {
|
||||
[self layoutIfNeeded];
|
||||
[UIView animateWithDuration:kDefaultAnimationDuration animations:block];
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
block();
|
||||
}
|
||||
SEL const collapseSelector = @selector(collapseSearchOnTimer);
|
||||
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:collapseSelector object:self];
|
||||
if (self.searchState == NavigationSearchState::Maximized)
|
||||
{
|
||||
if (self.searchState == NavigationSearchState::Maximized) {
|
||||
[self.superview bringSubviewToFront:self];
|
||||
[self performSelector:collapseSelector withObject:self afterDelay:kCollapseSearchTimeout];
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
[self.superview sendSubviewToBack:self];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)setSearchState:(NavigationSearchState)searchState
|
||||
{
|
||||
- (void)setSearchState:(NavigationSearchState)searchState {
|
||||
_searchState = searchState;
|
||||
self.searchMainButton.imageName = kSearchStateButtonImageNames.at(searchState);
|
||||
}
|
||||
|
||||
- (void)setState:(MWMNavigationInfoViewState)state
|
||||
{
|
||||
- (void)setState:(MWMNavigationInfoViewState)state {
|
||||
if (_state == state)
|
||||
return;
|
||||
_state = state;
|
||||
switch (state)
|
||||
{
|
||||
case MWMNavigationInfoViewStateHidden:
|
||||
self.isVisible = NO;
|
||||
[self setToastViewHidden:YES];
|
||||
[MWMLocationManager removeObserver:self];
|
||||
break;
|
||||
case MWMNavigationInfoViewStateNavigation:
|
||||
self.isVisible = YES;
|
||||
if ([MWMRouter type] == MWMRouterTypePedestrian)
|
||||
[MWMLocationManager addObserver:self];
|
||||
else
|
||||
switch (state) {
|
||||
case MWMNavigationInfoViewStateHidden:
|
||||
self.isVisible = NO;
|
||||
[self setToastViewHidden:YES];
|
||||
[MWMLocationManager removeObserver:self];
|
||||
break;
|
||||
case MWMNavigationInfoViewStatePrepare:
|
||||
self.isVisible = YES;
|
||||
[self setStreetNameVisible:NO];
|
||||
[self setTurnsViewVisible:NO];
|
||||
[MWMLocationManager addObserver:self];
|
||||
break;
|
||||
break;
|
||||
case MWMNavigationInfoViewStateNavigation:
|
||||
self.isVisible = YES;
|
||||
if ([MWMRouter type] == MWMRouterTypePedestrian)
|
||||
[MWMLocationManager addObserver:self];
|
||||
else
|
||||
[MWMLocationManager removeObserver:self];
|
||||
break;
|
||||
case MWMNavigationInfoViewStatePrepare:
|
||||
self.isVisible = YES;
|
||||
[self setStreetNameVisible:NO];
|
||||
[self setTurnsViewVisible:NO];
|
||||
[MWMLocationManager addObserver:self];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)setStreetNameVisible:(BOOL)isVisible
|
||||
{
|
||||
- (void)setStreetNameVisible:(BOOL)isVisible {
|
||||
self.streetNameView.hidden = !isVisible;
|
||||
self.streetNameViewHideOffset.priority =
|
||||
isVisible ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh;
|
||||
self.streetNameViewHideOffset.priority = isVisible ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh;
|
||||
}
|
||||
|
||||
- (void)setTurnsViewVisible:(BOOL)isVisible
|
||||
{
|
||||
- (void)setTurnsViewVisible:(BOOL)isVisible {
|
||||
self.turnsView.hidden = !isVisible;
|
||||
self.turnsViewHideOffset.priority =
|
||||
isVisible ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh;
|
||||
self.turnsViewHideOffset.priority = isVisible ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh;
|
||||
}
|
||||
|
||||
- (void)setIsVisible:(BOOL)isVisible
|
||||
{
|
||||
- (void)setIsVisible:(BOOL)isVisible {
|
||||
if (_isVisible == isVisible)
|
||||
return;
|
||||
_isVisible = isVisible;
|
||||
[self setNeedsLayout];
|
||||
if (isVisible)
|
||||
{
|
||||
if (isVisible) {
|
||||
[self setSearchState:NavigationSearchState::MinimizedNormal animated:NO];
|
||||
self.turnsWidth.constant = IPAD ? kTurnsiPadWidth : kTurnsiPhoneWidth;
|
||||
UIView * sv = self.ownerView;
|
||||
UIView *sv = self.ownerView;
|
||||
NSAssert(sv != nil, @"Superview can't be nil");
|
||||
if ([sv.subviews containsObject:self])
|
||||
return;
|
||||
|
|
@ -517,36 +450,32 @@ BOOL defaultOrientation(CGSize const & size)
|
|||
[self configLayout];
|
||||
}
|
||||
[UIView animateWithDuration:kDefaultAnimationDuration
|
||||
animations:^{
|
||||
[self layoutIfNeeded];
|
||||
}
|
||||
completion:^(BOOL finished) {
|
||||
if (!isVisible)
|
||||
[self removeFromSuperview];
|
||||
}];
|
||||
animations:^{
|
||||
[self layoutIfNeeded];
|
||||
}
|
||||
completion:^(BOOL finished) {
|
||||
if (!isVisible)
|
||||
[self removeFromSuperview];
|
||||
}];
|
||||
}
|
||||
|
||||
- (void)setToastViewHidden:(BOOL)hidden
|
||||
{
|
||||
- (void)setToastViewHidden:(BOOL)hidden {
|
||||
if (!hidden)
|
||||
self.toastView.hidden = NO;
|
||||
[self setNeedsLayout];
|
||||
self.toastViewHideOffset.priority =
|
||||
(hidden ? UILayoutPriorityDefaultHigh : UILayoutPriorityDefaultLow);
|
||||
self.toastViewHideOffset.priority = (hidden ? UILayoutPriorityDefaultHigh : UILayoutPriorityDefaultLow);
|
||||
[UIView animateWithDuration:kDefaultAnimationDuration
|
||||
animations:^{
|
||||
[self layoutIfNeeded];
|
||||
}
|
||||
completion:^(BOOL finished) {
|
||||
if (hidden)
|
||||
self.toastView.hidden = YES;
|
||||
}];
|
||||
animations:^{
|
||||
[self layoutIfNeeded];
|
||||
}
|
||||
completion:^(BOOL finished) {
|
||||
if (hidden)
|
||||
self.toastView.hidden = YES;
|
||||
}];
|
||||
}
|
||||
|
||||
//MARK: Update Theme
|
||||
- (void)applyTheme
|
||||
{
|
||||
// MARK: Update Theme
|
||||
- (void)applyTheme {
|
||||
[self setSearchState:_searchState];
|
||||
|
||||
}
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -155,12 +155,12 @@ final class NavigationControlView: SolidTouchView, MWMTextToSpeechObserver, MapO
|
|||
let routingNumberAttributes: [NSAttributedString.Key: Any] =
|
||||
[
|
||||
NSAttributedString.Key.foregroundColor: UIColor.blackPrimaryText(),
|
||||
NSAttributedString.Key.font: UIFont.bold24(),
|
||||
NSAttributedString.Key.font: UIFont.bold24()
|
||||
]
|
||||
let routingLegendAttributes: [NSAttributedString.Key: Any] =
|
||||
[
|
||||
NSAttributedString.Key.foregroundColor: UIColor.blackSecondaryText(),
|
||||
NSAttributedString.Key.font: UIFont.bold14(),
|
||||
NSAttributedString.Key.font: UIFont.bold14()
|
||||
]
|
||||
|
||||
if timePageControl.currentPage == 0 {
|
||||
|
|
@ -197,7 +197,7 @@ final class NavigationControlView: SolidTouchView, MWMTextToSpeechObserver, MapO
|
|||
speedLegendLabel.textColor = textColor
|
||||
speedWithLegendLabel.textColor = textColor
|
||||
|
||||
self.routingProgress.constant = self.progressView.width * info.progress / 100
|
||||
routingProgress.constant = progressView.width * info.progress / 100
|
||||
}
|
||||
|
||||
@IBAction
|
||||
|
|
@ -284,5 +284,6 @@ final class NavigationControlView: SolidTouchView, MWMTextToSpeechObserver, MapO
|
|||
}
|
||||
|
||||
override var widgetsAreaAffectDirections: MWMAvailableAreaAffectDirections {
|
||||
return alternative(iPhone: .bottom, iPad: []) }
|
||||
return alternative(iPhone: .bottom, iPad: [])
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue