From beee843c19db8b346d78a0688e154013b0dad9ee Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 7 Apr 2023 13:35:13 +0800
Subject: [PATCH] [mobile] update progress logic

---
 .../android/tv/ui/activity/MainActivity.java     |  2 --
 .../android/tv/ui/fragment/VodFragment.java      | 16 ++++++++++++----
 app/src/mobile/res/layout/fragment_vod.xml       |  5 +++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java
index bd9d5d59a..e5aeaed37 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java
@@ -46,7 +46,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
     @Override
     protected void initView(Bundle savedInstanceState) {
         initFragment(savedInstanceState);
-        Notify.progress(this);
         Updater.get().start();
         Server.get().start();
         initConfig();
@@ -93,7 +92,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
             @Override
             public void error(int resId) {
                 Notify.show(resId);
-                Notify.dismiss();
             }
         };
     }
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
index e6a8c0c08..6137c1efe 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
@@ -34,11 +34,10 @@ import com.fongmi.android.tv.ui.activity.HistoryActivity;
 import com.fongmi.android.tv.ui.activity.KeepActivity;
 import com.fongmi.android.tv.ui.adapter.TypeAdapter;
 import com.fongmi.android.tv.ui.base.BaseFragment;
-import com.fongmi.android.tv.utils.FileChooser;
 import com.fongmi.android.tv.ui.custom.dialog.FilterDialog;
 import com.fongmi.android.tv.ui.custom.dialog.LinkDialog;
 import com.fongmi.android.tv.ui.custom.dialog.SiteDialog;
-import com.fongmi.android.tv.utils.Notify;
+import com.fongmi.android.tv.utils.FileChooser;
 import com.fongmi.android.tv.utils.Prefers;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 
@@ -85,6 +84,7 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
         EventBus.getDefault().register(this);
         setRecyclerView();
         setViewModel();
+        showProgress();
         initHot();
         getHot();
     }
@@ -152,7 +152,7 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
         mAdapter.addAll(handle());
         for (Class item : mAdapter.getTypes()) if (result.getFilters().containsKey(item.getTypeId())) item.setFilters(result.getFilters().get(item.getTypeId()));
         mBinding.pager.getAdapter().notifyDataSetChanged();
-        Notify.dismiss();
+        hideProgress();
     }
 
     private void setFabVisible(int position) {
@@ -198,6 +198,14 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
         HistoryActivity.start(getActivity());
     }
 
+    private void showProgress() {
+        mBinding.progress.getRoot().setVisibility(View.VISIBLE);
+    }
+
+    private void hideProgress() {
+        mBinding.progress.getRoot().setVisibility(View.GONE);
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onRefreshEvent(RefreshEvent event) {
         switch (event.getType()) {
@@ -209,6 +217,7 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
     }
 
     private void homeContent() {
+        showProgress();
         setFabVisible(0);
         mAdapter.clear();
         mViewModel.homeContent();
@@ -218,7 +227,6 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
     @Override
     public void setSite(Site item) {
         ApiConfig.get().setHome(item);
-        Notify.progress(getActivity());
         homeContent();
     }
 
diff --git a/app/src/mobile/res/layout/fragment_vod.xml b/app/src/mobile/res/layout/fragment_vod.xml
index 0c3da70a7..41c2c3d96 100644
--- a/app/src/mobile/res/layout/fragment_vod.xml
+++ b/app/src/mobile/res/layout/fragment_vod.xml
@@ -99,6 +99,11 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
+    <include
+        android:id="@+id/progress"
+        layout="@layout/view_progress"
+        android:visibility="gone" />
+
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/filter"
         android:layout_width="wrap_content"