From 0e8363221b916e8186de32fe9bfa3b9c0fc419f9 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Sun, 25 Feb 2024 20:19:45 +0100 Subject: [PATCH] design: Nicer QR Code design --- .../new_private_chat_view.dart | 24 ++++++++++++++----- pubspec.lock | 16 ++++++------- pubspec.yaml | 2 +- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/lib/pages/new_private_chat/new_private_chat_view.dart b/lib/pages/new_private_chat/new_private_chat_view.dart index 3746ee47..81d10bcf 100644 --- a/lib/pages/new_private_chat/new_private_chat_view.dart +++ b/lib/pages/new_private_chat/new_private_chat_view.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:qr_flutter/qr_flutter.dart'; +import 'package:pretty_qr_code/pretty_qr_code.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; @@ -161,11 +161,23 @@ class NewPrivateChatView extends StatelessWidget { shadowColor: Theme.of(context).appBarTheme.shadowColor, clipBehavior: Clip.hardEdge, - child: QrImageView( - data: - 'https://matrix.to/#/${Matrix.of(context).client.userID}', - version: QrVersions.auto, - // size: qrCodeSize, + child: Padding( + padding: const EdgeInsets.all(8), + child: PrettyQrView.data( + data: + 'https://matrix.to/#/${Matrix.of(context).client.userID}', + decoration: PrettyQrDecoration( + shape: PrettyQrSmoothSymbol( + roundFactor: 1, + color: Theme.of(context).brightness == + Brightness.light + ? Theme.of(context).colorScheme.primary + : Theme.of(context) + .colorScheme + .onPrimary, + ), + ), + ), ), ), ), diff --git a/pubspec.lock b/pubspec.lock index be407c58..8e2813bb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1438,6 +1438,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.1" + pretty_qr_code: + dependency: "direct main" + description: + name: pretty_qr_code + sha256: "47a0fde3967e01ea31985d1a11a998fab1ab900becdba592e9abb0a4034b807e" + url: "https://pub.dev" + source: hosted + version: "3.2.1" process: dependency: transitive description: @@ -1502,14 +1510,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.1" - qr_flutter: - dependency: "direct main" - description: - name: qr_flutter - sha256: "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097" - url: "https://pub.dev" - source: hosted - version: "4.1.0" quiver: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index c044e3db..b95381d0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -71,10 +71,10 @@ dependencies: pasteboard: ^0.2.0 path_provider: ^2.0.9 permission_handler: ^11.0.1 + pretty_qr_code: ^3.2.1 provider: ^6.0.2 punycode: ^1.0.0 qr_code_scanner: ^1.0.0 - qr_flutter: ^4.0.0 receive_sharing_intent: ^1.4.5 record: 4.4.4 # Upgrade to 5 currently breaks playing on iOS scroll_to_index: ^3.0.1