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

[ios] Editor.

Browse source
This commit is contained in:
VladiMihaylenko 2016-04-19 12:53:45 +03:00
parent f7e8e9ccc6
commit c4e4cafe2a
24 changed files with 544 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h
View file

@ -36,6 +36,9 @@
- (void)presentDownloaderNotEnoughSpaceAlert;
- (void)presentDownloaderInternalErrorAlertWithOkBlock:(nonnull TMWMVoidBlock)okBlock cancelBlock:(nonnull TMWMVoidBlock)cancelBlock;
- (void)presentDownloaderNeedUpdateAlertWithOkBlock:(nonnull TMWMVoidBlock)okBlock;
- (void)presentPlaceDoesntExistAlertWithBlock:(nonnull MWMStringBlock)block;
- (void)presentResetChangesAlertWithBlock:(nonnull TMWMVoidBlock)block;
- (void)presentDeleteFeatureAlertWithBlock:(nonnull TMWMVoidBlock)block;
- (void)presentEditorViralAlert;
- (void)presentOsmAuthAlert;
- (void)closeAlert;

15
iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
View file

@ -178,6 +178,21 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
[self displayAlert:[MWMAlert downloaderNeedUpdateAlertWithOkBlock:okBlock]];
}
- (void)presentPlaceDoesntExistAlertWithBlock:(MWMStringBlock)block
{
[self displayAlert:[MWMAlert placeDoesntExistAlertWithBlock:block]];
}
- (void)presentResetChangesAlertWithBlock:(TMWMVoidBlock)block
{
[self displayAlert:[MWMAlert resetChangesAlertWithBlock:block]];
}
- (void)presentDeleteFeatureAlertWithBlock:(TMWMVoidBlock)block
{
[self displayAlert:[MWMAlert deleteFeatureAlertWithBlock:block]];
}
- (void)presentEditorViralAlert
{
[self displayAlert:[MWMAlert editorViralAlert]];

3
iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h
View file

@ -36,6 +36,9 @@ using TMWMDownloadBlock = void (^)(storage::TCountriesVec const &, TMWMVoidBlock
+ (MWMAlert *)downloaderNotEnoughSpaceAlert;
+ (MWMAlert *)downloaderInternalErrorAlertWithOkBlock:(TMWMVoidBlock)okBlock cancelBlock:(TMWMVoidBlock)cancelBlock;
+ (MWMAlert *)downloaderNeedUpdateAlertWithOkBlock:(TMWMVoidBlock)okBlock;
+ (MWMAlert *)placeDoesntExistAlertWithBlock:(MWMStringBlock)block;
+ (MWMAlert *)resetChangesAlertWithBlock:(TMWMVoidBlock)block;
+ (MWMAlert *)deleteFeatureAlertWithBlock:(TMWMVoidBlock)block;
+ (MWMAlert *)editorViralAlert;
+ (MWMAlert *)osmAuthAlert;
- (void)close;

16
iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
View file

@ -8,6 +8,7 @@
#import "MWMLocationAlert.h"
#import "MWMOsmAuthAlert.h"
#import "MWMPedestrianShareAlert.h"
#import "MWMPlaceDoesntExistAlert.h"
#import "MWMRateAlert.h"
#import "MWMRoutingDisclaimerAlert.h"
@ -163,6 +164,21 @@
return [MWMDefaultAlert downloaderNeedUpdateAlertWithOkBlock:okBlock];
}
+ (MWMAlert *)placeDoesntExistAlertWithBlock:(MWMStringBlock)block
{
return [MWMPlaceDoesntExistAlert alertWithBlock:block];
}
+ (MWMAlert *)resetChangesAlertWithBlock:(TMWMVoidBlock)block
{
return [MWMDefaultAlert resetChangesAlertWithBlock:block];
}
+ (MWMAlert *)deleteFeatureAlertWithBlock:(TMWMVoidBlock)block
{
return [MWMDefaultAlert resetChangesAlertWithBlock:block];
}
+ (MWMAlert *)editorViralAlert
{
return [MWMEditorViralAlert alert];

2
iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
View file

@ -26,5 +26,7 @@
+ (instancetype)downloaderInternalErrorAlertWithOkBlock:(TMWMVoidBlock)okBlock cancelBlock:(TMWMVoidBlock)cancelBlock;
+ (instancetype)downloaderNeedUpdateAlertWithOkBlock:(TMWMVoidBlock)okBlock;
+ (instancetype)routingMigrationAlertWithOkBlock:(TMWMVoidBlock)okBlock;
+ (instancetype)resetChangesAlertWithBlock:(TMWMVoidBlock)block;
+ (instancetype)deleteFeatureAlertWithBlock:(TMWMVoidBlock)block;
@end

22
iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
View file

@ -319,6 +319,28 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert";
return alert;
}
+ (instancetype)resetChangesAlertWithBlock:(TMWMVoidBlock)block
{
kStatisticsEvent = @"Reset changes alert";
MWMDefaultAlert * alert = [self defaultAlertWithTitle:@"editor_reset_edits_message"
message:nil
rightButtonTitle:@"editor_reset_edits_button"
leftButtonTitle:@"cancel"
rightButtonAction:block];
return alert;
}
+ (instancetype)deleteFeatureAlertWithBlock:(TMWMVoidBlock)block
{
kStatisticsEvent = @"Delete feature alert";
MWMDefaultAlert * alert = [self defaultAlertWithTitle:@"editor_remove_place_message"
message:nil
rightButtonTitle:@"editor_remove_place_button"
leftButtonTitle:@"cancel"
rightButtonAction:block];
return alert;
}
+ (instancetype)defaultAlertWithTitle:(nonnull NSString *)title
message:(nullable NSString *)message
rightButtonTitle:(nonnull NSString *)rightButtonTitle

7
iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.h Normal file
View file

@ -0,0 +1,7 @@
#import "MWMAlert.h"
@interface MWMPlaceDoesntExistAlert : MWMAlert
+ (instancetype)alertWithBlock:(MWMStringBlock)block;
@end

93
iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.mm Normal file
View file

@ -0,0 +1,93 @@
#import "MWMPlaceDoesntExistAlert.h"
// This private class needs for change default text field's content inset.
@interface _MWMTextField : UITextField
@end
@implementation _MWMTextField
// placeholder position
- (CGRect)textRectForBounds:(CGRect)bounds
{
return CGRectInset(bounds, 4, 4);
}
// text position
- (CGRect)editingRectForBounds:(CGRect)bounds
{
return CGRectInset(bounds, 4, 4);
}
@end
@interface MWMPlaceDoesntExistAlert ()
@property (weak, nonatomic) IBOutlet UITextField * textField;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * centerHorizontaly;
@property (copy, nonatomic) MWMStringBlock block;
@end
@implementation MWMPlaceDoesntExistAlert
+ (instancetype)alertWithBlock:(MWMStringBlock)block
{
MWMPlaceDoesntExistAlert * alert = [[[NSBundle mainBundle] loadNibNamed:[MWMPlaceDoesntExistAlert className] owner:nil
options:nil] firstObject];
alert.block = block;
[[NSNotificationCenter defaultCenter] addObserver:alert
selector:@selector(keyboardWillShow:)
name:UIKeyboardWillShowNotification
object:nil];
[[NSNotificationCenter defaultCenter] addObserver:alert
selector:@selector(keyboardWillHide:)
name:UIKeyboardWillHideNotification
object:nil];
return alert;
}
- (IBAction)rightButtonTap
{
[self.textField resignFirstResponder];
[self close];
self.block(self.textField.text);
}
- (IBAction)leftButtonTap
{
[self.textField resignFirstResponder];
[self close];
}
- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver:self];
}
- (void)keyboardWillShow:(NSNotification *)notification
{
CGFloat const keyboardHeight = [notification.userInfo[UIKeyboardFrameBeginUserInfoKey] CGRectValue].size.height;
NSNumber * rate = notification.userInfo[UIKeyboardAnimationDurationUserInfoKey];
[self setNeedsLayout];
self.centerHorizontaly.constant = - keyboardHeight / 2;
[UIView animateWithDuration:rate.floatValue animations:^
{
[self layoutIfNeeded];
}];
}
- (void)keyboardWillHide:(NSNotification *)notification
{
NSNumber * rate = notification.userInfo[UIKeyboardAnimationDurationUserInfoKey];
[self setNeedsLayout];
self.centerHorizontaly.constant = 0;
[UIView animateWithDuration:rate.floatValue animations:^
{
[self layoutIfNeeded];
}];
}
@end

