bugfix

lib/apis/models/note.dart

@@ -277,7 +277,7 @@ class NotePollModel {
 
   factory NotePollModel.fromMap(Map<String, dynamic> json) => NotePollModel(
         choices: List<NotePollModelChoices>.from(
-            json["choices"].map((x) => NotePollModel.fromMap(x))),
+            json["choices"]?.map((x) => NotePollModelChoices.fromMap(x))),
         expiresAt: json["expiresAt"] == null
             ? null
             : DateTime.parse(json["expiresAt"]),

lib/database/notes.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 import 'package:moekey/apis/models/note.dart';
 
@@ -15,14 +16,14 @@ class NotesDatabase {
 
   put(String noteId, NoteModel note) async {
     var db = await _getDatabase();
-    await db.put(noteId, note.toJson());
+    await db.put(noteId, await compute((note) => note.toJson(), note));
   }
 
   Future<NoteModel?> get(String noteId) async {
     var db = await _getDatabase();
     var res = await db.get(noteId);
     if (res != null) {
-      return NoteModel.fromJson(res);
+      return compute((res) => NoteModel.fromJson(res), res);
     }
     return null;
   }

lib/database/timeline.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 import 'package:moekey/apis/models/note.dart';
 import 'package:moekey/database/init_database.dart';
@@ -19,21 +20,10 @@ class TimelineDatabase {
 
   setTimeline(String name, List<NoteModel> list) async {
     var db = await _getDatabase();
-    db.put("$name-timeline", jsonEncode(List.from(list.map((e) => e.toMap()))));
-  }
-
-  setTimelineScroll(String name, double pos) async {
-    var db = await _getDatabase();
-    db.put("$name-timeline-pos", jsonEncode(pos));
-  }
-
-  Future<double> getTimelineScroll(String name) async {
-    var db = await _getDatabase();
-    var pos = db.get("$name-timeline-pos");
-    if (pos == null) {
-      return 0;
-    }
-    return jsonDecode(pos);
+    db.put(
+        "$name-timeline",
+        await compute(
+            (list) => jsonEncode(List.from(list.map((e) => e.toMap()))), list));
   }
 
   cleanTimeline(String name) async {
@@ -47,7 +37,9 @@ class TimelineDatabase {
     if (res == null) {
       return null;
     }
-    List list = jsonDecode(res);
+    List list = await compute((message) {
+      return jsonDecode(message);
+    }, res);
     return List<NoteModel>.from(list.map((e) => NoteModel.fromMap(e)));
   }
 }

lib/main.dart

@@ -3,8 +3,6 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:hive/hive.dart';
-import 'package:hive_flutter/adapters.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:logger/logger.dart';
 import 'package:media_kit/media_kit.dart';
@@ -14,9 +12,6 @@ import 'package:moekey/pages/login/login_page.dart';
 import 'package:moekey/status/server.dart';
 import 'package:moekey/status/themes.dart';
 import 'package:moekey/widgets/loading_weight.dart';
-import 'package:path_provider/path_provider.dart';
-
-import 'apis/models/login_user.dart';
 import 'generated/l10n.dart';
 import 'status/websocket.dart';
 

lib/pages/home/home_page.dart

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:moekey/apis/models/login_user.dart';
 import 'package:moekey/pages/home/home_page_state.dart';
 import 'package:moekey/pages/users/user_page.dart';
 import 'package:moekey/router/main_router_delegate.dart';

lib/pages/notes/note_page.dart

@@ -3,17 +3,14 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:moekey/status/misskey_api.dart';
 import 'package:moekey/status/notes_listener.dart';
 import 'package:moekey/status/themes.dart';
-import 'package:moekey/status/timeline.dart';
 import 'package:moekey/utils/get_padding_note.dart';
 import 'package:moekey/widgets/loading_weight.dart';
 import 'package:moekey/widgets/mk_header.dart';
 import 'package:moekey/widgets/notes/note_children.dart';
 
 import '../../apis/models/note.dart';
-import '../../apis/models/translate.dart';
 import '../../apis/models/user_lite.dart';
 import '../../router/main_router_delegate.dart';
 import '../../status/apis.dart';
@@ -47,7 +44,6 @@ class NotesPage extends HookConsumerWidget {
     var noteListener = noteListenerProvider(noteId);
     var data = ref.watch(noteListener).valueOrNull;
     var conversation = dataProvider.valueOrNull?.conversation ?? [];
-    NotesListener note = ref.watch(notesListenerProvider.notifier);
     return LayoutBuilder(
       builder: (context, constraints) {
         double padding = getPaddingForNote(constraints);
@@ -156,7 +152,7 @@ class NotesPage extends HookConsumerWidget {
                                 reply: true,
                                 disableReactions: true,
                               ),
-                            NotesPageNoteCard(data: data!)
+                            NotesPageNoteCard(data: data)
                           ],
                         ),
                       ),

lib/pages/timeline/timeline_list.dart

@@ -2,11 +2,9 @@ import 'dart:io';
 import 'dart:ui';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:implicitly_animated_reorderable_list_2/implicitly_animated_reorderable_list_2.dart';
 import 'package:implicitly_animated_reorderable_list_2/transitions.dart';
-import 'package:moekey/main.dart';
 import 'package:moekey/status/themes.dart';
 import 'package:moekey/status/timeline.dart';
 import 'package:moekey/utils/get_padding_note.dart';
@@ -32,8 +30,6 @@ class TimeLineListPage extends HookConsumerWidget {
     var data = ref.watch(dataProvider);
 
     var themes = ref.watch(themeColorsProvider);
-    var scroll =
-        useFuture(ref.watch(timelineScrollOffsetProvider(api: api).future));
     return LayoutBuilder(
       builder: (context, constraints) {
         double padding = getPaddingForNote(constraints);
@@ -51,30 +47,15 @@ class TimeLineListPage extends HookConsumerWidget {
                 },
               ),
               child: LoadingAndEmpty(
-                loading: data.isLoading ||
-                    scroll.connectionState == ConnectionState.waiting,
+                loading: data.isLoading,
                 empty: data.valueOrNull?.isEmpty ?? true,
                 refresh: () async {
                   await ref.read(dataProvider.notifier).cleanCache();
                   return await ref.refresh(dataProvider.future);
                 },
                 child: HookConsumer(
                   builder: (context, ref, child) {
-                    var controller = useScrollController(
-                        initialScrollOffset: scroll.data ?? 0);
-
-                    useEffect(() {
-                      scrollListener() {
-                        var scroll = ref.read(
-                            timelineScrollOffsetProvider(api: api).notifier);
-                        scroll.updateScroll(controller.offset);
-                      }
-
-                      controller.addListener(scrollListener);
-                      return () => controller.removeListener(scrollListener);
-                    }, [api]);
                     return CustomScrollView(
-                      controller: controller,
                       cacheExtent:
                           (Platform.isAndroid || Platform.isIOS) ? null : 4000,
                       // controller: scrollController,

lib/pages/timeline/timeline_page.dart

@@ -43,7 +43,6 @@ class TimelinePage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     var pageController = usePageController();
     var tabController = useTabController(initialLength: navItemList.length);
-    var themes = ref.watch(themeColorsProvider);
     var currentIndex = useState(0);
     return MkScaffold(
       header: MkAppbar(

lib/pages/users/user_notes_list.dart

@@ -65,7 +65,7 @@ class UserNotesPage extends HookConsumerWidget {
       key: 1,
     );
     var data = ref.watch(dataProvider);
-    print(data.error);
+
     return LayoutBuilder(
       builder: (context, constraints) {
         double padding = getPaddingForNote(constraints);

lib/pages/users/user_reactions_list.dart

@@ -24,8 +24,6 @@ class UserReactionsPage extends HookConsumerWidget {
       userId: userId,
     );
     var data = ref.watch(dataProvider);
-    print(data.error);
-    print(data.stackTrace);
     return LayoutBuilder(
       builder: (context, constraints) {
         double padding = 0;

lib/status/apis.dart

@@ -4,6 +4,7 @@ import 'dart:convert';
 import 'package:flutter/services.dart';
 import 'package:moekey/apis/models/meta.dart';
 import 'package:moekey/apis/models/note.dart';
+import 'package:moekey/main.dart';
 import 'package:moekey/status/server.dart';
 import 'package:moekey/status/themes.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -63,8 +64,8 @@ Future<List<EmojiSimple>> apiEmojisList(ApiEmojisListRef ref) async {
 
     return emojis;
   } catch (e, t) {
-    print(e);
-    print(t);
+    logger.e(e);
+    logger.e(t);
   }
   return [];
 }

lib/status/notifications.dart

@@ -1,4 +1,5 @@
 import 'package:moekey/apis/models/notification.dart';
+import 'package:moekey/main.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 import '../apis/models/note.dart';
@@ -24,8 +25,8 @@ class Notifications extends _$Notifications {
       var res = await apis.account.notificationsGrouped(untilId: untilId);
       return res;
     } catch (e, s) {
-      print(e);
-      print(s);
+      logger.e(e);
+      logger.e(s);
     } finally {
       loading = false;
     }

lib/status/themes.dart

@@ -135,7 +135,6 @@ class Themes extends _$Themes {
     //           !colors.isDark ? Brightness.dark : Brightness.light,
     //       systemNavigationBarContrastEnforced: false),
     // );
-    String? font;
     return ThemeData(
       colorScheme: ColorScheme.fromSeed(seedColor: colors.accentColor).copyWith(
         surface: colors.bgColor,

lib/status/timeline.dart

@@ -63,17 +63,3 @@ class Timeline extends _$Timeline {
     await db.cleanTimeline(api);
   }
 }
-
-@riverpod
-class TimelineScrollOffset extends _$TimelineScrollOffset {
-  @override
-  FutureOr<double> build({String api = "timeline"}) async {
-    var db = await ref.watch(timelineDatabaseProvider.future);
-    return db.getTimelineScroll(api);
-  }
-
-  updateScroll(double pos) async {
-    var db = await ref.read(timelineDatabaseProvider.future);
-    db.setTimelineScroll(api, pos);
-  }
-}

lib/utils/save_image.dart

@@ -16,7 +16,6 @@ Future<bool> saveImage({
   required String url,
   String album = "moekey",
 }) async {
-  print(url);
   var name = basename(url);
   var ext = extension(name);
   var fileBasename = basenameWithoutExtension(name);
@@ -28,8 +27,6 @@ Future<bool> saveImage({
 
   var codec = await ui.instantiateImageCodec(data);
 
-
-
   if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) {
     // webp 单帧图片转换成png
     if (ext.toLowerCase().contains("webp") && codec.frameCount == 1) {

lib/widgets/context_menu.dart

@@ -98,15 +98,13 @@ class ContextMenuBuilderState extends ConsumerState<ContextMenuBuilder>
   }
 
   showBottomSheet() {
-    print(context.hashCode);
     showModalBottomSheet(
       context: context,
       backgroundColor: Colors.transparent,
       elevation: 0,
       useRootNavigator: true,
       isScrollControlled: true,
       builder: (context) {
-        print(this.context.hashCode);
         return ContextDraggableBottomSheet(menu: widget.menu);
       },
     );

lib/widgets/driver/drive.dart

@@ -246,7 +246,6 @@ class DriveList extends _$DriveList {
   }
 
   loadMore() async {
-    print("load");
     if (state.isLoading) return;
     state = const AsyncLoading();
     try {

lib/widgets/driver/driver_select_dialog/driver_select_dialog.dart

@@ -8,7 +8,6 @@ import 'package:moekey/widgets/context_menu.dart';
 import 'package:moekey/widgets/driver/driver_select_dialog/driver_select_dialog_state.dart';
 import 'package:moekey/widgets/driver/upload_file_dialog.dart';
 
-import '../../../apis/models/drive.dart';
 import '../../../main.dart';
 import '../../mk_card.dart';
 import '../../mk_switch.dart';

lib/widgets/login/servers_select.dart

@@ -32,7 +32,6 @@ class ServersSelectCard extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     var themes = ref.watch(themeColorsProvider);
     var list = ref.watch(instanceListStateProvider);
-    print(list.error);
     var url = useState("");
     var filterList = instanceListFilter(list.valueOrNull ?? [], url.value);
     return MkCard(

lib/widgets/mk_sliver_pinned.dart

@@ -77,7 +77,6 @@ class RenderSliverFixedHeader extends RenderSliverSingleBoxAdapter {
       origin = _pinnedOffset - topOffset;
     }
     final paintExtent = min(constraints.remainingPaintExtent, origin);
-    print(paintExtent);
     // 2.上报当前节点的布局信息给 viewport
     geometry = SliverGeometry(
       // visible: paintExtent > 0.0