summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-12-07 09:58:32 +0300
committerAndrew Dolgov <[email protected]>2011-12-07 09:58:32 +0300
commitdf3be3d4c6ad7def0866dfed16d98c6a973f5a1b (patch)
treef06c1304ba6d505adbca7b5d0bee9eda50743fc0
parentbd6fd2e92fd4ccde77bdc6788d984eb51fe68c5c (diff)
break tabs a bit
-rw-r--r--src/org/fox/ttrss/MainActivity.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index ef969af9..565cfcbf 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -1043,12 +1043,6 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
m_selectedArticle = null;
- if (m_bar != null && m_feedTab != null) {
- m_bar.removeAllTabs();
- m_bar.addTab(m_rootTab);
- m_feedTab = null;
- }
-
initMainMenu();
refreshFeeds();
@@ -1872,6 +1866,9 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
public void onTabSelected(Tab arg0, android.app.FragmentTransaction arg1) {
// TODO Auto-generated method stub
+ if (m_catTab != null) m_bar.removeTab(m_catTab);
+ if (m_feedTab != null) m_bar.removeTab(m_feedTab);
+
}
@Override
@@ -1896,7 +1893,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
public void onTabReselected(Tab tab,
android.app.FragmentTransaction _ft) {
- closeArticle();
+ //closeArticle();
}
@Override
@@ -1921,7 +1918,8 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
public void onTabUnselected(Tab tab,
android.app.FragmentTransaction _ft) {
- closeArticle();
+ if (m_selectedArticle != null)
+ closeArticle();
findViewById(R.id.feeds_fragment).setVisibility(View.GONE);
findViewById(R.id.cats_fragment).setVisibility(View.VISIBLE);
@@ -1930,6 +1928,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
initMainMenu();
refreshCategories();
+
}
}