diff options
| author | Andrew Dolgov <[email protected]> | 2012-01-24 14:04:45 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-01-24 14:04:45 +0300 |
| commit | c8a5161d4f0d8922a3d3ec13802c0d1bbab98f5f (patch) | |
| tree | 54dee2c2ed2aa4cfad286e8aaac6428d9012afad /src/org | |
| parent | 5aaba5a070bf0a14fc80d1d19577a63ca58cf3ef (diff) | |
properly unmark categories when going back
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/fox/ttrss/FeedCategoriesFragment.java | 4 | ||||
| -rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 16 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java index a9449e8b..4b7873d7 100644 --- a/src/org/fox/ttrss/FeedCategoriesFragment.java +++ b/src/org/fox/ttrss/FeedCategoriesFragment.java @@ -337,4 +337,8 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe m_selectedCatId = cat.id;
m_adapter.notifyDataSetChanged();
}
+
+ public void setSelectedCategoryId(int id) {
+ m_selectedCatId = id;
+ }
}
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index 00d0ebf6..648e98bf 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -764,6 +764,13 @@ public class MainActivity extends FragmentActivity implements OnlineServices { findViewById(R.id.feeds_fragment).setVisibility(View.GONE); m_activeCategory = null; + + FeedCategoriesFragment cf = (FeedCategoriesFragment) getSupportFragmentManager() + .findFragmentById(R.id.cats_fragment); + + if (cf != null) { + cf.setSelectedCategoryId(0); + } initMainMenu(); refreshCategories(); @@ -794,12 +801,19 @@ public class MainActivity extends FragmentActivity implements OnlineServices { R.anim.slide_right)); } - if (m_activeFeed != null && m_activeFeed.is_cat) { + if (m_activeFeed.is_cat) { findViewById(R.id.cats_fragment) .setVisibility(View.VISIBLE); findViewById(R.id.headlines_fragment).setVisibility( View.GONE); + FeedCategoriesFragment cf = (FeedCategoriesFragment) getSupportFragmentManager() + .findFragmentById(R.id.cats_fragment); + + if (cf != null) { + cf.setSelectedCategoryId(0); + } + refreshCategories(); } else { findViewById(R.id.feeds_fragment).setVisibility( |