feat: setting pages重构 by futurw4v · Pull Request #10 · lxdklp/FML

futurw4v · 2026-02-19T12:27:17Z

重构了SettingPage AboutPage ThemePage LogSettingPage LogViewerPage JavaPage，优化样式与代码结构
更改了about页面里的版权信息

重构后

关于视觉不统一与其他页面与代码复用：
不在这个PR的职责内，下个PR会提取出一些组件然后全局替换和做一些代码重构

futurw4v · 2026-02-19T12:49:29Z

关于页面在小窗口会有点溢出，现在最小窗口大小还不是很合理，不过我打算到时候用window_manager来定制窗口样式（去标题栏按钮等），也不在这个PR的职责内了，所以暂时先不管

Copilot

Pull request overview

This PR refactors the settings pages (SettingPage, AboutPage, ThemePage, LogSettingPage, LogViewerPage, JavaPage) to modernize the UI and improve code structure. The refactor adopts Material Design 3 principles with consistent card styling (elevation 0, outlined borders), replaces separate navigation with a unified drawer-based navigation pattern using IndexedStack for state preservation, and consolidates common styling patterns. The about page is also updated to use the global gAppVersion constant instead of reading from SharedPreferences.

Changes:

Implemented unified navigation drawer in SettingPage with IndexedStack for state preservation
Standardized card styling across all settings pages using MD3 guidelines (elevation: 0, outlined borders with colorScheme.outlineVariant)
Refactored ThemePage to use SegmentedButton for theme mode selection and improved color picker UI
Enhanced LogViewerPage with FutureBuilder pattern and centralized date formatting
Improved JavaPage with better variable naming and UI consistency
Updated AboutPage to use global gAppVersion constant and extracted helper method for card creation

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
lib/pages/setting_page.dart	Replaced card-based navigation with NavigationDrawer and IndexedStack; removed slide navigation
lib/pages/setting/theme.dart	Replaced switch-based UI with SegmentedButton; customized color picker to match MD3; changed dialog button from "确定" to "关闭"
lib/pages/setting/log_viewer/log_setting.dart	Updated Card styling to MD3 standards; improved layout of log level dropdown
lib/pages/setting/log_viewer.dart	Converted to FutureBuilder pattern; added centralized date formatting; removed loading state variable; improved UI layout
lib/pages/setting/java.dart	Renamed variables for clarity; refactored UI with consistent card styling; improved code organization with better documentation
lib/pages/setting/about.dart	Replaced _appVersion with gAppVersion; extracted _buildCardWithListTile helper method; updated card styling to MD3 standards

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

lib/pages/setting/java.dart

lib/pages/setting/log_viewer.dart

Copilot · 2026-02-19T15:52:00Z

lib/pages/setting/java.dart

+                      return Card(
+                        // 裁剪掉ListTile超出圆角的部分
+                        clipBehavior: Clip.antiAlias,
+
+                        elevation: 0,
+
+                        shape: RoundedRectangleBorder(
+                          side: BorderSide(
+                            color: Theme.of(context).colorScheme.outlineVariant,
+                          ),
+                          borderRadius: BorderRadius.circular(12),
+                        ),
+
+                        child: ListTile(
+                          title: Text(info.version),
+
+                          subtitle: Text(
+                            info.path.isNotEmpty ? info.path : '路径未知',
+                          ),
+
+                          trailing: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              const Chip(label: Text('系统默认')),
+
+                              const SizedBox(width: kDefaultPadding / 2),
+
+                              Chip(label: Text(info.vendor ?? 'Unknown')),
+                            ],
+                          ),
+
+                          onTap: () => _setSystemJava(),
+                        ),
+                      );


The system Java card is missing the visual indication when it's selected. Previously, it would highlight with primaryContainer color when _currentJavaPath == 'java' or _currentJavaPath == null. This visual feedback should be restored to indicate which Java is currently active.

搜索java好像有点问题？

分割符的问题，改了不过还没改完

lib/pages/setting/log_viewer.dart

