🚀 Launch 1.2.0+8

⬆️ Clean and upgrade packages
✨ Friend request indicator
2024-08-02 23:24:36 +08:00 · 2024-08-02 23:22:50 +08:00 · 2024-08-02 23:15:28 +08:00 · 2024-08-02 22:54:56 +08:00 · 2024-08-02 22:46:48 +08:00
11 changed files with 148 additions and 98 deletions
--- a/lib/bootstrapper.dart
+++ b/lib/bootstrapper.dart
@@ -85,7 +85,7 @@ class _BootstrapperShellState extends State<BootstrapperShell> {
          await Future.wait([
            Get.find<RealmProvider>().refreshAvailableRealms(),
            Get.find<ChannelProvider>().refreshAvailableChannel(),
-            Get.find<RelationshipProvider>().refreshFriendList(),
+            Get.find<RelationshipProvider>().refreshRelativeList(),
          ]);
        }
      },
--- a/lib/providers/call.dart
+++ b/lib/providers/call.dart
@@ -2,7 +2,6 @@ import 'dart:async';

 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:get/get_rx/get_rx.dart';
 import 'package:livekit_client/livekit_client.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:solian/models/call.dart';
--- a/lib/providers/content/attachment.dart
+++ b/lib/providers/content/attachment.dart
@@ -4,6 +4,7 @@ import 'dart:typed_data';
 import 'package:get/get.dart';
 import 'package:path/path.dart';
 import 'package:solian/models/attachment.dart';
+import 'package:solian/models/pagination.dart';
 import 'package:solian/providers/auth.dart';
 import 'package:solian/services.dart';
 import 'package:dio/dio.dart' as dio;
