diff --git a/build.gradle b/build.gradle index 8c66b93f2f..f3fb18d1ae 100644 --- a/build.gradle +++ b/build.gradle @@ -78,7 +78,7 @@ dependencies { compile('org.whispersystems:libpastelog:1.1.2') { exclude group: 'com.squareup.okhttp3', module: 'okhttp' } - compile 'org.whispersystems:signal-service-android:2.7.6' + compile 'org.whispersystems:signal-service-android:2.7.7' compile 'org.whispersystems:webrtc-android:M67' compile "me.leolin:ShortcutBadger:1.1.16" @@ -171,7 +171,7 @@ dependencyVerification { 'com.google.android.gms:play-services-maps:45e8021e7ddac4a44a82a0e9698991389ded3023d35c58f38dbd86d54211ec0e', 'com.google.android.exoplayer:exoplayer:955085aa611a8f7cf6c61b88ae03d1a392f4ad94c9bfbc153f3dedb9ffb14718', 'org.whispersystems:libpastelog:fe56b4db9ec743c8b565e3e4caa9228fafe132dc0bf82000d6e359b97a81177c', - 'org.whispersystems:signal-service-android:823eed29e64fb0aa30d2078cb5ec0245e2a0713a4028121329c5c28788ef27f8', + 'org.whispersystems:signal-service-android:066a2d2f8309eb1e098345fb543cbb6f03b3f5975820b50892719a93a61e68c0', 'org.whispersystems:webrtc-android:235b3b79f0ea917e4cda447a9919cb8e17a74ae59da6fb8252503b787fe0828f', 'me.leolin:ShortcutBadger:e3cb3e7625892129b0c92dd5e4bc649faffdd526d5af26d9c45ee31ff8851774', 'se.emilsjolander:stickylistheaders:a08ca948aa6b220f09d82f16bbbac395f6b78897e9eeac6a9f0b0ba755928eeb', @@ -218,7 +218,7 @@ dependencyVerification { 'com.github.bumptech.glide:gifdecoder:59ccf3bb0cec11dab4b857382cbe0b171111b6fc62bf141adce4e1180889af15', 'com.android.support:support-annotations:af05330d997eb92a066534dbe0a3ea24347d26d7001221092113ae02a8f233da', 'org.whispersystems:signal-protocol-android:5b8acded7f2a40178eb90ab8e8cbfec89d170d91b3ff5e78487d1098df6185a1', - 'org.whispersystems:signal-service-java:6169643c65dcba8c784744006fc3afd9b6f309041b310a33a624121e3577433a', + 'org.whispersystems:signal-service-java:f9ce6971988c38403f982014188bfce094742a507c17c54641ce842b7a973cbc', 'com.github.bumptech.glide:disklrucache:c1b1b6f5bbd01e2fcdc9d7f60913c8d338bdb65ed4a93bfa02b56f19daaade4b', 'com.github.bumptech.glide:annotations:bede99ef9f71517a4274bac18fd3e483e9f2b6108d7d6fe8f4949be4aa4d9512', 'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a', diff --git a/res/drawable-hdpi/ic_delivery_status_delivered.png b/res/drawable-hdpi/ic_delivery_status_delivered.png new file mode 100644 index 0000000000..089afc0b54 Binary files /dev/null and b/res/drawable-hdpi/ic_delivery_status_delivered.png differ diff --git a/res/drawable-hdpi/ic_delivery_status_read.png b/res/drawable-hdpi/ic_delivery_status_read.png new file mode 100644 index 0000000000..307190cae6 Binary files /dev/null and b/res/drawable-hdpi/ic_delivery_status_read.png differ diff --git a/res/drawable-hdpi/ic_delivery_status_sending.png b/res/drawable-hdpi/ic_delivery_status_sending.png new file mode 100644 index 0000000000..fbdcef3583 Binary files /dev/null and b/res/drawable-hdpi/ic_delivery_status_sending.png differ diff --git a/res/drawable-hdpi/ic_delivery_status_sent.png b/res/drawable-hdpi/ic_delivery_status_sent.png new file mode 100644 index 0000000000..72b685aee4 Binary files /dev/null and b/res/drawable-hdpi/ic_delivery_status_sent.png differ diff --git a/res/drawable-hdpi/ic_document.png b/res/drawable-hdpi/ic_document.png new file mode 100644 index 0000000000..c3d2ff8325 Binary files /dev/null and b/res/drawable-hdpi/ic_document.png differ diff --git a/res/drawable-hdpi/ic_error.png b/res/drawable-hdpi/ic_error.png new file mode 100644 index 0000000000..93bf72064e Binary files /dev/null and b/res/drawable-hdpi/ic_error.png differ diff --git a/res/drawable-hdpi/ic_timer.png b/res/drawable-hdpi/ic_timer.png new file mode 100644 index 0000000000..c820ea2b0a Binary files /dev/null and b/res/drawable-hdpi/ic_timer.png differ diff --git a/res/drawable-hdpi/ic_timer_disabled.png b/res/drawable-hdpi/ic_timer_disabled.png new file mode 100644 index 0000000000..9e6127d54f Binary files /dev/null and b/res/drawable-hdpi/ic_timer_disabled.png differ diff --git a/res/drawable-hdpi/received_bubble.9.png b/res/drawable-hdpi/received_bubble.9.png deleted file mode 100644 index ef8ce1e3d7..0000000000 Binary files a/res/drawable-hdpi/received_bubble.9.png and /dev/null differ diff --git a/res/drawable-hdpi/sent_bubble.9.png b/res/drawable-hdpi/sent_bubble.9.png deleted file mode 100644 index 803d27693b..0000000000 Binary files a/res/drawable-hdpi/sent_bubble.9.png and /dev/null differ diff --git a/res/drawable-hdpi/timer00.png b/res/drawable-hdpi/timer00.png new file mode 100644 index 0000000000..7674e0065c Binary files /dev/null and b/res/drawable-hdpi/timer00.png differ diff --git a/res/drawable-hdpi/timer05.png b/res/drawable-hdpi/timer05.png new file mode 100644 index 0000000000..259b184434 Binary files /dev/null and b/res/drawable-hdpi/timer05.png differ diff --git a/res/drawable-hdpi/timer10.png b/res/drawable-hdpi/timer10.png new file mode 100644 index 0000000000..710c6a0755 Binary files /dev/null and b/res/drawable-hdpi/timer10.png differ diff --git a/res/drawable-hdpi/timer15.png b/res/drawable-hdpi/timer15.png new file mode 100644 index 0000000000..47767b4cac Binary files /dev/null and b/res/drawable-hdpi/timer15.png differ diff --git a/res/drawable-hdpi/timer20.png b/res/drawable-hdpi/timer20.png new file mode 100644 index 0000000000..4dcb446ef3 Binary files /dev/null and b/res/drawable-hdpi/timer20.png differ diff --git a/res/drawable-hdpi/timer25.png b/res/drawable-hdpi/timer25.png new file mode 100644 index 0000000000..194ebc397a Binary files /dev/null and b/res/drawable-hdpi/timer25.png differ diff --git a/res/drawable-hdpi/timer30.png b/res/drawable-hdpi/timer30.png new file mode 100644 index 0000000000..4cffeef993 Binary files /dev/null and b/res/drawable-hdpi/timer30.png differ diff --git a/res/drawable-hdpi/timer35.png b/res/drawable-hdpi/timer35.png new file mode 100644 index 0000000000..3fdbb5e902 Binary files /dev/null and b/res/drawable-hdpi/timer35.png differ diff --git a/res/drawable-hdpi/timer40.png b/res/drawable-hdpi/timer40.png new file mode 100644 index 0000000000..43d4607b41 Binary files /dev/null and b/res/drawable-hdpi/timer40.png differ diff --git a/res/drawable-hdpi/timer45.png b/res/drawable-hdpi/timer45.png new file mode 100644 index 0000000000..ddac60676c Binary files /dev/null and b/res/drawable-hdpi/timer45.png differ diff --git a/res/drawable-hdpi/timer50.png b/res/drawable-hdpi/timer50.png new file mode 100644 index 0000000000..ba5cbce030 Binary files /dev/null and b/res/drawable-hdpi/timer50.png differ diff --git a/res/drawable-hdpi/timer55.png b/res/drawable-hdpi/timer55.png new file mode 100644 index 0000000000..2eeaad9c9f Binary files /dev/null and b/res/drawable-hdpi/timer55.png differ diff --git a/res/drawable-hdpi/timer60.png b/res/drawable-hdpi/timer60.png new file mode 100644 index 0000000000..85fdb05feb Binary files /dev/null and b/res/drawable-hdpi/timer60.png differ diff --git a/res/drawable-mdpi/ic_delivery_status_delivered.png b/res/drawable-mdpi/ic_delivery_status_delivered.png new file mode 100644 index 0000000000..c66da8360b Binary files /dev/null and b/res/drawable-mdpi/ic_delivery_status_delivered.png differ diff --git a/res/drawable-mdpi/ic_delivery_status_read.png b/res/drawable-mdpi/ic_delivery_status_read.png new file mode 100644 index 0000000000..eee83ef591 Binary files /dev/null and b/res/drawable-mdpi/ic_delivery_status_read.png differ diff --git a/res/drawable-mdpi/ic_delivery_status_sending.png b/res/drawable-mdpi/ic_delivery_status_sending.png new file mode 100644 index 0000000000..b34ea32b8b Binary files /dev/null and b/res/drawable-mdpi/ic_delivery_status_sending.png differ diff --git a/res/drawable-mdpi/ic_delivery_status_sent.png b/res/drawable-mdpi/ic_delivery_status_sent.png new file mode 100644 index 0000000000..ff6bf0fac5 Binary files /dev/null and b/res/drawable-mdpi/ic_delivery_status_sent.png differ diff --git a/res/drawable-mdpi/ic_document.png b/res/drawable-mdpi/ic_document.png new file mode 100644 index 0000000000..3ae0e719e9 Binary files /dev/null and b/res/drawable-mdpi/ic_document.png differ diff --git a/res/drawable-mdpi/ic_error.png b/res/drawable-mdpi/ic_error.png new file mode 100644 index 0000000000..bf1a9f376d Binary files /dev/null and b/res/drawable-mdpi/ic_error.png differ diff --git a/res/drawable-mdpi/ic_timer.png b/res/drawable-mdpi/ic_timer.png new file mode 100644 index 0000000000..c999a9e2c6 Binary files /dev/null and b/res/drawable-mdpi/ic_timer.png differ diff --git a/res/drawable-mdpi/ic_timer_disabled.png b/res/drawable-mdpi/ic_timer_disabled.png new file mode 100644 index 0000000000..b2cd951a91 Binary files /dev/null and b/res/drawable-mdpi/ic_timer_disabled.png differ diff --git a/res/drawable-mdpi/received_bubble.9.png b/res/drawable-mdpi/received_bubble.9.png deleted file mode 100644 index 178cb588c9..0000000000 Binary files a/res/drawable-mdpi/received_bubble.9.png and /dev/null differ diff --git a/res/drawable-mdpi/sent_bubble.9.png b/res/drawable-mdpi/sent_bubble.9.png deleted file mode 100644 index dcf271c864..0000000000 Binary files a/res/drawable-mdpi/sent_bubble.9.png and /dev/null differ diff --git a/res/drawable-mdpi/timer00.png b/res/drawable-mdpi/timer00.png new file mode 100644 index 0000000000..0cfff1ec1e Binary files /dev/null and b/res/drawable-mdpi/timer00.png differ diff --git a/res/drawable-mdpi/timer05.png b/res/drawable-mdpi/timer05.png new file mode 100644 index 0000000000..4e4502c6db Binary files /dev/null and b/res/drawable-mdpi/timer05.png differ diff --git a/res/drawable-mdpi/timer10.png b/res/drawable-mdpi/timer10.png new file mode 100644 index 0000000000..99f6178335 Binary files /dev/null and b/res/drawable-mdpi/timer10.png differ diff --git a/res/drawable-mdpi/timer15.png b/res/drawable-mdpi/timer15.png new file mode 100644 index 0000000000..0f2a68de40 Binary files /dev/null and b/res/drawable-mdpi/timer15.png differ diff --git a/res/drawable-mdpi/timer20.png b/res/drawable-mdpi/timer20.png new file mode 100644 index 0000000000..8d5f3b58d8 Binary files /dev/null and b/res/drawable-mdpi/timer20.png differ diff --git a/res/drawable-mdpi/timer25.png b/res/drawable-mdpi/timer25.png new file mode 100644 index 0000000000..9527b34208 Binary files /dev/null and b/res/drawable-mdpi/timer25.png differ diff --git a/res/drawable-mdpi/timer30.png b/res/drawable-mdpi/timer30.png new file mode 100644 index 0000000000..038d94a9e5 Binary files /dev/null and b/res/drawable-mdpi/timer30.png differ diff --git a/res/drawable-mdpi/timer35.png b/res/drawable-mdpi/timer35.png new file mode 100644 index 0000000000..2d3d3f7de4 Binary files /dev/null and b/res/drawable-mdpi/timer35.png differ diff --git a/res/drawable-mdpi/timer40.png b/res/drawable-mdpi/timer40.png new file mode 100644 index 0000000000..2a72f42410 Binary files /dev/null and b/res/drawable-mdpi/timer40.png differ diff --git a/res/drawable-mdpi/timer45.png b/res/drawable-mdpi/timer45.png new file mode 100644 index 0000000000..a5b2b454f0 Binary files /dev/null and b/res/drawable-mdpi/timer45.png differ diff --git a/res/drawable-mdpi/timer50.png b/res/drawable-mdpi/timer50.png new file mode 100644 index 0000000000..ac0dfc30a6 Binary files /dev/null and b/res/drawable-mdpi/timer50.png differ diff --git a/res/drawable-mdpi/timer55.png b/res/drawable-mdpi/timer55.png new file mode 100644 index 0000000000..dc887764a4 Binary files /dev/null and b/res/drawable-mdpi/timer55.png differ diff --git a/res/drawable-mdpi/timer60.png b/res/drawable-mdpi/timer60.png new file mode 100644 index 0000000000..f641da09d5 Binary files /dev/null and b/res/drawable-mdpi/timer60.png differ diff --git a/res/drawable-xhdpi/ic_delivery_status_delivered.png b/res/drawable-xhdpi/ic_delivery_status_delivered.png new file mode 100644 index 0000000000..5d42fec8f7 Binary files /dev/null and b/res/drawable-xhdpi/ic_delivery_status_delivered.png differ diff --git a/res/drawable-xhdpi/ic_delivery_status_read.png b/res/drawable-xhdpi/ic_delivery_status_read.png new file mode 100644 index 0000000000..79c4857f6c Binary files /dev/null and b/res/drawable-xhdpi/ic_delivery_status_read.png differ diff --git a/res/drawable-xhdpi/ic_delivery_status_sending.png b/res/drawable-xhdpi/ic_delivery_status_sending.png new file mode 100644 index 0000000000..aca7fe7ef3 Binary files /dev/null and b/res/drawable-xhdpi/ic_delivery_status_sending.png differ diff --git a/res/drawable-xhdpi/ic_delivery_status_sent.png b/res/drawable-xhdpi/ic_delivery_status_sent.png new file mode 100644 index 0000000000..811a54373d Binary files /dev/null and b/res/drawable-xhdpi/ic_delivery_status_sent.png differ diff --git a/res/drawable-xhdpi/ic_document.png b/res/drawable-xhdpi/ic_document.png new file mode 100644 index 0000000000..f1d0df1e0a Binary files /dev/null and b/res/drawable-xhdpi/ic_document.png differ diff --git a/res/drawable-xhdpi/ic_error.png b/res/drawable-xhdpi/ic_error.png new file mode 100644 index 0000000000..5d36611473 Binary files /dev/null and b/res/drawable-xhdpi/ic_error.png differ diff --git a/res/drawable-xhdpi/ic_timer.png b/res/drawable-xhdpi/ic_timer.png new file mode 100644 index 0000000000..eacdf73a07 Binary files /dev/null and b/res/drawable-xhdpi/ic_timer.png differ diff --git a/res/drawable-xhdpi/ic_timer_disabled.png b/res/drawable-xhdpi/ic_timer_disabled.png new file mode 100644 index 0000000000..45165abecc Binary files /dev/null and b/res/drawable-xhdpi/ic_timer_disabled.png differ diff --git a/res/drawable-xhdpi/received_bubble.9.png b/res/drawable-xhdpi/received_bubble.9.png deleted file mode 100644 index 76d8de2cf7..0000000000 Binary files a/res/drawable-xhdpi/received_bubble.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/sent_bubble.9.png b/res/drawable-xhdpi/sent_bubble.9.png deleted file mode 100644 index cbcf0930a8..0000000000 Binary files a/res/drawable-xhdpi/sent_bubble.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/timer00.png b/res/drawable-xhdpi/timer00.png new file mode 100644 index 0000000000..74d03ec1e8 Binary files /dev/null and b/res/drawable-xhdpi/timer00.png differ diff --git a/res/drawable-xhdpi/timer05.png b/res/drawable-xhdpi/timer05.png new file mode 100644 index 0000000000..5536951ed1 Binary files /dev/null and b/res/drawable-xhdpi/timer05.png differ diff --git a/res/drawable-xhdpi/timer10.png b/res/drawable-xhdpi/timer10.png new file mode 100644 index 0000000000..a0efa5a282 Binary files /dev/null and b/res/drawable-xhdpi/timer10.png differ diff --git a/res/drawable-xhdpi/timer15.png b/res/drawable-xhdpi/timer15.png new file mode 100644 index 0000000000..58ecf78ca9 Binary files /dev/null and b/res/drawable-xhdpi/timer15.png differ diff --git a/res/drawable-xhdpi/timer20.png b/res/drawable-xhdpi/timer20.png new file mode 100644 index 0000000000..ea87eab10c Binary files /dev/null and b/res/drawable-xhdpi/timer20.png differ diff --git a/res/drawable-xhdpi/timer25.png b/res/drawable-xhdpi/timer25.png new file mode 100644 index 0000000000..edf88b9efc Binary files /dev/null and b/res/drawable-xhdpi/timer25.png differ diff --git a/res/drawable-xhdpi/timer30.png b/res/drawable-xhdpi/timer30.png new file mode 100644 index 0000000000..941e0bed73 Binary files /dev/null and b/res/drawable-xhdpi/timer30.png differ diff --git a/res/drawable-xhdpi/timer35.png b/res/drawable-xhdpi/timer35.png new file mode 100644 index 0000000000..64444a7960 Binary files /dev/null and b/res/drawable-xhdpi/timer35.png differ diff --git a/res/drawable-xhdpi/timer40.png b/res/drawable-xhdpi/timer40.png new file mode 100644 index 0000000000..a57dad11a9 Binary files /dev/null and b/res/drawable-xhdpi/timer40.png differ diff --git a/res/drawable-xhdpi/timer45.png b/res/drawable-xhdpi/timer45.png new file mode 100644 index 0000000000..fff7ec324f Binary files /dev/null and b/res/drawable-xhdpi/timer45.png differ diff --git a/res/drawable-xhdpi/timer50.png b/res/drawable-xhdpi/timer50.png new file mode 100644 index 0000000000..eba73f7576 Binary files /dev/null and b/res/drawable-xhdpi/timer50.png differ diff --git a/res/drawable-xhdpi/timer55.png b/res/drawable-xhdpi/timer55.png new file mode 100644 index 0000000000..c999a9e2c6 Binary files /dev/null and b/res/drawable-xhdpi/timer55.png differ diff --git a/res/drawable-xhdpi/timer60.png b/res/drawable-xhdpi/timer60.png new file mode 100644 index 0000000000..4066835b03 Binary files /dev/null and b/res/drawable-xhdpi/timer60.png differ diff --git a/res/drawable-xxhdpi/ic_delivery_status_delivered.png b/res/drawable-xxhdpi/ic_delivery_status_delivered.png new file mode 100644 index 0000000000..27d3b3e21b Binary files /dev/null and b/res/drawable-xxhdpi/ic_delivery_status_delivered.png differ diff --git a/res/drawable-xxhdpi/ic_delivery_status_read.png b/res/drawable-xxhdpi/ic_delivery_status_read.png new file mode 100644 index 0000000000..474a570724 Binary files /dev/null and b/res/drawable-xxhdpi/ic_delivery_status_read.png differ diff --git a/res/drawable-xxhdpi/ic_delivery_status_sending.png b/res/drawable-xxhdpi/ic_delivery_status_sending.png new file mode 100644 index 0000000000..4a81c629d8 Binary files /dev/null and b/res/drawable-xxhdpi/ic_delivery_status_sending.png differ diff --git a/res/drawable-xxhdpi/ic_delivery_status_sent.png b/res/drawable-xxhdpi/ic_delivery_status_sent.png new file mode 100644 index 0000000000..f679aaf244 Binary files /dev/null and b/res/drawable-xxhdpi/ic_delivery_status_sent.png differ diff --git a/res/drawable-xxhdpi/ic_document.png b/res/drawable-xxhdpi/ic_document.png new file mode 100644 index 0000000000..6c3c55ea4e Binary files /dev/null and b/res/drawable-xxhdpi/ic_document.png differ diff --git a/res/drawable-xxhdpi/ic_error.png b/res/drawable-xxhdpi/ic_error.png new file mode 100644 index 0000000000..8dbbc3292a Binary files /dev/null and b/res/drawable-xxhdpi/ic_error.png differ diff --git a/res/drawable-xxhdpi/ic_timer.png b/res/drawable-xxhdpi/ic_timer.png new file mode 100644 index 0000000000..48adc80b74 Binary files /dev/null and b/res/drawable-xxhdpi/ic_timer.png differ diff --git a/res/drawable-xxhdpi/ic_timer_disabled.png b/res/drawable-xxhdpi/ic_timer_disabled.png new file mode 100644 index 0000000000..fabf9ffdba Binary files /dev/null and b/res/drawable-xxhdpi/ic_timer_disabled.png differ diff --git a/res/drawable-xxhdpi/received_bubble.9.png b/res/drawable-xxhdpi/received_bubble.9.png deleted file mode 100644 index cb8e72d02a..0000000000 Binary files a/res/drawable-xxhdpi/received_bubble.9.png and /dev/null differ diff --git a/res/drawable-xxhdpi/sent_bubble.9.png b/res/drawable-xxhdpi/sent_bubble.9.png deleted file mode 100644 index 2c5716625e..0000000000 Binary files a/res/drawable-xxhdpi/sent_bubble.9.png and /dev/null differ diff --git a/res/drawable-xxhdpi/timer00.png b/res/drawable-xxhdpi/timer00.png new file mode 100644 index 0000000000..aa0be20b2d Binary files /dev/null and b/res/drawable-xxhdpi/timer00.png differ diff --git a/res/drawable-xxhdpi/timer05.png b/res/drawable-xxhdpi/timer05.png new file mode 100644 index 0000000000..a26c7a701d Binary files /dev/null and b/res/drawable-xxhdpi/timer05.png differ diff --git a/res/drawable-xxhdpi/timer10.png b/res/drawable-xxhdpi/timer10.png new file mode 100644 index 0000000000..1d77cf314a Binary files /dev/null and b/res/drawable-xxhdpi/timer10.png differ diff --git a/res/drawable-xxhdpi/timer15.png b/res/drawable-xxhdpi/timer15.png new file mode 100644 index 0000000000..73d67a5fd2 Binary files /dev/null and b/res/drawable-xxhdpi/timer15.png differ diff --git a/res/drawable-xxhdpi/timer20.png b/res/drawable-xxhdpi/timer20.png new file mode 100644 index 0000000000..ac0aee0b52 Binary files /dev/null and b/res/drawable-xxhdpi/timer20.png differ diff --git a/res/drawable-xxhdpi/timer25.png b/res/drawable-xxhdpi/timer25.png new file mode 100644 index 0000000000..7fd3966f20 Binary files /dev/null and b/res/drawable-xxhdpi/timer25.png differ diff --git a/res/drawable-xxhdpi/timer30.png b/res/drawable-xxhdpi/timer30.png new file mode 100644 index 0000000000..f31ca334fb Binary files /dev/null and b/res/drawable-xxhdpi/timer30.png differ diff --git a/res/drawable-xxhdpi/timer35.png b/res/drawable-xxhdpi/timer35.png new file mode 100644 index 0000000000..922c95886c Binary files /dev/null and b/res/drawable-xxhdpi/timer35.png differ diff --git a/res/drawable-xxhdpi/timer40.png b/res/drawable-xxhdpi/timer40.png new file mode 100644 index 0000000000..53f431cbdd Binary files /dev/null and b/res/drawable-xxhdpi/timer40.png differ diff --git a/res/drawable-xxhdpi/timer45.png b/res/drawable-xxhdpi/timer45.png new file mode 100644 index 0000000000..8781c30bfc Binary files /dev/null and b/res/drawable-xxhdpi/timer45.png differ diff --git a/res/drawable-xxhdpi/timer50.png b/res/drawable-xxhdpi/timer50.png new file mode 100644 index 0000000000..dcae6b3401 Binary files /dev/null and b/res/drawable-xxhdpi/timer50.png differ diff --git a/res/drawable-xxhdpi/timer55.png b/res/drawable-xxhdpi/timer55.png new file mode 100644 index 0000000000..c820ea2b0a Binary files /dev/null and b/res/drawable-xxhdpi/timer55.png differ diff --git a/res/drawable-xxhdpi/timer60.png b/res/drawable-xxhdpi/timer60.png new file mode 100644 index 0000000000..e4e8756966 Binary files /dev/null and b/res/drawable-xxhdpi/timer60.png differ diff --git a/res/drawable-xxxhdpi/ic_delivery_status_delivered.png b/res/drawable-xxxhdpi/ic_delivery_status_delivered.png new file mode 100644 index 0000000000..039cf55b27 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_delivery_status_delivered.png differ diff --git a/res/drawable-xxxhdpi/ic_delivery_status_read.png b/res/drawable-xxxhdpi/ic_delivery_status_read.png new file mode 100644 index 0000000000..c138886aa3 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_delivery_status_read.png differ diff --git a/res/drawable-xxxhdpi/ic_delivery_status_sending.png b/res/drawable-xxxhdpi/ic_delivery_status_sending.png new file mode 100644 index 0000000000..461c2ea636 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_delivery_status_sending.png differ diff --git a/res/drawable-xxxhdpi/ic_delivery_status_sent.png b/res/drawable-xxxhdpi/ic_delivery_status_sent.png new file mode 100644 index 0000000000..47bd9acd33 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_delivery_status_sent.png differ diff --git a/res/drawable-xxxhdpi/ic_document.png b/res/drawable-xxxhdpi/ic_document.png new file mode 100644 index 0000000000..2a9c56c586 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_document.png differ diff --git a/res/drawable-xxxhdpi/ic_error.png b/res/drawable-xxxhdpi/ic_error.png new file mode 100644 index 0000000000..9016eb7b98 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_error.png differ diff --git a/res/drawable-xxxhdpi/ic_timer.png b/res/drawable-xxxhdpi/ic_timer.png new file mode 100644 index 0000000000..4853eb2d9d Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_disabled.png b/res/drawable-xxxhdpi/ic_timer_disabled.png new file mode 100644 index 0000000000..6301f7bada Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_disabled.png differ diff --git a/res/drawable-xxxhdpi/timer00.png b/res/drawable-xxxhdpi/timer00.png new file mode 100644 index 0000000000..a724af4d9c Binary files /dev/null and b/res/drawable-xxxhdpi/timer00.png differ diff --git a/res/drawable-xxxhdpi/timer05.png b/res/drawable-xxxhdpi/timer05.png new file mode 100644 index 0000000000..10987c9de6 Binary files /dev/null and b/res/drawable-xxxhdpi/timer05.png differ diff --git a/res/drawable-xxxhdpi/timer10.png b/res/drawable-xxxhdpi/timer10.png new file mode 100644 index 0000000000..959a8dde47 Binary files /dev/null and b/res/drawable-xxxhdpi/timer10.png differ diff --git a/res/drawable-xxxhdpi/timer15.png b/res/drawable-xxxhdpi/timer15.png new file mode 100644 index 0000000000..e0fe28c894 Binary files /dev/null and b/res/drawable-xxxhdpi/timer15.png differ diff --git a/res/drawable-xxxhdpi/timer20.png b/res/drawable-xxxhdpi/timer20.png new file mode 100644 index 0000000000..a81cc471a4 Binary files /dev/null and b/res/drawable-xxxhdpi/timer20.png differ diff --git a/res/drawable-xxxhdpi/timer25.png b/res/drawable-xxxhdpi/timer25.png new file mode 100644 index 0000000000..fe06795b78 Binary files /dev/null and b/res/drawable-xxxhdpi/timer25.png differ diff --git a/res/drawable-xxxhdpi/timer30.png b/res/drawable-xxxhdpi/timer30.png new file mode 100644 index 0000000000..0815499c68 Binary files /dev/null and b/res/drawable-xxxhdpi/timer30.png differ diff --git a/res/drawable-xxxhdpi/timer35.png b/res/drawable-xxxhdpi/timer35.png new file mode 100644 index 0000000000..91a863fd7e Binary files /dev/null and b/res/drawable-xxxhdpi/timer35.png differ diff --git a/res/drawable-xxxhdpi/timer40.png b/res/drawable-xxxhdpi/timer40.png new file mode 100644 index 0000000000..2ad5ff358b Binary files /dev/null and b/res/drawable-xxxhdpi/timer40.png differ diff --git a/res/drawable-xxxhdpi/timer45.png b/res/drawable-xxxhdpi/timer45.png new file mode 100644 index 0000000000..8cc51a2d44 Binary files /dev/null and b/res/drawable-xxxhdpi/timer45.png differ diff --git a/res/drawable-xxxhdpi/timer50.png b/res/drawable-xxxhdpi/timer50.png new file mode 100644 index 0000000000..89cdd98299 Binary files /dev/null and b/res/drawable-xxxhdpi/timer50.png differ diff --git a/res/drawable-xxxhdpi/timer55.png b/res/drawable-xxxhdpi/timer55.png new file mode 100644 index 0000000000..eacdf73a07 Binary files /dev/null and b/res/drawable-xxxhdpi/timer55.png differ diff --git a/res/drawable-xxxhdpi/timer60.png b/res/drawable-xxxhdpi/timer60.png new file mode 100644 index 0000000000..d66cf127be Binary files /dev/null and b/res/drawable-xxxhdpi/timer60.png differ diff --git a/res/drawable/archived_indicator_background.xml b/res/drawable/archived_indicator_background.xml new file mode 100644 index 0000000000..4fa695590b --- /dev/null +++ b/res/drawable/archived_indicator_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/compose_background.xml b/res/drawable/compose_background.xml new file mode 100644 index 0000000000..b93c9edb7b --- /dev/null +++ b/res/drawable/compose_background.xml @@ -0,0 +1,16 @@ + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/image_shade.xml b/res/drawable/image_shade.xml new file mode 100644 index 0000000000..e7616a18c6 --- /dev/null +++ b/res/drawable/image_shade.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/message_bubble_background_received_alone.xml b/res/drawable/message_bubble_background_received_alone.xml new file mode 100644 index 0000000000..cda641b1da --- /dev/null +++ b/res/drawable/message_bubble_background_received_alone.xml @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/res/drawable/message_bubble_background_received_end.xml b/res/drawable/message_bubble_background_received_end.xml new file mode 100644 index 0000000000..3e4e2c0562 --- /dev/null +++ b/res/drawable/message_bubble_background_received_end.xml @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/res/drawable/message_bubble_background_received_middle.xml b/res/drawable/message_bubble_background_received_middle.xml new file mode 100644 index 0000000000..e3888978ab --- /dev/null +++ b/res/drawable/message_bubble_background_received_middle.xml @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/res/drawable/message_bubble_background_received_start.xml b/res/drawable/message_bubble_background_received_start.xml new file mode 100644 index 0000000000..4c30cc7565 --- /dev/null +++ b/res/drawable/message_bubble_background_received_start.xml @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/res/drawable/message_bubble_background_sent_alone.xml b/res/drawable/message_bubble_background_sent_alone.xml new file mode 100644 index 0000000000..6f19f4f16f --- /dev/null +++ b/res/drawable/message_bubble_background_sent_alone.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/message_bubble_background_sent_end.xml b/res/drawable/message_bubble_background_sent_end.xml new file mode 100644 index 0000000000..5bc4597c03 --- /dev/null +++ b/res/drawable/message_bubble_background_sent_end.xml @@ -0,0 +1,17 @@ + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/message_bubble_background_sent_middle.xml b/res/drawable/message_bubble_background_sent_middle.xml new file mode 100644 index 0000000000..aea4264539 --- /dev/null +++ b/res/drawable/message_bubble_background_sent_middle.xml @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/res/drawable/message_bubble_background_sent_start.xml b/res/drawable/message_bubble_background_sent_start.xml new file mode 100644 index 0000000000..4719d235f4 --- /dev/null +++ b/res/drawable/message_bubble_background_sent_start.xml @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/res/drawable/quote_background.xml b/res/drawable/quote_background.xml deleted file mode 100644 index c12ab15dde..0000000000 --- a/res/drawable/quote_background.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/drawable/rounded_rectangle.xml b/res/drawable/rounded_rectangle.xml deleted file mode 100644 index 4af7432fd4..0000000000 --- a/res/drawable/rounded_rectangle.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/res/drawable/shared_contact_button_background_alone.xml b/res/drawable/shared_contact_button_background_alone.xml new file mode 100644 index 0000000000..06420aa624 --- /dev/null +++ b/res/drawable/shared_contact_button_background_alone.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/res/drawable/shared_contact_button_background_clustered_received.xml b/res/drawable/shared_contact_button_background_clustered_received.xml new file mode 100644 index 0000000000..7d69d919a0 --- /dev/null +++ b/res/drawable/shared_contact_button_background_clustered_received.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/res/drawable/shared_contact_button_background_clustered_sent.xml b/res/drawable/shared_contact_button_background_clustered_sent.xml new file mode 100644 index 0000000000..a8be01e7a9 --- /dev/null +++ b/res/drawable/shared_contact_button_background_clustered_sent.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/res/drawable/shared_contact_view_background.xml b/res/drawable/shared_contact_view_background.xml deleted file mode 100644 index 36348d9547..0000000000 --- a/res/drawable/shared_contact_view_background.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/res/drawable/sticky_date_header_background.xml b/res/drawable/sticky_date_header_background.xml new file mode 100644 index 0000000000..b015b381ba --- /dev/null +++ b/res/drawable/sticky_date_header_background.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/thumbnail_background.xml b/res/drawable/thumbnail_background.xml new file mode 100644 index 0000000000..0aca471c00 --- /dev/null +++ b/res/drawable/thumbnail_background.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/res/drawable/triangle_right.xml b/res/drawable/triangle_right.xml new file mode 100644 index 0000000000..d6f003ef82 --- /dev/null +++ b/res/drawable/triangle_right.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/res/layout/alert_view.xml b/res/layout/alert_view.xml index 80c2daa6e6..ee4f9364a5 100644 --- a/res/layout/alert_view.xml +++ b/res/layout/alert_view.xml @@ -6,8 +6,9 @@ android:id="@+id/sms_failed_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_error_red_24dp" + android:src="@drawable/ic_error" android:visibility="gone" + android:tint="@color/core_red" tools:visibility="visible" android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description" /> @@ -15,7 +16,8 @@ android:id="@+id/pending_approval_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_info_outline_grey600_24dp" + android:src="@drawable/ic_error" + android:tint="@color/core_light_60" android:visibility="gone" tools:visibility="visible" android:layout_gravity="center_vertical" diff --git a/res/layout/conversation_activity_attachment_editor_stub.xml b/res/layout/conversation_activity_attachment_editor_stub.xml index a47de48b99..a03fce40ea 100644 --- a/res/layout/conversation_activity_attachment_editor_stub.xml +++ b/res/layout/conversation_activity_attachment_editor_stub.xml @@ -27,7 +27,6 @@ android:layout_gravity="center_horizontal" android:visibility="gone" android:contentDescription="@string/conversation_activity__attachment_thumbnail" - app:backgroundColorHint="?conversation_background" app:minWidth="100dp" app:maxWidth="300dp" app:minHeight="100dp" @@ -50,10 +49,7 @@ android:layout_height="wrap_content" android:visibility="gone" android:paddingTop="15dp" - android:paddingBottom="15dp" - app:documentWidgetBackground="?conversation_item_bubble_background" - app:documentForegroundTintColor="@color/grey_500" - app:documentBackgroundTintColor="?conversation_item_bubble_background"/> + android:paddingBottom="15dp" /> diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml index c8c50ac88b..5915ac2821 100644 --- a/res/layout/conversation_fragment.xml +++ b/res/layout/conversation_fragment.xml @@ -10,21 +10,25 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:scrollbars="vertical" - android:cacheColorHint="?conversation_background" /> + android:cacheColorHint="?conversation_background" + android:clipChildren="false" + android:clipToPadding="false"/> diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml index ca6674e7c2..fed3003140 100644 --- a/res/layout/conversation_input_panel.xml +++ b/res/layout/conversation_input_panel.xml @@ -9,33 +9,41 @@ android:gravity="center_vertical" android:orientation="horizontal" android:clickable="true" - android:padding="5dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="6dp" + android:paddingBottom="6dp" android:clipChildren="false" android:clipToPadding="false"> - + - + + android:id="@+id/quote_view" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="6dp" + android:layout_marginRight="6dp" + android:layout_marginTop="6dp" + android:visibility="gone" + app:message_type="preview" + app:quote_colorPrimary="?attr/conversation_item_sent_text_primary_color" + app:quote_colorSecondary="?attr/conversation_item_sent_text_primary_color" + tools:visibility="visible"/> - @@ -61,7 +72,8 @@ android:id="@+id/embedded_text_editor" android:layout_width="0dp" android:layout_height="wrap_content" - android:minHeight="37dp" + android:layout_marginTop="9dp" + android:layout_marginBottom="7dp" android:layout_gravity="center_vertical" android:layout_weight="1" android:nextFocusForward="@+id/send_button" @@ -74,43 +86,48 @@ + android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description" /> + android:contentDescription="@string/conversation_activity__quick_attachment_drawer_record_and_send_audio_description" /> - @@ -120,45 +137,49 @@ - - - - @@ -172,30 +193,32 @@ + android:id="@+id/button_toggle" + android:layout_width="40dp" + android:layout_height="40dp" + android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" + android:background="@drawable/circle_tintable" + android:layout_gravity="bottom"> - + + android:id="@+id/send_button" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:contentDescription="@string/conversation_activity__send" + android:nextFocusLeft="@+id/embedded_text_editor" + android:src="?conversation_transport_sms_indicator" + android:background="@drawable/circle_touch_highlight_background" /> diff --git a/res/layout/conversation_item_footer.xml b/res/layout/conversation_item_footer.xml new file mode 100644 index 0000000000..41bcf973da --- /dev/null +++ b/res/layout/conversation_item_footer.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + diff --git a/res/layout/conversation_item_header.xml b/res/layout/conversation_item_header.xml index ef6fb13203..9189f14964 100644 --- a/res/layout/conversation_item_header.xml +++ b/res/layout/conversation_item_header.xml @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/res/layout/conversation_item_last_seen.xml b/res/layout/conversation_item_last_seen.xml index 327d104ffa..5066a57dc0 100644 --- a/res/layout/conversation_item_last_seen.xml +++ b/res/layout/conversation_item_last_seen.xml @@ -1,20 +1,30 @@ - + + + - - \ No newline at end of file + + + \ No newline at end of file diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml index 6b49d68aa4..aae2d8199e 100644 --- a/res/layout/conversation_item_received.xml +++ b/res/layout/conversation_item_received.xml @@ -1,227 +1,170 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/conversation_item" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:background="@drawable/conversation_item_background" + android:focusable="true" + android:nextFocusLeft="@+id/container" + android:nextFocusRight="@+id/embedded_text_editor" + android:clipToPadding="false" + android:clipChildren="false"> - + - + - + - + - + + android:id="@+id/quote_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/message_bubble_quote_padding" + android:layout_marginBottom="@dimen/message_bubble_quote_padding" + android:layout_marginLeft="@dimen/message_bubble_quote_padding" + android:layout_marginRight="@dimen/message_bubble_quote_padding" + android:visibility="gone" + app:message_type="incoming" + app:quote_colorPrimary="?attr/conversation_item_received_text_primary_color" + app:quote_colorSecondary="?attr/conversation_item_received_text_primary_color" + tools:visibility="visible"/> + android:id="@+id/shared_contact_view_stub" + android:layout="@layout/conversation_item_received_shared_contact" + android:layout_width="@dimen/media_bubble_default_dimens" + android:layout_height="wrap_content" + android:visibility="gone"/> + android:id="@+id/image_view_stub" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout="@layout/conversation_item_received_thumbnail" /> + android:id="@+id/audio_view_stub" + android:layout="@layout/conversation_item_received_audio" + android:layout_width="210dp" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/message_bubble_horizontal_padding" + android:layout_marginRight="@dimen/message_bubble_horizontal_padding" /> - + + android:id="@+id/conversation_item_body" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/message_bubble_horizontal_padding" + android:layout_marginRight="@dimen/message_bubble_horizontal_padding" + style="@style/Signal.Text.Body" + android:textColor="?conversation_item_received_text_primary_color" + android:textColorLink="?conversation_item_received_text_primary_color" + app:scaleEmojis="true" + tools:text="Mango pickle lorem ipsum"/> - + - - - - - - - - - - - - + android:id="@+id/indicators_parent" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:orientation="vertical" + android:gravity="center_vertical"/> diff --git a/res/layout/conversation_item_received_document.xml b/res/layout/conversation_item_received_document.xml index e449ea4748..5153484a85 100644 --- a/res/layout/conversation_item_received_document.xml +++ b/res/layout/conversation_item_received_document.xml @@ -7,6 +7,6 @@ android:layout_width="210dp" android:layout_height="wrap_content" android:visibility="gone" - app:documentForegroundTintColor="@color/white" - app:documentBackgroundTintColor="@color/blue_500" + app:doc_titleColor="?conversation_item_received_text_primary_color" + app:doc_captionColor="?conversation_item_received_text_secondary_color" tools:visibility="visible"/> diff --git a/res/layout/conversation_item_received_shared_contact.xml b/res/layout/conversation_item_received_shared_contact.xml new file mode 100644 index 0000000000..f22d28d767 --- /dev/null +++ b/res/layout/conversation_item_received_shared_contact.xml @@ -0,0 +1,9 @@ + + diff --git a/res/layout/conversation_item_received_thumbnail.xml b/res/layout/conversation_item_received_thumbnail.xml index 43f600677a..f73d125d15 100644 --- a/res/layout/conversation_item_received_thumbnail.xml +++ b/res/layout/conversation_item_received_thumbnail.xml @@ -1,5 +1,5 @@ - diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml index 072876586e..1f82eb08a6 100644 --- a/res/layout/conversation_item_sent.xml +++ b/res/layout/conversation_item_sent.xml @@ -1,214 +1,142 @@ + + + android:layout_marginRight="@dimen/conversation_individual_right_gutter" + android:layout_marginEnd="@dimen/conversation_individual_right_gutter" + android:clipToPadding="false" + android:clipChildren="false"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_alignParentEnd="true" + android:layout_alignParentBottom="true" /> + diff --git a/res/layout/conversation_item_sent_document.xml b/res/layout/conversation_item_sent_document.xml index 27e5dc5238..e176f063c3 100644 --- a/res/layout/conversation_item_sent_document.xml +++ b/res/layout/conversation_item_sent_document.xml @@ -6,7 +6,7 @@ android:id="@+id/document_view" android:layout_width="210dp" android:layout_height="wrap_content" - app:documentForegroundTintColor="@color/grey_500" - app:documentBackgroundTintColor="@color/white" android:visibility="gone" + app:doc_titleColor="?conversation_item_sent_text_primary_color" + app:doc_captionColor="?conversation_item_sent_text_secondary_color" tools:visibility="visible"/> diff --git a/res/layout/conversation_item_shared_contact.xml b/res/layout/conversation_item_sent_shared_contact.xml similarity index 51% rename from res/layout/conversation_item_shared_contact.xml rename to res/layout/conversation_item_sent_shared_contact.xml index 44490b0859..70b3430573 100644 --- a/res/layout/conversation_item_shared_contact.xml +++ b/res/layout/conversation_item_sent_shared_contact.xml @@ -1,6 +1,9 @@ + android:layout_height="wrap_content" + app:contact_titleColor="?conversation_item_sent_text_primary_color" + app:contact_captionColor="?conversation_item_sent_text_secondary_color"/> diff --git a/res/layout/conversation_item_sent_thumbnail.xml b/res/layout/conversation_item_sent_thumbnail.xml index 4588dff88a..cdf1a3e430 100644 --- a/res/layout/conversation_item_sent_thumbnail.xml +++ b/res/layout/conversation_item_sent_thumbnail.xml @@ -1,5 +1,5 @@ - diff --git a/res/layout/conversation_item_thumbnail.xml b/res/layout/conversation_item_thumbnail.xml new file mode 100644 index 0000000000..e8d9c73fce --- /dev/null +++ b/res/layout/conversation_item_thumbnail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + diff --git a/res/layout/conversation_item_update.xml b/res/layout/conversation_item_update.xml index f22e7248cf..3ba0863a04 100644 --- a/res/layout/conversation_item_update.xml +++ b/res/layout/conversation_item_update.xml @@ -1,53 +1,80 @@ + + + android:layout_marginBottom="7dp" + android:layout_marginTop="12dp" + android:gravity="center"> - + - - - - - + + + + + + + + + diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml index 39c98f42fb..eb322f3f7f 100644 --- a/res/layout/conversation_list_item_view.xml +++ b/res/layout/conversation_list_item_view.xml @@ -8,32 +8,28 @@ android:focusable="true" android:nextFocusRight="@+id/fab" android:nextFocusLeft="@+id/container" - android:layout_height="75dp"> + android:layout_height="72dp" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + android:layout_marginEnd="10dp" /> @@ -93,30 +89,29 @@ android:layout_width="40dp" android:layout_height="40dp" android:layout_gravity="center_horizontal" - android:layout_marginRight="5dip" - android:layout_marginLeft="5dip" + android:layout_marginRight="5dp" + android:layout_marginLeft="5dp" android:layout_toLeftOf="@+id/date" android:layout_toStartOf="@+id/date" android:layout_alignParentTop="true" - android:layout_marginTop="5dip" + android:layout_marginTop="5dp" android:contentDescription="@string/conversation_activity__attachment_thumbnail" - app:backgroundColorHint="?conversation_background" android:visibility="gone" tools:src="@drawable/ic_video_light" tools:visibility="visible" /> @@ -128,17 +123,22 @@ android:layout_alignParentEnd="true" android:layout_alignBaseline="@id/subject" android:layout_marginLeft="5dp" - android:layout_marginRight="5dp" + android:layout_marginStart="5dp" + android:paddingLeft="6dp" + android:paddingRight="6dp" + android:paddingTop="2dp" + android:paddingBottom="2dp" + style="@style/Signal.Text.Caption" android:text="@string/conversation_list_item_view__archived" - android:textColor="#ffbbbbbb" - android:background="@drawable/rounded_rectangle" - android:textSize="12sp" - /> + android:textColor="@color/core_white" + android:textAllCaps="true" + android:background="@drawable/archived_indicator_background" /> - + diff --git a/res/layout/conversation_shared_contact_item_received.xml b/res/layout/conversation_shared_contact_item_received.xml new file mode 100644 index 0000000000..5430f98645 --- /dev/null +++ b/res/layout/conversation_shared_contact_item_received.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/conversation_shared_contact_item_sent.xml b/res/layout/conversation_shared_contact_item_sent.xml new file mode 100644 index 0000000000..f06585770d --- /dev/null +++ b/res/layout/conversation_shared_contact_item_sent.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/delivery_status_view.xml b/res/layout/delivery_status_view.xml index 4281be8828..1a94495770 100644 --- a/res/layout/delivery_status_view.xml +++ b/res/layout/delivery_status_view.xml @@ -2,19 +2,21 @@ - + @@ -22,9 +24,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical|end" - android:src="@drawable/ic_done_all_white_18dp" + android:src="@drawable/ic_delivery_status_delivered" android:paddingLeft="2dp" - android:paddingBottom="2dp" android:visibility="gone" android:contentDescription="@string/conversation_item_sent__delivered_description" tools:visibility="gone"/> @@ -33,12 +34,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical|end" - android:src="@drawable/ic_done_all_white_18dp" + android:src="@drawable/ic_delivery_status_read" android:paddingLeft="2dp" - android:paddingBottom="2dp" android:visibility="gone" android:contentDescription="@string/conversation_item_sent__message_read" - android:tint="@color/blue_800" + android:tint="@color/core_blue" tools:visibility="visible"/> \ No newline at end of file diff --git a/res/layout/document_view.xml b/res/layout/document_view.xml index 1eff4c0cb7..306cc89645 100644 --- a/res/layout/document_view.xml +++ b/res/layout/document_view.xml @@ -32,16 +32,22 @@ app:matProg_spinSpeed="0.333" tools:visibility="gone"/> - + + + + tools:text="PDF" /> @@ -75,18 +80,17 @@ - + android:clickable="false"> diff --git a/res/layout/expiration_timer_menu.xml b/res/layout/expiration_timer_menu.xml index a4f9bd3fb0..f95b562bfb 100644 --- a/res/layout/expiration_timer_menu.xml +++ b/res/layout/expiration_timer_menu.xml @@ -9,9 +9,11 @@ + android:layout_width="20dp" + android:layout_height="20dp" + android:layout_gravity="center" + android:src="@drawable/ic_timer" + android:scaleType="fitCenter"/> diff --git a/res/layout/quote_view.xml b/res/layout/quote_view.xml index 0591a9de7f..60d1149b36 100644 --- a/res/layout/quote_view.xml +++ b/res/layout/quote_view.xml @@ -2,6 +2,7 @@ - + android:background="#c0ffffff"> @@ -44,19 +45,52 @@ android:id="@+id/quote_author" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="sans-serif-medium" + style="@style/Signal.Text.Caption" + android:textColor="@color/core_black" + android:textStyle="bold" android:maxLines="1" android:ellipsize="end" - tools:text="Peter Parker" - tools:textColor="@color/purple_400" /> + tools:text="Peter Parker" /> + + + + + + + + @@ -76,50 +111,37 @@ + android:layout_height="match_parent"> - - - - + tools:visibility="visible"> - + - - - + @@ -137,6 +159,6 @@ android:src="@drawable/ic_close_white_18dp" android:tint="@color/gray70" /> - + \ No newline at end of file diff --git a/res/layout/shared_contact_view.xml b/res/layout/shared_contact_view.xml index 58bbf85f53..6826213cd4 100644 --- a/res/layout/shared_contact_view.xml +++ b/res/layout/shared_contact_view.xml @@ -1,25 +1,26 @@ + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto"> + android:orientation="vertical"> @@ -34,10 +35,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="4dp" + style="@style/Signal.Text.Body" android:maxLines="1" android:ellipsize="end" android:fontFamily="sans-serif-medium" - android:textColor="@color/signal_primary" android:textSize="16sp" tools:text="Peter Parker"/> @@ -45,6 +46,7 @@ android:id="@+id/contact_number" android:layout_width="match_parent" android:layout_height="wrap_content" + style="@style/Signal.Text.Caption" android:maxLines="1" android:ellipsize="end" android:textColor="@color/grey_600" @@ -54,31 +56,32 @@ - + + - - - - - - + android:layout_marginTop="@dimen/message_bubble_bottom_padding" + android:gravity="center" + android:padding="10dp" + style="@style/Signal.Text.Preview" + android:maxLines="1" + android:ellipsize="end" + android:fontFamily="sans-serif-medium" + android:textColor="@color/core_blue" + android:background="@drawable/shared_contact_button_background_alone" + android:foreground="?attr/selectableItemBackground" + tools:text="Add to Contacts"/> - \ No newline at end of file diff --git a/res/layout/thumbnail_view.xml b/res/layout/thumbnail_view.xml index 24851538c3..9d0368437d 100644 --- a/res/layout/thumbnail_view.xml +++ b/res/layout/thumbnail_view.xml @@ -1,31 +1,46 @@ - + - + - + - + + + + + diff --git a/res/values-sw320dp/dimens.xml b/res/values-sw320dp/dimens.xml index a496aac971..d6b105743f 100644 --- a/res/values-sw320dp/dimens.xml +++ b/res/values-sw320dp/dimens.xml @@ -1,5 +1,5 @@ - 250dp + 240dp 300dp \ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 7fa23f3217..1335f8f737 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -65,9 +65,9 @@ - - - + + + @@ -133,6 +133,7 @@ + @@ -153,7 +154,6 @@ - @@ -205,12 +205,6 @@ - - - - - - @@ -252,7 +246,29 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/values/colors.xml b/res/values/colors.xml index 07622a079b..7647b7de43 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -28,6 +28,7 @@ #20000000 #30000000 #40000000 + #70000000 #05ffffff #10ffffff diff --git a/res/values/conversation_colors.xml b/res/values/conversation_colors.xml index 385363a410..d44a236464 100644 --- a/res/values/conversation_colors.xml +++ b/res/values/conversation_colors.xml @@ -1,11 +1,32 @@ - #d32f2f - #d81b60 - #3949ab - #1976d2 - #00838f - #00796b - #2e7d32 - #bf360c + #d32f2f + #9a0007 + + #d81b60 + #a00037 + + #8e24aa + #5c007a + + #3949ab + #00227b + + #1976d2 + #004ba0 + + #00838f + #005662 + + #00796b + #004c40 + + #2e7d32 + #005005 + + #bf360c + #870000 + + #757575 + #494949 \ No newline at end of file diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 0c5eceb268..97dff6ad7c 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -16,17 +16,37 @@ 64dp 50dp - 4dp + + 16dp + 4dp + 2dp 1.5dp + 12dp + 6dp + 6dp + 6dp + 48dp + 8dp + 4dp 24dp 24dp 210dp 150dp - 250dp + 240dp 100dp 320dp + 16dp + 16dp + 16dp + 52dp + 16dp + 2dp + 3dp + 10dp + 4dp + 18dp 1dp 3 @@ -62,4 +82,11 @@ 16dp + 6sp + 8sp + 6sp + 4sp + + 14dp + diff --git a/res/values/strings.xml b/res/values/strings.xml index a9e4adff11..e5d00d8808 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -110,11 +110,10 @@ Selected contact was invalid - Not delivered + Send failed, tap for details Received key exchange message, tap to process. %1$s has left the group. - Tap for details - Tap for unsecured fallback + Send failed, tap for unsecured fallback Fallback to unencrypted SMS? Fallback to unencrypted MMS? This message will not be encrypted because the recipient is no longer a Signal user.\n\nSend unsecured message? @@ -251,11 +250,17 @@ None - Just now + Now %d min Today Yesterday + + Sending + Sent + Delivered + Read + Unlink \'%s\'? By unlinking this device, it will no longer be able to send or receive messages. @@ -400,13 +405,16 @@ Received a message encrypted using an old version of Signal that is no longer supported. Please ask the sender to update to the most recent version and resend the message. You have left the group. You updated the group. + You called + Contact called + Missed call %s updated the group. %s called you Called %s Missed call from %s %s is on Signal! - You set disappearing message time to %1$s. - %1$s set disappearing message time to %2$s. + You set the disappearing message timer to %1$s. + %1$s set the disappearing message timer to %2$s. Your safety number with %s has changed. You marked your safety number with %s verified You marked your safety number with %s verified from another device diff --git a/res/values/styles.xml b/res/values/styles.xml index c9bc2e6d46..d7d834e57e 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -175,7 +175,7 @@ @drawable/error_round - + + + + + + + + \ No newline at end of file diff --git a/res/values/themes.xml b/res/values/themes.xml index 45a58f1f8b..a1a6286e69 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -23,9 +23,6 @@ @color/gray50 @color/gray70 @color/white - - @color/grey_100 - @color/grey_400