Skip to content

Commit

Permalink
stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@nift4
nift4 committed Oct 25, 2024
1 parent c99ed47 commit 5bf1d4e
Show file tree
Hide file tree
Showing 37 changed files with 501 additions and 147 deletions.
6 changes: 4 additions & 2 deletions app/lint.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<!--
<issue id="UnusedAttribute">
<ignore regexp="textFontWeight"/> <!-- backported in ViewCompatInflater -->
<ignore regexp="tooltipText"/> <!-- backported in ViewCompatInflater -->
<ignore regexp="textFontWeight"/> - - backported in ViewCompatInflater - -
<ignore regexp="tooltipText"/> - - backported in ViewCompatInflater - -
</issue>
-->
</lint>
13 changes: 13 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,19 @@
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>

<receiver android:name=".ui.LyricWidgetProvider"
android:exported="false">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
</intent-filter>
<meta-data android:name="android.appwidget.provider"
android:resource="@xml/lyric_widget" />
</receiver>

<service android:name=".ui.LyricWidgetService"
android:permission="android.permission.BIND_REMOTEVIEWS" />

</application>

<queries>
Expand Down
89 changes: 57 additions & 32 deletions app/src/main/kotlin/org/akanework/gramophone/logic/GramophonePlaybackService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
package org.akanework.gramophone.logic

import android.annotation.SuppressLint
import android.app.NotificationChannel
import android.app.NotificationManager
import android.app.PendingIntent
import android.content.BroadcastReceiver
import android.content.Context
Expand All @@ -30,7 +28,6 @@ import android.graphics.Bitmap
import android.media.AudioManager
import android.media.audiofx.AudioEffect
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.os.Handler
import android.os.Looper
Expand Down Expand Up @@ -58,7 +55,6 @@ import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.exoplayer.util.EventLogger
import androidx.media3.session.CacheBitmapLoader
import androidx.media3.session.CommandButton
import androidx.media3.session.DefaultMediaNotificationProvider
import androidx.media3.session.MediaController
import androidx.media3.session.MediaLibraryService
import androidx.media3.session.MediaSession
Expand Down Expand Up @@ -96,6 +92,7 @@ import org.akanework.gramophone.logic.utils.SemanticLyrics
import org.akanework.gramophone.logic.utils.exoplayer.EndedWorkaroundPlayer
import org.akanework.gramophone.logic.utils.exoplayer.GramophoneMediaSourceFactory
import org.akanework.gramophone.logic.utils.exoplayer.GramophoneRenderFactory
import org.akanework.gramophone.ui.LyricWidgetProvider
import org.akanework.gramophone.ui.MainActivity
import kotlin.random.Random

Expand All @@ -114,6 +111,7 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
private const val NOTIFY_ID = 1
private const val PENDING_INTENT_SESSION_ID = 0
private const val PENDING_INTENT_NOTIFY_ID = 1
const val PENDING_INTENT_WIDGET_ID = 2
private const val PLAYBACK_SHUFFLE_ACTION_ON = "shuffle_on"
private const val PLAYBACK_SHUFFLE_ACTION_OFF = "shuffle_off"
private const val PLAYBACK_REPEAT_OFF = "repeat_off"
Expand All @@ -125,13 +123,17 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
const val SERVICE_GET_LYRICS_LEGACY = "get_lyrics_legacy"
const val SERVICE_GET_SESSION = "get_session"
const val SERVICE_TIMER_CHANGED = "changed_timer"
var instanceForWidgetAndOnlyWidget: GramophonePlaybackService? = null
}
private var lastSessionId = 0
private var mediaSession: MediaLibrarySession? = null
private var controller: MediaController? = null
private val sendLyrics = Runnable { sendLyricNow() }
private var lyrics: SemanticLyrics? = null
private var lyricsLegacy: MutableList<MediaStoreUtils.Lyric>? = null
var controller: MediaController? = null
private set
private val sendLyrics = Runnable { scheduleSendingLyrics() }
var lyrics: SemanticLyrics? = null
private set
var lyricsLegacy: MutableList<MediaStoreUtils.Lyric>? = null
private set
private var shuffleFactory:
((Int) -> ((CircularShuffleOrder) -> Unit) -> CircularShuffleOrder)? = null
private lateinit var customCommands: List<CommandButton>
Expand Down Expand Up @@ -183,7 +185,16 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
}
}

