From 5eb677e9bf2fa8aef4e9233aed5affb423c84457 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Thu, 1 Mar 2012 16:20:17 -0800 Subject: [PATCH] Minor cleanup --- .../astrid/activity/TaskListActivity.java | 144 +++++++++--------- .../adapter/TaskListFragmentPagerAdapter.java | 2 +- 2 files changed, 73 insertions(+), 73 deletions(-) diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index df9c45b4b..00512a349 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -185,7 +185,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener if (getIntent().hasExtra(TOKEN_SOURCE)) { trackActivitySource(); } - } + } @Override public TaskListFragment getTaskListFragment() { @@ -196,23 +196,23 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener } } - @Override + @Override public void setupTasklistFragmentWithFilter(Filter filter, Bundle extras) { - if (fragmentLayout == LAYOUT_SINGLE) { - tlfPager.showFilter(filter); // TODO: make sure we handle the extras and the custom task list - } else { - super.setupTasklistFragmentWithFilter(filter, extras); - } - } - - @Override + if (fragmentLayout == LAYOUT_SINGLE) { + tlfPager.showFilter(filter); + } else { + super.setupTasklistFragmentWithFilter(filter, extras); + } + } + + @Override public void setupTasklistFragmentWithFilterAndCustomTaskList(Filter filter, Bundle extras, Class customTaskList) { - if (fragmentLayout == LAYOUT_SINGLE) { - tlfPager.showFilter(filter); // TODO: make sure we handle the extras and the custom task list - } else { - super.setupTasklistFragmentWithFilterAndCustomTaskList(filter, extras, customTaskList); - } - } + if (fragmentLayout == LAYOUT_SINGLE) { + tlfPager.showFilter(filter); + } else { + super.setupTasklistFragmentWithFilterAndCustomTaskList(filter, extras, customTaskList); + } + } /** * @@ -222,29 +222,29 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener View filterFragment = findViewById(R.id.filterlist_fragment_container); View editFragment = findViewById(R.id.taskedit_fragment_container); - if (filterFragment != null) { - actionBar.setDisplayHomeAsUpEnabled(false); - actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow).setVisibility(View.GONE); - listsNav.setOnClickListener(null); - - if(editFragment != null && editFragment.getVisibility() == View.INVISIBLE) { - fragmentLayout = LAYOUT_TRIPLE; - actionBar.getCustomView().findViewById(R.id.comments).setVisibility(View.GONE); - } else { - fragmentLayout = LAYOUT_DOUBLE; - createEditPopover(); - createCommentsPopover(); - } - - setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, - R.id.filterlist_fragment_container, FilterListFragment.class, false); - } else { - fragmentLayout = LAYOUT_SINGLE; - actionBar.setDisplayHomeAsUpEnabled(true); - listsNav.setOnClickListener(popupMenuClickListener); - createListsPopover(); - setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0, FilterListFragment.class, true)); - } + if (filterFragment != null) { + actionBar.setDisplayHomeAsUpEnabled(false); + actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow).setVisibility(View.GONE); + listsNav.setOnClickListener(null); + + if(editFragment != null && editFragment.getVisibility() == View.INVISIBLE) { + fragmentLayout = LAYOUT_TRIPLE; + actionBar.getCustomView().findViewById(R.id.comments).setVisibility(View.GONE); + } else { + fragmentLayout = LAYOUT_DOUBLE; + createEditPopover(); + createCommentsPopover(); + } + + setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, + R.id.filterlist_fragment_container, FilterListFragment.class, false); + } else { + fragmentLayout = LAYOUT_SINGLE; + actionBar.setDisplayHomeAsUpEnabled(true); + listsNav.setOnClickListener(popupMenuClickListener); + createListsPopover(); + setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0, FilterListFragment.class, true)); + } } private void createListsPopover() { @@ -317,39 +317,39 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener @Override public void onTaskListItemClicked(long taskId) { - super.onTaskListItemClicked(taskId); - if (fragmentLayout == LAYOUT_DOUBLE && getTaskEditFragment() != null) { - DisplayMetrics metrics = getResources().getDisplayMetrics(); - setupPopoverWithFragment(editPopover, getTaskEditFragment(), new LayoutParams((int) (400 * metrics.density), (int) (600 * metrics.density))); - editPopover.show(listsNav); - } - } - - - @Override - public boolean onFilterItemClicked(FilterListItem item) { - if (listsPopover != null) - listsPopover.dismiss(); - setCommentsCount(0); - - if (fragmentLayout == LAYOUT_SINGLE) { - tlfPager.showFilter((Filter) item); - return true; - } - return super.onFilterItemClicked(item); - } - - private void setListsDropdownSelected(boolean selected) { - int oldTextColor = lists.getTextColors().getDefaultColor(); - int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected : - R.style.TextAppearance_ActionBar_ListsHeader); - - TypedValue listDisclosure = new TypedValue(); - getTheme().resolveAttribute(R.attr.asListsDisclosure, listDisclosure, false); - lists.setTextAppearance(this, textStyle); - listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent); - listsNavDisclosure.setSelected(selected); - } + super.onTaskListItemClicked(taskId); + if (fragmentLayout == LAYOUT_DOUBLE && getTaskEditFragment() != null) { + DisplayMetrics metrics = getResources().getDisplayMetrics(); + setupPopoverWithFragment(editPopover, getTaskEditFragment(), new LayoutParams((int) (400 * metrics.density), (int) (600 * metrics.density))); + editPopover.show(listsNav); + } + } + + + @Override + public boolean onFilterItemClicked(FilterListItem item) { + if (listsPopover != null) + listsPopover.dismiss(); + setCommentsCount(0); + + if (fragmentLayout == LAYOUT_SINGLE) { + tlfPager.showFilter((Filter) item); + return true; + } + return super.onFilterItemClicked(item); + } + + private void setListsDropdownSelected(boolean selected) { + int oldTextColor = lists.getTextColors().getDefaultColor(); + int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected : + R.style.TextAppearance_ActionBar_ListsHeader); + + TypedValue listDisclosure = new TypedValue(); + getTheme().resolveAttribute(R.attr.asListsDisclosure, listDisclosure, false); + lists.setTextAppearance(this, textStyle); + listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent); + listsNavDisclosure.setSelected(selected); + } @Override protected void onPostResume() { diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java index f28f305f0..8ac8bfae8 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java @@ -17,7 +17,7 @@ public class TaskListFragmentPagerAdapter extends FragmentStatePagerAdapter impl private final HashMap positionToFragment; - private final FilterAdapter filterAdapter; // Shares an adapter instance as the filter list fragment + private final FilterAdapter filterAdapter; // Shares an adapter instance with the filter list fragment public TaskListFragmentPagerAdapter(FragmentManager fm, FilterAdapter filterAdapter) { super(fm);