FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate MainActivity to viewBinding

This commit is contained in:
Shinokuni 2020-08-11 21:27:31 +02:00
parent 3657f740df
commit f41f430a52
1 changed files with 51 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
app/src/main/java/com/readrops/app/activities/MainActivity.java
View File

@ -9,16 +9,10 @@ import android.view.ActionMode;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.graphics.drawable.DrawableCompat;
import androidx.drawerlayout.widget.DrawerLayout; import androidx.drawerlayout.widget.DrawerLayout;
@ -34,7 +28,6 @@ import com.afollestad.materialdialogs.MaterialDialog;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader; import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader;
import com.bumptech.glide.util.ViewPreloadSizeProvider; import com.bumptech.glide.util.ViewPreloadSizeProvider;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.mikepenz.aboutlibraries.Libs; import com.mikepenz.aboutlibraries.Libs;
import com.mikepenz.aboutlibraries.LibsBuilder; import com.mikepenz.aboutlibraries.LibsBuilder;
import com.mikepenz.materialdrawer.Drawer; import com.mikepenz.materialdrawer.Drawer;
@ -43,6 +36,7 @@ import com.mikepenz.materialdrawer.model.SecondaryDrawerItem;
import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem; import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.app.adapters.MainItemListAdapter; import com.readrops.app.adapters.MainItemListAdapter;
import com.readrops.app.databinding.ActivityMainBinding;
import com.readrops.app.utils.DrawerManager; import com.readrops.app.utils.DrawerManager;
import com.readrops.app.utils.GlideApp; import com.readrops.app.utils.GlideApp;
import com.readrops.app.utils.ReadropsItemTouchCallback; import com.readrops.app.utils.ReadropsItemTouchCallback;
@ -88,12 +82,9 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
public static final int ITEM_REQUEST = 3; public static final int ITEM_REQUEST = 3;
public static final int ADD_ACCOUNT_REQUEST = 4; public static final int ADD_ACCOUNT_REQUEST = 4;
private RecyclerView recyclerView; private ActivityMainBinding binding;
private MainItemListAdapter adapter; private MainItemListAdapter adapter;
private SwipeRefreshLayout refreshLayout;
private ConstraintLayout rootLayout;
private Toolbar toolbar;
private Drawer drawer; private Drawer drawer;
private PagedList<ItemWithFeed> allItems; private PagedList<ItemWithFeed> allItems;
@ -101,12 +92,6 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
private MainViewModel viewModel; private MainViewModel viewModel;
private DrawerManager drawerManager; private DrawerManager drawerManager;
private LinearLayout emptyListLayout;
private RelativeLayout syncProgressLayout;
private TextView syncProgress;
private ProgressBar syncProgressBar;
private FloatingActionButton actionButton;
private int feedCount; private int feedCount;
private int feedNb; private int feedNb;
private boolean scrollToTop; private boolean scrollToTop;
@ -121,20 +106,12 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); binding = ActivityMainBinding.inflate(getLayoutInflater());
toolbar = findViewById(R.id.toolbar_main); setContentView(binding.getRoot());
setSupportActionBar(toolbar); setSupportActionBar(binding.toolbarMain);
emptyListLayout = findViewById(R.id.empty_list_layout); binding.swipeRefreshLayout.setOnRefreshListener(this);
refreshLayout = findViewById(R.id.swipe_refresh_layout);
refreshLayout.setOnRefreshListener(this);
rootLayout = findViewById(R.id.main_root);
syncProgressLayout = findViewById(R.id.sync_progress_layout);
syncProgress = findViewById(R.id.sync_progress_text_view);
syncProgressBar = findViewById(R.id.sync_progress_bar);
actionButton = findViewById(R.id.add_feed_fab);
feedCount = 0; feedCount = 0;
initRecyclerView(); initRecyclerView();
@ -148,15 +125,15 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
allItems = itemWithFeeds; allItems = itemWithFeeds;
if (!itemWithFeeds.isEmpty()) if (!itemWithFeeds.isEmpty())
emptyListLayout.setVisibility(View.GONE); binding.emptyListLayout.setVisibility(View.GONE);
else else
emptyListLayout.setVisibility(View.VISIBLE); binding.emptyListLayout.setVisibility(View.VISIBLE);
if (!refreshLayout.isRefreshing()) if (!binding.swipeRefreshLayout.isRefreshing())
adapter.submitList(itemWithFeeds); adapter.submitList(itemWithFeeds);
}); });
drawerManager = new DrawerManager(this, toolbar, (view, position, drawerItem) -> { drawerManager = new DrawerManager(this, binding.toolbarMain, (view, position, drawerItem) -> {
handleDrawerClick(drawerItem); handleDrawerClick(drawerItem);
return true; return true;
@ -227,11 +204,11 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
} }
if (accountWeakReference.get() != null && !accountWeakReference.get().isLocal()) { if (accountWeakReference.get() != null && !accountWeakReference.get().isLocal()) {
refreshLayout.setRefreshing(true); binding.swipeRefreshLayout.setRefreshing(true);
onRefresh(); onRefresh();
accountWeakReference.clear(); accountWeakReference.clear();
} else if (currentAccount == null && savedInstanceState != null && savedInstanceState.getBoolean(SYNCING)) { } else if (currentAccount == null && savedInstanceState != null && savedInstanceState.getBoolean(SYNCING)) {
refreshLayout.setRefreshing(true); binding.swipeRefreshLayout.setRefreshing(true);
onRefresh(); onRefresh();
savedInstanceState.clear(); savedInstanceState.clear();
} }
@ -257,7 +234,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
viewModel.setItemReadState(intent.getIntExtra(ITEM_ID, 0), true, true) viewModel.setItemReadState(intent.getIntExtra(ITEM_ID, 0), true, true)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doOnError(throwable -> Utils.showSnackbar(rootLayout, throwable.getMessage())) .doOnError(throwable -> Utils.showSnackbar(binding.mainRoot, throwable.getMessage()))
.subscribe(); .subscribe();
} }
} }
@ -308,7 +285,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
Utils.showSnackbar(rootLayout, e.getMessage()); Utils.showSnackbar(binding.mainRoot, e.getMessage());
} }
}); });
} }
@ -322,8 +299,6 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
} }
private void initRecyclerView() { private void initRecyclerView() {
recyclerView = findViewById(R.id.items_recycler_view);
ViewPreloadSizeProvider preloadSizeProvider = new ViewPreloadSizeProvider(); ViewPreloadSizeProvider preloadSizeProvider = new ViewPreloadSizeProvider();
adapter = new MainItemListAdapter(GlideApp.with(this), preloadSizeProvider); adapter = new MainItemListAdapter(GlideApp.with(this), preloadSizeProvider);
adapter.setOnItemClickListener(new MainItemListAdapter.OnItemClickListener() { adapter.setOnItemClickListener(new MainItemListAdapter.OnItemClickListener() {
@ -339,7 +314,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
viewModel.setItemReadState(itemWithFeed, true) viewModel.setItemReadState(itemWithFeed, true)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doOnError(throwable -> Utils.showSnackbar(rootLayout, throwable.getMessage())) .doOnError(throwable -> Utils.showSnackbar(binding.mainRoot, throwable.getMessage()))
.subscribe(); .subscribe();
itemWithFeed.getItem().setRead(true); itemWithFeed.getItem().setRead(true);
@ -358,7 +333,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
@Override @Override
public void onItemLongClick(ItemWithFeed itemWithFeed, int position) { public void onItemLongClick(ItemWithFeed itemWithFeed, int position) {
if (actionMode != null || refreshLayout.isRefreshing()) if (actionMode != null || binding.swipeRefreshLayout.isRefreshing())
return; return;
selectedItemWithFeed = itemWithFeed; selectedItemWithFeed = itemWithFeed;
@ -370,20 +345,20 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
}); });
RecyclerViewPreloader<String> preloader = new RecyclerViewPreloader<String>(Glide.with(this), adapter, preloadSizeProvider, 10); RecyclerViewPreloader<String> preloader = new RecyclerViewPreloader<String>(Glide.with(this), adapter, preloadSizeProvider, 10);
recyclerView.addOnScrollListener(preloader); binding.itemsRecyclerView.addOnScrollListener(preloader);
recyclerView.setRecyclerListener(viewHolder -> { binding.itemsRecyclerView.setRecyclerListener(viewHolder -> {
MainItemListAdapter.ItemViewHolder vh = (MainItemListAdapter.ItemViewHolder) viewHolder; MainItemListAdapter.ItemViewHolder vh = (MainItemListAdapter.ItemViewHolder) viewHolder;
GlideApp.with(this).clear(vh.getItemImage()); GlideApp.with(this).clear(vh.getItemImage());
}); });
LinearLayoutManager layoutManager = new LinearLayoutManager(this); LinearLayoutManager layoutManager = new LinearLayoutManager(this);
recyclerView.setLayoutManager(layoutManager); binding.itemsRecyclerView.setLayoutManager(layoutManager);
DividerItemDecoration decoration = new DividerItemDecoration(this, layoutManager.getOrientation()); DividerItemDecoration decoration = new DividerItemDecoration(this, layoutManager.getOrientation());
recyclerView.addItemDecoration(decoration); binding.itemsRecyclerView.addItemDecoration(decoration);
recyclerView.setAdapter(adapter); binding.itemsRecyclerView.setAdapter(adapter);
Drawable readLater = ContextCompat.getDrawable(this, R.drawable.ic_read_later).mutate(); Drawable readLater = ContextCompat.getDrawable(this, R.drawable.ic_read_later).mutate();
@ -396,34 +371,34 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
.leftDraw(ContextCompat.getColor(this, R.color.colorAccent), R.drawable.ic_read_later, readLater) .leftDraw(ContextCompat.getColor(this, R.color.colorAccent), R.drawable.ic_read_later, readLater)
.rightDraw(ContextCompat.getColor(this, R.color.colorAccent), R.drawable.ic_read, null) .rightDraw(ContextCompat.getColor(this, R.color.colorAccent), R.drawable.ic_read, null)
.build())) .build()))
.attachToRecyclerView(recyclerView); .attachToRecyclerView(binding.itemsRecyclerView);
adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() { adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
@Override @Override
public void onItemRangeInserted(int positionStart, int itemCount) { public void onItemRangeInserted(int positionStart, int itemCount) {
if (scrollToTop) { if (scrollToTop) {
recyclerView.scrollToPosition(0); binding.itemsRecyclerView.scrollToPosition(0);
scrollToTop = false; scrollToTop = false;
} }
} }
@Override @Override
public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) { public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
;if (scrollToTop) { if (scrollToTop) {
recyclerView.scrollToPosition(0); binding.itemsRecyclerView.scrollToPosition(0);
scrollToTop = false; scrollToTop = false;
} else } else
super.onItemRangeMoved(fromPosition, toPosition, itemCount); super.onItemRangeMoved(fromPosition, toPosition, itemCount);
} }
}); });
recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() { binding.itemsRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override @Override
public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
if (dy > 0) { if (dy > 0) {
actionButton.hide(); binding.addFeedFab.hide();
} else { } else {
actionButton.show(); binding.addFeedFab.show();
} }
} }
}); });
@ -437,7 +412,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
viewModel.setItemReadState(itemWithFeed, !itemWithFeed.getItem().isRead()) viewModel.setItemReadState(itemWithFeed, !itemWithFeed.getItem().isRead())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doOnError(throwable -> Utils.showSnackbar(rootLayout, throwable.getMessage())) .doOnError(throwable -> Utils.showSnackbar(binding.mainRoot, throwable.getMessage()))
.subscribe(); .subscribe();
itemWithFeed.getItem().setRead(!itemWithFeed.getItem().isRead()); itemWithFeed.getItem().setRead(!itemWithFeed.getItem().isRead());
@ -447,7 +422,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
viewModel.setItemReadItLater((int) adapter.getItemId(viewHolder.getAdapterPosition())) viewModel.setItemReadItLater((int) adapter.getItemId(viewHolder.getAdapterPosition()))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doOnError(throwable -> Utils.showSnackbar(rootLayout, throwable.getMessage())) .doOnError(throwable -> Utils.showSnackbar(binding.mainRoot, throwable.getMessage()))
.subscribe(); .subscribe();
if (viewModel.getFilterType() == FilterType.READ_IT_LATER_FILTER) if (viewModel.getFilterType() == FilterType.READ_IT_LATER_FILTER)
@ -458,7 +433,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
@Override @Override
public boolean onCreateActionMode(ActionMode actionMode, Menu menu) { public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
drawer.getDrawerLayout().setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED); drawer.getDrawerLayout().setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
refreshLayout.setEnabled(false); binding.swipeRefreshLayout.setEnabled(false);
actionMode.getMenuInflater().inflate(R.menu.item_list_contextual_menu, menu); actionMode.getMenuInflater().inflate(R.menu.item_list_contextual_menu, menu);
getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.primary_dark)); getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.primary_dark));
@ -504,7 +479,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
actionMode = null; actionMode = null;
drawer.getDrawerLayout().setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED); drawer.getDrawerLayout().setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
refreshLayout.setEnabled(true); binding.swipeRefreshLayout.setEnabled(true);
adapter.clearSelection(); adapter.clearSelection();
} }
@ -514,7 +489,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
viewModel.setAllItemsReadState(read) viewModel.setAllItemsReadState(read)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doOnError(throwable -> Utils.showSnackbar(rootLayout, throwable.getMessage())) .doOnError(throwable -> Utils.showSnackbar(binding.mainRoot, throwable.getMessage()))
.subscribe(); .subscribe();
allItemsSelected = false; allItemsSelected = false;
@ -522,7 +497,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
viewModel.setItemsReadState(adapter.getSelectedItems(), read) viewModel.setItemsReadState(adapter.getSelectedItems(), read)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doOnError(throwable -> Utils.showSnackbar(rootLayout, throwable.getMessage())) .doOnError(throwable -> Utils.showSnackbar(binding.mainRoot, throwable.getMessage()))
.subscribe(); .subscribe();
} }
@ -550,7 +525,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
Utils.showSnackbar(rootLayout, e.getMessage()); Utils.showSnackbar(binding.mainRoot, e.getMessage());
} }
}); });
} else { } else {
@ -570,7 +545,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
List<Feed> feeds = data.getParcelableArrayListExtra(FEEDS); List<Feed> feeds = data.getParcelableArrayListExtra(FEEDS);
if (feeds != null && !feeds.isEmpty() && viewModel.isAccountLocal()) { if (feeds != null && !feeds.isEmpty() && viewModel.isAccountLocal()) {
refreshLayout.setRefreshing(true); binding.swipeRefreshLayout.setRefreshing(true);
feedNb = feeds.size(); feedNb = feeds.size();
sync(feeds); sync(feeds);
} }
@ -592,7 +567,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
// start syncing only if the account is not local // start syncing only if the account is not local
if (!viewModel.isAccountLocal()) { if (!viewModel.isAccountLocal()) {
refreshLayout.setRefreshing(true); binding.swipeRefreshLayout.setRefreshing(true);
onRefresh(); onRefresh();
} }
@ -615,19 +590,19 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
syncDisposable = d; syncDisposable = d;
if (viewModel.isAccountLocal() && feedNb > 0) { if (viewModel.isAccountLocal() && feedNb > 0) {
syncProgressLayout.setVisibility(View.VISIBLE); binding.syncProgressLayout.setVisibility(View.VISIBLE);
syncProgressBar.setProgress(0); binding.syncProgressBar.setProgress(0);
} }
} }
@Override @Override
public void onNext(Feed feed) { public void onNext(Feed feed) {
if (viewModel.isAccountLocal() && feedNb > 0) { if (viewModel.isAccountLocal() && feedNb > 0) {
syncProgress.setText(getString(R.string.updating_feed, feed.getName())); binding.syncProgressTextView.setText(getString(R.string.updating_feed, feed.getName()));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
syncProgressBar.setProgress((feedCount * 100) / feedNb, true); binding.syncProgressBar.setProgress((feedCount * 100) / feedNb, true);
} else } else
syncProgressBar.setProgress((feedCount * 100) / feedNb); binding.syncProgressBar.setProgress((feedCount * 100) / feedNb);
} }
feedCount++; feedCount++;
@ -636,10 +611,10 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
e.printStackTrace(); e.printStackTrace();
refreshLayout.setRefreshing(false); binding.swipeRefreshLayout.setRefreshing(false);
syncProgressLayout.setVisibility(View.GONE); binding.syncProgressLayout.setVisibility(View.GONE);
Utils.showSnackbar(rootLayout, e.getMessage()); Utils.showSnackbar(binding.mainRoot, e.getMessage());
drawerManager.enableAccountSelection(); drawerManager.enableAccountSelection();
} }
@ -647,14 +622,14 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
public void onComplete() { public void onComplete() {
if (viewModel.isAccountLocal() && feedNb > 0) { if (viewModel.isAccountLocal() && feedNb > 0) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
syncProgressBar.setProgress(100, true); binding.syncProgressBar.setProgress(100, true);
else else
syncProgressBar.setProgress(100); binding.syncProgressBar.setProgress(100);
syncProgressLayout.setVisibility(View.GONE); binding.syncProgressLayout.setVisibility(View.GONE);
} }
refreshLayout.setRefreshing(false); binding.swipeRefreshLayout.setRefreshing(false);
scrollToTop = true; scrollToTop = true;
adapter.submitList(allItems); adapter.submitList(allItems);
@ -700,7 +675,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
return true; return true;
case R.id.start_sync: case R.id.start_sync:
if (!viewModel.isAccountLocal()) { if (!viewModel.isAccountLocal()) {
refreshLayout.setRefreshing(true); binding.swipeRefreshLayout.setRefreshing(true);
} }
onRefresh(); onRefresh();
break; break;
@ -770,10 +745,9 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
@Override @Override
protected void onSaveInstanceState(Bundle outState) { protected void onSaveInstanceState(Bundle outState) {
if (refreshLayout.isRefreshing()) if (binding.swipeRefreshLayout.isRefreshing())
outState.putBoolean(SYNCING, true); outState.putBoolean(SYNCING, true);
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
} }
} }