💄 Optimize UX

2024-05-01 19:39:48 +08:00
parent fd200105c0
commit 7c4427e84a
7 changed files with 46 additions and 69 deletions
--- a/lib/screens/account.dart
+++ b/lib/screens/account.dart
@ -2,10 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:solian/providers/auth.dart';
 import 'package:solian/router.dart';
-import 'package:solian/utils/service_url.dart';
 import 'package:solian/widgets/account/avatar.dart';
 import 'package:solian/widgets/common_wrapper.dart';
-import 'package:url_launcher/url_launcher.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';

 class AccountScreen extends StatefulWidget {
--- a/lib/screens/auth/signin.dart
+++ b/lib/screens/auth/signin.dart
@ -24,11 +24,10 @@ class SignInScreen extends StatelessWidget {
      router.pop(true);
    }).catchError((e) {
      List<String> messages = e.toString().split('\n');
-      if (messages.last.contains("risk")) {
-        final ticketId = RegExp(r"ticketId=(\d+)").firstMatch(messages.last);
+      if (messages.last.contains('risk')) {
+        final ticketId = RegExp(r'ticketId=(\d+)').firstMatch(messages.last);
        if (ticketId == null) {
-          context.showErrorDialog(
-              "requested to multi-factor authenticate, but the ticket id was not found");
+          context.showErrorDialog('requested to multi-factor authenticate, but the ticket id was not found');
        }
        showDialog(
          context: context,
@ -41,9 +40,7 @@ class SignInScreen extends StatelessWidget {
                  child: Text(AppLocalizations.of(context)!.next),
                  onPressed: () {
                    launchUrlString(
-                      getRequestUri(
-                              'passport', '/mfa?ticket=${ticketId!.group(1)}')
-                          .toString(),
+                      getRequestUri('passport', '/mfa?ticket=${ticketId!.group(1)}').toString(),
                    );
                    if (Navigator.canPop(context)) {
                      Navigator.pop(context);
@ -88,8 +85,7 @@ class SignInScreen extends StatelessWidget {
                  border: const OutlineInputBorder(),
                  labelText: AppLocalizations.of(context)!.username,
                ),
-                onTapOutside: (_) =>
-                    FocusManager.instance.primaryFocus?.unfocus(),
+                onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
              ),
              const SizedBox(height: 12),
              TextField(
@ -103,8 +99,7 @@ class SignInScreen extends StatelessWidget {
                  border: const OutlineInputBorder(),
                  labelText: AppLocalizations.of(context)!.password,
                ),
-                onTapOutside: (_) =>
-                    FocusManager.instance.primaryFocus?.unfocus(),
+                onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
                onSubmitted: (_) => performSignIn(context),
              ),
              const SizedBox(height: 16),
--- a/lib/screens/chat/chat.dart
+++ b/lib/screens/chat/chat.dart
@ -34,8 +34,7 @@ class _ChatScreenState extends State<ChatScreen> {
  Call? _ongoingCall;
  Channel? _channelMeta;

-  final PagingController<int, Message> _pagingController =
-      PagingController(firstPageKey: 0);
+  final PagingController<int, Message> _pagingController = PagingController(firstPageKey: 0);

  final http.Client _client = http.Client();

@ -54,8 +53,7 @@ class _ChatScreenState extends State<ChatScreen> {
  }

  Future<Call?> fetchCall() async {
-    var uri = getRequestUri(
-        'messaging', '/api/channels/${widget.alias}/calls/ongoing');
+    var uri = getRequestUri('messaging', '/api/channels/${widget.alias}/calls/ongoing');
    var res = await _client.get(uri);
    if (res.statusCode == 200) {
      final result = jsonDecode(utf8.decode(res.bodyBytes));
@ -84,10 +82,8 @@ class _ChatScreenState extends State<ChatScreen> {

    var res = await auth.client!.get(uri);
    if (res.statusCode == 200) {
-      final result =
-          PaginationResult.fromJson(jsonDecode(utf8.decode(res.bodyBytes)));
-      final items =
-          result.data?.map((x) => Message.fromJson(x)).toList() ?? List.empty();
+      final result = PaginationResult.fromJson(jsonDecode(utf8.decode(res.bodyBytes)));
+      final items = result.data?.map((x) => Message.fromJson(x)).toList() ?? List.empty();
      final isLastPage = (result.count - pageKey) < take;
      if (isLastPage || result.data == null) {
        _pagingController.appendLastPage(items);
@ -115,16 +111,13 @@ class _ChatScreenState extends State<ChatScreen> {

  void updateMessage(Message item) {
    setState(() {
-      _pagingController.itemList = _pagingController.itemList
-          ?.map((x) => x.id == item.id ? item : x)
-          .toList();
+      _pagingController.itemList = _pagingController.itemList?.map((x) => x.id == item.id ? item : x).toList();
    });
  }

  void deleteMessage(Message item) {
    setState(() {
-      _pagingController.itemList =
-          _pagingController.itemList?.where((x) => x.id != item.id).toList();
+      _pagingController.itemList = _pagingController.itemList?.where((x) => x.id != item.id).toList();
    });
  }

@ -154,8 +147,7 @@ class _ChatScreenState extends State<ChatScreen> {
      fetchCall();
    });

-    _pagingController
-        .addPageRequestListener((pageKey) => fetchMessages(pageKey, context));
+    _pagingController.addPageRequestListener((pageKey) => fetchMessages(pageKey, context));

    super.initState();
  }
@ -165,12 +157,10 @@ class _ChatScreenState extends State<ChatScreen> {
    Widget chatHistoryBuilder(context, item, index) {
      bool isMerged = false, hasMerged = false;
      if (index > 0) {
-        hasMerged =
-            getMessageMergeable(_pagingController.itemList?[index - 1], item);
+        hasMerged = getMessageMergeable(_pagingController.itemList?[index - 1], item);
      }
      if (index + 1 < (_pagingController.itemList?.length ?? 0)) {
-        isMerged =
-            getMessageMergeable(item, _pagingController.itemList?[index + 1]);
+        isMerged = getMessageMergeable(item, _pagingController.itemList?[index + 1]);
      }
      return InkWell(
        child: Container(
@ -193,8 +183,7 @@ class _ChatScreenState extends State<ChatScreen> {
    final callBanner = MaterialBanner(
      padding: const EdgeInsets.only(top: 4, bottom: 4, left: 20),
      leading: const Icon(Icons.call_received),
-      backgroundColor:
-          Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.9),
+      backgroundColor: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.9),
      dividerColor: const Color.fromARGB(1, 0, 0, 0),
      content: Text(AppLocalizations.of(context)!.chatCallOngoing),
      actions: [
@ -213,15 +202,18 @@ class _ChatScreenState extends State<ChatScreen> {

    return IndentWrapper(
      hideDrawer: true,
-      title: _channelMeta?.name ?? "Loading...",
+      title: _channelMeta?.name ?? 'Loading...',
      appBarActions: _channelMeta != null
          ? [
              ChannelCallAction(
-                  call: _ongoingCall,
-                  channel: _channelMeta!,
-                  onUpdate: () => fetchMetadata()),
+                call: _ongoingCall,
+                channel: _channelMeta!,
+                onUpdate: () => fetchMetadata(),
+              ),
              ChannelManageAction(
-                  channel: _channelMeta!, onUpdate: () => fetchMetadata()),
+                channel: _channelMeta!,
+                onUpdate: () => fetchMetadata(),
+              ),
            ]
          : [],
      child: FutureBuilder(
@ -242,8 +234,10 @@ class _ChatScreenState extends State<ChatScreen> {
                        reverse: true,
                        pagingController: _pagingController,
                        builderDelegate: PagedChildBuilderDelegate<Message>(
-                          noItemsFoundIndicatorBuilder: (_) => Container(),
+                          animateTransitions: true,
+                          transitionDuration: 500.ms,
                          itemBuilder: chatHistoryBuilder,
+                          noItemsFoundIndicatorBuilder: (_) => Container(),
                        ),
                      ),
                    ),
@ -258,9 +252,7 @@ class _ChatScreenState extends State<ChatScreen> {
                    ),
                  ],
                ),
-                _ongoingCall != null
-                    ? callBanner.animate().slideY()
-                    : Container(),
+                _ongoingCall != null ? callBanner.animate().slideY() : Container(),
              ],
            ),
            onInsertMessage: (message) => addMessage(message),