Merge pull request #258 from KizKizz/system-rework

System rework
KizKizz · Aug 13, 2024 · 5912857 · 5912857
2 parents c5bdc42 + 0551ed8
commit 5912857
Show file tree

Hide file tree

Showing 22 changed files with 1,651 additions and 1,333 deletions.
diff --git a/Language/CN.json b/Language/CN.json
@@ -311,6 +311,8 @@
   "uiShowNew": "Show New",
   "uiShowApplied": "Show Applied",
   "uiUndo": "Undo",
+  "uiExpandAllCategories": "Expand All Categories",
+  "uiCollapseAllCategories": "Collapse All Categories",
   "uiPreparing": "准备中",
   "uiDragDropFiles": "拖放文件夹、.zip、.rar、.7z文件\n以及.ice文件到这里\n或者点击\"添加文件夹或文件\"按钮选择文件夹或文件。\n大量文件的处理可能会花费较长时间。",
   "uiAchiveCurrentlyNotSupported": "当前不支持的压缩文件类型。请解压存档文件后，再将内容拖到此处。",
@@ -333,6 +335,7 @@
   "uiDuplicateModsIn": "重复MOD放置在",
   "uiRenameForMe": "请重命名!",
   "uiAddingMods": "添加MOD",
+  "uiNameCannotHaveSpacesAtTheEnd": "Name cannot have spaces at the end",
   "uiPickAColor": "选择颜色",
   "uiDuplicatesInAppliedModsFound": "在应用的MOD中发现了重复的物品",
   "uiApplyingWouldReplaceModFiles": "注意:应用此MOD将替换这些已应用的MOD文件。",

diff --git a/Language/EN.json b/Language/EN.json
@@ -311,6 +311,8 @@
   "uiShowNew": "Show New",
   "uiShowApplied": "Show Applied",
   "uiUndo": "Undo",
+  "uiExpandAllCategories": "Expand All Categories",
+  "uiCollapseAllCategories": "Collapse All Categories",
   "uiPreparing": "Preparing",
   "uiDragDropFiles": "Drag and drop folders, .zip, .rar, .7z files\nand .ice files here\nOr use the \"Add Folders/Files\" buttons to select folders/files\nMay take some time\nto process large amount of files",
   "uiAchiveCurrentlyNotSupported": "currently not supported. Open the archive file then drag the content in here instead",
@@ -333,6 +335,7 @@
   "uiDuplicateModsIn": "in",
   "uiRenameForMe": "Rename for me!",
   "uiAddingMods": "Adding mods",
+  "uiNameCannotHaveSpacesAtTheEnd": "Name cannot have spaces at the end",
   "uiPickAColor": "Pick a color",
   "uiDuplicatesInAppliedModsFound": "Duplicate(s) in applied mods found",
   "uiApplyingWouldReplaceModFiles": "Applying this mod would replace these applied mod files",

diff --git a/Language/JP.json b/Language/JP.json
@@ -311,6 +311,8 @@
   "uiShowNew": "新着情報",
   "uiShowApplied": "応用",
   "uiUndo": "元に戻す",
+  "uiExpandAllCategories": "すべてのカテゴリーを拡大する",
+  "uiCollapseAllCategories": "すべてのカテゴリーを閉じる",
   "uiPreparing": "準備中",
   "uiDragDropFiles": "フォルダ(.zip)(.rar)(.7z)ファイルのドラッグ&ドロップ\nおよび.iceファイルはこちら\nまたは、\"フォルダ/ファイルの追加\" ボタンを使って、フォルダやファイルを選択します\n大量のファイルの処理に時間がかかる場合があります",
   "uiAchiveCurrentlyNotSupported": "現在、サポートされていませんアーカイブファイルを開き、代わりにコンテンツをここにドラッグしてください",
@@ -333,6 +335,7 @@
   "uiDuplicateModsIn": "において",
   "uiAddingMods": "MODの追加",
   "uiRenameForMe": "リネームしてください！",
+  "uiNameCannotHaveSpacesAtTheEnd": "名前の最後にスペースを入れることはできない",
   "uiPickAColor": "カラーを選ぶ",
   "uiDuplicatesInAppliedModsFound": "適用されたMODの中で重複するものが見つかりました",
   "uiApplyingWouldReplaceModFiles": "このMODを適用すると、これらの適用済みMODファイルが置き換えられます",

