diff --git a/CHANGELOG.md b/CHANGELOG.md index 331d324..14664b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - 添加了调试页面 - 添加了个性化FSRS预设页面 [#26](https://github.com/OctagonalStar/arabic_learning/issues/26) - 添加了安卓通知功能 [#24](https://github.com/OctagonalStar/arabic_learning/issues/24) +- 添加了题型可拖动提示 [#43](https://github.com/OctagonalStar/arabic_learning/issues/43) ### Improvement @@ -17,6 +18,7 @@ - 优化连胜逻辑: FSRS复习也计算为连胜 - 调整了部分按钮的UI设计 - 去除了查看详解时,单词卡片的高斯模糊 +- 按照FSRS学习单词计算总学习单词[#45](https://github.com/OctagonalStar/arabic_learning/issues/45) ### Fix @@ -24,6 +26,7 @@ - 修复了日志中FSRS信息输出错误的问题 - 修复了新用户无法进入的问题 - 修复了FSRS复习界面中,“下一题”动画期间文字溢出的问题 +- 修复了固定列数文本溢出的问题[#44](https://github.com/OctagonalStar/arabic_learning/issues/44) ### Delete diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart index c0974ce..0ce56ed 100644 --- a/lib/pages/home_page.dart +++ b/lib/pages/home_page.dart @@ -78,7 +78,7 @@ class HomePage extends StatelessWidget { children: [ Text('已学词汇', style: TextStyle(fontSize: 12.0)), SizedBox(height: mediaQuery.size.height * 0.03), - Text(context.read().globalConfig.learning.knownWords.length.toString(), style: TextStyle(fontSize: 24.0, fontWeight: FontWeight.bold)), + Text(fsrs.config.enabled ? fsrs.config.cards.length.toString() : "未启用" , style: TextStyle(fontSize: 24.0, fontWeight: FontWeight.bold)), ], ), ), diff --git a/lib/sub_pages_builder/learning_pages/learning_pages_build.dart b/lib/sub_pages_builder/learning_pages/learning_pages_build.dart index 8cd205c..45e9d8a 100644 --- a/lib/sub_pages_builder/learning_pages/learning_pages_build.dart +++ b/lib/sub_pages_builder/learning_pages/learning_pages_build.dart @@ -607,7 +607,7 @@ class _WordCardOverViewPage extends State { children: [ StatefulBuilder( builder: (context, setLocalState) { - return Row( + return Column( mainAxisSize: MainAxisSize.min, children: [ Text("设置固定列数"), @@ -625,7 +625,7 @@ class _WordCardOverViewPage extends State { context.read().uiLogger.info("设置固定列数为$value"); }, ), - SizedBox(width: 60, child: Text(forceColumn == 0 ? "0(自动)" : forceColumn.toString())) + Text(forceColumn == 0 ? "0(自动)" : forceColumn.toString()) ], ); } diff --git a/lib/sub_pages_builder/setting_pages/questions_setting_page.dart b/lib/sub_pages_builder/setting_pages/questions_setting_page.dart index cc67f3d..dca4f53 100644 --- a/lib/sub_pages_builder/setting_pages/questions_setting_page.dart +++ b/lib/sub_pages_builder/setting_pages/questions_setting_page.dart @@ -131,6 +131,7 @@ class _QuestionsSettingPage extends State { appBar: AppBar(title: Text("题型配置: ${widget.sectionKey}")), body: Column( children: [ + if(!context.read().isWideScreen) TextContainer(text: "长按可拖动排序", style: TextStyle(color: Colors.grey)), Expanded( child: ReorderableListView( onReorder: (oldIndex, newIndex) { diff --git a/lib/vars/config_structure.dart b/lib/vars/config_structure.dart index f270435..7cccbf4 100644 --- a/lib/vars/config_structure.dart +++ b/lib/vars/config_structure.dart @@ -300,24 +300,17 @@ class LearningConfig { /// 连续学习最后有记录的日期(相较于2025/11/1) final int lastDate; - /// 已经学习的单词 - /// 内部int为单词ID - final List knownWords; - const LearningConfig({ int? startDate, int? lastDate, - List? knownWords }): startDate = startDate??0, - lastDate = lastDate??0, - knownWords = knownWords??const []; + lastDate = lastDate??0; Map toMap(){ return { "startDate": startDate, "lastDate": lastDate, - "KnownWords": knownWords, }; } @@ -326,7 +319,6 @@ class LearningConfig { return LearningConfig( startDate: setting["startDate"], lastDate: setting["lastDate"], - knownWords: setting["knownWords"] ); } @@ -338,7 +330,6 @@ class LearningConfig { return LearningConfig( startDate: startDate ?? this.startDate, lastDate: lastDate ?? this.lastDate, - knownWords: knownWords ?? this.knownWords, ); } }