Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update poll icons from Compound #1849

Merged
merged 2 commits into from
Nov 22, 2023
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
2 changes: 2 additions & 0 deletions changelog.d/1849.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update poll icons from Compound

Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ sealed class TimelineItemAction(
data object Edit : TimelineItemAction(CommonStrings.action_edit, CommonDrawables.ic_edit_outline)
data object ViewSource : TimelineItemAction(CommonStrings.action_view_source, CommonDrawables.ic_developer_options)
data object ReportContent : TimelineItemAction(CommonStrings.action_report_content, CommonDrawables.ic_compound_chat_problem, destructive = true)
data object EndPoll : TimelineItemAction(CommonStrings.action_end_poll, CommonDrawables.ic_poll_end)
data object EndPoll : TimelineItemAction(CommonStrings.action_end_poll, CommonDrawables.ic_compound_polls_end)
}
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ private fun PollTitle(
) {
if (isPollEnded) {
Icon(
resourceId = CommonDrawables.ic_poll_end,
resourceId = CommonDrawables.ic_compound_polls_end,
contentDescription = stringResource(id = CommonStrings.a11y_poll_end),
modifier = Modifier.size(22.dp)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ internal val iconsCompound = listOf(
R.drawable.ic_compound_overflow_horizontal,
R.drawable.ic_compound_overflow_vertical,
R.drawable.ic_compound_polls,
R.drawable.ic_compound_polls_end,
R.drawable.ic_compound_pop_out,
R.drawable.ic_compound_public,
R.drawable.ic_compound_search,
Expand Down Expand Up @@ -121,7 +122,6 @@ internal val iconsOther = listOf(
R.drawable.ic_new_message,
R.drawable.ic_numbered_list,
R.drawable.ic_plus,
R.drawable.ic_poll_end,
R.drawable.ic_quote,
R.drawable.ic_reply,
R.drawable.ic_send,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M18.7 7.7l4-4c0.4-0.38 0.4-1.02 0-1.4-0.38-0.4-1.02-0.4-1.4 0L18 5.58l-1.3-1.3c-0.38-0.39-1.02-0.39-1.4 0-0.4 0.4-0.4 1.03 0 1.42l2 2c0.38 0.39 1.02 0.39 1.4 0Z"/>
<path
android:fillColor="#FF000000"
android:pathData="M21 19v-8.34C20.37 10.88 19.7 11 19 11v8H5V5h8c0-0.7 0.12-1.37 0.34-2H5C4.45 3 3.98 3.2 3.59 3.59 3.19 3.98 3 4.45 3 5v14c0 0.55 0.2 1.02 0.59 1.41C3.98 20.81 4.45 21 5 21h14c0.55 0 1.02-0.2 1.41-0.59C20.81 20.02 21 19.55 21 19Z"/>
<path
android:fillColor="#FF000000"
android:pathData="M8 17c0.28 0 0.52-0.1 0.71-0.29C8.91 16.52 9 16.28 9 16v-5c0-0.28-0.1-0.52-0.29-0.71C8.52 10.09 8.28 10 8 10c-0.28 0-0.52 0.1-0.71 0.29C7.09 10.48 7 10.72 7 11v5c0 0.28 0.1 0.52 0.29 0.71C7.48 16.91 7.72 17 8 17Z"/>
<path
android:fillColor="#FF000000"
android:pathData="M12 17c0.28 0 0.52-0.1 0.71-0.29C12.91 16.52 13 16.28 13 16V8c0-0.28-0.1-0.52-0.29-0.71C12.52 7.09 12.28 7 12 7c-0.28 0-0.52 0.1-0.71 0.29C11.09 7.48 11 7.72 11 8v8c0 0.28 0.1 0.52 0.29 0.71C11.48 16.91 11.72 17 12 17Z"/>
<path
android:fillColor="#FF000000"
android:pathData="M16 17c0.28 0 0.52-0.1 0.71-0.29C16.91 16.52 17 16.28 17 16v-2c0-0.28-0.1-0.52-0.29-0.71C16.52 13.09 16.28 13 16 13c-0.28 0-0.52 0.1-0.71 0.29C15.09 13.48 15 13.72 15 14v2c0 0.28 0.1 0.52 0.29 0.71C15.48 16.91 15.72 17 16 17Z"/>
</vector>
21 changes: 0 additions & 21 deletions libraries/designsystem/src/main/res/drawable/ic_poll_end.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.GraphicEq
import androidx.compose.material.icons.outlined.Image
import androidx.compose.material.icons.outlined.Poll
import androidx.compose.material.icons.outlined.VideoCameraBack
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -125,7 +124,7 @@ fun AttachmentThumbnail(
}
AttachmentThumbnailType.Poll -> {
Icon(
imageVector = Icons.Outlined.Poll,
resourceId = CommonDrawables.ic_compound_polls,
contentDescription = info.textContent,
)
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Copy link
Member

Choose a reason for hiding this comment

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

Hard to see the diff here 🤔

Copy link
Author

Choose a reason for hiding this comment

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

The rounding of the bars seem a little bit different....

@amshakal can you just give an eye on this screenshots to see if the new poll icons look okay?

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.