mirror/AuroraStore
1
0
Fork 0
mirror of https://github.com/whyorean/AuroraStore.git synced 2026-06-19 04:58:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace placeholder layouts with ViewFlipper

Browse Source
This commit is contained in:
Rahul Kumar Patel
2020-04-13 04:27:18 +05:30
parent 307368e869
commit 8c3471fcf1
37 changed files with 812 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
app/src/main/java/com/aurora/store/RecyclerDataObserver.java
View File

@@ -1,55 +0,0 @@
package com.aurora.store;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
public class RecyclerDataObserver extends RecyclerView.AdapterDataObserver {
private RecyclerView recyclerView;
private ViewGroup emptyView;
private ViewGroup progressView;
public RecyclerDataObserver(@NonNull RecyclerView recyclerView, @NonNull ViewGroup emptyView, @NonNull ViewGroup progressView) {
this.recyclerView = recyclerView;
this.emptyView = emptyView;
this.progressView = progressView;
showProgress();
}
public void showProgress() {
progressView.setVisibility(View.VISIBLE);
}
public void hideProgress() {
progressView.setVisibility(View.GONE);
}
public void checkIfEmpty() {
if (recyclerView.getAdapter() != null) {
if (recyclerView.getAdapter().getItemCount() == 0)
emptyView.setVisibility(View.VISIBLE);
else
emptyView.setVisibility(View.GONE);
progressView.setVisibility(View.GONE);
}
}
@Override
public void onChanged() {
checkIfEmpty();
}
@Override
public void onItemRangeInserted(int positionStart, int itemCount) {
checkIfEmpty();
}
@Override
public void onItemRangeRemoved(int positionStart, int itemCount) {
checkIfEmpty();
}
}

25
app/src/main/java/com/aurora/store/ui/category/fragment/SubCategoryFragment.java
View File

@@ -26,7 +26,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RelativeLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -38,7 +37,6 @@ import androidx.recyclerview.widget.RecyclerView;
import com.aurora.store.Constants;
import com.aurora.store.R;
import com.aurora.store.RecyclerDataObserver;
import com.aurora.store.model.App;
import com.aurora.store.model.items.EndlessItem;
import com.aurora.store.sheet.AppMenuSheet;
@@ -46,6 +44,7 @@ import com.aurora.store.ui.category.CategoryAppsActivity;
import com.aurora.store.ui.category.CategoryAppsModel;
import com.aurora.store.ui.details.DetailsActivity;
import com.aurora.store.ui.single.fragment.BaseFragment;
import com.aurora.store.ui.view.ViewFlipper2;
import com.aurora.store.util.Util;
import com.aurora.store.util.ViewUtil;
import com.dragons.aurora.playstoreapiv2.GooglePlayAPI;
@@ -64,16 +63,13 @@ public class SubCategoryFragment extends BaseFragment implements
@BindView(R.id.recycler)
RecyclerView recyclerView;
@BindView(R.id.empty_layout)
RelativeLayout emptyLayout;
@BindView(R.id.progress_layout)
RelativeLayout progressLayout;
@BindView(R.id.viewFlipper)
ViewFlipper2 viewFlipper;
private GooglePlayAPI.SUBCATEGORY subcategory = GooglePlayAPI.SUBCATEGORY.TOP_FREE;
private SharedPreferences sharedPreferences;
private CategoryAppsModel model;
private RecyclerDataObserver dataObserver;
private FastAdapter fastAdapter;
private ItemAdapter<EndlessItem> itemAdapter;
@@ -129,9 +125,6 @@ public class SubCategoryFragment extends BaseFragment implements
@Override
public void onResume() {
super.onResume();
if (dataObserver != null && !itemAdapter.getAdapterItems().isEmpty()) {
dataObserver.hideProgress();
}
sharedPreferences.registerOnSharedPreferenceChangeListener(this);
}
@@ -146,6 +139,12 @@ public class SubCategoryFragment extends BaseFragment implements
recyclerView.post(() -> {
progressItemAdapter.clear();
});
if (itemAdapter != null && itemAdapter.getAdapterItems().size() > 0) {
viewFlipper.switchState(ViewFlipper2.DATA);
} else {
viewFlipper.switchState(ViewFlipper2.EMPTY);
}
}
private void purgeAdapterData() {
@@ -153,9 +152,6 @@ public class SubCategoryFragment extends BaseFragment implements
progressItemAdapter.clear();
itemAdapter.clear();
});
if (dataObserver != null)
dataObserver.checkIfEmpty();
}
private void setupRecycler() {
@@ -201,9 +197,6 @@ public class SubCategoryFragment extends BaseFragment implements
}
};
dataObserver = new RecyclerDataObserver(recyclerView, emptyLayout, progressLayout);
fastAdapter.registerAdapterDataObserver(dataObserver);
recyclerView.addOnScrollListener(endlessScrollListener);
recyclerView.setLayoutManager(new LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false));
recyclerView.setItemAnimator(new DefaultItemAnimator());

4
app/src/main/java/com/aurora/store/ui/details/DetailsActivity.java
View File

