From b3ba154cb45a4ed2b296adadaa0fa781024c1707 Mon Sep 17 00:00:00 2001
From: Bios Thusvill <87165098+thusvill@users.noreply.github.com>
Date: Wed, 22 Apr 2026 15:16:43 +0530
Subject: [PATCH 1/2] Added Pure Black Theme

Added option to toggle pure black for OLED devices
---
 .idea/deploymentTargetSelector.xml            |  8 +--
 .../pixelplay/ExternalPlayerActivity.kt       |  9 +++-
 .../com/theveloper/pixelplay/MainActivity.kt  |  7 ++-
 .../preferences/ThemePreferencesRepository.kt |  2 +
 .../preferences/UserPreferencesRepository.kt  | 11 ++++
 .../components/LyricsFloatingToolbar.kt       | 29 +++++++---
 .../presentation/components/LyricsSheet.kt    |  2 +
 .../components/QueueBottomSheet.kt            |  4 +-
 .../components/ToggleSegmentButton.kt         | 43 ++++++++++-----
 .../components/UnifiedPlayerSheetV2.kt        |  3 ++
 .../components/player/FullPlayerContent.kt    |  5 +-
 .../components/scoped/SheetThemeState.kt      | 20 +++++--
 .../screens/PaletteStyleSettingsScreen.kt     | 54 +++++++++++++------
 .../screens/SettingsCategoryScreen.kt         |  3 +-
 .../presentation/screens/StatsScreen.kt       |  2 +-
 .../viewmodel/SettingsViewModel.kt            |  5 +-
 .../theveloper/pixelplay/ui/theme/Theme.kt    | 29 +++++++++-
 app/src/main/res/values/strings_settings.xml  |  1 +
 shared/build.gradle.kts                       |  6 +++
 19 files changed, 189 insertions(+), 54 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index d8b7d40b0..c6d4def15 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-03-26T13:52:07.598927Z">
+        <DropdownSelection timestamp="2026-04-22T06:21:36.284079Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=H631104000007E4W0001" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=R5GYC2DKBEN" />
             </handle>
           </Target>
         </DropdownSelection>
@@ -15,10 +15,10 @@
       </SelectionState>
       <SelectionState runConfigName="wear">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-03-26T13:52:07.598927Z">
+        <DropdownSelection timestamp="2026-04-22T01:48:43.170330Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=H631104000007E4W0001" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=R5GYC2DKBEN" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/com/theveloper/pixelplay/ExternalPlayerActivity.kt b/app/src/main/java/com/theveloper/pixelplay/ExternalPlayerActivity.kt
index 2d993383d..efb7c4fea 100644
--- a/app/src/main/java/com/theveloper/pixelplay/ExternalPlayerActivity.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/ExternalPlayerActivity.kt
@@ -18,6 +18,7 @@ import com.theveloper.pixelplay.presentation.components.external.ExternalPlayerO
 import com.theveloper.pixelplay.ui.theme.PixelPlayTheme
 import android.content.Intent.EXTRA_STREAM
 import androidx.media3.common.util.UnstableApi
+import com.google.android.gms.wearable.AppTheme
 import com.theveloper.pixelplay.data.preferences.AppThemeMode
 import com.theveloper.pixelplay.data.preferences.ThemePreferencesRepository
 import javax.inject.Inject
