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

Merge pull request #4923 from alexzatsepin/MAPSME-3171-incorrect-traffic-animation-on-jelly-bean

Browse source 
[android] Fixed the traffic animation on Jelly Bean
This commit is contained in:
Arsentiy Milchakov 2016-12-09 11:40:31 +03:00 • committed by GitHub
commit 8cb3c040f4
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
android/src/com/mapswithme/maps/traffic/widget/TrafficButton.java
View file

@ -3,6 +3,7 @@ package com.mapswithme.maps.traffic.widget;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull;
@ -45,35 +46,41 @@ public class TrafficButton
void turnOff()
{
stopWaitingAnimation();
mButton.setImageResource(ThemeUtils.isNightTheme() ? R.drawable.ic_traffic_off_night
: R.drawable.ic_traffic_off);
}
void turnOn()
{
stopWaitingAnimation();
mButton.setImageResource(ThemeUtils.isNightTheme() ? R.drawable.ic_traffic_on_night
: R.drawable.ic_traffic_on);
}
void markAsOutdated()
{
stopWaitingAnimation();
mButton.setImageResource(ThemeUtils.isNightTheme() ? R.drawable.ic_traffic_outdated_night
: R.drawable.ic_traffic_outdated);
}
public void setLoading(boolean isLoading)
void startWaitingAnimation()
{
if (isLoading)
mButton.setImageDrawable(mLoadingAnim);
AnimationDrawable animationDrawable = (AnimationDrawable) mButton.getDrawable();
animationDrawable.start();
}
private void stopWaitingAnimation()
{
Drawable drawable = mButton.getDrawable();
if (drawable instanceof AnimationDrawable)
{
mLoadingAnim.start();
mButton.setImageDrawable(mLoadingAnim);
}
else
{
mLoadingAnim.stop();
AnimationDrawable animation = (AnimationDrawable) drawable;
animation.stop();
mButton.setImageDrawable(null);
}
mButton.invalidate();
}
public void setOffset(int offsetX, int offsetY)

2
android/src/com/mapswithme/maps/traffic/widget/TrafficButtonController.java
View file

@ -40,7 +40,7 @@ public class TrafficButtonController implements TrafficManager.TrafficCallback
@Override
public void onWaitingData()
{
mButton.setLoading(true);
mButton.startWaitingAnimation();
}
@Override