tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct colored status bar implementation for Lollipop, updated status bar colors in some activities to be darker than toolbar color (e.g. tag editor), added elevation to some views, etc. Getting KitKat support again for this colored UI will also come back soon with SystemBarTInt.

Browse source
This commit is contained in:
Aidan Follestad 2015-04-18 00:47:57 -05:00
commit 3028b96634
22 changed files with 323 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/res/values/attrs.xml
View file

@ -24,4 +24,8 @@
<attr name="toolbarPopupTheme" format="reference" />
<declare-styleable name="ScrimInsetsView">
<attr name="insetForeground" format="reference|color" />
</declare-styleable>
</resources>

3
app/src/main/res/values/colors.xml
View file

@ -36,4 +36,7 @@
<!--notification-->
<drawable name="notification_template_divider_media">#29ffffff</drawable>
<color name="scrim_inset_color">#40000000</color>
</resources>

4
app/src/main/res/values/dimens.xml
View file

@ -5,7 +5,8 @@
<!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
https://developer.android.com/design/patterns/navigation-drawer.html -->
<dimen name="navigation_drawer_image_height">140dp</dimen>
<dimen name="navigation_drawer_width">260dp</dimen>
<dimen name="nav_drawer_width_limit">320dp</dimen>
<dimen name="nav_drawer_margin">56dp</dimen>
<dimen name="title_view_height">72dp</dimen>
<dimen name="toolbar_elevation">2dp</dimen>
@ -43,5 +44,6 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
<dimen name="empty_text_size">20sp</dimen>
<dimen name="seek_bar_margin_left_right">-17dp</dimen>
<dimen name="list_padding_vertical">2dp</dimen>
</resources>

5
app/src/main/res/values/styles.xml
View file

@ -1,4 +1,4 @@
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="Theme.MaterialMusic" parent="Theme.MaterialMusic.Base" />
@ -43,7 +43,8 @@
<item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
<item name="android:minHeight">@dimen/abc_action_bar_default_height_material</item>
<item name="popupTheme">?toolbarPopupTheme</item>
<item name="elevation">@dimen/toolbar_elevation</item>
<item name="android:elevation" tools:ignore="NewApi">@dimen/toolbar_elevation</item>
<item name="android:transitionName" tools:ignore="NewApi">toolbar</item>
</style>
</resources>

14
app/src/main/res/values/styles_parents.xml
View file

@ -7,13 +7,6 @@
<item name="android:windowActionBarOverlay">true</item>
<item name="windowActionBarOverlay">true</item>
<item name="colorPrimary">@color/materialmusic_dark_color</item>
<item name="colorPrimaryDark">@color/materialmusic_dark_color_darker</item>
<item name="colorAccent">@color/materialmusic_accent_color</item>
<item name="fab_colorNormal">@color/materialmusic_accent_color</item>
<item name="fab_colorPressed">@color/materialmusic_accent_color</item>
<item name="title_text_color">?android:attr/textColorPrimary</item>
<item name="caption_text_color">?android:attr/textColorSecondary</item>
@ -46,13 +39,6 @@
<item name="windowActionBarOverlay">true</item>
<item name="md_dark_theme">false</item>
<item name="colorPrimary">@color/materialmusic_color</item>
<item name="colorPrimaryDark">@color/materialmusic_color_darker</item>
<item name="colorAccent">@color/materialmusic_accent_color</item>
<item name="fab_colorNormal">@color/materialmusic_accent_color</item>
<item name="fab_colorPressed">@color/materialmusic_accent_color</item>
<item name="title_text_color">?android:attr/textColorPrimary</item>
<item name="caption_text_color">?android:attr/textColorSecondary</item>