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

Merge pull request #5397 from pangeachat/hide-view-status

Browse source 
Hide status and view status toggle
This commit is contained in:
ggurdin 2026-01-23 12:33:52 -05:00 • committed by GitHub
commit 5cee36a31e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 33 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
import 'package:dynamic_color/dynamic_color.dart'; import 'package:dynamic_color/dynamic_color.dart';
import 'package:matrix/matrix.dart'; import 'package:matrix/matrix.dart';
import 'package:fluffychat/config/setting_keys.dart';
import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pages/chat/events/state_message.dart'; import 'package:fluffychat/pages/chat/events/state_message.dart';
@ -16,7 +15,6 @@ import 'package:fluffychat/widgets/layouts/max_width_body.dart';
import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/matrix.dart';
import 'package:fluffychat/widgets/mxc_image.dart'; import 'package:fluffychat/widgets/mxc_image.dart';
import '../../config/app_config.dart'; import '../../config/app_config.dart';
import '../../widgets/settings_switch_list_tile.dart';
import 'settings_style.dart'; import 'settings_style.dart';
class SettingsStyleView extends StatelessWidget { class SettingsStyleView extends StatelessWidget {
@ -335,25 +333,25 @@ class SettingsStyleView extends StatelessWidget {
semanticFormatterCallback: (d) => d.toString(), semanticFormatterCallback: (d) => d.toString(),
onChanged: controller.changeFontSizeFactor, onChanged: controller.changeFontSizeFactor,
), ),
Divider(
color: theme.dividerColor,
),
ListTile(
title: Text(
L10n.of(context).overview,
style: TextStyle(
color: theme.colorScheme.secondary,
fontWeight: FontWeight.bold,
),
),
),
SettingsSwitchListTile.adaptive(
title: L10n.of(context).presencesToggle,
onChanged: (b) => AppConfig.showPresences = b,
storeKey: SettingKeys.showPresences,
defaultValue: AppConfig.showPresences,
),
// #Pangea // #Pangea
// Divider(
// color: theme.dividerColor,
// ),
// ListTile(
// title: Text(
// L10n.of(context).overview,
// style: TextStyle(
// color: theme.colorScheme.secondary,
// fontWeight: FontWeight.bold,
// ),
// ),
// ),
// SettingsSwitchListTile.adaptive(
// title: L10n.of(context).presencesToggle,
// onChanged: (b) => AppConfig.showPresences = b,
// storeKey: SettingKeys.showPresences,
// defaultValue: AppConfig.showPresences,
// ),
// SettingsSwitchListTile.adaptive( // SettingsSwitchListTile.adaptive(
// title: L10n.of(context).separateChatTypes, // title: L10n.of(context).separateChatTypes,
// onChanged: (b) => AppConfig.separateChatTypes = b, // onChanged: (b) => AppConfig.separateChatTypes = b,

32
lib/widgets/adaptive_dialogs/user_dialog.dart
View file

@ -1,7 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_linkify/flutter_linkify.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart'; import 'package:matrix/matrix.dart';
@ -12,7 +11,6 @@ import 'package:fluffychat/utils/date_time_extension.dart';
import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart'; import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart';
import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/avatar.dart';
import 'package:fluffychat/widgets/presence_builder.dart'; import 'package:fluffychat/widgets/presence_builder.dart';
import '../../utils/url_launcher.dart';
import '../future_loading_dialog.dart'; import '../future_loading_dialog.dart';
import '../hover_builder.dart'; import '../hover_builder.dart';
import '../matrix.dart'; import '../matrix.dart';
@ -145,22 +143,22 @@ class UserDialog extends StatelessWidget {
style: const TextStyle(fontSize: 10), style: const TextStyle(fontSize: 10),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
if (statusMsg != null)
SelectableLinkify(
text: statusMsg,
textScaleFactor:
MediaQuery.textScalerOf(context).scale(1),
textAlign: TextAlign.center,
options: const LinkifyOptions(humanize: false),
linkStyle: TextStyle(
color: theme.colorScheme.primary,
decoration: TextDecoration.underline,
decorationColor: theme.colorScheme.primary,
),
onOpen: (url) =>
UrlLauncher(context, url.url).launchUrl(),
),
// #Pangea // #Pangea
// if (statusMsg != null)
// SelectableLinkify(
// text: statusMsg,
// textScaleFactor:
// MediaQuery.textScalerOf(context).scale(1),
// textAlign: TextAlign.center,
// options: const LinkifyOptions(humanize: false),
// linkStyle: TextStyle(
// color: theme.colorScheme.primary,
// decoration: TextDecoration.underline,
// decorationColor: theme.colorScheme.primary,
// ),
// onOpen: (url) =>
// UrlLauncher(context, url.url).launchUrl(),
// ),
Padding( Padding(
padding: const EdgeInsets.all(4.0), padding: const EdgeInsets.all(4.0),
child: Row( child: Row(