Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1376 from prathameshmm02/dev

Browse source 
Bug fixes
This commit is contained in:
Daksh P. Jain 2022-06-09 21:46:28 +05:30 • committed by GitHub
commit c5e5643164
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 203 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/build.gradle
View file

@ -14,7 +14,7 @@ android {
vectorDrawables.useSupportLibrary = true
applicationId "code.name.monkey.retromusic"
versionCode 10590
versionCode 10591
versionName '6.0.0-beta'
buildConfigField("String", "GOOGLE_PLAY_LICENSING_KEY", "\"${getProperty(getProperties('../public.properties'), 'GOOGLE_PLAY_LICENSE_KEY')}\"")
@ -125,7 +125,7 @@ dependencies {
def retrofit_version = '2.9.0'
implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.7'
implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.8'
def material_dialog_version = "3.3.0"
implementation "com.afollestad.material-dialogs:core:$material_dialog_version"
@ -167,5 +167,4 @@ dependencies {
implementation 'me.zhanghai.android.fastscroll:library:1.1.8'
implementation 'cat.ereza:customactivityoncrash:2.4.0'
implementation 'me.tankery.lib:circularSeekBar:1.4.0'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
}

15
app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt
View file

@ -77,14 +77,6 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics) {
baseUrl += query
return baseUrl
}
private val syairSearchLrcUrl: String
get() {
var baseUrl = "https://www.syair.info/search?"
var query = song.title + "+" + song.artistName
query = "q=" + query.replace(" ", "+")
baseUrl += query
return baseUrl
}
private lateinit var normalLyricsLauncher: ActivityResultLauncher<IntentSenderRequest>
private lateinit var newSyncedLyricsLauncher: ActivityResultLauncher<Intent>
@ -201,12 +193,7 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics) {
override fun onMenuItemSelected(item: MenuItem): Boolean {
if (item.itemId == R.id.action_search) {
openUrl(when (binding.lyricsPager.currentItem) {
0 -> syairSearchLrcUrl
1 -> googleSearchLrcUrl
else -> googleSearchLrcUrl
}
)
openUrl(googleSearchLrcUrl)
}
return false
}

4
app/src/main/java/code/name/monkey/retromusic/service/AudioFader.kt
View file

@ -3,8 +3,6 @@ package code.name.monkey.retromusic.service
import android.animation.Animator
import android.animation.ValueAnimator
import android.media.MediaPlayer
import android.os.Handler
import android.os.Looper
import androidx.core.animation.doOnEnd
import code.name.monkey.retromusic.service.playback.Playback
import code.name.monkey.retromusic.util.PreferenceUtil
@ -59,9 +57,7 @@ class AudioFader {
animator.doOnEnd {
callback.run()
}
Handler(Looper.getMainLooper()).post {
animator.start()
}
}
}
}

12
app/src/main/java/code/name/monkey/retromusic/service/CastPlayer.kt
View file

