From bfbc69eb86f310d21d7941be33751d5928c997c1 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Patel Date: Fri, 27 Mar 2020 01:36:22 +0530 Subject: [PATCH] Minor improvements --- .../java/com/aurora/store/RecyclerDataObserver.java | 13 ++++++++----- .../ui/category/fragment/SubCategoryFragment.java | 3 +++ .../store/ui/installed/InstalledAppActivity.java | 2 +- .../ui/main/fragment/updates/UpdatesFragment.java | 12 ++++++++++-- .../store/ui/search/activity/SearchActivity.java | 2 +- .../ui/search/activity/SearchResultActivity.java | 8 ++++++++ .../store/ui/single/fragment/FavouriteFragment.java | 8 ++++++++ .../store/{ => util/diff}/AppDiffCallback.java | 2 +- .../store/{ => util/diff}/EndlessDiffCallback.java | 2 +- .../{ => util/diff}/InstalledDiffCallback.java | 2 +- .../store/{ => util/diff}/ReviewsDiffCallback.java | 2 +- .../{ => util/diff}/SuggestionDiffCallback.java | 2 +- .../store/{ => util/diff}/UpdatesDiffCallback.java | 2 +- 13 files changed, 45 insertions(+), 15 deletions(-) rename app/src/main/java/com/aurora/store/{ => util/diff}/AppDiffCallback.java (95%) rename app/src/main/java/com/aurora/store/{ => util/diff}/EndlessDiffCallback.java (95%) rename app/src/main/java/com/aurora/store/{ => util/diff}/InstalledDiffCallback.java (95%) rename app/src/main/java/com/aurora/store/{ => util/diff}/ReviewsDiffCallback.java (95%) rename app/src/main/java/com/aurora/store/{ => util/diff}/SuggestionDiffCallback.java (95%) rename app/src/main/java/com/aurora/store/{ => util/diff}/UpdatesDiffCallback.java (95%) diff --git a/app/src/main/java/com/aurora/store/RecyclerDataObserver.java b/app/src/main/java/com/aurora/store/RecyclerDataObserver.java index dd8b86103..6c9904361 100644 --- a/app/src/main/java/com/aurora/store/RecyclerDataObserver.java +++ b/app/src/main/java/com/aurora/store/RecyclerDataObserver.java @@ -16,13 +16,16 @@ public class RecyclerDataObserver extends RecyclerView.AdapterDataObserver { this.recyclerView = recyclerView; this.emptyView = emptyView; this.progressView = progressView; - checkIfLoading(); + showProgress(); } - public void checkIfLoading() { - if (recyclerView.getAdapter() == null) { - progressView.setVisibility(View.VISIBLE); - } + + public void showProgress() { + progressView.setVisibility(View.VISIBLE); + } + + public void hideProgress() { + progressView.setVisibility(View.GONE); } public void checkIfEmpty() { diff --git a/app/src/main/java/com/aurora/store/ui/category/fragment/SubCategoryFragment.java b/app/src/main/java/com/aurora/store/ui/category/fragment/SubCategoryFragment.java index eb9c9937e..903c50cb7 100644 --- a/app/src/main/java/com/aurora/store/ui/category/fragment/SubCategoryFragment.java +++ b/app/src/main/java/com/aurora/store/ui/category/fragment/SubCategoryFragment.java @@ -129,6 +129,9 @@ public class SubCategoryFragment extends BaseFragment implements @Override public void onResume() { super.onResume(); + if (dataObserver != null && !itemAdapter.getAdapterItems().isEmpty()) { + dataObserver.hideProgress(); + } sharedPreferences.registerOnSharedPreferenceChangeListener(this); } diff --git a/app/src/main/java/com/aurora/store/ui/installed/InstalledAppActivity.java b/app/src/main/java/com/aurora/store/ui/installed/InstalledAppActivity.java index 430f0ff6a..50a27e77f 100644 --- a/app/src/main/java/com/aurora/store/ui/installed/InstalledAppActivity.java +++ b/app/src/main/java/com/aurora/store/ui/installed/InstalledAppActivity.java @@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.aurora.store.AuroraApplication; import com.aurora.store.Constants; -import com.aurora.store.InstalledDiffCallback; +import com.aurora.store.util.diff.InstalledDiffCallback; import com.aurora.store.R; import com.aurora.store.model.App; import com.aurora.store.model.items.InstalledItem; diff --git a/app/src/main/java/com/aurora/store/ui/main/fragment/updates/UpdatesFragment.java b/app/src/main/java/com/aurora/store/ui/main/fragment/updates/UpdatesFragment.java index 47d02b9df..e004a94ca 100644 --- a/app/src/main/java/com/aurora/store/ui/main/fragment/updates/UpdatesFragment.java +++ b/app/src/main/java/com/aurora/store/ui/main/fragment/updates/UpdatesFragment.java @@ -42,7 +42,6 @@ import com.aurora.store.AuroraApplication; import com.aurora.store.Constants; import com.aurora.store.R; import com.aurora.store.RecyclerDataObserver; -import com.aurora.store.UpdatesDiffCallback; import com.aurora.store.download.DownloadManager; import com.aurora.store.manager.IgnoreListManager; import com.aurora.store.model.App; @@ -53,6 +52,7 @@ import com.aurora.store.ui.single.fragment.BaseFragment; import com.aurora.store.ui.view.CustomSwipeToRefresh; import com.aurora.store.util.Util; import com.aurora.store.util.ViewUtil; +import com.aurora.store.util.diff.UpdatesDiffCallback; import com.google.android.material.button.MaterialButton; import com.mikepenz.fastadapter.FastAdapter; import com.mikepenz.fastadapter.adapters.ItemAdapter; @@ -177,6 +177,14 @@ public class UpdatesFragment extends BaseFragment { .subscribe(); } + @Override + public void onResume() { + super.onResume(); + if (dataObserver != null && !itemAdapter.getAdapterItems().isEmpty()) { + dataObserver.hideProgress(); + } + } + @Override public void onPause() { swipeToRefresh.setRefreshing(false); @@ -261,7 +269,7 @@ public class UpdatesFragment extends BaseFragment { fastAdapter.addExtension(selectExtension); fastAdapter.addEventHook(new UpdatesItem.CheckBoxClickEvent()); - dataObserver = new RecyclerDataObserver(recyclerView, emptyLayout,progressLayout); + dataObserver = new RecyclerDataObserver(recyclerView, emptyLayout, progressLayout); fastAdapter.registerAdapterDataObserver(dataObserver); selectExtension.setMultiSelect(true); diff --git a/app/src/main/java/com/aurora/store/ui/search/activity/SearchActivity.java b/app/src/main/java/com/aurora/store/ui/search/activity/SearchActivity.java index 6731df95f..7eb47e408 100644 --- a/app/src/main/java/com/aurora/store/ui/search/activity/SearchActivity.java +++ b/app/src/main/java/com/aurora/store/ui/search/activity/SearchActivity.java @@ -19,7 +19,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.aurora.store.Constants; import com.aurora.store.R; -import com.aurora.store.SuggestionDiffCallback; +import com.aurora.store.util.diff.SuggestionDiffCallback; import com.aurora.store.model.items.SearchSuggestionItem; import com.aurora.store.ui.details.DetailsActivity; import com.aurora.store.ui.search.SearchSuggestionModel; diff --git a/app/src/main/java/com/aurora/store/ui/search/activity/SearchResultActivity.java b/app/src/main/java/com/aurora/store/ui/search/activity/SearchResultActivity.java index 2a04db00f..480270b22 100644 --- a/app/src/main/java/com/aurora/store/ui/search/activity/SearchResultActivity.java +++ b/app/src/main/java/com/aurora/store/ui/search/activity/SearchResultActivity.java @@ -128,6 +128,14 @@ public class SearchResultActivity extends BaseActivity implements finishAfterTransition(); } + @Override + public void onResume() { + super.onResume(); + if (dataObserver != null && !itemAdapter.getAdapterItems().isEmpty()) { + dataObserver.hideProgress(); + } + } + @Override protected void onDestroy() { sharedPreferences.unregisterOnSharedPreferenceChangeListener(this); diff --git a/app/src/main/java/com/aurora/store/ui/single/fragment/FavouriteFragment.java b/app/src/main/java/com/aurora/store/ui/single/fragment/FavouriteFragment.java index 33d424da9..c37981152 100644 --- a/app/src/main/java/com/aurora/store/ui/single/fragment/FavouriteFragment.java +++ b/app/src/main/java/com/aurora/store/ui/single/fragment/FavouriteFragment.java @@ -134,6 +134,14 @@ public class FavouriteFragment extends BaseFragment { }); } + @Override + public void onResume() { + super.onResume(); + if (dataObserver != null && !fastItemAdapter.getAdapterItems().isEmpty()) { + dataObserver.hideProgress(); + } + } + @Override public void onPause() { swipeToRefresh.setRefreshing(false); diff --git a/app/src/main/java/com/aurora/store/AppDiffCallback.java b/app/src/main/java/com/aurora/store/util/diff/AppDiffCallback.java similarity index 95% rename from app/src/main/java/com/aurora/store/AppDiffCallback.java rename to app/src/main/java/com/aurora/store/util/diff/AppDiffCallback.java index 857634542..e626b1cdb 100644 --- a/app/src/main/java/com/aurora/store/AppDiffCallback.java +++ b/app/src/main/java/com/aurora/store/util/diff/AppDiffCallback.java @@ -1,4 +1,4 @@ -package com.aurora.store; +package com.aurora.store.util.diff; import androidx.recyclerview.widget.DiffUtil; diff --git a/app/src/main/java/com/aurora/store/EndlessDiffCallback.java b/app/src/main/java/com/aurora/store/util/diff/EndlessDiffCallback.java similarity index 95% rename from app/src/main/java/com/aurora/store/EndlessDiffCallback.java rename to app/src/main/java/com/aurora/store/util/diff/EndlessDiffCallback.java index 65f8ed1c3..fecdddb88 100644 --- a/app/src/main/java/com/aurora/store/EndlessDiffCallback.java +++ b/app/src/main/java/com/aurora/store/util/diff/EndlessDiffCallback.java @@ -1,4 +1,4 @@ -package com.aurora.store; +package com.aurora.store.util.diff; import com.aurora.store.model.items.EndlessItem; import com.mikepenz.fastadapter.diff.DiffCallback; diff --git a/app/src/main/java/com/aurora/store/InstalledDiffCallback.java b/app/src/main/java/com/aurora/store/util/diff/InstalledDiffCallback.java similarity index 95% rename from app/src/main/java/com/aurora/store/InstalledDiffCallback.java rename to app/src/main/java/com/aurora/store/util/diff/InstalledDiffCallback.java index db412c82f..a9f38497f 100644 --- a/app/src/main/java/com/aurora/store/InstalledDiffCallback.java +++ b/app/src/main/java/com/aurora/store/util/diff/InstalledDiffCallback.java @@ -1,4 +1,4 @@ -package com.aurora.store; +package com.aurora.store.util.diff; import com.aurora.store.model.items.InstalledItem; import com.mikepenz.fastadapter.diff.DiffCallback; diff --git a/app/src/main/java/com/aurora/store/ReviewsDiffCallback.java b/app/src/main/java/com/aurora/store/util/diff/ReviewsDiffCallback.java similarity index 95% rename from app/src/main/java/com/aurora/store/ReviewsDiffCallback.java rename to app/src/main/java/com/aurora/store/util/diff/ReviewsDiffCallback.java index 554790721..3ab6cc87b 100644 --- a/app/src/main/java/com/aurora/store/ReviewsDiffCallback.java +++ b/app/src/main/java/com/aurora/store/util/diff/ReviewsDiffCallback.java @@ -1,4 +1,4 @@ -package com.aurora.store; +package com.aurora.store.util.diff; import androidx.recyclerview.widget.DiffUtil; diff --git a/app/src/main/java/com/aurora/store/SuggestionDiffCallback.java b/app/src/main/java/com/aurora/store/util/diff/SuggestionDiffCallback.java similarity index 95% rename from app/src/main/java/com/aurora/store/SuggestionDiffCallback.java rename to app/src/main/java/com/aurora/store/util/diff/SuggestionDiffCallback.java index 9bf70ee0d..1bebc78df 100644 --- a/app/src/main/java/com/aurora/store/SuggestionDiffCallback.java +++ b/app/src/main/java/com/aurora/store/util/diff/SuggestionDiffCallback.java @@ -1,4 +1,4 @@ -package com.aurora.store; +package com.aurora.store.util.diff; import com.aurora.store.model.items.SearchSuggestionItem; import com.mikepenz.fastadapter.diff.DiffCallback; diff --git a/app/src/main/java/com/aurora/store/UpdatesDiffCallback.java b/app/src/main/java/com/aurora/store/util/diff/UpdatesDiffCallback.java similarity index 95% rename from app/src/main/java/com/aurora/store/UpdatesDiffCallback.java rename to app/src/main/java/com/aurora/store/util/diff/UpdatesDiffCallback.java index 4323b4c2e..07845703e 100644 --- a/app/src/main/java/com/aurora/store/UpdatesDiffCallback.java +++ b/app/src/main/java/com/aurora/store/util/diff/UpdatesDiffCallback.java @@ -1,4 +1,4 @@ -package com.aurora.store; +package com.aurora.store.util.diff; import com.aurora.store.model.items.UpdatesItem; import com.mikepenz.fastadapter.diff.DiffCallback;