From cd7f9529a780b5f4647c315fb460f59648178b00 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 26 Apr 2013 13:16:53 +0400 Subject: remove custom fragment constructors --- src/org/fox/ttrss/offline/OfflineArticleFragment.java | 8 +------- src/org/fox/ttrss/offline/OfflineArticlePager.java | 13 +++++-------- src/org/fox/ttrss/offline/OfflineFeedsActivity.java | 18 +++++++++++++----- src/org/fox/ttrss/offline/OfflineFeedsFragment.java | 6 +----- .../fox/ttrss/offline/OfflineHeadlinesActivity.java | 7 +++++-- .../fox/ttrss/offline/OfflineHeadlinesFragment.java | 6 +----- 6 files changed, 26 insertions(+), 32 deletions(-) (limited to 'src/org/fox/ttrss/offline') diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java index 621367d2..13052f0a 100644 --- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -48,16 +48,10 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector. private OfflineActivity m_activity; private GestureDetector m_detector; - public OfflineArticleFragment() { - super(); - } - - public OfflineArticleFragment(int articleId) { - super(); + public void initialize(int articleId) { m_articleId = articleId; } - @Override public boolean onContextItemSelected(MenuItem item) { /* AdapterContextMenuInfo info = (AdapterContextMenuInfo) item diff --git a/src/org/fox/ttrss/offline/OfflineArticlePager.java b/src/org/fox/ttrss/offline/OfflineArticlePager.java index a4a90031..1aa226bb 100644 --- a/src/org/fox/ttrss/offline/OfflineArticlePager.java +++ b/src/org/fox/ttrss/offline/OfflineArticlePager.java @@ -86,7 +86,10 @@ public class OfflineArticlePager extends Fragment { getView().setSystemUiVisibility(View.STATUS_BAR_HIDDEN); } - return new OfflineArticleFragment(m_cursor.getInt(m_cursor.getColumnIndex(BaseColumns._ID))); + OfflineArticleFragment oaf = new OfflineArticleFragment(); + oaf.initialize(m_cursor.getInt(m_cursor.getColumnIndex(BaseColumns._ID))); + + return oaf; } return null; @@ -116,13 +119,7 @@ public class OfflineArticlePager extends Fragment { } } - public OfflineArticlePager() { - super(); - } - - public OfflineArticlePager(int articleId, int feedId, boolean isCat) { - super(); - + public void initialize(int articleId, int feedId, boolean isCat) { m_feedId = feedId; m_isCat = isCat; m_articleId = articleId; diff --git a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java index 506cd493..dea8d336 100644 --- a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java +++ b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java @@ -68,14 +68,20 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead boolean isCat = intent.getBooleanExtra("isCat", false); if (articleId != -10000) { - ft.replace(R.id.feeds_fragment, new OfflineArticlePager(articleId, feedId, isCat), FRAG_ARTICLE); + OfflineArticlePager oap = new OfflineArticlePager(); + oap.initialize(articleId, feedId, isCat); + ft.replace(R.id.feeds_fragment, oap, FRAG_ARTICLE); } else { if (feedId != -10000) { - ft.replace(R.id.feeds_fragment, new OfflineHeadlinesFragment(feedId, isCat), FRAG_HEADLINES); + OfflineHeadlinesFragment ohf = new OfflineHeadlinesFragment(); + ohf.initialize(feedId, isCat); + ft.replace(R.id.feeds_fragment, ohf, FRAG_HEADLINES); } if (catId != -10000) { - ft.replace(R.id.feeds_fragment, new OfflineFeedsFragment(catId), FRAG_FEEDS); + OfflineFeedsFragment off = new OfflineFeedsFragment(); + off.initialize(catId); + ft.replace(R.id.feeds_fragment, off, FRAG_FEEDS); } } @@ -187,7 +193,8 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead FragmentTransaction ft = getSupportFragmentManager() .beginTransaction(); - OfflineFeedsFragment ff = new OfflineFeedsFragment(catId); + OfflineFeedsFragment ff = new OfflineFeedsFragment(); + ff.initialize(catId); ft.replace(R.id.feeds_fragment, ff, FRAG_FEEDS); ft.addToBackStack(null); @@ -234,7 +241,8 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead FragmentTransaction ft = getSupportFragmentManager() .beginTransaction(); - OfflineHeadlinesFragment hf = new OfflineHeadlinesFragment(feedId, isCat); + OfflineHeadlinesFragment hf = new OfflineHeadlinesFragment(); + hf.initialize(feedId, isCat); ft.replace(R.id.headlines_fragment, hf, FRAG_HEADLINES); ft.commit(); diff --git a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java index ed7df040..50e13afb 100644 --- a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java +++ b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java @@ -42,11 +42,7 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene private Cursor m_cursor; private OfflineFeedsActivity m_activity; - public OfflineFeedsFragment() { - // - } - - public OfflineFeedsFragment(int catId) { + public void initialize(int catId) { m_catId = catId; } diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java b/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java index 867a2e5d..9aabfc9d 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java @@ -52,8 +52,11 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline int articleId = i.getIntExtra("article", 0); String searchQuery = i.getStringExtra("searchQuery"); - OfflineHeadlinesFragment hf = new OfflineHeadlinesFragment(feedId, isCat); - OfflineArticlePager af = new OfflineArticlePager(articleId, feedId, isCat); + OfflineHeadlinesFragment hf = new OfflineHeadlinesFragment(); + hf.initialize(feedId, isCat); + + OfflineArticlePager af = new OfflineArticlePager(); + af.initialize(articleId, feedId, isCat); hf.setActiveArticleId(articleId); diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index cdb0adf3..e7e848d2 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -70,14 +70,10 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis }; - public OfflineHeadlinesFragment(int feedId, boolean isCat) { + public void initialize(int feedId, boolean isCat) { m_feedId = feedId; m_feedIsCat = isCat; } - - public OfflineHeadlinesFragment() { - // - } @Override public void onDestroy() { -- cgit v1.2.3-54-g00ecf