diff --git a/app/src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java b/app/src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java
index e42584a69b..38bb2b5278 100644
--- a/app/src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java
+++ b/app/src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java
@@ -120,7 +120,7 @@ public class CircularProgressDrawable extends Drawable implements Animatable {
/**
* The duration of a single progress spin in milliseconds.
*/
- private static final int ANIMATION_DURATION = 1700;
+ private static final int ANIMATION_DURATION = 1300;
/**
* Full rotation that's done for the animation duration in degrees.
@@ -706,31 +706,33 @@ public class CircularProgressDrawable extends Drawable implements Animatable {
R.drawable.refresh_43, R.drawable.refresh_44,
R.drawable.refresh_45, R.drawable.refresh_46,
R.drawable.refresh_47, R.drawable.refresh_48,
- R.drawable.refresh_49, R.drawable.refresh_50,
- R.drawable.refresh_51, R.drawable.refresh_52,
- R.drawable.refresh_53, R.drawable.refresh_54,
- R.drawable.refresh_55, R.drawable.refresh_56,
- R.drawable.refresh_57, R.drawable.refresh_58,
- R.drawable.refresh_59, R.drawable.refresh_60,
- R.drawable.refresh_61, R.drawable.refresh_62,
- R.drawable.refresh_63, R.drawable.refresh_64,
- R.drawable.refresh_65, R.drawable.refresh_66,
- R.drawable.refresh_67, R.drawable.refresh_68,
- R.drawable.refresh_69, R.drawable.refresh_70,
- R.drawable.refresh_71, R.drawable.refresh_72,
- R.drawable.refresh_73, R.drawable.refresh_74,
- R.drawable.refresh_75, R.drawable.refresh_76,
- R.drawable.refresh_77, R.drawable.refresh_78,
- R.drawable.refresh_79, R.drawable.refresh_80,
- R.drawable.refresh_81, R.drawable.refresh_82,
- R.drawable.refresh_83, R.drawable.refresh_84,
- R.drawable.refresh_85, R.drawable.refresh_86,
- R.drawable.refresh_87, R.drawable.refresh_88,
- R.drawable.refresh_89, R.drawable.refresh_90,
- R.drawable.refresh_91, R.drawable.refresh_92,
- R.drawable.refresh_93, R.drawable.refresh_94,
- R.drawable.refresh_95, R.drawable.refresh_96,
- R.drawable.refresh_97, R.drawable.refresh_98};
+ R.drawable.refresh_49
+// , R.drawable.refresh_50,
+// R.drawable.refresh_51, R.drawable.refresh_52,
+// R.drawable.refresh_53, R.drawable.refresh_54,
+// R.drawable.refresh_55, R.drawable.refresh_56,
+// R.drawable.refresh_57, R.drawable.refresh_58,
+// R.drawable.refresh_59, R.drawable.refresh_60,
+// R.drawable.refresh_61, R.drawable.refresh_62,
+// R.drawable.refresh_63, R.drawable.refresh_64,
+// R.drawable.refresh_65, R.drawable.refresh_66,
+// R.drawable.refresh_67, R.drawable.refresh_68,
+// R.drawable.refresh_69, R.drawable.refresh_70,
+// R.drawable.refresh_71, R.drawable.refresh_72,
+// R.drawable.refresh_73, R.drawable.refresh_74,
+// R.drawable.refresh_75, R.drawable.refresh_76,
+// R.drawable.refresh_77, R.drawable.refresh_78,
+// R.drawable.refresh_79, R.drawable.refresh_80,
+// R.drawable.refresh_81, R.drawable.refresh_82,
+// R.drawable.refresh_83, R.drawable.refresh_84,
+// R.drawable.refresh_85, R.drawable.refresh_86,
+// R.drawable.refresh_87, R.drawable.refresh_88,
+// R.drawable.refresh_89, R.drawable.refresh_90,
+// R.drawable.refresh_91, R.drawable.refresh_92,
+// R.drawable.refresh_93, R.drawable.refresh_94,
+// R.drawable.refresh_95, R.drawable.refresh_96,
+// R.drawable.refresh_97, R.drawable.refresh_98
+ };
Ring() {
mPaint.setStrokeCap(Paint.Cap.SQUARE);
@@ -811,11 +813,11 @@ public class CircularProgressDrawable extends Drawable implements Animatable {
Bitmap bitmap;
Resources resources = HaloApp.getInstance().getApplication().getResources();
- int offset = (int) (mInterpolatedTime * 100);
+ int offset = (int) (mInterpolatedTime * 100) / 2;
if (!animator.isRunning()) {
bitmap = BitmapFactory.decodeResource(resources, R.drawable.refresh_icon);
canvas.drawBitmap(bitmap, bounds, bounds, mPaint);
- } else if (offset < 98) {
+ } else if (offset < images.length) {
bitmap = BitmapFactory.decodeResource(resources, images[offset]);
canvas.drawBitmap(bitmap, bounds, bounds, mPaint);
}
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_01.png b/app/src/main/res/drawable-xxhdpi/refresh_01.png
index bb35f53a4a..da42f50421 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_01.png and b/app/src/main/res/drawable-xxhdpi/refresh_01.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_02.png b/app/src/main/res/drawable-xxhdpi/refresh_02.png
index 35436b9764..d98d7dbded 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_02.png and b/app/src/main/res/drawable-xxhdpi/refresh_02.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_03.png b/app/src/main/res/drawable-xxhdpi/refresh_03.png
index 6c7c158d9a..abb00abba2 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_03.png and b/app/src/main/res/drawable-xxhdpi/refresh_03.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_04.png b/app/src/main/res/drawable-xxhdpi/refresh_04.png
index e29157f5cf..27164bf0e4 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_04.png and b/app/src/main/res/drawable-xxhdpi/refresh_04.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_05.png b/app/src/main/res/drawable-xxhdpi/refresh_05.png
index 75cb0a3b4c..1bdf9b6ff6 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_05.png and b/app/src/main/res/drawable-xxhdpi/refresh_05.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_06.png b/app/src/main/res/drawable-xxhdpi/refresh_06.png
index 8180d59dc8..e1a4ba928f 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_06.png and b/app/src/main/res/drawable-xxhdpi/refresh_06.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_07.png b/app/src/main/res/drawable-xxhdpi/refresh_07.png
index bc7eb20acd..704c580e20 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_07.png and b/app/src/main/res/drawable-xxhdpi/refresh_07.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_08.png b/app/src/main/res/drawable-xxhdpi/refresh_08.png
index cc57cd6352..18946e8028 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_08.png and b/app/src/main/res/drawable-xxhdpi/refresh_08.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_09.png b/app/src/main/res/drawable-xxhdpi/refresh_09.png
index c9b46ebb32..e7b416e2f5 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_09.png and b/app/src/main/res/drawable-xxhdpi/refresh_09.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_10.png b/app/src/main/res/drawable-xxhdpi/refresh_10.png
index 30f18cd01e..84f33ead30 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_10.png and b/app/src/main/res/drawable-xxhdpi/refresh_10.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_11.png b/app/src/main/res/drawable-xxhdpi/refresh_11.png
index 04f073d8f6..00aa3748e4 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_11.png and b/app/src/main/res/drawable-xxhdpi/refresh_11.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_12.png b/app/src/main/res/drawable-xxhdpi/refresh_12.png
index 676c0c1b4c..cc7e1076f9 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_12.png and b/app/src/main/res/drawable-xxhdpi/refresh_12.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_13.png b/app/src/main/res/drawable-xxhdpi/refresh_13.png
index 5d270afc69..f37bac69be 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_13.png and b/app/src/main/res/drawable-xxhdpi/refresh_13.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_14.png b/app/src/main/res/drawable-xxhdpi/refresh_14.png
index 506e393571..f52d3bd7b9 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_14.png and b/app/src/main/res/drawable-xxhdpi/refresh_14.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_15.png b/app/src/main/res/drawable-xxhdpi/refresh_15.png
index 1b1aa35327..91127f37ac 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_15.png and b/app/src/main/res/drawable-xxhdpi/refresh_15.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_16.png b/app/src/main/res/drawable-xxhdpi/refresh_16.png
index a6a7281e9d..a1bf45440e 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_16.png and b/app/src/main/res/drawable-xxhdpi/refresh_16.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_17.png b/app/src/main/res/drawable-xxhdpi/refresh_17.png
index 16a1feb21a..bede0df79a 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_17.png and b/app/src/main/res/drawable-xxhdpi/refresh_17.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_18.png b/app/src/main/res/drawable-xxhdpi/refresh_18.png
index c7e6268eb3..e3bc3b0a97 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_18.png and b/app/src/main/res/drawable-xxhdpi/refresh_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_19.png b/app/src/main/res/drawable-xxhdpi/refresh_19.png
index aa5b6d49a1..886bc0b911 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_19.png and b/app/src/main/res/drawable-xxhdpi/refresh_19.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_20.png b/app/src/main/res/drawable-xxhdpi/refresh_20.png
index 0be65c7287..7480696cc6 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_20.png and b/app/src/main/res/drawable-xxhdpi/refresh_20.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_21.png b/app/src/main/res/drawable-xxhdpi/refresh_21.png
index 23fc90b2a5..bd9c0ab8f0 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_21.png and b/app/src/main/res/drawable-xxhdpi/refresh_21.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_22.png b/app/src/main/res/drawable-xxhdpi/refresh_22.png
index 04fe193ffa..72dcdfa544 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_22.png and b/app/src/main/res/drawable-xxhdpi/refresh_22.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_23.png b/app/src/main/res/drawable-xxhdpi/refresh_23.png
index 420f9b9005..8398069475 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_23.png and b/app/src/main/res/drawable-xxhdpi/refresh_23.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_24.png b/app/src/main/res/drawable-xxhdpi/refresh_24.png
index c0d8cf7542..c0c5595c10 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_24.png and b/app/src/main/res/drawable-xxhdpi/refresh_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_25.png b/app/src/main/res/drawable-xxhdpi/refresh_25.png
index 4c6c740404..eb26dedae3 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_25.png and b/app/src/main/res/drawable-xxhdpi/refresh_25.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_26.png b/app/src/main/res/drawable-xxhdpi/refresh_26.png
index 781763fbad..a307639e68 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_26.png and b/app/src/main/res/drawable-xxhdpi/refresh_26.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_27.png b/app/src/main/res/drawable-xxhdpi/refresh_27.png
index 968ae31f4f..c0c81aa421 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_27.png and b/app/src/main/res/drawable-xxhdpi/refresh_27.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_28.png b/app/src/main/res/drawable-xxhdpi/refresh_28.png
index 0cddd7e9b5..ade83b0b5d 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_28.png and b/app/src/main/res/drawable-xxhdpi/refresh_28.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_29.png b/app/src/main/res/drawable-xxhdpi/refresh_29.png
index ca8656d0eb..56f2de5f05 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_29.png and b/app/src/main/res/drawable-xxhdpi/refresh_29.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_30.png b/app/src/main/res/drawable-xxhdpi/refresh_30.png
index e7601fb837..de0d800e99 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_30.png and b/app/src/main/res/drawable-xxhdpi/refresh_30.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_31.png b/app/src/main/res/drawable-xxhdpi/refresh_31.png
index b788c666c0..1d12f0d5a8 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_31.png and b/app/src/main/res/drawable-xxhdpi/refresh_31.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_32.png b/app/src/main/res/drawable-xxhdpi/refresh_32.png
index 83533909da..caf58e8d99 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_32.png and b/app/src/main/res/drawable-xxhdpi/refresh_32.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_33.png b/app/src/main/res/drawable-xxhdpi/refresh_33.png
index a6590b72aa..b20b97f3d1 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_33.png and b/app/src/main/res/drawable-xxhdpi/refresh_33.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_34.png b/app/src/main/res/drawable-xxhdpi/refresh_34.png
index a1fb79f86e..7dbf1c74e2 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_34.png and b/app/src/main/res/drawable-xxhdpi/refresh_34.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_35.png b/app/src/main/res/drawable-xxhdpi/refresh_35.png
index 87e99456dd..6716c75471 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_35.png and b/app/src/main/res/drawable-xxhdpi/refresh_35.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_36.png b/app/src/main/res/drawable-xxhdpi/refresh_36.png
index 1c0ad67dd5..9ca1dc8146 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_36.png and b/app/src/main/res/drawable-xxhdpi/refresh_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_37.png b/app/src/main/res/drawable-xxhdpi/refresh_37.png
index 896c465f1f..cae1243a3b 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_37.png and b/app/src/main/res/drawable-xxhdpi/refresh_37.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_38.png b/app/src/main/res/drawable-xxhdpi/refresh_38.png
index 8a14b53bd1..0796824e25 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_38.png and b/app/src/main/res/drawable-xxhdpi/refresh_38.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_39.png b/app/src/main/res/drawable-xxhdpi/refresh_39.png
index 324ead9cf1..3955ee4cc6 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_39.png and b/app/src/main/res/drawable-xxhdpi/refresh_39.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_40.png b/app/src/main/res/drawable-xxhdpi/refresh_40.png
index 04a93504bc..9589776e19 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_40.png and b/app/src/main/res/drawable-xxhdpi/refresh_40.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_41.png b/app/src/main/res/drawable-xxhdpi/refresh_41.png
index 1799b0be50..f36a74ebc4 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_41.png and b/app/src/main/res/drawable-xxhdpi/refresh_41.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_42.png b/app/src/main/res/drawable-xxhdpi/refresh_42.png
index 6d4228c705..1faded57a9 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_42.png and b/app/src/main/res/drawable-xxhdpi/refresh_42.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_43.png b/app/src/main/res/drawable-xxhdpi/refresh_43.png
index d215d0df8a..a667496e7a 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_43.png and b/app/src/main/res/drawable-xxhdpi/refresh_43.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_44.png b/app/src/main/res/drawable-xxhdpi/refresh_44.png
index bfbd84c8c8..9a50082bc9 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_44.png and b/app/src/main/res/drawable-xxhdpi/refresh_44.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_45.png b/app/src/main/res/drawable-xxhdpi/refresh_45.png
index 6466e5d0cc..da42f50421 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_45.png and b/app/src/main/res/drawable-xxhdpi/refresh_45.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_46.png b/app/src/main/res/drawable-xxhdpi/refresh_46.png
index 3b26b64056..da42f50421 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_46.png and b/app/src/main/res/drawable-xxhdpi/refresh_46.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_47.png b/app/src/main/res/drawable-xxhdpi/refresh_47.png
index 9fbf601209..da42f50421 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_47.png and b/app/src/main/res/drawable-xxhdpi/refresh_47.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_48.png b/app/src/main/res/drawable-xxhdpi/refresh_48.png
index 1a6db226e3..da42f50421 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_48.png and b/app/src/main/res/drawable-xxhdpi/refresh_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/refresh_49.png b/app/src/main/res/drawable-xxhdpi/refresh_49.png
index 4af9e704b6..da42f50421 100644
Binary files a/app/src/main/res/drawable-xxhdpi/refresh_49.png and b/app/src/main/res/drawable-xxhdpi/refresh_49.png differ
diff --git a/app/src/main/res/drawable/refresh_anim.xml b/app/src/main/res/drawable/refresh_anim.xml
new file mode 100644
index 0000000000..528289f78d
--- /dev/null
+++ b/app/src/main/res/drawable/refresh_anim.xml
@@ -0,0 +1,299 @@
+
+
+
+