Merge pull request '1.1.0:版本号同步,关于页补 Git 服务与感谢(itxiaohui)' (#19) from sync/1.1.0-about into main

Reviewed-on: #19
This commit was merged in pull request #19.
This commit is contained in:
xhgit committed 2026-11-18 15:13:00 +00:00
commit a5fcaeb658
7 files changed
+161 -48

No files matched your search

+10
View File
@@ -138,6 +138,11 @@ class I18n {
'about.architectureValue': 'Flutter 前端 + .NET 后端(本地 HTTP)',
'about.sourceLanguage': '源码语言',
'about.frontend': '前端',
'about.gitService': 'Git 服务',
'about.thanks': '感谢',
'about.thanksHint': '特别感谢以下朋友的支持',
'about.thanksGit': 'Git 服务与部署支持',
'about.thanksGeo': '地理学科内容指导',
},
'en': <String, String>{
'app.name': 'Morris GC',
@@ -268,6 +273,11 @@ class I18n {
'about.architectureValue': 'Flutter frontend + .NET backend (local HTTP)',
'about.sourceLanguage': 'Source language',
'about.frontend': 'Frontend',
'about.gitService': 'Git hosting',
'about.thanks': 'Thanks',
'about.thanksHint': 'Special thanks to',
'about.thanksGit': 'Git hosting and deployment',
'about.thanksGeo': 'Geography content guidance',
},
};
+80
View File
@@ -2034,6 +2034,8 @@ class _AboutPageViewState extends State<AboutPageView> {
_versionCard(),
const SizedBox(height: GcSpace.lg),
_contributorsCard(),
const SizedBox(height: GcSpace.lg),
_thanksCard(),
],
],
);
@@ -2136,6 +2138,10 @@ class _AboutPageViewState extends State<AboutPageView> {
label: T('about.frontend'),
value: about?.frontend ?? 'Flutter',
),
GcFieldRow(
label: T('about.gitService'),
value: 'itxiaohui',
),
GcFieldRow(
label: T('set.license'),
value: T('set.licenseValue'),
@@ -2250,4 +2256,78 @@ class _AboutPageViewState extends State<AboutPageView> {
),
);
}
/// 特别感谢:与「开发者」分开列 —— 提供 Git 服务不等于往仓库提交代码,
/// 混进贡献者列表会让提交数失去意义。
Widget _thanksCard() {
return GcCard(
padding: const EdgeInsets.all(GcSpace.xxl),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(
T('about.thanks'),
subtitle: T('about.thanksHint'),
),
const SizedBox(height: GcSpace.lg),
Wrap(
spacing: GcSpace.xl,
runSpacing: GcSpace.md,
children: <Widget>[
_creditTile('地理洪老师', 'about.thanksGeo'),
_creditTile('itxiaohui', 'about.thanksGit'),
],
),
],
),
);
}
Widget _creditTile(String name, String roleKey) {
return SizedBox(
width: 220,
child: Row(
children: <Widget>[
CircleAvatar(
radius: 18,
backgroundColor: GcColors.surfaceAlt,
child: Text(
'◎',
style: TextStyle(fontSize: 14, color: GcColors.accent),
),
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 13,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
Text(
T(roleKey),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 11.5,
height: 1.4,
color: GcColors.faint,
),
),
],
),
),
],
),
);
}
}
+1 -1
View File
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 1.0.0+1
version: 1.1.0+1
environment:
sdk: ^3.5.4
+3
View File
@@ -61,6 +61,9 @@ public static class ContributorsService
["2509_92447106"] = "Morris",
["chenmoyuan1214@qq.com"] = "Morris",
["morris@xhmcl.com"] = "Morris",
// 早期提交用的是 xhgit 这个账号,展示名统一成 itxiaohui
["xhgit"] = "itxiaohui",
["itxiaohui"] = "itxiaohui",
};
/// <summary>自动化提交(CI / 助手账号),不计入开发者。</summary>
+21 -1
View File
@@ -28,7 +28,7 @@
<TextBlock Classes="faint" Text="{Binding PlatformText}" />
</StackPanel>
<Grid ColumnDefinitions="96,*" RowDefinitions="Auto,Auto">
<Grid ColumnDefinitions="96,*" RowDefinitions="Auto,Auto,Auto">
<TextBlock Classes="h3" Text="版本" />
<TextBlock Grid.Column="1" Classes="muted" Text="{Binding VersionText}"
FontWeight="SemiBold" />
@@ -38,6 +38,10 @@
HorizontalAlignment="Left" Padding="0"
Command="{Binding OpenRepositoryCommand}"
Content="{Binding RepositoryText}" />
<TextBlock Grid.Row="2" Classes="h3" Text="Git 服务" Margin="0,8,0,0" />
<TextBlock Grid.Row="2" Grid.Column="1" Classes="muted" Text="itxiaohui"
FontWeight="SemiBold" Margin="0,8,0,0" />
</Grid>
</StackPanel>
</Grid>
@@ -76,6 +80,22 @@
</StackPanel>
</StackPanel>
</Border>
<Border Background="{DynamicResource SurfaceAlt}"
BorderBrush="{DynamicResource Line}" BorderThickness="1"
CornerRadius="12" Padding="12,10" MinWidth="190">
<StackPanel Orientation="Horizontal" Spacing="10">
<Border Width="34" Height="34" CornerRadius="17"
Background="{DynamicResource AccentSoft}">
<TextBlock Text="◉" FontSize="15" Foreground="{DynamicResource Accent}"
HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border>
<StackPanel VerticalAlignment="Center" Spacing="1">
<TextBlock Text="itxiaohui" FontSize="12.5" FontWeight="SemiBold" />
<TextBlock Classes="faint" Text="Git 服务与部署支持" />
</StackPanel>
</StackPanel>
</Border>
</StackPanel>
</StackPanel>
</Border>
+23 -23
View File
@@ -5,42 +5,42 @@
"branch": "main",
"modelDir": "model",
"launcher": {
"version": "1.0.11",
"version": "1.1.0",
"revision": "",
"packages": {
"win-x64": {
"path": "dist/win-amd64/GCL-1.0.11-win-amd64.zip",
"path": "dist/win-amd64/GCL-1.1.0-win-amd64.zip",
"dir": "dist/win-amd64",
"name": "GCL-1.0.11-win-amd64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-win-amd64.zip",
"sha256": "55f1d5eb0dfdfc243656e6705c3d276dd83611561f913fe5ca9e6e5d2f2dd658",
"size": 74973271
"name": "GCL-1.1.0-win-amd64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-win-amd64.zip",
"sha256": "adfdca03bd84ad1a831da4925795dd4ee5b9f79f654a7a8208abcb6f3dbc4f3b",
"size": 74984771
},
"win-arm64": {
"path": "dist/win-arm64/GCL-1.0.11-win-arm64.zip",
"path": "dist/win-arm64/GCL-1.1.0-win-arm64.zip",
"dir": "dist/win-arm64",
"name": "GCL-1.0.11-win-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-win-arm64.zip",
"sha256": "9ce48381fcca18e7d6789364e1c43f7e616ceae529c0c1167b099ed762f5808f",
"size": 72515856
"name": "GCL-1.1.0-win-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-win-arm64.zip",
"sha256": "2ef3f657a4ff61d9cc62100daed8d399ad0635f120c5f38589a4efd3a8e76d9a",
"size": 72527477
},
"osx-arm64": {
"path": "dist/mac-arm64/GCL-1.0.11-mac-arm64.zip",
"path": "dist/mac-arm64/GCL-1.1.0-mac-arm64.zip",
"dir": "dist/mac-arm64",
"name": "GCL-1.0.11-mac-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-mac-arm64.zip"
"name": "GCL-1.1.0-mac-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-mac-arm64.zip"
},
"osx-x64": {
"path": "dist/mac-x64/GCL-1.0.11-mac-x64.zip",
"path": "dist/mac-x64/GCL-1.1.0-mac-x64.zip",
"dir": "dist/mac-x64",
"name": "GCL-1.0.11-mac-x64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-mac-x64.zip"
"name": "GCL-1.1.0-mac-x64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-mac-x64.zip"
},
"linux-arm64": {
"path": "dist/linux-arm64/GCL-1.0.11-linux-arm64.zip",
"path": "dist/linux-arm64/GCL-1.1.0-linux-arm64.zip",
"dir": "dist/linux-arm64",
"name": "GCL-1.0.11-linux-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-linux-arm64.zip"
"name": "GCL-1.1.0-linux-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-linux-arm64.zip"
}
}
},
@@ -94,8 +94,8 @@
"signature": {
"alg": "ECDSA-P256-SHA256",
"keyId": "gc-2026-12",
"value": "6i/y23uDD4qa3docjAeeUIHHEV+hSrEGEV6vxQ54a3tyUzxc5lbxBth15gnmxgac7kL3ULULb3G4dI59R6MHxg==",
"contentSha256": "86290d84dce5ae9619f5f25e7151480d916aab6177449955366f87b74fbce71c",
"signedAt": "2026-11-18T13:06:34Z"
"value": "A/A7GQ2muXgqhtG+HVKkAvs0cAX90TXDgXOtxWCr8VTQW10FPUUroUSdmp4x5FUT7KNnrs1wIoz4/YSJspv9oQ==",
"contentSha256": "84488b35a9f45f44c3b6c21c400f6c0d0a26b5f0f045a696afd889cf5af6f2f1",
"signedAt": "2026-11-18T14:46:36Z"
}
}
+23 -23
View File
@@ -5,42 +5,42 @@
"branch": "main",
"modelDir": "model",
"launcher": {
"version": "1.0.11",
"version": "1.1.0",
"revision": "",
"packages": {
"win-x64": {
"path": "dist/win-amd64/GCL-1.0.11-win-amd64.zip",
"path": "dist/win-amd64/GCL-1.1.0-win-amd64.zip",
"dir": "dist/win-amd64",
"name": "GCL-1.0.11-win-amd64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-win-amd64.zip",
"sha256": "55f1d5eb0dfdfc243656e6705c3d276dd83611561f913fe5ca9e6e5d2f2dd658",
"size": 74973271
"name": "GCL-1.1.0-win-amd64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-win-amd64.zip",
"sha256": "adfdca03bd84ad1a831da4925795dd4ee5b9f79f654a7a8208abcb6f3dbc4f3b",
"size": 74984771
},
"win-arm64": {
"path": "dist/win-arm64/GCL-1.0.11-win-arm64.zip",
"path": "dist/win-arm64/GCL-1.1.0-win-arm64.zip",
"dir": "dist/win-arm64",
"name": "GCL-1.0.11-win-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-win-arm64.zip",
"sha256": "9ce48381fcca18e7d6789364e1c43f7e616ceae529c0c1167b099ed762f5808f",
"size": 72515856
"name": "GCL-1.1.0-win-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-win-arm64.zip",
"sha256": "2ef3f657a4ff61d9cc62100daed8d399ad0635f120c5f38589a4efd3a8e76d9a",
"size": 72527477
},
"osx-arm64": {
"path": "dist/mac-arm64/GCL-1.0.11-mac-arm64.zip",
"path": "dist/mac-arm64/GCL-1.1.0-mac-arm64.zip",
"dir": "dist/mac-arm64",
"name": "GCL-1.0.11-mac-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-mac-arm64.zip"
"name": "GCL-1.1.0-mac-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-mac-arm64.zip"
},
"osx-x64": {
"path": "dist/mac-x64/GCL-1.0.11-mac-x64.zip",
"path": "dist/mac-x64/GCL-1.1.0-mac-x64.zip",
"dir": "dist/mac-x64",
"name": "GCL-1.0.11-mac-x64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-mac-x64.zip"
"name": "GCL-1.1.0-mac-x64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-mac-x64.zip"
},
"linux-arm64": {
"path": "dist/linux-arm64/GCL-1.0.11-linux-arm64.zip",
"path": "dist/linux-arm64/GCL-1.1.0-linux-arm64.zip",
"dir": "dist/linux-arm64",
"name": "GCL-1.0.11-linux-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-linux-arm64.zip"
"name": "GCL-1.1.0-linux-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-linux-arm64.zip"
}
}
},
@@ -94,8 +94,8 @@
"signature": {
"alg": "ECDSA-P256-SHA256",
"keyId": "gc-2026-12",
"value": "6i/y23uDD4qa3docjAeeUIHHEV+hSrEGEV6vxQ54a3tyUzxc5lbxBth15gnmxgac7kL3ULULb3G4dI59R6MHxg==",
"contentSha256": "86290d84dce5ae9619f5f25e7151480d916aab6177449955366f87b74fbce71c",
"signedAt": "2026-11-18T13:06:34Z"
"value": "A/A7GQ2muXgqhtG+HVKkAvs0cAX90TXDgXOtxWCr8VTQW10FPUUroUSdmp4x5FUT7KNnrs1wIoz4/YSJspv9oQ==",
"contentSha256": "84488b35a9f45f44c3b6c21c400f6c0d0a26b5f0f045a696afd889cf5af6f2f1",
"signedAt": "2026-11-18T14:46:36Z"
}
}