💄 Optimization of post item style

ios/Podfile.lock

@@ -227,7 +227,7 @@ PODS:
     - TOCropViewController (~> 2.7.4)
   - image_picker_ios (0.0.1):
     - Flutter
-  - livekit_client (2.2.5):
+  - livekit_client (2.2.6):
     - Flutter
     - WebRTC-SDK (= 125.6422.04)
   - media_kit_libs_ios_video (1.0.4):
@@ -482,7 +482,7 @@ SPEC CHECKSUMS:
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
   image_cropper: 37d40f62177c101ff4c164906d259ea2c3aa70cf
   image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
-  livekit_client: 9c8080879256a0fb16da13c9be4845248209d896
+  livekit_client: 20e01637431bc108dad451c8a11c1d206e1dd2cd
   media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
   media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
   media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e

lib/screens/account/profile_page.dart

@@ -1,11 +1,16 @@
+import 'dart:math';
+
+import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:get/get.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
+import 'package:intl/intl.dart';
 import 'package:solian/controllers/post_list_controller.dart';
 import 'package:solian/exts.dart';
 import 'package:solian/models/account.dart';
 import 'package:solian/models/attachment.dart';
+import 'package:solian/models/daily_sign.dart';
 import 'package:solian/models/pagination.dart';
 import 'package:solian/models/post.dart';
 import 'package:solian/models/subscription.dart';
@@ -18,6 +23,7 @@ import 'package:solian/widgets/account/account_avatar.dart';
 import 'package:solian/widgets/account/account_heading.dart';
 import 'package:solian/widgets/app_bar_leading.dart';
 import 'package:solian/widgets/attachments/attachment_list.dart';
+import 'package:solian/widgets/daily_sign/history_chart.dart';
 import 'package:solian/widgets/posts/post_list.dart';
 import 'package:solian/widgets/posts/post_warped_list.dart';
 import 'package:solian/widgets/sized_container.dart';
@@ -45,6 +51,7 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
   Account? _userinfo;
   Subscription? _subscription;
   List<Post> _pinnedPosts = List.empty();
