Import resource from riot

2019-04-03 14:24:32 +02:00 · 2019-04-03 14:24:32 +02:00 · 73580493ea
parent c188bb290f
commit 73580493ea
271 changed files with 707 additions and 107 deletions
--- a/matrix-sdk-android/src/main/res/values-nl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-nl/strings.xml
@ -64,7 +64,7 @@
    <!-- Last seen time -->

    <!-- room error messages -->
-    <string name="room_error_join_failed_empty_room">Het is momenteel niet mogelijk om een lege kamer opnieuw toe te treden.</string>
+    <string name="room_error_join_failed_empty_room">Het is momenteel niet mogelijk om een leeg gesprek opnieuw toe te treden.</string>

    <string name="encrypted_message">Versleuteld bericht</string>

@ -85,7 +85,7 @@
    <string name="room_displayname_invite_from">Uitnodiging van %s</string>
    <string name="room_displayname_room_invite">Gespreksuitnodiging</string>
    <string name="room_displayname_two_members">%1$s en %2$s</string>
-    <string name="room_displayname_empty_room">Lege kamer</string>
+    <string name="room_displayname_empty_room">Leeg gesprek</string>

    <plurals name="room_displayname_three_and_more_members">
        <item quantity="one">%1$s en 1 andere</item>
--- a/tools/import_from_riot.sh
+++ b/tools/import_from_riot.sh
@ -19,8 +19,8 @@
 # Exit on any error
 set -e

-echo "Copy strings to SDK"
 echo
+echo "Copy strings to SDK"

 cp ../matrix-android-sdk/matrix-sdk/src/main/res/values/strings.xml        ./matrix-sdk-android/src/main/res/values/strings.xml
 cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-ar/strings.xml     ./matrix-sdk-android/src/main/res/values-ar/strings.xml
@ -61,8 +61,7 @@ cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-zh-rCN/strings.xml ./mat
 cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-zh-rTW/strings.xml ./matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml

 echo
-echo "Copy strings to Riot"
-echo
+echo "Copy strings to RiotX"

 cp ../riot-android/vector/src/main/res/values/strings.xml        ./vector/src/main/res/values/strings.xml
 cp ../riot-android/vector/src/main/res/values-ar/strings.xml     ./vector/src/main/res/values-ar/strings.xml
@ -107,6 +106,39 @@ cp ../riot-android/vector/src/main/res/values-uk/strings.xml     ./vector/src/ma
 cp ../riot-android/vector/src/main/res/values-zh-rCN/strings.xml ./vector/src/main/res/values-zh-rCN/strings.xml
 cp ../riot-android/vector/src/main/res/values-zh-rTW/strings.xml ./vector/src/main/res/values-zh-rTW/strings.xml