lib/pages/setting/log_viewer/log_setting.dart

lib/pages/setting/log_viewer.dart

lib/pages/setting/about.dart

Copilot

Pull request overview

Copilot reviewed 7 out of 7 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-21T04:32:13Z

lib/pages/setting/log_viewer.dart

+                    return Text('加载失败：${snapshot.error}');
+                  }
+
+                  logs = snapshot.data ?? [];


FutureBuilder 的 builder 中直接给状态字段赋值 logs = snapshot.data ?? [] 会在 build 过程中产生副作用，且当前会按 SharedPreferences 追加顺序（旧→新）展示日志；旧实现会 reversed 以便新日志优先。建议把 snapshot.data 先转换成局部 final logs = ...（必要时 .reversed.toList()），并用该局部变量渲染列表/控制按钮启用状态，避免在 build 中修改 State 字段。

Suggested change

logs = snapshot.data ?? [];

final logs = (snapshot.data ?? []).reversed.toList();

我觉得上面是旧的下面是新的更合理点🤔

我觉得上面是旧的下面是新的更合理点🤔

新日志的显示优先级肯定是比旧日志高的,新→旧明显更合理

我觉得上面是旧的下面是新的更合理点🤔

新日志的显示优先级肯定是比旧日志高的,新→旧明显更合理

我觉得应该是和控制台一样，新的在下，自动滚动我觉得可以搞个设置

实现起来比较麻烦,必要性不高,直接新的在前就行了

Copilot · 2026-02-21T04:32:13Z

lib/function/java/java_manager.dart

+    // 去重返回
+    return result.toSet().toList();


searchPotentialJavaExecutables() currently returns result.toSet().toList() for deduplication, but JavaRuntime does not override ==/hashCode (identity equality only). This means duplicates will not actually be removed (and order may be unstable). Consider deduping by executable (as之前的 Map 实现) or implement value equality/hashCode in JavaRuntime based on executable (and possibly info.version/isJdk).

Suggested change

// 去重返回

return result.toSet().toList();

// 去重返回（按 executable 路径去重）

final Map<String, JavaRuntime> uniqueByExecutable = {};

for (final runtime in result) {

// 后出现的同一路径会覆盖先前的，确保最终列表中每个 executable 唯一

uniqueByExecutable[runtime.executable] = runtime;

}

return uniqueByExecutable.values.toList();

lib/pages/setting/java.dart

Copilot · 2026-02-21T04:32:14Z

lib/pages/setting/java.dart

