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

Commit 6b15d427 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '4795-Quote_icon_buttons_block_text_issue' into 'main' 

4795-Quote_icon_buttons_block_text_issue

See merge request e/apps/mail!45
parents c5a26877 ed6ab612

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

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 
        <item name="messageStar">@drawable/btn_check_star</item>

        <item name="messageViewBackgroundColor">@color/color_default_background</item>

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

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

        <item name="attachmentCardBackground">@color/color_default_foreground</item>

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

        <item name="contactTokenBackgroundColor">#ccc</item>

        <item name="composerBackgroundColor">@android:color/background_light</item>
@@ -226,7 +226,7 @@ 
        <item name="messageStar">@drawable/btn_check_star</item>

        <item name="messageViewBackgroundColor">@color/color_default_background</item>

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

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

        <item name="attachmentCardBackground">@color/color_default_foreground</item>

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

        <item name="contactTokenBackgroundColor">#ccc</item>

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

app/ui/legacy/src/main/res/layout/message_compose_content.xml

+17 −16
Original line number Diff line number Diff line
@@ -87,21 +87,6 @@ 
            android:layout_width="fill_parent"

            android:layout_height="wrap_content">



            <EditText

                android:id="@+id/quoted_text"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

                android:gravity="top"

                android:minLines="3"

                android:inputType="textMultiLine|textAutoCorrect|textCapSentences"

                android:imeOptions="flagNoExtractUi"

                android:textAppearance="?android:attr/textAppearanceMedium" />



            <com.fsck.k9.view.MessageWebView

                android:id="@+id/quoted_html"

                android:layout_height="wrap_content"

                android:layout_width="fill_parent" />



            <LinearLayout

                android:id="@+id/quoted_text_buttons"

                android:layout_width="wrap_content"
@@ -123,9 +108,25 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:background="@drawable/btn_dialog" />



            </LinearLayout>



            <EditText

                android:id="@+id/quoted_text"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

                android:gravity="top"

                android:layout_below="@id/quoted_text_buttons"

                android:imeOptions="flagNoExtractUi"

                android:inputType="textMultiLine|textAutoCorrect|textCapSentences"

                android:minLines="3"

                android:textAppearance="?android:attr/textAppearanceMedium" />



            <com.fsck.k9.view.MessageWebView

                android:id="@+id/quoted_html"

                android:layout_height="wrap_content"

                android:layout_width="fill_parent"

                android:layout_below="@id/quoted_text_buttons"/>



        </RelativeLayout>



        <EditText