mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-23 09:55:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Import resource from riot

Browse source
This commit is contained in:
Benoit Marty 2019-04-03 14:24:32 +02:00
parent c188bb290f
commit 73580493ea
271 changed files with 707 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
matrix-sdk-android/src/main/res/values-nl/strings.xml
View file

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

38
tools/import_strings.sh → tools/import_from_riot.sh
View file

@ -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!"

BIN
vector/src/main/res/drawable-hdpi/alert_triangle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
vector/src/main/res/drawable-hdpi/backup_keys.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
vector/src/main/res/drawable-hdpi/ic_eye_black.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
vector/src/main/res/drawable-hdpi/ic_eye_closed_black.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
vector/src/main/res/drawable-hdpi/ic_home_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 214 B

BIN
vector/src/main/res/drawable-hdpi/ic_import_black.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 724 B

BIN
vector/src/main/res/drawable-hdpi/ic_material_play_circle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
vector/src/main/res/drawable-hdpi/ic_notification_privacy_warning.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
vector/src/main/res/drawable-hdpi/ic_person_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 269 B

BIN
vector/src/main/res/drawable-hdpi/ic_remove_circle_outline_red.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 572 B

BIN
vector/src/main/res/drawable-hdpi/ic_settings.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 726 B

BIN
vector/src/main/res/drawable-hdpi/ic_small_close.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 363 B

BIN
vector/src/main/res/drawable-hdpi/ic_star_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 369 B

BIN
vector/src/main/res/drawable-hdpi/icon_notif_important.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1,022 B

BIN
vector/src/main/res/drawable-hdpi/key_big.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
vector/src/main/res/drawable-hdpi/key_small.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
vector/src/main/res/drawable-hdpi/logo_transparent.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 785 B

BIN
vector/src/main/res/drawable-hdpi/riot_splash_0_blue.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
vector/src/main/res/drawable-hdpi/riot_splash_1_green.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
vector/src/main/res/drawable-hdpi/riot_splash_2_pink.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
vector/src/main/res/drawable-hdpi/riot_splash_3_red.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
vector/src/main/res/drawable-hdpi/sticker_placeholder.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
vector/src/main/res/drawable-mdpi/alert_triangle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
vector/src/main/res/drawable-mdpi/backup_keys.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
vector/src/main/res/drawable-mdpi/ic_eye_black.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 773 B

BIN
vector/src/main/res/drawable-mdpi/ic_eye_closed_black.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 963 B

BIN
vector/src/main/res/drawable-mdpi/ic_home_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 177 B

BIN
vector/src/main/res/drawable-mdpi/ic_import_black.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 561 B

BIN
vector/src/main/res/drawable-mdpi/ic_material_play_circle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
vector/src/main/res/drawable-mdpi/ic_notification_privacy_warning.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 645 B

BIN
vector/src/main/res/drawable-mdpi/ic_person_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 189 B

BIN
vector/src/main/res/drawable-mdpi/ic_remove_circle_outline_red.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 377 B

BIN
vector/src/main/res/drawable-mdpi/ic_settings.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 538 B

BIN
vector/src/main/res/drawable-mdpi/ic_small_close.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 234 B

BIN
vector/src/main/res/drawable-mdpi/ic_star_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 263 B

BIN
vector/src/main/res/drawable-mdpi/icon_notif_important.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 596 B

BIN
vector/src/main/res/drawable-mdpi/key_big.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
vector/src/main/res/drawable-mdpi/key_small.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 916 B

BIN
vector/src/main/res/drawable-mdpi/logo_transparent.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 530 B

BIN
vector/src/main/res/drawable-mdpi/riot_splash_0_blue.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
vector/src/main/res/drawable-mdpi/riot_splash_1_green.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
vector/src/main/res/drawable-mdpi/riot_splash_2_pink.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
vector/src/main/res/drawable-mdpi/riot_splash_3_red.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
vector/src/main/res/drawable-mdpi/sticker_placeholder.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 868 B

BIN
vector/src/main/res/drawable-mdpi/stickerpack_rabbit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
vector/src/main/res/drawable-xhdpi/alert_triangle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4 KiB

