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

Unverified Commit 715728bf authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #6484 from thundernest/mdc_theme 

Switch to MaterialComponents themes
parents d2946c1b d3658804

app/ui/base/src/main/res/layout/toolbar.xml

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

<androidx.appcompat.widget.Toolbar

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

<com.google.android.material.appbar.MaterialToolbar xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/toolbar"

    style="?attr/toolbarStyle"

    android:layout_width="match_parent"

        android:layout_height="?attr/actionBarSize"

        android:background="?attr/colorPrimary"

        android:elevation="4dp"/>
 
 No newline at end of file
 
    android:layout_height="?attr/actionBarSize" />

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

+2 −1
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ class MessageViewFragment : 
                intArrayOf(R.attr.iconActionMarkAsRead)

            }



            requireContext().withStyledAttributes(attrs = drawableAttr) {

            val toolbarContext = requireActivity().findViewById<View>(R.id.toolbar).context

            toolbarContext.withStyledAttributes(attrs = drawableAttr) {

                menu.findItem(R.id.toggle_unread).icon = getDrawable(0)

            }

        }

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

+1 −2
Original line number Diff line number Diff line
@@ -8,10 +8,9 @@ 


    <androidx.appcompat.widget.Toolbar

        android:id="@+id/toolbar"

        style="?attr/toolbarStyle"

        android:layout_width="match_parent"

        android:layout_height="?attr/actionBarSize"

        android:background="?attr/colorPrimary"

        android:elevation="4dp"

        tools:navigationIcon="@drawable/ic_arrow_back">



        <com.fsck.k9.ui.settings.account.AccountSelectionSpinner

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

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ 
                android:textColor="?android:attr/textColorSecondary"

                tools:text="Oct 27"/>



        <!-- TODO: Replace with an ImageView. MaterialCheckBox comes with a lot of styling that we don't want. -->

        <CheckBox

                android:id="@+id/star"

                style="@style/MessageStarStyle"

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

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
<resources>



    <declare-styleable name="K9Styles">

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

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

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

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