Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update poll icons from Compound (#1849)

Browse source 
* Use compound icons for polls

---------

Co-authored-by: ElementBot <benoitm+elementbot@element.io>
This commit is contained in:
Marco Romano 2023-11-22 13:35:04 +01:00 • committed by GitHub
parent 0f0bd34665
commit 60f58f9915
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 53 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
changelog.d/1849.misc Normal file
View file

@ -0,0 +1,2 @@
Update poll icons from Compound

2
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt
View file

@ -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)
}

2
features/poll/api/src/main/kotlin/io/element/android/features/poll/api/PollContentView.kt
View file

@ -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)
)

2
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt
View file

@ -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,
@ -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,

21
libraries/designsystem/src/main/res/drawable/ic_compound_polls_end.xml Normal file
View file

@ -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
libraries/designsystem/src/main/res/drawable/ic_poll_end.xml
View file

@ -1,21 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
<path
android:pathData="M17.148,7.065L20.815,3.399C21.173,3.041 21.173,2.46 20.815,2.102C20.457,1.744 19.876,1.744 19.518,2.102L16.5,5.121L15.315,3.936C14.957,3.578 14.377,3.578 14.019,3.936C13.66,4.294 13.66,4.874 14.019,5.232L15.852,7.065C16.21,7.423 16.79,7.423 17.148,7.065Z"
android:fillColor="@android:color/white"/>
<path
android:pathData="M19.25,17.417V9.771C18.677,9.974 18.059,10.084 17.417,10.084V17.417H4.583V4.584L11.917,4.584C11.917,3.941 12.027,3.324 12.23,2.751H4.583C4.079,2.751 3.648,2.93 3.289,3.289C2.93,3.648 2.75,4.08 2.75,4.584V17.417C2.75,17.921 2.93,18.353 3.289,18.712C3.648,19.071 4.079,19.251 4.583,19.251H17.417C17.921,19.251 18.352,19.071 18.712,18.712C19.07,18.353 19.25,17.921 19.25,17.417Z"
android:fillColor="@android:color/white"/>
<path
android:pathData="M7.333,15.584C7.593,15.584 7.811,15.496 7.986,15.32C8.162,15.145 8.25,14.927 8.25,14.667V10.084C8.25,9.824 8.162,9.607 7.986,9.431C7.811,9.255 7.593,9.167 7.333,9.167C7.074,9.167 6.856,9.255 6.68,9.431C6.505,9.607 6.417,9.824 6.417,10.084V14.667C6.417,14.927 6.505,15.145 6.68,15.32C6.856,15.496 7.074,15.584 7.333,15.584Z"
android:fillColor="@android:color/white"/>
<path
android:pathData="M11,15.584C11.26,15.584 11.477,15.496 11.653,15.32C11.829,15.145 11.917,14.927 11.917,14.667V7.334C11.917,7.074 11.829,6.857 11.653,6.681C11.477,6.505 11.26,6.417 11,6.417C10.74,6.417 10.523,6.505 10.347,6.681C10.171,6.857 10.083,7.074 10.083,7.334V14.667C10.083,14.927 10.171,15.145 10.347,15.32C10.523,15.496 10.74,15.584 11,15.584Z"
android:fillColor="@android:color/white"/>
<path
android:pathData="M14.667,15.584C14.926,15.584 15.144,15.496 15.32,15.32C15.495,15.145 15.583,14.927 15.583,14.667V12.834C15.583,12.574 15.495,12.357 15.32,12.181C15.144,12.005 14.926,11.917 14.667,11.917C14.407,11.917 14.189,12.005 14.014,12.181C13.838,12.357 13.75,12.574 13.75,12.834V14.667C13.75,14.927 13.838,15.145 14.014,15.32C14.189,15.496 14.407,15.584 14.667,15.584Z"
android:fillColor="@android:color/white"/>
</vector>

3
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnail.kt
View file

@ -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
@ -125,7 +124,7 @@ fun AttachmentThumbnail(
}
AttachmentThumbnailType.Poll -> {
Icon(
imageVector = Icons.Outlined.Poll,
resourceId = CommonDrawables.ic_compound_polls,
contentDescription = info.textContent,
)
}

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_10,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:217c310a2262594c4ae38ca905237d06b34eca6a28f3a74864b13055caa5e79e
size 27614
oid sha256:0c8e68c96df17b5e3998b4ed26e1ddb64895ceadeb84dc2dfec621f789e37c1e
size 27769

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_10,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:50dd24c985850b9842eb769c7a747903b814bb0fc11ff014c38d75a9531f0855
size 26196
oid sha256:f9864017c3c079ed54abe4400832cb828ebe6cbcae70b1d212318d48a99b448c
size 26320

