poppingmoon · poppingmoon · Mar 16, 2025 · Mar 15, 2025 · Mar 15, 2025 · Mar 16, 2025
diff --git a/lib/i18n/aria/aria.i18n.yaml b/lib/i18n/aria/aria.i18n.yaml
@@ -135,6 +135,7 @@ showMenuButtonInTabBar: "Show menu button in tab bar"
 showNoteCreatedAt: "Show creation date of notes"
 showNoteFooter: "Show action buttons in notes"
 showNoteReactionsViewer: "Show reactions viewers in notes"
+showOnlineStatus: "Show online status"
 showPopupOnNewNote: "Show popup on new note"
 showQuoteButtonInNoteFooter: "Add \"Quote\" to note action menu"
 showReactionsCountForEachTypes: "See the number of reactions for each reaction types"

diff --git a/lib/i18n/strings.g.dart b/lib/i18n/strings.g.dart
@@ -4,7 +4,7 @@
 /// To regenerate, run: `dart run slang`
 ///
 /// Locales: 31
-/// Strings: 57343 (1849 per locale)
+/// Strings: 57344 (1849 per locale)
 
 // coverage:ignore-file
 // ignore_for_file: type=lint, unused_import

diff --git a/lib/i18n/strings_en_US.g.dart b/lib/i18n/strings_en_US.g.dart
@@ -224,6 +224,7 @@ class TranslationsAriaEnUs {
 	String get showNoteCreatedAt => 'Show creation date of notes';
 	String get showNoteFooter => 'Show action buttons in notes';
 	String get showNoteReactionsViewer => 'Show reactions viewers in notes';
+	String get showOnlineStatus => 'Show online status';
 	String get showPopupOnNewNote => 'Show popup on new note';
 	String get showQuoteButtonInNoteFooter => 'Add "Quote" to note action menu';
 	String get showReactionsCountForEachTypes => 'See the number of reactions for each reaction types';

diff --git a/lib/model/general_settings.dart b/lib/model/general_settings.dart
@@ -107,6 +107,7 @@ abstract class GeneralSettings with _$GeneralSettings {
     @Default(false) bool enableEmojiFadeIn,
     @Default(false) bool forceShowAds,
     @Default(false) bool useGroupedNotifications,
+    @Default(false) bool showOnlineStatus,
     @Default(false) bool showTimelineTabBarAtBottom,
     @Default(false) bool showMenuButtonInTabBar,
     @Default(defaultTimelinesPageButtonTypes)

diff --git a/lib/model/general_settings.freezed.dart b/lib/model/general_settings.freezed.dart
diff --git a/lib/model/general_settings.g.dart b/lib/model/general_settings.g.dart
diff --git a/lib/provider/general_settings_notifier_provider.dart b/lib/provider/general_settings_notifier_provider.dart
@@ -395,6 +395,11 @@ class GeneralSettingsNotifier extends _$GeneralSettingsNotifier {
     await _save();
   }
 
+  Future<void> setShowOnlineStatus(bool showOnlineStatus) async {
+    state = state.copyWith(showOnlineStatus: showOnlineStatus);
+    await _save();
+  }
+
   Future<void> setShowTimelineTabBarAtBottom(
     bool showTimelineTabBarAtBottom,
   ) async {

diff --git a/lib/provider/general_settings_notifier_provider.g.dart b/lib/provider/general_settings_notifier_provider.g.dart
diff --git a/lib/view/page/clip_page.dart b/lib/view/page/clip_page.dart
@@ -277,6 +277,7 @@ class _ClipDescription extends ConsumerWidget {
                   account: account,
                   user: user,
                   size: 32.0,
+                  showOnlineIndicator: true,
                   onTap: () => context.push('/$account/users/${user.id}'),
                 ),
                 const SizedBox(width: 4.0),

diff --git a/lib/view/page/settings/appearance_page.dart b/lib/view/page/settings/appearance_page.dart
@@ -171,6 +171,20 @@ class AppearancePage extends HookConsumerWidget {
               ),
             ),
           ),
+          Center(
+            child: Container(
+              margin: const EdgeInsets.symmetric(horizontal: 8.0),
+              width: maxContentWidth,
+              child: SwitchListTile(
+                title: Text(t.aria.showOnlineStatus),
+                value: settings.showOnlineStatus,
+                onChanged:
+                    (value) => ref
+                        .read(generalSettingsNotifierProvider.notifier)
+                        .setShowOnlineStatus(value),
+              ),
+            ),
+          ),
           Center(
             child: Container(
               margin: const EdgeInsets.symmetric(horizontal: 8.0),

diff --git a/lib/view/page/settings/blocked_users_page.dart b/lib/view/page/settings/blocked_users_page.dart
@@ -39,6 +39,7 @@ class BlockedUsersPage extends ConsumerWidget {
                 account: account,
                 user: blocking.blockee,
                 size: 32.0,
+                showOnlineIndicator: true,
               ),
               title: UsernameWidget(account: account, user: blocking.blockee),
               subtitle: Column(

diff --git a/lib/view/page/settings/muted_users_page.dart b/lib/view/page/settings/muted_users_page.dart
@@ -39,6 +39,7 @@ class MutedUsersPage extends ConsumerWidget {
                 account: account,
                 user: muting.mutee,
                 size: 32.0,
+                showOnlineIndicator: true,
               ),
               title: UsernameWidget(account: account, user: muting.mutee),
               subtitle: Column(

diff --git a/lib/view/page/settings/note_display_page.dart b/lib/view/page/settings/note_display_page.dart
@@ -735,9 +735,7 @@ class NoteDisplayPage extends HookConsumerWidget {
                           onTap: () async {
                             final result = await showRadioDialog(
                               context,
-                              title: Text(
-                                t.misskey.mediaListWithOneImageAppearance,
-                              ),
+                              title: Text(t.aria.displayOfThumbnail),
                               values: [BoxFit.contain, BoxFit.cover],
                               initialValue: settings.thumbnailBoxFit,
                               itemBuilder:

diff --git a/lib/view/page/settings/renote_muted_users_page.dart b/lib/view/page/settings/renote_muted_users_page.dart
@@ -41,6 +41,7 @@ class RenoteMutedUsersPage extends ConsumerWidget {
                 account: account,
                 user: renoteMuting.mutee,
                 size: 32.0,
+                showOnlineIndicator: true,
               ),
               title: UsernameWidget(account: account, user: renoteMuting.mutee),
               subtitle: Column(

diff --git a/lib/view/page/user/user_home.dart b/lib/view/page/user/user_home.dart
@@ -171,6 +171,7 @@ class _UserHome extends ConsumerWidget {
                   account: account,
                   user: user,
                   size: 100.0,
+                  showOnlineIndicator: true,
                   onTap:
                       () => showImageDialog(
                         context,
@@ -484,19 +485,12 @@ class _UserHome extends ConsumerWidget {
                                                   (context) =>
                                                       UrlSheet(url: link.url),
                                             ),
-                                        child:
-                                            link.imgSrc != null
-                                                ? ImageWidget(
-                                                  url: link.imgSrc!,
-                                                  width: 200.0,
-                                                  height: 40.0,
-                                                  semanticLabel:
-                                                      link.description,
-                                                )
-                                                : const SizedBox(
-                                                  width: 200.0,
-                                                  height: 40.0,
-                                                ),
+                                        child: ImageWidget(
+                                          url: link.imgSrc,
+                                          width: 200.0,
+                                          height: 40.0,
+                                          semanticLabel: link.description,
+                                        ),
                                       ),
                                     )
                                     .toList(),

diff --git a/lib/view/widget/cat_avatar.dart b/lib/view/widget/cat_avatar.dart
@@ -3,17 +3,13 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:misskey_dart/misskey_dart.dart';
 
 import '../../model/account.dart';
-import '../../provider/average_color_provider.dart';
-import '../../provider/data_saver_provider.dart';
-import '../../provider/general_settings_notifier_provider.dart';
-import '../../provider/static_image_url_provider.dart';
 import 'avatar_decorations.dart';
 import 'cat_ear.dart';
 import 'image_widget.dart';
+import 'online_indicator.dart';
 
 final _catEarWiggleTween = TweenSequence([
   TweenSequenceItem(
@@ -28,50 +24,36 @@ final _catEarWiggleTween = TweenSequence([
   TweenSequenceItem(tween: Tween(begin: 0.0, end: 0.65624379), weight: 25),
 ]);
 
-class CatAvatar extends HookConsumerWidget {
+class CatAvatar extends HookWidget {
   const CatAvatar({
     super.key,
     required this.account,
-    required this.user,
+    required this.url,
+    required this.blurHash,
+    required this.catEarColor,
+    required this.showAvatarDecorations,
+    required this.decorations,
+    required this.showOnlineStatus,
+    required this.onlineStatus,
     required this.size,
-    this.decorations,
-    this.forceShowDecoration = false,
-    this.onTap,
+    required this.borderRadius,
+    required this.onTap,
   });
 
   final Account account;
-  final User user;
+  final Uri? url;
+  final String? blurHash;
+  final Color catEarColor;
+  final bool showAvatarDecorations;
+  final List<UserAvatarDecoration> decorations;
+  final bool showOnlineStatus;
+  final OnlineStatus? onlineStatus;
   final double size;
-  final List<UserAvatarDecoration>? decorations;
-  final bool forceShowDecoration;
+  final BorderRadius borderRadius;
   final void Function()? onTap;
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final (
-      showAvatarDecorations,
-      squareAvatars,
-      disableShowingAnimatedImages,
-    ) = ref.watch(
-      generalSettingsNotifierProvider.select(
-        (settings) => (
-          settings.showAvatarDecorations,
-          settings.squareAvatars,
-          settings.disableShowingAnimatedImages,
-        ),
-      ),
-    );
-    final useStaticImage =
-        disableShowingAnimatedImages ||
-        ref.watch(dataSaverProvider.select((dataSaver) => dataSaver.avatar));
-    final borderRadius = BorderRadius.circular(
-      squareAvatars ? size * 0.2 : size,
-    );
-    final blurHash = user.avatarBlurhash;
-    final catEarColor =
-        blurHash != null
-            ? ref.watch(averageColorProvider(blurHash))
-            : Theme.of(context).colorScheme.primary;
+  Widget build(BuildContext context) {
     final controller = useAnimationController(
       duration: const Duration(seconds: 1),
     );
@@ -138,29 +120,28 @@ class CatAvatar extends HookConsumerWidget {
             ClipRRect(
               borderRadius: borderRadius,
               child: ImageWidget(
-                url:
-                    useStaticImage
-                        ? ref
-                            .watch(
-                              staticImageUrlProvider(
-                                account.host,
-                                user.avatarUrl.toString(),
-                              ),
-                            )
-                            .toString()
-                        : user.avatarUrl.toString(),
-                blurHash: user.avatarBlurhash,
+                url: url?.toString(),
+                blurHash: blurHash,
                 height: size,
                 width: size,
                 fit: BoxFit.cover,
               ),
             ),
-            if (forceShowDecoration || showAvatarDecorations)
+            if (showAvatarDecorations)
               AvatarDecorations(
                 account: account,
-                decorations: decorations ?? user.avatarDecorations,
+                decorations: decorations,
                 size: size,
               ),
+            if (showOnlineStatus)
+              Positioned(
+                left: 0.0,
+                bottom: 0.0,
+                child: OnlineIndicator(
+                  onlineStatus: onlineStatus,
+                  size: size * 0.2,
+                ),
+              ),
           ],
         ),
       ),

diff --git a/lib/view/widget/image_widget.dart b/lib/view/widget/image_widget.dart
@@ -21,7 +21,7 @@ class ImageWidget extends ConsumerWidget {
     this.enableFadeIn = true,
   });
 
-  final String url;
+  final String? url;
   final String? blurHash;
   final double? width;
   final double? height;
@@ -46,7 +46,8 @@ class ImageWidget extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    if (url.isEmpty) {
+    final url = this.url;
+    if (url == null || url.isEmpty) {
       return _buildPlaceholder();
     }
     if (url.startsWith('data')) {

diff --git a/lib/view/widget/note_detailed_widget.dart b/lib/view/widget/note_detailed_widget.dart
@@ -343,6 +343,7 @@ class _NoteDetailedContent extends HookConsumerWidget {
               account: account,
               user: appearNote.user,
               size: style.lineHeight * avatarScale,
+              showOnlineIndicator: true,
               onTap: () => context.push('/$account/users/${appearNote.userId}'),
             ),
             const SizedBox(width: 8.0),

diff --git a/lib/view/widget/online_indicator.dart b/lib/view/widget/online_indicator.dart
@@ -0,0 +1,44 @@
+import 'package:flutter/material.dart';
+import 'package:misskey_dart/misskey_dart.dart';
+
+import '../../i18n/strings.g.dart';
+
+class OnlineIndicator extends StatelessWidget {
+  const OnlineIndicator({
+    super.key,
+    required this.onlineStatus,
+    required this.size,
+  });
+
+  final OnlineStatus? onlineStatus;
+  final double size;
+
+  @override
+  Widget build(BuildContext context) {
+    return Tooltip(
+      message: switch (onlineStatus) {
+        OnlineStatus.online => t.misskey.online,
+        OnlineStatus.active => t.misskey.active,
+        OnlineStatus.offline => t.misskey.offline,
+        OnlineStatus.unknown || null => t.misskey.unknown,
+      },
+      child: DecoratedBox(
+        decoration: BoxDecoration(
+          color: switch (onlineStatus) {
+            OnlineStatus.online => const Color(0xff58d4c9),
+            OnlineStatus.active => const Color(0xffe4bc48),
+            OnlineStatus.offline => const Color(0xffea5353),
+            OnlineStatus.unknown || null => const Color(0xff888888),
+          },
+          border: Border.all(
+            color: Theme.of(context).colorScheme.surface,
+            width: 3.0,
+            strokeAlign: BorderSide.strokeAlignOutside,
+          ),
+          shape: BoxShape.circle,
+        ),
+        child: SizedBox.square(dimension: size),
+      ),
+    );
+  }
+}