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

Massiv design optimizations and settings

Browse source
This commit is contained in:
Karim Abou Zeid 2015-03-29 17:41:47 +02:00
commit b302abc2e1
117 changed files with 1104 additions and 962 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,9 +2,26 @@
<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="navigation_drawer_background_color" format="color"/>
<attr name="list_selector" format="reference"/>
<attr name="round_selector" format="reference"/>
<attr name="rect_selector" format="reference"/>
<attr name="separator_color" format="color"/>
<attr name="drawable_color" format="color"/>
<attr name="drawable_color_enabled" format="color"/>
<attr name="icon_overflow" format="reference"/>
<attr name="themed_drawable_color" format="color"/>
<attr name="themed_drawable_activated_color" format="color"/>
<attr name="default_bar_color" format="color"/>
<attr name="toolbarPopupTheme" format="reference"/>
</resources>

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

@ -1,18 +1,21 @@
<?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_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_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_music_controller_container_color">@color/grey_300</color>
<color name="materialmusic_navigation_drawer_background_color">@color/grey_300</color>
<color name="materialmusic_separator_color">#0C000000</color>
<color name="materialmusic_default_bar_color">@color/white</color>
<color name="materialmusic_themed_drawable_color">@color/grey_800</color>
<color name="materialmusic_themed_drawable_activated_color">@color/materialmusic_accent_color</color>
<color name="list_item_activated">#D0D0D0</color>
<!--dark theme-->
<color name="materialmusic_dark_color">@color/indigo_500</color>
@ -20,16 +23,13 @@
<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>
<!--nav drawer list items-->
<color name="list_item_activated">#55000000</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="materialmusic_dark_themed_drawable_activated_color">@color/materialmusic_dark_accent_color</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>

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

@ -89,5 +89,9 @@
<string name="delete_songs_2">\u0020songs?</string>
<string name="delete_warning">"Warning: This operation can not be undone."</string>
<string name="shuffle_all">Shuffle all</string>
<string name="last_opened">Last opened</string>
<string name="title_setting_start_page">Start page</string>
<string name="light_theme_name">Light</string>
<string name="dark_theme_name">Dark</string>
</resources>

40
app/src/main/res/values/strings_activity_settings.xml Normal file
View file

@ -0,0 +1,40 @@
<resources>
<string name="title_activity_settings">Settings</string>
<!-- Strings related to Settings -->
<!-- General settings -->
<string name="pref_header_general">General</string>
<string name="pref_title_set_default_start_page">Set default start page</string>
<string-array name="pref_start_page_list_titles">
<item>@string/last_opened</item>
<item>@string/songs</item>
<item>@string/albums</item>
<item>@string/artists</item>
<item>@string/playlists</item>
</string-array>
<string-array name="pref_start_page_list_values">
<item>-1</item>
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>
<!-- UI settings -->
<string name="pref_header_ui">UI</string>
<string name="pref_title_general_theme">General theme</string>
<string-array name="pref_general_theme_list_titles">
<item>@string/light_theme_name</item>
<item>@string/dark_theme_name</item>
</string-array>
<string-array name="pref_general_theme_list_values">
<item>0</item>
<item>1</item>
</string-array>
<string name="pref_title_show_playback_controller_card">Playback controller card</string>
<string name="pref_title_colored_navigation_bar_artists">Colored navigation bar artist view</string>
<string name="pref_title_colored_navigation_bar_albums">Colored navigation bar album view</string>
<string name="pref_title_colored_album_footers">Colored album footers</string>
</resources>

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

@ -16,7 +16,7 @@
<item name="android:padding">12dp</item>
<item name="android:layout_width">48dp</item>
<item name="android:layout_height">48dp</item>
<item name="android:src">@drawable/ic_overflow</item>
<item name="android:src">?icon_overflow</item>
<item name="android:scaleType">fitXY</item>
<item name="android:background">?round_selector</item>
<item name="android:layout_centerVertical">true</item>
@ -43,4 +43,13 @@
<item name="android:thumb">@drawable/slider_thumb</item>
</style>
<style name="Toolbar">
<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>
<item name="android:minHeight">@dimen/abc_action_bar_default_height_material</item>
<item name="popupTheme">?toolbarPopupTheme</item>
<item name="elevation">@dimen/toolbar_elevation</item>
</style>
</resources>

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

@ -21,6 +21,16 @@
<item name="list_selector">@drawable/list_selector_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="icon_overflow">@drawable/ic_more_vert_white_24dp</item>
<item name="themed_drawable_color">@color/materialmusic_dark_themed_drawable_color</item>
<item name="themed_drawable_activated_color">@color/materialmusic_dark_themed_drawable_activated_color</item>
<item name="default_bar_color">@color/materialmusic_dark_default_bar_color</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
<item name="md_dark_theme">true</item>
@ -37,8 +47,8 @@
<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="title_text_color">?android:attr/textColorPrimary</item>
<item name="caption_text_color">?android:attr/textColorSecondary</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>
@ -46,6 +56,16 @@
<item name="list_selector">@drawable/list_selector</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="icon_overflow">@drawable/ic_more_vert_black_24dp</item>
<item name="themed_drawable_color">@color/materialmusic_themed_drawable_color</item>
<item name="themed_drawable_activated_color">@color/materialmusic_themed_drawable_activated_color</item>
<item name="default_bar_color">@color/materialmusic_default_bar_color</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
<item name="md_dark_theme">false</item>
</style>