✨: migrate questlist from Cubit to Bloc with updated event handling and state management

imoyakin · imoyakin · commit f6e2cc455a3e · 2025-01-05T23:22:51.000+08:00
diff --git a/lib/components/kancolle_model/kancolle_parse.dart b/lib/components/kancolle_model/kancolle_parse.dart
@@ -34,7 +34,7 @@ void kancolleMessageHandle(BuildContext context, WebMessage message) {
       case 'api_get_member':
         switch (seg[2]) {
           case 'questlist':
-            context.read<QuestlistCubit>().parse(result);
+            context.read<QuestlistBloc>().add(QuestlistEvent.update(result));
           case 'require_info':
             //TODO
             break;
diff --git a/lib/components/kancolle_model/kcsapi/get/member/member.dart b/lib/components/kancolle_model/kcsapi/get/member/member.dart
@@ -1,5 +1,6 @@
 export 'ndock/ndock_cubit.dart';
 export 'furniture/furniture_cubit.dart';
 export 'questlist/questlist_cubit.dart';
+export 'questlist/questlist_bloc.dart';
 export 'slot_item/slot_item_cubit.dart';
 export 'unsetslot/unsetslot_cubit.dart';
diff --git a/lib/components/kancolle_model/kcsapi/get/member/questlist/questlist_bloc.dart b/lib/components/kancolle_model/kcsapi/get/member/questlist/questlist_bloc.dart
@@ -0,0 +1,64 @@
+import 'dart:convert';
+
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'questlist_event.dart';
+part 'questlist_state.dart';
+part 'questlist_bloc.freezed.dart';
+part 'questlist_bloc.g.dart';
+
+class QuestlistBloc extends Bloc<QuestlistEvent, QuestlistState> {
+  QuestlistBloc() : super(QuestlistState.initial()) {
+    on<_EventInitial>((event, emit) {});
+    on<_EventUpdate>((event, emit) {
+      final data = jsonDecode(event.data);
+      data['api_data']['questlist_type'] = 'loaded';
+      QuestlistStateData questList =
+          QuestlistStateData.fromJson(data['api_data']);
+      state.when(
+          initial: () =>
+              emit(_Loaded(apiData: questList, sortOrder: SortOrder.noSort)),
+          loaded: (apiData, sortOrder) {
+            if (sortOrder != null) {
+              questList = sort(questList, sortOrder);
+            } else {
+              sortOrder = SortOrder.noSort;
+            }
+            emit(QuestlistState.loaded(
+                apiData: questList, sortOrder: sortOrder));
+          });
+    });
+
+    on<_EventSort>((event, emit) {
+      if (state is! _Loaded) {
+        return;
+      }
+      var data = sort((state as _Loaded).apiData, event.sort);
+      emit(QuestlistState.loaded(apiData: data, sortOrder: event.sort));
+    });
+  }
+
+  QuestlistStateData sort(QuestlistStateData data, SortOrder sort) {
+    switch (sort) {
+      case SortOrder.ongoingAsc:
+                    // apiList.sort((a, b) => b.apiState.index.compareTo(a.apiState.index));
+        data.apiList.sort((a, b) => b.apiState.index.compareTo(a.apiState.index));
+
+        break;
+      case SortOrder.ongoingDesc:
+        data.apiList.sort((a, b) => a.apiState.index.compareTo(b.apiState.index));
+        break;
+      case SortOrder.typeAsc:
+        data.apiList.sort((a, b) => a.apiCategory.compareTo(b.apiCategory));
+        break;
+      case SortOrder.typeDesc:
+        data.apiList.sort((a, b) => b.apiCategory.compareTo(a.apiCategory));
+        break;
+      default:
+        break;
+    }
+    return data;
+  }
+}
diff --git a/lib/components/kancolle_model/kcsapi/get/member/questlist/questlist_cubit.dart b/lib/components/kancolle_model/kcsapi/get/member/questlist/questlist_cubit.dart
@@ -1,19 +1,19 @@
-import 'dart:convert';
+// import 'dart:convert';
 
-import 'package:bloc/bloc.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:equatable/equatable.dart';
+// import 'package:bloc/bloc.dart';
+// import 'package:freezed_annotation/freezed_annotation.dart';
+// import 'package:equatable/equatable.dart';
 
-part 'questlist_state.dart';
-part 'questlist_cubit.freezed.dart';
-part 'questlist_cubit.g.dart';
+// part 'questlist_state.dart';
+// part 'questlist_cubit.freezed.dart';
+// part 'questlist_cubit.g.dart';
 
-class QuestlistCubit extends Cubit<QuestlistState> {
-  QuestlistCubit() : super(QuestlistState.initial());
+// class QuestlistCubit extends Cubit<QuestlistState> {
+//   QuestlistCubit() : super(QuestlistState.initial());
 
-  void parse(String jsonData) {
-    final data = jsonDecode(jsonData);
-    data['api_data']['questlist_type'] = 'loaded';
-    emit(QuestlistState.fromJson(data['api_data']));
-  }
-}
+//   void parse(String jsonData) {
+//     final data = jsonDecode(jsonData);
+//     data['api_data']['questlist_type'] = 'loaded';
+//     emit(QuestlistState.fromJson(data['api_data']));
+//   }
+// }
diff --git a/lib/components/kancolle_model/kcsapi/get/member/questlist/questlist_event.dart b/lib/components/kancolle_model/kcsapi/get/member/questlist/questlist_event.dart
@@ -0,0 +1,8 @@
+part of 'questlist_bloc.dart';
+
+@freezed
+class QuestlistEvent with _$QuestlistEvent {
+  const factory QuestlistEvent.init() = _EventInitial;
+  const factory QuestlistEvent.update(String data) = _EventUpdate;
+  const factory QuestlistEvent.sort(SortOrder sort) = _EventSort;
+}
diff --git a/lib/components/kancolle_model/kcsapi/get/member/questlist/questlist_state.dart b/lib/components/kancolle_model/kcsapi/get/member/questlist/questlist_state.dart
@@ -1,4 +1,4 @@
-part of 'questlist_cubit.dart';
+part of 'questlist_bloc.dart';
 
 enum QuestState {
   @JsonValue(1)
@@ -9,27 +9,62 @@ enum QuestState {
   achieved,
 }
 
-@Freezed(unionKey: 'questlist_type', unionValueCase: FreezedUnionCase.pascal)
-class QuestlistState with _$QuestlistState  implements EquatableMixin{
+enum SortOrder {
+  noSort,
+  ongoingAsc,
+  ongoingDesc,
+  typeAsc,
+  typeDesc,
+}
+
+@freezed
+class QuestlistState with _$QuestlistState implements EquatableMixin {
   const QuestlistState._();
   const factory QuestlistState.initial() = _Initial;
 
   @JsonSerializable(fieldRename: FieldRename.snake)
   @FreezedUnionValue('loaded')
   const factory QuestlistState.loaded({
+    required QuestlistStateData apiData,
+    @Default(SortOrder.noSort) SortOrder? sortOrder,
+  }) = _Loaded;
+
+  factory QuestlistState.fromJson(Map<String, dynamic> json) =>
+      _$QuestlistStateFromJson(json);
+
+  @override
+  List<Object?> get props => [if (this is _Loaded) (this as _Loaded)];
+
+  @override
+  bool? get stringify => true;
+}
+
+@Freezed(
+  unionKey: 'questlist_type',
+  unionValueCase: FreezedUnionCase.pascal,
+  copyWith: true,
+  makeCollectionsUnmodifiable: false,
+  equal: false,
+)
+class QuestlistStateData with _$QuestlistStateData implements EquatableMixin {
+  const QuestlistStateData._();
+
+  @JsonSerializable(fieldRename: FieldRename.snake)
+  @FreezedUnionValue('loaded')
+  const factory QuestlistStateData.loaded({
     required int apiCount,
     required int apiCompletedKind,
     required List<Quest> apiList, //fixit
     required int apiExecCount,
     required List<ApiClist> apiCList, //fixit
     required int apiExecType,
-  }) = _Loaded;
+  }) = _StateLoaded;
 
-  factory QuestlistState.fromJson(Map<String, dynamic> json) =>
-      _$QuestlistStateFromJson(json);
+  factory QuestlistStateData.fromJson(Map<String, dynamic> json) =>
+      _$QuestlistStateDataFromJson(json);
 
   @override
-  List<Object?> get props => [if(this is _Loaded) (this as _Loaded)];
+  List<Object?> get props => [if (this is _StateLoaded) (this as _StateLoaded)];
 
   @override
   bool? get stringify => true;
diff --git a/lib/main.dart b/lib/main.dart
@@ -50,7 +50,7 @@ class App extends StatelessWidget {
         BlocProvider<FurnitureCubit>(create: (context) => FurnitureCubit()),
         BlocProvider<UnsetslotCubit>(create: (context) => UnsetslotCubit()),
         BlocProvider<Start2GetDataCubit>(create: (context) => Start2GetDataCubit()),
-        BlocProvider<QuestlistCubit>(create: (context) => QuestlistCubit()),
+        BlocProvider<QuestlistBloc>(create: (context) => QuestlistBloc()),
       ],
       child: BlocConsumer<GlobalBloc, GlobalState>(
           listener: (context, state) {},
diff --git a/lib/screens/questlist.dart b/lib/screens/questlist.dart
@@ -11,33 +11,25 @@ class QuestlistView extends StatefulWidget {
 }
 
 class QuestlistViewState extends State<QuestlistView> {
-  late int apiCount;
-  late int apiCompletedKind;
-  late List<Quest> apiList = [];
-  late int apiExecCount;
-  late List<ApiClist> apiCList;
-  late int apiExecType;
+  late QuestlistStateData? apiData;
 
   @override
   void initState() {
     super.initState();
-    apiList = [];
+    apiData = context
+        .read<QuestlistBloc>()
+        .state
+        .when(initial: () => null, loaded: (data, _) => data);
   }
 
   @override
   Widget build(BuildContext context) {
-    return BlocListener<QuestlistCubit, QuestlistState>(
+    return BlocListener<QuestlistBloc, QuestlistState>(
         listener: (context, state) {
           state.when(
             initial: () {},
-            loaded: (apiCount, apiCompletedKind, apiList, apiExecCount,
-                apiCList, apiExecType) {
-              this.apiCount = apiCount;
-              this.apiCompletedKind = apiCompletedKind;
-              this.apiList = List.from(apiList);
-              this.apiExecCount = apiExecCount;
-              this.apiCList = apiCList;
-              this.apiExecType = apiExecType;
+            loaded: (apiData, sortOrder) {
+              this.apiData = apiData;
               setState(() {});
             },
           );
@@ -52,28 +44,30 @@ class QuestlistViewState extends State<QuestlistView> {
               wrappedItem: CommandBarButton(
                 icon: const Icon(FluentIcons.increase_indent),
                 onPressed: () {
-                  setState(() {
-                    apiList.sort(
-                        (a, b) => b.apiState.index.compareTo(a.apiState.index));
-                  });
+                  context
+                      .read<QuestlistBloc>()
+                      .add(QuestlistEvent.sort(SortOrder.ongoingAsc));
                 },
               ),
             ),
           ]),
           Expanded(
-              child: ListView.builder(
-                  itemBuilder: (context, index) {
-                    return Tooltip(
-                      message: apiList[index].apiDetail,
-                      child: ListTile.selectable(
-                      leading: Text('月'),
-                      title: Text(apiList[index].apiTitle),
-                      trailing: Text(apiList[index].apiState.toString()),
-                      selected:
-                          apiList[index].apiState != QuestState.unaccepted,
-                    ));
-                  },
-                  itemCount: apiList.length)),
+              child: apiData == null
+                  ? const Center()
+                  : ListView.builder(
+                      itemBuilder: (context, index) {
+                        return Tooltip(
+                            message: apiData!.apiList[index].apiDetail,
+                            child: ListTile.selectable(
+                              leading: Text('月'),
+                              title: Text(apiData!.apiList[index].apiTitle),
+                              trailing: Text(
+                                  apiData!.apiList[index].apiState.toString()),
+                              selected: apiData!.apiList[index].apiState !=
+                                  QuestState.unaccepted,
+                            ));
+                      },
+                      itemCount: apiData!.apiList.length))
         ]));
   }
 }
