Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ fun ItemScreenBottomBar(
) {
Icon(
painter = painterResource(
id = if (state.isRead)
R.drawable.ic_remove_done
else R.drawable.ic_done_all
id = if (state.isRead) {
R.drawable.ic_state_read
} else {
R.drawable.ic_state_unread
}
Comment on lines +57 to +61
Copy link
Contributor Author

@christophehenry christophehenry Jun 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The icons are reversed compared to TimelineItem and the previous implementation. This is intentional. On this screen, the icons represent state, the same as the favorite icon next to it, whereas in TimelineItem, they represent action. This change makes this button consistant with the favorite icon throughout the app.

),
tint = onAccentColor,
contentDescription = null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ fun TimelineItem(
fun getSwipeIcon(swipeAction: SwipeAction): Int {
return if (swipeAction == SwipeAction.READ) {
if (itemWithFeed.isRead) {
R.drawable.ic_remove_done
R.drawable.ic_state_unread
} else {
R.drawable.ic_done_all
R.drawable.ic_state_read
}
} else {
if (itemWithFeed.isStarred) {
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/res/drawable/ic_remove_done.xml

This file was deleted.

11 changes: 11 additions & 0 deletions app/src/main/res/drawable/ic_state_read.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#000000"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="m480,40 l362,216q18,11 28,30t10,40v434q0,33 -23.5,56.5T800,840L160,840q-33,0 -56.5,-23.5T80,760v-434q0,-21 10,-40t28,-30l362,-216ZM480,506 L792,320 480,134 168,320 480,506ZM480,600L160,408v352h640v-352L480,600ZM480,760h320,-640 320Z"
/>
</vector>
11 changes: 11 additions & 0 deletions app/src/main/res/drawable/ic_state_unread.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#000000"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6zM20,6l-8,5 -8,-5h16zM20,18L4,18L4,8l8,5 8,-5v10z"
/>
</vector>