Skip to content

Commit 7cd6418

Browse files
committed
fix: Addressing issues caused by variable base code
Signed-off-by: ghhccghk <2137610394@qq.com>
1 parent d875ca4 commit 7cd6418

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

app/src/main/java/org/akanework/gramophone/ui/components/FullBottomSheet.kt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import androidx.media3.common.MediaItem
4141
import androidx.media3.common.MediaMetadata
4242
import androidx.media3.common.Player
4343
import androidx.media3.common.util.Log
44-
import androidx.media3.session.MediaController
44+
import androidx.media3.session.MediaBrowser
4545
import androidx.media3.session.SessionError
4646
import androidx.media3.session.SessionResult
4747
import androidx.preference.PreferenceManager
@@ -93,7 +93,6 @@ import org.akanework.gramophone.logic.utils.AudioFormatDetector.SpatialFormat
9393
import org.akanework.gramophone.logic.utils.CalculationUtils
9494
import org.akanework.gramophone.logic.utils.ColorUtils
9595
import org.akanework.gramophone.logic.utils.Flags
96-
import org.akanework.gramophone.logic.utils.convertDurationToTimeStamp
9796
import org.akanework.gramophone.logic.utils.exoplayer.oem.SystemMediaControlResolver
9897
import org.akanework.gramophone.ui.MainActivity
9998
import org.akanework.gramophone.ui.fragments.ArtistSubFragment
@@ -105,7 +104,6 @@ import uk.akane.libphonograph.manipulator.ItemManipulator
105104
import kotlin.math.min
106105
import androidx.core.content.edit
107106
import androidx.media3.common.PlaybackParameters
108-
import androidx.media3.session.MediaBrowser
109107
import com.google.android.material.checkbox.MaterialCheckBox
110108

111109
@SuppressLint("NotifyDataSetChanged")
@@ -218,8 +216,6 @@ class FullBottomSheet
218216
private var colorSecondaryContainerFinalColor: Int = -1
219217
private var colorOnSecondaryContainerFinalColor: Int = -1
220218
private var colorContrastFaintedFinalColor: Int = -1
221-
private var playlistNowPlaying: TextView? = null
222-
private var playlistNowPlayingCover: ImageView? = null
223219
private var lastDisposable: Disposable? = null
224220

225221
init {
@@ -411,6 +407,12 @@ class FullBottomSheet
411407
}
412408
}
413409

410+
bottomSheetPlaybackSpeedButton.setOnClickListener {
411+
ViewCompat.performHapticFeedback(it, HapticFeedbackConstantsCompat.CONTEXT_CLICK)
412+
if (instance != null)
413+
showPlaybackSpeedDialog()
414+
}
415+
414416
bottomSheetFavoriteButton.addOnCheckedChangeListener(this)
415417

416418
if (isMediaOutputPanelSupported(context)){
@@ -426,7 +428,7 @@ class FullBottomSheet
426428
bottomSheetPlaylistButton.setOnClickListener {
427429
ViewCompat.performHapticFeedback(it, HapticFeedbackConstantsCompat.CONTEXT_CLICK)
428430
if (instance != null)
429-
PlaylistQueueSheet(wrappedContext ?: context, activity).show()
431+
PlaylistQueueSheet(wrappedContext ?: context, activity).show()
430432
}
431433
bottomSheetFullControllerButton.setOnClickListener {
432434
ViewCompat.performHapticFeedback(it, HapticFeedbackConstantsCompat.CONTEXT_CLICK)
@@ -1059,6 +1061,8 @@ class FullBottomSheet
10591061

10601062
bottomSheetTimerButton.iconTint =
10611063
ColorStateList.valueOf(colorOnSurface)
1064+
bottomSheetPlaybackSpeedButton.iconTint =
1065+
ColorStateList.valueOf(colorOnSurface)
10621066
bottomSheetPlaylistButton.iconTint =
10631067
ColorStateList.valueOf(colorOnSurface)
10641068
bottomSheetShuffleButton.iconTint =

app/src/main/res/values/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,6 @@
182182
<string name="tempo_pitch_value">%s: %.2fx</string>
183183
<string name="lock_tempo_pitch">Lock tempo and pitch</string>
184184
<string name="reset">Reset</string>
185-
<string name="playback_speed">Playback speed</string>
186-
<string name="reset">Reset</string>
187185
<string name="current_playlist">Current playlist</string>
188186
<string name="fgs_failed_title">Failed to resume music playback</string>
189187
<string name="fgs_failed_text">Click here to open the app and continue playback</string>

0 commit comments

Comments
 (0)