Funkwhale
/
Audinaut-subsonic-app-android
mirror of https://github.com/nvllsvm/Audinaut
1
0
Fork 0
Code Issues Releases Wiki Activity

Update now playing layout

This commit is contained in:
Andrew Rabert 2019-03-19 00:12:47 -04:00
parent b213a99e7c
commit ca15682a5e
6 changed files with 63 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/res/drawable/gradient.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<gradient
android:angle="270"
android:startColor="#00000000"
android:centerColor="#00000000"
android:endColor="#bb000000"
android:type="linear"/>
</shape>
</item>
</selector>

53
app/src/main/res/layout/download.xml
View File

@ -3,7 +3,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<net.nullsum.audinaut.view.RecyclingImageView
android:id="@+id/download_album_art_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
<LinearLayout <LinearLayout
android:background="@drawable/gradient"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:orientation="vertical">
@ -25,12 +32,6 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"> android:layout_weight="1">
<net.nullsum.audinaut.view.RecyclingImageView
android:id="@+id/download_album_art_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
<net.nullsum.audinaut.view.RecyclingImageView <net.nullsum.audinaut.view.RecyclingImageView
android:id="@+id/download_album_art_image" android:id="@+id/download_album_art_image"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -39,15 +40,24 @@
</RelativeLayout> </RelativeLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/download_overlay_buttons" android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom" android:background="#000000"
android:background="@color/overlayColor" android:orientation="vertical">
android:gravity="center"
android:orientation="horizontal" <include layout="@layout/download_playlist" />
android:visibility="invisible" /> </LinearLayout>
</ViewFlipper>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingBottom="20dp"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/download_status" android:id="@+id/download_status"
@ -73,14 +83,19 @@
android:maxLines="1" android:maxLines="1"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> <LinearLayout
android:id="@+id/download_overlay_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:background="@color/overlayColor"
android:gravity="center"
android:orientation="horizontal"
android:visibility="invisible" />
<include layout="@layout/download_playlist" />
</ViewFlipper>
<include layout="@layout/download_media_buttons" />
<include layout="@layout/download_slider" /> <include layout="@layout/download_slider" />
<include layout="@layout/download_media_buttons" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>

6
app/src/main/res/layout/download_media_buttons.xml
View File

@ -29,21 +29,21 @@
<ImageButton <ImageButton
android:id="@+id/download_pause" android:id="@+id/download_pause"
style="@style/PlaybackControl.Large" style="@style/PlaybackControl.Larger"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:src="?attr/media_button_pause" android:src="?attr/media_button_pause"
android:visibility="invisible" /> android:visibility="invisible" />
<ImageButton <ImageButton
android:id="@+id/download_stop" android:id="@+id/download_stop"
style="@style/PlaybackControl.Large" style="@style/PlaybackControl.Larger"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:src="?attr/media_button_stop" android:src="?attr/media_button_stop"
android:visibility="invisible" /> android:visibility="invisible" />
<ImageButton <ImageButton
android:id="@+id/download_start" android:id="@+id/download_start"
style="@style/PlaybackControl.Large" style="@style/PlaybackControl.Larger"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:src="?attr/media_button_start" /> android:src="?attr/media_button_start" />

5
app/src/main/res/layout/download_slider.xml
View File

@ -3,7 +3,10 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:paddingBottom="10dip"> android:layout_marginTop="15dp"
android:layout_marginBottom="5dp"
android:paddingLeft="10dip"
android:paddingRight="10dip">
<TextView <TextView
android:id="@+id/download_position" android:id="@+id/download_position"

1
app/src/main/res/values/dimens.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<dimen name="Button">54dip</dimen> <dimen name="Button">54dip</dimen>
<dimen name="Button.Larger">80dip</dimen>
<dimen name="Button.Large">60dip</dimen> <dimen name="Button.Large">60dip</dimen>
<dimen name="Button.Small">42dip</dimen> <dimen name="Button.Small">42dip</dimen>
<dimen name="AlbumArt.Small">78dip</dimen> <dimen name="AlbumArt.Small">78dip</dimen>

5
app/src/main/res/values/styles.xml
View File

@ -66,6 +66,11 @@
<item name="android:paddingRight">3dp</item> <item name="android:paddingRight">3dp</item>
</style> </style>
<style name="PlaybackControl.Larger" parent="@style/PlaybackControl">
<item name="android:layout_width">@dimen/Button.Larger</item>
<item name="android:layout_height">@dimen/Button.Larger</item>
</style>
<style name="PlaybackControl.Match" parent="@style/PlaybackControl"> <style name="PlaybackControl.Match" parent="@style/PlaybackControl">
<item name="android:layout_height">match_parent</item> <item name="android:layout_height">match_parent</item>
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>