assets/translations/en-US.json

@@ -689,13 +689,5 @@
   "databaseDeleteDescription": "Remove the database on your local disk, the content will be fetched from server again.",
   "databaseDeleted": "The local database has been deleted.",
   "settingsEnablePushNotifications": "Enable Push Notifications",
-  "settingsEnablePushNotificationsDescription": "Re-enable and request permission to receive push notifications. Just in case it didn't run automatically.",
+  "settingsEnablePushNotificationsDescription": "Re-enable and request permission to receive push notifications. Just in case it didn't run automatically."
-  "screenStickers": "Stickers",
-  "stickersDiscovery": "Discovery",
-  "stickersOwned": "Owned",
-  "stickersCreated": "Created",
-  "stickersAdd": "Add Sticker Pack",
-  "stickersAdded": "Sticker pack has been added.",
-  "add": "Add",
-  "stickersRemoved": "Sticker pack has been removed, you can add it again anytime."
 }

assets/translations/zh-CN.json

@@ -687,13 +687,5 @@
   "databaseDeleteDescription": "删除本地数据库，内容将从服务器重新获取。",
   "databaseDeleted": "本地数据库已被删除。",
   "settingsEnablePushNotifications": "启用推送数据",
-  "settingsEnablePushNotificationsDescription": "重新启用并请求推送权限，以防自动激活失败。",
+  "settingsEnablePushNotificationsDescription": "重新启用并请求推送权限，以防自动激活失败。"
-  "screenStickers": "贴图",
-  "stickersDiscovery": "发现",
-  "stickersOwned": "由我拥有",
-  "stickersCreated": "由我发布",
-  "stickersAdd": "添加贴图包",
-  "stickersAdded": "贴图包已添加。",
-  "add": "添加",
-  "stickersRemoved": "贴图包已被移除，你可以随时再次添加回来。"
 }

assets/translations/zh-HK.json

@@ -685,15 +685,5 @@
   "databaseSize": "數據庫大小",
   "databaseDelete": "刪除數據庫",
   "databaseDeleteDescription": "刪除本地數據庫，內容將從服務器重新獲取。",
-  "databaseDeleted": "本地數據庫已被刪除。",
+  "databaseDeleted": "本地數據庫已被刪除。"
-  "settingsEnablePushNotifications": "啓用推送數據",
-  "settingsEnablePushNotificationsDescription": "重新啓用並請求推送權限，以防自動激活失敗。",
-  "screenStickers": "貼圖",
-  "stickersDiscovery": "發現",
-  "stickersOwned": "由我擁有",
-  "stickersCreated": "由我發佈",
-  "stickersAdd": "添加貼圖包",
-  "stickersAdded": "貼圖包已添加。",
-  "add": "添加",
-  "stickersRemoved": "貼圖包已被移除，你可以隨時再次添加回來。"
 }

assets/translations/zh-TW.json

@@ -685,15 +685,5 @@
   "databaseSize": "數據庫大小",
   "databaseDelete": "刪除數據庫",
   "databaseDeleteDescription": "刪除本地數據庫，內容將從服務器重新獲取。",
-  "databaseDeleted": "本地數據庫已被刪除。",
+  "databaseDeleted": "本地數據庫已被刪除。"
-  "settingsEnablePushNotifications": "啟用推送數據",
-  "settingsEnablePushNotificationsDescription": "重新啟用並請求推送權限，以防自動激活失敗。",
-  "screenStickers": "貼圖",
-  "stickersDiscovery": "發現",
-  "stickersOwned": "由我擁有",
-  "stickersCreated": "由我發佈",
-  "stickersAdd": "添加貼圖包",
-  "stickersAdded": "貼圖包已添加。",
-  "add": "添加",
-  "stickersRemoved": "貼圖包已被移除，你可以隨時再次添加回來。"
 }

lib/controllers/chat_message_controller.dart

