rei-forks
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6168 from vector-im/feature/aris/threads_update_icons 

Fix wrong rendered vector icon
This commit is contained in:
Aris Kotsomitopoulos 2022-05-30 15:59:18 +03:00 committed by GitHub
parent 828e13f9be 21225b8a28
commit 9a756f2b7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
View File

@ -52,7 +52,7 @@ sealed class EventSharedAction(@StringRes val titleRes: Int,
EventSharedAction(R.string.reply_in_thread, R.drawable.ic_reply_in_thread) EventSharedAction(R.string.reply_in_thread, R.drawable.ic_reply_in_thread)
object ViewInRoom : object ViewInRoom :
EventSharedAction(R.string.view_in_room, R.drawable.ic_thread_view_in_room_menu_item) EventSharedAction(R.string.view_in_room, R.drawable.ic_threads_view_in_room_24)
data class Share(val eventId: String, val messageContent: MessageContent) : data class Share(val eventId: String, val messageContent: MessageContent) :
EventSharedAction(R.string.action_share, R.drawable.ic_share) EventSharedAction(R.string.action_share, R.drawable.ic_share)

30
vector/src/main/res/drawable/ic_thread_view_in_room_menu_item.xml
View File

@ -1,30 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M3,4H21"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#737D8C"
android:strokeLineCap="round"/>
<path
android:pathData="M3,10H16"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#737D8C"
android:strokeLineCap="round"/>
<path
android:pathData="M3,14H11"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#737D8C"
android:strokeLineCap="round"/>
<path
android:pathData="M3,20H21"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#737D8C"
android:strokeLineCap="round"/>
</vector>

22
vector/src/main/res/drawable/ic_threads_view_in_room_24.xml Normal file
View File

@ -0,0 +1,22 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M2,4C2,3.448 2.448,3 3,3H3.005C3.557,3 4.005,3.448 4.005,4C4.005,4.552 3.557,5 3.005,5H3C2.448,5 2,4.552 2,4ZM4.995,4C4.995,3.448 5.443,3 5.995,3H6.005C6.557,3 7.005,3.448 7.005,4C7.005,4.552 6.557,5 6.005,5H5.995C5.443,5 4.995,4.552 4.995,4ZM7.995,4C7.995,3.448 8.443,3 8.995,3H9.005C9.557,3 10.005,3.448 10.005,4C10.005,4.552 9.557,5 9.005,5H8.995C8.443,5 7.995,4.552 7.995,4ZM10.995,4C10.995,3.448 11.443,3 11.995,3H12.005C12.557,3 13.005,3.448 13.005,4C13.005,4.552 12.557,5 12.005,5H11.995C11.443,5 10.995,4.552 10.995,4ZM13.995,4C13.995,3.448 14.443,3 14.995,3H15.005C15.557,3 16.005,3.448 16.005,4C16.005,4.552 15.557,5 15.005,5H14.995C14.443,5 13.995,4.552 13.995,4ZM16.995,4C16.995,3.448 17.443,3 17.995,3H18.005C18.557,3 19.005,3.448 19.005,4C19.005,4.552 18.557,5 18.005,5H17.995C17.443,5 16.995,4.552 16.995,4ZM19.995,4C19.995,3.448 20.443,3 20.995,3H21C21.552,3 22,3.448 22,4C22,4.552 21.552,5 21,5H20.995C20.443,5 19.995,4.552 19.995,4Z"
android:fillColor="#17191C"
android:fillType="evenOdd"/>
<path
android:pathData="M2,10C2,9.448 2.448,9 3,9H16C16.552,9 17,9.448 17,10C17,10.552 16.552,11 16,11H3C2.448,11 2,10.552 2,10Z"
android:fillColor="#17191C"
android:fillType="evenOdd"/>
<path
android:pathData="M2,14C2,13.448 2.448,13 3,13H11C11.552,13 12,13.448 12,14C12,14.552 11.552,15 11,15H3C2.448,15 2,14.552 2,14Z"
android:fillColor="#17191C"
android:fillType="evenOdd"/>
<path
android:pathData="M2,20C2,19.448 2.448,19 3,19H3.005C3.557,19 4.005,19.448 4.005,20C4.005,20.552 3.557,21 3.005,21H3C2.448,21 2,20.552 2,20ZM4.995,20C4.995,19.448 5.443,19 5.995,19H6.005C6.557,19 7.005,19.448 7.005,20C7.005,20.552 6.557,21 6.005,21H5.995C5.443,21 4.995,20.552 4.995,20ZM7.995,20C7.995,19.448 8.443,19 8.995,19H9.005C9.557,19 10.005,19.448 10.005,20C10.005,20.552 9.557,21 9.005,21H8.995C8.443,21 7.995,20.552 7.995,20ZM10.995,20C10.995,19.448 11.443,19 11.995,19H12.005C12.557,19 13.005,19.448 13.005,20C13.005,20.552 12.557,21 12.005,21H11.995C11.443,21 10.995,20.552 10.995,20ZM13.995,20C13.995,19.448 14.443,19 14.995,19H15.005C15.557,19 16.005,19.448 16.005,20C16.005,20.552 15.557,21 15.005,21H14.995C14.443,21 13.995,20.552 13.995,20ZM16.995,20C16.995,19.448 17.443,19 17.995,19H18.005C18.557,19 19.005,19.448 19.005,20C19.005,20.552 18.557,21 18.005,21H17.995C17.443,21 16.995,20.552 16.995,20ZM19.995,20C19.995,19.448 20.443,19 20.995,19H21C21.552,19 22,19.448 22,20C22,20.552 21.552,21 21,21H20.995C20.443,21 19.995,20.552 19.995,20Z"
android:fillColor="#17191C"
android:fillType="evenOdd"/>
</vector>

2
vector/src/main/res/menu/menu_timeline.xml
View File

@ -72,7 +72,7 @@
<item <item
android:id="@+id/menu_thread_timeline_view_in_room" android:id="@+id/menu_thread_timeline_view_in_room"
android:icon="@drawable/ic_thread_view_in_room_menu_item" android:icon="@drawable/ic_threads_view_in_room_24"
android:title="@string/action_thread_view_in_room" android:title="@string/action_thread_view_in_room"
app:iconTint="?vctr_content_secondary" app:iconTint="?vctr_content_secondary"
app:showAsAction="withText" /> app:showAsAction="withText" />