private val seekReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
val to = intent.extras?.getLong("seekTo", C.INDEX_UNSET.toLong()) ?: C.INDEX_UNSET.toLong()
if (to != C.INDEX_UNSET.toLong())
controller?.seekTo(to)
}
}

override fun onCreate() {
instanceForWidgetAndOnlyWidget = this
handler = Handler(Looper.getMainLooper())
super.onCreate()
nm = NotificationManagerCompat.from(this)
Expand Down Expand Up @@ -379,11 +390,18 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
headSetReceiver,
IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY)
)
ContextCompat.registerReceiver(
this,
seekReceiver,
IntentFilter("$packageName.SEEK_TO"),
ContextCompat.RECEIVER_NOT_EXPORTED
)
}

// When destroying, we should release server side player
// alongside with the mediaSession.
override fun onDestroy() {
instanceForWidgetAndOnlyWidget = null
// Important: this must happen before sending stop() as that changes state ENDED -> IDLE
lastPlayedManager.save()
mediaSession!!.player.stop()
Expand All @@ -393,9 +411,8 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
mediaSession!!.release()
mediaSession!!.player.release()
mediaSession = null
lyrics = null
lyricsLegacy = null
unregisterReceiver(headSetReceiver)
unregisterReceiver(seekReceiver)
super.onDestroy()
}

Expand Down Expand Up @@ -681,44 +698,52 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
private fun scheduleSendingLyrics() {
handler.removeCallbacks(sendLyrics)
sendLyricNow()
if (controller?.isPlaying != true) return
val controllerPos = (controller?.currentPosition ?: 0).toULong()
val isStatusBarLyricsEnabled = prefs.getBooleanStrict("status_bar_lyrics", false)
val hnw = !LyricWidgetProvider.hasWidget(this)
if (controller?.isPlaying != true || (!isStatusBarLyricsEnabled && hnw)) return
val cPos = (controller?.contentPosition ?: 0).toULong()
val nextUpdate = if (lyrics != null && lyrics is SemanticLyrics.SyncedLyrics) {
val syncedLyrics = lyrics as SemanticLyrics.SyncedLyrics
syncedLyrics.text.filterIndexed { _, lyric ->
lyric.lyric.start > controllerPos
}.minByOrNull { it.lyric.start }?.lyric?.start
syncedLyrics.text.flatMap {
if (hnw) listOf(it.lyric.start) else
(it.lyric.words?.map { it.timeRange.start }?.filter { it > cPos } ?: listOf())
.let { i -> if (it.lyric.start > cPos) i + it.lyric.start else i }
}.minOrNull()
} else if (lyricsLegacy != null) {
lyricsLegacy!!.filterIndexed { _, lyric ->
(lyric.timeStamp ?: -2) > controllerPos.toLong()
}.minByOrNull { it.timeStamp!! }?.timeStamp?.toULong()
lyricsLegacy!!.find {
(it.timeStamp ?: -2) > cPos.toLong()
}?.timeStamp?.toULong()
} else null
nextUpdate?.let { handler.postDelayed(sendLyrics, (it - controllerPos).toLong()) }
nextUpdate?.let { handler.postDelayed(sendLyrics, (it - cPos).toLong()) }
}

private fun sendLyricNow() {
LyricWidgetProvider.adapterUpdate(this)
val isStatusBarLyricsEnabled = prefs.getBooleanStrict("status_bar_lyrics", false)
val highlightedLyric = if (isStatusBarLyricsEnabled)
if (lyrics != null && lyrics is SemanticLyrics.SyncedLyrics) {
val syncedLyrics = lyrics as SemanticLyrics.SyncedLyrics
syncedLyrics.text.find {
it.lyric.start > (controller?.currentPosition ?: 0).toULong()
}?.lyric?.text
} else if (lyricsLegacy != null) {
val filteredList = lyricsLegacy?.filterIndexed { _, lyric ->
(lyric.timeStamp ?: Long.MAX_VALUE) <= (controller?.currentPosition ?: 0)
}
if (filteredList?.isNotEmpty() == true) {
filteredList.maxByOrNull { it.timeStamp ?: -2 }?.content
} else null
} else null
getCurrentLyricIndex()?.let {
(lyrics as? SemanticLyrics.SyncedLyrics)?.text?.get(it)?.lyric?.text ?:
lyricsLegacy?.get(it)?.content
}
else null
if (lastSentHighlightedLyric != highlightedLyric) {
lastSentHighlightedLyric = highlightedLyric
doUpdateNotification(mediaSession!!)
}
}

