From 72a5052a10e5c393a987f9957a100bf60602c3b5 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 15 Jan 2016 16:09:35 +0300 Subject: [PATCH] [ios] Fixed authorization check on edit. --- .../Classes/Editor/MWMEditorViewController.mm | 24 +++++++-- .../MWMOpeningHoursEditorViewController.mm | 13 ----- iphone/Maps/Mapsme.storyboard | 53 ++++++++++--------- 3 files changed, 48 insertions(+), 42 deletions(-) diff --git a/iphone/Maps/Classes/Editor/MWMEditorViewController.mm b/iphone/Maps/Classes/Editor/MWMEditorViewController.mm index 650ce00e86..07288cd5b6 100644 --- a/iphone/Maps/Classes/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/Classes/Editor/MWMEditorViewController.mm @@ -1,3 +1,4 @@ +#import "MWMAuthorizationCommon.h" #import "MWMCuisineEditorViewController.h" #import "MWMEditorCommon.h" #import "MWMEditorSelectTableViewCell.h" @@ -8,6 +9,7 @@ #import "MWMOpeningHoursEditorViewController.h" #import "MWMPlacePageOpeningHoursCell.h" #import "MWMStreetEditorViewController.h" +#import "Statistics.h" #include "std/algorithm.hpp" @@ -93,10 +95,17 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType) - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - if (self.needsReload) + [self checkAuthorization]; + [self reloadData]; +} + +- (void)checkAuthorization +{ + if (!MWMAuthorizationHaveCredentials()) { - [self.tableView reloadData]; - self.needsReload = NO; + [[Statistics instance] logEvent:kStatEventName(kStatPlacePage, kStatEditTime) + withParameters:@{kStatValue : kStatAuthorization}]; + [self performSegueWithIdentifier:@"Editor2AuthorizationSegue" sender:nil]; } } @@ -162,6 +171,15 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType) #pragma mark - Table +- (void)reloadData +{ + if (self.needsReload) + { + [self.tableView reloadData]; + self.needsReload = NO; + } +} + - (void)configTable { NSAssert(self.entity, @"Entity must be set"); diff --git a/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm b/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm index 4b9bbf68d0..ac4d49ed29 100644 --- a/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm +++ b/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm @@ -1,10 +1,8 @@ -#import "MWMAuthorizationCommon.h" #import "MWMOpeningHoursAddScheduleTableViewCell.h" #import "MWMOpeningHoursEditorViewController.h" #import "MWMOpeningHoursModel.h" #import "MWMOpeningHoursSection.h" #import "MWMTextView.h" -#import "Statistics.h" extern NSDictionary * const kMWMOpeningHoursEditorTableCells = @{ @(MWMOpeningHoursEditorDaysSelectorCell) : @"MWMOpeningHoursDaysSelectorTableViewCell", @@ -44,23 +42,12 @@ extern NSDictionary * const kMWMOpeningHoursEditorTableCells = @{ - (void)viewDidLoad { [super viewDidLoad]; - [self checkAuthorization]; [self configNavBar]; [self configTable]; [self configAdvancedEditor]; [self configData]; } -- (void)checkAuthorization -{ - if (!MWMAuthorizationHaveCredentials()) - { - [[Statistics instance] logEvent:kStatEventName(kStatPlacePage, kStatEditTime) - withParameters:@{kStatValue : kStatAuthorization}]; - [self performSegueWithIdentifier:@"OpeningHoursEditor2Authorization" sender:nil]; - } -} - #pragma mark - Configuration - (void)configNavBar diff --git a/iphone/Maps/Mapsme.storyboard b/iphone/Maps/Mapsme.storyboard index f881c8fcbf..763bd775b5 100644 --- a/iphone/Maps/Mapsme.storyboard +++ b/iphone/Maps/Mapsme.storyboard @@ -10,6 +10,7 @@ HelveticaNeue-Medium + HelveticaNeue-Medium @@ -64,10 +65,10 @@ - + - + - + - + - + - +