Skip to content

few ui improve #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OctagonalStar merged 2 commits into from
Feb 23, 2026
Merged

few ui improve #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bffcabc
fix: fix wordcard text overflow
OctagonalStar Feb 23, 2026
009de98
feat: correct sync loading circle size
OctagonalStar Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lib/funcs/ui.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,33 +512,33 @@ class WordCard extends StatelessWidget {
color: Theme.of(context).colorScheme.onInverseSurface.withAlpha(150),
borderRadius: BorderRadius.vertical(bottom: Radius.circular(25.0)),
),
child: ListView(
child: Column(
children: [
Row(
children: [
Container(
height: useHeight*0.16,
height: useHeight*0.14,
width: useWidth*0.2,
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.onSecondary.withAlpha(150),
),
child: Center(child: Text("中文", style: TextStyle(fontSize: 18),)),
child: Center(child: Text("中文", style: TextStyle(fontSize: 16),)),
),
Expanded(child: Text(word.chinese, style: TextStyle(fontSize: 24), textAlign: TextAlign.center))
Expanded(child: FittedBox(fit: BoxFit.scaleDown, child: Text(word.chinese, style: TextStyle(fontSize: 24))))
],
),
Divider(height: 0),
Row(
children: [
Container(
height: useHeight*0.3,
height: useHeight*0.32,
width: useWidth*0.2,
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.onPrimary.withAlpha(150),
),
child: Center(child: Text("解释", style: TextStyle(fontSize: 18),)),
child: Center(child: Text("解释", style: TextStyle(fontSize: 18))),
),
Expanded(child: Text(word.explanation, style: TextStyle(fontSize: 18), textAlign: TextAlign.center))
Expanded(child: Text(word.explanation, style: TextStyle(fontSize: 16), textAlign: TextAlign.center, maxLines: 3))
],
),
Divider(height: 0),
Expand All @@ -551,7 +551,7 @@ class WordCard extends StatelessWidget {
color: Theme.of(context).colorScheme.onSecondary.withAlpha(150),
borderRadius: BorderRadius.only(bottomLeft: Radius.circular(25.0))
),
child: Center(child: Text("归属课程", style: TextStyle(fontSize: 16),)),
child: FittedBox(fit: BoxFit.scaleDown, child: Text("归属课程", style: TextStyle(fontSize: 16))),
),
Expanded(child: Text(word.className, style: TextStyle(fontSize: 18), textAlign: TextAlign.center))
],
Expand Down
4 changes: 2 additions & 2 deletions lib/sub_pages_builder/setting_pages/sync_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ class _DataSyncPage extends State<DataSyncPage> {
return Row(
children: [
Icon(Icons.circle, color: Colors.redAccent, size: 18),
Text("在测试中遇到了未知的异常", style: TextStyle(fontSize: 8))
Text("在测试中遇到了未知的异常", style: Theme.of(context).textTheme.labelSmall)
],
);
}
if(snapshot.connectionState == ConnectionState.waiting) {
return CircularProgressIndicator();
return CircularProgressIndicator(constraints: BoxConstraints(minHeight: 18, minWidth: 18), strokeWidth: 2);
}
if(snapshot.hasData) {
return Row(
Expand Down
12 changes: 6 additions & 6 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,26 +1001,26 @@ packages:
dependency: transitive
description:
name: test
sha256: "77cc98ea27006c84e71a7356cf3daf9ddbde2d91d84f77dbfe64cf0e4d9611ae"
sha256: "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a"
url: "https://pub.dev"
source: hosted
version: "1.28.0"
version: "1.29.0"
test_api:
dependency: transitive
description:
name: test_api
sha256: "19a78f63e83d3a61f00826d09bc2f60e191bf3504183c001262be6ac75589fb8"
sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
url: "https://pub.dev"
source: hosted
version: "0.7.8"
version: "0.7.9"
test_core:
dependency: transitive
description:
name: test_core
sha256: f1072617a6657e5fc09662e721307f7fb009b4ed89b19f47175d11d5254a62d4
sha256: "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943"
url: "https://pub.dev"
source: hosted
version: "0.6.14"
version: "0.6.15"
timezone:
dependency: transitive
description:
Expand Down