diff --git a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/items/ButtonItems.kt b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/items/ButtonItems.kt index bcf3a4ba7..2cde5314e 100644 --- a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/items/ButtonItems.kt +++ b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/items/ButtonItems.kt @@ -77,8 +77,8 @@ fun LazyGridScope.buttonItems() { horizontalArrangement = Arrangement.spacedBy(MainTheme.spacings.default), modifier = Modifier.itemDefaultPadding(), ) { - ButtonIcon(onClick = { }, imageVector = Icons.Outlined.celebration) - ButtonIcon(onClick = { }, imageVector = Icons.Outlined.celebration, enabled = false) + ButtonIcon(onClick = { }, imageVector = Icons.Outlined.Celebration) + ButtonIcon(onClick = { }, imageVector = Icons.Outlined.Celebration, enabled = false) } } } diff --git a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/items/TextFieldItems.kt b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/items/TextFieldItems.kt index 5337943ab..0183e6124 100644 --- a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/items/TextFieldItems.kt +++ b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/items/TextFieldItems.kt @@ -160,7 +160,7 @@ private fun LazyGridScope.textFieldOutlinedItems() { onValueChange = { state.value = state.value.copy(input = it) }, trailingIcon = { if (state.value.showTrailingIcon) { - Icon(imageVector = Icons.Filled.user) + Icon(imageVector = Icons.Filled.User) } }, isEnabled = !state.value.isDisabled, diff --git a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/organism/items/AppBarItems.kt b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/organism/items/AppBarItems.kt index 60a56194b..460379b95 100644 --- a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/organism/items/AppBarItems.kt +++ b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/organism/items/AppBarItems.kt @@ -20,7 +20,7 @@ fun LazyGridScope.appBarItems() { ItemOutlined { TopAppBarItem( title = "Title", - actionIcon = Icons.Outlined.celebration, + actionIcon = Icons.Outlined.Celebration, ) } } @@ -57,7 +57,7 @@ fun TopAppBarItem( navIcon?.let { ButtonIcon( onClick = {}, - imageVector = Icons.Outlined.menu, + imageVector = Icons.Outlined.Menu, ) } }, diff --git a/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/button/ButtonIconPreview.kt b/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/button/ButtonIconPreview.kt index 1a3bed81b..552bb0335 100644 --- a/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/button/ButtonIconPreview.kt +++ b/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/button/ButtonIconPreview.kt @@ -11,7 +11,7 @@ internal fun ButtonIconPreview() { PreviewWithThemes { ButtonIcon( onClick = { }, - imageVector = Icons.Outlined.info, + imageVector = Icons.Outlined.Info, ) } } @@ -22,7 +22,7 @@ internal fun ButtonIconFilledPreview() { PreviewWithThemes { ButtonIcon( onClick = { }, - imageVector = Icons.Filled.cancel, + imageVector = Icons.Filled.Cancel, ) } } diff --git a/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/IconPreview.kt b/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/IconPreview.kt index 5ba22e0aa..dca86a1e8 100644 --- a/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/IconPreview.kt +++ b/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/IconPreview.kt @@ -10,7 +10,7 @@ import app.k9mail.core.ui.compose.designsystem.PreviewWithThemes internal fun IconPreview() { PreviewWithThemes { Icon( - imageVector = Icons.Filled.error, + imageVector = Icons.Filled.Error, ) } } @@ -20,7 +20,7 @@ internal fun IconPreview() { internal fun IconTintedPreview() { PreviewWithThemes { Icon( - imageVector = Icons.Filled.error, + imageVector = Icons.Filled.Error, tint = Color.Magenta, ) } diff --git a/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/textfield/TextFieldOutlinedPreview.kt b/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/textfield/TextFieldOutlinedPreview.kt index efd6eae7c..d474e79a1 100644 --- a/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/textfield/TextFieldOutlinedPreview.kt +++ b/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/textfield/TextFieldOutlinedPreview.kt @@ -73,7 +73,7 @@ internal fun TextFieldOutlinedWithTrailingIconPreview() { TextFieldOutlined( value = "", onValueChange = {}, - trailingIcon = { Icon(imageVector = Icons.Filled.user) }, + trailingIcon = { Icon(imageVector = Icons.Filled.User) }, isRequired = true, ) } diff --git a/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/organism/TopAppBarPreview.kt b/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/organism/TopAppBarPreview.kt index a1071bf6b..a4d7686c5 100644 --- a/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/organism/TopAppBarPreview.kt +++ b/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/organism/TopAppBarPreview.kt @@ -25,15 +25,15 @@ internal fun TopAppBarWithActionsPreview() { actions = { ButtonIcon( onClick = {}, - imageVector = Icons.Outlined.info, + imageVector = Icons.Outlined.Info, ) ButtonIcon( onClick = {}, - imageVector = Icons.Outlined.check, + imageVector = Icons.Outlined.Check, ) ButtonIcon( onClick = {}, - imageVector = Icons.Outlined.celebration, + imageVector = Icons.Outlined.Celebration, ) }, ) diff --git a/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/template/ScaffoldPreview.kt b/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/template/ScaffoldPreview.kt index fa2c6a0a0..f1d4880fe 100644 --- a/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/template/ScaffoldPreview.kt +++ b/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/template/ScaffoldPreview.kt @@ -70,7 +70,7 @@ internal fun ScaffoldWitFabPreview() { floatingActionButton = { ButtonIcon( onClick = { }, - imageVector = Icons.Outlined.check, + imageVector = Icons.Outlined.Check, ) }, ) { contentPadding -> diff --git a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/Icons.kt b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/Icons.kt index d4752edb6..1ed4ea82c 100644 --- a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/Icons.kt +++ b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/Icons.kt @@ -18,70 +18,66 @@ import androidx.compose.material.icons.outlined.ExpandLess import androidx.compose.material.icons.outlined.ExpandMore import androidx.compose.material.icons.outlined.Info import androidx.compose.material.icons.outlined.Menu -import androidx.compose.material.icons.outlined.WarningAmber import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.material.icons.Icons as MaterialIcons // We're using getters so not all icons are loaded into memory as soon as one of the nested objects is accessed. object Icons { object Filled { - val error: ImageVector + val Error: ImageVector get() = MaterialIcons.Filled.Error - val inbox: ImageVector + val Inbox: ImageVector get() = MaterialIcons.Filled.MoveToInbox - val outbox: ImageVector + val Outbox: ImageVector get() = MaterialIcons.Filled.Outbox - val security: ImageVector + val Security: ImageVector get() = MaterialIcons.Filled.Security - val passwordVisibility: ImageVector + val PasswordVisibility: ImageVector get() = MaterialIcons.Filled.Visibility - val passwordVisibilityOff: ImageVector + val PasswordVisibilityOff: ImageVector get() = MaterialIcons.Filled.VisibilityOff - val user: ImageVector + val User: ImageVector get() = MaterialIcons.Filled.AccountCircle - val check: ImageVector + val Check: ImageVector get() = MaterialIcons.Filled.CheckCircle - val cancel: ImageVector + val Cancel: ImageVector get() = MaterialIcons.Filled.Cancel } object Outlined { - val arrowBack: ImageVector + val ArrowBack: ImageVector get() = MaterialIcons.AutoMirrored.Outlined.ArrowBack - val arrowDropDown: ImageVector + val ArrowDropDown: ImageVector get() = MaterialIcons.Outlined.ArrowDropDown - val celebration: ImageVector + val Celebration: ImageVector get() = MaterialIcons.Outlined.Celebration - val menu: ImageVector + val Menu: ImageVector get() = MaterialIcons.Outlined.Menu - val check: ImageVector + val Check: ImageVector get() = MaterialIcons.Outlined.Check - val info: ImageVector + val Info: ImageVector get() = MaterialIcons.Outlined.Info - val warning: ImageVector - get() = MaterialIcons.Outlined.WarningAmber - - val error: ImageVector + val Error: ImageVector get() = MaterialIcons.Outlined.ErrorOutline - val expandMore: ImageVector + val ExpandMore: ImageVector get() = MaterialIcons.Outlined.ExpandMore - val expandLess: ImageVector + val ExpandLess: ImageVector get() = MaterialIcons.Outlined.ExpandLess } } diff --git a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/textfield/TextFieldOutlinedFakeSelect.kt b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/textfield/TextFieldOutlinedFakeSelect.kt index 119f9f16e..ed134325a 100644 --- a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/textfield/TextFieldOutlinedFakeSelect.kt +++ b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/textfield/TextFieldOutlinedFakeSelect.kt @@ -27,7 +27,7 @@ fun TextFieldOutlinedFakeSelect( .then(modifier), readOnly = true, label = optionalLabel(label), - trailingIcon = { Icon(Icons.Outlined.arrowDropDown) }, + trailingIcon = { Icon(Icons.Outlined.ArrowDropDown) }, singleLine = true, interactionSource = remember { MutableInteractionSource() } .also { interactionSource -> diff --git a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/textfield/TextFieldOutlinedPassword.kt b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/textfield/TextFieldOutlinedPassword.kt index 3e3a7f48d..19c8b2e19 100644 --- a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/textfield/TextFieldOutlinedPassword.kt +++ b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/textfield/TextFieldOutlinedPassword.kt @@ -97,9 +97,9 @@ private fun selectTrailingIcon( return if (hasTrailingIcon) { { val image = if (isShowPasswordAllowed(isEnabled, isPasswordVisible)) { - Icons.Filled.passwordVisibility + Icons.Filled.PasswordVisibility } else { - Icons.Filled.passwordVisibilityOff + Icons.Filled.PasswordVisibilityOff } val description = if (isShowPasswordAllowed(isEnabled, isPasswordVisible)) { diff --git a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/molecule/ErrorView.kt b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/molecule/ErrorView.kt index a8897956c..8b73fe44d 100644 --- a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/molecule/ErrorView.kt +++ b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/molecule/ErrorView.kt @@ -45,7 +45,7 @@ fun ErrorView( horizontalAlignment = Alignment.CenterHorizontally, ) { Icon( - imageVector = Icons.Filled.error, + imageVector = Icons.Filled.Error, tint = MainTheme.colors.error, ) Spacer(modifier = Modifier.height(MainTheme.spacings.double)) diff --git a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/organism/TopAppBar.kt b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/organism/TopAppBar.kt index fe0c7a637..ae78238d6 100644 --- a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/organism/TopAppBar.kt +++ b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/organism/TopAppBar.kt @@ -43,7 +43,7 @@ fun TopAppBarWithMenuButton( navigationIcon = { ButtonIcon( onClick = onMenuClick, - imageVector = Icons.Outlined.menu, + imageVector = Icons.Outlined.Menu, ) }, actions = actions, @@ -63,7 +63,7 @@ fun TopAppBarWithBackButton( navigationIcon = { ButtonIcon( onClick = onBackClick, - imageVector = Icons.Outlined.arrowBack, + imageVector = Icons.Outlined.ArrowBack, ) }, actions = actions, diff --git a/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/ui/view/SuccessView.kt b/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/ui/view/SuccessView.kt index 5b1af7ebb..da25f6d20 100644 --- a/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/ui/view/SuccessView.kt +++ b/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/ui/view/SuccessView.kt @@ -36,7 +36,7 @@ fun SuccessView( verticalAlignment = Alignment.CenterVertically, ) { Icon( - imageVector = Icons.Outlined.celebration, + imageVector = Icons.Outlined.Celebration, tint = MainTheme.colors.secondary, modifier = Modifier.requiredSize(MainTheme.sizes.large), ) diff --git a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/view/AutoDiscoveryResultHeaderState.kt b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/view/AutoDiscoveryResultHeaderState.kt index bab441ea1..a4946127e 100644 --- a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/view/AutoDiscoveryResultHeaderState.kt +++ b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/view/AutoDiscoveryResultHeaderState.kt @@ -12,21 +12,21 @@ enum class AutoDiscoveryResultHeaderState( val isExpandable: Boolean, ) { NoSettings( - icon = Icons.Outlined.info, + icon = Icons.Outlined.Info, titleResourceId = R.string.account_setup_auto_discovery_result_header_title_configuration_not_found, subtitleResourceId = R.string.account_setup_auto_discovery_result_header_subtitle_configuration_not_found, isExpandable = false, ), Trusted( - icon = Icons.Outlined.check, + icon = Icons.Outlined.Check, titleResourceId = R.string.account_setup_auto_discovery_status_header_title_configuration_found, subtitleResourceId = R.string.account_setup_auto_discovery_result_header_subtitle_configuration_trusted, isExpandable = true, ), Untrusted( - icon = Icons.Outlined.info, + icon = Icons.Outlined.Info, titleResourceId = R.string.account_setup_auto_discovery_status_header_title_configuration_found, subtitleResourceId = R.string.account_setup_auto_discovery_result_header_subtitle_configuration_untrusted, isExpandable = true, diff --git a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/view/AutoDiscoveryResultHeaderView.kt b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/view/AutoDiscoveryResultHeaderView.kt index 6bd8d4311..cc38f5ec3 100644 --- a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/view/AutoDiscoveryResultHeaderView.kt +++ b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/view/AutoDiscoveryResultHeaderView.kt @@ -55,7 +55,7 @@ internal fun AutoDiscoveryResultHeaderView( } if (state.isExpandable) { Icon( - imageVector = if (isExpanded) Icons.Outlined.expandLess else Icons.Outlined.expandMore, + imageVector = if (isExpanded) Icons.Outlined.ExpandLess else Icons.Outlined.ExpandMore, modifier = Modifier.padding(MainTheme.spacings.default), ) } diff --git a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/view/AutoDiscoveryServerSettingsView.kt b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/view/AutoDiscoveryServerSettingsView.kt index 3976538b2..6769611d6 100644 --- a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/view/AutoDiscoveryServerSettingsView.kt +++ b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/view/AutoDiscoveryServerSettingsView.kt @@ -53,7 +53,7 @@ internal fun AutoDiscoveryServerSettingsView( ) ServerSettingRow( - icon = if (isIncoming) Icons.Filled.inbox else Icons.Filled.outbox, + icon = if (isIncoming) Icons.Filled.Inbox else Icons.Filled.Outbox, text = buildAnnotatedString { append("Server") append(": ") @@ -70,7 +70,7 @@ internal fun AutoDiscoveryServerSettingsView( ) ServerSettingRow( - icon = Icons.Filled.security, + icon = Icons.Filled.Security, text = buildAnnotatedString { append("Security: ") append(connectionSecurity.toAutoDiscoveryConnectionSecurityString(resources)) @@ -79,7 +79,7 @@ internal fun AutoDiscoveryServerSettingsView( if (username.isNotEmpty()) { ServerSettingRow( - icon = Icons.Filled.user, + icon = Icons.Filled.User, text = buildAnnotatedString { append("Username: ") append(username) diff --git a/feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionBox.kt b/feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionBox.kt index 6d4019bf3..5a88b68d3 100644 --- a/feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionBox.kt +++ b/feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionBox.kt @@ -101,7 +101,7 @@ private fun IconWithPermissionStateOverlay( UiPermissionState.Unknown -> Unit UiPermissionState.Granted -> { Icon( - imageVector = Icons.Filled.check, + imageVector = Icons.Filled.Check, tint = MainTheme.colors.success, modifier = Modifier .size(overlayIconSize) @@ -114,7 +114,7 @@ private fun IconWithPermissionStateOverlay( UiPermissionState.Denied -> { Icon( - imageVector = Icons.Filled.cancel, + imageVector = Icons.Filled.Cancel, tint = MainTheme.colors.warning, modifier = Modifier .size(overlayIconSize) diff --git a/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/SettingsImportScreen.kt b/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/SettingsImportScreen.kt index a152848ad..1ddd4634b 100644 --- a/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/SettingsImportScreen.kt +++ b/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/SettingsImportScreen.kt @@ -30,7 +30,7 @@ fun SettingsImportScreen( navigationIcon = { ButtonIcon( onClick = onBack, - imageVector = Icons.Outlined.arrowBack, + imageVector = Icons.Outlined.ArrowBack, ) }, )