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

Commit 507ffeb6 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury Committed by Fahim
Browse files

Change drawer-header background to primaryDark 

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

- Change drawer-header background to primaryDark for UI consistency
- Update drawer-header textColors to primary & secondary text colors
parent 8b7e88c4

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

+1 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ import android.widget.LinearLayout 
import android.widget.Toast

import androidx.appcompat.content.res.AppCompatResources

import androidx.core.content.ContextCompat

import androidx.core.content.res.ResourcesCompat

import androidx.core.graphics.drawable.DrawableCompat

import androidx.core.view.GravityCompat

import androidx.drawerlayout.widget.DrawerLayout
@@ -167,7 +166,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K 
    }



    private fun configureAccountHeader() {

        headerView.headerBackground = ImageHolder(R.drawable.blue_background)

        headerView.headerBackground = ImageHolder(R.drawable.header_background)



        headerView.onAccountHeaderListener = { _, profile, _ ->

            val account = (profile as ProfileDrawerItem).tag as Account

app/ui/legacy/src/main/res/drawable/blue_background.xml→app/ui/legacy/src/main/res/drawable/header_background.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<shape xmlns:android="http://schemas.android.com/apk/res/android">



    <solid android:color="@color/color_icon_background_blue" />

    <solid android:color="@color/color_default_primary_dark" />



</shape>

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

+2 −4
Original line number Diff line number Diff line
@@ -68,16 +68,14 @@ 


    <style name="Widget.MaterialDrawerHeaderStyle.K9">

        <item name="materialDrawerCompactStyle">false</item>

        <item name="materialDrawerHeaderSelectionText">@color/color_default_primary_text</item>

        <item name="materialDrawerHeaderSelectionSubtext">@color/color_default_secondary_text</item>

    </style>



    <style name="Widget.MaterialDrawerHeaderStyle.K9.Light" parent="Widget.MaterialDrawerHeaderStyle.K9">

        <item name="materialDrawerHeaderSelectionText">@android:color/white</item>

        <item name="materialDrawerHeaderSelectionSubtext">#CCFFFFFF</item>

    </style>



    <style name="Widget.MaterialDrawerHeaderStyle.K9.Dark" parent="Widget.MaterialDrawerHeaderStyle.K9">

        <item name="materialDrawerHeaderSelectionText">@android:color/white</item>

        <item name="materialDrawerHeaderSelectionSubtext">#CCFFFFFF</item>

    </style>



    <style name="TextAppearance.K9.Small" parent="TextAppearance.AppCompat.Small">