diff --git a/CHANGELOG.md b/CHANGELOG.md
index da6d758..c9cb3ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
## 0.0.95
Feature: Show link in chat if the saved media file contains one
+Improve: Verification badge for groups
Fix: Problem with decrypting messages fixed
## 0.0.93
diff --git a/assets/icons/verified_badge_yellow.svg b/assets/icons/verified_badge_yellow.svg
deleted file mode 100644
index 29ee80a..0000000
--- a/assets/icons/verified_badge_yellow.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/lib/src/views/components/better_list_title.dart b/lib/src/views/components/better_list_title.dart
index fac2f5e..e15aca3 100644
--- a/lib/src/views/components/better_list_title.dart
+++ b/lib/src/views/components/better_list_title.dart
@@ -3,7 +3,8 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
class BetterListTile extends StatelessWidget {
const BetterListTile({
- required this.text,
+ this.text,
+ this.textWidget,
this.onTap,
this.icon,
this.leading,
@@ -17,7 +18,8 @@ class BetterListTile extends StatelessWidget {
final IconData? icon;
final Widget? leading;
final Widget? trailing;
- final String text;
+ final String? text;
+ final Widget? textWidget;
final Widget? subtitle;
final Color? color;
final VoidCallback? onTap;
@@ -40,10 +42,12 @@ class BetterListTile extends StatelessWidget {
),
),
trailing: trailing,
- title: Text(
- text,
- style: TextStyle(color: color),
- ),
+ title: text != null
+ ? Text(
+ text!,
+ style: TextStyle(color: color),
+ )
+ : textWidget,
subtitle: subtitle,
onTap: onTap,
);
diff --git a/lib/src/views/components/svg_icon.dart b/lib/src/views/components/svg_icon.dart
index efd067a..8691f59 100644
--- a/lib/src/views/components/svg_icon.dart
+++ b/lib/src/views/components/svg_icon.dart
@@ -3,7 +3,6 @@ import 'package:flutter_svg/flutter_svg.dart';
class SvgIcons {
static const String verifiedGreen = 'assets/icons/verified_badge_green.svg';
- static const String verifiedYellow = 'assets/icons/verified_badge_yellow.svg';
static const String verifiedRed = 'assets/icons/verified_badge_red.svg';
}
diff --git a/lib/src/views/components/verified_shield.dart b/lib/src/views/components/verified_shield.dart
index a18684d..f2042d7 100644
--- a/lib/src/views/components/verified_shield.dart
+++ b/lib/src/views/components/verified_shield.dart
@@ -37,7 +37,7 @@ class _VerifiedShieldState extends State {
contact = contacts.first;
}
setState(() {
- isVerified = contacts.any((t) => t.verified);
+ isVerified = contacts.every((t) => t.verified);
});
});
} else if (widget.contact != null) {
diff --git a/lib/src/views/groups/group.view.dart b/lib/src/views/groups/group.view.dart
index fcfae5f..8f56bda 100644
--- a/lib/src/views/groups/group.view.dart
+++ b/lib/src/views/groups/group.view.dart
@@ -242,7 +242,18 @@ class _GroupViewState extends State {
contactId: member.$1.userId,
fontSize: 16,
),
- text: getContactDisplayName(member.$1, maxLength: 25),
+ textWidget: Row(
+ children: [
+ Text(getContactDisplayName(member.$1, maxLength: 25)),
+ Padding(
+ padding: const EdgeInsets.only(left: 5),
+ child: VerifiedShield(
+ key: Key(member.$2.contactId.toString()),
+ contact: member.$1,
+ ),
+ ),
+ ],
+ ),
trailing: (member.$2.memberState == MemberState.admin)
? Text(context.lang.admin)
: null,
diff --git a/lib/src/views/settings/help/faq/verifybadge.dart b/lib/src/views/settings/help/faq/verifybadge.dart
index f3efb3d..b0568a7 100644
--- a/lib/src/views/settings/help/faq/verifybadge.dart
+++ b/lib/src/views/settings/help/faq/verifybadge.dart
@@ -30,7 +30,11 @@ class _VerificationBadeFaqViewState extends State {
description: context.lang.verificationBadgeGreenDesc,
),
_buildItem(
- icon: const SvgIcon(assetPath: SvgIcons.verifiedYellow, size: 40),
+ icon: const SvgIcon(
+ assetPath: SvgIcons.verifiedGreen,
+ size: 40,
+ color: Color.fromARGB(255, 227, 227, 3),
+ ),
description: context.lang.verificationBadgeYellowDesc,
),
_buildItem(