Makes full use of the Android Support Design Library. A lot of small things fixed or improved. Added dozens of new colors.

This commit is contained in:
Karim Abou Zeid 2015-05-30 22:51:17 +02:00
commit 31926d7983
45 changed files with 447 additions and 599 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 645 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 439 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 785 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

View file

@ -5,5 +5,5 @@
android:height="20dp"
android:width="3dp" />
<solid
android:color="?colorAccent" />
android:color="@color/black" />
</shape>

View file

@ -4,6 +4,7 @@
android:layout_height="match_parent">
<FrameLayout
android:background="?android:colorBackground"
android:layout_width="match_parent"
android:layout_height="@dimen/header_image_height">
@ -73,11 +74,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:id="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/status_bar_padding"
android:background="@android:color/transparent" />
<include layout="@layout/status_bar" />
<FrameLayout
android:layout_width="match_parent"

View file

@ -5,6 +5,7 @@
<FrameLayout
android:background="?android:colorBackground"
android:layout_width="match_parent"
android:layout_height="@dimen/header_image_height">
@ -74,11 +75,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:id="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/status_bar_padding"
android:background="@android:color/transparent" />
<include layout="@layout/status_bar" />
<FrameLayout
android:layout_width="match_parent"

View file

@ -1,38 +1,33 @@
<android.support.v4.widget.DrawerLayout
android:fitsSystemWindows="true"
android:id="@+id/drawer_layout"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".DrawerActivity">
<FrameLayout
<android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v4.view.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
<android.support.design.widget.AppBarLayout
android:id="@+id/toolbar_frame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="@dimen/toolbar_elevation"
android:orientation="vertical"
tools:ignore="UnusedAttribute">
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<FrameLayout
app:layout_scrollFlags="scroll|enterAlways"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:elevation="0dp">
android:elevation="0dp"
tools:ignore="UnusedAttribute">
</android.support.v7.widget.Toolbar>
@ -43,42 +38,35 @@
</FrameLayout>
<com.astuetz.PagerSlidingTabStrip
<android.support.design.widget.TabLayout
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="@dimen/tab_height"
android:background="?colorPrimary"
android:elevation="0dp"
android:paddingLeft="64dp"
android:paddingStart="64dp"
android:textColor="@color/sliding_tabs_deactivated"
android:textColorPrimary="@color/sliding_tabs_activated"
android:transitionName="sliding_tabs"
app:pstsIndicatorHeight="3dp"
app:pstsTabBackground="?selectableItemBackground"
app:pstsTabPaddingLeftRight="8dp"
tools:ignore="NewApi,RtlSymmetry,UnusedAttribute" />
app:tabContentStart="72dp"
app:tabIndicatorColor="#00000000"
app:tabMode="scrollable" />
<View
android:layout_width="match_parent"
android:layout_height="5dp"
android:background="@drawable/shadow_down" />
</LinearLayout>
</android.support.design.widget.AppBarLayout>
<android.support.v4.view.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<android.support.design.widget.FloatingActionButton
android:layout_margin="16dp"
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_gravity="end|bottom" />
android:layout_gravity="end|bottom"
android:layout_margin="16dp" />
</FrameLayout>
</android.support.design.widget.CoordinatorLayout>
<android.support.design.widget.NavigationView
android:id="@+id/nav_view"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
android:fitsSystemWindows="true"
app:menu="@menu/menu_drawer" />

View file

@ -8,6 +8,7 @@
<!-- BOTTOM-->
<LinearLayout
android:background="?android:colorBackground"
android:id="@+id/footer_frame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -200,16 +201,18 @@
<!-- TOOLBAR-->
<FrameLayout
<LinearLayout
android:id="@+id/toolbar_frame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/status_bar_padding">
android:orientation="vertical">
<include layout="@layout/status_bar" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:background="#00000000" />
</FrameLayout>
</LinearLayout>
</RelativeLayout>

View file

@ -5,8 +5,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="@dimen/status_bar_padding">
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
@ -49,6 +48,7 @@
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_gravity="bottom|end"
android:layout_margin="16dp" />
</FrameLayout>

