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

Commit 62a1f2bd authored by cketti's avatar cketti
Browse files

Merge pull request #731 

Make K9 themeable by layers
parents fb218ee1 d89bf8f3

k9mail/src/main/res/layout/accounts_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
                android:layout_height="match_parent"

                android:layout_marginLeft="2dip"

                android:layout_marginRight="4dip"

                android:background="?attr/compatDividerVertical" />

                android:background="?android:attr/dividerVertical" />



        <ImageButton

                android:id="@+id/folders"
@@ -68,7 +68,7 @@ 
                android:focusable="false"

                android:layout_marginRight="3dip"

                android:src="?attr/iconFolder"

                android:background="?attr/compatSelectableItemBackground"

                android:background="?android:attr/selectableItemBackground"

                android:layout_width="wrap_content"

                android:layout_height="fill_parent"

                android:padding="8dp"

k9mail/src/main/res/values/attrs.xml

+0 −2
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ 
        <attr name="messageViewAttachmentBackground" format="reference"/>

        <attr name="messageComposeAddContactImage" format="reference"/>

        <attr name="composerBackgroundColor" format="color"/>

        <attr name="compatDividerVertical" format="reference"/>

        <attr name="compatSelectableItemBackground" format="reference"/>

        <attr name="contactPictureFallbackDefaultBackgroundColor" format="reference|color"/>

    </declare-styleable>

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

+7 −17
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ 
        <item name="android:windowBackground">@android:color/black</item>

    </style>



    <style name="Theme.K9.Light.Base" parent="@android:style/Theme.Holo.Light">

    <!-- Empty base themes that can be easily replaced by RRO (Runtime Resource Overlay) themes -->

    <style name="Theme.K9.Light.Base" parent="@android:style/Theme.Holo.Light" />

    <style name="Theme.K9.Dark.Base" parent="@android:style/Theme.Holo" />



    <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">

        <item name="iconFolder">@drawable/folder_light</item>

        <item name="iconListItemMenu">@drawable/dropdown_ic_arrow_normal_holo_light</item>

        <item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
@@ -54,12 +58,11 @@ 
        <item name="messageViewBackgroundColor">#ffffffff</item>

        <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_light</item>

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

        <item name="compatDividerVertical">?attr/messageListDividerColor</item>

        <item name="compatSelectableItemBackground">@android:color/transparent</item>

        <item name="contactPictureFallbackDefaultBackgroundColor">#ffababab</item>

        <item name="composerBackgroundColor">@android:color/background_light</item>

    </style>



    <style name="Theme.K9.Dark.Base" parent="@android:style/Theme.Holo">

    <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">

        <item name="iconFolder">@drawable/folder_dark</item>

        <item name="iconListItemMenu">@drawable/dropdown_ic_arrow_normal_holo_dark</item>

        <item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
@@ -108,21 +111,8 @@ 
        <item name="messageViewBackgroundColor">#000000</item>

        <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_dark</item>

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

        <item name="compatDividerVertical">?attr/messageListDividerColor</item>

        <item name="compatSelectableItemBackground">@android:color/transparent</item>

        <item name="contactPictureFallbackDefaultBackgroundColor">#ff606060</item>

    </style>



    <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">

        <item name="composerBackgroundColor">@android:color/background_light</item>

        <item name="compatDividerVertical">?android:attr/dividerVertical</item>

        <item name="compatSelectableItemBackground">?android:attr/selectableItemBackground</item>

    </style>



    <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">

        <item name="composerBackgroundColor">@android:color/background_dark</item>

        <item name="compatDividerVertical">?android:attr/dividerVertical</item>

        <item name="compatSelectableItemBackground">?android:attr/selectableItemBackground</item>

    </style>



    <style name="Theme.K9.Dialog.Light" parent="Theme.K9.Light">