Funkwhale
/
Otter-App-Android-Funkwhale
mirror of https://github.com/apognu/otter
1
0
Fork 0
Code Issues Releases Wiki Activity

Reorganized Now Playing view to be more legible.

This commit is contained in:
Antoine POPINEAU 2020-07-11 19:24:38 +02:00
parent 308e7d7567
commit 8d7836172b
No known key found for this signature in database
GPG Key ID: A78AC64694F84063
5 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/res/drawable/circle.xml Normal file
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">
<solid android:color="@color/elevatedSurface" />
<padding android:top="5dp" android:left="5dp" android:right="5dp" android:bottom="5dp" />
</shape>

7
app/src/main/res/layout-land/partial_now_playing.xml
View File

@ -5,6 +5,7 @@
android:id="@+id/now_playing_root" android:id="@+id/now_playing_root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/elevatedSurface"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
@ -97,10 +98,10 @@
android:id="@+id/now_playing_details" android:id="@+id/now_playing_details"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="32dp"
android:paddingEnd="32dp"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="16dp"> android:paddingStart="32dp"
android:paddingTop="16dp"
android:paddingEnd="32dp">
<TextView <TextView
android:id="@+id/now_playing_details_title" android:id="@+id/now_playing_details_title"

60
app/src/main/res/layout/partial_now_playing.xml
View File

@ -5,6 +5,7 @@
android:id="@+id/now_playing_root" android:id="@+id/now_playing_root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/elevatedSurface"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
@ -126,18 +127,10 @@
android:layout_height="32dp" android:layout_height="32dp"
android:layout_gravity="top|end" android:layout_gravity="top|end"
android:layout_margin="8dp" android:layout_margin="8dp"
android:background="@drawable/circle"
android:contentDescription="@string/alt_track_info" android:contentDescription="@string/alt_track_info"
android:src="@drawable/more" /> android:src="@drawable/more"
android:tint="@color/controlForeground" />
<ImageButton
android:id="@+id/now_playing_details_favorite"
style="@style/IconButton"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="bottom|end"
android:layout_margin="8dp"
android:contentDescription="@string/alt_album_cover"
android:src="@drawable/favorite" />
</FrameLayout> </FrameLayout>
@ -150,19 +143,44 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="16dp"> android:paddingTop="16dp">
<TextView <LinearLayout
android:id="@+id/now_playing_details_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/itemTitle" android:orientation="horizontal">
android:textSize="18sp"
tools:text="Supermassive Black Hole" />
<TextView <LinearLayout
android:id="@+id/now_playing_details_artist" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_weight="1"
tools:text="Muse" /> android:orientation="vertical">
<TextView
android:id="@+id/now_playing_details_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/itemTitle"
android:textSize="18sp"
tools:text="Supermassive Black Hole" />
<TextView
android:id="@+id/now_playing_details_artist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="Muse" />
</LinearLayout>
<ImageButton
android:id="@+id/now_playing_details_favorite"
style="@style/IconButton"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="bottom|end"
android:layout_margin="8dp"
android:contentDescription="@string/alt_album_cover"
android:src="@drawable/favorite" />
</LinearLayout>
<SeekBar <SeekBar
android:id="@+id/now_playing_details_progress" android:id="@+id/now_playing_details_progress"

1
app/src/main/res/values-night/colors.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="surface">#121212</color> <color name="surface">#121212</color>
<color name="elevatedSurface">#191919</color>
<color name="colorPrimary">#283f4e</color> <color name="colorPrimary">#283f4e</color>
<color name="colorAccent">#f1b44f</color> <color name="colorAccent">#f1b44f</color>

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

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="surface">@android:color/background_light</color> <color name="surface">@android:color/background_light</color>
<color name="elevatedSurface">@android:color/background_light</color>
<color name="colorPrimary">#327eae</color> <color name="colorPrimary">#327eae</color>
<color name="colorPrimaryDark">#3d3e40</color> <color name="colorPrimaryDark">#3d3e40</color>