View file

@ -2,8 +2,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="@dimen/status_bar_padding">
android:orientation="vertical">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"

View file

@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:columnWidth="56dp"
android:numColumns="auto_fit"
android:numColumns="7"
android:verticalSpacing="4dp"
android:horizontalSpacing="4dp"
android:padding="16dp"

View file

@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<com.kabouzeid.gramophone.views.CircleView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="56dp"
android:layout_height="56dp" />
<com.kabouzeid.gramophone.views.ColorView
android:id="@+id/color_view"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" />

View file

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="1dp">
android:layout_margin="2dp">
<FrameLayout
android:id="@+id/content"

View file

@ -1,53 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?inset_divider"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" />
<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?rect_selector"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:clickable="true"
android:focusable="true">
<ImageView
android:id="@+id/icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:fontFamily="@string/font_fontFamily_medium"
android:textStyle="@integer/font_textStyle_medium"
android:textSize="14sp"
android:gravity="center_vertical"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
</LinearLayout>
</LinearLayout>

View file

@ -66,7 +66,7 @@
android:gravity="center_vertical"
android:orientation="vertical" />
<com.kabouzeid.gramophone.views.CircleView
<com.kabouzeid.gramophone.views.ColorView
android:id="@+id/circle"
android:layout_width="32dp"
android:layout_height="32dp"

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<View
android:id="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/status_bar_padding"
android:background="@android:color/transparent"
xmlns:android="http://schemas.android.com/apk/res/android" />

View file

@ -5,7 +5,6 @@
<item name="rect_selector">@drawable/rect_ripple_selector_dark</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
</style>
<style name="Theme.MaterialMusic.Light" parent="Theme.MaterialMusic.Base.Light">
@ -13,7 +12,6 @@
<item name="rect_selector">@drawable/rect_ripple_selector</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
</style>
<style name="Theme.MaterialMusic.Notification" parent="@android:style/TextAppearance.Material.Notification" />

View file

