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

[ios] Fixed @igrechuhin comments. (TTS)

Browse source
This commit is contained in:
v.mikhaylenko 2015-11-12 16:36:23 +03:00
parent 6442186334
commit 2df36d58d3
4 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
View file

@ -335,9 +335,9 @@ static NSString * const kNavigationDashboardIPADXibName = @"MWMNiPadNavigationDa
BOOL const isNeedToEnable = tts.isNeedToEnable;
self.navigationDashboardPortrait.soundButton.selected = isNeedToEnable;
self.navigationDashboardLandscape.soundButton.selected = isNeedToEnable;
if (isNeedToEnable) {
if (isNeedToEnable)
[tts enable];
}
[self.navigationDashboard addToView:self.ownerView];
}
@ -346,13 +346,9 @@ static NSString * const kNavigationDashboardIPADXibName = @"MWMNiPadNavigationDa
switch (GetFramework().GetRouter())
{
case routing::RouterType::Pedestrian:
// self.routePreview.pedestrianProgressView.state = MWMCircularProgressStateSelected;
// self.routePreview.vehicleProgressView.state = MWMCircularProgressStateNormal;
self.activeRouteTypeButton = self.routePreview.pedestrianProgressView;
break;
case routing::RouterType::Vehicle:
// self.routePreview.vehicleProgressView.state = MWMCircularProgressStateSelected;
// self.routePreview.pedestrianProgressView.state = MWMCircularProgressStateNormal;
self.activeRouteTypeButton = self.routePreview.vehicleProgressView;
break;
}

4
iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm
View file

@ -49,7 +49,7 @@ extern NSString * const kUserDafaultsNeedToEnableTTS = @"UserDefaultsNeedToEnabl
NSString * saved = self.savedLanguage;
string preferedLanguage ;
string preferedLanguage;
if (saved.length)
preferedLanguage = saved.UTF8String;
else
@ -226,7 +226,7 @@ namespace tts
string bcp47ToTwineLanguage(NSString const * bcp47LangName)
{
if (bcp47LangName == nil || [bcp47LangName length] < 2)
return nil;
return "";
if ([bcp47LangName isEqualToString:@"zh-CN"] || [bcp47LangName isEqualToString:@"zh-CHS"]
|| [bcp47LangName isEqualToString:@"zh-SG"])

9
iphone/Maps/MWMTTSSettingsViewController.mm
View file

@ -81,7 +81,8 @@ using namespace std;
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
return 2;
return 1;
// return 2;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
@ -125,10 +126,10 @@ using namespace std;
[tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationFade];
}
}
else
{
#warning need to add help
}
// else
// {
// }
}
@end

14
iphone/Maps/Settings/SettingsViewController.mm
View file

@ -1,13 +1,13 @@
#import "SettingsViewController.h"
#import "SwitchCell.h"
#import "SelectableCell.h"
#import "LinkCell.h"
#import "WebViewController.h"
#import "MapViewController.h"
#import "MapsAppDelegate.h"
#import "Statistics.h"
#import "MapViewController.h"
#import "MWMMapViewControlsManager.h"
#import "MWMTextToSpeech.h"
#import "SelectableCell.h"
#import "SettingsViewController.h"
#import "Statistics.h"
#import "SwitchCell.h"
#import "LinkCell.h"
#import "WebViewController.h"
#include "Framework.h"