fun getCurrentLyricIndex() =
if (lyrics != null && lyrics is SemanticLyrics.SyncedLyrics) {
val syncedLyrics = lyrics as SemanticLyrics.SyncedLyrics
syncedLyrics.text.indexOfFirst {
it.lyric.start > (controller?.currentPosition ?: 0).toULong()
}
} else if (lyricsLegacy != null) {
lyricsLegacy?.indexOfLast {
(it.timeStamp ?: Long.MAX_VALUE) <= (controller?.currentPosition ?: 0)
}
} else null

override fun onForegroundServiceStartNotAllowedException() {
Log.w(TAG, "Failed to resume playback :/")
if (mayThrowForegroundServiceStartNotAllowed()
Expand Down
36 changes: 16 additions & 20 deletions app/src/main/kotlin/org/akanework/gramophone/logic/ui/ViewCompatInflater.kt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.akanework.gramophone.logic.ui

import android.annotation.SuppressLint
import android.content.Context
import android.content.res.TypedArray
import android.os.Build
Expand All @@ -20,10 +21,7 @@ class ViewCompatInflater
class ViewCompatInflaterImpl : MaterialComponentsViewInflater(), Callback {

override fun createTextView(context: Context, attrs: AttributeSet?): AppCompatTextView {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
return TypefaceCompatTextView(context, attrs)
}
return super.createTextView(context, attrs)
return TypefaceCompatTextView(context, attrs)
}

class TypefaceCompatTextView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) :
Expand Down Expand Up @@ -72,7 +70,7 @@ class ViewCompatInflater
attrs: AttributeSet,
result: View?
) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P && result is TextView) {
if (result is TextView) {
// perhaps some descendant, not just TypefaceCompatTextView
var fontWeight = -1
val theme = context.theme
Expand All @@ -91,20 +89,20 @@ class ViewCompatInflater
if (ap != -1) {
appearance = theme.obtainStyledAttributes(ap, R.styleable.MyTextAppearance)
}
if (appearance != null) {
if (appearance != null && appearance.hasValue(R.styleable.MyTextAppearance_textFontWeight)) {
fontWeight =
appearance.getInt(R.styleable.MyTextAppearance_textFontWeight, -1)
appearance.recycle()
}
a = theme.obtainStyledAttributes(
attrs,
androidx.appcompat.R.styleable.TextAppearance,
R.styleable.MyTextAppearance,
0,
0
)
if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textFontWeight)) {
if (a.hasValue(R.styleable.MyTextAppearance_textFontWeight)) {
fontWeight = a.getInt(
androidx.appcompat.R.styleable.TextAppearance_android_textFontWeight,
R.styleable.MyTextAppearance_textFontWeight,
-1
)
}
Expand All @@ -119,17 +117,15 @@ class ViewCompatInflater
result.setTypeface(tf)
}
}
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
val a = context.theme.obtainStyledAttributes(
attrs,
R.styleable.MyTooltipCompat,
0,
0
)
val tooltip = a.getText(R.styleable.MyTooltipCompat_android_tooltipText)
if (tooltip != null) {
result?.let { TooltipCompat.setTooltipText(it, tooltip) }
}
val a = context.theme.obtainStyledAttributes(
attrs,
R.styleable.MyTooltipCompat,
0,
0
)
val tooltip = a.getText(R.styleable.MyTooltipCompat_tooltipText)
if (tooltip != null) {
result?.let { TooltipCompat.setTooltipText(it, tooltip) }
}
}
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/kotlin/org/akanework/gramophone/logic/utils/GramophoneShuffleOrder.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ class CircularShuffleOrder private constructor(
fun deserialize(data: String?): Persistent {
if (data == null || data.length < 2) return Persistent(Random.nextLong(), null)
val split = data.split(';')
if (split.isEmpty()) return Persistent(Random.nextLong(), null)
return Persistent(split[0].toLong(), if (split.size > 1) split[1]
.split(',').map(String::toInt).toIntArray() else null)
}
Expand Down
Loading

0 comments on commit 5bf1d4e

Please sign in to comment.