properly detect portrait orientation

move to ICS style of naming resources for various dpi
bump version

7 files changed, 19 insertions, 13 deletions

diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java
index f6aa339a..57de0cf3 100644
--- a/src/org/fox/ttrss/CommonActivity.java
+++ b/src/org/fox/ttrss/CommonActivity.java
@@ -7,6 +7,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;

 import android.support.v4.app.FragmentActivity;

 import android.util.Log;

+import android.view.Display;

 import android.widget.Toast;

 

 public class CommonActivity extends FragmentActivity {

@@ -70,8 +71,13 @@ public class CommonActivity extends FragmentActivity {
 		return m_compatMode;

 	}

 

-	public int getOrientation() {

-		return getWindowManager().getDefaultDisplay().getOrientation();

+	public boolean isPortrait() {

+		Display display = getWindowManager().getDefaultDisplay(); 

+		

+	    int width = display.getWidth();

+	    int height = display.getHeight();

+		

+	    return width < height;

 	}

 

 	public void copyToClipboard(String str) {

diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index 6e24aa64..8e861667 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -146,7 +146,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 		//list.setEmptyView(view.findViewById(R.id.no_headlines));

 		registerForContextMenu(list);

 

-		if (m_onlineServices.isSmallScreen() || m_onlineServices.getOrientation() % 2 != 0)

+		if (m_onlineServices.isSmallScreen() || m_onlineServices.isPortrait())

 			view.findViewById(R.id.headlines_fragment).setPadding(0, 0, 0, 0);

 

 		Log.d(TAG, "onCreateView, feed=" + m_feed);

diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 5cb281ef..6f4f4348 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -660,7 +660,7 @@ public class MainActivity extends CommonActivity implements OnlineServices {
 		if (!isCompatMode()) {
 			
 			if (!isSmallScreen()) {				
-				findViewById(R.id.feeds_fragment).setVisibility(m_selectedArticle != null && getOrientation() % 2 != 0 ? View.GONE : View.VISIBLE);
+				findViewById(R.id.feeds_fragment).setVisibility(m_selectedArticle != null && isPortrait() ? View.GONE : View.VISIBLE);
 				findViewById(R.id.article_fragment).setVisibility(m_selectedArticle != null ? View.VISIBLE : View.GONE);
 			}
 			
@@ -1414,7 +1414,7 @@ public class MainActivity extends CommonActivity implements OnlineServices {
 			
 			m_navigationAdapter.clear();
 
-			if (m_activeCategory != null || (m_activeFeed != null && (isSmallScreen() || getOrientation() % 2 != 0))) {
+			if (m_activeCategory != null || (m_activeFeed != null && (isSmallScreen() || isPortrait()))) {
 				getActionBar().setDisplayShowTitleEnabled(false);
 				getActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
 				
@@ -1862,11 +1862,11 @@ public class MainActivity extends CommonActivity implements OnlineServices {
 			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);
 			
-			if (getOrientation() % 2 == 0) refresh();
+			if (!isPortrait()) refresh();
 		}
 		ft.commit();
 	}
diff --git a/src/org/fox/ttrss/OnlineServices.java b/src/org/fox/ttrss/OnlineServices.java
index 330751a2..32399831 100644
--- a/src/org/fox/ttrss/OnlineServices.java
+++ b/src/org/fox/ttrss/OnlineServices.java
@@ -25,7 +25,7 @@ public interface OnlineServices {
 	public boolean isSmallScreen();

 	public boolean getUnreadOnly();

 	public int getApiLevel();

-	public int getOrientation();

+	public boolean isPortrait();

 	

 	public void copyToClipboard(String str);

 }

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();

 }