From 4747aa3ce45707cfe4b10153bfe86ba8140386e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Garc=C3=ADa=20Amor?= Date: Fri, 19 Mar 2021 12:27:28 +0100 Subject: [PATCH 1/3] [skip ci] Updated fastlane changelogs --- fastlane/metadata/android/en-US/changelogs/91.txt | 5 +++++ fastlane/metadata/android/es-ES/changelogs/91.txt | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/91.txt create mode 100644 fastlane/metadata/android/es-ES/changelogs/91.txt diff --git a/fastlane/metadata/android/en-US/changelogs/91.txt b/fastlane/metadata/android/en-US/changelogs/91.txt new file mode 100644 index 00000000..75853d00 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/91.txt @@ -0,0 +1,5 @@ +Bug fixes +- #395: Fixed layout to correctly display podcasts. + +Others +- #399: Convert SelectAlbumFragment to kotlin. diff --git a/fastlane/metadata/android/es-ES/changelogs/91.txt b/fastlane/metadata/android/es-ES/changelogs/91.txt new file mode 100644 index 00000000..7f8988c8 --- /dev/null +++ b/fastlane/metadata/android/es-ES/changelogs/91.txt @@ -0,0 +1,5 @@ +Bug fixes +- #395: Corregido el diseño para mostrar correctamente los podcasts. + +Others +- #399: Se ha convertido SelectAlbumFragment a kotlin. From 6a53644355384e3607166924ace37b94d08be9b8 Mon Sep 17 00:00:00 2001 From: Nite Date: Fri, 19 Mar 2021 17:47:32 +0100 Subject: [PATCH 2/3] Fixed Next button behavior when Repeat All is enabled --- .../moire/ultrasonic/fragment/PlayerFragment.java | 11 ++--------- .../service/MediaPlayerControllerImpl.java | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/PlayerFragment.java b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/PlayerFragment.java index 66518b05..0c454557 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/PlayerFragment.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/PlayerFragment.java @@ -304,15 +304,8 @@ public class PlayerFragment extends Fragment implements GestureDetector.OnGestur @Override protected Boolean doInBackground() { - if (mediaPlayerControllerLazy.getValue().getCurrentPlayingNumberOnPlaylist() < mediaPlayerControllerLazy.getValue().getPlaylistSize() - 1) - { - mediaPlayerControllerLazy.getValue().next(); - return true; - } - else - { - return false; - } + mediaPlayerControllerLazy.getValue().next(); + return true; } @Override diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerControllerImpl.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerControllerImpl.java index 0c173960..d5bffc02 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerControllerImpl.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerControllerImpl.java @@ -458,7 +458,20 @@ public class MediaPlayerControllerImpl implements MediaPlayerController int index = downloader.getCurrentPlayingIndex(); if (index != -1) { - play(index + 1); + switch (getRepeatMode()) + { + case SINGLE: + case OFF: + if (index + 1 >= 0 && index + 1 < downloader.downloadList.size()) { + play(index + 1); + } + break; + case ALL: + play((index + 1) % downloader.downloadList.size()); + break; + default: + break; + } } } From ef29f26893d2abb310c15a950118e18be893098e Mon Sep 17 00:00:00 2001 From: Nite Date: Fri, 19 Mar 2021 19:25:34 +0100 Subject: [PATCH 3/3] Fixed Next behavior in additional places --- .../org/moire/ultrasonic/fragment/PlayerFragment.java | 9 +++------ .../ultrasonic/service/MediaPlayerLifecycleSupport.java | 5 +---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/PlayerFragment.java b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/PlayerFragment.java index 0c454557..4f009edc 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/PlayerFragment.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/PlayerFragment.java @@ -1501,12 +1501,9 @@ public class PlayerFragment extends Fragment implements GestureDetector.OnGestur if (e1X - e2X > swipeDistance && absX > swipeVelocity) { networkAndStorageChecker.getValue().warnIfNetworkOrStorageUnavailable(); - if (mediaPlayerController.getCurrentPlayingNumberOnPlaylist() < mediaPlayerController.getPlaylistSize() - 1) - { - mediaPlayerController.next(); - onCurrentChanged(); - onSliderProgressChanged(); - } + mediaPlayerController.next(); + onCurrentChanged(); + onSliderProgressChanged(); return true; } diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.java index aea69afa..2e4d6984 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.java @@ -221,10 +221,7 @@ public class MediaPlayerLifecycleSupport mediaPlayerController.previous(); break; case KeyEvent.KEYCODE_MEDIA_NEXT: - if (downloader.getCurrentPlayingIndex() < downloader.downloadList.size() - 1) - { - mediaPlayerController.next(); - } + mediaPlayerController.next(); break; case KeyEvent.KEYCODE_MEDIA_STOP: mediaPlayerController.stop();