ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: disable custom message text sizing (#2355)

Browse source
This commit is contained in:
ggurdin 2025-04-04 11:31:11 -04:00 • committed by GitHub
parent aaf0bc22d0
commit e7a2d12a3c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 102 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/pages/settings_style/settings_style_view.dart
View file

@ -323,18 +323,20 @@ class SettingsStyleView extends StatelessWidget {
);
},
),
ListTile(
title: Text(L10n.of(context).fontSize),
trailing: Text('× ${AppConfig.fontSizeFactor}'),
),
Slider.adaptive(
min: 0.5,
max: 2.5,
divisions: 20,
value: AppConfig.fontSizeFactor,
semanticFormatterCallback: (d) => d.toString(),
onChanged: controller.changeFontSizeFactor,
),
// #Pangea
// ListTile(
// title: Text(L10n.of(context).fontSize),
// trailing: Text('× ${AppConfig.fontSizeFactor}'),
// ),
// Slider.adaptive(
// min: 0.5,
// max: 2.5,
// divisions: 20,
// value: AppConfig.fontSizeFactor,
// semanticFormatterCallback: (d) => d.toString(),
// onChanged: controller.changeFontSizeFactor,
// ),
// Pangea
Divider(
color: theme.dividerColor,
),

155
lib/pangea/activity_suggestions/activity_suggestions_area.dart
View file

@ -175,88 +175,91 @@ class ActivitySuggestionsAreaState extends State<ActivitySuggestionsArea> {
overflow: TextOverflow.ellipsis,
),
),
Row(
spacing: 8.0,
children: [
InkWell(
customBorder: const CircleBorder(),
onTap: () => context.go('/homepage/newgroup'),
child: Container(
decoration: BoxDecoration(
color: theme.colorScheme.surfaceContainerHighest,
borderRadius: BorderRadius.circular(36.0),
),
padding: const EdgeInsets.symmetric(
vertical: 6.0,
horizontal: 10.0,
),
child: Row(
spacing: 8.0,
mainAxisSize: MainAxisSize.min,
children: [
CustomizedSvg(
svgUrl:
"${AppConfig.assetsBaseURL}/${ActivitySuggestionsConstants.plusIconPath}",
colorReplacements: {
"#CDBEF9": colorToHex(
Theme.of(context).colorScheme.secondary,
),
},
height: 16.0,
width: 16.0,
),
Text(
isColumnMode
? L10n.of(context).createOwnChat
: L10n.of(context).chat,
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.bold,
Material(
type: MaterialType.transparency,
child: Row(
spacing: 8.0,
children: [
InkWell(
customBorder: const CircleBorder(),
onTap: () => context.go('/homepage/newgroup'),
child: Container(
decoration: BoxDecoration(
color: theme.colorScheme.surfaceContainerHighest,
borderRadius: BorderRadius.circular(36.0),
),
padding: const EdgeInsets.symmetric(
vertical: 6.0,
horizontal: 10.0,
),
child: Row(
spacing: 8.0,
mainAxisSize: MainAxisSize.min,
children: [
CustomizedSvg(
svgUrl:
"${AppConfig.assetsBaseURL}/${ActivitySuggestionsConstants.plusIconPath}",
colorReplacements: {
"#CDBEF9": colorToHex(
Theme.of(context).colorScheme.secondary,
),
},
height: 16.0,
width: 16.0,
),
),
],
Text(
isColumnMode
? L10n.of(context).createOwnChat
: L10n.of(context).chat,
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.bold,
),
),
],
),
),
),
),
InkWell(
customBorder: const CircleBorder(),
onTap: () => context.go('/homepage/planner'),
child: Container(
decoration: BoxDecoration(
color: theme.colorScheme.surfaceContainerHighest,
borderRadius: BorderRadius.circular(36.0),
),
padding: const EdgeInsets.symmetric(
vertical: 6.0,
horizontal: 10.0,
),
child: Row(
spacing: 8.0,
mainAxisSize: MainAxisSize.min,
children: [
CustomizedSvg(
svgUrl:
"${AppConfig.assetsBaseURL}/${ActivitySuggestionsConstants.crayonIconPath}",
colorReplacements: {
"#CDBEF9": colorToHex(
Theme.of(context).colorScheme.secondary,
),
},
height: 16.0,
width: 16.0,
),
Text(
isColumnMode
? L10n.of(context).makeYourOwnActivity
: L10n.of(context).createActivity,
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.bold,
InkWell(
customBorder: const CircleBorder(),
onTap: () => context.go('/homepage/planner'),
child: Container(
decoration: BoxDecoration(
color: theme.colorScheme.surfaceContainerHighest,
borderRadius: BorderRadius.circular(36.0),
),
padding: const EdgeInsets.symmetric(
vertical: 6.0,
horizontal: 10.0,
),
child: Row(
spacing: 8.0,
mainAxisSize: MainAxisSize.min,
children: [
CustomizedSvg(
svgUrl:
"${AppConfig.assetsBaseURL}/${ActivitySuggestionsConstants.crayonIconPath}",
colorReplacements: {
"#CDBEF9": colorToHex(
Theme.of(context).colorScheme.secondary,
),
},
height: 16.0,
width: 16.0,
),
),
],
Text(
isColumnMode
? L10n.of(context).makeYourOwnActivity
: L10n.of(context).createActivity,
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.bold,
),
),
],
),
),
),
),
],
],
),
),
],
),

8
lib/pangea/toolbar/widgets/message_token_text.dart
View file

@ -242,11 +242,11 @@ class MessageTextWidget extends StatelessWidget {
? theme.colorScheme.onPrimary
: theme.colorScheme.onSurface;
return RichText(
return Text.rich(
softWrap: softWrap ?? true,
maxLines: maxLines,
overflow: overflow ?? TextOverflow.clip,
text: TextSpan(
TextSpan(
children:
tokenPositions.mapIndexed((int i, TokenPosition tokenPosition) {
final substring = messageCharacters
@ -318,8 +318,8 @@ class MessageTextWidget extends StatelessWidget {
onTap: onClick != null
? () => onClick?.call(tokenPosition)
: null,
child: RichText(
text: TextSpan(
child: Text.rich(
TextSpan(
children: [
if (start.isNotEmpty)
LinkifySpan(

8
lib/widgets/matrix.dart
View file

@ -436,9 +436,11 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
}
void initSettings() {
AppConfig.fontSizeFactor =
double.tryParse(store.getString(SettingKeys.fontSizeFactor) ?? '') ??
AppConfig.fontSizeFactor;
// #Pangea
// AppConfig.fontSizeFactor =
// double.tryParse(store.getString(SettingKeys.fontSizeFactor) ?? '') ??
// AppConfig.fontSizeFactor;
// Pangea#
AppConfig.renderHtml =
store.getBool(SettingKeys.renderHtml) ?? AppConfig.renderHtml;