4
iphone/Maps/Classes/Editor/Cuisine/MWMCuisineEditorViewController.mm
View file

@ -61,9 +61,9 @@ vector<string> SliceKeys(vector<pair<string, string>> const & v)
- (void)keyboardWillShow:(NSNotification *)notification
{
CGSize const keyboardSize = [[[notification userInfo] objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue].size;
CGSize const keyboardSize = [notification.userInfo[UIKeyboardFrameBeginUserInfoKey] CGRectValue].size;
CGFloat const bottomInset = UIInterfaceOrientationIsPortrait([[UIApplication sharedApplication] statusBarOrientation]) ?
keyboardSize.height : keyboardSize.width;
keyboardSize.height : keyboardSize.width;
UIEdgeInsets const contentInsets = {.bottom = bottomInset};

7
iphone/Maps/Classes/Editor/MWMEditorCategoryCell.mm
View file

@ -3,6 +3,11 @@
#import "UIColor+MapsMeColor.h"
#import "UIImageView+Coloring.h"
namespace
{
CGFloat const kDetailShortRightSpace = 16;
} // namespace
@interface MWMEditorCategoryCell ()
@property (weak, nonatomic) IBOutlet UIImageView * accessoryIcon;
@ -27,7 +32,7 @@
else
{
self.selectionStyle = UITableViewCellSelectionStyleNone;
self.detailRightSpace.constant -= self.accessoryIcon.width / 2;
self.detailRightSpace.constant = kDetailShortRightSpace;
}
}

3
iphone/Maps/Classes/Editor/MWMEditorCommon.h
View file

@ -8,7 +8,4 @@
- (void)cellSelect:(UITableViewCell *)cell;
- (void)tryToChangeInvalidStateForCell:(MWMEditorTextTableViewCell *)cell;
@optional
- (void)fieldIsCorrect:(BOOL)isCorrect;
@end

5
iphone/Maps/Classes/Editor/MWMEditorNotesFooter.h Normal file
View file

@ -0,0 +1,5 @@
@interface MWMEditorNotesFooter : UIView
+ (instancetype)footer;
@end

24
iphone/Maps/Classes/Editor/MWMEditorNotesFooter.mm Normal file
View file

@ -0,0 +1,24 @@
#import "MWMEditorNotesFooter.h"
@implementation MWMEditorNotesFooter
+ (instancetype)footer
{
MWMEditorNotesFooter * f = [[[NSBundle mainBundle] loadNibNamed:[MWMEditorNotesFooter className] owner:nil options:nil]
firstObject];
[f setNeedsLayout];
[f layoutIfNeeded];
NSAssert(f.subviews.firstObject, @"Subviews can't be empty!");
f.height = f.subviews.firstObject.height;
return f;
}
- (IBAction)osmTap
{
NSURL * url = [NSURL URLWithString:@"https://www.openstreetmap.org/about"];
UIApplication * app = [UIApplication sharedApplication];
if ([app canOpenURL:url])
[app openURL:url];
}
@end

219
iphone/Maps/Classes/Editor/MWMEditorViewController.mm
View file

@ -1,14 +1,19 @@
#import "MapsAppDelegate.h"
#import "MWMAlertViewController.h"
#import "MWMAuthorizationCommon.h"
#import "MWMCuisineEditorViewController.h"
#import "MWMDropDown.h"
#import "MWMEditorCategoryCell.h"
#import "MWMEditorCommon.h"
#import "MWMEditorNotesFooter.h"
#import "MWMEditorSelectTableViewCell.h"
#import "MWMEditorSwitchTableViewCell.h"
#import "MWMEditorTextTableViewCell.h"
#import "MWMEditorViewController.h"
#import "MWMNoteCell.h"
#import "MWMObjectsCategorySelectorController.h"
#import "MWMOpeningHoursEditorViewController.h"
#import "MWMNoteButtonCell.h"
#import "MWMPlacePageEntity.h"
#import "MWMPlacePageOpeningHoursCell.h"
#import "MWMStreetEditorViewController.h"
@ -25,22 +30,27 @@ NSString * const kOpeningHoursEditorSegue = @"Editor2OpeningHoursEditorSegue";
NSString * const kCuisineEditorSegue = @"Editor2CuisineEditorSegue";
NSString * const kStreetEditorSegue = @"Editor2StreetEditorSegue";
NSString * const kCategoryEditorSegue = @"Editor2CategoryEditorSegue";
CGFloat const kDefaultFooterHeight = 32.;
typedef NS_ENUM(NSUInteger, MWMEditorSection)
{
MWMEditorSectionCategory,
MWMEditorSectionName,
MWMEditorSectionAddress,
MWMEditorSectionDetails
MWMEditorSectionDetails,
MWMEditorSectionNote,
MWMEditorSectionButton
};
vector<MWMPlacePageCellType> const kSectionCategoryCellTypes{MWMPlacePageCellTypeCategory};
vector<MWMPlacePageCellType> const kSectionNameCellTypes{MWMPlacePageCellTypeName};
vector<MWMPlacePageCellType> const kSectionAddressCellTypes{
MWMPlacePageCellTypeStreet, MWMPlacePageCellTypeBuilding, MWMPlacePageCellTypeZipCode};
vector<MWMPlacePageCellType> const kSectionNoteCellTypes{MWMPlacePageCellTypeNote};
vector<MWMPlacePageCellType> const kSectionButtonCellTypes{MWMPlacePageCellTypeReportButton};
MWMPlacePageCellTypeValueMap const kCellType2ReuseIdentifier{
{MWMPlacePageCellTypeCategory, "MWMEditorCategoryCell"},
{MWMPlacePageCellTypeName, "MWMEditorNameTableViewCell"},
@ -54,7 +64,9 @@ MWMPlacePageCellTypeValueMap const kCellType2ReuseIdentifier{
{MWMPlacePageCellTypeEmail, "MWMEditorTextTableViewCell"},
{MWMPlacePageCellTypeOperator, "MWMEditorTextTableViewCell"},
{MWMPlacePageCellTypeCuisine, "MWMEditorSelectTableViewCell"},
{MWMPlacePageCellTypeWiFi, "MWMEditorSwitchTableViewCell"}};
{MWMPlacePageCellTypeWiFi, "MWMEditorSwitchTableViewCell"},
{MWMPlacePageCellTypeNote, "MWMNoteCell"},
{MWMPlacePageCellTypeReportButton, "MWMNoteButtonCell"}};
NSString * reuseIdentifier(MWMPlacePageCellType cellType)
{
@ -122,10 +134,14 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
UITextFieldDelegate, MWMOpeningHoursEditorProtocol,
MWMPlacePageOpeningHoursCellProtocol,
MWMEditorCellProtocol, MWMCuisineEditorProtocol,
MWMStreetEditorProtocol, MWMObjectsCategorySelectorDelegate>
MWMStreetEditorProtocol, MWMObjectsCategorySelectorDelegate,
MWMNoteCelLDelegate>
@property (nonatomic) NSMutableDictionary<NSString *, UITableViewCell *> * offscreenCells;
@property (nonatomic) NSMutableArray<NSIndexPath *> * invalidCells;
@property (nonatomic) MWMEditorNotesFooter * footer;
@property (copy, nonatomic) NSString * note;
@property (nonatomic) osm::Editor::FeatureStatus featureStatus;
@end
@ -142,6 +158,8 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
[super viewDidLoad];
[self configTable];
[self configNavBar];
auto const & featureID = m_mapObject.GetID();
self.featureStatus = osm::Editor::Instance().GetFeatureStatus(featureID.m_mwmId, featureID.m_index);
}
- (void)setFeatureToEdit:(FeatureID const &)fid
@ -215,13 +233,27 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
auto & f = GetFramework();
auto const & featureID = m_mapObject.GetID();
NSDictionary * info = @{kStatEditorMWMName : @(featureID.GetMwmName().c_str()),
NSDictionary<NSString *, NSString *> * info = @{kStatEditorMWMName : @(featureID.GetMwmName().c_str()),
kStatEditorMWMVersion : @(featureID.GetMwmVersion())};
BOOL const haveNote = self.note.length;
if (haveNote)
{
auto const latLon = m_mapObject.GetLatLon();
NSMutableDictionary * noteInfo = [info mutableCopy];
noteInfo[kStatProblem] = self.note;
noteInfo[kStatLat] = @(latLon.lat);
noteInfo[kStatLon] = @(latLon.lon);
[Statistics logEvent:kStatEditorProblemReport withParameters:noteInfo];
osm::Editor::Instance().CreateNote(latLon, featureID, self.note.UTF8String);
}
switch (f.SaveEditedMapObject(m_mapObject))
{
case osm::Editor::NothingWasChanged:
case osm::Editor::NothingWasChanged:
[self.navigationController popToRootViewControllerAnimated:YES];
if (haveNote)
[self showDropDown];
break;
case osm::Editor::SavedSuccessfully:
[Statistics logEvent:(self.isCreating ? kStatEditorAddSuccess : kStatEditorEditSuccess) withParameters:info];
@ -236,6 +268,20 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
}
}
- (void)showDropDown
{
UIViewController * parent = static_cast<UIViewController *>([MapsAppDelegate theApp].mapViewController);
MWMDropDown * dd = [[MWMDropDown alloc] initWithSuperview:parent.view];
[dd showWithMessage:L(@"editor_edits_sent_message")];
}
- (MWMEditorNotesFooter *)footer
{
if (!_footer)
_footer = [MWMEditorNotesFooter footer];
return _footer;
}
#pragma mark - Offscreen cells
- (UITableViewCell *)offscreenCellForIdentifier:(NSString *)reuseIdentifier
@ -283,6 +329,15 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
registerCellsForTableView(cells, self.tableView);
}
}
m_sections.push_back(MWMEditorSectionNote);
m_cells[MWMEditorSectionNote] = kSectionNoteCellTypes;
registerCellsForTableView(kSectionNoteCellTypes, self.tableView);
if (self.isCreating)
return;
m_sections.push_back(MWMEditorSectionButton);
m_cells[MWMEditorSectionButton] = kSectionButtonCellTypes;
registerCellsForTableView(kSectionButtonCellTypes, self.tableView);
}
- (MWMPlacePageCellType)cellTypeForIndexPath:(NSIndexPath *)indexPath
@ -441,6 +496,35 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
placeholder:L(@"select_cuisine")];
break;
}
case MWMPlacePageCellTypeNote:
{
MWMNoteCell * tCell = static_cast<MWMNoteCell *>(cell);
[tCell configWithDelegate:self noteText:self.note];
break;
}
case MWMPlacePageCellTypeReportButton:
{
MWMNoteButtonCell * tCell = static_cast<MWMNoteButtonCell *>(cell);
auto title = ^ NSString * (osm::Editor::FeatureStatus s)
{
switch (s)
{
case osm::Editor::FeatureStatus::Untouched:
return L(@"editor_place_doesnt_exist");
case osm::Editor::FeatureStatus::Deleted:
NSAssert(false, @"Incorrect feature status!");
return L(@"editor_place_doesnt_exist");
case osm::Editor::FeatureStatus::Modified:
return L(@"editor_reset_edits_button");
case osm::Editor::FeatureStatus::Created:
return L(@"editor_remove_place_message");
}
};
[tCell configureWithDelegate:self title:title(self.featureStatus)];
break;
}
default:
NSAssert(false, @"Invalid field for editor");
break;
@ -483,7 +567,10 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
case MWMPlacePageCellTypeOpenHours:
return ((MWMPlacePageOpeningHoursCell *)cell).cellHeight;
case MWMPlacePageCellTypeCategory:
case MWMPlacePageCellTypeReportButton:
return self.tableView.rowHeight;
case MWMPlacePageCellTypeNote:
return static_cast<MWMNoteCell *>(cell).cellHeight;
default:
{
[cell setNeedsUpdateConstraints];
@ -503,7 +590,10 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
{
case MWMEditorSectionName:
case MWMEditorSectionCategory:
case MWMEditorSectionButton:
return nil;
case MWMEditorSectionNote:
return L(@"editor_notes_header");
case MWMEditorSectionAddress:
return L(@"address");
case MWMEditorSectionDetails:
@ -520,10 +610,43 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
case MWMEditorSectionAddress:
case MWMEditorSectionDetails:
case MWMEditorSectionCategory:
case MWMEditorSectionNote:
case MWMEditorSectionButton:
return nil;
}
}
- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
{
switch (m_sections[section])
{
case MWMEditorSectionAddress:
case MWMEditorSectionDetails:
case MWMEditorSectionCategory:
case MWMEditorSectionName:
case MWMEditorSectionButton:
return nil;
case MWMEditorSectionNote:
return self.footer;
}
}
- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
{
switch (m_sections[section])
{
case MWMEditorSectionAddress:
case MWMEditorSectionDetails:
case MWMEditorSectionCategory:
return 0.;
case MWMEditorSectionNote:
return self.footer.height;
case MWMEditorSectionName:
case MWMEditorSectionButton:
return kDefaultFooterHeight;
}
}
#pragma mark - MWMPlacePageOpeningHoursCellProtocol
- (BOOL)forcedButton
@ -559,6 +682,24 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
[self.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
}
#pragma mark - MWMNoteCellDelegate
- (void)cellShouldChangeSize:(MWMNoteCell *)cell text:(NSString *)text
{
self.offscreenCells[reuseIdentifier(MWMPlacePageCellTypeNote)] = cell;
self.note = text;
[self.tableView beginUpdates];
[self.tableView endUpdates];
[self.tableView scrollToRowAtIndexPath:[self.tableView indexPathForCell:cell]
atScrollPosition:UITableViewScrollPositionBottom
animated:YES];
}
- (void)cell:(MWMNoteCell *)cell didFinishEditingWithText:(NSString *)text
{
self.note = text;
}
#pragma mark - MWMEditorCellProtocol
- (void)tryToChangeInvalidStateForCell:(MWMEditorTextTableViewCell *)cell
@ -624,18 +765,68 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
MWMPlacePageCellType const cellType = [self cellTypeForIndexPath:indexPath];
switch (cellType)
{
case MWMPlacePageCellTypeStreet:
[self performSegueWithIdentifier:kStreetEditorSegue sender:nil];
case MWMPlacePageCellTypeStreet:
[self performSegueWithIdentifier:kStreetEditorSegue sender:nil];
break;
case MWMPlacePageCellTypeCuisine:
[self performSegueWithIdentifier:kCuisineEditorSegue sender:nil];
break;
case MWMPlacePageCellTypeCategory:
[self performSegueWithIdentifier:kCategoryEditorSegue sender:nil];
break;
case MWMPlacePageCellTypeReportButton:
switch (self.featureStatus)
{
case osm::Editor::FeatureStatus::Untouched:
{
__weak auto wself = self;
[self.alertController presentPlaceDoesntExistAlertWithBlock:^(NSString * additionalMessage)
{
__strong auto self = wself;
auto const & fid = self->m_mapObject.GetID();
auto const latLon = self->m_mapObject.GetLatLon();
if (additionalMessage.length)
{
//TODO(Vlad): Pass additional message as second parametr into CreateNote.
}
[Statistics logEvent:kStatEditorProblemReport withParameters:@{
kStatEditorMWMName : @(fid.GetMwmName().c_str()),
kStatEditorMWMVersion : @(fid.GetMwmVersion()),
kStatProblem : @(osm::Editor::kPlaceDoesNotExistMessage),
kStatLat : @(latLon.lat), kStatLon : @(latLon.lon)}];
osm::Editor::Instance().CreateNote(latLon, fid, osm::Editor::kPlaceDoesNotExistMessage);
[self backTap];
[self showDropDown];
}];
break;
case MWMPlacePageCellTypeCuisine:
[self performSegueWithIdentifier:kCuisineEditorSegue sender:nil];
}
case osm::Editor::FeatureStatus::Modified:
{
[self.alertController presentResetChangesAlertWithBlock:^
{
// TODO(Vlad): reset all changes
[self backTap];
}];
break;
case MWMPlacePageCellTypeCategory:
[self performSegueWithIdentifier:kCategoryEditorSegue sender:nil];
}
case osm::Editor::FeatureStatus::Created:
{
[self.alertController presentDeleteFeatureAlertWithBlock:^
{
//TODO(Vlad): delete feature
[self backTap];
}];
break;
default:
NSAssert(false, @"Invalid field for cellSelect");
}
case osm::Editor::FeatureStatus::Deleted:
break;
}
break;
default:
NSAssert(false, @"Invalid field for cellSelect");
break;
}
}

