From b074534fecff87038e40f23dd205e748d4577c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolf=20Montwe=CC=81?= Date: Wed, 22 Feb 2023 10:25:12 +0100 Subject: [PATCH] Add compose specific rules and fix some issues --- build.gradle.kts | 12 +- config/detekt/baseline.xml | 3 + config/detekt/detekt.yml | 4 + .../app/k9mail/core/ui/compose/theme/Color.kt | 380 +++++++++--------- .../theme/{Elevation.kt => Elevations.kt} | 0 5 files changed, 207 insertions(+), 192 deletions(-) rename core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/{Elevation.kt => Elevations.kt} (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 9ffda38b1..6411557c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -43,7 +43,11 @@ allprojects { substitute(module("androidx.recyclerview:recyclerview")) .using(module("androidx.recyclerview:recyclerview:${libs.versions.androidxRecyclerView.get()}")) substitute(module("androidx.constraintlayout:constraintlayout")) - .using(module("androidx.constraintlayout:constraintlayout:${libs.versions.androidxConstraintLayout.get()}")) + .using( + module( + "androidx.constraintlayout:constraintlayout:${libs.versions.androidxConstraintLayout.get()}", + ), + ) substitute(module("androidx.drawerlayout:drawerlayout")) .using(module("androidx.drawerlayout:drawerlayout:${libs.versions.androidxDrawerLayout.get()}")) substitute(module("androidx.lifecycle:lifecycle-livedata")) @@ -59,7 +63,11 @@ allprojects { substitute(module("org.jetbrains.kotlin:kotlin-stdlib-jdk8")) .using(module("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${libs.versions.kotlin.get()}")) substitute(module("org.jetbrains.kotlinx:kotlinx-coroutines-android")) - .using(module("org.jetbrains.kotlinx:kotlinx-coroutines-android:${libs.versions.kotlinCoroutines.get()}")) + .using( + module( + "org.jetbrains.kotlinx:kotlinx-coroutines-android:${libs.versions.kotlinCoroutines.get()}", + ), + ) } } diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml index fc0911285..8d1d967ca 100644 --- a/config/detekt/baseline.xml +++ b/config/detekt/baseline.xml @@ -196,6 +196,7 @@ LongParameterList:SettingsImportViewModel.kt$SavedAccountState$( val accountIndex: Int, val displayName: String, val accountUuid: String, val selected: Boolean, val importStatus: ImportStatus, val incomingServerName: String?, val outgoingServerName: String?, val incomingServerPasswordNeeded: Boolean, val outgoingServerPasswordNeeded: Boolean, ) LongParameterList:SimpleImapSettings.kt$SimpleImapSettings$( override val host: String, override val port: Int = 0, override val connectionSecurity: ConnectionSecurity = ConnectionSecurity.NONE, override val authType: AuthType, override val username: String, override val password: String? = null, override val useCompression: Boolean = false, ) LongParameterList:TextBodyBuilderTest.kt$TextBodyBuilderTest.TestData$( val appendSignature: Boolean, val includeQuotedText: Boolean, val insertSeparator: Boolean, val replyAfterQuote: Boolean, val signatureBeforeQuotedText: Boolean, val expectedPlainTextMessage: String, val expectedHtmlTextMessage: String, ) + LongParameterList:Typography.kt$( h1: TextStyle, h2: TextStyle, h3: TextStyle, h4: TextStyle, h5: TextStyle, h6: TextStyle, subtitle1: TextStyle, subtitle2: TextStyle, body1: TextStyle, body2: TextStyle, button: TextStyle, caption: TextStyle, overline: TextStyle, ) LoopWithTooManyJumpStatements:AccountSetupCheckSettings.kt$AccountSetupCheckSettings$for (subjectAlternativeName in subjectAlternativeNames) { val type = subjectAlternativeName[0] as Int val value: Any? = subjectAlternativeName[1] val name: String = when (type) { 0 -> { Timber.w("SubjectAltName of type OtherName not supported.") continue } 1 -> value as String 2 -> value as String 3 -> { Timber.w("unsupported SubjectAltName of type x400Address") continue } 4 -> { Timber.w("unsupported SubjectAltName of type directoryName") continue } 5 -> { Timber.w("unsupported SubjectAltName of type ediPartyName") continue } 6 -> value as String 7 -> value as String else -> { Timber.w("unsupported SubjectAltName of unknown type") continue } } // if some of the SubjectAltNames match the store or transport -host, display them if (name.equals(incomingServerHost, ignoreCase = true) || name.equals(outgoingServerHost, ignoreCase = true) ) { // TODO: localize this string altNamesText.append("Subject(alt): ").append(name).append(",...\n") } else if (name.startsWith("*.") && ( incomingServerHost.endsWith(name.substring(2)) || outgoingServerHost.endsWith(name.substring(2)) ) ) { // TODO: localize this string altNamesText.append("Subject(alt): ").append(name).append(",...\n") } } LoopWithTooManyJumpStatements:HttpUriParser.kt$HttpUriParser$while (currentPos < text.length) { val c = text[currentPos] if (isHexDigit(c)) { shouldBeHex = (shouldBeHex - 1).coerceAtLeast(0) } else if (shouldBeHex == 0) { if (c in allowedCharacters) { // Everything ok here :) } else if (c == '%') { shouldBeHex = 2 } else { break } } else { break } currentPos++ } LoopWithTooManyJumpStatements:RealImapStore.kt$RealImapStore$for (listResponse in listResponses) { val serverId = listResponse.name if (pathDelimiter == null) { pathDelimiter = listResponse.hierarchyDelimiter combinedPrefix = null } if (RealImapFolder.INBOX.equals(serverId, ignoreCase = true)) { continue } else if (listResponse.hasAttribute("\\NoSelect")) { continue } val name = getFolderDisplayName(serverId) val oldServerId = getOldServerId(serverId) val type = when { listResponse.hasAttribute("\\Archive") -> FolderType.ARCHIVE listResponse.hasAttribute("\\All") -> FolderType.ARCHIVE listResponse.hasAttribute("\\Drafts") -> FolderType.DRAFTS listResponse.hasAttribute("\\Sent") -> FolderType.SENT listResponse.hasAttribute("\\Junk") -> FolderType.SPAM listResponse.hasAttribute("\\Trash") -> FolderType.TRASH else -> FolderType.REGULAR } val existingItem = folderMap[serverId] if (existingItem == null || existingItem.type == FolderType.REGULAR) { folderMap[serverId] = FolderListItem(serverId, name, type, oldServerId) } } @@ -474,6 +475,8 @@ MagicNumber:ThemeManager.kt$ThemeManager$28 MagicNumber:ThreadMessageOperations.kt$ThreadMessageOperations$3 MagicNumber:TimberLogger.kt$TimberLogger$26 + MagicNumber:Typography.kt$0.5 + MagicNumber:Typography.kt$1.5 MagicNumber:UidValidityResponse.kt$UidValidityResponse.Companion$0xFFFFFFFFL MagicNumber:Utf8.kt$0x010000 MagicNumber:Utf8.kt$0x10000 diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml index fd1a9102d..6c62fe02b 100644 --- a/config/detekt/detekt.yml +++ b/config/detekt/detekt.yml @@ -333,6 +333,8 @@ naming: functionPattern: '[a-z][a-zA-Z0-9]*' excludeClassPattern: '$^' ignoreOverridden: true + ignoreAnnotated: + - 'Composable' FunctionParameterNaming: active: true parameterPattern: '[a-z][A-Za-z0-9]*' @@ -683,6 +685,8 @@ style: UnusedPrivateMember: active: true allowedNames: '(_|ignored|expected|serialVersionUID)' + ignoreAnnotated: + - 'Preview' UseAnyOrNoneInsteadOfFind: active: true UseArrayLiteralsInAnnotations: diff --git a/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Color.kt b/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Color.kt index f55d7fd1d..359131a5e 100644 --- a/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Color.kt +++ b/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Color.kt @@ -4,211 +4,211 @@ package app.k9mail.core.ui.compose.theme import androidx.compose.ui.graphics.Color -val material_red_50 = Color(0xFFFFEBEE) -val material_red_100 = Color(0xFFFFCDD2) -val material_red_200 = Color(0xFFEF9A9A) -val material_red_300 = Color(0xFFE57373) -val material_red_400 = Color(0xFFEF5350) -val material_red_500 = Color(0xFFF44336) -val material_red_600 = Color(0xFFE53935) -val material_red_700 = Color(0xFFD32F2F) -val material_red_800 = Color(0xFFC62828) -val material_red_900 = Color(0xFFB71C1C) +val material_red_50 = Color(color = 0xFFFFEBEE) +val material_red_100 = Color(color = 0xFFFFCDD2) +val material_red_200 = Color(color = 0xFFEF9A9A) +val material_red_300 = Color(color = 0xFFE57373) +val material_red_400 = Color(color = 0xFFEF5350) +val material_red_500 = Color(color = 0xFFF44336) +val material_red_600 = Color(color = 0xFFE53935) +val material_red_700 = Color(color = 0xFFD32F2F) +val material_red_800 = Color(color = 0xFFC62828) +val material_red_900 = Color(color = 0xFFB71C1C) -val material_deep_purple_50 = Color(0xFFEDE7F6) -val material_deep_purple_100 = Color(0xFFD1C4E9) -val material_deep_purple_200 = Color(0xFFB39DDB) -val material_deep_purple_300 = Color(0xFF9575CD) -val material_deep_purple_400 = Color(0xFF7E57C2) -val material_deep_purple_500 = Color(0xFF673AB7) -val material_deep_purple_600 = Color(0xFF5E35B1) -val material_deep_purple_700 = Color(0xFF512DA8) -val material_deep_purple_800 = Color(0xFF4527A0) -val material_deep_purple_900 = Color(0xFF311B92) +val material_deep_purple_50 = Color(color = 0xFFEDE7F6) +val material_deep_purple_100 = Color(color = 0xFFD1C4E9) +val material_deep_purple_200 = Color(color = 0xFFB39DDB) +val material_deep_purple_300 = Color(color = 0xFF9575CD) +val material_deep_purple_400 = Color(color = 0xFF7E57C2) +val material_deep_purple_500 = Color(color = 0xFF673AB7) +val material_deep_purple_600 = Color(color = 0xFF5E35B1) +val material_deep_purple_700 = Color(color = 0xFF512DA8) +val material_deep_purple_800 = Color(color = 0xFF4527A0) +val material_deep_purple_900 = Color(color = 0xFF311B92) -val material_light_blue_50 = Color(0xFFE1F5FE) -val material_light_blue_100 = Color(0xFFB3E5FC) -val material_light_blue_200 = Color(0xFF81D4FA) -val material_light_blue_300 = Color(0xFF4FC3F7) -val material_light_blue_400 = Color(0xFF29B6F6) -val material_light_blue_500 = Color(0xFF03A9F4) -val material_light_blue_600 = Color(0xFF039BE5) -val material_light_blue_700 = Color(0xFF0288D1) -val material_light_blue_800 = Color(0xFF0277BD) -val material_light_blue_900 = Color(0xFF01579B) +val material_light_blue_50 = Color(color = 0xFFE1F5FE) +val material_light_blue_100 = Color(color = 0xFFB3E5FC) +val material_light_blue_200 = Color(color = 0xFF81D4FA) +val material_light_blue_300 = Color(color = 0xFF4FC3F7) +val material_light_blue_400 = Color(color = 0xFF29B6F6) +val material_light_blue_500 = Color(color = 0xFF03A9F4) +val material_light_blue_600 = Color(color = 0xFF039BE5) +val material_light_blue_700 = Color(color = 0xFF0288D1) +val material_light_blue_800 = Color(color = 0xFF0277BD) +val material_light_blue_900 = Color(color = 0xFF01579B) -val material_green_50 = Color(0xFFE8F5E9) -val material_green_100 = Color(0xFFC8E6C9) -val material_green_200 = Color(0xFFA5D6A7) -val material_green_300 = Color(0xFF81C784) -val material_green_400 = Color(0xFF66BB6A) -val material_green_500 = Color(0xFF4CAF50) -val material_green_600 = Color(0xFF43A047) -val material_green_700 = Color(0xFF388E3C) -val material_green_800 = Color(0xFF2E7D32) -val material_green_900 = Color(0xFF1B5E20) +val material_green_50 = Color(color = 0xFFE8F5E9) +val material_green_100 = Color(color = 0xFFC8E6C9) +val material_green_200 = Color(color = 0xFFA5D6A7) +val material_green_300 = Color(color = 0xFF81C784) +val material_green_400 = Color(color = 0xFF66BB6A) +val material_green_500 = Color(color = 0xFF4CAF50) +val material_green_600 = Color(color = 0xFF43A047) +val material_green_700 = Color(color = 0xFF388E3C) +val material_green_800 = Color(color = 0xFF2E7D32) +val material_green_900 = Color(color = 0xFF1B5E20) -val material_yellow_50 = Color(0xFFFFFDE7) -val material_yellow_100 = Color(0xFFFFF9C4) -val material_yellow_200 = Color(0xFFFFF59D) -val material_yellow_300 = Color(0xFFFFF176) -val material_yellow_400 = Color(0xFFFFEE58) -val material_yellow_500 = Color(0xFFFFEB3B) -val material_yellow_600 = Color(0xFFFDD835) -val material_yellow_700 = Color(0xFFFBC02D) -val material_yellow_800 = Color(0xFFF9A825) -val material_yellow_900 = Color(0xFFF57F17) +val material_yellow_50 = Color(color = 0xFFFFFDE7) +val material_yellow_100 = Color(color = 0xFFFFF9C4) +val material_yellow_200 = Color(color = 0xFFFFF59D) +val material_yellow_300 = Color(color = 0xFFFFF176) +val material_yellow_400 = Color(color = 0xFFFFEE58) +val material_yellow_500 = Color(color = 0xFFFFEB3B) +val material_yellow_600 = Color(color = 0xFFFDD835) +val material_yellow_700 = Color(color = 0xFFFBC02D) +val material_yellow_800 = Color(color = 0xFFF9A825) +val material_yellow_900 = Color(color = 0xFFF57F17) -val material_deep_orange_50 = Color(0xFFFBE9E7) -val material_deep_orange_100 = Color(0xFFFFCCBC) -val material_deep_orange_200 = Color(0xFFFFAB91) -val material_deep_orange_300 = Color(0xFFFF8A65) -val material_deep_orange_400 = Color(0xFFFF7043) -val material_deep_orange_500 = Color(0xFFFF5722) -val material_deep_orange_600 = Color(0xFFF4511E) -val material_deep_orange_700 = Color(0xFFE64A19) -val material_deep_orange_800 = Color(0xFFD84315) -val material_deep_orange_900 = Color(0xFFBF360C) +val material_deep_orange_50 = Color(color = 0xFFFBE9E7) +val material_deep_orange_100 = Color(color = 0xFFFFCCBC) +val material_deep_orange_200 = Color(color = 0xFFFFAB91) +val material_deep_orange_300 = Color(color = 0xFFFF8A65) +val material_deep_orange_400 = Color(color = 0xFFFF7043) +val material_deep_orange_500 = Color(color = 0xFFFF5722) +val material_deep_orange_600 = Color(color = 0xFFF4511E) +val material_deep_orange_700 = Color(color = 0xFFE64A19) +val material_deep_orange_800 = Color(color = 0xFFD84315) +val material_deep_orange_900 = Color(color = 0xFFBF360C) -val material_blue_gray_50 = Color(0xFFECEFF1) -val material_blue_gray_100 = Color(0xFFCFD8DC) -val material_blue_gray_200 = Color(0xFFB0BEC5) -val material_blue_gray_300 = Color(0xFF90A4AE) -val material_blue_gray_400 = Color(0xFF78909C) -val material_blue_gray_500 = Color(0xFF607D8B) -val material_blue_gray_600 = Color(0xFF546E7A) -val material_blue_gray_700 = Color(0xFF455A64) -val material_blue_gray_800 = Color(0xFF37474F) -val material_blue_gray_900 = Color(0xFF263238) +val material_blue_gray_50 = Color(color = 0xFFECEFF1) +val material_blue_gray_100 = Color(color = 0xFFCFD8DC) +val material_blue_gray_200 = Color(color = 0xFFB0BEC5) +val material_blue_gray_300 = Color(color = 0xFF90A4AE) +val material_blue_gray_400 = Color(color = 0xFF78909C) +val material_blue_gray_500 = Color(color = 0xFF607D8B) +val material_blue_gray_600 = Color(color = 0xFF546E7A) +val material_blue_gray_700 = Color(color = 0xFF455A64) +val material_blue_gray_800 = Color(color = 0xFF37474F) +val material_blue_gray_900 = Color(color = 0xFF263238) -val material_pink_50 = Color(0xFFFCE4EC) -val material_pink_100 = Color(0xFFF8BBD0) -val material_pink_200 = Color(0xFFF48FB1) -val material_pink_300 = Color(0xFFF06292) -val material_pink_400 = Color(0xFFEC407A) -val material_pink_500 = Color(0xFFE91E63) -val material_pink_600 = Color(0xFFD81B60) -val material_pink_700 = Color(0xFFC2185B) -val material_pink_800 = Color(0xFFAD1457) -val material_pink_900 = Color(0xFF880E4F) +val material_pink_50 = Color(color = 0xFFFCE4EC) +val material_pink_100 = Color(color = 0xFFF8BBD0) +val material_pink_200 = Color(color = 0xFFF48FB1) +val material_pink_300 = Color(color = 0xFFF06292) +val material_pink_400 = Color(color = 0xFFEC407A) +val material_pink_500 = Color(color = 0xFFE91E63) +val material_pink_600 = Color(color = 0xFFD81B60) +val material_pink_700 = Color(color = 0xFFC2185B) +val material_pink_800 = Color(color = 0xFFAD1457) +val material_pink_900 = Color(color = 0xFF880E4F) -val material_indigo_50 = Color(0xFFE8EAF6) -val material_indigo_100 = Color(0xFFC5CAE9) -val material_indigo_200 = Color(0xFF9FA8DA) -val material_indigo_300 = Color(0xFF7986CB) -val material_indigo_400 = Color(0xFF5C6BC0) -val material_indigo_500 = Color(0xFF3F51B5) -val material_indigo_600 = Color(0xFF3949AB) -val material_indigo_700 = Color(0xFF303F9F) -val material_indigo_800 = Color(0xFF283593) -val material_indigo_900 = Color(0xFF1A237E) +val material_indigo_50 = Color(color = 0xFFE8EAF6) +val material_indigo_100 = Color(color = 0xFFC5CAE9) +val material_indigo_200 = Color(color = 0xFF9FA8DA) +val material_indigo_300 = Color(color = 0xFF7986CB) +val material_indigo_400 = Color(color = 0xFF5C6BC0) +val material_indigo_500 = Color(color = 0xFF3F51B5) +val material_indigo_600 = Color(color = 0xFF3949AB) +val material_indigo_700 = Color(color = 0xFF303F9F) +val material_indigo_800 = Color(color = 0xFF283593) +val material_indigo_900 = Color(color = 0xFF1A237E) -val material_cyan_50 = Color(0xFFE0F7FA) -val material_cyan_100 = Color(0xFFB2EBF2) -val material_cyan_200 = Color(0xFF80DEEA) -val material_cyan_300 = Color(0xFF4DD0E1) -val material_cyan_400 = Color(0xFF26C6DA) -val material_cyan_500 = Color(0xFF00BCD4) -val material_cyan_600 = Color(0xFF00ACC1) -val material_cyan_700 = Color(0xFF0097A7) -val material_cyan_800 = Color(0xFF00838F) -val material_cyan_900 = Color(0xFF006064) +val material_cyan_50 = Color(color = 0xFFE0F7FA) +val material_cyan_100 = Color(color = 0xFFB2EBF2) +val material_cyan_200 = Color(color = 0xFF80DEEA) +val material_cyan_300 = Color(color = 0xFF4DD0E1) +val material_cyan_400 = Color(color = 0xFF26C6DA) +val material_cyan_500 = Color(color = 0xFF00BCD4) +val material_cyan_600 = Color(color = 0xFF00ACC1) +val material_cyan_700 = Color(color = 0xFF0097A7) +val material_cyan_800 = Color(color = 0xFF00838F) +val material_cyan_900 = Color(color = 0xFF006064) -val material_light_green_50 = Color(0xFFF1F8E9) -val material_light_green_100 = Color(0xFFDCEDC8) -val material_light_green_200 = Color(0xFFC5E1A5) -val material_light_green_300 = Color(0xFFAED581) -val material_light_green_400 = Color(0xFF9CCC65) -val material_light_green_500 = Color(0xFF8BC34A) -val material_light_green_600 = Color(0xFF7CB342) -val material_light_green_700 = Color(0xFF689F38) -val material_light_green_800 = Color(0xFF558B2F) -val material_light_green_900 = Color(0xFF33691E) +val material_light_green_50 = Color(color = 0xFFF1F8E9) +val material_light_green_100 = Color(color = 0xFFDCEDC8) +val material_light_green_200 = Color(color = 0xFFC5E1A5) +val material_light_green_300 = Color(color = 0xFFAED581) +val material_light_green_400 = Color(color = 0xFF9CCC65) +val material_light_green_500 = Color(color = 0xFF8BC34A) +val material_light_green_600 = Color(color = 0xFF7CB342) +val material_light_green_700 = Color(color = 0xFF689F38) +val material_light_green_800 = Color(color = 0xFF558B2F) +val material_light_green_900 = Color(color = 0xFF33691E) -val material_amber_50 = Color(0xFFFFF8E1) -val material_amber_100 = Color(0xFFFFECB3) -val material_amber_200 = Color(0xFFFFE082) -val material_amber_300 = Color(0xFFFFD54F) -val material_amber_400 = Color(0xFFFFCA28) -val material_amber_500 = Color(0xFFFFC107) -val material_amber_600 = Color(0xFFFFB300) -val material_amber_700 = Color(0xFFFFA000) -val material_amber_800 = Color(0xFFFF8F00) -val material_amber_900 = Color(0xFFFF6F00) +val material_amber_50 = Color(color = 0xFFFFF8E1) +val material_amber_100 = Color(color = 0xFFFFECB3) +val material_amber_200 = Color(color = 0xFFFFE082) +val material_amber_300 = Color(color = 0xFFFFD54F) +val material_amber_400 = Color(color = 0xFFFFCA28) +val material_amber_500 = Color(color = 0xFFFFC107) +val material_amber_600 = Color(color = 0xFFFFB300) +val material_amber_700 = Color(color = 0xFFFFA000) +val material_amber_800 = Color(color = 0xFFFF8F00) +val material_amber_900 = Color(color = 0xFFFF6F00) -val material_brown_50 = Color(0xFFEFEBE9) -val material_brown_100 = Color(0xFFD7CCC8) -val material_brown_200 = Color(0xFFBCAAA4) -val material_brown_300 = Color(0xFFA1887F) -val material_brown_400 = Color(0xFF8D6E63) -val material_brown_500 = Color(0xFF795548) -val material_brown_600 = Color(0xFF6D4C41) -val material_brown_700 = Color(0xFF5D4037) -val material_brown_800 = Color(0xFF4E342E) -val material_brown_900 = Color(0xFF3E2723) +val material_brown_50 = Color(color = 0xFFEFEBE9) +val material_brown_100 = Color(color = 0xFFD7CCC8) +val material_brown_200 = Color(color = 0xFFBCAAA4) +val material_brown_300 = Color(color = 0xFFA1887F) +val material_brown_400 = Color(color = 0xFF8D6E63) +val material_brown_500 = Color(color = 0xFF795548) +val material_brown_600 = Color(color = 0xFF6D4C41) +val material_brown_700 = Color(color = 0xFF5D4037) +val material_brown_800 = Color(color = 0xFF4E342E) +val material_brown_900 = Color(color = 0xFF3E2723) -val material_purple_50 = Color(0xFFF3E5F5) -val material_purple_100 = Color(0xFFE1BEE7) -val material_purple_200 = Color(0xFFCE93D8) -val material_purple_300 = Color(0xFFBA68C8) -val material_purple_400 = Color(0xFFAB47BC) -val material_purple_500 = Color(0xFF9C27B0) -val material_purple_600 = Color(0xFF8E24AA) -val material_purple_700 = Color(0xFF7B1FA2) -val material_purple_800 = Color(0xFF6A1B9A) -val material_purple_900 = Color(0xFF4A148C) +val material_purple_50 = Color(color = 0xFFF3E5F5) +val material_purple_100 = Color(color = 0xFFE1BEE7) +val material_purple_200 = Color(color = 0xFFCE93D8) +val material_purple_300 = Color(color = 0xFFBA68C8) +val material_purple_400 = Color(color = 0xFFAB47BC) +val material_purple_500 = Color(color = 0xFF9C27B0) +val material_purple_600 = Color(color = 0xFF8E24AA) +val material_purple_700 = Color(color = 0xFF7B1FA2) +val material_purple_800 = Color(color = 0xFF6A1B9A) +val material_purple_900 = Color(color = 0xFF4A148C) -val material_blue_50 = Color(0xFFE3F2FD) -val material_blue_100 = Color(0xFFBBDEFB) -val material_blue_200 = Color(0xFF90CAF9) -val material_blue_300 = Color(0xFF64B5F6) -val material_blue_400 = Color(0xFF42A5F5) -val material_blue_500 = Color(0xFF2196F3) -val material_blue_600 = Color(0xFF1E88E5) -val material_blue_700 = Color(0xFF1976D2) -val material_blue_800 = Color(0xFF1565C0) -val material_blue_900 = Color(0xFF0D47A1) +val material_blue_50 = Color(color = 0xFFE3F2FD) +val material_blue_100 = Color(color = 0xFFBBDEFB) +val material_blue_200 = Color(color = 0xFF90CAF9) +val material_blue_300 = Color(color = 0xFF64B5F6) +val material_blue_400 = Color(color = 0xFF42A5F5) +val material_blue_500 = Color(color = 0xFF2196F3) +val material_blue_600 = Color(color = 0xFF1E88E5) +val material_blue_700 = Color(color = 0xFF1976D2) +val material_blue_800 = Color(color = 0xFF1565C0) +val material_blue_900 = Color(color = 0xFF0D47A1) -val material_teal_50 = Color(0xFFE0F2F1) -val material_teal_100 = Color(0xFFB2DFDB) -val material_teal_200 = Color(0xFF80CBC4) -val material_teal_300 = Color(0xFF4DB6AC) -val material_teal_400 = Color(0xFF26A69A) -val material_teal_500 = Color(0xFF009688) -val material_teal_600 = Color(0xFF00897B) -val material_teal_700 = Color(0xFF00796B) -val material_teal_800 = Color(0xFF00695C) -val material_teal_900 = Color(0xFF004D40) +val material_teal_50 = Color(color = 0xFFE0F2F1) +val material_teal_100 = Color(color = 0xFFB2DFDB) +val material_teal_200 = Color(color = 0xFF80CBC4) +val material_teal_300 = Color(color = 0xFF4DB6AC) +val material_teal_400 = Color(color = 0xFF26A69A) +val material_teal_500 = Color(color = 0xFF009688) +val material_teal_600 = Color(color = 0xFF00897B) +val material_teal_700 = Color(color = 0xFF00796B) +val material_teal_800 = Color(color = 0xFF00695C) +val material_teal_900 = Color(color = 0xFF004D40) -val material_lime_50 = Color(0xFFF9FBE7) -val material_lime_100 = Color(0xFFF0F4C3) -val material_lime_200 = Color(0xFFE6EE9C) -val material_lime_300 = Color(0xFFDCE775) -val material_lime_400 = Color(0xFFD4E157) -val material_lime_500 = Color(0xFFCDDC39) -val material_lime_600 = Color(0xFFC0CA33) -val material_lime_700 = Color(0xFFAFB42B) -val material_lime_800 = Color(0xFF9E9D24) -val material_lime_900 = Color(0xFF827717) +val material_lime_50 = Color(color = 0xFFF9FBE7) +val material_lime_100 = Color(color = 0xFFF0F4C3) +val material_lime_200 = Color(color = 0xFFE6EE9C) +val material_lime_300 = Color(color = 0xFFDCE775) +val material_lime_400 = Color(color = 0xFFD4E157) +val material_lime_500 = Color(color = 0xFFCDDC39) +val material_lime_600 = Color(color = 0xFFC0CA33) +val material_lime_700 = Color(color = 0xFFAFB42B) +val material_lime_800 = Color(color = 0xFF9E9D24) +val material_lime_900 = Color(color = 0xFF827717) -val material_orange_50 = Color(0xFFFFF3E0) -val material_orange_100 = Color(0xFFFFE0B2) -val material_orange_200 = Color(0xFFFFCC80) -val material_orange_300 = Color(0xFFFFB74D) -val material_orange_400 = Color(0xFFFFA726) -val material_orange_500 = Color(0xFFFF9800) -val material_orange_600 = Color(0xFFFB8C00) -val material_orange_700 = Color(0xFFF57C00) -val material_orange_800 = Color(0xFFEF6C00) -val material_orange_900 = Color(0xFFE65100) +val material_orange_50 = Color(color = 0xFFFFF3E0) +val material_orange_100 = Color(color = 0xFFFFE0B2) +val material_orange_200 = Color(color = 0xFFFFCC80) +val material_orange_300 = Color(color = 0xFFFFB74D) +val material_orange_400 = Color(color = 0xFFFFA726) +val material_orange_500 = Color(color = 0xFFFF9800) +val material_orange_600 = Color(color = 0xFFFB8C00) +val material_orange_700 = Color(color = 0xFFF57C00) +val material_orange_800 = Color(color = 0xFFEF6C00) +val material_orange_900 = Color(color = 0xFFE65100) -val material_gray_50 = Color(0xFFFAFAFA) -val material_gray_100 = Color(0xFFF5F5F5) -val material_gray_200 = Color(0xFFEEEEEE) -val material_gray_300 = Color(0xFFE0E0E0) -val material_gray_400 = Color(0xFFBDBDBD) -val material_gray_500 = Color(0xFF9E9E9E) -val material_gray_600 = Color(0xFF757575) -val material_gray_700 = Color(0xFF616161) -val material_gray_800 = Color(0xFF424242) -val material_gray_900 = Color(0xFF212121) +val material_gray_50 = Color(color = 0xFFFAFAFA) +val material_gray_100 = Color(color = 0xFFF5F5F5) +val material_gray_200 = Color(color = 0xFFEEEEEE) +val material_gray_300 = Color(color = 0xFFE0E0E0) +val material_gray_400 = Color(color = 0xFFBDBDBD) +val material_gray_500 = Color(color = 0xFF9E9E9E) +val material_gray_600 = Color(color = 0xFF757575) +val material_gray_700 = Color(color = 0xFF616161) +val material_gray_800 = Color(color = 0xFF424242) +val material_gray_900 = Color(color = 0xFF212121) diff --git a/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Elevation.kt b/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Elevations.kt similarity index 100% rename from core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Elevation.kt rename to core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Elevations.kt