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

1. Fixed album art image is not clear enough and always shows the previous song's cover;

Browse source 
2. Change Setting -> Personalize -> LOCKSCREEN (Show album cover, Blur album cover, Fullscreen controls) only about lockscreen, without change notification style anymore;
3. Lockscreen adapt landscape mode;
4. Move lockscreen image to the top, keep looks like player's style;
5. Change some defStyleAttr default value frome -1 to 0, to make Android Studio to preview;
6. Fitting more pages can display circular buttons.
This commit is contained in:
michaellee123 2022-12-27 21:52:10 +08:00
parent 4ce212a6e6
commit 94bc86b5d4
7 changed files with 182 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
View file

@ -26,10 +26,13 @@ import code.name.monkey.retromusic.extensions.hideStatusBar
import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
import code.name.monkey.retromusic.extensions.whichFragment
import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenControlsFragment
import code.name.monkey.retromusic.glide.BlurTransformation
import code.name.monkey.retromusic.glide.GlideApp
import code.name.monkey.retromusic.glide.RetroGlideExtension
import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
import code.name.monkey.retromusic.helper.MusicPlayerRemote
import code.name.monkey.retromusic.util.PreferenceUtil
import code.name.monkey.retromusic.util.PreferenceUtil.isAlbumArtOnLockScreen
import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
import com.r0adkll.slidr.Slidr
import com.r0adkll.slidr.model.SlidrConfig
@ -104,16 +107,31 @@ class LockScreenActivity : AbsMusicServiceActivity() {
}
private fun updateSongs() {
if (!isAlbumArtOnLockScreen) {
binding.image.setImageResource(R.drawable.default_audio_art)
return
}
val song = MusicPlayerRemote.currentSong
GlideApp.with(this)
.asBitmapPalette()
.songCoverOptions(song)
.load(RetroGlideExtension.getSongModel(song))
.dontAnimate()
.transition(RetroGlideExtension.getDefaultTransition())
.into(object : RetroMusicColoredTarget(binding.image) {
override fun onColorReady(colors: MediaNotificationProcessor) {
fragment?.setColor(colors)
}
})
if (PreferenceUtil.isBlurredAlbumArt) {
GlideApp.with(this)
.load(RetroGlideExtension.getSongModel(song))
.transition(RetroGlideExtension.getDefaultTransition())
.transform(BlurTransformation.Builder(this).blurRadius(25f).build())
.into(binding.ivBlurredAlbumArt)
}
}
}

5
app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt
View file

@ -155,6 +155,11 @@ abstract class AbsPlayerControlsFragment(@LayoutRes layout: Int) : AbsMusicServi
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
if (PreferenceUtil.circlePlayButton) {
requireContext().theme.applyStyle(R.style.CircleFABOverlay, true)
} else {
requireContext().theme.applyStyle(R.style.RoundedFABOverlay, true)
}
}
fun View.showBounceAnimation() {

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

@ -70,7 +70,6 @@ import code.name.monkey.retromusic.util.MusicUtil
import code.name.monkey.retromusic.util.MusicUtil.toggleFavorite
import code.name.monkey.retromusic.util.PackageValidator
import code.name.monkey.retromusic.util.PreferenceUtil.crossFadeDuration
import code.name.monkey.retromusic.util.PreferenceUtil.isAlbumArtOnLockScreen
import code.name.monkey.retromusic.util.PreferenceUtil.isBluetoothSpeaker
import code.name.monkey.retromusic.util.PreferenceUtil.isBlurredAlbumArt
import code.name.monkey.retromusic.util.PreferenceUtil.isClassicNotification
@ -1022,19 +1021,13 @@ class MusicService : MediaBrowserServiceCompat(),
.putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, null)
.putLong(MediaMetadataCompat.METADATA_KEY_NUM_TRACKS, playingQueue.size.toLong())
if (isAlbumArtOnLockScreen || VERSION.SDK_INT == 33) {
// val screenSize: Point = RetroUtil.getScreenSize(this)
val request = GlideApp.with(this)
// there only about notification's album art, so remove "isAlbumArtOnLockScreen" and "isBlurredAlbumArt"
GlideApp.with(this)
.asBitmap()
.songCoverOptions(song)
.load(getSongModel(song))
.transition(getDefaultTransition())
if (isBlurredAlbumArt) {
request.transform(BlurTransformation.Builder(this@MusicService).build())
}
request.into(object :
CustomTarget<Bitmap?>(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL) {
.into(object : CustomTarget<Bitmap?>(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL) {
override fun onLoadFailed(errorDrawable: Drawable?) {
super.onLoadFailed(errorDrawable)
metaData.putBitmap(
@ -1062,10 +1055,6 @@ class MusicService : MediaBrowserServiceCompat(),
override fun onLoadCleared(placeholder: Drawable?) {}
})
} else {
mediaSession?.setMetadata(metaData.build())
onCompletion()
}
}
private fun handleChangeInternal(what: String) {

2
app/src/main/java/code/name/monkey/retromusic/views/HeightFitSquareLayout.kt
View file

@ -20,7 +20,7 @@ import android.widget.FrameLayout
class HeightFitSquareLayout @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = -1
defStyleAttr: Int = 0
) : FrameLayout(context, attrs, defStyleAttr){
private var forceSquare = true

2
app/src/main/java/code/name/monkey/retromusic/views/StatusBarView.kt
View file

@ -21,7 +21,7 @@ import android.view.View
class StatusBarView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = -1
defStyleAttr: Int = 0
) : View(context, attrs, defStyleAttr) {
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {

90
app/src/main/res/layout-land/activity_lock_screen.xml Normal file
View file

@ -0,0 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_blurred_album_art"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#80000000"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/status_bar" />
</FrameLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent">
<code.name.monkey.retromusic.views.HeightFitSquareLayout
android:id="@+id/albumCoverContainer"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="16dp"
app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
tools:ignore="ContentDescription,UnusedAttribute"
tools:srcCompat="@tools:sample/backgrounds/scenic" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/slide"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:elevation="3dp"
android:fitsSystemWindows="true"
android:gravity="center"
android:padding="16dp"
android:text="@string/swipe_to_unlock"
android:textColor="?android:attr/textColorPrimary" />
</com.google.android.material.card.MaterialCardView>
</code.name.monkey.retromusic.views.HeightFitSquareLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical"
tools:ignore="UselessParent">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playback_controls_fragment"
android:name="code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_lock_screen_playback_controls" />
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</LinearLayout>
</RelativeLayout>

52
app/src/main/res/layout/activity_lock_screen.xml
View file

@ -1,10 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout 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">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_blurred_album_art"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:scaleType="centerCrop" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#80000000"
android:orientation="vertical"
android:paddingTop="24dp">
<FrameLayout
android:layout_width="match_parent"
@ -13,22 +25,6 @@
<include layout="@layout/status_bar" />
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical"
tools:ignore="UselessParent">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playback_controls_fragment"
android:name="code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_lock_screen_playback_controls" />
</LinearLayout>
<code.name.monkey.retromusic.views.WidthFitSquareCardView
android:id="@+id/albumCoverContainer"
android:layout_width="match_parent"
@ -50,6 +46,23 @@
</code.name.monkey.retromusic.views.WidthFitSquareCardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical"
tools:ignore="UselessParent">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playback_controls_fragment"
android:name="code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_lock_screen_playback_controls" />
</LinearLayout>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/slide"
android:layout_width="match_parent"
@ -60,4 +73,5 @@
android:padding="16dp"
android:text="@string/swipe_to_unlock"
android:textColor="?android:attr/textColorPrimary" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>