From 55a80ab47a0a57aa1929266764bd117833d4c965 Mon Sep 17 00:00:00 2001
From: NekoInverter <7741672-NekoInverter@users.noreply.gitlab.com>
Date: Fri, 22 Jan 2021 11:26:02 +0800
Subject: [PATCH] Fix bottom progress bar

---
 app/src/main/java/com/hippo/widget/ContentLayout.java | 6 +++---
 app/src/main/res/layout/widget_content_layout.xml     | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.java b/app/src/main/java/com/hippo/widget/ContentLayout.java
index 056cdd062..1ed788282 100644
--- a/app/src/main/java/com/hippo/widget/ContentLayout.java
+++ b/app/src/main/java/com/hippo/widget/ContentLayout.java
@@ -117,11 +117,9 @@ public class ContentLayout extends FrameLayout {
         Resources resources = getResources();
         mBottomProgress.setIndicatorColor(
                 resources.getColor(R.color.loading_indicator_red),
-                resources.getColor(R.color.loading_indicator_purple),
                 resources.getColor(R.color.loading_indicator_blue),
-                resources.getColor(R.color.loading_indicator_cyan),
                 resources.getColor(R.color.loading_indicator_green),
-                resources.getColor(R.color.loading_indicator_yellow));
+                resources.getColor(R.color.loading_indicator_orange));
         mBottomProgress.setIndeterminateAnimationType(LinearProgressIndicator.INDETERMINATE_ANIMATION_TYPE_CONTIGUOUS);
 
         mRecyclerViewOriginTop = mRecyclerView.getPaddingTop();
@@ -177,6 +175,8 @@ public class ContentLayout extends FrameLayout {
         mFastScroller.setPadding(mFastScroller.getPaddingLeft(), mFastScroller.getPaddingTop(), mFastScroller.getPaddingRight(), fitPaddingBottom);
         if (fitPaddingBottom > LayoutUtils.dp2pix(getContext(), 16)) {
             mBottomProgress.setPadding(0, 0, 0, fitPaddingBottom);
+        } else {
+            mBottomProgress.setPadding(0, 0, 0, 0);
         }
     }
 
diff --git a/app/src/main/res/layout/widget_content_layout.xml b/app/src/main/res/layout/widget_content_layout.xml
index 54426a975..5e5ade358 100644
--- a/app/src/main/res/layout/widget_content_layout.xml
+++ b/app/src/main/res/layout/widget_content_layout.xml
@@ -14,7 +14,8 @@
   ~ limitations under the License.
   -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/progress"
@@ -58,7 +59,9 @@
             android:layout_height="wrap_content"
             android:indeterminate="true"
             android:layout_gravity="bottom"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:hideAnimationBehavior="inward"
+            app:showAnimationBehavior="outward" />
 
         <com.hippo.easyrecyclerview.FastScroller
             android:id="@+id/fast_scroller"