From 4acc9ac37e3363552cebc7a37e16e254f9438f4d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 10 Jun 2015 19:40:08 +0300 Subject: [PATCH] further refactoring --- org.fox.ttrss/src/main/AndroidManifest.xml | 10 +++---- .../{GlobalState.java => Application.java} | 7 ++--- .../java/org/fox/ttrss/ArticleFragment.java | 10 +++---- .../fox/ttrss/ArticleImagesPagerActivity.java | 4 +-- .../main/java/org/fox/ttrss/ArticlePager.java | 10 +++---- ...linesActivity.java => DetailActivity.java} | 16 +++++----- .../org/fox/ttrss/FeedCategoriesFragment.java | 6 ++-- .../java/org/fox/ttrss/FeedsFragment.java | 6 ++-- .../java/org/fox/ttrss/HeadlinesFragment.java | 30 +++++++++---------- ...FeedsActivity.java => MasterActivity.java} | 22 +++++++------- .../java/org/fox/ttrss/OnlineActivity.java | 20 ++++++------- .../org/fox/ttrss/PreferencesActivity.java | 2 +- .../fox/ttrss/offline/OfflineActivity.java | 8 ++--- .../ttrss/offline/OfflineArticleFragment.java | 8 ++--- ...tivity.java => OfflineDetailActivity.java} | 8 ++--- .../OfflineFeedCategoriesFragment.java | 6 ++-- .../ttrss/offline/OfflineFeedsFragment.java | 6 ++-- .../offline/OfflineHeadlinesFragment.java | 10 +++---- ...tivity.java => OfflineMasterActivity.java} | 14 ++++----- .../fox/ttrss/share/CommonShareActivity.java | 8 +---- .../ttrss/tasker/TaskerSettingsActivity.java | 4 +-- .../ttrss/util/FontSizeDialogPreference.java | 2 +- .../org/fox/ttrss/util/HeadlinesRequest.java | 4 +-- ...lines_articles.xml => activity_detail.xml} | 0 .../{headlines.xml => activity_master.xml} | 0 ...lines_articles.xml => activity_detail.xml} | 0 ...lines_articles.xml => activity_detail.xml} | 0 .../layout/{login.xml => activity_login.xml} | 0 .../{headlines.xml => activity_master.xml} | 0 ...eferences.xml => activity_preferences.xml} | 0 ...size.xml => settings_select_font_size.xml} | 0 ...asker_settings.xml => settings_tasker.xml} | 0 ...ion_menu.xml => action_mode_headlines.xml} | 0 .../menu/{main_menu.xml => activity_main.xml} | 0 ...{offline_menu.xml => activity_offline.xml} | 0 .../{share_menu.xml => activity_share.xml} | 0 ...nu.xml => context_article_content_img.xml} | 0 ...text_menu.xml => context_article_link.xml} | 0 ...category_menu.xml => context_category.xml} | 0 .../menu/{feed_menu.xml => context_feed.xml} | 0 ...context_menu.xml => context_headlines.xml} | 0 41 files changed, 106 insertions(+), 115 deletions(-) rename org.fox.ttrss/src/main/java/org/fox/ttrss/{GlobalState.java => Application.java} (92%) mode change 100755 => 100644 rename org.fox.ttrss/src/main/java/org/fox/ttrss/{HeadlinesActivity.java => DetailActivity.java} (94%) mode change 100755 => 100644 rename org.fox.ttrss/src/main/java/org/fox/ttrss/{FeedsActivity.java => MasterActivity.java} (96%) mode change 100755 => 100644 rename org.fox.ttrss/src/main/java/org/fox/ttrss/offline/{OfflineHeadlinesActivity.java => OfflineDetailActivity.java} (95%) rename org.fox.ttrss/src/main/java/org/fox/ttrss/offline/{OfflineFeedsActivity.java => OfflineMasterActivity.java} (96%) mode change 100755 => 100644 rename org.fox.ttrss/src/main/res/layout-sw600dp-land/{activity_headlines_articles.xml => activity_detail.xml} (100%) rename org.fox.ttrss/src/main/res/layout-sw600dp-land/{headlines.xml => activity_master.xml} (100%) rename org.fox.ttrss/src/main/res/layout-sw600dp-port/{activity_headlines_articles.xml => activity_detail.xml} (100%) rename org.fox.ttrss/src/main/res/layout/{activity_headlines_articles.xml => activity_detail.xml} (100%) rename org.fox.ttrss/src/main/res/layout/{login.xml => activity_login.xml} (100%) mode change 100755 => 100644 rename org.fox.ttrss/src/main/res/layout/{headlines.xml => activity_master.xml} (100%) rename org.fox.ttrss/src/main/res/layout/{preferences.xml => activity_preferences.xml} (100%) mode change 100755 => 100644 rename org.fox.ttrss/src/main/res/layout/{dialog_select_font_size.xml => settings_select_font_size.xml} (100%) rename org.fox.ttrss/src/main/res/layout/{tasker_settings.xml => settings_tasker.xml} (100%) rename org.fox.ttrss/src/main/res/menu/{headlines_action_menu.xml => action_mode_headlines.xml} (100%) mode change 100755 => 100644 rename org.fox.ttrss/src/main/res/menu/{main_menu.xml => activity_main.xml} (100%) mode change 100755 => 100644 rename org.fox.ttrss/src/main/res/menu/{offline_menu.xml => activity_offline.xml} (100%) mode change 100755 => 100644 rename org.fox.ttrss/src/main/res/menu/{share_menu.xml => activity_share.xml} (100%) mode change 100755 => 100644 rename org.fox.ttrss/src/main/res/menu/{article_content_img_context_menu.xml => context_article_content_img.xml} (100%) mode change 100755 => 100644 rename org.fox.ttrss/src/main/res/menu/{article_link_context_menu.xml => context_article_link.xml} (100%) rename org.fox.ttrss/src/main/res/menu/{category_menu.xml => context_category.xml} (100%) rename org.fox.ttrss/src/main/res/menu/{feed_menu.xml => context_feed.xml} (100%) rename org.fox.ttrss/src/main/res/menu/{headlines_context_menu.xml => context_headlines.xml} (100%) diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index c87561ca..43f3931f 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -14,7 +14,7 @@ @@ -69,11 +69,11 @@ android:label="@string/app_name" > 0) { menu.setHeaderTitle(R.string.headline_context_multiple); @@ -327,10 +327,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (savedInstanceState != null) { m_feed = savedInstanceState.getParcelable("feed"); - if (! (m_activity instanceof HeadlinesActivity)) { + if (! (m_activity instanceof DetailActivity)) { m_articles = savedInstanceState.getParcelable("articles"); } else { - m_articles = ((HeadlinesActivity)m_activity).m_articles; + m_articles = ((DetailActivity)m_activity).m_articles; } m_activeArticle = savedInstanceState.getParcelable("activeArticle"); @@ -407,16 +407,16 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (m_adapter != null) m_adapter.notifyDataSetChanged(); - /* if (GlobalState.getInstance().m_activeArticle != null) { - m_activeArticle = GlobalState.getInstance().m_activeArticle; - GlobalState.getInstance().m_activeArticle = null; + /* if (Application.getInstance().m_activeArticle != null) { + m_activeArticle = Application.getInstance().m_activeArticle; + Application.getInstance().m_activeArticle = null; } */ if (m_activeArticle != null) { setActiveArticle(m_activeArticle); } - /* if (!(m_activity instanceof HeadlinesActivity)) { + /* if (!(m_activity instanceof DetailActivity)) { refresh(false); } */ @@ -424,10 +424,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, refresh(false); } - /* if (m_articles.size() == 0 || !m_feed.equals(GlobalState.getInstance().m_activeFeed)) { + /* if (m_articles.size() == 0 || !m_feed.equals(Application.getInstance().m_activeFeed)) { if (m_activity.getSupportFragmentManager().findFragmentByTag(CommonActivity.FRAG_ARTICLE) == null) { refresh(false); - GlobalState.getInstance().m_activeFeed = m_feed; + Application.getInstance().m_activeFeed = m_feed; } } else { notifyUpdated(); @@ -457,8 +457,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (article != null && article.id >= 0) { m_listener.onArticleSelected(article); - // only set active article when it makes sense (in HeadlinesActivity) - if (getActivity() instanceof HeadlinesActivity) { + // only set active article when it makes sense (in DetailActivity) + if (getActivity() instanceof DetailActivity) { m_activeArticle = article; } @@ -478,7 +478,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (m_swipeLayout != null) m_swipeLayout.setRefreshing(true); - /* if (!m_feed.equals(GlobalState.getInstance().m_activeFeed)) { + /* if (!m_feed.equals(Application.getInstance().m_activeFeed)) { append = false; } */ @@ -1155,8 +1155,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, public void setActiveArticle(Article article) { if (article != m_activeArticle && article != null) { - // only set active article when it makes sense (in HeadlinesActivity) - if (getActivity() instanceof HeadlinesActivity) { + // only set active article when it makes sense (in DetailActivity) + if (getActivity() instanceof DetailActivity) { m_activeArticle = article; } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java old mode 100755 new mode 100644 similarity index 96% rename from org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java rename to org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index 5aafce6b..0df1c48f --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -30,7 +30,7 @@ import org.fox.ttrss.widget.SmallWidgetProvider; import java.util.Date; import java.util.HashMap; -public class FeedsActivity extends OnlineActivity implements HeadlinesEventListener { +public class MasterActivity extends OnlineActivity implements HeadlinesEventListener { private final String TAG = this.getClass().getSimpleName(); private static final int HEADLINES_REQUEST = 1; @@ -54,14 +54,14 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe super.onCreate(savedInstanceState); - setContentView(R.layout.headlines); + setContentView(R.layout.activity_master); setSmallScreen(findViewById(R.id.sw600dp_anchor) == null); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); - GlobalState.getInstance().load(savedInstanceState); + Application.getInstance().load(savedInstanceState); m_drawerLayout = (DrawerLayout) findViewById(R.id.headlines_drawer); @@ -402,7 +402,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe out.putBoolean("feedIsSelected", m_feedIsSelected); out.putBoolean("userFeedSelected", m_userFeedSelected); - GlobalState.getInstance().save(out); + Application.getInstance().save(out); } @Override @@ -417,9 +417,9 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe } /* public void openFeedArticles(Feed feed) { - //GlobalState.getInstance().m_loadedArticles.clear(); + //Application.getInstance().m_loadedArticles.clear(); - Intent intent = new Intent(FeedsActivity.this, HeadlinesActivity.class); + Intent intent = new Intent(MasterActivity.this, DetailActivity.class); intent.putExtra("feed", feed); intent.putExtra("article", (Article)null); intent.putExtra("searchQuery", (String)null); @@ -432,12 +432,12 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe if (open) { HeadlinesFragment hf = (HeadlinesFragment)getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES); - Intent intent = new Intent(FeedsActivity.this, HeadlinesActivity.class); + Intent intent = new Intent(MasterActivity.this, DetailActivity.class); intent.putExtra("feed", hf.getFeed()); intent.putExtra("article", article); intent.putExtra("searchQuery", hf.getSearchQuery()); //intent.putExtra("articles", (Parcelable)hf.getAllArticles()); - GlobalState.getInstance().tmpArticleList = hf.getAllArticles(); + Application.getInstance().tmpArticleList = hf.getAllArticles(); /* if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { startActivityForResult(intent, HEADLINES_REQUEST, ActivityOptions.makeSceneTransitionAnimation(this).toBundle()); @@ -486,11 +486,11 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == HEADLINES_REQUEST && data != null) { - //GlobalState.getInstance().m_activeArticle = null; + //Application.getInstance().m_activeArticle = null; //ArrayList
tmp = data.getParcelableArrayListExtra("articles"); Article article = data.getParcelableExtra("activeArticle"); - ArticleList articles = GlobalState.getInstance().tmpArticleList; + ArticleList articles = Application.getInstance().tmpArticleList; if (articles != null) { HeadlinesFragment hf = (HeadlinesFragment)getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES); @@ -506,7 +506,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe } public void createFeedShortcut(Feed feed) { - final Intent shortcutIntent = new Intent(this, FeedsActivity.class); + final Intent shortcutIntent = new Intent(this, MasterActivity.class); shortcutIntent.putExtra("feed_id", feed.id); shortcutIntent.putExtra("feed_is_cat", feed.is_cat); shortcutIntent.putExtra("feed_title", feed.title); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index 5f2a13e3..2dba81a8 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -123,7 +123,7 @@ public class OnlineActivity extends CommonActivity { public boolean onCreateActionMode(ActionMode mode, Menu menu) { MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.headlines_action_menu, menu); + inflater.inflate(R.menu.action_mode_headlines, menu); return true; } @@ -136,11 +136,11 @@ public class OnlineActivity extends CommonActivity { } protected String getSessionId() { - return GlobalState.getInstance().m_sessionId; + return Application.getInstance().m_sessionId; } protected void setSessionId(String sessionId) { - GlobalState.getInstance().m_sessionId = sessionId; + Application.getInstance().m_sessionId = sessionId; } @Override @@ -163,7 +163,7 @@ public class OnlineActivity extends CommonActivity { Log.d(TAG, "m_isOffline=" + isOffline); - setContentView(R.layout.login); + setContentView(R.layout.activity_login); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); @@ -197,7 +197,7 @@ public class OnlineActivity extends CommonActivity { } protected boolean canUseProgress() { - return GlobalState.getInstance().m_canUseProgress; + return Application.getInstance().m_canUseProgress; } protected void switchOffline() { @@ -457,7 +457,7 @@ public class OnlineActivity extends CommonActivity { initMenu(); - Intent intent = new Intent(OnlineActivity.this, FeedsActivity.class); + Intent intent = new Intent(OnlineActivity.this, MasterActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); startActivityForResult(intent, 0); @@ -1252,7 +1252,7 @@ public class OnlineActivity extends CommonActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.main_menu, menu); + inflater.inflate(R.menu.activity_main, menu); m_menu = menu; @@ -1273,11 +1273,11 @@ public class OnlineActivity extends CommonActivity { } protected int getApiLevel() { - return GlobalState.getInstance().m_apiLevel; + return Application.getInstance().m_apiLevel; } protected void setApiLevel(int apiLevel) { - GlobalState.getInstance().m_apiLevel = apiLevel; + Application.getInstance().m_apiLevel = apiLevel; } @SuppressWarnings({ "unchecked", "serial" }) @@ -1623,7 +1623,7 @@ public class OnlineActivity extends CommonActivity { JsonElement apiLevel = content.get("api_level"); - GlobalState.getInstance().m_canUseProgress = m_canUseProgress; + Application.getInstance().m_canUseProgress = m_canUseProgress; Log.d(TAG, "Authenticated! canUseProgress=" + m_canUseProgress); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java index d7740be5..9e030748 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java @@ -16,7 +16,7 @@ public class PreferencesActivity extends CommonActivity { super.onCreate(savedInstanceState); - setContentView(R.layout.preferences); + setContentView(R.layout.activity_preferences); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java index 319477a1..fd14c831 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java @@ -60,7 +60,7 @@ public class OfflineActivity extends CommonActivity { public boolean onCreateActionMode(ActionMode mode, Menu menu) { MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.headlines_action_menu, menu); + inflater.inflate(R.menu.action_mode_headlines, menu); return true; } @@ -170,7 +170,7 @@ public class OfflineActivity extends CommonActivity { super.onCreate(savedInstanceState); - setContentView(R.layout.login); + setContentView(R.layout.activity_login); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); @@ -181,7 +181,7 @@ public class OfflineActivity extends CommonActivity { if (intent.getExtras() != null) { if (intent.getBooleanExtra("initial", false)) { - intent = new Intent(OfflineActivity.this, OfflineFeedsActivity.class); + intent = new Intent(OfflineActivity.this, OfflineMasterActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); startActivityForResult(intent, 0); @@ -552,7 +552,7 @@ public class OfflineActivity extends CommonActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.offline_menu, menu); + inflater.inflate(R.menu.activity_offline, menu); m_menu = menu; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java index 183df01a..7be392ab 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -87,7 +87,7 @@ public class OfflineArticleFragment extends Fragment { public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { - //getActivity().getMenuInflater().inflate(R.menu.article_link_context_menu, menu); + //getActivity().getMenuInflater().inflate(R.menu.context_article_link, menu); //menu.setHeaderTitle(m_cursor.getString(m_cursor.getColumnIndex("title"))); String title = m_cursor.getString(m_cursor.getColumnIndex("title")); @@ -97,7 +97,7 @@ public class OfflineArticleFragment extends Fragment { if (result != null && (result.getType() == HitTestResult.IMAGE_TYPE || result.getType() == HitTestResult.SRC_IMAGE_ANCHOR_TYPE)) { menu.setHeaderTitle(result.getExtra()); - getActivity().getMenuInflater().inflate(R.menu.article_content_img_context_menu, menu); + getActivity().getMenuInflater().inflate(R.menu.context_article_content_img, menu); /* FIXME I have no idea how to do this correctly ;( */ @@ -105,11 +105,11 @@ public class OfflineArticleFragment extends Fragment { } else { menu.setHeaderTitle(title); - getActivity().getMenuInflater().inflate(R.menu.article_link_context_menu, menu); + getActivity().getMenuInflater().inflate(R.menu.context_article_link, menu); } } else { menu.setHeaderTitle(title); - getActivity().getMenuInflater().inflate(R.menu.article_link_context_menu, menu); + getActivity().getMenuInflater().inflate(R.menu.context_article_link, menu); } super.onCreateContextMenu(menu, v, menuInfo); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java similarity index 95% rename from org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java rename to org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java index 5fb97a3d..568af77d 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java @@ -17,10 +17,10 @@ import android.util.Log; import android.view.MenuItem; import android.view.View; -import org.fox.ttrss.GlobalState; +import org.fox.ttrss.Application; import org.fox.ttrss.R; -public class OfflineHeadlinesActivity extends OfflineActivity implements OfflineHeadlinesEventListener { +public class OfflineDetailActivity extends OfflineActivity implements OfflineHeadlinesEventListener { private final String TAG = this.getClass().getSimpleName(); protected SharedPreferences m_prefs; @@ -38,7 +38,7 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline super.onCreate(savedInstanceState); - setContentView(R.layout.activity_headlines_articles); + setContentView(R.layout.activity_detail); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); @@ -168,7 +168,7 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline hf.setActiveArticleId(articleId); } - GlobalState.getInstance().m_selectedArticleId = articleId; + Application.getInstance().m_selectedArticleId = articleId; invalidateOptionsMenu(); refresh(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java index 771e89ac..e73ce6b4 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java @@ -34,7 +34,7 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen private FeedCategoryListAdapter m_adapter; private int m_selectedCatId; private Cursor m_cursor; - private OfflineFeedsActivity m_activity; + private OfflineMasterActivity m_activity; private SwipeRefreshLayout m_swipeLayout; private ListView m_list; @@ -42,7 +42,7 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { - getActivity().getMenuInflater().inflate(R.menu.category_menu, menu); + getActivity().getMenuInflater().inflate(R.menu.context_category, menu); menu.findItem(R.id.create_shortcut).setEnabled(false); @@ -168,7 +168,7 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen public void onAttach(Activity activity) { super.onAttach(activity); - m_activity = (OfflineFeedsActivity)activity; + m_activity = (OfflineMasterActivity)activity; m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); m_prefs.registerOnSharedPreferenceChangeListener(this); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java index 59ee674e..7ef733b3 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java @@ -35,7 +35,7 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem private int m_catId = -1; private boolean m_enableFeedIcons; private Cursor m_cursor; - private OfflineFeedsActivity m_activity; + private OfflineMasterActivity m_activity; private SwipeRefreshLayout m_swipeLayout; private boolean m_enableParentBtn = false; private ListView m_list; @@ -80,7 +80,7 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { - getActivity().getMenuInflater().inflate(R.menu.feed_menu, menu); + getActivity().getMenuInflater().inflate(R.menu.context_feed, menu); menu.findItem(R.id.create_shortcut).setEnabled(false); @@ -192,7 +192,7 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem public void onAttach(Activity activity) { super.onAttach(activity); - m_activity = (OfflineFeedsActivity)activity; + m_activity = (OfflineMasterActivity)activity; m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); m_prefs.registerOnSharedPreferenceChangeListener(this); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 1b89c8ac..8421d007 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -38,8 +38,8 @@ import android.widget.TextView; import com.amulyakhare.textdrawable.TextDrawable; import com.amulyakhare.textdrawable.util.ColorGenerator; +import org.fox.ttrss.Application; import org.fox.ttrss.CommonActivity; -import org.fox.ttrss.GlobalState; import org.fox.ttrss.R; import org.jsoup.Jsoup; @@ -214,7 +214,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { - getActivity().getMenuInflater().inflate(R.menu.headlines_context_menu, menu); + getActivity().getMenuInflater().inflate(R.menu.context_headlines, menu); if (getSelectedArticleCount() > 0) { menu.setHeaderTitle(R.string.headline_context_multiple); @@ -238,9 +238,9 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis public void onResume() { super.onResume(); - if (GlobalState.getInstance().m_selectedArticleId != 0) { - m_activeArticleId = GlobalState.getInstance().m_selectedArticleId; - GlobalState.getInstance().m_selectedArticleId = 0; + if (Application.getInstance().m_selectedArticleId != 0) { + m_activeArticleId = Application.getInstance().m_selectedArticleId; + Application.getInstance().m_selectedArticleId = 0; } if (m_activeArticleId != 0) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java old mode 100755 new mode 100644 similarity index 96% rename from org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java rename to org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java index 81bd8810..52de0c28 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java @@ -21,10 +21,10 @@ import android.view.Gravity; import android.view.MenuItem; import android.view.View; -import org.fox.ttrss.GlobalState; +import org.fox.ttrss.Application; import org.fox.ttrss.R; -public class OfflineFeedsActivity extends OfflineActivity implements OfflineHeadlinesEventListener { +public class OfflineMasterActivity extends OfflineActivity implements OfflineHeadlinesEventListener { private final String TAG = this.getClass().getSimpleName(); //private boolean m_actionbarUpEnabled = false; @@ -45,14 +45,14 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead super.onCreate(savedInstanceState); - setContentView(R.layout.headlines); + setContentView(R.layout.activity_master); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); setSmallScreen(findViewById(R.id.sw600dp_anchor) == null); - GlobalState.getInstance().load(savedInstanceState); + Application.getInstance().load(savedInstanceState); m_drawerLayout = (DrawerLayout) findViewById(R.id.headlines_drawer); @@ -117,7 +117,7 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead public void openFeedArticles(int feedId, boolean isCat) { if (isSmallScreen()) { - Intent intent = new Intent(OfflineFeedsActivity.this, OfflineHeadlinesActivity.class); + Intent intent = new Intent(OfflineMasterActivity.this, OfflineDetailActivity.class); intent.putExtra("feed", feedId); intent.putExtra("isCat", isCat); @@ -197,7 +197,7 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead out.putBoolean("feedIsSelected", m_feedIsSelected); - GlobalState.getInstance().save(out); + Application.getInstance().save(out); } public void initMenu() { @@ -335,7 +335,7 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead if (open) { OfflineHeadlinesFragment hf = (OfflineHeadlinesFragment) getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES); - Intent intent = new Intent(OfflineFeedsActivity.this, OfflineHeadlinesActivity.class); + Intent intent = new Intent(OfflineMasterActivity.this, OfflineDetailActivity.class); intent.putExtra("feed", hf.getFeedId()); intent.putExtra("isCat", hf.getFeedIsCat()); intent.putExtra("article", articleId); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java index 165d38f7..af06b28a 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java @@ -1,17 +1,11 @@ package org.fox.ttrss.share; -import java.util.HashMap; - import org.fox.ttrss.ApiRequest; import org.fox.ttrss.PreferencesActivity; import org.fox.ttrss.R; import org.fox.ttrss.util.SimpleLoginManager; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - import android.app.AlertDialog; -import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; @@ -127,7 +121,7 @@ public abstract class CommonShareActivity extends CommonActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.share_menu, menu); + inflater.inflate(R.menu.activity_share, menu); return true; } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerSettingsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerSettingsActivity.java index 0770fc00..9cddfc5a 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerSettingsActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerSettingsActivity.java @@ -1,8 +1,6 @@ package org.fox.ttrss.tasker; import org.fox.ttrss.R; -import org.fox.ttrss.offline.OfflineDownloadService; -import org.fox.ttrss.offline.OfflineUploadService; import android.app.Activity; import android.content.Intent; @@ -30,7 +28,7 @@ public class TaskerSettingsActivity extends Activity { int actionId = settings != null ? settings.getInt("actionId", -1) : -1; - setContentView(R.layout.tasker_settings); + setContentView(R.layout.settings_tasker); RadioGroup radioGroup = (RadioGroup) findViewById(R.id.taskerActions); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/FontSizeDialogPreference.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/FontSizeDialogPreference.java index 87a89c16..b280c6f6 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/FontSizeDialogPreference.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/FontSizeDialogPreference.java @@ -45,7 +45,7 @@ public class FontSizeDialogPreference extends DialogPreference { setProgressTextSuffix(" " + context.getString(R.string.font_size_dialog_suffix)); // set layout - setDialogLayoutResource(R.layout.dialog_select_font_size); + setDialogLayoutResource(R.layout.settings_select_font_size); setPositiveButtonText(android.R.string.ok); setNegativeButtonText(android.R.string.cancel); setDialogIcon(null); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java index 2d956284..453f5f50 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java @@ -25,7 +25,7 @@ public class HeadlinesRequest extends ApiRequest { private int m_offset = 0; private OnlineActivity m_activity; - private ArticleList m_articles; // = new ArticleList(); //GlobalState.getInstance().m_loadedArticles; + private ArticleList m_articles; // = new ArticleList(); //Application.getInstance().m_loadedArticles; private Feed m_feed; public HeadlinesRequest(Context context, OnlineActivity activity, final Feed feed, ArticleList articles) { @@ -41,7 +41,7 @@ public class HeadlinesRequest extends ApiRequest { try { // check if we are returning results for correct feed - /* if (GlobalState.getInstance().m_activeFeed != null && !m_feed.equals(GlobalState.getInstance().m_activeFeed)) { + /* if (Application.getInstance().m_activeFeed != null && !m_feed.equals(Application.getInstance().m_activeFeed)) { Log.d(TAG, "received results for wrong feed, bailing out."); return; } */ diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml similarity index 100% rename from org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_headlines_articles.xml rename to org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml similarity index 100% rename from org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml rename to org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_detail.xml similarity index 100% rename from org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_headlines_articles.xml rename to org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_detail.xml diff --git a/org.fox.ttrss/src/main/res/layout/activity_headlines_articles.xml b/org.fox.ttrss/src/main/res/layout/activity_detail.xml similarity index 100% rename from org.fox.ttrss/src/main/res/layout/activity_headlines_articles.xml rename to org.fox.ttrss/src/main/res/layout/activity_detail.xml diff --git a/org.fox.ttrss/src/main/res/layout/login.xml b/org.fox.ttrss/src/main/res/layout/activity_login.xml old mode 100755 new mode 100644 similarity index 100% rename from org.fox.ttrss/src/main/res/layout/login.xml rename to org.fox.ttrss/src/main/res/layout/activity_login.xml diff --git a/org.fox.ttrss/src/main/res/layout/headlines.xml b/org.fox.ttrss/src/main/res/layout/activity_master.xml similarity index 100% rename from org.fox.ttrss/src/main/res/layout/headlines.xml rename to org.fox.ttrss/src/main/res/layout/activity_master.xml diff --git a/org.fox.ttrss/src/main/res/layout/preferences.xml b/org.fox.ttrss/src/main/res/layout/activity_preferences.xml old mode 100755 new mode 100644 similarity index 100% rename from org.fox.ttrss/src/main/res/layout/preferences.xml rename to org.fox.ttrss/src/main/res/layout/activity_preferences.xml diff --git a/org.fox.ttrss/src/main/res/layout/dialog_select_font_size.xml b/org.fox.ttrss/src/main/res/layout/settings_select_font_size.xml similarity index 100% rename from org.fox.ttrss/src/main/res/layout/dialog_select_font_size.xml rename to org.fox.ttrss/src/main/res/layout/settings_select_font_size.xml diff --git a/org.fox.ttrss/src/main/res/layout/tasker_settings.xml b/org.fox.ttrss/src/main/res/layout/settings_tasker.xml similarity index 100% rename from org.fox.ttrss/src/main/res/layout/tasker_settings.xml rename to org.fox.ttrss/src/main/res/layout/settings_tasker.xml diff --git a/org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml b/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml old mode 100755 new mode 100644 similarity index 100% rename from org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml rename to org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml diff --git a/org.fox.ttrss/src/main/res/menu/main_menu.xml b/org.fox.ttrss/src/main/res/menu/activity_main.xml old mode 100755 new mode 100644 similarity index 100% rename from org.fox.ttrss/src/main/res/menu/main_menu.xml rename to org.fox.ttrss/src/main/res/menu/activity_main.xml diff --git a/org.fox.ttrss/src/main/res/menu/offline_menu.xml b/org.fox.ttrss/src/main/res/menu/activity_offline.xml old mode 100755 new mode 100644 similarity index 100% rename from org.fox.ttrss/src/main/res/menu/offline_menu.xml rename to org.fox.ttrss/src/main/res/menu/activity_offline.xml diff --git a/org.fox.ttrss/src/main/res/menu/share_menu.xml b/org.fox.ttrss/src/main/res/menu/activity_share.xml old mode 100755 new mode 100644 similarity index 100% rename from org.fox.ttrss/src/main/res/menu/share_menu.xml rename to org.fox.ttrss/src/main/res/menu/activity_share.xml diff --git a/org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml b/org.fox.ttrss/src/main/res/menu/context_article_content_img.xml old mode 100755 new mode 100644 similarity index 100% rename from org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml rename to org.fox.ttrss/src/main/res/menu/context_article_content_img.xml diff --git a/org.fox.ttrss/src/main/res/menu/article_link_context_menu.xml b/org.fox.ttrss/src/main/res/menu/context_article_link.xml similarity index 100% rename from org.fox.ttrss/src/main/res/menu/article_link_context_menu.xml rename to org.fox.ttrss/src/main/res/menu/context_article_link.xml diff --git a/org.fox.ttrss/src/main/res/menu/category_menu.xml b/org.fox.ttrss/src/main/res/menu/context_category.xml similarity index 100% rename from org.fox.ttrss/src/main/res/menu/category_menu.xml rename to org.fox.ttrss/src/main/res/menu/context_category.xml diff --git a/org.fox.ttrss/src/main/res/menu/feed_menu.xml b/org.fox.ttrss/src/main/res/menu/context_feed.xml similarity index 100% rename from org.fox.ttrss/src/main/res/menu/feed_menu.xml rename to org.fox.ttrss/src/main/res/menu/context_feed.xml diff --git a/org.fox.ttrss/src/main/res/menu/headlines_context_menu.xml b/org.fox.ttrss/src/main/res/menu/context_headlines.xml similarity index 100% rename from org.fox.ttrss/src/main/res/menu/headlines_context_menu.xml rename to org.fox.ttrss/src/main/res/menu/context_headlines.xml