diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 5 | ||||
| -rw-r--r-- | src/org/fox/ttrss/HeadlinesFragment.java | 4 | ||||
| -rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 8 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineArticleFragment.java | 5 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 4 |
5 files changed, 17 insertions, 9 deletions
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index 7b1128aa..8ad8eab0 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -88,7 +88,7 @@ public class ArticleFragment extends Fragment { Activity activity = (Activity)getActivity();
- if (activity != null) {
+ /* if (activity != null) {
int orientation = activity.getWindowManager().getDefaultDisplay().getOrientation();
if (!m_onlineServices.isSmallScreen()) {
@@ -103,7 +103,7 @@ public class ArticleFragment extends Fragment { }
} else {
view.findViewById(R.id.splitter_horizontal).setVisibility(View.GONE);
- }
+ } */
if (m_article != null) {
@@ -187,6 +187,7 @@ public class ArticleFragment extends Fragment { "<meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\">" +
//"<meta name=\"viewport\" content=\"target-densitydpi=device-dpi\" />" +
"<style type=\"text/css\">" +
+ "body { padding : 0px; margin : 0px; }" +
cssOverride +
"div.attachments { font-size : 70%; margin-top : 1em; }" +
"img { max-width : 98%; height : auto; }" +
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 66696d63..9cdab1da 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -464,11 +464,11 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, }
}
- ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);
+ /* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);
if (separator != null && m_onlineServices.isSmallScreen()) {
separator.setVisibility(View.GONE);
- }
+ } */
TextView content = (TextView)v.findViewById(R.id.content);
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index 064836c9..67a4a328 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -420,6 +420,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices { private void setUnreadOnly(boolean unread) { m_unreadOnly = unread; + m_lastRefresh = 0; refresh(); } @@ -975,6 +976,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices { startActivityForResult(intent, 0); return true; case R.id.update_feeds: + m_lastRefresh = 0; refresh(); return true; case R.id.logout: @@ -1390,7 +1392,11 @@ public class MainActivity extends FragmentActivity implements OnlineServices { getActionBar().setTitle(R.string.app_name); } - getActionBar().setDisplayHomeAsUpEnabled(m_selectedArticle != null || m_activeCategory != null); + if (m_smallScreenMode) { + getActionBar().setDisplayHomeAsUpEnabled(m_selectedArticle != null || m_activeCategory != null); + } else { + getActionBar().setDisplayHomeAsUpEnabled(m_selectedArticle != null || m_activeCategory != null || m_activeFeed != null); + } if (android.os.Build.VERSION.SDK_INT >= 14) { ShareActionProvider shareProvider = (ShareActionProvider) m_menu.findItem(R.id.share_article).getActionProvider(); diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java index 9df30279..790963fb 100644 --- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -75,7 +75,7 @@ public class OfflineArticleFragment extends Fragment { // TODO change to interface?
Activity activity = getActivity();
- if (activity != null) {
+ /* if (activity != null) {
int orientation = activity.getWindowManager().getDefaultDisplay().getOrientation();
if (!m_offlineServices.isSmallScreen()) {
@@ -90,7 +90,7 @@ public class OfflineArticleFragment extends Fragment { }
} else {
view.findViewById(R.id.splitter_horizontal).setVisibility(View.GONE);
- }
+ } */
m_cursor = m_offlineServices.getReadableDb().query("articles", null, BaseColumns._ID + "=?",
new String[] { String.valueOf(m_articleId) }, null, null, null);
@@ -193,6 +193,7 @@ public class OfflineArticleFragment extends Fragment { "<meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\">" +
//"<meta name=\"viewport\" content=\"target-densitydpi=device-dpi\" />" +
"<style type=\"text/css\">" +
+ "body { padding : 0px; margin : 0px; }" +
cssOverride +
"img { max-width : 98%; height : auto; }" +
"</style>" +
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 3688c3e4..46dd1e8a 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -364,11 +364,11 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis }
}
- ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);
+ /* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);
if (separator != null && m_offlineServices.isSmallScreen()) {
separator.setVisibility(View.GONE);
- }
+ } */
TextView content = (TextView)v.findViewById(R.id.content);
|