+            child: Text(
+              '设备上的Java列表',
+              style: Theme.of(context).textTheme.headlineMedium,


Java 页面原先 AppBar 上有“刷新”按钮，当前重构后 _refresh() 只在 initState() 调用一次，UI 上不再提供重新扫描/刷新 Java 列表的入口。这会导致用户安装/移除 Java 后只能重启应用才能更新列表。建议在标题区域增加一个刷新 IconButton（类似 LogViewer 的刷新），或提供下拉刷新等触发方式来调用 _refresh()。

Suggested change

child: Text(

'设备上的Java列表',

style: Theme.of(context).textTheme.headlineMedium,

child: Row(

mainAxisAlignment: MainAxisAlignment.spaceBetween,

children: [

Text(

'设备上的Java列表',

style: Theme.of(context).textTheme.headlineMedium,

),

IconButton(

icon: const Icon(Icons.refresh),

tooltip: '刷新',

onPressed: _refresh,

),

],

这一块可能会重写

futurw4v · 2026-02-21T04:36:55Z

啊我还没改好搜索java的（
我想的是遍历
但是每次启动都遍历有点吃性能

lxdklp · 2026-02-21T11:57:05Z

啊我还没改好搜索java的（
我想的是遍历
但是每次启动都遍历有点吃性能

搜索Java应该是只打开设置Java的页面才会去搜索吧，我原本的Java搜索是参考hmcl写的

futurw4v · 2026-02-22T02:38:34Z

最近没什么时间摸电脑T_T 所以这个可能会拖比较久

lxdklp · 2026-02-23T09:32:38Z

最近没什么时间摸电脑T_T 所以这个可能会拖比较久

没事，我最近也没啥空，甚至今年上半年因为实习之类的都没啥空，不出意外今年上半年最多只能再发一个版：（

将系统默认Java的标记从 'java' 改为 'default'（可能会有兼容问题）

futurw4v added 13 commits February 19, 2026 20:11

feat: 重构SettingPage的排版

382fd0a

chore(setting_page): 将“下载”改为“设置”

483edf6

feat: 重构ThemePage

429af46

feat: 重构JavaPage

a285078

feat: 使设置页面的标题对齐设置

0131ba9

refactor(JavaPage): 清理代码，优化代码结构和命名

4599aff

refactor: 用FutureBuilder重构LogViewerPage

cbc3262

refactor(LogViewerPage): 引入DateFormat格式化时间，重新设置代码格式

91eaddf

feat(LogViewerPage): 将标题行按钮组右对齐，更改卡片样式，添加视觉细节

a88c1df

refactor(about): 整理代码格式

59f0d80

feat(about): 更换卡片样式，更新版权年份

1f96374

feat(log_setting): 更换卡片样式，优化间距

2ac4ee7

fix: 移除多余括号，修复编译错误

e7cc7a8

dvdamghier requested a review from Copilot February 19, 2026 15:45

Copilot started reviewing on behalf of dvdamghier February 19, 2026 15:46 View session

Copilot AI reviewed Feb 19, 2026

View reviewed changes

futurw4v added 5 commits February 20, 2026 14:48

refactor: 用kDefaultPadding替换相应常量

cc52a69

feat(log_viewer): 为显示日志等级的容器添加内边距

04a4b1f

perf: 添加const标识符

cc8a470

fix(log_viewer): 清除日志后重新加载列表

eef4d74

fix(java_manager): 使用正确的PATH分隔符扫描Java可执行文件

79c4ce4

futurw4v force-pushed the feature/setting_page branch from 6724292 to fba6d2b Compare February 20, 2026 15:54

refactor(java_manager): 整理代码，提取与JavaPage相同的部分

29d0380

futurw4v force-pushed the feature/setting_page branch from fba6d2b to 29d0380 Compare February 20, 2026 15:54

dvdamghier requested a review from Copilot February 21, 2026 04:27

Copilot started reviewing on behalf of dvdamghier February 21, 2026 04:28 View session

Copilot AI reviewed Feb 21, 2026

View reviewed changes

feat(java.dart): 优化Java卡片视觉，优化代码

19c3567

将系统默认Java的标记从 'java' 改为 'default'（可能会有兼容问题）

	logs = snapshot.data ?? [];
	final logs = (snapshot.data ?? []).reversed.toList();

-    // 去重返回
-    return result.toSet().toList();
+    // 去重返回（按 executable 路径去重）
+    final Map<String, JavaRuntime> uniqueByExecutable = {};
+    for (final runtime in result) {
+      // 后出现的同一路径会覆盖先前的，确保最终列表中每个 executable 唯一
+      uniqueByExecutable[runtime.executable] = runtime;
+    }
+    return uniqueByExecutable.values.toList();

Conversation

futurw4v commented Feb 19, 2026

Uh oh!

futurw4v commented Feb 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

futurw4v Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

futurw4v Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Feb 21, 2026

Choose a reason for hiding this comment

Uh oh!

futurw4v Feb 21, 2026

Choose a reason for hiding this comment

Uh oh!

lxdklp Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

futurw4v Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

lxdklp Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 21, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Feb 21, 2026

Choose a reason for hiding this comment

Uh oh!

futurw4v Feb 21, 2026

Choose a reason for hiding this comment

Uh oh!

futurw4v commented Feb 21, 2026

Uh oh!

lxdklp commented Feb 21, 2026

Uh oh!

futurw4v commented Feb 22, 2026

Uh oh!

lxdklp commented Feb 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

futurw4v commented Feb 19, 2026 •

edited

Loading