diff --git a/app/src/main/java/com/mirkowu/mvm/mvvm/MVVMActivity.java b/app/src/main/java/com/mirkowu/mvm/mvvm/MVVMActivity.java index 86a9676..2bc1eab 100644 --- 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 new file mode 100644 index 0000000..13e7394 --- /dev/null +++ b/app/src/main/res/drawable/anim_loading.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file 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 index caad122..44da927 100644 --- 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 @@ 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 index 0bba251..8d6cb02 100644 --- 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 index 818c973..6a7c6ec 100644 Binary files a/lib_photo/src/main/res/drawable-xxhdpi/ivp_delete.webp and b/lib_photo/src/main/res/drawable-xxhdpi/ivp_delete.webp differ 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 index f5ec50f..eaf280c 100644 --- 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" /> 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 index f7a5eac..9d8078a 100644 --- 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 index 065f8bb..ea0e9a1 100644 --- 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">