Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
126 changes: 59 additions & 67 deletions lib/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import 'ui/provider/mention_cache_provider.dart';
import 'ui/provider/multi_auth_provider.dart';
import 'ui/provider/setting_provider.dart';
import 'ui/provider/slide_category_provider.dart';
import 'utils/app_lifecycle.dart';
import 'utils/extension/extension.dart';
import 'utils/logger.dart';
import 'utils/platform.dart';
Expand Down Expand Up @@ -134,75 +133,68 @@ class _App extends HookConsumerWidget {
final Widget home;

@override
Widget build(BuildContext context, WidgetRef ref) {
final appActive = useValueListenable(appActiveListener);

return TickerMode(
enabled: appActive,
child: WindowShortcuts(
child: GlobalMoveWindow(
child: MaterialApp(
title: 'Mixin',
navigatorObservers: [rootRouteObserver],
debugShowCheckedModeBanner: false,
localizationsDelegates: const [
Localization.delegate,
GlobalMaterialLocalizations.delegate,
GlobalCupertinoLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
],
supportedLocales: [...Localization.delegate.supportedLocales],
theme: ThemeData(
colorScheme: ColorScheme.light(
primary: lightBrightnessThemeData.text,
),
textSelectionTheme: TextSelectionThemeData(
cursorColor: lightBrightnessThemeData.accent,
),
useMaterial3: true,
).withFallbackFonts(),
darkTheme: ThemeData(
colorScheme: ColorScheme.dark(
primary: darkBrightnessThemeData.text,
),
textSelectionTheme: TextSelectionThemeData(
cursorColor: darkBrightnessThemeData.accent,
Widget build(BuildContext context, WidgetRef ref) => WindowShortcuts(
child: GlobalMoveWindow(
child: MaterialApp(
title: 'Mixin',
navigatorObservers: [rootRouteObserver],
debugShowCheckedModeBanner: false,
localizationsDelegates: const [
Localization.delegate,
GlobalMaterialLocalizations.delegate,
GlobalCupertinoLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
],
supportedLocales: [...Localization.delegate.supportedLocales],
theme: ThemeData(
colorScheme: ColorScheme.light(
primary: lightBrightnessThemeData.text,
),
textSelectionTheme: TextSelectionThemeData(
cursorColor: lightBrightnessThemeData.accent,
),
useMaterial3: true,
).withFallbackFonts(),
darkTheme: ThemeData(
colorScheme: ColorScheme.dark(
primary: darkBrightnessThemeData.text,
),
textSelectionTheme: TextSelectionThemeData(
cursorColor: darkBrightnessThemeData.accent,
),
useMaterial3: true,
).withFallbackFonts(),
themeMode: ref.watch(settingProvider).themeMode,
builder: (context, child) {
try {
context.accountServer.language = Localizations.localeOf(
context,
).languageCode;
} catch (_) {}
final mediaQueryData = MediaQuery.of(context);
return BrightnessObserver(
lightThemeData: lightBrightnessThemeData,
darkThemeData: darkBrightnessThemeData,
forceBrightness: ref.watch(settingProvider).brightness,
child: MediaQuery(
data: mediaQueryData.copyWith(
// Different linux distro change the value, e.g. 1.2
textScaler: Platform.isLinux
? TextScaler.noScaling
: mediaQueryData.textScaler,
),
useMaterial3: true,
).withFallbackFonts(),
themeMode: ref.watch(settingProvider).themeMode,
builder: (context, child) {
try {
context.accountServer.language = Localizations.localeOf(
context,
).languageCode;
} catch (_) {}
final mediaQueryData = MediaQuery.of(context);
return BrightnessObserver(
lightThemeData: lightBrightnessThemeData,
darkThemeData: darkBrightnessThemeData,
forceBrightness: ref.watch(settingProvider).brightness,
child: MediaQuery(
data: mediaQueryData.copyWith(
// Different linux distro change the value, e.g. 1.2
textScaler: Platform.isLinux
? TextScaler.noScaling
: mediaQueryData.textScaler,
),
child: SystemTrayWidget(
child: _WindowsTitleBarDivider(
child: AuthGuard(child: child!),
),
),
child: SystemTrayWidget(
child: _WindowsTitleBarDivider(
child: AuthGuard(child: child!),
),
);
},
home: MixinAppActions(child: MacosMenuBar(child: home)),
),
),
),
),
);
},
home: MixinAppActions(child: MacosMenuBar(child: home)),
),
);
}
),
);
}

class _WindowsTitleBarDivider extends StatelessWidget {
Expand Down
4 changes: 3 additions & 1 deletion lib/ui/home/chat/input_container.dart
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ class InputContainer extends HookConsumerWidget {
child: LayoutBuilder(
builder: (context, constraints) => VoiceRecorderBarOverlayComposition(
layoutWidth: constraints.maxWidth,
child: const _InputContainer(),
child: const AppActiveTickerMode(
child: _InputContainer(),
),
),
),
);
Expand Down
14 changes: 14 additions & 0 deletions lib/utils/app_lifecycle.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@ bool get isAppActive => _appObserver._isActive.value;

ValueNotifier<bool> get appActiveListener => _appObserver._isActive;

class AppActiveTickerMode extends StatelessWidget {
const AppActiveTickerMode({required this.child, super.key});

final Widget child;

@override
Widget build(BuildContext context) => ValueListenableBuilder<bool>(
valueListenable: appActiveListener,
builder: (context, enabled, child) =>
TickerMode(enabled: enabled, child: child!),
child: child,
);
}

class _AppLifecycleObserver extends WidgetsBindingObserver {
final _isActive = ValueNotifier<bool>(true);

Expand Down
37 changes: 20 additions & 17 deletions lib/widgets/message/item/image/image_preview_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import 'package:rxdart/rxdart.dart';
import '../../../../constants/resources.dart';
import '../../../../db/mixin_database.dart' hide Offset;
import '../../../../enum/message_category.dart';
import '../../../../utils/app_lifecycle.dart';
import '../../../../utils/extension/extension.dart';
import '../../../../utils/platform.dart';
import '../../../../utils/system/clipboard.dart';
Expand Down Expand Up @@ -604,25 +605,27 @@ class _Item extends HookConsumerWidget {
child: DecoratedBox(
decoration: const BoxDecoration(color: Color.fromRGBO(62, 65, 72, 0.9)),
child: ClipRect(
child: ImagPreviewWidget(
scale: initialScale,
minScale: math.min(initialScale / 2, 0.5),
maxScale: math.max(initialScale * 2, 2),
controller: controller,
onEmptyAreaTapped: () {
Navigator.maybePop(context);
},
image: Image.file(
File(
context.accountServer.convertMessageAbsolutePath(
message,
isTranscriptPage,
child: AppActiveTickerMode(
child: ImagPreviewWidget(
scale: initialScale,
minScale: math.min(initialScale / 2, 0.5),
maxScale: math.max(initialScale * 2, 2),
controller: controller,
onEmptyAreaTapped: () {
Navigator.maybePop(context);
},
image: Image.file(
File(
context.accountServer.convertMessageAbsolutePath(
message,
isTranscriptPage,
),
),
),
fit: BoxFit.contain,
errorBuilder: (context, error, s) => ImageByBlurHashOrBase64(
imageData: message.thumbImage ?? '',
fit: BoxFit.contain,
errorBuilder: (context, error, s) => ImageByBlurHashOrBase64(
imageData: message.thumbImage ?? '',
fit: BoxFit.contain,
),
),
),
),
Expand Down
37 changes: 20 additions & 17 deletions lib/widgets/message/message.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import '../../ui/provider/message_selection_provider.dart';
import '../../ui/provider/quote_message_provider.dart';
import '../../ui/provider/setting_provider.dart';
import '../../ui/provider/user_cache_provider.dart';
import '../../utils/app_lifecycle.dart';
import '../../utils/extension/extension.dart';
import '../avatar_view/avatar_view.dart';
import '../interactive_decorated_box.dart';
Expand Down Expand Up @@ -277,23 +278,25 @@ class MessageItemWidget extends HookConsumerWidget {
child: child,
);

return FocusScope(
node: focusNode,
child: MessageContext(
isTranscriptPage: isTranscriptPage,
isPinnedPage: isPinnedPage,
showNip: presentation.showNip,
isCurrentUser: presentation.isCurrentUser,
message: message,
highlightEnabled: blink,
menuHighlighted: showedMenu.value,
child: Builder(
builder: (context) => MessageQuickReplyDetector(
child: Padding(
padding: row.sameUserPrev
? EdgeInsets.zero
: const EdgeInsets.only(top: 8),
child: child,
return AppActiveTickerMode(
child: FocusScope(
node: focusNode,
child: MessageContext(
isTranscriptPage: isTranscriptPage,
isPinnedPage: isPinnedPage,
showNip: presentation.showNip,
isCurrentUser: presentation.isCurrentUser,
message: message,
highlightEnabled: blink,
menuHighlighted: showedMenu.value,
child: Builder(
builder: (context) => MessageQuickReplyDetector(
child: Padding(
padding: row.sameUserPrev
? EdgeInsets.zero
: const EdgeInsets.only(top: 8),
child: child,
),
),
),
),
Expand Down
Loading
Loading