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

Unverified Commit 417a7ed9 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

Rename swipe color attributes

parent e3330f89

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

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ class MessageListFragment : 
        val itemTouchHelper = ItemTouchHelper(

            MessageListSwipeCallback(

                requireContext(),

                resourceProvider = SwipeResourceProvider(requireActivity()),

                resourceProvider = SwipeResourceProvider(requireContext()),

                swipeActionSupportProvider,

                swipeRightAction = K9.swipeRightAction,

                swipeLeftAction = K9.swipeLeftAction,

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

+7 −7
Original line number Diff line number Diff line
@@ -50,13 +50,13 @@ class SwipeResourceProvider(private val context: Context) { 
        return context.resolveColorAttribute(

            when (action) {

                SwipeAction.None -> error("action == SwipeAction.None")

                SwipeAction.ToggleSelection -> R.attr.messageListSwipeSelectBackgroundColor

                SwipeAction.ToggleRead -> R.attr.messageListSwipeToggleReadBackgroundColor

                SwipeAction.ToggleStar -> R.attr.messageListSwipeToggleStarBackgroundColor

                SwipeAction.Archive -> R.attr.messageListSwipeArchiveBackgroundColor

                SwipeAction.Delete -> R.attr.messageListSwipeDeleteBackgroundColor

                SwipeAction.Spam -> R.attr.messageListSwipeSpamBackgroundColor

                SwipeAction.Move -> R.attr.messageListSwipeMoveBackgroundColor

                SwipeAction.ToggleSelection -> R.attr.messageListSwipeSelectColor

                SwipeAction.ToggleRead -> R.attr.messageListSwipeToggleReadColor

                SwipeAction.ToggleStar -> R.attr.messageListSwipeToggleStarColor

                SwipeAction.Archive -> R.attr.messageListSwipeArchiveColor

                SwipeAction.Delete -> R.attr.messageListSwipeDeleteColor

                SwipeAction.Spam -> R.attr.messageListSwipeSpamColor

                SwipeAction.Move -> R.attr.messageListSwipeMoveColor

            },

        )

    }

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

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

    android:gravity="center_vertical"

    android:orientation="horizontal"

    tools:background="?attr/messageListSwipeSelectBackgroundColor"

    tools:background="?attr/messageListSwipeSelectColor"

    tools:ignore="RtlHardcoded"

    tools:layout_height="?android:listPreferredItemHeight">

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

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

    android:gravity="center_vertical"

    android:orientation="horizontal"

    tools:background="?attr/messageListSwipeSelectBackgroundColor"

    tools:background="?attr/messageListSwipeSelectColor"

    tools:ignore="RtlHardcoded"

    tools:layout_height="?android:listPreferredItemHeight">

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

+7 −7
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 
        <attr name="messageListReadTextColor" format="reference|color"/>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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