From 89123afc8746625380f30dfdb3b1d6c0c940e7fb Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 27 Nov 2011 11:56:31 +0300 Subject: [PATCH] better compatMode animation checking --- src/org/fox/ttrss/MainActivity.java | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index 9f5b88f8..b1c2b362 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -40,6 +40,7 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe private boolean m_unreadOnly = true; private boolean m_unreadArticlesOnly = true; private boolean m_canLoadMore = true; + private boolean m_compatMode = false; private class RefreshTask extends TimerTask { @@ -91,10 +92,12 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe public void onCreate(Bundle savedInstanceState) { m_prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + m_compatMode = android.os.Build.VERSION.SDK_INT <= 10; + if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) { - setTheme(android.os.Build.VERSION.SDK_INT > 10 ? R.style.DarkTheme : R.style.DarkCompatTheme); + setTheme(m_compatMode ? R.style.DarkCompatTheme : R.style.DarkTheme); } else { - setTheme(android.os.Build.VERSION.SDK_INT > 10 ? R.style.LightTheme : R.style.LightCompatTheme); + setTheme(m_compatMode ? R.style.LightCompatTheme : R.style.LightTheme); } super.onCreate(savedInstanceState); @@ -127,8 +130,9 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe Log.d(TAG, "m_smallScreenMode=" + m_smallScreenMode); Log.d(TAG, "orientation=" + display.getOrientation()); + Log.d(TAG, "m_compatMode=" + m_compatMode); - if (android.os.Build.VERSION.SDK_INT > 10) { + if (!m_compatMode) { LayoutTransition transitioner = new LayoutTransition(); LinearLayout layout = (LinearLayout)findViewById(R.id.main); layout.setLayoutTransition(transitioner); @@ -262,10 +266,11 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe if (m_smallScreenMode) { if (m_selectedArticle != null) { - findViewById(R.id.main).setAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_right)); closeArticle(); } else if (m_activeFeed != null) { - findViewById(R.id.main).setAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_right)); + if (m_compatMode) { + findViewById(R.id.main).setAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_right)); + } findViewById(R.id.headlines_fragment).setVisibility(View.GONE); findViewById(R.id.feeds_fragment).setVisibility(View.VISIBLE); @@ -351,7 +356,10 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe } public void closeArticle() { - + if (m_compatMode) { + findViewById(R.id.main).setAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_right)); + } + if (m_smallScreenMode) { findViewById(R.id.article_fragment).setVisibility(View.GONE); findViewById(R.id.headlines_fragment).setVisibility(View.VISIBLE); @@ -540,10 +548,12 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); ft.replace(R.id.article_fragment, frag); ft.commit(); - - if (m_smallScreenMode) { + + if (m_compatMode) { findViewById(R.id.main).setAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_left)); - + } + + if (m_smallScreenMode) { findViewById(R.id.headlines_fragment).setVisibility(View.GONE); findViewById(R.id.article_fragment).setVisibility(View.VISIBLE); } else {