diff --git a/lib/pages/settings_style/settings_style_view.dart b/lib/pages/settings_style/settings_style_view.dart index 182c9f332..d234759df 100644 --- a/lib/pages/settings_style/settings_style_view.dart +++ b/lib/pages/settings_style/settings_style_view.dart @@ -323,20 +323,18 @@ class SettingsStyleView extends StatelessWidget { ); }, ), - // #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 + 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, + ), Divider( color: theme.dividerColor, ), diff --git a/lib/pangea/toolbar/widgets/message_token_text.dart b/lib/pangea/toolbar/widgets/message_token_text.dart index b4bd1d745..35c71a4d2 100644 --- a/lib/pangea/toolbar/widgets/message_token_text.dart +++ b/lib/pangea/toolbar/widgets/message_token_text.dart @@ -164,11 +164,11 @@ class MessageTextWidget extends StatelessWidget { ? theme.colorScheme.onPrimary : theme.colorScheme.onSurface; - return Text.rich( + return RichText( softWrap: softWrap ?? true, maxLines: maxLines, overflow: overflow ?? TextOverflow.clip, - TextSpan( + text: TextSpan( children: tokenPositions.mapIndexed((int i, TokenPosition tokenPosition) { final substring = messageCharacters @@ -246,8 +246,8 @@ class MessageTextWidget extends StatelessWidget { onTap: onClick != null ? () => onClick?.call(tokenPosition) : null, - child: Text.rich( - TextSpan( + child: RichText( + text: TextSpan( children: [ if (start.isNotEmpty) LinkifySpan( diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index 3f9428704..3f1673033 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -436,11 +436,9 @@ class MatrixState extends State with WidgetsBindingObserver { } void initSettings() { - // #Pangea - // AppConfig.fontSizeFactor = - // double.tryParse(store.getString(SettingKeys.fontSizeFactor) ?? '') ?? - // AppConfig.fontSizeFactor; - // Pangea# + AppConfig.fontSizeFactor = + double.tryParse(store.getString(SettingKeys.fontSizeFactor) ?? '') ?? + AppConfig.fontSizeFactor; AppConfig.renderHtml = store.getBool(SettingKeys.renderHtml) ?? AppConfig.renderHtml;