From 9d85909cc46919039a5046f5aed4e91a96c6e321 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Thu, 5 Jan 2023 23:17:59 -0600 Subject: Even more improvements to player UI! --- .../dsub/fragments/NowPlayingFragment.java | 2 +- .../daneren2005/dsub/view/AutoRepeatButton.java | 2 +- app/src/main/res/layout-land/download.xml | 37 ++++++---------------- app/src/main/res/layout-large-land/download.xml | 37 ++++++---------------- app/src/main/res/layout-port/download.xml | 28 ++-------------- app/src/main/res/layout/download_media_buttons.xml | 4 +-- app/src/main/res/layout/download_slider.xml | 2 +- app/src/main/res/layout/download_song_status.xml | 33 +++++++++++++++++++ app/src/main/res/values-large/dimens.xml | 2 +- app/src/main/res/values/dimens.xml | 2 +- app/src/main/res/values/strings.xml | 4 +-- app/src/main/res/values/styles.xml | 6 ++++ 12 files changed, 69 insertions(+), 90 deletions(-) create mode 100644 app/src/main/res/layout/download_song_status.xml (limited to 'app/src') 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 @@ + android:layout_above="@+id/download_song_wrapper"> - - - + + + + android:layout_above="@+id/download_song_wrapper"> - - - + + + @@ -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"> - - - + 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"> + android:layout_marginHorizontal="18dp"> + + + + \ 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 @@ 64dip - 74dip + 80dip 54dip 96dip 210dip 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 @@ 54dip - 65dip + 70dip 42dip 78dip 120dip 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 @@ Albums Songs - Please wait... + Please wait… Loading Artist Bio %d selected. @@ -179,7 +179,7 @@ Playlist is empty Shuffle list is loading... - Downloading - %s + Downloading • %s Waiting for WiFi or local (non-roaming) network to download Buffering Shuffle mode 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 @@ 1 + + +