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

New colors

Browse source
This commit is contained in:
Karim Abou Zeid 2015-03-30 21:42:54 +02:00
commit 696299b960
32 changed files with 116 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/drawable/list_item_activated.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/list_item_activated"/>
<solid android:color="@color/list_item_selector_activated"/>
</shape>

2
app/src/main/res/drawable/list_item_activated_dark.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/list_item_activated_dark"/>
<solid android:color="@color/list_item_selector_activated_dark"/>
</shape>

4
app/src/main/res/layout-land/activity_music_controller.xml
View file

@ -54,10 +54,12 @@
android:fontFamily="sans-serif-medium"
android:gravity="bottom|left"
android:singleLine="true"
android:textSize="14dp"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"/>
<TextView
android:textSize="14dp"
android:id="@+id/song_total_time"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@ -75,7 +77,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@color/materialmusic_default_bar_color"
android:background="?default_bar_color"
android:orientation="vertical"
>

3
app/src/main/res/layout/activity_album_tag_editor.xml
View file

@ -1,6 +1,5 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusable="true"
@ -15,7 +14,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.kabouzeid.gramophone.view.SquareImageView
<com.kabouzeid.gramophone.ui.widget.SquareImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"

2
app/src/main/res/layout/activity_main.xml
View file

@ -55,6 +55,8 @@
</android.support.v7.widget.Toolbar>
<com.astuetz.PagerSlidingTabStrip
app:pstsTabBackground="?selectableItemBackground"
app:pstsIndicatorHeight="3dp"
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="@dimen/tab_height"

4
app/src/main/res/layout/activity_music_controller.xml
View file

@ -40,6 +40,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"
android:textSize="14dp"
android:textStyle="bold"/>
<TextView
@ -50,6 +51,7 @@
android:fontFamily="sans-serif"
android:gravity="bottom|right"
android:singleLine="true"
android:textSize="14dp"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"/>
@ -60,7 +62,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/media_controller_container"
android:background="@color/materialmusic_default_bar_color"
android:background="?default_bar_color"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingLeft="72dp"

2
app/src/main/res/layout/activity_song_tag_editor.xml
View file

@ -15,7 +15,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.kabouzeid.gramophone.view.SquareImageView
<com.kabouzeid.gramophone.ui.widget.SquareImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"

1
app/src/main/res/layout/artist_detail_header.xml
View file

@ -12,6 +12,7 @@
android:scrollbars="none"/>
<View
android:layout_marginTop="-8dp"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?separator_color"/>

4
app/src/main/res/layout/item_grid_album.xml
View file

@ -14,7 +14,7 @@
android:gravity="center"
android:orientation="vertical">
<com.kabouzeid.gramophone.view.SquareImageView
<com.kabouzeid.gramophone.ui.widget.SquareImageView
android:id="@+id/album_art"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -25,7 +25,7 @@
android:id="@+id/footer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/materialmusic_default_bar_color"
android:background="?default_bar_color"
android:orientation="vertical"
android:padding="16dp"
android:transitionName="@string/transition_album_text">

4
app/src/main/res/layout/item_grid_artist_album.xml
View file

@ -8,7 +8,7 @@
android:foreground="?rect_selector">
<LinearLayout
android:background="@color/materialmusic_default_bar_color"
android:background="?default_bar_color"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@ -24,7 +24,7 @@
android:id="@+id/footer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/materialmusic_default_bar_color">
android:background="?default_bar_color">
<LinearLayout
android:layout_width="wrap_content"

2
app/src/main/res/layout/item_list_artist_song.xml
View file

@ -11,7 +11,7 @@
android:orientation="horizontal"
android:paddingLeft="16dp">
<com.kabouzeid.gramophone.view.SquareImageView
<com.kabouzeid.gramophone.ui.widget.SquareImageView
android:id="@+id/album_art"
android:layout_width="40dp"
android:layout_height="40dp"

2
app/src/main/res/layout/item_list_search.xml
View file

@ -7,7 +7,7 @@
android:orientation="horizontal"
android:paddingLeft="16dp">
<com.kabouzeid.gramophone.view.SquareImageView
<com.kabouzeid.gramophone.ui.widget.SquareImageView
android:id="@+id/image"
android:layout_width="40dp"
android:layout_height="40dp"

2
app/src/main/res/layout/item_list_song.xml
View file

@ -12,7 +12,7 @@
android:orientation="horizontal"
android:paddingLeft="16dp">
<com.kabouzeid.gramophone.view.SquareImageView
<com.kabouzeid.gramophone.ui.widget.SquareImageView
android:id="@+id/album_art"
android:layout_width="40dp"
android:layout_height="40dp"

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

@ -15,8 +15,6 @@
<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"/>

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

@ -13,9 +13,9 @@
<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_color">#8A000000</color>
<color name="materialmusic_themed_drawable_activated_color">@color/materialmusic_accent_color</color>
<color name="list_item_activated">#D0D0D0</color>
<color name="list_item_selector_activated">#D0D0D0</color>
<!--dark theme-->
<color name="materialmusic_dark_color">@color/indigo_500</color>
@ -29,12 +29,15 @@
<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_selector_activated_dark">#55000000</color>
<!--round and rect selector-->
<color name="button_selected">#D0D0D0</color>
<color name="button_selected_dark">#30FFFFFF</color>
<color name="sliding_tabs_activated">#FFFFFF</color>
<color name="sliding_tabs_deactivated">#99FFFFFF</color>
<!--notification-->
<drawable name="notification_template_divider_media">#29ffffff</drawable>
</resources>

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

@ -13,10 +13,11 @@
<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:src">?icon_overflow</item>
<item name="android:scaleType">fitXY</item>
<item name="android:background">?round_selector</item>
<item name="android:layout_centerVertical">true</item>

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

@ -23,8 +23,6 @@
<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>
@ -58,8 +56,6 @@
<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>
@ -71,6 +67,7 @@
</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>
<item name="fab_shadow">true</item>

48
app/src/main/res/xml/pref_ui.xml
View file

@ -1,34 +1,34 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:title="@string/pref_header_ui">
<com.afollestad.materialdialogs.prefs.MaterialListPreference
android:defaultValue="1"
android:entries="@array/pref_general_theme_list_titles"
android:entryValues="@array/pref_general_theme_list_values"
android:key="general_theme"
android:negativeButtonText="@null"
android:positiveButtonText="@null"
android:title="@string/pref_title_general_theme"/>
<com.afollestad.materialdialogs.prefs.MaterialListPreference
android:defaultValue="1"
android:entries="@array/pref_general_theme_list_titles"
android:entryValues="@array/pref_general_theme_list_values"
android:key="general_theme"
android:negativeButtonText="@null"
android:positiveButtonText="@null"
android:title="@string/pref_title_general_theme"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="playback_controller_card"
android:title="@string/pref_title_show_playback_controller_card"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="playback_controller_card"
android:title="@string/pref_title_show_playback_controller_card"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="colored_navigation_bar_artist"
android:title="@string/pref_title_colored_navigation_bar_artists"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="colored_navigation_bar_artist"
android:title="@string/pref_title_colored_navigation_bar_artists"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="colored_navigation_bar_album"
android:title="@string/pref_title_colored_navigation_bar_albums"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="colored_navigation_bar_album"
android:title="@string/pref_title_colored_navigation_bar_albums"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="colored_album_footers"
android:title="@string/pref_title_colored_album_footers"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="colored_album_footers"
android:title="@string/pref_title_colored_album_footers"/>
</PreferenceCategory>
</PreferenceScreen>