@ -33,15 +33,19 @@ class CastPlayer(castSession: CastSession) : Playback,
override var callbacks: Playback.PlaybackCallbacks? = null
override fun setDataSource(song: Song, force: Boolean): Boolean {
return try {
override fun setDataSource(
song: Song,
force: Boolean,
completion: (success: Boolean) -> Unit,
) {
try {
val mediaLoadOptions =
MediaLoadOptions.Builder().setPlayPosition(0).setAutoplay(true).build()
remoteMediaClient?.load(song.toMediaInfo()!!, mediaLoadOptions)
true
completion(true)
} catch (e: Exception) {
e.printStackTrace()
false
completion(false)
}
}

22
app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt
View file

@ -120,17 +120,25 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
override val isPlaying: Boolean
get() = mIsInitialized && getCurrentPlayer()?.isPlaying == true
override fun setDataSource(song: Song, force: Boolean): Boolean {
override fun setDataSource(
song: Song,
force: Boolean,
completion: (success: Boolean) -> Unit,
) {
if (force) hasDataSource = false
mIsInitialized = false
/* We've already set DataSource if initialized is true in setNextDataSource */
return if (!hasDataSource) {
mIsInitialized = setDataSourceImpl(getCurrentPlayer()!!, song.uri.toString())
if (!hasDataSource) {
getCurrentPlayer()?.let {
setDataSourceImpl(it, song.uri.toString()) { success ->
mIsInitialized = success
completion(success)
}
}
hasDataSource = true
mIsInitialized
} else {
completion(true)
mIsInitialized = true
true
}
}
@ -285,8 +293,8 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
val nextSong = MusicPlayerRemote.nextSong
// Switch to other player (Crossfade) only if next song exists
if (nextSong != null) {
if (setDataSourceImpl(player, nextSong.uri.toString())) {
switchPlayer()
setDataSourceImpl(player, nextSong.uri.toString()) { success ->
if (success) switchPlayer()
}
}
}

18
app/src/main/java/code/name/monkey/retromusic/service/LocalPlayback.kt
View file

@ -109,10 +109,13 @@ abstract class LocalPlayback(val context: Context) : Playback, MediaPlayer.OnErr
* @param path The path of the file, or the http/rtsp URL of the stream you want to play
* @return True if the <code>player</code> has been prepared and is ready to play, false otherwise
*/
fun setDataSourceImpl(player: MediaPlayer, path: String): Boolean {
try {
fun setDataSourceImpl(
player: MediaPlayer,
path: String,
completion: (success: Boolean) -> Unit,
) {
player.reset()
player.setOnPreparedListener(null)
try {
if (path.startsWith("content://")) {
player.setDataSource(context, path.toUri())
} else {
@ -123,14 +126,17 @@ abstract class LocalPlayback(val context: Context) : Playback, MediaPlayer.OnErr
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
.build()
)
player.prepare()
player.setOnPreparedListener {
player.setOnPreparedListener(null)
completion(true)
}
player.prepareAsync()
} catch (e: Exception) {
completion(false)
e.printStackTrace()
return false
}
player.setOnCompletionListener(this)
player.setOnErrorListener(this)
return true
}
private fun unregisterBecomingNoisyReceiver() {

16
app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.kt
View file

@ -46,13 +46,19 @@ class MultiPlayer(context: Context) : LocalPlayback(context) {
* @param song The song object you want to play
* @return True if the `player` has been prepared and is ready to play, false otherwise
*/
override fun setDataSource(song: Song, force: Boolean): Boolean {
override fun setDataSource(
song: Song,
force: Boolean,
completion: (success: Boolean) -> Unit,
) {
isInitialized = false
isInitialized = setDataSourceImpl(mCurrentMediaPlayer, song.uri.toString())
setDataSourceImpl(mCurrentMediaPlayer, song.uri.toString()) { success ->
isInitialized = success
if (isInitialized) {
setNextDataSource(null)
}
return isInitialized
completion(isInitialized)
}
}
/**
@ -80,7 +86,8 @@ class MultiPlayer(context: Context) : LocalPlayback(context) {
mNextMediaPlayer = MediaPlayer()
mNextMediaPlayer?.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK)
mNextMediaPlayer?.audioSessionId = audioSessionId
if (setDataSourceImpl(mNextMediaPlayer!!, path)) {
setDataSourceImpl(mNextMediaPlayer!!, path) { success ->
if (success) {
try {
mCurrentMediaPlayer.setNextMediaPlayer(mNextMediaPlayer)
} catch (e: IllegalArgumentException) {
@ -104,6 +111,7 @@ class MultiPlayer(context: Context) : LocalPlayback(context) {
}
}
}
}
/**
* Starts or resumes playback.

54
app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
View file

@ -117,11 +117,6 @@ class MusicService : MediaBrowserServiceCompat(),
private var trackEndedByCrossfade = false
private val serviceScope = CoroutineScope(Job() + Main)
// Every chromecast method needs to run on main thread or you are greeted with IllegalStateException
// So it will use Main dispatcher
// And by using Default dispatcher for local playback we are reducing the burden from main thread
private val playerDispatcher get() = if (playbackManager.isLocalPlayback) Default else Main
@JvmField
var position = -1
private val appWidgetBig = AppWidgetBig.instance
@ -441,9 +436,12 @@ class MusicService : MediaBrowserServiceCompat(),
}
private fun setPosition(position: Int) {
openTrackAndPrepareNextAt(position)
openTrackAndPrepareNextAt(position) { success ->
if (success) {
notifyChange(PLAY_STATE_CHANGED)
}
}
}
private fun getPreviousPosition(force: Boolean): Int {
var newPosition = getPosition() - 1
@ -634,6 +632,8 @@ class MusicService : MediaBrowserServiceCompat(),
if (playbackManager.maybeSwitchToCrossFade(crossFadeDuration)) {
restorePlaybackState(wasPlaying, progress)
} else {
playbackManager.setCrossFadeDuration(crossFadeDuration)
}
}
ALBUM_ART_ON_LOCK_SCREEN, BLURRED_ALBUM_ART -> updateMediaSessionMetaData(::updateMediaSessionPlaybackState)
@ -757,15 +757,16 @@ class MusicService : MediaBrowserServiceCompat(),
}
@Synchronized
fun openTrackAndPrepareNextAt(position: Int): Boolean {
fun openTrackAndPrepareNextAt(position: Int, completion: (success: Boolean) -> Unit) {
this.position = position
val prepared = openCurrent()
if (prepared) {
prepareNextImpl()
}
openCurrent { success ->
completion(success)
notifyChange(META_CHANGED)
notHandledMetaChangedForCurrentTrack = false
return prepared
if (success) {
prepareNextImpl()
}
}
}
fun pause(force: Boolean = false) {
@ -794,11 +795,16 @@ class MusicService : MediaBrowserServiceCompat(),
}
fun playSongAt(position: Int) {
serviceScope.launch(playerDispatcher) {
if (openTrackAndPrepareNextAt(position)) {
// Every chromecast method needs to run on main thread or you are greeted with IllegalStateException
// So it will use Main dispatcher
// And by using Default dispatcher for local playback we are reduce the burden of main thread
serviceScope.launch(if(playbackManager.isLocalPlayback) Default else Main) {
openTrackAndPrepareNextAt(position) { success ->
if (success) {
play()
} else {
showToast(R.string.unplayable_file)
showToast(resources.getString(R.string.unplayable_file))
}
}
}
}
@ -913,14 +919,15 @@ class MusicService : MediaBrowserServiceCompat(),
originalPlayingQueue = ArrayList(restoredOriginalQueue)
playingQueue = ArrayList(restoredQueue)
position = restoredPosition
withContext(playerDispatcher) {
openCurrent()
withContext(Main) {
openCurrent {
prepareNext()
if (restoredPositionInTrack > 0) {
seek(restoredPositionInTrack)
}
notHandledMetaChangedForCurrentTrack = true
sendChangeInternal(META_CHANGED)
}
if (receivedHeadsetConnected) {
play()
receivedHeadsetConnected = false
@ -1164,18 +1171,15 @@ class MusicService : MediaBrowserServiceCompat(),
}
@Synchronized
private fun openCurrent(): Boolean {
private fun openCurrent(completion: (success: Boolean) -> Unit) {
val force = if (!trackEndedByCrossfade) {
true
} else {
trackEndedByCrossfade = false
false
}
return try {
playbackManager.setDataSource(currentSong, force)
} catch (e: Exception) {
e.printStackTrace()
false
playbackManager.setDataSource(currentSong, force) { success ->
completion(success)
}
}
@ -1189,12 +1193,14 @@ class MusicService : MediaBrowserServiceCompat(),
private fun restorePlaybackState(wasPlaying: Boolean, progress: Int) {
playbackManager.setCallbacks(this)
if (openTrackAndPrepareNextAt(position)) {
openTrackAndPrepareNextAt(position) { success ->
if (success) {
seek(progress)
if (wasPlaying) {
play()
}
}
}
playbackManager.setCrossFadeDuration(crossFadeDuration)
}

8
app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt
View file

@ -86,8 +86,12 @@ class PlaybackManager(val context: Context) {
fun seek(millis: Int): Int = playback!!.seek(millis)
fun setDataSource(song: Song, force: Boolean): Boolean {
return playback?.setDataSource(song, force) == true
fun setDataSource(
song: Song,
force: Boolean,
completion: (success: Boolean) -> Unit,
) {
playback?.setDataSource(song, force, completion)
}
fun setNextDataSource(trackUri: String) {

4
app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.kt
View file

@ -25,7 +25,9 @@ interface Playback {
val audioSessionId: Int
fun setDataSource(song: Song, force: Boolean):Boolean
fun setDataSource(
song: Song, force: Boolean, completion: (success: Boolean) -> Unit,
)
fun setNextDataSource(path: String?)

72
app/src/main/res/layout-land/fragment_adaptive_player.xml Normal file
View file

@ -0,0 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?colorSurface">
<include layout="@layout/shadow_statusbar_toolbar" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/status_bar" />
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/playerToolbar"
style="@style/Toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:contentInsetLeft="0dp"
app:contentInsetStart="0dp"
app:contentInsetStartWithNavigation="0dp"
app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
app:subtitleTextAppearance="@style/TextViewCaption"
app:titleMargin="0dp"
app:titleMarginStart="0dp"
app:titleTextAppearance="@style/TextViewSubtitle1"
tools:subtitle="@tools:sample/full_names"
tools:title="@tools:sample/full_names" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_album_full_card_cover" />
<androidx.fragment.app.FragmentContainerView
android:id="@+id/cover_lyrics"
android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:elevation="20dp" />
</FrameLayout>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
tools:layout="@layout/fragment_adaptive_player_playback_controls" />
</LinearLayout>
</LinearLayout>
</FrameLayout>

14
app/src/main/res/layout-land/fragment_circle_player.xml
View file

@ -112,7 +112,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:background="?attr/roundSelector"
android:padding="16dp"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
app:layout_constraintStart_toEndOf="@+id/playPauseButton"
app:layout_constraintTop_toTopOf="@+id/playPauseButton"
@ -124,7 +126,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="?attr/roundSelector"
android:padding="16dp"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
app:layout_constraintTop_toTopOf="@+id/playPauseButton"
@ -195,7 +199,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:gravity="center_vertical|right|end"
android:gravity="center_vertical|end"
android:singleLine="true"
android:textColor="?android:attr/textColorSecondary"
android:textSize="12sp"
@ -209,9 +213,11 @@
android:id="@+id/songCurrentProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:layout_alignParentStart="true"
android:layout_marginStart="16dp"
android:gravity="center_vertical|start"
android:paddingStart="8dp"
android:paddingEnd="0dp"
android:singleLine="true"
android:textColor="?android:attr/textColorSecondary"
android:textSize="12sp"

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip