Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e56aab6f authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

fix base icon color issue of jetpack compose flow

parent 536f7f24

core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/Checkbox.kt

+6 −0
Original line number Diff line number Diff line 
package app.k9mail.core.ui.compose.designsystem.atom



import androidx.compose.material.CheckboxDefaults

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.tooling.preview.Preview

import app.k9mail.core.ui.compose.theme.MainTheme

import app.k9mail.core.ui.compose.theme.PreviewWithThemes

import androidx.compose.material.Checkbox as MaterialCheckbox
@@ -18,6 +20,10 @@ fun Checkbox( 
        onCheckedChange = onCheckedChange,

        modifier = modifier,

        enabled = enabled,

        colors = CheckboxDefaults.colors(

            checkedColor = MainTheme.colors.primary,

            checkmarkColor = MainTheme.colors.onPrimary,

        ),

    )

}

core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/Icon.kt

+2 −3
Original line number Diff line number Diff line 
package app.k9mail.core.ui.compose.designsystem.atom



import androidx.compose.material.LocalContentAlpha

import androidx.compose.material.LocalContentColor

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.graphics.vector.ImageVector

import androidx.compose.ui.tooling.preview.Preview

import app.k9mail.core.ui.compose.theme.Icons

import app.k9mail.core.ui.compose.theme.MainTheme

import app.k9mail.core.ui.compose.theme.PreviewWithThemes

import androidx.compose.material.Icon as MaterialIcon
@@ -15,7 +14,7 @@ import androidx.compose.material.Icon as MaterialIcon 
fun Icon(

    imageVector: ImageVector,

    modifier: Modifier = Modifier,

    tint: Color = LocalContentColor.current.copy(alpha = LocalContentAlpha.current),

    tint: Color = MainTheme.colors.secondary,

) {

    MaterialIcon(

        imageVector = imageVector,

core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/Switch.kt

+5 −0
Original line number Diff line number Diff line 
package app.k9mail.core.ui.compose.designsystem.atom



import androidx.compose.material.SwitchDefaults

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.tooling.preview.Preview

import app.k9mail.core.ui.compose.theme.MainTheme

import app.k9mail.core.ui.compose.theme.PreviewWithThemes

import androidx.compose.material.Switch as MaterialSwitch
@@ -18,6 +20,9 @@ fun Switch( 
        onCheckedChange = onCheckedChange,

        modifier = modifier,

        enabled = enabled,

        colors = SwitchDefaults.colors(

            checkedThumbColor = MainTheme.colors.primary,

        ),

    )

}

core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/color/Colors.kt

+2 −2
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ internal fun eOsColors(context: Context, isLight: Boolean): Colors { 
    return Colors(

        primary = Color(ContextCompat.getColor(context, R.color.e_accent)),

        primaryVariant = Color(ContextCompat.getColor(context, R.color.e_accent)),

        secondary = Color(ContextCompat.getColor(context, R.color.e_accent)),

        secondaryVariant = Color(ContextCompat.getColor(context, R.color.e_accent)),

        secondary = Color(ContextCompat.getColor(context, R.color.e_icon_color)),

        secondaryVariant = Color(ContextCompat.getColor(context, R.color.e_icon_color)),

        background = Color(ContextCompat.getColor(context, R.color.e_background)),

        surface = Color(ContextCompat.getColor(context, R.color.e_floating_background)),

        success = Color(ContextCompat.getColor(context, R.color.e_accent_green)),