8
iphone/Maps/Classes/Editor/MWMNoteButtonCell.h Normal file
View file

@ -0,0 +1,8 @@
#import "MWMEditorCommon.h"
#import "MWMTableViewCell.h"
@interface MWMNoteButtonCell : MWMTableViewCell
- (void)configureWithDelegate:(id<MWMEditorCellProtocol>)delegate title:(NSString *)title;
@end

23
iphone/Maps/Classes/Editor/MWMNoteButtonCell.m Normal file
View file

@ -0,0 +1,23 @@
#import "MWMNoteButtonCell.h"
@interface MWMNoteButtonCell ()
@property (weak, nonatomic) IBOutlet UIButton * button;
@property (weak, nonatomic) id<MWMEditorCellProtocol> delegate;
@end
@implementation MWMNoteButtonCell
- (void)configureWithDelegate:(id<MWMEditorCellProtocol>)delegate title:(NSString *)title
{
[self.button setTitle:title forState:UIControlStateNormal];
self.delegate = delegate;
}
- (IBAction)buttonTap
{
[self.delegate cellSelect:self];
}
@end

17
iphone/Maps/Classes/Editor/MWMNoteCell.h Normal file
View file

@ -0,0 +1,17 @@
#import "MWMTableViewCell.h"
@class MWMNoteCell;
@protocol MWMNoteCelLDelegate <NSObject>
- (void)cellShouldChangeSize:(MWMNoteCell *)cell text:(NSString *)text;
- (void)cell:(MWMNoteCell *)cell didFinishEditingWithText:(NSString *)text;
@end
@interface MWMNoteCell : MWMTableViewCell
- (void)configWithDelegate:(id<MWMNoteCelLDelegate>)delegate noteText:(NSString *)text;
- (CGFloat)cellHeight;
@end

