#update refresh

MirkoWu · Aug 20, 2021 · 653a9c4 · 653a9c4
1 parent 613ffc1
commit 653a9c4
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 7 deletions.
diff --git a/app/src/main/java/com/mirkowu/mvm/mvvm/MVVMActivity.java b/app/src/main/java/com/mirkowu/mvm/mvvm/MVVMActivity.java
@@ -87,7 +87,8 @@ public boolean onItemChildLongClick(View view, Object item, int position) {
             }
         });
 
-        binding.stateview.setLoadingState(R.mipmap.ic_launcher, getString(R.string.widget_loading));
+        binding.stateview.setLoadingState(getString(R.string.widget_loading));
+        //binding.stateview.setLoadingState(R.mipmap.ic_launcher, getString(R.string.widget_loading));
         binding.stateview.setOnRefreshListener(() -> refreshHelper.autoRefresh());
 
         refreshHelper.refresh();

diff --git a/app/src/main/res/drawable/anim_loading.xml b/app/src/main/res/drawable/anim_loading.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/widget_ic_loading"
+        android:duration="200" />
+    <item
+        android:drawable="@drawable/ivp_camera"
+        android:duration="200" />
+    <item
+        android:drawable="@drawable/ivp_addimage"
+        android:duration="200" />
+    <item
+        android:drawable="@drawable/ivp_delete"
+        android:duration="200" />
+    <item
+        android:drawable="@drawable/ivp_save"
+        android:duration="200" />
+</animation-list>
diff --git a/app/src/main/res/layout/activity_m_v_v_m.xml b/app/src/main/res/layout/activity_m_v_v_m.xml
@@ -28,5 +28,6 @@
     <com.mirkowu.lib_widget.stateview.StateView
         android:id="@+id/stateview"
         android:layout_width="match_parent"
+        app:sv_loadingIcon="@drawable/anim_loading"
         android:layout_height="match_parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/lib_base/src/main/java/com/mirkowu/lib_base/widget/RefreshHelper.java b/lib_base/src/main/java/com/mirkowu/lib_base/widget/RefreshHelper.java
@@ -96,6 +96,10 @@ public void setLoadData(BaseRVAdapter adapter, List<?> list) {
             mRefreshLayout.finishRefresh();
         }
         adapter.setData(list);
+
+        if (mOnRefreshListener != null) {
+            mOnRefreshListener.onEmptyChange(list == null || list.isEmpty());
+        }
     }
 
     /**

diff --git a/lib_photo/src/main/res/drawable-xxhdpi/ivp_delete.webp b/lib_photo/src/main/res/drawable-xxhdpi/ivp_delete.webp
diff --git a/lib_photo/src/main/res/layout/ivp_list_item_selected_image.xml b/lib_photo/src/main/res/layout/ivp_list_item_selected_image.xml
@@ -21,7 +21,7 @@
         android:id="@+id/flDelete"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top|right"
+        android:layout_gravity="top|end"
         android:paddingLeft="8dp"
         android:paddingTop="4dp"
         android:paddingRight="4dp"
@@ -33,7 +33,6 @@
             android:layout_height="26dp"
             android:layout_marginTop="2dp"
             android:layout_marginRight="2dp"
-            android:padding="2dp"
             android:src="@drawable/ivp_delete" />
     </FrameLayout>
 

diff --git a/lib_widget/src/main/java/com/mirkowu/lib_widget/stateview/StateView.java b/lib_widget/src/main/java/com/mirkowu/lib_widget/stateview/StateView.java
@@ -101,6 +101,15 @@ public int getState() {
         return mState;
     }
 
+    public ImageView getLoadingView() {
+        return ivLoading;
+    }
+
+    public Button getRefreshButton() {
+        return btnRefresh;
+    }
+
+
     private void setState(int state) {
         mState = state;
         setVisibility(VISIBLE);

diff --git a/lib_widget/src/main/res/layout/widget_layout_state_view.xml b/lib_widget/src/main/res/layout/widget_layout_state_view.xml
@@ -3,17 +3,18 @@
     android:id="@+id/mRootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FFFFFF"
     android:gravity="center"
     android:orientation="vertical">
 
     <ImageView
         android:id="@+id/ivLoading"
-        android:layout_width="100dp"
-        android:layout_height="80dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginBottom="30dp"
-        android:scaleType="center"
+        android:adjustViewBounds="true"
+        android:maxWidth="100dp"
+        android:scaleType="fitCenter"
         android:visibility="gone" />