Merge pull request #39 from OctagonalStar/dev

small fixes

Author: OctagonalStar

CHANGELOG.md

@@ -14,12 +14,16 @@
 - 优化了网页端字体加载逻辑
 - 重构了Config数据结构 [#27](https://github.com/OctagonalStar/arabic_learning/issues/27)
 - 重构了软件运行时数据结构 [#16](https://github.com/OctagonalStar/arabic_learning/issues/16)
+- 优化连胜逻辑: FSRS复习也计算为连胜
+- 调整了部分按钮的UI设计
+- 去除了查看详解时，单词卡片的高斯模糊
 
 ### Fix
 
 - 修复了FSRS算法对已经过期的单词无法计数的问题
 - 修复了日志中FSRS信息输出错误的问题
 - 修复了新用户无法进入的问题
+- 修复了FSRS复习界面中，“下一题”动画期间文字溢出的问题
 
 ## v0.1.11 - 2025-11-28 - (000111)
 

ios/Runner/AppDelegate.swift

@@ -7,9 +7,6 @@ import UIKit
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-    if #available(iOS 10.0, *) {
-      UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate
-    }
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }

lib/funcs/ui.dart

@@ -210,14 +210,14 @@ void viewAnswer(BuildContext context, WordItem wordData) async {
     enableDrag: true,
     builder: (context) {
       return Container(
-        padding: EdgeInsets.only(top: mediaQuery.size.height * 0.05),
         decoration: BoxDecoration(
           color: Theme.of(context).colorScheme.onPrimary,
           borderRadius: StaticsVar.br,
         ),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
-            Expanded(child: WordCard(word: wordData)),
+            WordCard(word: wordData, useMask: false),
             ElevatedButton(
               onPressed: () {Navigator.pop(context);}, 
               style: ElevatedButton.styleFrom(

lib/funcs/utili.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'package:arabic_learning/vars/config_structure.dart';
 import 'package:archive/archive.dart';
 import 'package:flutter_tts/flutter_tts.dart';
+import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart' as path_provider;
 import 'package:arabic_learning/package_replacement/fake_dart_io.dart' if (dart.library.io) 'dart:io' as io;
 import 'package:arabic_learning/package_replacement/fake_sherpa_onnx.dart' if (dart.library.io) 'package:sherpa_onnx/sherpa_onnx.dart' as sherpa_onnx;
@@ -263,6 +264,7 @@ class _RootPattern {
   /// 该模式对应的词性
   final ArabicPOS pos;
 
+  // ignore: unused_element_parameter
   _RootPattern(this.name, String pattern, this.pos, {this.groups = const [1, 2, 3]})
       : regex = RegExp(pattern);
 }
@@ -392,8 +394,11 @@ class ArabicStemmer {
     if (s.length > 3 && (s.startsWith('و') || s.startsWith('ف'))) s = s.substring(1);
 
     if (s.length > 4) {
-       if (s.endsWith('ات') || s.endsWith('ون') || s.endsWith('ين')) s = s.substring(0, s.length - 2);
-       else if (s.endsWith('ي')) s = s.substring(0, s.length - 1);
+      if (s.endsWith('ات') || s.endsWith('ون') || s.endsWith('ين')) {
+        s = s.substring(0, s.length - 2);
+      } else if (s.endsWith('ي')) {
+        s = s.substring(0, s.length - 1);
+      }
        // 注意：这里去掉了对 'ه' (Ha) 的移除，因为我们不再把 'ة' 转为 'ه'
        // 如果 'ه' 是原生字母或代词后缀，仍需小心
     }
@@ -520,26 +525,25 @@ class VocabularyOptimizer {
 
 /// 1. 初始化: BKSearch.init(['ktb', 'maktaba', ...]);
 /// 2. 搜索: var results = BKSearch.search('kitab');
+@immutable
 class BKSearch {
   // 私有构造函数，防止外部实例化
-  BKSearch._();
+  const BKSearch._();
 
   // 单例实例
   static final VocabularyOptimizer _optimizer = VocabularyOptimizer();
   static bool _isInitialized = false;
 
+  static final Logger logger = Logger("BKTree");
+
   /// [必须调用] 初始化搜索引擎
   /// 通常在 App 启动或加载词库时调用
   static void init(List<String> allWords) {
     if (_isInitialized) return; // 避免重复初始化
-    print("正在构建 BK-Tree 搜索索引，词库大小: ${allWords.length}...");
-    final stopwatch = Stopwatch()..start();
-    
+    logger.info("正在构建 BK-Tree 搜索索引，词库大小: ${allWords.length}...");
     _optimizer.build(allWords);
-    
-    stopwatch.stop();
     _isInitialized = true;
-    print("BK-Tree 索引构建完成，耗时: ${stopwatch.elapsedMilliseconds}ms");
+    logger.info("BK-Tree 索引构建完成");
   }
 
   /// 普通搜索: 返回所有相似词列表

lib/pages/learning_page.dart

@@ -50,7 +50,7 @@ class LearningPage extends StatelessWidget {
               ),
               Column(
                 children: [
-                  ElevatedButton.icon(
+                  ElevatedButton(
                     style: ElevatedButton.styleFrom(
                       backgroundColor: Theme.of(context).colorScheme.secondaryContainer.withAlpha(150),
                       foregroundColor: Theme.of(context).colorScheme.onSurface.withAlpha(150),
@@ -61,11 +61,10 @@ class LearningPage extends StatelessWidget {
                     onPressed: () {
                       shiftToStudy(context, 2);
                     }, 
-                    icon: Icon(Icons.arrow_back, size: 24.0),
-                    label: FittedBox(fit: BoxFit.fitWidth ,child: Text("阿译中专项", style: TextStyle(fontSize: 32.0))),
+                    child: FittedBox(fit: BoxFit.fitWidth ,child: Text("阿译中专项", style: TextStyle(fontSize: 32.0))),
                   ),
                   SizedBox(height: mediaQuery.size.height * 0.005),
-                  ElevatedButton.icon(
+                  ElevatedButton(
                     style: ElevatedButton.styleFrom(
                       backgroundColor: Theme.of(context).colorScheme.secondaryContainer.withAlpha(150),
                       foregroundColor: Theme.of(context).colorScheme.onSurface.withAlpha(150),
@@ -76,8 +75,7 @@ class LearningPage extends StatelessWidget {
                     onPressed: () {
                       shiftToStudy(context, 1);
                     }, 
-                    icon: Icon(Icons.arrow_forward, size: 24.0),
-                    label: FittedBox(fit: BoxFit.fitWidth ,child: Text("中译阿专项", style: TextStyle(fontSize: 32.0))),
+                    child: FittedBox(fit: BoxFit.fitWidth ,child: Text("中译阿专项", style: TextStyle(fontSize: 32.0))),
                   ),
                 ],
               ),
@@ -87,7 +85,7 @@ class LearningPage extends StatelessWidget {
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceEvenly,
             children: [
-              ElevatedButton.icon(
+              ElevatedButton(
                 style: ElevatedButton.styleFrom(
                   backgroundColor: Theme.of(context).colorScheme.onPrimary.withAlpha(150),
                   shadowColor: Colors.transparent,
@@ -105,8 +103,15 @@ class LearningPage extends StatelessWidget {
                     )
                   );
                 },
-                icon: Icon(Icons.history_edu, size: 24.0),
-                label: FittedBox(fit: BoxFit.fitWidth ,child: Text("规律性学习", style: TextStyle(fontSize: 32.0))),
+                child: FittedBox(
+                  fit: BoxFit.contain,
+                  child: Column(
+                    children: [
+                      Icon(Icons.history_edu, size: 24.0),
+                      Text("规律性学习", style: TextStyle(fontSize: 32.0)),
+                    ],
+                  )
+                ),
               ),
               ElevatedButton(
                 style: ElevatedButton.styleFrom(
@@ -160,7 +165,7 @@ Future<void> shiftToStudy(BuildContext context, int studyType) async {
   if(!context.mounted) return;
   context.read<Global>().uiLogger.info("返回完成情况: $finished");
   if(finished??false) {
-    context.read<Global>().saveLearningProgress(words);
+    context.read<Global>().updateLearningStreak();
   }
 }
 

lib/sub_pages_builder/learning_pages/fsrs_pages.dart

@@ -269,6 +269,7 @@ class _FSRSReviewCardPage extends State<FSRSReviewCardPage> {
           });
           if(correct == value) {
             widget.fsrs.reviewCard(widget.wordID, DateTime.now().difference(start).inMilliseconds, true);
+            context.read<Global>().updateLearningStreak();
             return true;
           } else {
             widget.fsrs.reviewCard(widget.wordID, DateTime.now().difference(start).inMilliseconds, false);
@@ -310,7 +311,7 @@ class _FSRSReviewCardPage extends State<FSRSReviewCardPage> {
                     widget.controller.nextPage(duration: Duration(milliseconds: 500), curve: StaticsVar.curve);
                   },
                   icon: Icon(Icons.arrow_downward),
-                  label: Text("下一题"),
+                  label: FittedBox(fit: BoxFit.contain, child: Text("下一题")),
                 )
               ],
             );

lib/vars/global.dart

@@ -270,11 +270,11 @@ class Global with ChangeNotifier {
     notifyListeners();
   }
 
-  void saveLearningProgress(List<WordItem> words){
-    logger.info("保存学习进度中");
-    // 以 2025/11/1 为基准计算天数（因为这个bug是这天修的:} ）
+  void updateLearningStreak(){
     final int nowDate = DateTime.now().difference(DateTime(2025, 11, 1)).inDays;
     if (nowDate == globalConfig.learning.lastDate) return;
+    logger.info("保存学习进度中");
+    // 以 2025/11/1 为基准计算天数（因为这个bug是这天修的:} ）
     if (nowDate - globalConfig.learning.lastDate > 1) {
       globalConfig = globalConfig.copyWith(learning: globalConfig.learning.copyWith(startDate: nowDate));
     }