88
iphone/Maps/Classes/Editor/MWMNoteCell.mm Normal file
View file

@ -0,0 +1,88 @@
#import "MWMNoteCell.h"
namespace
{
CGFloat const kMinimalTextViewHeight = 104.;
CGFloat const kTopTextViewOffset = 12.;
NSString * const kTextViewContentSizeKeyPath = @"contentSize";
} // namespace
@interface MWMNoteCell () <UITextViewDelegate>
@property (weak, nonatomic) IBOutlet UITextView * textView;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * textViewHeight;
@property (weak, nonatomic) id<MWMNoteCelLDelegate> delegate;
@end
static void * kContext = &kContext;
@implementation MWMNoteCell
- (void)configWithDelegate:(id<MWMNoteCelLDelegate>)delegate noteText:(NSString *)text
{
self.delegate = delegate;
self.textView.text = text;
}
- (void)observeValueForKeyPath:(NSString *)keyPath
ofObject:(id)object
change:(NSDictionary *)change
context:(void *)context
{
if (context == kContext)
{
NSValue * s = change[@"new"];
CGFloat const height = s.CGSizeValue.height;
if (height > kMinimalTextViewHeight)
{
self.textViewHeight.constant = height;
[self.delegate cellShouldChangeSize:self text:self.textView.text];
}
else
{
CGFloat const currentHeight = self.textViewHeight.constant;
if (currentHeight > kMinimalTextViewHeight)
{
self.textViewHeight.constant = kMinimalTextViewHeight;
[self.delegate cellShouldChangeSize:self text:self.textView.text];
}
}
[self setNeedsLayout];
[self layoutIfNeeded];
return;
}
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
}
- (CGFloat)cellHeight
{
return self.textViewHeight.constant + 2 * kTopTextViewOffset;
}
- (void)textViewDidEndEditing:(UITextView *)textView
{
[self.delegate cell:self didFinishEditingWithText:textView.text];
[self unregisterObserver];
}
- (void)textViewDidBeginEditing:(UITextView *)textView
{
[self registerObserver];
}
- (void)unregisterObserver
{
[self.textView removeObserver:self forKeyPath:kTextViewContentSizeKeyPath context:kContext];
}
- (void)registerObserver
{
[self.textView addObserver:self forKeyPath:kTextViewContentSizeKeyPath options:NSKeyValueObservingOptionNew context:kContext];
}
@end

