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

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

4723-Fix_UI_issues

parent 006b0d5a

app/k9mail/src/main/res/values/themes.xml

+20 −20
Original line number Diff line number Diff line
@@ -28,22 +28,22 @@ 
        <item name="iconFolder">@lineageos.platform:drawable/ic_folder</item>

        <item name="iconFolderInbox">@lineageos.platform:drawable/ic_inbox</item>

        <item name="iconFolderOutbox">@lineageos.platform:drawable/ic_outbox</item>

        <item name="iconFolderArchive">@lineageos.platform:drawable/ic_archive</item>

        <item name="iconFolderArchive">@drawable/ic_archive</item>

        <item name="iconFolderDrafts">@lineageos.platform:drawable/ic_file</item>

        <item name="iconFolderSent">@lineageos.platform:drawable/ic_send</item>

        <item name="iconFolderSpam">@lineageos.platform:drawable/ic_mail_spam</item>

        <item name="iconFolderTrash">@lineageos.platform:drawable/ic_bin</item>

        <item name="iconFolderTrash">@drawable/ic_trash_can</item>

        <item name="iconActionAddAttachment">@lineageos.platform:drawable/ic_attachment</item>

        <item name="iconActionArchive">@lineageos.platform:drawable/ic_archive</item>

        <item name="iconActionCompose">@lineageos.platform:drawable/ic_pen</item>

        <item name="iconActionDelete">@lineageos.platform:drawable/ic_bin</item>

        <item name="iconActionArchive">@drawable/ic_archive</item>

        <item name="iconActionCompose">@drawable/ic_pencil</item>

        <item name="iconActionDelete">@drawable/ic_trash_can</item>

        <item name="iconActionMove">@lineageos.platform:drawable/ic_folder</item>

        <item name="iconActionCopy">@drawable/ic_content_copy</item>

        <item name="iconActionNextStatus">@lineageos.platform:drawable/ic_chevron_right</item>

        <item name="iconActionNextMessage">@lineageos.platform:drawable/ic_chevron_right</item>

        <item name="iconActionPreviousMessage">@lineageos.platform:drawable/ic_back</item>

        <item name="iconActionRefresh">@drawable/ic_refresh</item>

        <item name="iconActionSearch">@lineageos.platform:drawable/ic_search</item>

        <item name="iconActionSearch">@drawable/ic_magnify</item>

        <item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>

        <item name="iconActionSend">@lineageos.platform:drawable/ic_send</item>

        <item name="iconActionSettings">@lineageos.platform:drawable/ic_settings_wheel</item>
@@ -53,7 +53,7 @@ 
        <item name="iconActionFlag">@lineageos.platform:drawable/ic_star_filled</item>

        <item name="iconActionUnflag">@lineageos.platform:drawable/ic_star</item>

        <item name="iconActionMarkAsRead">@drawable/ic_opened_envelope</item>

        <item name="iconActionMarkAsUnread">@lineageos.platform:drawable/ic_envelope</item>

        <item name="iconActionMarkAsUnread">@drawable/ic_envelope</item>

        <item name="iconActionRemoteSearch">@drawable/ic_magnify_cloud</item>

        <item name="iconActionAdd">@lineageos.platform:drawable/ic_add</item>

        <item name="iconActionImportExport">@drawable/ic_arrow_up_down</item>
@@ -72,14 +72,14 @@ 
        <item name="iconPreferencesPrivacy">@drawable/ic_shield</item>

        <item name="iconPreferencesDebug">@drawable/ic_bug</item>

        <item name="iconPreferencesFolders">@lineageos.platform:drawable/ic_folder</item>

        <item name="iconPreferencesSearch">@lineageos.platform:drawable/ic_search</item>

        <item name="iconPreferencesSearch">@drawable/ic_magnify</item>

        <item name="iconPreferencesCrypto">@drawable/ic_preferences_crypto</item>

        <item name="iconPreferencesFetchMail">@drawable/ic_preferences_check_mail</item>

        <item name="iconPreferencesReadMail">@drawable/ic_opened_envelope</item>

        <item name="iconPreferencesCompose">@lineageos.platform:drawable/ic_pen</item>

        <item name="iconPreferencesCompose">@drawable/ic_pencil</item>

        <item name="iconSettingsAbout">@lineageos.platform:drawable/ic_info</item>

        <item name="iconSettingsGeneral">@lineageos.platform:drawable/ic_settings_wheel</item>

        <item name="iconSettingsAccount">@lineageos.platform:drawable/ic_envelope</item>

        <item name="iconSettingsAccount">@drawable/ic_envelope</item>

        <item name="iconSettingsAccountAdd">@lineageos.platform:drawable/ic_add</item>

        <item name="iconSettingsExport">@drawable/ic_export</item>

        <item name="iconSettingsImport">@drawable/ic_import</item>
