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

[MAPSME-3143] [ios] Fixed traffic states handling.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-12-09 13:06:35 +03:00
parent 18c9a2678b
commit 705924b332
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
View file

@ -229,7 +229,6 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
{
BOOL const isEnable = sender.selected;
[Statistics logEvent:kStatMenu withParameters:@{kStatTTS : isEnable ? kStatOn : kStatOff}];
sender.coloring = isEnable ? MWMButtonColoringBlue : MWMButtonColoringGray;
[MWMTextToSpeech tts].active = isEnable;
[self refreshRoutingDiminishTimer];
}
@ -240,7 +239,6 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
{
MWMButton * tb = self.trafficButton;
BOOL const enabled = ([MWMTrafficManager state] != TrafficManager::TrafficState::Disabled);
tb.coloring = enabled ? MWMButtonColoringBlue : MWMButtonColoringGray;
tb.selected = enabled;
}
@ -602,9 +600,9 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
- (void)setTtsSoundButton:(MWMButton *)ttsSoundButton
{
_ttsSoundButton = ttsSoundButton;
[ttsSoundButton setImage:[UIImage imageNamed:@"ic_voice_on"] forState:UIControlStateNormal];
[ttsSoundButton setImage:[UIImage imageNamed:@"ic_voice_off"] forState:UIControlStateSelected];
[ttsSoundButton setImage:[UIImage imageNamed:@"ic_voice_off"]
[ttsSoundButton setImage:[UIImage imageNamed:@"ic_voice_off"] forState:UIControlStateNormal];
[ttsSoundButton setImage:[UIImage imageNamed:@"ic_voice_on"] forState:UIControlStateSelected];
[ttsSoundButton setImage:[UIImage imageNamed:@"ic_voice_on"]
forState:UIControlStateSelected | UIControlStateHighlighted];
[self ttsButtonStatusChanged:nil];
}

6
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib
View file

@ -452,7 +452,7 @@
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Z8y-bh-6dN">
<rect key="frame" x="0.0" y="48" width="320" height="64"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q6M-3k-tKX" customClass="MWMButton">
<button opaque="NO" contentMode="center" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q6M-3k-tKX" customClass="MWMButton">
<rect key="frame" x="8" y="0.0" width="64" height="64"/>
<constraints>
<constraint firstAttribute="height" constant="64" id="10m-d2-9gu"/>
@ -461,7 +461,7 @@
<state key="normal" image="ic_voice_on"/>
<state key="selected" image="ic_voice_off"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlue"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="soundTouchUpInside:" destination="-1" eventType="touchUpInside" id="CEW-OG-NlS"/>
@ -476,7 +476,7 @@
<state key="normal" image="ic_setting_traffic_on"/>
<state key="selected" image="ic_setting_traffic_off"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlue"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="trafficTouchUpInside:" destination="-1" eventType="touchUpInside" id="4Fg-pP-9MU"/>

1
iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
View file

@ -153,7 +153,6 @@ NSArray<UIImage *> * imagesWithName(NSString * name)
case TrafficManager::TrafficState::WaitingData:
iv.animationImages = imagesWithName(@"btn_traffic_update");
iv.animationDuration = 0.8;
iv.image = iv.animationImages.lastObject;
[iv startAnimating];
break;
case TrafficManager::TrafficState::Outdated: