From b826481001889868a57fb37b80fcfd7b109ab1a8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 1 Sep 2012 22:22:13 +0400 Subject: properly detect portrait orientation move to ICS style of naming resources for various dpi bump version --- src/org/fox/ttrss/offline/OfflineActivity.java | 6 +++--- src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 2 +- src/org/fox/ttrss/offline/OfflineServices.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/org/fox/ttrss/offline') diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/src/org/fox/ttrss/offline/OfflineActivity.java index 24899907..c26c4904 100644 --- a/src/org/fox/ttrss/offline/OfflineActivity.java +++ b/src/org/fox/ttrss/offline/OfflineActivity.java @@ -292,7 +292,7 @@ public class OfflineActivity extends CommonActivity implements if (!isCompatMode()) { if (!isSmallScreen()) { - findViewById(R.id.feeds_fragment).setVisibility(m_selectedArticleId != 0 && getOrientation() % 2 != 0 ? View.GONE : View.VISIBLE); + findViewById(R.id.feeds_fragment).setVisibility(m_selectedArticleId != 0 && isPortrait() ? View.GONE : View.VISIBLE); findViewById(R.id.article_fragment).setVisibility(m_selectedArticleId != 0 ? View.VISIBLE : View.GONE); } @@ -1397,7 +1397,7 @@ public class OfflineActivity extends CommonActivity implements ft.hide(getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES)); ft.add(R.id.fragment_container, frag, FRAG_ARTICLE); } else { - findViewById(R.id.feeds_fragment).setVisibility(getOrientation() % 2 != 0 ? View.GONE : View.VISIBLE); + findViewById(R.id.feeds_fragment).setVisibility(isPortrait() ? View.GONE : View.VISIBLE); findViewById(R.id.article_fragment).setVisibility(View.VISIBLE); ft.replace(R.id.article_fragment, frag, FRAG_ARTICLE); @@ -1445,7 +1445,7 @@ public class OfflineActivity extends CommonActivity implements m_navigationAdapter.clear(); - if (m_activeCatId != -1 || (m_activeFeedId != 0 && (isSmallScreen() || getOrientation() % 2 != 0))) { + if (m_activeCatId != -1 || (m_activeFeedId != 0 && (isSmallScreen() || isPortrait()))) { getActionBar().setDisplayShowTitleEnabled(false); getActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 40d42eb1..e5428f59 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -150,7 +150,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis list.setEmptyView(view.findViewById(R.id.no_headlines)); registerForContextMenu(list); - if (m_offlineServices.isSmallScreen() || m_offlineServices.getOrientation() % 2 != 0) + if (m_offlineServices.isSmallScreen() || m_offlineServices.isPortrait()) view.findViewById(R.id.headlines_fragment).setPadding(0, 0, 0, 0); getActivity().setProgressBarIndeterminateVisibility(false); diff --git a/src/org/fox/ttrss/offline/OfflineServices.java b/src/org/fox/ttrss/offline/OfflineServices.java index 76a8a308..8483c97f 100644 --- a/src/org/fox/ttrss/offline/OfflineServices.java +++ b/src/org/fox/ttrss/offline/OfflineServices.java @@ -18,5 +18,5 @@ public interface OfflineServices { public boolean isSmallScreen(); public void setSelectedArticleId(int articleId); public boolean activeFeedIsCat(); - public int getOrientation(); + public boolean isPortrait(); } -- cgit v1.2.3-54-g00ecf