@@ -21,6 +22,48 @@ class AttachmentProvider extends GetConnect {

  final Map<int, Attachment> _cachedResponses = {};

+  Future<List<Attachment?>> listMetadata(
+    List<int> id, {
+    noCache = false,
+  }) async {
+    List<Attachment?> result = List.filled(id.length, null);
+    List<int> pendingQuery = List.empty(growable: true);
+    if (!noCache) {
+      for (var idx = 0; idx < id.length; idx++) {
+        if (_cachedResponses.containsKey(id[idx])) {
+          result[idx] = _cachedResponses[id[idx]];
+        } else {
+          pendingQuery.add(id[idx]);
+        }
+      }
+    }
+
+    final resp = await get(
+      '/attachments?take=${pendingQuery.length}&id=${pendingQuery.join(',')}',
+    );
+    if (resp.statusCode != 200) return result;
+
+    final rawOut = PaginationResult.fromJson(resp.body);
+    if (rawOut.data == null) return result;
+
+    final List<Attachment> out =
+        rawOut.data!.map((x) => Attachment.fromJson(x)).toList();
+    for (final item in out) {
+      if (item.destination != 0 && item.isAnalyzed) {
+        _cachedResponses[item.id] = item;
+      }
+    }
+    for (var i = 0; i < out.length; i++) {
+      for (var j = 0; j < id.length; j++) {
+        if (out[i].id == id[j]) {
+          result[j] = out[i];
+        }
+      }
+    }
+
+    return result;
+  }
+
  Future<Attachment?> getMetadata(int id, {noCache = false}) async {
    if (!noCache && _cachedResponses.containsKey(id)) {
      return _cachedResponses[id]!;
--- a/lib/providers/relation.dart
+++ b/lib/providers/relation.dart
@@ -4,15 +4,19 @@ import 'package:solian/models/relations.dart';
 import 'package:solian/providers/auth.dart';

 class RelationshipProvider extends GetxController {
+  final RxInt friendRequestCount = 0.obs;
+
  final RxList<Relationship> _friends = RxList.empty(growable: true);

-  Future<void> refreshFriendList() async {
-    final resp = await listRelationWithStatus(1);
-    _friends.value = resp.body
+  Future<void> refreshRelativeList() async {
+    final resp = await listRelation();
+    final List<Relationship> result = resp.body
        .map((e) => Relationship.fromJson(e))
        .toList()
        .cast<Relationship>();
+    _friends.value = result.where((x) => x.status == 1).toList();
    _friends.refresh();
+    friendRequestCount.value = result.where((x) => x.status == 0).length;
  }

  bool hasFriend(Account account) {
--- a/lib/screens/account.dart
+++ b/lib/screens/account.dart
@@ -3,11 +3,13 @@ import 'package:get/get.dart';
 import 'package:solian/models/account.dart';
 import 'package:solian/providers/auth.dart';
 import 'package:solian/providers/account_status.dart';
+import 'package:solian/providers/relation.dart';
 import 'package:solian/router.dart';
 import 'package:solian/screens/auth/signin.dart';
 import 'package:solian/screens/auth/signup.dart';
 import 'package:solian/widgets/account/account_heading.dart';
 import 'package:solian/widgets/sized_container.dart';
+import 'package:badges/badges.dart' as badges;

 class AccountScreen extends StatefulWidget {
  const AccountScreen({super.key});
@@ -23,9 +25,27 @@ class _AccountScreenState extends State<AccountScreen> {
      (
        const Icon(Icons.color_lens),
        'accountPersonalize'.tr,
-        'accountPersonalize'
+        'accountPersonalize',
+      ),
+      (
+        Obx(() {
+          final RelationshipProvider relations = Get.find();
+          return badges.Badge(
+            badgeContent: Text(
+              relations.friendRequestCount.value.toString(),
+              style: const TextStyle(color: Colors.white),
+            ),
+            showBadge: relations.friendRequestCount.value > 0,
+            position: badges.BadgePosition.topEnd(
+              top: -12,
+              end: -8,
+            ),
+            child: const Icon(Icons.diversity_1),
+          );
+        }),
+        'accountFriend'.tr,
+        'accountFriend',
      ),
-      (const Icon(Icons.diversity_1), 'accountFriend'.tr, 'accountFriend'),
    ];

    final AuthProvider auth = Get.find();
--- a/lib/screens/account/friend.dart
+++ b/lib/screens/account/friend.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_animate/flutter_animate.dart';
 import 'package:get/get.dart';
 import 'package:solian/exts.dart';
 import 'package:solian/models/relations.dart';
 import 'package:solian/providers/relation.dart';
+import 'package:solian/theme.dart';
 import 'package:solian/widgets/account/relative_list.dart';

 class FriendScreen extends StatefulWidget {
@@ -21,15 +21,15 @@ class _FriendScreenState extends State<FriendScreen>

  List<Relationship> _relations = List.empty();

-  List<Relationship> filterByStatus(int status) {
+  List<Relationship> _filterByStatus(int status) {
    return _relations.where((x) => x.status == status).toList();
  }

-  Future<void> loadRelations() async {
+  Future<void> _loadRelations() async {
    setState(() => _isBusy = true);

-    final RelationshipProvider provider = Get.find();
-    final resp = await provider.listRelation();
+    final RelationshipProvider relations = Get.find();
+    final resp = await relations.listRelation();

    setState(() {
      _relations = resp.body
@@ -38,6 +38,9 @@ class _FriendScreenState extends State<FriendScreen>
          .cast<Relationship>();
      _isBusy = false;
    });
+
+    relations.friendRequestCount.value =
+        _relations.where((x) => x.status == 0).length;
  }

  void promptAddFriend() async {
@@ -104,8 +107,8 @@ class _FriendScreenState extends State<FriendScreen>
    super.initState();
    _tabController = TabController(length: 3, vsync: this);

-    loadRelations().then((_) {
-      if (filterByStatus(0).isEmpty) {
+    _loadRelations().then((_) {
+      if (_filterByStatus(0).isEmpty) {
        _tabController.animateTo(1);
      }
    });
@@ -119,6 +122,19 @@ class _FriendScreenState extends State<FriendScreen>
        appBar: AppBar(
          centerTitle: false,
          title: Text('accountFriend'.tr),
+          actions: [
+            if (_isBusy)
+              SizedBox(
+                height: 48,
+                width: 48,
+                child: const CircularProgressIndicator(
+                  strokeWidth: 3,
+                ).paddingAll(14),
+              ),
+            SizedBox(
+              width: SolianTheme.isLargeScreen(context) ? 8 : 16,
+            ),
+          ],
          bottom: TabBar(
            controller: _tabController,
            tabs: const [
@@ -136,46 +152,34 @@ class _FriendScreenState extends State<FriendScreen>
          controller: _tabController,
          children: [
            RefreshIndicator(
-              onRefresh: () => loadRelations(),
+              onRefresh: () => _loadRelations(),
              child: CustomScrollView(
                slivers: [
-                  if (_isBusy)
-                    SliverToBoxAdapter(
-                      child: const LinearProgressIndicator().animate().scaleX(),
-                    ),
                  SilverRelativeList(
-                    items: filterByStatus(0),
-                    onUpdate: () => loadRelations(),
+                    items: _filterByStatus(0),
+                    onUpdate: () => _loadRelations(),
                  ),
                ],
              ),
            ),
            RefreshIndicator(
-              onRefresh: () => loadRelations(),
+              onRefresh: () => _loadRelations(),
              child: CustomScrollView(
                slivers: [
-                  if (_isBusy)
-                    SliverToBoxAdapter(
-                      child: const LinearProgressIndicator().animate().scaleX(),
-                    ),
                  SilverRelativeList(
-                    items: filterByStatus(1),
-                    onUpdate: () => loadRelations(),
+                    items: _filterByStatus(1),
+                    onUpdate: () => _loadRelations(),
                  ),
                ],
              ),
            ),
            RefreshIndicator(
-              onRefresh: () => loadRelations(),
+              onRefresh: () => _loadRelations(),
              child: CustomScrollView(
                slivers: [
-                  if (_isBusy)
-                    SliverToBoxAdapter(
-                      child: const LinearProgressIndicator().animate().scaleX(),
-                    ),
                  SilverRelativeList(
-                    items: filterByStatus(3),
-                    onUpdate: () => loadRelations(),
+                    items: _filterByStatus(3),
+                    onUpdate: () => _loadRelations(),
                  ),
                ],
              ),
--- a/lib/widgets/attachments/attachment_editor.dart
+++ b/lib/widgets/attachments/attachment_editor.dart
@@ -222,19 +222,13 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {

    setState(() => _isBusy = true);

-    int progress = 0;
-    for (var idx = 0; idx < widget.initialAttachments.length; idx++) {
-      attach.getMetadata(widget.initialAttachments[idx]).then((resp) {
-        progress++;
-        _attachments[idx] = resp;
-        if (progress == widget.initialAttachments.length) {
-          setState(() {
-            _isBusy = false;
-            _isFirstTimeBusy = false;
-          });
-        }
+    attach.listMetadata(widget.initialAttachments).then((result) {
+      setState(() {
+        _attachments = result;
+        _isBusy = false;
+        _isFirstTimeBusy = false;
      });
-    }
+    });
  }

  void _showAttachmentPreview(Attachment element) {
--- a/lib/widgets/attachments/attachment_list.dart
+++ b/lib/widgets/attachments/attachment_list.dart
@@ -45,7 +45,7 @@ class _AttachmentListState extends State<AttachmentList> {
  List<Attachment?> _attachmentsMeta = List.empty();

  void _getMetadataList() {
-    final AttachmentProvider provider = Get.find();
+    final AttachmentProvider attach = Get.find();

    if (widget.attachmentsId.isEmpty) {
      return;
@@ -53,25 +53,16 @@ class _AttachmentListState extends State<AttachmentList> {
      _attachmentsMeta = List.filled(widget.attachmentsId.length, null);
    }

-    int progress = 0;
-    for (var idx = 0; idx < widget.attachmentsId.length; idx++) {
-      provider.getMetadata(widget.attachmentsId[idx]).then((resp) {
-        progress++;
-        if (resp != null) {
-          _attachmentsMeta[idx] = resp;
-        }
-        if (progress == widget.attachmentsId.length) {
-          calculateAspectRatio();
-
-          if (mounted) {
-            setState(() => _isLoading = false);
-          }
-        }
+    attach.listMetadata(widget.attachmentsId).then((result) {
+      setState(() {
+        _attachmentsMeta = result;
+        _isLoading = false;
      });
-    }
+      _calculateAspectRatio();
+    });
  }

-  void calculateAspectRatio() {
+  void _calculateAspectRatio() {
    bool isConsistent = true;
    double? consistentValue;
    int portrait = 0, square = 0, landscape = 0;
--- a/lib/widgets/navigation/app_navigation_drawer.dart
+++ b/lib/widgets/navigation/app_navigation_drawer.dart
@@ -4,6 +4,7 @@ import 'package:solian/models/account_status.dart';
 import 'package:solian/providers/account_status.dart';
 import 'package:solian/providers/auth.dart';
 import 'package:solian/providers/content/channel.dart';
+import 'package:solian/providers/relation.dart';
 import 'package:solian/router.dart';
 import 'package:solian/shells/root_shell.dart';
 import 'package:solian/theme.dart';
@@ -60,8 +61,7 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
          AppRouter.instance.pushNamed('settings');
          setState(() => _selectedIndex = null);
          _closeDrawer();
-        }
-    );
+        });
  }

  @override
@@ -130,22 +130,36 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
                );
              },
            ),
-            leading: Builder(builder: (context) {
-              final badgeColor = _accountStatus != null
+            leading: Obx(() {
+              final statusBadgeColor = _accountStatus != null
                  ? StatusProvider.determineStatus(
                      _accountStatus!,
                    ).$2
                  : Colors.grey;

+              final RelationshipProvider relations = Get.find();
+              final accountNotifications = relations.friendRequestCount.value;
+
              return badges.Badge(
-                showBadge: _accountStatus != null,
-                badgeStyle: badges.BadgeStyle(badgeColor: badgeColor),
-                position: badges.BadgePosition.bottomEnd(
-                  bottom: 0,
-                  end: -2,
+                badgeContent: Text(
+                  accountNotifications.toString(),
+                  style: const TextStyle(color: Colors.white),
                ),
-                child: AccountAvatar(
-                  content: auth.userProfile.value!['avatar'],
+                showBadge: accountNotifications > 0,
+                position: badges.BadgePosition.topEnd(
+                  top: -10,
+                  end: -6,
+                ),
+                child: badges.Badge(
+                  showBadge: _accountStatus != null,
+                  badgeStyle: badges.BadgeStyle(badgeColor: statusBadgeColor),
+                  position: badges.BadgePosition.bottomEnd(
+                    bottom: 0,
+                    end: -2,
+                  ),
+                  child: AccountAvatar(
+                    content: auth.userProfile.value!['avatar'],
+                  ),
                ),
              );
            }),
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -317,10 +317,10 @@ packages:
    dependency: transitive
    description:
      name: dev_build
-      sha256: "76dd5b2587a891ab9c1e7f7eea6ca4a3504667321e0186ecb1e385183889d89b"
+      sha256: f526d1fbe68875f6119ffc333f114dfe6aa93ad04439276d53968f7977cc410e
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.0+10"
+    version: "1.0.0+11"
  device_info_plus:
    dependency: "direct main"
    description:
@@ -369,14 +369,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.3.9"
-  easy_debounce:
-    dependency: "direct main"
-    description:
-      name: easy_debounce
-      sha256: f082609cfb8f37defb9e37fc28bc978c6712dedf08d4c5a26f820fa10165a236
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.3"
  fake_async:
    dependency: transitive
    description:
@@ -769,7 +761,7 @@ packages:
    source: hosted
    version: "4.0.2"
  image:
-    dependency: "direct main"
+    dependency: transitive
    description:
      name: image
      sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
@@ -1701,14 +1693,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.7.0"
-  textfield_tags:
-    dependency: "direct main"
-    description:
-      name: textfield_tags
-      sha256: d1f2204114157a1296bb97c20d7f8c8c7fd036212812afb2e19de7bb34acc55b
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
  timeago:
    dependency: "direct main"
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: solian
 description: "The Solar Network App"
 publish_to: "none"

-version: 1.2.0+7
+version: 1.2.0+8

 environment:
  sdk: ">=3.3.4 <4.0.0"
@@ -27,7 +27,6 @@ dependencies:
  crypto: ^3.0.3
  path: ^1.9.0
  intl: ^0.19.0
-  image: ^4.1.7
  font_awesome_flutter: ^10.7.0
  web_socket_channel: ^3.0.0
  permission_handler: ^11.3.1
@@ -50,7 +49,6 @@ dependencies:
  media_kit: ^1.1.10+1
  media_kit_video: ^1.2.4
  media_kit_libs_video: ^1.0.4
-  textfield_tags: ^3.0.1
  pasteboard: ^0.2.0
  desktop_drop: ^0.4.4
  badges: ^3.1.2
@@ -60,7 +58,6 @@ dependencies:
  flutter_cache_manager: ^3.3.3
  flutter_markdown_selectionarea: ^0.6.17+1
  shared_preferences: ^2.2.3
-  easy_debounce: ^2.0.3
  provider: ^6.1.2
  gal: ^2.3.0
  dio: ^5.5.0+1
Author	SHA1	Message	Date
LittleSheep	9ea364640d	🚀 Launch 1.2.0+8	2024-08-02 23:24:36 +08:00
LittleSheep	a9f55a489d	⬆️ Clean and upgrade packages	2024-08-02 23:22:50 +08:00
LittleSheep	4616f3a3e2	✨ Friend request indicator	2024-08-02 23:15:28 +08:00
LittleSheep	425bae9d13	💄 Better friend page loading indicator	2024-08-02 22:54:56 +08:00
LittleSheep	07771e8979	⚡ Improve the speed of fetching attachments meta via batch api	2024-08-02 22:46:48 +08:00