summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main/java/org/fox/ttrss/offline
diff options
context:
space:
mode:
Diffstat (limited to 'org.fox.ttrss/src/main/java/org/fox/ttrss/offline')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java8
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java8
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java (renamed from org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java)8
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java6
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java6
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java10
-rw-r--r--[-rwxr-xr-x]org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java (renamed from org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java)14
7 files changed, 30 insertions, 30 deletions
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
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
index 81bd8810..52de0c28 100755..100644
--- 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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-12 22:01:14 +0000