@@ -154,22 +154,22 @@ 
        <item name="iconFolder">@lineageos.platform:drawable/ic_folder</item>

        <item name="iconFolderInbox">@lineageos.platform:drawable/ic_inbox</item>

        <item name="iconFolderOutbox">@lineageos.platform:drawable/ic_outbox</item>

        <item name="iconFolderArchive">@lineageos.platform:drawable/ic_archive</item>

        <item name="iconFolderArchive">@drawable/ic_archive</item>

        <item name="iconFolderDrafts">@lineageos.platform:drawable/ic_file</item>

        <item name="iconFolderSent">@lineageos.platform:drawable/ic_send</item>

        <item name="iconFolderSpam">@lineageos.platform:drawable/ic_mail_spam</item>

        <item name="iconFolderTrash">@lineageos.platform:drawable/ic_bin</item>

        <item name="iconFolderTrash">@drawable/ic_trash_can</item>

        <item name="iconActionAddAttachment">@lineageos.platform:drawable/ic_attachment</item>

        <item name="iconActionArchive">@lineageos.platform:drawable/ic_archive</item>

        <item name="iconActionCompose">@lineageos.platform:drawable/ic_pen</item>

        <item name="iconActionDelete">@lineageos.platform:drawable/ic_bin</item>

        <item name="iconActionArchive">@drawable/ic_archive</item>

        <item name="iconActionCompose">@drawable/ic_pencil</item>

        <item name="iconActionDelete">@drawable/ic_trash_can</item>

        <item name="iconActionMove">@lineageos.platform:drawable/ic_folder</item>

        <item name="iconActionCopy">@drawable/ic_content_copy</item>

        <item name="iconActionNextStatus">@lineageos.platform:drawable/ic_chevron_right</item>

        <item name="iconActionNextMessage">@lineageos.platform:drawable/ic_chevron_right</item>

        <item name="iconActionPreviousMessage">@lineageos.platform:drawable/ic_back</item>

        <item name="iconActionRefresh">@drawable/ic_refresh</item>

        <item name="iconActionSearch">@lineageos.platform:drawable/ic_search</item>

        <item name="iconActionSearch">@drawable/ic_magnify</item>

        <item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>

        <item name="iconActionSend">@lineageos.platform:drawable/ic_send</item>

        <item name="iconActionSettings">@lineageos.platform:drawable/ic_settings_wheel</item>
@@ -179,7 +179,7 @@ 
        <item name="iconActionFlag">@lineageos.platform:drawable/ic_star_filled</item>

        <item name="iconActionUnflag">@lineageos.platform:drawable/ic_star</item>

        <item name="iconActionMarkAsRead">@drawable/ic_opened_envelope</item>

        <item name="iconActionMarkAsUnread">@lineageos.platform:drawable/ic_envelope</item>

        <item name="iconActionMarkAsUnread">@drawable/ic_envelope</item>

        <item name="iconActionRemoteSearch">@drawable/ic_magnify_cloud</item>

        <item name="iconActionAdd">@lineageos.platform:drawable/ic_add</item>

        <item name="iconActionImportExport">@drawable/ic_arrow_up_down</item>
@@ -198,14 +198,14 @@ 
        <item name="iconPreferencesPrivacy">@drawable/ic_shield</item>

        <item name="iconPreferencesDebug">@drawable/ic_bug</item>

        <item name="iconPreferencesFolders">@lineageos.platform:drawable/ic_folder</item>

        <item name="iconPreferencesSearch">@lineageos.platform:drawable/ic_search</item>

        <item name="iconPreferencesSearch">@drawable/ic_magnify</item>

        <item name="iconPreferencesCrypto">@drawable/ic_preferences_crypto</item>

        <item name="iconPreferencesFetchMail">@drawable/ic_preferences_check_mail</item>

        <item name="iconPreferencesReadMail">@drawable/ic_opened_envelope</item>

        <item name="iconPreferencesCompose">@lineageos.platform:drawable/ic_pen</item>

        <item name="iconPreferencesCompose">@drawable/ic_pencil</item>

        <item name="iconSettingsAbout">@lineageos.platform:drawable/ic_info</item>

        <item name="iconSettingsGeneral">@lineageos.platform:drawable/ic_settings_wheel</item>

        <item name="iconSettingsAccount">@lineageos.platform:drawable/ic_envelope</item>

        <item name="iconSettingsAccount">@drawable/ic_envelope</item>

        <item name="iconSettingsAccountAdd">@lineageos.platform:drawable/ic_add</item>

        <item name="iconSettingsExport">@drawable/ic_export</item>

        <item name="iconSettingsImport">@drawable/ic_import</item>

