diff options
-rw-r--r-- | project.properties | 1 | ||||
-rw-r--r-- | res/values/attrs.xml | 1 | ||||
-rw-r--r-- | res/values/style.xml | 20 | ||||
-rw-r--r-- | src/org/fox/ttrss/CommonActivity.java | 18 | ||||
-rw-r--r-- | src/org/fox/ttrss/FeedsActivity.java | 9 | ||||
-rw-r--r-- | src/org/fox/ttrss/HeadlinesActivity.java | 1 | ||||
-rw-r--r-- | src/org/fox/ttrss/OnlineActivity.java | 2 | ||||
-rw-r--r-- | src/org/fox/ttrss/offline/OfflineFeedsActivity.java | 4 | ||||
-rw-r--r-- | src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java | 1 |
9 files changed, 55 insertions, 2 deletions
diff --git a/project.properties b/project.properties index b27e5796..c886026b 100644 --- a/project.properties +++ b/project.properties @@ -13,3 +13,4 @@ android.library.reference.1=..\\Android-ViewPagerIndicator\\library android.library.reference.2=..\\tasker-locale-api android.library.reference.3=..\\appcompat android.library.reference.4=..\\SlidingMenu\\library +android.library.reference.5=../SystemBarTint/SystemBarTint-library diff --git a/res/values/attrs.xml b/res/values/attrs.xml index de72602a..1e5d0599 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -27,4 +27,5 @@ <attr name="unreadSelectedCounterBackground" format="reference|color" />
<attr name="articleNoteBackground" format="reference|color" />
<attr name="articleNoteTextColor" format="reference|color" />
+ <attr name="statusBarHintColor" format="reference|color" />
</resources>
\ No newline at end of file diff --git a/res/values/style.xml b/res/values/style.xml index a0383c1a..4028d3a1 100644 --- a/res/values/style.xml +++ b/res/values/style.xml @@ -1,5 +1,10 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="LightTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <item name="android:windowTranslucentStatus">true</item> + <item name="android:windowTranslucentNavigation">false</item> + <item name="android:fitsSystemWindows">true</item> + <item name="statusBarHintColor">#6482AF</item> + <item name="smallScreenBackground">#eeeeee</item> <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item> <item name="feedlistBackground"><!-- #e0e0e0 -->@drawable/shadow_feeds</item> @@ -31,6 +36,11 @@ </style> <style name="SepiaTheme" parent="LightTheme"> + <item name="android:windowTranslucentStatus">true</item> + <item name="android:windowTranslucentNavigation">false</item> + <item name="android:fitsSystemWindows">true</item> + <item name="statusBarHintColor">#7F3F3F</item> + <item name="smallScreenBackground">@drawable/paper_sepia</item> <item name="feedlistBackground">@drawable/shadow_feeds_sepia</item> <item name="headlinesBackground">@drawable/shadow_headlines_sepia</item> @@ -48,6 +58,11 @@ </style> <style name="HoloTheme" parent="Theme.AppCompat"> + <item name="android:windowTranslucentStatus">true</item> + <item name="android:windowTranslucentNavigation">false</item> + <item name="android:fitsSystemWindows">true</item> + <item name="statusBarHintColor">@android:color/black</item> + <item name="smallScreenBackground">@android:color/transparent</item> <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item> <item name="feedlistBackground">@android:color/transparent</item> @@ -78,6 +93,11 @@ </style> <style name="DarkTheme" parent="HoloTheme"> + <item name="android:windowTranslucentStatus">true</item> + <item name="android:windowTranslucentNavigation">false</item> + <item name="android:fitsSystemWindows">true</item> + <item name="statusBarHintColor">#394A63</item> + <item name="smallScreenBackground">@color/feeds_dark_gray</item> <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item> <item name="feedlistBackground">@drawable/shadow_feeds_gray</item> diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java index cff87129..f853d9b9 100644 --- a/src/org/fox/ttrss/CommonActivity.java +++ b/src/org/fox/ttrss/CommonActivity.java @@ -2,6 +2,8 @@ package org.fox.ttrss; import org.fox.ttrss.util.DatabaseHelper; +import com.readystatesoftware.systembartint.SystemBarTintManager; + import android.annotation.SuppressLint; import android.content.SharedPreferences; import android.database.sqlite.SQLiteDatabase; @@ -11,6 +13,7 @@ import android.preference.PreferenceManager; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.app.ActionBarActivity; import android.util.Log; +import android.util.TypedValue; import android.view.Display; import android.view.View; import android.widget.TextView; @@ -132,6 +135,21 @@ public class CommonActivity extends ActionBarActivity { super.onCreate(savedInstanceState); } + + public void setStatusBarTint() { + if (android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.KITKAT) { + SystemBarTintManager tintManager = new SystemBarTintManager(this); + // enable status bar tint + tintManager.setStatusBarTintEnabled(true); + // enable navigation bar tint + tintManager.setNavigationBarTintEnabled(true); + + TypedValue tv = new TypedValue(); + getTheme().resolveAttribute(R.attr.statusBarHintColor, tv, true); + + tintManager.setStatusBarTintColor(tv.data); + } + } @Override public void onSaveInstanceState(Bundle out) { diff --git a/src/org/fox/ttrss/FeedsActivity.java b/src/org/fox/ttrss/FeedsActivity.java index 0262c6be..90e2c118 100644 --- a/src/org/fox/ttrss/FeedsActivity.java +++ b/src/org/fox/ttrss/FeedsActivity.java @@ -20,11 +20,15 @@ import android.preference.PreferenceManager; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.util.Log; +import android.util.TypedValue; import android.view.MenuItem; +import android.view.Window; +import android.view.WindowManager; import android.widget.LinearLayout; import com.google.gson.JsonElement; import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; +import com.readystatesoftware.systembartint.SystemBarTintManager; public class FeedsActivity extends OnlineActivity implements HeadlinesEventListener { private final String TAG = this.getClass().getSimpleName(); @@ -50,7 +54,10 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe super.onCreate(savedInstanceState); - setContentView(R.layout.headlines); + setContentView(R.layout.headlines); + + setStatusBarTint(); + setSmallScreen(findViewById(R.id.sw600dp_anchor) == null && findViewById(R.id.sw600dp_port_anchor) == null); diff --git a/src/org/fox/ttrss/HeadlinesActivity.java b/src/org/fox/ttrss/HeadlinesActivity.java index 4eead0ec..c4e0f0cc 100644 --- a/src/org/fox/ttrss/HeadlinesActivity.java +++ b/src/org/fox/ttrss/HeadlinesActivity.java @@ -34,6 +34,7 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL getSupportActionBar().setDisplayHomeAsUpEnabled(true); + setStatusBarTint(); setSmallScreen(findViewById(R.id.sw600dp_anchor) == null); GlobalState.getInstance().load(savedInstanceState); diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java index 02d00d1f..ab7a6ab1 100644 --- a/src/org/fox/ttrss/OnlineActivity.java +++ b/src/org/fox/ttrss/OnlineActivity.java @@ -170,6 +170,8 @@ public class OnlineActivity extends CommonActivity { Log.d(TAG, "m_isOffline=" + isOffline); setContentView(R.layout.login); + + setStatusBarTint(); //m_pullToRefreshAttacher = PullToRefreshAttacher.get(this); diff --git a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java index c8a9cfc1..f7263fe0 100644 --- a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java +++ b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java @@ -39,7 +39,9 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead super.onCreate(savedInstanceState); - setContentView(R.layout.headlines); + setContentView(R.layout.headlines); + + setStatusBarTint(); setSmallScreen(findViewById(R.id.sw600dp_anchor) == null && findViewById(R.id.sw600dp_port_anchor) == null); diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java b/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java index 128a5919..de57c985 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java @@ -36,6 +36,7 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline getSupportActionBar().setDisplayHomeAsUpEnabled(true); + setStatusBarTint(); setSmallScreen(findViewById(R.id.sw600dp_anchor) == null); if (isPortrait() || m_prefs.getBoolean("headlines_hide_sidebar", false)) { |