diff --git a/post_merge.sh b/post_merge.sh index c8167f4e5c..6074d5dbb6 100755 --- a/post_merge.sh +++ b/post_merge.sh @@ -16,6 +16,7 @@ sed -i 's|"@style/VectorButtonStyle"|"?materialButtonStyle"|g' vector/src/*/res/ sed -i 's|"@color/element_background_light"|"?backgroundColorLight"|g' vector/src/*/res/layout/* library/ui-styles/src/main/res/layout/* sed -i 's|#FF4B55|#E53935|g' vector/src/*/res/drawable/* vector-app/src/*/res/drawable/* sed -i 's|#ff4b55|#e53935|g' vector/src/*/res/drawable/* vector-app/src/*/res/drawable/* +sed -i 's|#737D8C|#808080|g' vector/src/*/res/drawable/* vector-app/src/*/res/drawable/* uncommitted=`git status --porcelain` if [ -z "$uncommitted" ]; then echo "Seems like colors are still fine :)" diff --git a/vector/src/main/res/drawable/ic_attachment_voice_broadcast.xml b/vector/src/main/res/drawable/ic_attachment_voice_broadcast.xml index 3e93522b18..1e6ac937fa 100644 --- a/vector/src/main/res/drawable/ic_attachment_voice_broadcast.xml +++ b/vector/src/main/res/drawable/ic_attachment_voice_broadcast.xml @@ -5,17 +5,17 @@ android:viewportHeight="24"> + android:fillColor="#808080" /> + android:fillColor="#808080" /> + android:fillColor="#808080" /> + android:fillColor="#808080" /> + android:fillColor="#808080" /> diff --git a/vector/src/main/res/drawable/ic_call_audio_settings.xml b/vector/src/main/res/drawable/ic_call_audio_settings.xml index 8a47d27d9a..371306e460 100644 --- a/vector/src/main/res/drawable/ic_call_audio_settings.xml +++ b/vector/src/main/res/drawable/ic_call_audio_settings.xml @@ -5,11 +5,11 @@ android:viewportHeight="26"> + android:fillColor="#808080"/> + android:fillColor="#808080"/> + android:fillColor="#808080"/> diff --git a/vector/src/main/res/drawable/ic_call_audio_small.xml b/vector/src/main/res/drawable/ic_call_audio_small.xml index 9a407cdf7e..96af5ea246 100644 --- a/vector/src/main/res/drawable/ic_call_audio_small.xml +++ b/vector/src/main/res/drawable/ic_call_audio_small.xml @@ -5,5 +5,5 @@ android:viewportHeight="14"> + android:fillColor="#808080"/> diff --git a/vector/src/main/res/drawable/ic_call_video_small.xml b/vector/src/main/res/drawable/ic_call_video_small.xml index 5e2ae23598..fb85ee7bae 100644 --- a/vector/src/main/res/drawable/ic_call_video_small.xml +++ b/vector/src/main/res/drawable/ic_call_video_small.xml @@ -5,9 +5,9 @@ android:viewportHeight="12"> + android:fillColor="#808080"/> + android:fillColor="#808080"/> diff --git a/vector/src/main/res/drawable/ic_camera_plain.xml b/vector/src/main/res/drawable/ic_camera_plain.xml index 56d55c9da1..ae41e7c1fb 100644 --- a/vector/src/main/res/drawable/ic_camera_plain.xml +++ b/vector/src/main/res/drawable/ic_camera_plain.xml @@ -5,6 +5,6 @@ android:viewportHeight="16"> diff --git a/vector/src/main/res/drawable/ic_chat.xml b/vector/src/main/res/drawable/ic_chat.xml index fb10eae9c9..ad622c4b5f 100644 --- a/vector/src/main/res/drawable/ic_chat.xml +++ b/vector/src/main/res/drawable/ic_chat.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/vector/src/main/res/drawable/ic_delete_10dp.xml b/vector/src/main/res/drawable/ic_delete_10dp.xml index f8229a71d0..1d3495fbdc 100644 --- a/vector/src/main/res/drawable/ic_delete_10dp.xml +++ b/vector/src/main/res/drawable/ic_delete_10dp.xml @@ -7,12 +7,12 @@ android:pathData="M0.9998,0.9997L8.9998,8.9997" android:strokeWidth="2" android:fillColor="#00000000" - android:strokeColor="#737D8C" + android:strokeColor="#808080" android:strokeLineCap="round"/> diff --git a/vector/src/main/res/drawable/ic_device_type_desktop.xml b/vector/src/main/res/drawable/ic_device_type_desktop.xml index 922073459d..28f1f9675b 100644 --- a/vector/src/main/res/drawable/ic_device_type_desktop.xml +++ b/vector/src/main/res/drawable/ic_device_type_desktop.xml @@ -7,5 +7,5 @@ tools:ignore="UnusedResources"> + android:fillColor="#808080"/> diff --git a/vector/src/main/res/drawable/ic_device_type_mobile.xml b/vector/src/main/res/drawable/ic_device_type_mobile.xml index fd825c77f0..245306c53a 100644 --- a/vector/src/main/res/drawable/ic_device_type_mobile.xml +++ b/vector/src/main/res/drawable/ic_device_type_mobile.xml @@ -5,5 +5,5 @@ android:viewportHeight="22"> + android:fillColor="#808080"/> diff --git a/vector/src/main/res/drawable/ic_device_type_unknown.xml b/vector/src/main/res/drawable/ic_device_type_unknown.xml index 8368dcbd0b..a714f270d6 100644 --- a/vector/src/main/res/drawable/ic_device_type_unknown.xml +++ b/vector/src/main/res/drawable/ic_device_type_unknown.xml @@ -5,6 +5,6 @@ android:viewportHeight="25"> diff --git a/vector/src/main/res/drawable/ic_device_type_web.xml b/vector/src/main/res/drawable/ic_device_type_web.xml index dde3ce3a1f..1e04546677 100644 --- a/vector/src/main/res/drawable/ic_device_type_web.xml +++ b/vector/src/main/res/drawable/ic_device_type_web.xml @@ -7,5 +7,5 @@ tools:ignore="UnusedResources"> + android:fillColor="#808080"/> diff --git a/vector/src/main/res/drawable/ic_inactive_sessions.xml b/vector/src/main/res/drawable/ic_inactive_sessions.xml index 30ee2b3b3c..1c0f9cde95 100644 --- a/vector/src/main/res/drawable/ic_inactive_sessions.xml +++ b/vector/src/main/res/drawable/ic_inactive_sessions.xml @@ -5,5 +5,5 @@ android:viewportHeight="14"> + android:fillColor="#808080"/> diff --git a/vector/src/main/res/drawable/ic_info.xml b/vector/src/main/res/drawable/ic_info.xml index afca98641a..09ba210424 100644 --- a/vector/src/main/res/drawable/ic_info.xml +++ b/vector/src/main/res/drawable/ic_info.xml @@ -5,6 +5,6 @@ android:viewportHeight="16"> diff --git a/vector/src/main/res/drawable/ic_invites_empty.xml b/vector/src/main/res/drawable/ic_invites_empty.xml index 79908ff380..c99b55fe39 100644 --- a/vector/src/main/res/drawable/ic_invites_empty.xml +++ b/vector/src/main/res/drawable/ic_invites_empty.xml @@ -9,6 +9,6 @@ + android:fillColor="#808080" + android:strokeColor="#808080"/> diff --git a/vector/src/main/res/drawable/ic_mail.xml b/vector/src/main/res/drawable/ic_mail.xml index 80d25166b0..527117a442 100644 --- a/vector/src/main/res/drawable/ic_mail.xml +++ b/vector/src/main/res/drawable/ic_mail.xml @@ -9,13 +9,13 @@ android:strokeWidth="2" android:fillColor="#00000000" android:fillType="evenOdd" - android:strokeColor="#737D8C" + android:strokeColor="#808080" android:strokeLineCap="round"/> diff --git a/vector/src/main/res/drawable/ic_member_small.xml b/vector/src/main/res/drawable/ic_member_small.xml index 9298c5f80c..e66105f2dd 100644 --- a/vector/src/main/res/drawable/ic_member_small.xml +++ b/vector/src/main/res/drawable/ic_member_small.xml @@ -5,6 +5,6 @@ android:viewportHeight="16"> diff --git a/vector/src/main/res/drawable/ic_missed_video_call.xml b/vector/src/main/res/drawable/ic_missed_video_call.xml index 555e15a371..70edbf268e 100644 --- a/vector/src/main/res/drawable/ic_missed_video_call.xml +++ b/vector/src/main/res/drawable/ic_missed_video_call.xml @@ -5,6 +5,6 @@ android:viewportHeight="16"> diff --git a/vector/src/main/res/drawable/ic_missed_video_call_small.xml b/vector/src/main/res/drawable/ic_missed_video_call_small.xml index c703f0cfca..cd801cc2ed 100644 --- a/vector/src/main/res/drawable/ic_missed_video_call_small.xml +++ b/vector/src/main/res/drawable/ic_missed_video_call_small.xml @@ -1,4 +1,4 @@ - + diff --git a/vector/src/main/res/drawable/ic_reply_in_thread.xml b/vector/src/main/res/drawable/ic_reply_in_thread.xml index 3b9b595bd3..2ba43acd97 100644 --- a/vector/src/main/res/drawable/ic_reply_in_thread.xml +++ b/vector/src/main/res/drawable/ic_reply_in_thread.xml @@ -1,8 +1,8 @@ - + + android:strokeColor="#808080" android:strokeLineCap="round" android:strokeWidth="2"/> + android:strokeColor="#808080" android:strokeLineCap="round" android:strokeWidth="2"/> diff --git a/vector/src/main/res/drawable/ic_room_add.xml b/vector/src/main/res/drawable/ic_room_add.xml index 8404ff2181..facc4a94a8 100644 --- a/vector/src/main/res/drawable/ic_room_add.xml +++ b/vector/src/main/res/drawable/ic_room_add.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/vector/src/main/res/drawable/ic_room_explore.xml b/vector/src/main/res/drawable/ic_room_explore.xml index 9811a09054..5738e86b39 100644 --- a/vector/src/main/res/drawable/ic_room_explore.xml +++ b/vector/src/main/res/drawable/ic_room_explore.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/vector/src/main/res/drawable/ic_share_link.xml b/vector/src/main/res/drawable/ic_share_link.xml index d4eceb3b9a..f073194b80 100644 --- a/vector/src/main/res/drawable/ic_share_link.xml +++ b/vector/src/main/res/drawable/ic_share_link.xml @@ -7,6 +7,6 @@ android:pathData="M12.5285,6.5409L13.0273,6.0421C14.4052,4.6643 16.6259,4.651 17.9874,6.0125C19.349,7.374 19.3357,9.5947 17.9579,10.9725L15.5878,13.3425C14.21,14.7203 11.9893,14.7335 10.6277,13.372M11.4717,17.4589L10.9727,17.9579C9.5948,19.3357 7.3741,19.349 6.0126,17.9875C4.651,16.626 4.6643,14.4053 6.0421,13.0275L8.412,10.6577C9.7899,9.2799 12.0106,9.2667 13.3721,10.6281" android:strokeWidth="2" android:fillColor="#00000000" - android:strokeColor="#737D8C" + android:strokeColor="#808080" android:strokeLineCap="round"/> diff --git a/vector/src/main/res/drawable/ic_share_screen.xml b/vector/src/main/res/drawable/ic_share_screen.xml index 5e3caa6987..0edc3afa92 100644 --- a/vector/src/main/res/drawable/ic_share_screen.xml +++ b/vector/src/main/res/drawable/ic_share_screen.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/vector/src/main/res/drawable/ic_sound_device_headphone.xml b/vector/src/main/res/drawable/ic_sound_device_headphone.xml index 4648465356..01b685804d 100644 --- a/vector/src/main/res/drawable/ic_sound_device_headphone.xml +++ b/vector/src/main/res/drawable/ic_sound_device_headphone.xml @@ -5,5 +5,5 @@ android:viewportHeight="20"> + android:fillColor="#808080"/> diff --git a/vector/src/main/res/drawable/ic_sound_device_phone.xml b/vector/src/main/res/drawable/ic_sound_device_phone.xml index fd825c77f0..245306c53a 100644 --- a/vector/src/main/res/drawable/ic_sound_device_phone.xml +++ b/vector/src/main/res/drawable/ic_sound_device_phone.xml @@ -5,5 +5,5 @@ android:viewportHeight="22"> + android:fillColor="#808080"/> diff --git a/vector/src/main/res/drawable/ic_sound_device_speaker.xml b/vector/src/main/res/drawable/ic_sound_device_speaker.xml index eb786d3fe1..3c8756e373 100644 --- a/vector/src/main/res/drawable/ic_sound_device_speaker.xml +++ b/vector/src/main/res/drawable/ic_sound_device_speaker.xml @@ -5,11 +5,11 @@ android:viewportHeight="20"> + android:fillColor="#808080"/> + android:fillColor="#808080"/> + android:fillColor="#808080"/> diff --git a/vector/src/main/res/drawable/ic_sound_device_wireless.xml b/vector/src/main/res/drawable/ic_sound_device_wireless.xml index 02287aa96c..a1332f0a2a 100644 --- a/vector/src/main/res/drawable/ic_sound_device_wireless.xml +++ b/vector/src/main/res/drawable/ic_sound_device_wireless.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="#808080"/> + android:fillColor="#808080"/> diff --git a/vector/src/main/res/drawable/ic_thread_link_menu_item.xml b/vector/src/main/res/drawable/ic_thread_link_menu_item.xml index 779c9d832c..3b53e642c9 100644 --- a/vector/src/main/res/drawable/ic_thread_link_menu_item.xml +++ b/vector/src/main/res/drawable/ic_thread_link_menu_item.xml @@ -7,6 +7,6 @@ android:pathData="M12.604,5.761L13.1741,5.1909C14.7488,3.6163 17.2867,3.6012 18.8428,5.1572C20.3988,6.7132 20.3837,9.251 18.809,10.8257L16.1004,13.5342C14.5257,15.1089 11.9877,15.124 10.4317,13.568M11.3962,18.2387L10.8259,18.8091C9.2512,20.3837 6.7133,20.3988 5.1572,18.8428C3.6012,17.2868 3.6163,14.749 5.191,13.1743L7.8995,10.4659C9.4741,8.8913 12.0121,8.8762 13.5681,10.4322" android:strokeWidth="2" android:fillColor="#00000000" - android:strokeColor="#737D8C" + android:strokeColor="#808080" android:strokeLineCap="round"/> diff --git a/vector/src/main/res/drawable/ic_thread_share_menu_item.xml b/vector/src/main/res/drawable/ic_thread_share_menu_item.xml index cb863c39bf..b17af61d60 100644 --- a/vector/src/main/res/drawable/ic_thread_share_menu_item.xml +++ b/vector/src/main/res/drawable/ic_thread_share_menu_item.xml @@ -5,15 +5,15 @@ android:viewportHeight="24"> + android:fillColor="#808080"/> + android:fillColor="#808080"/> + android:fillColor="#808080"/> diff --git a/vector/src/main/res/drawable/ic_video_call_declined.xml b/vector/src/main/res/drawable/ic_video_call_declined.xml index dc5457178a..ef69f92e9e 100644 --- a/vector/src/main/res/drawable/ic_video_call_declined.xml +++ b/vector/src/main/res/drawable/ic_video_call_declined.xml @@ -5,6 +5,6 @@ android:viewportHeight="12"> diff --git a/vector/src/main/res/drawable/ic_voice_call_declined.xml b/vector/src/main/res/drawable/ic_voice_call_declined.xml index 2eb04a7e5a..a50fc54abe 100644 --- a/vector/src/main/res/drawable/ic_voice_call_declined.xml +++ b/vector/src/main/res/drawable/ic_voice_call_declined.xml @@ -5,8 +5,8 @@ android:viewportHeight="16"> + android:fillColor="#808080"/> + android:fillColor="#808080"/>