From 8ccfa3d30214ec0df392920fa18ae558dcaf9b5b Mon Sep 17 00:00:00 2001 From: Julian KOUNE Date: Thu, 12 Oct 2023 15:41:08 +0200 Subject: [PATCH] TW-795: fixed link styles and center --- lib/pages/chat/events/message_content.dart | 12 ++++-------- pubspec.lock | 4 ++-- pubspec.yaml | 7 ++++--- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart index c87288ee85..b9a0a19cc0 100644 --- a/lib/pages/chat/events/message_content.dart +++ b/lib/pages/chat/events/message_content.dart @@ -236,9 +236,6 @@ class MessageContent extends StatelessWidget with PlayVideoActionMixin { ); } - final bigEmotes = event.onlyEmotes && - event.numberEmotes > 0 && - event.numberEmotes <= 10; return FutureBuilder( future: event.calcLocalizedBody( MatrixLocals(L10n.of(context)!), @@ -263,11 +260,10 @@ class MessageContent extends StatelessWidget with PlayVideoActionMixin { Theme.of(context).textTheme.bodyLarge?.copyWith( color: Theme.of(context).colorScheme.onSurface, ), - linkStyle: TextStyle( - color: Theme.of(context).colorScheme.secondary, - fontSize: bigEmotes ? fontSize * 3 : fontSize, - decorationColor: textColor.withAlpha(150), - ), + linkStyle: + Theme.of(context).textTheme.bodyLarge?.copyWith( + color: Theme.of(context).colorScheme.secondary, + ), childWidget: Visibility( visible: false, maintainSize: true, diff --git a/pubspec.lock b/pubspec.lock index 060e6c41aa..547e4bd13e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1575,8 +1575,8 @@ packages: dependency: "direct main" description: path: "." - ref: "feat/add-text-span-builder" - resolved-ref: f159e4de7db4a70fa1830cf7c4a066979aa1464d + ref: twake-supported + resolved-ref: "1fe42ebdf5d2adecd6adfd9b2f109e18eca94570" url: "https://github.com/linagora/matrix_link_text.git" source: git version: "2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index be77f5a1fa..f24123d71f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -66,7 +66,7 @@ dependencies: keyboard_shortcuts: ^0.1.4 latlong2: ^0.8.1 matrix: - git: + git: url: git@github.com:linagora/matrix-dart-sdk.git ref: twake-supported-0.22.4 matrix_homeserver_recommendations: ^0.3.0 @@ -271,10 +271,11 @@ dependency_overrides: path: wakelock_windows/ # TODO: Remove it after this PR merged # https://github.com/Sorunome/matrix_link_text/pull/4 + # https://github.com/Sorunome/matrix_link_text/pull/5 matrix_link_text: - git: + git: url: https://github.com/linagora/matrix_link_text.git - ref: feat/add-text-span-builder + ref: twake-supported cider: link_template: