Landscape artist view & new progress slider

This commit is contained in:
Karim Abou Zeid 2015-02-09 21:26:05 +01:00
commit 85854939c4
23 changed files with 98 additions and 116 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 477 B

View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#00000000"/>
</shape>

View file

@ -0,0 +1,4 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/seekbar_thumb_pressed" android:state_pressed="false"/>
<item android:drawable="@drawable/seekbar_thumb_normal"/>
</selector>

View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
<size
android:height="10dp"
android:width="10dp"/>
<solid
android:color="@color/materialmusic_accent_color"/>
<corners
android:radius="18dp"/>
</shape>

View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
<size
android:height="18dp"
android:width="18dp"/>
<solid
android:color="@color/materialmusic_accent_color"/>
</shape>

View file

@ -14,9 +14,6 @@
android:layout_height="match_parent"
tools:context=".DrawerActivity">
<!-- As the main content view, the view below consumes the entire
space available using match_parent in both dimensions. -->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

View file

@ -159,13 +159,8 @@
<SeekBar
android:id="@+id/progress_slider"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/footer"
android:elevation="2dp"
android:padding="0dp"
android:progressTint="@color/materialmusic_accent_color"
android:thumbTint="@color/materialmusic_accent_color_darker"/>
style="@style/MusicProgressSlider"
android:layout_above="@+id/footer"/>
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"

View file

@ -0,0 +1,5 @@
<resources>
<dimen name="title_view_height">56dp</dimen>
<dimen name="header_image_height">180dp</dimen>
</resources>

View file

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="statusMargin">25dp</dimen>
<dimen name="navigation_drawer_image_height">189dp</dimen>
<dimen name="navigation_drawer_width">304dp</dimen>
</resources>

View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="statusMargin">25dp</dimen>
<dimen name="navigation_drawer_image_height">189dp</dimen>
<dimen name="navigation_drawer_width">304dp</dimen>
</resources>

View file

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="statusMargin">25dp</dimen>
<dimen name="navigation_drawer_image_height">189dp</dimen>
<dimen name="navigation_drawer_width">304dp</dimen>
</resources>

View file

@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="statusMargin">25dp</dimen>
<dimen name="navigation_drawer_width">304dp</dimen>
</resources>

View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="statusMargin">25dp</dimen>
<dimen name="navigation_drawer_image_height">165dp</dimen>
</resources>

View file

@ -21,4 +21,11 @@
<item name="android:background">@drawable/notification_selector</item>
<item name="android:tint">@color/notification_buttons_tint</item>
</style>
<style name="MusicProgressSlider" parent="MusicProgressSliderParent">
<item name="android:elevation">2dp</item>
<item name="android:thumbTint">@color/materialmusic_accent_color</item>
<item name="android:progressTint">@color/materialmusic_accent_color_darker</item>
<item name="android:padding">0dp</item>
</style>
</resources>

View file

@ -37,4 +37,10 @@
<style name="NotificationButton" parent="NotificationButtonParent">
<item name="android:background">?android:attr/selectableItemBackground</item>
</style>
<style name="MusicProgressSlider" parent="MusicProgressSliderParent">
<item name="android:progressDrawable">@drawable/seekbar_progress</item>
<item name="android:thumb">@drawable/seekbar_thumb</item>
</style>
</resources>

View file

@ -49,8 +49,6 @@
<style name="PlayPauseFabParent">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:scaleType">fitCenter</item>
<item name="android:padding">14dp</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>
@ -63,4 +61,10 @@
<item name="android:layout_gravity">center</item>
<item name="android:layout_weight">1</item>
</style>
<style name="MusicProgressSliderParent">
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">wrap_content</item>
</style>
</resources>