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

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

Remove account color option 

issue: https://gitlab.e.foundation/e/backlog/-/issues/5181

according to mockup, we want to use single color for all accounts. This
commit removes multiple account color choice & hide the account color
changing settings.
parent 9746ac66

app/core/src/main/res/values/arrays_account_settings_values.xml

+1 −19
Original line number Diff line number Diff line
@@ -3,25 +3,7 @@ 


    <!-- Must be kept in sync with arrays_drawer.xml/drawer_account_accent_color_dark_theme -->

    <integer-array name="account_colors">

        <item>0xFFFFB300</item> <!-- Amber 600 -->

        <item>0xFFFB8C00</item> <!-- Orange 600 -->

        <item>0xFFF4511E</item> <!-- Deep orange 600 -->

        <item>0xFFE53935</item> <!-- Red 600 -->



        <item>0xFFC0CA33</item> <!-- Lime 600 -->

        <item>0xFF7CB342</item> <!-- Light green 600 -->

        <item>0xFF388E3C</item> <!-- Green 700 -->

        <item>0xFF00897B</item> <!-- Teal 600 -->



        <item>0xFF00ACC1</item> <!-- Cyan 600 -->

        <item>0xFF039BE5</item> <!-- Light blue 600 -->

        <item>0xFF1976D2</item> <!-- Blue 700 -->

        <item>0xFF3949AB</item> <!-- Indigo 600 -->



        <item>0xFFE91E63</item> <!-- Pink 500 -->

        <item>0xFF8E24AA</item> <!-- Purple 600 -->

        <item>0xFF5E35B1</item> <!-- Deep purple 600 -->

        <item>0xFF455A64</item> <!-- Blue gray 700 -->

        <item>0xFF0086FF</item>

    </integer-array>



    <string-array name="check_frequency_values" translatable="false">

app/core/src/main/res/values/arrays_drawer.xml

+1 −19
Original line number Diff line number Diff line
@@ -3,25 +3,7 @@ 


    <!-- Must be kept in sync with arrays_account_settings_values.xml/account_colors -->

    <integer-array name="drawer_account_accent_color_dark_theme">

        <item>0xFFFFB300</item> <!-- Amber 600 -->

        <item>0xFFFF9800</item> <!-- Orange 500 -->

        <item>0xFFFF7043</item> <!-- Deep orange 400 -->

        <item>0xFFEF5350</item> <!-- Red 400 -->



        <item>0xFFC0CA33</item> <!-- Lime 600 -->

        <item>0xFF7CB342</item> <!-- Light green 600 -->

        <item>0xFF4CAF50</item> <!-- Green 500 -->

        <item>0xFF4DB6AC</item> <!-- Teal 300 -->



        <item>0xFF00ACC1</item> <!-- Cyan 600 -->

        <item>0xFF03A9F4</item> <!-- Light blue 500 -->

        <item>0xFF42A5F5</item> <!-- Blue 400 -->

        <item>0xFF9FA8DA</item> <!-- Indigo 200 -->



        <item>0xFFF48FB1</item> <!-- Pink 200 -->

        <item>0xFFCE93D8</item> <!-- Purple 200 -->

        <item>0xFFB39DDB</item> <!-- Deep purple 200 -->

        <item>0xFF90A4AE</item> <!-- Blue gray 300 -->

        <item>0xFF5DB2FF</item>

    </integer-array>



</resources>

app/ui/legacy/src/main/java/com/fsck/k9/account/AccountCreator.kt

+1 −12
Original line number Diff line number Diff line
@@ -52,19 +52,8 @@ class AccountCreator(private val preferences: Preferences, private val resources 
    }



    fun pickColor(): Int {

        val accounts = preferences.accounts

        val usedAccountColors = accounts.map { it.chipColor }

        val accountColors = resources.getIntArray(R.array.account_colors).toList()



        val availableColors = accountColors - usedAccountColors

        if (availableColors.isEmpty()) {

            return accountColors.random()

        }



        return availableColors.shuffled().minByOrNull { color ->

            val index = DEFAULT_COLORS.indexOf(color)

            if (index != -1) index else DEFAULT_COLORS.size

        } ?: error("availableColors must not be empty")

        return accountColors[0];

    }



    companion object {

app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K 
        }

        return DrawerColors(

            accentColor = baseColor,

            selectedColor = baseColor.and(0xffffff).or(0x22000000)

            selectedColor =  ResourcesCompat.getColor(resources, R.color.color_drawer_selected_background, null)

        )

    }

app/ui/legacy/src/main/res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -27,4 +27,6 @@ 
    <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>

    <color name="color_default_divider">@lineageos.platform:color/color_default_divider</color>

    <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>



    <color name="color_drawer_selected_background">#145DB2FF</color>

</resources>