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

[ios][editor] Remove conditions which can not be true.

Browse source
This commit is contained in:
tatiana-yan 2020-06-11 18:53:17 +03:00 • committed by Arsentiy Milchakov
parent bc4c89afa2
commit fdf50a3afd
3 changed files with 4 additions and 14 deletions

3
iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.h
View file

@ -12,7 +12,6 @@
- (void)configWithDelegate:(id<MWMEditorAdditionalNamesProtocol>)delegate
name:(StringUtf8Multilang const &)name
additionalSkipLanguageCodes:(std::vector<NSInteger>)additionalSkipLanguageCodes
selectedLanguageCode:(NSInteger)selectedLanguageCode;
additionalSkipLanguageCodes:(std::vector<NSInteger>)additionalSkipLanguageCodes;
@end

12
iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm
View file

@ -3,7 +3,6 @@
@interface MWMEditorAdditionalNamesTableViewController ()
@property (nonatomic) NSInteger selectedLanguageCode;
@property (weak, nonatomic) id<MWMEditorAdditionalNamesProtocol> delegate;
@end
@ -20,12 +19,10 @@
- (void)configWithDelegate:(id<MWMEditorAdditionalNamesProtocol>)delegate
name:(StringUtf8Multilang const &)name
additionalSkipLanguageCodes:(std::vector<NSInteger>)additionalSkipLanguageCodes
selectedLanguageCode:(NSInteger)selectedLanguageCode
{
self.delegate = delegate;
m_name = name;
m_additionalSkipLanguageCodes = additionalSkipLanguageCodes;
self.selectedLanguageCode = selectedLanguageCode;
}
- (void)viewDidLoad
@ -40,17 +37,12 @@ additionalSkipLanguageCodes:(std::vector<NSInteger>)additionalSkipLanguageCodes
auto const getIndex = [](std::string const & lang) { return StringUtf8Multilang::GetLangIndex(lang); };
StringUtf8Multilang::Languages const & supportedLanguages = StringUtf8Multilang::GetSupportedLanguages();
m_languages.clear();
if (self.selectedLanguageCode == StringUtf8Multilang::kDefaultCode ||
self.selectedLanguageCode == StringUtf8Multilang::kInternationalCode)
{
return;
}
auto constexpr kDefaultCode = StringUtf8Multilang::kDefaultCode;
for (auto const & language : supportedLanguages)
{
auto const langIndex = getIndex(language.m_code);
if (self.selectedLanguageCode == NSNotFound && langIndex != kDefaultCode && m_name.HasString(langIndex))
if (langIndex != kDefaultCode && m_name.HasString(langIndex))
continue;
auto it = std::find(m_additionalSkipLanguageCodes.begin(), m_additionalSkipLanguageCodes.end(), langIndex);
if (it == m_additionalSkipLanguageCodes.end())
@ -78,7 +70,7 @@ additionalSkipLanguageCodes:(std::vector<NSInteger>)additionalSkipLanguageCodes
cell.detailTextLabel.text = @(language.m_code);
int8_t const languageIndex = StringUtf8Multilang::GetLangIndex(language.m_code);
cell.accessoryType = (languageIndex == self.selectedLanguageCode ? UITableViewCellAccessoryCheckmark : UITableViewCellAccessoryNone);
cell.accessoryType = UITableViewCellAccessoryNone;
return cell;
}

3
iphone/Maps/UI/Editor/MWMEditorViewController.mm
View file

@ -1067,8 +1067,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellType> const & cells, UIT
MWMEditorAdditionalNamesTableViewController * dvc = segue.destinationViewController;
[dvc configWithDelegate:self
name:m_mapObject.GetNameMultilang()
additionalSkipLanguageCodes:m_newAdditionalLanguages
selectedLanguageCode:((NSNumber *)sender).integerValue];
additionalSkipLanguageCodes:m_newAdditionalLanguages];
}
}