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

Design fixes

Browse source
This commit is contained in:
Karim Abou Zeid 2015-03-01 21:17:04 +01:00
commit 13843095a8
48 changed files with 137 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,8 +3,7 @@
<attr name="title_text_color" format="color"/>
<attr name="caption_text_color" format="color"/>
<attr name="music_controller_container_color" format="color"/>
<attr name="fab_color" format="color"/>
<attr name="fab_color_pressed" format="color"/>
<attr name="navigation_drawer_background_color" format="color"/>
<attr name="list_selector" format="reference"/>
<attr name="round_selector" format="reference"/>
<attr name="rect_selector" format="reference"/>

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

@ -1,36 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--general-->
<color name="materialmusic_default_bar_color">@color/grey_900</color>
<!--light theme-->
<color name="materialmusic_color">@color/blue_500</color>
<color name="materialmusic_color_darker">@color/blue_600</color>
<color name="materialmusic_accent_color">@color/pink_500</color>
<color name="materialmusic_accent_color_darker">@color/pink_600</color>
<color name="materialmusic_accent_color_lighter">@color/pink_300</color>
<color name="materialmusic_title_text_color">?android:attr/textColorPrimaryInverse</color>
<color name="materialmusic_caption_text_color">?android:attr/textColorSecondaryInverse</color>
<color name="materialmusic_music_controller_container_color">@color/grey_400</color>
<color name="materialmusic_dark_color">@color/grey_900</color>
<color name="materialmusic_dark_color_darker">#161616</color>
<color name="materialmusic_navigation_drawer_background_color">@color/grey_300</color>
<!--dark theme-->
<color name="materialmusic_dark_color">@color/indigo_500</color>
<color name="materialmusic_dark_color_darker">@color/indigo_600</color>
<color name="materialmusic_dark_accent_color">@color/pink_500</color>
<color name="materialmusic_dark_accent_color_darker">@color/pink_600</color>
<color name="materialmusic_dark_accent_color_lighter">@color/pink_300</color>
<color name="materialmusic_dark_title_text_color">?android:attr/textColorPrimary</color>
<color name="materialmusic_dark_caption_text_color">?android:attr/textColorSecondary</color>
<color name="materialmusic_dark_music_controller_container_color">@color/grey_800</color>
<color name="materialmusic_dark_navigation_drawer_background_color">@color/grey_900</color>
<drawable name="notification_template_divider_media">#29ffffff</drawable>
<color name="list_item_activated">#26000000</color>
<color name="list_item_activated_dark">#26FFFFFF</color>
<!--nav drawer list items-->
<color name="list_item_activated">#55000000</color>
<color name="list_item_activated_dark">#55000000</color>
<color name="list_item_selected">#D0D0D0</color>
<color name="list_item_selected_dark">#77404040</color>
<!--round and rect selector-->
<color name="button_selected">#D0D0D0</color>
<color name="button_selected_dark">#30FFFFFF</color>
<!--notification-->
<drawable name="notification_template_divider_media">#29ffffff</drawable>
</resources>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Material Music</string>
<string name="app_name">Gramophone</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="action_settings">Settings</string>
@ -65,7 +65,7 @@
<string name="label_current_playing_queue">Playing queue</string>
<string name="close">Close</string>
<string name="save_as_playlist">Save as playlist</string>
<string name="credits">Material Music is a completely free material designed music player by <b>Karim Abou Zeid</b>.\n\n<a href="https://plus.google.com/+KarimAbouZeid23697">Google+</a>&#160;&#160;&#160;<a href="https://twitter.com/karim23697">Twitter</a></string>
<string name="credits">Gramophone is a completely free material designed music player by <b>Karim Abou Zeid</b>.\n\n<a href="https://plus.google.com/+KarimAbouZeid23697">Google+</a>&#160;&#160;&#160;<a href="https://twitter.com/karim23697">Twitter</a></string>
<string name="title_activity_search">SearchActivity</string>
<string name="more">more</string>
<string name="no_results">No results</string>

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

@ -7,17 +7,16 @@
<item name="colorPrimary">@color/materialmusic_dark_color</item>
<item name="colorPrimaryDark">@color/materialmusic_dark_color_darker</item>
<item name="colorAccent">@color/materialmusic_dark_accent_color</item>
<item name="colorAccent">@color/materialmusic_accent_color</item>
<item name="fab_color">@color/materialmusic_dark_accent_color</item>
<item name="fab_color_pressed">@color/materialmusic_dark_accent_color_lighter</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>
<item name="music_controller_container_color">
@color/materialmusic_dark_music_controller_container_color
</item>
<item name="music_controller_container_color">@color/materialmusic_dark_music_controller_container_color</item>
<item name="navigation_drawer_background_color">@color/materialmusic_dark_navigation_drawer_background_color</item>
<item name="list_selector">@drawable/list_selector_dark</item>
<item name="round_selector">@drawable/round_selector_dark</item>
@ -35,15 +34,14 @@
<item name="colorPrimaryDark">@color/materialmusic_color_darker</item>
<item name="colorAccent">@color/materialmusic_accent_color</item>
<item name="fab_color">@color/materialmusic_accent_color</item>
<item name="fab_color_pressed">@color/materialmusic_accent_color_lighter</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/textColorPrimaryInverse</item>
<item name="caption_text_color">?android:attr/textColorSecondaryInverse</item>
<item name="music_controller_container_color">
@color/materialmusic_music_controller_container_color
</item>
<item name="music_controller_container_color">@color/materialmusic_music_controller_container_color</item>
<item name="navigation_drawer_background_color">@color/materialmusic_navigation_drawer_background_color</item>
<item name="list_selector">@drawable/list_selector</item>
<item name="round_selector">@drawable/round_selector</item>
@ -56,9 +54,6 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="fab_shadow">true</item>
<item name="fab_color">@color/materialmusic_accent_color</item>
<item name="fab_colorNormal">@color/materialmusic_accent_color</item>
<item name="fab_colorPressed">@color/materialmusic_accent_color_darker</item>
</style>
<style name="NotificationButtonParent">