Merge pull request #415 from twonlyapp/dev

- New: Adds an "Ask a Friend" button to new contact suggestions. - New: Adds security profiles. - Improved: Onboarding flow for new users. - Improved: Flame restore experience. - Improved: The blue verification checkmark now displays the total number of verifications. - Fix: Issue with receiving messages when user closed app while decrypting - Fix: Background message fetching reliability. - Fix: Issue with focus changing when taking a picture - Fix: Issues with the camera initialization
2026-05-25 03:42:13 +00:00 · 2026-05-22 13:52:52 +02:00 · 2026-05-22 13:52:52 +02:00 · 25c826bff3
commit 25c826bff3
parent 874cf5fecc 789bcda34f
13 changed files with 63 additions and 37 deletions
--- a/lib/src/visual/context_menu/context_menu.helper.dart
+++ b/lib/src/visual/context_menu/context_menu.helper.dart
@ -21,12 +21,17 @@ class ContextMenu extends StatefulWidget {
 class _ContextMenuState extends State<ContextMenu> {
  Offset? _tapPosition;

-  Widget _getIcon(IconData icon) {
+  Widget _getIcon(dynamic icon) {
    return Padding(
      padding: const EdgeInsets.only(left: 12),
-      child: FaIcon(
+      child: icon is IconData
+          ? Icon(
              icon,
              size: 20,
+            )
+          : FaIcon(
+              icon as FaIconData?,
+              size: 20,
            ),
    );
  }
@ -95,5 +100,5 @@ class ContextMenuItem {
  });
  final String title;
  final Future<void> Function() onTap;
-  final IconData icon;
+  final dynamic icon;
 }
--- a/lib/src/visual/elements/better_list_title.element.dart
+++ b/lib/src/visual/elements/better_list_title.element.dart
@ -15,7 +15,7 @@ class BetterListTile extends StatelessWidget {
    this.iconSize = 20,
    this.padding,
  });
-  final IconData? icon;
+  final dynamic icon;
  final Widget? leading;
  final Widget? trailing;
  final String? text;
@ -34,8 +34,14 @@ class BetterListTile extends StatelessWidget {
        child: Center(
          child: (leading != null)
              ? leading
+              : (icon is IconData)
+                  ? Icon(
+                      icon as IconData,
+                      size: iconSize,
+                      color: color,
+                    )
                  : FaIcon(
-                  icon,
+                      icon as FaIconData?,
                      size: iconSize,
                      color: color,
                    ),
--- a/lib/src/visual/views/camera/share_image_editor_components/action_button.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/action_button.dart
@ -11,19 +11,34 @@ class ActionButton extends StatelessWidget {
    this.disable = false,
  });
  final VoidCallback? onPressed;
-  final IconData? icon;
+  final dynamic icon;
  final Color? color;
  final String tooltipText;
  final bool disable;

  @override
  Widget build(BuildContext context) {
+    final isFaIcon = icon is FaIconData;
    return Tooltip(
      message: tooltipText,
      child: IconButton(
-        icon: FaIcon(
-          icon,
-          size: (icon is FontAwesomeIcons) ? 25 : 30,
+        icon: isFaIcon
+            ? FaIcon(
+                icon as FaIconData?,
+                size: 25,
+                color: disable
+                    ? const Color.fromARGB(154, 255, 255, 255)
+                    : color ?? Colors.white,
+                shadows: const [
+                  Shadow(
+                    color: Color.fromARGB(122, 0, 0, 0),
+                    blurRadius: 5,
+                  ),
+                ],
+              )
+            : Icon(
+                icon as IconData?,
+                size: 30,
                color: disable
                    ? const Color.fromARGB(154, 255, 255, 255)
                    : color ?? Colors.white,
--- a/lib/src/visual/views/chats/chat_messages_components/chat_group_action.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/chat_group_action.dart
@ -47,7 +47,7 @@ class _ChatGroupActionState extends State<ChatGroupAction> {
  @override
  Widget build(BuildContext context) {
    var text = '';
-    IconData? icon;
+    FaIconData? icon;

    final affected = (affectedContact == null)
        ? context.lang.groupActionYou
--- a/lib/src/visual/views/contact/contact_components/mutual_groups_expansion_tile.comp.dart
+++ b/lib/src/visual/views/contact/contact_components/mutual_groups_expansion_tile.comp.dart
@ -71,7 +71,7 @@ class _MutualGroupsExpansionTileCompState
        child: SizedBox(
          width: 20,
          height: 20,
-          child: Icon(
+          child: FaIcon(
            FontAwesomeIcons.userGroup,
            size: 16,
            color: context.color.onSurfaceVariant,
--- a/lib/src/visual/views/contact/contact_components/verification_expansion_tile.comp.dart
+++ b/lib/src/visual/views/contact/contact_components/verification_expansion_tile.comp.dart
@ -128,7 +128,7 @@ class _VerificationExpansionTileCompState
                  padding: EdgeInsets.zero,
                  constraints: const BoxConstraints(),
                  iconSize: 8,
-                  icon: Icon(
+                  icon: FaIcon(
                    FontAwesomeIcons.trash,
                    size: 8,
                    color: context.color.onSurfaceVariant,
--- a/lib/src/visual/views/onboarding/setup/add_new_contacts.setup.dart
+++ b/lib/src/visual/views/onboarding/setup/add_new_contacts.setup.dart
@ -97,7 +97,7 @@ class AddNewContactsPage extends StatelessWidget {

  Widget _buildMethodItem(
    BuildContext context, {
-    required IconData icon,
+    required FaIconData icon,
    required String text,
  }) {
    return Padding(
--- a/lib/src/visual/views/settings/profile/modify_avatar.view.dart
+++ b/lib/src/visual/views/settings/profile/modify_avatar.view.dart
@ -162,7 +162,7 @@ class _ModifyAvatarViewState extends State<ModifyAvatarView> {
                            _avatarMakerController.randomizedSelectedOptions,
                      ),
                      IconButton(
-                        icon: const Icon(FontAwesomeIcons.rotateLeft),
+                        icon: const FaIcon(FontAwesomeIcons.rotateLeft),
                        onLongPress: () async {
                          await PersistentAvatarMakerController.clearAvatarMaker();
                          await _avatarMakerController.restoreState();
--- a/lib/src/visual/views/settings/subscription/subscription.view.dart
+++ b/lib/src/visual/views/settings/subscription/subscription.view.dart
@ -375,7 +375,7 @@ class _MissionRow extends StatelessWidget {
    required this.desc,
  });

-  final IconData icon;
+  final FaIconData icon;
  final String title;
  final String desc;

--- a/lib/src/visual/views/shared/select_contacts.view.dart
+++ b/lib/src/visual/views/shared/select_contacts.view.dart
@ -22,7 +22,7 @@ class SelectedContactView {
  });
  final String title;
  final String Function(int selected, int? limit) submitButton;
-  final IconData submitIcon;
+  final FaIconData submitIcon;
 }

 class SelectContactsView extends StatefulWidget {
--- a/lib/src/visual/views/unlock_twonly.view.dart
+++ b/lib/src/visual/views/unlock_twonly.view.dart
@ -38,7 +38,7 @@ class _UnlockTwonlyViewState extends State<UnlockTwonlyView> {
            children: [
              const Spacer(),

-              const Icon(
+              const FaIcon(
                FontAwesomeIcons.lock,
                size: 40,
              ),
--- a/pubspec.lock
+++ b/pubspec.lock
@ -868,10 +868,10 @@ packages:
    dependency: "direct main"
    description:
      name: font_awesome_flutter
-      sha256: b9011df3a1fa02993630b8fb83526368cf2206a711259830325bab2f1d2a4eb0
+      sha256: "09dcde8ab90ffae1a7d65ff2ef96fc62a17ad9d0ce7c127b317ded676b0d5935"
      url: "https://pub.dev"
    source: hosted
-    version: "10.12.0"
+    version: "11.0.0"
  fuchsia_remote_debug_protocol:
    dependency: transitive
    description: flutter
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -45,7 +45,7 @@ dependencies:
  # Trusted publisher fluttercommunity.dev
  connectivity_plus: ^7.0.0
  device_info_plus: ^12.1.0
-  font_awesome_flutter: ^10.10.0
+  font_awesome_flutter: ^11.0.0
  share_plus: ^12.0.0
  package_info_plus: ^9.0.0
  workmanager: ^0.9.0+3