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

Clang-format.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-09-13 11:45:40 +03:00
parent c607dc85a6
commit c63203ffc2
4 changed files with 97 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.mm
View file

@ -1,11 +1,11 @@
#import "MWMPlaceDoesntExistAlert.h"
#import "MWMKeyboard.h"
@interface MWMPlaceDoesntExistAlert () <MWMKeyboardObserver>
@interface MWMPlaceDoesntExistAlert ()<MWMKeyboardObserver>
@property (weak, nonatomic) IBOutlet UITextField * textField;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * centerHorizontaly;
@property (copy, nonatomic) MWMStringBlock block;
@property(weak, nonatomic) IBOutlet UITextField * textField;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * centerHorizontaly;
@property(copy, nonatomic) MWMStringBlock block;
@end
@ -13,8 +13,10 @@
+ (instancetype)alertWithBlock:(MWMStringBlock)block
{
MWMPlaceDoesntExistAlert * alert = [[[NSBundle mainBundle] loadNibNamed:[MWMPlaceDoesntExistAlert className] owner:nil
options:nil] firstObject];
MWMPlaceDoesntExistAlert * alert =
[[[NSBundle mainBundle] loadNibNamed:[MWMPlaceDoesntExistAlert className]
owner:nil
options:nil] firstObject];
alert.block = block;
[MWMKeyboard addObserver:alert];
return alert;
@ -37,13 +39,9 @@
- (void)onKeyboardAnimation
{
self.centerHorizontaly.constant = - [MWMKeyboard keyboardHeight] / 2;
self.centerHorizontaly.constant = -[MWMKeyboard keyboardHeight] / 2;
[self layoutIfNeeded];
}
- (void)onKeyboardWillAnimate
{
[self setNeedsLayout];
}
- (void)onKeyboardWillAnimate { [self setNeedsLayout]; }
@end

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

@ -1,10 +1,10 @@
#import "MWMCuisineEditorViewController.h"
#import "MWMKeyboard.h"
#import "MWMTableViewCell.h"
#import "UIColor+MapsMeColor.h"
#import "MWMKeyboard.h"
#include "indexer/search_string_utils.hpp"
#include "indexer/cuisines.hpp"
#include "indexer/search_string_utils.hpp"
#include "std/algorithm.hpp"
@ -19,9 +19,9 @@ vector<string> SliceKeys(vector<pair<string, string>> const & v)
res.push_back(kv.first);
return res;
}
} // namespace
} // namespace
@interface MWMCuisineEditorViewController () <UISearchBarDelegate, MWMKeyboardObserver>
@interface MWMCuisineEditorViewController ()<UISearchBarDelegate, MWMKeyboardObserver>
{
osm::TAllCuisines m_allCuisines;
vector<string> m_selectedCuisines;
@ -29,9 +29,9 @@ vector<string> SliceKeys(vector<pair<string, string>> const & v)
vector<string> m_untranslatedKeys;
}
@property (weak, nonatomic) IBOutlet UITableView * tableView;
@property (weak, nonatomic) IBOutlet UISearchBar * searchBar;
@property (nonatomic) BOOL isSearch;
@property(weak, nonatomic) IBOutlet UITableView * tableView;
@property(weak, nonatomic) IBOutlet UISearchBar * searchBar;
@property(nonatomic) BOOL isSearch;
@end
@ -47,11 +47,7 @@ vector<string> SliceKeys(vector<pair<string, string>> const & v)
[MWMKeyboard addObserver:self];
}
- (UIStatusBarStyle)preferredStatusBarStyle
{
return UIStatusBarStyleLightContent;
}
- (UIStatusBarStyle)preferredStatusBarStyle { return UIStatusBarStyleLightContent; }
#pragma mark - MWMKeyboard
- (void)onKeyboardAnimation
@ -109,16 +105,8 @@ vector<string> SliceKeys(vector<pair<string, string>> const & v)
[self.tableView reloadData];
}
- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar
{
[searchBar resignFirstResponder];
}
- (UIBarPosition)positionForBar:(id<UIBarPositioning>)bar
{
return UIBarPositionTopAttached;
}
- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar { [searchBar resignFirstResponder]; }
- (UIBarPosition)positionForBar:(id<UIBarPositioning>)bar { return UIBarPositionTopAttached; }
- (void)searchBar:(UISearchBar *)searchBar setActiveState:(BOOL)isActiveState
{
[searchBar setShowsCancelButton:isActiveState animated:YES];
@ -169,16 +157,13 @@ vector<string> SliceKeys(vector<pair<string, string>> const & v)
{
self.tableView.backgroundColor = [UIColor pressBackground];
self.tableView.separatorColor = [UIColor blackDividers];
[self.tableView registerClass:[MWMTableViewCell class] forCellReuseIdentifier:[UITableViewCell className]];
[self.tableView registerClass:[MWMTableViewCell class]
forCellReuseIdentifier:[UITableViewCell className]];
}
#pragma mark - Actions
- (void)onCancel
{
[self.navigationController popViewControllerAnimated:YES];
}
- (void)onCancel { [self.navigationController popViewControllerAnimated:YES]; }
- (void)onDone
{
[self.delegate setSelectedCuisines:m_selectedCuisines];
@ -197,9 +182,11 @@ vector<string> SliceKeys(vector<pair<string, string>> const & v)
#pragma mark - UITableViewDataSource
- (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath
- (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView
cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath
{
UITableViewCell * cell = [self.tableView dequeueReusableCellWithIdentifier:[UITableViewCell className]];
UITableViewCell * cell =
[self.tableView dequeueReusableCellWithIdentifier:[UITableViewCell className]];
NSInteger const index = indexPath.row;
auto const & dataSource = [self dataSourceForSection:indexPath.section];
@ -215,7 +202,8 @@ vector<string> SliceKeys(vector<pair<string, string>> const & v)
cell.textLabel.text = @(key.c_str());
}
BOOL const selected = find(m_selectedCuisines.begin(), m_selectedCuisines.end(), key) != m_selectedCuisines.end();
BOOL const selected =
find(m_selectedCuisines.begin(), m_selectedCuisines.end(), key) != m_selectedCuisines.end();
cell.accessoryType = selected ? UITableViewCellAccessoryCheckmark : UITableViewCellAccessoryNone;
return cell;
}
@ -240,13 +228,16 @@ vector<string> SliceKeys(vector<pair<string, string>> const & v)
#pragma mark - UITableViewDelegate
- (void)tableView:(UITableView * _Nonnull)tableView didSelectRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath
- (void)tableView:(UITableView * _Nonnull)tableView
didSelectRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath
{
UITableViewCell * cell = [tableView cellForRowAtIndexPath:indexPath];
[cell setSelected:NO animated:YES];
BOOL const isAlreadySelected = cell.accessoryType == UITableViewCellAccessoryCheckmark;
cell.accessoryType = isAlreadySelected ? UITableViewCellAccessoryNone : UITableViewCellAccessoryCheckmark;
[self change:[self dataSourceForSection:indexPath.section][indexPath.row] selected:!isAlreadySelected];
cell.accessoryType =
isAlreadySelected ? UITableViewCellAccessoryNone : UITableViewCellAccessoryCheckmark;
[self change:[self dataSourceForSection:indexPath.section][indexPath.row]
selected:!isAlreadySelected];
}
@end

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

@ -1,11 +1,11 @@
#import "MWMObjectsCategorySelectorController.h"
#import "MWMAuthorizationCommon.h"
#import "MWMEditorViewController.h"
#import "MWMObjectsCategorySelectorController.h"
#import "MWMKeyboard.h"
#import "MWMTableViewCell.h"
#import "Statistics.h"
#import "UIColor+MapsMeColor.h"
#import "UIViewController+Navigation.h"
#import "MWMKeyboard.h"
#include "LocaleTranslator.h"
@ -19,7 +19,6 @@ using namespace osm;
namespace
{
NSString * const kToEditorSegue = @"CategorySelectorToEditorSegue";
string locale()
@ -27,18 +26,19 @@ string locale()
return locale_translator::bcp47ToTwineLanguage([NSLocale currentLocale].localeIdentifier);
}
} // namespace
} // namespace
@interface MWMObjectsCategorySelectorController () <UISearchBarDelegate, UITableViewDelegate, UITableViewDataSource, MWMKeyboardObserver>
@interface MWMObjectsCategorySelectorController ()<UISearchBarDelegate, UITableViewDelegate,
UITableViewDataSource, MWMKeyboardObserver>
{
NewFeatureCategories m_categories;
NewFeatureCategories::TNames m_filteredCategories;
}
@property (weak, nonatomic) IBOutlet UITableView * tableView;
@property (weak, nonatomic) IBOutlet UISearchBar * searchBar;
@property (nonatomic) NSIndexPath * selectedIndexPath;
@property (nonatomic) BOOL isSearch;
@property(weak, nonatomic) IBOutlet UITableView * tableView;
@property(weak, nonatomic) IBOutlet UISearchBar * searchBar;
@property(nonatomic) NSIndexPath * selectedIndexPath;
@property(nonatomic) BOOL isSearch;
@end
@ -69,19 +69,18 @@ string locale()
{
self.tableView.backgroundColor = [UIColor pressBackground];
self.tableView.separatorColor = [UIColor blackDividers];
[self.tableView registerClass:[MWMTableViewCell class] forCellReuseIdentifier:[UITableViewCell className]];
[self.tableView registerClass:[MWMTableViewCell class]
forCellReuseIdentifier:[UITableViewCell className]];
}
- (void)setSelectedCategory:(string const &)category
{
auto const & all = m_categories.GetAllCategoryNames(locale());
auto const it = find_if(all.begin(), all.end(), [&category](NewFeatureCategories::TName const & name)
{
return name.first == category;
});
auto const it = find_if(
all.begin(), all.end(),
[&category](NewFeatureCategories::TName const & name) { return name.first == category; });
NSAssert(it != all.end(), @"Incorrect category!");
self.selectedIndexPath = [NSIndexPath indexPathForRow:(distance(all.begin(), it))
inSection:0];
self.selectedIndexPath = [NSIndexPath indexPathForRow:(distance(all.begin(), it)) inSection:0];
}
- (void)backTap
@ -94,16 +93,8 @@ string locale()
[super backTap];
}
- (UIStatusBarStyle)preferredStatusBarStyle
{
return UIStatusBarStyleLightContent;
}
- (void)configNavBar
{
self.title = L(@"editor_add_select_category");
}
- (UIStatusBarStyle)preferredStatusBarStyle { return UIStatusBarStyleLightContent; }
- (void)configNavBar { self.title = L(@"editor_add_select_category"); }
- (void)configSearchBar
{
self.searchBar.backgroundImage = [UIImage imageWithColor:[UIColor primary]];
@ -127,17 +118,21 @@ string locale()
NSAssert(false, @"incorrect segue");
return;
}
MWMEditorViewController * dest = static_cast<MWMEditorViewController *>(segue.destinationViewController);
MWMEditorViewController * dest =
static_cast<MWMEditorViewController *>(segue.destinationViewController);
dest.isCreating = YES;
auto const object = self.createdObject;
[dest setEditableMapObject:object];
using namespace osm_auth_ios;
auto const & featureID = object.GetID();
[Statistics logEvent:kStatEditorAddStart withParameters:@{kStatEditorIsAuthenticated : @(AuthorizationHaveCredentials()),
kStatIsOnline : Platform::IsConnected() ? kStatYes : kStatNo,
kStatEditorMWMName : @(featureID.GetMwmName().c_str()),
kStatEditorMWMVersion : @(featureID.GetMwmVersion())}];
[Statistics logEvent:kStatEditorAddStart
withParameters:@{
kStatEditorIsAuthenticated : @(AuthorizationHaveCredentials()),
kStatIsOnline : Platform::IsConnected() ? kStatYes : kStatNo,
kStatEditorMWMName : @(featureID.GetMwmName().c_str()),
kStatEditorMWMVersion : @(featureID.GetMwmVersion())
}];
}
#pragma mark - MWMKeyboard
@ -156,17 +151,21 @@ string locale()
auto const & ds = [self dataSourceForSection:self.selectedIndexPath.section];
EditableMapObject emo;
auto & f = GetFramework();
if (!f.CreateMapObject(f.GetViewportCenter() ,ds[self.selectedIndexPath.row].second, emo))
NSAssert(false, @"This call should never fail, because IsPointCoveredByDownloadedMaps is always called before!");
if (!f.CreateMapObject(f.GetViewportCenter(), ds[self.selectedIndexPath.row].second, emo))
NSAssert(false, @"This call should never fail, because IsPointCoveredByDownloadedMaps is "
@"always called before!");
return emo;
}
#pragma mark - UITableView
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
- (UITableViewCell *)tableView:(UITableView *)tableView
cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:[UITableViewCell className]];
cell.textLabel.text = @([self dataSourceForSection:indexPath.section][indexPath.row].first.c_str());
UITableViewCell * cell =
[tableView dequeueReusableCellWithIdentifier:[UITableViewCell className]];
cell.textLabel.text =
@([self dataSourceForSection:indexPath.section][indexPath.row].first.c_str());
if ([indexPath isEqual:self.selectedIndexPath])
cell.accessoryType = UITableViewCellAccessoryCheckmark;
else
@ -200,10 +199,11 @@ string locale()
if (self.isSearch)
return nil;
return L(@"editor_add_select_category_all_subtitle");
// TODO(Vlad): Uncoment this line when we will be ready to show recent categories
// if (m_categories.m_lastUsed.empty())
// return L(@"editor_add_select_category_all_subtitle");
// return section == 0 ? L(@"editor_add_select_category_popular_subtitle") : L(@"editor_add_select_category_all_subtitle");
// TODO(Vlad): Uncoment this line when we will be ready to show recent categories
// if (m_categories.m_lastUsed.empty())
// return L(@"editor_add_select_category_all_subtitle");
// return section == 0 ? L(@"editor_add_select_category_popular_subtitle") :
// L(@"editor_add_select_category_all_subtitle");
}
- (NewFeatureCategories::TNames const &)dataSourceForSection:(NSInteger)section
@ -211,11 +211,11 @@ string locale()
if (self.isSearch)
return m_filteredCategories;
return m_categories.GetAllCategoryNames(locale());
// TODO(Vlad): Uncoment this line when we will be ready to show recent categories
// if (m_categories.m_lastUsed.empty())
// return m_categories.m_allSorted;
// else
// return section == 0 ? m_categories.m_lastUsed : m_categories.m_allSorted;
// TODO(Vlad): Uncoment this line when we will be ready to show recent categories
// if (m_categories.m_lastUsed.empty())
// return m_categories.m_allSorted;
// else
// return section == 0 ? m_categories.m_lastUsed : m_categories.m_allSorted;
}
#pragma mark - UISearchBarDelegate
@ -231,7 +231,7 @@ string locale()
}
self.isSearch = YES;
string const query {[searchText lowercaseStringWithLocale:[NSLocale currentLocale]].UTF8String};
string const query{[searchText lowercaseStringWithLocale:[NSLocale currentLocale]].UTF8String};
m_filteredCategories = m_categories.Search(query, locale());
[self.tableView reloadData];
}
@ -262,16 +262,8 @@ string locale()
[self.tableView reloadData];
}
- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar
{
[searchBar resignFirstResponder];
}
- (UIBarPosition)positionForBar:(id<UIBarPositioning>)bar
{
return UIBarPositionTopAttached;
}
- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar { [searchBar resignFirstResponder]; }
- (UIBarPosition)positionForBar:(id<UIBarPositioning>)bar { return UIBarPositionTopAttached; }
- (void)searchBar:(UISearchBar *)searchBar setActiveState:(BOOL)isActiveState
{
[searchBar setShowsCancelButton:isActiveState animated:YES];

32
iphone/Maps/Classes/MapDownloader/NoMaps/MWMNoMapsView.mm
View file

@ -2,21 +2,21 @@
#import "Common.h"
#import "MWMKeyboard.h"
@interface MWMNoMapsView () <MWMKeyboardObserver>
@interface MWMNoMapsView ()<MWMKeyboardObserver>
@property (weak, nonatomic) IBOutlet UIImageView * image;
@property (weak, nonatomic) IBOutlet UILabel * title;
@property (weak, nonatomic) IBOutlet UILabel * text;
@property(weak, nonatomic) IBOutlet UIImageView * image;
@property(weak, nonatomic) IBOutlet UILabel * title;
@property(weak, nonatomic) IBOutlet UILabel * text;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * containerWidth;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * containerHeight;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * containerTopOffset;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * containerBottomOffset;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * imageMinHeight;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * imageHeight;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleImageOffset;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleTopOffset;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * textTopOffset;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * containerWidth;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * containerHeight;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * containerTopOffset;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * containerBottomOffset;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * imageMinHeight;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * imageHeight;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * titleImageOffset;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * titleTopOffset;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * textTopOffset;
@end
@ -89,9 +89,5 @@
[self.superview layoutIfNeeded];
}
- (void)onKeyboardWillAnimate
{
[self.superview layoutIfNeeded];
}
- (void)onKeyboardWillAnimate { [self.superview layoutIfNeeded]; }
@end