diff options
| author | Andrew Dolgov <[email protected]> | 2011-11-24 08:59:11 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-11-24 08:59:11 +0300 |
| commit | d5f17058c4c2446b925c289bdd2f572263bac6cd (patch) | |
| tree | 83687183536f3698c22f3bbdda46c5bcab6d5334 /src/org | |
| parent | c18ed97aa4b10d844e008c9dd610f775b5aaff8e (diff) | |
add show unread/show all menu item
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 4 | ||||
| -rw-r--r-- | src/org/fox/ttrss/FeedsFragment.java | 9 | ||||
| -rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 36 |
3 files changed, 41 insertions, 8 deletions
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index ab92f9bf..720c2271 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -47,7 +47,9 @@ public class ArticleFragment extends Fragment { if (web != null) {
// this is ridiculous
- String content = "<html><body>" + URLEncoder.encode(m_article.content).replace('+', ' ') + "</body></html>";
+ String content = URLEncoder.encode("<html>" +
+ "<head><style type=\"text/css\">img { max-width : 90%; }</style></head>" +
+ "<body>" + m_article.content + "</body></html>").replace('+', ' ');
web.loadData(content, "text/html", "utf-8");
}
diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java index 9898e10d..ad2bd2ef 100644 --- a/src/org/fox/ttrss/FeedsFragment.java +++ b/src/org/fox/ttrss/FeedsFragment.java @@ -32,8 +32,6 @@ import com.google.gson.reflect.TypeToken; public class FeedsFragment extends Fragment implements OnItemClickListener {
private final String TAG = this.getClass().getSimpleName();
private SharedPreferences m_prefs;
- //private String m_sessionId;
- //private int m_activeFeedId;
private FeedListAdapter m_adapter;
private List<Feed> m_feeds = new ArrayList<Feed>();
private OnFeedSelectedListener m_feedSelectedListener;
@@ -41,7 +39,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener { public interface OnFeedSelectedListener {
public void onFeedSelected(Feed feed);
}
-
+
public void showLoading(boolean show) {
View v = getView();
@@ -115,6 +113,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener { fr.setApi(m_prefs.getString("ttrss_url", null));
final String sessionId = ((MainActivity)getActivity()).getSessionId();
+ final boolean unreadOnly = ((MainActivity)getActivity()).getUnreadOnly();
if (sessionId != null) {
@@ -123,7 +122,9 @@ public class FeedsFragment extends Fragment implements OnItemClickListener { put("op", "getFeeds");
put("sid", sessionId);
put("cat_id", "-3");
- put("unread_only", "true");
+ if (unreadOnly) {
+ put("unread_only", String.valueOf(unreadOnly));
+ }
}
};
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index f46ea80a..09d94620 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -32,8 +32,8 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect private Feed m_activeFeed; private Timer m_refreshTimer; private RefreshTask m_refreshTask; - - protected MenuItem m_syncStatus; + private Menu m_menu; + private boolean m_unreadOnly = true; private class RefreshTask extends TimerTask { @@ -53,6 +53,17 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect } } + + public void setUnreadOnly(boolean unread) { + m_unreadOnly = unread; + refreshFeeds(); + } + + public boolean getUnreadOnly() { + return m_unreadOnly; + } + + public String getSessionId() { return m_sessionId; } @@ -97,7 +108,7 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect ft.commit(); findViewById(R.id.article_fragment).setVisibility(View.GONE); - findViewById(R.id.headlines_fragment).setVisibility(View.GONE); + //findViewById(R.id.headlines_fragment).setVisibility(View.GONE); LoginRequest ar = new LoginRequest(); ar.setApi(m_prefs.getString("ttrss_url", null)); @@ -167,10 +178,20 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.main_menu, menu); + + m_menu = menu; return true; } + public void setMenuLabel(int id, int labelId) { + MenuItem mi = m_menu.findItem(id); + + if (mi != null) { + mi.setTitle(labelId); + } + } + @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { @@ -178,6 +199,15 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect Intent intent = new Intent(this, PreferencesActivity.class); startActivityForResult(intent, 0); return true; + case R.id.show_feeds: + if (getUnreadOnly()) { + item.setTitle(R.string.menu_all_feeds); + } else { + item.setTitle(R.string.menu_unread_feeds); + } + + setUnreadOnly(!getUnreadOnly()); + return true; default: return super.onOptionsItemSelected(item); } |