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

Updated Music Controller Activitys design

Browse source
This commit is contained in:
Karim Abou Zeid 2015-02-20 22:06:48 +01:00
commit 5a1235df66
3 changed files with 39 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -121,18 +121,18 @@
<RelativeLayout <RelativeLayout
android:id="@+id/media_controller_container" android:id="@+id/media_controller_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="88dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_margin="16dp" android:layout_margin="16dp"
android:background="?attr/music_controller_container_color" android:background="?attr/music_controller_container_color"
android:elevation="1dp"> android:elevation="2dp"
android:padding="8dp">
<com.melnykov.fab.FloatingActionButton <com.melnykov.fab.FloatingActionButton
android:id="@+id/fab" android:id="@+id/fab"
style="@style/PlayPauseFab" style="@style/PlayPauseFab"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
/> />
<ImageButton <ImageButton
@ -140,8 +140,9 @@
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="56dp" android:layout_height="56dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/fab" android:layout_toLeftOf="@+id/fab"
android:background="?android:attr/selectableItemBackground" android:background="?round_selector"
android:padding="14dp" android:padding="14dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_skip_previous_white_48dp"/> android:src="@drawable/ic_skip_previous_white_48dp"/>
@ -151,8 +152,9 @@
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="56dp" android:layout_height="56dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toRightOf="@+id/fab" android:layout_toRightOf="@+id/fab"
android:background="?android:attr/selectableItemBackground" android:background="?round_selector"
android:padding="14dp" android:padding="14dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_skip_next_white_48dp"/> android:src="@drawable/ic_skip_next_white_48dp"/>
@ -163,8 +165,8 @@
android:layout_height="56dp" android:layout_height="56dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_margin="8dp"
android:background="?android:attr/selectableItemBackground" android:background="?round_selector"
android:padding="14dp" android:padding="14dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_repeat_grey600_48dp"/> android:src="@drawable/ic_repeat_grey600_48dp"/>
@ -175,8 +177,8 @@
android:layout_height="56dp" android:layout_height="56dp"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_margin="8dp"
android:background="?android:attr/selectableItemBackground" android:background="?round_selector"
android:padding="14dp" android:padding="14dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_shuffle_grey600_48dp"/> android:src="@drawable/ic_shuffle_grey600_48dp"/>
@ -196,7 +198,6 @@
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar

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

@ -5,10 +5,11 @@
android:orientation="vertical" android:orientation="vertical"
tools:context="com.kabouzeid.materialmusic.ui.activities.AlbumDetailActivity$PlaceholderFragment"> tools:context="com.kabouzeid.materialmusic.ui.activities.AlbumDetailActivity$PlaceholderFragment">
<com.kabouzeid.materialmusic.view.SquareImageView <ImageView
android:id="@+id/album_art" android:id="@+id/album_art"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_above="@+id/footer"
android:background="@color/black" android:background="@color/black"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/default_album_art" android:src="@drawable/default_album_art"
@ -59,7 +60,7 @@
android:id="@+id/footer" android:id="@+id/footer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/album_art" android:layout_above="@+id/media_controller_container"
android:background="?attr/colorPrimary" android:background="?attr/colorPrimary"
android:elevation="1dp" android:elevation="1dp"
android:orientation="vertical" android:orientation="vertical"
@ -67,10 +68,9 @@
android:paddingLeft="72dp" android:paddingLeft="72dp"
android:paddingRight="72dp" android:paddingRight="72dp"
android:paddingTop="16dp" android:paddingTop="16dp"
android:transitionName="@string/transition_album_text" android:transitionName="@string/transition_album_text">
>
<TextView <TextView
android:id="@+id/song_title" android:id="@+id/song_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -93,13 +93,13 @@
<RelativeLayout <RelativeLayout
android:id="@+id/media_controller_container" android:id="@+id/media_controller_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_below="@+id/footer"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_margin="16dp" android:layout_margin="16dp"
android:background="?attr/music_controller_container_color" android:background="?attr/music_controller_container_color"
android:elevation="1dp"> android:elevation="2dp"
android:padding="8dp">
<com.melnykov.fab.FloatingActionButton <com.melnykov.fab.FloatingActionButton
android:id="@+id/fab" android:id="@+id/fab"
@ -109,49 +109,49 @@
<ImageButton <ImageButton
android:id="@+id/prev_button" android:id="@+id/prev_button"
android:layout_width="56dp" android:layout_width="72dp"
android:layout_height="56dp" android:layout_height="72dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_margin="8dp"
android:layout_toLeftOf="@+id/fab" android:layout_toLeftOf="@+id/fab"
android:background="?round_selector" android:background="?round_selector"
android:padding="14dp" android:padding="22dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_skip_previous_white_48dp"/> android:src="@drawable/ic_skip_previous_white_48dp"/>
<ImageButton <ImageButton
android:id="@+id/next_button" android:id="@+id/next_button"
android:layout_width="56dp" android:layout_width="72dp"
android:layout_height="56dp" android:layout_height="72dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_margin="8dp"
android:layout_toRightOf="@+id/fab" android:layout_toRightOf="@+id/fab"
android:background="?round_selector" android:background="?round_selector"
android:padding="14dp" android:padding="22dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_skip_next_white_48dp"/> android:src="@drawable/ic_skip_next_white_48dp"/>
<ImageButton <ImageButton
android:id="@+id/repeat_button" android:id="@+id/repeat_button"
android:layout_width="56dp" android:layout_width="72dp"
android:layout_height="56dp" android:layout_height="72dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_margin="8dp"
android:background="?round_selector" android:background="?round_selector"
android:padding="14dp" android:padding="22dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_repeat_grey600_48dp"/> android:src="@drawable/ic_repeat_grey600_48dp"/>
<ImageButton <ImageButton
android:id="@+id/shuffle_button" android:id="@+id/shuffle_button"
android:layout_width="56dp" android:layout_width="72dp"
android:layout_height="56dp" android:layout_height="72dp"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_margin="8dp"
android:background="?round_selector" android:background="?round_selector"
android:padding="14dp" android:padding="22dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_shuffle_grey600_48dp"/> android:src="@drawable/ic_shuffle_grey600_48dp"/>

5
app/src/main/res/values-v21/colors.xml
View file

@ -2,6 +2,7 @@
<resources> <resources>
<color name="notification_buttons_tint">#de000000</color> <color name="notification_buttons_tint">#de000000</color>
<color name="button_selected">#D0D0D0</color> <!--must be solid colors so the ripple will not be semi transparent. Note: the color have no effect on the ripple-->
<color name="button_selected_dark">#88FFFFFF</color> <color name="button_selected">#FFFFFFFF</color>
<color name="button_selected_dark">#FFFFFFFF</color>
</resources> </resources>