@@ -49,9 +50,15 @@ class ExternalPlayerActivity : ComponentActivity() {
             val useDarkTheme = when (appThemeMode) {
                 AppThemeMode.DARK -> true
                 AppThemeMode.LIGHT -> false
+                AppThemeMode.PURE_DARK -> true
                 else -> systemDarkTheme
             }
-            PixelPlayTheme(darkTheme = useDarkTheme) {
+            val isOled = when(appThemeMode){
+                AppThemeMode.PURE_DARK -> true
+                else -> false
+            }
+            PixelPlayTheme(darkTheme = useDarkTheme, pureDark = isOled) {
+
                 ExternalPlayerOverlay(
                     playerViewModel = playerViewModel,
                     onDismiss = { finish() },
diff --git a/app/src/main/java/com/theveloper/pixelplay/MainActivity.kt b/app/src/main/java/com/theveloper/pixelplay/MainActivity.kt
index 76dda32e5..fff1b27a9 100644
--- a/app/src/main/java/com/theveloper/pixelplay/MainActivity.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/MainActivity.kt
@@ -215,6 +215,10 @@ class MainActivity : ComponentActivity() {
                 AppThemeMode.LIGHT -> false
                 else -> systemDarkTheme
             }
+            val usePureDark = when(appThemeMode){
+                AppThemeMode.PURE_DARK -> true
+                else -> false
+            }
             val isSetupComplete by mainViewModel.isSetupComplete.collectAsStateWithLifecycle()
             
             // Crash report dialog state
@@ -256,7 +260,8 @@ class MainActivity : ComponentActivity() {
             }
 
             PixelPlayTheme(
-                darkTheme = useDarkTheme
+                darkTheme = useDarkTheme,
+                pureDark = usePureDark
             ) {
                 var contentVisible by remember { mutableStateOf(false) }
                 val contentAlpha by animateFloatAsState(
diff --git a/app/src/main/java/com/theveloper/pixelplay/data/preferences/ThemePreferencesRepository.kt b/app/src/main/java/com/theveloper/pixelplay/data/preferences/ThemePreferencesRepository.kt
index 95029d28a..d3176bc46 100644
--- a/app/src/main/java/com/theveloper/pixelplay/data/preferences/ThemePreferencesRepository.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/data/preferences/ThemePreferencesRepository.kt
@@ -19,12 +19,14 @@ class ThemePreferencesRepository @Inject constructor(
         val ALBUM_ART_PALETTE_STYLE = stringPreferencesKey("album_art_palette_style_v1")
         val ALBUM_ART_COLOR_ACCURACY = intPreferencesKey("album_art_color_accuracy_v1")
         val APP_THEME_MODE = stringPreferencesKey("app_theme_mode")
+
     }
 
     val appThemeModeFlow: Flow<String> = dataStore.data.map { preferences ->
         preferences[Keys.APP_THEME_MODE] ?: AppThemeMode.FOLLOW_SYSTEM
     }
 
+
     val playerThemePreferenceFlow: Flow<String> = dataStore.data.map { preferences ->
         preferences[Keys.PLAYER_THEME_PREFERENCE] ?: ThemePreference.ALBUM_ART
     }
diff --git a/app/src/main/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepository.kt b/app/src/main/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepository.kt
index 9cff16d5e..5d6e00465 100644
--- a/app/src/main/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepository.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepository.kt
@@ -45,6 +45,8 @@ object AppThemeMode {
     const val FOLLOW_SYSTEM = "follow_system"
     const val LIGHT = "light"
     const val DARK = "dark"
+
+    const val PURE_DARK = "puredark"
 }
 
 /**
@@ -85,6 +87,8 @@ constructor(
         // Removed
         val PLAYER_THEME_PREFERENCE = stringPreferencesKey("player_theme_preference_v2")
         val ALBUM_ART_PALETTE_STYLE = stringPreferencesKey("album_art_palette_style_v1")
+        val ALBUM_ART_PALETTE_PURE_DARK = booleanPreferencesKey("album_art_palette_pure_dark")
+
         val APP_THEME_MODE = stringPreferencesKey("app_theme_mode")
         val FAVORITE_SONG_IDS = stringSetPreferencesKey("favorite_song_ids")
         val USER_PLAYLISTS = stringPreferencesKey("user_playlists_json_v1")
@@ -235,6 +239,9 @@ constructor(
         val REPLAYGAIN_USE_ALBUM_GAIN = booleanPreferencesKey("replaygain_use_album_gain")
     }
 
+    val albumArtPalettePureDarkFlow: Flow<Boolean> = dataStore.data.map { it[PreferencesKeys.ALBUM_ART_PALETTE_PURE_DARK] ?: false }
+
+
     val appRebrandDialogShownFlow: Flow<Boolean> =
             dataStore.data.map { preferences ->
                 preferences[PreferencesKeys.APP_REBRAND_DIALOG_SHOWN] ?: false
@@ -323,6 +330,10 @@ constructor(
             }
         }
 
+    suspend fun setAlbumArtPalettePureDark(enabled: Boolean) {
+        dataStore.edit { it[PreferencesKeys.ALBUM_ART_PALETTE_PURE_DARK] = enabled }
+    }
+
     suspend fun addCustomGenre(genre: String, iconResId: Int? = null) {
         dataStore.edit { preferences ->
             val currentGenres = preferences[PreferencesKeys.CUSTOM_GENRES] ?: emptySet()
diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsFloatingToolbar.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsFloatingToolbar.kt
index 29e9d4a74..494060353 100644
--- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsFloatingToolbar.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsFloatingToolbar.kt
@@ -42,8 +42,10 @@ import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SwitchDefaults
 import androidx.compose.ui.draw.clip
+import com.theveloper.pixelplay.ui.theme.LocalPixelPlayPureDark
 
 import racra.compose.smooth_corner_rect_library.AbsoluteSmoothCornerShape
+import androidx.compose.foundation.BorderStroke
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
@@ -90,29 +92,44 @@ fun LyricsFloatingToolbar(
             horizontalArrangement = Arrangement.spacedBy(8.dp)
         ) {
             ToggleSegmentButton(
-                modifier = Modifier.weight(1f).height(50.dp),
+                modifier = Modifier
+                    .weight(1f)
+                    .height(50.dp),
                 active = showSyncedLyrics,
                 enabled = hasSyncedLyrics,
                 activeColor = accentColor,
-                inactiveColor = backgroundColor,
+                inactiveColor = if(LocalPixelPlayPureDark.current) {
+                    Color.Transparent
+                }else{onBackgroundColor},
                 activeContentColor = onAccentColor,
                 inactiveContentColor = onBackgroundColor,
                 activeCornerRadius = 50.dp,
                 onClick = { onShowSyncedLyricsChange(true) },
-                text = stringResource(R.string.presentation_batch_g_lyrics_mode_synced)
+                text = stringResource(R.string.presentation_batch_g_lyrics_mode_synced),
+
+                border = if (!showSyncedLyrics && LocalPixelPlayPureDark.current) {
+                    BorderStroke(1.dp, MaterialTheme.colorScheme.outline)
+                } else null
             )
 
             ToggleSegmentButton(
-                modifier = Modifier.weight(1f).height(50.dp),
+                modifier = Modifier
+                    .weight(1f)
+                    .height(50.dp),
                 active = !showSyncedLyrics,
                 enabled = true,
                 activeColor = accentColor,
-                inactiveColor = backgroundColor,
+                inactiveColor = if(LocalPixelPlayPureDark.current) {
+                    Color.Transparent
+                }else{onBackgroundColor},
                 activeContentColor = onAccentColor,
                 inactiveContentColor = onBackgroundColor,
                 activeCornerRadius = 50.dp,
                 onClick = { onShowSyncedLyricsChange(false) },
-                text = stringResource(R.string.presentation_batch_g_lyrics_mode_static)
+                text = stringResource(R.string.presentation_batch_g_lyrics_mode_static),
+                border = if (showSyncedLyrics && LocalPixelPlayPureDark.current) {
+                    BorderStroke(1.dp, MaterialTheme.colorScheme.outline)
+                } else null
             )
         }
         
diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsSheet.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsSheet.kt
index 836ad3cf5..1df956626 100644
--- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsSheet.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsSheet.kt
@@ -131,6 +131,8 @@ import androidx.compose.material3.HorizontalDivider
 import androidx.compose.ui.text.style.TextGeometricTransform
 import androidx.compose.ui.text.style.TextOverflow
 import com.theveloper.pixelplay.presentation.components.subcomps.PlayingEqIcon
+import com.theveloper.pixelplay.ui.theme.LocalPixelPlayDarkTheme
+import com.theveloper.pixelplay.ui.theme.LocalPixelPlayPureDark
 import com.theveloper.pixelplay.utils.MultiLangRomanizer
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/QueueBottomSheet.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/QueueBottomSheet.kt
index 31bc51ee0..689161c5e 100644
--- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/QueueBottomSheet.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/QueueBottomSheet.kt
@@ -979,8 +979,8 @@ fun QueueBottomSheet(
                             QueueToolbarMenuButton(
                                 text = stringResource(R.string.presentation_batch_e_action_save_as_playlist),
                                 icon = Icons.Filled.LibraryAdd,
-                                containerColor = MaterialTheme.colorScheme.primaryContainer,
-                                contentColor = MaterialTheme.colorScheme.onPrimaryContainer,
+                                containerColor = MaterialTheme.colorScheme.background,
+                                contentColor = MaterialTheme.colorScheme.onBackground,
                                 onClick = {
                                     isFabExpanded = false
                                     val res = context.resources
diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/ToggleSegmentButton.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/ToggleSegmentButton.kt
index d25f905c6..e8fe86383 100644
--- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/ToggleSegmentButton.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/ToggleSegmentButton.kt
@@ -5,7 +5,9 @@ import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.core.spring
 import androidx.compose.animation.core.tween
+import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -28,9 +30,9 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.theveloper.pixelplay.presentation.components.LocalMaterialTheme
 
 @Composable
 fun ToggleSegmentButton(
@@ -42,6 +44,7 @@ fun ToggleSegmentButton(
     activeContentColor: Color = LocalMaterialTheme.current.onPrimary,
     inactiveContentColor: Color = LocalMaterialTheme.current.onSurfaceVariant,
     activeCornerRadius: Dp = 8.dp,
+    border: BorderStroke? = null,
     onClick: () -> Unit,
     iconId: Int,
     contentDesc: String
@@ -53,6 +56,7 @@ fun ToggleSegmentButton(
         activeColor = activeColor,
         inactiveColor = inactiveColor,
         activeCornerRadius = activeCornerRadius,
+        border = border,
         onClick = onClick
     ) {
         Icon(
@@ -74,6 +78,7 @@ fun ToggleSegmentButton(
     activeContentColor: Color = LocalMaterialTheme.current.onPrimary,
     inactiveContentColor: Color = LocalMaterialTheme.current.onSurfaceVariant,
     activeCornerRadius: Dp = 8.dp,
+    border: BorderStroke? = null,
     onClick: () -> Unit,
     imageVector: ImageVector,
     contentDesc: String
@@ -85,6 +90,7 @@ fun ToggleSegmentButton(
         activeColor = activeColor,
         inactiveColor = inactiveColor,
         activeCornerRadius = activeCornerRadius,
+        border = border,
         onClick = onClick
     ) {
         Icon(
@@ -106,6 +112,7 @@ fun ToggleSegmentButton(
     activeContentColor: Color = LocalMaterialTheme.current.onPrimary,
     inactiveContentColor: Color = LocalMaterialTheme.current.primary,
     activeCornerRadius: Dp = 8.dp,
+    border: BorderStroke? = null,
     onClick: () -> Unit,
     text: String
 ) {
@@ -116,13 +123,14 @@ fun ToggleSegmentButton(
         activeColor = activeColor,
         inactiveColor = inactiveColor,
         activeCornerRadius = activeCornerRadius,
+        border = border,
         onClick = onClick
     ) {
-        androidx.compose.material3.Text(
+        Text(
             text = text,
             color = if (active) activeContentColor else inactiveContentColor,
-            style = androidx.compose.material3.MaterialTheme.typography.bodyMedium,
-            fontWeight = androidx.compose.ui.text.font.FontWeight.Bold
+            style = MaterialTheme.typography.bodyMedium,
+            fontWeight = FontWeight.Bold
         )
     }
 }
@@ -139,7 +147,8 @@ fun ToggleSegmentButton(
     activeCornerRadius: Dp = 8.dp,
     onClick: () -> Unit,
     text: String,
-    imageVector: ImageVector
+    imageVector: ImageVector,
+    border: BorderStroke? = null,
 ) {
     ToggleSegmentButtonContainer(
         modifier = modifier,
@@ -148,7 +157,8 @@ fun ToggleSegmentButton(
         activeColor = activeColor,
         inactiveColor = inactiveColor,
         activeCornerRadius = activeCornerRadius,
-        onClick = onClick
+        onClick = onClick,
+        border = border
     ) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
@@ -166,13 +176,12 @@ fun ToggleSegmentButton(
                 text = text,
                 color = if (active) activeContentColor else inactiveContentColor,
                 style = MaterialTheme.typography.bodyMedium,
-                fontWeight = androidx.compose.ui.text.font.FontWeight.Bold
+                fontWeight = FontWeight.Bold
             )
         }
     }
 }
 
-
 @Composable
 private fun ToggleSegmentButtonContainer(
     modifier: Modifier,
@@ -182,25 +191,33 @@ private fun ToggleSegmentButtonContainer(
     inactiveColor: Color,
     activeCornerRadius: Dp,
     onClick: () -> Unit,
-    content: @Composable () -> Unit
+    border: BorderStroke? = null,
+    content: @Composable () -> Unit,
 ) {
     val targetBgColor = if (active) activeColor else inactiveColor
     val bgColor by animateColorAsState(
         targetValue = if (enabled) targetBgColor else targetBgColor.copy(alpha = 0.5f),
         animationSpec = tween(durationMillis = 250),
-        label = ""
+        label = "bgColorAnimation"
     )
     val cornerRadius by animateDpAsState(
         targetValue = if (active) activeCornerRadius else 8.dp,
         animationSpec = spring(stiffness = Spring.StiffnessLow),
-        label = ""
+        label = "cornerRadiusAnimation"
     )
 
+
+    val shape = RoundedCornerShape(cornerRadius)
+
     Box(
         modifier = modifier
             .fillMaxSize()
-            .clip(RoundedCornerShape(cornerRadius))
+            .clip(shape)
             .background(bgColor)
+            .then(
+                if (border != null) Modifier.border(border, shape)
+                else Modifier
+            )
             .clickable(enabled = enabled, onClick = onClick),
         contentAlignment = Alignment.Center
     ) {
@@ -208,4 +225,4 @@ private fun ToggleSegmentButtonContainer(
             content()
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt
index 8007ec774..fdb93c5e1 100644
--- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt
@@ -80,6 +80,7 @@ import com.theveloper.pixelplay.presentation.viewmodel.PlayerSheetState
 import com.theveloper.pixelplay.presentation.viewmodel.PlayerViewModel
 import com.theveloper.pixelplay.presentation.viewmodel.StablePlayerState
 import com.theveloper.pixelplay.ui.theme.LocalPixelPlayDarkTheme
+import com.theveloper.pixelplay.ui.theme.LocalPixelPlayPureDark
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
@@ -499,10 +500,12 @@ fun UnifiedPlayerSheetV2(
     val activePlayerSchemePair by playerViewModel.activePlayerColorSchemePair.collectAsStateWithLifecycle()
     val themedAlbumArtUri by playerViewModel.currentThemedAlbumArtUri.collectAsStateWithLifecycle()
     val isDarkTheme = LocalPixelPlayDarkTheme.current
+    val isPureDark = LocalPixelPlayPureDark.current
     val currentSong = infrequentPlayerState.currentSong
     val sheetThemeState = rememberSheetThemeState(
         activePlayerSchemePair = activePlayerSchemePair,
         isDarkTheme = isDarkTheme,
+        isPureDark = isPureDark,
         playerThemePreference = playerThemePreference,
         currentSong = currentSong,
         themedAlbumArtUri = themedAlbumArtUri,
diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/player/FullPlayerContent.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/player/FullPlayerContent.kt
index d7908ba74..454fc50f5 100644
--- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/player/FullPlayerContent.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/player/FullPlayerContent.kt
@@ -140,6 +140,7 @@ import java.util.Locale
 import kotlin.math.roundToLong
 import com.theveloper.pixelplay.presentation.components.WavySliderExpressive
 import com.theveloper.pixelplay.presentation.components.ToggleSegmentButton
+import com.theveloper.pixelplay.ui.theme.LocalPixelPlayPureDark
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.collect
@@ -306,7 +307,7 @@ fun FullPlayerContent(
     // OPTIMIZATION: Use passed provider instead of collecting flow
     val totalDurationValue = totalDurationProvider()
 
-    val playerOnBaseColor = LocalMaterialTheme.current.onPrimaryContainer
+    val playerOnBaseColor =  if(LocalPixelPlayPureDark.current) {LocalMaterialTheme.current.onBackground} else{ LocalMaterialTheme.current.onPrimaryContainer}
     val playerAccentColor = LocalMaterialTheme.current.primary
     val playerOnAccentColor = LocalMaterialTheme.current.onPrimary
     val transportPlayPauseColors = expressivePlayPauseButtonColors(LocalMaterialTheme.current)
@@ -952,7 +953,7 @@ fun FullPlayerContent(
             lyricsTextStyle = MaterialTheme.typography.titleLarge,
             backgroundColor = LocalMaterialTheme.current.background,
             onBackgroundColor = LocalMaterialTheme.current.onBackground,
-            containerColor = LocalMaterialTheme.current.primaryContainer,
+            containerColor = if(LocalPixelPlayPureDark.current){ LocalMaterialTheme.current.background} else{ LocalMaterialTheme.current.primaryContainer},
             contentColor = LocalMaterialTheme.current.onPrimaryContainer,
             accentColor = LocalMaterialTheme.current.primary,
             onAccentColor = LocalMaterialTheme.current.onPrimary,
diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/SheetThemeState.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/SheetThemeState.kt
index cb64b0343..36519f3a3 100644
--- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/SheetThemeState.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/SheetThemeState.kt
@@ -19,6 +19,7 @@ import androidx.compose.ui.util.lerp
 import com.theveloper.pixelplay.data.model.Song
 import com.theveloper.pixelplay.data.preferences.ThemePreference
 import com.theveloper.pixelplay.presentation.viewmodel.ColorSchemePair
+import com.theveloper.pixelplay.ui.theme.toOledRole
 
 /**
  * Theme state for the player sheet.
@@ -56,6 +57,7 @@ internal fun resolvePlayerSheetTargetScheme(
 internal fun rememberSheetThemeState(
     activePlayerSchemePair: ColorSchemePair?,
     isDarkTheme: Boolean,
+    isPureDark: Boolean,
     playerThemePreference: String,
     currentSong: Song?,
     themedAlbumArtUri: String?,
@@ -127,13 +129,21 @@ internal fun rememberSheetThemeState(
         systemColorScheme = systemColorScheme
     )
 
+    val targetAlbumScheme = remember(rawAlbumColorScheme, isDarkTheme, isPureDark) {
+        if (isDarkTheme && isPureDark) rawAlbumColorScheme.toOledRole() else rawAlbumColorScheme
+    }
+
+    val targetMiniPlayerScheme = remember(rawMiniPlayerScheme, isDarkTheme, isPureDark) {
+        if (isDarkTheme && isPureDark) rawMiniPlayerScheme.toOledRole() else rawMiniPlayerScheme
+    }
+
     // --- Batch Color Animation ---
     // Instead of 34×2 = 68 independent animateColorAsState (one Spring coroutine each),
     // we use a single Animatable<Float> progress [0,1] that interpolates between the
     // previous and the new target ColorScheme manually. This reduces per-frame State reads
     // from 68 → 0 (the lerp runs during the Animatable tick, not during recomposition).
-    val albumColorScheme = rememberBatchAnimatedColorScheme(rawAlbumColorScheme)
-    val miniPlayerScheme = rememberBatchAnimatedColorScheme(rawMiniPlayerScheme)
+    val albumColorScheme = rememberBatchAnimatedColorScheme(targetAlbumScheme)
+    val miniPlayerScheme = rememberBatchAnimatedColorScheme(targetMiniPlayerScheme)
 
     val miniAppearProgress = remember { Animatable(0f) }
     LaunchedEffect(currentSong?.id) {
@@ -149,7 +159,11 @@ internal fun rememberSheetThemeState(
 
     val miniReadyAlpha = miniAppearProgress.value
     val miniAppearScale = lerp(0.985f, 1f, miniAppearProgress.value)
-    val playerAreaBackground = miniPlayerScheme.primaryContainer
+    val playerAreaBackground = if(isPureDark) {
+        miniPlayerScheme.background
+    }else{
+        miniPlayerScheme.primaryContainer
+    }
 
     // NOTE: miniAlpha and effectivePlayerAreaElevation are no longer computed here.
     // They were driven by the expansion fraction via the Transition API, which
diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/screens/PaletteStyleSettingsScreen.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/screens/PaletteStyleSettingsScreen.kt
index a596649bf..9f007f53a 100644
--- a/app/src/main/java/com/theveloper/pixelplay/presentation/screens/PaletteStyleSettingsScreen.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/presentation/screens/PaletteStyleSettingsScreen.kt
@@ -28,6 +28,8 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Close
+import androidx.compose.material.icons.rounded.DarkMode
+import androidx.compose.material.icons.rounded.MusicNote
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ButtonDefaults
@@ -55,9 +57,11 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.compose.ui.res.stringResource
 import com.theveloper.pixelplay.R
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -69,7 +73,10 @@ import com.theveloper.pixelplay.presentation.viewmodel.ColorSchemePair
 import com.theveloper.pixelplay.presentation.viewmodel.PlayerViewModel
 import com.theveloper.pixelplay.presentation.viewmodel.SettingsViewModel
 import com.theveloper.pixelplay.ui.theme.LocalPixelPlayDarkTheme
+import com.theveloper.pixelplay.ui.theme.LocalPixelPlayPureDark
 import com.theveloper.pixelplay.ui.theme.generateColorSchemeFromSeed
+import com.theveloper.pixelplay.presentation.components.LibrarySheetToggleCard
+import com.theveloper.pixelplay.ui.theme.toOledRole
 import kotlin.math.roundToInt
 
 @androidx.annotation.OptIn(UnstableApi::class)
@@ -85,9 +92,14 @@ fun PaletteStyleSettingsScreen(
     val isDarkTheme = LocalPixelPlayDarkTheme.current
     val albumSchemePair by playerViewModel.currentAlbumArtColorSchemePair.collectAsStateWithLifecycle()
 
+    // Correctly bind to the palette-specific Pure Dark setting from uiState
+    val isOledEnabled = LocalPixelPlayPureDark.current
+
+
     val baseScheme = MaterialTheme.colorScheme
-    val albumScheme = remember(albumSchemePair, isDarkTheme, baseScheme) {
-        albumSchemePair?.let { pair -> if (isDarkTheme) pair.dark else pair.light } ?: baseScheme
+    val albumScheme = remember(albumSchemePair, isDarkTheme, baseScheme, isOledEnabled) {
+        val base = albumSchemePair?.let { pair -> if (isDarkTheme) pair.dark else pair.light } ?: baseScheme
+        if (isDarkTheme && isOledEnabled) base.toOledRole() else base
     }
 
     val currentSong = stablePlayerState.currentSong
@@ -105,13 +117,14 @@ fun PaletteStyleSettingsScreen(
 
     val resolvedSeed = seedColor ?: if (currentSong != null) albumScheme.primary else baseScheme.primary
 
-    val styleSchemes = remember(resolvedSeed, isDarkTheme) {
+    val styleSchemes = remember(resolvedSeed, isDarkTheme, isOledEnabled) {
         AlbumArtPaletteStyle.entries.associateWith { style ->
             val pair = generateColorSchemeFromSeed(
                 seedColor = resolvedSeed,
                 paletteStyle = style
             )
-            if (isDarkTheme) pair.dark else pair.light
+            val base = if (isDarkTheme) pair.dark else pair.light
+            if (isDarkTheme && isOledEnabled) base.toOledRole() else base
         }
     }
 
@@ -157,10 +170,20 @@ fun PaletteStyleSettingsScreen(
 
     val hasPendingChanges =
         pendingStyle != uiState.albumArtPaletteStyle ||
-            pendingAccuracy != uiState.albumArtColorAccuracy
-    val previewScheme = previewSchemePair?.let { pair ->
-        if (isDarkTheme) pair.dark else pair.light
-    } ?: styleSchemes[pendingStyle] ?: albumScheme
+                pendingAccuracy != uiState.albumArtColorAccuracy
+
+    val previewScheme = remember(previewSchemePair, isDarkTheme, isOledEnabled) {
+        previewSchemePair?.let { pair ->
+            val base = if (isDarkTheme) pair.dark else pair.light
+
+            if (isDarkTheme && isOledEnabled) {
+                base.toOledRole().copy(
+                    primaryContainer = Color.Black
+                )
+            } else base
+        } ?: styleSchemes[pendingStyle] ?: albumScheme
+    }
+    
     val bottomInset = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()
     val contentBottomPadding = bottomInset + if (isMiniPlayerVisible) MiniPlayerHeight + 12.dp else 16.dp
 
@@ -175,6 +198,7 @@ fun PaletteStyleSettingsScreen(
                         style = pendingStyle,
                         accuracyLevel = pendingAccuracy
                     )
+
                 },
                 applyEnabled = hasPendingChanges
             )
@@ -259,7 +283,11 @@ fun PaletteStyleSettingsScreen(
                         )
                     }
 
-                    Spacer(modifier = Modifier.height(2.dp))
+                    Spacer(modifier = Modifier.height(4.dp))
+
+
+
+
                     PaletteAccuracySlider(
                         scheme = previewScheme,
                         value = pendingAccuracy,
@@ -380,14 +408,6 @@ private fun MiniFullPlayerSkeletonPreview(
                     )
                 }
 
-//                Box(
-//                    modifier = Modifier
-//                        .fillMaxWidth(0.5f)
-//                        .height(scaled(12.dp))
-//                        .clip(RoundedCornerShape(scaled(6.dp)))
-//                        .background(placeholderOnColor)
-//                )
-
                 Box(
                     modifier = Modifier
                         .fillMaxWidth()
diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/screens/SettingsCategoryScreen.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/screens/SettingsCategoryScreen.kt
index 68ba68562..84bc55396 100644
--- a/app/src/main/java/com/theveloper/pixelplay/presentation/screens/SettingsCategoryScreen.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/presentation/screens/SettingsCategoryScreen.kt
@@ -543,7 +543,8 @@ fun SettingsCategoryScreen(
                                     options = mapOf(
                                         AppThemeMode.LIGHT to stringResource(R.string.setcat_theme_light),
                                         AppThemeMode.DARK to stringResource(R.string.setcat_theme_dark),
-                                        AppThemeMode.FOLLOW_SYSTEM to stringResource(R.string.setcat_theme_follow_system)
+                                        AppThemeMode.FOLLOW_SYSTEM to stringResource(R.string.setcat_theme_follow_system),
+                                        AppThemeMode.PURE_DARK to stringResource(R.string.setcat_theme_pure_dark)
                                     ),
                                     selectedKey = uiState.appThemeMode,
                                     onSelectionChanged = { settingsViewModel.setAppThemeMode(it) },
diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/screens/StatsScreen.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/screens/StatsScreen.kt
index 178dc5200..9fc9ae53f 100644
--- a/app/src/main/java/com/theveloper/pixelplay/presentation/screens/StatsScreen.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/presentation/screens/StatsScreen.kt
@@ -1450,7 +1450,7 @@ private fun TimelineMetricBadge(
     modifier: Modifier = Modifier
 ) {
     val (containerColor, contentColor) = when (metric) {
-        TimelineMetric.ListeningTime -> MaterialTheme.colorScheme.primaryContainer to MaterialTheme.colorScheme.onPrimaryContainer
+        TimelineMetric.ListeningTime -> MaterialTheme.colorScheme.secondaryContainer to MaterialTheme.colorScheme.onPrimaryContainer
         TimelineMetric.PlayCount -> MaterialTheme.colorScheme.secondaryContainer to MaterialTheme.colorScheme.onSecondaryContainer
         TimelineMetric.AverageSession -> MaterialTheme.colorScheme.tertiaryContainer to MaterialTheme.colorScheme.onTertiaryContainer
     }
diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/SettingsViewModel.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/SettingsViewModel.kt
index d12c3e21d..f1967ee1b 100644
--- a/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/SettingsViewModel.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/SettingsViewModel.kt
@@ -108,7 +108,8 @@ data class SettingsUiState(
     val minTracksPerAlbum: Int = 1,
     val replayGainEnabled: Boolean = false,
     val replayGainUseAlbumGain: Boolean = false,
-    val isSafeTokenLimitEnabled: Boolean = true
+    val isSafeTokenLimitEnabled: Boolean = true,
+    val albumArtPalettePureDark: Boolean = false
 )
 
 data class FailedSongInfo(
@@ -279,6 +280,8 @@ class SettingsViewModel @Inject constructor(
         }
     }
 
+
+
     // Specific on-change methods for UI binding
     fun onGeminiApiKeyChange(apiKey: String) {
         viewModelScope.launch {
diff --git a/app/src/main/java/com/theveloper/pixelplay/ui/theme/Theme.kt b/app/src/main/java/com/theveloper/pixelplay/ui/theme/Theme.kt
index 82ffad357..ff5126eb3 100644
--- a/app/src/main/java/com/theveloper/pixelplay/ui/theme/Theme.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/ui/theme/Theme.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Shapes
 import androidx.compose.material3.darkColorScheme
@@ -26,13 +27,29 @@ import androidx.core.graphics.ColorUtils
 import androidx.compose.ui.unit.dp
 
 val LocalPixelPlayDarkTheme = staticCompositionLocalOf { false }
+val LocalPixelPlayPureDark = staticCompositionLocalOf { false }
 
 private tailrec fun Context.findActivity(): Activity? = when (this) {
     is Activity -> this
     is ContextWrapper -> baseContext.findActivity()
     else -> null
 }
+fun ColorScheme.toOledRole(): ColorScheme {
+    return this.copy(
+        surface = Color.Black,
+        background = Color.Black,
+        scrim = Color(0xFF161616),
+        surfaceVariant = Color(0xFF121212),
+        onSurfaceVariant = Color.White.copy(alpha = 0.7f),
 
+        //primaryContainer = Color.Black,
+
+
+        surfaceContainerHigh = Color.Black,
+
+        outline = outline.copy(alpha = 0.6f)
+    )
+}
 @Composable
 fun PixelPlayStatusBarStyle(
     color: Color,
@@ -92,11 +109,12 @@ val LightColorScheme = lightColorScheme(
 @Composable
 fun PixelPlayTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
+    pureDark: Boolean = false,
     colorSchemePairOverride: ColorSchemePair? = null,
     content: @Composable () -> Unit
 ) {
     val context = LocalContext.current
-    val finalColorScheme = when {
+    val baseColorScheme = when {
         colorSchemePairOverride == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
             // Tema dinámico del sistema como prioridad si no hay override
             try {
@@ -115,6 +133,13 @@ fun PixelPlayTheme(
         else -> LightColorScheme
     }
 
+
+    val finalColorScheme = if (darkTheme && pureDark) {
+        baseColorScheme.toOledRole()
+    } else {
+        baseColorScheme
+    }
+
     val statusBarElevation = if (darkTheme) 4.dp else 12.dp
     val elevatedSurface = finalColorScheme.surfaceColorAtElevation(statusBarElevation)
     val defaultStatusBarColor = Color(
@@ -127,7 +152,7 @@ fun PixelPlayTheme(
 
     PixelPlayStatusBarStyle(color = defaultStatusBarColor)
 
-    CompositionLocalProvider(LocalPixelPlayDarkTheme provides darkTheme) {
+    CompositionLocalProvider(LocalPixelPlayDarkTheme provides darkTheme, LocalPixelPlayPureDark provides pureDark) {
         MaterialTheme(
             colorScheme = finalColorScheme,
             typography = Typography,
diff --git a/app/src/main/res/values/strings_settings.xml b/app/src/main/res/values/strings_settings.xml
index 7be070704..28ee6e4cb 100644
--- a/app/src/main/res/values/strings_settings.xml
+++ b/app/src/main/res/values/strings_settings.xml
@@ -73,6 +73,7 @@
     <string name="setcat_app_theme_desc">Switch between light, dark, or follow system appearance.</string>
     <string name="setcat_theme_light">Light Theme</string>
     <string name="setcat_theme_dark">Dark Theme</string>
+    <string name="setcat_theme_pure_dark">Pure Dark Theme</string>
     <string name="setcat_theme_follow_system">Follow System</string>
     <string name="setcat_smooth_corners_title">Use Smooth Corners</string>
     <string name="setcat_smooth_corners_subtitle">Use complex shaped corners effectively improving aesthetics but may affect performance on low-end devices</string>
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 11b7b4ca7..c5b7920f8 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -20,6 +20,12 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+    buildTypes {
+        create("benchmarkRelease") {
+        }
+        create("nonMinifiedRelease") {
+        }
+    }
 }
 
 dependencies {

From 43effa9c6509b52506004374898a45fb99bc6cd3 Mon Sep 17 00:00:00 2001
From: Bios Thusvill <87165098+thusvill@users.noreply.github.com>
Date: Thu, 23 Apr 2026 05:52:51 +0530
Subject: [PATCH 2/2] fixed non-oled lyrics screen

---
 .../presentation/components/LyricsFloatingToolbar.kt          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsFloatingToolbar.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsFloatingToolbar.kt
index 494060353..ba2b0d75d 100644
--- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsFloatingToolbar.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsFloatingToolbar.kt
@@ -100,7 +100,7 @@ fun LyricsFloatingToolbar(
                 activeColor = accentColor,
                 inactiveColor = if(LocalPixelPlayPureDark.current) {
                     Color.Transparent
-                }else{onBackgroundColor},
+                }else{backgroundColor},
                 activeContentColor = onAccentColor,
                 inactiveContentColor = onBackgroundColor,
                 activeCornerRadius = 50.dp,
@@ -121,7 +121,7 @@ fun LyricsFloatingToolbar(
                 activeColor = accentColor,
                 inactiveColor = if(LocalPixelPlayPureDark.current) {
                     Color.Transparent
-                }else{onBackgroundColor},
+                }else{backgroundColor},
                 activeContentColor = onAccentColor,
                 inactiveContentColor = onBackgroundColor,
                 activeCornerRadius = 50.dp,