diff --git a/Language/LanguageSettings.json b/Language/LanguageSettings.json
@@ -17,4 +17,4 @@
     "langFilePath": "E:\\Flutter project\\pso2_mod_manager\\Language\\JP.json",
     "selected": false
   }
-]
+]
diff --git a/app_version_check/app_version.json b/app_version_check/app_version.json
@@ -1,12 +1,18 @@
 {
     "name": "PSO2NGS Mod Manager",
-    "version": "2.8.13",
+    "version": "2.8.14",
     "description": [
-        "Fixed a bug with Mod Sets when applying mods",
-        "Code and performance optimization",
+        "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",
-        "MOD適用時のMODセットのバグを修正",
-        "コードとパフォーマンスの最適化",
+        "アイテムリストに全カテゴリーの展開と折りたたみを追加",
+        "新しく追加されたMODをMODセットに追加するオプションを追加",
+        "MODセットで適用済みリストが正しく更新されないバグを修正",
+        "MODセットの適用・未適用機能の改善",
+        "より多くのコードとパフォーマンスの最適化",
         "その他のバグ修正"
     ],
     "windows_file": "",

diff --git a/lib/classes/category_class.dart b/lib/classes/category_class.dart
@@ -14,6 +14,16 @@ class Category with ChangeNotifier {
   bool visible;
   List<Item> items;
 
+  bool _isExpanded = false;
+
+  bool getExpansionState() {
+    return _isExpanded;
+  }
+
+  void setExpansionState(bool state) {
+    _isExpanded = state;
+  }
+
   void removeItem(Item? item) {
     if (item != null) {
       items.remove(item);

diff --git a/lib/global_variables.dart b/lib/global_variables.dart
@@ -196,4 +196,6 @@ List<CsvItem> quickApplyItemList = [];
 bool itemsWithNewModsOnTop = false;
 bool newModsOnTop = false;
 bool markModdedItem = false;
-final saveApplyButtonState = signal<SaveApplyButtonState>(SaveApplyButtonState.none);
+final saveApplyButtonState = signal<SaveApplyButtonState>(SaveApplyButtonState.none);
+bool itemListCateExpansionState = false;
+bool modAdderAddToModSets = false;
diff --git a/lib/homepage/applied_list.dart b/lib/homepage/applied_list.dart
@@ -788,7 +788,7 @@ class _AppliedListState extends State<AppliedList> {
                                                                   children: [
                                                                     Text(
                                                                       '$totalAppliedModFiles / $totalModFiles ${curLangText!.uiFilesApplied}',
-                                                                      //style: TextStyle(color: Theme.of(context).textTheme.displaySmall?.color),
+                                                                      style: TextStyle(color: Theme.of(context).hintColor),
                                                                     ),
                                                                     if (curMods.where((mod) => mod.submods.where((submod) => submod.hasCmx!).isNotEmpty).isNotEmpty)
                                                                       Container(

diff --git a/lib/homepage/home_page.dart b/lib/homepage/home_page.dart
@@ -143,17 +143,8 @@ class _HomePageState extends State<HomePage> {
       children: [
         if (!context.watch<StateProvider>().setsWindowVisible) const ItemList(),
         if (context.watch<StateProvider>().setsWindowVisible) const ModSetList(),
-        //if (!context.watch<StateProvider>().setsWindowVisible)
         const ModView(),
         const AppliedList(),
-        //if (context.watch<StateProvider>().setsWindowVisible) modInSetList(),
-        // if (!context.watch<StateProvider>().previewWindowVisible || !context.watch<StateProvider>().showPreviewPanel) const AppliedList(),
-        // if (context.watch<StateProvider>().previewWindowVisible && context.watch<StateProvider>().showPreviewPanel)
-          // MultiSplitView(
-          //   axis: Axis.vertical,
-          //   controller: _verticalViewsController,
-          //   children: const [Preview(), AppliedList()],
-          // )
       ],
     );
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,4 +17,4 @@ @@
         "langFilePath": "E:\\Flutter project\\pso2_mod_manager\\Language\\JP.json",
         "selected": false
       }
-    ]
+    ]