diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 090f594..4a37ab7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -102,6 +102,7 @@ dependencies { implementation(libs.kotlinx.serialization.json) implementation(libs.jonahbauer.android.preference.annotations) implementation(libs.androidx.ui.tooling.preview.android) + debugImplementation(libs.androidx.ui.tooling) kapt(libs.jonahbauer.android.preference.annotations) testImplementation(libs.junit) androidTestImplementation(libs.androidx.espresso.core) diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/settings/meta/SettingsFragmentMeta.kt b/app/src/main/java/de/jrpie/android/launcher/ui/settings/meta/SettingsFragmentMeta.kt index afbcf24..e066da2 100644 --- a/app/src/main/java/de/jrpie/android/launcher/ui/settings/meta/SettingsFragmentMeta.kt +++ b/app/src/main/java/de/jrpie/android/launcher/ui/settings/meta/SettingsFragmentMeta.kt @@ -22,10 +22,12 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.ComposeView +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import androidx.fragment.app.Fragment @@ -112,6 +114,15 @@ fun SettingsMetaScreen( } } +@Preview +@Composable +fun SettingsMetaScreenPreview() { + SettingsMetaScreen( + context = LocalContext.current, + onResetConfirmed = {} + ) +} + // Composable for the scrollable button list and version number @Composable private fun SettingsButtonList( @@ -178,6 +189,14 @@ private fun SettingsButtonList( } } +@Preview +@Composable +fun SettingsButtonListPreview() { + SettingsButtonList( + context = LocalContext.current, + openAlertDialog = remember { mutableStateOf(false) }) +} + // Composable for a settings button @Composable fun SettingsButton( @@ -203,6 +222,12 @@ fun SettingsButton( } } +@Preview +@Composable +fun SettingsButtonPreview() { + SettingsButton(text = "Here's a button preview", onClick = {}) +} + // Composable for spacing between buttons @Composable fun SettingsButtonSpacer() { @@ -248,4 +273,16 @@ fun AlertDialogResetSettings( dismissOnClickOutside = true ) ) +} + +@Preview +@Composable +fun AlertDialogResetSettingsPreview() { + AlertDialogResetSettings( + onDismissRequest = {}, + onConfirmation = {}, + dialogTitle = "Reset settings", + dialogText = "Are you sure you want to reset all settings?", + icon = Icons.Default.Warning + ) } \ No newline at end of file diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/theme/Color.kt b/app/src/main/java/de/jrpie/android/launcher/ui/theme/Color.kt new file mode 100644 index 0000000..87aced2 --- /dev/null +++ b/app/src/main/java/de/jrpie/android/launcher/ui/theme/Color.kt @@ -0,0 +1,236 @@ +package de.jrpie.android.launcher.ui.theme + +import androidx.compose.ui.graphics.Color + +val finnmglasTheme_background_color = Color(0xFF252827) +val finnmglasTheme_accent_color = Color(0xFF5555FF) +val finnmglasTheme_text_color = Color(0xFFFFFFFF) + +val darkTheme_background_color = Color(0xFF000000) +val darkTheme_accent_color = Color(0xFF444444) +val darkTheme_text_color = Color(0xFFFFFFFF) + +val lightTheme_background_color = Color(0xFFFFFFFF) +val lightTheme_accent_color = Color(0xFF9999FF) +val lightTheme_text_color = Color(0xFF000000) +val light_blue_400 = Color(0xFF29B6F6) +val light_blue_600 = Color(0xFF039BE5) +val gray_400 = Color(0xFFBDBDBD) +val gray_600 = Color(0xFF757575) + +// Built using https://material-foundation.github.io/material-theme-builder/ +val primaryLight = Color(0xFF585992) +val onPrimaryLight = Color(0xFFFFFFFF) +val primaryContainerLight = Color(0xFFE1DFFF) +val onPrimaryContainerLight = Color(0xFF404178) +val secondaryLight = Color(0xFF585992) +val onSecondaryLight = Color(0xFFFFFFFF) +val secondaryContainerLight = Color(0xFFE1DFFF) +val onSecondaryContainerLight = Color(0xFF404178) +val tertiaryLight = Color(0xFF585992) +val onTertiaryLight = Color(0xFFFFFFFF) +val tertiaryContainerLight = Color(0xFFE1DFFF) +val onTertiaryContainerLight = Color(0xFF404178) +val errorLight = Color(0xFFBA1A1A) +val onErrorLight = Color(0xFFFFFFFF) +val errorContainerLight = Color(0xFFFFDAD6) +val onErrorContainerLight = Color(0xFF93000A) +val backgroundLight = Color(0xFFFCF8FF) +val onBackgroundLight = Color(0xFF1B1B21) +val surfaceLight = Color(0xFFF4FBF8) +val onSurfaceLight = Color(0xFF171D1B) +val surfaceVariantLight = Color(0xFFDAE5E1) +val onSurfaceVariantLight = Color(0xFF3F4946) +val outlineLight = Color(0xFF6F7976) +val outlineVariantLight = Color(0xFFBEC9C5) +val scrimLight = Color(0xFF000000) +val inverseSurfaceLight = Color(0xFF2B3230) +val inverseOnSurfaceLight = Color(0xFFECF2EF) +val inversePrimaryLight = Color(0xFFC1C1FF) +val surfaceDimLight = Color(0xFFD5DBD8) +val surfaceBrightLight = Color(0xFFF4FBF8) +val surfaceContainerLowestLight = Color(0xFFFFFFFF) +val surfaceContainerLowLight = Color(0xFFEFF5F2) +val surfaceContainerLight = Color(0xFFE9EFEC) +val surfaceContainerHighLight = Color(0xFFE3EAE7) +val surfaceContainerHighestLight = Color(0xFFDEE4E1) + +val primaryLightMediumContrast = Color(0xFF2F3066) +val onPrimaryLightMediumContrast = Color(0xFFFFFFFF) +val primaryContainerLightMediumContrast = Color(0xFF6668A2) +val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF) +val secondaryLightMediumContrast = Color(0xFF2F3066) +val onSecondaryLightMediumContrast = Color(0xFFFFFFFF) +val secondaryContainerLightMediumContrast = Color(0xFF6668A2) +val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF) +val tertiaryLightMediumContrast = Color(0xFF2F3066) +val onTertiaryLightMediumContrast = Color(0xFFFFFFFF) +val tertiaryContainerLightMediumContrast = Color(0xFF6668A2) +val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF) +val errorLightMediumContrast = Color(0xFF740006) +val onErrorLightMediumContrast = Color(0xFFFFFFFF) +val errorContainerLightMediumContrast = Color(0xFFCF2C27) +val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF) +val backgroundLightMediumContrast = Color(0xFFFCF8FF) +val onBackgroundLightMediumContrast = Color(0xFF1B1B21) +val surfaceLightMediumContrast = Color(0xFFF4FBF8) +val onSurfaceLightMediumContrast = Color(0xFF0C1211) +val surfaceVariantLightMediumContrast = Color(0xFFDAE5E1) +val onSurfaceVariantLightMediumContrast = Color(0xFF2F3836) +val outlineLightMediumContrast = Color(0xFF4B5452) +val outlineVariantLightMediumContrast = Color(0xFF656F6C) +val scrimLightMediumContrast = Color(0xFF000000) +val inverseSurfaceLightMediumContrast = Color(0xFF2B3230) +val inverseOnSurfaceLightMediumContrast = Color(0xFFECF2EF) +val inversePrimaryLightMediumContrast = Color(0xFFC1C1FF) +val surfaceDimLightMediumContrast = Color(0xFFC1C8C5) +val surfaceBrightLightMediumContrast = Color(0xFFF4FBF8) +val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF) +val surfaceContainerLowLightMediumContrast = Color(0xFFEFF5F2) +val surfaceContainerLightMediumContrast = Color(0xFFE3EAE7) +val surfaceContainerHighLightMediumContrast = Color(0xFFD8DEDB) +val surfaceContainerHighestLightMediumContrast = Color(0xFFCDD3D0) + +val primaryLightHighContrast = Color(0xFF25265C) +val onPrimaryLightHighContrast = Color(0xFFFFFFFF) +val primaryContainerLightHighContrast = Color(0xFF42447B) +val onPrimaryContainerLightHighContrast = Color(0xFFFFFFFF) +val secondaryLightHighContrast = Color(0xFF25265C) +val onSecondaryLightHighContrast = Color(0xFFFFFFFF) +val secondaryContainerLightHighContrast = Color(0xFF42447B) +val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF) +val tertiaryLightHighContrast = Color(0xFF25265C) +val onTertiaryLightHighContrast = Color(0xFFFFFFFF) +val tertiaryContainerLightHighContrast = Color(0xFF42447B) +val onTertiaryContainerLightHighContrast = Color(0xFFFFFFFF) +val errorLightHighContrast = Color(0xFF600004) +val onErrorLightHighContrast = Color(0xFFFFFFFF) +val errorContainerLightHighContrast = Color(0xFF98000A) +val onErrorContainerLightHighContrast = Color(0xFFFFFFFF) +val backgroundLightHighContrast = Color(0xFFFCF8FF) +val onBackgroundLightHighContrast = Color(0xFF1B1B21) +val surfaceLightHighContrast = Color(0xFFF4FBF8) +val onSurfaceLightHighContrast = Color(0xFF000000) +val surfaceVariantLightHighContrast = Color(0xFFDAE5E1) +val onSurfaceVariantLightHighContrast = Color(0xFF000000) +val outlineLightHighContrast = Color(0xFF252E2C) +val outlineVariantLightHighContrast = Color(0xFF414B49) +val scrimLightHighContrast = Color(0xFF000000) +val inverseSurfaceLightHighContrast = Color(0xFF2B3230) +val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF) +val inversePrimaryLightHighContrast = Color(0xFFC1C1FF) +val surfaceDimLightHighContrast = Color(0xFFB4BAB7) +val surfaceBrightLightHighContrast = Color(0xFFF4FBF8) +val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF) +val surfaceContainerLowLightHighContrast = Color(0xFFECF2EF) +val surfaceContainerLightHighContrast = Color(0xFFDEE4E1) +val surfaceContainerHighLightHighContrast = Color(0xFFCFD6D3) +val surfaceContainerHighestLightHighContrast = Color(0xFFC1C8C5) + +val primaryDark = Color(0xFFC1C1FF) +val onPrimaryDark = Color(0xFF292A60) +val primaryContainerDark = Color(0xFF404178) +val onPrimaryContainerDark = Color(0xFFE1DFFF) +val secondaryDark = Color(0xFFC1C1FF) +val onSecondaryDark = Color(0xFF292A60) +val secondaryContainerDark = Color(0xFF404178) +val onSecondaryContainerDark = Color(0xFFE1DFFF) +val tertiaryDark = Color(0xFFC1C1FF) +val onTertiaryDark = Color(0xFF292A60) +val tertiaryContainerDark = Color(0xFF404178) +val onTertiaryContainerDark = Color(0xFFE1DFFF) +val errorDark = Color(0xFFFFB4AB) +val onErrorDark = Color(0xFF690005) +val errorContainerDark = Color(0xFF93000A) +val onErrorContainerDark = Color(0xFFFFDAD6) +val backgroundDark = Color(0xFF131318) +val onBackgroundDark = Color(0xFFE4E1E9) +val surfaceDark = Color(0xFF0E1513) +val onSurfaceDark = Color(0xFFDEE4E1) +val surfaceVariantDark = Color(0xFF3F4946) +val onSurfaceVariantDark = Color(0xFFBEC9C5) +val outlineDark = Color(0xFF899390) +val outlineVariantDark = Color(0xFF3F4946) +val scrimDark = Color(0xFF000000) +val inverseSurfaceDark = Color(0xFFDEE4E1) +val inverseOnSurfaceDark = Color(0xFF2B3230) +val inversePrimaryDark = Color(0xFF585992) +val surfaceDimDark = Color(0xFF0E1513) +val surfaceBrightDark = Color(0xFF343B39) +val surfaceContainerLowestDark = Color(0xFF090F0E) +val surfaceContainerLowDark = Color(0xFF171D1B) +val surfaceContainerDark = Color(0xFF1B211F) +val surfaceContainerHighDark = Color(0xFF252B2A) +val surfaceContainerHighestDark = Color(0xFF303634) + +val primaryDarkMediumContrast = Color(0xFFDAD9FF) +val onPrimaryDarkMediumContrast = Color(0xFF1E1F55) +val primaryContainerDarkMediumContrast = Color(0xFF8A8BC8) +val onPrimaryContainerDarkMediumContrast = Color(0xFF000000) +val secondaryDarkMediumContrast = Color(0xFFDAD9FF) +val onSecondaryDarkMediumContrast = Color(0xFF1E1F55) +val secondaryContainerDarkMediumContrast = Color(0xFF8A8BC8) +val onSecondaryContainerDarkMediumContrast = Color(0xFF000000) +val tertiaryDarkMediumContrast = Color(0xFFDAD9FF) +val onTertiaryDarkMediumContrast = Color(0xFF1E1F55) +val tertiaryContainerDarkMediumContrast = Color(0xFF8A8BC8) +val onTertiaryContainerDarkMediumContrast = Color(0xFF000000) +val errorDarkMediumContrast = Color(0xFFFFD2CC) +val onErrorDarkMediumContrast = Color(0xFF540003) +val errorContainerDarkMediumContrast = Color(0xFFFF5449) +val onErrorContainerDarkMediumContrast = Color(0xFF000000) +val backgroundDarkMediumContrast = Color(0xFF131318) +val onBackgroundDarkMediumContrast = Color(0xFFE4E1E9) +val surfaceDarkMediumContrast = Color(0xFF0E1513) +val onSurfaceDarkMediumContrast = Color(0xFFFFFFFF) +val surfaceVariantDarkMediumContrast = Color(0xFF3F4946) +val onSurfaceVariantDarkMediumContrast = Color(0xFFD4DFDB) +val outlineDarkMediumContrast = Color(0xFFAAB4B1) +val outlineVariantDarkMediumContrast = Color(0xFF88928F) +val scrimDarkMediumContrast = Color(0xFF000000) +val inverseSurfaceDarkMediumContrast = Color(0xFFDEE4E1) +val inverseOnSurfaceDarkMediumContrast = Color(0xFF252B2A) +val inversePrimaryDarkMediumContrast = Color(0xFF41427A) +val surfaceDimDarkMediumContrast = Color(0xFF0E1513) +val surfaceBrightDarkMediumContrast = Color(0xFF3F4644) +val surfaceContainerLowestDarkMediumContrast = Color(0xFF040807) +val surfaceContainerLowDarkMediumContrast = Color(0xFF191F1D) +val surfaceContainerDarkMediumContrast = Color(0xFF232927) +val surfaceContainerHighDarkMediumContrast = Color(0xFF2D3432) +val surfaceContainerHighestDarkMediumContrast = Color(0xFF383F3D) + +val primaryDarkHighContrast = Color(0xFFF1EEFF) +val onPrimaryDarkHighContrast = Color(0xFF000000) +val primaryContainerDarkHighContrast = Color(0xFFBCBDFD) +val onPrimaryContainerDarkHighContrast = Color(0xFF02003C) +val secondaryDarkHighContrast = Color(0xFFF1EEFF) +val onSecondaryDarkHighContrast = Color(0xFF000000) +val secondaryContainerDarkHighContrast = Color(0xFFBCBDFD) +val onSecondaryContainerDarkHighContrast = Color(0xFF02003C) +val tertiaryDarkHighContrast = Color(0xFFF1EEFF) +val onTertiaryDarkHighContrast = Color(0xFF000000) +val tertiaryContainerDarkHighContrast = Color(0xFFBCBDFD) +val onTertiaryContainerDarkHighContrast = Color(0xFF02003C) +val errorDarkHighContrast = Color(0xFFFFECE9) +val onErrorDarkHighContrast = Color(0xFF000000) +val errorContainerDarkHighContrast = Color(0xFFFFAEA4) +val onErrorContainerDarkHighContrast = Color(0xFF220001) +val backgroundDarkHighContrast = Color(0xFF131318) +val onBackgroundDarkHighContrast = Color(0xFFE4E1E9) +val surfaceDarkHighContrast = Color(0xFF0E1513) +val onSurfaceDarkHighContrast = Color(0xFFFFFFFF) +val surfaceVariantDarkHighContrast = Color(0xFF3F4946) +val onSurfaceVariantDarkHighContrast = Color(0xFFFFFFFF) +val outlineDarkHighContrast = Color(0xFFE8F2EF) +val outlineVariantDarkHighContrast = Color(0xFFBAC5C1) +val scrimDarkHighContrast = Color(0xFF000000) +val inverseSurfaceDarkHighContrast = Color(0xFFDEE4E1) +val inverseOnSurfaceDarkHighContrast = Color(0xFF000000) +val inversePrimaryDarkHighContrast = Color(0xFF41427A) +val surfaceDimDarkHighContrast = Color(0xFF0E1513) +val surfaceBrightDarkHighContrast = Color(0xFF4B514F) +val surfaceContainerLowestDarkHighContrast = Color(0xFF000000) +val surfaceContainerLowDarkHighContrast = Color(0xFF1B211F) +val surfaceContainerDarkHighContrast = Color(0xFF2B3230) +val surfaceContainerHighDarkHighContrast = Color(0xFF363D3B) +val surfaceContainerHighestDarkHighContrast = Color(0xFF424846) diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/theme/Theme.kt b/app/src/main/java/de/jrpie/android/launcher/ui/theme/Theme.kt new file mode 100644 index 0000000..2ab76fe --- /dev/null +++ b/app/src/main/java/de/jrpie/android/launcher/ui/theme/Theme.kt @@ -0,0 +1,282 @@ +// Built using https://material-foundation.github.io/material-theme-builder/ + +package de.jrpie.android.launcher.ui.theme + +//import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +//import androidx.compose.material3.Typography +import androidx.compose.runtime.Composable +import androidx.compose.runtime.Immutable +import androidx.compose.ui.graphics.Color +//import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext + +private val lightScheme = lightColorScheme( + primary = primaryLight, + onPrimary = onPrimaryLight, + primaryContainer = primaryContainerLight, + onPrimaryContainer = onPrimaryContainerLight, + secondary = secondaryLight, + onSecondary = onSecondaryLight, + secondaryContainer = secondaryContainerLight, + onSecondaryContainer = onSecondaryContainerLight, + tertiary = tertiaryLight, + onTertiary = onTertiaryLight, + tertiaryContainer = tertiaryContainerLight, + onTertiaryContainer = onTertiaryContainerLight, + error = errorLight, + onError = onErrorLight, + errorContainer = errorContainerLight, + onErrorContainer = onErrorContainerLight, + background = backgroundLight, + onBackground = onBackgroundLight, + surface = surfaceLight, + onSurface = onSurfaceLight, + surfaceVariant = surfaceVariantLight, + onSurfaceVariant = onSurfaceVariantLight, + outline = outlineLight, + outlineVariant = outlineVariantLight, + scrim = scrimLight, + inverseSurface = inverseSurfaceLight, + inverseOnSurface = inverseOnSurfaceLight, + inversePrimary = inversePrimaryLight, + surfaceDim = surfaceDimLight, + surfaceBright = surfaceBrightLight, + surfaceContainerLowest = surfaceContainerLowestLight, + surfaceContainerLow = surfaceContainerLowLight, + surfaceContainer = surfaceContainerLight, + surfaceContainerHigh = surfaceContainerHighLight, + surfaceContainerHighest = surfaceContainerHighestLight, +) + +private val darkScheme = darkColorScheme( + primary = primaryDark, + onPrimary = onPrimaryDark, + primaryContainer = primaryContainerDark, + onPrimaryContainer = onPrimaryContainerDark, + secondary = secondaryDark, + onSecondary = onSecondaryDark, + secondaryContainer = secondaryContainerDark, + onSecondaryContainer = onSecondaryContainerDark, + tertiary = tertiaryDark, + onTertiary = onTertiaryDark, + tertiaryContainer = tertiaryContainerDark, + onTertiaryContainer = onTertiaryContainerDark, + error = errorDark, + onError = onErrorDark, + errorContainer = errorContainerDark, + onErrorContainer = onErrorContainerDark, + background = backgroundDark, + onBackground = onBackgroundDark, + surface = surfaceDark, + onSurface = onSurfaceDark, + surfaceVariant = surfaceVariantDark, + onSurfaceVariant = onSurfaceVariantDark, + outline = outlineDark, + outlineVariant = outlineVariantDark, + scrim = scrimDark, + inverseSurface = inverseSurfaceDark, + inverseOnSurface = inverseOnSurfaceDark, + inversePrimary = inversePrimaryDark, + surfaceDim = surfaceDimDark, + surfaceBright = surfaceBrightDark, + surfaceContainerLowest = surfaceContainerLowestDark, + surfaceContainerLow = surfaceContainerLowDark, + surfaceContainer = surfaceContainerDark, + surfaceContainerHigh = surfaceContainerHighDark, + surfaceContainerHighest = surfaceContainerHighestDark, +) + +private val mediumContrastLightColorScheme = lightColorScheme( + primary = primaryLightMediumContrast, + onPrimary = onPrimaryLightMediumContrast, + primaryContainer = primaryContainerLightMediumContrast, + onPrimaryContainer = onPrimaryContainerLightMediumContrast, + secondary = secondaryLightMediumContrast, + onSecondary = onSecondaryLightMediumContrast, + secondaryContainer = secondaryContainerLightMediumContrast, + onSecondaryContainer = onSecondaryContainerLightMediumContrast, + tertiary = tertiaryLightMediumContrast, + onTertiary = onTertiaryLightMediumContrast, + tertiaryContainer = tertiaryContainerLightMediumContrast, + onTertiaryContainer = onTertiaryContainerLightMediumContrast, + error = errorLightMediumContrast, + onError = onErrorLightMediumContrast, + errorContainer = errorContainerLightMediumContrast, + onErrorContainer = onErrorContainerLightMediumContrast, + background = backgroundLightMediumContrast, + onBackground = onBackgroundLightMediumContrast, + surface = surfaceLightMediumContrast, + onSurface = onSurfaceLightMediumContrast, + surfaceVariant = surfaceVariantLightMediumContrast, + onSurfaceVariant = onSurfaceVariantLightMediumContrast, + outline = outlineLightMediumContrast, + outlineVariant = outlineVariantLightMediumContrast, + scrim = scrimLightMediumContrast, + inverseSurface = inverseSurfaceLightMediumContrast, + inverseOnSurface = inverseOnSurfaceLightMediumContrast, + inversePrimary = inversePrimaryLightMediumContrast, + surfaceDim = surfaceDimLightMediumContrast, + surfaceBright = surfaceBrightLightMediumContrast, + surfaceContainerLowest = surfaceContainerLowestLightMediumContrast, + surfaceContainerLow = surfaceContainerLowLightMediumContrast, + surfaceContainer = surfaceContainerLightMediumContrast, + surfaceContainerHigh = surfaceContainerHighLightMediumContrast, + surfaceContainerHighest = surfaceContainerHighestLightMediumContrast, +) + +private val highContrastLightColorScheme = lightColorScheme( + primary = primaryLightHighContrast, + onPrimary = onPrimaryLightHighContrast, + primaryContainer = primaryContainerLightHighContrast, + onPrimaryContainer = onPrimaryContainerLightHighContrast, + secondary = secondaryLightHighContrast, + onSecondary = onSecondaryLightHighContrast, + secondaryContainer = secondaryContainerLightHighContrast, + onSecondaryContainer = onSecondaryContainerLightHighContrast, + tertiary = tertiaryLightHighContrast, + onTertiary = onTertiaryLightHighContrast, + tertiaryContainer = tertiaryContainerLightHighContrast, + onTertiaryContainer = onTertiaryContainerLightHighContrast, + error = errorLightHighContrast, + onError = onErrorLightHighContrast, + errorContainer = errorContainerLightHighContrast, + onErrorContainer = onErrorContainerLightHighContrast, + background = backgroundLightHighContrast, + onBackground = onBackgroundLightHighContrast, + surface = surfaceLightHighContrast, + onSurface = onSurfaceLightHighContrast, + surfaceVariant = surfaceVariantLightHighContrast, + onSurfaceVariant = onSurfaceVariantLightHighContrast, + outline = outlineLightHighContrast, + outlineVariant = outlineVariantLightHighContrast, + scrim = scrimLightHighContrast, + inverseSurface = inverseSurfaceLightHighContrast, + inverseOnSurface = inverseOnSurfaceLightHighContrast, + inversePrimary = inversePrimaryLightHighContrast, + surfaceDim = surfaceDimLightHighContrast, + surfaceBright = surfaceBrightLightHighContrast, + surfaceContainerLowest = surfaceContainerLowestLightHighContrast, + surfaceContainerLow = surfaceContainerLowLightHighContrast, + surfaceContainer = surfaceContainerLightHighContrast, + surfaceContainerHigh = surfaceContainerHighLightHighContrast, + surfaceContainerHighest = surfaceContainerHighestLightHighContrast, +) + +private val mediumContrastDarkColorScheme = darkColorScheme( + primary = primaryDarkMediumContrast, + onPrimary = onPrimaryDarkMediumContrast, + primaryContainer = primaryContainerDarkMediumContrast, + onPrimaryContainer = onPrimaryContainerDarkMediumContrast, + secondary = secondaryDarkMediumContrast, + onSecondary = onSecondaryDarkMediumContrast, + secondaryContainer = secondaryContainerDarkMediumContrast, + onSecondaryContainer = onSecondaryContainerDarkMediumContrast, + tertiary = tertiaryDarkMediumContrast, + onTertiary = onTertiaryDarkMediumContrast, + tertiaryContainer = tertiaryContainerDarkMediumContrast, + onTertiaryContainer = onTertiaryContainerDarkMediumContrast, + error = errorDarkMediumContrast, + onError = onErrorDarkMediumContrast, + errorContainer = errorContainerDarkMediumContrast, + onErrorContainer = onErrorContainerDarkMediumContrast, + background = backgroundDarkMediumContrast, + onBackground = onBackgroundDarkMediumContrast, + surface = surfaceDarkMediumContrast, + onSurface = onSurfaceDarkMediumContrast, + surfaceVariant = surfaceVariantDarkMediumContrast, + onSurfaceVariant = onSurfaceVariantDarkMediumContrast, + outline = outlineDarkMediumContrast, + outlineVariant = outlineVariantDarkMediumContrast, + scrim = scrimDarkMediumContrast, + inverseSurface = inverseSurfaceDarkMediumContrast, + inverseOnSurface = inverseOnSurfaceDarkMediumContrast, + inversePrimary = inversePrimaryDarkMediumContrast, + surfaceDim = surfaceDimDarkMediumContrast, + surfaceBright = surfaceBrightDarkMediumContrast, + surfaceContainerLowest = surfaceContainerLowestDarkMediumContrast, + surfaceContainerLow = surfaceContainerLowDarkMediumContrast, + surfaceContainer = surfaceContainerDarkMediumContrast, + surfaceContainerHigh = surfaceContainerHighDarkMediumContrast, + surfaceContainerHighest = surfaceContainerHighestDarkMediumContrast, +) + +private val highContrastDarkColorScheme = darkColorScheme( + primary = primaryDarkHighContrast, + onPrimary = onPrimaryDarkHighContrast, + primaryContainer = primaryContainerDarkHighContrast, + onPrimaryContainer = onPrimaryContainerDarkHighContrast, + secondary = secondaryDarkHighContrast, + onSecondary = onSecondaryDarkHighContrast, + secondaryContainer = secondaryContainerDarkHighContrast, + onSecondaryContainer = onSecondaryContainerDarkHighContrast, + tertiary = tertiaryDarkHighContrast, + onTertiary = onTertiaryDarkHighContrast, + tertiaryContainer = tertiaryContainerDarkHighContrast, + onTertiaryContainer = onTertiaryContainerDarkHighContrast, + error = errorDarkHighContrast, + onError = onErrorDarkHighContrast, + errorContainer = errorContainerDarkHighContrast, + onErrorContainer = onErrorContainerDarkHighContrast, + background = backgroundDarkHighContrast, + onBackground = onBackgroundDarkHighContrast, + surface = surfaceDarkHighContrast, + onSurface = onSurfaceDarkHighContrast, + surfaceVariant = surfaceVariantDarkHighContrast, + onSurfaceVariant = onSurfaceVariantDarkHighContrast, + outline = outlineDarkHighContrast, + outlineVariant = outlineVariantDarkHighContrast, + scrim = scrimDarkHighContrast, + inverseSurface = inverseSurfaceDarkHighContrast, + inverseOnSurface = inverseOnSurfaceDarkHighContrast, + inversePrimary = inversePrimaryDarkHighContrast, + surfaceDim = surfaceDimDarkHighContrast, + surfaceBright = surfaceBrightDarkHighContrast, + surfaceContainerLowest = surfaceContainerLowestDarkHighContrast, + surfaceContainerLow = surfaceContainerLowDarkHighContrast, + surfaceContainer = surfaceContainerDarkHighContrast, + surfaceContainerHigh = surfaceContainerHighDarkHighContrast, + surfaceContainerHighest = surfaceContainerHighestDarkHighContrast, +) + +@Immutable +data class ColorFamily( + val color: Color, + val onColor: Color, + val colorContainer: Color, + val onColorContainer: Color +) + +val unspecified_scheme = ColorFamily( + Color.Unspecified, Color.Unspecified, Color.Unspecified, Color.Unspecified +) + +@Composable +fun AppTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable() () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> darkScheme + else -> lightScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = AppTypography, + content = content + ) +} diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/theme/Type.kt b/app/src/main/java/de/jrpie/android/launcher/ui/theme/Type.kt new file mode 100644 index 0000000..fe32449 --- /dev/null +++ b/app/src/main/java/de/jrpie/android/launcher/ui/theme/Type.kt @@ -0,0 +1,11 @@ +// Built using https://material-foundation.github.io/material-theme-builder/ + +package de.jrpie.android.launcher.ui.theme + +import androidx.compose.material3.Typography +//import androidx.compose.ui.text.TextStyle +//import androidx.compose.ui.text.font.FontFamily +//import androidx.compose.ui.text.font.FontWeight +//import androidx.compose.ui.unit.sp + +val AppTypography = Typography() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 48330f0..fd00a27 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,6 +21,7 @@ palette-ktx = "1.0.0" preference-ktx = "1.2.1" recyclerview = "1.4.0" serialization = "1.8.10" +uiTooling = "1.8.1" uiToolingPreviewAndroid = "1.8.1" [libraries] @@ -54,6 +55,7 @@ jonahbauer-android-preference-annotations = { group = "eu.jonahbauer", name = "a junit = { group = "junit", name = "junit", version.ref = "junit" } androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "uiTooling" } androidx-ui-tooling-preview-android = { group = "androidx.compose.ui", name = "ui-tooling-preview-android", version.ref = "uiToolingPreviewAndroid" } [plugins]