2
iphone/Maps/Classes/Editor/MWMObjectsCategorySelectorController.mm
View file

@ -65,7 +65,7 @@ namespace
- (void)keyboardWillShow:(NSNotification *)notification
{
CGSize const keyboardSize = [[[notification userInfo] objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue].size;
CGSize const keyboardSize = [notification.userInfo[UIKeyboardFrameBeginUserInfoKey] CGRectValue].size;
CGFloat const bottomInset = UIInterfaceOrientationIsPortrait([[UIApplication sharedApplication] statusBarOrientation]) ?
keyboardSize.height : keyboardSize.width;

5
iphone/Maps/Classes/MWMBasePlacePageView.mm
View file

@ -47,7 +47,6 @@ vector<MWMPlacePageCellType> const kSectionMetadataCellTypes {
vector<MWMPlacePageCellType> const kSectionEditingCellTypes {
MWMPlacePageCellTypeEditButton,
MWMPlacePageCellTypeAddBusinessButton,
MWMPlacePageCellTypeReportButton
};
using TCellTypesSectionMap = pair<vector<MWMPlacePageCellType>, PlacePageSection>;
@ -69,8 +68,7 @@ MWMPlacePageCellTypeValueMap const kCellType2ReuseIdentifier{
{MWMPlacePageCellTypeOpenHours, "MWMPlacePageOpeningHoursCell"},
{MWMPlacePageCellTypeBookmark, "PlacePageBookmarkCell"},
{MWMPlacePageCellTypeEditButton, "MWMPlacePageButtonCell"},
{MWMPlacePageCellTypeAddBusinessButton, "MWMPlacePageButtonCell"},
{MWMPlacePageCellTypeReportButton, "MWMPlacePageButtonCell"}};
{MWMPlacePageCellTypeAddBusinessButton, "MWMPlacePageButtonCell"}};
NSString * reuseIdentifier(MWMPlacePageCellType cellType)
{
@ -443,7 +441,6 @@ enum class AttributePosition
break;
case MWMPlacePageCellTypeEditButton:
case MWMPlacePageCellTypeAddBusinessButton:
case MWMPlacePageCellTypeReportButton:
[static_cast<MWMPlacePageButtonCell *>(cell) config:self.ownerPlacePage forType:cellType];
break;
default:

10
iphone/Maps/Classes/MWMPlacePageButtonCell.mm
View file

@ -20,15 +20,9 @@
switch (type)
{
case MWMPlacePageCellTypeAddBusinessButton:
[self.titleButton setTitleColor:[UIColor linkBlue] forState:UIControlStateNormal];
[self.titleButton setTitle:L(@"placepage_add_business_button") forState:UIControlStateNormal];
break;
case MWMPlacePageCellTypeReportButton:
[self.titleButton setTitleColor:[UIColor red] forState:UIControlStateNormal];
[self.titleButton setTitle:L(@"placepage_report_problem_button") forState:UIControlStateNormal];
break;
case MWMPlacePageCellTypeEditButton:
[self.titleButton setTitleColor:[UIColor linkBlue] forState:UIControlStateNormal];
[self.titleButton setTitle:L(@"edit_place") forState:UIControlStateNormal];
break;
default:
@ -50,10 +44,6 @@
[Statistics logEvent:kStatEditorAddClick withParameters:@{kStatValue : kStatPlacePage}];
[self.placePage addBusiness];
break;
case MWMPlacePageCellTypeReportButton:
[Statistics logEvent:kStatEventName(kStatPlacePage, kStatReport)];
[self.placePage reportProblem];
break;
default:
NSAssert(false, @"Incorrect cell type!");
break;

1
iphone/Maps/Classes/MWMPlacePageEntity.h
View file

@ -24,6 +24,7 @@ typedef NS_ENUM(NSUInteger, MWMPlacePageCellType)
MWMPlacePageCellTypeZipCode,
MWMPlacePageCellTypeBuildingLevels,
MWMPlacePageCellTypeCuisine,
MWMPlacePageCellTypeNote,
MWMPlacePageCellTypeCount
};

4
iphone/Maps/Classes/MWMPlacePageEntity.mm
View file

@ -151,9 +151,7 @@ void initFieldsMap()
return m_info.IsBookmark() ? @"" : nil;
case MWMPlacePageCellTypeEditButton:
// TODO(Vlad): It's a really strange way to "display" cell if returned text is not nil.
return m_info.IsEditable() && isNewMWM ? @"" : nil;
case MWMPlacePageCellTypeReportButton:
return /* m_info.IsFeature() && isNewMWM ? @"" : */nil;
return isNewMWM ? @"": nil;
case MWMPlacePageCellTypeAddBusinessButton:
return m_info.IsBuilding() ? @"" : nil;
default:

1
iphone/Maps/Classes/MWMTypes.h
View file

@ -1 +1,2 @@
typedef void (^TMWMVoidBlock)();
typedef void (^MWMStringBlock)(NSString *);