diff options
Diffstat (limited to '')
85 files changed, 377 insertions, 339 deletions
diff --git a/src/main/res/drawable-hdpi/ic_android_grey600_48dp.png b/src/main/res/drawable-hdpi/ic_android_grey600_48dp.png Binary files differnew file mode 100644 index 000000000..3a39d9cc4 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_android_grey600_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_delete_black_24dp.png b/src/main/res/drawable-hdpi/ic_delete_black_24dp.png Binary files differnew file mode 100644 index 000000000..789d96d42 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_delete_black_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_menu_white_24dp.png b/src/main/res/drawable-hdpi/ic_menu_white_24dp.png Binary files differnew file mode 100644 index 000000000..aeb1e31a0 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_menu_white_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_qrcode_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_qrcode_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..5114bbd0d --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_qrcode_grey600_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_qrcode_scan_white_24dp.png b/src/main/res/drawable-hdpi/ic_qrcode_scan_white_24dp.png Binary files differnew file mode 100644 index 000000000..50aa91fca --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_qrcode_scan_white_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_qrcode_white_24dp.png b/src/main/res/drawable-hdpi/ic_qrcode_white_24dp.png Binary files differnew file mode 100644 index 000000000..cf8d6a8c9 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_qrcode_white_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_send_attachment_online.png b/src/main/res/drawable-hdpi/ic_send_attachment_online.png Binary files differindex c6c00dfa9..aa35e764d 100644 --- a/src/main/res/drawable-hdpi/ic_send_attachment_online.png +++ b/src/main/res/drawable-hdpi/ic_send_attachment_online.png diff --git a/src/main/res/drawable-hdpi/ic_share_black_24dp.png b/src/main/res/drawable-hdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..7331f79b3 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_share_black_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_video_black_24dp.png b/src/main/res/drawable-hdpi/ic_video_black_24dp.png Binary files differnew file mode 100644 index 000000000..afd308697 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_video_black_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_video_white_24dp.png b/src/main/res/drawable-hdpi/ic_video_white_24dp.png Binary files differnew file mode 100644 index 000000000..ca414b356 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_video_white_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_android_grey600_48dp.png b/src/main/res/drawable-mdpi/ic_android_grey600_48dp.png Binary files differnew file mode 100644 index 000000000..5040f8ef2 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_android_grey600_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_delete_black_24dp.png b/src/main/res/drawable-mdpi/ic_delete_black_24dp.png Binary files differnew file mode 100644 index 000000000..7981a3def --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_delete_black_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_menu_white_24dp.png b/src/main/res/drawable-mdpi/ic_menu_white_24dp.png Binary files differnew file mode 100644 index 000000000..60e4398a3 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_menu_white_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_qrcode_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_qrcode_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..24cb66d42 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_qrcode_grey600_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_qrcode_scan_white_24dp.png b/src/main/res/drawable-mdpi/ic_qrcode_scan_white_24dp.png Binary files differnew file mode 100644 index 000000000..ad5be5cdf --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_qrcode_scan_white_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_qrcode_white_24dp.png b/src/main/res/drawable-mdpi/ic_qrcode_white_24dp.png Binary files differnew file mode 100644 index 000000000..7e28f95dc --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_qrcode_white_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_send_attachment_online.png b/src/main/res/drawable-mdpi/ic_send_attachment_online.png Binary files differindex 7b2157825..921f79ffa 100644 --- a/src/main/res/drawable-mdpi/ic_send_attachment_online.png +++ b/src/main/res/drawable-mdpi/ic_send_attachment_online.png diff --git a/src/main/res/drawable-mdpi/ic_share_black_24dp.png b/src/main/res/drawable-mdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..d4ebebd06 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_share_black_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_video_black_24dp.png b/src/main/res/drawable-mdpi/ic_video_black_24dp.png Binary files differnew file mode 100644 index 000000000..c4be08a55 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_video_black_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_video_white_24dp.png b/src/main/res/drawable-mdpi/ic_video_white_24dp.png Binary files differnew file mode 100644 index 000000000..60cc35c42 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_video_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_android_grey600_48dp.png b/src/main/res/drawable-xhdpi/ic_android_grey600_48dp.png Binary files differnew file mode 100644 index 000000000..eeefeda38 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_android_grey600_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png Binary files differnew file mode 100644 index 000000000..16e6e7055 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png b/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png Binary files differnew file mode 100644 index 000000000..5b7f7480b --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_qrcode_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_qrcode_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..3a100a3ed --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_qrcode_grey600_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_qrcode_scan_white_24dp.png b/src/main/res/drawable-xhdpi/ic_qrcode_scan_white_24dp.png Binary files differnew file mode 100644 index 000000000..f22df8ea7 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_qrcode_scan_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_qrcode_white_24dp.png b/src/main/res/drawable-xhdpi/ic_qrcode_white_24dp.png Binary files differnew file mode 100644 index 000000000..fcb2de2c3 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_qrcode_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_send_attachment_online.png b/src/main/res/drawable-xhdpi/ic_send_attachment_online.png Binary files differindex 5ec947bf6..d1ba3d988 100644 --- a/src/main/res/drawable-xhdpi/ic_send_attachment_online.png +++ b/src/main/res/drawable-xhdpi/ic_send_attachment_online.png diff --git a/src/main/res/drawable-xhdpi/ic_share_black_24dp.png b/src/main/res/drawable-xhdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..5c058d4eb --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_share_black_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_video_black_24dp.png b/src/main/res/drawable-xhdpi/ic_video_black_24dp.png Binary files differnew file mode 100644 index 000000000..f695100bb --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_video_black_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_video_white_24dp.png b/src/main/res/drawable-xhdpi/ic_video_white_24dp.png Binary files differnew file mode 100644 index 000000000..2c764cbb5 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_video_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_android_grey600_48dp.png b/src/main/res/drawable-xxhdpi/ic_android_grey600_48dp.png Binary files differnew file mode 100644 index 000000000..42395613f --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_android_grey600_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png Binary files differnew file mode 100644 index 000000000..d118ae77b --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png Binary files differnew file mode 100644 index 000000000..dcbdc6ac9 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_qrcode_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_qrcode_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..1ff70a5c8 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_qrcode_grey600_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_qrcode_scan_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_qrcode_scan_white_24dp.png Binary files differnew file mode 100644 index 000000000..796e477ae --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_qrcode_scan_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_qrcode_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_qrcode_white_24dp.png Binary files differnew file mode 100644 index 000000000..2928df951 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_qrcode_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_send_attachment_online.png b/src/main/res/drawable-xxhdpi/ic_send_attachment_online.png Binary files differindex 34791812f..19e90728f 100644 --- a/src/main/res/drawable-xxhdpi/ic_send_attachment_online.png +++ b/src/main/res/drawable-xxhdpi/ic_send_attachment_online.png diff --git a/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..f52683b7f --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_video_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_video_black_24dp.png Binary files differnew file mode 100644 index 000000000..2cb46bf1a --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_video_black_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_video_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_video_white_24dp.png Binary files differnew file mode 100644 index 000000000..77ef5ec76 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_video_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_android_grey600_48dp.png b/src/main/res/drawable-xxxhdpi/ic_android_grey600_48dp.png Binary files differnew file mode 100644 index 000000000..7e9d48b6a --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_android_grey600_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png Binary files differnew file mode 100644 index 000000000..c49da5b4e --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png Binary files differnew file mode 100644 index 000000000..0966d1f16 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_qrcode_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_qrcode_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..ccd1ac6b7 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_qrcode_grey600_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_qrcode_scan_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_qrcode_scan_white_24dp.png Binary files differnew file mode 100644 index 000000000..8b90377f5 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_qrcode_scan_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_qrcode_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_qrcode_white_24dp.png Binary files differnew file mode 100644 index 000000000..3ec200f7a --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_qrcode_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_send_attachment_online.png b/src/main/res/drawable-xxxhdpi/ic_send_attachment_online.png Binary files differindex 50764c450..319709583 100644 --- a/src/main/res/drawable-xxxhdpi/ic_send_attachment_online.png +++ b/src/main/res/drawable-xxxhdpi/ic_send_attachment_online.png diff --git a/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..484b6d474 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_video_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_video_black_24dp.png Binary files differnew file mode 100644 index 000000000..bd76e9db6 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_video_black_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_video_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_video_white_24dp.png Binary files differnew file mode 100644 index 000000000..d8ab46d9f --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_video_white_24dp.png diff --git a/src/main/res/drawable/date_bubble.xml b/src/main/res/drawable/date_bubble.xml index 0ea7b0761..3edf349e9 100644 --- a/src/main/res/drawable/date_bubble.xml +++ b/src/main/res/drawable/date_bubble.xml @@ -11,7 +11,11 @@ android:left="6dp" android:right="6dp" android:top="6dp" /> + <stroke + android:width="1dp" + android:color="@color/grey500"> + </stroke> <solid android:color="@color/lightgreen"> </solid> -</shape> +</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/date_bubble_dark.xml b/src/main/res/drawable/date_bubble_dark.xml index 64f5c1515..345c315c1 100644 --- a/src/main/res/drawable/date_bubble_dark.xml +++ b/src/main/res/drawable/date_bubble_dark.xml @@ -11,7 +11,11 @@ android:left="6dp" android:right="6dp" android:top="6dp" /> + <stroke + android:width="1dp" + android:color="@color/grey800"> + </stroke> <solid android:color="@color/darkgreen"> </solid> -</shape> +</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_light.xml b/src/main/res/drawable/message_bubble_received_light.xml index 6619984b3..32e146460 100644 --- a/src/main/res/drawable/message_bubble_received_light.xml +++ b/src/main/res/drawable/message_bubble_received_light.xml @@ -1,29 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:gravity="top|left"> - <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="36dp" - android:height="24dp" - android:viewportWidth="36" - android:viewportHeight="24" > - <path - android:fillColor="@color/lightwhite" - android:pathData="m2,0 c6,0 10,6 10,10L18,0z" /> - </vector> - </item> - <item android:left="12dp"> - <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <corners - android:topLeftRadius="0dp" - android:topRightRadius="5dp" - android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp"/> - <padding - android:bottom="2dp" - android:left="18dp" - android:right="6dp" - android:top="2dp" /> - <solid android:color="@color/lightwhite" /> - </shape> - </item> -</layer-list> +<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> + <corners + android:topLeftRadius="0dp" + android:topRightRadius="5dp" + android:bottomRightRadius="5dp" + android:bottomLeftRadius="5dp"> + </corners> + <padding + android:bottom="2dp" + android:left="6dp" + android:right="6dp" + android:top="2dp" /> + <stroke + android:width="1dp" + android:color="@color/grey500"> + </stroke> + <solid + android:color="@color/lightwhite"> + </solid> +</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_light_dark.xml b/src/main/res/drawable/message_bubble_received_light_dark.xml index 9514bc757..8f9132566 100644 --- a/src/main/res/drawable/message_bubble_received_light_dark.xml +++ b/src/main/res/drawable/message_bubble_received_light_dark.xml @@ -1,29 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:gravity="top|left"> - <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="36dp" - android:height="24dp" - android:viewportWidth="36" - android:viewportHeight="24" > - <path - android:fillColor="@color/darkwhite" - android:pathData="m2,0 c6,0 10,6 10,10L18,0z" /> - </vector> - </item> - <item android:left="12dp"> - <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <corners - android:topLeftRadius="0dp" - android:topRightRadius="5dp" - android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="2dp" - android:left="18dp" - android:right="6dp" - android:top="2dp" /> - <solid android:color="@color/darkwhite" /> - </shape> - </item> -</layer-list> +<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> + <corners + android:topLeftRadius="0dp" + android:topRightRadius="5dp" + android:bottomRightRadius="5dp" + android:bottomLeftRadius="5dp"> + </corners> + <padding + android:bottom="2dp" + android:left="6dp" + android:right="6dp" + android:top="2dp" /> + <stroke + android:width="1dp" + android:color="@color/grey700"> + </stroke> + <solid + android:color="@color/darkwhite"> + </solid> +</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_warning.xml b/src/main/res/drawable/message_bubble_received_warning.xml index ae3222a9e..b3bf6d451 100644 --- a/src/main/res/drawable/message_bubble_received_warning.xml +++ b/src/main/res/drawable/message_bubble_received_warning.xml @@ -1,29 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:gravity="top|left"> - <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="36dp" - android:height="24dp" - android:viewportWidth="36" - android:viewportHeight="24" > - <path - android:fillColor="@color/lightred" - android:pathData="m2,0 c6,0 10,6 10,10L18,0z" /> - </vector> - </item> - <item android:left="12dp"> - <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <corners - android:topLeftRadius="0dp" - android:topRightRadius="5dp" - android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="2dp" - android:left="18dp" - android:right="6dp" - android:top="2dp" /> - <solid android:color="@color/lightred" /> - </shape> - </item> -</layer-list> +<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> + <corners + android:topLeftRadius="0dp" + android:topRightRadius="5dp" + android:bottomRightRadius="5dp" + android:bottomLeftRadius="5dp"> + </corners> + <padding + android:bottom="4dp" + android:left="6dp" + android:right="6dp" + android:top="4dp" /> + <stroke + android:width="1dp" + android:color="@color/grey500"> + </stroke> + <solid + android:color="@color/lightred"> + </solid> +</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_warning_dark.xml b/src/main/res/drawable/message_bubble_received_warning_dark.xml index 9f8aa779e..5867f67ce 100644 --- a/src/main/res/drawable/message_bubble_received_warning_dark.xml +++ b/src/main/res/drawable/message_bubble_received_warning_dark.xml @@ -1,29 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:gravity="top|left"> - <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="36dp" - android:height="24dp" - android:viewportWidth="36" - android:viewportHeight="24" > - <path - android:fillColor="@color/darkred" - android:pathData="m2,0 c6,0 10,6 10,10L18,0z" /> - </vector> - </item> - <item android:left="12dp"> - <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <corners - android:topLeftRadius="0dp" - android:topRightRadius="5dp" - android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="2dp" - android:left="18dp" - android:right="6dp" - android:top="2dp" /> - <solid android:color="@color/darkred" /> - </shape> - </item> -</layer-list> +<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> + <corners + android:topLeftRadius="0dp" + android:topRightRadius="5dp" + android:bottomRightRadius="5dp" + android:bottomLeftRadius="5dp"> + </corners> + <padding + android:bottom="4dp" + android:left="6dp" + android:right="6dp" + android:top="4dp" /> + <stroke + android:width="1dp" + android:color="@color/grey700"> + </stroke> + <solid + android:color="@color/darkred"> + </solid> +</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_blue.xml b/src/main/res/drawable/message_bubble_sent_blue.xml index 8e519ff6b..1ee3ad0c8 100644 --- a/src/main/res/drawable/message_bubble_sent_blue.xml +++ b/src/main/res/drawable/message_bubble_sent_blue.xml @@ -1,30 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:gravity="bottom|right"> - <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="36dp" - android:height="24dp" - android:viewportWidth="36" - android:viewportHeight="24" > - <path - android:fillColor="@color/lightblue" - android:pathData="m 34,24 c-6,0 -10,-6 -10,-10 l -6,12 z" /> - - </vector> - </item> - <item android:right="12dp"> - <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <corners - android:topLeftRadius="5dp" - android:topRightRadius="5dp" - android:bottomRightRadius="0dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="2dp" - android:left="6dp" - android:right="18dp" - android:top="2dp" /> - <solid android:color="@color/lightblue" /> - </shape> - </item> -</layer-list> +<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> + <corners + android:topLeftRadius="5dp" + android:topRightRadius="5dp" + android:bottomRightRadius="0dp" + android:bottomLeftRadius="5dp"> + </corners> + <padding + android:bottom="4dp" + android:left="6dp" + android:right="6dp" + android:top="4dp" /> + <stroke + android:width="1dp" + android:color="@color/grey500"> + </stroke> + <solid + android:color="@color/lightblue"> + </solid> +</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_blue_dark.xml b/src/main/res/drawable/message_bubble_sent_blue_dark.xml index e6f3c88c1..d9853bf74 100644 --- a/src/main/res/drawable/message_bubble_sent_blue_dark.xml +++ b/src/main/res/drawable/message_bubble_sent_blue_dark.xml @@ -1,29 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:gravity="bottom|right"> - <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="36dp" - android:height="24dp" - android:viewportWidth="36" - android:viewportHeight="24" > - <path - android:fillColor="@color/darkblue" - android:pathData="m 34,24 c-6,0 -10,-6 -10,-10 l -6,12 z" /> - </vector> - </item> - <item android:right="12dp"> - <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <corners - android:topLeftRadius="5dp" - android:topRightRadius="5dp" - android:bottomRightRadius="0dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="2dp" - android:left="6dp" - android:right="18dp" - android:top="2dp" /> - <solid android:color="@color/darkblue" /> - </shape> - </item> -</layer-list> +<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> + <corners + android:topLeftRadius="5dp" + android:topRightRadius="5dp" + android:bottomRightRadius="0dp" + android:bottomLeftRadius="5dp"> + </corners> + <padding + android:bottom="4dp" + android:left="6dp" + android:right="6dp" + android:top="4dp" /> + <stroke + android:width="1dp" + android:color="@color/grey700"> + </stroke> + <solid + android:color="@color/darkblue"> + </solid> +</shape>
\ No newline at end of file diff --git a/src/main/res/layout/ab_title.xml b/src/main/res/layout/ab_title.xml index a20e9f8bc..79c9d61f7 100644 --- a/src/main/res/layout/ab_title.xml +++ b/src/main/res/layout/ab_title.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:gravity="start|center_vertical"> - <android.support.text.emoji.widget.EmojiTextView + <TextView android:id="@android:id/text1" style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title" android:layout_width="match_parent" @@ -19,7 +19,7 @@ android:onClick="onClick" android:paddingTop="1dp" /> - <android.support.text.emoji.widget.EmojiTextView + <TextView android:id="@android:id/text2" style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle" android:layout_width="match_parent" diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index 9b638172a..e56ca6a95 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -15,6 +15,8 @@ android:layout_alignParentLeft="true" android:contentDescription="@string/account_image_description" android:padding="1dp" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <LinearLayout diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 268071fbd..58fe0c901 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -43,7 +43,7 @@ android:orientation="vertical" android:padding="@dimen/card_padding_regular"> - <android.support.text.emoji.widget.EmojiTextView + <TextView android:id="@+id/contact_display_name" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -114,7 +114,7 @@ android:layout_marginTop="4dp" android:textAppearance="@style/TextAppearance.Conversations.Subhead" /> - <android.support.text.emoji.widget.EmojiTextView + <TextView android:id="@+id/status_message" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -124,7 +124,7 @@ android:gravity="center_horizontal" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> - <android.support.text.emoji.widget.EmojiTextView + <TextView android:id="@+id/resource" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -253,7 +253,7 @@ <android.support.v7.widget.RecyclerView android:id="@+id/media" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="100dp" android:layout_marginEnd="-2dp" android:layout_marginStart="-2dp" android:orientation="horizontal" diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 275a1d894..b8c48a382 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -29,10 +29,10 @@ android:id="@+id/editor" 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" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:orientation="vertical" android:padding="@dimen/card_padding_regular" card_view:cardBackgroundColor="?attr/color_background_secondary"> @@ -51,9 +51,11 @@ android:layout_marginBottom="@dimen/avatar_item_distance" android:adjustViewBounds="true" android:contentDescription="@string/account_image_description" - android:maxHeight="384dp" android:maxWidth="384dp" + android:maxHeight="384dp" android:padding="1dp" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <LinearLayout @@ -177,8 +179,8 @@ android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_gravity="center_horizontal" - android:layout_marginBottom="4dp" android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:text="@string/show_privacy" android:visibility="gone" /> @@ -188,8 +190,8 @@ android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_gravity="center_horizontal" - android:layout_marginBottom="4dp" android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:text="@string/show_termsofuse" android:visibility="gone" /> </LinearLayout> @@ -200,10 +202,10 @@ android:id="@+id/os_optimization" 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" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:visibility="gone" card_view:cardBackgroundColor="?attr/color_background_secondary"> @@ -258,10 +260,10 @@ android:id="@+id/stats" android:layout_width="fill_parent" android:layout_height="fill_parent" - 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" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="@drawable/infocard_border" android:orientation="vertical" android:padding="@dimen/card_padding_regular" @@ -554,9 +556,11 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/action_copy_to_clipboard" + android:layout_toStartOf="@+id/key_actions" + android:layout_toLeftOf="@+id/key_actions" android:orientation="vertical"> <TextView @@ -574,17 +578,25 @@ </LinearLayout> - <ImageButton - android:id="@+id/action_copy_to_clipboard" + <LinearLayout + android:id="@+id/key_actions" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/copy_otr_clipboard_description" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_copy" - android:visibility="visible" /> + android:orientation="horizontal"> + + <ImageButton + android:id="@+id/action_copy_to_clipboard" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/copy_otr_clipboard_description" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_copy" + android:visibility="visible" /> + </LinearLayout> </RelativeLayout> <RelativeLayout @@ -596,8 +608,10 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_centerVertical="true" + android:layout_toStartOf="@+id/axolotl_actions" android:layout_toLeftOf="@+id/axolotl_actions" android:orientation="vertical"> @@ -618,9 +632,10 @@ android:id="@+id/axolotl_actions" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:orientation="vertical"> + android:orientation="horizontal"> <ImageButton android:id="@+id/action_copy_axolotl_to_clipboard" @@ -650,10 +665,10 @@ android:id="@+id/other_device_keys_card" 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" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:visibility="gone" card_view:cardBackgroundColor="?attr/color_background_secondary"> @@ -694,11 +709,11 @@ android:id="@+id/button_bar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:layout_alignParentStart="true"> + android:layout_alignParentBottom="true"> <Button android:id="@+id/cancel_button" @@ -711,8 +726,8 @@ <View android:layout_width="1dp" android:layout_height="fill_parent" - android:layout_marginBottom="7dp" - android:layout_marginTop="7dp" /> + android:layout_marginTop="7dp" + android:layout_marginBottom="7dp" /> <Button android:id="@+id/save_button" diff --git a/src/main/res/layout/activity_fullscreen_message.xml b/src/main/res/layout/activity_media_viewer.xml index c1a1bc619..2eaad0d04 100644 --- a/src/main/res/layout/activity_fullscreen_message.xml +++ b/src/main/res/layout/activity_media_viewer.xml @@ -13,7 +13,7 @@ android:layout_alignParentRight="true" android:layout_alignParentTop="true"> - <com.github.chrisbanes.photoview.PhotoView + <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView android:id="@id/message_image_view" android:layout_width="match_parent" android:layout_height="match_parent" @@ -32,6 +32,6 @@ android:layout_height="wrap_content" android:layout_gravity="right|top" android:layout_margin="16dp" - android:src="?attr/icon_share" /> + android:src="@drawable/ic_menu_white_24dp" /> </FrameLayout> </RelativeLayout>
\ 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 e1ac744ea..29400a246 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -26,11 +26,10 @@ <android.support.v7.widget.CardView android:layout_width="match_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" - android:orientation="vertical" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout @@ -53,10 +52,10 @@ android:id="@+id/muc_display" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:layout_toLeftOf="@+id/edit_muc_name_button" + android:layout_alignParentLeft="true" android:layout_toStartOf="@+id/edit_muc_name_button" + android:layout_toLeftOf="@+id/edit_muc_name_button" android:orientation="vertical"> <TextView @@ -76,8 +75,8 @@ android:id="@+id/jid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_below="@+id/muc_subject" + android:layout_alignParentLeft="true" android:text="@string/account_settings_example_jabber_id" android:textAppearance="@style/TextAppearance.Conversations.Body1" android:textIsSelectable="true" @@ -89,10 +88,10 @@ android:id="@+id/muc_editor" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:layout_toLeftOf="@+id/edit_muc_name_button" + android:layout_alignParentLeft="true" android:layout_toStartOf="@+id/edit_muc_name_button" + android:layout_toLeftOf="@+id/edit_muc_name_button" android:orientation="vertical" android:visibility="gone"> @@ -130,9 +129,9 @@ android:id="@+id/edit_muc_name_button" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentTop="true" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:layout_alignParentTop="true" android:alpha="?attr/icon_alpha" android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/image_button_padding" @@ -153,10 +152,12 @@ android:layout_marginEnd="@dimen/avatar_item_distance" android:layout_marginRight="@dimen/avatar_item_distance" android:adjustViewBounds="true" - android:maxHeight="384dp" android:maxWidth="384dp" + android:maxHeight="384dp" android:padding="1dp" android:scaleType="centerCrop" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> </RelativeLayout> @@ -279,12 +280,12 @@ <android.support.v7.widget.CardView android:id="@+id/media_wrapper" - android:layout_width="fill_parent" + android:layout_width="match_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" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout @@ -295,14 +296,14 @@ <android.support.v7.widget.RecyclerView android:id="@+id/media" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="100dp" 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" /> + android:paddingTop="@dimen/card_padding_regular" + android:paddingEnd="@dimen/card_padding_regular" + android:paddingBottom="@dimen/card_padding_list" /> <LinearLayout android:layout_width="wrap_content" @@ -327,11 +328,10 @@ <android.support.v7.widget.CardView android:layout_width="match_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" - android:orientation="vertical" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout @@ -355,10 +355,12 @@ android:id="@+id/your_photo" android:layout_width="72dp" android:layout_height="72dp" - android:layout_alignParentEnd="false" android:layout_alignParentLeft="true" + android:layout_alignParentEnd="false" android:layout_alignParentRight="false" android:padding="1dp" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <LinearLayout @@ -369,7 +371,7 @@ android:orientation="vertical" android:paddingLeft="@dimen/avatar_item_distance"> - <android.support.text.emoji.widget.EmojiTextView + <TextView android:id="@+id/muc_your_nick" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -429,11 +431,10 @@ android:id="@+id/muc_more_details" android:layout_width="match_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" - android:orientation="vertical" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout @@ -458,7 +459,7 @@ android:layout_weight="1" android:divider="?android:dividerHorizontal" android:orientation="vertical" - android:showDividers="middle"></LinearLayout> + android:showDividers="middle" /> </LinearLayout> </android.support.v7.widget.CardView> diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml index 1db8a159d..0fb666365 100644 --- a/src/main/res/layout/activity_publish_profile_picture.xml +++ b/src/main/res/layout/activity_publish_profile_picture.xml @@ -6,80 +6,89 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/color_background_tertiary"> + android:background="?attr/color_background_tertiary" + android:orientation="vertical"> <include android:id="@+id/toolbar" layout="@layout/toolbar" /> - <android.support.v7.widget.CardView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_below="@id/toolbar" - 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" - card_view:cardBackgroundColor="?attr/color_background_secondary"> - - <LinearLayout + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_above="@id/button_bar" + android:layout_below="@id/toolbar"> + + <android.support.v7.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:orientation="vertical" - android:padding="@dimen/card_padding_regular"> - - <FrameLayout - android:id="@+id/account_image_wrapper" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:layout_marginTop="@dimen/publish_avatar_top_margin"> - - <com.makeramen.roundedimageview.RoundedImageView - android:id="@+id/account_image" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" + card_view:cardBackgroundColor="?attr/color_background_secondary"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center_horizontal" + android:orientation="vertical" + android:padding="@dimen/card_padding_regular"> + + <FrameLayout + android:id="@+id/account_image_wrapper" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:adjustViewBounds="true" - android:maxHeight="384dp" - android:maxWidth="384dp" - android:padding="1dp" - android:scaleType="centerCrop" - app:riv_corner_radius="@dimen/rounded_image_border" /> - </FrameLayout> - - <TextView - android:id="@+id/hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/touch_to_choose_picture" - android:textAppearance="@style/TextAppearance.Conversations.Body1" /> - - <TextView - android:id="@+id/secondary_hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/or_long_press_for_default" - android:textAppearance="@style/TextAppearance.Conversations.Body1" /> - - <TextView - android:id="@+id/hint_or_warning" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:layout_marginTop="8dp" - android:textAppearance="@style/TextAppearance.Conversations.Body1" /> - - </LinearLayout> - </android.support.v7.widget.CardView> + android:layout_marginTop="@dimen/publish_avatar_top_margin" + android:layout_marginBottom="8dp"> + + <com.makeramen.roundedimageview.RoundedImageView + android:id="@+id/account_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:adjustViewBounds="true" + android:maxWidth="384dp" + android:maxHeight="384dp" + android:padding="1dp" + android:scaleType="centerCrop" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" + app:riv_corner_radius="@dimen/rounded_image_border" /> + </FrameLayout> + + <TextView + android:id="@+id/hint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/touch_to_choose_picture" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + + <TextView + android:id="@+id/secondary_hint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/or_long_press_for_default" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + + <TextView + android:id="@+id/hint_or_warning" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + + </LinearLayout> + </android.support.v7.widget.CardView> + </ScrollView> <LinearLayout android:id="@+id/button_bar" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true"> + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true"> <Button android:id="@+id/cancel_button" @@ -92,8 +101,8 @@ <View android:layout_width="1dp" android:layout_height="fill_parent" - android:layout_marginBottom="7dp" android:layout_marginTop="7dp" + android:layout_marginBottom="7dp" android:background="?attr/divider" /> <Button diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml index 9635d4c47..09e0ac9bf 100644 --- a/src/main/res/layout/contact.xml +++ b/src/main/res/layout/contact.xml @@ -13,6 +13,8 @@ android:layout_width="56dp" android:layout_height="56dp" android:layout_alignParentLeft="true" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <LinearLayout @@ -23,7 +25,7 @@ android:orientation="vertical" android:paddingLeft="@dimen/avatar_item_distance"> - <android.support.text.emoji.widget.EmojiTextView + <TextView android:id="@+id/contact_display_name" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index cbd884ae2..ed0e9e1cc 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -24,6 +24,8 @@ android:layout_alignParentLeft="true" android:padding="1dp" android:scaleType="centerCrop" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <RelativeLayout @@ -144,7 +146,7 @@ android:visibility="gone" app:backgroundColor="?attr/colorAccent" /> - <de.pixart.messenger.ui.widget.UnreadCountCustomView + <de.pixart.messenger.ui.widget.FailedCountCustomView android:id="@+id/conversation_failed" android:layout_width="?attr/IconSize" android:layout_height="?attr/IconSize" diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index eca67f91e..8917333c1 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -30,6 +30,7 @@ android:layout_height="wrap_content" android:layout_alignBottom="@+id/messages_view" android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" android:alpha="0.85" android:src="?attr/icon_scroll_down" android:visibility="gone" @@ -42,8 +43,10 @@ android:layout_width="?attr/IconSize" android:layout_height="?attr/IconSize" android:layout_alignEnd="@+id/scroll_to_bottom_button" + android:layout_alignRight="@+id/scroll_to_bottom_button" android:layout_alignTop="@+id/scroll_to_bottom_button" android:layout_marginEnd="8dp" + android:layout_marginRight="8dp" android:layout_marginTop="16dp" android:elevation="8dp" android:visibility="gone" @@ -84,7 +87,9 @@ android:id="@+id/media_preview" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentLeft="true" android:layout_alignParentStart="true" + android:layout_toLeftOf="@+id/textSendButton" android:layout_toStartOf="@+id/textSendButton" android:background="@drawable/message_bubble_sent_blue" android:orientation="horizontal" diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml index 296944565..044f8c64d 100644 --- a/src/main/res/layout/message_content.xml +++ b/src/main/res/layout/message_content.xml @@ -13,6 +13,8 @@ android:maxHeight="500dp" android:maxWidth="500dp" android:scaleType="centerCrop" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <de.pixart.messenger.ui.widget.CopyTextView diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index f8b5fce95..2c6fd044a 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -16,6 +16,8 @@ android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:scaleType="fitXY" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dip" app:riv_corner_radius="@dimen/rounded_image_border" /> <LinearLayout @@ -23,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_marginLeft="-7dp" + android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_toRightOf="@+id/message_photo" android:background="@drawable/message_bubble_received_light" diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index 188e466d5..2526e4dd2 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -23,6 +23,8 @@ android:layout_width="48dp" android:layout_height="48dp" android:scaleType="fitXY" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <View @@ -37,7 +39,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_marginLeft="4dp" - android:layout_marginRight="-7dp" + android:layout_marginRight="4dp" android:layout_toLeftOf="@+id/message_photo_box" android:layout_toStartOf="@+id/message_photo_box" android:background="@drawable/message_bubble_sent_blue" diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml index bd731cbe4..d42637175 100644 --- a/src/main/res/layout/message_status.xml +++ b/src/main/res/layout/message_status.xml @@ -29,6 +29,8 @@ android:padding="0dp" android:scaleType="fitXY" android:visibility="gone" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <TextView diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml index 50243150b..b9268e4f9 100644 --- a/src/main/res/menu/contact_details.xml +++ b/src/main/res/menu/contact_details.xml @@ -11,7 +11,7 @@ <item android:id="@+id/action_share" - android:icon="?attr/icon_share" + android:icon="@drawable/ic_share_white_24dp" android:orderInCategory="15" app:showAsAction="always" android:title="@string/share_uri_with"> diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index fbc5841ea..09919b9fe 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -5,11 +5,12 @@ android:id="@+id/action_change_presence" android:icon="@drawable/ic_new_releases_white_24dp" android:title="@string/edit_status_message" - app:showAsAction="always" /> + app:showAsAction="ifRoom" /> - <item android:id="@+id/action_share" + <item + android:id="@+id/action_share" + android:icon="@drawable/ic_share_white_24dp" android:title="@string/share_uri_with" - android:icon="?attr/icon_share" app:showAsAction="always"> <menu> <item @@ -21,57 +22,60 @@ <item android:id="@+id/action_share_barcode" android:title="@string/share_as_barcode" /> - <item - android:id="@+id/action_show_qr_code" - android:title="@string/show_qr_code" /> </menu> </item> <item + android:id="@+id/action_show_qr_code" + android:icon="@drawable/ic_qrcode_white_24dp" + android:title="@string/show_qr_code" + app:showAsAction="always" /> + + <item android:id="@+id/action_show_block_list" - app:showAsAction="always" android:icon="@drawable/ic_speaker_notes_off_white_24dp" - android:title="@string/show_block_list" /> + android:title="@string/show_block_list" + app:showAsAction="ifRoom" /> <item android:id="@+id/action_renew_certificate" - app:showAsAction="never" android:title="@string/action_renew_certificate" - android:visible="false" /> + android:visible="false" + app:showAsAction="never" /> <item android:id="@+id/action_server_info_show_more" android:checkable="true" android:checked="false" - app:showAsAction="never" - android:title="@string/server_info_show_more" /> + android:title="@string/server_info_show_more" + app:showAsAction="never" /> <item android:id="@+id/action_mam_prefs" android:icon="@drawable/ic_cloud_white_24dp" - app:showAsAction="always" - android:title="@string/mam_prefs" /> + android:title="@string/mam_prefs" + app:showAsAction="ifRoom" /> <item android:id="@+id/action_show_password" - app:showAsAction="never" - android:title="@string/show_password" /> + android:title="@string/show_password" + app:showAsAction="never" /> <item android:id="@+id/action_change_password_on_server" - app:showAsAction="always" android:icon="@drawable/ic_vpn_key_white_24dp" - android:title="@string/change_password" /> + android:title="@string/change_password" + app:showAsAction="ifRoom" /> <item android:id="@+id/mgmt_account_reconnect" - app:showAsAction="never" - android:title="@string/mgmt_account_reconnect" /> + android:title="@string/mgmt_account_reconnect" + app:showAsAction="never" /> <item android:id="@+id/mgmt_account_announce_pgp" android:title="@string/mgmt_account_publish_pgp" /> <item android:id="@+id/action_settings" android:orderInCategory="100" - app:showAsAction="never" - android:title="@string/action_settings" /> + android:title="@string/action_settings" + app:showAsAction="never" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/media_viewer.xml b/src/main/res/menu/media_viewer.xml new file mode 100644 index 000000000..c3898c79b --- /dev/null +++ b/src/main/res/menu/media_viewer.xml @@ -0,0 +1,17 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/action_share" + android:icon="?attr/icon_share" + android:orderInCategory="10" + android:title="@string/share" /> + <item + android:id="@+id/action_open" + android:orderInCategory="20" + android:title="@string/action_open" /> + <item + android:id="@+id/action_delete" + android:icon="?attr/icon_delete" + android:orderInCategory="30" + android:title="@string/action_delete" /> +</menu>
\ No newline at end of file diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml index b5e74f271..9f12e7333 100644 --- a/src/main/res/menu/muc_details.xml +++ b/src/main/res/menu/muc_details.xml @@ -4,7 +4,7 @@ <item android:id="@+id/action_share" - android:icon="?attr/icon_share" + android:icon="@drawable/ic_share_white_24dp" android:orderInCategory="15" android:title="@string/share_uri_with" app:showAsAction="always"> diff --git a/src/main/res/values-fil/strings.xml b/src/main/res/values-fil/strings.xml index f71f50243..fe40ec093 100644 --- a/src/main/res/values-fil/strings.xml +++ b/src/main/res/values-fil/strings.xml @@ -317,7 +317,7 @@ <string name="delete_x_file">Burahin %s</string> <string name="file">kikil</string> <string name="open_x_file">Buksan %s</string> - <string name="sending_file">pagpapadala (%1$d% nakumpleto)</string> + <string name="sending_file">pagpapadala (%1$d%% nakumpleto)</string> <string name="preparing_file">Paghahanda sa kikil para sa transmisyon</string> <string name="x_file_offered_for_download">%s inaalok para idownload</string> <string name="cancel_transmission">Kansel transmisyon</string> diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index d9528a409..9b5a71e96 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -433,7 +433,7 @@ <string name="download_failed_could_not_write_file">İndirme başarısız: Dosya yazılamadı</string> <string name="action_check_update">Güncellemeleri kontrol et</string> <string name="title_activity_updater">Servisi güncelle</string> - <string name="update_available">Sürüm% 1 $ s mevcut. \ N \ nFilesize:% 2 $ s \ n \ n% 1 $ s sürümüne şimdi mi güncelleştiniz?</string> + <string name="update_available">Sürüm %1$s mevcut.\n\nFilesize: %2$s \n\n%1$s sürümüne şimdi mi güncelleştiniz?</string> <string name="remind_later">sonra</string> <string name="update">güncelle</string> <string name="no_update_available">Güncelleme mevcut değil</string> diff --git a/src/main/res/values-w384dp/dimens.xml b/src/main/res/values-w384dp/dimens.xml index e9350addd..a04ce6763 100644 --- a/src/main/res/values-w384dp/dimens.xml +++ b/src/main/res/values-w384dp/dimens.xml @@ -2,7 +2,6 @@ <!-- 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 --> diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 672cb00fb..c537fd248 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -58,6 +58,7 @@ <attr name="icon_chat" format="reference" /> <attr name="icon_copy" format="reference" /> <attr name="icon_discard" format="reference" /> + <attr name="icon_show_qr_code" format="reference" /> <attr name="icon_download" format="reference" /> <attr name="icon_edit" format="reference" /> <attr name="icon_edit_body" format="reference" /> @@ -74,6 +75,7 @@ <attr name="icon_secure" format="reference" /> <attr name="icon_settings" format="reference" /> <attr name="icon_share" format="reference" /> + <attr name="icon_delete" format="reference" /> <attr name="icon_import_export" format="reference" /> <attr name="icon_scan_qr_code" format="reference" /> <attr name="icon_enable_undecided_device" format="reference" /> diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 6ea10548f..8dfec1519 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -27,7 +27,7 @@ <color name="grey900">#ff282828</color> <color name="red800">#ffc62828</color> <color name="red500">#fff44336</color> - <color name="red_a700">#ffd50000</color> + <color name="red700">#ffd50000</color> <color name="orange500">#ffff9800</color> <color name="bubble">#ff2e4272</color> <color name="realwhite">#ffffffff</color> diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index e213ea773..29e560124 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -41,7 +41,7 @@ \n\nhttp://hc.apache.org/httpcomponents-client\n(Apache License, Version 2.0) \n\nhttp://hc.apache.org/httpcomponents-core\n(Apache License, Version 2.0) \n\nhttps://github.com/bumptech/glide\n(BSD, The MIT License (MIT) and Apache License, Version 2.0) - \n\nhttps://github.com/chrisbanes/PhotoView\n(Apache License, Version 2.0) + \n\nhttps://github.com/davemorrissey/subsampling-scale-image-view\n(Apache License, Version 2.0) \n\nhttps://github.com/rtoshiro/FullscreenVideoView\n(Apache License, Version 2.0) \n\nhttps://github.com/mangstadt/ez-vcard\n(FreeBSD) \n\nhttps://github.com/googlesamples/easypermissions\n(Apache License, Version 2.0) @@ -51,7 +51,6 @@ \n\nhttp://leafletjs.com/\n(BSD 2-Clause) \n\nhttps://www.openstreetmap.org/\n(Open Database License) \n\nhttp://xmpp.rocks/\n(The MIT License (MIT)) - \n\nhttps://github.com/championswimmer/SimpleFingerGestures_Android_Library/\n(Apache License, Version 2.0) </string> <string name="default_resource" translatable="false">Phone</string> diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 526eb7d40..0c6ef41fb 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -27,5 +27,5 @@ <dimen name="scan_dot_size">8dp</dimen> <dimen name="background_image_opacity">0.12</dimen> - <dimen name="rounded_image_border">8dp</dimen> + <dimen name="rounded_image_border">5dp</dimen> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 62b415cf3..34c227331 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -75,7 +75,7 @@ <string name="sharing_files_please_wait">Sharing files. Please wait…</string> <string name="action_clear_history">Clear history</string> <string name="clear_conversation_history">Clear Conversation History</string> - <string name="clear_histor_msg">Do you want to delete all messages within this Conversation?\n\n<b>Warning:</b> This will not influence messages stored on other devices or servers.</string> + <string name="clear_histor_msg">Are you sure you want to delete all messages within this conversation?\n\n<b>Warning:</b> This will not delete copies of those messages that are stored on other devices or servers.</string> <string name="delete_messages">Delete messages</string> <string name="also_end_conversation">End this conversation afterwards</string> <string name="choose_presence">Choose device</string> @@ -295,8 +295,8 @@ <string name="send_again">Send again</string> <string name="file_url">File URL</string> <string name="url_copied_to_clipboard">URL copied to clipboard</string> - <string name="scan_qr_code">Scan barcode</string> - <string name="show_qr_code">Show barcode</string> + <string name="scan_qr_code">Scan QR code</string> + <string name="show_qr_code">Show QR code</string> <string name="show_block_list">Show block list</string> <string name="account_details">Account details</string> <string name="verify_otr">Verify OTR</string> @@ -611,19 +611,19 @@ <string name="this_device_has_been_verified">This device has been verified</string> <string name="copy_fingerprint">Copy fingerprint</string> <string name="all_omemo_keys_have_been_verified">All OMEMO keys have been verified</string> - <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Barcode does not contain fingerprints for this conversation.</string> + <string name="barcode_does_not_contain_fingerprints_for_this_conversation">QR code does not contain fingerprints for this conversation.</string> <string name="verified_fingerprints">Verified fingerprints</string> - <string name="use_camera_icon_to_scan_barcode">Use the camera to scan a contacts barcode</string> + <string name="use_camera_icon_to_scan_barcode">Use the camera to scan a contacts QR code</string> <string name="please_wait_for_keys_to_be_fetched">Please wait for keys to be fetched</string> - <string name="share_as_barcode">Share as Barcode</string> + <string name="share_as_barcode">Share as QR code</string> <string name="share_as_uri">Share as XMPP URI</string> <string name="share_as_http">Share as HTTP link</string> <string name="blindly_trusted_omemo_keys">Blindly trusted OMEMO keys</string> <string name="pref_blind_trust_before_verification">Blind Trust Before Verification</string> <string name="pref_blind_trust_before_verification_summary">Automatically trust all new devices from contacts that haven’t been verified before.</string> <string name="not_trusted">Untrusted</string> - <string name="invalid_barcode">Invalid barcode</string> - <string name="verify_with_qr_code">verify with barcode</string> + <string name="invalid_barcode">Invalid QR code</string> + <string name="verify_with_qr_code">verify with QR code</string> <string name="i_followed_this_link_from_a_trusted_source">I followed this link from a trusted source</string> <string name="verifying_omemo_keys_trusted_source">You are about to verify the OMEMO keys of %1$s after clicking a link. This is only secure if you followed this link from a trusted source where only %2$s could have published this link.</string> <string name="verify_omemo_keys">Verify OMEMO fingerprints</string> @@ -826,4 +826,14 @@ <string name="action_group_details">Group details</string> <string name="view_media">View media</string> <string name="media_browser">Media browser</string> + <string name="account_status_stream_opening_error">Stream opening error</string> + <string name="action_open">Open</string> + <string name="action_delete">Delete</string> + <string name="security_violation_not_attaching_file">File omitted due to security violation.</string> + <string name="delete_file_dialog">Delete file</string> + <string name="delete_file_dialog_msg">Are you sure you want to delete this file?\n\n<b>Warning:</b> This will not delete copies of this file that are stored on other devices or servers. </string> + <string name="cancelled">cancelled</string> + <string name="remote_server_timeout">Remote server timeout</string> + <string name="already_drafting_message">You are already drafting a message.</string> + </resources> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index bbfaf6060..342ed8aa1 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -13,7 +13,7 @@ <item name="color_background_primary">@color/grey50</item> <item name="color_background_secondary">@color/grey200</item> <item name="color_background_tertiary">@color/grey300</item> - <item name="color_warning">@color/red_a700</item> + <item name="color_warning">@color/red700</item> <item name="TextColorOnline">@color/green500</item> <item name="TextColorError">@color/red800</item> @@ -80,6 +80,7 @@ <item name="icon_cancel" type="reference">@drawable/ic_cancel_black_24dp</item> <item name="icon_chat" type="reference">@drawable/ic_action_chat</item> <item name="icon_copy" type="reference">@drawable/ic_content_copy_grey600_24dp</item> + <item name="icon_show_qr_code" type="reference">@drawable/ic_qrcode_grey600_24dp</item> <item name="icon_discard" type="reference">@drawable/ic_delete_white_24dp</item> <item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item> <item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item> @@ -98,8 +99,9 @@ <item name="icon_settings" type="reference">@drawable/ic_settings_black_24dp</item> <item name="icon_import_export" type="reference">@drawable/ic_import_export_white_24dp </item> - <item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item> - <item name="icon_scan_qr_code" type="reference">@drawable/ic_barcode_scan_white_24dp</item> + <item name="icon_delete" type="reference">@drawable/ic_delete_black_24dp</item> + <item name="icon_share" type="reference">@drawable/ic_share_black_24dp</item> + <item name="icon_scan_qr_code" type="reference">@drawable/ic_qrcode_scan_white_24dp</item> <item name="icon_scroll_down" type="reference">@drawable/ic_scroll_to_end_black</item> <!-- settings--> @@ -165,7 +167,7 @@ <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="color_warning">@color/red700</item> <item name="TextColorOnline">@color/green500</item> <item name="TextColorError">@color/red500</item> @@ -251,6 +253,7 @@ <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> <item name="icon_copy" type="reference">@drawable/ic_content_copy_white_24dp</item> + <item name="icon_show_qr_code" type="reference">@drawable/ic_qrcode_white_24dp</item> <item name="icon_discard" type="reference">@drawable/ic_delete_white_24dp</item> <item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item> <item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item> @@ -269,8 +272,9 @@ <item name="icon_settings" type="reference">@drawable/ic_settings_white_24dp</item> <item name="icon_import_export" type="reference">@drawable/ic_import_export_white_24dp </item> + <item name="icon_delete" type="reference">@drawable/ic_delete_white_24dp</item> <item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item> - <item name="icon_scan_qr_code" type="reference">@drawable/ic_barcode_scan_white_24dp</item> + <item name="icon_scan_qr_code" type="reference">@drawable/ic_qrcode_scan_white_24dp</item> <item name="icon_scroll_down" type="reference">@drawable/ic_scroll_to_end_white</item> <item name="icon_notifications" type="reference">@drawable/ic_notifications_white_24dp |
