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

Massive clean up of attrs, colors and styles. Also icon and divider colors matching better the guidelines now.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-08-10 21:21:03 +02:00
commit 7fd4226685
94 changed files with 160 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,24 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="title_text_color" format="color" />
<attr name="caption_text_color" format="color" />
<attr name="music_controller_container_color" format="color" />
<attr name="round_selector" format="reference" />
<attr name="rect_selector" format="reference" />
<attr name="separator_color" format="color" />
<attr name="themed_drawable_color" format="color" />
<attr name="check_mark_color" format="color" />
<attr name="default_bar_color" format="color" />
<attr name="card_color" format="color" />
<attr name="toolbarPopupTheme" format="reference" />
<attr name="seek_arc_thumb_drawable" format="reference" />
</resources>

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

@ -1,34 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--general-->
<color name="ripple_material_dark" type="color">#4dffffff</color>
<color name="ripple_material_light" type="color">#1f000000</color>
<color name="activated_selected_dark" type="color">#9affffff</color>
<color name="activated_selected_light" type="color">#3e000000</color>
<!--light theme-->
<color name="materialmusic_music_controller_container_color">@color/grey_300</color>
<color name="materialmusic_navigation_drawer_background_color">#fff</color>
<color name="materialmusic_separator_color">#0C000000</color>
<color name="materialmusic_default_bar_color">@color/grey_400</color>
<color name="materialmusic_themed_drawable_color">#8A000000</color>
<color name="music_controller_container_color">@android:color/white</color>
<color name="default_bar_color">@color/grey_700</color>
<!--dark theme-->
<color name="materialmusic_dark_music_controller_container_color">@color/grey_800</color>
<color name="materialmusic_dark_navigation_drawer_background_color">@color/grey_900</color>
<color name="materialmusic_dark_separator_color">#0CFFFFFF</color>
<color name="materialmusic_dark_default_bar_color">@color/grey_900</color>
<color name="materialmusic_dark_themed_drawable_color">@color/white</color>
<color name="sliding_tabs_activated">#FFFFFF</color>
<color name="sliding_tabs_deactivated">#99FFFFFF</color>
<!--notification-->
<color name="notification_content_color">#deFFFFFF</color>
<color name="notification_secondary_content_color">#aaFFFFFF</color>
<color name="notification_dark_text_content_color">#de000000</color>
<color name="notification_dark_text_secondary_content_color">#aa000000</color>
<color name="music_controller_container_color_dark">@color/grey_800</color>
<color name="default_bar_color_dark">@color/grey_900</color>
</resources>

8
app/src/main/res/values/materialcolors.xml
View file

@ -2,15 +2,9 @@
<resources>
<color name="pink_A200">#ff4081</color>
<color name="indigo_500">#3f51b5</color>
<color name="black">#000</color>
<color name="white">#fff</color>
<color name="grey_300">#e0e0e0</color>
<color name="grey_400">#bdbdbd</color>
<color name="grey_500">#9e9e9e</color>
<color name="grey_700">#616161</color>
<color name="grey_800">#424242</color>
<color name="grey_900">#212121</color>

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

@ -8,18 +8,7 @@
<style name="Theme.MaterialMusic.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title" />
<style name="OverFlowButton">
<item name="android:tint">?themed_drawable_color</item>
<item name="android:src">@drawable/ic_more_vert_white_24dp</item>
<item name="android:padding">12dp</item>
<item name="android:layout_width">48dp</item>
<item name="android:layout_height">48dp</item>
<item name="android:scaleType">fitXY</item>
<item name="android:background">?round_selector</item>
<item name="android:layout_centerVertical">true</item>
<item name="android:focusableInTouchMode">false</item>
<item name="android:focusable">false</item>
</style>
<style name="OverFlowButton" parent="OverFlowButtonParent" />
<style name="PlayingIndicator">
<item name="android:layout_width">36dp</item>
@ -41,8 +30,7 @@
</style>
<style name="Toolbar">
<item name="titleMarginStart">16dp</item>
<item name="titleMarginStart">16dp</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">?attr/actionBarSize</item>
<item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>

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

