From 8abfbf82fab1f51d5a3c13bba8c19b3d92de8eca Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 9 Dec 2016 18:46:32 +0100 Subject: use verified symbol instead of colored lock icons --- .../conversations/ui/adapter/MessageAdapter.java | 33 ++++++++------------- src/main/res/drawable-hdpi/ic_lock_black_18dp.png | Bin 368 -> 275 bytes src/main/res/drawable-hdpi/ic_lock_white_18dp.png | Bin 371 -> 281 bytes .../drawable-hdpi/ic_verified_user_black_18dp.png | Bin 0 -> 320 bytes .../drawable-hdpi/ic_verified_user_white_18dp.png | Bin 0 -> 329 bytes src/main/res/drawable-mdpi/ic_lock_black_18dp.png | Bin 293 -> 206 bytes src/main/res/drawable-mdpi/ic_lock_white_18dp.png | Bin 298 -> 211 bytes .../drawable-mdpi/ic_verified_user_black_18dp.png | Bin 0 -> 238 bytes .../drawable-mdpi/ic_verified_user_white_18dp.png | Bin 0 -> 241 bytes src/main/res/drawable-xhdpi/ic_lock_black_18dp.png | Bin 397 -> 308 bytes src/main/res/drawable-xhdpi/ic_lock_white_18dp.png | Bin 399 -> 309 bytes .../drawable-xhdpi/ic_verified_user_black_18dp.png | Bin 0 -> 390 bytes .../drawable-xhdpi/ic_verified_user_white_18dp.png | Bin 0 -> 407 bytes .../res/drawable-xxhdpi/ic_lock_black_18dp.png | Bin 559 -> 453 bytes .../res/drawable-xxhdpi/ic_lock_white_18dp.png | Bin 558 -> 463 bytes .../ic_verified_user_black_18dp.png | Bin 0 -> 516 bytes .../ic_verified_user_white_18dp.png | Bin 0 -> 538 bytes .../res/drawable-xxxhdpi/ic_lock_black_18dp.png | Bin 636 -> 527 bytes .../res/drawable-xxxhdpi/ic_lock_white_18dp.png | Bin 760 -> 540 bytes .../ic_verified_user_black_18dp.png | Bin 0 -> 634 bytes .../ic_verified_user_white_18dp.png | Bin 0 -> 668 bytes 21 files changed, 13 insertions(+), 20 deletions(-) create mode 100644 src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png create mode 100644 src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png create mode 100644 src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png create mode 100644 src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 66c60ca5..d09c70ea 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -211,31 +211,24 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie if (message.getEncryption() == Message.ENCRYPTION_NONE) { viewHolder.indicator.setVisibility(View.GONE); } else { - viewHolder.indicator.setImageResource(darkBackground ? R.drawable.ic_lock_white_18dp : R.drawable.ic_lock_black_18dp); - viewHolder.indicator.setVisibility(View.VISIBLE); + boolean verified = false; if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) { - FingerprintStatus status = message.getConversation() + final FingerprintStatus status = message.getConversation() .getAccount().getAxolotlService().getFingerprintTrust( message.getFingerprint()); - - if(status == null || (type == SENT ? !status.isTrusted() : (!status.isVerified() && inValidSession))) { - viewHolder.indicator.setColorFilter(0xffc64545); - viewHolder.indicator.setAlpha(1.0f); - } else { - viewHolder.indicator.clearColorFilter(); - if (darkBackground) { - viewHolder.indicator.setAlpha(0.7f); - } else { - viewHolder.indicator.setAlpha(0.57f); - } + if (status != null && status.isVerified()) { + verified = true; } + } + if (verified) { + viewHolder.indicator.setImageResource(darkBackground ? R.drawable.ic_verified_user_white_18dp : R.drawable.ic_verified_user_black_18dp); } else { - viewHolder.indicator.clearColorFilter(); - if (darkBackground) { - viewHolder.indicator.setAlpha(0.7f); - } else { - viewHolder.indicator.setAlpha(0.57f); - } + viewHolder.indicator.setImageResource(darkBackground ? R.drawable.ic_lock_white_18dp : R.drawable.ic_lock_black_18dp); + } + if (darkBackground) { + viewHolder.indicator.setAlpha(0.7f); + } else { + viewHolder.indicator.setAlpha(0.57f); } } diff --git a/src/main/res/drawable-hdpi/ic_lock_black_18dp.png b/src/main/res/drawable-hdpi/ic_lock_black_18dp.png index 4c7a7c59..f3142927 100644 Binary files a/src/main/res/drawable-hdpi/ic_lock_black_18dp.png and b/src/main/res/drawable-hdpi/ic_lock_black_18dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_lock_white_18dp.png b/src/main/res/drawable-hdpi/ic_lock_white_18dp.png index 29e8bfd3..f5f86141 100644 Binary files a/src/main/res/drawable-hdpi/ic_lock_white_18dp.png and b/src/main/res/drawable-hdpi/ic_lock_white_18dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png new file mode 100644 index 00000000..48e38bf9 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png new file mode 100644 index 00000000..1e252c0d Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_lock_black_18dp.png b/src/main/res/drawable-mdpi/ic_lock_black_18dp.png index c8b6fe71..317c034b 100644 Binary files a/src/main/res/drawable-mdpi/ic_lock_black_18dp.png and b/src/main/res/drawable-mdpi/ic_lock_black_18dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_lock_white_18dp.png b/src/main/res/drawable-mdpi/ic_lock_white_18dp.png index 1265e98e..b9666133 100644 Binary files a/src/main/res/drawable-mdpi/ic_lock_white_18dp.png and b/src/main/res/drawable-mdpi/ic_lock_white_18dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png new file mode 100644 index 00000000..59964fb0 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png new file mode 100644 index 00000000..81f1f41f Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png index 0888c617..de502959 100644 Binary files a/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png and b/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png index b94735ec..cd4f04aa 100644 Binary files a/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png and b/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png new file mode 100644 index 00000000..8ebb6db3 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png new file mode 100644 index 00000000..3e3792f8 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png index dbcf3f33..17e81589 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png and b/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png index 895aabbf..47bd6411 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png and b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png new file mode 100644 index 00000000..1244f932 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png new file mode 100644 index 00000000..ea938a6e Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png index c49d420e..a7caa2db 100644 Binary files a/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png and b/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png index 0dcada81..0e52c7c7 100644 Binary files a/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png and b/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png new file mode 100644 index 00000000..70a9fc1b Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png new file mode 100644 index 00000000..ec35ec7a Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png differ -- cgit v1.2.3