@ -1,53 +1,261 @@
<resources>
<array name="colors_primary">
<item>#9E9E9E</item>
<item>#424242</item>
<item>#1C1C1C</item>
<item>#000000</item>
<item>#607D8B</item>
<item>#37474F</item>
<item>#795548</item>
<item>#D32F2F</item>
<item>#E91E63</item>
<item>#9C27B0</item>
<item>#5E35B1</item>
<item>#3F51B5</item>
<item>#1976D2</item>
<item>#03A9F4</item>
<item>#00BCD4</item>
<item>#e57373</item>
<item>#ef5350</item>
<item>#f44336</item>
<item>#e53935</item>
<item>#d32f2f</item>
<item>#c62828</item>
<item>#b71c1c</item>
<item>#f06292</item>
<item>#ec407a</item>
<item>#e91e63</item>
<item>#d81b60</item>
<item>#c2185b</item>
<item>#ad1457</item>
<item>#880e4f</item>
<item>#ba68c8</item>
<item>#ab47bc</item>
<item>#9c27b0</item>
<item>#8e24aa</item>
<item>#7b1fa2</item>
<item>#6a1b9a</item>
<item>#4a148c</item>
<item>#9575cd</item>
<item>#7e57c2</item>
<item>#673ab7</item>
<item>#5e35b1</item>
<item>#512da8</item>
<item>#4527a0</item>
<item>#311b92</item>
<item>#7986cb</item>
<item>#5c6bc0</item>
<item>#3f51b5</item>
<item>#3949ab</item>
<item>#303f9f</item>
<item>#283593</item>
<item>#1a237e</item>
<item>#64b5f6</item>
<item>#42a5f5</item>
<item>#2196f3</item>
<item>#1e88e5</item>
<item>#1976d2</item>
<item>#1565c0</item>
<item>#0d47a1</item>
<item>#4fc3f7</item>
<item>#29b6f6</item>
<item>#03a9f4</item>
<item>#039be5</item>
<item>#0288d1</item>
<item>#0277bd</item>
<item>#01579b</item>
<item>#4dd0e1</item>
<item>#26c6da</item>
<item>#00bcd4</item>
<item>#00acc1</item>
<item>#0097a7</item>
<item>#00838f</item>
<item>#006064</item>
<item>#4db6ac</item>
<item>#26a69a</item>
<item>#009688</item>
<item>#43A047</item>
<item>#7CB342</item>
<item>#C0CA33</item>
<item>#FBC02D</item>
<item>#FFB300</item>
<item>#FB8C00</item>
<item>#F4511E</item>
<item>#00897b</item>
<item>#00796b</item>
<item>#00695c</item>
<item>#004d40</item>
<item>#81c784</item>
<item>#66bb6a</item>
<item>#4caf50</item>
<item>#43a047</item>
<item>#388e3c</item>
<item>#2e7d32</item>
<item>#1b5e20</item>
<item>#aed581</item>
<item>#9ccc65</item>
<item>#8bc34a</item>
<item>#7cb342</item>
<item>#689f38</item>
<item>#558b2f</item>
<item>#33691e</item>
<item>#dce775</item>
<item>#d4e157</item>
<item>#cddc39</item>
<item>#c0ca33</item>
<item>#afb42b</item>
<item>#9e9d24</item>
<item>#827717</item>
<item>#fff176</item>
<item>#ffee58</item>
<item>#ffeb3b</item>
<item>#fdd835</item>
<item>#fbc02d</item>
<item>#f9a825</item>
<item>#f57f17</item>
<item>#ffd54f</item>
<item>#ffca28</item>
<item>#ffc107</item>
<item>#ffb300</item>
<item>#ffa000</item>
<item>#ff8f00</item>
<item>#ff6f00</item>
<item>#ffb74d</item>
<item>#ffa726</item>
<item>#ff9800</item>
<item>#fb8c00</item>
<item>#f57c00</item>
<item>#ef6c00</item>
<item>#e65100</item>
<item>#ff8a65</item>
<item>#ff7043</item>
<item>#ff5722</item>
<item>#f4511e</item>
<item>#e64a19</item>
<item>#d84315</item>
<item>#bf360c</item>
<item>#a1887f</item>
<item>#8d6e63</item>
<item>#795548</item>
<item>#6d4c41</item>
<item>#5d4037</item>
<item>#4e342e</item>
<item>#3e2723</item>
<item>#e0e0e0</item>
<item>#bdbdbd</item>
<item>#9e9e9e</item>
<item>#757575</item>
<item>#616161</item>
<item>#424242</item>
<item>#212121</item>
<item>#90a4ae</item>
<item>#78909c</item>
<item>#607d8b</item>
<item>#546e7a</item>
<item>#455a64</item>
<item>#37474f</item>
<item>#263238</item>
</array>
<array name="colors_accent">
<item>#3F51B5</item>
<item>#9E9E9E</item>
<item>#607D8B</item>
<item>#795548</item>
<item>#D32F2F</item>
<item>#E91E63</item>
<item>#FF4081</item>
<item>#9C27B0</item>
<item>#5E35B1</item>
<item>#1976D2</item>
<item>#03A9F4</item>
<item>#00BCD4</item>
<item>#009688</item>
<item>#43A047</item>
<item>#7CB342</item>
<item>#C0CA33</item>
<item>#FBC02D</item>
<item>#FFB300</item>
<item>#FB8C00</item>
<item>#F4511E</item>
<item>#FFFFFF</item>
<item>#ff8a80</item>
<item>#ff5252</item>
<item>#ff1744</item>
<item>#d50000</item>
<item>#ff80ab</item>
<item>#ff4081</item>
<item>#f50057</item>
<item>#c51162</item>
<item>#ea80fc</item>
<item>#e040fb</item>
<item>#d500f9</item>
<item>#aa00ff</item>
<item>#b388ff</item>
<item>#7c4dff</item>
<item>#651fff</item>
<item>#6200ea</item>
<item>#8c9eff</item>
<item>#536dfe</item>
<item>#3d5afe</item>
<item>#304ffe</item>
<item>#82b1ff</item>
<item>#448aff</item>
<item>#2979ff</item>
<item>#2962ff</item>
<item>#80d8ff</item>
<item>#40c4ff</item>
<item>#00b0ff</item>
<item>#0091ea</item>
<item>#84ffff</item>
<item>#18ffff</item>
<item>#00e5ff</item>
<item>#00b8d4</item>
<item>#a7ffeb</item>
<item>#64ffda</item>
<item>#1de9b6</item>
<item>#00bfa5</item>
<item>#b9f6ca</item>
<item>#69f0ae</item>
<item>#00e676</item>
<item>#00c853</item>
<item>#ccff90</item>
<item>#b2ff59</item>
<item>#76ff03</item>
<item>#64dd17</item>
<item>#f4ff81</item>
<item>#eeff41</item>
<item>#c6ff00</item>
<item>#aeea00</item>
<item>#ffff8d</item>
<item>#ffff00</item>
<item>#ffea00</item>
<item>#ffd600</item>
<item>#ffe57f</item>
<item>#ffd740</item>
<item>#ffc400</item>
<item>#ffab00</item>
<item>#ffd180</item>
<item>#ffab40</item>
<item>#ff9100</item>
<item>#ff6d00</item>
<item>#ff9e80</item>
<item>#ff6e40</item>
<item>#ff3d00</item>
<item>#dd2c00</item>
<item>#fff</item>
<item>#000</item>
</array>
</resources>