BIN
vector/src/main/res/drawable-xhdpi/backup_keys.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
vector/src/main/res/drawable-xhdpi/ic_eye_black.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
vector/src/main/res/drawable-xhdpi/ic_eye_closed_black.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
vector/src/main/res/drawable-xhdpi/ic_home_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 239 B

BIN
vector/src/main/res/drawable-xhdpi/ic_import_black.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 964 B

BIN
vector/src/main/res/drawable-xhdpi/ic_material_play_circle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
vector/src/main/res/drawable-xhdpi/ic_notification_privacy_warning.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
vector/src/main/res/drawable-xhdpi/ic_person_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 307 B

BIN
vector/src/main/res/drawable-xhdpi/ic_remove_circle_outline_red.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 777 B

BIN
vector/src/main/res/drawable-xhdpi/ic_send_sticker.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
vector/src/main/res/drawable-xhdpi/ic_settings.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1,018 B

BIN
vector/src/main/res/drawable-xhdpi/ic_small_close.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 412 B

BIN
vector/src/main/res/drawable-xhdpi/ic_star_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 474 B

BIN
vector/src/main/res/drawable-xhdpi/icon_notif_important.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
vector/src/main/res/drawable-xhdpi/key_big.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
vector/src/main/res/drawable-xhdpi/key_small.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
vector/src/main/res/drawable-xhdpi/logo_transparent.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
vector/src/main/res/drawable-xhdpi/riot_splash_0_blue.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
vector/src/main/res/drawable-xhdpi/riot_splash_1_green.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
vector/src/main/res/drawable-xhdpi/riot_splash_2_pink.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
vector/src/main/res/drawable-xhdpi/riot_splash_3_red.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
vector/src/main/res/drawable-xhdpi/sticker_placeholder.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
vector/src/main/res/drawable-xxhdpi/admin_icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
vector/src/main/res/drawable-xxhdpi/alert_triangle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
vector/src/main/res/drawable-xxhdpi/apps_icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
vector/src/main/res/drawable-xxhdpi/backup_keys.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
vector/src/main/res/drawable-xxhdpi/bubbles_bg_portrait.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 48 KiB

BIN
vector/src/main/res/drawable-xxhdpi/camera_play.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
vector/src/main/res/drawable-xxhdpi/camera_stop.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

BIN
vector/src/main/res/drawable-xxhdpi/camera_video_capture.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
vector/src/main/res/drawable-xxhdpi/e2e_blocked.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
vector/src/main/res/drawable-xxhdpi/e2e_unencrypted.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 612 B

BIN
vector/src/main/res/drawable-xxhdpi/e2e_verified.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 926 B

BIN
vector/src/main/res/drawable-xxhdpi/e2e_warning.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
vector/src/main/res/drawable-xxhdpi/error.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
vector/src/main/res/drawable-xxhdpi/file_upload_failed.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 301 B

BIN
vector/src/main/res/drawable-xxhdpi/filetype_attachment.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
vector/src/main/res/drawable-xxhdpi/filetype_audio.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
vector/src/main/res/drawable-xxhdpi/filetype_gif.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 786 B

BIN
vector/src/main/res/drawable-xxhdpi/filetype_image.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
vector/src/main/res/drawable-xxhdpi/filetype_video.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
vector/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
vector/src/main/res/drawable-xxhdpi/ic_add_white.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 156 B

BIN
vector/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_white.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 185 B

BIN
vector/src/main/res/drawable-xxhdpi/ic_arrow_drop_up_white.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 182 B

BIN
vector/src/main/res/drawable-xxhdpi/ic_block_black.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 967 B

BIN
vector/src/main/res/drawable-xxhdpi/ic_comment_black.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 262 B

BIN
vector/src/main/res/drawable-xxhdpi/ic_devices_info.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 240 B

BIN
vector/src/main/res/drawable-xxhdpi/ic_exit_media_picker_vector_green.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 860 B

BIN
vector/src/main/res/drawable-xxhdpi/ic_file_download_white.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 197 B

BIN
vector/src/main/res/drawable-xxhdpi/ic_guest_access_black.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 214 B

BIN
vector/src/main/res/drawable-xxhdpi/ic_home_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 303 B

Some files were not shown because too many files have changed in this diff Show more