🚀 Launch 1.4.0+15

assets/locales/en_us.json

@@ -486,5 +486,9 @@
   "shareImage": "Share as image",
   "shareImageFooter": "Only on the Solar Network",
   "fileSavedAt": "File saved at @path",
-  "showIp": "Show IP Address"
+  "showIp": "Show IP Address",
+  "shotOn": "Shot on @device",
+  "unread": "Unread",
+  "searchTook": "Took @time",
+  "searchResult": "@count Matches"
 }

assets/locales/zh_cn.json

@@ -482,5 +482,9 @@
   "shareImage": "分享图片",
   "shareImageFooter": "上 Solar Network 看更多有趣帖子",
   "fileSavedAt": "文件保存于 @path",
-  "showIp": "显示 IP 地址"
+  "showIp": "显示 IP 地址",
+  "shotOn": "由 @device 拍摄",
+  "unread": "未读",
+  "searchTook": "耗时 @time",
+  "searchResult": "匹配到 @count 条结果"
 }

lib/bootstrapper.dart

@@ -13,6 +13,7 @@ import 'package:solian/exts.dart';
 import 'package:solian/platform.dart';
 import 'package:solian/providers/auth.dart';
 import 'package:solian/providers/content/realm.dart';
+import 'package:solian/providers/notifications.dart';
 import 'package:solian/providers/relation.dart';
 import 'package:solian/providers/theme_switcher.dart';
 import 'package:solian/providers/websocket.dart';