View file

@ -2,22 +2,16 @@
<resources>
<attr name="title_text_color" format="color" />
<attr name="caption_text_color" format="color" />
<attr name="nav_drawer_icon_color" format="color" />
<attr name="music_controller_container_color" format="color" />
<attr name="navigation_drawer_background_color" format="color" />
<attr name="inset_divider" 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="themed_drawable_color" format="color" />
<attr name="check_mark_color" format="color" />
<attr name="default_bar_color" format="color" />

View file

@ -5,8 +5,8 @@
<color name="indigo_500">#3f51b5</color>
<color name="black">#000000</color>
<color name="white">#ffffff</color>
<color name="black">#000</color>
<color name="white">#fff</color>
<color name="grey_300">#e0e0e0</color>
<color name="grey_500">#9e9e9e</color>

View file

@ -107,7 +107,6 @@
<string name="pref_title_navigation_bar">Colored navigation bar</string>
<string name="pref_title_set_default_start_page">Start page</string>
<string name="title_activity_settings">Settings</string>
<string name="pref_title_transparent_toolbar">Semi-Transparent toolbar</string>
<string name="pref_title_colored_navigation_bar_artists">Artist view</string>
<string name="pref_title_colored_navigation_bar_albums">Album view</string>
<string name="pref_title_colored_navigation_bar_current_playing">Playing view</string>
@ -136,7 +135,6 @@
<string name="playlist_name">Playlist name</string>
<string name="song">Song</string>
<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>

View file

@ -2,6 +2,9 @@
<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>
@ -13,17 +16,11 @@
<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="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="inset_divider">@color/md_divider_white</item>
<item name="nav_drawer_icon_color">#fff</item>
<item name="themed_drawable_color">@color/materialmusic_dark_themed_drawable_color</item>
<item name="check_mark_color">@color/grey_900</item>
@ -34,6 +31,9 @@
</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>
@ -45,17 +45,11 @@
<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="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="inset_divider">@color/md_divider_black</item>
<item name="nav_drawer_icon_color">#000</item>
<item name="themed_drawable_color">@color/materialmusic_themed_drawable_color</item>
<item name="check_mark_color">@color/white</item>

View file

@ -22,14 +22,6 @@
android:title="@string/accent_color"
android:summary="@string/accent_color_desc" />
<CheckBoxPreference
android:defaultValue="false"
android:key="transparent_toolbar"
android:title="@string/pref_title_transparent_toolbar"
android:summary="@string/pref_summary_transparent_toolbar"
android:layout="@layout/preference_custom"
android:widgetLayout="@layout/preference_dynamiccheckbox" />
<CheckBoxPreference
android:defaultValue="false"
android:key="opaque_toolbar_now_playing"