From 41630980df293095c538a2929a1c0ec3ad1d44bf Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 19 Sep 2012 13:44:35 +0400 Subject: [PATCH] remove smalltablet code as unnecessary, store showunreadfeeds in globalstate --- src/org/fox/ttrss/CommonActivity.java | 41 ++++++++----------- src/org/fox/ttrss/FeedsActivity.java | 2 +- src/org/fox/ttrss/GlobalState.java | 2 + src/org/fox/ttrss/OnlineActivity.java | 14 ------- .../fox/ttrss/offline/OfflineActivity.java | 13 ++---- .../ttrss/offline/OfflineFeedsActivity.java | 2 +- 6 files changed, 23 insertions(+), 51 deletions(-) diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java index 35e8718c..4b34ed62 100644 --- a/src/org/fox/ttrss/CommonActivity.java +++ b/src/org/fox/ttrss/CommonActivity.java @@ -26,13 +26,28 @@ public class CommonActivity extends FragmentActivity { private boolean m_smallScreenMode = true; private boolean m_compatMode = false; - private boolean m_smallTablet = false; protected void setSmallScreen(boolean smallScreen) { Log.d(TAG, "m_smallScreenMode=" + smallScreen); m_smallScreenMode = smallScreen; } + public boolean getUnreadArticlesOnly() { + return GlobalState.getInstance().m_unreadArticlesOnly; + } + + public boolean getUnreadOnly() { + return GlobalState.getInstance().m_unreadOnly; + } + + public void setUnreadOnly(boolean unread) { + GlobalState.getInstance().m_unreadOnly = unread; + } + + public void setUnreadArticlesOnly(boolean unread) { + GlobalState.getInstance().m_unreadArticlesOnly = unread; + } + public void setLoadingStatus(int status, boolean showProgress) { TextView tv = (TextView) findViewById(R.id.loading_message); @@ -53,23 +68,6 @@ public class CommonActivity extends FragmentActivity { toast.show(); } - protected void detectSmallTablet() { - - DisplayMetrics displayMetrics = new DisplayMetrics(); - getWindowManager().getDefaultDisplay().getMetrics(displayMetrics); - - float inHeight = displayMetrics.heightPixels / displayMetrics.ydpi; - float inWidth = displayMetrics.widthPixels / displayMetrics.xdpi; - - float inDiag = FloatMath.sqrt(inHeight * inHeight + inWidth * inWidth); - - if (inDiag < 9) { - m_smallTablet = true; - } - - Log.d(TAG, "m_smallTabletMode=" + m_smallTablet + " " + inDiag); - } - private void initDatabase() { DatabaseHelper dh = new DatabaseHelper(getApplicationContext()); @@ -91,7 +89,6 @@ public class CommonActivity extends FragmentActivity { m_readableDb.close(); m_writableDb.close(); - } @Override @@ -102,8 +99,6 @@ public class CommonActivity extends FragmentActivity { Log.d(TAG, "m_compatMode=" + m_compatMode); - detectSmallTablet(); - super.onCreate(savedInstanceState); } @@ -111,10 +106,6 @@ public class CommonActivity extends FragmentActivity { return m_smallScreenMode; } - public boolean isSmallTablet() { - return m_smallTablet; - } - public boolean isCompatMode() { return m_compatMode; } diff --git a/src/org/fox/ttrss/FeedsActivity.java b/src/org/fox/ttrss/FeedsActivity.java index ef75616e..5d088c7a 100644 --- a/src/org/fox/ttrss/FeedsActivity.java +++ b/src/org/fox/ttrss/FeedsActivity.java @@ -207,7 +207,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.show_feeds: - m_unreadOnly = !m_unreadOnly; + setUnreadOnly(!getUnreadOnly()); initMenu(); refresh(); return true; diff --git a/src/org/fox/ttrss/GlobalState.java b/src/org/fox/ttrss/GlobalState.java index 324364f3..6a174763 100644 --- a/src/org/fox/ttrss/GlobalState.java +++ b/src/org/fox/ttrss/GlobalState.java @@ -13,6 +13,8 @@ public class GlobalState extends Application { public Feed m_activeFeed; public Article m_activeArticle; public int m_selectedArticleId; + public boolean m_unreadOnly = true; + public boolean m_unreadArticlesOnly = true; public static GlobalState getInstance(){ return m_singleton; diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java index 2810948b..7dc44188 100644 --- a/src/org/fox/ttrss/OnlineActivity.java +++ b/src/org/fox/ttrss/OnlineActivity.java @@ -50,8 +50,6 @@ public class OnlineActivity extends CommonActivity { protected int m_apiLevel = 0; protected Menu m_menu; - protected boolean m_unreadOnly = true; - protected boolean m_unreadArticlesOnly = true; protected int m_offlineModeStatus = 0; private ActionMode m_headlinesActionMode; @@ -156,8 +154,6 @@ public class OnlineActivity extends CommonActivity { if (savedInstanceState != null) { m_sessionId = savedInstanceState.getString("sessionId"); m_apiLevel = savedInstanceState.getInt("apiLevel"); - m_unreadOnly = savedInstanceState.getBoolean("unreadOnly"); - m_unreadArticlesOnly = savedInstanceState.getBoolean("unreadArticlesOnly"); m_offlineModeStatus = savedInstanceState.getInt("offlineModeStatus"); } @@ -814,22 +810,12 @@ public class OnlineActivity extends CommonActivity { } } - public boolean getUnreadArticlesOnly() { - return m_unreadArticlesOnly; - } - - public boolean getUnreadOnly() { - return m_unreadOnly; - } - @Override public void onSaveInstanceState(Bundle out) { super.onSaveInstanceState(out); out.putString("sessionId", m_sessionId); out.putInt("apiLevel", m_apiLevel); - out.putBoolean("unreadOnly", m_unreadOnly); - out.putBoolean("unreadArticlesOnly", m_unreadArticlesOnly); out.putInt("offlineModeStatus", m_offlineModeStatus); } diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/src/org/fox/ttrss/offline/OfflineActivity.java index 93ebe932..319428f5 100644 --- a/src/org/fox/ttrss/offline/OfflineActivity.java +++ b/src/org/fox/ttrss/offline/OfflineActivity.java @@ -32,7 +32,6 @@ public class OfflineActivity extends CommonActivity { protected SharedPreferences m_prefs; protected Menu m_menu; - protected boolean m_unreadOnly = true; private ActionMode m_headlinesActionMode; private HeadlinesActionModeCallback m_headlinesActionModeCallback; @@ -100,9 +99,9 @@ public class OfflineActivity extends CommonActivity { } } - if (savedInstanceState != null) { - m_unreadOnly = savedInstanceState.getBoolean("unreadOnly"); - } + /* if (savedInstanceState != null) { + + } */ if (!isCompatMode()) { m_headlinesActionModeCallback = new HeadlinesActionModeCallback(); @@ -113,8 +112,6 @@ public class OfflineActivity extends CommonActivity { @Override public void onSaveInstanceState(Bundle out) { super.onSaveInstanceState(out); - - out.putBoolean("unreadOnly", m_unreadOnly); } protected void selectArticles(int feedId, boolean isCat, int mode) { @@ -401,10 +398,6 @@ public class OfflineActivity extends CommonActivity { return true; } - public boolean getUnreadOnly() { - return m_unreadOnly; - } - @SuppressLint("NewApi") protected void initMenu() { if (m_menu != null) { diff --git a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java index 4122f456..35bf05b7 100644 --- a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java +++ b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java @@ -90,7 +90,7 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.show_feeds: - m_unreadOnly = !m_unreadOnly; + setUnreadOnly(!getUnreadOnly()); initMenu(); refresh(); return true;