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

A lot of fixes and small changes

Browse source
This commit is contained in:
Karim Abou Zeid 2015-05-29 21:24:11 +02:00
commit 865f72e5bb
33 changed files with 360 additions and 479 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
<resources>
<array name="colors_primary">
<item>#3F51B5</item>
<item>#9E9E9E</item>
<item>#424242</item>
<item>#1C1C1C</item>
@ -13,6 +12,7 @@
<item>#E91E63</item>
<item>#9C27B0</item>
<item>#5E35B1</item>
<item>#3F51B5</item>
<item>#1976D2</item>
<item>#03A9F4</item>
<item>#00BCD4</item>
@ -33,6 +33,7 @@
<item>#795548</item>
<item>#D32F2F</item>
<item>#E91E63</item>
<item>#FF4081</item>
<item>#9C27B0</item>
<item>#5E35B1</item>
<item>#1976D2</item>

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

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

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

@ -8,27 +8,18 @@
<color name="activated_selected_light" type="color">#3e000000</color>
<!--light theme-->
<color name="materialmusic_color">@color/indigo_500</color>
<color name="materialmusic_color_darker">@color/indigo_600</color>
<color name="materialmusic_accent_color">@color/pink_500</color>
<color name="materialmusic_accent_color_darker">@color/pink_600</color>
<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_500</color>
<color name="materialmusic_themed_drawable_color">#8A000000</color>
<color name="list_item_selector_activated">#D0D0D0</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_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="list_item_selector_activated_dark">#55000000</color>
<color name="sliding_tabs_activated">#FFFFFF</color>
<color name="sliding_tabs_deactivated">#99FFFFFF</color>
@ -36,6 +27,4 @@
<!--notification-->
<drawable name="notification_template_divider_media">#29ffffff</drawable>
<color name="scrim_inset_color">#40000000</color>
</resources>

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

@ -12,7 +12,8 @@
<dimen name="toolbar_elevation">2dp</dimen>
<dimen name="header_image_height">360dp</dimen>
<dimen name="progress_container_height">32dp</dimen>
<dimen name="progress_container_height">20dp</dimen>
<dimen name="media_controller_container_height">120dp</dimen>
<dimen name="status_bar_padding">0dp</dimen>

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

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8"?><!-- https://gist.github.com/kalehv/bae765c756e94455ed88 -->
<resources>
<color name="pink_500">#e91e63</color>
<color name="pink_600">#d81b60</color>
<color name="pink_A200">#ff4081</color>
<color name="indigo_500">#3f51b5</color>
<color name="indigo_600">#3949ab</color>
<color name="black">#000000</color>
<color name="white">#ffffff</color>

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

@ -115,6 +115,8 @@
<string name="pref_title_colored_navigation_bar_tag_editor">Tag editor</string>
<string name="pref_title_colored_navigation_bar_other_screens">Everywhere else</string>
<string name="pref_title_colored_album_footers">Colored album footers</string>
<string name="pref_title_force_square_album_art">Force square album art</string>
<string name="pref_title_opaque_toolbar_now_playing">Opaque toolbar now playing</string>
<string name="no_equalizer">No equalizer found</string>
<string name="no_audio_ID">No audio ID, play something and try again.</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
@ -136,6 +138,8 @@
<string name="pref_only_lollipop">Only available on Lollipop.</string>
<string name="pref_summary_transparent_toolbar">Content scrolling underneath the toolbar is visible.</string>
<string name="pref_summary_colored_album_footers">Album footers in the grid are colored with the album cover\'s palette.</string>
<string name="pref_summary_force_square_album_art">Album art in the now playing view is forced to be squared.</string>
<string name="pref_summary_opaque_toolbar_now_playing">The toolbar in the now playing view is opaque and no longer covers the album art.</string>
<string name="failed_download_albumart">Unable to download the art for this album.</string>
<string name="search_hint">Search your library…</string>
<string name="rescanning_media">Rescanning media…</string>

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

@ -37,7 +37,6 @@
<style name="MusicProgressSlider" parent="MusicProgressSliderParent">
<item name="android:thumbOffset">0dp</item>
<item name="android:thumb">@drawable/slider_thumb</item>
</style>
<style name="Toolbar">

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

@ -66,7 +66,6 @@
</style>
<style name="PlayPauseFabParent">
<item name="elevation">8dp</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
</style>
@ -81,7 +80,9 @@
<style name="MusicProgressSliderParent">
<item name="android:layout_width">fill_parent</item>
<item name="android:progressDrawable">@android:color/transparent</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:thumb">@drawable/slider_thumb</item>
</style>
</resources>