@@ -193,7 +193,7 @@ public class DetailsActivity extends BaseActivity {
getMenuInflater().inflate(R.menu.menu_app_details, menu);
menu.findItem(R.id.action_favourite).setIcon(favouritesManager.isFavourite(packageName)
? R.drawable.ic_favourite_red
: R.drawable.ic_favourite_remove);
: R.drawable.ic_favourite);
MenuItem blackList = menu.findItem(R.id.action_blacklist);
if (!PackageUtil.isInstalled(this, packageName))
blackList.setVisible(false);
@@ -209,7 +209,7 @@ public class DetailsActivity extends BaseActivity {
case R.id.action_favourite:
if (favouritesManager.isFavourite(packageName)) {
favouritesManager.removeFromFavourites(packageName);
menuItem.setIcon(R.drawable.ic_favourite_remove);
menuItem.setIcon(R.drawable.ic_favourite);
} else {
favouritesManager.addToFavourites(packageName);
menuItem.setIcon(R.drawable.ic_favourite_red);

7
app/src/main/java/com/aurora/store/ui/details/views/ActionButton.java
View File

@@ -158,10 +158,13 @@ public class ActionButton extends AbstractDetails {
PackageInfo info = context.getPackageManager().getPackageInfo(app.getPackageName(), 0);
String currentVersion = info.versionName;
btnPositive.setText(R.string.details_update);
if (info.versionCode == app.getVersionCode() || null == currentVersion) {
if (info.versionCode >= app.getVersionCode() || null == currentVersion) {
btnPositive.setText(R.string.details_run);
btnPositive.setOnClickListener(openAppListener());
btnPositive.setVisibility(PackageUtil.isPackageLaunchable(context, app.getPackageName()) ? View.VISIBLE : View.GONE);
btnPositive.setVisibility(PackageUtil.isPackageLaunchable(context, app.getPackageName())
? View.VISIBLE
: View.GONE);
} else if (new File(PathUtil.getLocalApkPath(context, app.getPackageName(),
app.getVersionCode())).exists()) {
btnPositive.setOnClickListener(installAppListener());

24
app/src/main/java/com/aurora/store/ui/devapps/DevAppsActivity.java
View File

@@ -3,7 +3,6 @@ package com.aurora.store.ui.devapps;
import android.content.Intent;
import android.os.Bundle;
import android.view.MenuItem;
import android.widget.RelativeLayout;
import android.widget.Toast;
import androidx.annotation.Nullable;
@@ -16,12 +15,12 @@ import androidx.recyclerview.widget.RecyclerView;
import com.aurora.store.Constants;
import com.aurora.store.R;
import com.aurora.store.RecyclerDataObserver;
import com.aurora.store.model.App;
import com.aurora.store.model.items.EndlessItem;
import com.aurora.store.sheet.AppMenuSheet;
import com.aurora.store.ui.details.DetailsActivity;
import com.aurora.store.ui.single.activity.BaseActivity;
import com.aurora.store.ui.view.ViewFlipper2;
import com.aurora.store.util.ViewUtil;
import com.mikepenz.fastadapter.FastAdapter;
import com.mikepenz.fastadapter.adapters.ItemAdapter;
@@ -37,16 +36,12 @@ public class DevAppsActivity extends BaseActivity {
@BindView(R.id.toolbar)
Toolbar toolbar;
@BindView(R.id.viewFlipper)
ViewFlipper2 viewFlipper;
@BindView(R.id.recycler)
RecyclerView recyclerView;
@BindView(R.id.empty_layout)
RelativeLayout emptyLayout;
@BindView(R.id.progress_layout)
RelativeLayout progressLayout;
private DevAppsModel model;
private RecyclerDataObserver dataObserver;
private FastAdapter fastAdapter;
private ItemAdapter<EndlessItem> itemAdapter;
private ItemAdapter<ProgressItem> progressItemAdapter;
@@ -81,9 +76,6 @@ public class DevAppsActivity extends BaseActivity {
@Override
public void onResume() {
super.onResume();
if (dataObserver != null && !itemAdapter.getAdapterItems().isEmpty()) {
dataObserver.hideProgress();
}
}
@Override
@@ -101,8 +93,11 @@ public class DevAppsActivity extends BaseActivity {
progressItemAdapter.clear();
});
if (dataObserver != null)
dataObserver.checkIfEmpty();
if (itemAdapter != null && itemAdapter.getAdapterItems().size() > 0) {
viewFlipper.switchState(ViewFlipper2.DATA);
} else {
viewFlipper.switchState(ViewFlipper2.EMPTY);
}
}
private void setupActionBar() {
@@ -158,9 +153,6 @@ public class DevAppsActivity extends BaseActivity {
}
};
dataObserver = new RecyclerDataObserver(recyclerView, emptyLayout, progressLayout);
fastAdapter.registerAdapterDataObserver(dataObserver);
recyclerView.addOnScrollListener(endlessScrollListener);
recyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
recyclerView.setItemAnimator(new DefaultItemAnimator());

35
app/src/main/java/com/aurora/store/ui/installed/InstalledAppActivity.java
View File

@@ -3,7 +3,6 @@ package com.aurora.store.ui.installed;
import android.content.Intent;
import android.os.Bundle;
import android.view.MenuItem;
import android.widget.RelativeLayout;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.lifecycle.ViewModelProvider;
@@ -11,17 +10,17 @@ import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.aurora.store.AuroraApplication;
import com.aurora.store.Constants;
import com.aurora.store.R;
import com.aurora.store.RecyclerDataObserver;
import com.aurora.store.model.App;
import com.aurora.store.model.items.InstalledItem;
import com.aurora.store.sheet.AppMenuSheet;
import com.aurora.store.ui.details.DetailsActivity;
import com.aurora.store.ui.single.activity.BaseActivity;
import com.aurora.store.ui.view.CustomSwipeToRefresh;
import com.aurora.store.ui.view.ViewFlipper2;
import com.aurora.store.util.PrefUtil;
import com.aurora.store.util.Util;
import com.aurora.store.util.ViewUtil;
@@ -43,18 +42,13 @@ public class InstalledAppActivity extends BaseActivity {
CoordinatorLayout coordinator;
@BindView(R.id.switch_system)
SwitchMaterial switchSystem;
@BindView(R.id.viewFlipper)
ViewFlipper2 viewFlipper;
@BindView(R.id.swipe_layout)
CustomSwipeToRefresh swipeToRefresh;
SwipeRefreshLayout swipeToRefresh;
@BindView(R.id.recycler)
RecyclerView recyclerView;
@BindView(R.id.empty_layout)
RelativeLayout emptyLayout;
@BindView(R.id.progress_layout)
RelativeLayout progressLayout;
private InstalledAppsModel model;
private RecyclerDataObserver dataObserver;
private FastAdapter<InstalledItem> fastAdapter;
private ItemAdapter<InstalledItem> itemAdapter;
@@ -114,9 +108,12 @@ public class InstalledAppActivity extends BaseActivity {
@Override
public void onResume() {
super.onResume();
if (dataObserver != null && !itemAdapter.getAdapterItems().isEmpty()) {
dataObserver.hideProgress();
}
}
@Override
protected void onPause() {
swipeToRefresh.setRefreshing(false);
super.onPause();
}
@Override
@@ -138,8 +135,11 @@ public class InstalledAppActivity extends BaseActivity {
final DiffUtil.DiffResult diffResult = fastAdapterDiffUtil.calculateDiff(itemAdapter, installedItemList, diffCallback);
fastAdapterDiffUtil.set(itemAdapter, diffResult);
if (dataObserver != null)
dataObserver.checkIfEmpty();
if (itemAdapter != null && itemAdapter.getAdapterItems().size() > 0) {
viewFlipper.switchState(ViewFlipper2.DATA);
} else {
viewFlipper.switchState(ViewFlipper2.EMPTY);
}
}
private void removeItemByPackageName(String packageName) {
@@ -180,9 +180,6 @@ public class InstalledAppActivity extends BaseActivity {
return true;
});
dataObserver = new RecyclerDataObserver(recyclerView, emptyLayout, progressLayout);
fastAdapter.registerAdapterDataObserver(dataObserver);
recyclerView.setLayoutManager(new LinearLayoutManager(this));
recyclerView.setItemAnimator(new DefaultItemAnimator());
recyclerView.setAdapter(fastAdapter);

61
app/src/main/java/com/aurora/store/ui/main/fragment/category/CategoriesFragment.java
View File

@@ -25,7 +25,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ProgressBar;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -33,6 +32,7 @@ import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.aurora.store.Constants;
import com.aurora.store.R;
@@ -40,6 +40,8 @@ import com.aurora.store.manager.CategoryManager;
import com.aurora.store.model.items.CategoryItem;
import com.aurora.store.ui.category.CategoryAppsActivity;
import com.aurora.store.ui.main.AuroraActivity;
import com.aurora.store.ui.view.ViewFlipper2;
import com.aurora.store.util.Log;
import com.aurora.store.util.ViewUtil;
import com.mikepenz.fastadapter.FastAdapter;
import com.mikepenz.fastadapter.adapters.ItemAdapter;
@@ -47,18 +49,22 @@ import com.mikepenz.fastadapter.adapters.ItemAdapter;
import butterknife.BindView;
import butterknife.ButterKnife;
import io.reactivex.Observable;
import io.reactivex.disposables.CompositeDisposable;
public class CategoriesFragment extends Fragment {
@BindView(R.id.category_recycler)
@BindView(R.id.swipe_layout)
SwipeRefreshLayout swipeLayout;
@BindView(R.id.viewFlipper)
ViewFlipper2 viewFlipper;
@BindView(R.id.recycler)
RecyclerView recyclerView;
@BindView(R.id.progress_bar)
ProgressBar progressBar;
private CategoryManager categoryManager;
private FastAdapter<CategoryItem> fastAdapter;
private ItemAdapter<CategoryItem> categoryItemAdapter;
private ItemAdapter<CategoryItem> itemAdapter;
private CompositeDisposable disposable = new CompositeDisposable();
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -71,32 +77,53 @@ public class CategoriesFragment extends Fragment {
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
categoryManager = new CategoryManager(requireContext());
setupRecycler();
CategoriesModel categoriesModel = new ViewModelProvider(this).get(CategoriesModel.class);
categoriesModel.getFetchCompleted().observe(getViewLifecycleOwner(), success -> {
categoriesModel.getData().observe(getViewLifecycleOwner(), success -> {
if (success) {
setupRecycler();
progressBar.setVisibility(View.GONE);
dispatchDataToAdapter();
}
swipeLayout.setRefreshing(false);
});
categoriesModel.fetchCategories();
swipeLayout.setOnRefreshListener(categoriesModel::fetchCategories);
}
private void setupRecycler() {
fastAdapter = new FastAdapter<>();
categoryItemAdapter = new ItemAdapter<>();
@Override
public void onPause() {
swipeLayout.setRefreshing(false);
super.onPause();
}
Observable.fromIterable(categoryManager.getCategories(Constants.CATEGORY_APPS))
private void dispatchDataToAdapter() {
disposable.add(Observable.fromIterable(categoryManager.getCategories(Constants.CATEGORY_APPS))
.mergeWith(Observable.fromIterable(categoryManager.getCategories(Constants.CATEGORY_GAME)))
.mergeWith(Observable.fromIterable(categoryManager.getCategories(Constants.CATEGORY_FAMILY)))
.map(CategoryItem::new)
.toList()
.doOnSuccess(categoryItems -> {
categoryItemAdapter.add(categoryItems);
})
.subscribe();
.subscribe(categoryItems -> {
itemAdapter.add(categoryItems);
updatePageData();
},
throwable -> Log.e(throwable.getMessage())));
}
private void updatePageData() {
if (itemAdapter != null && itemAdapter.getAdapterItems().size() > 0) {
viewFlipper.switchState(ViewFlipper2.DATA);
} else {
viewFlipper.switchState(ViewFlipper2.EMPTY);
}
}
private void setupRecycler() {
fastAdapter = new FastAdapter<>();
itemAdapter = new ItemAdapter<>();
//TODO:Add section headers
fastAdapter.addAdapter(0, categoryItemAdapter);
fastAdapter.addAdapter(0, itemAdapter);
fastAdapter.setOnClickListener((view, categoryItemIAdapter, categoryItem, integer) -> {
Intent intent = new Intent(requireContext(), CategoryAppsActivity.class);
intent.putExtra("CategoryId", categoryItem.getCategoryModel().getCategoryId());

18
app/src/main/java/com/aurora/store/ui/main/fragment/category/CategoriesModel.java
View File

@@ -3,12 +3,12 @@ package com.aurora.store.ui.main.fragment.category;
import android.app.Application;
import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.MutableLiveData;
import com.aurora.store.AuroraApplication;
import com.aurora.store.manager.CategoryManager;
import com.aurora.store.task.CategoryListTask;
import com.aurora.store.viewmodel.BaseViewModel;
import com.dragons.aurora.playstoreapiv2.GooglePlayAPI;
import io.reactivex.Observable;
@@ -16,14 +16,14 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.schedulers.Schedulers;
public class CategoriesModel extends AndroidViewModel {
public class CategoriesModel extends BaseViewModel {
private Application application;
private CompositeDisposable disposable = new CompositeDisposable();
private GooglePlayAPI api;
private CategoryManager categoryManager;
private MutableLiveData<Boolean> fetchCompleted = new MutableLiveData<>();
private MutableLiveData<Boolean> data = new MutableLiveData<>();
public CategoriesModel(@NonNull Application application) {
super(application);
@@ -32,15 +32,15 @@ public class CategoriesModel extends AndroidViewModel {
this.categoryManager = new CategoryManager(application);
}
public MutableLiveData<Boolean> getFetchCompleted() {
return fetchCompleted;
public MutableLiveData<Boolean> getData() {
return data;
}
public void fetchCategories() {
if (categoryManager.categoryListEmpty())
getCategoriesFromAPI();
else
fetchCompleted.setValue(true);
data.setValue(true);
}
private void getCategoriesFromAPI() {
@@ -48,11 +48,7 @@ public class CategoriesModel extends AndroidViewModel {
.getResult())
.subscribeOn(Schedulers.computation())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(status -> {
fetchCompleted.setValue(status);
}, err -> {
}));
.subscribe(status -> data.setValue(status), this::handleError));
}
@Override

9
app/src/main/java/com/aurora/store/ui/main/fragment/updates/UpdatableAppsModel.java
View File

@@ -32,22 +32,21 @@ public class UpdatableAppsModel extends BaseViewModel {
}
public void fetchUpdatableApps() {
Observable.fromCallable(() -> new UpdatableAppsTask(api, getApplication())
disposable.add(Observable.fromCallable(() -> new UpdatableAppsTask(api, getApplication())
.getUpdatableApps())
.subscribeOn(Schedulers.computation())
.observeOn(AndroidSchedulers.mainThread())
.map(apps -> sortList(apps))
.map(this::sortList)
.flatMap(apps -> Observable
.fromIterable(apps)
.map(UpdatesItem::new))
.toList()
.doOnSuccess(updatesItems -> data.setValue(updatesItems))
.doOnError(this::handleError)
.subscribe();
.subscribe(updatesItems -> data.setValue(updatesItems), this::handleError));
}
@Override
protected void onCleared() {
disposable.dispose();
super.onCleared();
}
}

80
app/src/main/java/com/aurora/store/ui/main/fragment/updates/UpdatesFragment.java
View File

@@ -25,7 +25,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RelativeLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -37,11 +36,11 @@ import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.aurora.store.AuroraApplication;
import com.aurora.store.Constants;
import com.aurora.store.R;
import com.aurora.store.RecyclerDataObserver;
import com.aurora.store.download.DownloadManager;
import com.aurora.store.manager.IgnoreListManager;
import com.aurora.store.model.App;
@@ -49,7 +48,7 @@ import com.aurora.store.model.items.UpdatesItem;
import com.aurora.store.sheet.AppMenuSheet;
import com.aurora.store.ui.details.DetailsActivity;
import com.aurora.store.ui.single.fragment.BaseFragment;
import com.aurora.store.ui.view.CustomSwipeToRefresh;
import com.aurora.store.ui.view.ViewFlipper2;
import com.aurora.store.util.Util;
import com.aurora.store.util.ViewUtil;
import com.aurora.store.util.diff.UpdatesDiffCallback;
@@ -58,9 +57,10 @@ import com.mikepenz.fastadapter.FastAdapter;
import com.mikepenz.fastadapter.adapters.ItemAdapter;
import com.mikepenz.fastadapter.diff.FastAdapterDiffUtil;
import com.mikepenz.fastadapter.select.SelectExtension;
import com.tonyodev.fetch2.AbstractFetchListener;
import com.tonyodev.fetch2.AbstractFetchGroupListener;
import com.tonyodev.fetch2.Download;
import com.tonyodev.fetch2.Fetch;
import com.tonyodev.fetch2.FetchGroup;
import com.tonyodev.fetch2.FetchListener;
import org.apache.commons.lang3.StringUtils;
@@ -80,7 +80,9 @@ public class UpdatesFragment extends BaseFragment {
@BindView(R.id.coordinator)
CoordinatorLayout coordinator;
@BindView(R.id.swipe_layout)
CustomSwipeToRefresh swipeToRefresh;
SwipeRefreshLayout swipeLayout;
@BindView(R.id.viewFlipper)
ViewFlipper2 viewFlipper;
@BindView(R.id.recycler)
RecyclerView recyclerView;
@BindView(R.id.txt_update_all)
@@ -88,17 +90,10 @@ public class UpdatesFragment extends BaseFragment {
@BindView(R.id.btn_action)
MaterialButton btnAction;
@BindView(R.id.empty_layout)
RelativeLayout emptyLayout;
@BindView(R.id.progress_layout)
RelativeLayout progressLayout;
private Fetch fetch;
private Set<UpdatesItem> selectedItems = new HashSet<>();
private UpdatableAppsModel model;
private RecyclerDataObserver dataObserver;
private FastAdapter<UpdatesItem> fastAdapter;
private ItemAdapter<UpdatesItem> itemAdapter;
private SelectExtension<UpdatesItem> selectExtension;
@@ -118,10 +113,12 @@ public class UpdatesFragment extends BaseFragment {
setupRecycler();
model = new ViewModelProvider(this).get(UpdatableAppsModel.class);
model.getData().observe(getViewLifecycleOwner(), updatesItems -> {
dispatchAppsToAdapter(updatesItems);
swipeToRefresh.setRefreshing(false);
swipeLayout.setRefreshing(false);
});
model.getError().observe(getViewLifecycleOwner(), errorType -> {
switch (errorType) {
case NO_API:
@@ -135,8 +132,8 @@ public class UpdatesFragment extends BaseFragment {
}
});
swipeToRefresh.setRefreshing(true);
swipeToRefresh.setOnRefreshListener(() -> model.fetchUpdatableApps());
swipeLayout.setRefreshing(true);
swipeLayout.setOnRefreshListener(() -> model.fetchUpdatableApps());
AuroraApplication
.getRelayBus()
@@ -180,14 +177,11 @@ public class UpdatesFragment extends BaseFragment {
@Override
public void onResume() {
super.onResume();
if (dataObserver != null && !itemAdapter.getAdapterItems().isEmpty()) {
dataObserver.hideProgress();
}
}
@Override
public void onPause() {
swipeToRefresh.setRefreshing(false);
swipeLayout.setRefreshing(false);
super.onPause();
}
@@ -228,8 +222,12 @@ public class UpdatesFragment extends BaseFragment {
updateText();
updateButtons();
updateButtonActions();
if (dataObserver != null)
dataObserver.checkIfEmpty();
if (itemAdapter != null && itemAdapter.getAdapterItems().size() > 0) {
viewFlipper.switchState(ViewFlipper2.DATA);
} else {
viewFlipper.switchState(ViewFlipper2.EMPTY);
}
}
private void dispatchAppsToAdapter(List<UpdatesItem> updatesItems) {
@@ -269,9 +267,6 @@ public class UpdatesFragment extends BaseFragment {
fastAdapter.addExtension(selectExtension);
fastAdapter.addEventHook(new UpdatesItem.CheckBoxClickEvent());
dataObserver = new RecyclerDataObserver(recyclerView, emptyLayout, progressLayout);
fastAdapter.registerAdapterDataObserver(dataObserver);
selectExtension.setMultiSelect(true);
selectExtension.setSelectionListener((item, selected) -> {
if (selected) {
@@ -315,30 +310,39 @@ public class UpdatesFragment extends BaseFragment {
Observable.fromIterable(selectiveUpdate
? selectedItems
: itemAdapter.getAdapterItems())
.map(UpdatesItem::getPackageName)
.toList()
.doOnSuccess(packages -> {
final List<String> packageList = new ArrayList<>(packages);
final FetchListener fetchListener = new AbstractFetchListener() {
.map(updatesItem -> updatesItem.getPackageName().hashCode())
.doOnNext(hashcode -> {
final FetchListener fetchListener = new AbstractFetchGroupListener() {
@Override
public void onAdded(@NotNull Download download) {
DownloadManager.updateOngoingDownloads(fetch, packageList, download, this);
public void onAdded(int groupId, @NotNull Download download, @NotNull FetchGroup fetchGroup) {
super.onAdded(groupId, download, fetchGroup);
if (hashcode == groupId) {
fetch.cancelGroup(groupId);
fetch.removeListener(this);
}
}
@Override
public void onQueued(@NotNull Download download, boolean b) {
DownloadManager.updateOngoingDownloads(fetch, packageList, download, this);
public void onProgress(int groupId, @NotNull Download download, long etaInMilliSeconds, long downloadedBytesPerSecond, @NotNull FetchGroup fetchGroup) {
super.onProgress(groupId, download, etaInMilliSeconds, downloadedBytesPerSecond, fetchGroup);
if (hashcode == groupId) {
fetch.cancelGroup(groupId);
fetch.removeListener(this);
}
}
@Override
public void onProgress(@NotNull Download download, long etaInMilliSeconds, long downloadedBytesPerSecond) {
super.onProgress(download, etaInMilliSeconds, downloadedBytesPerSecond);
DownloadManager.updateOngoingDownloads(fetch, packageList, download, this);
public void onQueued(int groupId, @NotNull Download download, boolean waitingNetwork, @NotNull FetchGroup fetchGroup) {
super.onQueued(groupId, download, waitingNetwork, fetchGroup);
if (hashcode == groupId) {
fetch.cancelGroup(groupId);
fetch.removeListener(this);
}
}
};
fetch.addListener(fetchListener);
})
.doOnComplete(() -> {
//Clear ongoing update list
AuroraApplication.setOngoingUpdateList(new ArrayList<>());
//Start BulkUpdate cancellation request

6
app/src/main/java/com/aurora/store/ui/search/SearchAppsModel.java
View File

@@ -53,7 +53,7 @@ public class SearchAppsModel extends BaseViewModel {
if (!shouldIterate)
getIterator(query);
Observable.fromCallable(() -> new SearchTask(getApplication())
disposable.add(Observable.fromCallable(() -> new SearchTask(getApplication())
.getSearchResults(iterator))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@@ -62,9 +62,7 @@ public class SearchAppsModel extends BaseViewModel {
.toList()
.toObservable()
)
.doOnNext(searchItems -> listMutableLiveData.setValue(searchItems))
.doOnError(this::handleError)
.subscribe();
.subscribe(searchItems -> listMutableLiveData.setValue(searchItems), this::handleError));
}
public void getIterator(String query) {

28
app/src/main/java/com/aurora/store/ui/search/activity/SearchResultActivity.java
View File

@@ -3,7 +3,6 @@ package com.aurora.store.ui.search.activity;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.widget.RelativeLayout;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.lifecycle.ViewModelProvider;
@@ -14,7 +13,6 @@ import androidx.recyclerview.widget.RecyclerView;
import com.aurora.store.AuroraApplication;
import com.aurora.store.Constants;
import com.aurora.store.R;
import com.aurora.store.RecyclerDataObserver;
import com.aurora.store.manager.FilterManager;
import com.aurora.store.model.App;
import com.aurora.store.model.FilterModel;
@@ -24,6 +22,7 @@ import com.aurora.store.sheet.FilterBottomSheet;
import com.aurora.store.ui.details.DetailsActivity;
import com.aurora.store.ui.search.SearchAppsModel;
import com.aurora.store.ui.single.activity.BaseActivity;
import com.aurora.store.ui.view.ViewFlipper2;
import com.aurora.store.util.Util;
import com.aurora.store.util.ViewUtil;
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
@@ -42,24 +41,21 @@ import butterknife.OnClick;
public class SearchResultActivity extends BaseActivity implements
SharedPreferences.OnSharedPreferenceChangeListener {
@BindView(R.id.coordinator)
CoordinatorLayout coordinator;
@BindView(R.id.search_view)
TextInputEditText searchView;
@BindView(R.id.viewFlipper)
ViewFlipper2 viewFlipper;
@BindView(R.id.recycler)
RecyclerView recyclerView;
@BindView(R.id.filter_fab)
ExtendedFloatingActionButton filterFab;
@BindView(R.id.coordinator)
CoordinatorLayout coordinator;
@BindView(R.id.empty_layout)
RelativeLayout emptyLayout;
@BindView(R.id.progress_layout)
RelativeLayout progressLayout;
private String query;
private SharedPreferences sharedPreferences;
private SearchAppsModel model;
private RecyclerDataObserver dataObserver;
private FastAdapter fastAdapter;
private ItemAdapter<EndlessItem> itemAdapter;
@@ -80,6 +76,7 @@ public class SearchResultActivity extends BaseActivity implements
model.getQueriedApps().observe(this, this::dispatchAppsToAdapter);
model.getRelatedTags().observe(this, strings -> {
});
model.getError().observe(this, errorType -> {
switch (errorType) {
case NO_API:
@@ -131,9 +128,6 @@ public class SearchResultActivity extends BaseActivity implements
@Override
public void onResume() {
super.onResume();
if (dataObserver != null && !itemAdapter.getAdapterItems().isEmpty()) {
dataObserver.hideProgress();
}
}
@Override
@@ -173,8 +167,11 @@ public class SearchResultActivity extends BaseActivity implements
progressItemAdapter.clear();
});
if (dataObserver != null)
dataObserver.checkIfEmpty();
if (itemAdapter != null && itemAdapter.getAdapterItems().size() > 0) {
viewFlipper.switchState(ViewFlipper2.DATA);
} else {
viewFlipper.switchState(ViewFlipper2.EMPTY);
}
}
private void setupResultRecycler() {
@@ -220,9 +217,6 @@ public class SearchResultActivity extends BaseActivity implements
}
};
dataObserver = new RecyclerDataObserver(recyclerView, emptyLayout, progressLayout);
fastAdapter.registerAdapterDataObserver(dataObserver);
recyclerView.addOnScrollListener(endlessScrollListener);
recyclerView.setOnFlingListener(new RecyclerView.OnFlingListener() {
@Override

42
app/src/main/java/com/aurora/store/ui/single/activity/DownloadsActivity.java
View File

@@ -24,9 +24,6 @@ import android.content.Intent;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RelativeLayout;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
@@ -34,6 +31,7 @@ import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.aurora.store.Constants;
import com.aurora.store.R;
@@ -41,6 +39,8 @@ import com.aurora.store.download.DownloadManager;
import com.aurora.store.model.items.DownloadItem;
import com.aurora.store.sheet.DownloadMenuSheet;
import com.aurora.store.ui.details.DetailsActivity;
import com.aurora.store.ui.view.ViewFlipper2;
import com.aurora.store.util.Log;
import com.aurora.store.util.Util;
import com.aurora.store.util.ViewUtil;
import com.aurora.store.util.diff.DownloadDiffCallback;
@@ -65,24 +65,25 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.schedulers.Schedulers;
public class DownloadsActivity extends BaseActivity {
@BindView(R.id.toolbar)
Toolbar toolbar;
@BindView(R.id.recyclerDownloads)
@BindView(R.id.viewFlipper)
ViewFlipper2 viewFlipper;
@BindView(R.id.swipe_layout)
SwipeRefreshLayout swipeLayout;
@BindView(R.id.recycler)
RecyclerView recyclerView;
@BindView(R.id.content_view)
ViewGroup layoutContent;
@BindView(R.id.empty_layout)
RelativeLayout emptyLayout;
private FastAdapter<DownloadItem> fastAdapter;
private ItemAdapter<DownloadItem> itemAdapter;
private Fetch fetch;
private CompositeDisposable disposable = new CompositeDisposable();
private final FetchListener fetchListener = new AbstractFetchListener() {
@Override
public void onAdded(@NotNull Download download) {
@@ -147,6 +148,8 @@ public class DownloadsActivity extends BaseActivity {
fetch = DownloadManager.getFetchInstance(this);
updateDownloadsList();
swipeLayout.setOnRefreshListener(this::updateDownloadsList);
}
@Override
@@ -191,6 +194,7 @@ public class DownloadsActivity extends BaseActivity {
@Override
protected void onPause() {
swipeLayout.setRefreshing(false);
fetch.removeListener(fetchListener);
super.onPause();
}
@@ -217,20 +221,13 @@ public class DownloadsActivity extends BaseActivity {
final List<Download> downloadList = new ArrayList<>(downloads);
Collections.sort(downloadList, (first, second) -> Long.compare(first.getCreated(), second.getCreated()));
Observable.fromIterable(downloadList)
disposable.add(Observable.fromIterable(downloadList)
.subscribeOn(Schedulers.io())
.map(DownloadItem::new)
.toList()
.observeOn(AndroidSchedulers.mainThread())
.doOnSuccess(this::dispatchAppsToAdapter)
.doFinally(() -> {
if (itemAdapter != null) {
emptyLayout.setVisibility(itemAdapter.getAdapterItems().isEmpty()
? View.VISIBLE
: View.GONE);
}
})
.subscribe();
.subscribe(this::dispatchAppsToAdapter,
throwable -> Log.e(throwable.getMessage())));
});
}
@@ -239,6 +236,13 @@ public class DownloadsActivity extends BaseActivity {
final DownloadDiffCallback diffCallback = new DownloadDiffCallback();
final DiffUtil.DiffResult diffResult = fastAdapterDiffUtil.calculateDiff(itemAdapter, installedItemList, diffCallback);
fastAdapterDiffUtil.set(itemAdapter, diffResult);
if (itemAdapter != null && itemAdapter.getAdapterItems().size() > 0) {
viewFlipper.switchState(ViewFlipper2.DATA);
} else {
viewFlipper.switchState(ViewFlipper2.EMPTY);
}
swipeLayout.setRefreshing(false);
}
private void setupRecycler() {

41
app/src/main/java/com/aurora/store/ui/single/fragment/BlacklistFragment.java
View File

@@ -25,7 +25,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -34,12 +33,12 @@ import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.aurora.store.R;
import com.aurora.store.RecyclerDataObserver;
import com.aurora.store.manager.BlacklistManager;
import com.aurora.store.model.items.BlacklistItem;
import com.aurora.store.ui.view.CustomSwipeToRefresh;
import com.aurora.store.ui.view.ViewFlipper2;
import com.aurora.store.util.Log;
import com.aurora.store.util.ViewUtil;
import com.aurora.store.viewmodel.BlackListedAppsModel;
@@ -56,8 +55,11 @@ import butterknife.OnClick;
public class BlacklistFragment extends Fragment {
@BindView(R.id.swipe_layout)
CustomSwipeToRefresh swipeToRefresh;
SwipeRefreshLayout refreshLayout;
@BindView(R.id.viewFlipper)
ViewFlipper2 viewFlipper;
@BindView(R.id.recycler)
RecyclerView recyclerView;
@BindView(R.id.btn_clear_all)
@@ -65,14 +67,8 @@ public class BlacklistFragment extends Fragment {
@BindView(R.id.txt_blacklist)
TextView txtBlacklist;
@BindView(R.id.empty_layout)
RelativeLayout emptyLayout;
@BindView(R.id.progress_layout)
RelativeLayout progressLayout;
private BlacklistManager blacklistManager;
private BlackListedAppsModel model;
private RecyclerDataObserver dataObserver;
private FastItemAdapter<BlacklistItem> fastItemAdapter;
private SelectExtension<BlacklistItem> selectExtension;
@@ -95,24 +91,18 @@ public class BlacklistFragment extends Fragment {
model.getBlacklistedItems().observe(getViewLifecycleOwner(), blacklistItems -> {
final List<BlacklistItem> sortedList = sortBlackListedApps(blacklistItems);
fastItemAdapter.add(sortedList);
swipeToRefresh.setRefreshing(false);
if (dataObserver != null)
dataObserver.checkIfEmpty();
refreshLayout.setRefreshing(false);
updatePageData();
updateCount();
});
swipeToRefresh.setRefreshing(true);
swipeToRefresh.setOnRefreshListener(() -> model.fetchBlackListedApps());
refreshLayout.setRefreshing(true);
refreshLayout.setOnRefreshListener(() -> model.fetchBlackListedApps());
}
@Override
public void onResume() {
super.onResume();
if (dataObserver != null && !fastItemAdapter.getAdapterItems().isEmpty()) {
dataObserver.hideProgress();
}
}
@OnClick(R.id.btn_clear_all)
@@ -148,6 +138,14 @@ public class BlacklistFragment extends Fragment {
return sortedList;
}
private void updatePageData() {
if (fastItemAdapter != null && fastItemAdapter.getAdapterItems().size() > 0) {
viewFlipper.switchState(ViewFlipper2.DATA);
} else {
viewFlipper.switchState(ViewFlipper2.EMPTY);
}
}
private void setupRecycler() {
blacklistManager = new BlacklistManager(requireContext());
fastItemAdapter = new FastItemAdapter<>();
@@ -159,9 +157,6 @@ public class BlacklistFragment extends Fragment {
fastItemAdapter.addExtension(selectExtension);
fastItemAdapter.addEventHook(new BlacklistItem.CheckBoxClickEvent());
dataObserver = new RecyclerDataObserver(recyclerView, emptyLayout, progressLayout);
fastItemAdapter.registerAdapterDataObserver(dataObserver);
selectExtension.setMultiSelect(true);
selectExtension.setSelectionListener((item, selected) -> {
if (blacklistManager.isBlacklisted(item.getApp().getPackageName())) {

66
app/src/main/java/com/aurora/store/ui/single/fragment/FavouriteFragment.java
View File

@@ -25,20 +25,21 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.graphics.ColorUtils;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.aurora.store.Constants;
import com.aurora.store.R;
import com.aurora.store.RecyclerDataObserver;
import com.aurora.store.exception.MalformedRequestException;
import com.aurora.store.manager.FavouritesManager;
import com.aurora.store.model.App;
@@ -46,7 +47,8 @@ import com.aurora.store.model.items.FavouriteItem;
import com.aurora.store.task.LiveUpdate;
import com.aurora.store.task.ObservableDeliveryData;
import com.aurora.store.ui.details.DetailsActivity;
import com.aurora.store.ui.view.CustomSwipeToRefresh;
import com.aurora.store.ui.view.ViewFlipper2;
import com.aurora.store.util.ImageUtil;
import com.aurora.store.util.Log;
import com.aurora.store.util.PackageUtil;
import com.aurora.store.util.PathUtil;
@@ -55,6 +57,7 @@ import com.aurora.store.viewmodel.FavouriteAppsModel;
import com.google.android.material.button.MaterialButton;
import com.mikepenz.fastadapter.adapters.FastItemAdapter;
import com.mikepenz.fastadapter.select.SelectExtension;
import com.mikepenz.fastadapter.swipe.SimpleSwipeCallback;
import org.apache.commons.lang3.StringUtils;
@@ -75,10 +78,12 @@ import butterknife.ButterKnife;
import io.reactivex.Observable;
import io.reactivex.schedulers.Schedulers;
public class FavouriteFragment extends BaseFragment {
public class FavouriteFragment extends BaseFragment implements SimpleSwipeCallback.ItemSwipeCallback {
@BindView(R.id.swipe_refresh_layout)
CustomSwipeToRefresh swipeToRefresh;
@BindView(R.id.viewFlipper)
ViewFlipper2 viewFlipper;
@BindView(R.id.swipe_layout)
SwipeRefreshLayout swipeLayout;
@BindView(R.id.recycler)
RecyclerView recyclerView;
@BindView(R.id.export_list)
@@ -88,14 +93,8 @@ public class FavouriteFragment extends BaseFragment {
@BindView(R.id.count_selection)
TextView txtCount;
@BindView(R.id.empty_layout)
RelativeLayout emptyLayout;
@BindView(R.id.progress_layout)
RelativeLayout progressLayout;
private Set<App> selectedAppSet = new HashSet<>();
private FavouriteAppsModel model;
private RecyclerDataObserver dataObserver;
private FavouritesManager favouritesManager;
private FastItemAdapter<FavouriteItem> fastItemAdapter;
@@ -124,12 +123,12 @@ public class FavouriteFragment extends BaseFragment {
model = new ViewModelProvider(this).get(FavouriteAppsModel.class);
model.getFavouriteApps().observe(getViewLifecycleOwner(), favouriteItems -> {
fastItemAdapter.add(favouriteItems);
swipeToRefresh.setRefreshing(false);
swipeLayout.setRefreshing(false);
updatePageData();
});
swipeToRefresh.setRefreshing(true);
swipeToRefresh.setOnRefreshListener(() -> {
swipeLayout.setRefreshing(true);
swipeLayout.setOnRefreshListener(() -> {
model.fetchFavouriteApps();
});
}
@@ -137,14 +136,11 @@ 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);
swipeLayout.setRefreshing(false);
super.onPause();
}
@@ -208,8 +204,11 @@ public class FavouriteFragment extends BaseFragment {
updateButtons();
updateActions();
if (dataObserver != null)
dataObserver.checkIfEmpty();
if (fastItemAdapter != null && fastItemAdapter.getAdapterItems().size() > 0) {
viewFlipper.switchState(ViewFlipper2.DATA);
} else {
viewFlipper.switchState(ViewFlipper2.EMPTY);
}
}
private void updateText() {
@@ -228,6 +227,10 @@ public class FavouriteFragment extends BaseFragment {
private void updateActions() {
btnInstall.setOnClickListener(bulkInstallListener());
btnAction.setText(fastItemAdapter.getAdapterItems().size() == 0
? getString(R.string.action_import)
: getString(R.string.action_export));
btnAction.setOnClickListener(v -> {
if (fastItemAdapter.getAdapterItems().size() == 0) {
importList();
@@ -254,9 +257,6 @@ public class FavouriteFragment extends BaseFragment {
fastItemAdapter.addExtension(selectExtension);
fastItemAdapter.addEventHook(new FavouriteItem.CheckBoxClickEvent());
dataObserver = new RecyclerDataObserver(recyclerView, emptyLayout, progressLayout);
fastItemAdapter.registerAdapterDataObserver(dataObserver);
selectExtension.setMultiSelect(true);
selectExtension.setSelectionListener((item, selected) -> {
if (selected) {
@@ -267,7 +267,25 @@ public class FavouriteFragment extends BaseFragment {
updatePageData();
});
final SimpleSwipeCallback callback = new SimpleSwipeCallback(
this,
getResources().getDrawable(R.drawable.ic_delete),
ItemTouchHelper.LEFT,
ColorUtils.setAlphaComponent(ImageUtil.getSolidColor(0), 120));
final ItemTouchHelper itemTouchHelper = new ItemTouchHelper(callback);
itemTouchHelper.attachToRecyclerView(recyclerView);
recyclerView.setAdapter(fastItemAdapter);
recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
}
@Override
public void itemSwiped(int position, int direction) {
final FavouriteItem item = fastItemAdapter.getAdapterItem(position);
new FavouritesManager(requireContext()).removeFromFavourites(item.getPackageName());
fastItemAdapter.remove(position);
fastItemAdapter.notifyAdapterItemChanged(position);
updatePageData();
}
}

47
app/src/main/java/com/aurora/store/ui/view/ViewFlipper2.java Normal file
View File

@@ -0,0 +1,47 @@
/*
* Aurora Droid
* Copyright (C) 2019-20, Rahul Kumar Patel <whyorean@gmail.com>
*
* Aurora Droid is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Aurora Droid is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Aurora Droid. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.aurora.store.ui.view;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.ViewFlipper;
public class ViewFlipper2 extends ViewFlipper {
public static final int PROGRESS = 0;
public static final int DATA = 1;
public static final int EMPTY = 2;
public static final int ERROR = 3;
public static final int NO_NETWORK = 4;
public ViewFlipper2(Context context) {
super(context);
setDisplayedChild(PROGRESS);
}
public ViewFlipper2(Context context, AttributeSet attrs) {
super(context, attrs);
setDisplayedChild(PROGRESS);
}
public void switchState(int state) {
setDisplayedChild(state);
}
}

77
app/src/main/java/com/aurora/store/ui/view/placeholder/EmptyView.java Normal file
View File

@@ -0,0 +1,77 @@
/*
* Aurora Droid
* Copyright (C) 2019-20, Rahul Kumar Patel <whyorean@gmail.com>
*
* Aurora Droid is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Aurora Droid is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Aurora Droid. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.aurora.store.ui.view.placeholder;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.RelativeLayout;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.appcompat.widget.AppCompatTextView;
import com.aurora.store.R;
import org.apache.commons.lang3.StringUtils;
import butterknife.BindView;
import butterknife.ButterKnife;
public class EmptyView extends RelativeLayout {
@BindView(R.id.img_empty)
AppCompatImageView imgEmpty;
@BindView(R.id.txt_empty)
AppCompatTextView txtEmpty;
public EmptyView(Context context) {
super(context);
}
public EmptyView(Context context, AttributeSet attrs) {
super(context, attrs);
init(context, attrs);
}
public EmptyView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init(context, attrs);
}
public EmptyView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init(context, attrs);
}
private void init(Context context, AttributeSet attrs) {
View view = inflate(context, R.layout.view_empty, this);
ButterKnife.bind(this, view);
final TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.EmptyView);
final String txt = typedArray.getString(R.styleable.EmptyView_emptyText);
final Drawable drawable = typedArray.getDrawable(R.styleable.EmptyView_emptyImage);
txtEmpty.setText(StringUtils.isEmpty(txt) ? getResources().getString(R.string.action_loading) : txt);
imgEmpty.setImageDrawable(drawable);
typedArray.recycle();
}
}

71
app/src/main/java/com/aurora/store/ui/view/placeholder/ProgressView.java Normal file
View File

@@ -0,0 +1,71 @@
/*
* Aurora Droid
* Copyright (C) 2019-20, Rahul Kumar Patel <whyorean@gmail.com>
*
* Aurora Droid is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Aurora Droid is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Aurora Droid. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.aurora.store.ui.view.placeholder;
import android.content.Context;
import android.content.res.TypedArray;
import android.util.AttributeSet;
import android.view.View;
import android.widget.RelativeLayout;
import androidx.appcompat.widget.AppCompatTextView;
import com.aurora.store.R;
import org.apache.commons.lang3.StringUtils;
import butterknife.BindView;
import butterknife.ButterKnife;
public class ProgressView extends RelativeLayout {
@BindView(R.id.txt_progress)
AppCompatTextView txtProgress;
public ProgressView(Context context) {
super(context);
}
public ProgressView(Context context, AttributeSet attrs) {
super(context, attrs);
init(context, attrs);
}
public ProgressView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init(context, attrs);
}
public ProgressView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init(context, attrs);
}
private void init(Context context, AttributeSet attrs) {
View view = inflate(context, R.layout.view_progress, this);
ButterKnife.bind(this, view);
final TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.ProgressView);
final String txt = typedArray.getString(R.styleable.ProgressView_progressText);
txtProgress.setText(StringUtils.isEmpty(txt) ? getResources().getString(R.string.action_loading) : txt);
typedArray.recycle();
}
}

3
app/src/main/java/com/aurora/store/viewmodel/BaseViewModel.java
View File

@@ -21,10 +21,13 @@ import java.net.UnknownHostException;
import java.util.Collections;
import java.util.List;
import io.reactivex.disposables.CompositeDisposable;
public class BaseViewModel extends AndroidViewModel {
protected GooglePlayAPI api;
protected MutableLiveData<ErrorType> errorData = new MutableLiveData<>();
protected CompositeDisposable disposable = new CompositeDisposable();
public BaseViewModel(@NonNull Application application) {
super(application);

28
app/src/main/res/drawable/ic_delete.xml Normal file
View File

@@ -0,0 +1,28 @@
<!--
~ Aurora Droid
~ Copyright (C) 2019-20, Rahul Kumar Patel <whyorean@gmail.com>
~
~ Aurora Droid is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ Aurora Droid is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with Aurora Droid. If not, see <http://www.gnu.org/licenses/>.
~
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFF"
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8,9h8v10L8,19L8,9zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z" />
</vector>

0
app/src/main/res/drawable/ic_favourite_remove.xml → app/src/main/res/drawable/ic_favourite.xml
View File

78
app/src/main/res/layout/activity_all_apps.xml
View File

@@ -25,14 +25,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<RelativeLayout
android:id="@+id/layout"
android:id="@+id/layout_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/margin_medium"
@@ -65,60 +65,36 @@
app:useMaterialThemeColors="false" />
</RelativeLayout>
<com.aurora.store.ui.view.CustomSwipeToRefresh
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"
android:scrollbars="vertical"
android:splitMotionEvents="false"
tools:listitem="@layout/item_installed" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge" />
</com.aurora.store.ui.view.CustomSwipeToRefresh>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/empty_layout"
<com.aurora.store.ui.view.ViewFlipper2
android:id="@+id/viewFlipper"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/colorBackground"
android:visibility="gone">
android:layout_below="@id/layout_top"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_empty"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_above="@id/txt_empty"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/margin_small"
android:src="@drawable/ic_apps"
app:tint="?colorAccent" />
<com.aurora.store.ui.view.placeholder.ProgressView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:progressText="@string/action_loading" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/list_empty_fav"
android:textAppearance="@style/TextAppearance.Aurora.Line1" />
</RelativeLayout>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/include_placeholder_layouts" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
tools:listitem="@layout/item_installed" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<com.aurora.store.ui.view.placeholder.EmptyView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:emptyImage="@drawable/ic_apps"
app:emptyText="@string/error_app_not_found" />
</com.aurora.store.ui.view.ViewFlipper2>
</RelativeLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

49
app/src/main/res/layout/activity_dev_apps.xml
View File

@@ -26,54 +26,29 @@
<include layout="@layout/toolbar_main" />
<FrameLayout
android:id="@+id/content"
<com.aurora.store.ui.view.ViewFlipper2
android:id="@+id/viewFlipper"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/layout_top"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
<com.aurora.store.ui.view.placeholder.ProgressView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:progressText="@string/action_loading" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingTop="@dimen/margin_small"
android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical"
tools:listitem="@layout/item_installed" />
</FrameLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/empty_layout"
<com.aurora.store.ui.view.placeholder.EmptyView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/colorBackground"
android:visibility="gone">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_empty"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_above="@id/txt_empty"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/margin_small"
android:src="@drawable/ic_apps"
app:tint="?colorAccent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/list_empty_fav"
android:textAppearance="@style/TextAppearance.Aurora.Line1" />
</RelativeLayout>
<include layout="@layout/include_placeholder_layouts" />
</RelativeLayout>
app:emptyImage="@drawable/ic_round_search"
app:emptyText="@string/error_search_not_found" />
</com.aurora.store.ui.view.ViewFlipper2>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

53
app/src/main/res/layout/activity_downloads.xml
View File

@@ -27,44 +27,35 @@
<include layout="@layout/toolbar_main" />
<LinearLayout
android:id="@+id/content_view"
<com.aurora.store.ui.view.ViewFlipper2
android:id="@+id/viewFlipper"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_below="@id/layout_top"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerDownloads"
<com.aurora.store.ui.view.placeholder.ProgressView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:listitem="@layout/item_downloads" />
</LinearLayout>
app:progressText="@string/action_loading" />
<RelativeLayout
android:id="@+id/empty_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/colorBackground"
android:visibility="gone">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_empty"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_above="@id/txt_empty"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/margin_small"
android:src="@drawable/ic_menu_download"
app:tint="?colorAccent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
tools:listitem="@layout/item_downloads" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/download_none"
android:textAppearance="@style/TextAppearance.Aurora.Line1" />
</RelativeLayout>
<com.aurora.store.ui.view.placeholder.EmptyView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:emptyImage="@drawable/ic_menu_download"
app:emptyText="@string/download_none" />
</com.aurora.store.ui.view.ViewFlipper2>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

46
app/src/main/res/layout/activity_main.xml
View File

@@ -21,36 +21,40 @@
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.main.AuroraActivity">
android:layout_height="match_parent">
<include layout="@layout/item_searchview" />
<fragment
android:id="@+id/nav_host_main"
android:name="androidx.navigation.fragment.NavHostFragment"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:navGraph="@navigation/nav_graph_main" />
android:layout_height="match_parent">
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation"
style="@style/Widget.Aurora.BottomNavigation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:backgroundTint="?android:colorBackground"
app:elevation="6dp"
app:itemTextAppearanceActive="@style/TextAppearance.Aurora.BottomNav.Active"
app:itemTextAppearanceInactive="@style/TextAppearance.Aurora.BottomNav.Inactive"
app:menu="@menu/navigation_main" />
<include layout="@layout/item_searchview" />
<fragment
android:id="@+id/nav_host_main"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/search_bar"
app:navGraph="@navigation/nav_graph_main" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation"
style="@style/Widget.Aurora.BottomNavigation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
app:backgroundTint="?android:colorBackground"
app:elevation="6dp"
app:itemTextAppearanceActive="@style/TextAppearance.Aurora.BottomNav.Active"
app:itemTextAppearanceInactive="@style/TextAppearance.Aurora.BottomNav.Inactive"
app:menu="@menu/navigation_main" />
</RelativeLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<com.google.android.material.navigation.NavigationView

51
app/src/main/res/layout/activity_search_result.xml
View File

@@ -8,46 +8,31 @@
<include layout="@layout/search_bar" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
<com.aurora.store.ui.view.ViewFlipper2
android:id="@+id/viewFlipper"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:itemCount="4"
tools:listitem="@layout/item_installed" />
android:layout_below="@id/layout_top"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/empty_layout"
<com.aurora.store.ui.view.placeholder.ProgressView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/colorBackground"
android:visibility="gone">
app:progressText="@string/action_loading" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_empty"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_above="@id/txt_empty"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/margin_small"
android:src="@drawable/ic_round_search"
app:tint="?colorAccent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
tools:listitem="@layout/item_installed" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/error_search_not_found"
android:textAppearance="@style/TextAppearance.Aurora.Line1" />
</RelativeLayout>
<include layout="@layout/include_placeholder_layouts" />
</RelativeLayout>
<com.aurora.store.ui.view.placeholder.EmptyView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:emptyImage="@drawable/ic_round_search"
app:emptyText="@string/error_search_not_found" />
</com.aurora.store.ui.view.ViewFlipper2>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/filter_fab"

81
app/src/main/res/layout/fragment_blacklist.xml
View File

@@ -19,18 +19,18 @@
-->
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinator"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/layout_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?actionBarSize">
@@ -41,14 +41,14 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/margin_large"
android:layout_marginStart="@dimen/margin_normal"
android:layout_marginEnd="@dimen/margin_small"
android:layout_toStartOf="@id/btn_clear_all"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_clear_all"
style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
@@ -57,55 +57,40 @@
android:layout_marginEnd="@dimen/margin_small"
android:maxLines="1"
android:text="@string/action_clear_all"
android:visibility="invisible" />
android:visibility="gone"
tools:visibility="visible" />
</RelativeLayout>
<com.aurora.store.ui.view.CustomSwipeToRefresh
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"
android:scrollbars="vertical"
tools:listitem="@layout/item_checkbox" />
</com.aurora.store.ui.view.CustomSwipeToRefresh>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/empty_layout"
<com.aurora.store.ui.view.ViewFlipper2
android:id="@+id/viewFlipper"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/colorBackground"
android:visibility="gone">
android:layout_below="@id/layout_top">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_empty"
app:tint="?colorAccent"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_above="@id/txt_empty"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/margin_small"
android:src="@drawable/ic_menu_blacklist" />
<com.aurora.store.ui.view.placeholder.ProgressView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:progressText="@string/action_loading" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/list_empty_blacklist"
android:textAppearance="@style/TextAppearance.Aurora.Line1" />
</RelativeLayout>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/include_placeholder_layouts" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
tools:listitem="@layout/item_checkbox" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<com.aurora.store.ui.view.placeholder.EmptyView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:emptyImage="@drawable/ic_menu_blacklist"
app:emptyText="@string/list_blacklist_none" />
</com.aurora.store.ui.view.ViewFlipper2>
</RelativeLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

44
app/src/main/res/layout/fragment_categories.xml
View File

@@ -20,29 +20,39 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/coordinator"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
<com.aurora.store.ui.view.ViewFlipper2
android:id="@+id/viewFlipper"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_below="@id/layout_top">
<ProgressBar
android:id="@+id/progress_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/category_recycler"
<com.aurora.store.ui.view.placeholder.ProgressView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingTop="@dimen/margin_bottom"
android:paddingBottom="@dimen/margin_bottom"
android:splitMotionEvents="false"
tools:listitem="@layout/item_category_list" />
</FrameLayout>
app:progressText="@string/action_loading" />
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
tools:listitem="@layout/item_checkbox" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<com.aurora.store.ui.view.placeholder.EmptyView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:emptyImage="@drawable/ic_categories"
app:emptyText="@string/list_blacklist_none" />
</com.aurora.store.ui.view.ViewFlipper2>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

55
app/src/main/res/layout/fragment_category_applist.xml
View File

@@ -23,48 +23,29 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
<com.aurora.store.ui.view.ViewFlipper2
android:id="@+id/viewFlipper"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingTop="@dimen/margin_bottom"
android:paddingBottom="@dimen/margin_bottom"
tools:itemCount="4"
tools:listitem="@layout/item_installed" />
android:layout_below="@id/layout_top"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/empty_layout"
<com.aurora.store.ui.view.placeholder.ProgressView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/colorBackground"
android:visibility="gone">
app:progressText="@string/action_loading" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_empty"
app:tint="?colorAccent"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_above="@id/txt_empty"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/margin_small"
android:src="@drawable/ic_apps" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
tools:listitem="@layout/item_installed" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/error_search_not_found"
android:textAppearance="@style/TextAppearance.Aurora.Line1" />
</RelativeLayout>
<include layout="@layout/include_placeholder_layouts" />
</RelativeLayout>
<com.aurora.store.ui.view.placeholder.EmptyView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:emptyImage="@drawable/ic_round_search"
app:emptyText="@string/error_search_not_found" />
</com.aurora.store.ui.view.ViewFlipper2>
</FrameLayout>

73
app/src/main/res/layout/fragment_favourites.xml
View File

@@ -19,19 +19,19 @@
-->
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinator"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
<RelativeLayout
android:id="@+id/content_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/layout_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?actionBarSize">
@@ -72,52 +72,35 @@
</RelativeLayout>
<com.aurora.store.ui.view.CustomSwipeToRefresh
android:id="@+id/swipe_refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"
android:scrollbars="vertical"
tools:listitem="@layout/item_favorite" />
</com.aurora.store.ui.view.CustomSwipeToRefresh>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/empty_layout"
<com.aurora.store.ui.view.ViewFlipper2
android:id="@+id/viewFlipper"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/colorBackground"
android:visibility="gone">
android:layout_below="@id/layout_top">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_empty"
app:tint="?colorAccent"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_above="@id/txt_empty"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/margin_small"
android:src="@drawable/ic_favourite_red" />
<com.aurora.store.ui.view.placeholder.ProgressView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:progressText="@string/action_loading" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/list_empty_fav"
android:textAppearance="@style/TextAppearance.Aurora.Line1" />
</RelativeLayout>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/include_placeholder_layouts" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
tools:listitem="@layout/item_checkbox" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<com.aurora.store.ui.view.placeholder.EmptyView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:emptyImage="@drawable/ic_favourite"
app:emptyText="@string/list_empty_fav" />
</com.aurora.store.ui.view.ViewFlipper2>
</RelativeLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

1
app/src/main/res/layout/fragment_home.xml
View File

@@ -30,7 +30,6 @@
android:layout_height="match_parent"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingTop="@dimen/margin_bottom"
android:paddingBottom="@dimen/margin_bottom"
android:scrollbars="none">

77
app/src/main/res/layout/fragment_updates.xml
View File

@@ -23,16 +23,14 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinator"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="@dimen/margin_bottom">
android:layout_height="match_parent">
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/layout_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?actionBarSize"
@@ -68,54 +66,35 @@
android:visibility="invisible" />
</RelativeLayout>
<com.aurora.store.ui.view.CustomSwipeToRefresh
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingBottom="@dimen/margin_bottom"
android:scrollbars="vertical" />
</com.aurora.store.ui.view.CustomSwipeToRefresh>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/empty_layout"
<com.aurora.store.ui.view.ViewFlipper2
android:id="@+id/viewFlipper"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/colorBackground"
android:visibility="gone">
android:layout_below="@id/layout_top">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_empty"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_above="@id/txt_empty"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/margin_small"
android:src="@drawable/ic_apps"
app:tint="?colorAccent" />
<com.aurora.store.ui.view.placeholder.ProgressView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:progressText="@string/action_loading" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/list_empty_updates"
android:textAppearance="@style/TextAppearance.Aurora.Line1" />
</RelativeLayout>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/include_placeholder_layouts" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
tools:listitem="@layout/item_updates" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<com.aurora.store.ui.view.placeholder.EmptyView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:emptyImage="@drawable/ic_updates"
app:emptyText="@string/list_empty_updates" />
</com.aurora.store.ui.view.ViewFlipper2>
</RelativeLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

24
app/src/main/res/layout/include_placeholder_layouts.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/progress_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/colorBackground"
android:visibility="gone">
<ProgressBar
android:id="@+id/progress_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/txt_progress"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/margin_small" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/action_loading"
android:textAppearance="@style/TextAppearance.Aurora.Line1" />
</RelativeLayout>

43
app/src/main/res/layout/view_empty.xml Normal file
View File

@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Aurora Droid
~ Copyright (C) 2019-20, Rahul Kumar Patel <whyorean@gmail.com>
~
~ Aurora Droid is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ Aurora Droid is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with Aurora Droid. If not, see <http://www.gnu.org/licenses/>.
~
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/empty_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_empty"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_above="@id/txt_empty"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/margin_small"
android:src="@drawable/ic_apps"
app:tint="?colorAccent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/error_search_not_found"
android:textAppearance="@style/TextAppearance.Aurora.Line1" />
</RelativeLayout>

40
app/src/main/res/layout/view_progress.xml Normal file
View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Aurora Droid
~ Copyright (C) 2019-20, Rahul Kumar Patel <whyorean@gmail.com>
~
~ Aurora Droid is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ Aurora Droid is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with Aurora Droid. If not, see <http://www.gnu.org/licenses/>.
~
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/progress_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ProgressBar
android:id="@+id/progress_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/txt_progress"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/margin_small" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/action_loading"
android:textAppearance="@style/TextAppearance.Aurora.Line1" />
</RelativeLayout>

30
app/src/main/res/values/attrs.xml Normal file
View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Aurora Store
~ Copyright (C) 2019-20, Rahul Kumar Patel <whyorean@gmail.com>
~
~ Aurora Droid is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ Aurora Droid is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with Aurora Droid. If not, see <http://www.gnu.org/licenses/>.
~
-->
<resources>
<declare-styleable name="ProgressView">
<attr name="progressText" format="reference"/>
</declare-styleable>
<declare-styleable name="EmptyView">
<attr name="emptyImage" format="reference"/>
<attr name="emptyText" format="reference"/>
</declare-styleable>
</resources>

2
app/src/main/res/values/strings.xml
View File

@@ -16,6 +16,7 @@
<string name="action_done">"Done"</string>
<string name="action_enable">"Enable"</string>
<string name="action_export">"Export"</string>
<string name="action_import">"Import"</string>
<string name="action_favourites">"Favourite apps"</string>
<string name="action_filter">"Filters"</string>
<string name="action_filter_all">"All"</string>
@@ -106,6 +107,7 @@
<string name="list_app_user">"User app"</string>
<string name="list_blacklist">"Blacklisted apps"</string>
<string name="list_blacklist_none">"No apps blacklisted"</string>
<string name="list_categories_none">"No categories available"</string>
<string name="list_empty_fav">"No favourites"</string>
<string name="list_empty_updates">"No updates available"</string>
<string name="list_installed">"Installed"</string>