Merge pull request #259 from KizKizz/system-rework

prep

app_version_check/app_version.json

@@ -1,13 +1,15 @@
 {
     "name": "PSO2NGS Mod Manager",
-    "version": "2.8.14",
+    "version": "2.8.15",
     "description": [
+        "v2.8.15 hotfixes",
         "Added expand and collapse all categories to Item List",
         "Added an option to add newly added mods to Mod Sets",
         "Fixed a bug where Applied List would not refresh correctly in Mod Sets",
         "Improved Mod Sets Apply-Unapply function",
         "More code and performance optimization",
         "More bug fixes",
+        "v2.8.15 ホットフィックス",
         "アイテムリストに全カテゴリーの展開と折りたたみを追加",
         "新しく追加されたMODをMODセットに追加するオプションを追加",
         "MODセットで適用済みリストが正しく更新されないバグを修正",

lib/homepage/applied_list.dart

@@ -162,9 +162,10 @@ class _AppliedListState extends State<AppliedList> {
                                 Future.delayed(const Duration(milliseconds: applyButtonsDelay), () async {
                                   final reappliedList = await reapplySelectedAppliedMods(context);
                                   // .then((value) {
-                                  modViewModsApplyRemoving.value = false;
+
                                   saveModdedItemListToJson();
                                   ScaffoldMessenger.of(context).showSnackBar(snackBarMessage(context, reappliedList.first, reappliedList[1], 3000));
+                                  modViewModsApplyRemoving.value = false;
                                   setState(() {});
                                 });
                                 // });
@@ -201,8 +202,12 @@ class _AppliedListState extends State<AppliedList> {
                                 Future.delayed(const Duration(milliseconds: unapplyButtonsDelay), () async {
                                   final unappliedList = await unapplySelectedAppliedMods(context);
                                   // .then((value) {
-                                  modViewModsApplyRemoving.value = false;
+
                                   ScaffoldMessenger.of(context).showSnackBar(snackBarMessage(context, unappliedList.first, unappliedList[1], 3000));
+                                  if (moddedItemsList.where((e) => e.getNumOfAppliedCates() > 0).isEmpty) {
+                                    saveApplyButtonState.value = SaveApplyButtonState.none;
+                                  }
+                                  modViewModsApplyRemoving.value = false;
                                   setState(() {});
                                 });
                                 // });

lib/homepage/mod_view.dart

@@ -2,8 +2,8 @@
 
 import 'dart:io';
 
-import 'package:advance_expansion_tile/advance_expansion_tile.dart';
 import 'package:bitsdojo_window/bitsdojo_window.dart';
+import 'package:expansion_tile_group/expansion_tile_group.dart';
 import 'package:file_selector/file_selector.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -70,7 +70,7 @@ bool modViewListShowNew = false;
 bool modViewListShowApplied = false;
 // bool modViewListVisible != null;
 final ValueNotifier<Item?> modViewItem = ValueNotifier<Item?>(null);
-List<GlobalKey<AdvanceExpansionTileState>> modViewExpansionTileStates = [];
+List<GlobalKey<ExpansionTileCoreState>> modViewExpansionTileStates = [];
 
 class ModView extends StatefulWidget {
   const ModView({super.key});

lib/modsAdder/mods_adder_add_function.dart

@@ -24,7 +24,9 @@ Future<(bool, List<Item>)> modsAdderModFilesAdder(context, List<ModsAdderItem> i
   List<Item> returnItems = [];
   //add to set
   String newSetName = '';
-  newSetName = await modAdderNewModSetDialog(context);
+  if (addToModSets) {
+    newSetName = await modAdderNewModSetDialog(context);
+  }
   if (addToModSets && newSetName.isEmpty) {
     return (false, returnItems);
   }

linux/flutter/generated_plugin_registrant.cc

@@ -6,7 +6,6 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <advance_expansion_tile/advance_expansion_tile_plugin.h>
 #include <bitsdojo_window_linux/bitsdojo_window_plugin.h>
 #include <desktop_drop/desktop_drop_plugin.h>
 #include <file_selector_linux/file_selector_plugin.h>
@@ -17,9 +16,6 @@
 #include <window_manager/window_manager_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
-  g_autoptr(FlPluginRegistrar) advance_expansion_tile_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "AdvanceExpansionTilePlugin");
-  advance_expansion_tile_plugin_register_with_registrar(advance_expansion_tile_registrar);
   g_autoptr(FlPluginRegistrar) bitsdojo_window_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "BitsdojoWindowPlugin");
   bitsdojo_window_plugin_register_with_registrar(bitsdojo_window_linux_registrar);

linux/flutter/generated_plugins.cmake

@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  advance_expansion_tile
   bitsdojo_window_linux
   desktop_drop
   file_selector_linux

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,7 +5,6 @@
 import FlutterMacOS
 import Foundation
 
-import advance_expansion_tile
 import bitsdojo_window_macos
 import desktop_drop
 import file_selector_macos
@@ -21,7 +20,6 @@ import wakelock_plus
 import window_manager
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  AdvanceExpansionTilePlugin.register(with: registry.registrar(forPlugin: "AdvanceExpansionTilePlugin"))
   BitsdojoWindowPlugin.register(with: registry.registrar(forPlugin: "BitsdojoWindowPlugin"))
   DesktopDropPlugin.register(with: registry.registrar(forPlugin: "DesktopDropPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))

pubspec.lock

@@ -9,15 +9,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "67.0.0"
-  advance_expansion_tile:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: upgrade-material
-      resolved-ref: "19c8f60266be93d94cb09abc070957aaa46dbbc1"
-      url: "https://github.com/seddikmomo/advance_expansion_tile.git"
-    source: git
-    version: "1.0.2"
   analyzer:
     dependency: "direct dev"
     description:

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.8.8
+version: 2.8.15
 
 environment:
   sdk: ">=3.0.0"
@@ -67,10 +67,6 @@ dependencies:
   rflutter_alert: ^2.0.7
   super_sliver_list: ^0.4.1
   signals: ^5.3.0
-  advance_expansion_tile:
-    git:
-      url: https://github.com/seddikmomo/advance_expansion_tile.git
-      ref: upgrade-material # branch name
   expansion_tile_group: ^2.0.0
 
   # The following adds the Cupertino Icons font to your application.

windows/runner/Runner.rc

@@ -63,13 +63,13 @@ IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 #ifdef FLUTTER_BUILD_NUMBER
 #define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
 #else
-#define VERSION_AS_NUMBER 2,8,14
+#define VERSION_AS_NUMBER 2,8,15
 #endif
 
 #ifdef FLUTTER_BUILD_NAME
 #define VERSION_AS_STRING #FLUTTER_BUILD_NAME
 #else
-#define VERSION_AS_STRING "2.8.14"
+#define VERSION_AS_STRING "2.8.15"
 #endif
 
 VS_VERSION_INFO VERSIONINFO