diff --git a/app/src/main/java/com/michatec/radio/fragments/LicenseFragment.kt b/app/src/main/java/com/michatec/radio/fragments/LicenseFragment.kt index 828e5fa..142fa0c 100644 --- a/app/src/main/java/com/michatec/radio/fragments/LicenseFragment.kt +++ b/app/src/main/java/com/michatec/radio/fragments/LicenseFragment.kt @@ -4,17 +4,15 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface -import androidx.compose.material3.darkColorScheme -import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.fragment.app.Fragment +import com.michatec.radio.ui.theme.RadioTheme import com.mikepenz.aboutlibraries.Libs import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer import com.mikepenz.aboutlibraries.util.withContext @@ -34,10 +32,7 @@ class LicenseFragment : Fragment() { Libs.Builder().withContext(context).build() } - val isDark = isSystemInDarkTheme() - MaterialTheme( - colorScheme = if (isDark) darkColorScheme() else lightColorScheme() - ) { + RadioTheme { Surface( modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background diff --git a/app/src/main/java/com/michatec/radio/ui/theme/AppTheme.kt b/app/src/main/java/com/michatec/radio/ui/theme/AppTheme.kt new file mode 100644 index 0000000..c3b4ad0 --- /dev/null +++ b/app/src/main/java/com/michatec/radio/ui/theme/AppTheme.kt @@ -0,0 +1,55 @@ +package com.michatec.radio.ui.theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.luminance +import androidx.compose.ui.platform.LocalContext +import com.michatec.radio.helpers.PreferencesHelper +import com.michatec.radio.helpers.ThemeHelper + +@Composable +fun RadioTheme( + content: @Composable () -> Unit +) { + val context = LocalContext.current + val customThemeEnabled = PreferencesHelper.loadCustomThemeEnabled() + val isDark: Boolean + val backgroundColor: Color + + if (customThemeEnabled) { + var colorInt = PreferencesHelper.loadCustomThemeColor(context) + val index = PreferencesHelper.loadCustomThemeIndex() + if (index != -1) { + val colors = ThemeHelper.getPredefinedColors(context) + if (index < colors.size) { + colorInt = colors[index] + } + } + backgroundColor = Color(colorInt) + isDark = backgroundColor.luminance() < 0.5f + } else { + isDark = isSystemInDarkTheme() + backgroundColor = if (isDark) Color(0xFF1C1B1F) else Color(0xFFFFFBFE) + } + + val colorScheme = if (isDark) { + darkColorScheme( + background = backgroundColor, + surface = backgroundColor + ) + } else { + lightColorScheme( + background = backgroundColor, + surface = backgroundColor + ) + } + + MaterialTheme( + colorScheme = colorScheme, + content = content + ) +}