aboutsummaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2023-01-05 23:17:59 -0600
committerIván Ávalos <avalos@disroot.org>2023-01-05 23:17:59 -0600
commit9d85909cc46919039a5046f5aed4e91a96c6e321 (patch)
tree9774ae3ae87169d05c396db3c3970b56f10d72eb /app/src
parentcb52e6a262544590cd70180e4a2df407fa13ff44 (diff)
downloaddsub-9d85909cc46919039a5046f5aed4e91a96c6e321.tar.gz
dsub-9d85909cc46919039a5046f5aed4e91a96c6e321.tar.bz2
dsub-9d85909cc46919039a5046f5aed4e91a96c6e321.zip
Even more improvements to player UI!
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java2
-rw-r--r--app/src/main/java/github/daneren2005/dsub/view/AutoRepeatButton.java2
-rw-r--r--app/src/main/res/layout-land/download.xml37
-rw-r--r--app/src/main/res/layout-large-land/download.xml37
-rw-r--r--app/src/main/res/layout-port/download.xml28
-rw-r--r--app/src/main/res/layout/download_media_buttons.xml4
-rw-r--r--app/src/main/res/layout/download_slider.xml2
-rw-r--r--app/src/main/res/layout/download_song_status.xml33
-rw-r--r--app/src/main/res/values-large/dimens.xml2
-rw-r--r--app/src/main/res/values/dimens.xml2
-rw-r--r--app/src/main/res/values/strings.xml4
-rw-r--r--app/src/main/res/values/styles.xml6
12 files changed, 69 insertions, 90 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
index f1b2b9c8..1be883a0 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
@@ -1381,7 +1381,7 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
if(entry.getAlbum() != null) {
String artist = "";
if (entry.getArtist() != null) {
- artist = currentPlaying.getSong().getArtist() + " - ";
+ artist = currentPlaying.getSong().getArtist() + " • ";
}
statusTextView.setText(artist + entry.getAlbum());
} else {
diff --git a/app/src/main/java/github/daneren2005/dsub/view/AutoRepeatButton.java b/app/src/main/java/github/daneren2005/dsub/view/AutoRepeatButton.java
index 3c59dd37..c66f383f 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/AutoRepeatButton.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/AutoRepeatButton.java
@@ -6,7 +6,7 @@ import android.view.MotionEvent;
import android.view.View;
import android.widget.ImageButton;
-public class AutoRepeatButton extends ImageButton {
+public class AutoRepeatButton extends android.support.v7.widget.AppCompatImageButton {
private static final long initialRepeatDelay = 1000;
private static final long repeatIntervalInMilliseconds = 300;
diff --git a/app/src/main/res/layout-land/download.xml b/app/src/main/res/layout-land/download.xml
index 9a4dcade..99e29f97 100644
--- a/app/src/main/res/layout-land/download.xml
+++ b/app/src/main/res/layout-land/download.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/download_layout"
android:orientation="horizontal"
android:layout_width="match_parent"
@@ -44,7 +45,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
- android:layout_above="@+id/download_status">
+ android:layout_above="@+id/download_song_wrapper">
<LinearLayout
android:id="@+id/download_other_controls_layout"
@@ -80,33 +81,13 @@
</LinearLayout>
</LinearLayout>
- <TextView
- android:id="@+id/download_song_title"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:layout_marginLeft="12dip"
- android:layout_marginRight="12dip"
- android:singleLine="true"
- android:ellipsize="end"
- android:gravity="center_horizontal"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="?android:textColorPrimary"
- android:layout_above="@+id/download_slider_wrapper"/>
-
- <TextView
- android:id="@+id/download_status"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:layout_marginBottom="8dip"
- android:layout_marginLeft="12dip"
- android:layout_marginRight="12dip"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:textColorSecondary"
- android:layout_above="@+id/download_song_title"/>
+ <FrameLayout
+ android:id="@+id/download_song_wrapper"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@id/download_slider_wrapper">
+ <include layout="@layout/download_song_status" />
+ </FrameLayout>
<LinearLayout
android:id="@+id/download_media_buttons_wrapper"
diff --git a/app/src/main/res/layout-large-land/download.xml b/app/src/main/res/layout-large-land/download.xml
index c773e1fe..fb356a70 100644
--- a/app/src/main/res/layout-large-land/download.xml
+++ b/app/src/main/res/layout-large-land/download.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/download_layout"
android:orientation="horizontal"
android:layout_width="match_parent"
@@ -34,7 +35,7 @@
android:id="@+id/download_playlist_flipper"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:layout_above="@+id/download_song_title">
+ android:layout_above="@+id/download_song_wrapper">
<RelativeLayout
android:id="@+id/download_other_controls_wrapper"
@@ -82,33 +83,13 @@
</ViewFlipper>
- <TextView
- android:id="@+id/download_song_title"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:layout_marginLeft="12dip"
- android:layout_marginRight="12dip"
- android:singleLine="true"
- android:ellipsize="end"
- android:gravity="center_horizontal"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="?android:textColorPrimary"
- android:layout_above="@+id/download_status"/>
-
- <TextView
- android:id="@+id/download_status"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:layout_marginBottom="8dip"
- android:layout_marginLeft="12dip"
- android:layout_marginRight="12dip"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:textColorSecondary"
- android:layout_above="@+id/download_slider_wrapper"/>
+ <FrameLayout
+ android:id="@+id/download_song_wrapper"
+ android:layout_above="@+id/download_slider_wrapper"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <include layout="@layout/download_song_status" />
+ </FrameLayout>
<LinearLayout
android:id="@+id/download_media_buttons_wrapper"
diff --git a/app/src/main/res/layout-port/download.xml b/app/src/main/res/layout-port/download.xml
index 9f9fa40f..f1c630f0 100644
--- a/app/src/main/res/layout-port/download.xml
+++ b/app/src/main/res/layout-port/download.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/download_layout_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -32,7 +33,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_margin="16dp">
+ android:layout_margin="18dp">
<FrameLayout android:orientation="vertical"
android:layout_width="match_parent"
@@ -87,30 +88,7 @@
</github.daneren2005.dsub.view.CardView>
</FrameLayout>
- <TextView
- android:id="@+id/download_status"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:layout_marginTop="6dp"
- android:singleLine="true"
- android:ellipsize="end"
- style="?attr/actionbarSubtitleStyle"
- android:textColor="?android:textColorSecondary"/>
-
- <TextView
- android:id="@+id/download_song_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:singleLine="true"
- android:textStyle="bold"
- style="?attr/actionbarTitleStyle"
- android:textColor="?android:textColorPrimary"/>
+ <include layout="@layout/download_song_status" />
</LinearLayout>
<include layout="@layout/download_playlist"/>
diff --git a/app/src/main/res/layout/download_media_buttons.xml b/app/src/main/res/layout/download_media_buttons.xml
index 60cd5c78..06db43c3 100644
--- a/app/src/main/res/layout/download_media_buttons.xml
+++ b/app/src/main/res/layout/download_media_buttons.xml
@@ -4,8 +4,8 @@
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:paddingVertical="15dp"
- android:paddingHorizontal="9dp">
+ android:paddingVertical="22dp"
+ android:paddingHorizontal="18dp">
<ImageButton
style="@style/PlaybackControl.Small"
diff --git a/app/src/main/res/layout/download_slider.xml b/app/src/main/res/layout/download_slider.xml
index d50262c1..de996b5e 100644
--- a/app/src/main/res/layout/download_slider.xml
+++ b/app/src/main/res/layout/download_slider.xml
@@ -6,7 +6,7 @@
android:layout_width="fill_parent"
android:background="@android:color/transparent"
android:layout_marginTop="15dip"
- android:layout_marginHorizontal="14dp">
+ android:layout_marginHorizontal="18dp">
<TextView
android:id="@+id/download_position"
diff --git a/app/src/main/res/layout/download_song_status.xml b/app/src/main/res/layout/download_song_status.xml
new file mode 100644
index 00000000..50f95208
--- /dev/null
+++ b/app/src/main/res/layout/download_song_status.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_marginVertical="16dp"
+ android:orientation="vertical"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <TextView
+ android:id="@+id/download_song_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
+ android:singleLine="true"
+ android:textStyle="bold"
+ style="@style/DownloadActionSongTitle"
+ android:textColor="?android:textColorPrimary"
+ tools:text="Entropy"/>
+ <TextView
+ android:id="@+id/download_status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
+ android:layout_marginTop="6dp"
+ android:singleLine="true"
+ android:ellipsize="end"
+ style="@style/DownloadActionStatus"
+ android:textColor="?android:textColorSecondary"
+ tools:text="Beach Bunny - Emotional Creature"/>
+</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml
index faf88b3e..9ccbb6bc 100644
--- a/app/src/main/res/values-large/dimens.xml
+++ b/app/src/main/res/values-large/dimens.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="Button">64dip</dimen>
- <dimen name="Button.Large">74dip</dimen>
+ <dimen name="Button.Large">80dip</dimen>
<dimen name="Button.Small">54dip</dimen>
<dimen name="AlbumArt.Small">96dip</dimen>
<dimen name="AlbumArt.Header">210dip</dimen>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 41a02797..17f3aead 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="Button">54dip</dimen>
- <dimen name="Button.Large">65dip</dimen>
+ <dimen name="Button.Large">70dip</dimen>
<dimen name="Button.Small">42dip</dimen>
<dimen name="AlbumArt.Small">78dip</dimen>
<dimen name="AlbumArt.Header">120dip</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ea2b4f1a..9a1e4203 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -135,7 +135,7 @@
<string name="search.albums">Albums</string>
<string name="search.songs">Songs</string>
- <string name="progress.wait">Please wait...</string>
+ <string name="progress.wait">Please wait…</string>
<string name="progress.artist_info">Loading Artist Bio</string>
<string name="select_album.n_selected">%d selected.</string>
@@ -179,7 +179,7 @@
<string name="download.empty">Playlist is empty</string>
<string name="download.shuffle_loading">Shuffle list is loading...</string>
- <string name="download.playerstate_downloading">Downloading - %s</string>
+ <string name="download.playerstate_downloading">Downloading • %s</string>
<string name="download.playerstate_mobile_disabled">Waiting for WiFi or local (non-roaming) network to download</string>
<string name="download.playerstate_buffering">Buffering</string>
<string name="download.playerstate_playing_shuffle">Shuffle mode</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 04d92fa5..39e87aea 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -73,6 +73,12 @@
<item name="android:layout_weight">1</item>
</style>
+ <style name="DownloadActionSongTitle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse">
+ <item name="android:textSize">22sp</item>
+ </style>
+
+ <style name="DownloadActionStatus" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse" />
+
<style name="DownloadActionButton" parent="@style/BasicButton">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>