iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cache feeds/cats fragment when going back from headlines for speed

Browse Source
This commit is contained in:
Andrew Dolgov 2012-06-21 16:33:13 +04:00
parent 277c2e0e47
commit be9dbd7e85
1 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/org/fox/ttrss/MainActivity.java
View File

@ -516,11 +516,20 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
} }
if (m_smallScreenMode) { if (m_smallScreenMode) {
if (m_selectedArticle != null) {
FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
if (m_selectedArticle != null) {
ft.hide(getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES)); ft.hide(getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES));
ft.commit();
} }
if (m_activeFeed != null) {
if (m_activeFeed.is_cat) {
ft.hide(getSupportFragmentManager().findFragmentByTag(FRAG_CATS));
} else {
ft.hide(getSupportFragmentManager().findFragmentByTag(FRAG_FEEDS));
}
}
ft.commit();
} }
if (m_isOffline) { if (m_isOffline) {
@ -815,16 +824,31 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
} else if (m_activeFeed != null) { } else if (m_activeFeed != null) {
if (m_activeFeed.is_cat) { if (m_activeFeed.is_cat) {
FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
ft.replace(R.id.fragment_container, new FeedCategoriesFragment(), FRAG_CATS);
Fragment headlines = getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES);
Fragment cats = getSupportFragmentManager().findFragmentByTag(FRAG_CATS);
ft.show(cats);
ft.remove(headlines);
//ft.replace(R.id.fragment_container, new FeedCategoriesFragment(), FRAG_CATS);
ft.commit(); ft.commit();
} else { } else {
FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
ft.replace(R.id.fragment_container, new FeedsFragment(m_activeCategory), FRAG_FEEDS);
Fragment headlines = getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES);
Fragment feeds = getSupportFragmentManager().findFragmentByTag(FRAG_FEEDS);
ft.show(feeds);
ft.remove(headlines);
ft.commit(); ft.commit();
} }
m_activeFeed = null; m_activeFeed = null;
refresh();
initMainMenu(); initMainMenu();
} else if (m_activeCategory != null) { } else if (m_activeCategory != null) {
@ -1602,7 +1626,13 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
.beginTransaction(); .beginTransaction();
if (m_smallScreenMode) { if (m_smallScreenMode) {
ft.replace(R.id.fragment_container, hf, FRAG_HEADLINES); Fragment cats = getSupportFragmentManager().findFragmentByTag(FRAG_CATS);
if (cats != null) ft.hide(cats);
Fragment feeds = getSupportFragmentManager().findFragmentByTag(FRAG_FEEDS);
if (feeds != null) ft.hide(feeds);
ft.add(R.id.fragment_container, hf, FRAG_HEADLINES);
} else { } else {
findViewById(R.id.headlines_fragment).setVisibility(View.VISIBLE); findViewById(R.id.headlines_fragment).setVisibility(View.VISIBLE);
ft.replace(R.id.headlines_fragment, hf, FRAG_HEADLINES); ft.replace(R.id.headlines_fragment, hf, FRAG_HEADLINES);
@ -1638,7 +1668,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
} else { } else {
m_activeFeed = new Feed(cat.id, cat.title, true); Feed feed = new Feed(cat.id, cat.title, true);
if (m_menu != null) { if (m_menu != null) {
MenuItem search = m_menu.findItem(R.id.search); MenuItem search = m_menu.findItem(R.id.search);
@ -1649,7 +1679,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
} }
} }
HeadlinesFragment frag = new HeadlinesFragment(m_activeFeed); /* HeadlinesFragment frag = new HeadlinesFragment(m_activeFeed);
FragmentTransaction ft = getSupportFragmentManager() FragmentTransaction ft = getSupportFragmentManager()
.beginTransaction(); .beginTransaction();
@ -1659,8 +1689,9 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
findViewById(R.id.headlines_fragment).setVisibility(View.VISIBLE); findViewById(R.id.headlines_fragment).setVisibility(View.VISIBLE);
ft.replace(R.id.headlines_fragment, frag, FRAG_HEADLINES); ft.replace(R.id.headlines_fragment, frag, FRAG_HEADLINES);
} }
ft.commit(); ft.commit(); */
viewFeed(feed, false);
} }
initMainMenu(); initMainMenu();