2
tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.api_PollContentCreatorEnded_null_PollContentCreatorEnded-Day-12_13_null,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:88230f28f7761d8f76bc5a50dbc4ba08a694eaf0d64207257f5196c741fb7b52
oid sha256:457325b3f1ccb449bbce167bd215a9760990afa2fee0afeabb0ecf1deba38129
size 49078

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.api_PollContentCreatorEnded_null_PollContentCreatorEnded-Night-12_14_null,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a6e31f773b884608499081ab3c7a27297edfbf8af76f502d9076b4753956e2db
size 45929
oid sha256:f56f203e0c87c3ccc0ab1e54321c9b7dcea8bb4c9f1efd0735d43f43b867c03b
size 45927

2
tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.api_PollContentEnded_null_PollContentEnded-Day-9_10_null,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:88230f28f7761d8f76bc5a50dbc4ba08a694eaf0d64207257f5196c741fb7b52
oid sha256:457325b3f1ccb449bbce167bd215a9760990afa2fee0afeabb0ecf1deba38129
size 49078

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.api_PollContentEnded_null_PollContentEnded-Night-9_11_null,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a6e31f773b884608499081ab3c7a27297edfbf8af76f502d9076b4753956e2db
size 45929
oid sha256:f56f203e0c87c3ccc0ab1e54321c9b7dcea8bb4c9f1efd0735d43f43b867c03b
size 45927

4
tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.icons_IconsCompound_null_IconsCompound-Day_0_null_1,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:66ce02b19066a21d1ebf1b2963872df484cdce5f4eac16ec0d7d215ba7276b9a
size 84144
oid sha256:69b356a9027e5a09df13a824e061ca2cb0b079b8f73513cf3d4bac4fc1644364
size 83226

4
tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.icons_IconsCompound_null_IconsCompound-Day_0_null_2,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:15429b5c37ef7ebb125fc4c00741d5fb8a123ce6764d5eccf1697b6821bf6238
size 18823
oid sha256:adabc468933e39fb1dc898cb9cf72c8e62f59d50aa4dec3bbb7d3aa89e385a3a
size 21158

4
tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.icons_IconsCompound_null_IconsCompound-Night_1_null_1,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bcc61f1337b615ca05d0b6da76a0f434936a9b6bc14ba464ec8c3c8f2d20fe7d
size 80887
oid sha256:fa602e8416b8c609b5c2ee7331a7e1bb17b4a8c4bf25f9d402a2723d88f2e0a7
size 80152

4
tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.icons_IconsCompound_null_IconsCompound-Night_1_null_2,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:62d7f0187da9d4e5d33a63b8f1057bcfed5c63d7175969e37ab1b742d5a2d05a
size 17669
oid sha256:a51e0cd2d7c1dfdaa2fecb381b13183526f89ef886df573b2b4932281653e147
size 19876

4
tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.icons_IconsOther_null_IconsOther-Day_0_null_0,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:244a6f7b697dcbff32ad6010145c2c97f60df2c3b9455560148f4c8265ba36f1
size 77859
oid sha256:d22ae52d7d0e222743fa7b8cf0d767a5af8c103fce339640f1b430560f6b7893
size 76682

4
tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.icons_IconsOther_null_IconsOther-Night_1_null_0,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5da6a3d6d4e7657a760054acb68449050ff16c34431fde68f2a718b0c7bd047f
size 75080
oid sha256:312cfaf08c6a850e2ca167a2b53420e1c6bc8e375ab565bd41c2d643d66a7c58
size 73923

4
tests/uitests/src/test/snapshots/images/ui_S_t[l.matrix.ui.components_AttachmentThumbnail_null_AttachmentThumbnail-Day-0_1_null_8,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9e3fbf0f17f47df6d0889ed1b0ab0ec8aed643c244a34360cf538171ddf76be5
size 4701
oid sha256:d4e39e1aea820757c200a093dabd977f2f35969d69f497904f2f1f09dcae8853
size 4902

4
tests/uitests/src/test/snapshots/images/ui_S_t[l.matrix.ui.components_AttachmentThumbnail_null_AttachmentThumbnail-Night-0_2_null_8,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:334067772ec7b12afd075e80653bafa465e96cd13385db48891e2b0afa913543
size 4707
oid sha256:5cfef20aea5c4565515832fad00b36008d8b4c97790ae84cd620d12d9662d4a3
size 4899