aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-06-10 18:28:06 -0700
committerScott Jackson <daneren2005@gmail.com>2015-06-10 18:28:06 -0700
commit57e327cc1136896be328c790c2e10b4680aedefe (patch)
treef6fb16be16c9d9031385d802f8b3bb2e0cbc9abd /app/src/main
parent9d4876f4874d034177c4f012932ca936d85e40ac (diff)
downloaddsub-57e327cc1136896be328c790c2e10b4680aedefe.tar.gz
dsub-57e327cc1136896be328c790c2e10b4680aedefe.tar.bz2
dsub-57e327cc1136896be328c790c2e10b4680aedefe.zip
Put drawer behind system bar, color ActionBar
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/res/layout/abstract_activity.xml4
-rw-r--r--app/src/main/res/layout/abstract_fragment_activity.xml13
-rw-r--r--app/src/main/res/values-v21/themes.xml10
-rw-r--r--app/src/main/res/values/themes.xml26
4 files changed, 27 insertions, 26 deletions
diff --git a/app/src/main/res/layout/abstract_activity.xml b/app/src/main/res/layout/abstract_activity.xml
index f012f484..56db1439 100644
--- a/app/src/main/res/layout/abstract_activity.xml
+++ b/app/src/main/res/layout/abstract_activity.xml
@@ -4,7 +4,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true">
+
<!-- The main content view -->
<FrameLayout
android:id="@+id/content_frame"
diff --git a/app/src/main/res/layout/abstract_fragment_activity.xml b/app/src/main/res/layout/abstract_fragment_activity.xml
index 29fbc3b1..74a94111 100644
--- a/app/src/main/res/layout/abstract_fragment_activity.xml
+++ b/app/src/main/res/layout/abstract_fragment_activity.xml
@@ -15,9 +15,10 @@
<android.support.v7.widget.Toolbar
android:id="@+id/main_toolbar"
- style="?attr/actionBarStyle"
android:layout_height="?attr/actionBarSize"
- android:layout_width="match_parent"/>
+ android:layout_width="match_parent"
+ android:background="?attr/colorPrimary"
+ android:elevation="4dp"/>
<include layout="@layout/abstract_fragment_container"/>
</FrameLayout>
@@ -30,13 +31,14 @@
<FrameLayout
android:id="@+id/slide_up_swipe_target"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:background="?attr/colorPrimary">
<android.support.v7.widget.Toolbar
android:id="@+id/now_playing_toolbar"
- style="?attr/actionBarStyle"
android:layout_height="?attr/actionBarSize"
android:layout_width="match_parent"
+ android:elevation="4dp"
android:visibility="gone"/>
<LinearLayout
@@ -44,7 +46,8 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="@style/BasicButton"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:elevation="4dp">
<github.daneren2005.dsub.view.RecyclingImageView
android:id="@+id/album_art"
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
new file mode 100644
index 00000000..acd117b5
--- /dev/null
+++ b/app/src/main/res/values-v21/themes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <style name="Theme.DSub.Light" parent="Theme.DSub.Light.Base">
+ <item name="android:windowTranslucentStatus">true</item>
+ </style>
+
+ <style name="Theme.DSub.Dark" parent="Theme.DSub.Dark.Base">
+ <item name="android:windowTranslucentStatus">true</item>
+ </style>
+</resources> \ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 27082530..ecba7592 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="Theme.DSub.Light" parent="@style/Theme.AppCompat.Light">
- <item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item>
- <item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item>
+ <style name="Theme.DSub.Light.Base" parent="@style/Theme.AppCompat.Light">
<item name="offline_icon">@drawable/main_offline_light</item>
<item name="media_button_backward">@drawable/media_backward_light</item>
<item name="media_button_forward">@drawable/media_forward_light</item>
@@ -46,9 +44,7 @@
<item name="colorPrimaryDark">@color/cyan</item>
<item name="colorAccent">@color/cyan</item>
</style>
- <style name="Theme.DSub.Dark" parent="@style/Theme.AppCompat">
- <item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
- <item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
+ <style name="Theme.DSub.Dark.Base" parent="@style/Theme.AppCompat">
<item name="offline_icon">@drawable/main_offline_dark</item>
<item name="media_button_backward">@drawable/media_backward_dark</item>
<item name="media_button_forward">@drawable/media_forward_dark</item>
@@ -92,6 +88,10 @@
<item name="colorPrimaryDark">@color/cyan</item>
<item name="colorAccent">@color/cyan</item>
</style>
+ <style name="Theme.DSub.Light" parent="Theme.DSub.Light.Base">
+ </style>
+ <style name="Theme.DSub.Dark" parent="Theme.DSub.Dark.Base">
+ </style>
<style name="Theme.DSub.Black" parent="Theme.DSub.Dark">
<item name="android:windowBackground">@android:color/black</item>
</style>
@@ -115,20 +115,6 @@
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
-
- <style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.AppCompat.Light.ActionBar.Solid">
- <item name="background">@android:color/transparent</item>
- <item name="android:background">@android:color/transparent</item>
- <item name="backgroundStacked">@android:color/transparent</item>
- <item name="android:backgroundStacked">@android:color/transparent</item>
- </style>
-
- <style name="Widget.DSub.ActionBarStyle.Dark" parent="Widget.AppCompat.ActionBar.Solid">
- <item name="background">@android:color/transparent</item>
- <item name="android:background">@android:color/transparent</item>
- <item name="backgroundStacked">@android:color/transparent</item>
- <item name="android:backgroundStacked">@android:color/transparent</item>
- </style>
<style name="DSub.TextViewStyle" parent="android:Widget.TextView">
</style>