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

Commit 7dff2b6a authored by narinder Rana's avatar narinder Rana
Browse files

Merge branch '4723-UI_improvement' into 'main' 

4723-UI_improvement

See merge request e/apps/mail!50
parents 6fa281ae 85b1237e

app/core/src/main/java/com/fsck/k9/K9.kt

+6 −6
Original line number Diff line number Diff line
@@ -169,13 +169,13 @@ object K9 : EarlyInit { 
    var isShowMessageListStars = true



    @JvmStatic

    var messageListPreviewLines = 2

    var messageListPreviewLines = 1



    @JvmStatic

    var isShowCorrespondentNames = true



    @JvmStatic

    var isMessageListSenderAboveSubject = false

    var isMessageListSenderAboveSubject = true



    @JvmStatic

    var isShowContactName = false
@@ -234,7 +234,7 @@ object K9 : EarlyInit { 
    private val sortAscending = mutableMapOf<SortType, Boolean>()



    @JvmStatic

    var isUseBackgroundAsUnreadIndicator = false

    var isUseBackgroundAsUnreadIndicator = true



    @get:Synchronized

    @set:Synchronized
@@ -316,9 +316,9 @@ object K9 : EarlyInit { 
        isUseVolumeKeysForListNavigation = storage.getBoolean("useVolumeKeysForListNavigation", false)

        isShowUnifiedInbox = storage.getBoolean("showUnifiedInbox", true)

        isShowStarredCount = storage.getBoolean("showStarredCount", false)

        isMessageListSenderAboveSubject = storage.getBoolean("messageListSenderAboveSubject", false)

        isMessageListSenderAboveSubject = storage.getBoolean("messageListSenderAboveSubject", true)

        isShowMessageListStars = storage.getBoolean("messageListStars", true)

        messageListPreviewLines = storage.getInt("messageListPreviewLines", 2)

        messageListPreviewLines = storage.getInt("messageListPreviewLines", 1)



        isAutoFitWidth = storage.getBoolean("autofitWidth", true)
@@ -361,7 +361,7 @@ object K9 : EarlyInit { 


        splitViewMode = storage.getEnum("splitViewMode", SplitViewMode.NEVER)



        isUseBackgroundAsUnreadIndicator = storage.getBoolean("useBackgroundAsUnreadIndicator", false)

        isUseBackgroundAsUnreadIndicator = storage.getBoolean("useBackgroundAsUnreadIndicator", true)

        isThreadedViewEnabled = storage.getBoolean("threadedView", true)

        fontSizes.load(storage)

app/k9mail-jmap/src/main/res/layout/fragment_add_account.xml

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
                android:enabled="@{viewModel.isNextButtonEnabled()}"

                android:onClick="@{() -> viewModel.onNextButtonClicked()}"

                android:text="@string/next_action"

                android:textColor="@android:color/white"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintTop_toBottomOf="@+id/emailPasswordLayout"

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

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
        <item name="messageListForwarded">@drawable/ic_messagelist_forwarded</item>

        <item name="messageListAnsweredForwarded">@drawable/ic_messagelist_answered_forwarded</item>

        <item name="messageStar">@drawable/btn_check_star</item>

        <item name="messageStarColor">#fbbc04</item>

        <item name="messageStarColor">#EB621E</item>

        <item name="messageViewBackgroundColor">#ffffffff</item>

        <item name="messageComposeAddContactImage">@drawable/ic_person_plus</item>

        <item name="attachmentCardBackground">#e8e8e8</item>
@@ -212,7 +212,7 @@ 
        <item name="messageListForwarded">@drawable/ic_messagelist_forwarded</item>

        <item name="messageListAnsweredForwarded">@drawable/ic_messagelist_answered_forwarded</item>

        <item name="messageStar">@drawable/btn_check_star</item>

        <item name="messageStarColor">#fdd663</item>

        <item name="messageStarColor">#EB621E</item>

        <item name="messageViewBackgroundColor">#000000</item>

        <item name="messageComposeAddContactImage">@drawable/ic_person_plus</item>

        <item name="attachmentCardBackground">#313131</item>

app/k9mail/src/main/res/values-night/colors.xml

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

<resources>

    <color name="color_message_list_unread_background">#1FFFFFFF</color>

    <color name="color_message_list_thread_count_background">#61FFFFFF</color>

</resources>
 
 No newline at end of file

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

+6 −0
Original line number Diff line number Diff line
@@ -8,4 +8,10 @@ 
    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>

    <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_gray1">@lineageos.platform:color/color_default_gray1</color>

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



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

    <color name="color_message_list_unread_background">#1F000000</color>

    <color name="color_message_list_thread_count_background">#61000000</color>

</resources>
 
 No newline at end of file