app/ui/base/src/main/res/drawable/ic_close.xml

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

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="@color/default_icon_color"

        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>

</vector>

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

+1 −0
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ 
        <item name="colorControlNormal">@color/default_icon_color</item>

        <item name="colorAccent">@color/color_default_accent</item>

        <item name="actionModeBackground">@color/color_default_primary_dark</item>

        <item name="actionModeCloseDrawable">@drawable/ic_close</item>

    </style>

</resources>
 
 No newline at end of file

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

+25 −7
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ import android.util.TypedValue 
import android.widget.ImageView

import android.widget.LinearLayout

import android.widget.Toast

import androidx.annotation.LayoutRes

import androidx.appcompat.content.res.AppCompatResources

import androidx.core.content.ContextCompat

import androidx.core.content.res.ResourcesCompat
@@ -111,7 +112,12 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K 
        drawer.addDrawerListener(parent.createDrawerListener())

        sliderView.tintStatusBar = true

        val drawerPadding = parent.resources.getDimension(R.dimen.material_drawer_vertical_padding).toInt()

        sliderView.recyclerView.setPadding((-1) * drawerPadding, 0, (-1) * drawerPadding, sliderView.recyclerView.paddingBottom)

        sliderView.recyclerView.setPadding(

            (-1) * drawerPadding,

            0,

            (-1) * drawerPadding,

            sliderView.recyclerView.paddingBottom

        )

        sliderView.headerView?.setPadding(drawerPadding, 0, drawerPadding, 0)

        sliderView.onDrawerItemClickListener = { _, item, _ ->

            handleItemClickListener(item)
@@ -234,7 +240,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K 
            val drawerColors = getDrawerColorsForAccount(account)

            val selectedTextColor = drawerColors.accentColor.toSelectedColorStateList()



            val accountItem = ProfileDrawerItem().apply {

            val accountItem = CustomProfileDrawerItem().apply {

                account.name.let { accountName ->

                    isNameShown = accountName != null

                    nameText = accountName.orEmpty()
@@ -365,9 +371,10 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K 
        }



        folderList.unifiedInbox?.let { unifiedInbox ->

            val unwrappedDrawable = AppCompatResources.getDrawable(parent.applicationContext, R.drawable.ic_inbox_multiple)

            val unwrappedDrawable =

                AppCompatResources.getDrawable(parent.applicationContext, R.drawable.ic_inbox_multiple)

            val wrappedSelectedDrawable = DrawableCompat.wrap(unwrappedDrawable!!)

            DrawableCompat.setTint(wrappedSelectedDrawable, ContextCompat.getColor(parent.applicationContext, R.color.color_default_accent))

            DrawableCompat.setTintList(wrappedSelectedDrawable, selectedTextColor)



            val unifiedInboxItem = FolderDrawerItem().apply {

                iconRes = R.drawable.ic_inbox_multiple //getResId(R.attr.iconUnifiedInbox)
@@ -399,7 +406,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K 
            val iconId = folderIconProvider.getFolderIcon(folder.type)

            val unwrappedDrawable = AppCompatResources.getDrawable(parent.applicationContext, iconId)

            val wrappedSelectedDrawable = DrawableCompat.wrap(unwrappedDrawable!!)

            DrawableCompat.setTint(wrappedSelectedDrawable, ContextCompat.getColor(parent.applicationContext, R.color.color_default_accent))

            DrawableCompat.setTintList(wrappedSelectedDrawable, selectedTextColor)



            val drawerItem = FolderDrawerItem().apply {

                iconRes = iconId
@@ -472,9 +479,14 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K 
    )



    private fun getDrawerColorsForAccount(account: Account): DrawerColors {

        val baseColor = if (themeManager.appTheme == Theme.DARK) {

            getDarkThemeAccentColor(account.chipColor)

        } else {

            account.chipColor

        }

        return DrawerColors(

            accentColor = ResourcesCompat.getColor(resources, R.color.color_default_accent, null),

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

            accentColor = baseColor,

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

        )

    }
@@ -567,3 +579,9 @@ private class FolderDrawerItem : PrimaryDrawerItem() { 
    override val type: Int = R.id.drawer_list_folder_item

    override val layoutRes: Int = R.layout.drawer_folder_list_item

}



private class CustomProfileDrawerItem : ProfileDrawerItem() {

    override val layoutRes: Int

        @LayoutRes

        get() = R.layout.custom_profile_drawer_item

}

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

+0 −2
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ class SettingsListFragment : Fragment(), ItemTouchCallback { 
                    navigationAction = R.id.action_settingsListScreen_to_addAccountScreen,

                    icon = R.attr.iconSettingsAccountAdd

                )



                NewSetupUiHack.addAction(this)

            }



            addSection(title = getString(R.string.settings_list_backup_category)) {