diff options
| author | Andrew Dolgov <[email protected]> | 2011-11-25 14:53:32 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-11-25 14:53:32 +0300 |
| commit | 86b967f08f74ac9eb7b49597c62d46e818a9a530 (patch) | |
| tree | b929c837cfc1140f61b16c874c3f131863460a78 /src | |
| parent | 6488994dfa335c384a24642d854bd9474c54446a (diff) | |
disable irrelevant menu items when article is open
fix link color in dark theme webview
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 7 | ||||
| -rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 27 |
2 files changed, 23 insertions, 11 deletions
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index a0f9710e..c9a99733 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -50,18 +50,19 @@ public class ArticleFragment extends Fragment { // TODO white on black style for dark theme
String content;
try {
- String backgroundOverride = "";
+ String cssOverride = "";
if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) {
- backgroundOverride = "body { background : black; color : #f0f0f0}\n";
+ cssOverride = "body { background : black; color : #f0f0f0}\na { color : #303060; }\n";
}
content = URLEncoder.encode("<html>" +
"<head>" +
"<meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\">" + // wtf, google?
"<style type=\"text/css\">" +
- backgroundOverride +
+ cssOverride +
"img { max-width : 90%; }" +
+ "body { text-align : justify; }" +
"</style>" +
"</head>" +
"<body>" + m_article.content + "</body></html>", "utf-8").replace('+', ' ');
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index a91958c8..bfc07683 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -265,15 +265,18 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect m_menu.findItem(R.id.logout).setVisible(true); - m_menu.findItem(R.id.update_feeds).setEnabled(true); - m_menu.findItem(R.id.show_feeds).setEnabled(true); - if (m_selectedArticle != null) { m_menu.findItem(R.id.close_article).setVisible(true); m_menu.findItem(R.id.share_article).setVisible(true); + + m_menu.findItem(R.id.update_feeds).setEnabled(false); + m_menu.findItem(R.id.show_feeds).setEnabled(false); } else { m_menu.findItem(R.id.close_article).setVisible(false); m_menu.findItem(R.id.share_article).setVisible(false); + + m_menu.findItem(R.id.update_feeds).setEnabled(true); + m_menu.findItem(R.id.show_feeds).setEnabled(true); } } else { @@ -410,11 +413,6 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect } public void logout() { - findViewById(R.id.loading_container).setVisibility(View.VISIBLE); - findViewById(R.id.main).setVisibility(View.INVISIBLE); - - initMainMenu(); - if (m_refreshTask != null) { m_refreshTask.cancel(); m_refreshTask = null; @@ -426,6 +424,19 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect } m_sessionId = null; + + findViewById(R.id.loading_container).setVisibility(View.VISIBLE); + findViewById(R.id.main).setVisibility(View.INVISIBLE); + + TextView tv = (TextView)findViewById(R.id.loading_message); + + if (tv != null) { + tv.setText(R.string.login_ready); + } + + findViewById(R.id.loading_progress).setVisibility(View.GONE); + + initMainMenu(); } public void login() { |