+echo
+echo "Copy drawables to RiotX"
+
+cp ../riot-android/vector/src/main/res/drawable/* ./vector/src/main/res/drawable/
+cp ../riot-android/vector/src/main/res/drawable-hdpi/* ./vector/src/main/res/drawable-hdpi/
+cp ../riot-android/vector/src/main/res/drawable-mdpi/* ./vector/src/main/res/drawable-mdpi/
+cp ../riot-android/vector/src/main/res/drawable-xhdpi/* ./vector/src/main/res/drawable-xhdpi/
+cp ../riot-android/vector/src/main/res/drawable-xxhdpi/* ./vector/src/main/res/drawable-xxhdpi/
+cp ../riot-android/vector/src/main/res/drawable-xxxhdpi/* ./vector/src/main/res/drawable-xxxhdpi/
+
+echo
+echo "Copy icon to RiotX"
+
+cp ../riot-android/vector/src/main/res/mipmap-anydpi-v26/* ./vector/src/main/res/mipmap-anydpi-v26/
+cp ../riot-android/vector/src/main/res/mipmap-hdpi/* ./vector/src/main/res/mipmap-hdpi/
+cp ../riot-android/vector/src/main/res/mipmap-mdpi/* ./vector/src/main/res/mipmap-mdpi/
+cp ../riot-android/vector/src/main/res/mipmap-xhdpi/* ./vector/src/main/res/mipmap-xhdpi/
+cp ../riot-android/vector/src/main/res/mipmap-xxhdpi/* ./vector/src/main/res/mipmap-xxhdpi/
+cp ../riot-android/vector/src/main/res/mipmap-xxxhdpi/* ./vector/src/main/res/mipmap-xxxhdpi/
+
+
+echo
+echo "Copy other elements to RiotX"
+
+cp ../riot-android/vector/src/main/res/anim/* ./vector/src/main/res/anim/
+cp ../riot-android/vector/src/main/res/color/* ./vector/src/main/res/color/
+cp ../riot-android/vector/src/main/res/menu/* ./vector/src/main/res/menu/
+cp ../riot-android/vector/src/main/res/menu/* ./vector/src/main/res/menu/
+cp ../riot-android/vector/src/main/res/values-v17/* ./vector/src/main/res/values-v17/
+cp ../riot-android/vector/src/main/res/values-v21/* ./vector/src/main/res/values-v21/
+cp ../riot-android/vector/src/main/res/values-w480dp/* ./vector/src/main/res/values-w480dp/
+cp ../riot-android/vector/src/main/res/values-w820dp/* ./vector/src/main/res/values-w820dp/
+cp ../riot-android/vector/src/main/res/raw/* ./vector/src/main/res/raw/

 echo
 echo "Success!"
--- a/vector/src/main/res/drawable-hdpi/alert_triangle.png
+++ b/vector/src/main/res/drawable-hdpi/alert_triangle.png
--- a/vector/src/main/res/drawable-hdpi/backup_keys.png
+++ b/vector/src/main/res/drawable-hdpi/backup_keys.png
--- a/vector/src/main/res/drawable-hdpi/ic_eye_black.png
+++ b/vector/src/main/res/drawable-hdpi/ic_eye_black.png
--- a/vector/src/main/res/drawable-hdpi/ic_eye_closed_black.png
+++ b/vector/src/main/res/drawable-hdpi/ic_eye_closed_black.png
--- a/vector/src/main/res/drawable-hdpi/ic_home_black_24dp.png
+++ b/vector/src/main/res/drawable-hdpi/ic_home_black_24dp.png
--- a/vector/src/main/res/drawable-hdpi/ic_import_black.png
+++ b/vector/src/main/res/drawable-hdpi/ic_import_black.png
--- a/vector/src/main/res/drawable-hdpi/ic_material_play_circle.png
+++ b/vector/src/main/res/drawable-hdpi/ic_material_play_circle.png
--- a/vector/src/main/res/drawable-hdpi/ic_notification_privacy_warning.png
+++ b/vector/src/main/res/drawable-hdpi/ic_notification_privacy_warning.png
--- a/vector/src/main/res/drawable-hdpi/ic_person_black_24dp.png
+++ b/vector/src/main/res/drawable-hdpi/ic_person_black_24dp.png
--- a/vector/src/main/res/drawable-hdpi/ic_remove_circle_outline_red.png
+++ b/vector/src/main/res/drawable-hdpi/ic_remove_circle_outline_red.png
--- a/vector/src/main/res/drawable-hdpi/ic_settings.png
+++ b/vector/src/main/res/drawable-hdpi/ic_settings.png
--- a/vector/src/main/res/drawable-hdpi/ic_small_close.png
+++ b/vector/src/main/res/drawable-hdpi/ic_small_close.png
--- a/vector/src/main/res/drawable-hdpi/ic_star_black_24dp.png
+++ b/vector/src/main/res/drawable-hdpi/ic_star_black_24dp.png
--- a/vector/src/main/res/drawable-hdpi/icon_notif_important.png
+++ b/vector/src/main/res/drawable-hdpi/icon_notif_important.png
--- a/vector/src/main/res/drawable-hdpi/key_big.png
+++ b/vector/src/main/res/drawable-hdpi/key_big.png
--- a/vector/src/main/res/drawable-hdpi/key_small.png
+++ b/vector/src/main/res/drawable-hdpi/key_small.png
--- a/vector/src/main/res/drawable-hdpi/logo_transparent.png
+++ b/vector/src/main/res/drawable-hdpi/logo_transparent.png
--- a/vector/src/main/res/drawable-hdpi/riot_splash_0_blue.png
+++ b/vector/src/main/res/drawable-hdpi/riot_splash_0_blue.png
--- a/vector/src/main/res/drawable-hdpi/riot_splash_1_green.png
+++ b/vector/src/main/res/drawable-hdpi/riot_splash_1_green.png
--- a/vector/src/main/res/drawable-hdpi/riot_splash_2_pink.png
+++ b/vector/src/main/res/drawable-hdpi/riot_splash_2_pink.png
--- a/vector/src/main/res/drawable-hdpi/riot_splash_3_red.png
+++ b/vector/src/main/res/drawable-hdpi/riot_splash_3_red.png
--- a/vector/src/main/res/drawable-hdpi/sticker_placeholder.png
+++ b/vector/src/main/res/drawable-hdpi/sticker_placeholder.png
--- a/vector/src/main/res/drawable-mdpi/alert_triangle.png
+++ b/vector/src/main/res/drawable-mdpi/alert_triangle.png
--- a/vector/src/main/res/drawable-mdpi/backup_keys.png
+++ b/vector/src/main/res/drawable-mdpi/backup_keys.png
--- a/vector/src/main/res/drawable-mdpi/ic_eye_black.png
+++ b/vector/src/main/res/drawable-mdpi/ic_eye_black.png
--- a/vector/src/main/res/drawable-mdpi/ic_eye_closed_black.png
+++ b/vector/src/main/res/drawable-mdpi/ic_eye_closed_black.png
--- a/vector/src/main/res/drawable-mdpi/ic_home_black_24dp.png
+++ b/vector/src/main/res/drawable-mdpi/ic_home_black_24dp.png
--- a/vector/src/main/res/drawable-mdpi/ic_import_black.png
+++ b/vector/src/main/res/drawable-mdpi/ic_import_black.png
--- a/vector/src/main/res/drawable-mdpi/ic_material_play_circle.png
+++ b/vector/src/main/res/drawable-mdpi/ic_material_play_circle.png
--- a/vector/src/main/res/drawable-mdpi/ic_notification_privacy_warning.png
+++ b/vector/src/main/res/drawable-mdpi/ic_notification_privacy_warning.png
--- a/vector/src/main/res/drawable-mdpi/ic_person_black_24dp.png
+++ b/vector/src/main/res/drawable-mdpi/ic_person_black_24dp.png
--- a/vector/src/main/res/drawable-mdpi/ic_remove_circle_outline_red.png
+++ b/vector/src/main/res/drawable-mdpi/ic_remove_circle_outline_red.png
--- a/vector/src/main/res/drawable-mdpi/ic_settings.png
+++ b/vector/src/main/res/drawable-mdpi/ic_settings.png
--- a/vector/src/main/res/drawable-mdpi/ic_small_close.png
+++ b/vector/src/main/res/drawable-mdpi/ic_small_close.png
--- a/vector/src/main/res/drawable-mdpi/ic_star_black_24dp.png
+++ b/vector/src/main/res/drawable-mdpi/ic_star_black_24dp.png
--- a/vector/src/main/res/drawable-mdpi/icon_notif_important.png
+++ b/vector/src/main/res/drawable-mdpi/icon_notif_important.png
--- a/vector/src/main/res/drawable-mdpi/key_big.png
+++ b/vector/src/main/res/drawable-mdpi/key_big.png
--- a/vector/src/main/res/drawable-mdpi/key_small.png
+++ b/vector/src/main/res/drawable-mdpi/key_small.png
--- a/vector/src/main/res/drawable-mdpi/logo_transparent.png
+++ b/vector/src/main/res/drawable-mdpi/logo_transparent.png
--- a/vector/src/main/res/drawable-mdpi/riot_splash_0_blue.png
+++ b/vector/src/main/res/drawable-mdpi/riot_splash_0_blue.png
--- a/vector/src/main/res/drawable-mdpi/riot_splash_1_green.png
+++ b/vector/src/main/res/drawable-mdpi/riot_splash_1_green.png
--- a/vector/src/main/res/drawable-mdpi/riot_splash_2_pink.png
+++ b/vector/src/main/res/drawable-mdpi/riot_splash_2_pink.png
--- a/vector/src/main/res/drawable-mdpi/riot_splash_3_red.png
+++ b/vector/src/main/res/drawable-mdpi/riot_splash_3_red.png
--- a/vector/src/main/res/drawable-mdpi/sticker_placeholder.png
+++ b/vector/src/main/res/drawable-mdpi/sticker_placeholder.png
--- a/vector/src/main/res/drawable-mdpi/stickerpack_rabbit.png
+++ b/vector/src/main/res/drawable-mdpi/stickerpack_rabbit.png
--- a/vector/src/main/res/drawable-xhdpi/alert_triangle.png
+++ b/vector/src/main/res/drawable-xhdpi/alert_triangle.png
--- a/vector/src/main/res/drawable-xhdpi/backup_keys.png
+++ b/vector/src/main/res/drawable-xhdpi/backup_keys.png
--- a/vector/src/main/res/drawable-xhdpi/ic_eye_black.png
+++ b/vector/src/main/res/drawable-xhdpi/ic_eye_black.png
--- a/vector/src/main/res/drawable-xhdpi/ic_eye_closed_black.png
+++ b/vector/src/main/res/drawable-xhdpi/ic_eye_closed_black.png
--- a/vector/src/main/res/drawable-xhdpi/ic_home_black_24dp.png
+++ b/vector/src/main/res/drawable-xhdpi/ic_home_black_24dp.png
--- a/vector/src/main/res/drawable-xhdpi/ic_import_black.png
+++ b/vector/src/main/res/drawable-xhdpi/ic_import_black.png
--- a/vector/src/main/res/drawable-xhdpi/ic_material_play_circle.png
+++ b/vector/src/main/res/drawable-xhdpi/ic_material_play_circle.png
--- a/vector/src/main/res/drawable-xhdpi/ic_notification_privacy_warning.png
+++ b/vector/src/main/res/drawable-xhdpi/ic_notification_privacy_warning.png
--- a/vector/src/main/res/drawable-xhdpi/ic_person_black_24dp.png
+++ b/vector/src/main/res/drawable-xhdpi/ic_person_black_24dp.png
--- a/vector/src/main/res/drawable-xhdpi/ic_remove_circle_outline_red.png
+++ b/vector/src/main/res/drawable-xhdpi/ic_remove_circle_outline_red.png
--- a/vector/src/main/res/drawable-xhdpi/ic_send_sticker.png
+++ b/vector/src/main/res/drawable-xhdpi/ic_send_sticker.png
--- a/vector/src/main/res/drawable-xhdpi/ic_settings.png
+++ b/vector/src/main/res/drawable-xhdpi/ic_settings.png
--- a/vector/src/main/res/drawable-xhdpi/ic_small_close.png
+++ b/vector/src/main/res/drawable-xhdpi/ic_small_close.png
--- a/vector/src/main/res/drawable-xhdpi/ic_star_black_24dp.png
+++ b/vector/src/main/res/drawable-xhdpi/ic_star_black_24dp.png
--- a/vector/src/main/res/drawable-xhdpi/icon_notif_important.png
+++ b/vector/src/main/res/drawable-xhdpi/icon_notif_important.png
--- a/vector/src/main/res/drawable-xhdpi/key_big.png
+++ b/vector/src/main/res/drawable-xhdpi/key_big.png
--- a/vector/src/main/res/drawable-xhdpi/key_small.png
+++ b/vector/src/main/res/drawable-xhdpi/key_small.png
--- a/vector/src/main/res/drawable-xhdpi/logo_transparent.png
+++ b/vector/src/main/res/drawable-xhdpi/logo_transparent.png
--- a/vector/src/main/res/drawable-xhdpi/riot_splash_0_blue.png
+++ b/vector/src/main/res/drawable-xhdpi/riot_splash_0_blue.png
--- a/vector/src/main/res/drawable-xhdpi/riot_splash_1_green.png
+++ b/vector/src/main/res/drawable-xhdpi/riot_splash_1_green.png
--- a/vector/src/main/res/drawable-xhdpi/riot_splash_2_pink.png
+++ b/vector/src/main/res/drawable-xhdpi/riot_splash_2_pink.png
--- a/vector/src/main/res/drawable-xhdpi/riot_splash_3_red.png
+++ b/vector/src/main/res/drawable-xhdpi/riot_splash_3_red.png
--- a/vector/src/main/res/drawable-xhdpi/sticker_placeholder.png
+++ b/vector/src/main/res/drawable-xhdpi/sticker_placeholder.png
--- a/vector/src/main/res/drawable-xxhdpi/admin_icon.png
+++ b/vector/src/main/res/drawable-xxhdpi/admin_icon.png
--- a/vector/src/main/res/drawable-xxhdpi/alert_triangle.png
+++ b/vector/src/main/res/drawable-xxhdpi/alert_triangle.png
--- a/vector/src/main/res/drawable-xxhdpi/apps_icon.png
+++ b/vector/src/main/res/drawable-xxhdpi/apps_icon.png
--- a/vector/src/main/res/drawable-xxhdpi/backup_keys.png
+++ b/vector/src/main/res/drawable-xxhdpi/backup_keys.png
--- a/vector/src/main/res/drawable-xxhdpi/bubbles_bg_portrait.png
+++ b/vector/src/main/res/drawable-xxhdpi/bubbles_bg_portrait.png
--- a/vector/src/main/res/drawable-xxhdpi/camera_play.png
+++ b/vector/src/main/res/drawable-xxhdpi/camera_play.png
--- a/vector/src/main/res/drawable-xxhdpi/camera_stop.png
+++ b/vector/src/main/res/drawable-xxhdpi/camera_stop.png
--- a/vector/src/main/res/drawable-xxhdpi/camera_video_capture.png
+++ b/vector/src/main/res/drawable-xxhdpi/camera_video_capture.png
--- a/vector/src/main/res/drawable-xxhdpi/e2e_blocked.png
+++ b/vector/src/main/res/drawable-xxhdpi/e2e_blocked.png
--- a/vector/src/main/res/drawable-xxhdpi/e2e_unencrypted.png
+++ b/vector/src/main/res/drawable-xxhdpi/e2e_unencrypted.png
--- a/vector/src/main/res/drawable-xxhdpi/e2e_verified.png
+++ b/vector/src/main/res/drawable-xxhdpi/e2e_verified.png
--- a/vector/src/main/res/drawable-xxhdpi/e2e_warning.png
+++ b/vector/src/main/res/drawable-xxhdpi/e2e_warning.png
--- a/vector/src/main/res/drawable-xxhdpi/error.png
+++ b/vector/src/main/res/drawable-xxhdpi/error.png
--- a/vector/src/main/res/drawable-xxhdpi/file_upload_failed.png
+++ b/vector/src/main/res/drawable-xxhdpi/file_upload_failed.png
--- a/vector/src/main/res/drawable-xxhdpi/filetype_attachment.png
+++ b/vector/src/main/res/drawable-xxhdpi/filetype_attachment.png
--- a/vector/src/main/res/drawable-xxhdpi/filetype_audio.png
+++ b/vector/src/main/res/drawable-xxhdpi/filetype_audio.png
--- a/vector/src/main/res/drawable-xxhdpi/filetype_gif.png
+++ b/vector/src/main/res/drawable-xxhdpi/filetype_gif.png
--- a/vector/src/main/res/drawable-xxhdpi/filetype_image.png
+++ b/vector/src/main/res/drawable-xxhdpi/filetype_image.png
--- a/vector/src/main/res/drawable-xxhdpi/filetype_video.png
+++ b/vector/src/main/res/drawable-xxhdpi/filetype_video.png
--- a/vector/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white_24dp.png
+++ b/vector/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white_24dp.png
--- a/vector/src/main/res/drawable-xxhdpi/ic_add_white.png
+++ b/vector/src/main/res/drawable-xxhdpi/ic_add_white.png
--- a/vector/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_white.png
+++ b/vector/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_white.png
--- a/vector/src/main/res/drawable-xxhdpi/ic_arrow_drop_up_white.png
+++ b/vector/src/main/res/drawable-xxhdpi/ic_arrow_drop_up_white.png
--- a/vector/src/main/res/drawable-xxhdpi/ic_block_black.png
+++ b/vector/src/main/res/drawable-xxhdpi/ic_block_black.png
--- a/vector/src/main/res/drawable-xxhdpi/ic_comment_black.png
+++ b/vector/src/main/res/drawable-xxhdpi/ic_comment_black.png
--- a/vector/src/main/res/drawable-xxhdpi/ic_devices_info.png
+++ b/vector/src/main/res/drawable-xxhdpi/ic_devices_info.png
--- a/vector/src/main/res/drawable-xxhdpi/ic_exit_media_picker_vector_green.png
+++ b/vector/src/main/res/drawable-xxhdpi/ic_exit_media_picker_vector_green.png
--- a/vector/src/main/res/drawable-xxhdpi/ic_file_download_white.png
+++ b/vector/src/main/res/drawable-xxhdpi/ic_file_download_white.png
--- a/vector/src/main/res/drawable-xxhdpi/ic_guest_access_black.png
+++ b/vector/src/main/res/drawable-xxhdpi/ic_guest_access_black.png
--- a/vector/src/main/res/drawable-xxhdpi/ic_home_black_24dp.png
+++ b/vector/src/main/res/drawable-xxhdpi/ic_home_black_24dp.png
--- a/Show More
+++ b/Show More