+  List<DailySignRecord> _dailySignRecords = List.empty();
   int _totalUpvote = 0, _totalDownvote = 0;
 
   Future<void> _getSubscription() async {
@@ -57,7 +64,7 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
   Future<void> _getUserinfo() async {
     setState(() => _isBusy = true);
 
-    var client = await ServiceFinder.configureClient('auth');
+    var client = await ServiceFinder.configureClient('id');
     var resp = await client.get('/users/${widget.name}');
     if (resp.statusCode != 200) {
       context.showErrorDialog(resp.bodyString).then((_) {
@@ -67,7 +74,7 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
       _userinfo = Account.fromJson(resp.body);
     }
 
-    client = await ServiceFinder.configureClient('interactive');
+    client = await ServiceFinder.configureClient('co');
     resp = await client.get('/users/${widget.name}');
     if (resp.statusCode != 200) {
       context.showErrorDialog(resp.bodyString).then((_) {
@@ -82,7 +89,7 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
   }
 
   Future<void> _getPinnedPosts() async {
-    final client = await ServiceFinder.configureClient('interactive');
+    final client = await ServiceFinder.configureClient('co');
     final resp = await client.get('/users/${widget.name}/pin');
     if (resp.statusCode != 200) {
       context.showErrorDialog(resp.bodyString).then((_) {
@@ -96,6 +103,23 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
     }
   }
 
+  Future<void> _getDailySignRecords() async {
+    final client = await ServiceFinder.configureClient('id');
+    final resp = await client.get('/users/${widget.name}/daily?take=14');
+    if (resp.statusCode != 200) {
+      context.showErrorDialog(resp.bodyString).then((_) {
+        Navigator.pop(context);
+      });
+    } else {
+      final result = PaginationResult.fromJson(resp.body);
+      setState(() {
+        _dailySignRecords = List.from(
+          result.data?.map((x) => DailySignRecord.fromJson(x)) ?? [],
+        );
+      });
+    }
+  }
+
   int get _userSocialCreditPoints {
     return _totalUpvote * 2 - _totalDownvote + _postController.postTotal.value;
   }
@@ -129,6 +153,7 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
     _getUserinfo().then((_) {
       _getSubscription();
       _getPinnedPosts();
+      _getDailySignRecords();
     });
   }
 
@@ -285,7 +310,114 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
                         .getSomeoneStatus(_userinfo!.name),
                     detail: _userinfo,
                     profile: _userinfo!.profile,
-                    extraWidgets: const [],
+                    extraWidgets: [
+                      if (_dailySignRecords.isNotEmpty)
+                        Card(
+                          child: SizedBox(
+                            height: 180,
+                            width: max(640, MediaQuery.of(context).size.width),
+                            child: LineChart(
+                              LineChartData(
+                                lineBarsData: [
+                                  LineChartBarData(
+                                    isCurved: true,
+                                    isStrokeCapRound: true,
+                                    isStrokeJoinRound: true,
+                                    color:
+                                        Theme.of(context).colorScheme.primary,
+                                    belowBarData: BarAreaData(
+                                      show: true,
+                                      gradient: LinearGradient(
+                                        colors: List.filled(
+                                          _dailySignRecords.length,
+                                          Theme.of(context)
+                                              .colorScheme
+                                              .primary
+                                              .withOpacity(0.3),
+                                        ).toList(),
+                                      ),
+                                    ),
+                                    spots: _dailySignRecords
+                                        .map(
+                                          (x) => FlSpot(
+                                            x.createdAt
+                                                .copyWith(
+                                                  hour: 0,
+                                                  minute: 0,
+                                                  second: 0,
+                                                  millisecond: 0,
+                                                  microsecond: 0,
+                                                )
+                                                .millisecondsSinceEpoch
+                                                .toDouble(),
+                                            x.resultTier.toDouble(),
+                                          ),
+                                        )
+                                        .toList(),
+                                  )
+                                ],
+                                lineTouchData: LineTouchData(
+                                  touchTooltipData: LineTouchTooltipData(
+                                    getTooltipItems: (spots) => spots
+                                        .map((spot) => LineTooltipItem(
+                                              '${DailySignHistoryChartDialog.signSymbols[spot.y.toInt()]}\n${DateFormat('MM/dd').format(DateTime.fromMillisecondsSinceEpoch(spot.x.toInt()))}',
+                                              TextStyle(
+                                                color: Theme.of(context)
+                                                    .colorScheme
+                                                    .onSurface,
+                                              ),
+                                            ))
+                                        .toList(),
+                                    getTooltipColor: (_) => Theme.of(context)
+                                        .colorScheme
+                                        .surfaceContainerHigh,
+                                  ),
+                                ),
+                                titlesData: FlTitlesData(
+                                  topTitles: const AxisTitles(
+                                    sideTitles: SideTitles(showTitles: false),
+                                  ),
+                                  rightTitles: const AxisTitles(
+                                    sideTitles: SideTitles(showTitles: false),
+                                  ),
+                                  leftTitles: AxisTitles(
+                                    sideTitles: SideTitles(
+                                      showTitles: true,
+                                      reservedSize: 40,
+                                      interval: 1,
+                                      getTitlesWidget: (value, _) => Align(
+                                        alignment: Alignment.centerRight,
+                                        child: Text(
+                                          DailySignHistoryChartDialog
+                                              .signSymbols[value.toInt()],
+                                          textAlign: TextAlign.right,
+                                        ).paddingOnly(right: 8),
+                                      ),
+                                    ),
+                                  ),
+                                  bottomTitles: AxisTitles(
+                                    sideTitles: SideTitles(
+                                      showTitles: true,
+                                      reservedSize: 28,
+                                      interval: 86400000,
+                                      getTitlesWidget: (value, _) => Text(
+                                        DateFormat('dd').format(
+                                          DateTime.fromMillisecondsSinceEpoch(
+                                            value.toInt(),
+                                          ),
+                                        ),
+                                        textAlign: TextAlign.center,
+                                      ).paddingOnly(top: 8),
+                                    ),
+                                  ),
+                                ),
+                                gridData: const FlGridData(show: false),
+                                borderData: FlBorderData(show: false),
+                              ),
+                            ),
+                          ).marginOnly(right: 24, left: 12, bottom: 8, top: 24),
+                        )
+                    ],
                   ),
                 ],
               ),
@@ -373,8 +505,9 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
               ),
               CenteredContainer(
                 child: RefreshIndicator(
-                  onRefresh: () =>
+                  onRefresh: () => Future.sync(
-                      Future.sync(() => _albumPagingController.refresh()),
+                    () => _albumPagingController.refresh(),
+                  ),
                   child: PagedGridView<int, Attachment>(
                     padding: EdgeInsets.zero,
                     pagingController: _albumPagingController,

lib/screens/dashboard.dart

@@ -88,7 +88,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
   Future<void> _pullDaily() async {
     try {
       _signRecord = await _dailySign.getToday();
-      _dailySign.listLastRecord(30).then((value) {
+      _dailySign.listLastRecord(14).then((value) {
         setState(() => _signRecordHistory = value);
       });
     } catch (e) {
@@ -103,7 +103,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
 
     try {
       _signRecord = await _dailySign.signToday();
-      _dailySign.listLastRecord(30).then((value) {
+      _dailySign.listLastRecord(14).then((value) {
         setState(() => _signRecordHistory = value);
       });
     } catch (e) {

lib/widgets/daily_sign/history_chart.dart

@@ -12,7 +12,7 @@ class DailySignHistoryChartDialog extends StatelessWidget {
 
   const DailySignHistoryChartDialog({super.key, required this.data});
 
-  static List<String> signSymbols = ['大凶', '凶', '中平', '吉', '大吉'];
+  static final List<String> signSymbols = ['大凶', '凶', '中平', '吉', '大吉'];
 
   DateTime? get _firstRecordDate => data?.map((x) => x.createdAt).reduce(
       (a, b) => DateTime.fromMillisecondsSinceEpoch(
@@ -98,14 +98,17 @@ class DailySignHistoryChartDialog extends StatelessWidget {
                               .map((spot) => LineTooltipItem(
                                     '${signSymbols[spot.y.toInt()]}\n${DateFormat('MM/dd').format(DateTime.fromMillisecondsSinceEpoch(spot.x.toInt()))}',
                                     TextStyle(
-                                    color:
+                                      color: Theme.of(context)
-                                        Theme.of(context).colorScheme.onSurface,
+                                          .colorScheme
+                                          .onSurface,
                                     ),
                                   ))
                               .toList(),
-                        getTooltipColor: (_) =>
+                          getTooltipColor: (_) => Theme.of(context)
-                            Theme.of(context).colorScheme.surfaceContainerHigh,
+                              .colorScheme
-                      )),
+                              .surfaceContainerHigh,
+                        ),
+                      ),
                       titlesData: FlTitlesData(
                         topTitles: const AxisTitles(
                           sideTitles: SideTitles(showTitles: false),

lib/widgets/posts/post_item.dart

@@ -313,7 +313,7 @@ class _PostItemState extends State<PostItem> {
         attachmentsId: attachments,
         autoload: false,
         isColumn: true,
-      ).paddingOnly(left: 60, right: 24);
+      ).paddingOnly(left: 60, right: 24, top: 4, bottom: 4);
     } else {
       return AttachmentList(
         flatMaxHeight: MediaQuery.of(context).size.width,

macos/Podfile.lock

@@ -158,7 +158,7 @@ PODS:
   - GoogleUtilities/UserDefaults (8.0.2):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
-  - livekit_client (2.2.5):
+  - livekit_client (2.2.6):
     - FlutterMacOS
     - WebRTC-SDK (= 125.6422.04)
   - macos_window_utils (1.0.0):
@@ -359,7 +359,7 @@ SPEC CHECKSUMS:
   GoogleAppMeasurement: 6e49ffac7d3f2c3ded9cc663f912a13b67bbd0de
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
-  livekit_client: be04a950a4b84b9dbc87507ffad5154fe75fa067
+  livekit_client: 98d09566e3a936b3402be8091ec3845556d36800
   macos_window_utils: 933f91f64805e2eb91a5bd057cf97cd097276663
   media_kit_libs_macos_video: b3e2bbec2eef97c285f2b1baa7963c67c753fb82
   media_kit_native_event_loop: 81fd5b45192b72f8b5b69eaf5b540f45777eb8d5