Merge pull request #22 from OctagonalStar/dev

v0.1.10 release tag

Author: OctagonalStar

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## DEVELOPING VERSION - ????-??-?? - (000110)
+## v0.1.10 - 2025-11-28 - (000110)
 
 ### Added
 
@@ -9,6 +9,8 @@
 - 添加了题目配置
 - 添加了单词卡片题型
 - 添加了拼写题型
+- 添加了单词总览
+- 添加了WebDav数据备份/恢复功能
 
 ### Improvement
 
@@ -17,13 +19,16 @@
 - 优化了软件打开逻辑
 - 去除了HTTP依赖项
 - 重构了InLearning加载
+- 优化了主页面UI
+- 优化了听写界面UI
 
 ### FIX
 
 - 修复了FSRS页面中可能测试单词混乱的问题
 - 修复了连胜天数显示
 - 修复了激活彩蛋后更换主题时屏幕闪烁的问题
 - 修复了每日单词重构后出现的卡死问题
+- 修复了题目数量异常的问题
 
 ## v0.1.9 - 2025-11-9 - (000109)
 

lib/funcs/fsrs_func.dart

@@ -12,7 +12,7 @@ class FSRS {
 
   // index != cardId; cardId = wordId = the index of word in global.wordData[words]
 
-  Future<void> init() async {
+  Future<bool> init() async {
     prefs = await SharedPreferences.getInstance();
     if(!prefs.containsKey("fsrsData")) {
       settingData = {
@@ -23,7 +23,7 @@ class FSRS {
         'rater': {'scheme': 0},
       };
       prefs.setString("fsrsData", jsonEncode(settingData));
-      return;
+      return false;
     }
     settingData = jsonDecode(prefs.getString("fsrsData")!) as Map<String, dynamic>;
     if(isEnabled()){
@@ -33,7 +33,9 @@ class FSRS {
         reviewLogs.add(ReviewLog.fromMap(settingData['reviewLog'][i]));
       }
       rater = Rater(settingData['rater']['scheme']);
+      return true;
     }
+    return false;
   }
 
   void save() async {

lib/main.dart

@@ -5,7 +5,6 @@ import 'package:arabic_learning/vars/license_storage.dart';
 import 'package:arabic_learning/vars/statics_var.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:convex_bottom_bar/convex_bottom_bar.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_markdown_plus/flutter_markdown_plus.dart';
 import 'package:window_manager/window_manager.dart';
@@ -86,9 +85,9 @@ class MyHomePage extends StatefulWidget {
 
 class _MyHomePageState extends State<MyHomePage> {
   late List<Widget> _pageList;
-  int currentIndex = 0;
+  int currentIndex = 1;
   bool onSlip = false;
-  final PageController _pageController = PageController();
+  final PageController _pageController = PageController(initialPage: 1);
   static const Duration _duration = Duration(milliseconds: 500);
   bool disPlayedFirst = false;
 
@@ -110,26 +109,21 @@ class _MyHomePageState extends State<MyHomePage> {
           labelType: NavigationRailLabelType.selected,
           backgroundColor: Theme.of(context).colorScheme.onPrimary.withAlpha(150),
           destinations: const [
-            NavigationRailDestination(
-              icon: Icon(Icons.home_outlined),
-              selectedIcon: Icon(Icons.home),
-              label: Text('主页'),
-            ),
             NavigationRailDestination(
               icon: Icon(Icons.book_outlined),
               selectedIcon: Icon(Icons.book),
               label: Text('学习'),
             ),
+            NavigationRailDestination(
+              icon: Icon(Icons.home_outlined),
+              selectedIcon: Icon(Icons.home),
+              label: Text('主页'),
+            ),
             NavigationRailDestination(
               icon: Icon(Icons.edit_outlined),
               selectedIcon: Icon(Icons.edit),
               label: Text('测试'),
             ),
-            NavigationRailDestination(
-              icon: Icon(Icons.settings_outlined),
-              selectedIcon: Icon(Icons.settings),
-              label: Text('设置'),
-            ),
           ],
         ),
         // 垂直分隔线
@@ -172,20 +166,33 @@ class _MyHomePageState extends State<MyHomePage> {
           ),
         ),
         // 底部导航栏
-        ConvexAppBar(
-          key: ValueKey<int>(currentIndex),
-          curve: StaticsVar.curve,
-          style: TabStyle.flip,
-          backgroundColor: Theme.of(context).colorScheme.primary.withAlpha(150),
-          items: const [
-            TabItem(icon: Icons.home_outlined, title: '主页', activeIcon: Icons.home_filled),
-            TabItem(icon: Icons.book_outlined, title: '学习', activeIcon: Icons.book),
-            TabItem(icon: Icons.edit_outlined, title: '测试', activeIcon: Icons.edit),
-            TabItem(icon: Icons.settings_outlined, title: '设置', activeIcon: Icons.settings),
-          ],
-          initialActiveIndex: currentIndex,
-          onTap: _onNavigationTapped,
-        ),
+        NavigationBar(
+          selectedIndex: currentIndex,
+          onDestinationSelected: (int index) {
+            _onNavigationTapped(index);
+          },
+          height: MediaQuery.of(context).size.height * 0.1,
+          animationDuration: Duration(milliseconds: 500),
+          labelBehavior: NavigationDestinationLabelBehavior.onlyShowSelected,
+          backgroundColor: Theme.of(context).colorScheme.onPrimary.withAlpha(150),
+          destinations: const [
+            NavigationDestination(
+              icon: Icon(Icons.book_outlined),
+              selectedIcon: Icon(Icons.book),
+              label: '学习',
+            ),
+            NavigationDestination(
+              icon: Icon(Icons.home_outlined),
+              selectedIcon: Icon(Icons.home),
+              label: '主页',
+            ),
+            NavigationDestination(
+              icon: Icon(Icons.edit_outlined),
+              selectedIcon: Icon(Icons.edit),
+              label: '测试',
+            ),
+          ]
+        )
       ],
     );
   }
@@ -213,7 +220,6 @@ class _MyHomePageState extends State<MyHomePage> {
     if(gob.firstStart) {
       return Scaffold(
         body: PopScope(
-          canPop: false,
           child: Column(
             children: [
               Expanded(
@@ -278,35 +284,31 @@ class _MyHomePageState extends State<MyHomePage> {
       );
     }
     _pageList = [
-      HomePage(toPage: (index) {
-        _pageController.animateToPage(
-          index,
-          duration: _duration,
-          curve: StaticsVar.curve,
-        );
-        setState(() {
-          currentIndex = index;
-        });
-      }),
       LearningPage(),
-      TestPage(),
-      SettingPage(),
+      HomePage(),
+      TestPage()
     ];
     return Scaffold(
       backgroundColor: context.read<Global>().settingData["eggs"]["stella"] ? Colors.transparent : null,
       appBar: AppBar(
         centerTitle: true,
         backgroundColor: Theme.of(context).colorScheme.inversePrimary.withAlpha(150),
         title: Text(widget.title),
-        actions: kIsWeb && !gob.settingData['regular']['hideAppDownloadButton'] ?  [
-          ElevatedButton.icon(
+        actions: [
+          if(kIsWeb && !gob.settingData['regular']['hideAppDownloadButton']) ElevatedButton.icon(
             icon: Icon(Icons.add_to_home_screen),
             label: Text('下载APP版本'),
             onPressed: () {
               launchUrl(Uri.parse("https://github.com/OctagonalStar/arabic_learning/releases/latest"));
             }
+          ),
+          IconButton(
+            onPressed: () {
+              Navigator.of(context).push(MaterialPageRoute(builder: (context) => SettingPage()));
+            }, 
+            icon: Icon(Icons.settings)
           )
-        ] : [],
+        ],
       ),
       body: LayoutBuilder(
         builder: (context, constraints) {