diff options
| author | Christian Schneppe <kriztan@users.noreply.github.com> | 2018-09-27 18:42:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-27 18:42:25 +0200 |
| commit | 4f4a52f068f3b3956aca5934531a48d1f90d7974 (patch) | |
| tree | da24e0f840730a75f2b3dab69a3b5f12025391be /src/main/res | |
| parent | 1816092e68584b5794303578b6af6d621ffc58d4 (diff) | |
| parent | f4ac1f68feac3e3b19ab5932ede9d79dd14bff27 (diff) | |
Merge branch 'master' into bubble-into-avatar
Diffstat (limited to 'src/main/res')
138 files changed, 302 insertions, 46 deletions
diff --git a/src/main/res/drawable-hdpi/ic_android_black_48dp.png b/src/main/res/drawable-hdpi/ic_android_black_48dp.png Binary files differnew file mode 100644 index 000000000..38f6c05e8 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_android_black_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_android_white_48dp.png b/src/main/res/drawable-hdpi/ic_android_white_48dp.png Binary files differnew file mode 100644 index 000000000..13108b25b --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_android_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_archive_black_48dp.png b/src/main/res/drawable-hdpi/ic_archive_black_48dp.png Binary files differnew file mode 100644 index 000000000..1faf474cd --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_archive_black_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_archive_white_48dp.png b/src/main/res/drawable-hdpi/ic_archive_white_48dp.png Binary files differnew file mode 100644 index 000000000..462016ade --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_archive_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_attach_videocam.png b/src/main/res/drawable-hdpi/ic_attach_videocam.png Binary files differnew file mode 100644 index 000000000..f95861633 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_videocam.png diff --git a/src/main/res/drawable-hdpi/ic_contact_white_24dp.png b/src/main/res/drawable-hdpi/ic_contact_white_24dp.png Binary files differnew file mode 100644 index 000000000..7c046b21c --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_contact_white_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_description_black_48dp.png b/src/main/res/drawable-hdpi/ic_description_black_48dp.png Binary files differnew file mode 100644 index 000000000..193ac1011 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_description_black_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_description_white_48dp.png b/src/main/res/drawable-hdpi/ic_description_white_48dp.png Binary files differnew file mode 100644 index 000000000..bfb5baa97 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_description_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_event_black_48dp.png b/src/main/res/drawable-hdpi/ic_event_black_48dp.png Binary files differnew file mode 100644 index 000000000..5cd32f4c2 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_event_black_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_event_white_48dp.png b/src/main/res/drawable-hdpi/ic_event_white_48dp.png Binary files differnew file mode 100644 index 000000000..653d15b2b --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_event_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_headset_black_48dp.png b/src/main/res/drawable-hdpi/ic_headset_black_48dp.png Binary files differnew file mode 100644 index 000000000..8a97fe7ec --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_headset_black_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_headset_white_48dp.png b/src/main/res/drawable-hdpi/ic_headset_white_48dp.png Binary files differnew file mode 100644 index 000000000..a4810f277 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_headset_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_help_black_48dp.png b/src/main/res/drawable-hdpi/ic_help_black_48dp.png Binary files differnew file mode 100644 index 000000000..b2ea7914a --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_help_black_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_help_white_48dp.png b/src/main/res/drawable-hdpi/ic_help_white_48dp.png Binary files differnew file mode 100644 index 000000000..6827c3fac --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_help_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_mic_black_48dp.png b/src/main/res/drawable-hdpi/ic_mic_black_48dp.png Binary files differnew file mode 100644 index 000000000..4ed4168cd --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_mic_black_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_mic_white_48dp.png b/src/main/res/drawable-hdpi/ic_mic_white_48dp.png Binary files differnew file mode 100644 index 000000000..2d729e773 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_mic_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_person_black_48dp.png b/src/main/res/drawable-hdpi/ic_person_black_48dp.png Binary files differnew file mode 100644 index 000000000..7401e00b5 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_person_black_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_person_white_48dp.png b/src/main/res/drawable-hdpi/ic_person_white_48dp.png Binary files differnew file mode 100644 index 000000000..667c220dd --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_person_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_room_black_48dp.png b/src/main/res/drawable-hdpi/ic_room_black_48dp.png Binary files differnew file mode 100644 index 000000000..2ebc54430 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_room_black_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_room_white_48dp.png b/src/main/res/drawable-hdpi/ic_room_white_48dp.png Binary files differnew file mode 100644 index 000000000..29d2981b2 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_room_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_send_videocam_away.png b/src/main/res/drawable-hdpi/ic_send_videocam_away.png Binary files differnew file mode 100644 index 000000000..950db9d9e --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_videocam_away.png diff --git a/src/main/res/drawable-hdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-hdpi/ic_send_videocam_dnd.png Binary files differnew file mode 100644 index 000000000..8a3588678 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_videocam_dnd.png diff --git a/src/main/res/drawable-hdpi/ic_send_videocam_online.png b/src/main/res/drawable-hdpi/ic_send_videocam_online.png Binary files differnew file mode 100644 index 000000000..ac5af607f --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_videocam_online.png diff --git a/src/main/res/drawable-mdpi/ic_android_black_48dp.png b/src/main/res/drawable-mdpi/ic_android_black_48dp.png Binary files differnew file mode 100644 index 000000000..4f25964be --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_android_black_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_android_white_48dp.png b/src/main/res/drawable-mdpi/ic_android_white_48dp.png Binary files differnew file mode 100644 index 000000000..032fe2781 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_android_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_archive_black_48dp.png b/src/main/res/drawable-mdpi/ic_archive_black_48dp.png Binary files differnew file mode 100644 index 000000000..e9d5ed1b4 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_archive_black_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_archive_white_48dp.png b/src/main/res/drawable-mdpi/ic_archive_white_48dp.png Binary files differnew file mode 100644 index 000000000..82be16407 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_archive_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_attach_videocam.png b/src/main/res/drawable-mdpi/ic_attach_videocam.png Binary files differnew file mode 100644 index 000000000..66aa2fe49 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_attach_videocam.png diff --git a/src/main/res/drawable-mdpi/ic_contact_white_24dp.png b/src/main/res/drawable-mdpi/ic_contact_white_24dp.png Binary files differnew file mode 100644 index 000000000..c61747dc2 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_contact_white_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_description_black_48dp.png b/src/main/res/drawable-mdpi/ic_description_black_48dp.png Binary files differnew file mode 100644 index 000000000..7bc6a6846 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_description_black_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_description_white_48dp.png b/src/main/res/drawable-mdpi/ic_description_white_48dp.png Binary files differnew file mode 100644 index 000000000..9759bde29 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_description_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_event_black_48dp.png b/src/main/res/drawable-mdpi/ic_event_black_48dp.png Binary files differnew file mode 100644 index 000000000..8266743b4 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_event_black_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_event_white_48dp.png b/src/main/res/drawable-mdpi/ic_event_white_48dp.png Binary files differnew file mode 100644 index 000000000..2fb9a7a2c --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_event_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_headset_black_48dp.png b/src/main/res/drawable-mdpi/ic_headset_black_48dp.png Binary files differnew file mode 100644 index 000000000..36b513948 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_headset_black_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_headset_white_48dp.png b/src/main/res/drawable-mdpi/ic_headset_white_48dp.png Binary files differnew file mode 100644 index 000000000..798e229c7 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_headset_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_help_black_48dp.png b/src/main/res/drawable-mdpi/ic_help_black_48dp.png Binary files differnew file mode 100644 index 000000000..3678f6f23 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_help_black_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_help_white_48dp.png b/src/main/res/drawable-mdpi/ic_help_white_48dp.png Binary files differnew file mode 100644 index 000000000..68e4b1563 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_help_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_mic_black_48dp.png b/src/main/res/drawable-mdpi/ic_mic_black_48dp.png Binary files differnew file mode 100644 index 000000000..9c7caa295 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_mic_black_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_mic_white_48dp.png b/src/main/res/drawable-mdpi/ic_mic_white_48dp.png Binary files differnew file mode 100644 index 000000000..80d851e95 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_mic_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_person_black_48dp.png b/src/main/res/drawable-mdpi/ic_person_black_48dp.png Binary files differnew file mode 100644 index 000000000..76858f701 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_person_black_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_person_white_48dp.png b/src/main/res/drawable-mdpi/ic_person_white_48dp.png Binary files differnew file mode 100644 index 000000000..496699985 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_person_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_room_black_48dp.png b/src/main/res/drawable-mdpi/ic_room_black_48dp.png Binary files differnew file mode 100644 index 000000000..e60454537 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_room_black_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_room_white_48dp.png b/src/main/res/drawable-mdpi/ic_room_white_48dp.png Binary files differnew file mode 100644 index 000000000..8c51d01ad --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_room_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_send_videocam_away.png b/src/main/res/drawable-mdpi/ic_send_videocam_away.png Binary files differnew file mode 100644 index 000000000..55399ac8d --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_send_videocam_away.png diff --git a/src/main/res/drawable-mdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-mdpi/ic_send_videocam_dnd.png Binary files differnew file mode 100644 index 000000000..608947d59 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_send_videocam_dnd.png diff --git a/src/main/res/drawable-mdpi/ic_send_videocam_online.png b/src/main/res/drawable-mdpi/ic_send_videocam_online.png Binary files differnew file mode 100644 index 000000000..90a152504 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_send_videocam_online.png diff --git a/src/main/res/drawable-xhdpi/ic_android_black_48dp.png b/src/main/res/drawable-xhdpi/ic_android_black_48dp.png Binary files differnew file mode 100644 index 000000000..9f85a42bf --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_android_black_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_android_white_48dp.png b/src/main/res/drawable-xhdpi/ic_android_white_48dp.png Binary files differnew file mode 100644 index 000000000..913ebd69f --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_android_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_archive_black_48dp.png b/src/main/res/drawable-xhdpi/ic_archive_black_48dp.png Binary files differnew file mode 100644 index 000000000..6c383ee81 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_archive_black_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_archive_white_48dp.png b/src/main/res/drawable-xhdpi/ic_archive_white_48dp.png Binary files differnew file mode 100644 index 000000000..dbbf9f870 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_archive_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_attach_videocam.png b/src/main/res/drawable-xhdpi/ic_attach_videocam.png Binary files differnew file mode 100644 index 000000000..5f6054b81 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_attach_videocam.png diff --git a/src/main/res/drawable-xhdpi/ic_contact_white_24dp.png b/src/main/res/drawable-xhdpi/ic_contact_white_24dp.png Binary files differnew file mode 100644 index 000000000..eedda1b40 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_contact_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_description_black_48dp.png b/src/main/res/drawable-xhdpi/ic_description_black_48dp.png Binary files differnew file mode 100644 index 000000000..0da5f7798 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_description_black_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_description_white_48dp.png b/src/main/res/drawable-xhdpi/ic_description_white_48dp.png Binary files differnew file mode 100644 index 000000000..e1b8e9aec --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_description_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_event_black_48dp.png b/src/main/res/drawable-xhdpi/ic_event_black_48dp.png Binary files differnew file mode 100644 index 000000000..8e43444b7 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_event_black_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_event_white_48dp.png b/src/main/res/drawable-xhdpi/ic_event_white_48dp.png Binary files differnew file mode 100644 index 000000000..be533de42 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_event_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_headset_black_48dp.png b/src/main/res/drawable-xhdpi/ic_headset_black_48dp.png Binary files differnew file mode 100644 index 000000000..7f85eb8bb --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_headset_black_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_headset_white_48dp.png b/src/main/res/drawable-xhdpi/ic_headset_white_48dp.png Binary files differnew file mode 100644 index 000000000..b815a1944 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_headset_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_help_black_48dp.png b/src/main/res/drawable-xhdpi/ic_help_black_48dp.png Binary files differnew file mode 100644 index 000000000..066c88bbe --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_help_black_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_help_white_48dp.png b/src/main/res/drawable-xhdpi/ic_help_white_48dp.png Binary files differnew file mode 100644 index 000000000..805ea1efb --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_help_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_mic_black_48dp.png b/src/main/res/drawable-xhdpi/ic_mic_black_48dp.png Binary files differnew file mode 100644 index 000000000..e39b8170c --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_mic_black_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_mic_white_48dp.png b/src/main/res/drawable-xhdpi/ic_mic_white_48dp.png Binary files differnew file mode 100644 index 000000000..ec4405d44 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_mic_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_person_black_48dp.png b/src/main/res/drawable-xhdpi/ic_person_black_48dp.png Binary files differnew file mode 100644 index 000000000..2751da525 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_person_black_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_person_white_48dp.png b/src/main/res/drawable-xhdpi/ic_person_white_48dp.png Binary files differnew file mode 100644 index 000000000..6a77a6a38 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_person_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_room_black_48dp.png b/src/main/res/drawable-xhdpi/ic_room_black_48dp.png Binary files differnew file mode 100644 index 000000000..9d46eb841 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_room_black_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_room_white_48dp.png b/src/main/res/drawable-xhdpi/ic_room_white_48dp.png Binary files differnew file mode 100644 index 000000000..b7a61a2f5 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_room_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_send_videocam_away.png b/src/main/res/drawable-xhdpi/ic_send_videocam_away.png Binary files differnew file mode 100644 index 000000000..69e340800 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_send_videocam_away.png diff --git a/src/main/res/drawable-xhdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-xhdpi/ic_send_videocam_dnd.png Binary files differnew file mode 100644 index 000000000..e7f784d8b --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_send_videocam_dnd.png diff --git a/src/main/res/drawable-xhdpi/ic_send_videocam_online.png b/src/main/res/drawable-xhdpi/ic_send_videocam_online.png Binary files differnew file mode 100644 index 000000000..7cda9e6f0 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_send_videocam_online.png diff --git a/src/main/res/drawable-xxhdpi/ic_android_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_android_black_48dp.png Binary files differnew file mode 100644 index 000000000..61b806d38 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_android_black_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_android_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_android_white_48dp.png Binary files differnew file mode 100644 index 000000000..c3bf2bdc3 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_android_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_archive_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_archive_black_48dp.png Binary files differnew file mode 100644 index 000000000..0155c8104 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_archive_black_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_archive_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_archive_white_48dp.png Binary files differnew file mode 100644 index 000000000..5a18abe12 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_archive_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_attach_videocam.png b/src/main/res/drawable-xxhdpi/ic_attach_videocam.png Binary files differnew file mode 100644 index 000000000..e74d2a776 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_videocam.png diff --git a/src/main/res/drawable-xxhdpi/ic_contact_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_contact_white_24dp.png Binary files differnew file mode 100644 index 000000000..91e0d9a6b --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_contact_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_description_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_description_black_48dp.png Binary files differnew file mode 100644 index 000000000..9ddffa1f3 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_description_black_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_description_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_description_white_48dp.png Binary files differnew file mode 100644 index 000000000..b42cec8eb --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_description_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_event_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_event_black_48dp.png Binary files differnew file mode 100644 index 000000000..3eb5d3073 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_event_black_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_event_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_event_white_48dp.png Binary files differnew file mode 100644 index 000000000..44ead726f --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_event_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_headset_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_headset_black_48dp.png Binary files differnew file mode 100644 index 000000000..2a8236f35 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_headset_black_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_headset_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_headset_white_48dp.png Binary files differnew file mode 100644 index 000000000..2b6b2644f --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_headset_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_help_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_help_black_48dp.png Binary files differnew file mode 100644 index 000000000..2f8af6e41 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_help_black_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_help_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_help_white_48dp.png Binary files differnew file mode 100644 index 000000000..1a3e87205 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_help_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_mic_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_mic_black_48dp.png Binary files differnew file mode 100644 index 000000000..44ef2fb4a --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_mic_black_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png Binary files differnew file mode 100644 index 000000000..0fc42bfad --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_person_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_person_black_48dp.png Binary files differnew file mode 100644 index 000000000..0001aee6b --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_person_black_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_person_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_person_white_48dp.png Binary files differnew file mode 100644 index 000000000..32fe521d0 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_person_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_room_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_room_black_48dp.png Binary files differnew file mode 100644 index 000000000..e83824a17 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_room_black_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_room_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_room_white_48dp.png Binary files differnew file mode 100644 index 000000000..dd8eb11d3 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_room_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_send_videocam_away.png b/src/main/res/drawable-xxhdpi/ic_send_videocam_away.png Binary files differnew file mode 100644 index 000000000..ce04c7790 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_send_videocam_away.png diff --git a/src/main/res/drawable-xxhdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_videocam_dnd.png Binary files differnew file mode 100644 index 000000000..24890da09 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_send_videocam_dnd.png diff --git a/src/main/res/drawable-xxhdpi/ic_send_videocam_online.png b/src/main/res/drawable-xxhdpi/ic_send_videocam_online.png Binary files differnew file mode 100644 index 000000000..079cdef19 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_send_videocam_online.png diff --git a/src/main/res/drawable-xxxhdpi/ic_android_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_android_black_48dp.png Binary files differnew file mode 100644 index 000000000..1d1492b08 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_android_black_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_android_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_android_white_48dp.png Binary files differnew file mode 100644 index 000000000..d040e8639 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_android_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_archive_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_archive_black_48dp.png Binary files differnew file mode 100644 index 000000000..4dd5e44ab --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_archive_black_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_archive_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_archive_white_48dp.png Binary files differnew file mode 100644 index 000000000..5ac82a8df --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_archive_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_videocam.png b/src/main/res/drawable-xxxhdpi/ic_attach_videocam.png Binary files differnew file mode 100644 index 000000000..02fddb640 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_videocam.png diff --git a/src/main/res/drawable-xxxhdpi/ic_contact_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_contact_white_24dp.png Binary files differnew file mode 100644 index 000000000..f36920906 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_contact_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_description_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_description_black_48dp.png Binary files differnew file mode 100644 index 000000000..f405b2931 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_description_black_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_description_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_description_white_48dp.png Binary files differnew file mode 100644 index 000000000..1d32d8841 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_description_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_event_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_event_black_48dp.png Binary files differnew file mode 100644 index 000000000..038df57d5 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_event_black_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_event_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_event_white_48dp.png Binary files differnew file mode 100644 index 000000000..1937048aa --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_event_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_headset_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_headset_black_48dp.png Binary files differnew file mode 100644 index 000000000..9a9a1b7f6 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_headset_black_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_headset_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_headset_white_48dp.png Binary files differnew file mode 100644 index 000000000..ba48f28a1 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_headset_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_help_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_help_black_48dp.png Binary files differnew file mode 100644 index 000000000..45e2e7b21 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_help_black_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_help_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_help_white_48dp.png Binary files differnew file mode 100644 index 000000000..dc996ae81 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_help_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_mic_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_mic_black_48dp.png Binary files differnew file mode 100644 index 000000000..f2247b7ff --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_mic_black_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png Binary files differnew file mode 100644 index 000000000..e9079bb3b --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_person_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_person_black_48dp.png Binary files differnew file mode 100644 index 000000000..6d377123a --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_person_black_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_person_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_person_white_48dp.png Binary files differnew file mode 100644 index 000000000..5bb65aed1 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_person_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_room_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_room_black_48dp.png Binary files differnew file mode 100644 index 000000000..51d418cf7 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_room_black_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_room_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_room_white_48dp.png Binary files differnew file mode 100644 index 000000000..0f7de3f5d --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_room_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_send_videocam_away.png b/src/main/res/drawable-xxxhdpi/ic_send_videocam_away.png Binary files differnew file mode 100644 index 000000000..7e517e6be --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_send_videocam_away.png diff --git a/src/main/res/drawable-xxxhdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_videocam_dnd.png Binary files differnew file mode 100644 index 000000000..3077ee233 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_send_videocam_dnd.png diff --git a/src/main/res/drawable-xxxhdpi/ic_send_videocam_online.png b/src/main/res/drawable-xxxhdpi/ic_send_videocam_online.png Binary files differnew file mode 100644 index 000000000..0baef17f4 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_send_videocam_online.png diff --git a/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml index f720864a3..26f1c7494 100644 --- a/src/main/res/layout/activity_choose_contact.xml +++ b/src/main/res/layout/activity_choose_contact.xml @@ -13,7 +13,7 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/color_background_primary"> + android:background="?attr/color_background_secondary"> <ListView android:id="@+id/choose_contact_list" diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index dd3ff2c31..a6a720995 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<layout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> +<layout xmlns:android="http://schemas.android.com/apk/res/android"> <LinearLayout android:layout_width="match_parent" @@ -102,8 +101,7 @@ android:layout_marginBottom="4dp" android:layout_marginLeft="-2dp" android:layout_marginTop="4dp" - android:orientation="horizontal"> - </com.wefika.flowlayout.FlowLayout> + android:orientation="horizontal"></com.wefika.flowlayout.FlowLayout> <TextView android:id="@+id/details_lastseen" @@ -235,6 +233,52 @@ </android.support.v7.widget.CardView> <android.support.v7.widget.CardView + android:id="@+id/media_wrapper" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <android.support.v7.widget.RecyclerView + android:id="@+id/media" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginEnd="-2dp" + android:layout_marginStart="-2dp" + android:orientation="horizontal" + android:paddingBottom="@dimen/card_padding_list" + android:paddingEnd="@dimen/card_padding_regular" + android:paddingStart="@dimen/card_padding_regular" + android:paddingTop="@dimen/card_padding_regular" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="end" + android:orientation="horizontal"> + + <Button + android:id="@+id/show_media" + style="@style/Widget.Conversations.Button.Borderless" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minWidth="0dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:text="@string/view_media" + android:textColor="?attr/colorAccent" /> + </LinearLayout> + </LinearLayout> + </android.support.v7.widget.CardView> + + <android.support.v7.widget.CardView android:id="@+id/keys_wrapper" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -254,7 +298,7 @@ android:layout_height="wrap_content" android:divider="?android:dividerHorizontal" android:orientation="vertical" - android:padding="@dimen/card_padding_list"></LinearLayout> + android:padding="@dimen/card_padding_list" /> <LinearLayout android:layout_width="wrap_content" diff --git a/src/main/res/layout/activity_manage_accounts.xml b/src/main/res/layout/activity_manage_accounts.xml index e80aa01e0..2dc266bf3 100644 --- a/src/main/res/layout/activity_manage_accounts.xml +++ b/src/main/res/layout/activity_manage_accounts.xml @@ -2,7 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="?attr/color_background_primary" + android:background="?attr/color_background_secondary" android:orientation="vertical"> <include layout="@layout/toolbar" /> diff --git a/src/main/res/layout/activity_media_browser.xml b/src/main/res/layout/activity_media_browser.xml new file mode 100644 index 000000000..149f2c164 --- /dev/null +++ b/src/main/res/layout/activity_media_browser.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/color_background_primary" + android:orientation="vertical"> + + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> + + <android.support.v7.widget.RecyclerView + android:id="@+id/media" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipToPadding="false" + android:orientation="horizontal" + android:padding="2dp" + android:scrollbars="vertical" /> + + </LinearLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 2958e3efe..b46ad8032 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -276,6 +276,52 @@ </android.support.v7.widget.CardView> <android.support.v7.widget.CardView + android:id="@+id/media_wrapper" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <android.support.v7.widget.RecyclerView + android:id="@+id/media" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginEnd="-2dp" + android:layout_marginStart="-2dp" + android:orientation="horizontal" + android:paddingBottom="@dimen/card_padding_list" + android:paddingEnd="@dimen/card_padding_regular" + android:paddingStart="@dimen/card_padding_regular" + android:paddingTop="@dimen/card_padding_regular" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="end" + android:orientation="horizontal"> + + <Button + android:id="@+id/show_media" + style="@style/Widget.Conversations.Button.Borderless" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minWidth="0dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:text="@string/view_media" + android:textColor="?attr/colorAccent" /> + </LinearLayout> + </LinearLayout> + </android.support.v7.widget.CardView> + + <android.support.v7.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/activity_vertical_margin" diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml index 1cb95b456..7adb8714a 100644 --- a/src/main/res/layout/activity_start_conversation.xml +++ b/src/main/res/layout/activity_start_conversation.xml @@ -29,7 +29,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@id/tab_layout" - android:background="?attr/color_background_primary" /> + android:background="?attr/color_background_secondary" /> <android.support.design.widget.FloatingActionButton android:id="@+id/fab" diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 5fce5c1f2..cbd884ae2 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -8,12 +8,12 @@ android:id="@+id/frame" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:background="?attr/color_background_primary"> + android:background="?attr/color_background_secondary"> <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:background="?attr/color_background_secondary" + android:background="?android:selectableItemBackground" android:orientation="horizontal" android:padding="8dp"> diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index d081b6543..16f48bde2 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -5,7 +5,7 @@ <RelativeLayout xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/color_background_secondary" + android:background="?attr/color_background_tertiary" android:clickable="false"> <ListView @@ -14,8 +14,9 @@ android:layout_height="match_parent" android:layout_above="@+id/snackbar" android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_alignParentTop="true" - android:background="?attr/color_background_secondary" + android:background="?attr/color_background_tertiary" android:divider="@null" android:dividerHeight="0dp" android:listSelector="@android:color/transparent" @@ -53,7 +54,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true"> + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true"> <RelativeLayout android:id="@+id/textsend" @@ -61,7 +63,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:background="?attr/color_background_secondary" + android:background="?attr/color_background_tertiary" android:clickable="true" android:paddingBottom="2dp" android:paddingLeft="2dp" @@ -73,18 +75,34 @@ android:layout_height="48dp" android:layout_alignParentLeft="true" android:layout_centerVertical="true" - android:background="?attr/color_background_secondary" + android:background="?attr/color_background_tertiary" android:contentDescription="@string/attach_record_voice" android:src="@drawable/ic_send_voice_offline" android:visibility="gone" /> + <android.support.v7.widget.RecyclerView + android:id="@+id/media_preview" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:layout_toStartOf="@+id/textSendButton" + android:background="@drawable/message_bubble_sent_blue" + android:orientation="horizontal" + android:paddingTop="8dp" + android:requiresFadingEdge="horizontal" + android:visibility="gone" + app:layoutManager="android.support.v7.widget.LinearLayoutManager" + tools:listitem="@layout/media_preview"></android.support.v7.widget.RecyclerView> + <de.pixart.messenger.ui.widget.EditMessage android:id="@+id/textinput" style="@style/Widget.Conversations.EditText" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_toEndOf="@+id/recordVoiceButton" android:layout_toLeftOf="@+id/textSendButton" android:layout_toRightOf="@+id/recordVoiceButton" + android:layout_toStartOf="@+id/textSendButton" android:background="@drawable/message_bubble_sent_blue" android:ems="10" android:imeOptions="flagNoExtractUi|actionSend" @@ -105,9 +123,10 @@ android:id="@+id/textSendButton" android:layout_width="48dp" android:layout_height="48dp" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:background="?attr/color_background_secondary" + android:background="?attr/color_background_tertiary" android:contentDescription="@string/send_message" android:src="@drawable/ic_send_text_offline" /> </RelativeLayout> @@ -130,15 +149,19 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_centerVertical="true" android:layout_toLeftOf="@+id/snackbar_action" + android:layout_toStartOf="@+id/snackbar_action" android:paddingLeft="24dp" + android:paddingStart="24dp" android:textAppearance="@style/TextAppearance.Conversations.Body1.OnDark" /> <TextView android:id="@+id/snackbar_action" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:paddingBottom="16dp" @@ -166,8 +189,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_centerVertical="true" android:paddingLeft="24dp" + android:paddingStart="24dp" android:textColor="@color/realblack" android:textSize="?attr/TextSizeBody" /> </RelativeLayout> diff --git a/src/main/res/layout/media.xml b/src/main/res/layout/media.xml new file mode 100644 index 000000000..f95ddeda3 --- /dev/null +++ b/src/main/res/layout/media.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android"> + + <de.pixart.messenger.ui.widget.SquareFrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="2dp"> + + <ImageView + android:id="@+id/media" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/black54" + android:scaleType="centerInside" /> + </de.pixart.messenger.ui.widget.SquareFrameLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/layout/media_preview.xml b/src/main/res/layout/media_preview.xml new file mode 100644 index 000000000..8849e7b4a --- /dev/null +++ b/src/main/res/layout/media_preview.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android"> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <ImageView + android:id="@+id/media_preview" + android:layout_width="@dimen/media_preview_size" + android:layout_height="@dimen/media_preview_size" + android:layout_centerInParent="true" + android:layout_margin="12dp" + android:background="@color/black54" + android:scaleType="center" /> + + <ImageButton + android:id="@+id/delete_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:alpha="?attr/delete_icon_alpha" + android:background="?attr/selectableItemBackgroundBorderless" + android:src="?attr/icon_cancel" /> + </RelativeLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/menu/choose_attachment.xml b/src/main/res/menu/choose_attachment.xml index ae6f47a95..a9a57404d 100644 --- a/src/main/res/menu/choose_attachment.xml +++ b/src/main/res/menu/choose_attachment.xml @@ -14,7 +14,12 @@ <item android:id="@+id/attach_take_picture" android:icon="?attr/ic_attach_camera" - android:title="@string/attach_take_from_camera" /> + android:title="@string/action_take_photo" /> + + <item + android:id="@+id/attach_record_video" + android:icon="?attr/ic_attach_videocam" + android:title="@string/action_take_video" /> <item android:id="@+id/attach_record_voice" android:icon="?attr/ic_attach_record" diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml index d67bf5253..088501bcb 100644 --- a/src/main/res/menu/fragment_conversation.xml +++ b/src/main/res/menu/fragment_conversation.xml @@ -5,8 +5,8 @@ android:id="@+id/action_security" android:icon="?attr/icon_not_secure" android:orderInCategory="20" - app:showAsAction="always" - android:title="@string/action_secure" > + android:title="@string/action_secure" + app:showAsAction="always"> <menu> <group android:checkableBehavior="single"> <item @@ -28,8 +28,8 @@ android:id="@+id/action_attach_file" android:icon="?attr/icon_new_attachment" android:orderInCategory="30" - app:showAsAction="always" - android:title="@string/attach_file" > + android:title="@string/attach_file" + app:showAsAction="always"> <menu> <item @@ -45,7 +45,13 @@ <item android:id="@+id/attach_take_picture" android:icon="?attr/ic_attach_camera" - android:title="@string/attach_take_from_camera" /> + android:title="@string/action_take_photo" /> + + <item + android:id="@+id/attach_record_video" + android:icon="?attr/ic_attach_videocam" + android:title="@string/action_take_video" /> + <item android:id="@+id/attach_record_voice" android:icon="?attr/ic_attach_record" @@ -60,21 +66,33 @@ <item android:id="@+id/action_invite" android:orderInCategory="45" - app:showAsAction="never" - android:title="@string/invite_contact" /> + android:title="@string/invite_contact" + app:showAsAction="never" /> <item android:id="@+id/action_clear_history" android:orderInCategory="50" - app:showAsAction="never" - android:title="@string/action_clear_history" /> + android:title="@string/action_clear_history" + app:showAsAction="never" /> <item android:id="@+id/action_archive_chat" android:orderInCategory="60" - app:showAsAction="never" - android:title="@string/action_end_conversation" /> + android:title="@string/action_end_conversation" + app:showAsAction="never" /> <item android:id="@+id/action_create_issue" android:orderInCategory="100" - app:showAsAction="never" - android:title="@string/create_issue" /> + android:title="@string/create_issue" + app:showAsAction="never" /> + <item + android:id="@+id/action_group_details" + android:icon="@drawable/ic_group_white_24dp" + android:orderInCategory="100" + android:title="@string/action_group_details" + app:showAsAction="always" /> + <item + android:id="@+id/action_contact_details" + android:icon="@drawable/ic_contact_white_24dp" + android:orderInCategory="100" + android:title="@string/action_contact_details" + app:showAsAction="always" /> </menu>
\ No newline at end of file diff --git a/src/main/res/values-h360dp/dimens.xml b/src/main/res/values-h360dp/dimens.xml new file mode 100644 index 000000000..5e432c034 --- /dev/null +++ b/src/main/res/values-h360dp/dimens.xml @@ -0,0 +1,4 @@ +<resources> + <dimen name="publish_avatar_top_margin">16dp</dimen> + <dimen name="publish_avatar_size">128dp</dimen> +</resources>
\ No newline at end of file diff --git a/src/main/res/values-h500dp/dimens.xml b/src/main/res/values-h500dp/dimens.xml new file mode 100644 index 000000000..deea1124f --- /dev/null +++ b/src/main/res/values-h500dp/dimens.xml @@ -0,0 +1,4 @@ +<resources> + <dimen name="publish_avatar_top_margin">24dp</dimen> + <dimen name="publish_avatar_size">192dp</dimen> +</resources>
\ No newline at end of file diff --git a/src/main/res/values-w384dp/dimens.xml b/src/main/res/values-w384dp/dimens.xml index 430845b1c..e9350addd 100644 --- a/src/main/res/values-w384dp/dimens.xml +++ b/src/main/res/values-w384dp/dimens.xml @@ -1,5 +1,9 @@ <resources> <!-- 384dp is the screen width of the Nexus 4. Something like a Moto G is smaller but a Nexus 5X is larger --> <!-- https://material.io/devices/ --> + <dimen name="fineprint_size">12sp</dimen> + <dimen name="swipe_handle_size">48dp</dimen> <dimen name="audio_player_width">288dp</dimen> + <dimen name="avatar_on_details_screen_size">72dp</dimen> + <dimen name="media_size">64dp</dimen> <!-- ideally not larger than avatar_on_details_screen --> </resources>
\ No newline at end of file diff --git a/src/main/res/values-w585dp/dimens.xml b/src/main/res/values-w585dp/dimens.xml index 38ca33a11..067401781 100644 --- a/src/main/res/values-w585dp/dimens.xml +++ b/src/main/res/values-w585dp/dimens.xml @@ -1,3 +1,6 @@ <resources> <dimen name="activity_horizontal_margin">32dp</dimen> + <dimen name="avatar_on_details_screen_size">96dp</dimen> + <dimen name="media_size">80dp</dimen> <!-- ideally not larger than avatar_on_details_screen --> + <dimen name="browser_media_size">128dp</dimen> </resources> diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index ff36fe0ae..93da9bac4 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -37,7 +37,8 @@ <string-array name="quick_actions"> <item>@string/none</item> <item>@string/recently_used</item> - <item>@string/attach_take_from_camera</item> + <item>@string/action_take_photo</item> + <item>@string/action_take_video</item> <item>@string/attach_choose_picture</item> <item>@string/attach_record_voice</item> <item>@string/send_location</item> @@ -46,7 +47,8 @@ <string-array name="quick_action_values"> <item>none</item> <item>recent</item> - <item>TAKE_FROM_CAMERA</item> + <item>TAKE_PHOTO</item> + <item>RECORD_VIDEO</item> <item>CHOOSE_PICTURE</item> <item>RECORD_VOICE</item> <item>SEND_LOCATION</item> diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index e89ed2944..672cb00fb 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -42,6 +42,16 @@ <attr name="conversations_overview_background" format="reference|color" /> + <attr name="media_preview_document" format="reference" /> + <attr name="media_preview_recording" format="reference" /> + <attr name="media_preview_audio" format="reference" /> + <attr name="media_preview_location" format="reference" /> + <attr name="media_preview_contact" format="reference" /> + <attr name="media_preview_app" format="reference" /> + <attr name="media_preview_calendar" format="reference" /> + <attr name="media_preview_archive" format="reference" /> + <attr name="media_preview_unknown" format="reference" /> + <attr name="icon_add_group" format="reference" /> <attr name="icon_add_person" format="reference" /> <attr name="icon_cancel" format="reference" /> @@ -83,6 +93,7 @@ <attr name="ic_attach_photo" format="reference" /> <attr name="ic_attach_record" format="reference" /> <attr name="ic_attach_video" format="reference" /> + <attr name="ic_attach_videocam" format="reference" /> <attr name="ic_file_apk" format="reference" /> <attr name="ic_file_pdf" format="reference" /> @@ -90,6 +101,7 @@ <attr name="ic_file_calendar" format="reference" /> <attr name="icon_alpha" format="float" /> + <attr name="delete_icon_alpha" format="float" /> <attr name="popupOverlayStyle" format="reference" /> diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 4867a8e95..e213ea773 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -86,7 +86,6 @@ <bool name="btbv">true</bool> <bool name="send_button_status">true</bool> <string name="quick_action">recent</string> - <bool name="return_to_previous">false</bool> <bool name="display_enter_key">false</bool> <bool name="show_dynamic_tags">false</bool> <integer name="grace_period">144</integer> diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 7f0f561b1..526eb7d40 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -10,6 +10,9 @@ <dimen name="audio_player_width">224dp</dimen> <dimen name="avatar_item_distance">16dp</dimen> + <dimen name="media_preview_size">80dp</dimen> + <dimen name="media_size">56dp</dimen> <!-- ideally not larger than avatar_on_details_screen --> + <dimen name="browser_media_size">96dp</dimen> <dimen name="toolbar_elevation">4dp</dimen> <dimen name="publish_avatar_top_margin">8dp</dimen> @@ -24,6 +27,5 @@ <dimen name="scan_dot_size">8dp</dimen> <dimen name="background_image_opacity">0.12</dimen> - <dimen name="rounded_image_border">8dp</dimen> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 26a8a7112..62b415cf3 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -712,8 +712,6 @@ <string name="contacts_have_read_up_to_this_point">%s have read up to this point</string> <string name="contact_has_read_up_to_this_point">%s has read up to this point</string> <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s and %2$d more have read up to this point</string> - <string name="pref_return_to_previous">Quick Sharing</string> - <string name="pref_return_to_previous_summary">Immediately return to previous activity instead of opening the conversation after sharing something</string> <string name="conversation_unencrypted_hint">This chat is unencrypted, for security reasons you should activate message encryption by using the lock icon. The preferable encryption is OMEMO.</string> <string name="pref_warn_unencrypted_chat">Warn if chat is unencrypted</string> <string name="pref_warn_unencrypted_chat_summary">If message encryption is available, you should use it. If you don\'t use message encryption, show a warning message inside the chat.</string> @@ -812,17 +810,20 @@ <string name="phone_book">Address book</string> <string name="unable_to_save_recording">Unable to save recording</string> <string name="foreground_service_channel_name">Foreground service</string> - <string name="foreground_service_channel_description">This notification category is used to display a permanent notification indicating that Conversations is running.</string> + <string name="foreground_service_channel_description">This notification category is used to display a permanent notification indicating that Pix-Art Messenger is running.</string> <string name="notification_group_status_information">Status Information</string> <string name="error_channel_name">Connectivity Problems</string> <string name="error_channel_description">This notification category is used to display a notification in case there is a problem connecting to an account.</string> <string name="notification_group_messages">Messages</string> <string name="messages_channel_name">Messages</string> <string name="silent_messages_channel_name">Silent messages</string> - <string name="silent_messages_channel_description">This notification group is used to display notifications that should not trigger any sound. For example when being active on another device (Grace Period).</string> + <string name="silent_messages_channel_description">This notification category is used to display notifications that should not trigger any sound. For example when being active on another device (Grace Period).</string> <string name="pref_more_notification_settings">Notification Settings</string> <string name="pref_more_notification_settings_summary">Importance, Sound, Vibrate</string> <string name="video_compression_channel_name">Video compression</string> <string name="backup_channel_name">Database backup</string> <string name="app_update_channel_name">App update</string> + <string name="action_group_details">Group details</string> + <string name="view_media">View media</string> + <string name="media_browser">Media browser</string> </resources> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index c17bb820f..50cf8e93a 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -65,6 +65,16 @@ </item> <item name="ic_send_voice_offline" type="reference">@drawable/ic_send_voice_offline</item> + <item name="media_preview_document" type="reference">@drawable/ic_description_black_48dp</item> + <item name="media_preview_recording" type="reference">@drawable/ic_mic_black_48dp</item> + <item name="media_preview_audio" type="reference">@drawable/ic_headset_black_48dp</item> + <item name="media_preview_location" type="reference">@drawable/ic_room_black_48dp</item> + <item name="media_preview_contact" type="reference">@drawable/ic_person_black_48dp</item> + <item name="media_preview_app" type="reference">@drawable/ic_android_black_48dp</item> + <item name="media_preview_calendar" type="reference">@drawable/ic_event_black_48dp</item> + <item name="media_preview_archive" type="reference">@drawable/ic_archive_black_48dp</item> + <item name="media_preview_unknown" type="reference">@drawable/ic_help_black_48dp</item> + <item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item> <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item> <item name="icon_cancel" type="reference">@drawable/ic_cancel_black_24dp</item> @@ -106,8 +116,10 @@ <item name="dialog_horizontal_padding">16dp</item> <item name="dialog_vertical_padding">16dp</item> <item name="icon_alpha" type="float">0.54</item> + <item name="delete_icon_alpha" type="float">0.70</item> <item name="ic_attach_camera" type="reference">@drawable/ic_attach_camera</item> + <item type="reference" name="ic_attach_videocam">@drawable/ic_attach_videocam</item> <item name="ic_attach_document" type="reference">@drawable/ic_attach_document</item> <item name="ic_attach_location" type="reference">@drawable/ic_attach_location</item> <item name="ic_attach_photo" type="reference">@drawable/ic_attach_photo</item> @@ -150,9 +162,9 @@ <item name="colorControlActivated">@color/accent</item> <item name="text_Color_Main">@color/realwhite</item> - <item name="color_background_primary">@color/grey800</item> - <item name="color_background_secondary">@color/grey900</item> - <item name="color_background_tertiary">@color/grey700</item> + <item name="color_background_primary">@color/grey700</item> + <item name="color_background_secondary">@color/grey800</item> + <item name="color_background_tertiary">@color/grey900</item> <item name="color_warning">@color/red_a700</item> <item name="TextColorOnline">@color/green500</item> <item name="TextColorError">@color/red500</item> @@ -210,6 +222,7 @@ </item> <item name="ic_attach_camera" type="reference">@drawable/ic_attach_camera_white</item> + <item name="ic_attach_videocam" type="reference">@drawable/ic_attach_videocam_white</item> <item name="ic_attach_video" type="reference">@drawable/ic_attach_videocam_white</item> <item name="ic_attach_document" type="reference">@drawable/ic_attach_document_white</item> <item name="ic_attach_location" type="reference">@drawable/ic_attach_location_white</item> @@ -219,10 +232,21 @@ <item name="conversations_overview_background">@color/primary_dark</item> <item name="icon_alpha" type="float">0.7</item> + <item name="delete_icon_alpha" type="float">0.7</item> <item name="dialog_horizontal_padding">24dp</item> <item name="dialog_vertical_padding">16dp</item> + <item name="media_preview_document" type="reference">@drawable/ic_description_white_48dp</item> + <item name="media_preview_recording" type="reference">@drawable/ic_mic_white_48dp</item> + <item name="media_preview_audio" type="reference">@drawable/ic_headset_white_48dp</item> + <item name="media_preview_location" type="reference">@drawable/ic_room_white_48dp</item> + <item name="media_preview_contact" type="reference">@drawable/ic_person_white_48dp</item> + <item name="media_preview_app" type="reference">@drawable/ic_android_white_48dp</item> + <item name="media_preview_calendar" type="reference">@drawable/ic_event_white_48dp</item> + <item name="media_preview_archive" type="reference">@drawable/ic_archive_white_48dp</item> + <item name="media_preview_unknown" type="reference">@drawable/ic_help_white_48dp</item> + <item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item> <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item> <item name="icon_cancel" type="reference">@drawable/ic_cancel_white_24dp</item> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index d6241a5ff..819fcded9 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -203,11 +203,6 @@ android:key="video_compression" android:summary="@string/pref_video_compression_summary" android:title="@string/pref_video_compression" /> - <CheckBoxPreference - android:defaultValue="@bool/return_to_previous" - android:key="return_to_previous" - android:summary="@string/pref_return_to_previous_summary" - android:title="@string/pref_return_to_previous" /> </PreferenceScreen> <!--status--> <PreferenceScreen |
