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

Unverified Commit 6d9987a6 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

Move account colors to legacy theme

parent b415bd4b

app-common/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ dependencies { 
    implementation(projects.legacy.account)



    implementation(projects.core.featureflags)

    implementation(projects.core.ui.legacy.theme2.common)



    implementation(projects.feature.account.setup)

    implementation(projects.feature.migration.provider)

app-common/src/main/kotlin/net/thunderbird/app/common/account/AccountColorPicker.kt

+1 −1
Original line number Diff line number Diff line 
package net.thunderbird.app.common.account



import android.content.res.Resources

import app.k9mail.core.ui.legacy.theme2.common.R

import app.k9mail.legacy.account.AccountManager

import com.fsck.k9.core.R



class AccountColorPicker(

    private val accountManager: AccountManager,

core/ui/legacy/theme2/common/src/main/res/values/account_colors.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <integer-array name="account_colors">

        <item>@color/material_amber_600</item>

        <item>@color/material_orange_600</item>

        <item>@color/material_deep_orange_600</item>

        <item>@color/material_red_600</item>



        <item>@color/material_lime_600</item>

        <item>@color/material_light_green_600</item>

        <item>@color/material_green_700</item>

        <item>@color/material_teal_600</item>



        <item>@color/material_cyan_600</item>

        <item>@color/material_light_blue_600</item>

        <item>@color/material_blue_700</item>

        <item>@color/material_indigo_600</item>



        <item>@color/material_pink_500</item>

        <item>@color/material_purple_600</item>

        <item>@color/material_deep_purple_600</item>

        <item>@color/material_blue_gray_700</item>

    </integer-array>



    <integer-array name="default_account_colors">

        <item>@color/material_blue_700</item>

        <item>@color/material_pink_500</item>

        <item>@color/material_amber_600</item>

    </integer-array>

</resources>

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

+0 −28
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>



    <integer-array name="account_colors">

        <item>@color/material_amber_600</item>

        <item>@color/material_orange_600</item>

        <item>@color/material_deep_orange_600</item>

        <item>@color/material_red_600</item>



        <item>@color/material_lime_600</item>

        <item>@color/material_light_green_600</item>

        <item>@color/material_green_700</item>

        <item>@color/material_teal_600</item>



        <item>@color/material_cyan_600</item>

        <item>@color/material_light_blue_600</item>

        <item>@color/material_blue_700</item>

        <item>@color/material_indigo_600</item>



        <item>@color/material_pink_500</item>

        <item>@color/material_purple_600</item>

        <item>@color/material_deep_purple_600</item>

        <item>@color/material_blue_gray_700</item>

    </integer-array>



    <integer-array name="default_account_colors">

        <item>@color/material_blue_700</item>

        <item>@color/material_pink_500</item>

        <item>@color/material_amber_600</item>

    </integer-array>



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

        <item>-1</item>

        <item>15</item>