From a1337b531e3a94c372fc65eb4d267cabcb4ba3d2 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 18 Jan 2012 12:01:02 +0300 Subject: allow closing active feed in tablet mode --- src/org/fox/ttrss/MainActivity.java | 11 +++++++++++ src/org/fox/ttrss/OfflineActivity.java | 9 +++++++++ 2 files changed, 20 insertions(+) (limited to 'src') diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index c60e7e66..df419a41 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -829,6 +829,15 @@ public class MainActivity extends FragmentActivity implements OnlineServices { closeArticle(); } else if (m_activeCategory != null) { closeCategory(); + } else if (m_activeFeed != null) { + findViewById(R.id.headlines_fragment).setVisibility( + View.INVISIBLE); + + m_activeFeed = null; + + refreshFeeds(); + initMainMenu(); + } else if (allowQuit) { finish(); } @@ -1405,6 +1414,8 @@ public class MainActivity extends FragmentActivity implements OnlineServices { if (m_smallScreenMode) { findViewById(R.id.feeds_fragment).setVisibility(View.GONE); findViewById(R.id.headlines_fragment).setVisibility(View.VISIBLE); + } else { + findViewById(R.id.headlines_fragment).setVisibility(View.VISIBLE); } if (!append) { diff --git a/src/org/fox/ttrss/OfflineActivity.java b/src/org/fox/ttrss/OfflineActivity.java index 730c6a3e..74968893 100644 --- a/src/org/fox/ttrss/OfflineActivity.java +++ b/src/org/fox/ttrss/OfflineActivity.java @@ -337,6 +337,13 @@ public class OfflineActivity extends FragmentActivity implements } else { if (m_selectedArticleId != 0) { closeArticle(); + } else if (m_activeFeedId != 0) { + findViewById(R.id.headlines_fragment).setVisibility(View.INVISIBLE); + m_activeFeedId = 0; + + refreshViews(); + initMainMenu(); + } else if (allowQuit) { finish(); } @@ -960,6 +967,8 @@ public class OfflineActivity extends FragmentActivity implements if (m_smallScreenMode) { findViewById(R.id.feeds_fragment).setVisibility(View.GONE); findViewById(R.id.headlines_fragment).setVisibility(View.VISIBLE); + } else { + findViewById(R.id.headlines_fragment).setVisibility(View.VISIBLE); } deselectAllArticles(); -- cgit v1.2.3