mq: Correctly guard behind flag

Author: mikooomich

app/src/main/java/org/akanework/gramophone/logic/GramophonePlaybackService.kt

@@ -920,6 +920,7 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
                             endedWorkaroundPlayer!!.play()
                         }
                     } else {
+                        endedWorkaroundPlayer!!.setMediaItems(mediaList, mediaItemIndex, C.TIME_UNSET)
                         endedWorkaroundPlayer!!.prepare()
                         endedWorkaroundPlayer!!.play()
                     }

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

@@ -57,6 +57,7 @@ import org.akanework.gramophone.logic.deleteQueue
 import org.akanework.gramophone.logic.getInactiveQueues
 import org.akanework.gramophone.logic.getQueue
 import org.akanework.gramophone.logic.loadQueue
+import org.akanework.gramophone.logic.utils.Flags.MQ_PREVIEW
 
 @Composable
 fun MqListItem(
@@ -138,6 +139,7 @@ fun MqListItem(
 fun MqContent(
     mqState: MqState,
     modifier: Modifier = Modifier,
+    mqEnabled: Boolean = false,
 ) {
     val haptic = LocalHapticFeedback.current
 
@@ -174,7 +176,7 @@ fun MqContent(
                     )
                     .padding(2.dp)
                     .weight(1f)
-                    .clickable(enabled = !landscape) {
+                    .clickable(enabled = mqEnabled && !landscape) {
                         mqState.toggleExpand()
                         haptic.performHapticFeedback(HapticFeedbackType.ContextClick)
                     }
@@ -188,7 +190,7 @@ fun MqContent(
                         .padding(horizontal = 8.dp)
                 )
                 IconButton(
-                    enabled = !landscape,
+                    enabled = mqEnabled && !landscape,
                     onClick = {
                         mqState.toggleExpand()
                         haptic.performHapticFeedback(HapticFeedbackType.ContextClick)

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

@@ -1,6 +1,7 @@
 package org.akanework.gramophone.ui.components
 
 import android.content.Context
+import android.content.SharedPreferences
 import android.os.SystemClock
 import android.view.LayoutInflater
 import android.view.View
@@ -41,15 +42,18 @@ import androidx.media3.common.MediaItem
 import androidx.media3.common.Player
 import androidx.media3.common.Timeline
 import androidx.media3.session.MediaBrowser
+import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import kotlinx.coroutines.launch
 import org.akanework.gramophone.R
+import org.akanework.gramophone.logic.getBooleanStrict
 import org.akanework.gramophone.logic.getQueueForUi
 import org.akanework.gramophone.logic.replaceAllSupport
 import org.akanework.gramophone.logic.ui.MyRecyclerView
+import org.akanework.gramophone.logic.utils.Flags
 import org.akanework.gramophone.logic.utils.convertDurationToTimeStamp
 import org.akanework.gramophone.ui.GramophoneTheme
 import org.akanework.gramophone.ui.MainActivity
@@ -59,6 +63,7 @@ import java.util.LinkedList
 class PlaylistQueueSheet(
     context: Context, private val activity: MainActivity
 ) : BottomSheetDialog(context), Player.Listener {
+    private var prefs: SharedPreferences
     private val instance: MediaBrowser?
         get() = activity.getPlayer()
     private val playlistAdapter: PlaylistCardAdapter
@@ -69,6 +74,9 @@ class PlaylistQueueSheet(
     private val mqEnabled: Boolean
 
     init {
+        prefs = PreferenceManager.getDefaultSharedPreferences(context.applicationContext)
+        mqEnabled = Flags.MQ_PREVIEW && prefs.getBooleanStrict("mq_preview", false)
+
         setContentView(R.layout.playlist_bottom_sheet)
         behavior.state = BottomSheetBehavior.STATE_EXPANDED
         val recyclerView = findViewById<MyRecyclerView>(R.id.recyclerview)!!
@@ -213,6 +221,7 @@ class PlaylistQueueSheet(
                                 0 -> {
                                     MqContent(
                                         mqState = mqState,
+                                        mqEnabled = mqEnabled
                                     )
                                 }
 

app/src/main/java/org/akanework/gramophone/ui/fragments/settings/ExperimentalSettingsFragment.kt

@@ -49,6 +49,8 @@ class ExperimentalSettingsFragment : BasePreferenceFragment() {
         findPreference<Preference>("crash")!!.isVisible = BuildConfig.DEBUG
         if (!Flags.OFFLOAD)
             findPreference<Preference>("offload")!!.isVisible = false
+        if (!Flags.MQ_PREVIEW)
+            findPreference<Preference>("mq_preview")!!.isVisible = false
         if (BuildConfig.DEBUG)
             e = RuntimeException("skill issue")
     }