diff options
| author | Andrew Dolgov <[email protected]> | 2012-06-24 23:55:56 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-06-24 23:55:56 +0400 |
| commit | 3d39b03a60625574c35de0face7a84d8ca077799 (patch) | |
| tree | bf0260acee50fdaae801bd523fc69c15c102a558 | |
| parent | 099377a665d8901b245a42125ecd8703c73b49af (diff) | |
move some more common stuff to CommonActivity
| -rw-r--r-- | src/org/fox/ttrss/CommonActivity.java | 5 | ||||
| -rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 9 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineActivity.java | 13 |
3 files changed, 5 insertions, 22 deletions
diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java index 07f18fc9..92d8b2a3 100644 --- a/src/org/fox/ttrss/CommonActivity.java +++ b/src/org/fox/ttrss/CommonActivity.java @@ -11,6 +11,11 @@ import android.util.Log; public class CommonActivity extends FragmentActivity {
private final String TAG = this.getClass().getSimpleName();
+ public final static String FRAG_HEADLINES = "headlines";
+ public final static String FRAG_ARTICLE = "article";
+ public final static String FRAG_FEEDS = "feeds";
+ public final static String FRAG_CATS = "cats";
+
private SQLiteDatabase m_readableDb;
private SQLiteDatabase m_writableDb;
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index b1b4da0d..91ae5de3 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -64,11 +64,6 @@ import com.google.gson.reflect.TypeToken; public class MainActivity extends CommonActivity implements OnlineServices { private final String TAG = this.getClass().getSimpleName(); - - protected final static String FRAG_HEADLINES = "headlines"; - protected final static String FRAG_ARTICLE = "article"; - protected final static String FRAG_FEEDS = "feeds"; - protected final static String FRAG_CATS = "cats"; private SharedPreferences m_prefs; private String m_themeName = ""; @@ -1759,10 +1754,6 @@ public class MainActivity extends CommonActivity implements OnlineServices { viewFeed(feed, false); } - public Article getSelectedArticle() { - return m_selectedArticle; - } - public void viewFeed(Feed feed, boolean append) { Log.d(TAG, "viewFeeed/" + feed.id); diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/src/org/fox/ttrss/offline/OfflineActivity.java index e5f4793c..9b8d2061 100644 --- a/src/org/fox/ttrss/offline/OfflineActivity.java +++ b/src/org/fox/ttrss/offline/OfflineActivity.java @@ -46,11 +46,6 @@ public class OfflineActivity extends CommonActivity implements OfflineServices { private final String TAG = this.getClass().getSimpleName(); - protected final static String FRAG_HEADLINES = "headlines"; - protected final static String FRAG_ARTICLE = "article"; - protected final static String FRAG_FEEDS = "feeds"; - protected final static String FRAG_CATS = "cats"; - private SharedPreferences m_prefs; private String m_themeName = ""; private Menu m_menu; @@ -429,14 +424,6 @@ public class OfflineActivity extends CommonActivity implements return true; } - private void setMenuLabel(int id, int labelId) { - MenuItem mi = m_menu.findItem(id); - - if (mi != null) { - mi.setTitle(labelId); - } - } - private void goBack(boolean allowQuit) { if (isSmallScreen()) { if (m_selectedArticleId != 0) { |