forked from organicmaps/organicmaps
[ios] move out UI from the MWMNavigationDashboardManager to RoutePreviewView
The MWMNavigationDashboardManager's old impl contains both the business logic and UI. Now this responsibilities are separated: the MWMNavigationDashboardManager controls the previewing logic and NavigationDashboardView - UI Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
parent
a52b51cb58
commit
b07a645d86
SSH key fingerprint:
SHA256:P3swI85Rc1ZoE8vyL28Oa6+FgRIaOwsjkKyqcVZ0NtY
8 changed files with 427 additions and 273 deletions
|
|
@ -79,3 +79,4 @@
|
|||
#import "MWMSearchSuggestionCell.h"
|
||||
#import "MWMSearch.h"
|
||||
#import "SearchResult.h"
|
||||
#import "RoutePreview.h"
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ typedef NS_ENUM(NSUInteger, MWMNavigationDashboardState) {
|
|||
MWMNavigationDashboardStateNavigation
|
||||
};
|
||||
|
||||
@class NavigationDashboardView;
|
||||
|
||||
@interface MWMNavigationDashboardManager : NSObject
|
||||
|
||||
+ (nonnull MWMNavigationDashboardManager *)sharedManager;
|
||||
|
|
|
|||
|
|
@ -1,40 +1,24 @@
|
|||
#import "MWMNavigationDashboardManager.h"
|
||||
#import "MWMMapViewControlsManager.h"
|
||||
#import "MWMNavigationInfoView.h"
|
||||
#import "MWMRoutePreview.h"
|
||||
#import "MWMSearch.h"
|
||||
#import "MapViewController.h"
|
||||
|
||||
#import "SwiftBridge.h"
|
||||
|
||||
namespace {
|
||||
NSString *const kRoutePreviewIPhoneXibName = @"MWMiPhoneRoutePreview";
|
||||
NSString *const kNavigationInfoViewXibName = @"MWMNavigationInfoView";
|
||||
NSString *const kNavigationControlViewXibName = @"NavigationControlView";
|
||||
} // namespace
|
||||
#import "NavigationDashboardView.h"
|
||||
|
||||
@interface MWMMapViewControlsManager ()
|
||||
|
||||
@property(nonatomic) MWMNavigationDashboardManager *navigationManager;
|
||||
@property(nonatomic) MWMNavigationDashboardManager * navigationManager;
|
||||
|
||||
@end
|
||||
|
||||
@interface MWMNavigationDashboardManager () <SearchOnMapManagerObserver, MWMRoutePreviewDelegate>
|
||||
|
||||
@property(copy, nonatomic) NSDictionary *etaAttributes;
|
||||
@property(copy, nonatomic) NSDictionary *etaSecondaryAttributes;
|
||||
@property(copy, nonatomic) NSString *errorMessage;
|
||||
@property(nonatomic) IBOutlet MWMBaseRoutePreviewStatus *baseRoutePreviewStatus;
|
||||
@property(nonatomic) IBOutlet MWMNavigationControlView *navigationControlView;
|
||||
@property(nonatomic) IBOutlet MWMNavigationInfoView *navigationInfoView;
|
||||
@property(nonatomic) IBOutlet MWMRoutePreview *routePreview;
|
||||
@property(nonatomic) IBOutlet MWMTransportRoutePreviewStatus *transportRoutePreviewStatus;
|
||||
@property(nonatomic) IBOutletCollection(MWMRouteStartButton) NSArray *goButtons;
|
||||
@property(nonatomic) MWMNavigationDashboardEntity *entity;
|
||||
@property(nonatomic) MWMRouteManagerTransitioningManager *routeManagerTransitioningManager;
|
||||
@property(weak, nonatomic) IBOutlet UIButton *showRouteManagerButton;
|
||||
@property(weak, nonatomic) IBOutlet UIView *goButtonsContainer;
|
||||
@property(weak, nonatomic) UIView *ownerView;
|
||||
@property(copy, nonatomic) NSDictionary * etaAttributes;
|
||||
@property(copy, nonatomic) NSDictionary * etaSecondaryAttributes;
|
||||
@property(copy, nonatomic) NSString * errorMessage;
|
||||
@property(copy, nonatomic) MWMNavigationDashboardEntity * entity;
|
||||
|
||||
@property(nonatomic, readonly) NavigationDashboardView * _Nonnull navigationDashboardView;
|
||||
@property(weak, nonatomic) UIView * ownerView;
|
||||
|
||||
@end
|
||||
|
||||
|
|
@ -48,6 +32,8 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
|
|||
self = [super init];
|
||||
if (self) {
|
||||
_ownerView = view;
|
||||
_navigationDashboardView = [[NavigationDashboardView alloc] initWithOwnerView:view];
|
||||
_navigationDashboardView.delegate = self;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
|
@ -56,215 +42,51 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
|
|||
return [[MapViewController sharedController] searchManager];
|
||||
}
|
||||
|
||||
- (void)loadPreviewWithStatusBoxes {
|
||||
[NSBundle.mainBundle loadNibNamed:kRoutePreviewIPhoneXibName owner:self options:nil];
|
||||
auto ownerView = self.ownerView;
|
||||
_baseRoutePreviewStatus.ownerView = ownerView;
|
||||
_transportRoutePreviewStatus.ownerView = ownerView;
|
||||
}
|
||||
|
||||
#pragma mark - MWMRoutePreview
|
||||
|
||||
- (void)setRouteBuilderProgress:(CGFloat)progress {
|
||||
[self.routePreview router:[MWMRouter type] setProgress:progress / 100.];
|
||||
[self.navigationDashboardView setRouteBuilderProgress:[MWMRouter type] progress:progress / 100.];
|
||||
}
|
||||
|
||||
#pragma mark - MWMNavigationGo
|
||||
|
||||
- (IBAction)routingStartTouchUpInside {
|
||||
[MWMRouter startRouting];
|
||||
}
|
||||
- (void)updateGoButtonTitle {
|
||||
NSString *title = L(@"p2p_start");
|
||||
|
||||
for (MWMRouteStartButton *button in self.goButtons)
|
||||
[button setTitle:title forState:UIControlStateNormal];
|
||||
}
|
||||
#pragma mark - On route updates
|
||||
|
||||
- (void)onNavigationInfoUpdated {
|
||||
auto entity = self.entity;
|
||||
if (!entity.isValid)
|
||||
return;
|
||||
[_navigationInfoView onNavigationInfoUpdated:entity];
|
||||
bool const isPublicTransport = [MWMRouter type] == MWMRouterTypePublicTransport;
|
||||
bool const isRuler = [MWMRouter type] == MWMRouterTypeRuler;
|
||||
if (isPublicTransport || isRuler)
|
||||
[_transportRoutePreviewStatus onNavigationInfoUpdated:entity prependDistance:isRuler];
|
||||
else
|
||||
[_baseRoutePreviewStatus onNavigationInfoUpdated:entity];
|
||||
[_navigationControlView onNavigationInfoUpdated:entity];
|
||||
[self.navigationDashboardView onNavigationInfoUpdated:entity];
|
||||
}
|
||||
|
||||
#pragma mark - On route updates
|
||||
|
||||
- (void)onRoutePrepare {
|
||||
self.state = MWMNavigationDashboardStatePrepare;
|
||||
self.routePreview.drivingOptionsState = MWMDrivingOptionsStateNone;
|
||||
[self.navigationDashboardView setDrivingOptionState:MWMDrivingOptionsStateNone];
|
||||
}
|
||||
|
||||
- (void)onRoutePlanning {
|
||||
self.state = MWMNavigationDashboardStatePlanning;
|
||||
self.routePreview.drivingOptionsState = MWMDrivingOptionsStateNone;
|
||||
[self.navigationDashboardView setDrivingOptionState:MWMDrivingOptionsStateNone];
|
||||
}
|
||||
|
||||
- (void)onRouteError:(NSString *)error {
|
||||
self.errorMessage = error;
|
||||
self.state = MWMNavigationDashboardStateError;
|
||||
self.routePreview.drivingOptionsState =
|
||||
[MWMRouter hasActiveDrivingOptions] ? MWMDrivingOptionsStateChange : MWMDrivingOptionsStateNone;
|
||||
[self.navigationDashboardView setDrivingOptionState:[MWMRouter hasActiveDrivingOptions] ? MWMDrivingOptionsStateChange : MWMDrivingOptionsStateNone];
|
||||
}
|
||||
|
||||
- (void)onRouteReady:(BOOL)hasWarnings {
|
||||
if (self.state != MWMNavigationDashboardStateNavigation)
|
||||
self.state = MWMNavigationDashboardStateReady;
|
||||
if ([MWMRouter hasActiveDrivingOptions]) {
|
||||
self.routePreview.drivingOptionsState = MWMDrivingOptionsStateChange;
|
||||
[self.navigationDashboardView setDrivingOptionState:MWMDrivingOptionsStateChange];
|
||||
} else {
|
||||
self.routePreview.drivingOptionsState = hasWarnings ? MWMDrivingOptionsStateDefine : MWMDrivingOptionsStateNone;
|
||||
[self.navigationDashboardView setDrivingOptionState:hasWarnings ? MWMDrivingOptionsStateDefine : MWMDrivingOptionsStateNone];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)onRoutePointsUpdated {
|
||||
if (self.state == MWMNavigationDashboardStateHidden)
|
||||
self.state = MWMNavigationDashboardStatePrepare;
|
||||
[self.navigationInfoView updateToastView];
|
||||
[self.navigationDashboardView onRoutePointsUpdated];
|
||||
}
|
||||
|
||||
#pragma mark - State changes
|
||||
|
||||
- (void)stateHidden {
|
||||
self.routePreview = nil;
|
||||
self.navigationInfoView.state = MWMNavigationInfoViewStateHidden;
|
||||
self.navigationInfoView = nil;
|
||||
_navigationControlView.isVisible = NO;
|
||||
_navigationControlView = nil;
|
||||
[self.baseRoutePreviewStatus hide];
|
||||
[_transportRoutePreviewStatus hide];
|
||||
_transportRoutePreviewStatus = nil;
|
||||
}
|
||||
|
||||
- (void)statePrepare {
|
||||
self.navigationInfoView.state = MWMNavigationInfoViewStatePrepare;
|
||||
auto routePreview = self.routePreview;
|
||||
[routePreview addToView:self.ownerView];
|
||||
[routePreview statePrepare];
|
||||
[routePreview selectRouter:[MWMRouter type]];
|
||||
[self updateGoButtonTitle];
|
||||
[self.baseRoutePreviewStatus hide];
|
||||
[_transportRoutePreviewStatus hide];
|
||||
for (MWMRouteStartButton *button in self.goButtons)
|
||||
[button statePrepare];
|
||||
}
|
||||
|
||||
- (void)statePlanning {
|
||||
[self statePrepare];
|
||||
[self.routePreview router:[MWMRouter type] setState:MWMCircularProgressStateSpinner];
|
||||
[self setRouteBuilderProgress:0.];
|
||||
}
|
||||
|
||||
- (void)stateError {
|
||||
if (_state == MWMNavigationDashboardStateReady)
|
||||
return;
|
||||
|
||||
NSAssert(_state == MWMNavigationDashboardStatePlanning, @"Invalid state change (error)");
|
||||
auto routePreview = self.routePreview;
|
||||
[routePreview router:[MWMRouter type] setState:MWMCircularProgressStateFailed];
|
||||
[self updateGoButtonTitle];
|
||||
[self.baseRoutePreviewStatus showErrorWithMessage:self.errorMessage];
|
||||
for (MWMRouteStartButton *button in self.goButtons)
|
||||
[button stateError];
|
||||
}
|
||||
|
||||
- (void)stateReady {
|
||||
// TODO: Here assert sometimes fires with _state = MWMNavigationDashboardStateReady, if app was stopped while navigating and then restarted.
|
||||
// Also in ruler mode when new point is added by single tap on the map state MWMNavigationDashboardStatePlanning is skipped and we get _state = MWMNavigationDashboardStateReady.
|
||||
NSAssert(_state == MWMNavigationDashboardStatePlanning || _state == MWMNavigationDashboardStateReady, @"Invalid state change (ready)");
|
||||
[self setRouteBuilderProgress:100.];
|
||||
[self updateGoButtonTitle];
|
||||
bool const isTransport = ([MWMRouter type] == MWMRouterTypePublicTransport);
|
||||
bool const isRuler = ([MWMRouter type] == MWMRouterTypeRuler);
|
||||
if (isTransport || isRuler)
|
||||
[self.transportRoutePreviewStatus showReady];
|
||||
else
|
||||
[self.baseRoutePreviewStatus showReady];
|
||||
self.goButtonsContainer.hidden = isTransport || isRuler;
|
||||
for (MWMRouteStartButton *button in self.goButtons)
|
||||
{
|
||||
if (isRuler)
|
||||
[button stateHidden];
|
||||
else
|
||||
[button stateReady];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)onRouteStart {
|
||||
self.state = MWMNavigationDashboardStateNavigation;
|
||||
}
|
||||
- (void)onRouteStop {
|
||||
self.state = MWMNavigationDashboardStateHidden;
|
||||
}
|
||||
- (void)stateNavigation {
|
||||
self.routePreview = nil;
|
||||
self.navigationInfoView.state = MWMNavigationInfoViewStateNavigation;
|
||||
self.navigationControlView.isVisible = YES;
|
||||
[self.baseRoutePreviewStatus hide];
|
||||
[_transportRoutePreviewStatus hide];
|
||||
_transportRoutePreviewStatus = nil;
|
||||
[self onNavigationInfoUpdated];
|
||||
}
|
||||
|
||||
#pragma mark - MWMRoutePreviewStatus
|
||||
|
||||
- (IBAction)showRouteManager {
|
||||
auto routeManagerViewModel = [[MWMRouteManagerViewModel alloc] init];
|
||||
auto routeManager = [[MWMRouteManagerViewController alloc] initWithViewModel:routeManagerViewModel];
|
||||
routeManager.modalPresentationStyle = UIModalPresentationCustom;
|
||||
|
||||
self.routeManagerTransitioningManager = [[MWMRouteManagerTransitioningManager alloc] init];
|
||||
routeManager.transitioningDelegate = self.routeManagerTransitioningManager;
|
||||
|
||||
[[MapViewController sharedController] presentViewController:routeManager animated:YES completion:nil];
|
||||
}
|
||||
|
||||
#pragma mark - MWMNavigationControlView
|
||||
|
||||
- (IBAction)ttsButtonAction {
|
||||
BOOL const isEnabled = [MWMTextToSpeech tts].active;
|
||||
[MWMTextToSpeech tts].active = !isEnabled;
|
||||
}
|
||||
|
||||
- (IBAction)settingsButtonAction {
|
||||
[[MapViewController sharedController] openSettings];
|
||||
}
|
||||
|
||||
- (IBAction)stopRoutingButtonAction {
|
||||
[MWMSearch clear];
|
||||
[MWMRouter stopRouting];
|
||||
[self.searchManager close];
|
||||
}
|
||||
|
||||
#pragma mark - SearchOnMapManagerObserver
|
||||
|
||||
- (void)searchManagerWithDidChangeState:(SearchOnMapState)state {
|
||||
switch (state) {
|
||||
case SearchOnMapStateClosed:
|
||||
[self.navigationInfoView setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
|
||||
break;
|
||||
case SearchOnMapStateHidden:
|
||||
case SearchOnMapStateSearching:
|
||||
[self setMapSearch];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - Available area
|
||||
|
||||
+ (void)updateNavigationInfoAvailableArea:(CGRect)frame {
|
||||
[[self sharedManager] updateNavigationInfoAvailableArea:frame];
|
||||
}
|
||||
|
||||
- (void)updateNavigationInfoAvailableArea:(CGRect)frame {
|
||||
_navigationInfoView.availableArea = frame;
|
||||
}
|
||||
#pragma mark - Properties
|
||||
|
||||
- (void)setState:(MWMNavigationDashboardState)state {
|
||||
|
|
@ -299,64 +121,91 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
|
|||
BottomTabBarViewController.controller.isHidden = state != MWMNavigationDashboardStateHidden;
|
||||
}
|
||||
|
||||
@synthesize routePreview = _routePreview;
|
||||
- (MWMRoutePreview *)routePreview {
|
||||
if (!_routePreview)
|
||||
[self loadPreviewWithStatusBoxes];
|
||||
return _routePreview;
|
||||
}
|
||||
|
||||
- (void)setRoutePreview:(MWMRoutePreview *)routePreview {
|
||||
if (routePreview == _routePreview)
|
||||
return;
|
||||
[_routePreview remove];
|
||||
_routePreview = routePreview;
|
||||
_routePreview.delegate = self;
|
||||
}
|
||||
|
||||
- (MWMBaseRoutePreviewStatus *)baseRoutePreviewStatus {
|
||||
if (!_baseRoutePreviewStatus)
|
||||
[self loadPreviewWithStatusBoxes];
|
||||
return _baseRoutePreviewStatus;
|
||||
}
|
||||
|
||||
- (MWMTransportRoutePreviewStatus *)transportRoutePreviewStatus {
|
||||
if (!_transportRoutePreviewStatus)
|
||||
[self loadPreviewWithStatusBoxes];
|
||||
return _transportRoutePreviewStatus;
|
||||
}
|
||||
|
||||
- (MWMNavigationInfoView *)navigationInfoView {
|
||||
if (!_navigationInfoView) {
|
||||
[NSBundle.mainBundle loadNibNamed:kNavigationInfoViewXibName owner:self options:nil];
|
||||
_navigationInfoView.state = MWMNavigationInfoViewStateHidden;
|
||||
_navigationInfoView.ownerView = self.ownerView;
|
||||
}
|
||||
return _navigationInfoView;
|
||||
}
|
||||
|
||||
- (MWMNavigationControlView *)navigationControlView {
|
||||
if (!_navigationControlView) {
|
||||
[NSBundle.mainBundle loadNibNamed:kNavigationControlViewXibName owner:self options:nil];
|
||||
_navigationControlView.ownerView = self.ownerView;
|
||||
}
|
||||
return _navigationControlView;
|
||||
}
|
||||
|
||||
- (MWMNavigationDashboardEntity *)entity {
|
||||
if (!_entity)
|
||||
_entity = [[MWMNavigationDashboardEntity alloc] init];
|
||||
return _entity;
|
||||
}
|
||||
|
||||
- (void)setMapSearch {
|
||||
[_navigationInfoView setMapSearch];
|
||||
#pragma mark - State changes
|
||||
|
||||
- (void)stateHidden {
|
||||
[self.navigationDashboardView setHidden];
|
||||
}
|
||||
|
||||
- (void)statePrepare {
|
||||
[self.navigationDashboardView statePrepare];
|
||||
}
|
||||
|
||||
- (void)statePlanning {
|
||||
[self statePrepare];
|
||||
[self.navigationDashboardView statePlanning];
|
||||
[self setRouteBuilderProgress:0.];
|
||||
}
|
||||
|
||||
- (void)stateError {
|
||||
if (_state == MWMNavigationDashboardStateReady)
|
||||
return;
|
||||
NSAssert(_state == MWMNavigationDashboardStatePlanning, @"Invalid state change (error)");
|
||||
[self.navigationDashboardView stateError:self.errorMessage];
|
||||
}
|
||||
|
||||
- (void)stateReady {
|
||||
// TODO: Here assert sometimes fires with _state = MWMNavigationDashboardStateReady, if app was stopped while navigating and then restarted.
|
||||
// Also in ruler mode when new point is added by single tap on the map state MWMNavigationDashboardStatePlanning is skipped and we get _state = MWMNavigationDashboardStateReady.
|
||||
NSAssert(_state == MWMNavigationDashboardStatePlanning || _state == MWMNavigationDashboardStateReady, @"Invalid state change (ready)");
|
||||
[self setRouteBuilderProgress:100.];
|
||||
[self.navigationDashboardView stateReady];
|
||||
}
|
||||
|
||||
- (void)onRouteStart {
|
||||
self.state = MWMNavigationDashboardStateNavigation;
|
||||
}
|
||||
- (void)onRouteStop {
|
||||
self.state = MWMNavigationDashboardStateHidden;
|
||||
}
|
||||
|
||||
- (void)stateNavigation {
|
||||
[self.navigationDashboardView stateNavigation];
|
||||
[self onNavigationInfoUpdated];
|
||||
}
|
||||
|
||||
#pragma mark - MWMRoutePreviewDelegate
|
||||
|
||||
- (void)routingStartButtonDidTap {
|
||||
[MWMRouter startRouting];
|
||||
}
|
||||
|
||||
- (void)routePreviewDidPressDrivingOptions:(MWMRoutePreview *)routePreview {
|
||||
[[MapViewController sharedController] openDrivingOptions];
|
||||
}
|
||||
|
||||
- (void)ttsButtonDidTap {
|
||||
BOOL const isEnabled = [MWMTextToSpeech tts].active;
|
||||
[MWMTextToSpeech tts].active = !isEnabled;
|
||||
}
|
||||
|
||||
- (void)settingsButtonDidTap {
|
||||
[[MapViewController sharedController] openSettings];
|
||||
}
|
||||
|
||||
- (void)stopRoutingButtonDidTap {
|
||||
[MWMSearch clear];
|
||||
[MWMRouter stopRouting];
|
||||
[self.searchManager close];
|
||||
}
|
||||
|
||||
#pragma mark - SearchOnMapManagerObserver
|
||||
|
||||
- (void)searchManagerWithDidChangeState:(SearchOnMapState)state {
|
||||
[self.navigationDashboardView searchManagerWithDidChangeState:state];
|
||||
}
|
||||
|
||||
#pragma mark - Available area
|
||||
|
||||
+ (void)updateNavigationInfoAvailableArea:(CGRect)frame {
|
||||
[[self sharedManager].navigationDashboardView updateNavigationInfoAvailableArea:frame];
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -1,31 +1,8 @@
|
|||
#import "MWMCircularProgressState.h"
|
||||
#import "MWMRouterType.h"
|
||||
#import "RoutePreviewView.h"
|
||||
|
||||
typedef NS_ENUM(NSInteger, MWMDrivingOptionsState) {
|
||||
MWMDrivingOptionsStateNone,
|
||||
MWMDrivingOptionsStateDefine,
|
||||
MWMDrivingOptionsStateChange
|
||||
};
|
||||
|
||||
@class MWMRoutePreview;
|
||||
|
||||
@protocol MWMRoutePreviewDelegate
|
||||
|
||||
- (void)routePreviewDidPressDrivingOptions:(MWMRoutePreview *)routePreview;
|
||||
|
||||
@end
|
||||
|
||||
@interface MWMRoutePreview : UIView
|
||||
@interface MWMRoutePreview : UIView <RoutePreviewView>
|
||||
|
||||
@property(nonatomic) MWMDrivingOptionsState drivingOptionsState;
|
||||
@property(weak, nonatomic) id<MWMRoutePreviewDelegate> delegate;
|
||||
|
||||
- (void)addToView:(UIView *)superview;
|
||||
- (void)remove;
|
||||
|
||||
- (void)statePrepare;
|
||||
- (void)selectRouter:(MWMRouterType)routerType;
|
||||
- (void)router:(MWMRouterType)routerType setState:(MWMCircularProgressState)state;
|
||||
- (void)router:(MWMRouterType)routerType setProgress:(CGFloat)progress;
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
#import "RoutePreviewView.h"
|
||||
#import "SwiftBridge.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class MWMNavigationDashboardEntity;
|
||||
|
||||
@interface NavigationDashboardView : NSObject
|
||||
|
||||
@property(weak, nonatomic) id<MWMRoutePreviewDelegate> delegate;
|
||||
|
||||
- (instancetype)initWithOwnerView:(UIView *)ownerView;
|
||||
|
||||
- (void)loadPreview;
|
||||
- (void)onNavigationInfoUpdated:(MWMNavigationDashboardEntity *)entity;
|
||||
- (void)setDrivingOptionState:(MWMDrivingOptionsState)state;
|
||||
- (void)searchManagerWithDidChangeState:(SearchOnMapState)state;
|
||||
- (void)updateNavigationInfoAvailableArea:(CGRect)frame;
|
||||
- (void)setRouteBuilderProgress:(MWMRouterType)router progress:(CGFloat)progress;
|
||||
|
||||
- (void)setHidden;
|
||||
- (void)statePrepare;
|
||||
- (void)statePlanning;
|
||||
- (void)stateError:(NSString *_Nonnull)errorMessage;
|
||||
- (void)stateReady;
|
||||
- (void)onRouteStart;
|
||||
- (void)onRouteStop;
|
||||
- (void)onRoutePointsUpdated;
|
||||
- (void)stateNavigation;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
|
@ -0,0 +1,245 @@
|
|||
#import "NavigationDashboardView.h"
|
||||
#import "MWMNavigationDashboardManager.h"
|
||||
#import "MWMMapViewControlsManager.h"
|
||||
#import "MWMNavigationInfoView.h"
|
||||
#import "MWMRoutePreview.h"
|
||||
#import "MWMSearch.h"
|
||||
#import "MapViewController.h"
|
||||
|
||||
#import "SwiftBridge.h"
|
||||
|
||||
NSString *kRoutePreviewIPhoneXibName = @"MWMiPhoneRoutePreview";
|
||||
NSString *kNavigationInfoViewXibName = @"MWMNavigationInfoView";
|
||||
NSString *kNavigationControlViewXibName = @"NavigationControlView";
|
||||
|
||||
@interface NavigationDashboardView()
|
||||
|
||||
@property(nonatomic) IBOutlet MWMBaseRoutePreviewStatus *baseRoutePreviewStatus;
|
||||
@property(nonatomic) IBOutlet MWMNavigationControlView *navigationControlView;
|
||||
@property(nonatomic) IBOutlet MWMNavigationInfoView *navigationInfoView;
|
||||
@property(nonatomic) IBOutlet MWMRoutePreview *routePreview;
|
||||
@property(nonatomic) IBOutlet MWMTransportRoutePreviewStatus *transportRoutePreviewStatus;
|
||||
@property(nonatomic) IBOutletCollection(MWMRouteStartButton) NSArray *goButtons;
|
||||
@property(nonatomic) MWMRouteManagerTransitioningManager *routeManagerTransitioningManager;
|
||||
@property(weak, nonatomic) IBOutlet UIButton *showRouteManagerButton;
|
||||
@property(weak, nonatomic) IBOutlet UIView *goButtonsContainer;
|
||||
@property(weak, nonatomic) UIView *ownerView;
|
||||
|
||||
@end
|
||||
|
||||
@implementation NavigationDashboardView
|
||||
|
||||
- (instancetype)initWithOwnerView:(UIView *)ownerView {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
self.ownerView = ownerView;
|
||||
[self loadPreview];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)loadPreview {
|
||||
[NSBundle.mainBundle loadNibNamed:kRoutePreviewIPhoneXibName owner:self options:nil];
|
||||
auto const ownerView = self.ownerView;
|
||||
self.baseRoutePreviewStatus.ownerView = ownerView;
|
||||
self.transportRoutePreviewStatus.ownerView = ownerView;
|
||||
}
|
||||
|
||||
- (void)setRouteBuilderProgress:(MWMRouterType)router progress:(CGFloat)progress {
|
||||
[self.routePreview router:router setProgress:progress];
|
||||
}
|
||||
|
||||
- (void)onNavigationInfoUpdated:(MWMNavigationDashboardEntity *)entity {
|
||||
[_navigationInfoView onNavigationInfoUpdated:entity];
|
||||
bool const isPublicTransport = ([MWMRouter type] == MWMRouterTypePublicTransport);
|
||||
bool const isRuler = ([MWMRouter type] == MWMRouterTypeRuler);
|
||||
if (isPublicTransport || isRuler)
|
||||
[_transportRoutePreviewStatus onNavigationInfoUpdated:entity prependDistance:isRuler];
|
||||
else
|
||||
[_baseRoutePreviewStatus onNavigationInfoUpdated:entity];
|
||||
[_navigationControlView onNavigationInfoUpdated:entity];
|
||||
}
|
||||
|
||||
- (void)setDrivingOptionState:(MWMDrivingOptionsState)state {
|
||||
self.routePreview.drivingOptionsState = state;
|
||||
}
|
||||
|
||||
- (void)onRoutePointsUpdated {
|
||||
[self.navigationInfoView updateToastView];
|
||||
}
|
||||
|
||||
- (void)updateGoButtonTitle {
|
||||
NSString *title = L(@"p2p_start");
|
||||
|
||||
for (MWMRouteStartButton *button in self.goButtons)
|
||||
[button setTitle:title forState:UIControlStateNormal];
|
||||
}
|
||||
|
||||
#pragma mark - State changes
|
||||
|
||||
- (void)setHidden {
|
||||
self.routePreview = nil;
|
||||
self.navigationInfoView.state = MWMNavigationInfoViewStateHidden;
|
||||
self.navigationInfoView = nil;
|
||||
_navigationControlView.isVisible = NO;
|
||||
_navigationControlView = nil;
|
||||
[self.baseRoutePreviewStatus hide];
|
||||
[_transportRoutePreviewStatus hide];
|
||||
_transportRoutePreviewStatus = nil;
|
||||
}
|
||||
|
||||
- (void)statePrepare {
|
||||
self.navigationInfoView.state = MWMNavigationInfoViewStatePrepare;
|
||||
[self.routePreview addToView:self.ownerView];
|
||||
[self.routePreview statePrepare];
|
||||
[self.routePreview selectRouter:[MWMRouter type]];
|
||||
[self updateGoButtonTitle];
|
||||
[self.baseRoutePreviewStatus hide];
|
||||
[_transportRoutePreviewStatus hide];
|
||||
for (MWMRouteStartButton *button in self.goButtons)
|
||||
[button statePrepare];
|
||||
}
|
||||
|
||||
- (void)statePlanning {
|
||||
// [self statePrepare];
|
||||
[self.routePreview router:[MWMRouter type] setState:MWMCircularProgressStateSpinner];
|
||||
}
|
||||
|
||||
- (void)stateError:(NSString *_Nonnull)errorMessage {
|
||||
[self.routePreview router:[MWMRouter type] setState:MWMCircularProgressStateFailed];
|
||||
[self updateGoButtonTitle];
|
||||
[self.baseRoutePreviewStatus showErrorWithMessage:errorMessage];
|
||||
for (MWMRouteStartButton *button in self.goButtons)
|
||||
[button stateError];
|
||||
}
|
||||
|
||||
- (void)stateReady {
|
||||
[self updateGoButtonTitle];
|
||||
bool const isTransport = ([MWMRouter type] == MWMRouterTypePublicTransport);
|
||||
bool const isRuler = ([MWMRouter type] == MWMRouterTypeRuler);
|
||||
if (isTransport || isRuler)
|
||||
[self.transportRoutePreviewStatus showReady];
|
||||
else
|
||||
[self.baseRoutePreviewStatus showReady];
|
||||
self.goButtonsContainer.hidden = isTransport || isRuler;
|
||||
for (MWMRouteStartButton *button in self.goButtons)
|
||||
{
|
||||
if (isRuler)
|
||||
[button stateHidden];
|
||||
else
|
||||
[button stateReady];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)onRouteStart {
|
||||
}
|
||||
|
||||
- (void)onRouteStop {
|
||||
}
|
||||
|
||||
- (void)stateNavigation {
|
||||
self.routePreview = nil;
|
||||
self.navigationInfoView.state = MWMNavigationInfoViewStateNavigation;
|
||||
self.navigationControlView.isVisible = YES;
|
||||
[self.baseRoutePreviewStatus hide];
|
||||
[_transportRoutePreviewStatus hide];
|
||||
_transportRoutePreviewStatus = nil;
|
||||
}
|
||||
|
||||
#pragma mark - MWMRoutePreviewStatus
|
||||
|
||||
- (IBAction)showRouteManager {
|
||||
MWMRouteManagerViewModel * routeManagerViewModel = [[MWMRouteManagerViewModel alloc] init];
|
||||
MWMRouteManagerViewController * routeManager = [[MWMRouteManagerViewController alloc] initWithViewModel:routeManagerViewModel];
|
||||
routeManager.modalPresentationStyle = UIModalPresentationCustom;
|
||||
|
||||
self.routeManagerTransitioningManager = [[MWMRouteManagerTransitioningManager alloc] init];
|
||||
routeManager.transitioningDelegate = self.routeManagerTransitioningManager;
|
||||
|
||||
[[MapViewController sharedController] presentViewController:routeManager animated:YES completion:nil];
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
@synthesize routePreview = _routePreview;
|
||||
- (MWMRoutePreview *)routePreview {
|
||||
if (!_routePreview)
|
||||
[self loadPreview];
|
||||
return _routePreview;
|
||||
}
|
||||
|
||||
- (void)setRoutePreview:(MWMRoutePreview *)routePreview {
|
||||
if (routePreview == _routePreview)
|
||||
return;
|
||||
[_routePreview remove];
|
||||
_routePreview = routePreview;
|
||||
_routePreview.delegate = self.delegate;
|
||||
}
|
||||
|
||||
- (MWMBaseRoutePreviewStatus *)baseRoutePreviewStatus {
|
||||
if (!_baseRoutePreviewStatus)
|
||||
[self loadPreview];
|
||||
return _baseRoutePreviewStatus;
|
||||
}
|
||||
|
||||
- (MWMTransportRoutePreviewStatus *)transportRoutePreviewStatus {
|
||||
if (!_transportRoutePreviewStatus)
|
||||
[self loadPreview];
|
||||
return _transportRoutePreviewStatus;
|
||||
}
|
||||
|
||||
- (MWMNavigationInfoView *)navigationInfoView {
|
||||
if (!_navigationInfoView) {
|
||||
[NSBundle.mainBundle loadNibNamed:kNavigationInfoViewXibName owner:self options:nil];
|
||||
_navigationInfoView.state = MWMNavigationInfoViewStateHidden;
|
||||
_navigationInfoView.ownerView = self.ownerView;
|
||||
}
|
||||
return _navigationInfoView;
|
||||
}
|
||||
|
||||
- (MWMNavigationControlView *)navigationControlView {
|
||||
if (!_navigationControlView) {
|
||||
[NSBundle.mainBundle loadNibNamed:kNavigationControlViewXibName owner:self options:nil];
|
||||
_navigationControlView.ownerView = self.ownerView;
|
||||
}
|
||||
return _navigationControlView;
|
||||
}
|
||||
|
||||
#pragma mark - Button tap Actions
|
||||
|
||||
- (IBAction)ttsButtonAction {
|
||||
[self.delegate ttsButtonDidTap];
|
||||
}
|
||||
|
||||
- (IBAction)settingsButtonAction {
|
||||
[self.delegate settingsButtonDidTap];
|
||||
}
|
||||
|
||||
- (IBAction)stopRoutingButtonAction {
|
||||
[self.delegate stopRoutingButtonDidTap];
|
||||
}
|
||||
|
||||
- (IBAction)routingStartTouchUpInside {
|
||||
[self.delegate routingStartButtonDidTap];
|
||||
}
|
||||
|
||||
#pragma mark - SearchOnMapManagerObserver
|
||||
|
||||
- (void)searchManagerWithDidChangeState:(SearchOnMapState)state {
|
||||
switch (state) {
|
||||
case SearchOnMapStateClosed:
|
||||
[self.navigationInfoView setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
|
||||
break;
|
||||
case SearchOnMapStateHidden:
|
||||
case SearchOnMapStateSearching:
|
||||
[self.navigationInfoView setMapSearch];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - Available area
|
||||
|
||||
- (void)updateNavigationInfoAvailableArea:(CGRect)frame {
|
||||
_navigationInfoView.availableArea = frame;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
#import "MWMCircularProgressState.h"
|
||||
#import "MWMRouterType.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
typedef NS_ENUM(NSInteger, MWMDrivingOptionsState) {
|
||||
MWMDrivingOptionsStateNone,
|
||||
MWMDrivingOptionsStateDefine,
|
||||
MWMDrivingOptionsStateChange
|
||||
};
|
||||
|
||||
@protocol MWMRoutePreviewDelegate;
|
||||
|
||||
@protocol RoutePreviewView <NSObject>
|
||||
|
||||
@property(nonatomic) MWMDrivingOptionsState drivingOptionsState;
|
||||
@property(weak, nonatomic) id<MWMRoutePreviewDelegate> delegate;
|
||||
|
||||
- (void)addToView:(UIView *)superview;
|
||||
- (void)remove;
|
||||
|
||||
- (void)statePrepare;
|
||||
- (void)selectRouter:(MWMRouterType)routerType;
|
||||
- (void)router:(MWMRouterType)routerType setState:(MWMCircularProgressState)state;
|
||||
- (void)router:(MWMRouterType)routerType setProgress:(CGFloat)progress;
|
||||
|
||||
@end
|
||||
|
||||
@protocol MWMRoutePreviewDelegate <NSObject>
|
||||
|
||||
- (void)routePreviewDidPressDrivingOptions:(id<RoutePreviewView>)routePreview;
|
||||
- (void)ttsButtonDidTap;
|
||||
- (void)settingsButtonDidTap;
|
||||
- (void)stopRoutingButtonDidTap;
|
||||
- (void)routingStartButtonDidTap;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
|
@ -492,6 +492,7 @@
|
|||
ED4DC7792CAEDECC0029B338 /* ProductsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED4DC7742CAEDECC0029B338 /* ProductsViewController.swift */; };
|
||||
ED5BAF4B2D688F5B0088D7B1 /* SearchOnMapHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED5BAF4A2D688F5A0088D7B1 /* SearchOnMapHeaderView.swift */; };
|
||||
ED5E02142D8B17B600A5CC7B /* ModalPresentationStepsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED5E02132D8B17B600A5CC7B /* ModalPresentationStepsController.swift */; };
|
||||
ED5E02522D92E33300A5CC7B /* NavigationDashboardView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED5E02512D92E33300A5CC7B /* NavigationDashboardView.mm */; };
|
||||
ED63CEB92BDF8F9D006155C4 /* SettingsTableViewiCloudSwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED63CEB62BDF8F9C006155C4 /* SettingsTableViewiCloudSwitchCell.swift */; };
|
||||
ED70D55C2D5396F300738C1E /* SearchResult.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED70D55A2D5396F300738C1E /* SearchResult.mm */; };
|
||||
ED70D5892D539A2500738C1E /* SearchOnMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70D5872D539A2500738C1E /* SearchOnMapViewController.swift */; };
|
||||
|
|
@ -1389,6 +1390,10 @@
|
|||
A630D205207CAA3A00976DEA /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
|
||||
A630D206207CAA5800976DEA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
|
||||
AA1C7E3D269A2DD600BAADF2 /* EditTrackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditTrackViewController.swift; sourceTree = "<group>"; };
|
||||
AC4209FF2D79BCEC00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = af; path = af.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
||||
AC420A002D79BCED00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = af; path = af.lproj/Localizable.strings; sourceTree = "<group>"; };
|
||||
AC420A012D79BCED00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = af; path = af.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
|
||||
AC420A022D79BCEE00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = af; path = af.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
|
||||
AC420A082D79BDDA00A64AA9 /* lt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lt; path = lt.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
||||
AC420A092D79BDDA00A64AA9 /* lt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lt; path = lt.lproj/Localizable.strings; sourceTree = "<group>"; };
|
||||
AC420A0A2D79BDDB00A64AA9 /* lt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = lt; path = lt.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
|
||||
|
|
@ -1397,10 +1402,6 @@
|
|||
AC420A142D79C2EC00A64AA9 /* mt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = mt; path = mt.lproj/Localizable.strings; sourceTree = "<group>"; };
|
||||
AC420A152D79C2EC00A64AA9 /* mt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = mt; path = mt.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
|
||||
AC420A162D79C2ED00A64AA9 /* mt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = mt; path = mt.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
|
||||
AC4209FF2D79BCEC00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = af; path = af.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
||||
AC420A002D79BCED00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = af; path = af.lproj/Localizable.strings; sourceTree = "<group>"; };
|
||||
AC420A012D79BCED00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = af; path = af.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
|
||||
AC420A022D79BCEE00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = af; path = af.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
|
||||
AC79C8912A65AB9500594C24 /* UIColor+hexString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+hexString.swift"; sourceTree = "<group>"; };
|
||||
B33D21AE20DAF9F000BAD749 /* Toast.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Toast.swift; sourceTree = "<group>"; };
|
||||
B3E3B4FC20D463B700DA8C13 /* BMCCategoriesHeader.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BMCCategoriesHeader.xib; sourceTree = "<group>"; };
|
||||
|
|
@ -1467,6 +1468,9 @@
|
|||
ED4DC7752CAEDECC0029B338 /* ProductsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductsViewModel.swift; sourceTree = "<group>"; };
|
||||
ED5BAF4A2D688F5A0088D7B1 /* SearchOnMapHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchOnMapHeaderView.swift; sourceTree = "<group>"; };
|
||||
ED5E02132D8B17B600A5CC7B /* ModalPresentationStepsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalPresentationStepsController.swift; sourceTree = "<group>"; };
|
||||
ED5E024F2D92AC9300A5CC7B /* RoutePreviewView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoutePreviewView.h; sourceTree = "<group>"; };
|
||||
ED5E02502D92E33300A5CC7B /* NavigationDashboardView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NavigationDashboardView.h; sourceTree = "<group>"; };
|
||||
ED5E02512D92E33300A5CC7B /* NavigationDashboardView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NavigationDashboardView.mm; sourceTree = "<group>"; };
|
||||
ED63CEB62BDF8F9C006155C4 /* SettingsTableViewiCloudSwitchCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewiCloudSwitchCell.swift; sourceTree = "<group>"; };
|
||||
ED70D5582D5396F300738C1E /* SearchItemType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SearchItemType.h; sourceTree = "<group>"; };
|
||||
ED70D5592D5396F300738C1E /* SearchResult.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SearchResult.h; sourceTree = "<group>"; };
|
||||
|
|
@ -2550,9 +2554,12 @@
|
|||
34AB65FE1FC5AA320078E451 /* MWMiPhoneRoutePreview.xib */,
|
||||
34AB65FF1FC5AA320078E451 /* MWMRoutePreview.h */,
|
||||
34AB65FD1FC5AA320078E451 /* MWMRoutePreview.mm */,
|
||||
ED5E024F2D92AC9300A5CC7B /* RoutePreviewView.h */,
|
||||
34AB65D71FC5AA320078E451 /* RouteManager */,
|
||||
34AB65EC1FC5AA320078E451 /* RoutePreviewStatus */,
|
||||
34AB65D51FC5AA320078E451 /* RouteStartButton.swift */,
|
||||
ED5E02502D92E33300A5CC7B /* NavigationDashboardView.h */,
|
||||
ED5E02512D92E33300A5CC7B /* NavigationDashboardView.mm */,
|
||||
);
|
||||
path = RoutePreview;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -4632,6 +4639,7 @@
|
|||
993DF12223F6BDB100AC231A /* UINavigationItemRenderer.swift in Sources */,
|
||||
993DF12B23F6BDB100AC231A /* StyleManager.swift in Sources */,
|
||||
ED43B8BD2C12063500D07BAA /* DocumentPicker.swift in Sources */,
|
||||
ED5E02522D92E33300A5CC7B /* NavigationDashboardView.mm in Sources */,
|
||||
470E1674252AD7F2002D201A /* BookmarksListInfoViewController.swift in Sources */,
|
||||
47B9065521C7FA400079C85E /* NSString+MD5.m in Sources */,
|
||||
ED5BAF4B2D688F5B0088D7B1 /* SearchOnMapHeaderView.swift in Sources */,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue