wbrawner/news-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reset listview to top if folder/feed is changed - refactoring

Browse source
This commit is contained in:
David Development 2015-07-19 15:09:15 +02:00
parent fb2600c53a
commit 54c6b8db8a
2 changed files with 43 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderDetailFragment.java
View file

@ -67,18 +67,10 @@ import de.luhmer.owncloudnewsreader.services.PodcastDownloadService;
* tablets) or a {@link NewsReaderListActivity} on handsets.
*/
public class NewsReaderDetailFragment extends Fragment {
/**
* The fragment argument representing the item ID that this fragment
* represents.
*/
public static final String ARG_ITEM_ID = "item_id";
protected final String TAG = getClass().getCanonicalName();
//private boolean DialogShowedToMarkLastItemsAsRead = false;
Long idFeed;
private Long idFeed;
private Drawable markAsReadDrawable;
private Drawable starredDrawable;
@ -108,9 +100,7 @@ public class NewsReaderDetailFragment extends Fragment {
return titel;
}
private boolean reloadCursorOnStartUp = false;
//private static ArrayList<Integer> databaseIdsOfItems;
private boolean isStartup = true;
private static final String LAYOUT_MANAGER_STATE = "LAYOUT_MANAGER_STATE";
@InjectView(R.id.pb_loading) ProgressBar pbLoading;
@ -118,42 +108,21 @@ public class NewsReaderDetailFragment extends Fragment {
@InjectView(R.id.list) RecyclerView recyclerView;
@InjectView(R.id.swipeRefresh) SwipeRefreshLayout swipeRefresh;
/**
* Mandatory empty constructor for the fragment manager to instantiate the
* fragment (e.g. upon screen orientation changes).
*/
public NewsReaderDetailFragment() {
//databaseIdsOfItems = new ArrayList<Integer>();
}
public void setUpdateListViewOnStartUp(boolean reloadCursorOnStartUp) {
this.reloadCursorOnStartUp = reloadCursorOnStartUp;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if(getArguments() != null) {
if (getArguments().containsKey(NewsReaderListActivity.FEED_ID)) {
idFeed = getArguments().getLong(NewsReaderListActivity.FEED_ID);
}
if (getArguments().containsKey(NewsReaderListActivity.TITEL)) {
titel = getArguments().getString(NewsReaderListActivity.TITEL);
}
if (getArguments().containsKey(NewsReaderListActivity.FOLDER_ID)) {
idFolder = getArguments().getLong(NewsReaderListActivity.FOLDER_ID);
}
}
}
public void setData(Long idFeed, Long idFolder, String titel, boolean updateListView) {
this.idFeed = idFeed;
this.idFolder = idFolder;
this.titel = titel;
setUpdateListViewOnStartUp(updateListView);
((AppCompatActivity)getActivity()).getSupportActionBar().setTitle(titel);
UpdateCurrentRssView(getActivity(), true);
UpdateCurrentRssView(getActivity(), updateListView);
}
@Override
@ -166,11 +135,11 @@ public class NewsReaderDetailFragment extends Fragment {
recyclerView.addOnScrollListener(ListScrollListener);
}
if(reloadCursorOnStartUp)
UpdateCurrentRssView(getActivity(), true);
else
if(!isStartup) {
UpdateCurrentRssView(getActivity(), false);
} else {
isStartup = false;
}
super.onResume();
}
@ -264,9 +233,9 @@ public class NewsReaderDetailFragment extends Fragment {
private class UpdateCurrentRssViewTask extends AsyncTask<Void, Void, LazyList<RssItem>> {
Context context;
SORT_DIRECTION sortDirection;
boolean refreshCurrentRssView;
private Context context;
private SORT_DIRECTION sortDirection;
private boolean refreshCurrentRssView;
public UpdateCurrentRssViewTask(Context context, boolean refreshCurrentRssView) {
this.context = context;
@ -311,8 +280,6 @@ public class NewsReaderDetailFragment extends Fragment {
}
}
setUpdateListViewOnStartUp(false);//Always reset this variable here. Otherwise the list will be cleared when the activity is restarted
LazyList<RssItem> list = dbConn.getCurrentRssItemView(sortDirection);
stopWatch.stop();
@ -325,11 +292,6 @@ public class NewsReaderDetailFragment extends Fragment {
protected void onPostExecute(LazyList<RssItem> rssItemLazyList) {
try
{
// TODO: is this necessary for RecyclerView?
// Block children layout for now
//BlockingListView bView = ((BlockingListView) getListView());
//bView.setBlockLayoutChildren(true);
NewsListRecyclerAdapter nra = ((NewsListRecyclerAdapter) recyclerView.getAdapter());
if(nra != null) {
nra.setLazyList(rssItemLazyList);
@ -345,7 +307,9 @@ public class NewsReaderDetailFragment extends Fragment {
tvNoItemsAvailable.setVisibility(View.INVISIBLE);
}
// TODO: see above: bView.setBlockLayoutChildren(false);
if(refreshCurrentRssView) { //Scroll to top
recyclerView.scrollToPosition(0);
}
}
catch(Exception ex)
{

61
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
View file

@ -62,7 +62,6 @@ import butterknife.Optional;
import de.greenrobot.event.EventBus;
import de.luhmer.owncloudnewsreader.ListView.SubscriptionExpandableListAdapter;
import de.luhmer.owncloudnewsreader.LoginDialogFragment.LoginSuccessfullListener;
import de.luhmer.owncloudnewsreader.adapter.NewsListRecyclerAdapter;
import de.luhmer.owncloudnewsreader.adapter.RecyclerItemClickListener;
import de.luhmer.owncloudnewsreader.adapter.ViewHolder;
import de.luhmer.owncloudnewsreader.authentication.AccountGeneral;
@ -109,7 +108,6 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
@InjectView(R.id.toolbar) Toolbar toolbar;
private ServiceConnection mConnection = null;
private View.OnClickListener mListener = null;
@Optional @InjectView(R.id.drawer_layout) protected DrawerLayout drawerLayout;
@ -181,26 +179,27 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
StartDetailFragment(SubscriptionExpandableListAdapter.SPECIAL_FOLDERS.ALL_UNREAD_ITEMS.getValue(), true, null, true);
}
mListener = new View.OnClickListener()
{
@Override
public void onClick(View view)
{
//Toast.makeText(getActivity(), "button 1 pressed", 3000).show();
NewsReaderDetailFragment ndf = ((NewsReaderDetailFragment) getSupportFragmentManager().findFragmentById(R.id.content_frame));
if(ndf != null) {
//ndf.reloadAdapterFromScratch();
ndf.UpdateCurrentRssView(NewsReaderListActivity.this, true);
}
}
};
//AppRater.app_launched(this);
//AppRater.rateNow(this);
UpdateButtonLayout();
}
View.OnClickListener mSnackbarListener = new View.OnClickListener()
{
@Override
public void onClick(View view)
{
//Toast.makeText(getActivity(), "button 1 pressed", 3000).show();
NewsReaderDetailFragment ndf = getNewsReaderDetailFragment();
if(ndf != null) {
//ndf.reloadAdapterFromScratch();
ndf.UpdateCurrentRssView(NewsReaderListActivity.this, true);
}
}
};
private static final String ID_FEED_STRING = "ID_FEED_STRING";
private static final String IS_FOLDER_BOOLEAN = "IS_FOLDER_BOOLEAN";
private static final String OPTIONAL_FOLDER_ID ="OPTIONAL_FOLDER_ID";
@ -215,10 +214,6 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
super.onSaveInstanceState(outState);
}
public NewsReaderDetailFragment getNewsReaderDetailFragment() {
return ((NewsReaderDetailFragment) getSupportFragmentManager().findFragmentById(R.id.content_frame));
}
/**
* Check if the account is in the Android Account Manager. If not it will be added automatically
*/
@ -400,7 +395,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
Handler refresh = new Handler(Looper.getMainLooper());
refresh.post(new Runnable() {
public void run() {
NewsReaderListFragment newsReaderListFragment = (NewsReaderListFragment) getSupportFragmentManager().findFragmentById(R.id.left_drawer);
NewsReaderListFragment newsReaderListFragment = getSlidingListFragment();
newsReaderListFragment.ReloadAdapter();
UpdateItemList();
UpdatePodcastView();
@ -411,7 +406,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
Snackbar snackbar = Snackbar.make(findViewById(R.id.coordinator_layout),
getResources().getQuantityString(R.plurals.message_bar_new_articles_available,newItemsCount,newItemsCount),
Snackbar.LENGTH_LONG);
snackbar.setAction(getString(R.string.message_bar_reload), mListener);
snackbar.setAction(getString(R.string.message_bar_reload), mSnackbarListener);
snackbar.setActionTextColor(getResources().getColor(R.color.accent_material_dark));
// Setting android:TextColor to #000 in the light theme results in black on black
// text on the Snackbar, set the text back to white,
@ -495,8 +490,8 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
titel = getString(R.string.starredFeeds);
}
NewsReaderDetailFragment fragment = (NewsReaderDetailFragment) getSupportFragmentManager().findFragmentById(R.id.content_frame);
fragment.setData(feedId,folderId,titel,updateListView);
NewsReaderDetailFragment fragment = getNewsReaderDetailFragment();
fragment.setData(feedId, folderId, titel, updateListView);
return fragment;
}
@ -504,7 +499,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
public void UpdateItemList()
{
try {
NewsReaderDetailFragment nrD = getDetailFragment();
NewsReaderDetailFragment nrD = getNewsReaderDetailFragment();
if (nrD != null)
nrD.getRecyclerView().getAdapter().notifyDataSetChanged();
} catch (Exception ex) {
@ -572,7 +567,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
menuItemDownloadMoreItems.setEnabled(false);
NewsReaderDetailFragment ndf = getDetailFragment();
NewsReaderDetailFragment ndf = getNewsReaderDetailFragment();
if(ndf != null)
ndf.UpdateMenuItemsState();
@ -652,7 +647,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
return true;
case R.id.menu_markAllAsRead:
NewsReaderDetailFragment ndf = getDetailFragment();
NewsReaderDetailFragment ndf = getNewsReaderDetailFragment();
if(ndf != null)
{
DatabaseConnectionOrm dbConn2 = new DatabaseConnectionOrm(this);
@ -693,7 +688,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
API api = API.GetRightApiForVersion(appVersion, NewsReaderListActivity.this);
((OwnCloud_Reader) _Reader).setApi(api);
NewsReaderDetailFragment ndf = getDetailFragment();
NewsReaderDetailFragment ndf = getNewsReaderDetailFragment();
_Reader.Start_AsyncTask_GetOldItems(Constants.TaskID_GetItems, NewsReaderListActivity.this, onAsyncTaskComplete, ndf.getIdFeed(), ndf.getIdFolder());
}
}
@ -702,7 +697,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
OnAsyncTaskCompletedListener onAsyncTaskComplete = new OnAsyncTaskCompletedListener() {
@Override
public void onAsyncTaskCompleted(int task_id, Object task_result) {
NewsReaderDetailFragment ndf = getDetailFragment();
NewsReaderDetailFragment ndf = getNewsReaderDetailFragment();
if(ndf != null)
ndf.UpdateCurrentRssView(NewsReaderListActivity.this, true);
@ -713,7 +708,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if(resultCode == RESULT_OK){
UpdateListView(this);
UpdateListView();
getSlidingListFragment().ListViewNotifyDataSetChanged();
}
@ -742,7 +737,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
return ((NewsReaderListFragment) getSupportFragmentManager().findFragmentById(R.id.left_drawer));
}
private NewsReaderDetailFragment getDetailFragment() {
private NewsReaderDetailFragment getNewsReaderDetailFragment() {
return (NewsReaderDetailFragment) getSupportFragmentManager().findFragmentById(R.id.content_frame);
}
@ -761,9 +756,9 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
}
public static void UpdateListView(FragmentActivity act)
private void UpdateListView()
{
((NewsReaderDetailFragment) act.getSupportFragmentManager().findFragmentById(R.id.content_frame)).notifyDataSetChangedOnAdapter();
getNewsReaderDetailFragment().notifyDataSetChangedOnAdapter();
}
@Override
public void onClick(ViewHolder vh, int position) {