@@ -198,6 +199,8 @@ class _BootstrapperShellState extends State<BootstrapperShell> {
         final AuthProvider auth = Get.find();
         try {
           await Future.wait([
+            if (auth.isAuthorized.isTrue)
+              Get.find<NotificationProvider>().fetchNotification(),
             if (auth.isAuthorized.isTrue)
               Get.find<RelationshipProvider>().refreshRelativeList(),
             if (auth.isAuthorized.isTrue)
@@ -214,7 +217,7 @@ class _BootstrapperShellState extends State<BootstrapperShell> {
         final AuthProvider auth = Get.find();
         if (auth.isAuthorized.isTrue) {
           try {
-            Get.find<WebSocketProvider>().registerPushNotifications();
+            Get.find<NotificationProvider>().registerPushNotifications();
           } catch (err) {
             context.showSnackbar(
               'pushNotifyRegisterFailed'.trParams({'reason': err.toString()}),

lib/main.dart

@@ -18,6 +18,7 @@ import 'package:solian/providers/database/services/messages.dart';
 import 'package:solian/providers/last_read.dart';
 import 'package:solian/providers/link_expander.dart';
 import 'package:solian/providers/navigation.dart';
+import 'package:solian/providers/notifications.dart';
 import 'package:solian/providers/stickers.dart';
 import 'package:solian/providers/subscription.dart';
 import 'package:solian/providers/theme_switcher.dart';
@@ -138,11 +139,12 @@ class SolianApp extends StatelessWidget {
     Get.put(NavigationStateProvider());
 
     Get.lazyPut(() => AuthProvider());
+    Get.lazyPut(() => WebSocketProvider());
     Get.lazyPut(() => RelationshipProvider());
     Get.lazyPut(() => PostProvider());
     Get.lazyPut(() => StickerProvider());
     Get.lazyPut(() => AttachmentProvider());
-    Get.lazyPut(() => WebSocketProvider());
+    Get.lazyPut(() => NotificationProvider());
     Get.lazyPut(() => StatusProvider());
     Get.lazyPut(() => ChannelProvider());
     Get.lazyPut(() => RealmProvider());
@@ -154,6 +156,6 @@ class SolianApp extends StatelessWidget {
     Get.lazyPut(() => LastReadProvider());
     Get.lazyPut(() => SubscriptionProvider());
 
-    Get.find<WebSocketProvider>().requestPermissions();
+    Get.find<NotificationProvider>().requestPermissions();
   }
 }

lib/models/notification.dart

@@ -1,18 +1,29 @@
+import 'package:flutter/material.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 part 'notification.g.dart';
 
+const Map<String, IconData> NotificationTopicIcons = {
+  'passport.security.alert': Icons.gpp_maybe,
+  'interactive.subscription': Icons.subscriptions,
+  'interactive.feedback': Icons.add_reaction,
+  'messaging.callStart': Icons.call_received,
+};
+
 @JsonSerializable()
 class Notification {
   int id;
   DateTime createdAt;
   DateTime updatedAt;
   DateTime? deletedAt;
+  DateTime? readAt;
+  String topic;
   String title;
   String? subtitle;
   String body;
   String? avatar;
   String? picture;
+  Map<String, dynamic>? metadata;
   int? senderId;
   int accountId;
 
@@ -21,11 +32,14 @@ class Notification {
     required this.createdAt,
     required this.updatedAt,
     required this.deletedAt,
+    required this.readAt,
+    required this.topic,
     required this.title,
     required this.subtitle,
     required this.body,
     required this.avatar,
     required this.picture,
+    required this.metadata,
     required this.senderId,
     required this.accountId,
   });

lib/models/notification.g.dart

@@ -13,11 +13,16 @@ Notification _$NotificationFromJson(Map<String, dynamic> json) => Notification(
       deletedAt: json['deleted_at'] == null
           ? null
           : DateTime.parse(json['deleted_at'] as String),
+      readAt: json['read_at'] == null
+          ? null
+          : DateTime.parse(json['read_at'] as String),
+      topic: json['topic'] as String,
       title: json['title'] as String,
       subtitle: json['subtitle'] as String?,
       body: json['body'] as String,
       avatar: json['avatar'] as String?,
       picture: json['picture'] as String?,
+      metadata: json['metadata'] as Map<String, dynamic>?,
       senderId: (json['sender_id'] as num?)?.toInt(),
       accountId: (json['account_id'] as num).toInt(),
     );
@@ -28,11 +33,14 @@ Map<String, dynamic> _$NotificationToJson(Notification instance) =>
       'created_at': instance.createdAt.toIso8601String(),
       'updated_at': instance.updatedAt.toIso8601String(),
       'deleted_at': instance.deletedAt?.toIso8601String(),
+      'read_at': instance.readAt?.toIso8601String(),
+      'topic': instance.topic,
       'title': instance.title,
       'subtitle': instance.subtitle,
       'body': instance.body,
       'avatar': instance.avatar,
       'picture': instance.picture,
+      'metadata': instance.metadata,
       'sender_id': instance.senderId,
       'account_id': instance.accountId,
     };

lib/providers/auth.dart

@@ -11,6 +11,7 @@ import 'package:solian/exceptions/request.dart';
 import 'package:solian/exceptions/unauthorized.dart';
 import 'package:solian/models/auth.dart';
 import 'package:solian/providers/database/database.dart';
+import 'package:solian/providers/notifications.dart';
 import 'package:solian/providers/websocket.dart';
 import 'package:solian/services.dart';
 
@@ -174,7 +175,7 @@ class AuthProvider extends GetConnect {
     );
 
     Get.find<WebSocketProvider>().connect();
-    Get.find<WebSocketProvider>().notifyPrefetch();
+    Get.find<NotificationProvider>().fetchNotification();
 
     return credentials!;
   }
@@ -184,8 +185,8 @@ class AuthProvider extends GetConnect {
     userProfile.value = null;
 
     Get.find<WebSocketProvider>().disconnect();
-    Get.find<WebSocketProvider>().notifications.clear();
+    Get.find<NotificationProvider>().notifications.clear();
-    Get.find<WebSocketProvider>().notificationUnread.value = 0;
+    Get.find<NotificationProvider>().notificationUnread.value = 0;
 
     AppDatabase.removeDatabase();
     autoStopBackgroundNotificationService();

lib/providers/notifications.dart

@@ -0,0 +1,175 @@
+import 'dart:developer';
+
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:flutter_udid/flutter_udid.dart';
+import 'package:get/get.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:solian/exceptions/request.dart';
+import 'package:solian/models/notification.dart';
+import 'package:solian/models/pagination.dart';
+import 'package:solian/platform.dart';
+import 'package:solian/providers/auth.dart';
+
+class NotificationProvider extends GetxController {
+  RxBool isBusy = false.obs;
+
+  RxInt notificationUnread = 0.obs;
+  RxList<Notification> notifications =
+      List<Notification>.empty(growable: true).obs;
+
+  Future<void> fetchNotification() async {
+    final AuthProvider auth = Get.find();
+    if (auth.isAuthorized.isFalse) return;
+
+    final client = await auth.configureClient('auth');
+
+    final resp = await client.get('/notifications?skip=0&take=100');
+    if (resp.statusCode == 200) {
+      final result = PaginationResult.fromJson(resp.body);
+      final data = result.data?.map((x) => Notification.fromJson(x)).toList();
+      if (data != null) {
+        notifications.addAll(data);
+        notificationUnread.value = data.where((x) => x.readAt == null).length;
+      }
+    }
+  }
+
+  Future<void> markAllRead() async {
+    final AuthProvider auth = Get.find();
+    if (auth.isAuthorized.isFalse) return;
+
+    isBusy.value = true;
+
+    final NotificationProvider nty = Get.find();
+
+    List<int> markList = List.empty(growable: true);
+    for (final element in nty.notifications) {
+      if (element.id <= 0) continue;
+      if (element.readAt != null) continue;
+      markList.add(element.id);
+    }
+
+    if (markList.isNotEmpty) {
+      final client = await auth.configureClient('auth');
+      await client.put('/notifications/read', {'messages': markList});
+    }
+
+    nty.notifications.value = nty.notifications.map((x) {
+      x.readAt = DateTime.now();
+      return x;
+    }).toList();
+    nty.notifications.refresh();
+
+    isBusy.value = false;
+  }
+
+  Future<void> markOneRead(Notification element, int index) async {
+    final AuthProvider auth = Get.find();
+    if (auth.isAuthorized.isFalse) return;
+
+    final NotificationProvider nty = Get.find();
+
+    if (element.id <= 0) {
+      nty.notifications.removeAt(index);
+      return;
+    } else if (element.readAt != null) {
+      return;
+    }
+
+    isBusy.value = true;
+
+    final client = await auth.configureClient('auth');
+
+    await client.put('/notifications/read/${element.id}', {});
+
+    nty.notifications[0].readAt = DateTime.now();
+    nty.notifications.refresh();
+
+    isBusy.value = false;
+  }
+
+  void requestPermissions() {
+    try {
+      FirebaseMessaging.instance.requestPermission(
+          alert: true,
+          announcement: true,
+          carPlay: true,
+          badge: true,
+          sound: true);
+    } catch (_) {
+      // When firebase isn't initialized (background service)
+      FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
+          FlutterLocalNotificationsPlugin();
+      flutterLocalNotificationsPlugin
+          .resolvePlatformSpecificImplementation<
+              AndroidFlutterLocalNotificationsPlugin>()
+          ?.requestNotificationsPermission();
+      flutterLocalNotificationsPlugin
+          .resolvePlatformSpecificImplementation<
+              IOSFlutterLocalNotificationsPlugin>()
+          ?.requestPermissions(
+            alert: true,
+            badge: true,
+            sound: true,
+          );
+      flutterLocalNotificationsPlugin
+          .resolvePlatformSpecificImplementation<
+              MacOSFlutterLocalNotificationsPlugin>()
+          ?.requestPermissions(
+            alert: true,
+            badge: true,
+            sound: true,
+          );
+    }
+  }
+
+  Future<void> registerPushNotifications() async {
+    if (PlatformInfo.isWeb) return;
+
+    final prefs = await SharedPreferences.getInstance();
+    if (prefs.getBool('service_background_notification') == true) {
+      log('Background notification service has been enabled, skip register push notifications');
+      return;
+    }
+
+    final AuthProvider auth = Get.find();
+    if (auth.isAuthorized.isFalse) return;
+
+    late final String? token;
+    late final String provider;
+    var deviceUuid = await _getDeviceUuid();
+
+    if (deviceUuid == null || deviceUuid.isEmpty) {
+      log("Unable to active push notifications, couldn't get device uuid");
+      return;
+    } else {
+      log('Device UUID is $deviceUuid');
+    }
+
+    if (PlatformInfo.isIOS || PlatformInfo.isMacOS) {
+      provider = 'apple';
+      token = await FirebaseMessaging.instance.getAPNSToken();
+    } else {
+      provider = 'firebase';
+      token = await FirebaseMessaging.instance.getToken();
+    }
+    log('Device Push Token is $token');
+
+    final client = await auth.configureClient('auth');
+
+    final resp = await client.post('/notifications/subscribe', {
+      'provider': provider,
+      'device_token': token,
+      'device_id': deviceUuid,
+    });
+    if (resp.statusCode != 200 && resp.statusCode != 400) {
+      throw RequestException(resp);
+    }
+  }
+
+  Future<String?> _getDeviceUuid() async {
+    if (PlatformInfo.isWeb) return null;
+    return await FlutterUdid.consistentUdid;
+  }
+}

lib/providers/websocket.dart

@@ -3,17 +3,11 @@ import 'dart:convert';
 import 'dart:developer';
 import 'dart:io';
 
-import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:flutter_udid/flutter_udid.dart';
 import 'package:get/get.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:solian/exceptions/request.dart';
 import 'package:solian/models/notification.dart';
 import 'package:solian/models/packet.dart';
-import 'package:solian/models/pagination.dart';
-import 'package:solian/platform.dart';
 import 'package:solian/providers/auth.dart';
+import 'package:solian/providers/notifications.dart';
 import 'package:solian/services.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 
@@ -21,56 +15,10 @@ class WebSocketProvider extends GetxController {
   RxBool isConnected = false.obs;
   RxBool isConnecting = false.obs;
 
-  RxInt notificationUnread = 0.obs;
-  RxList<Notification> notifications =
-      List<Notification>.empty(growable: true).obs;
-
   WebSocketChannel? websocket;
 
   StreamController<NetworkPackage> stream = StreamController.broadcast();
 
-  @override
-  onInit() {
-    notifyPrefetch();
-
-    super.onInit();
-  }
-
-  void requestPermissions() {
-    try {
-      FirebaseMessaging.instance.requestPermission(
-          alert: true,
-          announcement: true,
-          carPlay: true,
-          badge: true,
-          sound: true);
-    } catch (_) {
-      // When firebase isn't initialized (background service)
-      FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
-          FlutterLocalNotificationsPlugin();
-      flutterLocalNotificationsPlugin
-          .resolvePlatformSpecificImplementation<
-              AndroidFlutterLocalNotificationsPlugin>()
-          ?.requestNotificationsPermission();
-      flutterLocalNotificationsPlugin
-          .resolvePlatformSpecificImplementation<
-              IOSFlutterLocalNotificationsPlugin>()
-          ?.requestPermissions(
-            alert: true,
-            badge: true,
-            sound: true,
-          );
-      flutterLocalNotificationsPlugin
-          .resolvePlatformSpecificImplementation<
-              MacOSFlutterLocalNotificationsPlugin>()
-          ?.requestPermissions(
-            alert: true,
-            badge: true,
-            sound: true,
-          );
-    }
-  }
-
   Future<void> connect({noRetry = false}) async {
     if (isConnected.value) {
       return;
@@ -119,8 +67,9 @@ class WebSocketProvider extends GetxController {
         log('Websocket incoming message: ${packet.method} ${packet.message}');
         stream.sink.add(packet);
         if (packet.method == 'notifications.new') {
-          notifications.add(Notification.fromJson(packet.payload!));
+          final NotificationProvider nty = Get.find();
-          notificationUnread.value++;
+          nty.notifications.add(Notification.fromJson(packet.payload!));
+          nty.notificationUnread.value++;
         }
       },
       onDone: () {
@@ -133,70 +82,4 @@ class WebSocketProvider extends GetxController {
       },
     );
   }
-
-  Future<void> notifyPrefetch() async {
-    final AuthProvider auth = Get.find();
-    if (auth.isAuthorized.isFalse) return;
-
-    final client = await auth.configureClient('auth');
-
-    final resp = await client.get('/notifications?skip=0&take=100');
-    if (resp.statusCode == 200) {
-      final result = PaginationResult.fromJson(resp.body);
-      final data = result.data?.map((x) => Notification.fromJson(x)).toList();
-      if (data != null) {
-        notifications.addAll(data);
-        notificationUnread.value = data.length;
-      }
-    }
-  }
-
-  Future<void> registerPushNotifications() async {
-    if (PlatformInfo.isWeb) return;
-
-    final prefs = await SharedPreferences.getInstance();
-    if (prefs.getBool('service_background_notification') == true) {
-      log('Background notification service has been enabled, skip register push notifications');
-      return;
-    }
-
-    final AuthProvider auth = Get.find();
-    if (auth.isAuthorized.isFalse) return;
-
-    late final String? token;
-    late final String provider;
-    var deviceUuid = await _getDeviceUuid();
-
-    if (deviceUuid == null || deviceUuid.isEmpty) {
-      log("Unable to active push notifications, couldn't get device uuid");
-      return;
-    } else {
-      log('Device UUID is $deviceUuid');
-    }
-
-    if (PlatformInfo.isIOS || PlatformInfo.isMacOS) {
-      provider = 'apple';
-      token = await FirebaseMessaging.instance.getAPNSToken();
-    } else {
-      provider = 'firebase';
-      token = await FirebaseMessaging.instance.getToken();
-    }
-    log('Device Push Token is $token');
-
-    final client = await auth.configureClient('auth');
-
-    final resp = await client.post('/notifications/subscribe', {
-      'provider': provider,
-      'device_token': token,
-      'device_id': deviceUuid,
-    });
-    if (resp.statusCode != 200 && resp.statusCode != 400) {
-      throw RequestException(resp);
-    }
-  }
-
-  Future<String?> _getDeviceUuid() async {
-    if (PlatformInfo.isWeb) return null;
-    return await FlutterUdid.consistentUdid;
-  }
 }

lib/screens/account/notification.dart

@@ -1,9 +1,14 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_animate/flutter_animate.dart';
+import 'package:gap/gap.dart';
 import 'package:get/get.dart';
-import 'package:solian/providers/websocket.dart';
+import 'package:solian/models/notification.dart';
-import 'package:solian/providers/auth.dart';
+import 'package:solian/models/post.dart';
-import 'package:solian/models/notification.dart' as notify;
+import 'package:solian/providers/notifications.dart';
+import 'package:solian/router.dart';
+import 'package:solian/widgets/loading_indicator.dart';
+import 'package:solian/widgets/markdown_text_content.dart';
+import 'package:solian/widgets/posts/post_item.dart';
+import 'package:solian/widgets/relative_date.dart';
 import 'package:uuid/uuid.dart';
 
 class NotificationScreen extends StatefulWidget {
@@ -14,57 +19,9 @@ class NotificationScreen extends StatefulWidget {
 }
 
 class _NotificationScreenState extends State<NotificationScreen> {
-  bool _isBusy = false;
-
-  Future<void> _markAllRead() async {
-    final AuthProvider auth = Get.find();
-    if (auth.isAuthorized.isFalse) return;
-
-    setState(() => _isBusy = true);
-
-    final WebSocketProvider provider = Get.find();
-
-    List<int> markList = List.empty(growable: true);
-    for (final element in provider.notifications) {
-      if (element.id <= 0) continue;
-      markList.add(element.id);
-    }
-
-    if (markList.isNotEmpty) {
-      final client = await auth.configureClient('auth');
-      await client.put('/notifications/read', {'messages': markList});
-    }
-
-    provider.notifications.clear();
-
-    setState(() => _isBusy = false);
-  }
-
-  Future<void> _markOneRead(notify.Notification element, int index) async {
-    final AuthProvider auth = Get.find();
-    if (auth.isAuthorized.isFalse) return;
-
-    final WebSocketProvider provider = Get.find();
-
-    if (element.id <= 0) {
-      provider.notifications.removeAt(index);
-      return;
-    }
-
-    setState(() => _isBusy = true);
-
-    final client = await auth.configureClient('auth');
-
-    await client.put('/notifications/read/${element.id}', {});
-
-    provider.notifications.removeAt(index);
-
-    setState(() => _isBusy = false);
-  }
-
   @override
   Widget build(BuildContext context) {
-    final WebSocketProvider ws = Get.find();
+    final NotificationProvider nty = Get.find();
 
     return SizedBox(
       height: MediaQuery.of(context).size.height * 0.85,
@@ -77,18 +34,24 @@ class _NotificationScreenState extends State<NotificationScreen> {
           ).paddingOnly(left: 24, right: 24, top: 32, bottom: 16),
           Expanded(
             child: Obx(() {
-              return CustomScrollView(
+              return RefreshIndicator(
+                onRefresh: () => nty.fetchNotification(),
+                child: CustomScrollView(
                   slivers: [
-                  if (_isBusy)
                     SliverToBoxAdapter(
-                      child: const LinearProgressIndicator().animate().scaleX(),
+                      child: LoadingIndicator(
+                        isActive: nty.isBusy.value,
                       ),
-                  if (ws.notifications.isEmpty)
+                    ),
+                    if (nty.notifications
+                        .where((x) => x.readAt == null)
+                        .isEmpty)
                       SliverToBoxAdapter(
                         child: Container(
                           padding: const EdgeInsets.symmetric(horizontal: 10),
-                        color:
+                          color: Theme.of(context)
-                            Theme.of(context).colorScheme.surfaceContainerHigh,
+                              .colorScheme
+                              .surfaceContainerHigh,
                           child: ListTile(
                             leading: const Icon(Icons.check),
                             title: Text('notifyEmpty'.tr),
@@ -96,52 +59,147 @@ class _NotificationScreenState extends State<NotificationScreen> {
                           ),
                         ),
                       ),
-                  if (ws.notifications.isNotEmpty)
+                    if (nty.notifications
+                        .where((x) => x.readAt == null)
+                        .isNotEmpty)
                       SliverToBoxAdapter(
                         child: Container(
                           padding: const EdgeInsets.symmetric(horizontal: 10),
-                        color: Theme.of(context).colorScheme.secondaryContainer,
+                          color:
+                              Theme.of(context).colorScheme.secondaryContainer,
                           child: ListTile(
                             leading: const Icon(Icons.checklist),
                             title: Text('notifyAllRead'.tr),
-                          onTap: _isBusy ? null : () => _markAllRead(),
+                            onTap: nty.isBusy.value
+                                ? null
+                                : () => nty.markAllRead(),
                           ),
                         ),
                       ),
                     SliverList.separated(
-                    itemCount: ws.notifications.length,
+                      itemCount: nty.notifications.length,
                       itemBuilder: (BuildContext context, int index) {
-                      var element = ws.notifications[index];
+                        var element = nty.notifications[index];
-                      return Dismissible(
+                        return ClipRect(
+                          child: Dismissible(
+                            direction: element.readAt == null
+                                ? DismissDirection.horizontal
+                                : DismissDirection.none,
                             key: Key(const Uuid().v4()),
                             background: Container(
                               color: Colors.lightBlue,
-                          padding: const EdgeInsets.symmetric(horizontal: 20),
+                              padding:
+                                  const EdgeInsets.symmetric(horizontal: 20),
                               alignment: Alignment.centerLeft,
-                          child: const Icon(Icons.check, color: Colors.white),
+                              child:
+                                  const Icon(Icons.check, color: Colors.white),
                             ),
-                        child: ListTile(
+                            secondaryBackground: Container(
-                          contentPadding: const EdgeInsets.symmetric(
+                              color: Colors.lightBlue,
-                            horizontal: 24,
+                              padding:
-                            vertical: 8,
+                                  const EdgeInsets.symmetric(horizontal: 20),
+                              alignment: Alignment.centerRight,
+                              child:
+                                  const Icon(Icons.check, color: Colors.white),
                             ),
-                          title: Text(element.title),
+                            child: Container(
-                          subtitle: Column(
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: 28,
+                                vertical: 16,
+                              ),
+                              child: Row(
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
+                                  Icon(NotificationTopicIcons[element.topic]),
+                                  const Gap(16),
+                                  Expanded(
+                                    child: Column(
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
+                                      children: [
+                                        if (element.readAt == null)
+                                          Badge(
+                                            label: Row(
+                                              children: [
+                                                const Icon(
+                                                  Icons.new_releases_outlined,
+                                                  color: Colors.white,
+                                                  size: 12,
+                                                ),
+                                                const Gap(4),
+                                                Text('unread'.tr),
+                                              ],
+                                            ),
+                                          ).paddingOnly(bottom: 4),
+                                        Text(
+                                          element.title,
+                                          style: Theme.of(context)
+                                              .textTheme
+                                              .titleMedium,
+                                        ),
                                         if (element.subtitle != null)
-                                Text(element.subtitle!),
+                                          Text(
-                              Text(element.body),
+                                            element.subtitle!,
+                                            style: Theme.of(context)
+                                                .textTheme
+                                                .titleSmall,
+                                          ),
+                                        if (element.subtitle != null)
+                                          const Gap(4),
+                                        MarkdownTextContent(
+                                          content: element.body,
+                                          isAutoWarp: true,
+                                          isSelectable: true,
+                                          parentId:
+                                              'notification-${element.id}',
+                                        ),
+                                        if ([
+                                              'interactive.feedback',
+                                              'interactive.subscription'
+                                            ].contains(element.topic) &&
+                                            element.metadata?['related_post'] !=
+                                                null)
+                                          _PostRelatedNotificationWidget(
+                                            metadata: element.metadata!,
+                                          ),
+                                        const Gap(8),
+                                        Opacity(
+                                          opacity: 0.75,
+                                          child: Row(
+                                            children: [
+                                              RelativeDate(
+                                                element.createdAt,
+                                                style: TextStyle(fontSize: 12),
+                                              ),
+                                              const Gap(4),
+                                              Text(
+                                                '·',
+                                                style: TextStyle(fontSize: 12),
+                                              ),
+                                              const Gap(4),
+                                              RelativeDate(
+                                                element.createdAt,
+                                                style: TextStyle(fontSize: 12),
+                                                isFull: true,
+                                              ),
                                             ],
                                           ),
                                         ),
-                        onDismissed: (_) => _markOneRead(element, index),
+                                      ],
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                            onDismissed: (_) => nty.markOneRead(element, index),
+                          ),
                         );
                       },
                       separatorBuilder: (_, __) =>
                           const Divider(thickness: 0.3, height: 0.3),
                     ),
                   ],
+                ),
               );
             }),
           ),
@@ -156,7 +214,7 @@ class NotificationButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final WebSocketProvider provider = Get.find();
+    final NotificationProvider nty = Get.find();
 
     final button = IconButton(
       icon: const Icon(Icons.notifications),
@@ -166,16 +224,16 @@ class NotificationButton extends StatelessWidget {
           isScrollControlled: true,
           context: context,
           builder: (context) => const NotificationScreen(),
-        ).then((_) => provider.notificationUnread.value = 0);
+        ).then((_) => nty.notificationUnread.value = 0);
       },
     );
 
     return Obx(() {
-      if (provider.notificationUnread.value > 0) {
+      if (nty.notificationUnread.value > 0) {
         return Badge(
           isLabelVisible: true,
           offset: const Offset(-8, 2),
-          label: Text(provider.notificationUnread.value.toString()),
+          label: Text(nty.notificationUnread.value.toString()),
           child: button,
         );
       } else {
@@ -184,3 +242,31 @@ class NotificationButton extends StatelessWidget {
     });
   }
 }
+
+class _PostRelatedNotificationWidget extends StatelessWidget {
+  final Map<String, dynamic> metadata;
+
+  const _PostRelatedNotificationWidget({super.key, required this.metadata});
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      child: Card(
+        margin: const EdgeInsets.symmetric(vertical: 4),
+        child: PostItem(
+          item: Post.fromJson(metadata['related_post']),
+          isCompact: true,
+        ).paddingAll(8),
+      ),
+      onTap: () {
+        final data = Post.fromJson(metadata['related_post']);
+        Navigator.pop(context);
+        AppRouter.instance.pushNamed(
+          'postDetail',
+          pathParameters: {'id': data.id.toString()},
+          extra: data,
+        );
+      },
+    );
+  }
+}

lib/screens/auth/signin.dart

@@ -8,8 +8,8 @@ import 'package:solian/exts.dart';
 import 'package:solian/models/auth.dart';
 import 'package:solian/providers/auth.dart';
 import 'package:solian/providers/content/realm.dart';
+import 'package:solian/providers/notifications.dart';
 import 'package:solian/providers/relation.dart';
-import 'package:solian/providers/websocket.dart';
 import 'package:solian/services.dart';
 import 'package:solian/widgets/sized_container.dart';
 import 'package:url_launcher/url_launcher_string.dart';
@@ -178,7 +178,7 @@ class _SignInScreenState extends State<SignInScreen> {
 
           Get.find<RealmProvider>().refreshAvailableRealms();
           Get.find<RelationshipProvider>().refreshRelativeList();
-          Get.find<WebSocketProvider>().registerPushNotifications();
+          Get.find<NotificationProvider>().registerPushNotifications();
           autoConfigureBackgroundNotificationService();
           autoStartBackgroundNotificationService();
 

lib/screens/dashboard.dart

@@ -20,7 +20,7 @@ import 'package:solian/providers/content/posts.dart';
 import 'package:solian/providers/daily_sign.dart';
 import 'package:solian/providers/database/services/messages.dart';
 import 'package:solian/providers/last_read.dart';
-import 'package:solian/providers/websocket.dart';
+import 'package:solian/providers/notifications.dart';
 import 'package:solian/router.dart';
 import 'package:solian/screens/account/notification.dart';
 import 'package:solian/theme.dart';
@@ -38,7 +38,7 @@ class DashboardScreen extends StatefulWidget {
 class _DashboardScreenState extends State<DashboardScreen> {
   late final AuthProvider _auth = Get.find();
   late final LastReadProvider _lastRead = Get.find();
-  late final WebSocketProvider _ws = Get.find();
+  late final NotificationProvider _nty = Get.find();
   late final PostProvider _posts = Get.find();
   late final DailySignProvider _dailySign = Get.find();
 
@@ -46,7 +46,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
       Theme.of(context).colorScheme.onSurface.withOpacity(0.75);
 
   List<Notification> get _pendingNotifications =>
-      List<Notification>.from(_ws.notifications)
+      List<Notification>.from(_nty.notifications.where((x) => x.readAt == null))
         ..sort((a, b) => b.createdAt.compareTo(a.createdAt));
 
   List<Post>? _currentPosts;
@@ -254,7 +254,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                         ),
                         Text(
                           'notificationUnreadCount'.trParams({
-                            'count': _ws.notifications.length.toString(),
+                            'count': _pendingNotifications.length.toString(),
                           }),
                         ),
                       ],
@@ -267,12 +267,12 @@ class _DashboardScreenState extends State<DashboardScreen> {
                           isScrollControlled: true,
                           context: context,
                           builder: (context) => const NotificationScreen(),
-                        ).then((_) => _ws.notificationUnread.value = 0);
+                        ).then((_) => _nty.notificationUnread.value = 0);
                       },
                     ),
                   ],
                 ).paddingOnly(left: 18, right: 18, bottom: 8),
-                if (_ws.notifications.isNotEmpty)
+                if (_pendingNotifications.isNotEmpty)
                   SizedBox(
                     height: 76,
                     child: ListView.separated(

lib/screens/posts/post_search.dart

@@ -20,6 +20,9 @@ class PostSearchScreen extends StatefulWidget {
 }
 
 class _PostSearchScreenState extends State<PostSearchScreen> {
+  int? _totalCount;
+  Duration? _lastTook;
+
   final TextEditingController _probeController = TextEditingController();
   final PagingController<int, Post> _pagingController =
       PagingController(firstPageKey: 0);
@@ -43,18 +46,20 @@ class _PostSearchScreenState extends State<PostSearchScreen> {
       _pagingController.nextPageKey = 0;
     }
 
-    final PostProvider provider = Get.find();
+    final PostProvider posts = Get.find();
+
+    Stopwatch stopwatch = new Stopwatch()..start();
 
     Response resp;
     try {
       if (_probeController.text.isEmpty) {
-        resp = await provider.listPost(
+        resp = await posts.listPost(
           pageKey,
           tag: widget.tag,
           category: widget.category,
         );
       } else {
-        resp = await provider.searchPost(
+        resp = await posts.searchPost(
           _probeController.text,
           pageKey,
           tag: widget.tag,
@@ -74,6 +79,11 @@ class _PostSearchScreenState extends State<PostSearchScreen> {
       _pagingController.appendLastPage(parsed);
     }
 
+    stopwatch.stop();
+
+    _totalCount = result.count;
+    _lastTook = stopwatch.elapsed;
+
     setState(() => _isBusy = false);
   }
 
@@ -90,6 +100,9 @@ class _PostSearchScreenState extends State<PostSearchScreen> {
     super.dispose();
   }
 
+  Color get _unFocusColor =>
+      Theme.of(context).colorScheme.onSurface.withOpacity(0.75);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -136,6 +149,42 @@ class _PostSearchScreenState extends State<PostSearchScreen> {
             ),
           ),
           LoadingIndicator(isActive: _isBusy),
+          if (_totalCount != null || _lastTook != null)
+            Container(
+              padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 4),
+              child: Row(
+                children: [
+                  Icon(
+                    Icons.summarize_outlined,
+                    size: 16,
+                    color: _unFocusColor,
+                  ),
+                  const Gap(4),
+                  if (_totalCount != null)
+                    Text(
+                      'searchResult'.trParams({
+                        'count': _totalCount!.toString(),
+                      }),
+                      style: TextStyle(
+                        fontSize: 13,
+                        color: _unFocusColor,
+                      ),
+                    ),
+                  const Gap(4),
+                  if (_lastTook != null)
+                    Text(
+                      'searchTook'.trParams({
+                        'time':
+                            '${(_lastTook!.inMilliseconds / 1000).toStringAsFixed(3)}s',
+                      }),
+                      style: TextStyle(
+                        fontSize: 13,
+                        color: _unFocusColor,
+                      ),
+                    ),
+                ],
+              ),
+            ),
           Expanded(
             child: RefreshIndicator(
               onRefresh: () => Future.sync(() => _pagingController.refresh()),

lib/widgets/attachments/attachment_fullscreen.dart

@@ -8,6 +8,7 @@ import 'package:flutter_animate/flutter_animate.dart';
 import 'package:gal/gal.dart';
 import 'package:gap/gap.dart';
 import 'package:get/get.dart';
+import 'package:google_fonts/google_fonts.dart';
 import 'package:solian/exts.dart';
 import 'package:solian/models/attachment.dart';
 import 'package:solian/platform.dart';
@@ -103,9 +104,10 @@ class _AttachmentFullScreenState extends State<AttachmentFullScreen> {
 
   @override
   Widget build(BuildContext context) {
-    final metaTextStyle = TextStyle(
+    final metaTextStyle = GoogleFonts.roboto(
       fontSize: 12,
       color: _unFocusColor,
+      height: 1,
     );
 
     return DismissiblePage(
@@ -239,27 +241,43 @@ class _AttachmentFullScreenState extends State<AttachmentFullScreen> {
                       child: Wrap(
                         spacing: 6,
                         children: [
+                          if (widget.item.metadata?['exif'] == null)
                             Text(
                               '#${widget.item.rid}',
                               style: metaTextStyle,
                             ),
-                          if (widget.item.metadata?['width'] != null &&
+                          if (widget.item.metadata?['exif']?['Model'] != null)
-                              widget.item.metadata?['height'] != null)
                             Text(
-                              '${widget.item.metadata?['width']}x${widget.item.metadata?['height']}',
+                              'shotOn'.trParams({
+                                'device': widget.item.metadata?['exif']
+                                    ?['Model']
+                              }),
                               style: metaTextStyle,
-                            ),
+                            ).paddingOnly(right: 2),
-                          if (widget.item.metadata?['ratio'] != null)
+                          if (widget.item.metadata?['exif']?['ShutterSpeed'] !=
+                              null)
                             Text(
-                              '${_getRatio().toPrecision(2)}',
+                              widget.item.metadata?['exif']?['ShutterSpeed'],
                               style: metaTextStyle,
-                            ),
+                            ).paddingOnly(right: 2),
+                          if (widget.item.metadata?['exif']?['ISO'] != null)
+                            Text(
+                              'ISO${widget.item.metadata?['exif']?['ISO']}',
+                              style: metaTextStyle,
+                            ).paddingOnly(right: 2),
+                          if (widget.item.metadata?['exif']?['Megapixels'] !=
+                              null)
+                            Text(
+                              '${widget.item.metadata?['exif']?['Megapixels']}MP',
+                              style: metaTextStyle,
+                            )
+                          else
                             Text(
                               widget.item.size.formatBytes(),
                               style: metaTextStyle,
                             ),
                           Text(
-                            widget.item.mimetype,
+                            '${widget.item.metadata?['width']}x${widget.item.metadata?['height']}',
                             style: metaTextStyle,
                           ),
                         ],

lib/widgets/posts/post_item.dart

@@ -660,6 +660,11 @@ class _PostHeaderWidget extends StatelessWidget {
               IconButton(
                 color: Theme.of(context).colorScheme.primary,
                 icon: const Icon(Icons.more_vert),
+                padding: const EdgeInsets.symmetric(horizontal: 4),
+                visualDensity: const VisualDensity(
+                  horizontal: -4,
+                  vertical: -2,
+                ),
                 onPressed: () => onTapMore!(),
               ),
           ],

lib/widgets/relative_date.dart

@@ -4,20 +4,25 @@ import 'package:timeago/timeago.dart';
 
 class RelativeDate extends StatelessWidget {
   final DateTime date;
+  final TextStyle? style;
   final bool isFull;
 
-  const RelativeDate(this.date, {super.key, this.isFull = false});
+  const RelativeDate(this.date, {super.key, this.style, this.isFull = false});
 
   @override
   Widget build(BuildContext context) {
     if (isFull) {
-      return Text(DateFormat('y/M/d HH:mm').format(date));
+      return Text(
+        DateFormat('y/M/d HH:mm').format(date),
+        style: style,
+      );
     }
     return Text(
       format(
         date,
         locale: 'en_short',
       ),
+      style: style,
     );
   }
 }

pubspec.yaml

@@ -2,7 +2,7 @@ name: solian
 description: "The Solar Network App"
 publish_to: "none"
 
-version: 1.4.0+14
+version: 1.4.0+15
 
 environment:
   sdk: ">=3.3.4 <4.0.0"