kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] change to view anim for pending location

Browse source 
gets rid of loads of redundant drawables, and looks smoother on high refresh rate displays
Signed-off-by: Harry Bond <hrbond@pm.me>
This commit is contained in:
Harry Bond 2024-03-25 20:46:17 +00:00 • committed by Viktor Havaka
parent d198d91fb3
commit 052e1a1722
4 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
View file

@ -3,10 +3,12 @@ package app.organicmaps.widget.menu;
import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.Drawable;
import android.util.SparseArray;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.LinearInterpolator;
import android.view.animation.RotateAnimation;
import androidx.annotation.AttrRes;
import androidx.annotation.DimenRes;
@ -61,7 +63,7 @@ public class MyPositionButton
{
@DrawableRes int drawableRes = switch (mode)
{
case LocationState.PENDING_POSITION -> ThemeUtils.getResource(context, R.attr.myPositionButtonAnimation);
case LocationState.PENDING_POSITION -> R.drawable.ic_menu_location_pending;
case LocationState.NOT_FOLLOW_NO_POSITION -> R.drawable.ic_location_off;
case LocationState.NOT_FOLLOW -> R.drawable.ic_not_follow;
case LocationState.FOLLOW -> R.drawable.ic_follow;
@ -77,8 +79,19 @@ public class MyPositionButton
ImageViewCompat.setImageTintList(mButton, ColorStateList.valueOf(ThemeUtils.getColor(context, colorAttr)));
updatePadding(mode);
if (image instanceof AnimationDrawable)
((AnimationDrawable) image).start();
if (mode == LocationState.PENDING_POSITION)
{
final RotateAnimation rotate = new RotateAnimation(0, 360,
Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
rotate.setDuration(1000);
rotate.setRepeatCount(Animation.INFINITE);
rotate.setInterpolator(new LinearInterpolator());
mButton.startAnimation(rotate);
}
else
mButton.clearAnimation();
}
private void updatePadding(int mode)

0
android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_1.png → android/app/src/main/res/drawable/ic_menu_location_pending.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

0
android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_1_night.png → android/app/src/main/res/drawable/ic_menu_location_pending_night.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

4
android/app/src/main/res/values/themes-base.xml
View file

@ -67,7 +67,7 @@
<item name="menuBackground">@color/bg_menu</item>
<item name="myPositionButtonAnimation">@drawable/anim_myposition_pending</item>
<item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending</item>
<item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
<item name="trafficLoadingAnimation">@drawable/anim_traffic_loading</item>
@ -201,7 +201,7 @@
<item name="menuBackground">@color/bg_menu_night</item>
<item name="myPositionButtonAnimation">@drawable/anim_myposition_pending_night</item>
<item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending_night</item>
<item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
<item name="trafficLoadingAnimation">@drawable/anim_traffic_loading_night</item>