Set title when loading fragment

pull/384/head
Alex Baker 10 years ago
parent a229cf631d
commit cfa8fc9e2f

@ -199,14 +199,12 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
if (intent.hasExtra(TaskListFragment.TOKEN_FILTER)) { if (intent.hasExtra(TaskListFragment.TOKEN_FILTER)) {
Filter filter = intent.getParcelableExtra(TaskListFragment.TOKEN_FILTER); Filter filter = intent.getParcelableExtra(TaskListFragment.TOKEN_FILTER);
extras.putAll(configureIntentAndExtrasWithFilter(intent, filter)); extras.putAll(configureIntentAndExtrasWithFilter(intent, filter));
setListsTitle(filter.listingTitle);
taskListFragment = newTaskListFragment(filter, extras); taskListFragment = newTaskListFragment(filter, extras);
} else { } else {
taskListFragment = getTaskListFragment(); taskListFragment = getTaskListFragment();
if (taskListFragment == null) { if (taskListFragment == null) {
Filter filter = getDefaultFilter(); Filter filter = getDefaultFilter();
extras.putAll(configureIntentAndExtrasWithFilter(intent, filter)); extras.putAll(configureIntentAndExtrasWithFilter(intent, filter));
setListsTitle(filter.listingTitle);
taskListFragment = newTaskListFragment(filter, extras); taskListFragment = newTaskListFragment(filter, extras);
} }
} }
@ -231,6 +229,8 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
} }
private void loadTaskListFragment(boolean onCreate, TaskListFragment taskListFragment) { private void loadTaskListFragment(boolean onCreate, TaskListFragment taskListFragment) {
Filter filter = taskListFragment.getFilter();
getSupportActionBar().setTitle(filter.listingTitle);
FragmentManager fragmentManager = getFragmentManager(); FragmentManager fragmentManager = getFragmentManager();
if (onCreate) { if (onCreate) {
fragmentManager.popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE); fragmentManager.popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
@ -368,9 +368,6 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
getTaskEditFragment().onBackPressed(); getTaskEditFragment().onBackPressed();
} }
if ((item instanceof Filter)) {
setSelectedItem((Filter) item);
}
// If showing both fragments, directly update the tasklist-fragment // If showing both fragments, directly update the tasklist-fragment
Intent intent = getIntent(); Intent intent = getIntent();
@ -520,14 +517,6 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
} }
} }
public void setListsTitle(String title) {
getSupportActionBar().setTitle(title);
}
public void setSelectedItem(Filter item) {
getSupportActionBar().setTitle(item.listingTitle);
}
@Override @Override
public void onBackPressed() { public void onBackPressed() {
if (navigationDrawer.isDrawerOpen()) { if (navigationDrawer.isDrawerOpen()) {

Loading…
Cancel
Save