Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TW-795: fixed link styles and center #819

Merged
merged 1 commit into from
Oct 19, 2023
+11 −14
Merged

TW-795: fixed link styles and center #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions lib/pages/chat/events/message_content.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,6 @@ class MessageContent extends StatelessWidget with PlayVideoActionMixin {
);
}

final bigEmotes = event.onlyEmotes &&
hoangdat marked this conversation as resolved.
Show resolved Hide resolved
event.numberEmotes > 0 &&
event.numberEmotes <= 10;
return FutureBuilder<String>(
future: event.calcLocalizedBody(
MatrixLocals(L10n.of(context)!),
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,8 +1575,8 @@ packages:
dependency: "direct main"
description:
path: "."
ref: "feat/add-text-span-builder"
resolved-ref: f159e4de7db4a70fa1830cf7c4a066979aa1464d
ref: twake-supported
resolved-ref: "326f4ef15303bbbd13971912fd84e936b60e521d"
url: "https://github.com/linagora/matrix_link_text.git"
source: git
version: "2.0.0"
Expand Down
9 changes: 5 additions & 4 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ dependencies:
keyboard_shortcuts: ^0.1.4
latlong2: ^0.8.1
matrix:
git:
git:
url: [email protected]:linagora/matrix-dart-sdk.git
ref: twake-supported-0.22.4
matrix_homeserver_recommendations: ^0.3.0
Expand Down Expand Up @@ -269,12 +269,13 @@ dependency_overrides:
url: https://github.com/chandrabezzo/wakelock.git
ref: main
path: wakelock_windows/
# TODO: Remove it after this PR merged
# TODO: Remove this part after upstream contribution is merged
# https://github.com/Sorunome/matrix_link_text/pull/4
# https://github.com/Sorunome/matrix_link_text/pull/5
hoangdat marked this conversation as resolved.
Show resolved Hide resolved
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:
Expand Down