@@ -514,11 +514,6 @@ class ChatMessageController extends ChangeNotifier {
     }
 
     _readEventDebounce = Timer(const Duration(milliseconds: 500), () {
-      _sendReadEvent();
-    });
-  }
-
-  void _sendReadEvent() {
       _ws.conn?.sink.add(jsonEncode(
         WebSocketPackage(
           method: 'events.read',
@@ -530,14 +525,12 @@ class ChatMessageController extends ChangeNotifier {
         ).toJson(),
       ));
       log('[Messaging] Send read event request: $_readEventAnchor');
+    });
   }
 
   @override
   void dispose() {
     _wsSubscription?.cancel();
-    if (_readEventDebounce?.isActive ?? false) {
-      _sendReadEvent();
-    }
     _readEventDebounce?.cancel();
     super.dispose();
   }

lib/providers/navigation.dart

@@ -63,11 +63,6 @@ class NavigationProvider extends ChangeNotifier {
       screen: 'news',
       label: 'screenNews',
     ),
-    AppNavDestination(
-      icon: Icon(Symbols.emoji_emotions, weight: 400, opticalSize: 20),
-      screen: 'stickers',
-      label: 'screenStickers',
-    ),
     AppNavDestination(
       icon: Icon(Symbols.photo_library, weight: 400, opticalSize: 20),
       screen: 'album',
@@ -93,8 +88,7 @@ class NavigationProvider extends ChangeNotifier {
 
   List<AppNavDestination> destinations = [];
 
-  int get pinnedDestinationCount =>
+  int get pinnedDestinationCount => destinations.where((ele) => ele.isPinned).length;
-      destinations.where((ele) => ele.isPinned).length;
 
   NavigationProvider() {
     buildDestinations(kDefaultPinnedDestination);
@@ -123,17 +117,13 @@ class NavigationProvider extends ChangeNotifier {
   }
 
   bool isIndexInRange(int min, int max) {
-    return _currentIndex != null &&
+    return _currentIndex != null && _currentIndex! >= min && _currentIndex! < max;
-        _currentIndex! >= min &&
-        _currentIndex! < max;
   }
 
   void autoDetectIndex(GoRouter? state) {
     if (state == null) return;
     final idx = destinations.indexWhere(
-      (ele) =>
+      (ele) => ele.screen == state.routerDelegate.currentConfiguration.last.route.name,
-          ele.screen ==
-          state.routerDelegate.currentConfiguration.last.route.name,
     );
     _currentIndex = idx == -1 ? null : idx;
     notifyListeners();

lib/providers/sn_sticker.dart

@@ -11,8 +11,7 @@ class SnStickerProvider {
 
   final Map<int, List<SnSticker>> stickersByPack = {};
 
-  List<SnSticker> get stickers =>
+  List<SnSticker> get stickers => _cache.values.where((ele) => ele != null).cast<SnSticker>().toList();
-      _cache.values.where((ele) => ele != null).cast<SnSticker>().toList();
 
   SnStickerProvider(BuildContext context) {
     _sn = context.read<SnNetworkProvider>();
@@ -24,18 +23,8 @@ class SnStickerProvider {
 
   void _cacheSticker(SnSticker sticker) {
     _cache['${sticker.pack.prefix}:${sticker.alias}'] = sticker;
-    if (stickersByPack[sticker.pack.id] == null) {
+    if (stickersByPack[sticker.pack.id] == null) stickersByPack[sticker.pack.id] = List.empty(growable: true);
-      stickersByPack[sticker.pack.id] = List.empty(growable: true);
+    if (!stickersByPack[sticker.pack.id]!.contains(sticker)) stickersByPack[sticker.pack.id]!.add(sticker);
-    }
-    if (!stickersByPack[sticker.pack.id]!.contains(sticker)) {
-      stickersByPack[sticker.pack.id]!.add(sticker);
-    }
-  }
-
-  void putSticker(Iterable<SnSticker> sticker) {
-    for (final ele in sticker) {
-      _cacheSticker(ele);
-    }
   }
 
   Future<SnSticker?> lookupSticker(String alias) async {
@@ -72,8 +61,7 @@ class SnStickerProvider {
         'offset': page * 10,
       });
       final data = resp.data;
-      final stickers =
+      final stickers = List.from(data['data']).map((ele) => SnSticker.fromJson(ele));
-          List.from(data['data']).map((ele) => SnSticker.fromJson(ele));
       for (final sticker in stickers) {
         _cacheSticker(sticker);
       }

lib/router.dart

@@ -34,14 +34,13 @@ import 'package:surface/screens/realm/realm_detail.dart';
 import 'package:surface/screens/realm/realm_discovery.dart';
 import 'package:surface/screens/settings.dart';
 import 'package:surface/screens/sharing.dart';
-import 'package:surface/screens/stickers.dart';
 import 'package:surface/screens/wallet.dart';
 import 'package:surface/types/post.dart';
 import 'package:surface/widgets/about.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
 
-Widget _fadeThroughTransition(BuildContext context, Animation<double> animation,
+Widget _fadeThroughTransition(
-    Animation<double> secondaryAnimation, Widget child) {
+    BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation, Widget child) {
   return FadeThroughTransition(
     animation: animation,
     secondaryAnimation: secondaryAnimation,
@@ -83,15 +82,13 @@ final _appRoutes = [
         name: 'postSearch',
         builder: (context, state) => PostSearchScreen(
           initialTags: state.uri.queryParameters['tags']?.split(','),
-          initialCategories:
+          initialCategories: state.uri.queryParameters['categories']?.split(','),
-              state.uri.queryParameters['categories']?.split(','),
         ),
       ),
       GoRoute(
         path: '/publishers/:name',
         name: 'postPublisher',
-        builder: (context, state) =>
+        builder: (context, state) => PostPublisherScreen(name: state.pathParameters['name']!),
-            PostPublisherScreen(name: state.pathParameters['name']!),
       ),
       GoRoute(
         path: '/:slug',
@@ -103,11 +100,7 @@ final _appRoutes = [
       ),
     ],
   ),
-  GoRoute(
+  GoRoute(path: '/account', name: 'account', builder: (context, state) => const AccountScreen(), routes: [
-      path: '/account',
-      name: 'account',
-      builder: (context, state) => const AccountScreen(),
-      routes: [
     GoRoute(
       path: '/wallet',
       name: 'accountWallet',
@@ -215,16 +208,11 @@ final _appRoutes = [
       GoRoute(
         path: '/:alias',
         name: 'realmDetail',
-        builder: (context, state) =>
+        builder: (context, state) => RealmDetailScreen(alias: state.pathParameters['alias']!),
-            RealmDetailScreen(alias: state.pathParameters['alias']!),
       ),
     ],
   ),
-  GoRoute(
+  GoRoute(path: '/news', name: 'news', builder: (context, state) => const NewsScreen(), routes: [
-    path: '/news',
-    name: 'news',
-    builder: (context, state) => const NewsScreen(),
-    routes: [
     GoRoute(
       path: '/:hash',
       name: 'newsDetail',
@@ -232,13 +220,7 @@ final _appRoutes = [
         hash: state.pathParameters['hash']!,
       ),
     ),
-    ],
+  ]),
-  ),
-  GoRoute(
-    path: '/stickers',
-    name: 'stickers',
-    builder: (context, state) => const StickerScreen(),
-  ),
   GoRoute(
     path: '/album',
     name: 'album',

lib/screens/settings.dart

@@ -572,12 +572,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                   trailing: const Icon(Symbols.chevron_right),
                   onTap: () {
                     final nty = context.read<NotificationProvider>();
-                    try {
                     nty.registerPushNotifications();
-                    } catch (err) {
-                      if (!mounted) return;
-                      context.showErrorDialog(err);
-                    }
                   },
                 ),
                 ListTile(

lib/screens/stickers.dart

@@ -1,304 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
-import 'package:material_symbols_icons/symbols.dart';
-import 'package:provider/provider.dart';
-import 'package:styled_widget/styled_widget.dart';
-import 'package:surface/providers/sn_network.dart';
-import 'package:surface/providers/sn_sticker.dart';
-import 'package:surface/providers/userinfo.dart';
-import 'package:surface/types/attachment.dart';
-import 'package:surface/widgets/attachment/attachment_item.dart';
-import 'package:surface/widgets/dialog.dart';
-import 'package:surface/widgets/loading_indicator.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
-import 'package:very_good_infinite_list/very_good_infinite_list.dart';
-
-class StickerScreen extends StatefulWidget {
-  const StickerScreen({super.key});
-
-  @override
-  State<StickerScreen> createState() => _StickerScreenState();
-}
-
-class _StickerScreenState extends State<StickerScreen>
-    with SingleTickerProviderStateMixin {
-  late final TabController _tabController =
-      TabController(length: 3, vsync: this);
-
-  bool _isBusy = false;
-  int? _totalCount;
-  final List<SnStickerPack> _packs = List.empty(growable: true);
-
-  Future<void> _fetchPacks() async {
-    try {
-      setState(() => _isBusy = true);
-      final sn = context.read<SnNetworkProvider>();
-      final ua = context.read<UserProvider>();
-      final resp = await sn.client.get(
-        _tabController.index == 1
-            ? '/cgi/uc/stickers/packs/own'
-            : '/cgi/uc/stickers/packs',
-        queryParameters: {
-          'take': 10,
-          'offset': _packs.length,
-          if (_tabController.index == 2) 'author': ua.user?.id,
-        },
-      );
-      if (resp.data is Map<String, dynamic>) {
-        _totalCount = resp.data['count'] as int?;
-        final out = List<SnStickerPack>.from(
-          resp.data['data'].map((ele) => SnStickerPack.fromJson(ele)),
-        );
-        _packs.addAll(out);
-      } else {
-        _totalCount = 0;
-        final out = List<SnStickerPack>.from(
-          resp.data.map((ele) => SnStickerPack.fromJson(ele)),
-        );
-        _packs.addAll(out);
-      }
-    } catch (err) {
-      if (!mounted) return;
-      context.showErrorDialog(err);
-    } finally {
-      setState(() => _isBusy = false);
-    }
-  }
-
-  Future<void> _removePack(SnStickerPack pack) async {
-    try {
-      setState(() => _isBusy = true);
-      final sn = context.read<SnNetworkProvider>();
-      await sn.client.delete('/cgi/uc/stickers/packs/${pack.id}/own');
-      if (!mounted) return;
-      context.showSnackbar('stickersRemoved'.tr());
-      _refreshPacks();
-    } catch (err) {
-      if (!mounted) return;
-      context.showErrorDialog(err);
-    } finally {
-      setState(() => _isBusy = false);
-    }
-  }
-
-  Future<void> _refreshPacks() async {
-    _packs.clear();
-    _totalCount = null;
-    await _fetchPacks();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    _fetchPacks();
-    _tabController.addListener(() {
-      if (_tabController.indexIsChanging) {
-        _refreshPacks();
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    _tabController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AppScaffold(
-      appBar: AppBar(
-        title: Text('screenStickers').tr(),
-        bottom: TabBar(
-          controller: _tabController,
-          tabs: [
-            Tab(
-              child: Text('stickersDiscovery'.tr()).textColor(
-                Theme.of(context).appBarTheme.foregroundColor,
-              ),
-            ),
-            Tab(
-              child: Text('stickersOwned'.tr()).textColor(
-                Theme.of(context).appBarTheme.foregroundColor,
-              ),
-            ),
-            Tab(
-              child: Text('stickersCreated'.tr()).textColor(
-                Theme.of(context).appBarTheme.foregroundColor,
-              ),
-            ),
-          ],
-        ),
-      ),
-      body: MediaQuery.removePadding(
-        context: context,
-        removeTop: true,
-        child: RefreshIndicator(
-          onRefresh: _refreshPacks,
-          child: InfiniteList(
-            itemCount: _packs.length,
-            onFetchData: _fetchPacks,
-            hasReachedMax: _totalCount != null && _packs.length >= _totalCount!,
-            isLoading: _isBusy,
-            itemBuilder: (context, idx) {
-              final pack = _packs[idx];
-              return ListTile(
-                title: Text(pack.name),
-                subtitle: Text(
-                  pack.description,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                ),
-                contentPadding: const EdgeInsets.symmetric(horizontal: 16),
-                trailing: _tabController.index == 1
-                    ? IconButton(
-                        onPressed: () {
-                          _removePack(pack);
-                        },
-                        icon: const Icon(Symbols.remove),
-                      )
-                    : null,
-                onTap: () {
-                  showModalBottomSheet(
-                    context: context,
-                    builder: (context) => _StickerPackAddPopup(pack: pack),
-                  ).then((value) {
-                    if (value == true && _tabController.index == 1) {
-                      _refreshPacks();
-                    }
-                  });
-                },
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _StickerPackAddPopup extends StatefulWidget {
-  final SnStickerPack pack;
-  const _StickerPackAddPopup({required this.pack});
-
-  @override
-  State<_StickerPackAddPopup> createState() => _StickerPackAddPopupState();
-}
-
-class _StickerPackAddPopupState extends State<_StickerPackAddPopup> {
-  SnStickerPack? _pack;
-
-  bool _isBusy = false;
-
-  Future<void> _fetchPack() async {
-    try {
-      setState(() => _isBusy = true);
-      final sn = context.read<SnNetworkProvider>();
-      final resp =
-          await sn.client.get('/cgi/uc/stickers/packs/${widget.pack.id}');
-      _pack = SnStickerPack.fromJson(resp.data);
-    } catch (err) {
-      if (!mounted) return;
-      context.showErrorDialog(err);
-    } finally {
-      setState(() => _isBusy = false);
-    }
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    _fetchPack();
-  }
-
-  bool _isAdding = false;
-
-  Future<void> _addPack() async {
-    if (_pack == null) return;
-
-    try {
-      setState(() => _isAdding = true);
-      final sn = context.read<SnNetworkProvider>();
-      final stickers = context.read<SnStickerProvider>();
-      await sn.client.post(
-        '/cgi/uc/stickers/packs/${widget.pack.id}/own',
-      );
-      if (!mounted) return;
-      context.showSnackbar('stickersAdded'.tr());
-      if (_pack?.stickers != null) stickers.putSticker(_pack!.stickers!);
-      Navigator.pop(context, true);
-    } catch (err) {
-      if (!mounted) return;
-      context.showErrorDialog(err);
-    } finally {
-      setState(() => _isAdding = false);
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Row(
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            const Icon(Symbols.add, size: 24),
-            const Gap(16),
-            Text('stickersAdd', style: Theme.of(context).textTheme.titleLarge)
-                .tr(),
-          ],
-        ).padding(horizontal: 20, top: 16, bottom: 12),
-        Row(
-          crossAxisAlignment: CrossAxisAlignment.end,
-          children: [
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(widget.pack.name).bold(),
-                  Text(
-                    widget.pack.description,
-                    maxLines: 2,
-                    overflow: TextOverflow.ellipsis,
-                  ),
-                ],
-              ),
-            ),
-            ElevatedButton(
-              onPressed: _isAdding ? null : _addPack,
-              child: Text('add').tr(),
-            ),
-          ],
-        ).padding(horizontal: 24),
-        LoadingIndicator(isActive: _isBusy),
-        if (_pack?.stickers != null)
-          Expanded(
-            child: GridView.extent(
-              padding: EdgeInsets.only(left: 20, right: 20, top: 8),
-              maxCrossAxisExtent: 48,
-              mainAxisSpacing: 8,
-              crossAxisSpacing: 8,
-              children: _pack!.stickers!
-                  .map(
-                    (ele) => ClipRRect(
-                      borderRadius: BorderRadius.circular(8),
-                      child: Container(
-                        color:
-                            Theme.of(context).colorScheme.surfaceContainerHigh,
-                        child: AttachmentItem(
-                          data: ele.attachment,
-                          heroTag: 'sticker-pack-${ele.attachment.rid}',
-                          fit: BoxFit.contain,
-                        ),
-                      ),
-                    ),
-                  )
-                  .toList(),
-            ),
-          ),
-      ],
-    );
-  }
-}