@ -2,69 +2,48 @@
<resources>
<style name="Theme.MaterialMusic.Base" parent="Theme.AppCompat.NoActionBar">
<!-- FIX FOR DESIGN LIB 22.2.0 NAVDRAWER ITEM FONT-->
<item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Body2</item>
<item name="android:windowActionBarOverlay">true</item>
<item name="windowActionBarOverlay">true</item>
<item name="md_dark_theme">true</item>
<item name="title_text_color">@color/primary_text_default_material_dark</item>
<item name="caption_text_color">@color/secondary_text_default_material_dark</item>
<item name="music_controller_container_color">
@color/materialmusic_dark_music_controller_container_color
<item name="music_controller_container_color">@color/music_controller_container_color_dark
</item>
<item name="round_selector">@drawable/round_selector_dark</item>
<item name="rect_selector">@drawable/rect_selector_dark</item>
<item name="separator_color">@color/materialmusic_dark_separator_color</item>
<item name="seek_arc_thumb_drawable">@drawable/traditional_slider_thumb_dark</item>
<item name="themed_drawable_color">@color/materialmusic_dark_themed_drawable_color</item>
<item name="check_mark_color">@color/grey_900</item>
<item name="cardBackgroundColor">@color/cardview_dark_background</item>
<item name="default_bar_color">@color/materialmusic_dark_default_bar_color</item>
<item name="card_color">@color/grey_800</item>
<item name="default_bar_color">@color/default_bar_color_dark</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
<!-- FOR EVERYWHERE WE CANT OVERRIDE THE ACCENT COLOR-->
<item name="colorAccent">@color/white</item>
<item name="colorAccent">@android:color/white</item>
</style>
<style name="Theme.MaterialMusic.Base.Light" parent="Theme.AppCompat.Light.NoActionBar">
<!-- FIX FOR DESIGN LIB 22.2.0 NAVDRAWER ITEM FONT-->
<item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Body2</item>
<item name="android:windowActionBarOverlay">true</item>
<item name="windowActionBarOverlay">true</item>
<item name="md_dark_theme">false</item>
<item name="title_text_color">@color/primary_text_default_material_light</item>
<item name="caption_text_color">@color/secondary_text_default_material_light</item>
<item name="music_controller_container_color">
@color/materialmusic_music_controller_container_color
</item>
<item name="music_controller_container_color">@color/music_controller_container_color</item>
<item name="round_selector">@drawable/round_selector</item>
<item name="rect_selector">@drawable/rect_selector</item>
<item name="separator_color">@color/materialmusic_separator_color</item>
<item name="seek_arc_thumb_drawable">@drawable/traditional_slider_thumb</item>
<item name="themed_drawable_color">@color/materialmusic_themed_drawable_color</item>
<item name="check_mark_color">@color/white</item>
<item name="cardBackgroundColor">@color/cardview_light_background</item>
<item name="default_bar_color">@color/materialmusic_default_bar_color</item>
<item name="card_color">@color/white</item>
<item name="default_bar_color">@color/default_bar_color</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
<!-- FOR EVERYWHERE WE CANT OVERRIDE THE ACCENT COLOR-->
<item name="colorAccent">@color/black</item>
<item name="colorAccent">@android:color/black</item>
</style>
<style name="PlayPauseFabParent">
@ -86,4 +65,17 @@
<item name="android:layout_marginLeft">@dimen/seek_bar_margin_left_right</item>
<item name="android:layout_marginRight">@dimen/seek_bar_margin_left_right</item>
</style>
<style name="OverFlowButtonParent">
<item name="android:tint">?android:textColorSecondary</item>
<item name="android:src">@drawable/abc_ic_menu_moreoverflow_mtrl_alpha</item>
<item name="android:padding">12dp</item>
<item name="android:layout_width">48dp</item>
<item name="android:layout_height">48dp</item>
<item name="android:scaleType">fitXY</item>
<item name="android:background">?round_selector</item>
<item name="android:layout_centerVertical">true</item>
<item name="android:focusableInTouchMode">false</item>
<item name="android:focusable">false</item>
</style>
</resources>