From e7d3f66538e212ec9268af319979330de081933e Mon Sep 17 00:00:00 2001 From: KizKizz Date: Tue, 13 Aug 2024 15:15:10 -0700 Subject: [PATCH] prep --- app_version_check/app_version.json | 4 +++- lib/homepage/applied_list.dart | 9 +++++++-- lib/homepage/mod_view.dart | 4 ++-- lib/modsAdder/mods_adder_add_function.dart | 4 +++- linux/flutter/generated_plugin_registrant.cc | 4 ---- linux/flutter/generated_plugins.cmake | 1 - macos/Flutter/GeneratedPluginRegistrant.swift | 2 -- pubspec.lock | 9 --------- pubspec.yaml | 6 +----- windows/runner/Runner.rc | 4 ++-- 10 files changed, 18 insertions(+), 29 deletions(-) diff --git a/app_version_check/app_version.json b/app_version_check/app_version.json index edb77329..0ea00cd8 100644 --- a/app_version_check/app_version.json +++ b/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セットで適用済みリストが正しく更新されないバグを修正", diff --git a/lib/homepage/applied_list.dart b/lib/homepage/applied_list.dart index 82d1b8b4..4c6a2d41 100644 --- a/lib/homepage/applied_list.dart +++ b/lib/homepage/applied_list.dart @@ -162,9 +162,10 @@ class _AppliedListState extends State { 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 { 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(() {}); }); // }); diff --git a/lib/homepage/mod_view.dart b/lib/homepage/mod_view.dart index 4af31d47..b1000ffd 100644 --- a/lib/homepage/mod_view.dart +++ b/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 modViewItem = ValueNotifier(null); -List> modViewExpansionTileStates = []; +List> modViewExpansionTileStates = []; class ModView extends StatefulWidget { const ModView({super.key}); diff --git a/lib/modsAdder/mods_adder_add_function.dart b/lib/modsAdder/mods_adder_add_function.dart index 7571eb87..bc6497bc 100644 --- a/lib/modsAdder/mods_adder_add_function.dart +++ b/lib/modsAdder/mods_adder_add_function.dart @@ -24,7 +24,9 @@ Future<(bool, List)> modsAdderModFilesAdder(context, List i List returnItems = []; //add to set String newSetName = ''; - newSetName = await modAdderNewModSetDialog(context); + if (addToModSets) { + newSetName = await modAdderNewModSetDialog(context); + } if (addToModSets && newSetName.isEmpty) { return (false, returnItems); } diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 1959b199..8556b896 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -6,7 +6,6 @@ #include "generated_plugin_registrant.h" -#include #include #include #include @@ -17,9 +16,6 @@ #include 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); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 96423300..78400471 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/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 diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index bad598c2..59f8f655 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/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")) diff --git a/pubspec.lock b/pubspec.lock index 9a15e768..6aa2f33b 100644 --- a/pubspec.lock +++ b/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: diff --git a/pubspec.yaml b/pubspec.yaml index 8e0f267c..c5bfb1f0 100644 --- a/pubspec.yaml +++ b/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. diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index e795b349..5fa77224 100644 --- a/windows/runner/Runner.rc +++ b/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