From 10a24471d6b092ebbed589b925b54d8b2e991b29 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Sun, 30 Jun 2024 20:03:39 +0800
Subject: [PATCH 01/74] =?UTF-8?q?Badge=20=E7=BB=84=E4=BB=B6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=BC=94=E7=A4=BA=E4=BB=A3=E7=A0=81=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_badge_page.dart       | 550 +++++++++++-------
 tdesign-component/example/pubspec.lock        | 194 +++---
 tdesign-component/pubspec.lock                |  56 +-
 3 files changed, 476 insertions(+), 324 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_badge_page.dart b/tdesign-component/example/lib/page/td_badge_page.dart
index c52dd273b..a726ec689 100644
--- a/tdesign-component/example/lib/page/td_badge_page.dart
+++ b/tdesign-component/example/lib/page/td_badge_page.dart
@@ -21,9 +21,123 @@ class _TDBadgePageState extends State<TDBadgePage> {
           ExampleModule(
             title: '组件类型',
             children: [
-              ExampleItem(desc: '红点徽标', builder: _buildRedPointBadge),
-              ExampleItem(desc: '数字徽标', builder: _buildNumberBadge),
-              ExampleItem(desc: '自定义徽标', builder: _buildCustomBadge),
+              ExampleItem(
+                  ignoreCode: true,
+                  desc: '红点徽标',
+                  builder: (context) {
+                    return Container(
+                      alignment: Alignment.topLeft,
+                      padding: const EdgeInsets.only(left: 16),
+                      child: Row(
+                        crossAxisAlignment: CrossAxisAlignment.center, // 垂直方向上末端对齐
+                        children: [
+                            Container(
+                              alignment: Alignment.bottomLeft,
+                              margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                              child: CodeWrapper(
+                                builder: _buildRedPointMessageBadge,
+                                methodName: '_buildRedPointMessageBadge',
+                              ),
+                            ),
+                            Container(
+                              alignment: Alignment.bottomLeft,
+                              margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                              child: CodeWrapper(
+                                builder: _buildRedPointIconBadge,
+                                methodName: '_buildRedPointIconBadge',
+                              ),
+                            ),
+                            Container(
+                              alignment: Alignment.bottomLeft,
+                              margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                              child: CodeWrapper(
+                                builder: _buildRedPointButtonBadge,
+                                methodName: '_buildRedPointButtonBadge',
+                              ),
+                            ),
+
+                        ],
+                      ),
+                    );
+                  }),
+
+              ExampleItem(
+                  ignoreCode: true,
+                  desc: '数字徽标',
+                  builder: (context) {
+                    return Container(
+                      alignment: Alignment.topLeft,
+                      padding: const EdgeInsets.only(left: 16),
+                      child: Row(
+                        crossAxisAlignment: CrossAxisAlignment.center, // 垂直方向上末端对齐
+                        children: [
+                          Container(
+                            alignment: Alignment.bottomLeft,
+                            margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                            child: CodeWrapper(
+                              builder: _buildMessageNumberBadge,
+                              methodName: '_buildMessageNumberBadge',
+                            ),
+                          ),
+                          Container(
+                            alignment: Alignment.bottomLeft,
+                            margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                            child: CodeWrapper(
+                              builder: _buildIconNumberBadge,
+                              methodName: '_buildIconNumberBadge',
+                            ),
+                          ),
+                          Container(
+                            alignment: Alignment.bottomLeft,
+                            margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                            child: CodeWrapper(
+                              builder: _buildButtonNumberBadge,
+                              methodName: '_buildButtonNumberBadge',
+                            ),
+                          ),
+
+                        ],
+                      ),
+                    );
+                  }),
+              ExampleItem(
+                  ignoreCode: true,
+                  desc: '自定义徽标',
+                  builder: (context) {
+                    return Container(
+                      alignment: Alignment.topLeft,
+                      padding: const EdgeInsets.only(left: 16),
+                      child: Row(
+                        crossAxisAlignment: CrossAxisAlignment.center, // 垂直方向上末端对齐
+                        children: [
+                          Container(
+                            alignment: Alignment.bottomLeft,
+                            margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                            child: CodeWrapper(
+                              builder: _buildCustomBadgeShowingNumberEight,
+                              methodName: '_buildCustomBadgeShowingNumberEight',
+                            ),
+                          ),
+                          Container(
+                            alignment: Alignment.bottomLeft,
+                            margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                            child: CodeWrapper(
+                              builder: _buildCustomBadgeShowingNumberZero,
+                              methodName: '_buildCustomBadgeShowingNumberZero',
+                            ),
+                          ),
+                          Container(
+                            alignment: Alignment.bottomLeft,
+                            margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                            child: CodeWrapper(
+                              builder: _buildCustomBadgeWithoutShowingNumberZero,
+                              methodName: '_buildCustomBadgeWithoutShowingNumberZero',
+                            ),
+                          ),
+                        ],
+                      ),
+                    );
+                  }),
             ],
           ),
           ExampleModule(
@@ -46,251 +160,241 @@ class _TDBadgePageState extends State<TDBadgePage> {
   }
 
   @Demo(group: 'badge')
-  Widget _buildRedPointBadge(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 16),
-      child: Row(
+  Widget _buildRedPointMessageBadge(BuildContext context) {
+    return SizedBox(
+      width: 40,
+      height: 24,
+      child: Stack(
+        alignment: Alignment.bottomLeft,
         children: [
-          SizedBox(
-            width: 40,
-            height: 24,
-            child: Stack(
-              alignment: Alignment.bottomLeft,
-              children: [
-                TDText(
-                  '消息',
-                  font: TDTheme.of(context).fontBodyLarge,
-                ),
-                const Positioned(
-                  child: TDBadge(TDBadgeType.redPoint),
-                  right: 0,
-                  top: 0,
-                )
-              ],
-            ),
-          ),
-          const SizedBox(
-            width: 40,
+          TDText(
+            '消息',
+            font: TDTheme.of(context).fontBodyLarge,
           ),
-          SizedBox(
-            width: 27,
-            height: 27,
-            child: Stack(
-              alignment: Alignment.bottomLeft,
-              children: const [
-                Icon(TDIcons.notification),
-                Positioned(
-                  child: TDBadge(TDBadgeType.redPoint),
-                  right: 0,
-                  top: 0,
-                )
-              ],
-            ),
+          const Positioned(
+            child: TDBadge(TDBadgeType.redPoint),
+            right: 0,
+            top: 0,
+          )
+        ],
+      ),
+    );
+  }
+
+  @Demo(group: 'badge')
+  Widget _buildRedPointIconBadge(BuildContext context) {
+    return const SizedBox(
+      width: 27,
+      height: 27,
+      child: Stack(
+        alignment: Alignment.bottomLeft,
+        children: [
+          Icon(TDIcons.notification),
+          Positioned(
+            child: TDBadge(TDBadgeType.redPoint),
+            right: 0,
+            top: 0,
+          )
+        ],
+      ),
+    );
+  }
+
+  @Demo(group: 'badge')
+  Widget _buildRedPointButtonBadge(BuildContext context) {
+    return const SizedBox(
+      width: 83,
+      height: 48,
+      child: Stack(
+        alignment: Alignment.bottomLeft,
+        children: [
+          TDButton(
+            width: 80,
+            height: 48,
+            text: '按钮',
+            size: TDButtonSize.large,
+            type: TDButtonType.fill,
           ),
-          const SizedBox(
-            width: 40,
+          Positioned(
+            child: TDBadge(TDBadgeType.redPoint),
+            right: 0,
+            top: 0,
+          )
+        ],
+      ),
+    );
+  }
+
+  @Demo(group: 'badge')
+  Widget _buildMessageNumberBadge(BuildContext context) {
+    return SizedBox(
+      width: 48,
+      height: 32,
+      child: Stack(
+        alignment: Alignment.bottomLeft,
+        children: [
+          TDText(
+            '消息',
+            font: TDTheme.of(context).fontBodyLarge,
           ),
-          SizedBox(
-            width: 83,
-            height: 51,
-            child: Stack(
-              alignment: Alignment.bottomLeft,
-              children: const [
-                TDButton(
-                  width: 80,
-                  height: 48,
-                  text: '按钮',
-                  size: TDButtonSize.large,
-                  type: TDButtonType.fill,
-                ),
-                Positioned(
-                  child: TDBadge(TDBadgeType.redPoint),
-                  right: 0,
-                  top: 0,
-                )
-              ],
+          const Positioned(
+            child: TDBadge(
+              TDBadgeType.message,
+              count: '8',
             ),
-          ),
+            right: 0,
+            top: 0,
+          )
         ],
       ),
     );
   }
 
   @Demo(group: 'badge')
-  Widget _buildNumberBadge(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 16),
-      child: Row(
+  Widget _buildIconNumberBadge(BuildContext context) {
+    return const SizedBox(
+      width: 34,
+      height: 34,
+      child: Stack(
+        alignment: Alignment.bottomLeft,
         children: [
-          SizedBox(
-            width: 48,
-            height: 32,
-            child: Stack(
-              alignment: Alignment.bottomLeft,
-              children: [
-                TDText(
-                  '消息',
-                  font: TDTheme.of(context).fontBodyLarge,
-                ),
-                const Positioned(
-                  child: TDBadge(
-                    TDBadgeType.message,
-                    count: '8',
-                  ),
-                  right: 0,
-                  top: 0,
-                )
-              ],
+          Icon(TDIcons.notification),
+          Positioned(
+            child: TDBadge(
+              TDBadgeType.message,
+              count: '8',
             ),
+            right: 0,
+            top: 0,
+          )
+        ],
+      ),
+    );
+  }
+
+  @Demo(group: 'badge')
+  Widget _buildButtonNumberBadge(BuildContext context) {
+    return const SizedBox(
+      width: 86,
+      height: 54,
+      child: Stack(
+        alignment: Alignment.bottomLeft,
+        children: [
+          TDButton(
+            width: 80,
+            height: 48,
+            text: '按钮',
+            size: TDButtonSize.large,
           ),
-          const SizedBox(
-            width: 40,
-          ),
-          SizedBox(
-            width: 34,
-            height: 34,
-            child: Stack(
-              alignment: Alignment.bottomLeft,
-              children: const [
-                Icon(TDIcons.notification),
-                Positioned(
-                  child: TDBadge(
-                    TDBadgeType.message,
-                    count: '8',
-                  ),
-                  right: 0,
-                  top: 0,
-                )
-              ],
+          Positioned(
+            child: TDBadge(
+              TDBadgeType.message,
+              count: '8',
             ),
+            right: 0,
+            top: 0,
+          )
+        ],
+      ),
+    );
+  }
+
+  @Demo(group: 'badge')
+  Widget _buildCustomBadgeShowingNumberEight(BuildContext context) {
+    return SizedBox(
+      width: 64,
+      height: 56,
+      child: Stack(
+        alignment: Alignment.bottomLeft,
+        children: [
+          Container(
+            child: const Icon(TDIcons.notification),
+            decoration: BoxDecoration(
+                color: TDTheme.of(context).grayColor2,
+                borderRadius: BorderRadius.circular(
+                    TDTheme.of(context).radiusDefault)),
+            height: 48,
+            width: 48,
           ),
-          const SizedBox(
-            width: 40,
-          ),
-          SizedBox(
-            width: 86,
-            height: 54,
-            child: Stack(
-              alignment: Alignment.bottomLeft,
-              children: const [
-                TDButton(
-                  width: 80,
-                  height: 48,
-                  text: '按钮',
-                  size: TDButtonSize.large,
-                ),
-                Positioned(
-                  child: TDBadge(
-                    TDBadgeType.message,
-                    count: '8',
-                  ),
-                  right: 0,
-                  top: 0,
-                )
-              ],
+          const Positioned(
+            child: TDBadge(
+              TDBadgeType.message,
+              count: '8',
             ),
-          ),
+            right: 0,
+            top: 0,
+          )
         ],
       ),
     );
   }
 
   @Demo(group: 'badge')
-  Widget _buildCustomBadge(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 16),
-      child: Row(
+  Widget _buildCustomBadgeShowingNumberZero(BuildContext context) {
+    return SizedBox(
+      width: 64,
+      height: 56,
+      child: Stack(
+        alignment: Alignment.bottomLeft,
         children: [
-          SizedBox(
-            width: 64,
-            height: 56,
-            child: Stack(
-              alignment: Alignment.bottomLeft,
-              children: [
-                Container(
-                  child: const Icon(TDIcons.notification),
-                  decoration: BoxDecoration(
-                      color: TDTheme.of(context).grayColor2,
-                      borderRadius: BorderRadius.circular(
-                          TDTheme.of(context).radiusDefault)),
-                  height: 48,
-                  width: 48,
-                ),
-                const Positioned(
-                  child: TDBadge(
-                    TDBadgeType.message,
-                    count: '8',
-                  ),
-                  right: 0,
-                  top: 0,
-                )
-              ],
-            ),
+          Container(
+            child: const Icon(TDIcons.notification),
+            decoration: BoxDecoration(
+                color: TDTheme.of(context).grayColor2,
+                borderRadius: BorderRadius.circular(
+                    TDTheme.of(context).radiusDefault)),
+            height: 48,
+            width: 48,
           ),
-          const SizedBox(width: 40),
-          SizedBox(
-            width: 64,
-            height: 56,
-            child: Stack(
-              alignment: Alignment.bottomLeft,
-              children: [
-                Container(
-                  child: const Icon(TDIcons.notification),
-                  decoration: BoxDecoration(
-                      color: TDTheme.of(context).grayColor2,
-                      borderRadius: BorderRadius.circular(
-                          TDTheme.of(context).radiusDefault)),
-                  height: 48,
-                  width: 48,
-                ),
-                const Positioned(
-                  child: TDBadge(
-                    TDBadgeType.message,
-                    count: '0',
-                  ),
-                  right: 0,
-                  top: 0,
-                )
-              ],
+          const Positioned(
+            child: TDBadge(
+              TDBadgeType.message,
+              count: '0',
             ),
+            right: 0,
+            top: 0,
+          )
+        ],
+      ),
+    );
+  }
+
+  @Demo(group: 'badge')
+  Widget _buildCustomBadgeWithoutShowingNumberZero(BuildContext context) {
+    return SizedBox(
+      width: 64,
+      height: 56,
+      child: Stack(
+        alignment: Alignment.bottomLeft,
+        children: [
+          Container(
+            child: const Icon(TDIcons.notification),
+            decoration: BoxDecoration(
+                color: TDTheme.of(context).grayColor2,
+                borderRadius: BorderRadius.circular(
+                    TDTheme.of(context).radiusDefault)),
+            height: 48,
+            width: 48,
           ),
-          const SizedBox(width: 40),
-          SizedBox(
-            width: 64,
-            height: 56,
-            child: Stack(
-              alignment: Alignment.bottomLeft,
-              children: [
-                Container(
-                  child: const Icon(TDIcons.notification),
-                  decoration: BoxDecoration(
-                      color: TDTheme.of(context).grayColor2,
-                      borderRadius: BorderRadius.circular(
-                          TDTheme.of(context).radiusDefault)),
-                  height: 48,
-                  width: 48,
-                ),
-                const Positioned(
-                  child: TDBadge(
-                    TDBadgeType.message,
-                    count: '0',
-                    showZero: false,
-                  ),
-                  right: 0,
-                  top: 0,
-                )
-              ],
+          const Positioned(
+            child: TDBadge(
+              TDBadgeType.message,
+              count: '0',
+              showZero: false,
             ),
-          ),
+            right: 0,
+            top: 0,
+          )
         ],
       ),
     );
   }
 
+
   @Demo(group: 'badge')
   Widget _buildCircleBadge(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 16),
+    return const Padding(
+      padding: EdgeInsets.only(left: 16),
       child: Row(
         children: [
           SizedBox(
@@ -298,7 +402,7 @@ class _TDBadgePageState extends State<TDBadgePage> {
             height: 34,
             child: Stack(
               alignment: Alignment.bottomLeft,
-              children: const [
+              children: [
                 Icon(TDIcons.notification),
                 Positioned(
                   child: TDBadge(
@@ -318,8 +422,8 @@ class _TDBadgePageState extends State<TDBadgePage> {
 
   @Demo(group: 'badge')
   Widget _buildSquareBadge(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 16),
+    return const Padding(
+      padding: EdgeInsets.only(left: 16),
       child: Row(
         children: [
           SizedBox(
@@ -327,7 +431,7 @@ class _TDBadgePageState extends State<TDBadgePage> {
             height: 34,
             child: Stack(
               alignment: Alignment.bottomLeft,
-              children: const [
+              children: [
                 Icon(TDIcons.notification),
                 Positioned(
                   child: TDBadge(
@@ -410,8 +514,8 @@ class _TDBadgePageState extends State<TDBadgePage> {
 
   @Demo(group: 'badge')
   Widget _buildLargeBadge(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 16),
+    return const Padding(
+      padding: EdgeInsets.only(left: 16),
       child: Row(
         children: [
           SizedBox(
@@ -419,7 +523,7 @@ class _TDBadgePageState extends State<TDBadgePage> {
             height: 65.5,
             child: Stack(
               alignment: Alignment.bottomLeft,
-              children: const [
+              children: [
                 TDAvatar(
                   size: TDAvatarSize.large,
                   type: TDAvatarType.icon,
@@ -443,8 +547,8 @@ class _TDBadgePageState extends State<TDBadgePage> {
 
   @Demo(group: 'badge')
   Widget _buildMediumBadge(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 16),
+    return const Padding(
+      padding: EdgeInsets.only(left: 16),
       child: Row(
         children: [
           SizedBox(
@@ -452,7 +556,7 @@ class _TDBadgePageState extends State<TDBadgePage> {
             height: 49.5,
             child: Stack(
               alignment: Alignment.bottomLeft,
-              children: const [
+              children: [
                 TDAvatar(
                   size: TDAvatarSize.medium,
                   type: TDAvatarType.icon,
diff --git a/tdesign-component/example/pubspec.lock b/tdesign-component/example/pubspec.lock
index 80ce68064..056f33c2e 100644
--- a/tdesign-component/example/pubspec.lock
+++ b/tdesign-component/example/pubspec.lock
@@ -6,7 +6,7 @@ packages:
     description:
       name: args
       sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.5.0"
   async:
@@ -14,7 +14,7 @@ packages:
     description:
       name: async
       sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
   boolean_selector:
@@ -22,7 +22,7 @@ packages:
     description:
       name: boolean_selector
       sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
   characters:
@@ -30,7 +30,7 @@ packages:
     description:
       name: characters
       sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
   clock:
@@ -38,41 +38,41 @@ packages:
     description:
       name: clock
       sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
-      url: "https://pub.flutter-io.cn"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.18.0"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
-      url: "https://pub.flutter-io.cn"
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "1.0.8"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
-      url: "https://pub.flutter-io.cn"
+      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -83,7 +83,7 @@ packages:
     description:
       name: flutter_easyrefresh
       sha256: "5d161ee5dcac34da9065116568147d742dd25fb9bff3b10024d9054b195087ad"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.2"
   flutter_lints:
@@ -91,7 +91,7 @@ packages:
     description:
       name: flutter_lints
       sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
   flutter_localizations:
@@ -103,16 +103,16 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      sha256: "21b085a1c185e46701373866144ced56cfb7a0c33f63c916bb8fe2d0c1491278"
-      url: "https://pub.flutter-io.cn"
+      sha256: "04c4722cc36ec5af38acc38ece70d22d3c2123c61305d555750a091517bbe504"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.6.19"
+    version: "0.6.23"
   flutter_swiper_null_safety:
     dependency: "direct main"
     description:
       name: flutter_swiper_null_safety
       sha256: "5a855e0080d035c08e82f8b7fd2f106344943a30c9ab483b2584860a2f22eaaf"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
   flutter_test:
@@ -125,7 +125,7 @@ packages:
     description:
       name: http
       sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.13.6"
   http_parser:
@@ -133,103 +133,119 @@ packages:
     description:
       name: http_parser
       sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
-      url: "https://pub.flutter-io.cn"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.19.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.4"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.18.0"
-  js:
+    version: "3.0.3"
+  leak_tracker_testing:
     dependency: transitive
     description:
-      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
-      url: "https://pub.flutter-io.cn"
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.6.7"
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
       name: lints
       sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
   markdown:
     dependency: transitive
     description:
       name: markdown
-      sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd
-      url: "https://pub.flutter-io.cn"
+      sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051
+      url: "https://pub.dev"
     source: hosted
-    version: "7.1.1"
+    version: "7.2.2"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
-      url: "https://pub.flutter-io.cn"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.15"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
-      url: "https://pub.flutter-io.cn"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
-      url: "https://pub.flutter-io.cn"
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.12.0"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
-      url: "https://pub.flutter-io.cn"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
-      url: "https://pub.flutter-io.cn"
+      sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
-      url: "https://pub.flutter-io.cn"
+      sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a
+      url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.6"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
-      url: "https://pub.flutter-io.cn"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
+      url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
       sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.1"
   path_provider_platform_interface:
@@ -237,7 +253,7 @@ packages:
     description:
       name: path_provider_platform_interface
       sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
   path_provider_windows:
@@ -245,23 +261,23 @@ packages:
     description:
       name: path_provider_windows
       sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.1"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
-      url: "https://pub.flutter-io.cn"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "3.1.5"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
       sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
   sky_engine:
@@ -273,32 +289,32 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
-      url: "https://pub.flutter-io.cn"
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
-      url: "https://pub.flutter-io.cn"
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
-      url: "https://pub.flutter-io.cn"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
   tdesign_flutter:
@@ -313,23 +329,23 @@ packages:
     description:
       name: term_glyph
       sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
-      url: "https://pub.flutter-io.cn"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.7.0"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.2"
   vector_math:
@@ -337,25 +353,33 @@ packages:
     description:
       name: vector_math
       sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.2.1"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
-      url: "https://pub.flutter-io.cn"
+      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
+      url: "https://pub.dev"
     source: hosted
-    version: "5.0.9"
+    version: "5.5.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
       sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
 sdks:
-  dart: ">=3.0.0 <4.0.0"
-  flutter: ">=3.10.0"
+  dart: ">=3.4.0 <4.0.0"
+  flutter: ">=3.22.0"
diff --git a/tdesign-component/pubspec.lock b/tdesign-component/pubspec.lock
index e9ad7d4c4..ae131cffc 100644
--- a/tdesign-component/pubspec.lock
+++ b/tdesign-component/pubspec.lock
@@ -83,6 +83,30 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.4"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -95,34 +119,34 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.12.0"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -172,10 +196,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   vector_math:
     dependency: transitive
     description:
@@ -184,14 +208,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  web:
+  vm_service:
     dependency: transitive
     description:
-      name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      name: vm_service
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "14.2.1"
 sdks:
-  dart: ">=3.2.0-194.0.dev <4.0.0"
-  flutter: ">=3.7.0"
+  dart: ">=3.3.0 <4.0.0"
+  flutter: ">=3.18.0-18.0.pre.54"

From 0e7ffcbb227ca2e52b63ec5c66a7e78e4035e198 Mon Sep 17 00:00:00 2001
From: shinyina <shinyina@foxmail.com>
Date: Mon, 1 Jul 2024 22:56:07 +0800
Subject: [PATCH 02/74] =?UTF-8?q?feat(TDSwitch):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E2=80=9C=E5=BC=80/=E5=85=B3?=
 =?UTF-8?q?=E2=80=9D=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/assets/api/switch_api.md          |  2 +
 .../assets/code/switch._customTextFont.txt    | 14 ++++
 .../example/lib/page/td_switch_page.dart      | 73 ++++++++++++-------
 .../lib/src/components/switch/td_switch.dart  | 54 ++++++++++----
 4 files changed, 99 insertions(+), 44 deletions(-)
 create mode 100644 tdesign-component/example/assets/code/switch._customTextFont.txt

diff --git a/tdesign-component/example/assets/api/switch_api.md b/tdesign-component/example/assets/api/switch_api.md
index 499bb609f..0404f652e 100644
--- a/tdesign-component/example/assets/api/switch_api.md
+++ b/tdesign-component/example/assets/api/switch_api.md
@@ -13,6 +13,8 @@
 | trackOffColor | Color? | - | 关闭时轨道颜色 |
 | thumbContentOnColor | Color? | - | 开启时ThumbView的颜色 |
 | thumbContentOffColor | Color? | - | 关闭时ThumbView的颜色 |
+| thumbContentOnFont | double? | - | 开启时ThumbView的字体大小 |
+| thumbContentOffFont | double? | - | 关闭时ThumbView的字体大小 |
 | onChanged | OnSwitchChanged? | - | 改变事件 |
 | openText | String? | - | 打开文案 |
 | closeText | String? | - | 关闭文案 |
diff --git a/tdesign-component/example/assets/code/switch._customTextFont.txt b/tdesign-component/example/assets/code/switch._customTextFont.txt
new file mode 100644
index 000000000..bca7c0d49
--- /dev/null
+++ b/tdesign-component/example/assets/code/switch._customTextFont.txt
@@ -0,0 +1,14 @@
+
+  Widget _customTextFont(BuildContext context) {
+    return _buildItem(
+      context,
+      const TDSwitch(
+        type: TDSwitchType.text,
+        openText: '开',
+        closeText: '关',
+        thumbContentOnFont: 16,
+        thumbContentOffFont: 10,
+      ),
+      title: '基础开关',
+    );
+  }
\ No newline at end of file
diff --git a/tdesign-component/example/lib/page/td_switch_page.dart b/tdesign-component/example/lib/page/td_switch_page.dart
index 986d3cf20..2b33458ef 100644
--- a/tdesign-component/example/lib/page/td_switch_page.dart
+++ b/tdesign-component/example/lib/page/td_switch_page.dart
@@ -20,34 +20,36 @@ class TDSwitchPageState extends State<TDSwitchPage> {
   @override
   Widget build(BuildContext context) {
     var current = ExamplePage(
-        title: tdTitle(),
-        exampleCodeGroup: 'switch',
-        desc: '用于控制某个功能的开启和关闭。',
-        children: [
-          ExampleModule(
-            title: '组件类型',
-            children: [
-              ExampleItem(desc: '基础开关', builder: _buildSwitchWithBase),
-              ExampleItem(desc: '带描述开关', builder: _buildSwitchWithText),
-              ExampleItem(builder: _buildSwitchWithIcon),
-              ExampleItem(desc: '自定义颜色开关', builder: _buildSwitchWithColor),
-            ],
-          ),
-          ExampleModule(title: '组件状态', children: [
-            ExampleItem(desc: '加载状态', builder: _buildSwitchWithLoadingOff),
-            ExampleItem(builder: _buildSwitchWithLoadingOn),
-            ExampleItem(desc: '禁用状态', builder: _buildSwitchWithDisableOff),
-            ExampleItem(builder: _buildSwitchWithDisableOn),
-          ]),
-          ExampleModule(title: '组件样式', children: [
-            ExampleItem(desc: '开关尺寸', builder: _buildSwitchWithSizeLarge),
-            ExampleItem(builder: _buildSwitchWithSizeMed),
-            ExampleItem(builder: _buildSwitchWithSizeSmall),
-          ]),
-        ],
-    test: [
-      ExampleItem(desc: '自定义开关文案-通常只支持一个字符,超出部分无法展示', builder: _customText),
-    ],);
+      title: tdTitle(),
+      exampleCodeGroup: 'switch',
+      desc: '用于控制某个功能的开启和关闭。',
+      children: [
+        ExampleModule(
+          title: '组件类型',
+          children: [
+            ExampleItem(desc: '基础开关', builder: _buildSwitchWithBase),
+            ExampleItem(desc: '带描述开关', builder: _buildSwitchWithText),
+            ExampleItem(builder: _buildSwitchWithIcon),
+            ExampleItem(desc: '自定义颜色开关', builder: _buildSwitchWithColor),
+          ],
+        ),
+        ExampleModule(title: '组件状态', children: [
+          ExampleItem(desc: '加载状态', builder: _buildSwitchWithLoadingOff),
+          ExampleItem(builder: _buildSwitchWithLoadingOn),
+          ExampleItem(desc: '禁用状态', builder: _buildSwitchWithDisableOff),
+          ExampleItem(builder: _buildSwitchWithDisableOn),
+        ]),
+        ExampleModule(title: '组件样式', children: [
+          ExampleItem(desc: '开关尺寸', builder: _buildSwitchWithSizeLarge),
+          ExampleItem(builder: _buildSwitchWithSizeMed),
+          ExampleItem(builder: _buildSwitchWithSizeSmall),
+        ]),
+      ],
+      test: [
+        ExampleItem(desc: '自定义开关文案-通常只支持一个字符,超出部分无法展示', builder: _customText),
+        ExampleItem(desc: '自定义带文字开关的字体大小', builder: _customTextFont),
+      ],
+    );
     return current;
   }
 
@@ -295,4 +297,19 @@ class TDSwitchPageState extends State<TDSwitchPage> {
       title: '基础开关',
     );
   }
+
+  @Demo(group: 'switch')
+  Widget _customTextFont(BuildContext context) {
+    return _buildItem(
+      context,
+      const TDSwitch(
+        type: TDSwitchType.text,
+        openText: '开',
+        closeText: '关',
+        thumbContentOnFont: 16,
+        thumbContentOffFont: 10,
+      ),
+      title: '基础开关',
+    );
+  }
 }
diff --git a/tdesign-component/lib/src/components/switch/td_switch.dart b/tdesign-component/lib/src/components/switch/td_switch.dart
index d9830e7fd..70da33a2e 100644
--- a/tdesign-component/lib/src/components/switch/td_switch.dart
+++ b/tdesign-component/lib/src/components/switch/td_switch.dart
@@ -24,9 +24,11 @@ class TDSwitch extends StatefulWidget {
     this.trackOffColor,
     this.thumbContentOnColor,
     this.thumbContentOffColor,
+    this.thumbContentOnFont,
+    this.thumbContentOffFont,
     this.onChanged,
     this.openText,
-     this.closeText,
+    this.closeText,
   }) : super(key: key);
 
   /// 是否可点击
@@ -47,6 +49,12 @@ class TDSwitch extends StatefulWidget {
   /// 关闭时ThumbView的颜色
   final Color? thumbContentOffColor;
 
+  /// 开启时ThumbView的字体大小
+  final double? thumbContentOnFont;
+
+  /// 关闭时ThumbView的字体大小
+  final double? thumbContentOffFont;
+
   /// 尺寸：大、中、小
   final TDSwitchSize? size;
 
@@ -86,11 +94,16 @@ class TDSwitchState extends State<TDSwitch> {
   @override
   Widget build(BuildContext context) {
     final theme = TDTheme.of(context);
+    print(theme);
     final switchEnable = widget.enable && widget.type != TDSwitchType.loading;
     final trackOnColor = widget.trackOnColor ?? theme.brandColor7;
     final trackOffColor = widget.trackOffColor ?? theme.grayColor4;
-    final thumbContentOnColor = widget.thumbContentOnColor ?? theme.brandNormalColor;
-    final thumbContentOffColor = widget.thumbContentOffColor ?? theme.fontGyColor4;
+    final thumbContentOnColor =
+        widget.thumbContentOnColor ?? theme.brandNormalColor;
+    final thumbContentOffColor =
+        widget.thumbContentOffColor ?? theme.fontGyColor4;
+    final thumbContentOnFont = widget.thumbContentOnFont ?? 14;
+    final thumbContentOffFont = widget.thumbContentOffFont ?? 14;
     Widget current = TDCupertinoSwitch(
       value: isOn,
       activeColor: trackOnColor,
@@ -103,7 +116,7 @@ class TDSwitchState extends State<TDSwitch> {
           setState(() {});
         }
       },
-      thumbView: _getThumbView(thumbContentOnColor, thumbContentOffColor),
+      thumbView: _getThumbView(thumbContentOnColor, thumbContentOffColor,thumbContentOnFont, thumbContentOffFont),
     );
     if (!switchEnable) {
       current = Opacity(
@@ -150,20 +163,28 @@ class TDSwitchState extends State<TDSwitch> {
     }
   }
 
-  Widget? _getThumbView(Color thumbContentOnColor, Color thumbContentOffColor) {
+  Widget? _getThumbView(Color thumbContentOnColor, Color thumbContentOffColor, double thumbContentOnFont, double thumbContentOffFont) {
     switch (widget.type) {
       case TDSwitchType.text:
         return Stack(
-          children: [Container(
-            alignment: Alignment.center,
-            width: 16,
-            child: TDText(
-              isOn ? (widget.openText ?? context.resource.open) : (widget.closeText ?? context.resource.close),
-              style: TextStyle(color: isOn ? thumbContentOnColor : thumbContentOffColor, fontSize: 14),
-              forceVerticalCenter: true,
-              maxLines: 1,
-            ),
-          )],
+          children: [
+            Container(
+              alignment: Alignment.center,
+              width: 16,
+              child: TDText(
+                isOn
+                    ? (widget.openText ?? context.resource.open)
+                    : (widget.closeText ?? context.resource.close),
+                style: TextStyle(
+                    color: isOn ? thumbContentOnColor : thumbContentOffColor,
+                    fontSize: isOn
+                        ? thumbContentOnFont
+                        : thumbContentOffFont),
+                forceVerticalCenter: true,
+                maxLines: 1,
+              ),
+            )
+          ],
         );
       case TDSwitchType.loading:
         return Container(
@@ -178,7 +199,8 @@ class TDSwitchState extends State<TDSwitch> {
         return Container(
           alignment: Alignment.centerLeft,
           child: Icon(isOn ? TDIcons.check : TDIcons.close,
-              size: 16, color: isOn ? thumbContentOnColor : thumbContentOffColor),
+              size: 16,
+              color: isOn ? thumbContentOnColor : thumbContentOffColor),
         );
       case TDSwitchType.fill:
       default:

From da49d526cc43ec524f55879a301bd0a908281efe Mon Sep 17 00:00:00 2001
From: shinyina <shinyina@foxmail.com>
Date: Tue, 2 Jul 2024 00:39:49 +0800
Subject: [PATCH 03/74] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/lib/src/components/switch/td_switch.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tdesign-component/lib/src/components/switch/td_switch.dart b/tdesign-component/lib/src/components/switch/td_switch.dart
index 70da33a2e..fd9715bfb 100644
--- a/tdesign-component/lib/src/components/switch/td_switch.dart
+++ b/tdesign-component/lib/src/components/switch/td_switch.dart
@@ -94,7 +94,6 @@ class TDSwitchState extends State<TDSwitch> {
   @override
   Widget build(BuildContext context) {
     final theme = TDTheme.of(context);
-    print(theme);
     final switchEnable = widget.enable && widget.type != TDSwitchType.loading;
     final trackOnColor = widget.trackOnColor ?? theme.brandColor7;
     final trackOffColor = widget.trackOffColor ?? theme.grayColor4;

From 08ef16248b075a0f32523efcca533ec77762e470 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Tue, 2 Jul 2024 21:36:02 +0800
Subject: [PATCH 04/74] =?UTF-8?q?Badge=20=E7=BB=84=E4=BB=B6=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9EmaxCount=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_badge_page.dart       | 251 +++++++++++++-----
 .../lib/src/components/badge/td_badge.dart    |  59 ++--
 2 files changed, 214 insertions(+), 96 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_badge_page.dart b/tdesign-component/example/lib/page/td_badge_page.dart
index a726ec689..73aa7d507 100644
--- a/tdesign-component/example/lib/page/td_badge_page.dart
+++ b/tdesign-component/example/lib/page/td_badge_page.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:tdesign_flutter/tdesign_flutter.dart';
 import '../../base/example_widget.dart';
@@ -29,38 +30,36 @@ class _TDBadgePageState extends State<TDBadgePage> {
                       alignment: Alignment.topLeft,
                       padding: const EdgeInsets.only(left: 16),
                       child: Row(
-                        crossAxisAlignment: CrossAxisAlignment.center, // 垂直方向上末端对齐
+                        crossAxisAlignment: CrossAxisAlignment.center,
                         children: [
-                            Container(
-                              alignment: Alignment.bottomLeft,
-                              margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
-                              child: CodeWrapper(
-                                builder: _buildRedPointMessageBadge,
-                                methodName: '_buildRedPointMessageBadge',
-                              ),
+                          Container(
+                            alignment: Alignment.bottomLeft,
+                            margin: const EdgeInsets.only(
+                                top: 8, left: 16, right: 16, bottom: 8),
+                            child: CodeWrapper(
+                              builder: _buildRedPointMessageBadge,
                             ),
-                            Container(
-                              alignment: Alignment.bottomLeft,
-                              margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
-                              child: CodeWrapper(
-                                builder: _buildRedPointIconBadge,
-                                methodName: '_buildRedPointIconBadge',
-                              ),
+                          ),
+                          Container(
+                            alignment: Alignment.bottomLeft,
+                            margin: const EdgeInsets.only(
+                                top: 8, left: 16, right: 16, bottom: 8),
+                            child: CodeWrapper(
+                              builder: _buildRedPointIconBadge,
                             ),
-                            Container(
-                              alignment: Alignment.bottomLeft,
-                              margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
-                              child: CodeWrapper(
-                                builder: _buildRedPointButtonBadge,
-                                methodName: '_buildRedPointButtonBadge',
-                              ),
+                          ),
+                          Container(
+                            alignment: Alignment.bottomLeft,
+                            margin: const EdgeInsets.only(
+                                top: 8, left: 16, right: 16, bottom: 8),
+                            child: CodeWrapper(
+                              builder: _buildRedPointButtonBadge,
                             ),
-
+                          ),
                         ],
                       ),
                     );
                   }),
-
               ExampleItem(
                   ignoreCode: true,
                   desc: '数字徽标',
@@ -69,33 +68,33 @@ class _TDBadgePageState extends State<TDBadgePage> {
                       alignment: Alignment.topLeft,
                       padding: const EdgeInsets.only(left: 16),
                       child: Row(
-                        crossAxisAlignment: CrossAxisAlignment.center, // 垂直方向上末端对齐
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        // 垂直方向上末端对齐
                         children: [
                           Container(
                             alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                            margin: const EdgeInsets.only(
+                                top: 8, left: 16, right: 16, bottom: 8),
                             child: CodeWrapper(
                               builder: _buildMessageNumberBadge,
-                              methodName: '_buildMessageNumberBadge',
                             ),
                           ),
                           Container(
                             alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                            margin: const EdgeInsets.only(
+                                top: 8, left: 16, right: 16, bottom: 8),
                             child: CodeWrapper(
                               builder: _buildIconNumberBadge,
-                              methodName: '_buildIconNumberBadge',
                             ),
                           ),
                           Container(
                             alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                            margin: const EdgeInsets.only(
+                                top: 8, left: 16, right: 16, bottom: 8),
                             child: CodeWrapper(
                               builder: _buildButtonNumberBadge,
-                              methodName: '_buildButtonNumberBadge',
                             ),
                           ),
-
                         ],
                       ),
                     );
@@ -108,30 +107,32 @@ class _TDBadgePageState extends State<TDBadgePage> {
                       alignment: Alignment.topLeft,
                       padding: const EdgeInsets.only(left: 16),
                       child: Row(
-                        crossAxisAlignment: CrossAxisAlignment.center, // 垂直方向上末端对齐
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        // 垂直方向上末端对齐
                         children: [
                           Container(
                             alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                            margin: const EdgeInsets.only(
+                                top: 8, left: 16, right: 16, bottom: 8),
                             child: CodeWrapper(
                               builder: _buildCustomBadgeShowingNumberEight,
-                              methodName: '_buildCustomBadgeShowingNumberEight',
                             ),
                           ),
                           Container(
                             alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                            margin: const EdgeInsets.only(
+                                top: 8, left: 16, right: 16, bottom: 8),
                             child: CodeWrapper(
                               builder: _buildCustomBadgeShowingNumberZero,
-                              methodName: '_buildCustomBadgeShowingNumberZero',
                             ),
                           ),
                           Container(
                             alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+                            margin: const EdgeInsets.only(
+                                top: 8, left: 16, right: 16, bottom: 8),
                             child: CodeWrapper(
-                              builder: _buildCustomBadgeWithoutShowingNumberZero,
-                              methodName: '_buildCustomBadgeWithoutShowingNumberZero',
+                              builder:
+                                  _buildCustomBadgeWithoutShowingNumberZero,
                             ),
                           ),
                         ],
@@ -155,6 +156,55 @@ class _TDBadgePageState extends State<TDBadgePage> {
               ExampleItem(desc: 'Large', builder: _buildLargeBadge),
               ExampleItem(desc: 'Medium', builder: _buildMediumBadge)
             ],
+          ),
+          ExampleModule(
+            title: '最大数字上限',
+            children: [
+              ExampleItem(
+                  ignoreCode: true,
+                  desc: '未超过上限',
+                  builder: (context) {
+                    return Container(
+                      alignment: Alignment.topLeft,
+                      padding: const EdgeInsets.only(left: 16),
+                      child: Row(
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          Container(
+                            alignment: Alignment.bottomLeft,
+                            margin: const EdgeInsets.only(
+                                left: 16, right: 16, bottom: 8),
+                            child: CodeWrapper(
+                              builder: _buildLessThanMaxCountBadge,
+                            ),
+                          ),
+                        ],
+                      ),
+                    );
+                  }),
+              ExampleItem(
+                  ignoreCode: true,
+                  desc: '超过上限',
+                  builder: (context) {
+                    return Container(
+                      alignment: Alignment.topLeft,
+                      padding: const EdgeInsets.only(left: 16),
+                      child: Row(
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          Container(
+                            alignment: Alignment.bottomLeft,
+                            margin: const EdgeInsets.only(
+                                left: 16, right: 16, bottom: 8),
+                            child: CodeWrapper(
+                              builder: _buildMoreThanMaxCountBadge,
+                            ),
+                          ),
+                        ],
+                      ),
+                    );
+                  }),
+            ],
           )
         ]);
   }
@@ -228,8 +278,8 @@ class _TDBadgePageState extends State<TDBadgePage> {
   @Demo(group: 'badge')
   Widget _buildMessageNumberBadge(BuildContext context) {
     return SizedBox(
-      width: 48,
-      height: 32,
+      width: 54,
+      height: 36,
       child: Stack(
         alignment: Alignment.bottomLeft,
         children: [
@@ -242,8 +292,8 @@ class _TDBadgePageState extends State<TDBadgePage> {
               TDBadgeType.message,
               count: '8',
             ),
-            right: 0,
-            top: 0,
+            left: 28,
+            bottom: 18,
           )
         ],
       ),
@@ -253,8 +303,8 @@ class _TDBadgePageState extends State<TDBadgePage> {
   @Demo(group: 'badge')
   Widget _buildIconNumberBadge(BuildContext context) {
     return const SizedBox(
-      width: 34,
-      height: 34,
+      width: 42,
+      height: 36,
       child: Stack(
         alignment: Alignment.bottomLeft,
         children: [
@@ -264,8 +314,8 @@ class _TDBadgePageState extends State<TDBadgePage> {
               TDBadgeType.message,
               count: '8',
             ),
-            right: 0,
-            top: 0,
+            left: 18,
+            bottom: 18,
           )
         ],
       ),
@@ -311,8 +361,8 @@ class _TDBadgePageState extends State<TDBadgePage> {
             child: const Icon(TDIcons.notification),
             decoration: BoxDecoration(
                 color: TDTheme.of(context).grayColor2,
-                borderRadius: BorderRadius.circular(
-                    TDTheme.of(context).radiusDefault)),
+                borderRadius:
+                    BorderRadius.circular(TDTheme.of(context).radiusDefault)),
             height: 48,
             width: 48,
           ),
@@ -341,8 +391,8 @@ class _TDBadgePageState extends State<TDBadgePage> {
             child: const Icon(TDIcons.notification),
             decoration: BoxDecoration(
                 color: TDTheme.of(context).grayColor2,
-                borderRadius: BorderRadius.circular(
-                    TDTheme.of(context).radiusDefault)),
+                borderRadius:
+                    BorderRadius.circular(TDTheme.of(context).radiusDefault)),
             height: 48,
             width: 48,
           ),
@@ -371,8 +421,8 @@ class _TDBadgePageState extends State<TDBadgePage> {
             child: const Icon(TDIcons.notification),
             decoration: BoxDecoration(
                 color: TDTheme.of(context).grayColor2,
-                borderRadius: BorderRadius.circular(
-                    TDTheme.of(context).radiusDefault)),
+                borderRadius:
+                    BorderRadius.circular(TDTheme.of(context).radiusDefault)),
             height: 48,
             width: 48,
           ),
@@ -390,7 +440,6 @@ class _TDBadgePageState extends State<TDBadgePage> {
     );
   }
 
-
   @Demo(group: 'badge')
   Widget _buildCircleBadge(BuildContext context) {
     return const Padding(
@@ -398,7 +447,7 @@ class _TDBadgePageState extends State<TDBadgePage> {
       child: Row(
         children: [
           SizedBox(
-            width: 34,
+            width: 48,
             height: 34,
             child: Stack(
               alignment: Alignment.bottomLeft,
@@ -407,10 +456,10 @@ class _TDBadgePageState extends State<TDBadgePage> {
                 Positioned(
                   child: TDBadge(
                     TDBadgeType.message,
-                    count: '8',
+                    count: '16',
                   ),
-                  right: 0,
-                  top: 0,
+                  left: 18,
+                  bottom: 18,
                 )
               ],
             ),
@@ -427,7 +476,7 @@ class _TDBadgePageState extends State<TDBadgePage> {
       child: Row(
         children: [
           SizedBox(
-            width: 34,
+            width: 48,
             height: 34,
             child: Stack(
               alignment: Alignment.bottomLeft,
@@ -437,10 +486,10 @@ class _TDBadgePageState extends State<TDBadgePage> {
                   child: TDBadge(
                     TDBadgeType.square,
                     border: TDBadgeBorder.small,
-                    count: '8',
+                    count: '16',
                   ),
-                  right: 0,
-                  top: 0,
+                  left: 20,
+                  bottom: 18,
                 )
               ],
             ),
@@ -520,7 +569,7 @@ class _TDBadgePageState extends State<TDBadgePage> {
         children: [
           SizedBox(
             width: 68,
-            height: 65.5,
+            height: 70,
             child: Stack(
               alignment: Alignment.bottomLeft,
               children: [
@@ -534,8 +583,8 @@ class _TDBadgePageState extends State<TDBadgePage> {
                     size: TDBadgeSize.large,
                     count: '8',
                   ),
-                  right: 0,
-                  top: 0,
+                  left: 48,
+                  bottom: 48,
                 )
               ],
             ),
@@ -547,13 +596,13 @@ class _TDBadgePageState extends State<TDBadgePage> {
 
   @Demo(group: 'badge')
   Widget _buildMediumBadge(BuildContext context) {
-    return const Padding(
-      padding: EdgeInsets.only(left: 16),
-      child: Row(
+    return Container(
+      padding: const EdgeInsets.only(left: 16),
+      child: const Row(
         children: [
           SizedBox(
-            width: 51,
-            height: 49.5,
+            width: 120,
+            height: 54,
             child: Stack(
               alignment: Alignment.bottomLeft,
               children: [
@@ -566,8 +615,8 @@ class _TDBadgePageState extends State<TDBadgePage> {
                     TDBadgeType.message,
                     count: '8',
                   ),
-                  right: 0,
-                  top: 0,
+                  left: 36,
+                  bottom: 36,
                 )
               ],
             ),
@@ -576,4 +625,60 @@ class _TDBadgePageState extends State<TDBadgePage> {
       ),
     );
   }
+
+  @Demo(group: 'badge')
+  Widget _buildLessThanMaxCountBadge(BuildContext context) {
+    return const SizedBox(
+      width: 60,
+      height: 50,
+      child: Stack(
+        children: [
+          Positioned(
+            left: 0,
+            bottom: 0,
+            child: Icon(TDIcons.notification),
+          ),
+          Positioned(
+            child: TDBadge(
+              TDBadgeType.square,
+              count: '8888',
+              maxCount: '9000',
+              size: TDBadgeSize.large,
+              border: TDBadgeBorder.large,
+            ),
+            left: 18,
+            bottom: 18,
+          ),
+        ],
+      ),
+    );
+  }
+
+  @Demo(group: 'badge')
+  Widget _buildMoreThanMaxCountBadge(BuildContext context) {
+    return const SizedBox(
+      width: 60,
+      height: 50,
+      child: Stack(
+        children: [
+          Positioned(
+            left: 0,
+            bottom: 0,
+            child: Icon(TDIcons.notification),
+          ),
+          Positioned(
+            child: TDBadge(
+              TDBadgeType.square,
+              count: '888',
+              maxCount: '99',
+              size: TDBadgeSize.large,
+              border: TDBadgeBorder.large,
+            ),
+            left: 18,
+            bottom: 18,
+          ),
+        ],
+      ),
+    );
+  }
 }
diff --git a/tdesign-component/lib/src/components/badge/td_badge.dart b/tdesign-component/lib/src/components/badge/td_badge.dart
index 15d58eec1..8ef1cbee0 100644
--- a/tdesign-component/lib/src/components/badge/td_badge.dart
+++ b/tdesign-component/lib/src/components/badge/td_badge.dart
@@ -43,6 +43,7 @@ class TDBadge extends StatefulWidget {
   const TDBadge(this.type,
       {Key? key,
       this.count,
+      this.maxCount = '99',
       this.border = TDBadgeBorder.large,
       this.size = TDBadgeSize.small,
       this.color,
@@ -57,6 +58,9 @@ class TDBadge extends StatefulWidget {
   /// 红点数量
   final String? count;
 
+  /// 最大红点数量
+  final String? maxCount;
+
   /// 红点样式
   final TDBadgeType type;
 
@@ -99,7 +103,14 @@ class _TDBadgeState extends State<TDBadge> {
       return;
     }
     setState(() {
-      badgeNum = newCount;
+      // 如果 newCount 超过了 maxCount，则显示 `${maxCount}+`
+      final countValue = int.tryParse(newCount) ?? 0;
+      final maxCountValue = int.tryParse(widget.maxCount ?? '') ?? 0;
+      if (maxCountValue > 0 && countValue > maxCountValue) {
+        badgeNum = '${maxCountValue}+';
+      } else {
+        badgeNum = newCount;
+      }
     });
   }
 
@@ -245,28 +256,30 @@ class _TDBadgeState extends State<TDBadge> {
       case TDBadgeType.square:
         return Visibility(
             visible: isVisible(),
-            child: Container(
-              height: getBadgeSize(),
-              width: getBadgeSize(),
-              padding: const EdgeInsets.only(left: 5, right: 5),
-              decoration: BoxDecoration(
-                color: widget.color ?? TDTheme.of(context).errorColor6,
-                borderRadius: widget.border == TDBadgeBorder.large
-                    ? BorderRadius.circular(8)
-                    : BorderRadius.circular(2),
-              ),
-              child: Center(
-                child: TDText(
-                  widget.message ?? '$badgeNum',
-                  forceVerticalCenter: true,
-                  font: getBadgeFont(context),
-                  fontWeight: FontWeight.w500,
-                  textColor:
-                      widget.textColor ?? TDTheme.of(context).whiteColor1,
-                  textAlign: TextAlign.center,
-                ),
-              ),
-            ));
+            child: IntrinsicWidth(
+                child: Container(
+                  height: getBadgeSize(),
+                  padding: const EdgeInsets.only(left: 5, right: 5),
+                  decoration: BoxDecoration(
+                    color: widget.color ?? TDTheme.of(context).errorColor6,
+                    borderRadius: widget.border == TDBadgeBorder.large
+                        ? BorderRadius.circular(8)
+                        : BorderRadius.circular(2),
+                  ),
+                  child: Center(
+                    child: TDText(
+                      widget.message ?? '$badgeNum',
+                      forceVerticalCenter: true,
+                      font: getBadgeFont(context),
+                      fontWeight: FontWeight.w500,
+                      textColor:
+                        widget.textColor ?? TDTheme.of(context).whiteColor1,
+                      textAlign: TextAlign.center,
+                    ),
+                  ),
+                )
+            )
+        );
     }
   }
 }

From 050932cfdc966e8c6955149dd52babdabdf94481 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Tue, 2 Jul 2024 21:44:01 +0800
Subject: [PATCH 05/74] =?UTF-8?q?Badge-page=E5=88=A0=E5=8E=BB=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/example/lib/page/td_badge_page.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tdesign-component/example/lib/page/td_badge_page.dart b/tdesign-component/example/lib/page/td_badge_page.dart
index 73aa7d507..b3b00c78f 100644
--- a/tdesign-component/example/lib/page/td_badge_page.dart
+++ b/tdesign-component/example/lib/page/td_badge_page.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:tdesign_flutter/tdesign_flutter.dart';
 import '../../base/example_widget.dart';

From bf8d1dc9b5afa15ea974a3483c64c4bd5137f17f Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Fri, 5 Jul 2024 20:42:11 +0800
Subject: [PATCH 06/74] =?UTF-8?q?badge=E7=A4=BA=E4=BE=8B=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=B0=86builder=E6=8A=BD=E6=88=90=E7=8B=AC=E7=AB=8B=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_badge_page.dart       | 782 ++++++++----------
 1 file changed, 366 insertions(+), 416 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_badge_page.dart b/tdesign-component/example/lib/page/td_badge_page.dart
index b3b00c78f..b0b0f63ba 100644
--- a/tdesign-component/example/lib/page/td_badge_page.dart
+++ b/tdesign-component/example/lib/page/td_badge_page.dart
@@ -14,434 +14,378 @@ class _TDBadgePageState extends State<TDBadgePage> {
   @override
   Widget build(BuildContext context) {
     return ExamplePage(
-        title: tdTitle(),
-        desc: '用于告知用户，该区域的状态变化或者待处理任务的数量。',
-        exampleCodeGroup: 'badge',
-        children: [
-          ExampleModule(
-            title: '组件类型',
-            children: [
-              ExampleItem(
-                  ignoreCode: true,
-                  desc: '红点徽标',
-                  builder: (context) {
-                    return Container(
-                      alignment: Alignment.topLeft,
-                      padding: const EdgeInsets.only(left: 16),
-                      child: Row(
-                        crossAxisAlignment: CrossAxisAlignment.center,
-                        children: [
-                          Container(
-                            alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(
-                                top: 8, left: 16, right: 16, bottom: 8),
-                            child: CodeWrapper(
-                              builder: _buildRedPointMessageBadge,
-                            ),
-                          ),
-                          Container(
-                            alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(
-                                top: 8, left: 16, right: 16, bottom: 8),
-                            child: CodeWrapper(
-                              builder: _buildRedPointIconBadge,
-                            ),
-                          ),
-                          Container(
-                            alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(
-                                top: 8, left: 16, right: 16, bottom: 8),
-                            child: CodeWrapper(
-                              builder: _buildRedPointButtonBadge,
-                            ),
-                          ),
-                        ],
+      title: tdTitle(),
+      desc: '用于告知用户，该区域的状态变化或者待处理任务的数量。',
+      exampleCodeGroup: 'badge',
+      children: [
+        ExampleModule(
+          title: '组件类型',
+          children: [
+            ExampleItem(
+                desc: '红点徽标',
+                builder: (context) {
+                  return Row(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      CodeWrapper(
+                        builder: _buildRedPointMessageBadge,
                       ),
-                    );
-                  }),
-              ExampleItem(
-                  ignoreCode: true,
-                  desc: '数字徽标',
-                  builder: (context) {
-                    return Container(
-                      alignment: Alignment.topLeft,
-                      padding: const EdgeInsets.only(left: 16),
-                      child: Row(
-                        crossAxisAlignment: CrossAxisAlignment.center,
-                        // 垂直方向上末端对齐
-                        children: [
-                          Container(
-                            alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(
-                                top: 8, left: 16, right: 16, bottom: 8),
-                            child: CodeWrapper(
-                              builder: _buildMessageNumberBadge,
-                            ),
-                          ),
-                          Container(
-                            alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(
-                                top: 8, left: 16, right: 16, bottom: 8),
-                            child: CodeWrapper(
-                              builder: _buildIconNumberBadge,
-                            ),
-                          ),
-                          Container(
-                            alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(
-                                top: 8, left: 16, right: 16, bottom: 8),
-                            child: CodeWrapper(
-                              builder: _buildButtonNumberBadge,
-                            ),
-                          ),
-                        ],
+                      CodeWrapper(
+                        builder: _buildRedPointIconBadge,
                       ),
-                    );
-                  }),
-              ExampleItem(
-                  ignoreCode: true,
-                  desc: '自定义徽标',
-                  builder: (context) {
-                    return Container(
-                      alignment: Alignment.topLeft,
-                      padding: const EdgeInsets.only(left: 16),
-                      child: Row(
-                        crossAxisAlignment: CrossAxisAlignment.center,
-                        // 垂直方向上末端对齐
-                        children: [
-                          Container(
-                            alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(
-                                top: 8, left: 16, right: 16, bottom: 8),
-                            child: CodeWrapper(
-                              builder: _buildCustomBadgeShowingNumberEight,
-                            ),
-                          ),
-                          Container(
-                            alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(
-                                top: 8, left: 16, right: 16, bottom: 8),
-                            child: CodeWrapper(
-                              builder: _buildCustomBadgeShowingNumberZero,
-                            ),
-                          ),
-                          Container(
-                            alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(
-                                top: 8, left: 16, right: 16, bottom: 8),
-                            child: CodeWrapper(
-                              builder:
-                                  _buildCustomBadgeWithoutShowingNumberZero,
-                            ),
-                          ),
-                        ],
+                      CodeWrapper(
+                        builder: _buildRedPointButtonBadge,
                       ),
-                    );
-                  }),
-            ],
-          ),
-          ExampleModule(
-            title: '组件样式',
-            children: [
-              ExampleItem(desc: '圆形徽标', builder: _buildCircleBadge),
-              ExampleItem(desc: '方形徽标', builder: _buildSquareBadge),
-              ExampleItem(desc: '气泡徽标', builder: _buildBubbleBadge),
-              ExampleItem(desc: '角标', builder: _buildSubscriptBadge),
-            ],
-          ),
-          ExampleModule(
-            title: '组件尺寸',
-            children: [
-              ExampleItem(desc: 'Large', builder: _buildLargeBadge),
-              ExampleItem(desc: 'Medium', builder: _buildMediumBadge)
-            ],
-          ),
-          ExampleModule(
-            title: '最大数字上限',
-            children: [
-              ExampleItem(
-                  ignoreCode: true,
-                  desc: '未超过上限',
-                  builder: (context) {
-                    return Container(
-                      alignment: Alignment.topLeft,
-                      padding: const EdgeInsets.only(left: 16),
-                      child: Row(
-                        crossAxisAlignment: CrossAxisAlignment.center,
-                        children: [
-                          Container(
-                            alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(
-                                left: 16, right: 16, bottom: 8),
-                            child: CodeWrapper(
-                              builder: _buildLessThanMaxCountBadge,
-                            ),
-                          ),
-                        ],
+                    ],
+                  );
+                }),
+            ExampleItem(
+                desc: '数字徽标',
+                builder: (context) {
+                  return Row(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      CodeWrapper(
+                        builder: _buildMessageNumberBadge,
                       ),
-                    );
-                  }),
-              ExampleItem(
-                  ignoreCode: true,
-                  desc: '超过上限',
-                  builder: (context) {
-                    return Container(
-                      alignment: Alignment.topLeft,
-                      padding: const EdgeInsets.only(left: 16),
-                      child: Row(
-                        crossAxisAlignment: CrossAxisAlignment.center,
-                        children: [
-                          Container(
-                            alignment: Alignment.bottomLeft,
-                            margin: const EdgeInsets.only(
-                                left: 16, right: 16, bottom: 8),
-                            child: CodeWrapper(
-                              builder: _buildMoreThanMaxCountBadge,
-                            ),
-                          ),
-                        ],
+                      CodeWrapper(
+                        builder: _buildIconNumberBadge,
                       ),
-                    );
-                  }),
-            ],
-          )
-        ]);
+                      CodeWrapper(
+                        builder: _buildButtonNumberBadge,
+                      ),
+                    ],
+                  );
+                }),
+            ExampleItem(
+                desc: '自定义徽标',
+                builder: (context) {
+                  return Row(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      CodeWrapper(
+                        builder: _buildCustomBadgeShowingNumberEight,
+                      ),
+                      CodeWrapper(
+                        builder: _buildCustomBadgeShowingNumberZero,
+                      ),
+                      CodeWrapper(
+                        builder: _buildCustomBadgeWithoutShowingNumberZero,
+                      ),
+                    ],
+                  );
+                }),
+          ],
+        ),
+        ExampleModule(
+          title: '组件样式',
+          children: [
+            ExampleItem(desc: '圆形徽标', builder: _buildCircleBadge),
+            ExampleItem(desc: '方形徽标', builder: _buildSquareBadge),
+            ExampleItem(desc: '气泡徽标', builder: _buildBubbleBadge),
+            ExampleItem(desc: '角标', builder: _buildSubscriptBadge),
+          ],
+        ),
+        ExampleModule(
+          title: '组件尺寸',
+          children: [
+            ExampleItem(desc: 'Large', builder: _buildLargeBadge),
+            ExampleItem(desc: 'Medium', builder: _buildMediumBadge)
+          ],
+        ),
+      ],
+      test: [
+        ExampleItem(
+            ignoreCode: true,
+            desc: '未超过上限',
+            builder: (context) {
+              return Row(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  CodeWrapper(
+                    builder: _buildLessThanMaxCountBadge,
+                  ),
+                ],
+              );
+            }),
+        ExampleItem(
+            ignoreCode: true,
+            desc: '超过上限',
+            builder: (context) {
+              return Row(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  CodeWrapper(
+                    builder: _buildMoreThanMaxCountBadge,
+                  ),
+                ],
+              );
+            })
+      ],
+    );
   }
 
   @Demo(group: 'badge')
   Widget _buildRedPointMessageBadge(BuildContext context) {
-    return SizedBox(
-      width: 40,
-      height: 24,
-      child: Stack(
+    return Container(
         alignment: Alignment.bottomLeft,
-        children: [
-          TDText(
-            '消息',
-            font: TDTheme.of(context).fontBodyLarge,
+        margin: const EdgeInsets.only(left: 16, right: 16),
+        child: SizedBox(
+          width: 40,
+          height: 24,
+          child: Stack(
+            alignment: Alignment.bottomLeft,
+            children: [
+              TDText(
+                '消息',
+                font: TDTheme.of(context).fontBodyLarge,
+              ),
+              const Positioned(
+                child: TDBadge(TDBadgeType.redPoint),
+                right: 0,
+                top: 0,
+              )
+            ],
           ),
-          const Positioned(
-            child: TDBadge(TDBadgeType.redPoint),
-            right: 0,
-            top: 0,
-          )
-        ],
-      ),
-    );
+        ));
   }
 
   @Demo(group: 'badge')
   Widget _buildRedPointIconBadge(BuildContext context) {
-    return const SizedBox(
-      width: 27,
-      height: 27,
-      child: Stack(
+    return Container(
         alignment: Alignment.bottomLeft,
-        children: [
-          Icon(TDIcons.notification),
-          Positioned(
-            child: TDBadge(TDBadgeType.redPoint),
-            right: 0,
-            top: 0,
-          )
-        ],
-      ),
-    );
+        margin: const EdgeInsets.only(left: 16, right: 16),
+        child: SizedBox(
+          width: 27,
+          height: 27,
+          child: Stack(
+            alignment: Alignment.bottomLeft,
+            children: [
+              Icon(TDIcons.notification),
+              Positioned(
+                child: TDBadge(TDBadgeType.redPoint),
+                right: 0,
+                top: 0,
+              )
+            ],
+          ),
+        ));
   }
 
   @Demo(group: 'badge')
   Widget _buildRedPointButtonBadge(BuildContext context) {
-    return const SizedBox(
-      width: 83,
-      height: 48,
-      child: Stack(
+    return Container(
         alignment: Alignment.bottomLeft,
-        children: [
-          TDButton(
-            width: 80,
-            height: 48,
-            text: '按钮',
-            size: TDButtonSize.large,
-            type: TDButtonType.fill,
+        margin: const EdgeInsets.only(left: 16, right: 16),
+        child: SizedBox(
+          width: 83,
+          height: 48,
+          child: Stack(
+            alignment: Alignment.bottomLeft,
+            children: [
+              TDButton(
+                width: 80,
+                height: 48,
+                text: '按钮',
+                size: TDButtonSize.large,
+                type: TDButtonType.fill,
+              ),
+              Positioned(
+                child: TDBadge(TDBadgeType.redPoint),
+                right: 0,
+                top: 0,
+              )
+            ],
           ),
-          Positioned(
-            child: TDBadge(TDBadgeType.redPoint),
-            right: 0,
-            top: 0,
-          )
-        ],
-      ),
-    );
+        ));
   }
 
   @Demo(group: 'badge')
   Widget _buildMessageNumberBadge(BuildContext context) {
-    return SizedBox(
-      width: 54,
-      height: 36,
-      child: Stack(
+    return Container(
         alignment: Alignment.bottomLeft,
-        children: [
-          TDText(
-            '消息',
-            font: TDTheme.of(context).fontBodyLarge,
+        margin: const EdgeInsets.only(left: 16),
+        child: SizedBox(
+          width: 54,
+          height: 36,
+          child: Stack(
+            alignment: Alignment.bottomLeft,
+            children: [
+              TDText(
+                '消息',
+                font: TDTheme.of(context).fontBodyLarge,
+              ),
+              const Positioned(
+                child: TDBadge(
+                  TDBadgeType.message,
+                  count: '8',
+                ),
+                left: 28,
+                bottom: 18,
+              )
+            ],
           ),
-          const Positioned(
-            child: TDBadge(
-              TDBadgeType.message,
-              count: '8',
-            ),
-            left: 28,
-            bottom: 18,
-          )
-        ],
-      ),
-    );
+        ));
   }
 
   @Demo(group: 'badge')
   Widget _buildIconNumberBadge(BuildContext context) {
-    return const SizedBox(
-      width: 42,
-      height: 36,
-      child: Stack(
+    return Container(
         alignment: Alignment.bottomLeft,
-        children: [
-          Icon(TDIcons.notification),
-          Positioned(
-            child: TDBadge(
-              TDBadgeType.message,
-              count: '8',
-            ),
-            left: 18,
-            bottom: 18,
-          )
-        ],
-      ),
-    );
+        margin: const EdgeInsets.only(left: 16),
+        child: SizedBox(
+          width: 42,
+          height: 36,
+          child: Stack(
+            alignment: Alignment.bottomLeft,
+            children: [
+              Icon(TDIcons.notification),
+              Positioned(
+                child: TDBadge(
+                  TDBadgeType.message,
+                  count: '8',
+                ),
+                left: 18,
+                bottom: 18,
+              )
+            ],
+          ),
+        ));
   }
 
   @Demo(group: 'badge')
   Widget _buildButtonNumberBadge(BuildContext context) {
-    return const SizedBox(
-      width: 86,
-      height: 54,
-      child: Stack(
+    return Container(
         alignment: Alignment.bottomLeft,
-        children: [
-          TDButton(
-            width: 80,
-            height: 48,
-            text: '按钮',
-            size: TDButtonSize.large,
+        margin: const EdgeInsets.only(left: 16),
+        child: SizedBox(
+          width: 86,
+          height: 54,
+          child: Stack(
+            alignment: Alignment.bottomLeft,
+            children: [
+              TDButton(
+                width: 80,
+                height: 48,
+                text: '按钮',
+                size: TDButtonSize.large,
+              ),
+              Positioned(
+                child: TDBadge(
+                  TDBadgeType.message,
+                  count: '8',
+                ),
+                right: 0,
+                top: 0,
+              )
+            ],
           ),
-          Positioned(
-            child: TDBadge(
-              TDBadgeType.message,
-              count: '8',
-            ),
-            right: 0,
-            top: 0,
-          )
-        ],
-      ),
-    );
+        ));
   }
 
   @Demo(group: 'badge')
   Widget _buildCustomBadgeShowingNumberEight(BuildContext context) {
-    return SizedBox(
-      width: 64,
-      height: 56,
-      child: Stack(
+    return Container(
         alignment: Alignment.bottomLeft,
-        children: [
-          Container(
-            child: const Icon(TDIcons.notification),
-            decoration: BoxDecoration(
-                color: TDTheme.of(context).grayColor2,
-                borderRadius:
-                    BorderRadius.circular(TDTheme.of(context).radiusDefault)),
-            height: 48,
-            width: 48,
+        margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+        child: SizedBox(
+          width: 64,
+          height: 56,
+          child: Stack(
+            alignment: Alignment.bottomLeft,
+            children: [
+              Container(
+                child: const Icon(TDIcons.notification),
+                decoration: BoxDecoration(
+                    color: TDTheme.of(context).grayColor2,
+                    borderRadius: BorderRadius.circular(
+                        TDTheme.of(context).radiusDefault)),
+                height: 48,
+                width: 48,
+              ),
+              const Positioned(
+                child: TDBadge(
+                  TDBadgeType.message,
+                  count: '8',
+                ),
+                right: 0,
+                top: 0,
+              )
+            ],
           ),
-          const Positioned(
-            child: TDBadge(
-              TDBadgeType.message,
-              count: '8',
-            ),
-            right: 0,
-            top: 0,
-          )
-        ],
-      ),
-    );
+        ));
   }
 
   @Demo(group: 'badge')
   Widget _buildCustomBadgeShowingNumberZero(BuildContext context) {
-    return SizedBox(
-      width: 64,
-      height: 56,
-      child: Stack(
+    return Container(
         alignment: Alignment.bottomLeft,
-        children: [
-          Container(
-            child: const Icon(TDIcons.notification),
-            decoration: BoxDecoration(
-                color: TDTheme.of(context).grayColor2,
-                borderRadius:
-                    BorderRadius.circular(TDTheme.of(context).radiusDefault)),
-            height: 48,
-            width: 48,
+        margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+        child: SizedBox(
+          width: 64,
+          height: 56,
+          child: Stack(
+            alignment: Alignment.bottomLeft,
+            children: [
+              Container(
+                child: const Icon(TDIcons.notification),
+                decoration: BoxDecoration(
+                    color: TDTheme.of(context).grayColor2,
+                    borderRadius: BorderRadius.circular(
+                        TDTheme.of(context).radiusDefault)),
+                height: 48,
+                width: 48,
+              ),
+              const Positioned(
+                child: TDBadge(
+                  TDBadgeType.message,
+                  count: '0',
+                ),
+                right: 0,
+                top: 0,
+              )
+            ],
           ),
-          const Positioned(
-            child: TDBadge(
-              TDBadgeType.message,
-              count: '0',
-            ),
-            right: 0,
-            top: 0,
-          )
-        ],
-      ),
-    );
+        ));
   }
 
   @Demo(group: 'badge')
   Widget _buildCustomBadgeWithoutShowingNumberZero(BuildContext context) {
-    return SizedBox(
-      width: 64,
-      height: 56,
-      child: Stack(
+    return Container(
         alignment: Alignment.bottomLeft,
-        children: [
-          Container(
-            child: const Icon(TDIcons.notification),
-            decoration: BoxDecoration(
-                color: TDTheme.of(context).grayColor2,
-                borderRadius:
-                    BorderRadius.circular(TDTheme.of(context).radiusDefault)),
-            height: 48,
-            width: 48,
+        margin: const EdgeInsets.only(top: 8, left: 16, right: 16, bottom: 8),
+        child: SizedBox(
+          width: 64,
+          height: 56,
+          child: Stack(
+            alignment: Alignment.bottomLeft,
+            children: [
+              Container(
+                child: const Icon(TDIcons.notification),
+                decoration: BoxDecoration(
+                    color: TDTheme.of(context).grayColor2,
+                    borderRadius: BorderRadius.circular(
+                        TDTheme.of(context).radiusDefault)),
+                height: 48,
+                width: 48,
+              ),
+              const Positioned(
+                child: TDBadge(
+                  TDBadgeType.message,
+                  count: '0',
+                  showZero: false,
+                ),
+                right: 0,
+                top: 0,
+              )
+            ],
           ),
-          const Positioned(
-            child: TDBadge(
-              TDBadgeType.message,
-              count: '0',
-              showZero: false,
-            ),
-            right: 0,
-            top: 0,
-          )
-        ],
-      ),
-    );
+        ));
   }
 
   @Demo(group: 'badge')
   Widget _buildCircleBadge(BuildContext context) {
-    return const Padding(
+    return Padding(
       padding: EdgeInsets.only(left: 16),
       child: Row(
         children: [
@@ -470,7 +414,7 @@ class _TDBadgePageState extends State<TDBadgePage> {
 
   @Demo(group: 'badge')
   Widget _buildSquareBadge(BuildContext context) {
-    return const Padding(
+    return Padding(
       padding: EdgeInsets.only(left: 16),
       child: Row(
         children: [
@@ -562,7 +506,7 @@ class _TDBadgePageState extends State<TDBadgePage> {
 
   @Demo(group: 'badge')
   Widget _buildLargeBadge(BuildContext context) {
-    return const Padding(
+    return Padding(
       padding: EdgeInsets.only(left: 16),
       child: Row(
         children: [
@@ -597,7 +541,7 @@ class _TDBadgePageState extends State<TDBadgePage> {
   Widget _buildMediumBadge(BuildContext context) {
     return Container(
       padding: const EdgeInsets.only(left: 16),
-      child: const Row(
+      child: Row(
         children: [
           SizedBox(
             width: 120,
@@ -627,57 +571,63 @@ class _TDBadgePageState extends State<TDBadgePage> {
 
   @Demo(group: 'badge')
   Widget _buildLessThanMaxCountBadge(BuildContext context) {
-    return const SizedBox(
-      width: 60,
-      height: 50,
-      child: Stack(
-        children: [
-          Positioned(
-            left: 0,
-            bottom: 0,
-            child: Icon(TDIcons.notification),
-          ),
-          Positioned(
-            child: TDBadge(
-              TDBadgeType.square,
-              count: '8888',
-              maxCount: '9000',
-              size: TDBadgeSize.large,
-              border: TDBadgeBorder.large,
-            ),
-            left: 18,
-            bottom: 18,
+    return Container(
+        alignment: Alignment.bottomLeft,
+        margin: const EdgeInsets.only(left: 16, right: 16, bottom: 8),
+        child: SizedBox(
+          width: 60,
+          height: 50,
+          child: Stack(
+            children: [
+              Positioned(
+                left: 0,
+                bottom: 0,
+                child: Icon(TDIcons.notification),
+              ),
+              Positioned(
+                child: TDBadge(
+                  TDBadgeType.square,
+                  count: '8888',
+                  maxCount: '9000',
+                  size: TDBadgeSize.large,
+                  border: TDBadgeBorder.large,
+                ),
+                left: 18,
+                bottom: 18,
+              ),
+            ],
           ),
-        ],
-      ),
-    );
+        ));
   }
 
   @Demo(group: 'badge')
   Widget _buildMoreThanMaxCountBadge(BuildContext context) {
-    return const SizedBox(
-      width: 60,
-      height: 50,
-      child: Stack(
-        children: [
-          Positioned(
-            left: 0,
-            bottom: 0,
-            child: Icon(TDIcons.notification),
-          ),
-          Positioned(
-            child: TDBadge(
-              TDBadgeType.square,
-              count: '888',
-              maxCount: '99',
-              size: TDBadgeSize.large,
-              border: TDBadgeBorder.large,
-            ),
-            left: 18,
-            bottom: 18,
+    return Container(
+        alignment: Alignment.bottomLeft,
+        margin: const EdgeInsets.only(left: 16, right: 16, bottom: 8),
+        child: SizedBox(
+          width: 60,
+          height: 50,
+          child: Stack(
+            children: [
+              Positioned(
+                left: 0,
+                bottom: 0,
+                child: Icon(TDIcons.notification),
+              ),
+              Positioned(
+                child: TDBadge(
+                  TDBadgeType.square,
+                  count: '888',
+                  maxCount: '99',
+                  size: TDBadgeSize.large,
+                  border: TDBadgeBorder.large,
+                ),
+                left: 18,
+                bottom: 18,
+              ),
+            ],
           ),
-        ],
-      ),
-    );
+        ));
   }
 }

From f7d26a6253b3c0b3a16fe7fc72da56f2a4caf0f6 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Sun, 7 Jul 2024 21:31:03 +0800
Subject: [PATCH 07/74] =?UTF-8?q?=E6=96=B0=E5=A2=9Etd=5Ffooter=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/example/lib/config.dart     |   6 +-
 .../example/lib/page/td_footer_page.dart      |  72 ++++++++++
 .../lib/src/components/footer/td_footer.dart  | 131 ++++++++++++++++++
 tdesign-component/lib/tdesign_flutter.dart    |   1 +
 4 files changed, 206 insertions(+), 4 deletions(-)
 create mode 100644 tdesign-component/example/lib/page/td_footer_page.dart
 create mode 100644 tdesign-component/lib/src/components/footer/td_footer.dart

diff --git a/tdesign-component/example/lib/config.dart b/tdesign-component/example/lib/config.dart
index 0f52c8843..572353d25 100644
--- a/tdesign-component/example/lib/config.dart
+++ b/tdesign-component/example/lib/config.dart
@@ -19,6 +19,7 @@ import 'page/td_divider_page.dart';
 import 'page/td_dropdown_menu_page.dart';
 import 'page/td_empty_page.dart';
 import 'page/td_font_page.dart';
+import 'page/td_footer_page.dart';
 import 'page/td_icon_page.dart';
 import 'page/td_image_page.dart';
 import 'page/td_input_page.dart';
@@ -162,10 +163,7 @@ Map<String, List<ExamplePageModel>> exampleMap = {
     ExamplePageModel(
         text: 'Empty 空状态', name: 'empty', pageBuilder: _wrapInheritedTheme((context) => const TDEmptyPage())),
     ExamplePageModel(
-        text: 'Footer 页脚',
-        name: 'footer',
-        isTodo: true,
-        pageBuilder: _wrapInheritedTheme((context) => const TodoPage())),
+        text: 'Footer 页脚', name: 'footer', pageBuilder: _wrapInheritedTheme((context) => const TDFooterPage())),
     ExamplePageModel(
         text: 'Grid 宫格', name: 'grid', isTodo: true, pageBuilder: _wrapInheritedTheme((context) => const TodoPage())),
     ExamplePageModel(
diff --git a/tdesign-component/example/lib/page/td_footer_page.dart b/tdesign-component/example/lib/page/td_footer_page.dart
new file mode 100644
index 000000000..4a4d1fa30
--- /dev/null
+++ b/tdesign-component/example/lib/page/td_footer_page.dart
@@ -0,0 +1,72 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:tdesign_flutter/tdesign_flutter.dart';
+import '../../base/example_widget.dart';
+import '../annotation/demo.dart';
+
+class TDFooterPage extends StatefulWidget {
+  const TDFooterPage({Key? key}) : super(key: key);
+
+  @override
+  State<StatefulWidget> createState() => _TDFooterPageState();
+}
+
+class _TDFooterPageState extends State<TDFooterPage> {
+  @override
+  Widget build(BuildContext context) {
+    return ExamplePage(
+      title: tdTitle(),
+      desc: '可以折叠/展开的内容区域。',
+      exampleCodeGroup: 'footer',
+      children: [
+        ExampleModule(
+          title: '组件类型',
+          children: [
+            ExampleItem(desc: '基础页脚', builder: _buildFooter),
+            ExampleItem(desc: '基础加链接页脚', builder: _buildSingleLinkFooter),
+            ExampleItem(desc: '', builder: _buildLinksFooter),
+            ExampleItem(desc: '品牌页脚', builder: _buildBrandFooter),
+          ],
+        ),
+      ],
+    );
+  }
+
+  @Demo(group: 'footer')
+  Widget _buildFooter(BuildContext context) {
+    return TDFooter();
+  }
+
+  @Demo(group: 'footer')
+  Widget _buildSingleLinkFooter(BuildContext context) {
+    // 示例链接列表
+    final singleLink = <LinkObj>[
+      LinkObj(name: '底部链接', uri: Uri.parse('https://example.com')),
+    ];
+
+    return TDFooter(
+      links: singleLink,
+    );
+  }
+
+  @Demo(group: 'footer')
+  Widget _buildLinksFooter(BuildContext context) {
+    final links = <LinkObj>[
+      LinkObj(name: '底部链接', uri: Uri.parse('https://example.com')),
+      LinkObj(name: '底部链接', uri: Uri.parse('https://example.com')),
+    ];
+    return TDFooter(
+      links: links,
+    );
+  }
+
+  @Demo(group: 'footer')
+  Widget _buildBrandFooter(BuildContext context) {
+    return TDFooter(
+      logo: 'assets/img/td_brand.png',
+      width: 204,
+      height: 48,
+    );
+  }
+
+}
diff --git a/tdesign-component/lib/src/components/footer/td_footer.dart b/tdesign-component/lib/src/components/footer/td_footer.dart
new file mode 100644
index 000000000..4201b9ee8
--- /dev/null
+++ b/tdesign-component/lib/src/components/footer/td_footer.dart
@@ -0,0 +1,131 @@
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import '../../../tdesign_flutter.dart';
+
+
+class TDFooter extends StatefulWidget {
+  const TDFooter({
+    Key? key,
+    this.logo,
+    this.text = 'Copyright © 2019-2023 TDesign.All Rights Reserved.',
+    this.links = const [],
+    this.width,
+    this.height,
+  }) : super(key: key);
+
+  /// 品牌图片
+  final String? logo;
+
+  /// 文字
+  final String text;
+
+  /// 自定义图片宽
+  final double? width;
+
+  /// 自定义图片高
+  final double? height;
+
+  /// 链接
+  final List<LinkObj> links;
+
+  @override
+  State<TDFooter> createState() => _TDFooterState();
+}
+
+class _TDFooterState extends State<TDFooter> {
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      alignment: Alignment.center,
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          if (widget.logo != null)
+            _renderLogo()
+          else if (widget.links.isNotEmpty)
+            _renderLinks()
+          else
+            _renderText(),
+        ],
+      ),
+    );
+  }
+
+  Widget _renderLogo() {
+    return Container(
+        color: TDTheme.of(context).whiteColor1,
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Padding(
+              padding: const EdgeInsets.only(top: 4, bottom: 4),
+              child: Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    TDImage(
+                      assetUrl: widget.logo,
+                      type: TDImageType.clip,
+                      width: widget.width,
+                      height: widget.height,
+                    ),
+                  ]
+              ),
+            )
+          ]
+        ));
+  }
+
+  Widget _renderLinks() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(top: 4, bottom: 4),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: widget.links.map((link) {
+              return Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 4),
+                child: TDLink(
+                    type: TDLinkType.basic,
+                    style: TDLinkStyle.primary,
+                    label: link.name,
+                    uri: link.uri)
+              );
+            }).toList(),
+          ),
+        ),
+        Padding(
+          padding: const EdgeInsets.only(bottom: 4),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              _renderText()
+            ]
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _renderText() {
+    return Text(
+      widget.text,
+      textAlign: TextAlign.center,
+      style: TextStyle(
+        fontSize: 12,
+        color: TDTheme.of(context).fontGyColor3,
+      ),
+    );
+  }
+}
+
+class LinkObj {
+  LinkObj({
+    required this.name,
+    this.uri,
+  });
+
+  final String name;
+  final Uri? uri;
+}
diff --git a/tdesign-component/lib/tdesign_flutter.dart b/tdesign-component/lib/tdesign_flutter.dart
index daab20a59..c68e4eea2 100644
--- a/tdesign-component/lib/tdesign_flutter.dart
+++ b/tdesign-component/lib/tdesign_flutter.dart
@@ -11,6 +11,7 @@ export 'src/components/divider/td_divider.dart';
 export 'src/components/dropdown_menu/td_dropdown_item.dart';
 export 'src/components/dropdown_menu/td_dropdown_menu.dart';
 export 'src/components/empty/td_empty.dart';
+export 'src/components/footer/td_footer.dart';
 export 'src/components/icon/td_icons.dart';
 export 'src/components/image/image_widget.dart';
 export 'src/components/image/td_image.dart';

From 637cd1cb476cac7896539b227d1291496cabe686 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Tue, 9 Jul 2024 18:09:40 +0800
Subject: [PATCH 08/74] =?UTF-8?q?td=5Ffooter=5Fpage=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_footer_page.dart      |  9 +-
 tdesign-component/example/pubspec.lock        | 82 +++++++++----------
 2 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_footer_page.dart b/tdesign-component/example/lib/page/td_footer_page.dart
index 4a4d1fa30..1f99a1404 100644
--- a/tdesign-component/example/lib/page/td_footer_page.dart
+++ b/tdesign-component/example/lib/page/td_footer_page.dart
@@ -55,8 +55,13 @@ class _TDFooterPageState extends State<TDFooterPage> {
       LinkObj(name: '底部链接', uri: Uri.parse('https://example.com')),
       LinkObj(name: '底部链接', uri: Uri.parse('https://example.com')),
     ];
-    return TDFooter(
-      links: links,
+    return Column(
+      children: [
+        SizedBox(height: 12),
+        TDFooter(
+          links: links,
+        )
+      ],
     );
   }
 
diff --git a/tdesign-component/example/pubspec.lock b/tdesign-component/example/pubspec.lock
index 80ce68064..34bd8d04b 100644
--- a/tdesign-component/example/pubspec.lock
+++ b/tdesign-component/example/pubspec.lock
@@ -6,7 +6,7 @@ packages:
     description:
       name: args
       sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.5.0"
   async:
@@ -14,7 +14,7 @@ packages:
     description:
       name: async
       sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
   boolean_selector:
@@ -22,7 +22,7 @@ packages:
     description:
       name: boolean_selector
       sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
   characters:
@@ -30,7 +30,7 @@ packages:
     description:
       name: characters
       sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
   clock:
@@ -38,7 +38,7 @@ packages:
     description:
       name: clock
       sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
   collection:
@@ -46,7 +46,7 @@ packages:
     description:
       name: collection
       sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.17.1"
   cupertino_icons:
@@ -54,7 +54,7 @@ packages:
     description:
       name: cupertino_icons
       sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.6"
   fake_async:
@@ -62,7 +62,7 @@ packages:
     description:
       name: fake_async
       sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
   ffi:
@@ -70,7 +70,7 @@ packages:
     description:
       name: ffi
       sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
   flutter:
@@ -83,7 +83,7 @@ packages:
     description:
       name: flutter_easyrefresh
       sha256: "5d161ee5dcac34da9065116568147d742dd25fb9bff3b10024d9054b195087ad"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.2"
   flutter_lints:
@@ -91,7 +91,7 @@ packages:
     description:
       name: flutter_lints
       sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
   flutter_localizations:
@@ -104,7 +104,7 @@ packages:
     description:
       name: flutter_markdown
       sha256: "21b085a1c185e46701373866144ced56cfb7a0c33f63c916bb8fe2d0c1491278"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.6.19"
   flutter_swiper_null_safety:
@@ -112,7 +112,7 @@ packages:
     description:
       name: flutter_swiper_null_safety
       sha256: "5a855e0080d035c08e82f8b7fd2f106344943a30c9ab483b2584860a2f22eaaf"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
   flutter_test:
@@ -125,7 +125,7 @@ packages:
     description:
       name: http
       sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.13.6"
   http_parser:
@@ -133,7 +133,7 @@ packages:
     description:
       name: http_parser
       sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
   intl:
@@ -141,7 +141,7 @@ packages:
     description:
       name: intl
       sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.18.0"
   js:
@@ -149,7 +149,7 @@ packages:
     description:
       name: js
       sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.6.7"
   lints:
@@ -157,7 +157,7 @@ packages:
     description:
       name: lints
       sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
   markdown:
@@ -165,7 +165,7 @@ packages:
     description:
       name: markdown
       sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "7.1.1"
   matcher:
@@ -173,7 +173,7 @@ packages:
     description:
       name: matcher
       sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.12.15"
   material_color_utilities:
@@ -181,7 +181,7 @@ packages:
     description:
       name: material_color_utilities
       sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.2.0"
   meta:
@@ -189,7 +189,7 @@ packages:
     description:
       name: meta
       sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.9.1"
   path:
@@ -197,7 +197,7 @@ packages:
     description:
       name: path
       sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.8.3"
   path_provider:
@@ -205,7 +205,7 @@ packages:
     description:
       name: path_provider
       sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
   path_provider_android:
@@ -213,7 +213,7 @@ packages:
     description:
       name: path_provider_android
       sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.2"
   path_provider_foundation:
@@ -221,7 +221,7 @@ packages:
     description:
       name: path_provider_foundation
       sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.3.2"
   path_provider_linux:
@@ -229,7 +229,7 @@ packages:
     description:
       name: path_provider_linux
       sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.1"
   path_provider_platform_interface:
@@ -237,7 +237,7 @@ packages:
     description:
       name: path_provider_platform_interface
       sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
   path_provider_windows:
@@ -245,7 +245,7 @@ packages:
     description:
       name: path_provider_windows
       sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.1"
   platform:
@@ -253,7 +253,7 @@ packages:
     description:
       name: platform
       sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.4"
   plugin_platform_interface:
@@ -261,7 +261,7 @@ packages:
     description:
       name: plugin_platform_interface
       sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
   sky_engine:
@@ -274,7 +274,7 @@ packages:
     description:
       name: source_span
       sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.9.1"
   stack_trace:
@@ -282,7 +282,7 @@ packages:
     description:
       name: stack_trace
       sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.11.0"
   stream_channel:
@@ -290,7 +290,7 @@ packages:
     description:
       name: stream_channel
       sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
   string_scanner:
@@ -298,7 +298,7 @@ packages:
     description:
       name: string_scanner
       sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
   tdesign_flutter:
@@ -313,7 +313,7 @@ packages:
     description:
       name: term_glyph
       sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
   test_api:
@@ -321,7 +321,7 @@ packages:
     description:
       name: test_api
       sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.5.1"
   typed_data:
@@ -329,7 +329,7 @@ packages:
     description:
       name: typed_data
       sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.2"
   vector_math:
@@ -337,7 +337,7 @@ packages:
     description:
       name: vector_math
       sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
   win32:
@@ -345,7 +345,7 @@ packages:
     description:
       name: win32
       sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "5.0.9"
   xdg_directories:
@@ -353,7 +353,7 @@ packages:
     description:
       name: xdg_directories
       sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
 sdks:

From 28d1560a207ebfc46336a80f435756b7a1ef3120 Mon Sep 17 00:00:00 2001
From: iamitis <221250009@smail.nju.edu.cn>
Date: Wed, 10 Jul 2024 15:29:07 +0800
Subject: [PATCH 09/74] =?UTF-8?q?=E2=80=9C=E5=85=B3=E4=BA=8E=E6=88=91?=
 =?UTF-8?q?=E4=BB=AC=E2=80=9D=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=8F=91?=
 =?UTF-8?q?=E7=89=88=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/example/assets/publish_time |  1 +
 tdesign-component/example/lib/about.dart      | 13 +++++++++++--
 tdesign-component/example/pubspec.yaml        |  3 ++-
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 tdesign-component/example/assets/publish_time

diff --git a/tdesign-component/example/assets/publish_time b/tdesign-component/example/assets/publish_time
new file mode 100644
index 000000000..36add3bab
--- /dev/null
+++ b/tdesign-component/example/assets/publish_time
@@ -0,0 +1 @@
+1719244800000
\ No newline at end of file
diff --git a/tdesign-component/example/lib/about.dart b/tdesign-component/example/lib/about.dart
index affcaceb8..c12f809c0 100644
--- a/tdesign-component/example/lib/about.dart
+++ b/tdesign-component/example/lib/about.dart
@@ -13,10 +13,13 @@ class _AboutPageState extends State<AboutPage> {
 
   String? version;
 
+  String? publishTime;
+
   @override
   void initState() {
     super.initState();
     _getVersion();
+    _getPublishTime();
   }
 
   Future<void> _getVersion() async {
@@ -24,7 +27,12 @@ class _AboutPageState extends State<AboutPage> {
     setState(() {});
   }
   
-  
+  Future<void> _getPublishTime() async {
+    var timeStamp = await rootBundle.loadString('assets/publish_time');
+    var exactTime = DateTime.fromMillisecondsSinceEpoch(int.parse(timeStamp));
+    publishTime = '${exactTime.year}-${exactTime.month}-${exactTime.day}';
+    setState(() {});
+  }
 
 
   @override
@@ -35,7 +43,8 @@ class _AboutPageState extends State<AboutPage> {
       body: SingleChildScrollView(
         child: Column(
           children: [
-            demoRow(context, '版本号：',desc: version)
+            demoRow(context, '版本号：',desc: version),
+            demoRow(context, '发版日期：', desc: publishTime)
           ],
         ),
       ),
diff --git a/tdesign-component/example/pubspec.yaml b/tdesign-component/example/pubspec.yaml
index 050fdbb5c..c2635a8f6 100644
--- a/tdesign-component/example/pubspec.yaml
+++ b/tdesign-component/example/pubspec.yaml
@@ -105,4 +105,5 @@ flutter:
     - assets/code/
     - assets/version
     - assets/img/
-    - assets/theme.json
\ No newline at end of file
+    - assets/theme.json
+    - assets/publish_time
\ No newline at end of file

From 45701d6ae0e9ca43bd310881fd3801165b4af549 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Wed, 10 Jul 2024 20:03:02 +0800
Subject: [PATCH 10/74] =?UTF-8?q?td=5Fbadge=20=E7=A4=BA=E4=BE=8B=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BB=84=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?ignoreCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/example/lib/page/td_badge_page.dart | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tdesign-component/example/lib/page/td_badge_page.dart b/tdesign-component/example/lib/page/td_badge_page.dart
index b0b0f63ba..d81df2424 100644
--- a/tdesign-component/example/lib/page/td_badge_page.dart
+++ b/tdesign-component/example/lib/page/td_badge_page.dart
@@ -23,6 +23,7 @@ class _TDBadgePageState extends State<TDBadgePage> {
           children: [
             ExampleItem(
                 desc: '红点徽标',
+                ignoreCode: true,
                 builder: (context) {
                   return Row(
                     crossAxisAlignment: CrossAxisAlignment.center,
@@ -39,8 +40,10 @@ class _TDBadgePageState extends State<TDBadgePage> {
                     ],
                   );
                 }),
+
             ExampleItem(
                 desc: '数字徽标',
+                ignoreCode: true,
                 builder: (context) {
                   return Row(
                     crossAxisAlignment: CrossAxisAlignment.center,
@@ -59,6 +62,7 @@ class _TDBadgePageState extends State<TDBadgePage> {
                 }),
             ExampleItem(
                 desc: '自定义徽标',
+                ignoreCode: true,
                 builder: (context) {
                   return Row(
                     crossAxisAlignment: CrossAxisAlignment.center,

From 0a40b8373ada5a96fff3ac64a3b0bd86ab9d3117 Mon Sep 17 00:00:00 2001
From: plus7c <1959512279@qq.com>
Date: Mon, 15 Jul 2024 14:09:07 +0800
Subject: [PATCH 11/74] =?UTF-8?q?refactor:=20image=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=BC=94=E7=A4=BA=E4=BB=A3=E7=A0=81=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/assets/code/image._failCustom.txt |  11 +
 .../assets/code/image._failDefault.txt        |   4 +
 .../assets/code/image._imageCircle.txt        |   6 +
 .../example/assets/code/image._imageClip.txt  |  89 +-
 .../example/assets/code/image._imageFile.txt  |  10 +
 .../assets/code/image._imageFitHeight.txt     |   4 +
 .../assets/code/image._imageFitWidth.txt      |  39 +-
 .../assets/code/image._imageRoundedSquare.txt |   6 +
 .../assets/code/image._imageSquare.txt        |  78 +-
 .../assets/code/image._imageStretch.txt       |   6 +
 .../assets/code/image._loadingCustom.txt      |  13 +
 .../assets/code/image._loadingDefault.txt     |   5 +
 .../example/lib/page/td_image_page.dart       | 856 +++++++++++-------
 13 files changed, 603 insertions(+), 524 deletions(-)
 create mode 100644 tdesign-component/example/assets/code/image._failCustom.txt
 create mode 100644 tdesign-component/example/assets/code/image._failDefault.txt
 create mode 100644 tdesign-component/example/assets/code/image._imageCircle.txt
 create mode 100644 tdesign-component/example/assets/code/image._imageFile.txt
 create mode 100644 tdesign-component/example/assets/code/image._imageFitHeight.txt
 create mode 100644 tdesign-component/example/assets/code/image._imageRoundedSquare.txt
 create mode 100644 tdesign-component/example/assets/code/image._imageStretch.txt
 create mode 100644 tdesign-component/example/assets/code/image._loadingCustom.txt
 create mode 100644 tdesign-component/example/assets/code/image._loadingDefault.txt

diff --git a/tdesign-component/example/assets/code/image._failCustom.txt b/tdesign-component/example/assets/code/image._failCustom.txt
new file mode 100644
index 000000000..8097845c9
--- /dev/null
+++ b/tdesign-component/example/assets/code/image._failCustom.txt
@@ -0,0 +1,11 @@
+const TDImage(
+                imgUrl: 'error',
+                errorWidget: TDText(
+                  '加载失败',
+                  forceVerticalCenter: true,
+                  font: TDTheme.of(context).fontBodyExtraSmall,
+                  fontWeight: FontWeight.w500,
+                  textColor: TDTheme.of(context).fontGyColor3,
+                ),
+                type: TDImageType.roundedSquare,
+              )
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/image._failDefault.txt b/tdesign-component/example/assets/code/image._failDefault.txt
new file mode 100644
index 000000000..8400f238f
--- /dev/null
+++ b/tdesign-component/example/assets/code/image._failDefault.txt
@@ -0,0 +1,4 @@
+const TDImage(
+                imgUrl: 'error',
+                type: TDImageType.roundedSquare,
+              )
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/image._imageCircle.txt b/tdesign-component/example/assets/code/image._imageCircle.txt
new file mode 100644
index 000000000..a281b5fa9
--- /dev/null
+++ b/tdesign-component/example/assets/code/image._imageCircle.txt
@@ -0,0 +1,6 @@
+const TDImage(
+                assetUrl: 'assets/img/image.png',
+                width: 72,
+                height: 72,
+                type: TDImageType.circle,
+              )
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/image._imageClip.txt b/tdesign-component/example/assets/code/image._imageClip.txt
index c0afade42..9ab89afa9 100644
--- a/tdesign-component/example/assets/code/image._imageClip.txt
+++ b/tdesign-component/example/assets/code/image._imageClip.txt
@@ -1,85 +1,4 @@
-
-  Widget _imageClip(BuildContext context)  {
-
-    return Row(
-      children: [
-        const SizedBox(
-          width: 16,
-        ),
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsets.only(bottom: 16),
-              child: TDText(
-                '裁剪',
-                font: TDTheme.of(context).fontBodyMedium,
-                textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-              ),
-            ),
-             const TDImage(
-               assetUrl: 'assets/img/image.png',
-               type: TDImageType.clip,
-            ),
-          ],
-        ),
-        const SizedBox(
-          width: 24,
-        ),
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsets.only(bottom: 16),
-              child: TDText(
-                '适应高',
-                font: TDTheme.of(context).fontBodyMedium,
-                textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-              ),
-            ),
-            Container(
-              width: 89,
-              height: 72,
-              color: Colors.black,
-              child: const TDImage(
-                assetUrl: 'assets/img/image.png',
-                type: TDImageType.fitHeight,
-              ),
-            ),
-          ],
-        ),
-        const SizedBox(
-          width: 24,
-        ),
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsets.only(bottom: 16),
-              child: TDText(
-                '拉伸',
-                font: TDTheme.of(context).fontBodyMedium,
-                textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-              ),
-            ),
-            Container(
-              color: Colors.black,
-              width: 121,
-              height: 72,
-              child: Stack(
-                alignment: Alignment.center,
-                children: const [
-                  TDImage(
-                    assetUrl: 'assets/img/image.png',
-                    width: 121,
-                    height: 50,
-                    type: TDImageType.stretch,
-                  ),
-                ],
-              ),
-            ),
-          ],
-        )
-      ],
-    );
-  }
\ No newline at end of file
+const TDImage(
+          assetUrl: 'assets/img/image.png',
+          type: TDImageType.clip,
+        )
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/image._imageFile.txt b/tdesign-component/example/assets/code/image._imageFile.txt
new file mode 100644
index 000000000..23fa1f59e
--- /dev/null
+++ b/tdesign-component/example/assets/code/image._imageFile.txt
@@ -0,0 +1,10 @@
+Widget _imageFile(BuildContext context) {
+    return Container(
+      width: 72,
+      height: 72,
+      child: TDImage(
+        imageFile: File('/sdcard/td/test.jpg'),
+        type: TDImageType.fitWidth,
+      ),
+    );
+  }
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/image._imageFitHeight.txt b/tdesign-component/example/assets/code/image._imageFitHeight.txt
new file mode 100644
index 000000000..f475ac312
--- /dev/null
+++ b/tdesign-component/example/assets/code/image._imageFitHeight.txt
@@ -0,0 +1,4 @@
+const TDImage(
+            assetUrl: 'assets/img/image.png',
+            type: TDImageType.fitHeight,
+          )
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/image._imageFitWidth.txt b/tdesign-component/example/assets/code/image._imageFitWidth.txt
index 3ff359b1b..9a8a99802 100644
--- a/tdesign-component/example/assets/code/image._imageFitWidth.txt
+++ b/tdesign-component/example/assets/code/image._imageFitWidth.txt
@@ -1,35 +1,4 @@
-
-  Widget _imageFitWidth(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(top: 24),
-      child: Row(
-        children: [
-          const SizedBox(
-            width: 16,
-          ),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(bottom: 16),
-                child: TDText(
-                  '适应宽',
-                  font: TDTheme.of(context).fontBodyMedium,
-                  textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-                ),
-              ),
-              Container(
-                width: 72,
-                height: 89,
-                color: Colors.black,
-                child: const TDImage(
-                  assetUrl: 'assets/img/image.png',
-                  type: TDImageType.fitWidth,
-                ),
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
\ No newline at end of file
+const TDImage(
+            assetUrl: 'assets/img/image.png',
+            type: TDImageType.fitWidth
+            )
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/image._imageRoundedSquare.txt b/tdesign-component/example/assets/code/image._imageRoundedSquare.txt
new file mode 100644
index 000000000..c6175246c
--- /dev/null
+++ b/tdesign-component/example/assets/code/image._imageRoundedSquare.txt
@@ -0,0 +1,6 @@
+const TDImage(
+                assetUrl: 'assets/img/image.png',
+                type: TDImageType.roundedSquare,
+                width: 72,
+                height: 72,
+              )
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/image._imageSquare.txt b/tdesign-component/example/assets/code/image._imageSquare.txt
index 92f354459..76b20a758 100644
--- a/tdesign-component/example/assets/code/image._imageSquare.txt
+++ b/tdesign-component/example/assets/code/image._imageSquare.txt
@@ -1,74 +1,4 @@
-
-  Widget _imageSquare(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(top: 24),
-      child: Row(
-        children: [
-          const SizedBox(
-            width: 16,
-          ),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(bottom: 16),
-                child: TDText(
-                  '方形',
-                  font: TDTheme.of(context).fontBodyMedium,
-                  textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-                ),
-              ),
-              const TDImage(
-                assetUrl: 'assets/img/image.png',
-                type: TDImageType.square,
-              ),
-            ],
-          ),
-          const SizedBox(
-            width: 24,
-          ),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(bottom: 16),
-                child: TDText(
-                  '圆角方形',
-                  font: TDTheme.of(context).fontBodyMedium,
-                  textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-                ),
-              ),
-              const TDImage(
-                assetUrl: 'assets/img/image.png',
-                type: TDImageType.roundedSquare,
-                width: 72,
-                height: 72,
-              ),
-            ],
-          ),
-          const SizedBox(
-            width: 24,
-          ),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(bottom: 16),
-                child: TDText(
-                  '圆形',
-                  font: TDTheme.of(context).fontBodyMedium,
-                  textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-                ),
-              ),
-              const TDImage(
-                assetUrl: 'assets/img/image.png',
-                width: 72,
-                height: 72,
-                type: TDImageType.circle,
-              ),
-            ],
-          )
-        ],
-      ),
-    );
-  }
\ No newline at end of file
+const TDImage(
+          assetUrl: 'assets/img/image.png',
+          type: TDImageType.square,
+        )
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/image._imageStretch.txt b/tdesign-component/example/assets/code/image._imageStretch.txt
new file mode 100644
index 000000000..92f0e7814
--- /dev/null
+++ b/tdesign-component/example/assets/code/image._imageStretch.txt
@@ -0,0 +1,6 @@
+const TDImage(
+                assetUrl: 'assets/img/image.png',
+                width: 121,
+                height: 50,
+                type: TDImageType.stretch,
+              )
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/image._loadingCustom.txt b/tdesign-component/example/assets/code/image._loadingCustom.txt
new file mode 100644
index 000000000..999c50e3e
--- /dev/null
+++ b/tdesign-component/example/assets/code/image._loadingCustom.txt
@@ -0,0 +1,13 @@
+const TDImage(
+              imgUrl:
+                  'https://images.pexels.com/photos/842711/pexels-photo-842711.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=2',
+              loadingWidget: RotationTransition(
+                  turns: animation,
+                  alignment: Alignment.center,
+                  child: TDCircleIndicator(
+                    color: TDTheme.of(context).brandNormalColor,
+                    size: 18,
+                    lineWidth: 3,
+                  )),
+              type: TDImageType.roundedSquare,
+            ),
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/image._loadingDefault.txt b/tdesign-component/example/assets/code/image._loadingDefault.txt
new file mode 100644
index 000000000..b26caeb75
--- /dev/null
+++ b/tdesign-component/example/assets/code/image._loadingDefault.txt
@@ -0,0 +1,5 @@
+const TDImage(
+          imgUrl:
+              'https://images.pexels.com/photos/842711/pexels-photo-842711.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=2',
+          type: TDImageType.roundedSquare,
+        ),
\ No newline at end of file
diff --git a/tdesign-component/example/lib/page/td_image_page.dart b/tdesign-component/example/lib/page/td_image_page.dart
index e20a36c6a..a48b7e42c 100644
--- a/tdesign-component/example/lib/page/td_image_page.dart
+++ b/tdesign-component/example/lib/page/td_image_page.dart
@@ -5,6 +5,7 @@ import 'package:tdesign_flutter/tdesign_flutter.dart';
 import '../../base/example_widget.dart';
 import '../annotation/demo.dart';
 import 'dart:io';
+
 class TDImagePage extends StatefulWidget {
   const TDImagePage({Key? key}) : super(key: key);
 
@@ -34,390 +35,585 @@ class TDImageState extends State<TDImagePage>
   @override
   Widget build(BuildContext context) {
     return ExamplePage(
-        title: tdTitle(),
-        exampleCodeGroup: 'image',
-        desc: '用于展示效果，主要为上下左右居中裁切、拉伸、平铺等方式。',
-        children: [
-          ExampleModule(
-            title: '组件类型',
-            children: [
-              ExampleItem(desc: '', builder: _imageClip),
-              ExampleItem(desc: '', builder: _imageFitWidth),
-              ExampleItem(desc: '', builder: _imageSquare),
-            ],
-          ),
-          ExampleModule(
-            title: '组件状态',
-            children: [
-              ExampleItem(desc: '', builder: _loading),
-              ExampleItem(desc: '', builder: _fail),
-            ],
-          )
-        ],
-     test: [
-       ExampleItem(desc: '加载本地文件', builder: _imageFile),
-     ],);
-  }
-  @Demo(group: 'image')
-  Widget _imageClip(BuildContext context)  {
-
-    return Row(
+      title: tdTitle(),
+      exampleCodeGroup: 'image',
+      desc: '用于展示效果，主要为上下左右居中裁切、拉伸、平铺等方式。',
       children: [
-        const SizedBox(
-          width: 16,
-        ),
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+        ExampleModule(
+          title: '组件类型',
           children: [
-            Padding(
-              padding: const EdgeInsets.only(bottom: 16),
-              child: TDText(
-                '裁剪',
-                font: TDTheme.of(context).fontBodyMedium,
-                textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-              ),
-            ),
-             const TDImage(
-               assetUrl: 'assets/img/image.png',
-               type: TDImageType.clip,
-            ),
+            ExampleItem(
+                ignoreCode: true,
+                desc: '',
+                builder: (context) {
+                  return Container(
+                    alignment: Alignment.topLeft,
+                    padding: const EdgeInsets.only(left: 8),
+                    child: Wrap(
+                      children: [
+                        Container(
+                          margin: const EdgeInsets.all(8),
+                          child: CodeWrapper(
+                            builder: _imageClip,
+                            methodName: '_imageClip',
+                          ),
+                        ),
+                        Container(
+                          margin: const EdgeInsets.all(8),
+                          child: CodeWrapper(
+                            builder: _imageStretch,
+                            methodName: '_imageStretch',
+                          ),
+                        ),
+                      ],
+                    ),
+                  );
+                }),
+            ExampleItem(
+                ignoreCode: true,
+                desc: '',
+                builder: (context) {
+                  return Container(
+                    alignment: Alignment.topLeft,
+                    padding: const EdgeInsets.only(left: 8),
+                    child: Wrap(
+                      children: [
+                        Container(
+                          margin: const EdgeInsets.all(8),
+                          child: CodeWrapper(
+                            builder: _imageFitHeight,
+                            methodName: '_imageFitHeight',
+                          ),
+                        ),
+                        Container(
+                          margin: const EdgeInsets.all(8),
+                          child: CodeWrapper(
+                            builder: _imageFitWidth,
+                            methodName: '_imageFitWidth',
+                          ),
+                        ),
+                      ],
+                    ),
+                  );
+                }),
+            ExampleItem(
+                ignoreCode: true,
+                desc: '',
+                builder: (context) {
+                  return Container(
+                    alignment: Alignment.topLeft,
+                    padding: const EdgeInsets.only(left: 8),
+                    child: Wrap(
+                      children: [
+                        Container(
+                          margin: const EdgeInsets.all(8),
+                          child: CodeWrapper(
+                            builder: _imageSquare,
+                            methodName: '_imageSquare',
+                          ),
+                        ),
+                        Container(
+                          margin: const EdgeInsets.all(8),
+                          child: CodeWrapper(
+                            builder: _imageRoundedSquare,
+                            methodName: '_imageRoundedSquare',
+                          ),
+                        ),
+                        Container(
+                          margin: const EdgeInsets.all(8),
+                          child: CodeWrapper(
+                            builder: _imageCircle,
+                            methodName: '_imageCircle',
+                          ),
+                        ),
+                      ],
+                    ),
+                  );
+                })
           ],
         ),
-        const SizedBox(
-          width: 24,
-        ),
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+        ExampleModule(
+          title: '组件状态',
           children: [
-            Padding(
-              padding: const EdgeInsets.only(bottom: 16),
-              child: TDText(
-                '适应高',
-                font: TDTheme.of(context).fontBodyMedium,
-                textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-              ),
-            ),
-            Container(
-              width: 89,
-              height: 72,
-              color: Colors.black,
-              child: const TDImage(
-                assetUrl: 'assets/img/image.png',
-                type: TDImageType.fitHeight,
-              ),
-            ),
+            ExampleItem(
+                ignoreCode: true,
+                desc: '',
+                builder: (context) {
+                  return Container(
+                    alignment: Alignment.topLeft,
+                    padding: const EdgeInsets.only(left: 8),
+                    child: Wrap(
+                      children: [
+                        Container(
+                          margin: const EdgeInsets.all(8),
+                          child: CodeWrapper(
+                            builder: _loadingDefault,
+                            methodName: '_loadingDefault',
+                          ),
+                        ),
+                        Container(
+                          margin: const EdgeInsets.all(8),
+                          child: CodeWrapper(
+                            builder: _loadingCustom,
+                            methodName: '_loadingCustom',
+                          ),
+                        ),
+                      ],
+                    ),
+                  );
+                }),
+            ExampleItem(
+                ignoreCode: true,
+                desc: '',
+                builder: (context) {
+                  return Container(
+                    alignment: Alignment.topLeft,
+                    padding: const EdgeInsets.only(left: 8),
+                    child: Wrap(
+                      children: [
+                        Container(
+                          margin: const EdgeInsets.all(8),
+                          child: CodeWrapper(
+                            builder: _failDefault,
+                            methodName: '_failDefault',
+                          ),
+                        ),
+                        Container(
+                          margin: const EdgeInsets.all(8),
+                          child: CodeWrapper(
+                            builder: _failCustom,
+                            methodName: '_failCustom',
+                          ),
+                        ),
+                      ],
+                    ),
+                  );
+                }),
           ],
+        )
+      ],
+      test: [
+        ExampleItem(
+            ignoreCode: true,
+            desc: '',
+            builder: (context) {
+              return Container(
+                alignment: Alignment.center,
+                padding: const EdgeInsets.only(left: 8),
+                child: Wrap(
+                  children: [
+                    Container(
+                      margin: const EdgeInsets.all(8),
+                      child: CodeWrapper(
+                        builder: _imageFile,
+                        methodName: '_imageFile',
+                      ),
+                    ),
+                  ],
+                ),
+              );
+            }),
+      ],
+    );
+  }
+
+  //     children: [
+  //       const SizedBox(
+  //         width: 16,
+  //       ),
+  //       Column(
+  //         crossAxisAlignment: CrossAxisAlignment.start,
+  //         children: [
+  //           Padding(
+  //             padding: const EdgeInsets.only(bottom: 16),
+  //             child: TDText(
+  //               '裁剪',
+  //               font: TDTheme.of(context).fontBodyMedium,
+  //               textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
+  //             ),
+  //           ),
+  //            const TDImage(
+  //              assetUrl: 'assets/img/image.png',
+  //              type: TDImageType.clip,
+  //           ),
+  //         ],
+  //       ),
+  //       const SizedBox(
+  //         width: 24,
+  //       ),
+  //       Column(
+  //         crossAxisAlignment: CrossAxisAlignment.start,
+  //         children: [
+  //           Padding(
+  //             padding: const EdgeInsets.only(bottom: 16),
+  //             child: TDText(
+  //               '适应高',
+  //               font: TDTheme.of(context).fontBodyMedium,
+  //               textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
+  //             ),
+  //           ),
+  //           Container(
+  //             width: 89,
+  //             height: 72,
+  //             color: Colors.black,
+  //             child: const TDImage(
+  //               assetUrl: 'assets/img/image.png',
+  //               type: TDImageType.fitHeight,
+  //             ),
+  //           ),
+  //         ],
+  //       ),
+  //       const SizedBox(
+  //         width: 24,
+  //       ),
+  //       Column(
+  //         crossAxisAlignment: CrossAxisAlignment.start,
+  //         children: [
+  //           Padding(
+  //             padding: const EdgeInsets.only(bottom: 16),
+  //             child: TDText(
+  //               '拉伸',
+  //               font: TDTheme.of(context).fontBodyMedium,
+  //               textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
+  //             ),
+  //           ),
+  //           Container(
+  //             color: Colors.black,
+  //             width: 121,
+  //             height: 72,
+  //             child: Stack(
+  //               alignment: Alignment.center,
+  //               children: const [
+  //                 TDImage(
+  //                   assetUrl: 'assets/img/image.png',
+  //                   width: 121,
+  //                   height: 50,
+  //                   type: TDImageType.stretch,
+  //                 ),
+  //               ],
+  //             ),
+  //           ),
+  //         ],
+  //       )
+  //     ],
+  //   );
+  // }
+
+  @Demo(group: 'image')
+  Widget _imageClip(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(bottom: 16),
+          child: TDText(
+            '裁剪',
+            font: TDTheme.of(context).fontBodyMedium,
+            textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
+          ),
         ),
-        const SizedBox(
-          width: 24,
+        const TDImage(
+          assetUrl: 'assets/img/image.png',
+          type: TDImageType.clip,
         ),
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsets.only(bottom: 16),
-              child: TDText(
-                '拉伸',
-                font: TDTheme.of(context).fontBodyMedium,
-                textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-              ),
-            ),
-            Container(
-              color: Colors.black,
-              width: 121,
-              height: 72,
-              child: Stack(
-                alignment: Alignment.center,
-                children: const [
-                  TDImage(
-                    assetUrl: 'assets/img/image.png',
-                    width: 121,
-                    height: 50,
-                    type: TDImageType.stretch,
-                  ),
-                ],
-              ),
-            ),
-          ],
-        )
       ],
     );
   }
 
   @Demo(group: 'image')
-  Widget _imageFitWidth(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(top: 24),
-      child: Row(
-        children: [
-          const SizedBox(
-            width: 16,
+  Widget _imageFitHeight(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(bottom: 16),
+          child: TDText(
+            '适应高',
+            font: TDTheme.of(context).fontBodyMedium,
+            textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
           ),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(bottom: 16),
-                child: TDText(
-                  '适应宽',
-                  font: TDTheme.of(context).fontBodyMedium,
-                  textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-                ),
-              ),
-              Container(
-                width: 72,
-                height: 89,
-                color: Colors.black,
-                child: const TDImage(
-                  assetUrl: 'assets/img/image.png',
-                  type: TDImageType.fitWidth,
-                ),
-              ),
-            ],
+        ),
+        Container(
+          width: 89,
+          height: 72,
+          color: Colors.black,
+          child: const TDImage(
+            assetUrl: 'assets/img/image.png',
+            type: TDImageType.fitHeight,
           ),
-        ],
-      ),
+        ),
+      ],
     );
   }
 
   @Demo(group: 'image')
-  Widget _imageSquare(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(top: 24),
-      child: Row(
-        children: [
-          const SizedBox(
-            width: 16,
+  Widget _imageStretch(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(bottom: 16),
+          child: TDText(
+            '拉伸',
+            font: TDTheme.of(context).fontBodyMedium,
+            textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
           ),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
+        ),
+        Container(
+          color: Colors.black,
+          width: 121,
+          height: 72,
+          child: const Stack(
+            alignment: Alignment.center,
             children: [
-              Padding(
-                padding: const EdgeInsets.only(bottom: 16),
-                child: TDText(
-                  '方形',
-                  font: TDTheme.of(context).fontBodyMedium,
-                  textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-                ),
-              ),
-              const TDImage(
+              TDImage(
                 assetUrl: 'assets/img/image.png',
-                type: TDImageType.square,
+                width: 121,
+                height: 50,
+                type: TDImageType.stretch,
               ),
             ],
           ),
-          const SizedBox(
-            width: 24,
-          ),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(bottom: 16),
-                child: TDText(
-                  '圆角方形',
-                  font: TDTheme.of(context).fontBodyMedium,
-                  textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-                ),
-              ),
-              const TDImage(
-                assetUrl: 'assets/img/image.png',
-                type: TDImageType.roundedSquare,
-                width: 72,
-                height: 72,
-              ),
-            ],
+        ),
+      ],
+    );
+  }
+
+  @Demo(group: 'image')
+  Widget _imageFitWidth(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(bottom: 16),
+          child: TDText(
+            '适应宽',
+            font: TDTheme.of(context).fontBodyMedium,
+            textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
           ),
-          const SizedBox(
-            width: 24,
+        ),
+        Container(
+          width: 72,
+          height: 89,
+          color: Colors.black,
+          child: const TDImage(
+            assetUrl: 'assets/img/image.png',
+            type: TDImageType.fitWidth,
           ),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(bottom: 16),
-                child: TDText(
-                  '圆形',
-                  font: TDTheme.of(context).fontBodyMedium,
-                  textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-                ),
-              ),
-              const TDImage(
-                assetUrl: 'assets/img/image.png',
-                width: 72,
-                height: 72,
-                type: TDImageType.circle,
-              ),
-            ],
-          )
-        ],
-      ),
+        ),
+      ],
     );
   }
 
   @Demo(group: 'image')
-  Widget _loading(BuildContext context) {
-    return Row(
+  Widget _imageSquare(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        const SizedBox(
-          width: 16,
+        Padding(
+          padding: const EdgeInsets.only(bottom: 16),
+          child: TDText(
+            '方形',
+            font: TDTheme.of(context).fontBodyMedium,
+            textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
+          ),
         ),
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsets.only(bottom: 16),
-              child: TDText(
-                '加载默认提示',
-                font: TDTheme.of(context).fontBodyMedium,
-                textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-              ),
-            ),
-            Container(
-                height: 72,
-                width: 72,
-                clipBehavior: Clip.hardEdge,
-                decoration: BoxDecoration(borderRadius: BorderRadius.circular(TDTheme.of(context).radiusDefault)),
-                child: Container(
-                    alignment: Alignment.center,
-                    color: TDTheme.of(context).grayColor2,
-                    child: Icon(
-                      TDIcons.ellipsis,
-                      size: 22,
-                      color: TDTheme.of(context).fontGyColor3,
-                    )
-                )
-            ),
-            // 实际组件写法如下：上面仅为加载展示
-            // const TDImage(
-            //   imgUrl:
-            //       'https://images.pexels.com/photos/842711/pexels-photo-842711.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=2',
-            //   type: TDImageType.roundedSquare,
-            // ),
-          ],
+        const TDImage(
+          assetUrl: 'assets/img/image.png',
+          type: TDImageType.square,
         ),
-        const SizedBox(
-          width: 24,
+      ],
+    );
+  }
+
+  @Demo(group: 'image')
+  Widget _imageRoundedSquare(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(bottom: 16),
+          child: TDText(
+            '圆角方形',
+            font: TDTheme.of(context).fontBodyMedium,
+            textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
+          ),
         ),
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsets.only(bottom: 16),
-              child: TDText(
-                '加载自定义提示',
-                font: TDTheme.of(context).fontBodyMedium,
-                textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-              ),
-            ),
-            Container(
-                height: 72,
-                width: 72,
-                clipBehavior: Clip.hardEdge,
-                decoration: BoxDecoration(borderRadius: BorderRadius.circular(TDTheme.of(context).radiusDefault)),
-                child: Container(
-                    alignment: Alignment.center,
-                    color: TDTheme.of(context).grayColor2,
-                    child: RotationTransition(
-                        turns: animation,
-                        alignment: Alignment.center,
-                        child: TDCircleIndicator(
-                          color: TDTheme.of(context).brandNormalColor,
-                          size: 18,
-                          lineWidth: 3,
-                        ))
-                )
-            ),
-            // 实际组件写法如下：上面仅为加载展示
-            // TDImage(
-            //   imgUrl:
-            //       'https://images.pexels.com/photos/842711/pexels-photo-842711.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=2',
-            //   loadingWidget: RotationTransition(
-            //       turns: animation,
-            //       alignment: Alignment.center,
-            //       child: TDCircleIndicator(
-            //         color: TDTheme.of(context).brandNormalColor,
-            //         size: 18,
-            //         lineWidth: 3,
-            //       )),
-            //   type: TDImageType.roundedSquare,
-            // ),
-          ],
+        const TDImage(
+          assetUrl: 'assets/img/image.png',
+          type: TDImageType.roundedSquare,
+          width: 72,
+          height: 72,
+        ),
+      ],
+    );
+  }
+
+  @Demo(group: 'image')
+  Widget _imageCircle(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(bottom: 16),
+          child: TDText(
+            '圆形',
+            font: TDTheme.of(context).fontBodyMedium,
+            textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
+          ),
         ),
-        const SizedBox(
-          width: 24,
+        const TDImage(
+          assetUrl: 'assets/img/image.png',
+          width: 72,
+          height: 72,
+          type: TDImageType.circle,
         ),
       ],
     );
   }
 
   @Demo(group: 'image')
-  Widget _fail(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(top: 24),
-      child: Row(
-        children: [
-          const SizedBox(
-            width: 16,
+  Widget _loadingDefault(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(bottom: 16),
+          child: TDText(
+            '加载默认提示',
+            font: TDTheme.of(context).fontBodyMedium,
+            textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
           ),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(bottom: 16),
-                child: TDText(
-                  '失败默认提示',
-                  font: TDTheme.of(context).fontBodyMedium,
-                  textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-                ),
-              ),
-              const TDImage(
-                imgUrl: 'error',
-                type: TDImageType.roundedSquare,
-              ),
-            ],
+        ),
+        Container(
+            height: 72,
+            width: 72,
+            clipBehavior: Clip.hardEdge,
+            decoration: BoxDecoration(
+                borderRadius:
+                    BorderRadius.circular(TDTheme.of(context).radiusDefault)),
+            child: Container(
+                alignment: Alignment.center,
+                color: TDTheme.of(context).grayColor2,
+                child: Icon(
+                  TDIcons.ellipsis,
+                  size: 22,
+                  color: TDTheme.of(context).fontGyColor3,
+                ))),
+        // 实际组件写法如下：上面仅为加载展示
+        // const TDImage(
+        //   imgUrl:
+        //       'https://images.pexels.com/photos/842711/pexels-photo-842711.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=2',
+        //   type: TDImageType.roundedSquare,
+        // ),
+      ],
+    );
+  }
+
+  @Demo(group: 'image')
+  Widget _loadingCustom(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(bottom: 16),
+          child: TDText(
+            '加载自定义提示',
+            font: TDTheme.of(context).fontBodyMedium,
+            textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
           ),
-          const SizedBox(
-            width: 24,
+        ),
+        Container(
+            height: 72,
+            width: 72,
+            clipBehavior: Clip.hardEdge,
+            decoration: BoxDecoration(
+                borderRadius:
+                    BorderRadius.circular(TDTheme.of(context).radiusDefault)),
+            child: Container(
+                alignment: Alignment.center,
+                color: TDTheme.of(context).grayColor2,
+                child: RotationTransition(
+                    turns: animation,
+                    alignment: Alignment.center,
+                    child: TDCircleIndicator(
+                      color: TDTheme.of(context).brandNormalColor,
+                      size: 18,
+                      lineWidth: 3,
+                    )))),
+        // 实际组件写法如下：上面仅为加载展示
+        // TDImage(
+        //   imgUrl:
+        //       'https://images.pexels.com/photos/842711/pexels-photo-842711.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=2',
+        //   loadingWidget: RotationTransition(
+        //       turns: animation,
+        //       alignment: Alignment.center,
+        //       child: TDCircleIndicator(
+        //         color: TDTheme.of(context).brandNormalColor,
+        //         size: 18,
+        //         lineWidth: 3,
+        //       )),
+        //   type: TDImageType.roundedSquare,
+        // ),
+      ],
+    );
+  }
+
+  @Demo(group: 'image')
+  Widget _failDefault(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(bottom: 16),
+          child: TDText(
+            '失败默认提示',
+            font: TDTheme.of(context).fontBodyMedium,
+            textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
           ),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(bottom: 16),
-                child: TDText(
-                  '失败自定义提示',
-                  font: TDTheme.of(context).fontBodyMedium,
-                  textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-                ),
-              ),
-              TDImage(
-                imgUrl: 'error',
-                errorWidget: TDText(
-                  '加载失败',
-                  forceVerticalCenter: true,
-                  font: TDTheme.of(context).fontBodyExtraSmall,
-                  fontWeight: FontWeight.w500,
-                  textColor: TDTheme.of(context).fontGyColor3,
-                ),
-                type: TDImageType.roundedSquare,
-              ),
-            ],
+        ),
+        const TDImage(
+          imgUrl: 'error',
+          type: TDImageType.roundedSquare,
+        ),
+      ],
+    );
+  }
+
+  @Demo(group: 'image')
+  Widget _failCustom(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(bottom: 16),
+          child: TDText(
+            '失败自定义提示',
+            font: TDTheme.of(context).fontBodyMedium,
+            textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
           ),
-          const SizedBox(
-            width: 24,
+        ),
+        TDImage(
+          imgUrl: 'error',
+          errorWidget: TDText(
+            '加载失败',
+            forceVerticalCenter: true,
+            font: TDTheme.of(context).fontBodyExtraSmall,
+            fontWeight: FontWeight.w500,
+            textColor: TDTheme.of(context).fontGyColor3,
           ),
-        ],
-      ),
+          type: TDImageType.roundedSquare,
+        ),
+      ],
     );
   }
 
+  @Demo(group: 'image')
   Widget _imageFile(BuildContext context) {
-
     return Container(
       width: 72,
       height: 72,
-      child:  TDImage(
+      child: TDImage(
         imageFile: File('/sdcard/td/test.jpg'),
         type: TDImageType.fitWidth,
       ),

From 70b6a7dcf0424340aed329300aea4a11edcb0729 Mon Sep 17 00:00:00 2001
From: plus7c <1959512279@qq.com>
Date: Mon, 15 Jul 2024 14:46:32 +0800
Subject: [PATCH 12/74] =?UTF-8?q?doc:=20=E6=B7=BB=E5=8A=A0=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_image_page.dart       | 167 +++++-------------
 1 file changed, 43 insertions(+), 124 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_image_page.dart b/tdesign-component/example/lib/page/td_image_page.dart
index a48b7e42c..5d4da460e 100644
--- a/tdesign-component/example/lib/page/td_image_page.dart
+++ b/tdesign-component/example/lib/page/td_image_page.dart
@@ -55,14 +55,14 @@ class TDImageState extends State<TDImagePage>
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _imageClip,
-                            methodName: '_imageClip',
+                            methodName: '_imageClip', // 裁剪
                           ),
                         ),
                         Container(
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _imageStretch,
-                            methodName: '_imageStretch',
+                            methodName: '_imageStretch', // 拉伸
                           ),
                         ),
                       ],
@@ -82,11 +82,11 @@ class TDImageState extends State<TDImagePage>
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _imageFitHeight,
-                            methodName: '_imageFitHeight',
+                            methodName: '_imageFitHeight', // 适应高
                           ),
                         ),
                         Container(
-                          margin: const EdgeInsets.all(8),
+                          margin: const EdgeInsets.all(8), // 适应宽
                           child: CodeWrapper(
                             builder: _imageFitWidth,
                             methodName: '_imageFitWidth',
@@ -109,21 +109,21 @@ class TDImageState extends State<TDImagePage>
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _imageSquare,
-                            methodName: '_imageSquare',
+                            methodName: '_imageSquare', // 方形
                           ),
                         ),
                         Container(
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _imageRoundedSquare,
-                            methodName: '_imageRoundedSquare',
+                            methodName: '_imageRoundedSquare', // 圆角方形
                           ),
                         ),
                         Container(
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _imageCircle,
-                            methodName: '_imageCircle',
+                            methodName: '_imageCircle', // 圆形
                           ),
                         ),
                       ],
@@ -148,14 +148,14 @@ class TDImageState extends State<TDImagePage>
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _loadingDefault,
-                            methodName: '_loadingDefault',
+                            methodName: '_loadingDefault', // 加载默认
                           ),
                         ),
                         Container(
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _loadingCustom,
-                            methodName: '_loadingCustom',
+                            methodName: '_loadingCustom', // 加载自定义
                           ),
                         ),
                       ],
@@ -175,14 +175,14 @@ class TDImageState extends State<TDImagePage>
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _failDefault,
-                            methodName: '_failDefault',
+                            methodName: '_failDefault', // 失败默认
                           ),
                         ),
                         Container(
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _failCustom,
-                            methodName: '_failCustom',
+                            methodName: '_failCustom', // 失败自定义
                           ),
                         ),
                       ],
@@ -217,88 +217,7 @@ class TDImageState extends State<TDImagePage>
     );
   }
 
-  //     children: [
-  //       const SizedBox(
-  //         width: 16,
-  //       ),
-  //       Column(
-  //         crossAxisAlignment: CrossAxisAlignment.start,
-  //         children: [
-  //           Padding(
-  //             padding: const EdgeInsets.only(bottom: 16),
-  //             child: TDText(
-  //               '裁剪',
-  //               font: TDTheme.of(context).fontBodyMedium,
-  //               textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-  //             ),
-  //           ),
-  //            const TDImage(
-  //              assetUrl: 'assets/img/image.png',
-  //              type: TDImageType.clip,
-  //           ),
-  //         ],
-  //       ),
-  //       const SizedBox(
-  //         width: 24,
-  //       ),
-  //       Column(
-  //         crossAxisAlignment: CrossAxisAlignment.start,
-  //         children: [
-  //           Padding(
-  //             padding: const EdgeInsets.only(bottom: 16),
-  //             child: TDText(
-  //               '适应高',
-  //               font: TDTheme.of(context).fontBodyMedium,
-  //               textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-  //             ),
-  //           ),
-  //           Container(
-  //             width: 89,
-  //             height: 72,
-  //             color: Colors.black,
-  //             child: const TDImage(
-  //               assetUrl: 'assets/img/image.png',
-  //               type: TDImageType.fitHeight,
-  //             ),
-  //           ),
-  //         ],
-  //       ),
-  //       const SizedBox(
-  //         width: 24,
-  //       ),
-  //       Column(
-  //         crossAxisAlignment: CrossAxisAlignment.start,
-  //         children: [
-  //           Padding(
-  //             padding: const EdgeInsets.only(bottom: 16),
-  //             child: TDText(
-  //               '拉伸',
-  //               font: TDTheme.of(context).fontBodyMedium,
-  //               textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
-  //             ),
-  //           ),
-  //           Container(
-  //             color: Colors.black,
-  //             width: 121,
-  //             height: 72,
-  //             child: Stack(
-  //               alignment: Alignment.center,
-  //               children: const [
-  //                 TDImage(
-  //                   assetUrl: 'assets/img/image.png',
-  //                   width: 121,
-  //                   height: 50,
-  //                   type: TDImageType.stretch,
-  //                 ),
-  //               ],
-  //             ),
-  //           ),
-  //         ],
-  //       )
-  //     ],
-  //   );
-  // }
-
+/* 图片裁剪 */
   @Demo(group: 'image')
   Widget _imageClip(BuildContext context) {
     return Column(
@@ -319,66 +238,66 @@ class TDImageState extends State<TDImagePage>
       ],
     );
   }
-
+/* 图片拉伸 */
   @Demo(group: 'image')
-  Widget _imageFitHeight(BuildContext context) {
+  Widget _imageStretch(BuildContext context) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Padding(
           padding: const EdgeInsets.only(bottom: 16),
           child: TDText(
-            '适应高',
+            '拉伸',
             font: TDTheme.of(context).fontBodyMedium,
             textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
           ),
         ),
         Container(
-          width: 89,
-          height: 72,
           color: Colors.black,
-          child: const TDImage(
-            assetUrl: 'assets/img/image.png',
-            type: TDImageType.fitHeight,
+          width: 121,
+          height: 72,
+          child: const Stack(
+            alignment: Alignment.center,
+            children: [
+              TDImage(
+                assetUrl: 'assets/img/image.png',
+                width: 121,
+                height: 50,
+                type: TDImageType.stretch,
+              ),
+            ],
           ),
         ),
       ],
     );
   }
-
+/* 图片适应高 */
   @Demo(group: 'image')
-  Widget _imageStretch(BuildContext context) {
+  Widget _imageFitHeight(BuildContext context) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Padding(
           padding: const EdgeInsets.only(bottom: 16),
           child: TDText(
-            '拉伸',
+            '适应高',
             font: TDTheme.of(context).fontBodyMedium,
             textColor: TDTheme.of(context).fontGyColor2.withOpacity(0.6),
           ),
         ),
         Container(
-          color: Colors.black,
-          width: 121,
+          width: 89,
           height: 72,
-          child: const Stack(
-            alignment: Alignment.center,
-            children: [
-              TDImage(
-                assetUrl: 'assets/img/image.png',
-                width: 121,
-                height: 50,
-                type: TDImageType.stretch,
-              ),
-            ],
+          color: Colors.black,
+          child: const TDImage(
+            assetUrl: 'assets/img/image.png',
+            type: TDImageType.fitHeight,
           ),
         ),
       ],
     );
   }
-
+  /* 图片适应宽 */
   @Demo(group: 'image')
   Widget _imageFitWidth(BuildContext context) {
     return Column(
@@ -404,7 +323,7 @@ class TDImageState extends State<TDImagePage>
       ],
     );
   }
-
+/* 方形 */
   @Demo(group: 'image')
   Widget _imageSquare(BuildContext context) {
     return Column(
@@ -425,7 +344,7 @@ class TDImageState extends State<TDImagePage>
       ],
     );
   }
-
+/* 圆角方形 */
   @Demo(group: 'image')
   Widget _imageRoundedSquare(BuildContext context) {
     return Column(
@@ -448,7 +367,7 @@ class TDImageState extends State<TDImagePage>
       ],
     );
   }
-
+/* 圆形 */
   @Demo(group: 'image')
   Widget _imageCircle(BuildContext context) {
     return Column(
@@ -471,7 +390,7 @@ class TDImageState extends State<TDImagePage>
       ],
     );
   }
-
+/* 加载默认提示 */
   @Demo(group: 'image')
   Widget _loadingDefault(BuildContext context) {
     return Column(
@@ -509,7 +428,7 @@ class TDImageState extends State<TDImagePage>
       ],
     );
   }
-
+/* 加载自定义提示 */
   @Demo(group: 'image')
   Widget _loadingCustom(BuildContext context) {
     return Column(
@@ -558,7 +477,7 @@ class TDImageState extends State<TDImagePage>
       ],
     );
   }
-
+/* 失败默认提示 */
   @Demo(group: 'image')
   Widget _failDefault(BuildContext context) {
     return Column(
@@ -579,7 +498,7 @@ class TDImageState extends State<TDImagePage>
       ],
     );
   }
-
+/* 失败自定义提示 */
   @Demo(group: 'image')
   Widget _failCustom(BuildContext context) {
     return Column(

From 240cac03f1d8afcc870301b6ad067ddb93b5883a Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Tue, 16 Jul 2024 18:41:48 +0800
Subject: [PATCH 13/74] =?UTF-8?q?td=5Ffooter=E5=88=A0=E9=99=A4text?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=88=9D=E5=A7=8B=E5=8C=96=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9,brand=E5=88=A0=E9=99=A4=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_footer_page.dart      |  16 ++-
 .../lib/src/components/footer/td_footer.dart  | 112 ++++++++++++------
 2 files changed, 88 insertions(+), 40 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_footer_page.dart b/tdesign-component/example/lib/page/td_footer_page.dart
index 1f99a1404..ae69a3bcc 100644
--- a/tdesign-component/example/lib/page/td_footer_page.dart
+++ b/tdesign-component/example/lib/page/td_footer_page.dart
@@ -34,18 +34,27 @@ class _TDFooterPageState extends State<TDFooterPage> {
 
   @Demo(group: 'footer')
   Widget _buildFooter(BuildContext context) {
-    return TDFooter();
+    return SizedBox(
+      height: 30,
+      child:  TDFooter(
+        TDFooterType.text,
+        text: 'Copyright © 2019-2023 TDesign.All Rights Reserved.',
+      ),
+    );
+
   }
 
   @Demo(group: 'footer')
   Widget _buildSingleLinkFooter(BuildContext context) {
     // 示例链接列表
     final singleLink = <LinkObj>[
-      LinkObj(name: '底部链接', uri: Uri.parse('https://example.com')),
+      LinkObj(name: '底部链接', uri: Uri.parse('https://www.baidu.com')),
     ];
 
     return TDFooter(
+      TDFooterType.link,
       links: singleLink,
+      text: 'Copyright © 2019-2023 TDesign.All Rights Reserved.',
     );
   }
 
@@ -59,7 +68,9 @@ class _TDFooterPageState extends State<TDFooterPage> {
       children: [
         SizedBox(height: 12),
         TDFooter(
+          TDFooterType.link,
           links: links,
+          text: 'Copyright © 2019-2023 TDesign.All Rights Reserved.',
         )
       ],
     );
@@ -68,6 +79,7 @@ class _TDFooterPageState extends State<TDFooterPage> {
   @Demo(group: 'footer')
   Widget _buildBrandFooter(BuildContext context) {
     return TDFooter(
+      TDFooterType.brand,
       logo: 'assets/img/td_brand.png',
       width: 204,
       height: 48,
diff --git a/tdesign-component/lib/src/components/footer/td_footer.dart b/tdesign-component/lib/src/components/footer/td_footer.dart
index 4201b9ee8..dbd08c57a 100644
--- a/tdesign-component/lib/src/components/footer/td_footer.dart
+++ b/tdesign-component/lib/src/components/footer/td_footer.dart
@@ -2,12 +2,23 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import '../../../tdesign_flutter.dart';
 
+enum TDFooterType {
+  /// 文字样式
+  text,
+
+  /// 链接样式
+  link,
+
+  /// 品牌样式
+  brand,
+
+}
 
 class TDFooter extends StatefulWidget {
-  const TDFooter({
-    Key? key,
+  const TDFooter( this.type,
+    {Key? key,
     this.logo,
-    this.text = 'Copyright © 2019-2023 TDesign.All Rights Reserved.',
+    this.text = '',
     this.links = const [],
     this.width,
     this.height,
@@ -16,6 +27,9 @@ class TDFooter extends StatefulWidget {
   /// 品牌图片
   final String? logo;
 
+  /// 样式
+  final TDFooterType type;
+
   /// 文字
   final String text;
 
@@ -35,44 +49,66 @@ class TDFooter extends StatefulWidget {
 class _TDFooterState extends State<TDFooter> {
   @override
   Widget build(BuildContext context) {
-    return Container(
-      alignment: Alignment.center,
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          if (widget.logo != null)
-            _renderLogo()
-          else if (widget.links.isNotEmpty)
-            _renderLinks()
-          else
-            _renderText(),
-        ],
-      ),
-    );
+    switch (widget.type) {
+      case TDFooterType.text:
+        return Container(
+          alignment: Alignment.center,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              _renderText(),
+            ],
+          ),
+        );
+    case TDFooterType.link:
+      return Container(
+        alignment: Alignment.center,
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            if (widget.links.isNotEmpty)
+              _renderLinks()
+            else
+              _renderText(),
+          ],
+        ),
+      );
+    case TDFooterType.brand:
+      return Container(
+        alignment: Alignment.center,
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            if (widget.logo != null)
+              _renderLogo()
+            else
+              _renderText(),
+          ],
+        ),
+      );
+    }
   }
 
   Widget _renderLogo() {
-    return Container(
-        color: TDTheme.of(context).whiteColor1,
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Padding(
-              padding: const EdgeInsets.only(top: 4, bottom: 4),
-              child: Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    TDImage(
-                      assetUrl: widget.logo,
-                      type: TDImageType.clip,
-                      width: widget.width,
-                      height: widget.height,
-                    ),
-                  ]
-              ),
-            )
-          ]
-        ));
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(top: 4, bottom: 4),
+          child: Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                TDImage(
+                  assetUrl: widget.logo,
+                  type: TDImageType.clip,
+                  width: widget.width,
+                  height: widget.height,
+                ),
+              ]
+          ),
+        )
+      ]
+    );
   }
 
   Widget _renderLinks() {

From 8a4092dfaf98add6f5c7acbe2afc2706956f0b33 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Tue, 16 Jul 2024 19:01:04 +0800
Subject: [PATCH 14/74] =?UTF-8?q?td=5Ffooter=E9=93=BE=E6=8E=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8B=E5=88=92=E7=BA=BF=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/example/pubspec.lock        |  8 ++
 .../lib/src/components/footer/td_footer.dart  |  2 +-
 tdesign-component/pubspec.lock                | 80 +++++++++----------
 3 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/tdesign-component/example/pubspec.lock b/tdesign-component/example/pubspec.lock
index 34bd8d04b..a208e30dd 100644
--- a/tdesign-component/example/pubspec.lock
+++ b/tdesign-component/example/pubspec.lock
@@ -107,6 +107,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.19"
+  flutter_slidable:
+    dependency: transitive
+    description:
+      name: flutter_slidable
+      sha256: "673403d2eeef1f9e8483bd6d8d92aae73b1d8bd71f382bc3930f699c731bc27c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
   flutter_swiper_null_safety:
     dependency: "direct main"
     description:
diff --git a/tdesign-component/lib/src/components/footer/td_footer.dart b/tdesign-component/lib/src/components/footer/td_footer.dart
index dbd08c57a..bef69ac88 100644
--- a/tdesign-component/lib/src/components/footer/td_footer.dart
+++ b/tdesign-component/lib/src/components/footer/td_footer.dart
@@ -123,7 +123,7 @@ class _TDFooterState extends State<TDFooter> {
               return Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 4),
                 child: TDLink(
-                    type: TDLinkType.basic,
+                    type: TDLinkType.withUnderline,
                     style: TDLinkStyle.primary,
                     label: link.name,
                     uri: link.uri)
diff --git a/tdesign-component/pubspec.lock b/tdesign-component/pubspec.lock
index 11d28c167..1a1978a1c 100644
--- a/tdesign-component/pubspec.lock
+++ b/tdesign-component/pubspec.lock
@@ -5,48 +5,48 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
-      url: "https://pub.flutter-io.cn"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
-      url: "https://pub.flutter-io.cn"
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
       name: clock
       sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
-      url: "https://pub.flutter-io.cn"
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.17.1"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
   flutter:
@@ -59,7 +59,7 @@ packages:
     description:
       name: flutter_easyrefresh
       sha256: "5d161ee5dcac34da9065116568147d742dd25fb9bff3b10024d9054b195087ad"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.2"
   flutter_lints:
@@ -67,7 +67,7 @@ packages:
     description:
       name: flutter_lints
       sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
   flutter_slidable:
@@ -75,7 +75,7 @@ packages:
     description:
       name: flutter_slidable
       sha256: "673403d2eeef1f9e8483bd6d8d92aae73b1d8bd71f382bc3930f699c731bc27c"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
   flutter_swiper_null_safety:
@@ -83,7 +83,7 @@ packages:
     description:
       name: flutter_swiper_null_safety
       sha256: "5a855e0080d035c08e82f8b7fd2f106344943a30c9ab483b2584860a2f22eaaf"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
   flutter_test:
@@ -95,50 +95,50 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
-      url: "https://pub.flutter-io.cn"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      url: "https://pub.dev"
     source: hosted
-    version: "0.6.5"
+    version: "0.6.7"
   lints:
     dependency: transitive
     description:
       name: lints
       sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
-      url: "https://pub.flutter-io.cn"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.15"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
       sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
-      url: "https://pub.flutter-io.cn"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
-      url: "https://pub.flutter-io.cn"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -149,7 +149,7 @@ packages:
     description:
       name: source_span
       sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.9.1"
   stack_trace:
@@ -157,7 +157,7 @@ packages:
     description:
       name: stack_trace
       sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.11.0"
   stream_channel:
@@ -165,7 +165,7 @@ packages:
     description:
       name: stream_channel
       sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
   string_scanner:
@@ -173,7 +173,7 @@ packages:
     description:
       name: string_scanner
       sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
   term_glyph:
@@ -181,25 +181,25 @@ packages:
     description:
       name: term_glyph
       sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
-      url: "https://pub.flutter-io.cn"
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.16"
+    version: "0.5.1"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
 sdks:
-  dart: ">=2.19.0 <3.0.0"
+  dart: ">=3.0.0-0 <4.0.0"
   flutter: ">=3.7.0"

From f880763bda1a45fc31ebfc8a0b56b7f6b15b5aa5 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Tue, 16 Jul 2024 19:25:59 +0800
Subject: [PATCH 15/74] =?UTF-8?q?td=5Ffooter=E6=BC=94=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9uri?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/example/lib/page/td_footer_page.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tdesign-component/example/lib/page/td_footer_page.dart b/tdesign-component/example/lib/page/td_footer_page.dart
index ae69a3bcc..8bb898cec 100644
--- a/tdesign-component/example/lib/page/td_footer_page.dart
+++ b/tdesign-component/example/lib/page/td_footer_page.dart
@@ -48,7 +48,7 @@ class _TDFooterPageState extends State<TDFooterPage> {
   Widget _buildSingleLinkFooter(BuildContext context) {
     // 示例链接列表
     final singleLink = <LinkObj>[
-      LinkObj(name: '底部链接', uri: Uri.parse('https://www.baidu.com')),
+      LinkObj(name: '底部链接', uri: Uri.parse('https://example.com')),
     ];
 
     return TDFooter(

From eed55e5353a53e73b044e9e0c48a1f4f5af12771 Mon Sep 17 00:00:00 2001
From: v_szheshi <v_szheshi@tencent.com>
Date: Thu, 18 Jul 2024 19:15:28 +0800
Subject: [PATCH 16/74] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=81=94=E5=8A=A8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=99=90=E5=88=B6=E8=8C=83=E5=9B=B4=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/picker/td_date_picker.dart | 284 +++++++++++-------
 1 file changed, 181 insertions(+), 103 deletions(-)

diff --git a/tdesign-component/lib/src/components/picker/td_date_picker.dart b/tdesign-component/lib/src/components/picker/td_date_picker.dart
index ddf90df47..1758d3c9a 100644
--- a/tdesign-component/lib/src/components/picker/td_date_picker.dart
+++ b/tdesign-component/lib/src/components/picker/td_date_picker.dart
@@ -10,30 +10,29 @@ typedef DatePickerCallback = void Function(Map<String, int> selected);
 
 /// 时间选择器
 class TDDatePicker extends StatefulWidget {
-
   const TDDatePicker(
       {required this.title,
-        required this.onConfirm,
-        this.rightText,
-        this.leftText,
-        this.onCancel,
-        this.backgroundColor,
-        this.titleDividerColor,
-        this.topRadius,
-        this.titleHeight,
-        this.padding,
-        this.leftPadding,
-        this.rightPadding,
-        this.leftTextStyle,
-        this.rightTextStyle,
-        this.centerTextStyle,
-        this.customSelectWidget,
-        this.itemDistanceCalculator,
-        required this.model,
-        this.showTitle = true,
-        this.pickerHeight = 200,
-        required this.pickerItemCount,
-        Key? key})
+      required this.onConfirm,
+      this.rightText,
+      this.leftText,
+      this.onCancel,
+      this.backgroundColor,
+      this.titleDividerColor,
+      this.topRadius,
+      this.titleHeight,
+      this.padding,
+      this.leftPadding,
+      this.rightPadding,
+      this.leftTextStyle,
+      this.rightTextStyle,
+      this.centerTextStyle,
+      this.customSelectWidget,
+      this.itemDistanceCalculator,
+      required this.model,
+      this.showTitle = true,
+      this.pickerHeight = 200,
+      required this.pickerItemCount,
+      Key? key})
       : super(key: key);
 
   /// 选择器标题
@@ -114,17 +113,54 @@ class _TDDatePickerState extends State<TDDatePicker> {
   }
 
   bool useAll() {
-    if(widget.model.useYear
-        && widget.model.useMonth
-        && widget.model.useDay
-        && widget.model.useHour
-        && widget.model.useMinute
-        && widget.model.useSecond) {
+    if (widget.model.useYear &&
+        widget.model.useMonth &&
+        widget.model.useDay &&
+        widget.model.useHour &&
+        widget.model.useMinute &&
+        widget.model.useSecond) {
       return true;
     }
     return false;
   }
 
+  selectListItem(String ev) {
+    var selected = <String, int>{
+      'year': widget.model.useYear
+          ? widget.model.yearFixedExtentScrollController.selectedItem + widget.model.data[0][0]
+          : -1,
+      'month': widget.model.useMonth
+          ? widget.model.monthFixedExtentScrollController.selectedItem + widget.model.data[1][0]
+          : -1,
+      'day':
+          widget.model.useDay ? widget.model.dayFixedExtentScrollController.selectedItem + widget.model.data[2][0] : -1,
+      'weekDay': widget.model.useWeekDay
+          ? widget.model.weekDayFixedExtentScrollController.selectedItem + widget.model.data[3][0]
+          : -1,
+      'hour': widget.model.useHour
+          ? selectItemValue(widget.model.data[4], widget.model.hourFixedExtentScrollController.selectedItem)
+          : -1,
+      'minute': widget.model.useMinute
+          ? selectItemValue(widget.model.data[5], widget.model.minuteFixedExtentScrollController.selectedItem)
+          : -1,
+      'second': widget.model.useSecond
+          ? selectItemValue(widget.model.data[6], widget.model.secondFixedExtentScrollController.selectedItem)
+          : -1,
+    };
+    if (ev == 'onCancel' && widget.onCancel != null) {
+      widget.onCancel!(selected);
+    } else if (ev == 'onConfirm' && widget.onConfirm != null) {
+      widget.onConfirm!(selected);
+    } else {
+      Navigator.of(context).pop();
+    }
+  }
+
+  int selectItemValue(List items, int itemIndex) {
+    ///选择列表索引对应的项的值
+    return items[itemIndex];
+  }
+
   @override
   Widget build(BuildContext context) {
     var maxWidth = MediaQuery.of(context).size.width;
@@ -168,11 +204,11 @@ class _TDDatePickerState extends State<TDDatePicker> {
                       children: [
                         widget.model.useYear
                             ? useAll()
-                            ? SizedBox(
-                          child: buildList(context, 0),
-                          width: 64,
-                        )
-                            : Expanded(child: buildList(context, 0))
+                                ? SizedBox(
+                                    child: buildList(context, 0),
+                                    width: 64,
+                                  )
+                                : Expanded(child: buildList(context, 0))
                             : Container(),
                         widget.model.useMonth ? Expanded(child: buildList(context, 1)) : Container(),
                         widget.model.useDay ? Expanded(child: buildList(context, 2)) : Container(),
@@ -192,9 +228,9 @@ class _TDDatePickerState extends State<TDDatePicker> {
                       width: MediaQuery.of(context).size.width,
                       decoration: BoxDecoration(
                           gradient: LinearGradient(begin: Alignment.topCenter, end: Alignment.bottomCenter, colors: [
-                            TDTheme.of(context).whiteColor1,
-                            TDTheme.of(context).whiteColor1.withOpacity(0)
-                          ])),
+                        TDTheme.of(context).whiteColor1,
+                        TDTheme.of(context).whiteColor1.withOpacity(0)
+                      ])),
                     ),
                   ),
                 ),
@@ -207,9 +243,9 @@ class _TDDatePickerState extends State<TDDatePicker> {
                       width: MediaQuery.of(context).size.width,
                       decoration: BoxDecoration(
                           gradient: LinearGradient(begin: Alignment.bottomCenter, end: Alignment.topCenter, colors: [
-                            TDTheme.of(context).whiteColor1,
-                            TDTheme.of(context).whiteColor1.withOpacity(0)
-                          ])),
+                        TDTheme.of(context).whiteColor1,
+                        TDTheme.of(context).whiteColor1.withOpacity(0)
+                      ])),
                     ),
                   ),
                 )
@@ -235,7 +271,7 @@ class _TDDatePickerState extends State<TDDatePicker> {
               controller: widget.model.controllers[whichLine],
               physics: whichLine == 3 ? const NeverScrollableScrollPhysics() : const FixedExtentScrollPhysics(),
               onSelectedItemChanged: (index) {
-                if (whichLine == 0 || whichLine == 1 || whichLine == 2) {
+                if (whichLine == 0 || whichLine == 1 || whichLine == 2 || whichLine == 4 || whichLine == 5) {
                   // 年月的改变会引起日的改变, 年的改变会引起月的改变
                   setState(() {
                     switch (whichLine) {
@@ -258,7 +294,9 @@ class _TDDatePickerState extends State<TDDatePicker> {
                         }
                         break;
                     }
-
+                    if (useAll()) {
+                      widget.model.refreshTimeDataInitialAndController(whichLine);
+                    }
                     /// 使用动态高度，强制列表组件的state刷新，以展现更新的数据，详见下方链接
                     /// FIX:https://github.com/flutter/flutter/issues/22999
                     pickerHeight = pickerHeight - Random().nextDouble() / 100000000;
@@ -277,7 +315,7 @@ class _TDDatePickerState extends State<TDDatePicker> {
                           itemHeight: pickerHeight / widget.pickerItemCount,
                           content: whichLine == 3
                               ? widget.model.mapping[whichLine] +
-                              widget.model.weekMap[widget.model.data[whichLine][index] - 1]
+                                  widget.model.weekMap[widget.model.data[whichLine][index] - 1]
                               : widget.model.data[whichLine][index].toString() + widget.model.mapping[whichLine],
                           fixedExtentScrollController: widget.model.controllers[whichLine],
                           itemDistanceCalculator: widget.itemDistanceCalculator,
@@ -298,33 +336,13 @@ class _TDDatePickerState extends State<TDDatePicker> {
           /// 左边按钮
           GestureDetector(
               onTap: () {
-                if (widget.onCancel != null) {
-                  var selected = <String, int>{
-                    'year': widget.model.useYear
-                        ? widget.model.yearFixedExtentScrollController.selectedItem + widget.model.data[0][0]
-                        : -1,
-                    'month': widget.model.useMonth
-                        ? widget.model.monthFixedExtentScrollController.selectedItem + widget.model.data[1][0]
-                        : -1,
-                    'day': widget.model.useDay
-                        ? widget.model.dayFixedExtentScrollController.selectedItem + widget.model.data[2][0]
-                        : -1,
-                    'weekDay': widget.model.useWeekDay
-                        ? widget.model.weekDayFixedExtentScrollController.selectedItem + widget.model.data[3][0]
-                        : -1,
-                    'hour': widget.model.useHour ? widget.model.hourFixedExtentScrollController.selectedItem : -1,
-                    'minute': widget.model.useMinute ? widget.model.minuteFixedExtentScrollController.selectedItem : -1,
-                    'second': widget.model.useSecond ? widget.model.secondFixedExtentScrollController.selectedItem : -1,
-                  };
-                  widget.onCancel!(selected);
-                } else {
-                  Navigator.of(context).pop();
-                }
+                selectListItem('onCancel');
               },
               behavior: HitTestBehavior.opaque,
               child: TDText(widget.leftText ?? context.resource.cancel,
                   style: widget.leftTextStyle ??
-                      TextStyle(fontSize: TDTheme.of(context).fontBodyLarge!.size, color: TDTheme.of(context).fontGyColor2))),
+                      TextStyle(
+                          fontSize: TDTheme.of(context).fontBodyLarge!.size, color: TDTheme.of(context).fontGyColor2))),
 
           /// 中间title
           Expanded(
@@ -344,32 +362,14 @@ class _TDDatePickerState extends State<TDDatePicker> {
           /// 右边按钮
           GestureDetector(
             onTap: () {
-              if (widget.onConfirm != null) {
-                var selected = <String, int>{
-                  'year': widget.model.useYear
-                      ? widget.model.yearFixedExtentScrollController.selectedItem + widget.model.data[0][0]
-                      : -1,
-                  'month': widget.model.useMonth
-                      ? widget.model.monthFixedExtentScrollController.selectedItem + widget.model.data[1][0]
-                      : -1,
-                  'day': widget.model.useDay
-                      ? widget.model.dayFixedExtentScrollController.selectedItem + widget.model.data[2][0]
-                      : -1,
-                  'weekDay': widget.model.useWeekDay
-                      ? widget.model.weekDayFixedExtentScrollController.selectedItem + widget.model.data[3][0]
-                      : -1,
-                  'hour': widget.model.useHour ? widget.model.hourFixedExtentScrollController.selectedItem : -1,
-                  'minute': widget.model.useMinute ? widget.model.minuteFixedExtentScrollController.selectedItem : -1,
-                  'second': widget.model.useSecond ? widget.model.secondFixedExtentScrollController.selectedItem : -1,
-                };
-                widget.onConfirm!(selected);
-              }
+              selectListItem('onConfirm');
             },
             behavior: HitTestBehavior.opaque,
             child: TDText(
               widget.rightText ?? context.resource.confirm,
               style: widget.rightTextStyle ??
-                  TextStyle(fontSize: TDTheme.of(context).fontBodyLarge!.size, color: TDTheme.of(context).brandNormalColor),
+                  TextStyle(
+                      fontSize: TDTheme.of(context).fontBodyLarge!.size, color: TDTheme.of(context).brandNormalColor),
             ),
           ),
         ],
@@ -403,7 +403,9 @@ class DatePickerModel {
   late int monthIndex;
   late int dayIndex;
   late int weekDayIndex;
-
+  late int hourIndex;
+  late int minuteIndex;
+  late int secondIndex;
   late List<List<int>> data = [
     List.generate(dateEnd[0] - dateStart[0] + 1, (index) => index + dateStart[0]),
     [],
@@ -424,27 +426,30 @@ class DatePickerModel {
 
   DatePickerModel(
       {required this.useYear,
-        required this.useMonth,
-        required this.useDay,
-        required this.useHour,
-        required this.useMinute,
-        required this.useWeekDay,
-        required this.useSecond,
-        required this.dateStart,
-        required this.dateEnd,
-        this.dateInitial}) {
+      required this.useMonth,
+      required this.useDay,
+      required this.useHour,
+      required this.useMinute,
+      required this.useWeekDay,
+      required this.useSecond,
+      required this.dateStart,
+      required this.dateEnd,
+      this.dateInitial}) {
     assert(!useWeekDay || (!useSecond && !useMinute && !useHour), 'WeekDay can only used with Year, Month and Day!');
     setInitialTime();
     setInitialMonthData();
     setInitialDayData();
     setInitialWeekDayData();
+    setInitialTimeData();
     setControllers();
     addListener();
   }
 
   void setInitialTime() {
-    var startTime = DateTime(dateStart[0], dateStart[1], dateStart[2], 0, 0, 0);
-    var endTime = DateTime(dateEnd[0], dateEnd[1], dateEnd[2], 0, 0, 0);
+    var startTime = DateTime(dateStart[0], dateStart[1], dateStart[2], dateStart.length > 3 ? dateStart[3] : 0,
+        dateStart.length > 4 ? dateStart[4] : 0, dateStart.length > 5 ? dateStart[5] : 0);
+    var endTime = DateTime(dateEnd[0], dateEnd[1], dateEnd[2], dateEnd.length > 3 ? dateEnd[3] : 0,
+        dateEnd.length > 4 ? dateEnd[4] : 0, dateEnd.length > 5 ? dateEnd[5] : 0);
     if (dateInitial != null) {
       initialTime = DateTime(
           dateInitial![0],
@@ -496,6 +501,20 @@ class DatePickerModel {
     }
   }
 
+  void setInitialTimeData() {
+    if (dateStart.length > 3) {
+      if (initialTime.hour >= dateStart[3]) {
+        data[4] = List.generate(24 - dateStart[3], (index) => index + dateStart[3]);
+      }
+      if (initialTime.minute >= dateStart[4]) {
+        data[5] = List.generate(60 - dateStart[4], (index) => index + dateStart[4]);
+      }
+      if (initialTime.second >= dateStart[5]) {
+        data[6] = List.generate(60 - dateStart[5], (index) => index + dateStart[5]);
+      }
+    }
+  }
+
   void setInitialWeekDayData() {
     data[3] = [1, 2, 3, 4, 5, 6, 7];
   }
@@ -506,15 +525,17 @@ class DatePickerModel {
     monthIndex = initialTime.month - data[1][0];
     dayIndex = initialTime.day - data[2][0];
     weekDayIndex = initialTime.weekday - 1;
-
+    hourIndex = initialTime.hour - data[4][0];
+    minuteIndex = initialTime.minute - data[5][0];
+    secondIndex = initialTime.second - data[6][0];
     controllers = [
       FixedExtentScrollController(initialItem: yearIndex),
       FixedExtentScrollController(initialItem: monthIndex),
       FixedExtentScrollController(initialItem: dayIndex),
       FixedExtentScrollController(initialItem: weekDayIndex),
-      FixedExtentScrollController(initialItem: initialTime.hour),
-      FixedExtentScrollController(initialItem: initialTime.minute),
-      FixedExtentScrollController(initialItem: initialTime.second)
+      FixedExtentScrollController(initialItem: hourIndex),
+      FixedExtentScrollController(initialItem: minuteIndex),
+      FixedExtentScrollController(initialItem: secondIndex)
     ];
     yearFixedExtentScrollController = controllers[0];
     monthFixedExtentScrollController = controllers[1];
@@ -539,6 +560,15 @@ class DatePickerModel {
     weekDayFixedExtentScrollController.addListener(() {
       weekDayIndex = weekDayFixedExtentScrollController.selectedItem;
     });
+    hourFixedExtentScrollController.addListener(() {
+      hourIndex = hourFixedExtentScrollController.selectedItem;
+    });
+    minuteFixedExtentScrollController.addListener(() {
+      minuteIndex = minuteFixedExtentScrollController.selectedItem;
+    });
+    secondFixedExtentScrollController.addListener(() {
+      secondIndex = secondFixedExtentScrollController.selectedItem;
+    });
   }
 
   void refreshMonthDataAndController() {
@@ -578,11 +608,59 @@ class DatePickerModel {
     weekDayFixedExtentScrollController.jumpToItem(date.weekday - 1);
   }
 
+  void refreshTimeDataInitialAndController(int wheel) {
+    var selectedYear = yearIndex + data[0][0];
+    var selectedMonth = monthIndex + data[1][0];
+    var selectDay = dayIndex + data[2][0];
+    if (selectedYear == dateStart[0] && selectedMonth == dateStart[1] && selectDay == dateStart[2]) {
+      if (wheel <= 2) {
+        refreshHourData();
+        refreshMinuteData();
+        refreshSecondData();
+        return;
+      }
+      if (wheel == 4) {
+        refreshMinuteData();
+        refreshSecondData();
+        return;
+      }
+      refreshSecondData();
+    } else {
+      data[4] = List.generate(24, (index) => index);
+      data[5] = List.generate(60, (index) => index);
+      data[6] = List.generate(60, (index) => index);
+    }
+  }
+
+  void refreshHourData() {
+    var selectDay = dayIndex + data[2][0];
+    int hour = selectDay == dateStart[2] ? dateStart[3] : 0;
+    data[4] = List.generate(24 - hour, (index) => index + hour);
+    hourFixedExtentScrollController.jumpToItem(hour > 0 ? 0 : hourIndex);
+  }
+
+  void refreshMinuteData() {
+    var selectDay = dayIndex + data[2][0];
+    var selectHour = hourIndex + data[4][0];
+    int minute = selectDay == dateStart[2] ?selectHour>dateStart[3]?0:dateStart[4] : 0;
+    data[5] = List.generate(60 - minute, (index) => index + minute);
+    minuteFixedExtentScrollController.jumpToItem(minute > 0 ? 0 : minute);
+  }
+
+  void refreshSecondData() {
+    var selectDay = dayIndex + data[2][0];
+    var selectHour = hourIndex + data[4][0];
+    var selectMinute = minuteIndex + data[5][0];
+    int second = selectDay == dateStart[2] ?selectHour>dateStart[3]||selectMinute>dateStart[4]?0:dateStart[5]: 0;
+    data[6] = List.generate(60 - second, (index) => index + second);
+    secondFixedExtentScrollController.jumpToItem(second > 0 ? 0 : second);
+  }
+
   Map<String, int> getSelectedMap() {
     var map = <String, int>{
       'year': yearIndex + data[0][0],
       'month': monthIndex + data[1][0],
-      'day' : dayIndex + data[2][0],
+      'day': dayIndex + data[2][0],
     };
     return map;
   }

From 1a41e271fb1fa713b89348d76c886f961c48be6b Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Thu, 18 Jul 2024 19:51:20 +0800
Subject: [PATCH 17/74] =?UTF-8?q?td=5Ffooter=E6=BC=94=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=83=8C=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/example/lib/page/td_footer_page.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tdesign-component/example/lib/page/td_footer_page.dart b/tdesign-component/example/lib/page/td_footer_page.dart
index 8bb898cec..dd35f6c8e 100644
--- a/tdesign-component/example/lib/page/td_footer_page.dart
+++ b/tdesign-component/example/lib/page/td_footer_page.dart
@@ -16,6 +16,7 @@ class _TDFooterPageState extends State<TDFooterPage> {
   Widget build(BuildContext context) {
     return ExamplePage(
       title: tdTitle(),
+      backgroundColor: TDTheme.of(context).whiteColor1,
       desc: '可以折叠/展开的内容区域。',
       exampleCodeGroup: 'footer',
       children: [

From 15406cae826a000a8ce96dff5c67c3cc7a97315f Mon Sep 17 00:00:00 2001
From: iamitis <221250009@smail.nju.edu.cn>
Date: Sun, 21 Jul 2024 17:24:52 +0800
Subject: [PATCH 18/74] =?UTF-8?q?Slider=E6=BC=94=E7=A4=BA=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_slider_page.dart      | 282 +++++++++---------
 1 file changed, 137 insertions(+), 145 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_slider_page.dart b/tdesign-component/example/lib/page/td_slider_page.dart
index bb6b74367..e9d924901 100644
--- a/tdesign-component/example/lib/page/td_slider_page.dart
+++ b/tdesign-component/example/lib/page/td_slider_page.dart
@@ -32,10 +32,17 @@ class _TDSliderPageState extends State<TDSliderPage> {
             ExampleItem(desc: '带刻度双游标滑块', builder: _buildDoubleHandleWithScale),
           ]),
           ExampleModule(title: '组件状态', children: [
-            ExampleItem(desc: '禁用状态', builder: _buildDisable),
+            ExampleItem(desc: '禁用状态', builder: _buildDisableSingleHandle),
+            ExampleItem(builder: _buildDisableDoubleHandleWithNumber),
+            ExampleItem(builder: _buildDisableDoubleHandleWithScale),
           ]),
           ExampleModule(title: '特殊样式', children: [
-            ExampleItem(desc: '胶囊型滑块', builder: _buildCapsule),
+            ExampleItem(desc: '胶囊型滑块', builder: _buildCapsuleSingleHandleWithNumber),
+            ExampleItem(builder: _buildCapsuleDoubleHandle),
+            ExampleItem(builder: _buildCapsuleSingleHandle),
+            ExampleItem(builder: _buildCapsuleDoubleHandleWithNumber),
+            ExampleItem(builder: _buildCapsuleSingleHandleWithScale),
+            ExampleItem(builder: _buildCapsuleDoubleHandleWithScale),
           ]),
         ]);
   }
@@ -48,7 +55,6 @@ class _TDSliderPageState extends State<TDSliderPage> {
         max: 100,
       ),
       value: 10,
-      // divisions: 5,
       onChanged: (value) {},
     );
   }
@@ -61,7 +67,6 @@ class _TDSliderPageState extends State<TDSliderPage> {
         max: 100,
       ),
       value: const RangeValues(10, 60),
-      // divisions: 5,
       onChanged: (value) {},
     );
   }
@@ -78,7 +83,6 @@ class _TDSliderPageState extends State<TDSliderPage> {
       value: 10,
       leftLabel: '0',
       rightLabel: '100',
-      // divisions: 5,
       onChanged: (value) {},
     );
   }
@@ -95,7 +99,6 @@ class _TDSliderPageState extends State<TDSliderPage> {
       leftLabel: '0',
       rightLabel: '100',
       value: const RangeValues(40, 60),
-      // divisions: 5,
       onChanged: (value) {},
     );
   }
@@ -111,7 +114,6 @@ class _TDSliderPageState extends State<TDSliderPage> {
         scaleFormatter: (value) => value.toInt().toString(),
       ),
       value: 60,
-      // divisions: 5,
       onChanged: (value) {},
     );
   }
@@ -127,153 +129,143 @@ class _TDSliderPageState extends State<TDSliderPage> {
         scaleFormatter: (value) => value.toInt().toString(),
       ),
       value: const RangeValues(40, 70),
-      // divisions: 5,
       onChanged: (value) {},
     );
   }
 
   @Demo(group: 'slider')
-  Widget _buildDisable(BuildContext context) {
-    return Column(
-      children: [
-        TDSlider(
-          sliderThemeData: TDSliderThemeData(
-            min: 0,
-            max: 100,
-          ),
-          value: 40,
-          leftLabel: '0',
-          rightLabel: '100',
-        ),
-        const SizedBox(
-          height: 16,
-        ),
-        TDRangeSlider(
-          sliderThemeData: TDSliderThemeData(
-            min: 0,
-            max: 100,
-            showThumbValue: true,
-            scaleFormatter: (value) => value.toInt().toString(),
-          ),
-          value: const RangeValues(20, 60),
-          leftLabel: '0',
-          rightLabel: '100',
-        ),
-        const SizedBox(
-          height: 16,
-        ),
-        TDRangeSlider(
-          sliderThemeData: TDSliderThemeData(
-            showScaleValue: true,
-            divisions: 5,
-            min: 0,
-            max: 100,
-            scaleFormatter: (value) => value.toInt().toString(),
-          ),
-          value: const RangeValues(20, 60),
-        ),
-      ],
+  Widget _buildDisableSingleHandle(BuildContext context) {
+    return TDSlider(
+      sliderThemeData: TDSliderThemeData(
+        min: 0,
+        max: 100,
+      ),
+      leftLabel: '0',
+      rightLabel: '100',
+      value: 40,
+    );
+  }
+
+  @Demo(group: 'slider')
+  Widget _buildDisableDoubleHandleWithNumber(BuildContext context) {
+    return TDRangeSlider(
+      sliderThemeData: TDSliderThemeData(
+        showThumbValue: true,
+        min: 0,
+        max: 100,
+        scaleFormatter: (value) => value.toInt().toString(),
+      ),
+      leftLabel: '0',
+      rightLabel: '100',
+      value: const RangeValues(20, 60),
+    );
+  }
+
+  @Demo(group: 'slider')
+  Widget _buildDisableDoubleHandleWithScale(BuildContext context) {
+    return TDRangeSlider(
+      sliderThemeData: TDSliderThemeData(
+        showScaleValue: true,
+        divisions: 5,
+        min: 0,
+        max: 100,
+        scaleFormatter: (value) => value.toInt().toString(),
+      ),
+      value: const RangeValues(20, 60),
+    );
+  }
+  
+  @Demo(group: 'slider')
+  Widget _buildCapsuleSingleHandleWithNumber(BuildContext context) {
+    return TDSlider(
+      sliderThemeData: TDSliderThemeData.capsule(
+        showThumbValue: true,
+        min: 0,
+        max: 100,
+        scaleFormatter: (value) => value.toInt().toString(),
+      ),
+      value: 40,
+      onChanged: (value) {},
+    );
+  }
+
+  @Demo(group: 'slider')
+  Widget _buildCapsuleDoubleHandle(BuildContext context) {
+    return TDRangeSlider(
+      sliderThemeData: TDSliderThemeData.capsule(
+        min: 0,
+        max: 100,
+        scaleFormatter: (value) => value.toInt().toString(),
+      ),
+      value: const RangeValues(20, 60),
+      onChanged: (value) {},
+    );
+  }
+
+  @Demo(group: 'slider')
+  Widget _buildCapsuleSingleHandle(BuildContext context) {
+    return TDSlider(
+      sliderThemeData: TDSliderThemeData.capsule(
+        min: 0,
+        max: 100,
+        scaleFormatter: (value) => value.toInt().toString(),
+      ),
+      leftLabel: '0',
+      rightLabel: '100',
+      value: 40,
+      onChanged: (value) {},
+    );
+  }
+
+  @Demo(group: 'slider')
+  Widget _buildCapsuleDoubleHandleWithNumber(BuildContext context) {
+    return TDRangeSlider(
+      sliderThemeData: TDSliderThemeData.capsule(
+        showThumbValue: true,
+        min: 0,
+        max: 100,
+        scaleFormatter: (value) => value.toInt().toString(),
+      ),
+      leftLabel: '0',
+      rightLabel: '100',
+      value: const RangeValues(20, 60),
+      onChanged: (value) {},
+    );
+  }
+
+  @Demo(group: 'slider')
+  Widget _buildCapsuleSingleHandleWithScale(BuildContext context) {
+    return TDSlider(
+      sliderThemeData: TDSliderThemeData.capsule(
+        showScaleValue: true,
+        divisions: 5,
+        min: 0,
+        max: 100,
+        scaleFormatter: (value) => value.toInt().toString(),
+      )..updateSliderThemeData((data) => data.copyWith(
+           activeTickMarkColor: const Color(0xFFE7E7E7),
+           inactiveTickMarkColor: const Color(0xFFE7E7E7),
+      )),
+      value: 60,
+      onChanged: (value) {},
     );
   }
 
   @Demo(group: 'slider')
-  Widget _buildCapsule(BuildContext context) {
-    return Column(
-      children: [
-        TDSlider(
-          sliderThemeData: TDSliderThemeData.capsule(
-            showThumbValue: true,
-            min: 0,
-            max: 100,
-            scaleFormatter: (value) => value.toInt().toString(),
-          ),
-          value: 40,
-          // divisions: 5,
-          onChanged: (value) {},
-        ),
-        const SizedBox(
-          height: 16,
-        ),
-        TDRangeSlider(
-          sliderThemeData: TDSliderThemeData.capsule(
-            min: 0,
-            max: 100,
-            scaleFormatter: (value) => value.toInt().toString(),
-          ),
-          value: const RangeValues(20, 60),
-          // divisions: 5,
-          onChanged: (value) {},
-        ),
-        const SizedBox(
-          height: 16,
-        ),
-        TDSlider(
-          sliderThemeData: TDSliderThemeData.capsule(
-            min: 0,
-            max: 100,
-            scaleFormatter: (value) => value.toInt().toString(),
-          ),
-          leftLabel: '0',
-          rightLabel: '100',
-          value: 40,
-          // divisions: 5,
-          onChanged: (value) {},
-        ),
-        const SizedBox(
-          height: 16,
-        ),
-        TDRangeSlider(
-          sliderThemeData: TDSliderThemeData.capsule(
-            min: 0,
-            max: 100,
-            showThumbValue: true,
-            scaleFormatter: (value) => value.toInt().toString(),
-          ),
-          value: const RangeValues(20, 60),
-          leftLabel: '0',
-          rightLabel: '100',
-          // divisions: 5,
-          onChanged: (value) {},
-        ),
-        const SizedBox(
-          height: 16,
-        ),
-        TDSlider(
-          sliderThemeData: TDSliderThemeData.capsule(
-            showScaleValue: true,
-            divisions: 5,
-            min: 0,
-            max: 100,
-            scaleFormatter: (value) => value.toInt().toString(),
-          )..updateSliderThemeData((data) => data.copyWith(
-                activeTickMarkColor: const Color(0xFFE7E7E7),
-                inactiveTickMarkColor: const Color(0xFFE7E7E7),
-              )),
-          value: 60,
-          // divisions: 5,
-          onChanged: (value) {},
-        ),
-        const SizedBox(
-          height: 16,
-        ),
-        TDRangeSlider(
-          sliderThemeData: TDSliderThemeData.capsule(
-            showScaleValue: true,
-            divisions: 5,
-            min: 0,
-            max: 100,
-            scaleFormatter: (value) => value.toInt().toString(),
-          )
-            ..updateSliderThemeData((data) =>
-                data.copyWith(
-                  activeTickMarkColor: const Color(0xFFE7E7E7),
-                  inactiveTickMarkColor: const Color(0xFFE7E7E7),
-                )),
-          value: const RangeValues(20, 60),
-          // divisions: 5,
-          onChanged: (value) {},
-        )
-      ],
+  Widget _buildCapsuleDoubleHandleWithScale(BuildContext context) {
+    return TDRangeSlider(
+      sliderThemeData: TDSliderThemeData.capsule(
+        showScaleValue: true,
+        divisions: 5,
+        min: 0,
+        max: 100,
+        scaleFormatter: (value) => value.toInt().toString(),
+      )..updateSliderThemeData((data) => data.copyWith(
+           activeTickMarkColor: const Color(0xFFE7E7E7),
+           inactiveTickMarkColor: const Color(0xFFE7E7E7),
+      )),
+      value: const RangeValues(20, 60),
+      onChanged: (value) {},
     );
   }
 }

From e14789e3998a0343cf0a78221a5c28336eb06d59 Mon Sep 17 00:00:00 2001
From: shinyina <shinyina@foxmail.com>
Date: Sun, 28 Jul 2024 01:18:14 +0800
Subject: [PATCH 19/74] =?UTF-8?q?feat:=20=E7=9B=B4=E6=8E=A5=E4=BC=A0TextSt?=
 =?UTF-8?q?yle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/assets/api/switch_api.md          |  4 ++--
 .../assets/code/switch._customTextFont.txt    |  6 ++++--
 .../example/lib/page/td_switch_page.dart      |  6 ++++--
 .../lib/src/components/switch/td_switch.dart  | 21 ++++++++-----------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/tdesign-component/example/assets/api/switch_api.md b/tdesign-component/example/assets/api/switch_api.md
index 0404f652e..468b74925 100644
--- a/tdesign-component/example/assets/api/switch_api.md
+++ b/tdesign-component/example/assets/api/switch_api.md
@@ -13,8 +13,8 @@
 | trackOffColor | Color? | - | 关闭时轨道颜色 |
 | thumbContentOnColor | Color? | - | 开启时ThumbView的颜色 |
 | thumbContentOffColor | Color? | - | 关闭时ThumbView的颜色 |
-| thumbContentOnFont | double? | - | 开启时ThumbView的字体大小 |
-| thumbContentOffFont | double? | - | 关闭时ThumbView的字体大小 |
+| thumbContentOnFont | TextStyle? | - | 开启时ThumbView的字体样式 |
+| thumbContentOffFont | TextStyle? | - | 关闭时ThumbView的字体样式 |
 | onChanged | OnSwitchChanged? | - | 改变事件 |
 | openText | String? | - | 打开文案 |
 | closeText | String? | - | 关闭文案 |
diff --git a/tdesign-component/example/assets/code/switch._customTextFont.txt b/tdesign-component/example/assets/code/switch._customTextFont.txt
index bca7c0d49..ca87352c3 100644
--- a/tdesign-component/example/assets/code/switch._customTextFont.txt
+++ b/tdesign-component/example/assets/code/switch._customTextFont.txt
@@ -6,8 +6,10 @@
         type: TDSwitchType.text,
         openText: '开',
         closeText: '关',
-        thumbContentOnFont: 16,
-        thumbContentOffFont: 10,
+        thumbContentOffColor: Colors.red,
+        thumbContentOnColor: Colors.green,
+        thumbContentOnFont: TextStyle(fontSize: 18),
+        thumbContentOffFont: TextStyle(fontSize: 12),
       ),
       title: '基础开关',
     );
diff --git a/tdesign-component/example/lib/page/td_switch_page.dart b/tdesign-component/example/lib/page/td_switch_page.dart
index 2b33458ef..5f95a37e0 100644
--- a/tdesign-component/example/lib/page/td_switch_page.dart
+++ b/tdesign-component/example/lib/page/td_switch_page.dart
@@ -306,8 +306,10 @@ class TDSwitchPageState extends State<TDSwitchPage> {
         type: TDSwitchType.text,
         openText: '开',
         closeText: '关',
-        thumbContentOnFont: 16,
-        thumbContentOffFont: 10,
+        thumbContentOffColor: Colors.red,
+        thumbContentOnColor: Colors.green,
+        thumbContentOnFont: TextStyle(fontSize: 18),
+        thumbContentOffFont: TextStyle(fontSize: 12),
       ),
       title: '基础开关',
     );
diff --git a/tdesign-component/lib/src/components/switch/td_switch.dart b/tdesign-component/lib/src/components/switch/td_switch.dart
index fd9715bfb..9bdac3b9f 100644
--- a/tdesign-component/lib/src/components/switch/td_switch.dart
+++ b/tdesign-component/lib/src/components/switch/td_switch.dart
@@ -49,11 +49,11 @@ class TDSwitch extends StatefulWidget {
   /// 关闭时ThumbView的颜色
   final Color? thumbContentOffColor;
 
-  /// 开启时ThumbView的字体大小
-  final double? thumbContentOnFont;
+  /// 开启时ThumbView的字体样式
+  final TextStyle? thumbContentOnFont;
 
-  /// 关闭时ThumbView的字体大小
-  final double? thumbContentOffFont;
+  /// 关闭时ThumbView的字体样式
+  final TextStyle? thumbContentOffFont;
 
   /// 尺寸：大、中、小
   final TDSwitchSize? size;
@@ -101,8 +101,8 @@ class TDSwitchState extends State<TDSwitch> {
         widget.thumbContentOnColor ?? theme.brandNormalColor;
     final thumbContentOffColor =
         widget.thumbContentOffColor ?? theme.fontGyColor4;
-    final thumbContentOnFont = widget.thumbContentOnFont ?? 14;
-    final thumbContentOffFont = widget.thumbContentOffFont ?? 14;
+    final thumbContentOnFont = widget.thumbContentOnFont ?? const TextStyle(fontSize: 14);
+    final thumbContentOffFont = widget.thumbContentOffFont ?? const TextStyle(fontSize: 14);
     Widget current = TDCupertinoSwitch(
       value: isOn,
       activeColor: trackOnColor,
@@ -162,7 +162,7 @@ class TDSwitchState extends State<TDSwitch> {
     }
   }
 
-  Widget? _getThumbView(Color thumbContentOnColor, Color thumbContentOffColor, double thumbContentOnFont, double thumbContentOffFont) {
+  Widget? _getThumbView(Color thumbContentOnColor, Color thumbContentOffColor, TextStyle thumbContentOnFont, TextStyle thumbContentOffFont) {
     switch (widget.type) {
       case TDSwitchType.text:
         return Stack(
@@ -174,13 +174,10 @@ class TDSwitchState extends State<TDSwitch> {
                 isOn
                     ? (widget.openText ?? context.resource.open)
                     : (widget.closeText ?? context.resource.close),
-                style: TextStyle(
-                    color: isOn ? thumbContentOnColor : thumbContentOffColor,
-                    fontSize: isOn
-                        ? thumbContentOnFont
-                        : thumbContentOffFont),
+                textColor: isOn ? thumbContentOnColor : thumbContentOffColor,
                 forceVerticalCenter: true,
                 maxLines: 1,
+                style: isOn ? thumbContentOnFont : thumbContentOffFont,
               ),
             )
           ],

From c43c4c8921aac5cb11f39b3a593e02b92fff3130 Mon Sep 17 00:00:00 2001
From: plus7c <1959512279@qq.com>
Date: Sun, 4 Aug 2024 10:13:36 +0800
Subject: [PATCH 20/74] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4methodName?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=8C=E6=89=93=E5=8C=85=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E4=BC=9A=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_image_page.dart              | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_image_page.dart b/tdesign-component/example/lib/page/td_image_page.dart
index 5d4da460e..49defe1fc 100644
--- a/tdesign-component/example/lib/page/td_image_page.dart
+++ b/tdesign-component/example/lib/page/td_image_page.dart
@@ -55,14 +55,12 @@ class TDImageState extends State<TDImagePage>
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _imageClip,
-                            methodName: '_imageClip', // 裁剪
                           ),
                         ),
                         Container(
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _imageStretch,
-                            methodName: '_imageStretch', // 拉伸
                           ),
                         ),
                       ],
@@ -82,14 +80,12 @@ class TDImageState extends State<TDImagePage>
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _imageFitHeight,
-                            methodName: '_imageFitHeight', // 适应高
                           ),
                         ),
                         Container(
                           margin: const EdgeInsets.all(8), // 适应宽
                           child: CodeWrapper(
                             builder: _imageFitWidth,
-                            methodName: '_imageFitWidth',
                           ),
                         ),
                       ],
@@ -109,21 +105,18 @@ class TDImageState extends State<TDImagePage>
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _imageSquare,
-                            methodName: '_imageSquare', // 方形
                           ),
                         ),
                         Container(
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _imageRoundedSquare,
-                            methodName: '_imageRoundedSquare', // 圆角方形
                           ),
                         ),
                         Container(
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _imageCircle,
-                            methodName: '_imageCircle', // 圆形
                           ),
                         ),
                       ],
@@ -148,14 +141,12 @@ class TDImageState extends State<TDImagePage>
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _loadingDefault,
-                            methodName: '_loadingDefault', // 加载默认
                           ),
                         ),
                         Container(
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _loadingCustom,
-                            methodName: '_loadingCustom', // 加载自定义
                           ),
                         ),
                       ],
@@ -175,14 +166,12 @@ class TDImageState extends State<TDImagePage>
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _failDefault,
-                            methodName: '_failDefault', // 失败默认
                           ),
                         ),
                         Container(
                           margin: const EdgeInsets.all(8),
                           child: CodeWrapper(
                             builder: _failCustom,
-                            methodName: '_failCustom', // 失败自定义
                           ),
                         ),
                       ],
@@ -206,7 +195,6 @@ class TDImageState extends State<TDImagePage>
                       margin: const EdgeInsets.all(8),
                       child: CodeWrapper(
                         builder: _imageFile,
-                        methodName: '_imageFile',
                       ),
                     ),
                   ],

From f835cd72560ea5001ef3a29de663b794be73b864 Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Sat, 17 Aug 2024 17:08:27 +0800
Subject: [PATCH 21/74] =?UTF-8?q?=E5=AE=9A=E4=B9=89Progress=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=92=8C=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/progress/td_progress.dart  |  17 ++
 .../progress/td_progress_style.dart           | 190 ++++++++++++++++++
 2 files changed, 207 insertions(+)
 create mode 100644 tdesign-component/lib/src/components/progress/td_progress.dart
 create mode 100644 tdesign-component/lib/src/components/progress/td_progress_style.dart

diff --git a/tdesign-component/lib/src/components/progress/td_progress.dart b/tdesign-component/lib/src/components/progress/td_progress.dart
new file mode 100644
index 000000000..f4ae460bd
--- /dev/null
+++ b/tdesign-component/lib/src/components/progress/td_progress.dart
@@ -0,0 +1,17 @@
+import 'package:flutter/material.dart';
+import '../../../tdesign_flutter.dart';
+
+
+class TDProgress extends StatefulWidget {
+  const TDProgress({super.key});
+
+  @override
+  State<TDProgress> createState() => _TDProgressState();
+}
+
+class _TDProgressState extends State<TDProgress> {
+  @override
+  Widget build(BuildContext context) {
+    return const Placeholder();
+  }
+}
diff --git a/tdesign-component/lib/src/components/progress/td_progress_style.dart b/tdesign-component/lib/src/components/progress/td_progress_style.dart
new file mode 100644
index 000000000..b8292cf5a
--- /dev/null
+++ b/tdesign-component/lib/src/components/progress/td_progress_style.dart
@@ -0,0 +1,190 @@
+import 'package:flutter/material.dart';
+import '../button/td_button_style.dart';
+
+class TDProgressStyle {
+  const TDProgressStyle({
+    this.height,
+    this.width,
+    this.circleRadius,
+    this.borderRadius,
+    this.color,
+    this.backgroundColor,
+    this.labelPosition,
+    this.labelType,
+    this.animationConfig,
+    this.buttonConfig,
+  });
+
+  final double? height;
+  final double? width;
+  final double? circleRadius;
+  final double? borderRadius;
+  final Color? color;
+  final Color? backgroundColor;
+  final TDProgressLabelPosition? labelPosition;
+  final TDProgressLabelType? labelType;
+  final TDProgressAnimationConfig? animationConfig;
+  final TDProgressButtonConfig? buttonConfig;
+
+  // 基础进度条样式
+  static TDProgressStyle baseStyle(BuildContext context) {
+    final theme = Theme.of(context);
+    return TDProgressStyle(
+      color: theme.colorScheme.primary,
+      backgroundColor: theme.colorScheme.surface,
+      animationConfig: const TDProgressAnimationConfig(
+        enabled: true,
+        type: TDProgressAnimationType.linear,
+        speed: 1.0,
+      ),
+    );
+  }
+
+  // 线性进度条样式
+  static TDProgressStyle lineStyle(BuildContext context) {
+    return baseStyle(context).copyWith(
+      height: 8,
+      width: double.infinity,
+      borderRadius: 4,
+      labelPosition: TDProgressLabelPosition.right,
+      labelType: TDProgressLabelType.text,
+    );
+  }
+
+  // 圆形进度条样式
+  static TDProgressStyle circleStyle(BuildContext context) {
+    return baseStyle(context).copyWith(
+      circleRadius: 50,
+      labelPosition: TDProgressLabelPosition.inner,
+      labelType: TDProgressLabelType.text,
+      animationConfig: const TDProgressAnimationConfig(
+        type: TDProgressAnimationType.easeInOut,
+      ),
+    );
+  }
+
+  // 微型进度条样式
+  static TDProgressStyle microStyle(BuildContext context) {
+    return baseStyle(context).copyWith(
+      height: 4,
+      width: 60,
+      borderRadius: 2,
+      labelType: TDProgressLabelType.none,
+      animationConfig: const TDProgressAnimationConfig(
+        speed: 1.5,
+      ),
+    );
+  }
+
+  // 带按钮的微型进度条样式
+  static TDProgressStyle microButtonStyle(BuildContext context) {
+    return microStyle(context).copyWith(
+      labelType: TDProgressLabelType.icon,
+      buttonConfig: const TDProgressButtonConfig(
+        size: Size(20, 20),
+        padding: EdgeInsets.all(4),
+        // 其他微型按钮特定的配置
+      ),
+    );
+  }
+
+  // 带按钮的线性进度条样式
+  static TDProgressStyle lineButtonStyle(BuildContext context) {
+    return lineStyle(context).copyWith(
+      height: 12,
+      borderRadius: 6,
+      labelType: TDProgressLabelType.custom,
+      buttonConfig: const TDProgressButtonConfig(
+        padding: EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+        // 其他线性按钮特定的配置
+      ),
+    );
+  }
+
+  // 根据进度条类型获取默认样式
+  static TDProgressStyle getDefaultStyle(BuildContext context, TDProgressType type) {
+    switch (type) {
+      case TDProgressType.line:
+        return lineStyle(context);
+      case TDProgressType.circle:
+        return circleStyle(context);
+      case TDProgressType.micro:
+        return microStyle(context);
+      case TDProgressType.microButton:
+        return microButtonStyle(context);
+      case TDProgressType.lineButton:
+        return lineButtonStyle(context);
+    }
+  }
+
+  // 复制并修改当前样式
+  TDProgressStyle copyWith({
+    double? height,
+    double? width,
+    double? circleRadius,
+    double? borderRadius,
+    Color? color,
+    Color? backgroundColor,
+    TDProgressLabelPosition? labelPosition,
+    TDProgressLabelType? labelType,
+    TDProgressAnimationConfig? animationConfig,
+    TDProgressButtonConfig? buttonConfig,
+  }) {
+    return TDProgressStyle(
+      height: height ?? this.height,
+      width: width ?? this.width,
+      circleRadius: circleRadius ?? this.circleRadius,
+      borderRadius: borderRadius ?? this.borderRadius,
+      color: color ?? this.color,
+      backgroundColor: backgroundColor ?? this.backgroundColor,
+      labelPosition: labelPosition ?? this.labelPosition,
+      labelType: labelType ?? this.labelType,
+      animationConfig: animationConfig ?? this.animationConfig,
+      buttonConfig: buttonConfig ?? this.buttonConfig,
+    );
+  }
+}
+
+// 新增：进度条按钮配置类
+class TDProgressButtonConfig {
+  const TDProgressButtonConfig({
+    this.size,
+    this.padding,
+    this.style,
+  });
+
+  final Size? size;
+  final EdgeInsetsGeometry? padding;
+  final TDButtonStyle? style;
+
+  TDProgressButtonConfig copyWith({
+    Size? size,
+    EdgeInsetsGeometry? padding,
+    TDButtonStyle? style,
+  }) {
+    return TDProgressButtonConfig(
+      size: size ?? this.size,
+      padding: padding ?? this.padding,
+      style: style ?? this.style,
+    );
+  }
+}
+
+// 其他枚举和类的定义
+enum TDProgressType { line, circle, micro, microButton, lineButton }
+enum TDProgressLabelPosition { left, right, inner }
+enum TDProgressLabelType { none, text, icon, custom }
+
+class TDProgressAnimationConfig {
+  const TDProgressAnimationConfig({
+    this.enabled = true,
+    this.type = TDProgressAnimationType.linear,
+    this.speed = 1.0,
+  });
+
+  final bool enabled;
+  final TDProgressAnimationType type;
+  final double speed;
+}
+
+enum TDProgressAnimationType { easeIn, easeOut, easeInOut, linear }
\ No newline at end of file

From caac0ab5e24e025c3688256878b3b3649cd7f331 Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Sat, 17 Aug 2024 18:38:49 +0800
Subject: [PATCH 22/74] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E4=B9=8908/17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/progress/td_progress.dart  |  2 +-
 .../progress/td_progress_style.dart           | 30 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/tdesign-component/lib/src/components/progress/td_progress.dart b/tdesign-component/lib/src/components/progress/td_progress.dart
index f4ae460bd..c9a77cc66 100644
--- a/tdesign-component/lib/src/components/progress/td_progress.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../../../tdesign_flutter.dart';
+import './td_progress_style.dart';
 
 
 class TDProgress extends StatefulWidget {
diff --git a/tdesign-component/lib/src/components/progress/td_progress_style.dart b/tdesign-component/lib/src/components/progress/td_progress_style.dart
index b8292cf5a..7c9f573c8 100644
--- a/tdesign-component/lib/src/components/progress/td_progress_style.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress_style.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import '../button/td_button_style.dart';
+import '../../../tdesign_flutter.dart';
 
 class TDProgressStyle {
   const TDProgressStyle({
     this.height,
-    this.width,
+    this.strokeWidth,
     this.circleRadius,
     this.borderRadius,
     this.color,
@@ -16,7 +16,7 @@ class TDProgressStyle {
   });
 
   final double? height;
-  final double? width;
+  final double? strokeWidth;
   final double? circleRadius;
   final double? borderRadius;
   final Color? color;
@@ -28,10 +28,9 @@ class TDProgressStyle {
 
   // 基础进度条样式
   static TDProgressStyle baseStyle(BuildContext context) {
-    final theme = Theme.of(context);
     return TDProgressStyle(
-      color: theme.colorScheme.primary,
-      backgroundColor: theme.colorScheme.surface,
+      color: TDTheme.of(context).brandColor1,
+      backgroundColor: TDTheme.of(context).grayColor1,
       animationConfig: const TDProgressAnimationConfig(
         enabled: true,
         type: TDProgressAnimationType.linear,
@@ -44,8 +43,8 @@ class TDProgressStyle {
   static TDProgressStyle lineStyle(BuildContext context) {
     return baseStyle(context).copyWith(
       height: 8,
-      width: double.infinity,
-      borderRadius: 4,
+      strokeWidth: 2,
+      borderRadius: TDTheme.of(context).radiusDefault,
       labelPosition: TDProgressLabelPosition.right,
       labelType: TDProgressLabelType.text,
     );
@@ -54,7 +53,8 @@ class TDProgressStyle {
   // 圆形进度条样式
   static TDProgressStyle circleStyle(BuildContext context) {
     return baseStyle(context).copyWith(
-      circleRadius: 50,
+      strokeWidth: 2,
+      circleRadius: TDTheme.of(context).radiusCircle,
       labelPosition: TDProgressLabelPosition.inner,
       labelType: TDProgressLabelType.text,
       animationConfig: const TDProgressAnimationConfig(
@@ -67,8 +67,8 @@ class TDProgressStyle {
   static TDProgressStyle microStyle(BuildContext context) {
     return baseStyle(context).copyWith(
       height: 4,
-      width: 60,
-      borderRadius: 2,
+      strokeWidth: 1,
+      borderRadius: TDTheme.of(context).radiusCircle,
       labelType: TDProgressLabelType.none,
       animationConfig: const TDProgressAnimationConfig(
         speed: 1.5,
@@ -91,8 +91,6 @@ class TDProgressStyle {
   // 带按钮的线性进度条样式
   static TDProgressStyle lineButtonStyle(BuildContext context) {
     return lineStyle(context).copyWith(
-      height: 12,
-      borderRadius: 6,
       labelType: TDProgressLabelType.custom,
       buttonConfig: const TDProgressButtonConfig(
         padding: EdgeInsets.symmetric(horizontal: 12, vertical: 8),
@@ -120,7 +118,7 @@ class TDProgressStyle {
   // 复制并修改当前样式
   TDProgressStyle copyWith({
     double? height,
-    double? width,
+    double? strokeWidth,
     double? circleRadius,
     double? borderRadius,
     Color? color,
@@ -132,7 +130,7 @@ class TDProgressStyle {
   }) {
     return TDProgressStyle(
       height: height ?? this.height,
-      width: width ?? this.width,
+      strokeWidth: strokeWidth ?? this.strokeWidth,
       circleRadius: circleRadius ?? this.circleRadius,
       borderRadius: borderRadius ?? this.borderRadius,
       color: color ?? this.color,
@@ -145,7 +143,7 @@ class TDProgressStyle {
   }
 }
 
-// 新增：进度条按钮配置类
+// 进度条按钮配置类
 class TDProgressButtonConfig {
   const TDProgressButtonConfig({
     this.size,

From 6544ed21e982a73e51cde9e7331cacf29eaf89e5 Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Sun, 18 Aug 2024 16:23:33 +0800
Subject: [PATCH 23/74] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=A2=B3=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/DEVELOPER.md | 230 +++++++++++++++++++++++++++++++++
 1 file changed, 230 insertions(+)
 create mode 100644 tdesign-component/DEVELOPER.md

diff --git a/tdesign-component/DEVELOPER.md b/tdesign-component/DEVELOPER.md
new file mode 100644
index 000000000..55c2f5e78
--- /dev/null
+++ b/tdesign-component/DEVELOPER.md
@@ -0,0 +1,230 @@
+1. 准备工作
+   a. Fork 项目仓库
+    - 访问 TDesign Flutter 项目的 GitHub 页面
+    - 点击右上角的 "Fork" 按钮
+
+   b. 克隆 fork 的仓库到本地
+      ```
+      git clone https://github.com/你的用户名/tdesign-flutter.git
+      cd tdesign-flutter
+      ```
+
+   c. 设置上游仓库
+      ```
+      git remote add upstream https://github.com/Tencent/tdesign-flutter.git
+      ```
+
+   d. 创建并切换到新的特性分支
+      ```
+      git checkout -b feature/新组件名小写_下划线  //如feature/td_new_component
+      ```
+
+   e. 安装依赖
+      ```
+      flutter pub get
+      ```
+
+2. 组件开发
+   a. 在 `lib/src/components` 下创建新组件文件夹和主文件
+      ```
+      mkdir lib/src/components/new_component
+      touch lib/src/components/new_component/td_new_component.dart
+      ```
+
+   b. 实现组件基本结构
+      ```dart
+      import 'package:flutter/material.dart';
+      import 'package:tdesign_flutter/tdesign_flutter.dart';
+
+      class TDNewComponent extends StatefulWidget {
+        const TDNewComponent({Key? key}) : super(key: key);
+
+        @override
+        _TDNewComponentState createState() => _TDNewComponentState();
+      }
+
+      class _TDNewComponentState extends State<TDNewComponent> {
+        @override
+        Widget build(BuildContext context) {
+          final theme = TDTheme.of(context);
+          return Container(
+            // 使用主题中的颜色和样式
+            color: theme.brandNormalColor,
+            child: Text(
+              // 使用本地化文本
+              TDResources.of(context).textComponentTitle,
+              style: TextStyle(color: theme.fontGyColor1),
+            ),
+          );
+        }
+      }
+      ```
+
+3. 国际化支持
+   a. 打开 `lib/src/localization/td_resources.dart`
+   b. 在 TDResources 类中添加新的 getter
+      ```dart
+      String get newComponentTitle => _getText('newComponentTitle');
+      ```
+
+   c. 在 `lib/src/localization/l10n/intl_en.arb` 和 `intl_zh.arb` 中添加新的文本
+      ```json
+      {
+        "newComponentTitle": "New Component"
+      }
+      ```
+
+4. 示例页面开发
+   a. 创建示例页面文件
+      ```
+      touch example/lib/page/td_new_component_page.dart
+      ```
+
+   b. 实现示例页面
+      ```dart
+      import 'package:flutter/material.dart';
+      import 'package:tdesign_flutter/tdesign_flutter.dart';
+      import '../base/example_base.dart';
+
+      class TDNewComponentPage extends StatelessWidget {
+        const TDNewComponentPage({Key? key}) : super(key: key);
+
+        @override
+        Widget build(BuildContext context) {
+          return ExamplePage(
+            title: 'New Component',
+            exampleCodeGroup: 'newComponent',
+            children: [
+              ExampleModule(title: 'Basic Usage', children: [
+                ExampleItem(
+                  desc: 'Default',
+                  builder: (_) => const TDNewComponent(),
+                ),
+                // 添加更多 ExampleItem
+              ]),
+              // 添加更多 ExampleModule
+            ],
+          );
+        }
+      }
+      ```
+
+5. 注册路由
+   a. 打开 `example/lib/base/example_model.dart`
+   b. 添加新组件的 ExampleModel
+      ```dart
+      ExampleModel('New Component', 'NewComponent', '/new_component', Icons.new_releases, (context, model) => const TDNewComponentPage()),
+      ```
+
+   c. 更新 `example/lib/config.dart`
+      ```dart
+      'Components': [
+        // ... 其他组件
+        ExampleModel('New Component', 'NewComponent', '/new_component', Icons.new_releases, (context, model) => const TDNewComponentPage()),
+      ],
+      ```
+
+6. 演示代码编写
+   在 TDNewComponentPage 中：
+   ```dart
+   @Demo(group: 'newComponent')
+   Widget _buildBasicExample() {
+     return const TDNewComponent();
+   }
+   ```
+
+7. API 文档准备
+   在 td_new_component.dart 中：
+   ```dart
+   /// A new component in the TDesign Flutter library.
+   ///
+   /// This component is used for... (describe the purpose)
+   ///
+   /// Example:
+   /// ```dart
+   /// TDNewComponent(
+   ///   // Add example properties here
+   /// )
+   /// ```
+   class TDNewComponent extends StatefulWidget {
+     /// Creates a TDNewComponent.
+     const TDNewComponent({Key? key}) : super(key: key);
+
+     @override
+     _TDNewComponentState createState() => _TDNewComponentState();
+   }
+   ```
+
+8. 主题支持
+   确保在组件中正确使用主题：
+   ```dart
+   final theme = TDTheme.of(context);
+   // 使用 theme 中的颜色和样式
+   ```
+
+9. 测试
+   a. 创建测试文件
+      ```
+      touch test/components/new_component_test.dart
+      ```
+
+   b. 编写测试用例
+      ```dart
+      import 'package:flutter_test/flutter_test.dart';
+      import 'package:tdesign_flutter/tdesign_flutter.dart';
+
+      void main() {
+        testWidgets('TDNewComponent basic test', (WidgetTester tester) async {
+          await tester.pumpWidget(
+            MaterialApp(
+              home: TDTheme(
+                data: TDThemeData.defaultData(),
+                child: const TDNewComponent(),
+              ),
+            ),
+          );
+          // 添加验证逻辑
+        });
+      }
+      ```
+
+10. 代码规范检查
+    运行以下命令：
+    ```
+    dart analyze
+    dart format .
+    ```
+
+11. 更新文档
+    a. 在 CHANGELOG.md 中添加：
+       ```markdown
+       ## Unreleased
+
+       ### Added
+       - New component: TDNewComponent
+       ```
+
+    b. 更新 README.md 和 README_zh.md
+
+12. 本地测试
+    运行示例应用：
+    ```
+    cd example
+    flutter run
+    ```
+
+13. 代码提交
+    ```
+    git add .
+    git commit -m "Add TDNewComponent"
+    git push origin feature/new_component_name
+    ```
+
+14. 持续集成
+    查看 GitHub Actions（如果配置了）的运行结果，根据需要进行修复。
+
+15. 创建 Pull Request
+    - 打开您的 GitHub fork 仓库页面
+    - 点击 "New pull request"
+    - 选择基础分支为原仓库的 dev 分支
+    - 填写 PR 描述，详细说明新组件的功能和用法
\ No newline at end of file

From e15b38937e48e8983da0c2e3fed676913e05bf55 Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Mon, 19 Aug 2024 20:05:09 +0800
Subject: [PATCH 24/74] =?UTF-8?q?progress=E6=B5=8B=E8=AF=95=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 progress/.gitignore                           |  44 ++
 progress/.metadata                            |  45 ++
 progress/README.md                            |  16 +
 progress/analysis_options.yaml                |  29 +
 progress/android/.gitignore                   |  13 +
 progress/android/app/build.gradle             |  67 ++
 .../android/app/src/debug/AndroidManifest.xml |   7 +
 .../android/app/src/main/AndroidManifest.xml  |  33 +
 .../com/example/progress/MainActivity.kt      |   6 +
 .../res/drawable-v21/launch_background.xml    |  12 +
 .../main/res/drawable/launch_background.xml   |  12 +
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 0 -> 544 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 0 -> 442 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 0 -> 1031 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 0 -> 1443 bytes
 .../app/src/main/res/values-night/styles.xml  |  18 +
 .../app/src/main/res/values/styles.xml        |  18 +
 .../app/src/profile/AndroidManifest.xml       |   7 +
 progress/android/build.gradle                 |  31 +
 progress/android/gradle.properties            |   3 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 progress/android/settings.gradle              |  20 +
 progress/ios/.gitignore                       |  34 +
 progress/ios/Flutter/AppFrameworkInfo.plist   |  26 +
 progress/ios/Flutter/Debug.xcconfig           |   1 +
 progress/ios/Flutter/Release.xcconfig         |   1 +
 progress/ios/Runner.xcodeproj/project.pbxproj | 614 ++++++++++++++++
 .../contents.xcworkspacedata                  |   7 +
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 +
 .../xcshareddata/WorkspaceSettings.xcsettings |   8 +
 .../xcshareddata/xcschemes/Runner.xcscheme    |  98 +++
 .../contents.xcworkspacedata                  |   7 +
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 +
 .../xcshareddata/WorkspaceSettings.xcsettings |   8 +
 progress/ios/Runner/AppDelegate.swift         |  13 +
 .../AppIcon.appiconset/Contents.json          | 122 +++
 .../Icon-App-1024x1024@1x.png                 | Bin 0 -> 10932 bytes
 .../AppIcon.appiconset/Icon-App-20x20@1x.png  | Bin 0 -> 295 bytes
 .../AppIcon.appiconset/Icon-App-20x20@2x.png  | Bin 0 -> 406 bytes
 .../AppIcon.appiconset/Icon-App-20x20@3x.png  | Bin 0 -> 450 bytes
 .../AppIcon.appiconset/Icon-App-29x29@1x.png  | Bin 0 -> 282 bytes
 .../AppIcon.appiconset/Icon-App-29x29@2x.png  | Bin 0 -> 462 bytes
 .../AppIcon.appiconset/Icon-App-29x29@3x.png  | Bin 0 -> 704 bytes
 .../AppIcon.appiconset/Icon-App-40x40@1x.png  | Bin 0 -> 406 bytes
 .../AppIcon.appiconset/Icon-App-40x40@2x.png  | Bin 0 -> 586 bytes
 .../AppIcon.appiconset/Icon-App-40x40@3x.png  | Bin 0 -> 862 bytes
 .../AppIcon.appiconset/Icon-App-60x60@2x.png  | Bin 0 -> 862 bytes
 .../AppIcon.appiconset/Icon-App-60x60@3x.png  | Bin 0 -> 1674 bytes
 .../AppIcon.appiconset/Icon-App-76x76@1x.png  | Bin 0 -> 762 bytes
 .../AppIcon.appiconset/Icon-App-76x76@2x.png  | Bin 0 -> 1226 bytes
 .../Icon-App-83.5x83.5@2x.png                 | Bin 0 -> 1418 bytes
 .../LaunchImage.imageset/Contents.json        |  23 +
 .../LaunchImage.imageset/LaunchImage.png      | Bin 0 -> 68 bytes
 .../LaunchImage.imageset/LaunchImage@2x.png   | Bin 0 -> 68 bytes
 .../LaunchImage.imageset/LaunchImage@3x.png   | Bin 0 -> 68 bytes
 .../LaunchImage.imageset/README.md            |   5 +
 .../Runner/Base.lproj/LaunchScreen.storyboard |  37 +
 .../ios/Runner/Base.lproj/Main.storyboard     |  26 +
 progress/ios/Runner/Info.plist                |  51 ++
 progress/ios/Runner/Runner-Bridging-Header.h  |   1 +
 progress/ios/RunnerTests/RunnerTests.swift    |  12 +
 progress/lib/main.dart                        |  97 +++
 progress/lib/progress.dart                    | 464 ++++++++++++
 progress/lib/progressbar.dart                 | 124 ++++
 progress/linux/.gitignore                     |   1 +
 progress/linux/CMakeLists.txt                 | 139 ++++
 progress/linux/flutter/CMakeLists.txt         |  88 +++
 .../flutter/generated_plugin_registrant.cc    |  11 +
 .../flutter/generated_plugin_registrant.h     |  15 +
 .../linux/flutter/generated_plugins.cmake     |  23 +
 progress/linux/main.cc                        |   6 +
 progress/linux/my_application.cc              | 104 +++
 progress/linux/my_application.h               |  18 +
 progress/macos/.gitignore                     |   7 +
 progress/macos/Flutter/Flutter-Debug.xcconfig |   1 +
 .../macos/Flutter/Flutter-Release.xcconfig    |   1 +
 .../Flutter/GeneratedPluginRegistrant.swift   |  10 +
 .../macos/Runner.xcodeproj/project.pbxproj    | 695 ++++++++++++++++++
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 +
 .../xcshareddata/xcschemes/Runner.xcscheme    |  98 +++
 .../contents.xcworkspacedata                  |   7 +
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 +
 progress/macos/Runner/AppDelegate.swift       |   9 +
 .../AppIcon.appiconset/Contents.json          |  68 ++
 .../AppIcon.appiconset/app_icon_1024.png      | Bin 0 -> 102994 bytes
 .../AppIcon.appiconset/app_icon_128.png       | Bin 0 -> 5680 bytes
 .../AppIcon.appiconset/app_icon_16.png        | Bin 0 -> 520 bytes
 .../AppIcon.appiconset/app_icon_256.png       | Bin 0 -> 14142 bytes
 .../AppIcon.appiconset/app_icon_32.png        | Bin 0 -> 1066 bytes
 .../AppIcon.appiconset/app_icon_512.png       | Bin 0 -> 36406 bytes
 .../AppIcon.appiconset/app_icon_64.png        | Bin 0 -> 2218 bytes
 progress/macos/Runner/Base.lproj/MainMenu.xib | 343 +++++++++
 .../macos/Runner/Configs/AppInfo.xcconfig     |  14 +
 progress/macos/Runner/Configs/Debug.xcconfig  |   2 +
 .../macos/Runner/Configs/Release.xcconfig     |   2 +
 .../macos/Runner/Configs/Warnings.xcconfig    |  13 +
 .../macos/Runner/DebugProfile.entitlements    |  12 +
 progress/macos/Runner/Info.plist              |  32 +
 progress/macos/Runner/MainFlutterWindow.swift |  15 +
 progress/macos/Runner/Release.entitlements    |   8 +
 progress/macos/RunnerTests/RunnerTests.swift  |  12 +
 progress/pubspec.lock                         | 221 ++++++
 progress/pubspec.yaml                         |  91 +++
 progress/test/widget_test.dart                |  30 +
 progress/web/favicon.png                      | Bin 0 -> 917 bytes
 progress/web/icons/Icon-192.png               | Bin 0 -> 5292 bytes
 progress/web/icons/Icon-512.png               | Bin 0 -> 8252 bytes
 progress/web/icons/Icon-maskable-192.png      | Bin 0 -> 5594 bytes
 progress/web/icons/Icon-maskable-512.png      | Bin 0 -> 20998 bytes
 progress/web/index.html                       |  59 ++
 progress/web/manifest.json                    |  35 +
 progress/windows/.gitignore                   |  17 +
 progress/windows/CMakeLists.txt               | 102 +++
 progress/windows/flutter/CMakeLists.txt       | 104 +++
 .../flutter/generated_plugin_registrant.cc    |  11 +
 .../flutter/generated_plugin_registrant.h     |  15 +
 .../windows/flutter/generated_plugins.cmake   |  23 +
 progress/windows/runner/CMakeLists.txt        |  40 +
 progress/windows/runner/Runner.rc             | 121 +++
 progress/windows/runner/flutter_window.cpp    |  71 ++
 progress/windows/runner/flutter_window.h      |  33 +
 progress/windows/runner/main.cpp              |  43 ++
 progress/windows/runner/resource.h            |  16 +
 .../windows/runner/resources/app_icon.ico     | Bin 0 -> 33772 bytes
 progress/windows/runner/runner.exe.manifest   |  20 +
 progress/windows/runner/utils.cpp             |  65 ++
 progress/windows/runner/utils.h               |  19 +
 progress/windows/runner/win32_window.cpp      | 288 ++++++++
 progress/windows/runner/win32_window.h        | 102 +++
 130 files changed, 5477 insertions(+)
 create mode 100644 progress/.gitignore
 create mode 100644 progress/.metadata
 create mode 100644 progress/README.md
 create mode 100644 progress/analysis_options.yaml
 create mode 100644 progress/android/.gitignore
 create mode 100644 progress/android/app/build.gradle
 create mode 100644 progress/android/app/src/debug/AndroidManifest.xml
 create mode 100644 progress/android/app/src/main/AndroidManifest.xml
 create mode 100644 progress/android/app/src/main/kotlin/com/example/progress/MainActivity.kt
 create mode 100644 progress/android/app/src/main/res/drawable-v21/launch_background.xml
 create mode 100644 progress/android/app/src/main/res/drawable/launch_background.xml
 create mode 100644 progress/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 progress/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 progress/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 progress/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 progress/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 progress/android/app/src/main/res/values-night/styles.xml
 create mode 100644 progress/android/app/src/main/res/values/styles.xml
 create mode 100644 progress/android/app/src/profile/AndroidManifest.xml
 create mode 100644 progress/android/build.gradle
 create mode 100644 progress/android/gradle.properties
 create mode 100644 progress/android/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 progress/android/settings.gradle
 create mode 100644 progress/ios/.gitignore
 create mode 100644 progress/ios/Flutter/AppFrameworkInfo.plist
 create mode 100644 progress/ios/Flutter/Debug.xcconfig
 create mode 100644 progress/ios/Flutter/Release.xcconfig
 create mode 100644 progress/ios/Runner.xcodeproj/project.pbxproj
 create mode 100644 progress/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 create mode 100644 progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
 create mode 100644 progress/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
 create mode 100644 progress/ios/Runner.xcworkspace/contents.xcworkspacedata
 create mode 100644 progress/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 create mode 100644 progress/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
 create mode 100644 progress/ios/Runner/AppDelegate.swift
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
 create mode 100644 progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
 create mode 100644 progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
 create mode 100644 progress/ios/Runner/Base.lproj/LaunchScreen.storyboard
 create mode 100644 progress/ios/Runner/Base.lproj/Main.storyboard
 create mode 100644 progress/ios/Runner/Info.plist
 create mode 100644 progress/ios/Runner/Runner-Bridging-Header.h
 create mode 100644 progress/ios/RunnerTests/RunnerTests.swift
 create mode 100644 progress/lib/main.dart
 create mode 100644 progress/lib/progress.dart
 create mode 100644 progress/lib/progressbar.dart
 create mode 100644 progress/linux/.gitignore
 create mode 100644 progress/linux/CMakeLists.txt
 create mode 100644 progress/linux/flutter/CMakeLists.txt
 create mode 100644 progress/linux/flutter/generated_plugin_registrant.cc
 create mode 100644 progress/linux/flutter/generated_plugin_registrant.h
 create mode 100644 progress/linux/flutter/generated_plugins.cmake
 create mode 100644 progress/linux/main.cc
 create mode 100644 progress/linux/my_application.cc
 create mode 100644 progress/linux/my_application.h
 create mode 100644 progress/macos/.gitignore
 create mode 100644 progress/macos/Flutter/Flutter-Debug.xcconfig
 create mode 100644 progress/macos/Flutter/Flutter-Release.xcconfig
 create mode 100644 progress/macos/Flutter/GeneratedPluginRegistrant.swift
 create mode 100644 progress/macos/Runner.xcodeproj/project.pbxproj
 create mode 100644 progress/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 create mode 100644 progress/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
 create mode 100644 progress/macos/Runner.xcworkspace/contents.xcworkspacedata
 create mode 100644 progress/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 create mode 100644 progress/macos/Runner/AppDelegate.swift
 create mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
 create mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
 create mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
 create mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
 create mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
 create mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
 create mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
 create mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
 create mode 100644 progress/macos/Runner/Base.lproj/MainMenu.xib
 create mode 100644 progress/macos/Runner/Configs/AppInfo.xcconfig
 create mode 100644 progress/macos/Runner/Configs/Debug.xcconfig
 create mode 100644 progress/macos/Runner/Configs/Release.xcconfig
 create mode 100644 progress/macos/Runner/Configs/Warnings.xcconfig
 create mode 100644 progress/macos/Runner/DebugProfile.entitlements
 create mode 100644 progress/macos/Runner/Info.plist
 create mode 100644 progress/macos/Runner/MainFlutterWindow.swift
 create mode 100644 progress/macos/Runner/Release.entitlements
 create mode 100644 progress/macos/RunnerTests/RunnerTests.swift
 create mode 100644 progress/pubspec.lock
 create mode 100644 progress/pubspec.yaml
 create mode 100644 progress/test/widget_test.dart
 create mode 100644 progress/web/favicon.png
 create mode 100644 progress/web/icons/Icon-192.png
 create mode 100644 progress/web/icons/Icon-512.png
 create mode 100644 progress/web/icons/Icon-maskable-192.png
 create mode 100644 progress/web/icons/Icon-maskable-512.png
 create mode 100644 progress/web/index.html
 create mode 100644 progress/web/manifest.json
 create mode 100644 progress/windows/.gitignore
 create mode 100644 progress/windows/CMakeLists.txt
 create mode 100644 progress/windows/flutter/CMakeLists.txt
 create mode 100644 progress/windows/flutter/generated_plugin_registrant.cc
 create mode 100644 progress/windows/flutter/generated_plugin_registrant.h
 create mode 100644 progress/windows/flutter/generated_plugins.cmake
 create mode 100644 progress/windows/runner/CMakeLists.txt
 create mode 100644 progress/windows/runner/Runner.rc
 create mode 100644 progress/windows/runner/flutter_window.cpp
 create mode 100644 progress/windows/runner/flutter_window.h
 create mode 100644 progress/windows/runner/main.cpp
 create mode 100644 progress/windows/runner/resource.h
 create mode 100644 progress/windows/runner/resources/app_icon.ico
 create mode 100644 progress/windows/runner/runner.exe.manifest
 create mode 100644 progress/windows/runner/utils.cpp
 create mode 100644 progress/windows/runner/utils.h
 create mode 100644 progress/windows/runner/win32_window.cpp
 create mode 100644 progress/windows/runner/win32_window.h

diff --git a/progress/.gitignore b/progress/.gitignore
new file mode 100644
index 000000000..24476c5d1
--- /dev/null
+++ b/progress/.gitignore
@@ -0,0 +1,44 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/progress/.metadata b/progress/.metadata
new file mode 100644
index 000000000..900720458
--- /dev/null
+++ b/progress/.metadata
@@ -0,0 +1,45 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f"
+  channel: "[user-branch]"
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
+      base_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
+    - platform: android
+      create_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
+      base_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
+    - platform: ios
+      create_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
+      base_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
+    - platform: linux
+      create_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
+      base_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
+    - platform: macos
+      create_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
+      base_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
+    - platform: web
+      create_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
+      base_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
+    - platform: windows
+      create_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
+      base_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/progress/README.md b/progress/README.md
new file mode 100644
index 000000000..7198e55fe
--- /dev/null
+++ b/progress/README.md
@@ -0,0 +1,16 @@
+# progress
+
+A new Flutter project.
+
+## Getting Started
+
+This project is a starting point for a Flutter application.
+
+A few resources to get you started if this is your first Flutter project:
+
+- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
+- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
+
+For help getting started with Flutter development, view the
+[online documentation](https://docs.flutter.dev/), which offers tutorials,
+samples, guidance on mobile development, and a full API reference.
diff --git a/progress/analysis_options.yaml b/progress/analysis_options.yaml
new file mode 100644
index 000000000..61b6c4de1
--- /dev/null
+++ b/progress/analysis_options.yaml
@@ -0,0 +1,29 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
diff --git a/progress/android/.gitignore b/progress/android/.gitignore
new file mode 100644
index 000000000..6f568019d
--- /dev/null
+++ b/progress/android/.gitignore
@@ -0,0 +1,13 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+key.properties
+**/*.keystore
+**/*.jks
diff --git a/progress/android/app/build.gradle b/progress/android/app/build.gradle
new file mode 100644
index 000000000..97d081a54
--- /dev/null
+++ b/progress/android/app/build.gradle
@@ -0,0 +1,67 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
+def localProperties = new Properties()
+def localPropertiesFile = rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    localPropertiesFile.withReader('UTF-8') { reader ->
+        localProperties.load(reader)
+    }
+}
+
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
+android {
+    namespace "com.example.progress"
+    compileSdkVersion flutter.compileSdkVersion
+    ndkVersion flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId "com.example.progress"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig signingConfigs.debug
+        }
+    }
+}
+
+flutter {
+    source '../..'
+}
+
+dependencies {}
diff --git a/progress/android/app/src/debug/AndroidManifest.xml b/progress/android/app/src/debug/AndroidManifest.xml
new file mode 100644
index 000000000..399f6981d
--- /dev/null
+++ b/progress/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
diff --git a/progress/android/app/src/main/AndroidManifest.xml b/progress/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..9ea14697b
--- /dev/null
+++ b/progress/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
+        android:label="progress"
+        android:name="${applicationName}"
+        android:icon="@mipmap/ic_launcher">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <!-- Specifies an Android theme to apply to this Activity as soon as
+                 the Android process has started. This theme is visible to the user
+                 while the Flutter UI initializes. After that, this theme continues
+                 to determine the Window background behind the Flutter UI. -->
+            <meta-data
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+    </application>
+</manifest>
diff --git a/progress/android/app/src/main/kotlin/com/example/progress/MainActivity.kt b/progress/android/app/src/main/kotlin/com/example/progress/MainActivity.kt
new file mode 100644
index 000000000..b91e2d741
--- /dev/null
+++ b/progress/android/app/src/main/kotlin/com/example/progress/MainActivity.kt
@@ -0,0 +1,6 @@
+package com.example.progress
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}
diff --git a/progress/android/app/src/main/res/drawable-v21/launch_background.xml b/progress/android/app/src/main/res/drawable-v21/launch_background.xml
new file mode 100644
index 000000000..f74085f3f
--- /dev/null
+++ b/progress/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/progress/android/app/src/main/res/drawable/launch_background.xml b/progress/android/app/src/main/res/drawable/launch_background.xml
new file mode 100644
index 000000000..304732f88
--- /dev/null
+++ b/progress/android/app/src/main/res/drawable/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/progress/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/progress/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29
GIT binary patch
literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc
zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs
zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U<k`UN+s5qQ#T?KrmN7v*f2L%`GO4-^
z(#_kX+jhyc?*UrsvLED<w+p3gfi4y<3GxeO5CDRJfCLa|I1d8%B?X@R0!qL1ba4!c
zIQ;g^b-pGC0f)elH+vJ_clF3>|N3vA*22N<t#oc3|FNCx%`Ll}Jbl*Q`}yg~1ZO@=
zF!6p)NTYsh!6(JdtLiRuwi@`&XeqAXe9fY|=kfFy_3t|md##(iHE+K4ydxH3>aGQG
zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#i<K@6w~yiZZH!59hqLTYF-H
zp0%uz(2~z(X$>qdw@AL`7MR}m`rwr|mZgU`8P7SB<Kba6`>kL78fFf!WnuYWm$5Z0
zNXhDbCv&49sM544K|?c)WrFfiZ<W8RzO1)p=v7f>vCi9h0O)B3Pgg&ebxsLQ05GG~
AQ2+n{

literal 0
HcmV?d00001

diff --git a/progress/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/progress/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be
GIT binary patch
literal 442
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB
zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q0<?|W-^A&VhjhO+044$%!YxiPI;`p4Q#=k
za-F;6dk-j1J*_nBlG2>3KywUtLX8Ua?`H+NMzkczFPK3<KtaL4z@UHr{Pp|KpFjT|
z1oAia3j-A_^>lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l
zyt<ns@%x_-ezPmiS-=02Ut8`WUGa5ad?jb?UB<rkVmAJ)*Xy}nR&U>Q?X=U+MF$@3
zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+
yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@U<OZDKbLh*2~7avPrJzg

literal 0
HcmV?d00001

diff --git a/progress/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/progress/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..09d4391482be68e9e4a07fab769b5de337d16eb1
GIT binary patch
literal 721
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!iOI#yLg7ec#$`gxH85~pclTsBt
za}(23gHjVyDhp4h+5i=O3-AeX1=1l$e`s#|#^}+&7(N@w0CIr{$Oe+Uk^K-ZP~83C
zcc@hG6rikF&NPT(23>y!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs
z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM
zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R`
zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM
zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg
z<JnHTOuK%sGbNji)8cv6*ZNtnbwxJZ-?eY1e-ZPG#r<}_kct2Ie>oq1^2_p9@|WEo
z*X_Uko@K)qYYv~<poG`LOv(2(Hhkk{Dz;b6_#4<(=XBwh@>>43eQGMdbiGbo>E~Q&
zr<n4_y=h^-h|%}kO&jwCioQ5EzF6K8^VdP)H>YBH{QP^@Sti!`2)uG{irBBq@y*$B
zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N
zdG@vOZB4v_lF7Plrx+hxo7(fCV&}f<lyK#S=nvDw%*y%vwN3psIS+1s7G}QfbZGd|
zV;VoMy*YI2-%hU{-w$hl9!*Y_m~60h&vVVs6)lfgu09v4QWIt25UBGxaN`?mVmn*e
U?z!!Jz`$qlboFyt=akR{0C)T?>Hq)$

literal 0
HcmV?d00001

diff --git a/progress/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/progress/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c
GIT binary patch
literal 1031
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xj&#3c(B0U1_%
zz5^97Xt*<I`!eYGGw1~|=m#_ChcFm~F&M`%SZ6TU=QA3HGn&RTnk6urCox*3Gg@ad
z+GI1@<S^O-Q7)rh9;1CBqhm3nV+o^EDWh`*qe~T|Yc-==4WnBvqgx%LdmW=k1EWVH
zqbCqGF?u#LdbTinH8Xm(F#5DJ`gAb*0#PTUUpJ#)52HU2^)d$ZF$VTC22NlMoX8kB
zi7{v*V-S#>%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3
zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc
z$|q_opQ^2TrnVZ0o~wh<3t%W&f<tNc(Fvx&VC63f@(X4V5O7Fnm=6N`&!0cPZsO%v
z3=B;Ao-U3d6}R4ANDmGU6lr~^!Nn0K;_9?HfJbVIkW)*G%Yg&F)*BmaZ)6Dl_&?vn
za8gV0`@6<5-|YBa|J|21FVarliS1gU$698&iU*DCL=pdt&mR>lvYGe#$xqda2bR_R
zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2<a5l9V~;L&ZJD?F
zD6?3<TgqciA=l+!=Lp=a%2;%{dX@{HT-OP1|K<}HAM1TO7OY<MaYyH#Pk)4WR?Ts}
zSNX4tLr#6-^m$z!Pd18IzSivQkh7k6T`o7OKThT4#m*F4b=OPt(kAX%9+=X!JT9f}
zc|=Oray6sl!J;#tXm&@~>^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2
z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b
z<q`EIyVgP^b`|@{uDX5oB6GTR%^Or)?eBf<KkJg@eR6BbGYJ*-U;nQCudos6R9mG`
zc=6fn-^`2s)0Hm%cpbX>pQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE
z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o
zo~|9<SN`RwE}r7KC~Q%?|CMD5O&m%cKw{Bn6{qJbmFIooO_;g=+H+v4V(@hJb6Mw<
G&;$S>I;xof

literal 0
HcmV?d00001

diff --git a/progress/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/progress/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0
GIT binary patch
literal 1443
zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`Y<EGuRA6NX2Md
zPqmGQbJPjRLrI#9?bL25ZHra>V6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY
zB_M<hJUv`}aj#i9>sH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv
za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8<s&Q-yp4r*9
z(t|8L&`vhm$wAg!MByQdFQW1h)eqSS&@P++v^xmx2}OHF$WDZ4QHUN37S3Sd0#=@|
zD*$YR!8QbJ55gWH>=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~<G>Lo9vl;Zfs+W#BydUw
zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3
z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w!
zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u
zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%<BT_6>4Q8~Mad
z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt*
zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW
zu72MW`|?8h<N~B$l%}NU6KvLZj~&>t^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w
z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf<
zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$
zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v
zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq
z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek
zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+
zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q
zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl
z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f
z<NEXJGYh+`9LE^Z1#g~OZ)yl?O>%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H
zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP
z(1P?z<YzdcoCZ;A^sD<`wcO1=DLw>~7YxD~Rf<<Lt&2H?f`^~9TW?0O(WnyXeZvF-
hHxv6WEXUT@T$j&O|7sZ6iSVC<kf$5l^{TT-@h=>(a@_y`

literal 0
HcmV?d00001

diff --git a/progress/android/app/src/main/res/values-night/styles.xml b/progress/android/app/src/main/res/values-night/styles.xml
new file mode 100644
index 000000000..06952be74
--- /dev/null
+++ b/progress/android/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/progress/android/app/src/main/res/values/styles.xml b/progress/android/app/src/main/res/values/styles.xml
new file mode 100644
index 000000000..cb1ef8805
--- /dev/null
+++ b/progress/android/app/src/main/res/values/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/progress/android/app/src/profile/AndroidManifest.xml b/progress/android/app/src/profile/AndroidManifest.xml
new file mode 100644
index 000000000..399f6981d
--- /dev/null
+++ b/progress/android/app/src/profile/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
diff --git a/progress/android/build.gradle b/progress/android/build.gradle
new file mode 100644
index 000000000..f7eb7f63c
--- /dev/null
+++ b/progress/android/build.gradle
@@ -0,0 +1,31 @@
+buildscript {
+    ext.kotlin_version = '1.7.10'
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.buildDir = '../build'
+subprojects {
+    project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
+    project.evaluationDependsOn(':app')
+}
+
+tasks.register("clean", Delete) {
+    delete rootProject.buildDir
+}
diff --git a/progress/android/gradle.properties b/progress/android/gradle.properties
new file mode 100644
index 000000000..94adc3a3f
--- /dev/null
+++ b/progress/android/gradle.properties
@@ -0,0 +1,3 @@
+org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/progress/android/gradle/wrapper/gradle-wrapper.properties b/progress/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..3c472b99c
--- /dev/null
+++ b/progress/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/progress/android/settings.gradle b/progress/android/settings.gradle
new file mode 100644
index 000000000..55c4ca8b1
--- /dev/null
+++ b/progress/android/settings.gradle
@@ -0,0 +1,20 @@
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
+
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+
+    plugins {
+        id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
+    }
+}
+
+include ":app"
+
+apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"
diff --git a/progress/ios/.gitignore b/progress/ios/.gitignore
new file mode 100644
index 000000000..7a7f9873a
--- /dev/null
+++ b/progress/ios/.gitignore
@@ -0,0 +1,34 @@
+**/dgph
+*.mode1v3
+*.mode2v3
+*.moved-aside
+*.pbxuser
+*.perspectivev3
+**/*sync/
+.sconsign.dblite
+.tags*
+**/.vagrant/
+**/DerivedData/
+Icon?
+**/Pods/
+**/.symlinks/
+profile
+xcuserdata
+**/.generated/
+Flutter/App.framework
+Flutter/Flutter.framework
+Flutter/Flutter.podspec
+Flutter/Generated.xcconfig
+Flutter/ephemeral/
+Flutter/app.flx
+Flutter/app.zip
+Flutter/flutter_assets/
+Flutter/flutter_export_environment.sh
+ServiceDefinitions.json
+Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!default.mode1v3
+!default.mode2v3
+!default.pbxuser
+!default.perspectivev3
diff --git a/progress/ios/Flutter/AppFrameworkInfo.plist b/progress/ios/Flutter/AppFrameworkInfo.plist
new file mode 100644
index 000000000..9625e105d
--- /dev/null
+++ b/progress/ios/Flutter/AppFrameworkInfo.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>App</string>
+  <key>CFBundleIdentifier</key>
+  <string>io.flutter.flutter.app</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>App</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>1.0</string>
+  <key>MinimumOSVersion</key>
+  <string>11.0</string>
+</dict>
+</plist>
diff --git a/progress/ios/Flutter/Debug.xcconfig b/progress/ios/Flutter/Debug.xcconfig
new file mode 100644
index 000000000..592ceee85
--- /dev/null
+++ b/progress/ios/Flutter/Debug.xcconfig
@@ -0,0 +1 @@
+#include "Generated.xcconfig"
diff --git a/progress/ios/Flutter/Release.xcconfig b/progress/ios/Flutter/Release.xcconfig
new file mode 100644
index 000000000..592ceee85
--- /dev/null
+++ b/progress/ios/Flutter/Release.xcconfig
@@ -0,0 +1 @@
+#include "Generated.xcconfig"
diff --git a/progress/ios/Runner.xcodeproj/project.pbxproj b/progress/ios/Runner.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..464be3973
--- /dev/null
+++ b/progress/ios/Runner.xcodeproj/project.pbxproj
@@ -0,0 +1,614 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 54;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
+		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
+		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
+		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 97C146ED1CF9000F007C117D;
+			remoteInfo = Runner;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
+		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
+		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
+		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
+		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
+		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		97C146EB1CF9000F007C117D /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		9740EEB11CF90186004384FC /* Flutter */ = {
+			isa = PBXGroup;
+			children = (
+				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
+				9740EEB21CF90195004384FC /* Debug.xcconfig */,
+				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
+				9740EEB31CF90195004384FC /* Generated.xcconfig */,
+			);
+			name = Flutter;
+			sourceTree = "<group>";
+		};
+		331C8082294A63A400263BE5 /* RunnerTests */ = {
+			isa = PBXGroup;
+			children = (
+				331C807B294A618700263BE5 /* RunnerTests.swift */,
+			);
+			path = RunnerTests;
+			sourceTree = "<group>";
+		};
+		97C146E51CF9000F007C117D = {
+			isa = PBXGroup;
+			children = (
+				9740EEB11CF90186004384FC /* Flutter */,
+				97C146F01CF9000F007C117D /* Runner */,
+				97C146EF1CF9000F007C117D /* Products */,
+				331C8082294A63A400263BE5 /* RunnerTests */,
+			);
+			sourceTree = "<group>";
+		};
+		97C146EF1CF9000F007C117D /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				97C146EE1CF9000F007C117D /* Runner.app */,
+				331C8081294A63A400263BE5 /* RunnerTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		97C146F01CF9000F007C117D /* Runner */ = {
+			isa = PBXGroup;
+			children = (
+				97C146FA1CF9000F007C117D /* Main.storyboard */,
+				97C146FD1CF9000F007C117D /* Assets.xcassets */,
+				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
+				97C147021CF9000F007C117D /* Info.plist */,
+				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
+				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
+				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
+				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
+			);
+			path = Runner;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		331C8080294A63A400263BE5 /* RunnerTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
+			buildPhases = (
+				331C807D294A63A400263BE5 /* Sources */,
+				331C807E294A63A400263BE5 /* Frameworks */,
+				331C807F294A63A400263BE5 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				331C8086294A63A400263BE5 /* PBXTargetDependency */,
+			);
+			name = RunnerTests;
+			productName = RunnerTests;
+			productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+		97C146ED1CF9000F007C117D /* Runner */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
+			buildPhases = (
+				9740EEB61CF901F6004384FC /* Run Script */,
+				97C146EA1CF9000F007C117D /* Sources */,
+				97C146EB1CF9000F007C117D /* Frameworks */,
+				97C146EC1CF9000F007C117D /* Resources */,
+				9705A1C41CF9048500538489 /* Embed Frameworks */,
+				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = Runner;
+			productName = Runner;
+			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		97C146E61CF9000F007C117D /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1430;
+				ORGANIZATIONNAME = "";
+				TargetAttributes = {
+					331C8080294A63A400263BE5 = {
+						CreatedOnToolsVersion = 14.0;
+						TestTargetID = 97C146ED1CF9000F007C117D;
+					};
+					97C146ED1CF9000F007C117D = {
+						CreatedOnToolsVersion = 7.3.1;
+						LastSwiftMigration = 1100;
+					};
+				};
+			};
+			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 97C146E51CF9000F007C117D;
+			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				97C146ED1CF9000F007C117D /* Runner */,
+				331C8080294A63A400263BE5 /* RunnerTests */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		331C807F294A63A400263BE5 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		97C146EC1CF9000F007C117D /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
+				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
+				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
+				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
+			);
+			name = "Thin Binary";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+		};
+		9740EEB61CF901F6004384FC /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		331C807D294A63A400263BE5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		97C146EA1CF9000F007C117D /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
+				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 97C146ED1CF9000F007C117D /* Runner */;
+			targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				97C146FB1CF9000F007C117D /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+		97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				97C147001CF9000F007C117D /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		249021D3217E4FDB00AE95B9 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Profile;
+		};
+		249021D4217E4FDB00AE95B9 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				ENABLE_BITCODE = NO;
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Profile;
+		};
+		331C8088294A63A400263BE5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = AE0B7B92F70575B8D7E0D07E /* Pods-RunnerTests.debug.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Debug;
+		};
+		331C8089294A63A400263BE5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 89B67EB44CE7B6631473024E /* Pods-RunnerTests.release.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Release;
+		};
+		331C808A294A63A400263BE5 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 640959BDD8F10B91D80A66BE /* Pods-RunnerTests.profile.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Profile;
+		};
+		97C147031CF9000F007C117D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		97C147041CF9000F007C117D /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		97C147061CF9000F007C117D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				ENABLE_BITCODE = NO;
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Debug;
+		};
+		97C147071CF9000F007C117D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				ENABLE_BITCODE = NO;
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				331C8088294A63A400263BE5 /* Debug */,
+				331C8089294A63A400263BE5 /* Release */,
+				331C808A294A63A400263BE5 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				97C147031CF9000F007C117D /* Debug */,
+				97C147041CF9000F007C117D /* Release */,
+				249021D3217E4FDB00AE95B9 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				97C147061CF9000F007C117D /* Debug */,
+				97C147071CF9000F007C117D /* Release */,
+				249021D4217E4FDB00AE95B9 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 97C146E61CF9000F007C117D /* Project object */;
+}
diff --git a/progress/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/progress/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..919434a62
--- /dev/null
+++ b/progress/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000..18d981003
--- /dev/null
+++ b/progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 000000000..f9b0d7c5e
--- /dev/null
+++ b/progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>
diff --git a/progress/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/progress/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
new file mode 100644
index 000000000..87131a09b
--- /dev/null
+++ b/progress/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+               BuildableName = "Runner.app"
+               BlueprintName = "Runner"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "331C8080294A63A400263BE5"
+               BuildableName = "RunnerTests.xctest"
+               BlueprintName = "RunnerTests"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Profile"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/progress/ios/Runner.xcworkspace/contents.xcworkspacedata b/progress/ios/Runner.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..1d526a16e
--- /dev/null
+++ b/progress/ios/Runner.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:Runner.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/progress/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/progress/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000..18d981003
--- /dev/null
+++ b/progress/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/progress/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/progress/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 000000000..f9b0d7c5e
--- /dev/null
+++ b/progress/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>
diff --git a/progress/ios/Runner/AppDelegate.swift b/progress/ios/Runner/AppDelegate.swift
new file mode 100644
index 000000000..70693e4a8
--- /dev/null
+++ b/progress/ios/Runner/AppDelegate.swift
@@ -0,0 +1,13 @@
+import UIKit
+import Flutter
+
+@UIApplicationMain
+@objc class AppDelegate: FlutterAppDelegate {
+  override func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+  ) -> Bool {
+    GeneratedPluginRegistrant.register(with: self)
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+  }
+}
diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 000000000..d36b1fab2
--- /dev/null
+++ b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,122 @@
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-40x40@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "Icon-App-1024x1024@1x.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc9ada4725e9b0ddb1deab583e5b5102493aa332
GIT binary patch
literal 10932
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

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..7353c41ecf9ca08017312dc233d9830079b50717
GIT binary patch
literal 295
zcmV+?0oeYDP)<h;3K|Lk000e1NJLTq000yK000yS0{{R3x>xN#0001NP)t-s|Ns9~
z#rXRE|M&d=0au&!`~QyF`q}dRnBDt}*!qXo`c{v<liT|#w)Vf&=I{Fc;Pw9Z`ux7>
z{Djr|@Adh0(D_%#_&mM$D6{kE_x{oE{l@J5@%H*?%=t~i_`ufYOPkAEn!pfkr2$fs
z652Tz0001XNkl<Z7}K4Q$qs`s3<WVUZPSpj?>qeeKN4RM4i{jKqmiC$?+xN>3Apn^
z0QfuZLym_5b<*QdmkHjHlj811{If)dl(Z2K0A+ekGtrFJb?g|wt#k#pV-#A~bK=OT
ts8>{%cPtyC${m|1#B1A6#u!Q;umknL1chzTM$P~L002ovPDHLkV1lTfnu!1a

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..797d452e458972bab9d994556c8305db4c827017
GIT binary patch
literal 406
zcmV;H0crk;P)<h;3K|Lk000e1NJLTq001Ze001Zm0{{R3yC6tk0001rP)t-s|Ns9~
z#rOeNn<=*T@cRC4&iUu}{?YIKbkO<t{r_Rg`SSb!?D_s{&H1p);C<8j-t_+S`~U6q
z`B238{Qm!3$oMh2_TcODCa>)>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN
zo!<LHzxPSJ@i4UU+UD@q<nIk_s|j3`3t5Q^SB6%oxX}Or0LMv0K~y-)?T|?lf-n>X
zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY
zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW
z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7<pBH$sJ!Z4uL5R#lHLQMbsjPyu3lS&P#-eI
z`6<26X6SmpL7JKc%xiDVU{Pl_!$sZ9a08>{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx
ACIA2c

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ed2d933e1120817fe9182483a228007b18ab6ae
GIT binary patch
literal 450
zcmV;z0X_bSP)<h;3K|Lk000e1NJLTq002Ay002A)0{{R34I(K(0001lP)t-s|Ns9~
z#rP?<_5oL$SH}2R$N25}{-ogh<M#fP+xy+~{#%p3>iGWQ_5NJQ_~rNh*z)}eT%KUb
z`7gNk0#AwF^#0T0?hIa^`~Ck;!}#m+_uT050aTR(J!bU#|IzRL%<lbB#Q5Uu^d+k2
z=<oI?ukI$R=x3Y5T$8^FSCIxweE~vt7!iLQ0002_Nkl<ZNXPBd*$#p*5J1sd7O_$`
zL2y9@cm4nWvj#$kn3N2CAVlsX$w}KOB~w%1>^UsMS#KsYnTF*!YeDOytlP4VhV?b}
z%rz_<=#CPc)tU1MZTq~*2=8~iZ!lSa<{9b@2Jl;?IEV8)=fG217*|@)CCYgFze-x?
zIFODUIA>nWKpE+bn~n7;-89sa>#DR>TSlqWk*!2hSN6D~Qb#VqbP~4Fk&m`@1$JGr
zXPIdeRE&b2Thd#{MtDK$px*d3-Wx``>!oimf%|A-&-q*6KAH)e$3|6JV%HX{Hig)k
suLT-RhftRq8b9;(V=235Wa|I=027H2wCDra;{X5v07*qoM6N<$f;9x^2LJ#7

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cd7b0099ca80c806f8fe495613e8d6c69460d76
GIT binary patch
literal 282
zcmV+#0p<RQP)<h;3K|Lk000e1NJLTq0012T0012b0{{R3VNI7k00018P)t-s|Ns9~
z#rP?<_5oL$`~LrB%lY{I|Jw8ZvE}@&<NRF6_#kYjrQ!RX-urIO`M2l%l-v6OR+-lE
z{q_0#LcjMxzV|k|_lCRKdZ){Ir^+0L!WDhE7ImlrRF(lrfr8uVB>(^bcu7P-R4C8Q
z&e;xxFbF_Vrezo%_kH*OKhshZ6BFpG-Y1e10`QXJKbND7AMQ&cMj<Rt#L#B&<}(k`
z&v(Q6!rV_O+)5cqL@s8;Rzfa9z}^^#8AwrQTna*FxEVpNbhuQB&g))Tm50r`l1Aal
gdM1U(lMx>60B5TNObaZxYybcN07*qoM6N<$g3m;S%K!iX

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe730945a01f64a61e2235dbe3f45b08f7729182
GIT binary patch
literal 462
zcmV;<0WtoGP)<h;3K|Lk000e1NJLTq0024w0024&0{{R3)@8aH0001%P)t-s|Ns9~
z#rOeNn<=*Tp5FVy>-}iV`2<;=$?g5M=KQbZ{F&YRNy7Nn@%_*5{gvDM0aKI4?ESmw
z{NnZg)A0R`+4?NF_RZexyVB&^^ZvN!{I28tr{Vje;QNTz`dG&Jz0~Ek&f<Ki%5tK}
z7<#M$PKy9Rbn5v2y6F7V;_h?9>2;*Z7>B|cg}xYpxEFY+0YrKLF;^Q+-HreN0P{&i
zK~zY`?b7ECf-n?@;d<&orQ*Q7KoR%4|C>{W^h6@&01>0SKS`dn{Q}GT%Qj_{PLZ_&
zs`MFI#j-(>?bvdZ!8^xTwlY{qA)T4QLbY@j(!YJ7aXJervHy6HaG_2SB`6CC{He}f
zHVw(fJWApwPq!6VY7r1w-Fs)@ox~N<e>+q|w~e;JI~C4Vf^@d>Wvj=fl`^u9x9wd9
zR%3*Q+)t%S!MU_`id^@&Y{y7-r98lZX0?YrHlfmwb?#}^1b{8g&KzmkE(L>Z&)179
zp<)v6Y}pR<EODy^$f#TG0Y$V+eC{BDH50toV0pja4PB58a@&T&ng9R*07*qoM6N<$
Ef{9-9n*aa+

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..321773cd857a8a0f0c9c7d3dc3f5ff4fb298dc10
GIT binary patch
literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq003720037A0{{R3Miwbv0002DP)t-s|Ns9~
z#rP?<_5oL$`~Ls={r^|S_*KRDf7JSX)B5oG{`C0!9BHKkS)BI#|MUC*n%(<~*ZTeb
z|GVh?ujKrB()j^anupf<QpEU_+WP@eji}=Lgx30GnZmQ?{7s6v0aKNr-}{c)`Z&Ay
zF1Yp=d8+|Sg#kcvxaa&jy!U#i%XOs58Hd7OmB8}){x`e#aiYgnkGvRyx&c*~05e+j
z`~TbX{-WUfio)L<X{G{5egHIG0Web~wJ>l100G2FL_t(o!|l{-Q-VMg#&MKg7c{O0
z2wJImOS3Gy*Z2Qifdv~JYOp;v+U)a|nLoc7hNH;I$;lzDt$}rkaFw1mYK5_0Q(Sut
zvbEloxON7$+HSOgC9Z8ltuC&0OSF!-mXv5caV>#bc3@hBPX@I$58-z}(ZZE!t-aOG
zpjNkbau@>yEzH(5Yj4kZiMH32XI!4~gVXNnjAvRx;Sdg^`>2DpUEwoMhTs_st8pKG
z(%SHyHdU&v%f36~uERh!bd`!T2dw;z6PrOTQ7Vt*#9F2uHlUVnb#ev_o^fh}Dzmq}
zWtlk35}k=?xj28uO|5>>$yXadTUE@@IPpgH`gJ~Ro4>jd1IF|(+IX>8M4Ps{PNvmI
zNj4D+XgN83gPt_Gm}`Ybv{;+&yu-C(Grdiahmo~BjG-l&mWM+{e5M1sm&=xduwgM9
z`8OEh`=F3r`^E{n_;%9weN{cf2%7=VzC@cYj+lg>+3|D|_1C@{hcU(DyQG_BvBWe?
zvTv``=%b1zrol#=R`JB<Q`F~GOz}zuLlL*;1}|cY-IeioVw78<ETDLaB8FiD=WNcO
mkBVDRjE_g)6gfG$f4O%7iYO|SoHw-q0000<MNUMnLSTYxO==DR

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..797d452e458972bab9d994556c8305db4c827017
GIT binary patch
literal 406
zcmV;H0crk;P)<h;3K|Lk000e1NJLTq001Ze001Zm0{{R3yC6tk0001rP)t-s|Ns9~
z#rOeNn<=*T@cRC4&iUu}{?YIKbkO<t{r_Rg`SSb!?D_s{&H1p);C<8j-t_+S`~U6q
z`B238{Qm!3$oMh2_TcODCa>)>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN
zo!<LHzxPSJ@i4UU+UD@q<nIk_s|j3`3t5Q^SB6%oxX}Or0LMv0K~y-)?T|?lf-n>X
zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY
zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW
z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7<pBH$sJ!Z4uL5R#lHLQMbsjPyu3lS&P#-eI
z`6<26X6SmpL7JKc%xiDVU{Pl_!$sZ9a08>{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx
ACIA2c

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..502f463a9bc882b461c96aadf492d1729e49e725
GIT binary patch
literal 586
zcmV-Q0=4~#P)<h;3K|Lk000e1NJLTq002+`002-30{{R3xz7Th0001}P)t-s|Ns9~
z#rP?<_5oL${r>+}#`wDE{8-2Mebf5<{{PqV{TgVcv*r8?UZ3{-|G?_}T*&y;@cqf{
z{Q*~+qr%%p!1pS*_Uicl#q9lc(D`!D`LN62sNwq{oYw(Wmhk)k<@f$!$@ng~_5)Ru
z0Z)trIA5^j{DIW^c+vT2%lW+2<(RtE2wR;4O@)Tm`Xr*?A(qYoM}7i5Yxw>D(&6ou
zxz!_Xr~yNF+waPe00049Nkl<ZSi|j>*;a!v6h%{rlvIH#gW3s8p;bFr=l}mRqpW2h
zw=OA%hdyL~z+UHOzl0eKhEr$YYOL-c-%Y<)=j?(bzDweB7{b+%_ypvm_cG{SvM=DK
zhv{K@m>#Bw>2W$eUI#iU)Wdgs8Y3U+A$Gd&{+j)d)BmGKx+43U_!tik_YlN)>$7G!
zhkE!s;%oku3;IwG3U^2kw?z+HM)jB{@zFhK8P#KMSytSthr+4!c(5c%+^UBn`0X*2
zy3(k600_CSZj?O$Qu%&$;|TGUJrptR(HzyIx>5E(2r{eA(<6t3e3I0B)7d6s7?Z5J
zZ!rtKvA{MiEBm&KFtoifx>5P^Z=vl)95XJn()aS5%ad(s?4-=Tkis9IG<HyCS`?qT
z)Ro|6_Qh7NQ@~}`rA+~si8eJKUPi2KvJt(SYy``QNE6~^-tErIoNIi%F$_*%27{p$
YU*-TH>u{`Fy8r+H07*qoM6N<$f<k9BS^xk5

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ec303439225b78712f49115768196d8d76f6790
GIT binary patch
literal 862
zcmV-k1EKthP)<h;3K|Lk000e1NJLTq004LZ004Lh0{{R34!XwR0002zP)t-s|Ns9~
z#rObMn<=*T{Qmz~#`ydF|4G63{{H_)!1q<f`1$?*a?kkyRhf|4`b@(223wu=`~FbG
z_%68j(ctU=Ns=bC^iqtv`~3aV@cotB`eMoW_Wb_z`u;7!|0=fj9I^Fp&iOXF_5o9s
z8nN{@danRWl$6@~chULM@BMes`C`iW7K6P3OosqIa2R>20Z)wqMt%V?S?~D#06};F
zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU
z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R
zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6;
z1CV9ecD9ZEe87{{NtI*)_aJ<`<r)mO2JY~qH<i}}3%K`^CfiEV%iQNK88@tOg>kJa
z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5
zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh
z<Ot=3TnjL#{3s56++SYyJuk^V_KKHTH-gSG_ln;ze%`ptyY$>xd}eOm`fm3@MQC1<
zIk&aCj<SqPSNj*&T)V4Xl1qEFEV*8u7jv?}yd;}iuRJfwLaw8-PHA3}1zeIDmt-jy
zvzB#9ro9rV<dV$)FD&(DPu;TY*(F)noh0wk<>b~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor
zE!I71Z@ASH3grl8&P^L0Wpa<xz^6=Zk)~<jNhbH%=&&dd_9T;gIXs`jK4o;Dj*o`d
z6Z@3Wy&55W?qH8Hx+j;T<BP+>vHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@
z<lpwc2DnuIWwY0&c|FQG<a_&#RArSZ0Xg^wWdl+<xk%Z9_C`)GB_!mvPit%+KTpKq
oKffp!%tkY_plO<>Y5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ec303439225b78712f49115768196d8d76f6790
GIT binary patch
literal 862
zcmV-k1EKthP)<h;3K|Lk000e1NJLTq004LZ004Lh0{{R34!XwR0002zP)t-s|Ns9~
z#rObMn<=*T{Qmz~#`ydF|4G63{{H_)!1q<f`1$?*a?kkyRhf|4`b@(223wu=`~FbG
z_%68j(ctU=Ns=bC^iqtv`~3aV@cotB`eMoW_Wb_z`u;7!|0=fj9I^Fp&iOXF_5o9s
z8nN{@danRWl$6@~chULM@BMes`C`iW7K6P3OosqIa2R>20Z)wqMt%V?S?~D#06};F
zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU
z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R
zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6;
z1CV9ecD9ZEe87{{NtI*)_aJ<`<r)mO2JY~qH<i}}3%K`^CfiEV%iQNK88@tOg>kJa
z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5
zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh
z<Ot=3TnjL#{3s56++SYyJuk^V_KKHTH-gSG_ln;ze%`ptyY$>xd}eOm`fm3@MQC1<
zIk&aCj<SqPSNj*&T)V4Xl1qEFEV*8u7jv?}yd;}iuRJfwLaw8-PHA3}1zeIDmt-jy
zvzB#9ro9rV<dV$)FD&(DPu;TY*(F)noh0wk<>b~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor
zE!I71Z@ASH3grl8&P^L0Wpa<xz^6=Zk)~<jNhbH%=&&dd_9T;gIXs`jK4o;Dj*o`d
z6Z@3Wy&55W?qH8Hx+j;T<BP+>vHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@
z<lpwc2DnuIWwY0&c|FQG<a_&#RArSZ0Xg^wWdl+<xk%Z9_C`)GB_!mvPit%+KTpKq
oKffp!%tkY_plO<>Y5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9f5fea27c705180eb716271f41b582e76dcbd90
GIT binary patch
literal 1674
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
Ux%ZwassI2007*qoM6N<$f}6Z;X#fBK

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..84ac32ae7d989f82d5e46a60405adcc8279e8001
GIT binary patch
literal 762
zcmV<W0tNkvP)<h;3K|Lk000e1NJLTq002w?002w~0{{R3@JXQ=0002qP)t-s|Ns9~
z#rXXG|5(QODYo_jSDX9&{(;o_`ThU+`~6SD_+iQT==c3r#`s3S_Xb*>OTza`!S_YK
z_v-lm^7{VO^8Q@M_^8F)09Ki6%=s?2_5e<mRK)jOlD-01od8IZ-1Gexu=M~@mHz(!
z(eM2^yY?%;|8~&%Fu3+1v-Tvk^(eCP%G~M!P>upee(w1FB%aqSweusQ-T+CH0Xt{`
zFjMvW{@C&TB)k25()nh~_yJ9c<MsW_?fl2<{Nd~J)#L6sujeJC;K<b8pugFfyVhQm
zzhIHOPKmexK#VF>oBRL(0oO@HK~z}7?bm5j;y@69;bvlHb2tf!$ReA~x{22wTq550
z?f?Hnw(;m3ip30;QzdV~7pi!wyMYhDtXW#cO7T>|f=bdFhu+F!zMZ2UFj;GUKX7tI
z;hv3{q~!*pMj75WP_c}>6)IWvg5_yyg<9Op()eD1hWC19M@?_9_MHec{Z8n3FaF{8
z;u`Mw0ly(uE>*CgQYv{be6ab2LWhlaH1^iLIM{olnag$78^Fd}%dR7;JECQ+hmk|o
z!u<uZ-oSPu!itt>2&!3MqPfP5ChDSkFSH8F2WVOEf0(E_M(JL17G}Y+fg0_IuW%WQ
zG(mG&u<d$HDGTG--N>?|->YSdk0;8rc{yw2@2Z&GA}z{Wb91Ooz9VhA{b2DYE7RmG
zjL}?eq#iX%3#k;JWMx_{^2nNax`xPhByFiDX+a7uTGU|otOvIAUy|dEKkXOm-`aWS
z27pUzD{a)Ct<6p{{3)+lq@i`t@%>-wT4r?*S}k)58e09WZYP<FHdyPA5JO8{8|?N+
zqi)hNvlO*O+|i6<gw!<~F3i}+9jB!I_Y=QmeihA(%{U8hIJ^d63fk~TuH^2PD`=;e
s-wR!xNH1D_BdsZ;*`*lFn)Mmo0|Ng&v#M4dp#T5?07*qoM6N<$g6nFR7XSbN

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8953cba09064923c5daf2d37e7c3c836ccdd794b
GIT binary patch
literal 1226
zcmV;*1U37KP)<h;3K|Lk000e1NJLTq005W(005W>0{{R3FC5Sl00039P)t-s|Ns9~
z#rP?<_5oL$Q^olD{r_0T`27C={r>*`|Nj71npVa5OTzc(_WfbW_({R{p56NV{r*M2
z_xt?)2V0#0Ns<IwoaFZYD7E$gOO&$Z{I}-(M!@%1kG%Q&{X2ZIEw}bv$M_ep_9e9S
z0acfN)A=K`_9(RUPs8^>fV0u>{42ctGP(8vQj-Btk1n|O0ZD=YLwd&R{Ko41Gr9H=
zY@z@@bOAMB5Ltl$E>bJJ{>JP30ZxkmI%?eW{k`b?Wy<&gOo;dS`~CR$Vwb@XWtR|N
zi~t=w02?-0&j0TD{>bb6sNwsK*!p?V`RMQUl(*DVjk-9Cx+-z1KXab|Ka2oXhX5f%
z`$|e!000AhNkl<Zc-rlk>rxs)5QTeTVRi&#7Emz~MKK1WAjCw(c-JK6eox;2O)?`?
zTG`AHia671e^vgmp!llKp|=5sVHk#C7=~epA~VAf-~%aPC=%Qw01h8mnSZ|p?hz91
z7p83F3%LVu9;S$tSI$C^%^yud1dfTM_6p2|+5Ejp$bd`GD<tQoa;#(tdg*x)^b%Ba
zB<dx&U)Pai49>vbR|xit>i!ZD&F>@CJrPmu*UjD&?DfZs=$@e3FQA(vNiU+$A*%a}
z?`XcG2jDxJ_ZQ#Md`H{4Lpf6QBDp81_KWZ6Tk#yCy1)32zO#3<7>b`eT7UyYH1eGz
z;O(rH$=QR*L%%ZcBpc=eGua?N55nD^K(8<#gl2+pN_j~b2MHs4#mcLmv%DkspS-3<
zpI1F=^9siI0s-;IN_IrA;5xm~3?3!StX}pUv0vkxMaqm+zxrg7X7(I&*N~&dEd0kD
z-FRV|g=|QuUsuh>-xCI}vD2imzYIOIdcCVV=$Bz@*u0+Bs<|L^)32nN*=wu3n%Ynw
z@1|eLG>!8ruU1pFXUfb`j>(=Gy~?Rn4QJ-c3%3T|(Frd!bI`9u&zAnyFYTqlG#&J7
zAkD(jpw|oZLNiA>;><E14vb!C<}61v(|=|!?3p_+{3UDZS8`^UqXVSX3uorc3rX$?
zgBj-N6r7jA4EKZs%)L+cEbx+}6e`CWdL?HT)GI#bCEzgCo0rk-&7lV`DdA{&!{YV0
zy887LPQW<=GWV7@&0eYX=i7@5umH{x5G^fN%Vw|k%=BW>hgp1KX7-wxC~31II47gc
zHcehD6Uxlf%+M^^uN5Wc*G%^;>D5qT{>=uxUhX%WJu^Z*(_Wq9y}npFO{Hhb>s6<9
zNi0pHXWFaVZnb)1+RS&F)xOv6&aeILcI)`k#0YE+?e)5&#r7J#c`3Z7x!LpTc01dx
zrdC3{Z;joZ^KN&))zB_i)I9fWedoN>Zl-6_Iz+^G&*ak2j<V8PXoPq(E5hmbxe_*B
zL8NCzkZaSWt6DUAR)k2Ir6){c{?c5yFzaVYs%JejB}TAkwwd{RZb~T9PxHo^dE6RA
z&7_)HtjuOCl;+mJu^Fa0XQT1s+b4*@8EAHL_T{0Cv$f9<fqUW+UgMUy7!LtFAtQ~9
o<N)eleSl#YhG7_nVQw400riWbnCg0%WB>pF07*qoM6N<$f;w%0(f|Me

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0467bf12aa4d28f374bb26596605a46dcbb3e7c8
GIT binary patch
literal 1418
zcmV;51$Fv~P)<h;3K|Lk000e1NJLTq005@|005^50{{R3L&&_|0002<P)t-s|Ns9~
z#rP?<_5oL$Q^ffF{{Q^_{`&p@SjPDK{{L6T_)f$3M8Ed{N|OOrnTpr?P{a5HTAk4D
z`~z5={{R2(`ToW0{7S+1UdZ?uu=R4G$LIF_V#@f2t<FZk_b#~h^7{VK@BE3@`mW>q
zKfU)WzW*n(@|xWGCA9ScMt*e9`2kdxPQ&<!ug?KelLAhO12k6wP>&>|-UCa7_51w+
zLUsW@ZzZSW0y$)Hp~e9%PvP|a03ks1`~K?q{u;6NC8*{AOqIUq{CL&;p56Lf$oQGq
z^={4hPQv)y=I|4n+?>7Fim=dxt<Pzk!)BSn06mMNcYMVF00dG=L_t(|+U?wHQxh>1
z2H+Dm+1+fh+IF>G0SjJMkQQre1x4|G*Z==(Ot&kCnUrL4I(rf(ucITwmuHf^hXiJT
zkdTm&kdTm&kdTm&kdP`esgWG0BcWCVkVZ&2dUwN`cgM8QJb`Z7Z~e<&Yj2(}>Tmf`
zm1{eLgw!b{bXkjWbF%dTkTZEJWyWOb##Lfw4EK2}<0d6%>AGS{po>WCOy&f$Tay_>
z?NBlkpo@s-O;0V%Y_Xa-G#_O08q5LR*~F%&)}{}r&L%Sbs8AS4t7Y0N<jX*!Zo1T)
zt|ujDdNPm_Uj|b5at$QXrYAL;&a;w9ef8K&nK>Ex*{soY=0MZExqA5XHQkqi#4gW3
zqODM^iyZl;dvf)-bOXtOru(s)Uc7~BFx{w-FK;2{`VA?(g&@3z&bfLFyctOH!cVsF
z7IL=fo-qBndRUm;kAdXR4e6>k-z|21AaN%ubeVrHl*<|s&Ax@W-t?LR(P-24A5=>a
z*R9#QvjzF8n%@1Nw@?CG@6(%>+-0ASK~jEmCV|&a*7-GKT72W<(TbSjf)&Eme6nGE
z>Gkj4Sq&2e+-G%|+NM8OOm5zVl9{Z8Dd8A5z3y8mZ=4Bv4%>as_{9cN#bm~;h>62(
zdqY93Zy}v&c4n($Vv!Uy<K_zKOlD+qWUdUFpAY5dH@%6osjq0CErn{#ykyp^kOXJ|
zicCq>bR8<y)-%R+rrz||Wzz|mSSH5JR}UOW%{1K(MW)nNGvf_6U5B!ao8CgILf1Aw
zG8(21)tipYTWdQR!P(SW&lOZ}Ix;uc9`9tF6EXD_)#ql#Ttg@c6QPVRxq2XT0i|SO
z>ocs7#zbfX1IY-*w~)p}XyZ-SFC~4w>BvMVr`dFbelV{lLL0bx7@*ZZdebr3`sP;?
zVImji)kG)(6Juv0lz@q`F!k1FE;CQ(D0iG$wchPbKZQELlsZ#~rt8#90Y_Xh&3U-<
z{s<&cCV_1`^TD^<AY&knfDgB9%(uhhCkR@o0C;q3ZPUygx3AnIhYBN9F~{R}6uAL?
za|+d%FUCc?y@1B}&Zmf!YDG=VT?Oq`P|6@wXBNfooEf<coiiu<`=wJs9XO-1ER)Wh
zOb-qgPDh|3$JQfrIvoy`(<!K^pvZhSn-$|zr!!DljVEM|CTE-_G;*y>ia9!*mQDq&
zn2{r`j};V|uV%_wsP!zB?m%;FeaRe+X47K0e+KE!8C{gAWF8)lCd1u1%~|M!XNRvw
zvtqy3iz0WSpWdhn6$hP8PaRBmp)q`#PCA`Vd#Tc$@f1tAcM>f_I@bC)hkI9|o(Iqv
zo}Piadq!j76}004RBio<`)70k^`K1NK)q>w?p^C6J2ZC!+UppiK6&y3Kmbv&O!oYF
z34$0Z;QO!JOY#!`qyGH<3Pd}Pt@q*A0V=3SVtWKRR8d8Z&@)3qLPA19LPA19LPEUC
YUoZo%k(ykuW&i*H07*qoM6N<$f+CH{y8r+H

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
new file mode 100644
index 000000000..0bedcf2fd
--- /dev/null
+++ b/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchImage.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchImage@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchImage@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
new file mode 100644
index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838
GIT binary patch
literal 68
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J
Q1PU{Fy85}Sb4q9e0B4a5jsO4v

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838
GIT binary patch
literal 68
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J
Q1PU{Fy85}Sb4q9e0B4a5jsO4v

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838
GIT binary patch
literal 68
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J
Q1PU{Fy85}Sb4q9e0B4a5jsO4v

literal 0
HcmV?d00001

diff --git a/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
new file mode 100644
index 000000000..89c2725b7
--- /dev/null
+++ b/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
@@ -0,0 +1,5 @@
+# Launch Screen Assets
+
+You can customize the launch screen with your own desired assets by replacing the image files in this directory.
+
+You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
\ No newline at end of file
diff --git a/progress/ios/Runner/Base.lproj/LaunchScreen.storyboard b/progress/ios/Runner/Base.lproj/LaunchScreen.storyboard
new file mode 100644
index 000000000..f2e259c7c
--- /dev/null
+++ b/progress/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Ydg-fD-yQy"/>
+                        <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="LaunchImage" width="168" height="185"/>
+    </resources>
+</document>
diff --git a/progress/ios/Runner/Base.lproj/Main.storyboard b/progress/ios/Runner/Base.lproj/Main.storyboard
new file mode 100644
index 000000000..f3c28516f
--- /dev/null
+++ b/progress/ios/Runner/Base.lproj/Main.storyboard
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+    </dependencies>
+    <scenes>
+        <!--Flutter View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="FlutterViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
+                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>
diff --git a/progress/ios/Runner/Info.plist b/progress/ios/Runner/Info.plist
new file mode 100644
index 000000000..4d738dd4e
--- /dev/null
+++ b/progress/ios/Runner/Info.plist
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>Progress</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>progress</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(FLUTTER_BUILD_NAME)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+</dict>
+</plist>
diff --git a/progress/ios/Runner/Runner-Bridging-Header.h b/progress/ios/Runner/Runner-Bridging-Header.h
new file mode 100644
index 000000000..308a2a560
--- /dev/null
+++ b/progress/ios/Runner/Runner-Bridging-Header.h
@@ -0,0 +1 @@
+#import "GeneratedPluginRegistrant.h"
diff --git a/progress/ios/RunnerTests/RunnerTests.swift b/progress/ios/RunnerTests/RunnerTests.swift
new file mode 100644
index 000000000..86a7c3b1b
--- /dev/null
+++ b/progress/ios/RunnerTests/RunnerTests.swift
@@ -0,0 +1,12 @@
+import Flutter
+import UIKit
+import XCTest
+
+class RunnerTests: XCTestCase {
+
+  func testExample() {
+    // If you add code to the Runner application, consider adding tests here.
+    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
+  }
+
+}
diff --git a/progress/lib/main.dart b/progress/lib/main.dart
new file mode 100644
index 000000000..dc8d87099
--- /dev/null
+++ b/progress/lib/main.dart
@@ -0,0 +1,97 @@
+import 'package:flutter/material.dart';
+import 'package:tdesign_flutter/tdesign_flutter.dart';
+import './progress.dart';
+
+void main() {
+  runApp(const MyApp());
+}
+
+class MyApp extends StatelessWidget {
+  const MyApp({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const MaterialApp(
+      title: 'Flutter Demo',
+      home: Home(title: 'Flutter Demo Home Page'),
+    );
+  }
+}
+
+class Home extends StatefulWidget {
+  final String title;
+
+  const Home({super.key, required this.title});
+
+  @override
+  State<Home> createState() => _HomeState();
+}
+
+class _HomeState extends State<Home> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: const Text('自定义百分比进度条')),
+      body: ListView(
+        padding: const EdgeInsets.all(16.0),
+        children: [
+          _buildSection("线形进度条", [
+            _buildProgressItem("无确定值", Progress.linear(strokeWidth: 5)),
+            _buildProgressItem("有确定值,小于等于10%", Progress.linear(value: 0.1)),
+            _buildProgressItem("有确定值，大于10%", Progress.linear(value: 0.5)),
+            _buildProgressItem("label靠左，大于10%", Progress.linear(
+                value: 0.5, progressLabelPosition: ProgressLabelPosition.left)),
+            _buildProgressItem("自定义label", Progress.linear(value: 0.5, label: TextLabel("百分之50"))),
+            _buildProgressItem("label靠右，大于10%", Progress.linear(
+                value: 0.5, progressLabelPosition: ProgressLabelPosition.right)),
+            _buildProgressItem("更改status", Progress.linear(value: 0.5, progressStatus: ProgressStatus.warning)),
+            _buildProgressItem("更改status,且Label在外", Progress.linear(
+                value: 0.5,
+                progressStatus: ProgressStatus.danger,
+                progressLabelPosition: ProgressLabelPosition.right)),
+          ]),
+          _buildSection("环形进度条", [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              children: [
+                Progress.circular(),
+                Progress.circular(value: 0.5),
+                Progress.circular(
+                    value: 0.5, progressStatus: ProgressStatus.success),
+                Progress.circular(
+                    value: 0.7, progressStatus: ProgressStatus.warning),
+              ],
+            ),
+          ]),
+          _buildSection("微型进度条", [
+            Progress.micro(value: 0.3, label: const IconLabel(TDIcons.arrow_down)),
+          ]),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildSection(String title, List<Widget> children) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(title, style: Theme.of(context).textTheme.titleLarge),
+        const SizedBox(height: 10),
+        ...children,
+        const SizedBox(height: 20),
+      ],
+    );
+  }
+
+  Widget _buildProgressItem(String label, Widget progressWidget) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(label),
+        const SizedBox(height: 5),
+        progressWidget,
+        const SizedBox(height: 15),
+      ],
+    );
+  }
+}
\ No newline at end of file
diff --git a/progress/lib/progress.dart b/progress/lib/progress.dart
new file mode 100644
index 000000000..e504e4e9a
--- /dev/null
+++ b/progress/lib/progress.dart
@@ -0,0 +1,464 @@
+import 'package:flutter/material.dart';
+import 'package:tdesign_flutter/tdesign_flutter.dart';
+
+// 用于区分线性和圆形进度条的枚举
+enum _ProgressType { linear, circular, micro }
+
+//label位置的枚举
+enum ProgressLabelPosition { inside, left, right }
+
+//status枚举
+enum ProgressStatus { primary, warning, danger, success }
+
+// label 类型的辅助类
+abstract class LabelWidget extends Widget {
+  const LabelWidget({super.key});
+}
+
+class TextLabel extends Text implements LabelWidget {
+  const TextLabel(String data, {Key? key, TextStyle? style})
+      : super(data, key: key, style: style);
+}
+
+class IconLabel extends Icon implements LabelWidget {
+  const IconLabel(IconData icon, {Key? key, double? size, Color? color})
+      : super(icon, key: key, size: size, color: color);
+}
+
+/// progress工具类
+class Progress {
+  Progress._();
+
+  /// 创建线性进度条
+  static Widget linear<T extends LabelWidget>({
+    Key? key,
+    double? value,
+    T? label,
+    ProgressStatus progressStatus = ProgressStatus.primary,
+    ProgressLabelPosition progressLabelPosition = ProgressLabelPosition.inside,
+    double strokeWidth = 20.0,
+    Color? color,
+    Color backgroundColor = const Color(0xFFEEEEEE),
+    BorderRadiusGeometry borderRadius =
+        const BorderRadius.all(Radius.circular(20)),
+  }) {
+    return _ProgressIndicator<T>(
+        key: key,
+        value: value,
+        label: label,
+        progressStatus: progressStatus,
+        progressLabelPosition: progressLabelPosition,
+        strokeWidth: strokeWidth,
+        color: color,
+        backgroundColor: backgroundColor,
+        borderRadius: borderRadius,
+        type: _ProgressType.linear);
+  }
+
+  /// 创建圆形进度条
+  static Widget circular<T extends LabelWidget>({
+    Key? key,
+    double? value,
+    T? label,
+    ProgressStatus progressStatus = ProgressStatus.primary,
+    double strokeWidth = 5.0,
+    Color? color,
+    Color backgroundColor = const Color(0xFFEEEEEE),
+    double circleRadius = 80.0,
+  }) {
+    return _ProgressIndicator<T>(
+      key: key,
+      value: value,
+      label: label,
+      progressStatus: progressStatus,
+      strokeWidth: strokeWidth,
+      color: color,
+      backgroundColor: backgroundColor,
+      circleRadius: circleRadius,
+      type: _ProgressType.circular,
+    );
+  }
+
+  //构建微型进度条
+  static Widget micro<T extends LabelWidget>({
+    Key? key,
+    double? value,
+    T? label,
+    ProgressStatus progressStatus = ProgressStatus.primary,
+    double strokeWidth = 2.0,
+    Color? color,
+    Color backgroundColor = const Color(0xFFEEEEEE),
+    double circleRadius = 20.0,
+  }) {
+    return _ProgressIndicator(
+      key: key,
+      value: value,
+      label: label,
+      progressStatus: progressStatus,
+      strokeWidth: strokeWidth,
+      color: color,
+      backgroundColor: backgroundColor,
+      circleRadius: circleRadius,
+      type: _ProgressType.micro,
+    );
+  }
+}
+
+
+// 构建进度条基础小部件类
+class _ProgressIndicator<T extends LabelWidget> extends StatefulWidget {
+  final double? value;
+  final T? label;
+  final ProgressLabelPosition progressLabelPosition;
+  final double strokeWidth;
+  final BorderRadiusGeometry borderRadius;
+  final double circleRadius;
+  final Color? color;
+  final Color backgroundColor;
+  final _ProgressType type;
+  final StrokeCap strokeCap;
+  final ProgressStatus progressStatus;
+
+  const _ProgressIndicator(
+      {Key? key,
+      this.value,
+      this.label,
+      this.progressLabelPosition = ProgressLabelPosition.inside,
+      this.strokeWidth = 20.0,
+      this.borderRadius = const BorderRadius.all(Radius.circular(20)),
+      this.circleRadius = 80.0,
+      this.color,
+      this.backgroundColor = const Color(0xFFEEEEEE),
+      this.type = _ProgressType.linear,
+      this.strokeCap = StrokeCap.round,
+      this.progressStatus = ProgressStatus.primary})
+      : super(key: key);
+
+  @override
+  _ProgressIndicatorState<T> createState() => _ProgressIndicatorState<T>();
+}
+
+class _ProgressIndicatorState<T extends LabelWidget>
+    extends State<_ProgressIndicator<T>> with SingleTickerProviderStateMixin {
+  late AnimationController _animationController;
+  late Animation<double> _animation;
+  late Color _effectiveColor;
+  late Widget _effectiveLabel;
+
+  @override
+  void initState() {
+    super.initState();
+    _animationController = AnimationController(
+      vsync: this,
+      duration: const Duration(seconds: 1),
+    );
+    _updateAnimation();
+    _updateEffectiveColor();
+    _updateEffectiveLabel();
+  }
+
+  @override
+  void didUpdateWidget(_ProgressIndicator<T> oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.value != widget.value) {
+      _updateAnimation();
+    }
+    if (oldWidget.color != widget.color ||
+        oldWidget.progressStatus != widget.progressStatus) {
+      _updateEffectiveColor();
+    }
+    if (oldWidget.label != widget.label ||
+        oldWidget.progressStatus != widget.progressStatus) {
+      _updateEffectiveLabel();
+    }
+  }
+
+  void _updateEffectiveColor() {
+    _effectiveColor =
+        widget.color ?? _getColorFromStatus(widget.progressStatus);
+  }
+
+  void _updateEffectiveLabel() {
+    _effectiveLabel =
+        widget.label ?? _getDefaultLabelFromStatus(widget.progressStatus);
+  }
+
+  void _updateAnimation() {
+    _animation = Tween<double>(begin: 0, end: widget.value ?? 0)
+        .animate(_animationController);
+    _animationController.forward(from: 0);
+  }
+
+  //根据status构建默认参数
+  Widget _getDefaultLabelFromStatus(ProgressStatus status) {
+    final bool showAutoText =
+        widget.value != null && widget.type != _ProgressType.micro;
+    final bool showInsideLabel =
+        widget.progressLabelPosition == ProgressLabelPosition.inside &&
+            widget.type != _ProgressType.circular;
+    final bool showIconBorder = widget.type == _ProgressType.linear;
+    // 生成自动文本
+    Widget getAutoText() => showAutoText
+        ? Text('${(widget.value! * 100).round()}%')
+        : const Text("");
+
+    final statusWidgets = {
+      ProgressStatus.primary: getAutoText(),
+      ProgressStatus.warning:
+          showInsideLabel ? getAutoText() :showIconBorder?const Icon(TDIcons.error_circle_filled): const Icon(TDIcons.error),
+      ProgressStatus.danger:
+          showInsideLabel ? getAutoText() : showIconBorder?const Icon(TDIcons.close_circle_filled): const Icon(TDIcons.close),
+      ProgressStatus.success:
+          showInsideLabel ? getAutoText() : showIconBorder?const Icon(TDIcons.check_circle_filled): const Icon(TDIcons.check),
+    };
+
+    return statusWidgets[status] ?? getAutoText(); // 如果状态不匹配，默认返回自动文本
+  }
+
+  //设置默认颜色
+  Color _getColorFromStatus(ProgressStatus status) {
+    switch (status) {
+      case ProgressStatus.primary:
+        return Colors.blue;
+      case ProgressStatus.warning:
+        return Colors.orange;
+      case ProgressStatus.danger:
+        return Colors.red;
+      case ProgressStatus.success:
+        return Colors.green;
+    }
+  }
+
+  @override
+  void dispose() {
+    _animationController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        if (widget.type == _ProgressType.linear)
+          _buildLinearProgress()
+        else if (widget.type == _ProgressType.circular)
+          _buildCircularProgress()
+        else if (widget.type == _ProgressType.micro)
+          _buildMicroProgress(),
+      ],
+    );
+  }
+
+  //构建条形指示器
+  Widget _buildLinearProgress() {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final maxWidth = constraints.maxWidth;
+
+        if (widget.value != null &&
+            widget.progressLabelPosition == ProgressLabelPosition.inside) {
+          return _buildInsideLabel(maxWidth);
+        } else {
+          return _buildOutsideLabel();
+        }
+      },
+    );
+  }
+
+  //构建百分比内显label
+  Widget _buildInsideLabel(double maxWidth) {
+    return AnimatedBuilder(
+      animation: _animation,
+      builder: (context, child) {
+        final progressWidth = _animation.value * maxWidth;
+        return Stack(
+          children: [
+            _buildBackgroundContainer(),
+            if (widget.value! > 0.1)
+              _buildProgressContainerWithLabel(progressWidth)
+            else
+              _buildProgressContainerWithLabelOutside(progressWidth),
+          ],
+        );
+      },
+    );
+  }
+
+  //构建外显label
+  Widget _buildOutsideLabel() {
+    return Row(
+      children: [
+        if (widget.progressLabelPosition == ProgressLabelPosition.left)
+          Padding(
+            padding: const EdgeInsets.only(right: 8.0),
+            child: _buildLabelWidget(Colors.black),
+          ),
+        Expanded(
+          child: LinearProgressIndicator(
+            borderRadius: widget.borderRadius,
+            value: widget.value != null ? _animation.value : null,
+            backgroundColor: widget.backgroundColor,
+            valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
+            minHeight: widget.strokeWidth,
+          ),
+        ),
+        if (widget.progressLabelPosition == ProgressLabelPosition.right)
+          Padding(
+            padding: const EdgeInsets.only(left: 8.0),
+            child: _buildLabelWidget(Colors.black),
+          ),
+      ],
+    );
+  }
+
+  //构建进度条外容器
+  Widget _buildBackgroundContainer() {
+    return Container(
+      height: widget.strokeWidth,
+      decoration: BoxDecoration(
+        color: widget.backgroundColor,
+        borderRadius: widget.borderRadius,
+      ),
+    );
+  }
+
+  //构建内显label的进度条内容器
+  Widget _buildProgressContainerWithLabel(double progressWidth) {
+    return Container(
+      height: widget.strokeWidth,
+      width: progressWidth,
+      decoration: BoxDecoration(
+        color: _effectiveColor,
+        borderRadius: widget.borderRadius,
+      ),
+      child: Align(
+        alignment: Alignment.centerRight,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 10.0),
+          child: _buildLabelWidget(Colors.white),
+        ),
+      ),
+    );
+  }
+
+  //构建外显label的进度条内容器
+  Widget _buildProgressContainerWithLabelOutside(double progressWidth) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        Container(
+          height: widget.strokeWidth,
+          width: progressWidth,
+          decoration: BoxDecoration(
+            color: _effectiveColor,
+            borderRadius: widget.borderRadius,
+          ),
+        ),
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 5.0),
+          child: _buildLabelWidget(Colors.black),
+        ),
+      ],
+    );
+  }
+
+  //构建label基础容器
+  Widget _buildLabelWidget(Color labelColor) {
+    late double iconSize;
+    late double fontSize;
+    late FontWeight fontWeight;
+
+    switch (widget.type) {
+      case _ProgressType.linear:
+        iconSize = widget.strokeWidth;
+        fontSize = widget.strokeWidth  * 0.6;
+        fontWeight = FontWeight.normal;
+        break;
+      case _ProgressType.circular:
+        iconSize = widget.circleRadius * 0.4;
+        fontSize = widget.circleRadius * 0.2;
+        fontWeight = FontWeight.bold;
+        break;
+      case _ProgressType.micro:
+        iconSize = widget.circleRadius * 0.4;
+        fontSize = widget.circleRadius * 0.2;
+        fontWeight = FontWeight.normal;
+        break;
+      default:
+        iconSize = 20;
+        fontSize = 12;
+        fontWeight = FontWeight.normal;
+        break;
+    }
+
+    return IconTheme(
+      data: IconThemeData(color: _effectiveColor, size: iconSize),
+      child: DefaultTextStyle(
+        style: TextStyle(
+          color: labelColor,
+          fontSize: fontSize,
+          fontWeight: fontWeight,
+        ),
+        child: _effectiveLabel,
+      ),
+    );
+  }
+  
+  // 构建圆形进度条
+  Widget _buildCircularProgress() {
+    return AnimatedBuilder(
+      animation: _animation,
+      builder: (context, child) {
+        return Stack(
+          alignment: Alignment.center,
+          children: [
+            SizedBox(
+              height: widget.circleRadius,
+              width: widget.circleRadius,
+              child: Padding(
+                padding: EdgeInsets.all(widget.strokeWidth / 2),
+                child: CircularProgressIndicator(
+                  value: widget.value != null ? _animation.value : null,
+                  backgroundColor: widget.backgroundColor,
+                  strokeCap: widget.strokeCap,
+                  valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
+                  strokeWidth: widget.strokeWidth,
+                ),
+              ),
+            ),
+            _buildLabelWidget(Colors.black),
+          ],
+        );
+      },
+    );
+  }
+
+  //构建微型进度条
+  Widget _buildMicroProgress() {
+    return AnimatedBuilder(
+        animation: _animation,
+        builder: (context, child) {
+          return Stack(
+            alignment: Alignment.center,
+            children: [
+              SizedBox(
+                height: widget.circleRadius,
+                width: widget.circleRadius,
+                child: Padding(
+                  padding: EdgeInsets.all(widget.strokeWidth / 2),
+                  child: CircularProgressIndicator(
+                    value: widget.value != null ? _animation.value : null,
+                    backgroundColor: widget.backgroundColor,
+                    strokeCap: widget.strokeCap,
+                    valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
+                    strokeWidth: widget.strokeWidth,
+                  ),
+                ),
+              ),
+              _buildLabelWidget(Colors.black),
+            ],
+          );
+        });
+  }
+}
diff --git a/progress/lib/progressbar.dart b/progress/lib/progressbar.dart
new file mode 100644
index 000000000..7de8cb1fd
--- /dev/null
+++ b/progress/lib/progressbar.dart
@@ -0,0 +1,124 @@
+import 'package:flutter/material.dart';
+
+class DynamicProgressBar extends StatefulWidget {
+  final double percentage;
+  final double height;
+  final Color backgroundColor;
+  final Color progressColor;
+  final Color labelColor;
+  final double labelWidth;
+  final double fontSize;
+  final bool showLabel;
+  final Duration animationDuration;
+
+  const DynamicProgressBar({
+    Key? key,
+    required this.percentage,
+    this.height = 20.0,
+    this.backgroundColor = const Color(0xFFEEEEEE),
+    this.progressColor = Colors.blue,
+    this.labelColor = Colors.black,
+    this.labelWidth = 40.0,
+    this.fontSize = 12.0,
+    this.showLabel = true,
+    this.animationDuration = const Duration(milliseconds: 300),
+  }) : super(key: key);
+
+  @override
+  DynamicProgressBarState createState() => DynamicProgressBarState();
+}
+
+class DynamicProgressBarState extends State<DynamicProgressBar>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _animationController;
+  late Animation<double> _animation;
+
+  @override
+  void initState() {
+    super.initState();
+    _animationController = AnimationController(
+      vsync: this,
+      duration: widget.animationDuration,
+    );
+    _animation = Tween<double>(begin: 0, end: widget.percentage).animate(_animationController);
+    _animationController.forward();
+  }
+
+  @override
+  void didUpdateWidget(DynamicProgressBar oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.percentage != widget.percentage) {
+      _animation = Tween<double>(
+        begin: oldWidget.percentage,
+        end: widget.percentage,
+      ).animate(_animationController);
+      _animationController.forward(from: 0);
+    }
+  }
+
+  @override
+  void dispose() {
+    _animationController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final maxWidth = constraints.maxWidth;
+
+        return AnimatedBuilder(
+          animation: _animation,
+          builder: (context, child) {
+            final currentPercentage = _animation.value;
+            final progressWidth = (currentPercentage / 100) * maxWidth;
+            final isLessThanTen = currentPercentage < 10;
+
+            return Stack(
+              children: [
+                // Background
+                Container(
+                  height: widget.height,
+                  decoration: BoxDecoration(
+                    color: widget.backgroundColor,
+                    borderRadius: BorderRadius.circular(widget.height / 2),
+                  ),
+                ),
+                // Progress
+                Container(
+                  height: widget.height,
+                  width: progressWidth,
+                  decoration: BoxDecoration(
+                    color: widget.progressColor,
+                    borderRadius: BorderRadius.circular(widget.height / 2),
+                  ),
+                ),
+                // Label
+                if (widget.showLabel)
+                  Positioned(
+                    left: isLessThanTen ? progressWidth : progressWidth - widget.labelWidth,
+                    top: 0,
+                    bottom: 0,
+                    child: Container(
+                      width: widget.labelWidth,
+                      alignment: Alignment.centerRight,
+                      padding: const EdgeInsets.only(right: 8),
+                      child: Text(
+                        '${currentPercentage.toInt()}%',
+                        style: TextStyle(
+                          color: isLessThanTen ? widget.labelColor : Colors.white,
+                          fontWeight: FontWeight.bold,
+                          fontSize: widget.fontSize,
+                        ),
+                      ),
+                    ),
+                  ),
+              ],
+            );
+          },
+        );
+      },
+    );
+  }
+}
\ No newline at end of file
diff --git a/progress/linux/.gitignore b/progress/linux/.gitignore
new file mode 100644
index 000000000..d3896c984
--- /dev/null
+++ b/progress/linux/.gitignore
@@ -0,0 +1 @@
+flutter/ephemeral
diff --git a/progress/linux/CMakeLists.txt b/progress/linux/CMakeLists.txt
new file mode 100644
index 000000000..0ec65865c
--- /dev/null
+++ b/progress/linux/CMakeLists.txt
@@ -0,0 +1,139 @@
+# Project-level configuration.
+cmake_minimum_required(VERSION 3.10)
+project(runner LANGUAGES CXX)
+
+# The name of the executable created for the application. Change this to change
+# the on-disk name of your application.
+set(BINARY_NAME "progress")
+# The unique GTK application identifier for this application. See:
+# https://wiki.gnome.org/HowDoI/ChooseApplicationID
+set(APPLICATION_ID "com.example.progress")
+
+# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
+# versions of CMake.
+cmake_policy(SET CMP0063 NEW)
+
+# Load bundled libraries from the lib/ directory relative to the binary.
+set(CMAKE_INSTALL_RPATH "$ORIGIN/lib")
+
+# Root filesystem for cross-building.
+if(FLUTTER_TARGET_PLATFORM_SYSROOT)
+  set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT})
+  set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
+  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+  set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endif()
+
+# Define build configuration options.
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  set(CMAKE_BUILD_TYPE "Debug" CACHE
+    STRING "Flutter build mode" FORCE)
+  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+    "Debug" "Profile" "Release")
+endif()
+
+# Compilation settings that should be applied to most targets.
+#
+# Be cautious about adding new options here, as plugins use this function by
+# default. In most cases, you should add new options to specific targets instead
+# of modifying this function.
+function(APPLY_STANDARD_SETTINGS TARGET)
+  target_compile_features(${TARGET} PUBLIC cxx_std_14)
+  target_compile_options(${TARGET} PRIVATE -Wall -Werror)
+  target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
+  target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
+endfunction()
+
+# Flutter library and tool build rules.
+set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
+add_subdirectory(${FLUTTER_MANAGED_DIR})
+
+# System-level dependencies.
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
+
+add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
+
+# Define the application target. To change its name, change BINARY_NAME above,
+# not the value here, or `flutter run` will no longer work.
+#
+# Any new source files that you add to the application should be added here.
+add_executable(${BINARY_NAME}
+  "main.cc"
+  "my_application.cc"
+  "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
+)
+
+# Apply the standard set of build settings. This can be removed for applications
+# that need different build settings.
+apply_standard_settings(${BINARY_NAME})
+
+# Add dependency libraries. Add any application-specific dependencies here.
+target_link_libraries(${BINARY_NAME} PRIVATE flutter)
+target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
+
+# Run the Flutter tool portions of the build. This must not be removed.
+add_dependencies(${BINARY_NAME} flutter_assemble)
+
+# Only the install-generated bundle's copy of the executable will launch
+# correctly, since the resources must in the right relative locations. To avoid
+# people trying to run the unbundled copy, put it in a subdirectory instead of
+# the default top-level location.
+set_target_properties(${BINARY_NAME}
+  PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
+)
+
+
+# Generated plugin build rules, which manage building the plugins and adding
+# them to the application.
+include(flutter/generated_plugins.cmake)
+
+
+# === Installation ===
+# By default, "installing" just makes a relocatable bundle in the build
+# directory.
+set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle")
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
+endif()
+
+# Start with a clean build bundle directory every time.
+install(CODE "
+  file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\")
+  " COMPONENT Runtime)
+
+set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
+set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+
+install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
+  COMPONENT Runtime)
+
+install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
+  COMPONENT Runtime)
+
+install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+  COMPONENT Runtime)
+
+foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES})
+  install(FILES "${bundled_library}"
+    DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+    COMPONENT Runtime)
+endforeach(bundled_library)
+
+# Fully re-copy the assets directory on each build to avoid having stale files
+# from a previous install.
+set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
+install(CODE "
+  file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
+  " COMPONENT Runtime)
+install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
+  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
+
+# Install the AOT library on non-Debug builds only.
+if(NOT CMAKE_BUILD_TYPE MATCHES "Debug")
+  install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+    COMPONENT Runtime)
+endif()
diff --git a/progress/linux/flutter/CMakeLists.txt b/progress/linux/flutter/CMakeLists.txt
new file mode 100644
index 000000000..d5bd01648
--- /dev/null
+++ b/progress/linux/flutter/CMakeLists.txt
@@ -0,0 +1,88 @@
+# This file controls Flutter-level build steps. It should not be edited.
+cmake_minimum_required(VERSION 3.10)
+
+set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
+
+# Configuration provided via flutter tool.
+include(${EPHEMERAL_DIR}/generated_config.cmake)
+
+# TODO: Move the rest of this into files in ephemeral. See
+# https://github.com/flutter/flutter/issues/57146.
+
+# Serves the same purpose as list(TRANSFORM ... PREPEND ...),
+# which isn't available in 3.10.
+function(list_prepend LIST_NAME PREFIX)
+    set(NEW_LIST "")
+    foreach(element ${${LIST_NAME}})
+        list(APPEND NEW_LIST "${PREFIX}${element}")
+    endforeach(element)
+    set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE)
+endfunction()
+
+# === Flutter Library ===
+# System-level dependencies.
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
+pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
+pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
+
+set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
+
+# Published to parent scope for install step.
+set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE)
+set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE)
+set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE)
+set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE)
+
+list(APPEND FLUTTER_LIBRARY_HEADERS
+  "fl_basic_message_channel.h"
+  "fl_binary_codec.h"
+  "fl_binary_messenger.h"
+  "fl_dart_project.h"
+  "fl_engine.h"
+  "fl_json_message_codec.h"
+  "fl_json_method_codec.h"
+  "fl_message_codec.h"
+  "fl_method_call.h"
+  "fl_method_channel.h"
+  "fl_method_codec.h"
+  "fl_method_response.h"
+  "fl_plugin_registrar.h"
+  "fl_plugin_registry.h"
+  "fl_standard_message_codec.h"
+  "fl_standard_method_codec.h"
+  "fl_string_codec.h"
+  "fl_value.h"
+  "fl_view.h"
+  "flutter_linux.h"
+)
+list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/")
+add_library(flutter INTERFACE)
+target_include_directories(flutter INTERFACE
+  "${EPHEMERAL_DIR}"
+)
+target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}")
+target_link_libraries(flutter INTERFACE
+  PkgConfig::GTK
+  PkgConfig::GLIB
+  PkgConfig::GIO
+)
+add_dependencies(flutter flutter_assemble)
+
+# === Flutter tool backend ===
+# _phony_ is a non-existent file to force this command to run every time,
+# since currently there's no way to get a full input/output list from the
+# flutter tool.
+add_custom_command(
+  OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS}
+    ${CMAKE_CURRENT_BINARY_DIR}/_phony_
+  COMMAND ${CMAKE_COMMAND} -E env
+    ${FLUTTER_TOOL_ENVIRONMENT}
+    "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh"
+      ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE}
+  VERBATIM
+)
+add_custom_target(flutter_assemble DEPENDS
+  "${FLUTTER_LIBRARY}"
+  ${FLUTTER_LIBRARY_HEADERS}
+)
diff --git a/progress/linux/flutter/generated_plugin_registrant.cc b/progress/linux/flutter/generated_plugin_registrant.cc
new file mode 100644
index 000000000..e71a16d23
--- /dev/null
+++ b/progress/linux/flutter/generated_plugin_registrant.cc
@@ -0,0 +1,11 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+
+void fl_register_plugins(FlPluginRegistry* registry) {
+}
diff --git a/progress/linux/flutter/generated_plugin_registrant.h b/progress/linux/flutter/generated_plugin_registrant.h
new file mode 100644
index 000000000..e0f0a47bc
--- /dev/null
+++ b/progress/linux/flutter/generated_plugin_registrant.h
@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter_linux/flutter_linux.h>
+
+// Registers Flutter plugins.
+void fl_register_plugins(FlPluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_
diff --git a/progress/linux/flutter/generated_plugins.cmake b/progress/linux/flutter/generated_plugins.cmake
new file mode 100644
index 000000000..2e1de87a7
--- /dev/null
+++ b/progress/linux/flutter/generated_plugins.cmake
@@ -0,0 +1,23 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)
diff --git a/progress/linux/main.cc b/progress/linux/main.cc
new file mode 100644
index 000000000..e7c5c5437
--- /dev/null
+++ b/progress/linux/main.cc
@@ -0,0 +1,6 @@
+#include "my_application.h"
+
+int main(int argc, char** argv) {
+  g_autoptr(MyApplication) app = my_application_new();
+  return g_application_run(G_APPLICATION(app), argc, argv);
+}
diff --git a/progress/linux/my_application.cc b/progress/linux/my_application.cc
new file mode 100644
index 000000000..dbbb6f9df
--- /dev/null
+++ b/progress/linux/my_application.cc
@@ -0,0 +1,104 @@
+#include "my_application.h"
+
+#include <flutter_linux/flutter_linux.h>
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
+#include "flutter/generated_plugin_registrant.h"
+
+struct _MyApplication {
+  GtkApplication parent_instance;
+  char** dart_entrypoint_arguments;
+};
+
+G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
+
+// Implements GApplication::activate.
+static void my_application_activate(GApplication* application) {
+  MyApplication* self = MY_APPLICATION(application);
+  GtkWindow* window =
+      GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
+
+  // Use a header bar when running in GNOME as this is the common style used
+  // by applications and is the setup most users will be using (e.g. Ubuntu
+  // desktop).
+  // If running on X and not using GNOME then just use a traditional title bar
+  // in case the window manager does more exotic layout, e.g. tiling.
+  // If running on Wayland assume the header bar will work (may need changing
+  // if future cases occur).
+  gboolean use_header_bar = TRUE;
+#ifdef GDK_WINDOWING_X11
+  GdkScreen* screen = gtk_window_get_screen(window);
+  if (GDK_IS_X11_SCREEN(screen)) {
+    const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
+    if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
+      use_header_bar = FALSE;
+    }
+  }
+#endif
+  if (use_header_bar) {
+    GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
+    gtk_widget_show(GTK_WIDGET(header_bar));
+    gtk_header_bar_set_title(header_bar, "progress");
+    gtk_header_bar_set_show_close_button(header_bar, TRUE);
+    gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
+  } else {
+    gtk_window_set_title(window, "progress");
+  }
+
+  gtk_window_set_default_size(window, 1280, 720);
+  gtk_widget_show(GTK_WIDGET(window));
+
+  g_autoptr(FlDartProject) project = fl_dart_project_new();
+  fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
+
+  FlView* view = fl_view_new(project);
+  gtk_widget_show(GTK_WIDGET(view));
+  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
+
+  fl_register_plugins(FL_PLUGIN_REGISTRY(view));
+
+  gtk_widget_grab_focus(GTK_WIDGET(view));
+}
+
+// Implements GApplication::local_command_line.
+static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
+  MyApplication* self = MY_APPLICATION(application);
+  // Strip out the first argument as it is the binary name.
+  self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
+
+  g_autoptr(GError) error = nullptr;
+  if (!g_application_register(application, nullptr, &error)) {
+     g_warning("Failed to register: %s", error->message);
+     *exit_status = 1;
+     return TRUE;
+  }
+
+  g_application_activate(application);
+  *exit_status = 0;
+
+  return TRUE;
+}
+
+// Implements GObject::dispose.
+static void my_application_dispose(GObject* object) {
+  MyApplication* self = MY_APPLICATION(object);
+  g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
+  G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
+}
+
+static void my_application_class_init(MyApplicationClass* klass) {
+  G_APPLICATION_CLASS(klass)->activate = my_application_activate;
+  G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
+  G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
+}
+
+static void my_application_init(MyApplication* self) {}
+
+MyApplication* my_application_new() {
+  return MY_APPLICATION(g_object_new(my_application_get_type(),
+                                     "application-id", APPLICATION_ID,
+                                     "flags", G_APPLICATION_NON_UNIQUE,
+                                     nullptr));
+}
diff --git a/progress/linux/my_application.h b/progress/linux/my_application.h
new file mode 100644
index 000000000..72271d5e4
--- /dev/null
+++ b/progress/linux/my_application.h
@@ -0,0 +1,18 @@
+#ifndef FLUTTER_MY_APPLICATION_H_
+#define FLUTTER_MY_APPLICATION_H_
+
+#include <gtk/gtk.h>
+
+G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION,
+                     GtkApplication)
+
+/**
+ * my_application_new:
+ *
+ * Creates a new Flutter-based application.
+ *
+ * Returns: a new #MyApplication.
+ */
+MyApplication* my_application_new();
+
+#endif  // FLUTTER_MY_APPLICATION_H_
diff --git a/progress/macos/.gitignore b/progress/macos/.gitignore
new file mode 100644
index 000000000..746adbb6b
--- /dev/null
+++ b/progress/macos/.gitignore
@@ -0,0 +1,7 @@
+# Flutter-related
+**/Flutter/ephemeral/
+**/Pods/
+
+# Xcode-related
+**/dgph
+**/xcuserdata/
diff --git a/progress/macos/Flutter/Flutter-Debug.xcconfig b/progress/macos/Flutter/Flutter-Debug.xcconfig
new file mode 100644
index 000000000..c2efd0b60
--- /dev/null
+++ b/progress/macos/Flutter/Flutter-Debug.xcconfig
@@ -0,0 +1 @@
+#include "ephemeral/Flutter-Generated.xcconfig"
diff --git a/progress/macos/Flutter/Flutter-Release.xcconfig b/progress/macos/Flutter/Flutter-Release.xcconfig
new file mode 100644
index 000000000..c2efd0b60
--- /dev/null
+++ b/progress/macos/Flutter/Flutter-Release.xcconfig
@@ -0,0 +1 @@
+#include "ephemeral/Flutter-Generated.xcconfig"
diff --git a/progress/macos/Flutter/GeneratedPluginRegistrant.swift b/progress/macos/Flutter/GeneratedPluginRegistrant.swift
new file mode 100644
index 000000000..cccf817a5
--- /dev/null
+++ b/progress/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -0,0 +1,10 @@
+//
+//  Generated file. Do not edit.
+//
+
+import FlutterMacOS
+import Foundation
+
+
+func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+}
diff --git a/progress/macos/Runner.xcodeproj/project.pbxproj b/progress/macos/Runner.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..4aadc4aca
--- /dev/null
+++ b/progress/macos/Runner.xcodeproj/project.pbxproj
@@ -0,0 +1,695 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 54;
+	objects = {
+
+/* Begin PBXAggregateTarget section */
+		33CC111A2044C6BA0003C045 /* Flutter Assemble */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */;
+			buildPhases = (
+				33CC111E2044C6BF0003C045 /* ShellScript */,
+			);
+			dependencies = (
+			);
+			name = "Flutter Assemble";
+			productName = FLX;
+		};
+/* End PBXAggregateTarget section */
+
+/* Begin PBXBuildFile section */
+		331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; };
+		335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
+		33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
+		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
+		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
+		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 33CC10E52044A3C60003C045 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 33CC10EC2044A3C60003C045;
+			remoteInfo = Runner;
+		};
+		33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 33CC10E52044A3C60003C045 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 33CC111A2044C6BA0003C045;
+			remoteInfo = FLX;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		33CC110E2044A8840003C045 /* Bundle Framework */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+			);
+			name = "Bundle Framework";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
+		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
+		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
+		33CC10ED2044A3C60003C045 /* progress.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "progress.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
+		33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
+		33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = "<group>"; };
+		33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = "<group>"; };
+		33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = "<group>"; };
+		33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = "<group>"; };
+		33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = "<group>"; };
+		33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
+		33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
+		33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
+		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
+		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		331C80D2294CF70F00263BE5 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		33CC10EA2044A3C60003C045 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		331C80D6294CF71000263BE5 /* RunnerTests */ = {
+			isa = PBXGroup;
+			children = (
+				331C80D7294CF71000263BE5 /* RunnerTests.swift */,
+			);
+			path = RunnerTests;
+			sourceTree = "<group>";
+		};
+		33BA886A226E78AF003329D5 /* Configs */ = {
+			isa = PBXGroup;
+			children = (
+				33E5194F232828860026EE4D /* AppInfo.xcconfig */,
+				9740EEB21CF90195004384FC /* Debug.xcconfig */,
+				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
+				333000ED22D3DE5D00554162 /* Warnings.xcconfig */,
+			);
+			path = Configs;
+			sourceTree = "<group>";
+		};
+		33CC10E42044A3C60003C045 = {
+			isa = PBXGroup;
+			children = (
+				33FAB671232836740065AC1E /* Runner */,
+				33CEB47122A05771004F2AC0 /* Flutter */,
+				331C80D6294CF71000263BE5 /* RunnerTests */,
+				33CC10EE2044A3C60003C045 /* Products */,
+				D73912EC22F37F3D000D13A0 /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		33CC10EE2044A3C60003C045 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				33CC10ED2044A3C60003C045 /* progress.app */,
+				331C80D5294CF71000263BE5 /* RunnerTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		33CC11242044D66E0003C045 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				33CC10F22044A3C60003C045 /* Assets.xcassets */,
+				33CC10F42044A3C60003C045 /* MainMenu.xib */,
+				33CC10F72044A3C60003C045 /* Info.plist */,
+			);
+			name = Resources;
+			path = ..;
+			sourceTree = "<group>";
+		};
+		33CEB47122A05771004F2AC0 /* Flutter */ = {
+			isa = PBXGroup;
+			children = (
+				335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */,
+				33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */,
+				33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */,
+				33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */,
+			);
+			path = Flutter;
+			sourceTree = "<group>";
+		};
+		33FAB671232836740065AC1E /* Runner */ = {
+			isa = PBXGroup;
+			children = (
+				33CC10F02044A3C60003C045 /* AppDelegate.swift */,
+				33CC11122044BFA00003C045 /* MainFlutterWindow.swift */,
+				33E51913231747F40026EE4D /* DebugProfile.entitlements */,
+				33E51914231749380026EE4D /* Release.entitlements */,
+				33CC11242044D66E0003C045 /* Resources */,
+				33BA886A226E78AF003329D5 /* Configs */,
+			);
+			path = Runner;
+			sourceTree = "<group>";
+		};
+		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		331C80D4294CF70F00263BE5 /* RunnerTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
+			buildPhases = (
+				331C80D1294CF70F00263BE5 /* Sources */,
+				331C80D2294CF70F00263BE5 /* Frameworks */,
+				331C80D3294CF70F00263BE5 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				331C80DA294CF71000263BE5 /* PBXTargetDependency */,
+			);
+			name = RunnerTests;
+			productName = RunnerTests;
+			productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+		33CC10EC2044A3C60003C045 /* Runner */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
+			buildPhases = (
+				33CC10E92044A3C60003C045 /* Sources */,
+				33CC10EA2044A3C60003C045 /* Frameworks */,
+				33CC10EB2044A3C60003C045 /* Resources */,
+				33CC110E2044A8840003C045 /* Bundle Framework */,
+				3399D490228B24CF009A79C7 /* ShellScript */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				33CC11202044C79F0003C045 /* PBXTargetDependency */,
+			);
+			name = Runner;
+			productName = Runner;
+			productReference = 33CC10ED2044A3C60003C045 /* progress.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		33CC10E52044A3C60003C045 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 0920;
+				LastUpgradeCheck = 1430;
+				ORGANIZATIONNAME = "";
+				TargetAttributes = {
+					331C80D4294CF70F00263BE5 = {
+						CreatedOnToolsVersion = 14.0;
+						TestTargetID = 33CC10EC2044A3C60003C045;
+					};
+					33CC10EC2044A3C60003C045 = {
+						CreatedOnToolsVersion = 9.2;
+						LastSwiftMigration = 1100;
+						ProvisioningStyle = Automatic;
+						SystemCapabilities = {
+							com.apple.Sandbox = {
+								enabled = 1;
+							};
+						};
+					};
+					33CC111A2044C6BA0003C045 = {
+						CreatedOnToolsVersion = 9.2;
+						ProvisioningStyle = Manual;
+					};
+				};
+			};
+			buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 33CC10E42044A3C60003C045;
+			productRefGroup = 33CC10EE2044A3C60003C045 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				33CC10EC2044A3C60003C045 /* Runner */,
+				331C80D4294CF70F00263BE5 /* RunnerTests */,
+				33CC111A2044C6BA0003C045 /* Flutter Assemble */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		331C80D3294CF70F00263BE5 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		33CC10EB2044A3C60003C045 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */,
+				33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		3399D490228B24CF009A79C7 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n";
+		};
+		33CC111E2044C6BF0003C045 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				Flutter/ephemeral/FlutterInputs.xcfilelist,
+			);
+			inputPaths = (
+				Flutter/ephemeral/tripwire,
+			);
+			outputFileListPaths = (
+				Flutter/ephemeral/FlutterOutputs.xcfilelist,
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		331C80D1294CF70F00263BE5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		33CC10E92044A3C60003C045 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */,
+				33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */,
+				335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		331C80DA294CF71000263BE5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 33CC10EC2044A3C60003C045 /* Runner */;
+			targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */;
+		};
+		33CC11202044C79F0003C045 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */;
+			targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		33CC10F42044A3C60003C045 /* MainMenu.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				33CC10F52044A3C60003C045 /* Base */,
+			);
+			name = MainMenu.xib;
+			path = Runner;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		331C80DB294CF71000263BE5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/progress.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/progress";
+			};
+			name = Debug;
+		};
+		331C80DC294CF71000263BE5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/progress.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/progress";
+			};
+			name = Release;
+		};
+		331C80DD294CF71000263BE5 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/progress.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/progress";
+			};
+			name = Profile;
+		};
+		338D0CE9231458BD00FA5F75 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = macosx;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+			};
+			name = Profile;
+		};
+		338D0CEA231458BD00FA5F75 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
+				CODE_SIGN_STYLE = Automatic;
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_VERSION = 5.0;
+			};
+			name = Profile;
+		};
+		338D0CEB231458BD00FA5F75 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Manual;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Profile;
+		};
+		33CC10F92044A3C60003C045 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		33CC10FA2044A3C60003C045 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = macosx;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+			};
+			name = Release;
+		};
+		33CC10FC2044A3C60003C045 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
+				CODE_SIGN_STYLE = Automatic;
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+			};
+			name = Debug;
+		};
+		33CC10FD2044A3C60003C045 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
+				CODE_SIGN_STYLE = Automatic;
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_VERSION = 5.0;
+			};
+			name = Release;
+		};
+		33CC111C2044C6BA0003C045 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Manual;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		33CC111D2044C6BA0003C045 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				331C80DB294CF71000263BE5 /* Debug */,
+				331C80DC294CF71000263BE5 /* Release */,
+				331C80DD294CF71000263BE5 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				33CC10F92044A3C60003C045 /* Debug */,
+				33CC10FA2044A3C60003C045 /* Release */,
+				338D0CE9231458BD00FA5F75 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				33CC10FC2044A3C60003C045 /* Debug */,
+				33CC10FD2044A3C60003C045 /* Release */,
+				338D0CEA231458BD00FA5F75 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				33CC111C2044C6BA0003C045 /* Debug */,
+				33CC111D2044C6BA0003C045 /* Release */,
+				338D0CEB231458BD00FA5F75 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 33CC10E52044A3C60003C045 /* Project object */;
+}
diff --git a/progress/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/progress/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000..18d981003
--- /dev/null
+++ b/progress/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/progress/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/progress/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
new file mode 100644
index 000000000..5cbe3b8d3
--- /dev/null
+++ b/progress/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "33CC10EC2044A3C60003C045"
+               BuildableName = "progress.app"
+               BlueprintName = "Runner"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
+            BuildableName = "progress.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "331C80D4294CF70F00263BE5"
+               BuildableName = "RunnerTests.xctest"
+               BlueprintName = "RunnerTests"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
+            BuildableName = "progress.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Profile"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
+            BuildableName = "progress.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/progress/macos/Runner.xcworkspace/contents.xcworkspacedata b/progress/macos/Runner.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..1d526a16e
--- /dev/null
+++ b/progress/macos/Runner.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:Runner.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/progress/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/progress/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000..18d981003
--- /dev/null
+++ b/progress/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/progress/macos/Runner/AppDelegate.swift b/progress/macos/Runner/AppDelegate.swift
new file mode 100644
index 000000000..d53ef6437
--- /dev/null
+++ b/progress/macos/Runner/AppDelegate.swift
@@ -0,0 +1,9 @@
+import Cocoa
+import FlutterMacOS
+
+@NSApplicationMain
+class AppDelegate: FlutterAppDelegate {
+  override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
+    return true
+  }
+}
diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 000000000..a2ec33f19
--- /dev/null
+++ b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,68 @@
+{
+  "images" : [
+    {
+      "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "app_icon_16.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "app_icon_32.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "app_icon_32.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "app_icon_64.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "app_icon_128.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "app_icon_256.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "app_icon_256.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "app_icon_512.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "app_icon_512.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "app_icon_1024.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
new file mode 100644
index 0000000000000000000000000000000000000000..82b6f9d9a33e198f5747104729e1fcef999772a5
GIT binary patch
literal 102994
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
Pe7HEdAEg|=c=LY&YVNkY

literal 0
HcmV?d00001

diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
new file mode 100644
index 0000000000000000000000000000000000000000..13b35eba55c6dabc3aac36f33d859266c18fa0d0
GIT binary patch
literal 5680
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

literal 0
HcmV?d00001

diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a3f5fa40fb3d1e0710331a48de5d256da3f275d
GIT binary patch
literal 520
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K#jR^;j87-Auq
zoUlN^K<V}W|Nr-^PFT-<B<I8<k2moS-$dQqjwO2}38)2pwoy<M({V6lSaDit{<(Sw
zPXRaPYYNUY7O1^kFoWZ1&9ATX7d}2E-*#lOy=2(EzuoIt*085BSnql>{r-Q+XN;zI
ze|?*NFmgt#V#GwrSWaz^2G&@SBmck6ZcIFMww~vE<1E?M2#KUn1CzsB6D2<IW)xrk
zTF<k-{!d~7Q&wNdv9*#ZTy2c$asSgRzRIqUe32s`sn+(h{GXA{&u{&Xv->+0SuRV@
zV2kK5HvIGB{HX-hQzs0*AB%5$9RJ@a;)Ahq#p$GSP91^&hi#6sg*;a~dt}4AclK>h
z_3MoPRQ{i;==;*1S-mY<(JFzhAxMI&<61&m$J0NDHdJ3tYx~j0%M-u<zsp4Sq6Wua
z5BBhjsWTfpZEpHBEIjPnnRxiIKToJ|*&=PntIR&BpDzYU*}YSmk@;dK=M)=9O`bU(
o30)I1CTw2MWPDjr#qiV&hQFoXIy#f5hk;_j)78&qol`;+052KE`v3p{

literal 0
HcmV?d00001

diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdb57226d5f2bd20f11934f4903f16459cf52379
GIT binary patch
literal 14142
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
K%C(A?AO9DJ-0fok

literal 0
HcmV?d00001

diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..f083318e09ca1b6b8484b1694a149f0c5d5cac1d
GIT binary patch
literal 1066
zcmV+_1l9YAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91AfN*P1ONa40RR91AOHXW0IY^$^8f$?lu1NER9Fe^SItioK@|V(ZWmgL
zZT;XwPgVuWM>O%^|Dc$VK;n&?9!&g5)aVsG8cjs5UbtxVVnQNOV~7Mrg3+jnU;rhE
z6fhW6P)R>_eXrXo-RW*y6RQ_qc<j#1d-MCvdv9j8z=r(i2q<p&rfD9eu@2G*X@FEG
z6~cb9uStEZLK5`yo%9{)UDA7sqGXR#mxB;+fV7|VZ_5LkFz5hj?;@j8fQ!XEq!(M{
zYz-RZu=m?3<!>b^s1wTu$TwriZ`=JUws>vRi}5x}MW1MR#7p|gIWJlaLK;~xaN}b<
z<-@=RX-%1mt`^O0o^~2=CD7pJ<<$Rp-oUL-7PuG>do^5W_Mk#unlP}6I@6NPxY`Q}
zuXJF}!0l)vwPNAW;@5DjPRj?*rZx<jK$)1#?a4VGrm!=3lJYK6-%z3AD1isd9rK<&
zotoW{3D^d+4f&nH7`%5jZrktykBXBK9scZ-LUvwn+Zf6O*3BH=2BOx=IRz|CDC|>l
zwn;A(cFV!xe^CUu+6SrN?xe#mz?&%N9QHf~=KyK%DoB8HKC)=w=3E?1Bqj9RMJs3U
z5am3Uv`@+{jgqO^f}Lx_Jp~CoP3N4AMZr~4&d)T`R?`(M{W5WWJV^z~2B|-oih@h^
zD#DuzGbl(P5>()u*YGo*Och=oRr~3P1wOlKqI)udc$|)(bacG5>~p(y>?{JD7nQf_
z*`T^YL06-O>T(s$bi5v~_fWMfnE7Vn%2*tqV|?~m;wSJEVGkNMD>+xCu#um(7}0so
zSEu7?_=Q64Q5D+fz~T=Rr=G_!L*P|(-iOK*@X8r{-?oBlnxMNNgCVCN9Y~ocu+?XA
zjjovJ9F1W$Nf!{AEv%W~8oahwM}4Ruc+SLs>_I_*uBxdcn1gQ^2F8a*vGjgAXYyh?
zWCE@c5R=tbD(F4nL9<VTK~ebn>NS?$PN1V_2*WR?gjv3)4MQeizuH`;sqrhgykEzj
z593&TGlm3h`sIXy_U<7(dpRXGgp0TB{>s?}D{fwLe>IV~exweOfH!qM@CV5kib!YA
z6O0gvJi_0J8IdEvyP#;PtqP*=;$iI2t(xG2YI-e!)~kaUn~b{6<BmbAI7C`%X>(&n
zp)?iJ`z2)Xh%sCV@BkU`XL%_|FnCA?cVv@h*-FOZhY5erbG<m)%ac-@w;CT4TyWxt
kNncSvOvqtF{%Hh$1H=*W-r{pWaR2}S07*qoM6N<$g8Wt7Y5)KL

literal 0
HcmV?d00001

diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
new file mode 100644
index 0000000000000000000000000000000000000000..326c0e72c9d820600887813b3b98d0dd69c5d4e8
GIT binary patch
literal 36406
zcmeGE=RaKU_dbB`8KZ_EB%(x35TbX25d=Z>h)%Q!Av#fJM3Csc_g<nz^d3ZyUZRH>
zC2I6x%$)80`Tkz#KRA!h1FzY`?0es3t!rKDT5EjPe6B=BLPr7s0GW!if;Ip^!AmGW
zL;$`Vdre+|FA!I4r6)keFvAx3M#1`}ijBHDzy)3t0gw<o0CxQm@P`ik0RX&g2!IE^
zLau+84gG(Ag#y`l|KIED58gPh4FUi-prRnB>jl|qC2YB`SSxFKHr(oY#H$)x{L$LL
zBdLKTlsOrmb>T0wd=&6l3+_Te>1!j0OU8%b%N<Ko#ZEw**BmZNWchQD`41c-9hRid
zup{-h!wadIdzsILCKiu&M>342^opKmT)gni(wV($s(>V-fUv@0p8!f`=>PxC|9=nu
ze{ToBBj8b<{PLfXV$h8YPgA~E!_sF9bl;QOF{o6t&JdsX?}rW!_&d`#wlB6T_h;Xf
zl{4Tz5>qjF4kZgjO7ZiLPRz_~U@k5%?=30+nxEh9?s78gZ07YH<f(VdP2w|K;`V+a
zSU&!%=C5aS?5~xgm4;ps#|80kHb3cl6$$KTD%`Eg#!o(BY!;i`Z|-i6<^8-k+1B&m
z_%cA#qPLW(mG?9yf?n*y^RDd$E+-Dts?FINJE~QYWto3cC@Qf*{V3h8XrfQcRq<WU
z1&^W^W0?MF?{|F&3ZAWqX~-d?7tId$5HFoksq}@Nv3$QblByo!R$KMeviGK{G+oKa
z%2b)Y{riya!a%c3bq@cjQoROuuh*G>B`FV`4%hlQlMJe@J`+e(qzy+h(9yY^ckv_*
zb_E6o4p)ZaWfraIoB2)U7_@l(J0O%jm+Or>8}zSSTk<a4@uWZ_pD$@B@k*Ipd`2=s
zhXdDW`VT7PvXx{Qq|dWAdkL6Q<ZnvkpN-0s?<SFNcr~&QD*3u<X{Yr&4QiLv6!`Yl
zQ7X3P`5xC%<g*VtseTSbXwNYBez+AN%EG)qo84j-)@{PRC)n@N*b>M$ASG^w3F|I?
z$+eHt7T~04(_WfKh27zq<M+F8%cr0AY~kW1b?@zX9d|y&9!N9_^qCjbDBrIc>S$6*
zzyy-ZyqvSIZ0!kkSvHknm_P*{5TKLQs8S6M=ONuKAUJWtpxbL#2(_huvY(v~Y%%#~
zYgsq$JbLLprKkV)32`liIT$KKEqs$iYxjFlHiRNvBhxbDg*3@Qefw4UM$>i${R5uB
zhvTgmqQsKA{vrKN;TSJU2<s?{=#%q717?q=>$f9q=y{$oH{<)woSeV>fkIz6D8@KB
zf4M%v%f5U2?<8B(xn}xV+gWP?t&oiapJhJbfa;agtz-YM7=hrSuxl8lAc3GgFna#7
zNjX7;`d?oD`#AK+fQ=ZXqfIZFEk{ApzjJF0=yO~Yj{7oQfXl+6v!wNnoqwEvrs81a
zGC?yXeSD2NV!ejp{LdZGEtd1T<NHg;^UK)N2gejhi4fB9j}5IYuYnqx{rpCWlLs%n
z$!(@_+wItG>J)3g{P6j#2jLR`cpo;YX}~_gU&Gd<+~SUJVh+$7S%`zLy^QqndN<_9
zrLwnXrLvW+ew9zX2)5qw7)zIYawgMrh`{_|(nx%u-ur1B7YcL<U>p&WFa24gAuw~&
zKJD3~^`Vp_SR$WGGBaMnttT)#fCc^+P$@UHIyBu+TRJWbcw4`CYL@SVGh!X&y%!x~
zaO*m-bTadEcEL6V6*{>irB8qT5Tqd<B(D{NFY@~;PY}S~gcg!{3xur`iJ!1c*Tgtq
zEiqkfD#ckD;|61Qj@MOG<gP<g-%aS@y~_{>54TC4`h`PV<p;~ci}{~|;ZI9H6Tn5e
zI!g$5*KxBW{&j&vzuR>cd^AM6^Qf=GS->x%N70SY-u?qr>o2*OV7LQ=j)pQGv%4~z
zz?X;qv*l$QSNjOuQZ>&WZs2^@G^Qas`T8iM{b19dS>DaXX~=jd4B2u`P;B}JjRBi#
z_a@&Z5ev1-VphmKlZEZZd2-Lsw!+1S60YwW6@>+NQ=E5PZ+OUEXjgUaXL-E0fo(E*
zsjQ{s>n33o#VZm0e%H{`KJi@2ghl8g>a~`?mFj<s<bobqX#|}4Uu~P=nu)}_`#<bf
z7N$OVgP1l+$_o^sZr^EL_B>w+$zlt|VJhSU@Y%0TWs>cnD&61fW4e0vFS<JbKF5ve
zKk*kP58WfJHlG5a%d<&l&!@RFyjDM7?zdg;X{dVQq!vE5a9rQ(#saO3YgHefwTzPP
zacI9fC0{Mx<;e7c4rGx{-jOARHMj#aRf=VZkb53?qfaohi90frO^^Ch{@WsZm}#sl
z;mx-5)iASI7RV6Us43v?YSQq9c!Uu-J^3jQ^YsgPx&JK1A7qB-651(ts;#^~()jar
zhzWw5=ROL+cFPgon`EQUlI9|$_$rniG-YUCP{$wTXt`@X@B&e<Cp8Fe4Say8rN#v{
zAkW*hnd`knrc67_C3Onqhj3H3AH{{#x^+`3IS9G`o%Fs{XZGG8nhG3WA={n;?$nV&
z$msQ32gIR^OD5d8(mew6E|CHyBmrC!{ughSEe`X{?CP&R&bsp>aXZa4-c}U{4QR8U
z;GV3^@(?Dk5uc@RT|+5C8-24->1snH6-?(nwXSnPcLn#X_}y3XS)MI_?zQ$ZAuyg+
z-pjqsw}|hg{$~f0FzmmbZzFC0He_*Vx|_uLc!Ffeb8#+@m#Z^AYcWcZF(^Os8&Z4g
zG)y{$_pgrv#=_rV^D|Y<_b@ICleUv>c<0HzJDOsgJb#Rd-Vt@+EBDPyq7dUM9O{Yp
zuGUrO?ma2wpuJuwl1M=*+tb|qx7Doj?!F-3Z>Dq_ihFP=d@_JO;vF{iu-6MWYn#=2
zRX6W=`Q`q-+q@Db|6_a1#8B|#%hskH82lS|9`im0UOJn?N#S;Y0$%xZw3*jR(1h5s
z?-7D1tnIafviko>q6$UyqVDq1o@cwyCb*})l~x<@s$5D6N=-Uo1yc49p)xMzxwnuZ
zHt!(hu-Ek;Fv4MyNTgbW%rPF*dB=;@r3YnrlFV{#-*gKS_qA(G-~TAlZ@Ti~Yxw;k
za1EYyX_Up|`rpbZ0&Iv#$;eC|c0r4XGaQ-1mw@M_4p3vKIIpKs49a8Ns#ni)G314Z
z8<zhMC&uyKbr!0p$@ulq+M0{sArrl_R_Y^t*2#kW{j8)GlY_CI?GFb57b_`FZ26xl
zDr7GbeWE<5^K3iH@I#z;F)?DnQ|q5bd?Lw){3h4VIK*Mk+S|MC7&)vA3IEgRynAgT
z0Ock%^c9TZm<jifY0%obgUJpiT!~KyEZr?RoGJIKpL1;9&7{&MJA3{^^Z#z(g!=jU
zh2SpRahGu#(kGM4*6zq*{NMHSc`sfA!XI+UL%($``z&8B{qxyx6^oahL5scmL2-RE
ze4T=V?Kj^3`<dpw7*nKvgTiS0dvW3_#<bMKBy;l#&pwtA^EzC^d%-0zs$JiZNEwYc
z%ZM3IY7?eCs#kbE<$e({QoZ>$E<zeO(fqU0QF)eZ8M$>i?AhiT5dQGWUYdCS|IC7r
z=-8ol>V?u!n%F*J^^<H2=4hm>PZ(ONT&$Ph;r6X;pj|03HlDY6r~0g~X<Vn7mLf6Z
zKSZ#FS=D#k8<E`pk~L_+^OBLsPYLCu$LRxbnQzLEaT}?g`t91A&HIDY43iK<)e0If
zh?>#zuzVU%a&!fs_f|m?qYvg^Z{y?9Qh7Rn?T*F%7lUtA6U&={HzhYEzA`knx1VH>
z{tqv?p@I(&ObD5L4|YJV$QM>Nh-X3cx{I&!$FoPC_2iIEJfPk-$;4wz>adRu@n`_y
z_R6aN|MDHdK;+IJmyw(hMoDCFCQ(6?hCAG5&7p{y<cZYLkfEs;kgkHLo>->0Uckv#
zvooVuu04$+pqof777ftk<#42@KQ((5DPcSMQyzGOJ{e9H$a9<2Qi_oHjl{#=FUL9d
z+~0^2`tcvmp0hENwfHR`Ce|<1S@p;MNGInXCtHnrDPXCKmMTZQ{HVm_cZ>@?Wa6}O
zHsJc7wE)mc@1OR2DWY%ZIPK1J2p6XDO$ar`$RXkbW}=@rFZ(t85AS>>U0!yt9f49^
zA9@pc0P#k;>+o5bJfx0t)Lq#v4`OcQn~av__dZ-RYOYu}F#pdsl31C^+Q<?6KFjka
zqP|_xm2{9&`X+(|M`1v-@%gq{)79n3<D(&suiNeRnVxszuMg=rbJd?nsii6~be$2%
znOMWz=0A$*R^(x<C6u#<h%$t&2dL|?XgTKVeR89Pjvu69>gro}$q~5A<*c|kypzd}
ziYGZ~?}5o`S5lw^B{O@laad9M_D<sU@Nn20B8N8gdV8{r-}`nLoW^5O6E1cFOd8_A
zX<lCNwH}XWST!%JzR`e6|Ichj^@x=D;JCD9%=&E?^HC-&W<!=-@5ZvoJiezYIdbuW
zPo*HqW6^!asOhhYt;PTOIwU~Avd33`nB*=WAwiDZ7c#{uTC!tBlFd7KfO{~>uJle-
z*9C7o=CJh#QL=V^sFlJ0c?BaB#4bV^T(DS6&Ne&DBM_3E$S^S13<joH2iW(oIIn$T
zo&TJVB&4HQD{nZu>qC$7_Z?GYXTpR@wqr70wu$7+qvf-SEUa5mdHvFbu^7ew!Z1a^
zo}xKOuT*gtGws-a{Tx}{#(>G~Y_h&5P@Q8&p!{*s37^QX_Ibx<6XU*AtDOIvk|^{~
zPlS}&DM5$Ffyu-T&0|KS;Wnaqw{9DB&B3}vcO1<R|0l`O|J&fuQ22fTAtUEJ6k{R@
z$(&?FKB*+)bRmbEY%|$QTQ~N4EBd(@@LpR8K&c$uk*^Zhrq7$S+mD?4q}C&zR}$s`
z050V%u|rrUq4&p|c|wNd)c+6O!;xQZ((_6GxKyzm6NO4X(%Y`yC&0_rpY}Sv=egh<
zQh)QQ%YSr*B7l{-YPW9Q-;@+`7dSNrcC~n)P}*B_mO`?55b>4wn;)O_e@2*9B&0I_
zZz{}CMxx`hv-XouY>^$Y@J(_INeM>lIQI@I>dBAqq1)}?Xmx(qRuX^i4IV%=MF306
z9g)i*79pP%_7Ex?m6ag-4Tlm=Z;?DQDyC-NpUIb#_^~V_tsL<~5<&;Gf2N+p?(msn
zzUD<r{_O#w*E4WUinF~M^J>~g>OoW@O}y0@Z;RN)wjam`CipmT&O7a|YljZqU=U86
zedayEdY)2F#BJ6xvmW8K&ffdS*0!%N<%RB!2~PAT4AD*$W7yzHbX#Eja9%3aD+Ah2
zf#T;XJW-GMxpE=d4Y>}jE=#U<nDc*G<M1ZXw!7ucHS3fb^$f9Re2Z4WmR$8-61^I?
zRlEtUsG1s5S#A}}A}jT&WAD`%^!vVwk`XH1yiwZ<^ub>`IqgSoWcuvgaWQ9j1CKzG
zDkoMDDT)B;Byl3R2PtC`ip=yGybfzmVNEx{xi_1|Cbqj>=FxQc{g`xj6fIfy`D8fA
z##!-H_e6o0>6Su&$H2kQTujtbtyNFeKc}2=|4IfLTnye#@$Au7Kv4)dnA;-fz@D_8
z)>ir<E}8DFE5kwq0cz~qqu?R3qwVIa+K<F;8P%WGo{p78|J)}DbuIcFYs*va|M?B%
zr?gN{(vVV7{7?gyb6jLYHFT3mEt!8MU*FVQkqnu;^^7o@_0BW1<|Xve##zKYsnhsP
zy^(8H4_xoN^$_mnOmcg~&3H?xsf6`{3ZAferu>G$)dk<qHN7N)p%Z<Y6+|F0!d9go
zm)zFZh!(O|bAVYr{GA9g+*NT4b3VfGpL}7&VQ+wJ;{p&(<EZj)aoA9L4Jg2>BY~zX
zC!ZXLy*L3xr6cb70QqfN#Q>lFIc<>}>la4@3%7#>a1$PU&O^&VszpxLC%*!m-cO{B
z-Y}<!@c6mS8LYF?0vAo+cNY=3tIM0Rn1jH1Vs<dOQ<MV+aJ;lf?d~h)oTw~aTBRRk
z=pZynNRC}%z33X-5ee}?8v9l<VvQm7^YHmcqU%u1w7b1M@fkUq6jYj@t1cvm`aRR^
ze{~W22qn&9aU~={xhV<Du6OkJ?;A2%m0sT`P-y?ea*`qCy>rQr4$84(hvy#R69H{H
zJ*O#uJh)TF6fbXy;fZkk%X=CjsTK}o5N1a`d7kgYYZLPxsHx%9*_XN8VWXEkVJZ%A
z1A+5(B;0^{T4aPYr8%i@i32h)_)|q?9vws)r+=5u)1YNftF5mknwfd*%jXA2TeP}Z
zQ!m?xJ3?9Lp<x&0=u@b0$<!m2CF8{0yMW=tcUpzx#2o2W>PM?_A3$hQ1QxNbR&}^m
z!F999s?p^ak#C4NM_x2p9FoXWJ$>r?lJ)2bG)sX{gExgLA2s5RwHV!h6!C~d_H||J
z>9{E{mEv{Z1z~65Vix@dqM4ZqiU|!)e<w>WX$mwS5mLSufxbpBqqS!jShq1bmwCR6
z4u<o~Z&JF}ZU?h}NssYn2~f(#%NIbem^`z2lyngk)RyN~9kYP@9$ihevPrXVxLf?`
zs}SFKUtF8x@Oiu2?7?ySuPA&f4=U*Ed{f*)bR*#+)@4QU(5^x9-yR}cPnzaIMw-Ut
zCBHZR*e{omeyLAMw(p~0Qc*F9INiO2jnDc|@dV<HGl*VS!upD9#=5z*$&qwGK?1ja
zqSaxKPp+KY8`e=jqWFS&oTR}<RDu6{?@gYFLpMFN&(k_i{)opDzbRinzGBt;JbH-3
zsBz)oLxOY<3Gvh^#<KZ#O_7PRPs)SyhzO8vHt#Y>Bri7ezMeS6ycaXPVu(i2up$L;
zjpMtB`k~WaNrdgM_R=e#SN?Oa*u%nQy01?()h4A(jyfeNfx;5o+kX?maO4#1A^L}0
zYNyIh@QVXIFiS0*tE<Ql)bx4D`dDA~n9jCX(2(U{r)q4_yGL1<uVxoovd4GHNtCt*
zjXu&m>}2SWTrWNP3pH}1Vz1;E{@JbbgDFM-_Mky^7gH}LEhl~Ve5Pexgb<VvJYMUr
zI**#w1>IyZ(IN%PqcaV@*_`ZFb=`EjspSz%5m2E34BVT)d=<xZ79`HuR4ffVr^|O0
za#-<8Zs{BqrlPd&x*akz`SpS8z@A_FfqnpgJ+8n4%`$7qcu}o+1cZ*OM|x7VFR7=A
zo<!1%Ilger5+->LGyHVz@-e%9Ova*{5@RD;7=Ebkc2GP%pIP^P7KzKapnh`UpH?@h
z$RBpD*{b?vhohOKf-JG3?A|AX|2pQ?(>dwIbWhZ38GbTm4AImRNdv_&<99ySX;kJ|
zo|5YgbHZC#HYgjBZrvGAT4NZYbp}qkVSa;C-LGsR26Co+i_HM&{awuO9l)Ml{G8zD
zs$M8R`r+>PT#Rg!J(K6T4xHq7+tscU(}N$HY;Yz*cUObX7J7h0#u)S7b~t^Oj}TBF
zuzsugnst;F#^1jm>22*AC$heublWtaQyM6RuaquFd8V#hJ60Z3j7@bAs&?dD#<ivf
z(|aoRr|<kR3-jfm1IytP+tngT4h_ZE(IWc<$UA*nSeJ>*>H0SJaDwp%U~27>zdtn+
z|8sZzklZy$%S|+^ie&P6++>zbrq&?+{Yy11Y>@_ce@vU4ZulS@6yziG6;iu3Iu`M=
zf3rcWG<+3F`K|*(`0mE<$89F@jSq;j=W#E>(R}2drCB7D*0-|D;S;(;TwzIJkGs|q
z2qH{m_zZ+el`b;Bv-#bQ>}*VPYC|7`rgBFf2oivXS^>v<&HHTypvd4|-zn|=h=TG{
z05TH2+{T%EnADO>3i<U+^h<TPR(jL@J|Q(zyU|~$GOEs|fJ0fsx-;v+WoUu9X^Js6
z`1|+ooty|=4K2yigUD00%*TyNr*D_?%t!8p$-`LLkOGJr%*Mx^(-~6Te|d!PD>|CB
zCu60#q<L<EUO}HHFsUf~l+-cdL5-us)u5`aKjJHuw84s>k`}GW{n4l-E$VrqgZGbI
zbQW690KgZt4U3F^5@bdO1!xu~p@7Y~*_FfWg2CdvED5P5#w#V46LH`<&V0{t&Ml~4
zHNi7lIa+#i+^Z6EnxO7KJQw)wD)4~&S-Ki8)3=jpqxmx6c&zU&<&h%*c$I(5{1HZT
zc9WE}ijcWJiVa^Q^xC|WX0habl89qycOyeViIbi(LFsEY_8a|+X^+%Qv+W4vzj>`y
zpuRnjc-eHNkvXvI_f{=*FX=OKQzT?bck#2*qoKTHmDe>CDb&3AngA1O)1b}QJ1Tun
z_<@yVEM>qG7664Pa@dzL@;DEh`#?yM+M|_fQS<7yv|i*pw)<s;k^3L}xk=UU5;Leh
zdg5?+WMQx&TgX?x>|Z8)9IR+QB7N3v3K(wv4OY*TXnH&X0nQB}?|h2XQeGL^q~N7N
zDFa@x0E(UyN7k<T;f{y|6<e&5Uh2gyt}Ks+R9hhfxtVbGFD<DX71gc#&f^qo-(@Uf
zxNk1j*iEoMvrFtBv2$B*wNl)Iz@?AXvSj?2_isNze}?PA(ghF(8;Je!ciWh&b9-{6
zS&Laixw)Ro#aQ8O#|_$Up+_cn8GoM;%#xjcn<&8q9&ouV3`^~|oc#J~`7e1pufmZx
z%!C@R!w$XQj>9g%IFq7Sf+EAfE#K%%#`)!90_)Dmy3Bll&e1vHQyPA<Ap4`!BeoHK
z@7Zefzc+U(9#>87TaF(xbqMpDntVp?;8*$87STop$<Q_aU<IA<1yYCB=xy!P$AxJa
zJ_nSN64}`s(^l`5{+A|3FT&Udl1qnI8h#S=MZh735G^vOYW+<9qqKF&vX)fR(67hj
zsf7@Qq@(C*+?}hdtI@Q`;jatEtU4ci8(&b)JA5PSvGt-1=wt&>!EAnGhZ?>mqPJ(X
zFsr336p3P{PpZCGn&^LP(JjnBbl_3P3Kcq+m}xVFMVr1zdCPJMDIV_ki#c=vvTwbU
z*gKtfic&{<5ozL6Vfpx>o2Tts?3fkhWnJD&^$&+Mh5WGGyO7fG@6WDE`tEe(8<;+q
z@Ld~g08XDzF8xtmpIj`#q^(Ty{Hq>t*v`pedHnuj(0%L(%sjkwp%s}wMd!a<*L~9T
z9MM@s)Km~ogxlqEhIw5(lc46gCPsSosUFsgGDr8H{mj%OzJz{N#;bQ;KkV+ZWA1(9
zu0PXzyh+C<4OBYQ0v3z~Lr;=C@qmt8===Ov2lJ1=DeLfq*#jgT{YQCuwz?j{&3o_6
zsqp2Z_q-YWJg?C6=!Or|b@(zxTlg$ng2eUQzuC<+o)k<6^9ju_Z*#x+oioZ5T8Z_L
zz9^A1h2eFS0O5muq8;LuDKwOv4A9pxmOjgb6L*i!<dl2>-(0`Ie^d5Fsgspon%X|7
zC{RRXEmYn!5zP9XjG*{pLa)!2;PJB2<-tH@R7+E1cRo=Wz_5Ko8h8bB$QU%t9#vol
zAoq?C$~~AsYC|AQQ)>>7BJ@{Cal)ZpqE=gjT+Juf!RD-;U0mbV1ED5PbvFD6M=qj1
zZ{QERT5@(&LQ~1X9xSf&@%r|3`S#ZCE=sWD`D4YQZ`MR`G&s>lN{y2+HqCfvgcw3E
z-}Kp(dfGG?V|97kAHQX+OcKCZS`Q%}HD6u*e$~Ki&Vx53&FC!x94xJd4F2l^qQeFO
z?&JdmgrdVjroKNJx64C!<b<#AliD%%@pmJ$_XjF$d?*RUy0fca@iIacvY$Vy&65#1
zeEo5!6yYG2q&QLr$u{3U%eM9Mx=RRgrp;!R7n=cRhSToBjO{K*a;t2&-#eW3R?xzn
z!-eyf-PQViLzOP(C?=SYNCyHdCm1z6<*FErknmpu(CJDuCo3XQ`8~~&c=ihh0nJ9#
zsqb<6Z{=ln17U^jCLBM>H<qukZuN~HgM35YV^^$xooNqoVxa#zH-j{vP=>&Vncr^w
zzR#X<dhd9kz3qoka{y?})GK?@Pq)s<i?=i6+HI`!1m1f+y*)nFTMw4h#tI?iho3@K
zG*kFj_U{_}6^pdQ+UaV{93+c7v-$vn+VfuR8Oy6b!p87ABmmlyyP=f#AZ}gDhfih~
z9#Ua*xtcZ`MGD_hf3ae)6$cLM=7>I}Dn&o8jB~_YlVM^+#0W(G1LZH5K^|uYT@KSR
z^Y5>^*Bc45E1({~EJB(t@4n<Grrf*>9gb-eT#s@@7)J^^<_VV`Pm!h7av8XH6^5zO
zOcQBhTGr;|MbRsgxCW69w{bl4EW#A~);L?d4*y#j8Ne=Z@fmJP0k4<!IQLN&MQa7!
zelb>{_cQ~KA|Y#_#BuUiYx8y*za3_6Y}c=GSe7(2|KAfhdzud!<Xqat^pPNyjfPEM
zxF#h&<ltr6Rs-ckY&ww}HR!%OyNI-Kbn|UvDW=V09t6I+^$YzjBUJE@Zq-abt07!o
z^)Lbhf5}_Ug^ymR4ftz^^q_RPgriysvk4x1Kx^zjf+Z?<Sa!anmw(^FwsTcf5_Isr
z_Z*AaOXC9pO~Z3Dp;D{onRB*1Ygb`2H=|ROn4!7$J1j`}+!v)gEAAba>Zq&}j)=o4
z7R|&&oX7~e@~HmyOOsCCwy`AR+deNjZ3bf6ijI_*tKP*_5JP3;0d;L_p(c>W1b%sG
zJ*$wcO$ng^aW0E(5ldckV9unU7}OB7s?Wx(761?1^&8tA5y0_(ieV>(x-e@}1`lWC
z-YH~G$D>#ud!SxK2_Iw{K%92=+{4yb-_XC>ji&j7)1ofp(OGa4jjF;Hd*`6YQL+Jf
zffg+6CPc8F@EDPN{Kn96yip;?g@)qgkPo^nVKFqY?8!=h$G$V=<>%5J&iVjwR!7H0
z$@QL|_Q<v#0qanvql2WtUW=tmoy-L%ihZi$BtWiEz%@mLDkiS!7Xj_jj62r!5T3GX
zpKBKH@o=Vr8)z9A{mXAYL7LQRU5D$}ncZFf+qC%tD+tS`hisLl8gY_X0)5@#3;ItT
zvsg(OKOuQfn#I<V5kmMh$p%Ax4XuC$wToH|U2IT)nc(`!ESBuI0J8{8VdfnXvxsn<
zK<PujQ{X;cY>81I;Bnq8-5JyNRv$Y>`sWl{qhq>u+X|)@cMlsG!{*lu?*H`Tp|!uv
z9oEPU1jU<BGX-Z%o>Ej@ueBr}%Y)7Luyi)REaJV>eQ{+uy4uh0ep0){t;OU8D*RZ&
zE-Z-&=BrWQLAD^A&qut&4{ZfhqK1ZQB0fACP)=zgx(0(o-`U62EzTkBkG@mXqbjXm
z>w`HNeQM?Is&4xq@BB(K;wv5nI6EXas)XXAkUuf}5uSrZLYxRCQPefn-1^#OCd4aO
zzF=dQ*CREEyWf@n6h7(uXLNgJIwGp#Xrsj6S<^bzQ7N0B0N{XlT;`=m9Olg<>KL}9
zlp>EKTx-h|%d1Ncqa=wnQEuE;sI<B=^sH}DI8Vwo$}+q~(BHW*ibBrim5-GCkXV}q
zipyXrc$%KeuNL|;iG-O!;*}7N&YPFzOXBhufpzwgS$_##Ruu?Yp-gysG~uSBh(@?X
z$?P2zAxGcRLlg9n?z5;DXa5ZZp@sgw-yx~sHSruax*Ii%)x`3{4qX(rFs9Zn+%|lv
z!krFzc#GKAXjh+Q;phiZ#YCj!<nvAJ^#e>O-f#%Bs?g4}&xS?$9MG?n$isHky0caj
za8W+B^ERK#&h?(x)7LLpOqApV5F>sqB`sntV%SV>Q1;ax67qs+WcssfFeF3Xk=e4^
zjR2^(%K1oBq%0%Rf!y&WT;lu2<K$BnxZ?DA9*#8~UsJH?6S-VI5{^nnOuk{0raVvp
zlL~-jS||S}?PL4UfE0Nk4P$(?6Ya3yT(Wgq<KHRYxT0O}GIN1b@c|6^R+Mk@OP)rn
z`^(5gEMnP;M`z?<2g<8Smt~+&%=#Yvyzx!iaxbftm-CvwwTN3W8aDNR5}PjInfKsE
z5Tz9{0=6Y!)@mtjsipw?K*1Rf(agU}3FHcQ&QJoBE|wlzV(Yybw&?XF^{^S6hEZJh
z9Gho}Y<{xUAOqQjoeoXV2e9%;j5I?uw}WF?fJoB!vX!Ljln~Ax`b;LlvjKM5(w09}
zGc~2>Co(rHi|r1_uW)n{<7fGc-c=ft7Z0Q<iNfGZWI#OC@@VG2KfN?Lk1Vz$-0r~v
zOYF=*GERO<0HL>}r4W$o$@tQF#i?jDBwZ8h+=SC}3?anUp3mtRVv9l#H?-UD;HjTF
zQ*>|}e=6gDrgI9p%c&4iMUkQa4zziS$bO&i#DI$Wu$7dz7-}XLk%!US^XUIFf2obO
zFCTjVEtkvYSKWB;<0C;_B{HHs<El7_s8Bm^*6YFO5tpWky-Q~VC=JPCI1hVOsDfl)
z+ddm)+Q#&f*Ra(WkH=&ZWfPLwxCvBr9s{2sns+S=??$~4cm`1f1rPE82SjTu7cPHG
zFS58I@=EC^)A9MLqB@OU+pbd5kloH{6bb#-XSf3_^c8U2M*-IwxYaC}!fyiOpT|8-
zIS6sbo+jwhva34{-kN6e++o7Zv+T=McP)R`kyvM{lTn$GfF(XMsIGQxEJ}0DOki(Q
ztyLujZbBwUvpF6@69jN9t|PJUQRHnZhMjY%&$-Ofk3n+9@s@kSe27W)s%H&tKlu#V
zC#CbBJ{KqSKoe>~ax_48^Cml*mjfBC5*7^HJZiLDir(3k&BerVIZF8zF;0q80eX8c
zPN4tc+Dc5DqEAq$Y3B3R&XPZ=AQfFMXv#!RQnGecJONe0H;+!f^<X9lvh@ZgRiE!(
zC>h5x0wS<+%;D}MpUbTNUBA}S2n&U59-_5HKr{L^jPsV8B^%NaH|tUr)mq=qCBv_-
ziZ1xUp(ZzxUYTCF@C}To;u60?RIfTGS?#JnB8S8@j`TKPkAa)$My+6ziGaBcA@){d
z91)%+v2_ba7gNecdj^8*I4#<11l!{XKl6s0zkXfJPxhP+@b+5ev{a>p*W-3*25c&}
zmCf{g9mPWVQ$?Sp*4V|lT@~>RR)9iNdN^7KT@>*MU3&v^3e?=NTbG9!h6C|9zO097
zN{Qs6Yw<Nd$b;u}H{)5dU4d$I*p5t{mCRSd<|}$eVFHSPn=BoS$eWN62dSw4m&Ar0
zo@qy`BzTM;t5B9EluUe3mIE`W<cAL;(H!Nvh5O=AL6~N;`UZ(kbfoNUYG!>R-5$)~
z`b~qs`a1Dbx8P>%V=1XGjBptMf%P~sl1qbHVm1HYpY|-Z^Dar8^HqjIw}xaeRlsYa
zJ_@Apy-??`gxPmb`m`0`z`#G7*_C}qiSZe~l2z65tE~IwMw$1|-u&t|z-8SxliH00
zlh1#kuqB56s+E&PWQ7Nz17?c}pN+A@-c^xLqh(j;mS|?>(Pf7(<e4L1ie`y##T7bp
z`?p37h!GR?*#|T1xJsUZ7A^%^_&h~6WK^^`MGK?~^*9EJseOytwO)-zbdXYlG>?qd
z5q@jkc^nA&!K-}-1P=Ry0yyze0W!+h^iW}7jzC1{?|rEFFWbE^Yu7Y}t?jmP-D$f+
zmqFT7nTl0HL|<j7tfRrHM-K+2Y!-<QDHj|^5e2ZSL-Qfgd4y59J@P>4jwGm7w@a>9
zKD)V~+g~ysmei$OT5}%$&LK<VtESlV;rVc`lsNBFGltD%b`GL<x6Ge&g}%B4slim<
zMmg>8?ib|8aY|>W3;P+0B;=oD=?1rg+PxKcP(d;OEzq1CKA&y#boc51P^ZJPPS)z5
zAZ)dd2$glGQXFj$`XBBJyl2y-aoBA8121JC9&~|_nY>nkmW>TLi%mWdn-^Jks-Jv|
zSR*wij;A3Fcy8KsDjQ15<r6O~x~pb~X5yj3_K>?Z9oOj|Qw2;jgJiq>dxG(2I2RE-
z$As!#zSFIskebqU2bnoM^N<4VWD2#>!;saPSsY8OaCCQqkCMdje$C?Sp%V}f2~tG5
z0whMYk6tcaABwu*x)ak@n4sMElGPX1_lmv@bgdI2jPdD|2-<~Jf`L`@>Lj7{<-uLQ
zE3S_#3e10q-ra=vaDQ42QUY^@edh>tnTtpBiiDVUk5+Po@%RmuTntOlE2<Z{e%2*S
zr>9I4MeJI?;`7;{3e4Qst#i-RH6s;>e(Sc+ubF2_gwf5Qi%P!aa89fx6^{~A*&B4Q
zKTF|Kx^NkiWx=RDhe<{PWXMQ;2)=SC=yZC&mh?T&CvFVz?5cW~ritRjG2?I0Av_cI
z)=s!@MXpXbarYm>Kj0wOxl=eFMgSMc?62U#2gM^li@wKPK9^;;0_h7B>F>0>I3P`{
zr^ygPYp~WVm<rnkTV&vfb;fqH*!2%tp=gl*L+Z8@>?Qbp6O3*O2)(`y)x>%ZXtztz
zMAcwKDr=TCMY!S-MJ8|2MJCVNUBI0BkJV6?(!~W!_dC{TS=eh}t#X+2D>Kp&)ZN~q
zvg!ogxUXu^y(P*;Q+y_rDoGeSCYxkaGPldDDx)k;ocJvvGO#1YKoQLHUf2h_pjm&1
zqh&!_KFH03FcJvSdfgUYMp=5EpigZ*8}7N_W%Ms^WSQ4hH`9<Y-@eCo=Bwa(J7F&-
z@0Hqn)@Z`(=jSAHT9RGUL*8#!OeK+Eo|1gomdO7>>3061OEcxmf~TcYn5_oHtscWn
zo5!ayj<_fZ)vHu3!A!7M;4y1QIr8YGy$P2qDD_4+T8^=^dB6uNsz|D>p~4pF3Nrb6
zcpRK*($<~JUqOya#M<Nj5NeD+T5x;hmFG<eX9c}=NV`wc<jARp5vyLs-@>1=#IhOZ
zG)W<eDkicrMp8-_i9^4z{DmKwXh5ub#oD0<{P?1u$dyO*+dQl6>+rJS-x(6EoVz)P
zsSo>JtnChd<BA`Ke6ojq<e9H=esJ{9j^XI6oct+80F(vv2>j9^);su%SkFG~_7JPM
zEDz3gk2T7Y%x>1tWyia|op(ilEzvAujW?Xwlw>J6d7<fenhQ-o{rU%TG0yq>yEi8E
zv30riR|a_MM%ZZX&n!qm0{2agq(s?x9E@=*tyT$nND+{Djpm7Rsy!+c$j+wqMwTOF
zZL8BQ|I`<^bGW)5apO{lh(Asqen?_U`$_n0-Ob~Yd%^89oEe%9yGumQ_8Be+l2k+n
zCxT%s?bMpv|AdWP7M1LQwLm|x+igA~;+iK-*+tClF&ueX_V}>=4gvZ01xpubQWXD_
zi?Un>&3=$fu)dgk-Z;0Ll}HK5_YM->l^Czrd0^cJ))(DwL2g3aZuza7ga9^|mT_70
z))}A}r1#-(9cxtn<9jGRwOB4hb9kK@YCgjfOM-90I$8@l=H^`K$cyhe2mTM|FY9vW
znH~h)I<_aa#V1xmhk?Ng@$Jw-s%a!$BI4Us+Df+<tEL-hW7Ms|u9`A#*N;)Maza#2
zze#5;?o={Fl{hl^?>?J&gKAF-M`v}j`OWKP3>6`X`tEmhe#y*(Xm$_^Ybbs=%;L7h
zp7q^C*qM}Krqsinq|WolR99>_!GL#Z71Hhz|IwQQv<>Ds09B?Je(lhI1(FInO8mc}
zl$RyKCUmfku+Cd^8s0|t+e}5g7M{ZPJQH=UB3(~U&(w#Bz#@DTDHy>_UaS~AtN>4O
zJ-I#U@R($fgupHebcpuEBX`SZ>kN!rW$#9>s{^3`86ZRQRtYTY)hiFm_9wU3c`SC8
z-5M%g)h}3Pt|wyj#F%}pGC@VL`9&>9P+_UbudCkS%y2w&*o})hBplrB*@Z?gel5q+
z%|*59(sR9GMk3xME}wd%&k?7~J)OL`rK#4d-haC7uaU8-L@?$K6(r<0e<;y83rK&`
z3Q!1rD9Wkc<?WA+BwMkM^Us)2_`Fi#U;)u%Tj*Mrr)PvDevP<}RrKF&Ui^SxXABRN
zE@bGOea!UE;c~Y#=6~LJGB>B8WBQ|WT|$u^lkr0UL4WH4EQTJyk@5gzHb18cOte4w
zS`fLv8q;PvAZyY;*Go3Qw1~5#gP0D0ERla6M6<d|#}q2cK5j4^9~!z!#57kAw>#{;
zr1l?bR}Nh+OC7)4bfAs(0ZD(axaw6j9v`^jh5>*Eo&$dAnt?c|Y*ckEORIiJXfGcM
zEo`bmIq6rJm`XhkXR-^3d8^RTK2;nmVetHfUNugJG(4XLOu>HJA;0EWb~?&|0abr6
zxqVp@p=b3MN^|~?djPe!=eex(u!x>RYFAj|*T$cTi*Sd3Bme7Pri1tkK9N`KtRmXf
zZYNBNtik97ct1R^vamQBfo9ZUR@k*LhIg8OR9d_{iv#t)LQV91^5}K5u{eyxwOFoU
zHMVq$C>tfa@uNDW^_>EmO~WYQd(@!nKmAvSSIb&hPO|}g-3985t?|R&WZXvxS<ZFQ
zu#EDz3{d_w8RPmHI9?PPAxj~&8j@8$!~cP*{+&2ldOYzckEW7`;MqE<$E8u<geq(<
z5IBRpCLbPpphOf8s@(2^EBiU0RIglgy9;wAc@TDmWt5}Bazs!*l&p@;Wfm6|R(zca
z3J1%F@suFn7(m9Fv{8;0_@9ZU>}Kt2i^eRe>WHb_;-K5cM4=@AN1>E&1c<io+I`+0
z32_B5UoF&#VEpTd-Z1&~J2T0MPx*};V~K5lUJ!1IJhEFk2y#YP7rux(&fx!@Nfs?E
zRtR=}F+-t2-jEyLNV1hGh;A#7Q&S+TFAE->$k!w4O*oscx(f=<1K6l#8Exi)U(ZiZ
zdr#YTP6?m1e1dOKysUjQ^>-MR={OuD00g6+(a^cvcmn#A_%Fh3Of%(qP5nvjS1=(>
z|Ld8{u%(J}%2SY~+$4pjy{()5HN2MYUjg1X9umxOMFFPdM+IwOVEs4Z(olynvT%G)
zt9|#VR}%O2@f6=+6uvbZv{3<!n!IJ@u1~JTZ<i{K_|_{aj<-z`W#jr{>U)l;C{tuc
zZ{K$rut=eS%3_~fQv^@$HV6#9)K9>|0qD$EV2$G^XUNBLM|5-ZmFF!KV)$4l^KVj@
zZ4fI}Knv*K%zPqK77}B-h_V{66VrmoZP2>@^euu8Rc}#qwRwt5uEBWcJJE5*5rT2t
zA4Jpx`QQ~1Sh_n_a9x%Il!t1&B~J6p54zxAJx`REov${jeuL8h8x-z=?qwMAmPK5i
z_*ES)BW(NZluu#Bmn1-NUKQip_X<C+V839FvaVI_NY>&_WzJy~J`WYxEJQ&Gu7DD<
z&F<oG80d~wWIC#R=&LGKUwX37xIMFBSIV$+^x4k%Z;{u3*meTW>9urE;}8S{x4{yB
za<Ixd8m8D*Q@bDkO)*GszSHBj4#O5G`+-cA@;~F2x+d^9<6RR8Z=QY!OE$NCeazmX
z>q~1Zrz%8)<`prSQv$eu5@1RY2WLu=waPTrn`WK%;G5(jt^FeM;gOdvXQjYhax~_>
z{bS_`;t#$RYMu-;_Dd&o+LD<5Afg6v{NK?0d8dD5ohAN?QoocETBj?y{M<zzztwk-
zq**Q}xEOlad^X^Ki>B)jQ%UQ}#t3j&iL!qr@#6JEajR3@^k5wgLfI9S9dT2^f`2wd
z%I#Q*@Ctk@w=(u)@QC}yBvUP&fFRR-uYKJ){Wp3&$s(o~W7OzgsUIPx0|<dx<*{As
z_-+;-3Ss0<Rm`Y`{W-81r24H&VSowxFrE0LYIKdkztmoRh*wv4tc2a0ELz2@Wd<Sb
z?x)~@4x6FZod%xD^|(N=1*H21&y@!)<md6|BXk48O+Or6RyQEC3ifbZjYl^c1PAR{
zilsgrwE4Fe%k7~xA>ph2L1(r*_Pa@T@mcH^JxBjh09#fgo|W#gG7}|)k&uD1iZxb0
z@|Y)W79SKj9sS&EhmTD;uI#)FE6VwQ*YAr&foK$RI5H8_ripb$^=;U%gWbrrk4!5P
zXDcyscEZoSH~n6VJu8$^6LE6)>+=o#Q-~*jmob^@191+Ot1w454e3)WMliLtY6~^w
zW|n#R@~{5K#P+(w+XC%(+UcOrk|yzkEes=!qW%imu6>zjdb!B#`efaliKtN}_c!Jp
zfyZa`n+Nx8;*AquvMT2;c8fnYszdDA*0(R`bsof1W<#O{v%O!1IO4WZe=>XBu_D%d
zOwWDaEtX%@B>4V%f1+dKqcXT>m2!|&?}(GK8e&R=&w?V`*Vj)sCetWp9lr@@{xe6a
zE)JL&;p}OnOO}Nw?vFyoccXT*z*?r}E8{uPtd;4<(hmX;d$rqJhEF}I+kD+m(ke;J
z7Cm$W*CSdcD=RYEBhedg>tuT{PHqwCdDP*NkHv4rvQTXkzEn*Mb0oJz&+WfWIOS4@
zzpPJ|e%a-PIwOaOC7uQcHQ-q(SE(e@fj+7oC@34wzaBNaP;cw&gm{Z8yYX?V(lIv5
zKbg*zo1m5aGA4^lwJ|bAU=j3*d8S{vp!~fLFcK8s6%Ng55_qW_d*3R%e=34aDZPfD
z&Le39j|ahp6E7B0*9OVdeMNrTErFatiE+=Z!XZ^tv0y%zZKXRTBuPyP&C{5(H?t)S
zKV24_-TKpOmCPzU&by8R1Q5HY^@IDoeDA9MbgizgQ*F1Er~HVmvSU>vx}pZVQ&tr|
zOtZl8vfY2#L<)g<P^`K!BdAG#JH2u<JcbXAbC&+5oV4?fK~PJag8d^J(TOIRb!S0`
zS!~~~HeP@OB+QhSp3Z0ptsFe6-3mQ&Xwz!C5}41j#J(-PZ}aCf$d@!;hSHvI6v(ev
z{Frq>Z=ba&wG~EI*Vd?}lRMCf+!b5CDz$8~be-HKM<GBqxLn12;ecxpe^8o7Er@?(
zTOf=lQl{C0cE@aykX2(|HiU<M>o5omk$w7p4`Mym*IR8WiTz4^kKcUo^8Hkcsu14u
z`Pkg`#-Y^A%CqJ0O@UF|caAulf68@(zhqp~YjzInh7qSN7Ov%Aj(Qz%{3zW|xubJ-
ztNE_u_MO7Q_585r;xD?e=Er}@U1G@BKW5v$UM((eByhH2p!^g9W}99OD8VV@7d{#H
zv)Eam+^K(5>-Ot~U!R$Um3prQmM)7DyK=iM%v<dFgt_;&aE9uokCMFF5D+YER%&B+
z1NFlYYbs9KJJsBUmYalD;m^KimIDKYS{_$(*g|3xnAZ3nkE)!kRG!u0q|h1{uhWfS
z@Sz{{UVmFXR*lHI&l6p*RzU~ZBQIT=4==R{7?=y|Sw$sGt1f#5&F0n&Fdegyhw6Cq
zuj5p-u-<e>y>BRX4#aH7*oCMmz07YB(EL!^%F7?CA#>zXqiYDhS;e?LYPTf(bte6B
ztrfvDXYG*T;ExK-w?Knt{jNv)>KMk*sM^n<D*|Oe?Qo@1-8s%l5I3^@<sXv3z4W6k
zubwl}Yz)&G2wPH(mt}WD*_C7ot@91w-qRjMO>gZ-WiUN;=0Ev^GIDMs=AyLg2V@3R
z7ugNc45;4!RPxvzoT}3NCMeK$7j#q3r_xV(@t@OPRyoKBzHJ#IepkDsm$EJRxL)A*
zf{_GQYttu^OXr$jHQn}zs$Eh|s|Z!r?Yi+bS-bi+<K4xZD8$i?u60R!CmjD>PE*lH
zo|6ztu6$r_?|B~S#m>imI!kQP9`6X426uHRri!wGcK;J;`%sFM(D#*Le~W*t2uH`Q
z(HEO9-c_`mhA@4QhbW+tgtt9Pzx=_*3Kh~TB$SKmU4yx-Ay&)n%PZPKg#rD4H{%Ke
zdMY@rf5EAFfqtrf?Vmk&N(_d-<=bvfOdPrYwY*;5%j@O6@O#Qj7LJTk-x3LN+<OaC
zuu1+3D;0A<6<DY!ENaN?+4dznGWKGe;)oHb=;@4zgx#~Q=XMT?B^Lg6hW8>dEKy+X
z>~U8j3Ql`exr1jR>+S4nEy+4c2f{-Q!3_9)yY758tLGg7k^=nt<6<QCi2ReIFn*~P
z0lo8RTEVpW*(EV0rMg_OktG~$1`5dn(L`Yx5%m{cY}>h$YE$ltA+13S<}uOg#XHe6
zZHK<TRwTU`dC1e;NLFyO@(ye{T!)B}+Vk$l{yxy1sFsTf?4}0erchCTvg6V;`p;zV
zc9|tsOW^a9%7#Dvk+Bsk>dNsAnMQ_RIuB;mdoZ%RWpandzLR-BnjN2j@lkBbBd+?i
ze*!5mC}!Qj(Q!rTu`KrRRqp22c=hF6<^v&iCDB`n7mHl;vdclcer%;{;=kA(PwdGG
zdX#B<T=UGU+QCjg84BaSH01V$Z)8EEos04=bp1$qpk;6``a}Y9&cEF|ds<Io?6B|S
zGJJX(0+w(<oJ-KT>WoC!leBC4);^J^tPkPbIe<)~nYb6R3u{HvC!NOQa?DC^Q`|_@
zcz;rk`a!4rSLAS>_=b@g?Yab4%=J3Cc7pRv8?_rHMl_aK*HSPU%0pG2<ecQ6<(S-`
ze1ULaXKO6zV4ZX&kFi}vcgRpkq*4ifp!Qn~2Yi60##6k3n{2>Fyhef_biA!aW|-((
z*RIdG&Lmk(=(nk28Q1k1Oa$8Oa-phG%Mc6dT3>JIylcMMIc{&FsBYBD^n@#~>C?HG
z*1&FpYVvXOU@~r2(BUa+KZv;tZ15#RewooEM0LFb>guQN;Z0EBFMFMZ=-m$a3;gVD
z)2EBD4+*=6ZF?+)P`z@DOT;azK0Q4p4>NfwDR#Pd;no|{q_qB!zk1O8QojE;>zhPu
z1Q=1z^0MYHo1*``H3ex|bW-Zy==5J4fE2;g6sq6YcXMYK5i|S^9(OSw#v!3^!EB<%
zZF~J~CleS`V-peStyf*I%1^R88D;+8{{qN6-t!@gTARDg^w2`uSzFZbPQ!)q^oC}m
zPo8VOQx<Jf9$QxH!1t=XYbND6gD4)~PDdJ4Tbhq5X~|}aMg+64ou3q))oq{tX``B<
z-kJu>q2BaIN`pAVFGu8!{p3}(+iZ`f4ck2ygVpEZMQW38nLpj3NQx+&sAkb8`}P3-
zc>N<oFPq=nmzyIGLDO+Dbl$x~|Fq+?j;c+eUwjpj1>*k6AG?r}bfO6_vccTuKX+*-
z7W4Q#2``P0jIHYs)F>uG#AM#I6W2)!Nu2nD5{<l9!rb#}1|%0Lv<~Q*yx!&(&~cb6
zMP?w40u1ji_FUqt9Oxamq4i9;vld*X{>CRV_PmkDS2ditmbd#pggqEgAo%5oC?|CP
zGa0CV)wA*ko!xC7pZYkqo{10CN_e00FX5SjWkI3?@XG}}bze!(&+k2$C-C`6temSk
z_YyYpB^wh3woo`<Wsaqgc1t2a!^g9^lzKC0rslcWuz#f!+1;%o6gzkLkj=fkxOj>B
zrMSTd4T?(X-jh`FeO76C(3xsOm9s2BP_b%ospg^!#*2*o9N;tf4(X9$qc_d(()yz5
zDk@1}u_Xd+86vy5RBs?LQCuYKCGPS;E4uFOi@V%1JTK&|eRf~lp$AV#;*<!r44#as
z!dyOpmYJ@rJKe3I(P1aZfczZb-R2QPjL1rGU+_--8KLf90ruX^(}*~s^Bim3%N&z0
zs!zTZe(UNyI4Dqw(0b$Xv9j1Fd{<;+*lKW@hWY6lT|nnuK-vY>#O}iRI2=i3rFL8{
zA^ptDZ0l6k-mq=hUJ0x$Y@J>UNfz~I5l63H(`~*v;qX`Z{zwsQQD-!wp0D&hyB8&Z
z7$R07gIKGJ^%AvQ{4KM0edM39iFRx=P^6`!<1(s0t|JbB2tXs_B_IH9#ajH0C=-n+
z`nz`fKMBKLlf?2AC+|83M+0rqR%uhNGD;uKA6jOjp7YDe^4%0fRB<^bcjlS2KF~F;
zu09wh1x0&4pG&76M;x8$u`b134t=dEPBn6PV|X29<#T4F1mxGF*HOgiWU8tN@cguI
z_F@o+XL7FJztR63wC|j4x_DANzcX94r7Iz-O2x$({&qd*mdLG=-Rv)uZ}UlMR+F&q
zU}=lkfb0p1>1Ho){<D*l&HMgf)@%iX&ndM?1_8l%G7lHG2ptl4pBF6lo`3-UP`{`y
z2Zfv97+5c=)P4VQIt+_gnPM?G-7uT~6nc@MeF4;AX@etFIv&f76KusNH9g}81qg)P
zH2O$aR`Fv6A#|^|C-6R#9Qd4kLT08<G%uf}-+Q+cZ+cY6Q*8&^;aCK_XLo;2N#f+R
zuwpXOuPc1L^JwGmVGmH>o$@}mSKIV;h*$AND7~Dl)QzpFBlSM99Kx+F7GsVK5xcR?
z_4Q(Z%cgk8ST}U;;=!LwyZVu^S$>B-Waeik%wzcKTIqeX=0FP(TGQ=nxi=dsS5BYF
zl@?}NT!Y!Iyos^@v7XWXA{_bV<GrjWdOemoPm1ZIR8@7nKZ}xCVskN#la&Rdao#-?
zoUxGKC#JTfdwUdwPl5Q|`0$<5Z)kYdw?GRp$eE#MsvE7Ap4#<a%FgjaO=B|wL}-ug
zaG_p%Q^X|klMZ2srFv>~1lxz7gC?xuXxy0_?GaN!AhRRM5>)^t%&ODd;@HN5L{MD3
zc>i2keQZVm#?NrDwbfd}_<*5^U&w0zv~n-y8=GGN-!=_`FU^cM8oVCWRFxw?BM^YD
zi=<GQTNb_HC3TWA;Y0{o$P1KE6#N+At(3ZK1@l$cT#S-)Nftfb(j_x9*hRec_PUKh
z9*|pB&MLKf$4!Z(eCO7k_x~a4E5o8{+pcGZp#-E;x+SDLl@d@w2?6O)y1NFHknS$&
zlum&`6r@4AySsasZ*xEIaeV(__TE>Vxz4q|jwPTg+?q7_XI)-S@gQkh>w0ZUB}a{^
z_i;`Y(~fvpI<Qoat-qZrSQvl3An0RwV}2eQMzqdC(0#9(VCQdl^bAvlfE45L`W3wE
zJ(A#3bKR(9{Xie;3#k&7)-yR^?cxV&)#YR~o_m+@!;+Vu2H-5g%o8GDgEEx;WR#1X
ziaobU#SE{;ji`8P%X#xZhy)(u4FFKoRP1Ii`V?$dc^D!BjcHR-|0e$p|Cq<}+tCZc
zlUYYw1^}jMu4s~_>!vm<b={xSd@kp5haP#0&d{V1jAHPS(;4zH?R_F`;03zMiyEWN
z!w+KBgX3>W*A^|P7(6+@C4UeL2WATf{P<!`9|SVCF{42tpia{XK_v>1?H5rk`5{TL
zcf!CgP6Mi{MvjZS)rfo7JLD<Nm(AUvbjZ}D5Q;$}b1(`wkD4|*ZDw}~-AIIXu?P3r
zXw`Ru#-yIg);l2GFEWd#Ie&9P4_SzkHVy`b)d|)X<1$6SkX9=hpokm)H(E3iwyFv;
zY!hF3km+Wb$O0}Cd!z@4Emb+k2qCxsU{$RuEO^G{#K}sZE%EI_ozrN|m!(DC72LTy
zmG#(m%U{ZpBL5+7gdlx?<3m?qxV;&m4EhucYZq;xlPU}Z|Ig0gx4kttKWc}Tv^4+i
zj^h5UH&Jh;zk?bHcSJM4Q?bKexQa~?ASj~Gs|xzCT(J5J9?x+h7Nl_dgrGH!p4J&O
z>ZK7M7ANd$3`{j9baD*7{#Zu-33fOYUzjvtKzR2)_T1I<c0gpbBE1Lz*UlmX%FmE1
z%Fj?yG&TRNNcZK8i?VcBn;5OnYm^E0^YgAL1?D)(8kd+@rIqk*`X6TbHuFB!bZeQB
z$$8y2_z0IdLQ4i)9LZtEVf+Rc^)<AHFp4XYDct&5Mc)JN@gV-oX6el|&`v5?ZmLqW
zc80{I_4IIWG^kGVLK%1nu>1s7fe&z|=)QkX;=`zX8!Byw-veM#yr;|wjO^II>!B*B
z0+w%;0(=*G3V@88t!}~zx)&do(uF=073Yeh*fEhZb3Vn>t!m(9p~Y_FdV3IgR)9eT
z)~e9xpI%2deTWyHlXA(7srrfc_`7ACm!R>So<wwK$b)hOtc@9M7}H@dlj?5*aEXEV
z4f!VOylp$^?K_1-0#xm1#TTS+cBsPZtjk5fiyD&O|H)n$^Agx3|Gtb?W4r>IgkuF8
z!wkOhrixFy9y@)GdxAntd!!7@=L_tFD2T5OdSUO)I%yj02le`qeQ=yKq$g^h)NG;#
za(0J@#VBi^5YI|QI=rq{KlxwGabZJ0dKmfWDROkcM}lUN$@DV`K7fU?8CP2H23QPi
zG?YF*=Vn=kTK<Di2(U=A>*#Y_{AQN&oLju|0#E=fx%YVh>S{puu&K$b;BN*jIo<Zz
zzRGrcG`rdp^V2?x)s@C<AR=L#yNlXfd@$hV;Xs87V{)V7jaj@zp|zEr8^(2pM8&Lt
zY)IA%>@VYhqPiJPzzM>#kxoy0vW9i;ne2_BIG0zyRFp<3M(iY(%*M_>q0ulV2K}Tg
zkG{EWKS{i%4DUuHi%DVKy%e+Q!~Uf`>>F6NgD{{I8~nO4!VgOvtFOc7(O)X`|7n*f
zxBa4CJ-v9fUUH+`7sPVvpM_C*udZ@OTGTzx56QM5y~OlrZc&w9=)B?nmd@keRn+^=
zvm~4sa5987L<xOMsN(kDq(KnCe@&y{sr8G5cRF;;)Yu+B+W^sh9NRF;J~Q(+)H%#f
z$Kph0hn^yD?j1P&H7y*mLeFo*J5kC|GDN`i_L=y2L5di<0&iZ$+{S&r>FDnU{(N|N
zJAR8H@}p1fC+H(yTI4n#%~TbImMpuqYn9cQ<0QQ%=PzZItLkC*ef9WJUvfITKWh#D
zc#__8`4am9%#NslIUw+<82#SR8AYG|woLfBg#!-&dqq}@P>|I0%lbdy0lSMmNe+}o
zj0zZuFr6Wb?Y{Qy-S=|r`bdrDmhnmvkRnkdn`YCleU>Q$=je}LGhh>_QAj6aa_0Oc
z%Swsmui;IRx7bN*=AAS@5yW&Y2hy;3&|HAiA8}!HT6!Z!RVn~MZg`RmI6&%#tBZDx
zfD+y@Z~NWlk*4l13vmt3AK2wP!fQlnBbECL>?p)F?T)<`w&QN>cP_V>r7UTcsTaaP
zTOb$f!P@zf$6>890NVKbIkG8rE?9<OqttRj(-ZK8f%}9p`79lS?>!Y97sMSZjfF?A
zYR8l<h=2$V^4#*9G|J-^Q7CnT=tr2LIrsKnEjBOW8GH|1A4;o6@qTN;6mJCLt=kf|
zh;`^g^TK``40;4_<hi(6FKtHhAPLO|{KccsHH)_i01g$RE)dx!p7j1F7$zamkN<D_
z@|Cr>p`LMoz~O?iaZN;gcX;LC-%Ia*R%A&SLx!YIf29?P+=XAAojK8!^<h1{U)O*W
z3U3~v691kJ1v;_~`1@5lj>OU*@?R&DK!#G_lsn!#;S375uZ&B0HH1|BO0R90$U>qs
z<vnMOU-}JTrm#3ef@K)7UlJr}>SvHv>H~mAgNCcjo-e+;RjY6B9<S}C=_0?vC5S&L
z6#AV0@io_9FBx)7f0)xYBu<`-jOUC9;s23eW26F#0KrAT%axw_bX*=yI4l5!fHVF6
z`1Mj99y1NS+RGeP8BlOP=;n1J7J#q^jNmrvYh`dLuV$nE#!0`zMocVdSOjdD`0VEH
zr1Ps(`B`=kk3ZbXL>NCbQrZ|BHjTkehaU<9CSkdd>Vl*ifA2LNOP&R2Qdy3k3-TQ+
zbq=#vI43x`s=%~cGyN&y4Y!FxhwgDe@i6uv8^BLL&3z*SO=D0aLjih?gY4-<y^l?t
zk3e8`;$%Kxn5g;jN1DMxlMjDpdi0&aPG^&WB@fGT&~65(@|xSH?el!AgVft7A4zxB
zq06hzaAR3oP9Rgs4`RF_q5$9whAgHJQov-ZcZp%fE16#_MHP#};;p0kzf?C)SEIQH
zFg@_a(8AIuH<G-QfTgMS{sy4d!EYo>9uWp5or)H+v~w6n5X#F-I52z=Z_p4JB(;M|
zeaVFhuR2|3UD2MzVc~^nSoD<LbmC1bKfM%DNxB8FwTuG2brrI(GLY^!yEls)PHDDr
zDX+M703dQBayYBlaEqoO#vn|E*nmjVpw9BN+H=OQ(g#1-7YHClz{W`!w<lG4568f0
z0$(A}c}>2(dD#uL_1Pdn<dE0I#JmiUK#=Z()Pvs4{V@B(+?^oGlQ0}@vI5=j=SW;?
z%j1_%``DjKz5S8};=unJOSJLM$u-t3xb7Y<T>IxeA{V5n`#3xf1Zx@4lw(DsQ&H$h
zw#%3O<1173hjg2_nhKi!d1ej=h7y`hVjCNB6|HTnx>SWuCE-kgTnfT+YGX4_Lun({
zDv2`>d3vrS)tTf7ps_vvh!Cx^e1BFuWnEAh0(7fkNk|-3oU|iRWdsC6U)?Raft~HN
z;^$U}vZK5O8|LV$>6X5T(uYkblv{zwPxnQBh(BQ5tA~J!vGiAMYP^_ki~pkIxDfOZ
zUJDwq%O~WueeV6%uN<54&u*c&E4y431cklBNrb06zGOOy4XNT~JS-q(s6@)F@ovbe
ze`fial(O4(-su%6@@1+V0MsdLLMyE8;)nou(7}czU(5ASaZYDT(kUZ0L(&g$nF^n9
z9-Pi`ZZLX&)^*M6As4_2Mmc9S7OT)F8KkL2NJ)KJcnCuWU=Wy402A&45#Q9Id~BBH
z0cY*xlv!uXzKrXLH!xQu(OtJvEj|0-DmRj1vjFz{c*I4$Pe(+_V|^b~S!0xm{8lq=
zZv)@NlcyL3Xdz+*|L137F7y6L-2VsrKw=q^S>F6i%<{Fr8<WM{ts-vCJB7AA<R;-Z
zj8OzQwh#a5ur&1^JP{uiVk^%d#slE~PfVLhx<QYYzl~0W0JRT^4nXv}egG)hZndvo
zGk!SAt87w@&q7!{rhWGBSnm@Qruh$t;;6w-#kIomVN8LS_3=Q|b{^qJy<`35mH#2$
zvb^+6X-)A`xs9T#rD!k!OY}dvdU@6##IOfk^;z7+gJ`z$Of7_it-nT=!8!Mb@y{n=
zxKEVnv54AzXV89mWl&YM)Tnl}j~*arcBU7n3JbFV$dC%XS^_o97(kz#^7MULgd1|3
zz3{di(P_6}-{4oyyT!lPd};kb_ojHiv}f)3ZGs>zk06$Ay-(!L$fY@7mcng!2}L0t
zgi|KxfB63Xtk_Q8#ZP<GXYHJ~y1J5@LvGCA+fiog-K*6F{#d-v4~}DVo}a^Me%u~h
zk9J3H_IgwEYcHHz*BY<&P-3MA`vGVK(JzlCjXtv9WmA2-{bTjny#LYIr$ycpsfo_A
zKv%vCEcY>ipQ@!zgjdpEIbK_?q17Hoi4Eiyun$hrc>T(7pOLVLQE=lgGwA+A308p&
z7@=09(|$>eLy5gLe{*|3b(M;1n;C^~v?o88jYib48eR4$QGsBFzd}3QuwO^_XE(=B
zq+hMi0UFC|dB{LCwch7;zYT=NK})O%sgi0k#yV;My@24^B1+CuZmYOh0^b)5Ba_))
zC%i#_Iev&nsu%I|1N5=MVc#PrlunKAs&hY|3<u*}B}09#+tJy2i<?Tn4Iur!#);dW
zgZusa=(teXg;7j~<|h7lf9psCfEglzx@i=(FM(NP7)HX&j69I1+4F{thHZm=6|(ij
zS*39m7N5^twygWd2XM)4MbiJFceCe#a^o_3tJee22Rr5ZDT?df7`7aVIQMc<Cwhu)
zlLDP<phpt|;{9L<%;a5!NAa;T$n^<A^8R34cl!Bma`Qj}Uuc>s5;@}`>sB>}gzxuB
zB=2vrRyB3uiyW<pr?qBXrL?>(hkDUNe1@&(b`;>ZvGgw|@s{zVC#_`HXIN_^J@Etb
zA7A+F?ot37T{<-vTy8h&b3e+WKHE1oh;pUQrN4yRRrx?mT_9jRa2i4l1fUnLW^Cbl
z!I1>VzyFe?VELWWhM?@?t-YPZkD-Qjo@bC2(o#ZtZmr{KZsdFWItV`rs$gp{724@C
zL8K5}E0+DHcWcL^{BGei4>@J-3%a#$y6;I}=upc};-NDv-z#kPX26ylOpH)Ov1uU{
zkLj6oiH6l_s+B~_z;|Jc2oi?naS7#3H63~~lWj4rUnd=fCnKdkik<@R&kch9q##G{
z4u!%=rlM~Yp3jk*t8}1B`Sv6<%Z^}~1e@aq<X7riC~1(P(DH@8ivif@)OH<{Fxu_U
zmPNqoSd?-iXeU~dyJ-Ie!)p`a2e?X8wSJj8+@F5v)Hv146gqWWv;?lg@6wY8NZZ{>
zg|JQ`QO2pSjAm-g*?IrNc$<O%@Md5UOwkv=LlV5T|DIO?&U_OUPzv(p3&&e2GW%VH
z@$UGgqu`N&&Tivstir&k_EZX;BGj{vr4t}|>^~sIrNBo2$m|Sxanr?Mfs>2@Auu49
zGXlsS<9XS1&8h(dD*Hl&5HBDG!^pJ*lkau_Ur+7`7z;rcs$hT4we?3bT=7Fe<>{5(
z2m2(c+hUz2BTHM8d<w9V>Ce*Z3XX&Av;b~a=$6EF>&^E8%nyxO@m_n<s{kYz4AgIR
zL2NoCxZr(4hi(HV=Z>!q&XD^A{SRjRZQ0L~qDeC=j&0$j6=LNIz@`ni^>ch|sv}^6
zlm>?28yPl@WmDPR?Y-A9X{U9Dv_IsbXJnzKCjkRksL<ezzCcRL9w1`L`S^mg@ZD(f
zhtt<I-~r4g2c+cLk)GETbQ@*cZS6Irpwx%I?attLUeje!|7FO^zn^xQI&NF~7Bi&+
zuM83k*@|tUw1uhVgP+@xciID_FPi(ym#Used<L*hvb1QA4#6ZLQ!!N93<_jsYom|Z
zP*q}T#kI!s;K4sCSn$He-@i|5c5>Og#42uG2mE_acbTQ4)J|1V>%U@K(FP3AYhL0U
zdeOCPN1qLv!|#c=p!_+%VNV(GHt`RuLRV^vz<5tt-r)yOK**kUWPspVAf|}ZL{LS=
z@k(@@!P&W!>wwe`x{+GrFSWhHov7hu?{KuuT%kl#WO@*WX$i_@retlhQBj++SVNCx
z5$78LxP>Z=^aJ)D280r_jj=zFfMJFXCIe^B{~V@d1rl_F(qo&AB4bC-vYL>x2jSKX
zpuTG-6kgp3e^T&+dtV*i6a~)v@n?n*<z->MffN59y}<0dj<e1F<R$Ci;6PyyM{_cK
zV71BZRI)8Yglo`qWIFif?ipY!Fni#(;o1`0e#@!ow(-{uWmLazz?Kl6IQsE(uy3NK
ztrFu2s#NYVou{VP-;#N;IkfO89yDpXPK^?qNmsu=?7p0kh*Eu0;q|pJWMhZV4f>UX
zt27R+SE#hp<Lm{tGyC#7E{ce(0_YQZM$4z{o7Z1`AvybOyS!e00nb0C34Q}+!r`aD
zpf`Mac2WC!%G`LV*pM&LTXWaX84{D9G*D(FVDQ_bt?mJim`l!B0Z}vUqmlqg0!*^O
zcA!Q;hqw#$8Ao(o3Hpi__#Q&w!Xsm;P&9Wec^l(uj}n=Gl-=U*thjru8FrQ_Je|~K
zp1XUI3e>8bzc#;rk$jw3r4)Q@eI$*`_)=Pvge8@8|8>H3X)<9YX6cXa=ii#Le;(<a
z`KFRJIj-ffCpF6ENMIcEcU&$Hd;|(3cpVlmvy<LKm)Jg`PbcRwGIi(`%q09nT&_zF
zvWSvuKS@1qJl>qKm@%0-7$>2ShnYc`j#zJ7gu_FE^?uAkL|H)UIH#gPu^40!6^J=^
zr`}iwa^!4tzW<Qt%a<<laH{7_zB&p(0$FPylMs#J0s?N#bzgbh&B$b;2w2TH(u#xX
zR}M?2ymO*H#ZAtff0x8nn)XyVVRHyh_o9OC1?w9D(!n?LVed$yyI)eXw7**a^W}#V
zyBV?S1<81#@|akkAxc^KI>~vOMZAaKF>*8A{^8m$i(VK)>?=#l`xrVe>wseSvM_aF
zATNkY><TQeR9<>kM_P3?1kE`uIq#mvr-wuTgUH0N<&JhF=(E9%^NS*HLm!4GZ4_XI
zL=R5tlG5Mk_1rPfg)sk^llFuKPMPBhuU|L5q#yP_mzxp1o&pAzi-X31sgFpIHn@($
z_>=`AB5(8tP6p<?8(2xdNNpl%0MLfNZTwA&9rBO#uTq#Qw^QJQ)uQ2s#I;Qg_&J<D
zZ&&s)bA-~md1xHINT5&_nLww5su08kh8vapD}I-Yp9Z_6{QuajI>2zS5VEvH5J$M`
z_much3>S7t3Yo`Yx!>83-hW9LYzDKP?mKdkD#QAK8*M((sx{eBQdrR<^3ZhFP81+&
zBn<SQWvqO%c}_IG&1NDZ&bTP}wC*pcl?}d&gh50-gIRZkXfi*wUn71FcE8OaBZIsE
zV1*QqcFBW8x<X~A7X$Kv{#qoJ?0O~iH@K8=!EU!pw^qLU{)n%#y+zB_i3v+VL3{it
zl%R3|Q!SNkg@K>JMUefQyNBj<DZWurg+o<Mr21=YbR(4xcmG?w5EPT;zl{Iz$S5f}
z2GkRQ=S=?4xAs@gonS5bCLN9^t=gdoRO0q6UX~h7*am$V3a@d?)Nw?9v1kUMX#HBt
z_2Ms!?Gu}}ZyUeZ$QguJVP@2wR??NHp*(pmB}T#16zydjLms{*aUR&bI=hroFRmoa
z=93={>i~$5d88Wfw1Lv59aJN9t2!pABLg;ewJ#LXL-10;QcJl+Y4M<e0t$@U?O%#m
z+}tz85hqk7=3Oh8{Tb|GY!556)0iG&lr-isk&QSmue&WHXFV#NV_2gc8t#*fn(79s
zU+rg7xM@z!+)LZSG2Cyl{);jq1c-lu9NJ&JW0|OYgJqpn{!RJ~RK8aORtcw0N7YQm
zXvxyjG~t;EQDx>tngb)k6JZlCf)3uD_u)J3s<zJVhL9Wemph~5E%9-LEvT#|Xg(;e
zJ5=7sFIA~H71xlmT$)!qdH7rjaitIUt9L#VJY`*(&f)#e1*uuZo-8=ixFgtL%mrqA
zQ3R5~o9o~9On89&I>YyN;NN5hNbg$%W!i-GK%e&!Us)2IExWSss$YG(hm3kJ-h%yD
z>8q^n$+4I(_y_mbT{du4P%h1j3oSpjhY97{+IZ`aA4ug!vNJ6*p?<2H(2w+GD3j$I
z1TUXGyNzdf>_yB3grP~FZUs<2Quw;eEi*7s(-MiIkQ%@J^+WGdQvYSUN+TRiD-xto
zJ=OUU+kxGYc!HC<pe#-^0;ZHBgF>LNbCvR4lGTp~#L;DFzGd-#gJe<tAL3ntTohN|
z^FZy7ch=Oj>*xf(P3hDQz|y)?b9mwU3WUVnpcqXM<@w%r-k*Wr^gzAv)8T^sqA=Ye
z!7qy&exJmAcAt~CwS#@yNmjr8*T*!A6w4~E*ibaLRs0CFo(;R3=ODhDt6zWNodmo0
zXx&bT$6&+5c>a|WJ)F4G-^GjY0H#*tY=UNyYr_q5fsrcjk(c^~e*7Lf`!Jd`)p412
z<z*QcFvu`K2N?SBr`tlvW^?OESeAhGV2z#~pS4!+J9z14MVqidbO#Fj0Y*Ypct6ue
z@eeTZl=LCDN*1pZB#Gd8=Q6CiA-Ep(J1yr|l_|r9K1Dk40B6W7)bo37EauiB9n4K?
zv}7gy6AG;WUJqa(AYh;ax4G!MnTH=mV8{GvA^CO0D)H5#y#c_pl2KMV{{4@&OB6cN
zif&aC-joD5$b54{^;;(OTSTIr-$17f#hh*x6cx+d6gA{Z_nUQYkgDyZ;w{z#_tHnN
ziM$L#Jg`ul7XvNf5Z2h-eA;G+kR2z^0&P(W(E9L{=}0A{okOdP4U!XjLG>n|^*hV=
zFI4UbwA%X@smDd$cQOiMC%jfitTxTb+#`9`G=2rJDfK!E=5ra|So>lc{X1$~w28i+
z4p&cTGwZ#5VueiXS9O8#;RR$yg7tL9!^)Sz&pZYIzlSh}0}V{LxL$Cu%B4U5_}k}-
zm~|CsD<076x@<>m=6w6N?<jtJ7_!*BRP~Red6W5UH?Z%Qq)HZvu`S#Wb8NZqT9TEW
zZUmur`|K~aFkFcgu6!dSGiAA>WaThIBP`!u{-;WF)xc=2otx*lwf|5+MkdJePjh(B
z9SH+%<l8+=TSp5{izBZ*y$n6C{R8*8lQGb1+>cHGCMAXNxB{_3^otDWdsV7Ob6n{0
z+&!(;iaHOX__5z_$Qk{%xYV%Ig@7iokGBwR`3642ZP#H#v9QGbWl8<|MS*=@qO@Uj
z6+SZ_v9`1paUe5tFN~v(b#J3a_Lx0+;r9giZIx-A5TxdbG>xi#AZ5_z1V}B^n)sxT
zz49}eK7EWb6wR!6-qQOrHQHkUvshvq%=G2d&@(#XM*Am1;WbnJ{X_!a{ZkphD$^TQ
z=Iskb&}=lBm(RHiwJoGg`*NiQ6#RB$T#LF+>#ef;Jne&M<VvOah+wY`R={-6k2=lR
z2_t5IQcGx5C;1n9Y8D^^46tj{Y-?*H<l|tLV}Jx;L?kf<vH;OqBCoOUWlgsT*srfb
zp#_n=<e03}=HVG6MdadI4$r;WF!;h<$YpwCzT?J<doH5%tUG|kUh~}UOOEc7Vg3Ln
zn+Oec{Ja@~cc>xKPX!#r`&TVEFsp2jnNx>dClzpcPy&G&13a_<0qaR3i+k212~hoQ
z8n<!aK2raOiu(^#z)w4cfHt8%7H~=DX$!i<ILe)$=cRjtyK=era@8gD<)6oPN#F#M
z97_Ic)9Mz8um3Fa>Mk{JP-t04I{GW5gUBqcJW-jSMrlw}>p)ptx?WKuCUV77taMiV
zHok9V=6yv+Uts@fMY&A}amC=!Yj}eL@=e%XJ#%?agkt1jWF+10{(E9mHLDa>Ll7Vj
zG=3cp%ljIB-6pC}6&`xJ*6WCP|IlglLWJ^?yviI8Ve)?V_i4%n;olzny62_`-|IGi
z^=}p_O>Z8M;c4|RExu70E7ePW(HWVS&E$+LL6xSQgB`QfMQJ|4pCTFowA39p5P-|$
zUtM_H<g}qAE_sVllCG=<M7JsGdHHhhU-UC?0g!wiJTfK;FpH@Q%+(F1&-<x!X@PgM
zvKCR6P5<eQA@iw-lA-S1m+j5JNv&=s$xGjyi3+ZlOGh=dw>2HnP8_RoS~Vwk(FhbG
zH41licj%=0a;Ln2STFBvU}Ne&O&%8bYKj!h1FA#sNM`232fX|U3QPp#3C?mN2;hE9
z;)!@5ixSPl<89^7gwhHc2YAX1KJK$#*3`KOMIQ253q7-*RJ5k)zp9GBO|Ga~X*^<w
z66A&v#A=l-eXA_Ad|ec)K5wO!rk{{6$Z2+xfF5yj_W6dPtx$bx^M*W?&|yWDCdm^_
z`LxRMJDeH}kPFbnto>}US5oN@aG&waHV<JwM9&yg%AbC~$YEKY*FkLhPUL+pNVQ73
zUzM+Q+hOAq*3!LAkL1~7j!rD_&dV_Ot|!gCHTm4%Mu)D4HK(-n)c!S*RL8%;xcMPA
zHlfB<w<WQA@dUVuN#p&3=a)^rQNm+Xpcc4R*!kw%jWqrW6F<gw>%vi~r{t^`ptTxb
zL}q1W8S7*>7oWwvgV4uFLZ(@k`R*=LO_|Gu`prs~!WQXj-NLIa^2(<al;Jh;hQ95$
zPQ`kpdv$S4vWaain)Gi`v=Od5g!4@`PX-k?)EXtfQ(4{ZZB#~+ujH%%>7IHg>BG^N
zc|i{-^=&Cek9dkJFQys|sjG9i>LLz|;yCv{^1i%c*h>8zF91kLvS9HBQi~ZU!JL`B
zK8N+U0fr1*6??Ium)AF!6tc1eGhXIYL6IRT7rmKp7+>?%5Pa6zC5)KY$ycF0<l#9E
z$8B4tWNLL==*Bm>ZJ`G5nEQDG100U-jLkH8^UE4g6wq?sg%pP=-$&G#bcN`^?w3a6
z((s$6eRKcSEIslW-kk5Qi|5Mg-(xdLF}PxxVh$PuO}#aR6pW1kV4Af!Bqh*btXNNZ
z>-4(IUl+L4dw+3LcpGut=qB45O+W)Q5?*zZ2A6rJcg`qkSvWA!j^r2mqKuCm6`Py?
z@^T#Ux04HemPGd!Hs7NkZdVn1<F}@~Qum4opUXdFj-(>}8_j`o?)*OKZGS!`ff)gF
zG?v-lj$wWNWCcw2Mg2o18D~1?3_b0XzdiKBNkYSDpcv@&kp0POmweJE2ZkIQ3B!a!
zIgIoE+Xv?;34kyo^QYjZk+tEqZvq^#QG<xY{v9%{6QU~c%Cdh&4BPnAYMOfJxnMN@
z(1}k9p~F8K(iCOC2ktHCpD$HvCF=vJT`Bg=K}u&ldt~ySLLegHqE{rGx_^8@MEEU1
z3PuU#M^ZbXD1)9Mtv_mH@xuPKpBpS#Wgsq`3aZ{KoX&}gyn97jT{()LX<@?dTV`Y2
zXOg^-SbxMxg6gNDf`8vT2<Lky=;R9HQq#w)wp(a12Og)Lq43-p0|;1)+pf3(=HS@@
zx;Fu#(pUh91lG1M)$*65aOz)H{nRhMspSvDi~#|q@hIP3$@l$}bsa1f)!~#oqSgaZ
z`T6}OqcHr-RriMY)v=`W(AZ{Ywm9p|-xVTWnK*L_u*ee+9ar+4zSO-CI)D%?5ZC?s
z8%tIWI47EE;m1qRZ!oF<uEeHt$o{z6W(#RPouD7=tg~0@Cl7T<dY`u9UQs8Lpsf5w
zE1Nv{+RM>(OzX4~X+KtsoQoddTWUR(yo8R+ObEF1j<-syWOb>)JQ&Zbdu(sctU%Mt
zW&YR0{ttY2TTXYZ?~WNU&cES1Z2q(7SrWDh``!J(JM+Nk$!hu&Y;(7E`ZNKTe0w+%
zJc?Qnw2B+%UR}0;cB0Rufa(7-3FF}?629@LgTiEC&2uyL6NxexOp?AKT^aAx3gi(W
zao>r>MPw0eQ3>IV02uLsC@>yK_epX6GRg4{NEL2wPPF9=*L2RV3yyK8DhuEK>rmmV
z`&Q~#c`lgR&93TdOCja|ewOXmPNRh7!&dMT(1ett#iDr8HZW~VqWW@7fe9B6;7S+?
zbC`d4@MEau&mKlOPKd>*10q0c{~^baw6!a*w^sY#0Xim{oOsiXiDOhbG&kl3c$$n1
zMRrD83&QucDSEcV*7LIp8VTA@F<%qe+_c`L;6on(>SjAU^}5c9!BCffT>$VQhe=)z
z8(=Ej{5>jhmjB3{xDfj2R@VmHQ!CqjlO4KnuOmvHy3K#po$yp_V;p_MKjh1`(rzj6
zHW956k1yvntz{_g?<K|0Ox;ldqz}7~sWiCO_;;Z$zeJbZ@*_=jF5aD^<z=xsMFc%S
ztx8_QXEl60TW_5`$iGSyg;56v+mN`-s-vgcQ*TzQ!o>Xbs`avK(IjlTnsu%htO;D7
z?J#x^EzuvVn&NA=<!E-%FlSm|&K91xLw{Qo)ICV~E;(<q2m!O85Q?$_H9BE*X|1#w
zLeNDo#s!%<egse#*9CWw^!b0jIo%lkg#Q_!&Yg{f@v$uT2&E6VTB7rb4sdvRre|=G
zf4mzEdoKK;IQPOV;EnY9{c+_(Snf#dI}zxnr8$0>!MEj7cwe5A-Z$Zk2LBZH$~%E*
zf`((xH0?`}hs|HA%mtwfOEsZJxxrennkTYcwP#FKO5%Lpc^JXhSpV|ZH$Wr;`}`_(
zIP==gd3LYyVtwD|*ZJGi{7~x8{=^bGVqu0RJ`n_BZH9+}kz%-4ZRsImi@rx%=ZEKs
zcPnUXo6hbJV><N0A2vUl*$<pju{|4nFdi>fH;@1|bAHIe0ijYI*&kdT|HkDS$9No9
zCHo=*HWb~U+Dtzxr+Esao}6@|;Pf+E$ay0$kQp#s{wlw+7aIKbMdf`OqhoG*;Tco0
zjrP}VQG#Y2cJuqoJg&5({)S(BA}q9T1lGeWRyu=Je|)I!6a+aj!IP^1({)ZYe&x6w
zt3a)Dq^TB+A7CdB0-}#z2Ur$W&h3YVw8==!xONy$uQmDWh-@15iEOt!q2m&?ZLA|w
z8loSb(0}7y6Xu0?M5Uf4>VZGluB`wMf2oh;m)ghxVda>3m}4%V)r^0nVQ5V6f3>*)
z0&VN!N0~GC^P}<TFeKN%{QeEFU_iG2Uh3T9tar*DXup3XU*WWxAkMjtWvbC~y#F(j
zEdC?Zjk;Z2oVOCH`R*z-;Ub+_TSPMvK6o`ggXB&&L=-=F7VZdUn)2Jx?{+*J;S1V9
z1(1WVMi-C0ibg>vj$`EDMZEmVV;N&RISY2C;$0;2(<{Lt&PKzqRByQdiEHGAbwtbS
zPj`Da5%U6k1oEtVzI}QNw;!hT6F+~|@=c@$C4NtO@=xg<R=LN}&n=y^3--f}KhmTx
zJlhb1_I`QZpy~R<_jfm}=8M2C8nT;V#Pb{YUQGNw1xpn$LJkx_&Jao8d%eNNCCwQ@
z;V9_s>P?|5MyZAyuCzcvq4rdAv@C06%gZ`9%I);R6UGiGJobfux+<0DLS&|MSG4UH
z_~o{^^9>ixMg~mY!-@Fai{xaE4^;qy9iZN15Gbn5ZqHWf>Jc5Rv6(#n8`1NcCsdmG
zab*dSXVPaE?)wCalD;$ivF%@nB#7D`@YG04p6ed9m}4iJW|pfVMLE<-c{=-8$e?cH
zUd<xThhv*8PHrF}EQ$aw`*!pGq=k0G<(!Po&%31`yRF2%u|hyZ&kAMxei<J|ktN}M
ziKVi09S!g-8$OoH&v9vNRF*zH+u8?7z4C3oU(Ix2_0!gdzpWHs4sK3RS>U#mCj4gb
zZKA^b9p*9S(}8@tw~1RNPHr7tQr;<ZXj9xn$qLL!gq8|;Tpv_V3JQ`=ywmjF#7cEX
zkq!tcOXPL=jU!}4KzsN|#f}Gq)!H7jJQd3J?^gk9B(nO>P+-)D8|sq=*o)G%RGqt>
zzP5yf`pVxb)I51D_G<k*KI6g^jmM(TL72A(ECxqI<sKk)-5RUGR&&M9f*>~Xp^GNK
zVI6sAX)a9s)e{8N3?35YA6aQTXuy<AK9dSdChZK)kaIam{lV3ngYU-&{0&Qdz5;kI
zUN<)aiwCow)0PV^Lv38uQCIBfu1twu6BlNbFyc|oF_XDvE-C)ukDdpWgDn@&e1&<0
z!!hPP)*>szK3ah~CemzA&CII#8F&F#KN41~8I^&_%}6MCNb{W87qAF`zj_Y^szhb>
z3p3}KbOxot<VQxJf=a2j5NrL{Tj`6rUr1e=#w+H7?q~#YL(&z{5_6s;_Yp{C`$&w=
zCba(}o)j#3NpnixD8=Lq@%tobLs=fa_Er!O^4QFZ`M#0nhyPr?wtXUN@STUUCL;=n
zI8ceLKdEEmFSYl+>Y|(lD=;)`fYE_*{S}x;f^SW#)SU&5X#o|-R|trpa|L5PS5aa0
zTHw8%SDSVtU4?vyrhnq+^@dgFS)|(y{~(4j%3UEiO-rBM9%`)8(dh33pMLiuurNY#
z#10AsQ7%*0Cu_DSAU}<dhwPOA<yIDY1$IULsiwAm7iT~KHjq?;!9Zur;qvF;)MA4(
zQ(~KWrLvCaB_4k-y9!0sxXW#>P;X(JwA64~Q_^R%d_zSm^6Aux?Pn70PM>9EvLeOX
z&w9c)pGmc<dO<uA92i7rFmL(|A5QN80{Fb2^2uN;&QA(GDRBuVh5he%Tdl5trM&dK
zJ&BJ8D;H&X?dsj$-Zmt7KWZ9&mCb2voEk{0&YN-iP2qesrYuuvr4n3O*j_$ZGFCV;
zzcM+8UZ1h6X!WZ>L2<u|`$6ePqEDh9FrjsI|D;ymvu(z?(H19y%V0)kIpMuZvvdQv
zo8)X710!C@sJeuQcJbaoZW}z}j`f2NN^3_>2;MO3C_B>=NC0RJpMp8?#ZUf=GWRvy
z6RHq3B}=MGVg?9@iKFBpsvnkVh3{Vpp=`CcD=u~@ql{my|6?3ssi3mCOPnjI&E}VC
zc@X+Yl>;;DNo0W0`0th!X{?luDhOC<mZsB{{0@HyWCaBiPfBpW_h;Ei%7hIV90wQm
zIY3QNg%9*AwkX|;Ma(A!-Kx%NN<?ihrc`gN{agdLBij*zvCQS88ls4kC09#bZHEzC
z6kI%SG&IMOXfbaf;7pflT}lW!##~DzhUVjY9&~hoth8OjTkv>{E8N=?<oG~pbXEm8
z`T&`6nOPi8i|wO?8bGVJPk4;XbZolWH2yj1dl1;}<CbxN+qd{O#9M6OQp|?}QVy*b
zHmo<qFOb)6zPQ8XMNItr?B!bV8t2_q*y*_)QRmV9uH4xI(l-Ve(x4wt?I^2kzr_VK
zNFt(;Wp*#?gDYl-FsON_=&?nA9ZqErp>!w}K1{V=)+1={m(f`Oc|N=07>}3;z{-(A
zm{JL=j?Sro5iecmE2-pWlRf(r%|HEQ7kgwQ9+kt=NBhtQI7OwcZ#3%$Uf%^r2nhjY
zoQ08MfC%_X{O9~WcirMZMhn#z^ux4Erx-tf-6bHD)9eH&^L>^jvAd^9A^DCDs?0;k
zkm7LE*KjP6`2d17M<h~@#0><GFiRFH&zzgiba#GJ@rL^eQoLKd2iD|5ximFPfdGQC
zy;ur$SJBzbNre##<?L%+Et2mwm&yc!_e6k$?h=6We))18ak5JUQBLA$HXhAa6!4{Y
znw9`%60lGBgpZ(rq>rQaaLqd_Rka}J$csvUec#hw78<=s(hyR>065~YCVCA9+#Q+;
za(*<S_H<0lL)lBP#x7J#i}k!_F3woldM^JpLZe8?EDt}6{10mgE)7)bbij$P&ZETh
z%ukHGyl;8J59)UkZkXYHP(Srz3E=Yji7veb=J%wZ<#HaU3^xPi?0dZ54F;Q`gaj}|
zi#tVNqwEtCQ;q^MG-}ZRc6gCPzGJ<<Y;YkrKZh~i5A_+5t#1;8yCnJdpHes?9gFWt
zvVG`M3NdNPW2FLd$A<j5<R`D|E7ODyYu|rOV0;TOH9i>L0IEw!r5P|@-;x33L$Lv9
zcuN8YG&g{<(SeJG18~(b!5yywSqQiLAX0;---;}mF5&b4lg|T?LwKREa{9YX_<cWo
zp5tfV50Y2+lRda01HS}+=SxrfSkC!&*0gD>-zL@ZE?Zqi@HxK^2KO1>0LATu{te=T
zprmHtY)b<a2h{jY+qvO~gd4b2xl*<_GH{|zwlHuGaV{E&4NI!%G@mqwLs{g7HvMB%
z2s~ICsHlE``yt{1=`23o`-amH$$unpLE*NzEw=JdG?*<^m^k!pz>DVfxI1S}KBE7V
zznP7KQ8HekWU#W6mw`dr-boV}pMQR==&5=Q5T=_q091jfc;R*jX#&=MQ%~@E<Nx=l
z(`c9tr8XeeP)p+vFpRsF8+ykZgNmbi{a=<b0fAOdq6q+9!BQD=p-wQTT2lZ2F9|4N
z>@9^?`$v48ks<>(fI(F6L(5ppKy|$HWng*bKOb(4<vOk(wOcaY>|cMUB&z$#ob#XV
z5-mg)gmFIybZf=znm3ZPyUO^GJfxt0kmHjaTZ|sthsxXw&}Y)fOUSg=JhRSR^UjZ-
zhqqb}Wsyw4zdnj6@#BAJa#-PdI4_dgafFXh85DsEQ_cT+5)XpZq$fZlBA_9UsE9r6
zEFec5?uqN@QhJ^IzwZrwl-5J`CmVPv{(YDTqEqWR^dI;5hXc~cxP%B3v&~s0`Ct89
z@<j>S`i~a^c%V^N81dDT*ItFS*&IN;@O$EgzX0e7x&}TD=!zS}hTpezBLS>mdX(5<
z)8DEI(-o_D)c-UX@dA1<K6(L)RH684V}zX@mfT@j2yo`Ro-$w;wGyVdVefy{h%GPA
zH#;NsFn9h_JN!>MuJ*yc>Hf4|`*B2S_O>w*-tbUwtiu`;W(Ud{HTty@(&x(T(F&;M
zJ=?H>6`B7nf-90e8V`WSVp|0oEKB-P2M{}4ZDawzvM&a!y><z+0)0-#VZ)W0t8r%g
z-~|>`Y#jCsD%T_l``@ah(I2nJs~Q|%uSKu@k!m~*8B*IoA{*TgtF<(5sHC<erPY3+
zSLQ(IMXla;-GU6iB?UfZCeE{XNaL4(PjiART4+_2>GG;n@NE%~Xt(G$^&<87u;}Na
zx-8cq0g`uA(&RBFo=-4Y1GUZ<``Zw{xL4jfHkZw~%~wvtGueszcXt)_QwH8g!;<bu
zzrDuE#h)*{k%8~+kH8}$A~%^JC#N(Ma+3bg4{U~*3F15X@$%&#n@=lMg;&1P$Y(*p
z7yz6cl@9N$qh0i<_3Q`Mvz*F%U&8RLo2lH^EJQNlvIyu<LtY(`?-dE!ellYnpTJUt
zWyz(g4okY8bl$taIrAqM#f0F&K+q?$%Y#Bo_cK7?OG))(`m3;SG*Zm#V{-6Pa`Qi>
z%s&3kSa~R$dO$-%L-)c@_hi7&>{6L_M>OZFkUQu;{sL_bUMStNrt{{&O(Wn~*zPOk
zB>dnfszb29NSTf2pqIs68k|p-UrSrxgLHqi?3N-UFa!LHy9n1)=s>`y<fuaVPmb(~
zz)=<RXUQBIM}~iPJu#%Wwi2GAu&z6g$VGFj?X|^zB**;kyDt<U!9`MfEiOBYmGB2$
zG$~ieJM@n4{{1aq)sJLAo}_~^;5a83Mc&m?lkHqX)J*LsdvYPW`3=u!>S+J{MEzS@
zNlfGtpma7<xmFGQKk@0*S1C>kG&LR3JE@wB%rFA*h~~KitlO=IP)ZjN6dQLM6qsry
zHkB#cyNh#n`)}bCrN1My*;k)^@>e4gJ`LJK?2)Pwp?4Tl4)4FA0(tvY+#1jOUM)xw
zlMz4x-f@g^+yKUN`?Vu)|AwujArnM~Pa@y*Q9S8eS(u{-S%(Z5=R~pRl5ZGDjdqH%
zC8rW&{##wOpU_oTIG4WXMk4&%2t1;lWcW5&!yxmOT*!hBcKyTqEcNoO+R2;Q?Yj+W
z1-Y4?59fijz4(MIDwGe4-baYf08UCs;r|YefD-Md2ST;=cxwpgW=tR76-dQVAhn^=
zG9Wk5lQk%jIR@<yTWu!~7BSL}EaU!9*}jurfSr^gr3v}4SWo=qe_uir5ET_=zqVH?
z^-Xb+`s&KpVD!8H3<Q4JSU7a#fZOo-DNI6a7<D9Q7-76WTVHkoXw@Qa+I{cbs9u;g
zgaBs-6!44Xc>KNU!UMp6@BfU;r+;y4VQ)D2!Il9HX%yW-9nOzV+m$YKzVaO`B8S7t
z$!S2Mz`xw>V(RjE`0>bQp<0y&h~Y=M#jpy!#=dE>`=e_AjSZq6u!Dy1xJf~-7|0F!
zPR9|n`e_7D2DIV2H(CESQ}hA>U>n|6`%z?YKEA~)BOV<x=%f|d$^F24T5>Y%y=jPV
zT=44R!L?J)736X#csn|lfBJ)o8ixaZclguWgrGO<`TN2FMfO}7;5}d+BlK0yTSH3*
z4!=;5rOh85&2|x=46hkNaz?)U8&=bcfh=N_#8BNpZ2v$aVBo;sk^*X`v;4-LU;D>!
zM*h12MxXIQy)S<L)4A)~989;pH{VAzNJ*U*xdvrkCmWRHzJ<IQUTEo*%pzi~99ffl
z`b@Dw_H~K*;e505>fAqE4;jY)wgnppazZkdNNVVF;(PLf^qK$FgY9+VFyBKE7UC|f
z`R|?&egV11K3s$rJ6!GvoeW=jV*!-e(wA;x(2=d0E_e_%0x--0o8#~m^H1%AH5Z^B
zn!TNPn927*bvaf0pt}zhK0o^V@WlGwwKo(*nQ|Q~4_;>~-8y20`HP>@UJa)3nEnGG
z5Hwhs|FcmFG16ZVNb5hL`2Gc1{zWIMM{_OiKewV!hCi}U!VuE?s9wU-QbZ!)+Y^tS
zGzp5OSi5iq6hmEr$w}&9DFgoB+i*`q`8TBi^MVS{SKEb8Aw<u!+dlQv^<W`zFIS#6
zBX}^YZkb~Fa#p~~s@UZ{*GVonU8IKdl%^^)s%iX|S{D`{Q2x93h_^Y;4M@1`G+aRP
zY_Hfh>%@K7@XCo(De2A`6%mf&a2#~y1N)+kJLD<?ae}Pwz^G0<mc2h^x{@4W3a1c?
zJRUuiS4MZ22gBL^4>$1HCP!22)(U}xo2|j?WRzt(11j8Z_*v;P$R+Ug*Gy3VxV4K;
zGGUGabnW*`Z}~`ydXL-l9e=GC$pY#z|63vy>E*m=$=j}iWP{sRTh0%H54`t>2xYH%
zsk<hcZmDKwVGw47Y+}ICPKZ+sVU^F#Y1_%rPBL&#uKo@V4z9&DsQq__mbo#ve@m*0
zpZu|HoOkLk{c~MJ_%MH`ok|I_*@hQ+-x^aJAJ`sJ+a6HebkJ1KT%Sn$N`8pOcpBXm
zjiFmQCB=~odJEWfOI^UQMz6(pN`>+M&u&pNgMCM@3e)Xc?jBWX-TIR_cQ1Z!RW7!B
zBjZX=+^3}?SE)B+$EP+0oi1Fp5blDT?*}nsP>filqXH<uZhGh$jnxiIdJhq6e>{ms
zxU<$hetC`u)Wi+x|EKL-`y^#aQX+sDYIa{M;V%LqLrOk~lR>u0Q!+pyQSU4zY`?E^
z|5@)C)w6G_=i5YYC5SE_u(7hDNYr}uKT|@DSqF%S++lTIbIk^$a>{~0IH8KNFEy%+
zW#$&!ynpgNJh>6uR~?2c)ZMW+h0OKu231(7L_vETPaR+(P)Zy%0~yGm>E9?@@x!Jy
z3PYgS<yn;JHp>}Q@b}x}E#F27@F+j}0=&Ql4gES&f8acMrPAVlVs9$97`FR))R5wI
zc&}KFI1UIewh>3Pk<icV$Q}+{%jb)4^`l}mcOHYV{DOjw#*@;%)X2!lztrzyA^#aN
zynsufB*odZ9;cl30K_AD^!N5_m5XhE@5Xxl9uEVVKmNXq({KZBI#Elh=W_zug;<aR
z3MFdHei-!YBGDOyA{vm1?gqjM+r{yc_x4f$w{0#2p-;zX?BIw?xPGgLWB+7@-a`77
znH0H~2#9*meR%0<VCTbO#J{~Gv)OoB$Oz$gnW-xx%$_^^Bmu4*K8h;APQA)MSEWUO
zBD+oJ_rdp&$6XVKuF6Ro!cV%N`IBbr`3tr;%u?82*Q#q*E(I^O`H6vbS+;0>hnB7u
zS3AT8_*|nexznG|Z*DU0c!K@jsI4J)5#DyNi#|e#`l1Vv1`1)*NVcy0LZ``aL0n8B
zecupJ(rhq3u8bW0NIRhKYq$v1li+jp*4hfAd&wxYDE8<bDzN;1D!Q0|+DC@pvXFjH
z+a9cCCiifPr{y~K8S7coa^<1`y#o-P1d$O-4zEa6t%@l&7Jme#NDUn|dFwLJGr6~H
zl~YrJJcdBh`h=mtEU5FGZKK4^N(fCuH=`7}!^OJ!_(a*%DxN>vn1TQ7S@bTM|I2Ob
z8vMOIxA7&_j{AKmD+O@EyXT`|dElt0pED^@IV0m)RPBUs*5jW60>>w1!@_G3aBKzG
z_f(KfAPBk}-jQtR*Sroq!*3rbQ_m27e+YdzQjUb<_*k8vc_C)y!@cj5E>NxUhPu&g
z@Z2<~esU`)ih+4opWe+K7sbN9<br2kw6jeE($p-1;($sSX*XrS&B>n*9@n>#@n3*o
z?xoROgDuvhq>jJ;Ve{6i<3roQNfgo5^4Q4(|GNExO2Dr7GjgA2zWuKp_K)K0R(6lv
z!l$!zW-+T6mb3gQaAFviTQi{|*t%>{(mhTdy+y;Re4qT@kccy#{<kajvN^sBEw0gk
zN~nHi<%jBA&hG2Ecxre=v&^Ia{N-M0C<AuG+rGf<NNoH^0V~9s$@f(9sy1%?-nf!n
z$FS_0NEg6bDGXWr8=cI-`Ju|F6Zj<|E(4A~EFq|00n31`1M#x=7w<=|OI*$8MPJt0
z&(`&J&$W3xb0xnXKc2&naiQ`;pm-G6R-rkN2HDJhWI`ms^08YZeRnZFOo=LB?+f$)
zQ3&okk^dF!xYjKoe%yf~6`E{zFZYJ}KCf6A*a}*QKbYI<?b`=ZHzP8*oSrK|q~|>b
z&zWy~kLO@>*WPj2k#H)|7L&gAJ37DmHQAme#@m;(Y8Nu^`D5vf8sZFW#+lA2!HK=(
zJ)#hO6<Ki+wWwi}q))?H68AvN)n+zZXDRfDAt>JD*`o~&c*&46d}g=Qj@SsoB5ikC
z^1V8E+&<-OzuS_C`p5<<(A6fB`LXT(!kV^0_~hL6PpW4={l%|#xgdh?5EIk~lu8{D
z2hiyhv3Yxij_#$Wu>P@7SYsl`-~3;}Ktx{34_NL^Kwin&=?!HDv3elQDbcU*qyYpN
z(#yw~f1vFGK-t%CC-qa-4FYHbA^h>bag-I&*q<mz`em&&#tu{XKJz2@x7}hAxGwR#
zW_gLF54Fi?d7_5)Rk}~d%c_SM=XeBWK8YE_x9k-~-xL{UiqAz_icRQqwcuU=<bkH+
zKvFj>axwn?Qv|idE$<>1H|<n{Je}GVls}6m{%Y}l`3tUAcX+>Gr6JtUu(he2$eg!N
z@HTF@dG1)*y;4fxe)4_ZkpaBHH9hXp9p4|gLrRQyuevRd@gSS}JhRnWqrvm|U@>qM
z=yl7RQROTKwQtzP3!zUF)_6Ld#NGA6v~2{J9Dd`h6{%+XsU#qGLh%`fB1Hc?wfayK
zN`H4BpDp)npVQuu$DVW1qsBS&A<aRmfuB|Wf}Z=d<nZy_cK=9G@X}lpPGi~HuVZ)p
z!~jj37&JGox-2H6L(eFf_pRW0$w?z$%#VIih#Tu@LqCsd4!`5-A2d0P)&8#q&chOo
zJj{eq86wV`Ux6_3O&H75p@`mK|Izt*aY65@bvjVMEp3kD9mZ7UOttCXqdZb1yiBWN
zwgyl+Ug%HevPS^g(Q~FXjv~Rtb8AczqQ=iQG-i#IXG1^X_*?DQ${X&D3eGoN7JWTg
z8a7sYn8m~C8=CH=gAPauObRXw?k|Wy-Jqi_vj(1x@eP@~qA5-uR|VV;rFvoh_fgxZ
z2^SWfDIcfF?3u)O0ljr<*S_aP5#LCOGVxp$s9eX@|0+O@-?XM1*>J2eP<jM5Fuepp
zzNkv0Nl@M%tV|zme{2uMjXsFNjXL;NeM4nE^#egKS$6mKd{<A%W_pBL;y&uypQ{UL
z_uT7>%6Qw>;k{)Z$8%HL=Q4(a$Ng2_vHw&vA!1L+9zc8vaX2GtqJ{L-;gvF0IR$em
zMQ8@{Qp3+3Quk)TJ$?I<8KmwzD*7#(q<@Mc`dchngW}cRG14(Z6K7{<m7M5_m?K0B
zOrt~!%b9X9ad?n9>T|LhFXwhqUQ;BET;cYqPcAcMgt6M$V9$(?jHo@Sud$an$U&5F
zZ1QNh^ztt)E*d<a5>#Ij;<43oSKKnd+WNr$_r}+s_O_x6DZSB10*5Q{ourqq>mTl|
zx4y^(cy+9;t@R=*j>3_dmm_m)$k$#937V(sllby&5)Xex^UD-|m|q<(jEd#@DV(of
zAd7sSdmS*zUDqJ9|K%O2J<Hs(EGc*G)o85N*0CxtDC#y0UPN0Q?UvF{wo7g}@RjG&
zze`r3FoPtfZ_ysbFKDtX?-@T|<6L;xt>2OfdUiK{{b{PCy)pi<;hp~7v1CQj&4-10
zgO<3dqhYH1#-Fa}Q{pjql5>>P6gZH21zLfxZ4$SK4T@7b!|`nWF9b*84Bq8&Eht;9
z*P72x&NUCZ7*@B$`FtE=hz5b}S`<KDTyCibq&qt%zim@R!JaL<&GU0+1#{ZXuF6z)
zTH2{`eVL^@2H7lQwx^Tt(E@Vuwj*B-Oe&t~EO_>|c6Ey+j@D1ZibjJaRlR;{cxAWv
z?Nqa>QqV*H-*zzaPvpLMHt~nl(x6?vrPpR?zn7~wow?oj*1TKmx4j71>$hvtC$DLD
zUrz0^tiP0792U&dxJxNv@r}Elsjn^aSLUu=9#mD{&9n8|ayIL$!H3s>%KEvbchBFW
z%cd?VU83mGF#Dar9*s~w&AnmQRQIOvR+uWsuZ?+|a=TzApXO@q^(r%8=}iv#wCnFq
z=K9}JbqU@k99Q%j-}NNk+qLCP)jXfmOO|)@?mHcnynd6({mJisP1_}u7k)|eYHXWK
z63eQ)E$ufFi!3CWUY2gw%e>omCv}qEX66aH-k&35f9`Q@Us|NPetVqe8=dX*VxJdn
ze`q7b<f<?sU1f7>=Dn(UA(2sf&g)cOmQFhNJ#<-aMELJZbA#@to>25@kbW<)&!X01
z%NMJt>1ST)tyX)h@?`DxhbgCHr>S4wv}WC&Nw-!{+Z7$2D}74QAcXTvip=M0%Tp_N
zor=k`)t|ra^ySr-+(|R9mB(E=`MX#y(wSw)$!iymzB;^c*>%&^*7HxTnRga=soSZT
zdDl+9s;r!v8hk6POtzBaig4pRp7eWF(<8gufvNHPu6xs-=e{;mnHzJyGKE+8L0j};
z@%8-e^UCL5HhMiR>sD3Rve&yVZ#{Q1*CO8c+qSr^Z#CN;)(X5>tGG5yUw3<+CfhaL
z%bP;hZ?jvgJU67BWyiy74_)6r)_nSxttxn0`0?HE^5(uydHVgP+HE$V?Lv)Leti43
zWA|;f-RqX``95>)^P-fw!Vi{3KNsII-*5f){gdxqd%gVdB1sOBNe=nEW%;i~g_P8J
w!5uhoe-Jcg1nPN%MiEAtgE$;km@@t6ukO)1^!cY^83Pb_y85}Sb4q9e0FIsP9{>OV

literal 0
HcmV?d00001

diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f1632cfddf3d9dade342351e627a0a75609fb46
GIT binary patch
literal 2218
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

literal 0
HcmV?d00001

diff --git a/progress/macos/Runner/Base.lproj/MainMenu.xib b/progress/macos/Runner/Base.lproj/MainMenu.xib
new file mode 100644
index 000000000..80e867a4e
--- /dev/null
+++ b/progress/macos/Runner/Base.lproj/MainMenu.xib
@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+            <connections>
+                <outlet property="delegate" destination="Voe-Tx-rLC" id="GzC-gU-4Uq"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Runner" customModuleProvider="target">
+            <connections>
+                <outlet property="applicationMenu" destination="uQy-DD-JDr" id="XBo-yE-nKs"/>
+                <outlet property="mainFlutterWindow" destination="QvC-M9-y7g" id="gIp-Ho-8D9"/>
+            </connections>
+        </customObject>
+        <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
+        <menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
+            <items>
+                <menuItem title="APP_NAME" id="1Xt-HY-uBw">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="APP_NAME" systemMenu="apple" id="uQy-DD-JDr">
+                        <items>
+                            <menuItem title="About APP_NAME" id="5kV-Vb-QxS">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
+                            <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
+                            <menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
+                            <menuItem title="Services" id="NMo-om-nkz">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
+                            <menuItem title="Hide APP_NAME" keyEquivalent="h" id="Olw-nP-bQN">
+                                <connections>
+                                    <action selector="hide:" target="-1" id="PnN-Uc-m68"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="hideOtherApplications:" target="-1" id="VT4-aY-XCT"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Show All" id="Kd2-mp-pUS">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="unhideAllApplications:" target="-1" id="Dhg-Le-xox"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
+                            <menuItem title="Quit APP_NAME" keyEquivalent="q" id="4sb-4s-VLi">
+                                <connections>
+                                    <action selector="terminate:" target="-1" id="Te7-pn-YzF"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Edit" id="5QF-Oa-p0T">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Edit" id="W48-6f-4Dl">
+                        <items>
+                            <menuItem title="Undo" keyEquivalent="z" id="dRJ-4n-Yzg">
+                                <connections>
+                                    <action selector="undo:" target="-1" id="M6e-cu-g7V"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Redo" keyEquivalent="Z" id="6dh-zS-Vam">
+                                <connections>
+                                    <action selector="redo:" target="-1" id="oIA-Rs-6OD"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="WRV-NI-Exz"/>
+                            <menuItem title="Cut" keyEquivalent="x" id="uRl-iY-unG">
+                                <connections>
+                                    <action selector="cut:" target="-1" id="YJe-68-I9s"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Copy" keyEquivalent="c" id="x3v-GG-iWU">
+                                <connections>
+                                    <action selector="copy:" target="-1" id="G1f-GL-Joy"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Paste" keyEquivalent="v" id="gVA-U4-sdL">
+                                <connections>
+                                    <action selector="paste:" target="-1" id="UvS-8e-Qdg"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Paste and Match Style" keyEquivalent="V" id="WeT-3V-zwk">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="pasteAsPlainText:" target="-1" id="cEh-KX-wJQ"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Delete" id="pa3-QI-u2k">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="delete:" target="-1" id="0Mk-Ml-PaM"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m">
+                                <connections>
+                                    <action selector="selectAll:" target="-1" id="VNm-Mi-diN"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="uyl-h8-XO2"/>
+                            <menuItem title="Find" id="4EN-yA-p0u">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Find" id="1b7-l0-nxx">
+                                    <items>
+                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W">
+                                            <connections>
+                                                <action selector="performFindPanelAction:" target="-1" id="cD7-Qs-BN4"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="performFindPanelAction:" target="-1" id="WD3-Gg-5AJ"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye">
+                                            <connections>
+                                                <action selector="performFindPanelAction:" target="-1" id="NDo-RZ-v9R"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="OwM-mh-QMV">
+                                            <connections>
+                                                <action selector="performFindPanelAction:" target="-1" id="HOh-sY-3ay"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt">
+                                            <connections>
+                                                <action selector="performFindPanelAction:" target="-1" id="U76-nv-p5D"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="S0p-oC-mLd">
+                                            <connections>
+                                                <action selector="centerSelectionInVisibleArea:" target="-1" id="IOG-6D-g5B"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Spelling and Grammar" id="Dv1-io-Yv7">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Spelling" id="3IN-sU-3Bg">
+                                    <items>
+                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="HFo-cy-zxI">
+                                            <connections>
+                                                <action selector="showGuessPanel:" target="-1" id="vFj-Ks-hy3"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Document Now" keyEquivalent=";" id="hz2-CU-CR7">
+                                            <connections>
+                                                <action selector="checkSpelling:" target="-1" id="fz7-VC-reM"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="bNw-od-mp5"/>
+                                        <menuItem title="Check Spelling While Typing" id="rbD-Rh-wIN">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleContinuousSpellChecking:" target="-1" id="7w6-Qz-0kB"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Grammar With Spelling" id="mK6-2p-4JG">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleGrammarChecking:" target="-1" id="muD-Qn-j4w"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Correct Spelling Automatically" id="78Y-hA-62v">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticSpellingCorrection:" target="-1" id="2lM-Qi-WAP"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Substitutions" id="9ic-FL-obx">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Substitutions" id="FeM-D8-WVr">
+                                    <items>
+                                        <menuItem title="Show Substitutions" id="z6F-FW-3nz">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="orderFrontSubstitutionsPanel:" target="-1" id="oku-mr-iSq"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="gPx-C9-uUO"/>
+                                        <menuItem title="Smart Copy/Paste" id="9yt-4B-nSM">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleSmartInsertDelete:" target="-1" id="3IJ-Se-DZD"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smart Quotes" id="hQb-2v-fYv">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="ptq-xd-QOA"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smart Dashes" id="rgM-f4-ycn">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticDashSubstitution:" target="-1" id="oCt-pO-9gS"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smart Links" id="cwL-P1-jid">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticLinkDetection:" target="-1" id="Gip-E3-Fov"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Data Detectors" id="tRr-pd-1PS">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticDataDetection:" target="-1" id="R1I-Nq-Kbl"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Text Replacement" id="HFQ-gK-NFA">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticTextReplacement:" target="-1" id="DvP-Fe-Py6"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Transformations" id="2oI-Rn-ZJC">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Transformations" id="c8a-y6-VQd">
+                                    <items>
+                                        <menuItem title="Make Upper Case" id="vmV-6d-7jI">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="uppercaseWord:" target="-1" id="sPh-Tk-edu"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Make Lower Case" id="d9M-CD-aMd">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="lowercaseWord:" target="-1" id="iUZ-b5-hil"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Capitalize" id="UEZ-Bs-lqG">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="capitalizeWord:" target="-1" id="26H-TL-nsh"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Speech" id="xrE-MZ-jX0">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Speech" id="3rS-ZA-NoH">
+                                    <items>
+                                        <menuItem title="Start Speaking" id="Ynk-f8-cLZ">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="startSpeaking:" target="-1" id="654-Ng-kyl"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Stop Speaking" id="Oyz-dy-DGm">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="stopSpeaking:" target="-1" id="dX8-6p-jy9"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="View" id="H8h-7b-M4v">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="View" id="HyV-fh-RgO">
+                        <items>
+                            <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
+                                <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                <connections>
+                                    <action selector="toggleFullScreen:" target="-1" id="dU3-MA-1Rq"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Window" id="aUF-d1-5bR">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo">
+                        <items>
+                            <menuItem title="Minimize" keyEquivalent="m" id="OY7-WF-poV">
+                                <connections>
+                                    <action selector="performMiniaturize:" target="-1" id="VwT-WD-YPe"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Zoom" id="R4o-n2-Eq4">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="performZoom:" target="-1" id="DIl-cC-cCs"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="eu3-7i-yIM"/>
+                            <menuItem title="Bring All to Front" id="LE2-aR-0XJ">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="arrangeInFront:" target="-1" id="DRN-fu-gQh"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Help" id="EPT-qC-fAb">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Help" systemMenu="help" id="rJ0-wn-3NY"/>
+                </menuItem>
+            </items>
+            <point key="canvasLocation" x="142" y="-258"/>
+        </menu>
+        <window title="APP_NAME" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="MainFlutterWindow" customModule="Runner" customModuleProvider="target">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <rect key="contentRect" x="335" y="390" width="800" height="600"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1577"/>
+            <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
+                <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
+                <autoresizingMask key="autoresizingMask"/>
+            </view>
+        </window>
+    </objects>
+</document>
diff --git a/progress/macos/Runner/Configs/AppInfo.xcconfig b/progress/macos/Runner/Configs/AppInfo.xcconfig
new file mode 100644
index 000000000..4aa254221
--- /dev/null
+++ b/progress/macos/Runner/Configs/AppInfo.xcconfig
@@ -0,0 +1,14 @@
+// Application-level settings for the Runner target.
+//
+// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the
+// future. If not, the values below would default to using the project name when this becomes a
+// 'flutter create' template.
+
+// The application's name. By default this is also the title of the Flutter window.
+PRODUCT_NAME = progress
+
+// The application's bundle identifier
+PRODUCT_BUNDLE_IDENTIFIER = com.example.progress
+
+// The copyright displayed in application information
+PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved.
diff --git a/progress/macos/Runner/Configs/Debug.xcconfig b/progress/macos/Runner/Configs/Debug.xcconfig
new file mode 100644
index 000000000..36b0fd946
--- /dev/null
+++ b/progress/macos/Runner/Configs/Debug.xcconfig
@@ -0,0 +1,2 @@
+#include "../../Flutter/Flutter-Debug.xcconfig"
+#include "Warnings.xcconfig"
diff --git a/progress/macos/Runner/Configs/Release.xcconfig b/progress/macos/Runner/Configs/Release.xcconfig
new file mode 100644
index 000000000..dff4f4956
--- /dev/null
+++ b/progress/macos/Runner/Configs/Release.xcconfig
@@ -0,0 +1,2 @@
+#include "../../Flutter/Flutter-Release.xcconfig"
+#include "Warnings.xcconfig"
diff --git a/progress/macos/Runner/Configs/Warnings.xcconfig b/progress/macos/Runner/Configs/Warnings.xcconfig
new file mode 100644
index 000000000..42bcbf478
--- /dev/null
+++ b/progress/macos/Runner/Configs/Warnings.xcconfig
@@ -0,0 +1,13 @@
+WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings
+GCC_WARN_UNDECLARED_SELECTOR = YES
+CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES
+CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE
+CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
+CLANG_WARN_PRAGMA_PACK = YES
+CLANG_WARN_STRICT_PROTOTYPES = YES
+CLANG_WARN_COMMA = YES
+GCC_WARN_STRICT_SELECTOR_MATCH = YES
+CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES
+CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES
+GCC_WARN_SHADOW = YES
+CLANG_WARN_UNREACHABLE_CODE = YES
diff --git a/progress/macos/Runner/DebugProfile.entitlements b/progress/macos/Runner/DebugProfile.entitlements
new file mode 100644
index 000000000..dddb8a30c
--- /dev/null
+++ b/progress/macos/Runner/DebugProfile.entitlements
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.cs.allow-jit</key>
+	<true/>
+	<key>com.apple.security.network.server</key>
+	<true/>
+</dict>
+</plist>
diff --git a/progress/macos/Runner/Info.plist b/progress/macos/Runner/Info.plist
new file mode 100644
index 000000000..4789daa6a
--- /dev/null
+++ b/progress/macos/Runner/Info.plist
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(FLUTTER_BUILD_NAME)</string>
+	<key>CFBundleVersion</key>
+	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>$(PRODUCT_COPYRIGHT)</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/progress/macos/Runner/MainFlutterWindow.swift b/progress/macos/Runner/MainFlutterWindow.swift
new file mode 100644
index 000000000..3cc05eb23
--- /dev/null
+++ b/progress/macos/Runner/MainFlutterWindow.swift
@@ -0,0 +1,15 @@
+import Cocoa
+import FlutterMacOS
+
+class MainFlutterWindow: NSWindow {
+  override func awakeFromNib() {
+    let flutterViewController = FlutterViewController()
+    let windowFrame = self.frame
+    self.contentViewController = flutterViewController
+    self.setFrame(windowFrame, display: true)
+
+    RegisterGeneratedPlugins(registry: flutterViewController)
+
+    super.awakeFromNib()
+  }
+}
diff --git a/progress/macos/Runner/Release.entitlements b/progress/macos/Runner/Release.entitlements
new file mode 100644
index 000000000..852fa1a47
--- /dev/null
+++ b/progress/macos/Runner/Release.entitlements
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+</dict>
+</plist>
diff --git a/progress/macos/RunnerTests/RunnerTests.swift b/progress/macos/RunnerTests/RunnerTests.swift
new file mode 100644
index 000000000..5418c9f53
--- /dev/null
+++ b/progress/macos/RunnerTests/RunnerTests.swift
@@ -0,0 +1,12 @@
+import FlutterMacOS
+import Cocoa
+import XCTest
+
+class RunnerTests: XCTestCase {
+
+  func testExample() {
+    // If you add code to the Runner application, consider adding tests here.
+    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
+  }
+
+}
diff --git a/progress/pubspec.lock b/progress/pubspec.lock
new file mode 100644
index 000000000..b4509f290
--- /dev/null
+++ b/progress/pubspec.lock
@@ -0,0 +1,221 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  async:
+    dependency: transitive
+    description:
+      name: async
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.11.0"
+  boolean_selector:
+    dependency: transitive
+    description:
+      name: boolean_selector
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.17.2"
+  cupertino_icons:
+    dependency: "direct main"
+    description:
+      name: cupertino_icons
+      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.1"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_easyrefresh:
+    dependency: transitive
+    description:
+      name: flutter_easyrefresh
+      sha256: "5d161ee5dcac34da9065116568147d742dd25fb9bff3b10024d9054b195087ad"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
+  flutter_lints:
+    dependency: "direct dev"
+    description:
+      name: flutter_lints
+      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
+  flutter_slidable:
+    dependency: transitive
+    description:
+      name: flutter_slidable
+      sha256: "673403d2eeef1f9e8483bd6d8d92aae73b1d8bd71f382bc3930f699c731bc27c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
+  flutter_swiper_null_safety:
+    dependency: transitive
+    description:
+      name: flutter_swiper_null_safety
+      sha256: "5a855e0080d035c08e82f8b7fd2f106344943a30c9ab483b2584860a2f22eaaf"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  flutter_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.7"
+  lints:
+    dependency: transitive
+    description:
+      name: lints
+      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.12.16"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.0"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.1"
+  path:
+    dependency: transitive
+    description:
+      name: path
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.8.3"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.99"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.10.0"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.11.0"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
+  tdesign_flutter:
+    dependency: "direct main"
+    description:
+      name: tdesign_flutter
+      sha256: "3e60fab491f04546ca41c7e96033d1ad5d6bea975a7c356b0a47a9a40f4ded45"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
+  test_api:
+    dependency: transitive
+    description:
+      name: test_api
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.0"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+sdks:
+  dart: ">=3.1.0-163.1.beta <4.0.0"
+  flutter: ">=3.7.0"
diff --git a/progress/pubspec.yaml b/progress/pubspec.yaml
new file mode 100644
index 000000000..fcc1d0794
--- /dev/null
+++ b/progress/pubspec.yaml
@@ -0,0 +1,91 @@
+name: progress
+description: A new Flutter project.
+# The following line prevents the package from being accidentally published to
+# pub.dev using `flutter pub publish`. This is preferred for private packages.
+publish_to: 'none' # Remove this line if you wish to publish to pub.dev
+
+# The following defines the version and build number for your application.
+# A version number is three numbers separated by dots, like 1.2.43
+# followed by an optional build number separated by a +.
+# Both the version and the builder number may be overridden in flutter
+# build by specifying --build-name and --build-number, respectively.
+# In Android, build-name is used as versionName while build-number used as versionCode.
+# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
+# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion.
+# Read more about iOS versioning at
+# 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
+
+environment:
+  sdk: '>=3.1.0-163.1.beta <4.0.0'
+
+# Dependencies specify other packages that your package needs in order to work.
+# To automatically upgrade your package dependencies to the latest versions
+# consider running `flutter pub upgrade --major-versions`. Alternatively,
+# dependencies can be manually updated by changing the version numbers below to
+# the latest version available on pub.dev. To see which dependencies have newer
+# versions available, run `flutter pub outdated`.
+dependencies:
+  flutter:
+    sdk: flutter
+
+
+  # The following adds the Cupertino Icons font to your application.
+  # Use with the CupertinoIcons class for iOS style icons.
+  cupertino_icons: ^1.0.2
+  tdesign_flutter: ^0.1.6
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+
+  # The "flutter_lints" package below contains a set of recommended lints to
+  # encourage good coding practices. The lint set provided by the package is
+  # activated in the `analysis_options.yaml` file located at the root of your
+  # package. See that file for information about deactivating specific lint
+  # rules and activating additional ones.
+  flutter_lints: ^2.0.0
+
+# For information on the generic Dart part of this file, see the
+# following page: https://dart.dev/tools/pub/pubspec
+
+# The following section is specific to Flutter packages.
+flutter:
+
+  # The following line ensures that the Material Icons font is
+  # included with your application, so that you can use the icons in
+  # the material Icons class.
+  uses-material-design: true
+
+  # To add assets to your application, add an assets section, like this:
+  # assets:
+  #   - images/a_dot_burr.jpeg
+  #   - images/a_dot_ham.jpeg
+
+  # An image asset can refer to one or more resolution-specific "variants", see
+  # https://flutter.dev/assets-and-images/#resolution-aware
+
+  # For details regarding adding assets from package dependencies, see
+  # https://flutter.dev/assets-and-images/#from-packages
+
+  # To add custom fonts to your application, add a fonts section here,
+  # in this "flutter" section. Each entry in this list should have a
+  # "family" key with the font family name, and a "fonts" key with a
+  # list giving the asset and other descriptors for the font. For
+  # example:
+  # fonts:
+  #   - family: Schyler
+  #     fonts:
+  #       - asset: fonts/Schyler-Regular.ttf
+  #       - asset: fonts/Schyler-Italic.ttf
+  #         style: italic
+  #   - family: Trajan Pro
+  #     fonts:
+  #       - asset: fonts/TrajanPro.ttf
+  #       - asset: fonts/TrajanPro_Bold.ttf
+  #         weight: 700
+  #
+  # For details regarding fonts from package dependencies,
+  # see https://flutter.dev/custom-fonts/#from-packages
diff --git a/progress/test/widget_test.dart b/progress/test/widget_test.dart
new file mode 100644
index 000000000..9cd290de6
--- /dev/null
+++ b/progress/test/widget_test.dart
@@ -0,0 +1,30 @@
+// This is a basic Flutter widget test.
+//
+// To perform an interaction with a widget in your test, use the WidgetTester
+// utility in the flutter_test package. For example, you can send tap and scroll
+// gestures. You can also use WidgetTester to find child widgets in the widget
+// tree, read text, and verify that the values of widget properties are correct.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:progress/main.dart';
+
+void main() {
+  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+    // Build our app and trigger a frame.
+    await tester.pumpWidget(const MyApp());
+
+    // Verify that our counter starts at 0.
+    expect(find.text('0'), findsOneWidget);
+    expect(find.text('1'), findsNothing);
+
+    // Tap the '+' icon and trigger a frame.
+    await tester.tap(find.byIcon(Icons.add));
+    await tester.pump();
+
+    // Verify that our counter has incremented.
+    expect(find.text('0'), findsNothing);
+    expect(find.text('1'), findsOneWidget);
+  });
+}
diff --git a/progress/web/favicon.png b/progress/web/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1
GIT binary patch
literal 917
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7
zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2
zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l<c?^6clWVQqrt~T->1AfjnEK
zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o
z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo
zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8
zTYqUsf!gYFyJnXpu0!n&N*<mM6;!yDy;iI!?0xZxS-@9o){@>SYAX-%d(5<QWisP%
zpKxJ^!zO{CB{zx^b({)M+}nHh%-rj7^M&&ZcU$j%zjx;LVyDXoIuhq|8P;5s=KHG5
z<JUB4<A0$RmNJizixz(PY{v3_`K1HjE{oV$3+pLbhDf-dGF^GSkNIsaZ^^?aj@RFX
zmI#!cuT=hV*<Wg+koNS~T)(gK8EvWbJGDN%Cgswi@;rmS$PYP}{^d1_2Ol_C#PhDD
zFw$(<^hU$>gVjrHJWqXQshj@!<B9Fv+a9JEO;0$m^uEygb*U`#RIBf=|21JrRHoLF
zSVqsI&*oWt$jm+Fz?pMwCX>Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr
zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf
zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od
z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz
oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM

literal 0
HcmV?d00001

diff --git a/progress/web/icons/Icon-192.png b/progress/web/icons/Icon-192.png
new file mode 100644
index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa
GIT binary patch
literal 5292
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

literal 0
HcmV?d00001

diff --git a/progress/web/icons/Icon-512.png b/progress/web/icons/Icon-512.png
new file mode 100644
index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6
GIT binary patch
literal 8252
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

literal 0
HcmV?d00001

diff --git a/progress/web/icons/Icon-maskable-192.png b/progress/web/icons/Icon-maskable-192.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d
GIT binary patch
literal 5594
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
X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z!

literal 0
HcmV?d00001

diff --git a/progress/web/icons/Icon-maskable-512.png b/progress/web/icons/Icon-maskable-512.png
new file mode 100644
index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e
GIT binary patch
literal 20998
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
MPgg&ebxsLQ025IeI{*Lx

literal 0
HcmV?d00001

diff --git a/progress/web/index.html b/progress/web/index.html
new file mode 100644
index 000000000..cebd06b99
--- /dev/null
+++ b/progress/web/index.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <!--
+    If you are serving your web app in a path other than the root, change the
+    href value below to reflect the base path you are serving from.
+
+    The path provided below has to start and end with a slash "/" in order for
+    it to work correctly.
+
+    For more details:
+    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+
+    This is a placeholder for base href that will be replaced by the value of
+    the `--base-href` argument provided to `flutter build`.
+  -->
+  <base href="$FLUTTER_BASE_HREF">
+
+  <meta charset="UTF-8">
+  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
+  <meta name="description" content="A new Flutter project.">
+
+  <!-- iOS meta tags & icons -->
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="apple-mobile-web-app-title" content="progress">
+  <link rel="apple-touch-icon" href="icons/Icon-192.png">
+
+  <!-- Favicon -->
+  <link rel="icon" type="image/png" href="favicon.png"/>
+
+  <title>progress</title>
+  <link rel="manifest" href="manifest.json">
+
+  <script>
+    // The value below is injected by flutter build, do not touch.
+    const serviceWorkerVersion = null;
+  </script>
+  <!-- This script adds the flutter initialization JS code -->
+  <script src="flutter.js" defer></script>
+</head>
+<body>
+  <script>
+    window.addEventListener('load', function(ev) {
+      // Download main.dart.js
+      _flutter.loader.loadEntrypoint({
+        serviceWorker: {
+          serviceWorkerVersion: serviceWorkerVersion,
+        },
+        onEntrypointLoaded: function(engineInitializer) {
+          engineInitializer.initializeEngine().then(function(appRunner) {
+            appRunner.runApp();
+          });
+        }
+      });
+    });
+  </script>
+</body>
+</html>
diff --git a/progress/web/manifest.json b/progress/web/manifest.json
new file mode 100644
index 000000000..a53617ae2
--- /dev/null
+++ b/progress/web/manifest.json
@@ -0,0 +1,35 @@
+{
+    "name": "progress",
+    "short_name": "progress",
+    "start_url": ".",
+    "display": "standalone",
+    "background_color": "#0175C2",
+    "theme_color": "#0175C2",
+    "description": "A new Flutter project.",
+    "orientation": "portrait-primary",
+    "prefer_related_applications": false,
+    "icons": [
+        {
+            "src": "icons/Icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-maskable-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "icons/Icon-maskable-512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
+        }
+    ]
+}
diff --git a/progress/windows/.gitignore b/progress/windows/.gitignore
new file mode 100644
index 000000000..d492d0d98
--- /dev/null
+++ b/progress/windows/.gitignore
@@ -0,0 +1,17 @@
+flutter/ephemeral/
+
+# Visual Studio user-specific files.
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# Visual Studio build-related files.
+x64/
+x86/
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
diff --git a/progress/windows/CMakeLists.txt b/progress/windows/CMakeLists.txt
new file mode 100644
index 000000000..8ce309bf1
--- /dev/null
+++ b/progress/windows/CMakeLists.txt
@@ -0,0 +1,102 @@
+# Project-level configuration.
+cmake_minimum_required(VERSION 3.14)
+project(progress LANGUAGES CXX)
+
+# The name of the executable created for the application. Change this to change
+# the on-disk name of your application.
+set(BINARY_NAME "progress")
+
+# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
+# versions of CMake.
+cmake_policy(VERSION 3.14...3.25)
+
+# Define build configuration option.
+get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+if(IS_MULTICONFIG)
+  set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release"
+    CACHE STRING "" FORCE)
+else()
+  if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    set(CMAKE_BUILD_TYPE "Debug" CACHE
+      STRING "Flutter build mode" FORCE)
+    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+      "Debug" "Profile" "Release")
+  endif()
+endif()
+# Define settings for the Profile build mode.
+set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
+set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
+set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}")
+set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}")
+
+# Use Unicode for all projects.
+add_definitions(-DUNICODE -D_UNICODE)
+
+# Compilation settings that should be applied to most targets.
+#
+# Be cautious about adding new options here, as plugins use this function by
+# default. In most cases, you should add new options to specific targets instead
+# of modifying this function.
+function(APPLY_STANDARD_SETTINGS TARGET)
+  target_compile_features(${TARGET} PUBLIC cxx_std_17)
+  target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100")
+  target_compile_options(${TARGET} PRIVATE /EHsc)
+  target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0")
+  target_compile_definitions(${TARGET} PRIVATE "$<$<CONFIG:Debug>:_DEBUG>")
+endfunction()
+
+# Flutter library and tool build rules.
+set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
+add_subdirectory(${FLUTTER_MANAGED_DIR})
+
+# Application build; see runner/CMakeLists.txt.
+add_subdirectory("runner")
+
+
+# Generated plugin build rules, which manage building the plugins and adding
+# them to the application.
+include(flutter/generated_plugins.cmake)
+
+
+# === Installation ===
+# Support files are copied into place next to the executable, so that it can
+# run in place. This is done instead of making a separate bundle (as on Linux)
+# so that building and running from within Visual Studio will work.
+set(BUILD_BUNDLE_DIR "$<TARGET_FILE_DIR:${BINARY_NAME}>")
+# Make the "install" step default, as it's required to run.
+set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1)
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
+endif()
+
+set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
+set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}")
+
+install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
+  COMPONENT Runtime)
+
+install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
+  COMPONENT Runtime)
+
+install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+  COMPONENT Runtime)
+
+if(PLUGIN_BUNDLED_LIBRARIES)
+  install(FILES "${PLUGIN_BUNDLED_LIBRARIES}"
+    DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+    COMPONENT Runtime)
+endif()
+
+# Fully re-copy the assets directory on each build to avoid having stale files
+# from a previous install.
+set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
+install(CODE "
+  file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
+  " COMPONENT Runtime)
+install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
+  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
+
+# Install the AOT library on non-Debug builds only.
+install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
+  CONFIGURATIONS Profile;Release
+  COMPONENT Runtime)
diff --git a/progress/windows/flutter/CMakeLists.txt b/progress/windows/flutter/CMakeLists.txt
new file mode 100644
index 000000000..930d2071a
--- /dev/null
+++ b/progress/windows/flutter/CMakeLists.txt
@@ -0,0 +1,104 @@
+# This file controls Flutter-level build steps. It should not be edited.
+cmake_minimum_required(VERSION 3.14)
+
+set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
+
+# Configuration provided via flutter tool.
+include(${EPHEMERAL_DIR}/generated_config.cmake)
+
+# TODO: Move the rest of this into files in ephemeral. See
+# https://github.com/flutter/flutter/issues/57146.
+set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")
+
+# === Flutter Library ===
+set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")
+
+# Published to parent scope for install step.
+set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE)
+set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE)
+set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE)
+set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE)
+
+list(APPEND FLUTTER_LIBRARY_HEADERS
+  "flutter_export.h"
+  "flutter_windows.h"
+  "flutter_messenger.h"
+  "flutter_plugin_registrar.h"
+  "flutter_texture_registrar.h"
+)
+list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/")
+add_library(flutter INTERFACE)
+target_include_directories(flutter INTERFACE
+  "${EPHEMERAL_DIR}"
+)
+target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib")
+add_dependencies(flutter flutter_assemble)
+
+# === Wrapper ===
+list(APPEND CPP_WRAPPER_SOURCES_CORE
+  "core_implementations.cc"
+  "standard_codec.cc"
+)
+list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/")
+list(APPEND CPP_WRAPPER_SOURCES_PLUGIN
+  "plugin_registrar.cc"
+)
+list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/")
+list(APPEND CPP_WRAPPER_SOURCES_APP
+  "flutter_engine.cc"
+  "flutter_view_controller.cc"
+)
+list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/")
+
+# Wrapper sources needed for a plugin.
+add_library(flutter_wrapper_plugin STATIC
+  ${CPP_WRAPPER_SOURCES_CORE}
+  ${CPP_WRAPPER_SOURCES_PLUGIN}
+)
+apply_standard_settings(flutter_wrapper_plugin)
+set_target_properties(flutter_wrapper_plugin PROPERTIES
+  POSITION_INDEPENDENT_CODE ON)
+set_target_properties(flutter_wrapper_plugin PROPERTIES
+  CXX_VISIBILITY_PRESET hidden)
+target_link_libraries(flutter_wrapper_plugin PUBLIC flutter)
+target_include_directories(flutter_wrapper_plugin PUBLIC
+  "${WRAPPER_ROOT}/include"
+)
+add_dependencies(flutter_wrapper_plugin flutter_assemble)
+
+# Wrapper sources needed for the runner.
+add_library(flutter_wrapper_app STATIC
+  ${CPP_WRAPPER_SOURCES_CORE}
+  ${CPP_WRAPPER_SOURCES_APP}
+)
+apply_standard_settings(flutter_wrapper_app)
+target_link_libraries(flutter_wrapper_app PUBLIC flutter)
+target_include_directories(flutter_wrapper_app PUBLIC
+  "${WRAPPER_ROOT}/include"
+)
+add_dependencies(flutter_wrapper_app flutter_assemble)
+
+# === Flutter tool backend ===
+# _phony_ is a non-existent file to force this command to run every time,
+# since currently there's no way to get a full input/output list from the
+# flutter tool.
+set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_")
+set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE)
+add_custom_command(
+  OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS}
+    ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN}
+    ${CPP_WRAPPER_SOURCES_APP}
+    ${PHONY_OUTPUT}
+  COMMAND ${CMAKE_COMMAND} -E env
+    ${FLUTTER_TOOL_ENVIRONMENT}
+    "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
+      windows-x64 $<CONFIG>
+  VERBATIM
+)
+add_custom_target(flutter_assemble DEPENDS
+  "${FLUTTER_LIBRARY}"
+  ${FLUTTER_LIBRARY_HEADERS}
+  ${CPP_WRAPPER_SOURCES_CORE}
+  ${CPP_WRAPPER_SOURCES_PLUGIN}
+  ${CPP_WRAPPER_SOURCES_APP}
+)
diff --git a/progress/windows/flutter/generated_plugin_registrant.cc b/progress/windows/flutter/generated_plugin_registrant.cc
new file mode 100644
index 000000000..8b6d4680a
--- /dev/null
+++ b/progress/windows/flutter/generated_plugin_registrant.cc
@@ -0,0 +1,11 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+
+void RegisterPlugins(flutter::PluginRegistry* registry) {
+}
diff --git a/progress/windows/flutter/generated_plugin_registrant.h b/progress/windows/flutter/generated_plugin_registrant.h
new file mode 100644
index 000000000..dc139d85a
--- /dev/null
+++ b/progress/windows/flutter/generated_plugin_registrant.h
@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter/plugin_registry.h>
+
+// Registers Flutter plugins.
+void RegisterPlugins(flutter::PluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_
diff --git a/progress/windows/flutter/generated_plugins.cmake b/progress/windows/flutter/generated_plugins.cmake
new file mode 100644
index 000000000..b93c4c30c
--- /dev/null
+++ b/progress/windows/flutter/generated_plugins.cmake
@@ -0,0 +1,23 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)
diff --git a/progress/windows/runner/CMakeLists.txt b/progress/windows/runner/CMakeLists.txt
new file mode 100644
index 000000000..394917c05
--- /dev/null
+++ b/progress/windows/runner/CMakeLists.txt
@@ -0,0 +1,40 @@
+cmake_minimum_required(VERSION 3.14)
+project(runner LANGUAGES CXX)
+
+# Define the application target. To change its name, change BINARY_NAME in the
+# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer
+# work.
+#
+# Any new source files that you add to the application should be added here.
+add_executable(${BINARY_NAME} WIN32
+  "flutter_window.cpp"
+  "main.cpp"
+  "utils.cpp"
+  "win32_window.cpp"
+  "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
+  "Runner.rc"
+  "runner.exe.manifest"
+)
+
+# Apply the standard set of build settings. This can be removed for applications
+# that need different build settings.
+apply_standard_settings(${BINARY_NAME})
+
+# Add preprocessor definitions for the build version.
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}")
+
+# Disable Windows macros that collide with C++ standard library functions.
+target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX")
+
+# Add dependency libraries and include directories. Add any application-specific
+# dependencies here.
+target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app)
+target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib")
+target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}")
+
+# Run the Flutter tool portions of the build. This must not be removed.
+add_dependencies(${BINARY_NAME} flutter_assemble)
diff --git a/progress/windows/runner/Runner.rc b/progress/windows/runner/Runner.rc
new file mode 100644
index 000000000..d387e1182
--- /dev/null
+++ b/progress/windows/runner/Runner.rc
@@ -0,0 +1,121 @@
+// Microsoft Visual C++ generated resource script.
+//
+#pragma code_page(65001)
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
+#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
+#else
+#define VERSION_AS_NUMBER 1,0,0,0
+#endif
+
+#if defined(FLUTTER_VERSION)
+#define VERSION_AS_STRING FLUTTER_VERSION
+#else
+#define VERSION_AS_STRING "1.0.0"
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION VERSION_AS_NUMBER
+ PRODUCTVERSION VERSION_AS_NUMBER
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904e4"
+        BEGIN
+            VALUE "CompanyName", "com.example" "\0"
+            VALUE "FileDescription", "progress" "\0"
+            VALUE "FileVersion", VERSION_AS_STRING "\0"
+            VALUE "InternalName", "progress" "\0"
+            VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0"
+            VALUE "OriginalFilename", "progress.exe" "\0"
+            VALUE "ProductName", "progress" "\0"
+            VALUE "ProductVersion", VERSION_AS_STRING "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
diff --git a/progress/windows/runner/flutter_window.cpp b/progress/windows/runner/flutter_window.cpp
new file mode 100644
index 000000000..955ee3038
--- /dev/null
+++ b/progress/windows/runner/flutter_window.cpp
@@ -0,0 +1,71 @@
+#include "flutter_window.h"
+
+#include <optional>
+
+#include "flutter/generated_plugin_registrant.h"
+
+FlutterWindow::FlutterWindow(const flutter::DartProject& project)
+    : project_(project) {}
+
+FlutterWindow::~FlutterWindow() {}
+
+bool FlutterWindow::OnCreate() {
+  if (!Win32Window::OnCreate()) {
+    return false;
+  }
+
+  RECT frame = GetClientArea();
+
+  // The size here must match the window dimensions to avoid unnecessary surface
+  // creation / destruction in the startup path.
+  flutter_controller_ = std::make_unique<flutter::FlutterViewController>(
+      frame.right - frame.left, frame.bottom - frame.top, project_);
+  // Ensure that basic setup of the controller was successful.
+  if (!flutter_controller_->engine() || !flutter_controller_->view()) {
+    return false;
+  }
+  RegisterPlugins(flutter_controller_->engine());
+  SetChildContent(flutter_controller_->view()->GetNativeWindow());
+
+  flutter_controller_->engine()->SetNextFrameCallback([&]() {
+    this->Show();
+  });
+
+  // Flutter can complete the first frame before the "show window" callback is
+  // registered. The following call ensures a frame is pending to ensure the
+  // window is shown. It is a no-op if the first frame hasn't completed yet.
+  flutter_controller_->ForceRedraw();
+
+  return true;
+}
+
+void FlutterWindow::OnDestroy() {
+  if (flutter_controller_) {
+    flutter_controller_ = nullptr;
+  }
+
+  Win32Window::OnDestroy();
+}
+
+LRESULT
+FlutterWindow::MessageHandler(HWND hwnd, UINT const message,
+                              WPARAM const wparam,
+                              LPARAM const lparam) noexcept {
+  // Give Flutter, including plugins, an opportunity to handle window messages.
+  if (flutter_controller_) {
+    std::optional<LRESULT> result =
+        flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam,
+                                                      lparam);
+    if (result) {
+      return *result;
+    }
+  }
+
+  switch (message) {
+    case WM_FONTCHANGE:
+      flutter_controller_->engine()->ReloadSystemFonts();
+      break;
+  }
+
+  return Win32Window::MessageHandler(hwnd, message, wparam, lparam);
+}
diff --git a/progress/windows/runner/flutter_window.h b/progress/windows/runner/flutter_window.h
new file mode 100644
index 000000000..6da0652f0
--- /dev/null
+++ b/progress/windows/runner/flutter_window.h
@@ -0,0 +1,33 @@
+#ifndef RUNNER_FLUTTER_WINDOW_H_
+#define RUNNER_FLUTTER_WINDOW_H_
+
+#include <flutter/dart_project.h>
+#include <flutter/flutter_view_controller.h>
+
+#include <memory>
+
+#include "win32_window.h"
+
+// A window that does nothing but host a Flutter view.
+class FlutterWindow : public Win32Window {
+ public:
+  // Creates a new FlutterWindow hosting a Flutter view running |project|.
+  explicit FlutterWindow(const flutter::DartProject& project);
+  virtual ~FlutterWindow();
+
+ protected:
+  // Win32Window:
+  bool OnCreate() override;
+  void OnDestroy() override;
+  LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam,
+                         LPARAM const lparam) noexcept override;
+
+ private:
+  // The project to run.
+  flutter::DartProject project_;
+
+  // The Flutter instance hosted by this window.
+  std::unique_ptr<flutter::FlutterViewController> flutter_controller_;
+};
+
+#endif  // RUNNER_FLUTTER_WINDOW_H_
diff --git a/progress/windows/runner/main.cpp b/progress/windows/runner/main.cpp
new file mode 100644
index 000000000..cb85be5e9
--- /dev/null
+++ b/progress/windows/runner/main.cpp
@@ -0,0 +1,43 @@
+#include <flutter/dart_project.h>
+#include <flutter/flutter_view_controller.h>
+#include <windows.h>
+
+#include "flutter_window.h"
+#include "utils.h"
+
+int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
+                      _In_ wchar_t *command_line, _In_ int show_command) {
+  // Attach to console when present (e.g., 'flutter run') or create a
+  // new console when running with a debugger.
+  if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) {
+    CreateAndAttachConsole();
+  }
+
+  // Initialize COM, so that it is available for use in the library and/or
+  // plugins.
+  ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
+
+  flutter::DartProject project(L"data");
+
+  std::vector<std::string> command_line_arguments =
+      GetCommandLineArguments();
+
+  project.set_dart_entrypoint_arguments(std::move(command_line_arguments));
+
+  FlutterWindow window(project);
+  Win32Window::Point origin(10, 10);
+  Win32Window::Size size(1280, 720);
+  if (!window.Create(L"progress", origin, size)) {
+    return EXIT_FAILURE;
+  }
+  window.SetQuitOnClose(true);
+
+  ::MSG msg;
+  while (::GetMessage(&msg, nullptr, 0, 0)) {
+    ::TranslateMessage(&msg);
+    ::DispatchMessage(&msg);
+  }
+
+  ::CoUninitialize();
+  return EXIT_SUCCESS;
+}
diff --git a/progress/windows/runner/resource.h b/progress/windows/runner/resource.h
new file mode 100644
index 000000000..66a65d1e4
--- /dev/null
+++ b/progress/windows/runner/resource.h
@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Runner.rc
+//
+#define IDI_APP_ICON                    101
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/progress/windows/runner/resources/app_icon.ico b/progress/windows/runner/resources/app_icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..c04e20caf6370ebb9253ad831cc31de4a9c965f6
GIT binary patch
literal 33772
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

literal 0
HcmV?d00001

diff --git a/progress/windows/runner/runner.exe.manifest b/progress/windows/runner/runner.exe.manifest
new file mode 100644
index 000000000..a42ea7687
--- /dev/null
+++ b/progress/windows/runner/runner.exe.manifest
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 and Windows 11 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+    </application>
+  </compatibility>
+</assembly>
diff --git a/progress/windows/runner/utils.cpp b/progress/windows/runner/utils.cpp
new file mode 100644
index 000000000..b2b08734d
--- /dev/null
+++ b/progress/windows/runner/utils.cpp
@@ -0,0 +1,65 @@
+#include "utils.h"
+
+#include <flutter_windows.h>
+#include <io.h>
+#include <stdio.h>
+#include <windows.h>
+
+#include <iostream>
+
+void CreateAndAttachConsole() {
+  if (::AllocConsole()) {
+    FILE *unused;
+    if (freopen_s(&unused, "CONOUT$", "w", stdout)) {
+      _dup2(_fileno(stdout), 1);
+    }
+    if (freopen_s(&unused, "CONOUT$", "w", stderr)) {
+      _dup2(_fileno(stdout), 2);
+    }
+    std::ios::sync_with_stdio();
+    FlutterDesktopResyncOutputStreams();
+  }
+}
+
+std::vector<std::string> GetCommandLineArguments() {
+  // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use.
+  int argc;
+  wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
+  if (argv == nullptr) {
+    return std::vector<std::string>();
+  }
+
+  std::vector<std::string> command_line_arguments;
+
+  // Skip the first argument as it's the binary name.
+  for (int i = 1; i < argc; i++) {
+    command_line_arguments.push_back(Utf8FromUtf16(argv[i]));
+  }
+
+  ::LocalFree(argv);
+
+  return command_line_arguments;
+}
+
+std::string Utf8FromUtf16(const wchar_t* utf16_string) {
+  if (utf16_string == nullptr) {
+    return std::string();
+  }
+  int target_length = ::WideCharToMultiByte(
+      CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
+      -1, nullptr, 0, nullptr, nullptr)
+    -1; // remove the trailing null character
+  int input_length = (int)wcslen(utf16_string);
+  std::string utf8_string;
+  if (target_length <= 0 || target_length > utf8_string.max_size()) {
+    return utf8_string;
+  }
+  utf8_string.resize(target_length);
+  int converted_length = ::WideCharToMultiByte(
+      CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
+      input_length, utf8_string.data(), target_length, nullptr, nullptr);
+  if (converted_length == 0) {
+    return std::string();
+  }
+  return utf8_string;
+}
diff --git a/progress/windows/runner/utils.h b/progress/windows/runner/utils.h
new file mode 100644
index 000000000..3879d5475
--- /dev/null
+++ b/progress/windows/runner/utils.h
@@ -0,0 +1,19 @@
+#ifndef RUNNER_UTILS_H_
+#define RUNNER_UTILS_H_
+
+#include <string>
+#include <vector>
+
+// Creates a console for the process, and redirects stdout and stderr to
+// it for both the runner and the Flutter library.
+void CreateAndAttachConsole();
+
+// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string
+// encoded in UTF-8. Returns an empty std::string on failure.
+std::string Utf8FromUtf16(const wchar_t* utf16_string);
+
+// Gets the command line arguments passed in as a std::vector<std::string>,
+// encoded in UTF-8. Returns an empty std::vector<std::string> on failure.
+std::vector<std::string> GetCommandLineArguments();
+
+#endif  // RUNNER_UTILS_H_
diff --git a/progress/windows/runner/win32_window.cpp b/progress/windows/runner/win32_window.cpp
new file mode 100644
index 000000000..60608d0fe
--- /dev/null
+++ b/progress/windows/runner/win32_window.cpp
@@ -0,0 +1,288 @@
+#include "win32_window.h"
+
+#include <dwmapi.h>
+#include <flutter_windows.h>
+
+#include "resource.h"
+
+namespace {
+
+/// Window attribute that enables dark mode window decorations.
+///
+/// Redefined in case the developer's machine has a Windows SDK older than
+/// version 10.0.22000.0.
+/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute
+#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE
+#define DWMWA_USE_IMMERSIVE_DARK_MODE 20
+#endif
+
+constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW";
+
+/// Registry key for app theme preference.
+///
+/// A value of 0 indicates apps should use dark mode. A non-zero or missing
+/// value indicates apps should use light mode.
+constexpr const wchar_t kGetPreferredBrightnessRegKey[] =
+  L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
+constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme";
+
+// The number of Win32Window objects that currently exist.
+static int g_active_window_count = 0;
+
+using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd);
+
+// Scale helper to convert logical scaler values to physical using passed in
+// scale factor
+int Scale(int source, double scale_factor) {
+  return static_cast<int>(source * scale_factor);
+}
+
+// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module.
+// This API is only needed for PerMonitor V1 awareness mode.
+void EnableFullDpiSupportIfAvailable(HWND hwnd) {
+  HMODULE user32_module = LoadLibraryA("User32.dll");
+  if (!user32_module) {
+    return;
+  }
+  auto enable_non_client_dpi_scaling =
+      reinterpret_cast<EnableNonClientDpiScaling*>(
+          GetProcAddress(user32_module, "EnableNonClientDpiScaling"));
+  if (enable_non_client_dpi_scaling != nullptr) {
+    enable_non_client_dpi_scaling(hwnd);
+  }
+  FreeLibrary(user32_module);
+}
+
+}  // namespace
+
+// Manages the Win32Window's window class registration.
+class WindowClassRegistrar {
+ public:
+  ~WindowClassRegistrar() = default;
+
+  // Returns the singleton registrar instance.
+  static WindowClassRegistrar* GetInstance() {
+    if (!instance_) {
+      instance_ = new WindowClassRegistrar();
+    }
+    return instance_;
+  }
+
+  // Returns the name of the window class, registering the class if it hasn't
+  // previously been registered.
+  const wchar_t* GetWindowClass();
+
+  // Unregisters the window class. Should only be called if there are no
+  // instances of the window.
+  void UnregisterWindowClass();
+
+ private:
+  WindowClassRegistrar() = default;
+
+  static WindowClassRegistrar* instance_;
+
+  bool class_registered_ = false;
+};
+
+WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr;
+
+const wchar_t* WindowClassRegistrar::GetWindowClass() {
+  if (!class_registered_) {
+    WNDCLASS window_class{};
+    window_class.hCursor = LoadCursor(nullptr, IDC_ARROW);
+    window_class.lpszClassName = kWindowClassName;
+    window_class.style = CS_HREDRAW | CS_VREDRAW;
+    window_class.cbClsExtra = 0;
+    window_class.cbWndExtra = 0;
+    window_class.hInstance = GetModuleHandle(nullptr);
+    window_class.hIcon =
+        LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON));
+    window_class.hbrBackground = 0;
+    window_class.lpszMenuName = nullptr;
+    window_class.lpfnWndProc = Win32Window::WndProc;
+    RegisterClass(&window_class);
+    class_registered_ = true;
+  }
+  return kWindowClassName;
+}
+
+void WindowClassRegistrar::UnregisterWindowClass() {
+  UnregisterClass(kWindowClassName, nullptr);
+  class_registered_ = false;
+}
+
+Win32Window::Win32Window() {
+  ++g_active_window_count;
+}
+
+Win32Window::~Win32Window() {
+  --g_active_window_count;
+  Destroy();
+}
+
+bool Win32Window::Create(const std::wstring& title,
+                         const Point& origin,
+                         const Size& size) {
+  Destroy();
+
+  const wchar_t* window_class =
+      WindowClassRegistrar::GetInstance()->GetWindowClass();
+
+  const POINT target_point = {static_cast<LONG>(origin.x),
+                              static_cast<LONG>(origin.y)};
+  HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST);
+  UINT dpi = FlutterDesktopGetDpiForMonitor(monitor);
+  double scale_factor = dpi / 96.0;
+
+  HWND window = CreateWindow(
+      window_class, title.c_str(), WS_OVERLAPPEDWINDOW,
+      Scale(origin.x, scale_factor), Scale(origin.y, scale_factor),
+      Scale(size.width, scale_factor), Scale(size.height, scale_factor),
+      nullptr, nullptr, GetModuleHandle(nullptr), this);
+
+  if (!window) {
+    return false;
+  }
+
+  UpdateTheme(window);
+
+  return OnCreate();
+}
+
+bool Win32Window::Show() {
+  return ShowWindow(window_handle_, SW_SHOWNORMAL);
+}
+
+// static
+LRESULT CALLBACK Win32Window::WndProc(HWND const window,
+                                      UINT const message,
+                                      WPARAM const wparam,
+                                      LPARAM const lparam) noexcept {
+  if (message == WM_NCCREATE) {
+    auto window_struct = reinterpret_cast<CREATESTRUCT*>(lparam);
+    SetWindowLongPtr(window, GWLP_USERDATA,
+                     reinterpret_cast<LONG_PTR>(window_struct->lpCreateParams));
+
+    auto that = static_cast<Win32Window*>(window_struct->lpCreateParams);
+    EnableFullDpiSupportIfAvailable(window);
+    that->window_handle_ = window;
+  } else if (Win32Window* that = GetThisFromHandle(window)) {
+    return that->MessageHandler(window, message, wparam, lparam);
+  }
+
+  return DefWindowProc(window, message, wparam, lparam);
+}
+
+LRESULT
+Win32Window::MessageHandler(HWND hwnd,
+                            UINT const message,
+                            WPARAM const wparam,
+                            LPARAM const lparam) noexcept {
+  switch (message) {
+    case WM_DESTROY:
+      window_handle_ = nullptr;
+      Destroy();
+      if (quit_on_close_) {
+        PostQuitMessage(0);
+      }
+      return 0;
+
+    case WM_DPICHANGED: {
+      auto newRectSize = reinterpret_cast<RECT*>(lparam);
+      LONG newWidth = newRectSize->right - newRectSize->left;
+      LONG newHeight = newRectSize->bottom - newRectSize->top;
+
+      SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth,
+                   newHeight, SWP_NOZORDER | SWP_NOACTIVATE);
+
+      return 0;
+    }
+    case WM_SIZE: {
+      RECT rect = GetClientArea();
+      if (child_content_ != nullptr) {
+        // Size and position the child window.
+        MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left,
+                   rect.bottom - rect.top, TRUE);
+      }
+      return 0;
+    }
+
+    case WM_ACTIVATE:
+      if (child_content_ != nullptr) {
+        SetFocus(child_content_);
+      }
+      return 0;
+
+    case WM_DWMCOLORIZATIONCOLORCHANGED:
+      UpdateTheme(hwnd);
+      return 0;
+  }
+
+  return DefWindowProc(window_handle_, message, wparam, lparam);
+}
+
+void Win32Window::Destroy() {
+  OnDestroy();
+
+  if (window_handle_) {
+    DestroyWindow(window_handle_);
+    window_handle_ = nullptr;
+  }
+  if (g_active_window_count == 0) {
+    WindowClassRegistrar::GetInstance()->UnregisterWindowClass();
+  }
+}
+
+Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept {
+  return reinterpret_cast<Win32Window*>(
+      GetWindowLongPtr(window, GWLP_USERDATA));
+}
+
+void Win32Window::SetChildContent(HWND content) {
+  child_content_ = content;
+  SetParent(content, window_handle_);
+  RECT frame = GetClientArea();
+
+  MoveWindow(content, frame.left, frame.top, frame.right - frame.left,
+             frame.bottom - frame.top, true);
+
+  SetFocus(child_content_);
+}
+
+RECT Win32Window::GetClientArea() {
+  RECT frame;
+  GetClientRect(window_handle_, &frame);
+  return frame;
+}
+
+HWND Win32Window::GetHandle() {
+  return window_handle_;
+}
+
+void Win32Window::SetQuitOnClose(bool quit_on_close) {
+  quit_on_close_ = quit_on_close;
+}
+
+bool Win32Window::OnCreate() {
+  // No-op; provided for subclasses.
+  return true;
+}
+
+void Win32Window::OnDestroy() {
+  // No-op; provided for subclasses.
+}
+
+void Win32Window::UpdateTheme(HWND const window) {
+  DWORD light_mode;
+  DWORD light_mode_size = sizeof(light_mode);
+  LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey,
+                               kGetPreferredBrightnessRegValue,
+                               RRF_RT_REG_DWORD, nullptr, &light_mode,
+                               &light_mode_size);
+
+  if (result == ERROR_SUCCESS) {
+    BOOL enable_dark_mode = light_mode == 0;
+    DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE,
+                          &enable_dark_mode, sizeof(enable_dark_mode));
+  }
+}
diff --git a/progress/windows/runner/win32_window.h b/progress/windows/runner/win32_window.h
new file mode 100644
index 000000000..e901dde68
--- /dev/null
+++ b/progress/windows/runner/win32_window.h
@@ -0,0 +1,102 @@
+#ifndef RUNNER_WIN32_WINDOW_H_
+#define RUNNER_WIN32_WINDOW_H_
+
+#include <windows.h>
+
+#include <functional>
+#include <memory>
+#include <string>
+
+// A class abstraction for a high DPI-aware Win32 Window. Intended to be
+// inherited from by classes that wish to specialize with custom
+// rendering and input handling
+class Win32Window {
+ public:
+  struct Point {
+    unsigned int x;
+    unsigned int y;
+    Point(unsigned int x, unsigned int y) : x(x), y(y) {}
+  };
+
+  struct Size {
+    unsigned int width;
+    unsigned int height;
+    Size(unsigned int width, unsigned int height)
+        : width(width), height(height) {}
+  };
+
+  Win32Window();
+  virtual ~Win32Window();
+
+  // Creates a win32 window with |title| that is positioned and sized using
+  // |origin| and |size|. New windows are created on the default monitor. Window
+  // sizes are specified to the OS in physical pixels, hence to ensure a
+  // consistent size this function will scale the inputted width and height as
+  // as appropriate for the default monitor. The window is invisible until
+  // |Show| is called. Returns true if the window was created successfully.
+  bool Create(const std::wstring& title, const Point& origin, const Size& size);
+
+  // Show the current window. Returns true if the window was successfully shown.
+  bool Show();
+
+  // Release OS resources associated with window.
+  void Destroy();
+
+  // Inserts |content| into the window tree.
+  void SetChildContent(HWND content);
+
+  // Returns the backing Window handle to enable clients to set icon and other
+  // window properties. Returns nullptr if the window has been destroyed.
+  HWND GetHandle();
+
+  // If true, closing this window will quit the application.
+  void SetQuitOnClose(bool quit_on_close);
+
+  // Return a RECT representing the bounds of the current client area.
+  RECT GetClientArea();
+
+ protected:
+  // Processes and route salient window messages for mouse handling,
+  // size change and DPI. Delegates handling of these to member overloads that
+  // inheriting classes can handle.
+  virtual LRESULT MessageHandler(HWND window,
+                                 UINT const message,
+                                 WPARAM const wparam,
+                                 LPARAM const lparam) noexcept;
+
+  // Called when CreateAndShow is called, allowing subclass window-related
+  // setup. Subclasses should return false if setup fails.
+  virtual bool OnCreate();
+
+  // Called when Destroy is called.
+  virtual void OnDestroy();
+
+ private:
+  friend class WindowClassRegistrar;
+
+  // OS callback called by message pump. Handles the WM_NCCREATE message which
+  // is passed when the non-client area is being created and enables automatic
+  // non-client DPI scaling so that the non-client area automatically
+  // responds to changes in DPI. All other messages are handled by
+  // MessageHandler.
+  static LRESULT CALLBACK WndProc(HWND const window,
+                                  UINT const message,
+                                  WPARAM const wparam,
+                                  LPARAM const lparam) noexcept;
+
+  // Retrieves a class instance pointer for |window|
+  static Win32Window* GetThisFromHandle(HWND const window) noexcept;
+
+  // Update the window frame's theme to match the system theme.
+  static void UpdateTheme(HWND const window);
+
+  bool quit_on_close_ = false;
+
+  // window handle for top level window.
+  HWND window_handle_ = nullptr;
+
+  // window handle for hosted content.
+  HWND child_content_ = nullptr;
+};
+
+#endif  // RUNNER_WIN32_WINDOW_H_

From a29b1f3533c779544472cfc8b27485934f2908c3 Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Mon, 19 Aug 2024 20:34:11 +0800
Subject: [PATCH 25/74] =?UTF-8?q?=E6=96=B0=E5=A2=9EshowLabel=3F=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 progress/lib/progress.dart | 111 +++++++++++++++++++++----------------
 1 file changed, 64 insertions(+), 47 deletions(-)

diff --git a/progress/lib/progress.dart b/progress/lib/progress.dart
index e504e4e9a..c8f01872a 100644
--- a/progress/lib/progress.dart
+++ b/progress/lib/progress.dart
@@ -30,18 +30,19 @@ class Progress {
   Progress._();
 
   /// 创建线性进度条
-  static Widget linear<T extends LabelWidget>({
-    Key? key,
-    double? value,
-    T? label,
-    ProgressStatus progressStatus = ProgressStatus.primary,
-    ProgressLabelPosition progressLabelPosition = ProgressLabelPosition.inside,
-    double strokeWidth = 20.0,
-    Color? color,
-    Color backgroundColor = const Color(0xFFEEEEEE),
-    BorderRadiusGeometry borderRadius =
-        const BorderRadius.all(Radius.circular(20)),
-  }) {
+  static Widget linear<T extends LabelWidget>(
+      {Key? key,
+      double? value,
+      T? label,
+      ProgressStatus progressStatus = ProgressStatus.primary,
+      ProgressLabelPosition progressLabelPosition =
+          ProgressLabelPosition.inside,
+      double strokeWidth = 20.0,
+      Color? color,
+      Color backgroundColor = const Color(0xFFEEEEEE),
+      BorderRadiusGeometry borderRadius =
+          const BorderRadius.all(Radius.circular(20)),
+      bool showLabel = true}) {
     return _ProgressIndicator<T>(
         key: key,
         value: value,
@@ -52,6 +53,7 @@ class Progress {
         color: color,
         backgroundColor: backgroundColor,
         borderRadius: borderRadius,
+        showLabel: showLabel,
         type: _ProgressType.linear);
   }
 
@@ -65,6 +67,7 @@ class Progress {
     Color? color,
     Color backgroundColor = const Color(0xFFEEEEEE),
     double circleRadius = 80.0,
+    bool showLabel = true,
   }) {
     return _ProgressIndicator<T>(
       key: key,
@@ -75,21 +78,22 @@ class Progress {
       color: color,
       backgroundColor: backgroundColor,
       circleRadius: circleRadius,
+      showLabel: showLabel,
       type: _ProgressType.circular,
     );
   }
 
   //构建微型进度条
-  static Widget micro<T extends LabelWidget>({
-    Key? key,
-    double? value,
-    T? label,
-    ProgressStatus progressStatus = ProgressStatus.primary,
-    double strokeWidth = 2.0,
-    Color? color,
-    Color backgroundColor = const Color(0xFFEEEEEE),
-    double circleRadius = 20.0,
-  }) {
+  static Widget micro<T extends LabelWidget>(
+      {Key? key,
+      double? value,
+      T? label,
+      ProgressStatus progressStatus = ProgressStatus.primary,
+      double strokeWidth = 2.0,
+      Color? color,
+      Color backgroundColor = const Color(0xFFEEEEEE),
+      double circleRadius = 20.0,
+      bool showLabel = false}) {
     return _ProgressIndicator(
       key: key,
       value: value,
@@ -99,12 +103,12 @@ class Progress {
       color: color,
       backgroundColor: backgroundColor,
       circleRadius: circleRadius,
+      showLabel: showLabel,
       type: _ProgressType.micro,
     );
   }
 }
 
-
 // 构建进度条基础小部件类
 class _ProgressIndicator<T extends LabelWidget> extends StatefulWidget {
   final double? value;
@@ -118,6 +122,7 @@ class _ProgressIndicator<T extends LabelWidget> extends StatefulWidget {
   final _ProgressType type;
   final StrokeCap strokeCap;
   final ProgressStatus progressStatus;
+  final bool showLabel;
 
   const _ProgressIndicator(
       {Key? key,
@@ -131,7 +136,8 @@ class _ProgressIndicator<T extends LabelWidget> extends StatefulWidget {
       this.backgroundColor = const Color(0xFFEEEEEE),
       this.type = _ProgressType.linear,
       this.strokeCap = StrokeCap.round,
-      this.progressStatus = ProgressStatus.primary})
+      this.progressStatus = ProgressStatus.primary,
+      this.showLabel = true})
       : super(key: key);
 
   @override
@@ -191,8 +197,7 @@ class _ProgressIndicatorState<T extends LabelWidget>
 
   //根据status构建默认参数
   Widget _getDefaultLabelFromStatus(ProgressStatus status) {
-    final bool showAutoText =
-        widget.value != null && widget.type != _ProgressType.micro;
+    final bool showAutoText = widget.value != null;
     final bool showInsideLabel =
         widget.progressLabelPosition == ProgressLabelPosition.inside &&
             widget.type != _ProgressType.circular;
@@ -204,12 +209,21 @@ class _ProgressIndicatorState<T extends LabelWidget>
 
     final statusWidgets = {
       ProgressStatus.primary: getAutoText(),
-      ProgressStatus.warning:
-          showInsideLabel ? getAutoText() :showIconBorder?const Icon(TDIcons.error_circle_filled): const Icon(TDIcons.error),
-      ProgressStatus.danger:
-          showInsideLabel ? getAutoText() : showIconBorder?const Icon(TDIcons.close_circle_filled): const Icon(TDIcons.close),
-      ProgressStatus.success:
-          showInsideLabel ? getAutoText() : showIconBorder?const Icon(TDIcons.check_circle_filled): const Icon(TDIcons.check),
+      ProgressStatus.warning: showInsideLabel
+          ? getAutoText()
+          : showIconBorder
+              ? const Icon(TDIcons.error_circle_filled)
+              : const Icon(TDIcons.error),
+      ProgressStatus.danger: showInsideLabel
+          ? getAutoText()
+          : showIconBorder
+              ? const Icon(TDIcons.close_circle_filled)
+              : const Icon(TDIcons.close),
+      ProgressStatus.success: showInsideLabel
+          ? getAutoText()
+          : showIconBorder
+              ? const Icon(TDIcons.check_circle_filled)
+              : const Icon(TDIcons.check),
     };
 
     return statusWidgets[status] ?? getAutoText(); // 如果状态不匹配，默认返回自动文本
@@ -332,13 +346,15 @@ class _ProgressIndicatorState<T extends LabelWidget>
         color: _effectiveColor,
         borderRadius: widget.borderRadius,
       ),
-      child: Align(
-        alignment: Alignment.centerRight,
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 10.0),
-          child: _buildLabelWidget(Colors.white),
-        ),
-      ),
+      child: widget.showLabel
+          ? Align(
+              alignment: Alignment.centerRight,
+              child: Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 10.0),
+                child: _buildLabelWidget(Colors.white),
+              ),
+            )
+          : null,
     );
   }
 
@@ -355,10 +371,11 @@ class _ProgressIndicatorState<T extends LabelWidget>
             borderRadius: widget.borderRadius,
           ),
         ),
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 5.0),
-          child: _buildLabelWidget(Colors.black),
-        ),
+        if (widget.showLabel)
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 5.0),
+            child: _buildLabelWidget(Colors.black),
+          ),
       ],
     );
   }
@@ -372,7 +389,7 @@ class _ProgressIndicatorState<T extends LabelWidget>
     switch (widget.type) {
       case _ProgressType.linear:
         iconSize = widget.strokeWidth;
-        fontSize = widget.strokeWidth  * 0.6;
+        fontSize = widget.strokeWidth * 0.6;
         fontWeight = FontWeight.normal;
         break;
       case _ProgressType.circular:
@@ -404,7 +421,7 @@ class _ProgressIndicatorState<T extends LabelWidget>
       ),
     );
   }
-  
+
   // 构建圆形进度条
   Widget _buildCircularProgress() {
     return AnimatedBuilder(
@@ -427,7 +444,7 @@ class _ProgressIndicatorState<T extends LabelWidget>
                 ),
               ),
             ),
-            _buildLabelWidget(Colors.black),
+            if (widget.showLabel) _buildLabelWidget(Colors.black),
           ],
         );
       },
@@ -456,7 +473,7 @@ class _ProgressIndicatorState<T extends LabelWidget>
                   ),
                 ),
               ),
-              _buildLabelWidget(Colors.black),
+              if (widget.showLabel) _buildLabelWidget(Colors.black),
             ],
           );
         });

From 02acd014d3a70983049b02489c69f7aba4c8dc71 Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Mon, 19 Aug 2024 21:38:47 +0800
Subject: [PATCH 26/74] =?UTF-8?q?=E4=BF=AE=E5=A4=8Danimation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 progress/lib/progress.dart | 52 ++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/progress/lib/progress.dart b/progress/lib/progress.dart
index c8f01872a..bf6327c38 100644
--- a/progress/lib/progress.dart
+++ b/progress/lib/progress.dart
@@ -159,6 +159,8 @@ class _ProgressIndicatorState<T extends LabelWidget>
       duration: const Duration(seconds: 1),
     );
     _updateAnimation();
+    final int duration = (_animation.value * 1000).toInt();
+    _animationController.duration = Duration(milliseconds: duration);
     _updateEffectiveColor();
     _updateEffectiveLabel();
   }
@@ -301,28 +303,34 @@ class _ProgressIndicatorState<T extends LabelWidget>
 
   //构建外显label
   Widget _buildOutsideLabel() {
-    return Row(
-      children: [
-        if (widget.progressLabelPosition == ProgressLabelPosition.left)
-          Padding(
-            padding: const EdgeInsets.only(right: 8.0),
-            child: _buildLabelWidget(Colors.black),
-          ),
-        Expanded(
-          child: LinearProgressIndicator(
-            borderRadius: widget.borderRadius,
-            value: widget.value != null ? _animation.value : null,
-            backgroundColor: widget.backgroundColor,
-            valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
-            minHeight: widget.strokeWidth,
-          ),
-        ),
-        if (widget.progressLabelPosition == ProgressLabelPosition.right)
-          Padding(
-            padding: const EdgeInsets.only(left: 8.0),
-            child: _buildLabelWidget(Colors.black),
-          ),
-      ],
+    return AnimatedBuilder(
+      animation: _animation,
+      builder: (context, child)  {
+        return Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            if (widget.progressLabelPosition == ProgressLabelPosition.left)
+              Padding(
+                padding: const EdgeInsets.only(right: 8.0),
+                child: _buildLabelWidget(Colors.black),
+              ),
+            Expanded(
+              child: LinearProgressIndicator(
+                borderRadius: widget.borderRadius,
+                value: widget.value != null ? _animation.value : null,
+                backgroundColor: widget.backgroundColor,
+                valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
+                minHeight: widget.strokeWidth,
+              ),
+            ),
+            if (widget.progressLabelPosition == ProgressLabelPosition.right)
+              Padding(
+                padding: const EdgeInsets.only(left: 8.0),
+                child: _buildLabelWidget(Colors.black),
+              ),
+          ],
+        );
+      },
     );
   }
 

From fcb3fe334f8d22f6fbffc86885d23306d626fb73 Mon Sep 17 00:00:00 2001
From: 221250009 <221250009@smail.nju.edu.cn>
Date: Wed, 21 Aug 2024 01:18:01 +0800
Subject: [PATCH 27/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=8B=E5=8A=BF?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 progress/lib/main.dart     |  25 +++++-
 progress/lib/progress.dart | 156 ++++++++++++++++++++++++++++++-------
 2 files changed, 153 insertions(+), 28 deletions(-)

diff --git a/progress/lib/main.dart b/progress/lib/main.dart
index dc8d87099..f3e44db41 100644
--- a/progress/lib/main.dart
+++ b/progress/lib/main.dart
@@ -28,6 +28,7 @@ class Home extends StatefulWidget {
 }
 
 class _HomeState extends State<Home> {
+  TextLabel buttonLabel = const TextLabel("50%");
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -64,8 +65,30 @@ class _HomeState extends State<Home> {
             ),
           ]),
           _buildSection("微型进度条", [
-            Progress.micro(value: 0.3, label: const IconLabel(TDIcons.arrow_down)),
+            Progress.micro(value: 0.3),
           ]),
+          _buildSection("微型按钮进度条", [
+            Row(
+              children: [
+                Progress.micro(value: 0.3, onTap: (){}, label: const IconLabel(Icons.play_arrow, color: Colors.blue)),
+                const SizedBox(width: 10),
+                Progress.micro(value: 0.3, onTap: (){}, label: const IconLabel(Icons.pause, color: Colors.blue)),
+                const SizedBox(width: 10),
+                Progress.micro(value: 0.3, onTap: (){}, label: const IconLabel(Icons.stop, color: Colors.blue))
+              ]
+            )
+          ]),
+          _buildSection("按钮进度条", [
+            Progress.button(
+              onTap: (){
+                setState(() {
+                  buttonLabel = buttonLabel.data == "50%" ? const TextLabel("继续") : const TextLabel("50%");
+                });
+              },
+              value: .5,
+              label: buttonLabel,
+            ),
+          ])
         ],
       ),
     );
diff --git a/progress/lib/progress.dart b/progress/lib/progress.dart
index bf6327c38..b7112350f 100644
--- a/progress/lib/progress.dart
+++ b/progress/lib/progress.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:tdesign_flutter/tdesign_flutter.dart';
 
 // 用于区分线性和圆形进度条的枚举
-enum _ProgressType { linear, circular, micro }
+enum _ProgressType { linear, circular, micro, button }
 
 //label位置的枚举
 enum ProgressLabelPosition { inside, left, right }
@@ -93,20 +93,56 @@ class Progress {
       Color? color,
       Color backgroundColor = const Color(0xFFEEEEEE),
       double circleRadius = 20.0,
-      bool showLabel = false}) {
+      VoidCallback? onTap,
+      VoidCallback? onLongPress,
+      bool showLabel = true}) {
     return _ProgressIndicator(
       key: key,
       value: value,
-      label: label,
+      label: label ?? const TextLabel(""),
       progressStatus: progressStatus,
       strokeWidth: strokeWidth,
       color: color,
       backgroundColor: backgroundColor,
       circleRadius: circleRadius,
+      onTap: onTap,
+      onLongPress: onLongPress,
       showLabel: showLabel,
       type: _ProgressType.micro,
     );
   }
+
+  // 构建按钮进度条
+  static Widget button<T extends LabelWidget>(
+      {Key? key,
+      double? value,
+      T? label,
+      ProgressStatus progressStatus = ProgressStatus.primary,
+      ProgressLabelPosition progressLabelPosition =
+          ProgressLabelPosition.inside,
+      double strokeWidth = 60.0,
+      Color? color,
+      Color backgroundColor = Colors.blue,
+      BorderRadiusGeometry borderRadius =
+          const BorderRadius.all(Radius.circular(10)),
+      VoidCallback? onTap,
+      VoidCallback? onLongPress,
+      bool showLabel = true}) {
+    return _ProgressIndicator<T>(
+        key: key,
+        value: value,
+        label: label,
+        progressStatus: progressStatus,
+        progressLabelPosition: progressLabelPosition,
+        strokeWidth: strokeWidth,
+        color: color,
+        backgroundColor: backgroundColor,
+        borderRadius: borderRadius,
+        showLabel: showLabel,
+        onTap: onTap,
+        onLongPress: onLongPress,
+        type: _ProgressType.button);
+  }
 }
 
 // 构建进度条基础小部件类
@@ -123,6 +159,8 @@ class _ProgressIndicator<T extends LabelWidget> extends StatefulWidget {
   final StrokeCap strokeCap;
   final ProgressStatus progressStatus;
   final bool showLabel;
+  final VoidCallback? onTap;
+  final VoidCallback? onLongPress;
 
   const _ProgressIndicator(
       {Key? key,
@@ -137,7 +175,9 @@ class _ProgressIndicator<T extends LabelWidget> extends StatefulWidget {
       this.type = _ProgressType.linear,
       this.strokeCap = StrokeCap.round,
       this.progressStatus = ProgressStatus.primary,
-      this.showLabel = true})
+      this.showLabel = true,
+      this.onTap,
+      this.onLongPress})
       : super(key: key);
 
   @override
@@ -261,7 +301,9 @@ class _ProgressIndicatorState<T extends LabelWidget>
         else if (widget.type == _ProgressType.circular)
           _buildCircularProgress()
         else if (widget.type == _ProgressType.micro)
-          _buildMicroProgress(),
+          _buildMicroProgress()
+        else if (widget.type == _ProgressType.button)
+          _buildButtonProgress()
       ],
     );
   }
@@ -305,7 +347,7 @@ class _ProgressIndicatorState<T extends LabelWidget>
   Widget _buildOutsideLabel() {
     return AnimatedBuilder(
       animation: _animation,
-      builder: (context, child)  {
+      builder: (context, child) {
         return Row(
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
@@ -406,10 +448,15 @@ class _ProgressIndicatorState<T extends LabelWidget>
         fontWeight = FontWeight.bold;
         break;
       case _ProgressType.micro:
-        iconSize = widget.circleRadius * 0.4;
+        iconSize = widget.circleRadius * 0.6;
         fontSize = widget.circleRadius * 0.2;
         fontWeight = FontWeight.normal;
         break;
+      case _ProgressType.button:
+        iconSize = widget.strokeWidth * 0.8;
+        fontSize = widget.strokeWidth * 0.4;
+        fontWeight = FontWeight.normal;
+        break;
       default:
         iconSize = 20;
         fontSize = 12;
@@ -464,26 +511,81 @@ class _ProgressIndicatorState<T extends LabelWidget>
     return AnimatedBuilder(
         animation: _animation,
         builder: (context, child) {
-          return Stack(
-            alignment: Alignment.center,
-            children: [
-              SizedBox(
-                height: widget.circleRadius,
-                width: widget.circleRadius,
-                child: Padding(
-                  padding: EdgeInsets.all(widget.strokeWidth / 2),
-                  child: CircularProgressIndicator(
-                    value: widget.value != null ? _animation.value : null,
-                    backgroundColor: widget.backgroundColor,
-                    strokeCap: widget.strokeCap,
-                    valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
-                    strokeWidth: widget.strokeWidth,
-                  ),
-                ),
-              ),
-              if (widget.showLabel) _buildLabelWidget(Colors.black),
-            ],
+          return GestureDetector(
+            onTap: widget.onTap,
+            onLongPress: widget.onLongPress,
+            child: Stack(
+              alignment: Alignment.center,
+              children: [
+                _buildMicroOutline(),
+                if (widget.showLabel) _buildLabelWidget(Colors.black),
+              ],
+            )
           );
-        });
+        }
+    );
+  }
+
+  Widget _buildMicroOutline() {
+    return SizedBox(
+      height: widget.circleRadius,
+      width: widget.circleRadius,
+      child: Padding(
+        padding: EdgeInsets.all(widget.strokeWidth / 2),
+        child: CircularProgressIndicator(
+          value: widget.value != null ? _animation.value : null,
+          backgroundColor: widget.backgroundColor,
+          strokeCap: widget.strokeCap,
+          valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
+          strokeWidth: widget.strokeWidth,
+        ),
+      ),
+    );
+  }
+
+  Widget _buildButtonProgress() {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final maxWidth = constraints.maxWidth;
+        return AnimatedBuilder(
+          animation: _animation,
+          builder: (context, child) {
+            final progressWidth = maxWidth * _animation.value;
+            return GestureDetector(
+              onTap: widget.onTap,
+              onLongPress: widget.onLongPress,
+              child: Stack(
+                children: [
+                  _buildBackgroundContainer(),
+                  _buildButtonActiveContainer(progressWidth),
+                  if (widget.showLabel) _buildButtonLabel(maxWidth),
+                ],
+              )
+            );
+          }
+        );
+      },
+    );
+  }
+
+  // 按钮进度条内容器
+  Widget _buildButtonActiveContainer(double progressWidth) {
+    return Container(
+      height: widget.strokeWidth,
+      width: progressWidth,
+      decoration: BoxDecoration(
+        gradient: LinearGradient(
+            colors: [widget.backgroundColor, Colors.white.withOpacity(.2)]),
+        borderRadius: widget.borderRadius,
+      ),
+    );
+  }
+
+  Widget _buildButtonLabel(double maxWidth) {
+    return Container(
+      height: widget.strokeWidth,
+      alignment: Alignment.center,
+      child: _buildLabelWidget(Colors.white),
+    );
   }
 }

From 0c17ed45f3cf3ff7a7f747419010518f51c0e199 Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Wed, 21 Aug 2024 15:51:56 +0800
Subject: [PATCH 28/74] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 progress/.metadata                            |  45 --
 progress/lib/main.dart                        | 192 ++++--
 .../lib/{progress.dart => old_progress.dart}  |  66 +-
 progress/lib/progressbar.dart                 | 124 ----
 progress/lib/td_progress.dart                 | 574 ++++++++++++++++++
 5 files changed, 757 insertions(+), 244 deletions(-)
 delete mode 100644 progress/.metadata
 rename progress/lib/{progress.dart => old_progress.dart} (93%)
 delete mode 100644 progress/lib/progressbar.dart
 create mode 100644 progress/lib/td_progress.dart

diff --git a/progress/.metadata b/progress/.metadata
deleted file mode 100644
index 900720458..000000000
--- a/progress/.metadata
+++ /dev/null
@@ -1,45 +0,0 @@
-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
-  revision: "8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f"
-  channel: "[user-branch]"
-
-project_type: app
-
-# Tracks metadata for the flutter migrate command
-migration:
-  platforms:
-    - platform: root
-      create_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
-      base_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
-    - platform: android
-      create_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
-      base_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
-    - platform: ios
-      create_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
-      base_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
-    - platform: linux
-      create_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
-      base_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
-    - platform: macos
-      create_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
-      base_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
-    - platform: web
-      create_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
-      base_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
-    - platform: windows
-      create_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
-      base_revision: 8fcb74dbc16b9edb3d3f14c11c627d9e8f24fb1f
-
-  # User provided section
-
-  # List of Local paths (relative to this file) that should be
-  # ignored by the migrate tool.
-  #
-  # Files that are not part of the templates will be ignored by default.
-  unmanaged_files:
-    - 'lib/main.dart'
-    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/progress/lib/main.dart b/progress/lib/main.dart
index f3e44db41..3e7c7a4ee 100644
--- a/progress/lib/main.dart
+++ b/progress/lib/main.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:tdesign_flutter/tdesign_flutter.dart';
-import './progress.dart';
+// 假设Progress组件在一个单独的文件中
+import 'td_progress.dart';
+import 'dart:async';
 
 void main() {
   runApp(const MyApp());
@@ -11,9 +12,12 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const MaterialApp(
-      title: 'Flutter Demo',
-      home: Home(title: 'Flutter Demo Home Page'),
+    return MaterialApp(
+      title: '进度条演示',
+      theme: ThemeData(
+        primarySwatch: Colors.blue,
+      ),
+      home: const Home(title: '进度条演示主页'),
     );
   }
 }
@@ -28,7 +32,90 @@ class Home extends StatefulWidget {
 }
 
 class _HomeState extends State<Home> {
-  TextLabel buttonLabel = const TextLabel("50%");
+  TDLabelWidget buttonLabel = const TDTextLabel("0%");
+  double progressValue = 0.0;
+  Timer? _timer;
+  bool isProgressing = false;
+
+  // 新增：用于微型按钮进度条的状态
+  bool isPlaying = false;
+  double microProgressValue = 0.0;
+  Timer? _microTimer;
+
+  @override
+  void dispose() {
+    _timer?.cancel();
+    _microTimer?.cancel();
+    super.dispose();
+  }
+
+  void _toggleProgress() {
+    if (isProgressing) {
+      // 暂停进度
+      _timer?.cancel();
+      setState(() {
+        buttonLabel = const TDTextLabel("继续");
+        isProgressing = false;
+      });
+    } else {
+      // 开始或继续进度
+      _timer?.cancel();
+      _timer = Timer.periodic(const Duration(milliseconds: 100), (timer) {
+        setState(() {
+          if (progressValue < 1.0) {
+            progressValue += 0.01;
+            buttonLabel = TDTextLabel("${(progressValue * 100).toInt()}%");
+          } else {
+            _timer?.cancel();
+            buttonLabel = const TDTextLabel("完成");
+            isProgressing = false;
+          }
+        });
+      });
+      setState(() {
+        isProgressing = true;
+      });
+    }
+  }
+
+  void _resetProgress() {
+    _timer?.cancel();
+    setState(() {
+      progressValue = 0.0;
+      buttonLabel = const TDTextLabel("开始");
+      isProgressing = false;
+    });
+  }
+  // 新增：控制微型按钮进度条的方法
+  void _toggleMicroProgress() {
+    setState(() {
+      isPlaying = !isPlaying;
+    });
+    if (isPlaying) {
+      _microTimer = Timer.periodic(const Duration(milliseconds: 100), (timer) {
+        setState(() {
+          if (microProgressValue < 1.0) {
+            microProgressValue += 0.01;
+          } else {
+            _microTimer?.cancel();
+            isPlaying = false;
+            microProgressValue = 0.0;
+          }
+        });
+      });
+    } else {
+      _microTimer?.cancel();
+    }
+  }
+
+  void _resetMicroProgress() {
+    _microTimer?.cancel();
+    setState(() {
+      isPlaying = false;
+      microProgressValue = 0.0;
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -36,58 +123,81 @@ class _HomeState extends State<Home> {
       body: ListView(
         padding: const EdgeInsets.all(16.0),
         children: [
-          _buildSection("线形进度条", [
-            _buildProgressItem("无确定值", Progress.linear(strokeWidth: 5)),
-            _buildProgressItem("有确定值,小于等于10%", Progress.linear(value: 0.1)),
-            _buildProgressItem("有确定值，大于10%", Progress.linear(value: 0.5)),
-            _buildProgressItem("label靠左，大于10%", Progress.linear(
-                value: 0.5, progressLabelPosition: ProgressLabelPosition.left)),
-            _buildProgressItem("自定义label", Progress.linear(value: 0.5, label: TextLabel("百分之50"))),
-            _buildProgressItem("label靠右，大于10%", Progress.linear(
-                value: 0.5, progressLabelPosition: ProgressLabelPosition.right)),
-            _buildProgressItem("更改status", Progress.linear(value: 0.5, progressStatus: ProgressStatus.warning)),
-            _buildProgressItem("更改status,且Label在外", Progress.linear(
+          _buildSection("线性进度条", [
+            _buildProgressItem("不确定", const TDProgress(type: TDProgressType.linear, strokeWidth: 5)),
+            _buildProgressItem("确定, ≤ 10%", const TDProgress(type: TDProgressType.linear, value: 0.1)),
+            _buildProgressItem("确定, > 10%", const TDProgress(type: TDProgressType.linear, value: 0.5)),
+            _buildProgressItem("左侧标签, > 10%", const TDProgress(
+                type: TDProgressType.linear, value: 0.5, progressLabelPosition: TDProgressLabelPosition.left)),
+            _buildProgressItem("自定义标签", const TDProgress(type: TDProgressType.linear, value: 0.5, label: TDTextLabel("百分之50"))),
+            _buildProgressItem("右侧标签, > 10%", const TDProgress(
+                type: TDProgressType.linear, value: 0.5, progressLabelPosition: TDProgressLabelPosition.right)),
+            _buildProgressItem("警告状态", const TDProgress(type: TDProgressType.linear, value: 0.5, progressStatus: TDProgressStatus.warning)),
+            _buildProgressItem("危险状态, 外部标签", const TDProgress(
+                type: TDProgressType.linear,
                 value: 0.5,
-                progressStatus: ProgressStatus.danger,
-                progressLabelPosition: ProgressLabelPosition.right)),
+                progressStatus: TDProgressStatus.danger,
+                progressLabelPosition: TDProgressLabelPosition.right)),
           ]),
-          _buildSection("环形进度条", [
-            Row(
+          _buildSection("圆形进度条", [
+            const Row(
               mainAxisAlignment: MainAxisAlignment.spaceEvenly,
               children: [
-                Progress.circular(),
-                Progress.circular(value: 0.5),
-                Progress.circular(
-                    value: 0.5, progressStatus: ProgressStatus.success),
-                Progress.circular(
-                    value: 0.7, progressStatus: ProgressStatus.warning),
+                TDProgress(type: TDProgressType.circular),
+                TDProgress(type: TDProgressType.circular, value: 0.5),
+                TDProgress(
+                    type: TDProgressType.circular, value: 0.5, progressStatus: TDProgressStatus.success),
+                TDProgress(
+                    type: TDProgressType.circular, value: 0.7, progressStatus: TDProgressStatus.warning),
               ],
             ),
           ]),
           _buildSection("微型进度条", [
-            Progress.micro(value: 0.3),
+            const TDProgress(type: TDProgressType.micro, value: 0.3),
           ]),
           _buildSection("微型按钮进度条", [
             Row(
+                children: [
+                  TDProgress(type: TDProgressType.micro, value: 0.3, onTap: (){}, label: const TDIconLabel(Icons.play_arrow, color: Colors.blue)),
+                  const SizedBox(width: 10),
+                  TDProgress(type: TDProgressType.micro, value: 0.3, onTap: (){}, label: const TDIconLabel(Icons.pause, color: Colors.blue)),
+                  const SizedBox(width: 10),
+                  TDProgress(type: TDProgressType.micro, value: 0.3, onTap: (){}, label: const TDIconLabel(Icons.stop, color: Colors.blue))
+                ]
+            )
+          ]),
+          _buildSection("交互式微型按钮进度条", [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.start,
               children: [
-                Progress.micro(value: 0.3, onTap: (){}, label: const IconLabel(Icons.play_arrow, color: Colors.blue)),
-                const SizedBox(width: 10),
-                Progress.micro(value: 0.3, onTap: (){}, label: const IconLabel(Icons.pause, color: Colors.blue)),
+                TDProgress(
+                  type: TDProgressType.micro,
+                  value: microProgressValue,
+                  onTap: _toggleMicroProgress,
+                  label: TDIconLabel(isPlaying ? Icons.pause : Icons.play_arrow, color: Colors.blue),
+                ),
                 const SizedBox(width: 10),
-                Progress.micro(value: 0.3, onTap: (){}, label: const IconLabel(Icons.stop, color: Colors.blue))
-              ]
-            )
+                TDProgress(
+                  type: TDProgressType.micro,
+                  value: microProgressValue,
+                  onTap: _resetMicroProgress,
+                  label: const TDIconLabel(Icons.stop, color: Colors.blue),
+                ),
+              ],
+            ),
+            const SizedBox(height: 10),
+            Text('点击播放/暂停，点击停止重置进度', style: Theme.of(context).textTheme.bodyMedium),
           ]),
           _buildSection("按钮进度条", [
-            Progress.button(
-              onTap: (){
-                setState(() {
-                  buttonLabel = buttonLabel.data == "50%" ? const TextLabel("继续") : const TextLabel("50%");
-                });
-              },
-              value: .5,
+            TDProgress(
+              type: TDProgressType.button,
+              onTap: _toggleProgress,
+              onLongPress: _resetProgress,
+              value: progressValue,
               label: buttonLabel,
             ),
+            const SizedBox(height: 10),
+            Text('点击开始/暂停进度，长按重置进度', style: Theme.of(context).textTheme.bodyMedium),
           ])
         ],
       ),
diff --git a/progress/lib/progress.dart b/progress/lib/old_progress.dart
similarity index 93%
rename from progress/lib/progress.dart
rename to progress/lib/old_progress.dart
index b7112350f..074502fa1 100644
--- a/progress/lib/progress.dart
+++ b/progress/lib/old_progress.dart
@@ -122,9 +122,9 @@ class Progress {
           ProgressLabelPosition.inside,
       double strokeWidth = 60.0,
       Color? color,
-      Color backgroundColor = Colors.blue,
+      Color backgroundColor = const Color(0xFF0052da),
       BorderRadiusGeometry borderRadius =
-          const BorderRadius.all(Radius.circular(10)),
+          const BorderRadius.all(Radius.circular(6)),
       VoidCallback? onTap,
       VoidCallback? onLongPress,
       bool showLabel = true}) {
@@ -382,7 +382,6 @@ class _ProgressIndicatorState<T extends LabelWidget>
       height: widget.strokeWidth,
       decoration: BoxDecoration(
         color: widget.backgroundColor,
-        borderRadius: widget.borderRadius,
       ),
     );
   }
@@ -454,7 +453,7 @@ class _ProgressIndicatorState<T extends LabelWidget>
         break;
       case _ProgressType.button:
         iconSize = widget.strokeWidth * 0.8;
-        fontSize = widget.strokeWidth * 0.4;
+        fontSize = widget.strokeWidth * 0.3;
         fontWeight = FontWeight.normal;
         break;
       default:
@@ -512,18 +511,16 @@ class _ProgressIndicatorState<T extends LabelWidget>
         animation: _animation,
         builder: (context, child) {
           return GestureDetector(
-            onTap: widget.onTap,
-            onLongPress: widget.onLongPress,
-            child: Stack(
-              alignment: Alignment.center,
-              children: [
-                _buildMicroOutline(),
-                if (widget.showLabel) _buildLabelWidget(Colors.black),
-              ],
-            )
-          );
-        }
-    );
+              onTap: widget.onTap,
+              onLongPress: widget.onLongPress,
+              child: Stack(
+                alignment: Alignment.center,
+                children: [
+                  _buildMicroOutline(),
+                  if (widget.showLabel) _buildLabelWidget(Colors.black),
+                ],
+              ));
+        });
   }
 
   Widget _buildMicroOutline() {
@@ -548,22 +545,23 @@ class _ProgressIndicatorState<T extends LabelWidget>
       builder: (context, constraints) {
         final maxWidth = constraints.maxWidth;
         return AnimatedBuilder(
-          animation: _animation,
-          builder: (context, child) {
-            final progressWidth = maxWidth * _animation.value;
-            return GestureDetector(
-              onTap: widget.onTap,
-              onLongPress: widget.onLongPress,
-              child: Stack(
-                children: [
-                  _buildBackgroundContainer(),
-                  _buildButtonActiveContainer(progressWidth),
-                  if (widget.showLabel) _buildButtonLabel(maxWidth),
-                ],
-              )
-            );
-          }
-        );
+            animation: _animation,
+            builder: (context, child) {
+              final progressWidth = maxWidth * _animation.value;
+              return ClipRRect(
+                borderRadius: widget.borderRadius,
+                child: GestureDetector(
+                    onTap: widget.onTap,
+                    onLongPress: widget.onLongPress,
+                    child: Stack(
+                      children: [
+                        _buildBackgroundContainer(),
+                        _buildButtonActiveContainer(progressWidth),
+                        if (widget.showLabel) _buildButtonLabel(maxWidth),
+                      ],
+                    )),
+              );
+            });
       },
     );
   }
@@ -575,8 +573,8 @@ class _ProgressIndicatorState<T extends LabelWidget>
       width: progressWidth,
       decoration: BoxDecoration(
         gradient: LinearGradient(
-            colors: [widget.backgroundColor, Colors.white.withOpacity(.2)]),
-        borderRadius: widget.borderRadius,
+          colors: [widget.backgroundColor, Colors.white.withOpacity(.4)],
+        ),
       ),
     );
   }
diff --git a/progress/lib/progressbar.dart b/progress/lib/progressbar.dart
deleted file mode 100644
index 7de8cb1fd..000000000
--- a/progress/lib/progressbar.dart
+++ /dev/null
@@ -1,124 +0,0 @@
-import 'package:flutter/material.dart';
-
-class DynamicProgressBar extends StatefulWidget {
-  final double percentage;
-  final double height;
-  final Color backgroundColor;
-  final Color progressColor;
-  final Color labelColor;
-  final double labelWidth;
-  final double fontSize;
-  final bool showLabel;
-  final Duration animationDuration;
-
-  const DynamicProgressBar({
-    Key? key,
-    required this.percentage,
-    this.height = 20.0,
-    this.backgroundColor = const Color(0xFFEEEEEE),
-    this.progressColor = Colors.blue,
-    this.labelColor = Colors.black,
-    this.labelWidth = 40.0,
-    this.fontSize = 12.0,
-    this.showLabel = true,
-    this.animationDuration = const Duration(milliseconds: 300),
-  }) : super(key: key);
-
-  @override
-  DynamicProgressBarState createState() => DynamicProgressBarState();
-}
-
-class DynamicProgressBarState extends State<DynamicProgressBar>
-    with SingleTickerProviderStateMixin {
-  late AnimationController _animationController;
-  late Animation<double> _animation;
-
-  @override
-  void initState() {
-    super.initState();
-    _animationController = AnimationController(
-      vsync: this,
-      duration: widget.animationDuration,
-    );
-    _animation = Tween<double>(begin: 0, end: widget.percentage).animate(_animationController);
-    _animationController.forward();
-  }
-
-  @override
-  void didUpdateWidget(DynamicProgressBar oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.percentage != widget.percentage) {
-      _animation = Tween<double>(
-        begin: oldWidget.percentage,
-        end: widget.percentage,
-      ).animate(_animationController);
-      _animationController.forward(from: 0);
-    }
-  }
-
-  @override
-  void dispose() {
-    _animationController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return LayoutBuilder(
-      builder: (context, constraints) {
-        final maxWidth = constraints.maxWidth;
-
-        return AnimatedBuilder(
-          animation: _animation,
-          builder: (context, child) {
-            final currentPercentage = _animation.value;
-            final progressWidth = (currentPercentage / 100) * maxWidth;
-            final isLessThanTen = currentPercentage < 10;
-
-            return Stack(
-              children: [
-                // Background
-                Container(
-                  height: widget.height,
-                  decoration: BoxDecoration(
-                    color: widget.backgroundColor,
-                    borderRadius: BorderRadius.circular(widget.height / 2),
-                  ),
-                ),
-                // Progress
-                Container(
-                  height: widget.height,
-                  width: progressWidth,
-                  decoration: BoxDecoration(
-                    color: widget.progressColor,
-                    borderRadius: BorderRadius.circular(widget.height / 2),
-                  ),
-                ),
-                // Label
-                if (widget.showLabel)
-                  Positioned(
-                    left: isLessThanTen ? progressWidth : progressWidth - widget.labelWidth,
-                    top: 0,
-                    bottom: 0,
-                    child: Container(
-                      width: widget.labelWidth,
-                      alignment: Alignment.centerRight,
-                      padding: const EdgeInsets.only(right: 8),
-                      child: Text(
-                        '${currentPercentage.toInt()}%',
-                        style: TextStyle(
-                          color: isLessThanTen ? widget.labelColor : Colors.white,
-                          fontWeight: FontWeight.bold,
-                          fontSize: widget.fontSize,
-                        ),
-                      ),
-                    ),
-                  ),
-              ],
-            );
-          },
-        );
-      },
-    );
-  }
-}
\ No newline at end of file
diff --git a/progress/lib/td_progress.dart b/progress/lib/td_progress.dart
new file mode 100644
index 000000000..4e44e93b6
--- /dev/null
+++ b/progress/lib/td_progress.dart
@@ -0,0 +1,574 @@
+import 'package:flutter/material.dart';
+import 'package:tdesign_flutter/tdesign_flutter.dart';
+
+enum TDProgressType { linear, circular, micro, button }
+
+enum TDProgressLabelPosition { inside, left, right }
+
+enum TDProgressStatus { primary, warning, danger, success }
+
+enum ProgressStrokeCap {
+  round,
+  square,
+  butt,
+}
+
+abstract class TDLabelWidget extends Widget {
+  const TDLabelWidget({super.key});
+}
+
+class TDTextLabel extends Text implements TDLabelWidget {
+  const TDTextLabel(String data, {Key? key, TextStyle? style})
+      : super(data, key: key, style: style);
+}
+
+class TDIconLabel extends Icon implements TDLabelWidget {
+  const TDIconLabel(IconData icon, {Key? key, double? size, Color? color})
+      : super(icon, key: key, size: size, color: color);
+}
+
+class TDProgress extends StatelessWidget {
+  final TDProgressType type;
+  final double? value;
+  final TDLabelWidget? label;
+  final TDProgressStatus progressStatus;
+  final TDProgressLabelPosition progressLabelPosition;
+  final double? strokeWidth;
+  final Color? color;
+  final Color? backgroundColor;
+  final ProgressStrokeCap? strokeCap;
+  final double? circleRadius;
+  final bool showLabel;
+  final VoidCallback? onTap;
+  final VoidCallback? onLongPress;
+
+  const TDProgress({
+    Key? key,
+    required this.type,
+    this.value,
+    this.label,
+    this.progressStatus = TDProgressStatus.primary,
+    this.progressLabelPosition = TDProgressLabelPosition.inside,
+    this.strokeWidth,
+    this.color,
+    this.backgroundColor,
+    this.strokeCap,
+    this.circleRadius,
+    this.showLabel = true,
+    this.onTap,
+    this.onLongPress,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final defaultValues = _getDefaultValues(type);
+    return _ProgressIndicator(
+      value: value,
+      label: label,
+      progressStatus: progressStatus,
+      progressLabelPosition: progressLabelPosition,
+      strokeWidth: strokeWidth ?? defaultValues.strokeWidth,
+      color: color,
+      backgroundColor: backgroundColor ?? defaultValues.backgroundColor,
+      strokeCap: strokeCap ?? defaultValues.strokeCap,
+      circleRadius: circleRadius ?? defaultValues.circleRadius,
+      showLabel: showLabel,
+      onTap: onTap,
+      onLongPress: onLongPress,
+      type: type,
+    );
+  }
+
+  _DefaultValues _getDefaultValues(TDProgressType type) {
+    switch (type) {
+      case TDProgressType.linear:
+        return _DefaultValues(
+          strokeWidth: 20.0,
+          backgroundColor: const Color(0xFFEEEEEE),
+          strokeCap: ProgressStrokeCap.round,
+          circleRadius: 0, // Not applicable for linear progress
+        );
+      case TDProgressType.circular:
+        return _DefaultValues(
+          strokeWidth: 5.0,
+          backgroundColor: const Color(0xFFEEEEEE),
+          strokeCap: ProgressStrokeCap.round,
+          circleRadius: 80.0,
+        );
+      case TDProgressType.micro:
+        return _DefaultValues(
+          strokeWidth: 2.0,
+          backgroundColor: const Color(0xFFEEEEEE),
+          strokeCap: ProgressStrokeCap.round,
+          circleRadius: 20.0,
+        );
+      case TDProgressType.button:
+        return _DefaultValues(
+          strokeWidth: 60.0,
+          backgroundColor: const Color(0xFF0052da),
+          strokeCap: ProgressStrokeCap.butt,
+          circleRadius: 0, // Not applicable for button progress
+        );
+    }
+  }
+}
+
+class _DefaultValues {
+  final double strokeWidth;
+  final Color backgroundColor;
+  final ProgressStrokeCap strokeCap;
+  final double circleRadius;
+
+  _DefaultValues({
+    required this.strokeWidth,
+    required this.backgroundColor,
+    required this.strokeCap,
+    required this.circleRadius,
+  });
+}
+
+class _ProgressIndicator extends StatefulWidget {
+  final double? value;
+  final TDLabelWidget? label;
+  final TDProgressLabelPosition progressLabelPosition;
+  final double strokeWidth;
+  final double circleRadius;
+  final ProgressStrokeCap strokeCap;
+  final Color? color;
+  final Color backgroundColor;
+  final TDProgressType type;
+  final TDProgressStatus progressStatus;
+  final bool showLabel;
+  final VoidCallback? onTap;
+  final VoidCallback? onLongPress;
+
+  const _ProgressIndicator({
+    Key? key,
+    this.value,
+    this.label,
+    this.progressLabelPosition = TDProgressLabelPosition.inside,
+    required this.strokeWidth,
+    required this.strokeCap,
+    required this.circleRadius,
+    this.color,
+    required this.backgroundColor,
+    required this.type,
+    this.progressStatus = TDProgressStatus.primary,
+    this.showLabel = true,
+    this.onTap,
+    this.onLongPress,
+  }) : super(key: key);
+
+  @override
+  _ProgressIndicatorState createState() => _ProgressIndicatorState();
+}
+
+class _ProgressIndicatorState extends State<_ProgressIndicator>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _animationController;
+  late Animation<double> _animation;
+  late Color _effectiveColor;
+  late Widget _effectiveLabel;
+
+  @override
+  void initState() {
+    super.initState();
+    _animationController = AnimationController(
+      vsync: this,
+      duration: const Duration(seconds: 1),
+    );
+    _updateAnimation();
+    final int duration = (_animation.value * 1000).toInt();
+    _animationController.duration = Duration(milliseconds: duration);
+    _updateEffectiveColor();
+    _updateEffectiveLabel();
+  }
+
+  @override
+  void didUpdateWidget(_ProgressIndicator oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.value != widget.value) {
+      _updateAnimation();
+    }
+    if (oldWidget.color != widget.color ||
+        oldWidget.progressStatus != widget.progressStatus) {
+      _updateEffectiveColor();
+    }
+    if (oldWidget.label != widget.label ||
+        oldWidget.progressStatus != widget.progressStatus) {
+      _updateEffectiveLabel();
+    }
+  }
+
+  BorderRadius _getBorderRadius() {
+    switch (widget.strokeCap) {
+      case ProgressStrokeCap.round:
+        return BorderRadius.circular(widget.strokeWidth / 2);
+      case ProgressStrokeCap.square:
+        return BorderRadius.zero;
+      case ProgressStrokeCap.butt:
+        return BorderRadius.circular(widget.strokeWidth / 6);
+    }
+  }
+
+  void _updateEffectiveColor() {
+    _effectiveColor =
+        widget.color ?? _getColorFromStatus(widget.progressStatus);
+  }
+
+  void _updateEffectiveLabel() {
+    _effectiveLabel =
+        widget.label ?? _getDefaultLabelFromStatus(widget.progressStatus);
+  }
+
+  void _updateAnimation() {
+    _animation = Tween<double>(begin: 0, end: widget.value ?? 0)
+        .animate(_animationController);
+    _animationController.forward(from: 0);
+  }
+
+  Widget _getDefaultLabelFromStatus(TDProgressStatus status) {
+    final bool showAutoText = widget.value != null;
+    final bool showInsideLabel =
+        widget.progressLabelPosition == TDProgressLabelPosition.inside &&
+            widget.type != TDProgressType.circular;
+    final bool showIconBorder = widget.type == TDProgressType.linear;
+
+    Widget getAutoText() => showAutoText && widget.type != TDProgressType.micro
+        ? Text('${(widget.value! * 100).round()}%')
+        : const Text("");
+
+    final statusWidgets = {
+      TDProgressStatus.primary: getAutoText(),
+      TDProgressStatus.warning: showInsideLabel
+          ? getAutoText()
+          : showIconBorder
+              ? const Icon(TDIcons.error_circle_filled)
+              : const Icon(TDIcons.error),
+      TDProgressStatus.danger: showInsideLabel
+          ? getAutoText()
+          : showIconBorder
+              ? const Icon(TDIcons.close_circle_filled)
+              : const Icon(TDIcons.close),
+      TDProgressStatus.success: showInsideLabel
+          ? getAutoText()
+          : showIconBorder
+              ? const Icon(TDIcons.check_circle_filled)
+              : const Icon(TDIcons.check),
+    };
+
+    return statusWidgets[status] ?? getAutoText();
+  }
+
+  Color _getColorFromStatus(TDProgressStatus status) {
+    switch (status) {
+      case TDProgressStatus.primary:
+        return Colors.blue;
+      case TDProgressStatus.warning:
+        return Colors.orange;
+      case TDProgressStatus.danger:
+        return Colors.red;
+      case TDProgressStatus.success:
+        return Colors.green;
+    }
+  }
+
+  StrokeCap _getFlutterStrokeCap(ProgressStrokeCap cap) {
+    switch (cap) {
+      case ProgressStrokeCap.round:
+        return StrokeCap.round;
+      case ProgressStrokeCap.square:
+        return StrokeCap.square;
+      case ProgressStrokeCap.butt:
+        return StrokeCap.butt;
+    }
+  }
+
+  @override
+  void dispose() {
+    _animationController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        if (widget.type == TDProgressType.linear)
+          _buildLinearProgress()
+        else if (widget.type == TDProgressType.circular)
+          _buildCircularProgress()
+        else if (widget.type == TDProgressType.micro)
+          _buildMicroProgress()
+        else if (widget.type == TDProgressType.button)
+          _buildButtonProgress()
+      ],
+    );
+  }
+
+  Widget _buildLinearProgress() {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final maxWidth = constraints.maxWidth;
+
+        if (widget.value != null &&
+            widget.progressLabelPosition == TDProgressLabelPosition.inside) {
+          return _buildInsideLabel(maxWidth);
+        } else {
+          return _buildOutsideLabel();
+        }
+      },
+    );
+  }
+
+  Widget _buildInsideLabel(double maxWidth) {
+    return AnimatedBuilder(
+      animation: _animation,
+      builder: (context, child) {
+        final progressWidth = _animation.value * maxWidth;
+        return Stack(
+          children: [
+            _buildBackgroundContainer(),
+            if (widget.value! > 0.1)
+              _buildProgressContainerWithLabel(progressWidth)
+            else
+              _buildProgressContainerWithLabelOutside(progressWidth),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget _buildOutsideLabel() {
+    return AnimatedBuilder(
+      animation: _animation,
+      builder: (context, child) {
+        return Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            if (widget.progressLabelPosition == TDProgressLabelPosition.left)
+              Padding(
+                padding: const EdgeInsets.only(right: 8.0),
+                child: _buildLabelWidget(Colors.black),
+              ),
+            Expanded(
+              child: LinearProgressIndicator(
+                borderRadius: _getBorderRadius(),
+                value: widget.value != null ? _animation.value : null,
+                backgroundColor: widget.backgroundColor,
+                valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
+                minHeight: widget.strokeWidth,
+              ),
+            ),
+            if (widget.progressLabelPosition == TDProgressLabelPosition.right)
+              Padding(
+                padding: const EdgeInsets.only(left: 8.0),
+                child: _buildLabelWidget(Colors.black),
+              ),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget _buildBackgroundContainer() {
+    return Container(
+      height: widget.strokeWidth,
+      decoration: BoxDecoration(
+        borderRadius: _getBorderRadius(),
+        color: widget.backgroundColor,
+      ),
+    );
+  }
+
+  Widget _buildProgressContainerWithLabel(double progressWidth) {
+    return Container(
+      height: widget.strokeWidth,
+      width: progressWidth,
+      decoration: BoxDecoration(
+        color: _effectiveColor,
+        borderRadius: _getBorderRadius(),
+      ),
+      child: widget.showLabel
+          ? Align(
+              alignment: Alignment.centerRight,
+              child: Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 10.0),
+                child: _buildLabelWidget(Colors.white),
+              ),
+            )
+          : null,
+    );
+  }
+
+  Widget _buildProgressContainerWithLabelOutside(double progressWidth) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        Container(
+          height: widget.strokeWidth,
+          width: progressWidth,
+          decoration: BoxDecoration(
+            color: _effectiveColor,
+            borderRadius: _getBorderRadius(),
+          ),
+        ),
+        if (widget.showLabel)
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 5.0),
+            child: _buildLabelWidget(Colors.black),
+          ),
+      ],
+    );
+  }
+
+  Widget _buildLabelWidget(Color labelColor) {
+    late double iconSize;
+    late double fontSize;
+    late FontWeight fontWeight;
+
+    switch (widget.type) {
+      case TDProgressType.linear:
+        iconSize = widget.strokeWidth;
+        fontSize = widget.strokeWidth * 0.6;
+        fontWeight = FontWeight.normal;
+        break;
+      case TDProgressType.circular:
+        iconSize = widget.circleRadius * 0.4;
+        fontSize = widget.circleRadius * 0.2;
+        fontWeight = FontWeight.bold;
+        break;
+      case TDProgressType.micro:
+        iconSize = widget.circleRadius * 0.6;
+        fontSize = widget.circleRadius * 0.2;
+        fontWeight = FontWeight.normal;
+        break;
+      case TDProgressType.button:
+        iconSize = widget.strokeWidth * 0.8;
+        fontSize = widget.strokeWidth * 0.3;
+        fontWeight = FontWeight.normal;
+        break;
+    }
+
+    return IconTheme(
+      data: IconThemeData(color: _effectiveColor, size: iconSize),
+      child: DefaultTextStyle(
+        style: TextStyle(
+          color: labelColor,
+          fontSize: fontSize,
+          fontWeight: fontWeight,
+        ),
+        child: _effectiveLabel,
+      ),
+    );
+  }
+
+  Widget _buildCircularProgress() {
+    return AnimatedBuilder(
+      animation: _animation,
+      builder: (context, child) {
+        return Stack(
+          alignment: Alignment.center,
+          children: [
+            SizedBox(
+              height: widget.circleRadius,
+              width: widget.circleRadius,
+              child: Padding(
+                padding: EdgeInsets.all(widget.strokeWidth / 2),
+                child: CircularProgressIndicator(
+                  value: widget.value != null ? _animation.value : null,
+                  backgroundColor: widget.backgroundColor,
+                  strokeCap: _getFlutterStrokeCap(widget.strokeCap),
+                  valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
+                  strokeWidth: widget.strokeWidth,
+                ),
+              ),
+            ),
+            if (widget.showLabel) _buildLabelWidget(Colors.black),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget _buildMicroProgress() {
+    return AnimatedBuilder(
+        animation: _animation,
+        builder: (context, child) {
+          return GestureDetector(
+              onTap: widget.onTap,
+              onLongPress: widget.onLongPress,
+              child: Stack(
+                alignment: Alignment.center,
+                children: [
+                  _buildMicroOutline(),
+                  if (widget.showLabel) _buildLabelWidget(Colors.black),
+                ],
+              ));
+        });
+  }
+
+  Widget _buildMicroOutline() {
+    return SizedBox(
+      height: widget.circleRadius,
+      width: widget.circleRadius,
+      child: Padding(
+        padding: EdgeInsets.all(widget.strokeWidth / 2),
+        child: CircularProgressIndicator(
+          value: widget.value != null ? _animation.value : null,
+          backgroundColor: widget.backgroundColor,
+          strokeCap: _getFlutterStrokeCap(widget.strokeCap),
+          valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
+          strokeWidth: widget.strokeWidth,
+        ),
+      ),
+    );
+  }
+
+  Widget _buildButtonProgress() {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final maxWidth = constraints.maxWidth;
+        return AnimatedBuilder(
+            animation: _animation,
+            builder: (context, child) {
+              final progressWidth = maxWidth * _animation.value;
+              return ClipRRect(
+                borderRadius: _getBorderRadius(),
+                child: GestureDetector(
+                    onTap: widget.onTap,
+                    onLongPress: widget.onLongPress,
+                    child: Stack(
+                      children: [
+                        _buildBackgroundContainer(),
+                        _buildButtonActiveContainer(progressWidth),
+                        if (widget.showLabel) _buildButtonLabel(maxWidth),
+                      ],
+                    )),
+              );
+            });
+      },
+    );
+  }
+
+  Widget _buildButtonActiveContainer(double progressWidth) {
+    return Container(
+      height: widget.strokeWidth,
+      width: progressWidth,
+      decoration: BoxDecoration(
+        gradient: LinearGradient(
+          colors: [widget.backgroundColor, Colors.white.withOpacity(.4)],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildButtonLabel(double maxWidth) {
+    return Container(
+      height: widget.strokeWidth,
+      alignment: Alignment.center,
+      child: _buildLabelWidget(Colors.white),
+    );
+  }
+}

From d9b6bb8bd60e80da4f47136ec1f09e213b753565 Mon Sep 17 00:00:00 2001
From: 221250009 <221250009@smail.nju.edu.cn>
Date: Wed, 21 Aug 2024 20:48:10 +0800
Subject: [PATCH 29/74] =?UTF-8?q?=E6=95=B4=E5=90=88Progress=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E8=87=B3TDesign?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/example/lib/config.dart     |   4 +-
 .../example/lib/page/td_progress_page.dart    | 293 +++++++++
 .../src/components/progress/td_progress.dart  | 602 +++++++++++++++++-
 tdesign-component/lib/tdesign_flutter.dart    |   1 +
 4 files changed, 892 insertions(+), 8 deletions(-)
 create mode 100644 tdesign-component/example/lib/page/td_progress_page.dart

diff --git a/tdesign-component/example/lib/config.dart b/tdesign-component/example/lib/config.dart
index c787754fe..893cdfc7c 100644
--- a/tdesign-component/example/lib/config.dart
+++ b/tdesign-component/example/lib/config.dart
@@ -34,6 +34,7 @@ import 'page/td_loading_page.dart';
 import 'page/td_navbar_page.dart';
 import 'page/td_picker_page.dart';
 import 'page/td_popup_page.dart';
+import 'page/td_progress_page.dart';
 import 'page/td_radio_page.dart';
 import 'page/td_radius_page.dart';
 import 'page/td_refresh_page.dart';
@@ -185,8 +186,7 @@ Map<String, List<ExamplePageModel>> exampleMap = {
     ExamplePageModel(
         text: 'Progress 进度条',
         name: 'progress',
-        isTodo: true,
-        pageBuilder: _wrapInheritedTheme((context) => const TodoPage())),
+        pageBuilder: _wrapInheritedTheme((context) => const TDProgressPage())),
     ExamplePageModel(
         text: 'Result 结果',
         name: 'result',
diff --git a/tdesign-component/example/lib/page/td_progress_page.dart b/tdesign-component/example/lib/page/td_progress_page.dart
new file mode 100644
index 000000000..e27703130
--- /dev/null
+++ b/tdesign-component/example/lib/page/td_progress_page.dart
@@ -0,0 +1,293 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:tdesign_flutter/tdesign_flutter.dart';
+
+import '../annotation/demo.dart';
+import '../base/example_widget.dart';
+
+class TDProgressPage extends StatefulWidget {
+  const TDProgressPage({Key? key}) : super(key: key);
+
+  final examplePadding = const EdgeInsets.symmetric(horizontal: 16);
+
+  @override
+  State<StatefulWidget> createState() {
+    return _TDProgressPageState();
+  }
+}
+
+class _TDProgressPageState extends State<TDProgressPage> {
+  TDLabelWidget buttonLabel = const TDTextLabel('开始');
+  double progressValue = 0.0;
+  Timer? _timer;
+  bool isProgressing = false;
+  bool isPlaying = false;
+  double microProgressValue = 0.0;
+  Timer? _microTimer;
+
+  @override
+  Widget build(BuildContext context) {
+    return ExamplePage(
+        title: tdTitle(),
+        desc: '用于展示任务当前的进度',
+        exampleCodeGroup: 'progress',
+        backgroundColor: TDTheme.of().whiteColor1,
+        padding: const EdgeInsets.symmetric(vertical: 8),
+        children: [
+          ExampleModule(title: '组件类型', children: [
+            ExampleItem(
+                desc: '线性进度条',
+                padding: widget.examplePadding,
+                builder: _buildRightLabelLinear),
+            ExampleItem(
+                desc: '百分比内显',
+                padding: widget.examplePadding,
+                builder: _buildInsideLabelLinear),
+            ExampleItem(
+                desc: '环形进度条',
+                padding: widget.examplePadding,
+                center: false,
+                builder: _buildCircle),
+            ExampleItem(
+                desc: '微型环形进度条',
+                padding: widget.examplePadding,
+                center: false,
+                builder: _buildMicro),
+            ExampleItem(
+                desc: '按钮进度条',
+                padding: widget.examplePadding,
+                builder: _buildButton),
+            ExampleItem(
+                desc: '微型按钮进度条',
+                padding: widget.examplePadding,
+                center: false,
+                builder: _buildMicroButton),
+          ]),
+          ExampleModule(title: '组件状态', children: [
+            ExampleItem(
+                desc: '线性进度条',
+                padding: widget.examplePadding,
+                builder: _buildPrimary),
+            ExampleItem(padding: widget.examplePadding, builder: _buildWarning),
+            ExampleItem(padding: widget.examplePadding, builder: _buildDanger),
+            ExampleItem(padding: widget.examplePadding, builder: _buildSuccess),
+            ExampleItem(
+                desc: '环形进度条',
+                padding: widget.examplePadding,
+                center: false,
+                builder: _buildCirclePrimary),
+            ExampleItem(
+                padding: widget.examplePadding,
+                center: false,
+                builder: _buildCircleWarning),
+            ExampleItem(
+                padding: widget.examplePadding,
+                center: false,
+                builder: _buildCircleDanger),
+            ExampleItem(
+                padding: widget.examplePadding,
+                center: false,
+                builder: _buildCircleSuccess),
+          ])
+        ]);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildRightLabelLinear(BuildContext context) {
+    return const TDProgress(
+        type: TDProgressType.linear,
+        value: 0.8,
+        strokeWidth: 6,
+        progressLabelPosition: TDProgressLabelPosition.right);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildInsideLabelLinear(BuildContext context) {
+    return const TDProgress(type: TDProgressType.linear, value: 0.8);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildCircle(BuildContext context) {
+    return const TDProgress(type: TDProgressType.circular, value: 0.3);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildMicro(BuildContext context) {
+    return const TDProgress(type: TDProgressType.micro, value: 0.75);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildButton(BuildContext context) {
+    return TDProgress(
+        type: TDProgressType.button,
+        onTap: _toggleProgress,
+        onLongPress: _resetProgress,
+        value: progressValue,
+        label: buttonLabel);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildMicroButton(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        TDProgress(
+          type: TDProgressType.micro,
+          value: microProgressValue,
+          onTap: _toggleMicroProgress,
+          label: TDIconLabel(isPlaying ? Icons.pause : Icons.play_arrow,
+              color: TDTheme.of(context).brandNormalColor),
+        ),
+        const SizedBox(width: 10),
+        TDProgress(
+          type: TDProgressType.micro,
+          value: microProgressValue,
+          onTap: _resetMicroProgress,
+          label: TDIconLabel(Icons.stop,
+              color: TDTheme.of(context).brandNormalColor),
+        ),
+      ],
+    );
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildPrimary(BuildContext context) {
+    return const TDProgress(
+        type: TDProgressType.linear,
+        progressStatus: TDProgressStatus.primary,
+        value: 0.8,
+        strokeWidth: 6,
+        progressLabelPosition: TDProgressLabelPosition.right);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildWarning(BuildContext context) {
+    return const TDProgress(
+        type: TDProgressType.linear,
+        progressStatus: TDProgressStatus.warning,
+        value: 0.8,
+        strokeWidth: 6,
+        progressLabelPosition: TDProgressLabelPosition.right);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildDanger(BuildContext context) {
+    return const TDProgress(
+        type: TDProgressType.linear,
+        progressStatus: TDProgressStatus.danger,
+        value: 0.8,
+        strokeWidth: 6,
+        progressLabelPosition: TDProgressLabelPosition.right);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildSuccess(BuildContext context) {
+    return const TDProgress(
+        type: TDProgressType.linear,
+        progressStatus: TDProgressStatus.success,
+        value: 0.8,
+        strokeWidth: 6,
+        progressLabelPosition: TDProgressLabelPosition.right);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildCirclePrimary(BuildContext context) {
+    return const TDProgress(
+        type: TDProgressType.circular,
+        progressStatus: TDProgressStatus.primary,
+        value: 0.3);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildCircleWarning(BuildContext context) {
+    return const TDProgress(
+        type: TDProgressType.circular,
+        progressStatus: TDProgressStatus.warning,
+        value: 0.3);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildCircleDanger(BuildContext context) {
+    return const TDProgress(
+        type: TDProgressType.circular,
+        progressStatus: TDProgressStatus.danger,
+        value: 0.3);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildCircleSuccess(BuildContext context) {
+    return const TDProgress(
+        type: TDProgressType.circular,
+        progressStatus: TDProgressStatus.success,
+        value: 1);
+  }
+
+  void _toggleProgress() {
+    if (isProgressing) {
+      // 暂停进度
+      _timer?.cancel();
+      setState(() {
+        buttonLabel = const TDTextLabel('继续');
+        isProgressing = false;
+      });
+    } else {
+      // 开始或继续进度
+      _timer?.cancel();
+      _timer = Timer.periodic(const Duration(milliseconds: 100), (timer) {
+        setState(() {
+          if (progressValue < 1.0) {
+            progressValue += 0.01;
+            buttonLabel = TDTextLabel('${(progressValue * 100).toInt()}%');
+          } else {
+            _timer?.cancel();
+            buttonLabel = const TDTextLabel('完成');
+            isProgressing = false;
+          }
+        });
+      });
+      setState(() {
+        isProgressing = true;
+      });
+    }
+  }
+
+  void _resetProgress() {
+    _timer?.cancel();
+    setState(() {
+      progressValue = 0.0;
+      buttonLabel = const TDTextLabel('开始');
+      isProgressing = false;
+    });
+  }
+
+  void _toggleMicroProgress() {
+    setState(() {
+      isPlaying = !isPlaying;
+    });
+    if (isPlaying) {
+      _microTimer = Timer.periodic(const Duration(milliseconds: 100), (timer) {
+        setState(() {
+          if (microProgressValue < 1.0) {
+            microProgressValue += 0.01;
+          } else {
+            _microTimer?.cancel();
+            isPlaying = false;
+            microProgressValue = 0.0;
+          }
+        });
+      });
+    } else {
+      _microTimer?.cancel();
+    }
+  }
+
+  void _resetMicroProgress() {
+    _microTimer?.cancel();
+    setState(() {
+      isPlaying = false;
+      microProgressValue = 0.0;
+    });
+  }
+}
diff --git a/tdesign-component/lib/src/components/progress/td_progress.dart b/tdesign-component/lib/src/components/progress/td_progress.dart
index c9a77cc66..78b770d91 100644
--- a/tdesign-component/lib/src/components/progress/td_progress.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress.dart
@@ -1,17 +1,607 @@
 import 'package:flutter/material.dart';
-import './td_progress_style.dart';
+import '../../../tdesign_flutter.dart';
 
+enum TDProgressType { linear, circular, micro, button }
 
-class TDProgress extends StatefulWidget {
-  const TDProgress({super.key});
+enum TDProgressLabelPosition { inside, left, right }
+
+enum TDProgressStatus { primary, warning, danger, success }
+
+enum ProgressStrokeCap {
+  round,
+  square,
+  butt,
+}
+
+abstract class TDLabelWidget extends Widget {
+  const TDLabelWidget({super.key});
+}
+
+class TDTextLabel extends Text implements TDLabelWidget {
+  const TDTextLabel(String data, {Key? key, TextStyle? style})
+      : super(data, key: key, style: style);
+}
+
+class TDIconLabel extends Icon implements TDLabelWidget {
+  const TDIconLabel(IconData icon, {Key? key, double? size, Color? color})
+      : super(icon, key: key, size: size, color: color);
+}
+
+/// 进度条组件
+class TDProgress extends StatelessWidget {
+
+  /// 进度条类型
+  final TDProgressType type;
+
+  /// 进度值
+  final double? value;
+
+  /// 进度条标签
+  final TDLabelWidget? label;
+
+  /// 进度条状态
+  final TDProgressStatus progressStatus;
+
+  /// 标签显示位置
+  final TDProgressLabelPosition progressLabelPosition;
+
+  /// 进度条粗细
+  final double? strokeWidth;
+
+  /// 进度条颜色
+  final Color? color;
+
+  /// 进度条背景颜色
+  final Color? backgroundColor;
+
+  /// 进度条末端形状
+  final ProgressStrokeCap? strokeCap;
+
+  /// 进度条背景圆角
+  final double? circleRadius;
+
+  /// 是否显示标签
+  final bool showLabel;
+
+  /// 点击事件
+  final VoidCallback? onTap;
+
+  /// 长按事件
+  final VoidCallback? onLongPress;
+
+  const TDProgress({
+    Key? key,
+    required this.type,
+    this.value,
+    this.label,
+    this.progressStatus = TDProgressStatus.primary,
+    this.progressLabelPosition = TDProgressLabelPosition.inside,
+    this.strokeWidth,
+    this.color,
+    this.backgroundColor,
+    this.strokeCap,
+    this.circleRadius,
+    this.showLabel = true,
+    this.onTap,
+    this.onLongPress,
+  }) : super(key: key);
 
   @override
-  State<TDProgress> createState() => _TDProgressState();
+  Widget build(BuildContext context) {
+    final defaultValues = _getDefaultValues(type);
+    return _ProgressIndicator(
+      value: value,
+      label: label,
+      progressStatus: progressStatus,
+      progressLabelPosition: progressLabelPosition,
+      strokeWidth: strokeWidth ?? defaultValues.strokeWidth,
+      color: color,
+      backgroundColor: backgroundColor ?? defaultValues.backgroundColor,
+      strokeCap: strokeCap ?? defaultValues.strokeCap,
+      circleRadius: circleRadius ?? defaultValues.circleRadius,
+      showLabel: showLabel,
+      onTap: onTap,
+      onLongPress: onLongPress,
+      type: type,
+    );
+  }
+
+  _DefaultValues _getDefaultValues(TDProgressType type) {
+    switch (type) {
+      case TDProgressType.linear:
+        return _DefaultValues(
+          strokeWidth: 20.0,
+          backgroundColor: TDTheme.of().grayColor3,
+          strokeCap: ProgressStrokeCap.round,
+          circleRadius: 0, // Not applicable for linear progress
+        );
+      case TDProgressType.circular:
+        return _DefaultValues(
+          strokeWidth: 5.0,
+          backgroundColor: TDTheme.of().grayColor2,
+          strokeCap: ProgressStrokeCap.round,
+          circleRadius: 80.0,
+        );
+      case TDProgressType.micro:
+        return _DefaultValues(
+          strokeWidth: 2.0,
+          backgroundColor: TDTheme.of().grayColor2,
+          strokeCap: ProgressStrokeCap.round,
+          circleRadius: 20.0,
+        );
+      case TDProgressType.button:
+        return _DefaultValues(
+          strokeWidth: 60.0,
+          backgroundColor: TDTheme.of().brandNormalColor,
+          strokeCap: ProgressStrokeCap.butt,
+          circleRadius: 0, // Not applicable for button progress
+        );
+    }
+  }
+}
+
+class _DefaultValues {
+  final double strokeWidth;
+  final Color backgroundColor;
+  final ProgressStrokeCap strokeCap;
+  final double circleRadius;
+
+  _DefaultValues({
+    required this.strokeWidth,
+    required this.backgroundColor,
+    required this.strokeCap,
+    required this.circleRadius,
+  });
 }
 
-class _TDProgressState extends State<TDProgress> {
+/// 构建工具类
+class _ProgressIndicator extends StatefulWidget {
+  final double? value;
+  final TDLabelWidget? label;
+  final TDProgressLabelPosition progressLabelPosition;
+  final double strokeWidth;
+  final double circleRadius;
+  final ProgressStrokeCap strokeCap;
+  final Color? color;
+  final Color backgroundColor;
+  final TDProgressType type;
+  final TDProgressStatus progressStatus;
+  final bool showLabel;
+  final VoidCallback? onTap;
+  final VoidCallback? onLongPress;
+
+  const _ProgressIndicator({
+    Key? key,
+    this.value,
+    this.label,
+    this.progressLabelPosition = TDProgressLabelPosition.inside,
+    required this.strokeWidth,
+    required this.strokeCap,
+    required this.circleRadius,
+    this.color,
+    required this.backgroundColor,
+    required this.type,
+    this.progressStatus = TDProgressStatus.primary,
+    this.showLabel = true,
+    this.onTap,
+    this.onLongPress,
+  }) : super(key: key);
+
+  @override
+  _ProgressIndicatorState createState() => _ProgressIndicatorState();
+}
+
+class _ProgressIndicatorState extends State<_ProgressIndicator>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _animationController;
+  late Animation<double> _animation;
+  late Color _effectiveColor;
+  late Widget _effectiveLabel;
+
+  @override
+  void initState() {
+    super.initState();
+    _animationController = AnimationController(
+      vsync: this,
+      duration: const Duration(seconds: 1),
+    );
+    _updateAnimation();
+    final int duration = (_animation.value * 1000).toInt();
+    _animationController.duration = Duration(milliseconds: duration);
+    _updateEffectiveColor();
+    _updateEffectiveLabel();
+  }
+
+  @override
+  void didUpdateWidget(_ProgressIndicator oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.value != widget.value) {
+      _updateAnimation();
+    }
+    if (oldWidget.color != widget.color ||
+        oldWidget.progressStatus != widget.progressStatus) {
+      _updateEffectiveColor();
+    }
+    if (oldWidget.label != widget.label ||
+        oldWidget.progressStatus != widget.progressStatus) {
+      _updateEffectiveLabel();
+    }
+  }
+
+  BorderRadius _getBorderRadius() {
+    switch (widget.strokeCap) {
+      case ProgressStrokeCap.round:
+        return BorderRadius.circular(widget.strokeWidth / 2);
+      case ProgressStrokeCap.square:
+        return BorderRadius.zero;
+      case ProgressStrokeCap.butt:
+        return BorderRadius.circular(widget.strokeWidth / 6);
+    }
+  }
+
+  void _updateEffectiveColor() {
+    _effectiveColor =
+        widget.color ?? _getColorFromStatus(widget.progressStatus);
+  }
+
+  void _updateEffectiveLabel() {
+    _effectiveLabel =
+        widget.label ?? _getDefaultLabelFromStatus(widget.progressStatus);
+  }
+
+  void _updateAnimation() {
+    _animation = Tween<double>(begin: 0, end: widget.value ?? 0)
+        .animate(_animationController);
+    _animationController.forward(from: 0);
+  }
+
+  Widget _getDefaultLabelFromStatus(TDProgressStatus status) {
+    final bool showAutoText = widget.value != null;
+    final bool showInsideLabel =
+        widget.progressLabelPosition == TDProgressLabelPosition.inside &&
+            widget.type != TDProgressType.circular;
+    final bool showIconBorder = widget.type == TDProgressType.linear;
+
+    Widget getAutoText() => showAutoText && widget.type != TDProgressType.micro
+        ? Text('${(widget.value! * 100).round()}%')
+        : const Text("");
+
+    final statusWidgets = {
+      TDProgressStatus.primary: getAutoText(),
+      TDProgressStatus.warning: showInsideLabel
+          ? getAutoText()
+          : showIconBorder
+              ? const Icon(TDIcons.error_circle_filled)
+              : const Icon(TDIcons.error),
+      TDProgressStatus.danger: showInsideLabel
+          ? getAutoText()
+          : showIconBorder
+              ? const Icon(TDIcons.close_circle_filled)
+              : const Icon(TDIcons.close),
+      TDProgressStatus.success: showInsideLabel
+          ? getAutoText()
+          : showIconBorder
+              ? const Icon(TDIcons.check_circle_filled)
+              : const Icon(TDIcons.check),
+    };
+
+    return statusWidgets[status] ?? getAutoText();
+  }
+
+  Color _getColorFromStatus(TDProgressStatus status) {
+    switch (status) {
+      case TDProgressStatus.primary:
+        return TDTheme.of().brandNormalColor;
+      case TDProgressStatus.warning:
+        return TDTheme.of().warningNormalColor;
+      case TDProgressStatus.danger:
+        return TDTheme.of().errorNormalColor;
+      case TDProgressStatus.success:
+        return TDTheme.of().successNormalColor;
+    }
+  }
+
+  StrokeCap _getFlutterStrokeCap(ProgressStrokeCap cap) {
+    switch (cap) {
+      case ProgressStrokeCap.round:
+        return StrokeCap.round;
+      case ProgressStrokeCap.square:
+        return StrokeCap.square;
+      case ProgressStrokeCap.butt:
+        return StrokeCap.butt;
+    }
+  }
+
+  @override
+  void dispose() {
+    _animationController.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
-    return const Placeholder();
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        if (widget.type == TDProgressType.linear)
+          _buildLinearProgress()
+        else if (widget.type == TDProgressType.circular)
+          _buildCircularProgress()
+        else if (widget.type == TDProgressType.micro)
+          _buildMicroProgress()
+        else if (widget.type == TDProgressType.button)
+          _buildButtonProgress()
+      ],
+    );
+  }
+
+  Widget _buildLinearProgress() {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final maxWidth = constraints.maxWidth;
+
+        if (widget.value != null &&
+            widget.progressLabelPosition == TDProgressLabelPosition.inside) {
+          return _buildInsideLabel(maxWidth);
+        } else {
+          return _buildOutsideLabel();
+        }
+      },
+    );
+  }
+
+  Widget _buildInsideLabel(double maxWidth) {
+    return AnimatedBuilder(
+      animation: _animation,
+      builder: (context, child) {
+        final progressWidth = _animation.value * maxWidth;
+        return Stack(
+          children: [
+            _buildBackgroundContainer(),
+            if (widget.value! > 0.1)
+              _buildProgressContainerWithLabel(progressWidth)
+            else
+              _buildProgressContainerWithLabelOutside(progressWidth),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget _buildOutsideLabel() {
+    return AnimatedBuilder(
+      animation: _animation,
+      builder: (context, child) {
+        return Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            if (widget.progressLabelPosition == TDProgressLabelPosition.left)
+              Padding(
+                padding: const EdgeInsets.only(right: 8.0),
+                child: _buildLabelWidget(TDTheme.of().fontGyColor1),
+              ),
+            Expanded(
+              child: LinearProgressIndicator(
+                borderRadius: _getBorderRadius(),
+                value: widget.value != null ? _animation.value : null,
+                backgroundColor: widget.backgroundColor,
+                valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
+                minHeight: widget.strokeWidth,
+              ),
+            ),
+            if (widget.progressLabelPosition == TDProgressLabelPosition.right)
+              Padding(
+                padding: const EdgeInsets.only(left: 8.0),
+                child: _buildLabelWidget(TDTheme.of().fontGyColor1),
+              ),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget _buildBackgroundContainer() {
+    return Container(
+      height: widget.strokeWidth,
+      decoration: BoxDecoration(
+        borderRadius: _getBorderRadius(),
+        color: widget.backgroundColor,
+      ),
+    );
+  }
+
+  Widget _buildProgressContainerWithLabel(double progressWidth) {
+    return Container(
+      height: widget.strokeWidth,
+      width: progressWidth,
+      decoration: BoxDecoration(
+        color: _effectiveColor,
+        borderRadius: _getBorderRadius(),
+      ),
+      child: widget.showLabel
+          ? Align(
+              alignment: Alignment.centerRight,
+              child: Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 10.0),
+                child: _buildLabelWidget(TDTheme.of().fontWhColor1),
+              ),
+            )
+          : null,
+    );
+  }
+
+  Widget _buildProgressContainerWithLabelOutside(double progressWidth) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        Container(
+          height: widget.strokeWidth,
+          width: progressWidth,
+          decoration: BoxDecoration(
+            color: _effectiveColor,
+            borderRadius: _getBorderRadius(),
+          ),
+        ),
+        if (widget.showLabel)
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 5.0),
+            child: _buildLabelWidget(TDTheme.of().fontGyColor1),
+          ),
+      ],
+    );
+  }
+
+  Widget _buildLabelWidget(Color labelColor) {
+    late double iconSize;
+    late double fontSize;
+    late FontWeight fontWeight;
+
+    switch (widget.type) {
+      case TDProgressType.linear:
+        if (widget.progressLabelPosition != TDProgressLabelPosition.inside) {
+          fontSize = widget.strokeWidth > 14 ? widget.strokeWidth : 14;
+          iconSize = widget.strokeWidth > 20 ? widget.strokeWidth : 20;
+        } else {
+          fontSize = widget.strokeWidth * 0.6;
+          iconSize = widget.strokeWidth;
+        }
+        fontWeight = FontWeight.normal;
+        break;
+      case TDProgressType.circular:
+        iconSize = widget.circleRadius * 0.4;
+        fontSize = widget.circleRadius * 0.2;
+        fontWeight = FontWeight.bold;
+        break;
+      case TDProgressType.micro:
+        iconSize = widget.circleRadius * 0.6;
+        fontSize = widget.circleRadius * 0.2;
+        fontWeight = FontWeight.normal;
+        break;
+      case TDProgressType.button:
+        iconSize = widget.strokeWidth * 0.8;
+        fontSize = widget.strokeWidth * 0.3;
+        fontWeight = FontWeight.normal;
+        break;
+    }
+
+    return IconTheme(
+      data: IconThemeData(color: _effectiveColor, size: iconSize),
+      child: DefaultTextStyle(
+        style: TextStyle(
+          color: labelColor,
+          fontSize: fontSize,
+          fontWeight: fontWeight,
+        ),
+        child: _effectiveLabel,
+      ),
+    );
+  }
+
+  Widget _buildCircularProgress() {
+    return AnimatedBuilder(
+      animation: _animation,
+      builder: (context, child) {
+        return Stack(
+          alignment: Alignment.center,
+          children: [
+            SizedBox(
+              height: widget.circleRadius,
+              width: widget.circleRadius,
+              child: Padding(
+                padding: EdgeInsets.all(widget.strokeWidth / 2),
+                child: CircularProgressIndicator(
+                  value: widget.value != null ? _animation.value : null,
+                  backgroundColor: widget.backgroundColor,
+                  strokeCap: _getFlutterStrokeCap(widget.strokeCap),
+                  valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
+                  strokeWidth: widget.strokeWidth,
+                ),
+              ),
+            ),
+            if (widget.showLabel) _buildLabelWidget(TDTheme.of().fontGyColor1),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget _buildMicroProgress() {
+    return AnimatedBuilder(
+        animation: _animation,
+        builder: (context, child) {
+          return GestureDetector(
+              onTap: widget.onTap,
+              onLongPress: widget.onLongPress,
+              child: Stack(
+                alignment: Alignment.center,
+                children: [
+                  _buildMicroOutline(),
+                  if (widget.showLabel) _buildLabelWidget(TDTheme.of().fontGyColor1),
+                ],
+              ));
+        });
+  }
+
+  Widget _buildMicroOutline() {
+    return SizedBox(
+      height: widget.circleRadius,
+      width: widget.circleRadius,
+      child: Padding(
+        padding: EdgeInsets.all(widget.strokeWidth / 2),
+        child: CircularProgressIndicator(
+          value: widget.value != null ? _animation.value : null,
+          backgroundColor: widget.backgroundColor,
+          strokeCap: _getFlutterStrokeCap(widget.strokeCap),
+          valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
+          strokeWidth: widget.strokeWidth,
+        ),
+      ),
+    );
+  }
+
+  Widget _buildButtonProgress() {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final maxWidth = constraints.maxWidth;
+        return AnimatedBuilder(
+            animation: _animation,
+            builder: (context, child) {
+              final progressWidth = maxWidth * _animation.value;
+              return ClipRRect(
+                borderRadius: _getBorderRadius(),
+                child: GestureDetector(
+                    onTap: widget.onTap,
+                    onLongPress: widget.onLongPress,
+                    child: Stack(
+                      children: [
+                        _buildBackgroundContainer(),
+                        _buildButtonActiveContainer(progressWidth),
+                        if (widget.showLabel) _buildButtonLabel(maxWidth),
+                      ],
+                    )),
+              );
+            });
+      },
+    );
+  }
+
+  Widget _buildButtonActiveContainer(double progressWidth) {
+    return Container(
+      height: widget.strokeWidth,
+      width: progressWidth,
+      decoration: const BoxDecoration(
+        gradient: LinearGradient(
+          colors: [Color(0x0096bbf8), Color(0x8096bbf8)],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildButtonLabel(double maxWidth) {
+    return Container(
+      height: widget.strokeWidth,
+      alignment: Alignment.center,
+      child: _buildLabelWidget(TDTheme.of().fontWhColor1),
+    );
   }
 }
diff --git a/tdesign-component/lib/tdesign_flutter.dart b/tdesign-component/lib/tdesign_flutter.dart
index 3efc7f50e..7b02e83a6 100644
--- a/tdesign-component/lib/tdesign_flutter.dart
+++ b/tdesign-component/lib/tdesign_flutter.dart
@@ -42,6 +42,7 @@ export 'src/components/picker/td_multi_picker.dart';
 export 'src/components/picker/td_picker.dart';
 export 'src/components/popup/td_popup_panel.dart';
 export 'src/components/popup/td_popup_route.dart';
+export 'src/components/progress/td_progress.dart';
 export 'src/components/radio/td_radio.dart';
 export 'src/components/refresh/td_refresh_header.dart';
 export 'src/components/search/td_search_bar.dart';

From 6cf1e674bfab729cd1e9d6f0018d58593e99b35d Mon Sep 17 00:00:00 2001
From: 221250009 <221250009@smail.nju.edu.cn>
Date: Wed, 21 Aug 2024 23:00:43 +0800
Subject: [PATCH 30/74] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8A=A0=E8=BD=BD=E5=8A=A8=E7=94=BB=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/progress/td_progress.dart  | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/tdesign-component/lib/src/components/progress/td_progress.dart b/tdesign-component/lib/src/components/progress/td_progress.dart
index 78b770d91..15f0f33c5 100644
--- a/tdesign-component/lib/src/components/progress/td_progress.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress.dart
@@ -29,7 +29,6 @@ class TDIconLabel extends Icon implements TDLabelWidget {
 
 /// 进度条组件
 class TDProgress extends StatelessWidget {
-
   /// 进度条类型
   final TDProgressType type;
 
@@ -72,7 +71,7 @@ class TDProgress extends StatelessWidget {
   const TDProgress({
     Key? key,
     required this.type,
-    this.value,
+    double? value,
     this.label,
     this.progressStatus = TDProgressStatus.primary,
     this.progressLabelPosition = TDProgressLabelPosition.inside,
@@ -84,7 +83,9 @@ class TDProgress extends StatelessWidget {
     this.showLabel = true,
     this.onTap,
     this.onLongPress,
-  }) : super(key: key);
+  })  : value =
+            (value == null) ? null : (value < 0 ? 0 : (value > 1 ? 1 : value)),
+        super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -203,11 +204,11 @@ class _ProgressIndicatorState extends State<_ProgressIndicator>
     super.initState();
     _animationController = AnimationController(
       vsync: this,
-      duration: const Duration(seconds: 1),
+      duration: Duration(
+          milliseconds:
+              widget.value != null ? (widget.value! * 1000).toInt() : 1000),
     );
     _updateAnimation();
-    final int duration = (_animation.value * 1000).toInt();
-    _animationController.duration = Duration(milliseconds: duration);
     _updateEffectiveColor();
     _updateEffectiveLabel();
   }
@@ -263,8 +264,12 @@ class _ProgressIndicatorState extends State<_ProgressIndicator>
     final bool showIconBorder = widget.type == TDProgressType.linear;
 
     Widget getAutoText() => showAutoText && widget.type != TDProgressType.micro
-        ? Text('${(widget.value! * 100).round()}%')
-        : const Text("");
+        ? AnimatedBuilder(
+            animation: _animation,
+            builder: (context, child) {
+              return Text('${(_animation.value * 100).round()}%');
+            })
+        : const Text('');
 
     final statusWidgets = {
       TDProgressStatus.primary: getAutoText(),
@@ -358,7 +363,7 @@ class _ProgressIndicatorState extends State<_ProgressIndicator>
         return Stack(
           children: [
             _buildBackgroundContainer(),
-            if (widget.value! > 0.1)
+            if (_animation.value > 0.1)
               _buildProgressContainerWithLabel(progressWidth)
             else
               _buildProgressContainerWithLabelOutside(progressWidth),
@@ -536,7 +541,8 @@ class _ProgressIndicatorState extends State<_ProgressIndicator>
                 alignment: Alignment.center,
                 children: [
                   _buildMicroOutline(),
-                  if (widget.showLabel) _buildLabelWidget(TDTheme.of().fontGyColor1),
+                  if (widget.showLabel)
+                    _buildLabelWidget(TDTheme.of().fontGyColor1),
                 ],
               ));
         });

From e9493adf1c6e8ff1905ebdd9aea1413263a7d7e1 Mon Sep 17 00:00:00 2001
From: 221250009 <221250009@smail.nju.edu.cn>
Date: Thu, 22 Aug 2024 14:01:58 +0800
Subject: [PATCH 31/74] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/progress/td_progress.dart  | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/tdesign-component/lib/src/components/progress/td_progress.dart b/tdesign-component/lib/src/components/progress/td_progress.dart
index 15f0f33c5..7ced16ea3 100644
--- a/tdesign-component/lib/src/components/progress/td_progress.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress.dart
@@ -90,7 +90,7 @@ class TDProgress extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final defaultValues = _getDefaultValues(type);
-    return _ProgressIndicator(
+    return MyProgressIndicator(
       value: value,
       label: label,
       progressStatus: progressStatus,
@@ -156,7 +156,7 @@ class _DefaultValues {
 }
 
 /// 构建工具类
-class _ProgressIndicator extends StatefulWidget {
+class MyProgressIndicator extends StatefulWidget {
   final double? value;
   final TDLabelWidget? label;
   final TDProgressLabelPosition progressLabelPosition;
@@ -171,7 +171,7 @@ class _ProgressIndicator extends StatefulWidget {
   final VoidCallback? onTap;
   final VoidCallback? onLongPress;
 
-  const _ProgressIndicator({
+  const MyProgressIndicator({
     Key? key,
     this.value,
     this.label,
@@ -192,7 +192,7 @@ class _ProgressIndicator extends StatefulWidget {
   _ProgressIndicatorState createState() => _ProgressIndicatorState();
 }
 
-class _ProgressIndicatorState extends State<_ProgressIndicator>
+class _ProgressIndicatorState extends State<MyProgressIndicator>
     with SingleTickerProviderStateMixin {
   late AnimationController _animationController;
   late Animation<double> _animation;
@@ -204,6 +204,7 @@ class _ProgressIndicatorState extends State<_ProgressIndicator>
     super.initState();
     _animationController = AnimationController(
       vsync: this,
+      value: widget.value ?? 0,
       duration: Duration(
           milliseconds:
               widget.value != null ? (widget.value! * 1000).toInt() : 1000),
@@ -214,10 +215,10 @@ class _ProgressIndicatorState extends State<_ProgressIndicator>
   }
 
   @override
-  void didUpdateWidget(_ProgressIndicator oldWidget) {
+  void didUpdateWidget(MyProgressIndicator oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (oldWidget.value != widget.value) {
-      _updateAnimation();
+      _updateAnimation(oldWidgetValue: oldWidget.value);
     }
     if (oldWidget.color != widget.color ||
         oldWidget.progressStatus != widget.progressStatus) {
@@ -250,10 +251,10 @@ class _ProgressIndicatorState extends State<_ProgressIndicator>
         widget.label ?? _getDefaultLabelFromStatus(widget.progressStatus);
   }
 
-  void _updateAnimation() {
-    _animation = Tween<double>(begin: 0, end: widget.value ?? 0)
+  void _updateAnimation({double? oldWidgetValue}) {
+    _animation = Tween<double>(begin: _animationController.value, end: widget.value ?? 0)
         .animate(_animationController);
-    _animationController.forward(from: 0);
+    _animationController.forward(from: _animationController.value);
   }
 
   Widget _getDefaultLabelFromStatus(TDProgressStatus status) {
@@ -264,11 +265,7 @@ class _ProgressIndicatorState extends State<_ProgressIndicator>
     final bool showIconBorder = widget.type == TDProgressType.linear;
 
     Widget getAutoText() => showAutoText && widget.type != TDProgressType.micro
-        ? AnimatedBuilder(
-            animation: _animation,
-            builder: (context, child) {
-              return Text('${(_animation.value * 100).round()}%');
-            })
+        ? Text('${(widget.value! * 100).round()}%')
         : const Text('');
 
     final statusWidgets = {
@@ -363,7 +360,7 @@ class _ProgressIndicatorState extends State<_ProgressIndicator>
         return Stack(
           children: [
             _buildBackgroundContainer(),
-            if (_animation.value > 0.1)
+            if (widget.value! > 0.1)
               _buildProgressContainerWithLabel(progressWidth)
             else
               _buildProgressContainerWithLabelOutside(progressWidth),

From 87b3f6137bd2b209fbdd60ecdea594d160a623bc Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Sat, 24 Aug 2024 15:22:46 +0800
Subject: [PATCH 32/74] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAnimate=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0duration=E5=8F=82=E6=95=B0=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=95=B0=E5=80=BC=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_progress_page.dart    |  75 ++++---
 .../src/components/progress/td_progress.dart  | 182 ++++++++++-------
 .../progress/td_progress_style.dart           | 188 ------------------
 3 files changed, 147 insertions(+), 298 deletions(-)
 delete mode 100644 tdesign-component/lib/src/components/progress/td_progress_style.dart

diff --git a/tdesign-component/example/lib/page/td_progress_page.dart b/tdesign-component/example/lib/page/td_progress_page.dart
index e27703130..9810bfd57 100644
--- a/tdesign-component/example/lib/page/td_progress_page.dart
+++ b/tdesign-component/example/lib/page/td_progress_page.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:tdesign_flutter/tdesign_flutter.dart';
 
 import '../annotation/demo.dart';
@@ -96,32 +95,32 @@ class _TDProgressPageState extends State<TDProgressPage> {
 
   @Demo(group: 'progress')
   Widget _buildRightLabelLinear(BuildContext context) {
-    return const TDProgress(
-        type: TDProgressType.linear,
+    return TDProgress(
+        type: ProgressType.linear,
         value: 0.8,
         strokeWidth: 6,
-        progressLabelPosition: TDProgressLabelPosition.right);
+        progressLabelPosition: ProgressLabelPosition.right);
   }
 
   @Demo(group: 'progress')
   Widget _buildInsideLabelLinear(BuildContext context) {
-    return const TDProgress(type: TDProgressType.linear, value: 0.8);
+    return TDProgress(type: ProgressType.linear, value: 0.8);
   }
 
   @Demo(group: 'progress')
   Widget _buildCircle(BuildContext context) {
-    return const TDProgress(type: TDProgressType.circular, value: 0.3);
+    return TDProgress(type: ProgressType.circular, value: 0.3);
   }
 
   @Demo(group: 'progress')
   Widget _buildMicro(BuildContext context) {
-    return const TDProgress(type: TDProgressType.micro, value: 0.75);
+    return TDProgress(type: ProgressType.micro, value: 0.75);
   }
 
   @Demo(group: 'progress')
   Widget _buildButton(BuildContext context) {
     return TDProgress(
-        type: TDProgressType.button,
+        type: ProgressType.button,
         onTap: _toggleProgress,
         onLongPress: _resetProgress,
         value: progressValue,
@@ -134,7 +133,7 @@ class _TDProgressPageState extends State<TDProgressPage> {
       mainAxisAlignment: MainAxisAlignment.start,
       children: [
         TDProgress(
-          type: TDProgressType.micro,
+          type: ProgressType.micro,
           value: microProgressValue,
           onTap: _toggleMicroProgress,
           label: TDIconLabel(isPlaying ? Icons.pause : Icons.play_arrow,
@@ -142,7 +141,7 @@ class _TDProgressPageState extends State<TDProgressPage> {
         ),
         const SizedBox(width: 10),
         TDProgress(
-          type: TDProgressType.micro,
+          type: ProgressType.micro,
           value: microProgressValue,
           onTap: _resetMicroProgress,
           label: TDIconLabel(Icons.stop,
@@ -154,73 +153,73 @@ class _TDProgressPageState extends State<TDProgressPage> {
 
   @Demo(group: 'progress')
   Widget _buildPrimary(BuildContext context) {
-    return const TDProgress(
-        type: TDProgressType.linear,
-        progressStatus: TDProgressStatus.primary,
+    return TDProgress(
+        type: ProgressType.linear,
+        progressStatus: ProgressStatus.primary,
         value: 0.8,
         strokeWidth: 6,
-        progressLabelPosition: TDProgressLabelPosition.right);
+        progressLabelPosition: ProgressLabelPosition.right);
   }
 
   @Demo(group: 'progress')
   Widget _buildWarning(BuildContext context) {
-    return const TDProgress(
-        type: TDProgressType.linear,
-        progressStatus: TDProgressStatus.warning,
+    return TDProgress(
+        type: ProgressType.linear,
+        progressStatus: ProgressStatus.warning,
         value: 0.8,
         strokeWidth: 6,
-        progressLabelPosition: TDProgressLabelPosition.right);
+        progressLabelPosition: ProgressLabelPosition.right);
   }
 
   @Demo(group: 'progress')
   Widget _buildDanger(BuildContext context) {
-    return const TDProgress(
-        type: TDProgressType.linear,
-        progressStatus: TDProgressStatus.danger,
+    return TDProgress(
+        type: ProgressType.linear,
+        progressStatus: ProgressStatus.danger,
         value: 0.8,
         strokeWidth: 6,
-        progressLabelPosition: TDProgressLabelPosition.right);
+        progressLabelPosition: ProgressLabelPosition.right);
   }
 
   @Demo(group: 'progress')
   Widget _buildSuccess(BuildContext context) {
-    return const TDProgress(
-        type: TDProgressType.linear,
-        progressStatus: TDProgressStatus.success,
+    return TDProgress(
+        type: ProgressType.linear,
+        progressStatus: ProgressStatus.success,
         value: 0.8,
         strokeWidth: 6,
-        progressLabelPosition: TDProgressLabelPosition.right);
+        progressLabelPosition: ProgressLabelPosition.right);
   }
 
   @Demo(group: 'progress')
   Widget _buildCirclePrimary(BuildContext context) {
-    return const TDProgress(
-        type: TDProgressType.circular,
-        progressStatus: TDProgressStatus.primary,
+    return TDProgress(
+        type: ProgressType.circular,
+        progressStatus: ProgressStatus.primary,
         value: 0.3);
   }
 
   @Demo(group: 'progress')
   Widget _buildCircleWarning(BuildContext context) {
-    return const TDProgress(
-        type: TDProgressType.circular,
-        progressStatus: TDProgressStatus.warning,
+    return TDProgress(
+        type: ProgressType.circular,
+        progressStatus: ProgressStatus.warning,
         value: 0.3);
   }
 
   @Demo(group: 'progress')
   Widget _buildCircleDanger(BuildContext context) {
-    return const TDProgress(
-        type: TDProgressType.circular,
-        progressStatus: TDProgressStatus.danger,
+    return TDProgress(
+        type: ProgressType.circular,
+        progressStatus: ProgressStatus.danger,
         value: 0.3);
   }
 
   @Demo(group: 'progress')
   Widget _buildCircleSuccess(BuildContext context) {
-    return const TDProgress(
-        type: TDProgressType.circular,
-        progressStatus: TDProgressStatus.success,
+    return TDProgress(
+        type: ProgressType.circular,
+        progressStatus: ProgressStatus.success,
         value: 1);
   }
 
diff --git a/tdesign-component/lib/src/components/progress/td_progress.dart b/tdesign-component/lib/src/components/progress/td_progress.dart
index 7ced16ea3..3401ded36 100644
--- a/tdesign-component/lib/src/components/progress/td_progress.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress.dart
@@ -1,17 +1,15 @@
 import 'package:flutter/material.dart';
 import '../../../tdesign_flutter.dart';
 
-enum TDProgressType { linear, circular, micro, button }
+enum ProgressType { linear, circular, micro, button }
 
-enum TDProgressLabelPosition { inside, left, right }
+enum ProgressLabelPosition { inside, left, right }
 
-enum TDProgressStatus { primary, warning, danger, success }
+enum ProgressStatus { primary, warning, danger, success }
 
-enum ProgressStrokeCap {
-  round,
-  square,
-  butt,
-}
+enum ProgressStrokeCap { round, square, butt }
+
+enum ProgressAnimationCurve { easeIn, easeOut, easeInout }
 
 abstract class TDLabelWidget extends Widget {
   const TDLabelWidget({super.key});
@@ -30,21 +28,21 @@ class TDIconLabel extends Icon implements TDLabelWidget {
 /// 进度条组件
 class TDProgress extends StatelessWidget {
   /// 进度条类型
-  final TDProgressType type;
+  final ProgressType type;
 
-  /// 进度值
+  /// 进度值 (0.0 到 1.0 之间的正数)
   final double? value;
 
   /// 进度条标签
   final TDLabelWidget? label;
 
   /// 进度条状态
-  final TDProgressStatus progressStatus;
+  final ProgressStatus progressStatus;
 
   /// 标签显示位置
-  final TDProgressLabelPosition progressLabelPosition;
+  final ProgressLabelPosition progressLabelPosition;
 
-  /// 进度条粗细
+  /// 进度条粗细 (正数)
   final double? strokeWidth;
 
   /// 进度条颜色
@@ -56,7 +54,7 @@ class TDProgress extends StatelessWidget {
   /// 进度条末端形状
   final ProgressStrokeCap? strokeCap;
 
-  /// 进度条背景圆角
+  /// 环形进度条半径 (正数)
   final double? circleRadius;
 
   /// 是否显示标签
@@ -68,29 +66,69 @@ class TDProgress extends StatelessWidget {
   /// 长按事件
   final VoidCallback? onLongPress;
 
-  const TDProgress({
+  /// 动画持续时间 (正整数，单位为毫秒)
+  final int animationDuration;
+
+  TDProgress({
     Key? key,
     required this.type,
     double? value,
     this.label,
-    this.progressStatus = TDProgressStatus.primary,
-    this.progressLabelPosition = TDProgressLabelPosition.inside,
-    this.strokeWidth,
+    this.progressStatus = ProgressStatus.primary,
+    this.progressLabelPosition = ProgressLabelPosition.inside,
+    double? strokeWidth,
     this.color,
     this.backgroundColor,
     this.strokeCap,
-    this.circleRadius,
+    double? circleRadius,
     this.showLabel = true,
     this.onTap,
     this.onLongPress,
-  })  : value =
-            (value == null) ? null : (value < 0 ? 0 : (value > 1 ? 1 : value)),
+    int animationDuration = 300,
+  })  : value = _validateProgress(value),
+        strokeWidth = _validatePositiveDouble(strokeWidth, 'strokeWidth'),
+        circleRadius = _validatePositiveDouble(circleRadius, 'circleRadius'),
+        animationDuration = _validatePositiveInt(animationDuration, 'animationDuration'),
         super(key: key);
 
+  // 验证进度值
+  static double? _validateProgress(double? value) {
+    if (value == null) {
+      return null;
+    }
+    if (value < 0) {
+      return 0;
+    }
+    if (value > 1) {
+      return 1;
+    }
+    return value;
+  }
+
+  // 验证正数 double 值
+  static double? _validatePositiveDouble(double? value, String paramName) {
+    if (value == null) {
+      return null;
+    }
+    if (value <= 0) {
+      throw ArgumentError('$paramName must be a positive number');
+    }
+    return value;
+  }
+
+  // 验证正整数
+  static int _validatePositiveInt(int value, String paramName) {
+    if (value <= 0) {
+      throw ArgumentError('$paramName must be a positive number');
+    }
+    return value;
+  }
+
+
   @override
   Widget build(BuildContext context) {
     final defaultValues = _getDefaultValues(type);
-    return MyProgressIndicator(
+    return ProgressIndicator(
       value: value,
       label: label,
       progressStatus: progressStatus,
@@ -104,38 +142,39 @@ class TDProgress extends StatelessWidget {
       onTap: onTap,
       onLongPress: onLongPress,
       type: type,
+
     );
   }
 
-  _DefaultValues _getDefaultValues(TDProgressType type) {
+  _DefaultValues _getDefaultValues(ProgressType type) {
     switch (type) {
-      case TDProgressType.linear:
+      case ProgressType.linear:
         return _DefaultValues(
           strokeWidth: 20.0,
           backgroundColor: TDTheme.of().grayColor3,
           strokeCap: ProgressStrokeCap.round,
-          circleRadius: 0, // Not applicable for linear progress
+          circleRadius: 0, 
         );
-      case TDProgressType.circular:
+      case ProgressType.circular:
         return _DefaultValues(
           strokeWidth: 5.0,
           backgroundColor: TDTheme.of().grayColor2,
           strokeCap: ProgressStrokeCap.round,
           circleRadius: 80.0,
         );
-      case TDProgressType.micro:
+      case ProgressType.micro:
         return _DefaultValues(
           strokeWidth: 2.0,
           backgroundColor: TDTheme.of().grayColor2,
           strokeCap: ProgressStrokeCap.round,
           circleRadius: 20.0,
         );
-      case TDProgressType.button:
+      case ProgressType.button:
         return _DefaultValues(
           strokeWidth: 60.0,
           backgroundColor: TDTheme.of().brandNormalColor,
           strokeCap: ProgressStrokeCap.butt,
-          circleRadius: 0, // Not applicable for button progress
+          circleRadius: 0, 
         );
     }
   }
@@ -156,43 +195,45 @@ class _DefaultValues {
 }
 
 /// 构建工具类
-class MyProgressIndicator extends StatefulWidget {
+class ProgressIndicator extends StatefulWidget {
   final double? value;
   final TDLabelWidget? label;
-  final TDProgressLabelPosition progressLabelPosition;
+  final ProgressLabelPosition progressLabelPosition;
   final double strokeWidth;
   final double circleRadius;
   final ProgressStrokeCap strokeCap;
   final Color? color;
   final Color backgroundColor;
-  final TDProgressType type;
-  final TDProgressStatus progressStatus;
+  final ProgressType type;
+  final ProgressStatus progressStatus;
   final bool showLabel;
   final VoidCallback? onTap;
   final VoidCallback? onLongPress;
+  final int animationDuration;
 
-  const MyProgressIndicator({
+  const ProgressIndicator({
     Key? key,
     this.value,
     this.label,
-    this.progressLabelPosition = TDProgressLabelPosition.inside,
+    this.progressLabelPosition = ProgressLabelPosition.inside,
     required this.strokeWidth,
     required this.strokeCap,
     required this.circleRadius,
     this.color,
     required this.backgroundColor,
     required this.type,
-    this.progressStatus = TDProgressStatus.primary,
+    this.progressStatus = ProgressStatus.primary,
     this.showLabel = true,
     this.onTap,
     this.onLongPress,
+    this.animationDuration = 300,
   }) : super(key: key);
 
   @override
   _ProgressIndicatorState createState() => _ProgressIndicatorState();
 }
 
-class _ProgressIndicatorState extends State<MyProgressIndicator>
+class _ProgressIndicatorState extends State<ProgressIndicator>
     with SingleTickerProviderStateMixin {
   late AnimationController _animationController;
   late Animation<double> _animation;
@@ -204,10 +245,7 @@ class _ProgressIndicatorState extends State<MyProgressIndicator>
     super.initState();
     _animationController = AnimationController(
       vsync: this,
-      value: widget.value ?? 0,
-      duration: Duration(
-          milliseconds:
-              widget.value != null ? (widget.value! * 1000).toInt() : 1000),
+      duration: Duration(milliseconds: widget.animationDuration),
     );
     _updateAnimation();
     _updateEffectiveColor();
@@ -215,7 +253,7 @@ class _ProgressIndicatorState extends State<MyProgressIndicator>
   }
 
   @override
-  void didUpdateWidget(MyProgressIndicator oldWidget) {
+  void didUpdateWidget(ProgressIndicator oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (oldWidget.value != widget.value) {
       _updateAnimation(oldWidgetValue: oldWidget.value);
@@ -252,35 +290,35 @@ class _ProgressIndicatorState extends State<MyProgressIndicator>
   }
 
   void _updateAnimation({double? oldWidgetValue}) {
-    _animation = Tween<double>(begin: _animationController.value, end: widget.value ?? 0)
+    _animation = Tween<double>(begin: oldWidgetValue ?? _animationController.value, end: widget.value)
         .animate(_animationController);
-    _animationController.forward(from: _animationController.value);
+    _animationController.forward(from: 0);
   }
 
-  Widget _getDefaultLabelFromStatus(TDProgressStatus status) {
-    final bool showAutoText = widget.value != null;
-    final bool showInsideLabel =
-        widget.progressLabelPosition == TDProgressLabelPosition.inside &&
-            widget.type != TDProgressType.circular;
-    final bool showIconBorder = widget.type == TDProgressType.linear;
+  Widget _getDefaultLabelFromStatus(ProgressStatus status) {
+    final showAutoText = widget.value != null;
+    final showInsideLabel =
+        widget.progressLabelPosition == ProgressLabelPosition.inside &&
+            widget.type != ProgressType.circular;
+    final showIconBorder = widget.type == ProgressType.linear;
 
-    Widget getAutoText() => showAutoText && widget.type != TDProgressType.micro
+    Widget getAutoText() => showAutoText && widget.type != ProgressType.micro
         ? Text('${(widget.value! * 100).round()}%')
         : const Text('');
 
     final statusWidgets = {
-      TDProgressStatus.primary: getAutoText(),
-      TDProgressStatus.warning: showInsideLabel
+      ProgressStatus.primary: getAutoText(),
+      ProgressStatus.warning: showInsideLabel
           ? getAutoText()
           : showIconBorder
               ? const Icon(TDIcons.error_circle_filled)
               : const Icon(TDIcons.error),
-      TDProgressStatus.danger: showInsideLabel
+      ProgressStatus.danger: showInsideLabel
           ? getAutoText()
           : showIconBorder
               ? const Icon(TDIcons.close_circle_filled)
               : const Icon(TDIcons.close),
-      TDProgressStatus.success: showInsideLabel
+      ProgressStatus.success: showInsideLabel
           ? getAutoText()
           : showIconBorder
               ? const Icon(TDIcons.check_circle_filled)
@@ -290,15 +328,15 @@ class _ProgressIndicatorState extends State<MyProgressIndicator>
     return statusWidgets[status] ?? getAutoText();
   }
 
-  Color _getColorFromStatus(TDProgressStatus status) {
+  Color _getColorFromStatus(ProgressStatus status) {
     switch (status) {
-      case TDProgressStatus.primary:
+      case ProgressStatus.primary:
         return TDTheme.of().brandNormalColor;
-      case TDProgressStatus.warning:
+      case ProgressStatus.warning:
         return TDTheme.of().warningNormalColor;
-      case TDProgressStatus.danger:
+      case ProgressStatus.danger:
         return TDTheme.of().errorNormalColor;
-      case TDProgressStatus.success:
+      case ProgressStatus.success:
         return TDTheme.of().successNormalColor;
     }
   }
@@ -325,13 +363,13 @@ class _ProgressIndicatorState extends State<MyProgressIndicator>
     return Column(
       mainAxisSize: MainAxisSize.min,
       children: [
-        if (widget.type == TDProgressType.linear)
+        if (widget.type == ProgressType.linear)
           _buildLinearProgress()
-        else if (widget.type == TDProgressType.circular)
+        else if (widget.type == ProgressType.circular)
           _buildCircularProgress()
-        else if (widget.type == TDProgressType.micro)
+        else if (widget.type == ProgressType.micro)
           _buildMicroProgress()
-        else if (widget.type == TDProgressType.button)
+        else if (widget.type == ProgressType.button)
           _buildButtonProgress()
       ],
     );
@@ -343,7 +381,7 @@ class _ProgressIndicatorState extends State<MyProgressIndicator>
         final maxWidth = constraints.maxWidth;
 
         if (widget.value != null &&
-            widget.progressLabelPosition == TDProgressLabelPosition.inside) {
+            widget.progressLabelPosition == ProgressLabelPosition.inside) {
           return _buildInsideLabel(maxWidth);
         } else {
           return _buildOutsideLabel();
@@ -377,7 +415,7 @@ class _ProgressIndicatorState extends State<MyProgressIndicator>
         return Row(
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            if (widget.progressLabelPosition == TDProgressLabelPosition.left)
+            if (widget.progressLabelPosition == ProgressLabelPosition.left)
               Padding(
                 padding: const EdgeInsets.only(right: 8.0),
                 child: _buildLabelWidget(TDTheme.of().fontGyColor1),
@@ -391,7 +429,7 @@ class _ProgressIndicatorState extends State<MyProgressIndicator>
                 minHeight: widget.strokeWidth,
               ),
             ),
-            if (widget.progressLabelPosition == TDProgressLabelPosition.right)
+            if (widget.progressLabelPosition == ProgressLabelPosition.right)
               Padding(
                 padding: const EdgeInsets.only(left: 8.0),
                 child: _buildLabelWidget(TDTheme.of().fontGyColor1),
@@ -459,8 +497,8 @@ class _ProgressIndicatorState extends State<MyProgressIndicator>
     late FontWeight fontWeight;
 
     switch (widget.type) {
-      case TDProgressType.linear:
-        if (widget.progressLabelPosition != TDProgressLabelPosition.inside) {
+      case ProgressType.linear:
+        if (widget.progressLabelPosition != ProgressLabelPosition.inside) {
           fontSize = widget.strokeWidth > 14 ? widget.strokeWidth : 14;
           iconSize = widget.strokeWidth > 20 ? widget.strokeWidth : 20;
         } else {
@@ -469,17 +507,17 @@ class _ProgressIndicatorState extends State<MyProgressIndicator>
         }
         fontWeight = FontWeight.normal;
         break;
-      case TDProgressType.circular:
+      case ProgressType.circular:
         iconSize = widget.circleRadius * 0.4;
         fontSize = widget.circleRadius * 0.2;
         fontWeight = FontWeight.bold;
         break;
-      case TDProgressType.micro:
+      case ProgressType.micro:
         iconSize = widget.circleRadius * 0.6;
         fontSize = widget.circleRadius * 0.2;
         fontWeight = FontWeight.normal;
         break;
-      case TDProgressType.button:
+      case ProgressType.button:
         iconSize = widget.strokeWidth * 0.8;
         fontSize = widget.strokeWidth * 0.3;
         fontWeight = FontWeight.normal;
diff --git a/tdesign-component/lib/src/components/progress/td_progress_style.dart b/tdesign-component/lib/src/components/progress/td_progress_style.dart
deleted file mode 100644
index 7c9f573c8..000000000
--- a/tdesign-component/lib/src/components/progress/td_progress_style.dart
+++ /dev/null
@@ -1,188 +0,0 @@
-import 'package:flutter/material.dart';
-import '../../../tdesign_flutter.dart';
-
-class TDProgressStyle {
-  const TDProgressStyle({
-    this.height,
-    this.strokeWidth,
-    this.circleRadius,
-    this.borderRadius,
-    this.color,
-    this.backgroundColor,
-    this.labelPosition,
-    this.labelType,
-    this.animationConfig,
-    this.buttonConfig,
-  });
-
-  final double? height;
-  final double? strokeWidth;
-  final double? circleRadius;
-  final double? borderRadius;
-  final Color? color;
-  final Color? backgroundColor;
-  final TDProgressLabelPosition? labelPosition;
-  final TDProgressLabelType? labelType;
-  final TDProgressAnimationConfig? animationConfig;
-  final TDProgressButtonConfig? buttonConfig;
-
-  // 基础进度条样式
-  static TDProgressStyle baseStyle(BuildContext context) {
-    return TDProgressStyle(
-      color: TDTheme.of(context).brandColor1,
-      backgroundColor: TDTheme.of(context).grayColor1,
-      animationConfig: const TDProgressAnimationConfig(
-        enabled: true,
-        type: TDProgressAnimationType.linear,
-        speed: 1.0,
-      ),
-    );
-  }
-
-  // 线性进度条样式
-  static TDProgressStyle lineStyle(BuildContext context) {
-    return baseStyle(context).copyWith(
-      height: 8,
-      strokeWidth: 2,
-      borderRadius: TDTheme.of(context).radiusDefault,
-      labelPosition: TDProgressLabelPosition.right,
-      labelType: TDProgressLabelType.text,
-    );
-  }
-
-  // 圆形进度条样式
-  static TDProgressStyle circleStyle(BuildContext context) {
-    return baseStyle(context).copyWith(
-      strokeWidth: 2,
-      circleRadius: TDTheme.of(context).radiusCircle,
-      labelPosition: TDProgressLabelPosition.inner,
-      labelType: TDProgressLabelType.text,
-      animationConfig: const TDProgressAnimationConfig(
-        type: TDProgressAnimationType.easeInOut,
-      ),
-    );
-  }
-
-  // 微型进度条样式
-  static TDProgressStyle microStyle(BuildContext context) {
-    return baseStyle(context).copyWith(
-      height: 4,
-      strokeWidth: 1,
-      borderRadius: TDTheme.of(context).radiusCircle,
-      labelType: TDProgressLabelType.none,
-      animationConfig: const TDProgressAnimationConfig(
-        speed: 1.5,
-      ),
-    );
-  }
-
-  // 带按钮的微型进度条样式
-  static TDProgressStyle microButtonStyle(BuildContext context) {
-    return microStyle(context).copyWith(
-      labelType: TDProgressLabelType.icon,
-      buttonConfig: const TDProgressButtonConfig(
-        size: Size(20, 20),
-        padding: EdgeInsets.all(4),
-        // 其他微型按钮特定的配置
-      ),
-    );
-  }
-
-  // 带按钮的线性进度条样式
-  static TDProgressStyle lineButtonStyle(BuildContext context) {
-    return lineStyle(context).copyWith(
-      labelType: TDProgressLabelType.custom,
-      buttonConfig: const TDProgressButtonConfig(
-        padding: EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-        // 其他线性按钮特定的配置
-      ),
-    );
-  }
-
-  // 根据进度条类型获取默认样式
-  static TDProgressStyle getDefaultStyle(BuildContext context, TDProgressType type) {
-    switch (type) {
-      case TDProgressType.line:
-        return lineStyle(context);
-      case TDProgressType.circle:
-        return circleStyle(context);
-      case TDProgressType.micro:
-        return microStyle(context);
-      case TDProgressType.microButton:
-        return microButtonStyle(context);
-      case TDProgressType.lineButton:
-        return lineButtonStyle(context);
-    }
-  }
-
-  // 复制并修改当前样式
-  TDProgressStyle copyWith({
-    double? height,
-    double? strokeWidth,
-    double? circleRadius,
-    double? borderRadius,
-    Color? color,
-    Color? backgroundColor,
-    TDProgressLabelPosition? labelPosition,
-    TDProgressLabelType? labelType,
-    TDProgressAnimationConfig? animationConfig,
-    TDProgressButtonConfig? buttonConfig,
-  }) {
-    return TDProgressStyle(
-      height: height ?? this.height,
-      strokeWidth: strokeWidth ?? this.strokeWidth,
-      circleRadius: circleRadius ?? this.circleRadius,
-      borderRadius: borderRadius ?? this.borderRadius,
-      color: color ?? this.color,
-      backgroundColor: backgroundColor ?? this.backgroundColor,
-      labelPosition: labelPosition ?? this.labelPosition,
-      labelType: labelType ?? this.labelType,
-      animationConfig: animationConfig ?? this.animationConfig,
-      buttonConfig: buttonConfig ?? this.buttonConfig,
-    );
-  }
-}
-
-// 进度条按钮配置类
-class TDProgressButtonConfig {
-  const TDProgressButtonConfig({
-    this.size,
-    this.padding,
-    this.style,
-  });
-
-  final Size? size;
-  final EdgeInsetsGeometry? padding;
-  final TDButtonStyle? style;
-
-  TDProgressButtonConfig copyWith({
-    Size? size,
-    EdgeInsetsGeometry? padding,
-    TDButtonStyle? style,
-  }) {
-    return TDProgressButtonConfig(
-      size: size ?? this.size,
-      padding: padding ?? this.padding,
-      style: style ?? this.style,
-    );
-  }
-}
-
-// 其他枚举和类的定义
-enum TDProgressType { line, circle, micro, microButton, lineButton }
-enum TDProgressLabelPosition { left, right, inner }
-enum TDProgressLabelType { none, text, icon, custom }
-
-class TDProgressAnimationConfig {
-  const TDProgressAnimationConfig({
-    this.enabled = true,
-    this.type = TDProgressAnimationType.linear,
-    this.speed = 1.0,
-  });
-
-  final bool enabled;
-  final TDProgressAnimationType type;
-  final double speed;
-}
-
-enum TDProgressAnimationType { easeIn, easeOut, easeInOut, linear }
\ No newline at end of file

From 81f1ef97e8d2392303b592cad14c1a4ae22f382a Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Sat, 24 Aug 2024 15:28:29 +0800
Subject: [PATCH 33/74] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E5=80=BC?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/progress/td_progress.dart  | 48 +++++--------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/tdesign-component/lib/src/components/progress/td_progress.dart b/tdesign-component/lib/src/components/progress/td_progress.dart
index 3401ded36..b0773210c 100644
--- a/tdesign-component/lib/src/components/progress/td_progress.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress.dart
@@ -67,7 +67,7 @@ class TDProgress extends StatelessWidget {
   final VoidCallback? onLongPress;
 
   /// 动画持续时间 (正整数，单位为毫秒)
-  final int animationDuration;
+  final int? animationDuration;
 
   TDProgress({
     Key? key,
@@ -86,43 +86,19 @@ class TDProgress extends StatelessWidget {
     this.onLongPress,
     int animationDuration = 300,
   })  : value = _validateProgress(value),
-        strokeWidth = _validatePositiveDouble(strokeWidth, 'strokeWidth'),
-        circleRadius = _validatePositiveDouble(circleRadius, 'circleRadius'),
-        animationDuration = _validatePositiveInt(animationDuration, 'animationDuration'),
+        strokeWidth = _validatePositiveDouble(strokeWidth),
+        circleRadius = _validatePositiveDouble(circleRadius),
+        animationDuration = _validatePositiveInt(animationDuration),
         super(key: key);
 
-  // 验证进度值
-  static double? _validateProgress(double? value) {
-    if (value == null) {
-      return null;
-    }
-    if (value < 0) {
-      return 0;
-    }
-    if (value > 1) {
-      return 1;
-    }
-    return value;
-  }
+  static double? _validateProgress(double? value) =>
+      value == null ? null : value.clamp(0.0, 1.0);
 
-  // 验证正数 double 值
-  static double? _validatePositiveDouble(double? value, String paramName) {
-    if (value == null) {
-      return null;
-    }
-    if (value <= 0) {
-      throw ArgumentError('$paramName must be a positive number');
-    }
-    return value;
-  }
+  static double? _validatePositiveDouble(double? value) =>
+      value == null ? null : value <= 0 ? 0 : value;
 
-  // 验证正整数
-  static int _validatePositiveInt(int value, String paramName) {
-    if (value <= 0) {
-      throw ArgumentError('$paramName must be a positive number');
-    }
-    return value;
-  }
+  static int _validatePositiveInt(int? value) =>
+      value == null || value <= 0 ? 0 : value;
 
 
   @override
@@ -153,7 +129,7 @@ class TDProgress extends StatelessWidget {
           strokeWidth: 20.0,
           backgroundColor: TDTheme.of().grayColor3,
           strokeCap: ProgressStrokeCap.round,
-          circleRadius: 0, 
+          circleRadius: 0,
         );
       case ProgressType.circular:
         return _DefaultValues(
@@ -174,7 +150,7 @@ class TDProgress extends StatelessWidget {
           strokeWidth: 60.0,
           backgroundColor: TDTheme.of().brandNormalColor,
           strokeCap: ProgressStrokeCap.butt,
-          circleRadius: 0, 
+          circleRadius: 0,
         );
     }
   }

From 78c88349f81ef0f045d5dfe4f2d8932834753804 Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Sat, 24 Aug 2024 15:42:07 +0800
Subject: [PATCH 34/74] =?UTF-8?q?=E6=B8=85=E7=90=86=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 progress/.gitignore                           |  44 --
 progress/README.md                            |  16 -
 progress/analysis_options.yaml                |  29 -
 progress/android/.gitignore                   |  13 -
 progress/android/app/build.gradle             |  67 --
 .../android/app/src/debug/AndroidManifest.xml |   7 -
 .../android/app/src/main/AndroidManifest.xml  |  33 -
 .../com/example/progress/MainActivity.kt      |   6 -
 .../res/drawable-v21/launch_background.xml    |  12 -
 .../main/res/drawable/launch_background.xml   |  12 -
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 544 -> 0 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 442 -> 0 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 721 -> 0 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 1031 -> 0 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 1443 -> 0 bytes
 .../app/src/main/res/values-night/styles.xml  |  18 -
 .../app/src/main/res/values/styles.xml        |  18 -
 .../app/src/profile/AndroidManifest.xml       |   7 -
 progress/android/build.gradle                 |  31 -
 progress/android/gradle.properties            |   3 -
 .../gradle/wrapper/gradle-wrapper.properties  |   5 -
 progress/android/settings.gradle              |  20 -
 progress/ios/.gitignore                       |  34 -
 progress/ios/Flutter/AppFrameworkInfo.plist   |  26 -
 progress/ios/Flutter/Debug.xcconfig           |   1 -
 progress/ios/Flutter/Release.xcconfig         |   1 -
 progress/ios/Runner.xcodeproj/project.pbxproj | 614 ----------------
 .../contents.xcworkspacedata                  |   7 -
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 -
 .../xcshareddata/WorkspaceSettings.xcsettings |   8 -
 .../xcshareddata/xcschemes/Runner.xcscheme    |  98 ---
 .../contents.xcworkspacedata                  |   7 -
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 -
 .../xcshareddata/WorkspaceSettings.xcsettings |   8 -
 progress/ios/Runner/AppDelegate.swift         |  13 -
 .../AppIcon.appiconset/Contents.json          | 122 ---
 .../Icon-App-1024x1024@1x.png                 | Bin 10932 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-20x20@1x.png  | Bin 295 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-20x20@2x.png  | Bin 406 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-20x20@3x.png  | Bin 450 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-29x29@1x.png  | Bin 282 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-29x29@2x.png  | Bin 462 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-29x29@3x.png  | Bin 704 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-40x40@1x.png  | Bin 406 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-40x40@2x.png  | Bin 586 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-40x40@3x.png  | Bin 862 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-60x60@2x.png  | Bin 862 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-60x60@3x.png  | Bin 1674 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-76x76@1x.png  | Bin 762 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-76x76@2x.png  | Bin 1226 -> 0 bytes
 .../Icon-App-83.5x83.5@2x.png                 | Bin 1418 -> 0 bytes
 .../LaunchImage.imageset/Contents.json        |  23 -
 .../LaunchImage.imageset/LaunchImage.png      | Bin 68 -> 0 bytes
 .../LaunchImage.imageset/LaunchImage@2x.png   | Bin 68 -> 0 bytes
 .../LaunchImage.imageset/LaunchImage@3x.png   | Bin 68 -> 0 bytes
 .../LaunchImage.imageset/README.md            |   5 -
 .../Runner/Base.lproj/LaunchScreen.storyboard |  37 -
 .../ios/Runner/Base.lproj/Main.storyboard     |  26 -
 progress/ios/Runner/Info.plist                |  51 --
 progress/ios/Runner/Runner-Bridging-Header.h  |   1 -
 progress/ios/RunnerTests/RunnerTests.swift    |  12 -
 progress/lib/main.dart                        | 230 ------
 progress/lib/old_progress.dart                | 589 ---------------
 progress/lib/td_progress.dart                 | 574 ---------------
 progress/linux/.gitignore                     |   1 -
 progress/linux/CMakeLists.txt                 | 139 ----
 progress/linux/flutter/CMakeLists.txt         |  88 ---
 .../flutter/generated_plugin_registrant.cc    |  11 -
 .../flutter/generated_plugin_registrant.h     |  15 -
 .../linux/flutter/generated_plugins.cmake     |  23 -
 progress/linux/main.cc                        |   6 -
 progress/linux/my_application.cc              | 104 ---
 progress/linux/my_application.h               |  18 -
 progress/macos/.gitignore                     |   7 -
 progress/macos/Flutter/Flutter-Debug.xcconfig |   1 -
 .../macos/Flutter/Flutter-Release.xcconfig    |   1 -
 .../Flutter/GeneratedPluginRegistrant.swift   |  10 -
 .../macos/Runner.xcodeproj/project.pbxproj    | 695 ------------------
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 -
 .../xcshareddata/xcschemes/Runner.xcscheme    |  98 ---
 .../contents.xcworkspacedata                  |   7 -
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 -
 progress/macos/Runner/AppDelegate.swift       |   9 -
 .../AppIcon.appiconset/Contents.json          |  68 --
 .../AppIcon.appiconset/app_icon_1024.png      | Bin 102994 -> 0 bytes
 .../AppIcon.appiconset/app_icon_128.png       | Bin 5680 -> 0 bytes
 .../AppIcon.appiconset/app_icon_16.png        | Bin 520 -> 0 bytes
 .../AppIcon.appiconset/app_icon_256.png       | Bin 14142 -> 0 bytes
 .../AppIcon.appiconset/app_icon_32.png        | Bin 1066 -> 0 bytes
 .../AppIcon.appiconset/app_icon_512.png       | Bin 36406 -> 0 bytes
 .../AppIcon.appiconset/app_icon_64.png        | Bin 2218 -> 0 bytes
 progress/macos/Runner/Base.lproj/MainMenu.xib | 343 ---------
 .../macos/Runner/Configs/AppInfo.xcconfig     |  14 -
 progress/macos/Runner/Configs/Debug.xcconfig  |   2 -
 .../macos/Runner/Configs/Release.xcconfig     |   2 -
 .../macos/Runner/Configs/Warnings.xcconfig    |  13 -
 .../macos/Runner/DebugProfile.entitlements    |  12 -
 progress/macos/Runner/Info.plist              |  32 -
 progress/macos/Runner/MainFlutterWindow.swift |  15 -
 progress/macos/Runner/Release.entitlements    |   8 -
 progress/macos/RunnerTests/RunnerTests.swift  |  12 -
 progress/pubspec.lock                         | 221 ------
 progress/pubspec.yaml                         |  91 ---
 progress/test/widget_test.dart                |  30 -
 progress/web/favicon.png                      | Bin 917 -> 0 bytes
 progress/web/icons/Icon-192.png               | Bin 5292 -> 0 bytes
 progress/web/icons/Icon-512.png               | Bin 8252 -> 0 bytes
 progress/web/icons/Icon-maskable-192.png      | Bin 5594 -> 0 bytes
 progress/web/icons/Icon-maskable-512.png      | Bin 20998 -> 0 bytes
 progress/web/index.html                       |  59 --
 progress/web/manifest.json                    |  35 -
 progress/windows/.gitignore                   |  17 -
 progress/windows/CMakeLists.txt               | 102 ---
 progress/windows/flutter/CMakeLists.txt       | 104 ---
 .../flutter/generated_plugin_registrant.cc    |  11 -
 .../flutter/generated_plugin_registrant.h     |  15 -
 .../windows/flutter/generated_plugins.cmake   |  23 -
 progress/windows/runner/CMakeLists.txt        |  40 -
 progress/windows/runner/Runner.rc             | 121 ---
 progress/windows/runner/flutter_window.cpp    |  71 --
 progress/windows/runner/flutter_window.h      |  33 -
 progress/windows/runner/main.cpp              |  43 --
 progress/windows/runner/resource.h            |  16 -
 .../windows/runner/resources/app_icon.ico     | Bin 33772 -> 0 bytes
 progress/windows/runner/runner.exe.manifest   |  20 -
 progress/windows/runner/utils.cpp             |  65 --
 progress/windows/runner/utils.h               |  19 -
 progress/windows/runner/win32_window.cpp      | 288 --------
 progress/windows/runner/win32_window.h        | 102 ---
 129 files changed, 6140 deletions(-)
 delete mode 100644 progress/.gitignore
 delete mode 100644 progress/README.md
 delete mode 100644 progress/analysis_options.yaml
 delete mode 100644 progress/android/.gitignore
 delete mode 100644 progress/android/app/build.gradle
 delete mode 100644 progress/android/app/src/debug/AndroidManifest.xml
 delete mode 100644 progress/android/app/src/main/AndroidManifest.xml
 delete mode 100644 progress/android/app/src/main/kotlin/com/example/progress/MainActivity.kt
 delete mode 100644 progress/android/app/src/main/res/drawable-v21/launch_background.xml
 delete mode 100644 progress/android/app/src/main/res/drawable/launch_background.xml
 delete mode 100644 progress/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
 delete mode 100644 progress/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
 delete mode 100644 progress/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
 delete mode 100644 progress/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
 delete mode 100644 progress/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 delete mode 100644 progress/android/app/src/main/res/values-night/styles.xml
 delete mode 100644 progress/android/app/src/main/res/values/styles.xml
 delete mode 100644 progress/android/app/src/profile/AndroidManifest.xml
 delete mode 100644 progress/android/build.gradle
 delete mode 100644 progress/android/gradle.properties
 delete mode 100644 progress/android/gradle/wrapper/gradle-wrapper.properties
 delete mode 100644 progress/android/settings.gradle
 delete mode 100644 progress/ios/.gitignore
 delete mode 100644 progress/ios/Flutter/AppFrameworkInfo.plist
 delete mode 100644 progress/ios/Flutter/Debug.xcconfig
 delete mode 100644 progress/ios/Flutter/Release.xcconfig
 delete mode 100644 progress/ios/Runner.xcodeproj/project.pbxproj
 delete mode 100644 progress/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 delete mode 100644 progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 delete mode 100644 progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
 delete mode 100644 progress/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
 delete mode 100644 progress/ios/Runner.xcworkspace/contents.xcworkspacedata
 delete mode 100644 progress/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 delete mode 100644 progress/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
 delete mode 100644 progress/ios/Runner/AppDelegate.swift
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
 delete mode 100644 progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
 delete mode 100644 progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
 delete mode 100644 progress/ios/Runner/Base.lproj/LaunchScreen.storyboard
 delete mode 100644 progress/ios/Runner/Base.lproj/Main.storyboard
 delete mode 100644 progress/ios/Runner/Info.plist
 delete mode 100644 progress/ios/Runner/Runner-Bridging-Header.h
 delete mode 100644 progress/ios/RunnerTests/RunnerTests.swift
 delete mode 100644 progress/lib/main.dart
 delete mode 100644 progress/lib/old_progress.dart
 delete mode 100644 progress/lib/td_progress.dart
 delete mode 100644 progress/linux/.gitignore
 delete mode 100644 progress/linux/CMakeLists.txt
 delete mode 100644 progress/linux/flutter/CMakeLists.txt
 delete mode 100644 progress/linux/flutter/generated_plugin_registrant.cc
 delete mode 100644 progress/linux/flutter/generated_plugin_registrant.h
 delete mode 100644 progress/linux/flutter/generated_plugins.cmake
 delete mode 100644 progress/linux/main.cc
 delete mode 100644 progress/linux/my_application.cc
 delete mode 100644 progress/linux/my_application.h
 delete mode 100644 progress/macos/.gitignore
 delete mode 100644 progress/macos/Flutter/Flutter-Debug.xcconfig
 delete mode 100644 progress/macos/Flutter/Flutter-Release.xcconfig
 delete mode 100644 progress/macos/Flutter/GeneratedPluginRegistrant.swift
 delete mode 100644 progress/macos/Runner.xcodeproj/project.pbxproj
 delete mode 100644 progress/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 delete mode 100644 progress/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
 delete mode 100644 progress/macos/Runner.xcworkspace/contents.xcworkspacedata
 delete mode 100644 progress/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 delete mode 100644 progress/macos/Runner/AppDelegate.swift
 delete mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
 delete mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
 delete mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
 delete mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
 delete mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
 delete mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
 delete mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
 delete mode 100644 progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
 delete mode 100644 progress/macos/Runner/Base.lproj/MainMenu.xib
 delete mode 100644 progress/macos/Runner/Configs/AppInfo.xcconfig
 delete mode 100644 progress/macos/Runner/Configs/Debug.xcconfig
 delete mode 100644 progress/macos/Runner/Configs/Release.xcconfig
 delete mode 100644 progress/macos/Runner/Configs/Warnings.xcconfig
 delete mode 100644 progress/macos/Runner/DebugProfile.entitlements
 delete mode 100644 progress/macos/Runner/Info.plist
 delete mode 100644 progress/macos/Runner/MainFlutterWindow.swift
 delete mode 100644 progress/macos/Runner/Release.entitlements
 delete mode 100644 progress/macos/RunnerTests/RunnerTests.swift
 delete mode 100644 progress/pubspec.lock
 delete mode 100644 progress/pubspec.yaml
 delete mode 100644 progress/test/widget_test.dart
 delete mode 100644 progress/web/favicon.png
 delete mode 100644 progress/web/icons/Icon-192.png
 delete mode 100644 progress/web/icons/Icon-512.png
 delete mode 100644 progress/web/icons/Icon-maskable-192.png
 delete mode 100644 progress/web/icons/Icon-maskable-512.png
 delete mode 100644 progress/web/index.html
 delete mode 100644 progress/web/manifest.json
 delete mode 100644 progress/windows/.gitignore
 delete mode 100644 progress/windows/CMakeLists.txt
 delete mode 100644 progress/windows/flutter/CMakeLists.txt
 delete mode 100644 progress/windows/flutter/generated_plugin_registrant.cc
 delete mode 100644 progress/windows/flutter/generated_plugin_registrant.h
 delete mode 100644 progress/windows/flutter/generated_plugins.cmake
 delete mode 100644 progress/windows/runner/CMakeLists.txt
 delete mode 100644 progress/windows/runner/Runner.rc
 delete mode 100644 progress/windows/runner/flutter_window.cpp
 delete mode 100644 progress/windows/runner/flutter_window.h
 delete mode 100644 progress/windows/runner/main.cpp
 delete mode 100644 progress/windows/runner/resource.h
 delete mode 100644 progress/windows/runner/resources/app_icon.ico
 delete mode 100644 progress/windows/runner/runner.exe.manifest
 delete mode 100644 progress/windows/runner/utils.cpp
 delete mode 100644 progress/windows/runner/utils.h
 delete mode 100644 progress/windows/runner/win32_window.cpp
 delete mode 100644 progress/windows/runner/win32_window.h

diff --git a/progress/.gitignore b/progress/.gitignore
deleted file mode 100644
index 24476c5d1..000000000
--- a/progress/.gitignore
+++ /dev/null
@@ -1,44 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-migrate_working_dir/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-**/ios/Flutter/.last_build_id
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-
-# Symbolication related
-app.*.symbols
-
-# Obfuscation related
-app.*.map.json
-
-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release
diff --git a/progress/README.md b/progress/README.md
deleted file mode 100644
index 7198e55fe..000000000
--- a/progress/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# progress
-
-A new Flutter project.
-
-## Getting Started
-
-This project is a starting point for a Flutter application.
-
-A few resources to get you started if this is your first Flutter project:
-
-- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
-
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
diff --git a/progress/analysis_options.yaml b/progress/analysis_options.yaml
deleted file mode 100644
index 61b6c4de1..000000000
--- a/progress/analysis_options.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file configures the analyzer, which statically analyzes Dart code to
-# check for errors, warnings, and lints.
-#
-# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
-# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
-# invoked from the command line by running `flutter analyze`.
-
-# The following line activates a set of recommended lints for Flutter apps,
-# packages, and plugins designed to encourage good coding practices.
-include: package:flutter_lints/flutter.yaml
-
-linter:
-  # The lint rules applied to this project can be customized in the
-  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
-  # included above or to enable additional rules. A list of all available lints
-  # and their documentation is published at
-  # https://dart-lang.github.io/linter/lints/index.html.
-  #
-  # Instead of disabling a lint rule for the entire project in the
-  # section below, it can also be suppressed for a single line of code
-  # or a specific dart file by using the `// ignore: name_of_lint` and
-  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
-  # producing the lint.
-  rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
diff --git a/progress/android/.gitignore b/progress/android/.gitignore
deleted file mode 100644
index 6f568019d..000000000
--- a/progress/android/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-gradle-wrapper.jar
-/.gradle
-/captures/
-/gradlew
-/gradlew.bat
-/local.properties
-GeneratedPluginRegistrant.java
-
-# Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
-key.properties
-**/*.keystore
-**/*.jks
diff --git a/progress/android/app/build.gradle b/progress/android/app/build.gradle
deleted file mode 100644
index 97d081a54..000000000
--- a/progress/android/app/build.gradle
+++ /dev/null
@@ -1,67 +0,0 @@
-plugins {
-    id "com.android.application"
-    id "kotlin-android"
-    id "dev.flutter.flutter-gradle-plugin"
-}
-
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-android {
-    namespace "com.example.progress"
-    compileSdkVersion flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
-    defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.progress"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
-    }
-
-    buildTypes {
-        release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
-        }
-    }
-}
-
-flutter {
-    source '../..'
-}
-
-dependencies {}
diff --git a/progress/android/app/src/debug/AndroidManifest.xml b/progress/android/app/src/debug/AndroidManifest.xml
deleted file mode 100644
index 399f6981d..000000000
--- a/progress/android/app/src/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- The INTERNET permission is required for development. Specifically,
-         the Flutter tool needs it to communicate with the running application
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-</manifest>
diff --git a/progress/android/app/src/main/AndroidManifest.xml b/progress/android/app/src/main/AndroidManifest.xml
deleted file mode 100644
index 9ea14697b..000000000
--- a/progress/android/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <application
-        android:label="progress"
-        android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
-        <activity
-            android:name=".MainActivity"
-            android:exported="true"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
-            <!-- Specifies an Android theme to apply to this Activity as soon as
-                 the Android process has started. This theme is visible to the user
-                 while the Flutter UI initializes. After that, this theme continues
-                 to determine the Window background behind the Flutter UI. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-        <!-- Don't delete the meta-data below.
-             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
-        <meta-data
-            android:name="flutterEmbedding"
-            android:value="2" />
-    </application>
-</manifest>
diff --git a/progress/android/app/src/main/kotlin/com/example/progress/MainActivity.kt b/progress/android/app/src/main/kotlin/com/example/progress/MainActivity.kt
deleted file mode 100644
index b91e2d741..000000000
--- a/progress/android/app/src/main/kotlin/com/example/progress/MainActivity.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.example.progress
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}
diff --git a/progress/android/app/src/main/res/drawable-v21/launch_background.xml b/progress/android/app/src/main/res/drawable-v21/launch_background.xml
deleted file mode 100644
index f74085f3f..000000000
--- a/progress/android/app/src/main/res/drawable-v21/launch_background.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
-</layer-list>
diff --git a/progress/android/app/src/main/res/drawable/launch_background.xml b/progress/android/app/src/main/res/drawable/launch_background.xml
deleted file mode 100644
index 304732f88..000000000
--- a/progress/android/app/src/main/res/drawable/launch_background.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
-</layer-list>
diff --git a/progress/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/progress/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index db77bb4b7b0906d62b1847e87f15cdcacf6a4f29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc
zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs
zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U<k`UN+s5qQ#T?KrmN7v*f2L%`GO4-^
z(#_kX+jhyc?*UrsvLED<w+p3gfi4y<3GxeO5CDRJfCLa|I1d8%B?X@R0!qL1ba4!c
zIQ;g^b-pGC0f)elH+vJ_clF3>|N3vA*22N<t#oc3|FNCx%`Ll}Jbl*Q`}yg~1ZO@=
zF!6p)NTYsh!6(JdtLiRuwi@`&XeqAXe9fY|=kfFy_3t|md##(iHE+K4ydxH3>aGQG
zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#i<K@6w~yiZZH!59hqLTYF-H
zp0%uz(2~z(X$>qdw@AL`7MR}m`rwr|mZgU`8P7SB<Kba6`>kL78fFf!WnuYWm$5Z0
zNXhDbCv&49sM544K|?c)WrFfiZ<W8RzO1)p=v7f>vCi9h0O)B3Pgg&ebxsLQ05GG~
AQ2+n{

diff --git a/progress/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/progress/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 17987b79bb8a35cc66c3c1fd44f5a5526c1b78be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB
zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q0<?|W-^A&VhjhO+044$%!YxiPI;`p4Q#=k
za-F;6dk-j1J*_nBlG2>3KywUtLX8Ua?`H+NMzkczFPK3<KtaL4z@UHr{Pp|KpFjT|
z1oAia3j-A_^>lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l
zyt<ns@%x_-ezPmiS-=02Ut8`WUGa5ad?jb?UB<rkVmAJ)*Xy}nR&U>Q?X=U+MF$@3
zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+
yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@U<OZDKbLh*2~7avPrJzg

diff --git a/progress/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/progress/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 09d4391482be68e9e4a07fab769b5de337d16eb1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 721
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!iOI#yLg7ec#$`gxH85~pclTsBt
za}(23gHjVyDhp4h+5i=O3-AeX1=1l$e`s#|#^}+&7(N@w0CIr{$Oe+Uk^K-ZP~83C
zcc@hG6rikF&NPT(23>y!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs
z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM
zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R`
zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM
zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg
z<JnHTOuK%sGbNji)8cv6*ZNtnbwxJZ-?eY1e-ZPG#r<}_kct2Ie>oq1^2_p9@|WEo
z*X_Uko@K)qYYv~<poG`LOv(2(Hhkk{Dz;b6_#4<(=XBwh@>>43eQGMdbiGbo>E~Q&
zr<n4_y=h^-h|%}kO&jwCioQ5EzF6K8^VdP)H>YBH{QP^@Sti!`2)uG{irBBq@y*$B
zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N
zdG@vOZB4v_lF7Plrx+hxo7(fCV&}f<lyK#S=nvDw%*y%vwN3psIS+1s7G}QfbZGd|
zV;VoMy*YI2-%hU{-w$hl9!*Y_m~60h&vVVs6)lfgu09v4QWIt25UBGxaN`?mVmn*e
U?z!!Jz`$qlboFyt=akR{0C)T?>Hq)$

diff --git a/progress/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/progress/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index d5f1c8d34e7a88e3f88bea192c3a370d44689c3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1031
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xj&#3c(B0U1_%
zz5^97Xt*<I`!eYGGw1~|=m#_ChcFm~F&M`%SZ6TU=QA3HGn&RTnk6urCox*3Gg@ad
z+GI1@<S^O-Q7)rh9;1CBqhm3nV+o^EDWh`*qe~T|Yc-==4WnBvqgx%LdmW=k1EWVH
zqbCqGF?u#LdbTinH8Xm(F#5DJ`gAb*0#PTUUpJ#)52HU2^)d$ZF$VTC22NlMoX8kB
zi7{v*V-S#>%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3
zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc
z$|q_opQ^2TrnVZ0o~wh<3t%W&f<tNc(Fvx&VC63f@(X4V5O7Fnm=6N`&!0cPZsO%v
z3=B;Ao-U3d6}R4ANDmGU6lr~^!Nn0K;_9?HfJbVIkW)*G%Yg&F)*BmaZ)6Dl_&?vn
za8gV0`@6<5-|YBa|J|21FVarliS1gU$698&iU*DCL=pdt&mR>lvYGe#$xqda2bR_R
zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2<a5l9V~;L&ZJD?F
zD6?3<TgqciA=l+!=Lp=a%2;%{dX@{HT-OP1|K<}HAM1TO7OY<MaYyH#Pk)4WR?Ts}
zSNX4tLr#6-^m$z!Pd18IzSivQkh7k6T`o7OKThT4#m*F4b=OPt(kAX%9+=X!JT9f}
zc|=Oray6sl!J;#tXm&@~>^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2
z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b
z<q`EIyVgP^b`|@{uDX5oB6GTR%^Or)?eBf<KkJg@eR6BbGYJ*-U;nQCudos6R9mG`
zc=6fn-^`2s)0Hm%cpbX>pQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE
z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o
zo~|9<SN`RwE}r7KC~Q%?|CMD5O&m%cKw{Bn6{qJbmFIooO_;g=+H+v4V(@hJb6Mw<
G&;$S>I;xof

diff --git a/progress/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/progress/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 4d6372eebdb28e45604e46eeda8dd24651419bc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1443
zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`Y<EGuRA6NX2Md
zPqmGQbJPjRLrI#9?bL25ZHra>V6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY
zB_M<hJUv`}aj#i9>sH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv
za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8<s&Q-yp4r*9
z(t|8L&`vhm$wAg!MByQdFQW1h)eqSS&@P++v^xmx2}OHF$WDZ4QHUN37S3Sd0#=@|
zD*$YR!8QbJ55gWH>=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~<G>Lo9vl;Zfs+W#BydUw
zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3
z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w!
zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u
zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%<BT_6>4Q8~Mad
z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt*
zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW
zu72MW`|?8h<N~B$l%}NU6KvLZj~&>t^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w
z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf<
zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$
zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v
zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq
z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek
zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+
zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q
zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl
z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f
z<NEXJGYh+`9LE^Z1#g~OZ)yl?O>%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H
zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP
z(1P?z<YzdcoCZ;A^sD<`wcO1=DLw>~7YxD~Rf<<Lt&2H?f`^~9TW?0O(WnyXeZvF-
hHxv6WEXUT@T$j&O|7sZ6iSVC<kf$5l^{TT-@h=>(a@_y`

diff --git a/progress/android/app/src/main/res/values-night/styles.xml b/progress/android/app/src/main/res/values-night/styles.xml
deleted file mode 100644
index 06952be74..000000000
--- a/progress/android/app/src/main/res/values-night/styles.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <!-- Show a splash screen on the activity. Automatically removed when
-             the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
-    </style>
-    <!-- Theme applied to the Android Window as soon as the process has started.
-         This theme determines the color of the Android Window while your
-         Flutter UI initializes, as well as behind your Flutter UI while its
-         running.
-
-         This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <item name="android:windowBackground">?android:colorBackground</item>
-    </style>
-</resources>
diff --git a/progress/android/app/src/main/res/values/styles.xml b/progress/android/app/src/main/res/values/styles.xml
deleted file mode 100644
index cb1ef8805..000000000
--- a/progress/android/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
-        <!-- Show a splash screen on the activity. Automatically removed when
-             the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
-    </style>
-    <!-- Theme applied to the Android Window as soon as the process has started.
-         This theme determines the color of the Android Window while your
-         Flutter UI initializes, as well as behind your Flutter UI while its
-         running.
-
-         This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
-        <item name="android:windowBackground">?android:colorBackground</item>
-    </style>
-</resources>
diff --git a/progress/android/app/src/profile/AndroidManifest.xml b/progress/android/app/src/profile/AndroidManifest.xml
deleted file mode 100644
index 399f6981d..000000000
--- a/progress/android/app/src/profile/AndroidManifest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- The INTERNET permission is required for development. Specifically,
-         the Flutter tool needs it to communicate with the running application
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-</manifest>
diff --git a/progress/android/build.gradle b/progress/android/build.gradle
deleted file mode 100644
index f7eb7f63c..000000000
--- a/progress/android/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-rootProject.buildDir = '../build'
-subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
-    project.evaluationDependsOn(':app')
-}
-
-tasks.register("clean", Delete) {
-    delete rootProject.buildDir
-}
diff --git a/progress/android/gradle.properties b/progress/android/gradle.properties
deleted file mode 100644
index 94adc3a3f..000000000
--- a/progress/android/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-org.gradle.jvmargs=-Xmx1536M
-android.useAndroidX=true
-android.enableJetifier=true
diff --git a/progress/android/gradle/wrapper/gradle-wrapper.properties b/progress/android/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 3c472b99c..000000000
--- a/progress/android/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/progress/android/settings.gradle b/progress/android/settings.gradle
deleted file mode 100644
index 55c4ca8b1..000000000
--- a/progress/android/settings.gradle
+++ /dev/null
@@ -1,20 +0,0 @@
-pluginManagement {
-    def flutterSdkPath = {
-        def properties = new Properties()
-        file("local.properties").withInputStream { properties.load(it) }
-        def flutterSdkPath = properties.getProperty("flutter.sdk")
-        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-        return flutterSdkPath
-    }
-    settings.ext.flutterSdkPath = flutterSdkPath()
-
-    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
-
-    plugins {
-        id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
-    }
-}
-
-include ":app"
-
-apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"
diff --git a/progress/ios/.gitignore b/progress/ios/.gitignore
deleted file mode 100644
index 7a7f9873a..000000000
--- a/progress/ios/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-**/dgph
-*.mode1v3
-*.mode2v3
-*.moved-aside
-*.pbxuser
-*.perspectivev3
-**/*sync/
-.sconsign.dblite
-.tags*
-**/.vagrant/
-**/DerivedData/
-Icon?
-**/Pods/
-**/.symlinks/
-profile
-xcuserdata
-**/.generated/
-Flutter/App.framework
-Flutter/Flutter.framework
-Flutter/Flutter.podspec
-Flutter/Generated.xcconfig
-Flutter/ephemeral/
-Flutter/app.flx
-Flutter/app.zip
-Flutter/flutter_assets/
-Flutter/flutter_export_environment.sh
-ServiceDefinitions.json
-Runner/GeneratedPluginRegistrant.*
-
-# Exceptions to above rules.
-!default.mode1v3
-!default.mode2v3
-!default.pbxuser
-!default.perspectivev3
diff --git a/progress/ios/Flutter/AppFrameworkInfo.plist b/progress/ios/Flutter/AppFrameworkInfo.plist
deleted file mode 100644
index 9625e105d..000000000
--- a/progress/ios/Flutter/AppFrameworkInfo.plist
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleExecutable</key>
-  <string>App</string>
-  <key>CFBundleIdentifier</key>
-  <string>io.flutter.flutter.app</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>App</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>11.0</string>
-</dict>
-</plist>
diff --git a/progress/ios/Flutter/Debug.xcconfig b/progress/ios/Flutter/Debug.xcconfig
deleted file mode 100644
index 592ceee85..000000000
--- a/progress/ios/Flutter/Debug.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-#include "Generated.xcconfig"
diff --git a/progress/ios/Flutter/Release.xcconfig b/progress/ios/Flutter/Release.xcconfig
deleted file mode 100644
index 592ceee85..000000000
--- a/progress/ios/Flutter/Release.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-#include "Generated.xcconfig"
diff --git a/progress/ios/Runner.xcodeproj/project.pbxproj b/progress/ios/Runner.xcodeproj/project.pbxproj
deleted file mode 100644
index 464be3973..000000000
--- a/progress/ios/Runner.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,614 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 54;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
-		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
-		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
-		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 97C146ED1CF9000F007C117D;
-			remoteInfo = Runner;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
-		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
-		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
-		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
-		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
-		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		97C146EB1CF9000F007C117D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		9740EEB11CF90186004384FC /* Flutter */ = {
-			isa = PBXGroup;
-			children = (
-				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				9740EEB21CF90195004384FC /* Debug.xcconfig */,
-				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
-				9740EEB31CF90195004384FC /* Generated.xcconfig */,
-			);
-			name = Flutter;
-			sourceTree = "<group>";
-		};
-		331C8082294A63A400263BE5 /* RunnerTests */ = {
-			isa = PBXGroup;
-			children = (
-				331C807B294A618700263BE5 /* RunnerTests.swift */,
-			);
-			path = RunnerTests;
-			sourceTree = "<group>";
-		};
-		97C146E51CF9000F007C117D = {
-			isa = PBXGroup;
-			children = (
-				9740EEB11CF90186004384FC /* Flutter */,
-				97C146F01CF9000F007C117D /* Runner */,
-				97C146EF1CF9000F007C117D /* Products */,
-				331C8082294A63A400263BE5 /* RunnerTests */,
-			);
-			sourceTree = "<group>";
-		};
-		97C146EF1CF9000F007C117D /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				97C146EE1CF9000F007C117D /* Runner.app */,
-				331C8081294A63A400263BE5 /* RunnerTests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		97C146F01CF9000F007C117D /* Runner */ = {
-			isa = PBXGroup;
-			children = (
-				97C146FA1CF9000F007C117D /* Main.storyboard */,
-				97C146FD1CF9000F007C117D /* Assets.xcassets */,
-				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
-				97C147021CF9000F007C117D /* Info.plist */,
-				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
-				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
-				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
-				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
-			);
-			path = Runner;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		331C8080294A63A400263BE5 /* RunnerTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
-			buildPhases = (
-				331C807D294A63A400263BE5 /* Sources */,
-				331C807E294A63A400263BE5 /* Frameworks */,
-				331C807F294A63A400263BE5 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				331C8086294A63A400263BE5 /* PBXTargetDependency */,
-			);
-			name = RunnerTests;
-			productName = RunnerTests;
-			productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-		97C146ED1CF9000F007C117D /* Runner */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
-			buildPhases = (
-				9740EEB61CF901F6004384FC /* Run Script */,
-				97C146EA1CF9000F007C117D /* Sources */,
-				97C146EB1CF9000F007C117D /* Frameworks */,
-				97C146EC1CF9000F007C117D /* Resources */,
-				9705A1C41CF9048500538489 /* Embed Frameworks */,
-				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = Runner;
-			productName = Runner;
-			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		97C146E61CF9000F007C117D /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1430;
-				ORGANIZATIONNAME = "";
-				TargetAttributes = {
-					331C8080294A63A400263BE5 = {
-						CreatedOnToolsVersion = 14.0;
-						TestTargetID = 97C146ED1CF9000F007C117D;
-					};
-					97C146ED1CF9000F007C117D = {
-						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 1100;
-					};
-				};
-			};
-			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
-			compatibilityVersion = "Xcode 9.3";
-			developmentRegion = en;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 97C146E51CF9000F007C117D;
-			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				97C146ED1CF9000F007C117D /* Runner */,
-				331C8080294A63A400263BE5 /* RunnerTests */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		331C807F294A63A400263BE5 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		97C146EC1CF9000F007C117D /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
-				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
-				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
-			);
-			name = "Thin Binary";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
-		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		331C807D294A63A400263BE5 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		97C146EA1CF9000F007C117D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
-				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 97C146ED1CF9000F007C117D /* Runner */;
-			targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				97C146FB1CF9000F007C117D /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
-		97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				97C147001CF9000F007C117D /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		249021D3217E4FDB00AE95B9 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Profile;
-		};
-		249021D4217E4FDB00AE95B9 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Profile;
-		};
-		331C8088294A63A400263BE5 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = AE0B7B92F70575B8D7E0D07E /* Pods-RunnerTests.debug.xcconfig */;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
-			};
-			name = Debug;
-		};
-		331C8089294A63A400263BE5 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 89B67EB44CE7B6631473024E /* Pods-RunnerTests.release.xcconfig */;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
-			};
-			name = Release;
-		};
-		331C808A294A63A400263BE5 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 640959BDD8F10B91D80A66BE /* Pods-RunnerTests.profile.xcconfig */;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
-			};
-			name = Profile;
-		};
-		97C147031CF9000F007C117D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		97C147041CF9000F007C117D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = iphoneos;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		97C147061CF9000F007C117D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Debug;
-		};
-		97C147071CF9000F007C117D /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				331C8088294A63A400263BE5 /* Debug */,
-				331C8089294A63A400263BE5 /* Release */,
-				331C808A294A63A400263BE5 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				97C147031CF9000F007C117D /* Debug */,
-				97C147041CF9000F007C117D /* Release */,
-				249021D3217E4FDB00AE95B9 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				97C147061CF9000F007C117D /* Debug */,
-				97C147071CF9000F007C117D /* Release */,
-				249021D4217E4FDB00AE95B9 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
diff --git a/progress/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/progress/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a62..000000000
--- a/progress/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d981003..000000000
--- a/progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
deleted file mode 100644
index f9b0d7c5e..000000000
--- a/progress/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>
diff --git a/progress/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/progress/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
deleted file mode 100644
index 87131a09b..000000000
--- a/progress/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1430"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-               BuildableName = "Runner.app"
-               BlueprintName = "Runner"
-               ReferencedContainer = "container:Runner.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <Testables>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "331C8080294A63A400263BE5"
-               BuildableName = "RunnerTests.xctest"
-               BlueprintName = "RunnerTests"
-               ReferencedContainer = "container:Runner.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Profile"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/progress/ios/Runner.xcworkspace/contents.xcworkspacedata b/progress/ios/Runner.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 1d526a16e..000000000
--- a/progress/ios/Runner.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:Runner.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/progress/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/progress/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d981003..000000000
--- a/progress/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/progress/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/progress/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
deleted file mode 100644
index f9b0d7c5e..000000000
--- a/progress/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>
diff --git a/progress/ios/Runner/AppDelegate.swift b/progress/ios/Runner/AppDelegate.swift
deleted file mode 100644
index 70693e4a8..000000000
--- a/progress/ios/Runner/AppDelegate.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-import UIKit
-import Flutter
-
-@UIApplicationMain
-@objc class AppDelegate: FlutterAppDelegate {
-  override func application(
-    _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
-  ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
-    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
-  }
-}
diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index d36b1fab2..000000000
--- a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
deleted file mode 100644
index dc9ada4725e9b0ddb1deab583e5b5102493aa332..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10932
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

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index 7353c41ecf9ca08017312dc233d9830079b50717..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 295
zcmV+?0oeYDP)<h;3K|Lk000e1NJLTq000yK000yS0{{R3x>xN#0001NP)t-s|Ns9~
z#rXRE|M&d=0au&!`~QyF`q}dRnBDt}*!qXo`c{v<liT|#w)Vf&=I{Fc;Pw9Z`ux7>
z{Djr|@Adh0(D_%#_&mM$D6{kE_x{oE{l@J5@%H*?%=t~i_`ufYOPkAEn!pfkr2$fs
z652Tz0001XNkl<Z7}K4Q$qs`s3<WVUZPSpj?>qeeKN4RM4i{jKqmiC$?+xN>3Apn^
z0QfuZLym_5b<*QdmkHjHlj811{If)dl(Z2K0A+ekGtrFJb?g|wt#k#pV-#A~bK=OT
ts8>{%cPtyC${m|1#B1A6#u!Q;umknL1chzTM$P~L002ovPDHLkV1lTfnu!1a

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
deleted file mode 100644
index 797d452e458972bab9d994556c8305db4c827017..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 406
zcmV;H0crk;P)<h;3K|Lk000e1NJLTq001Ze001Zm0{{R3yC6tk0001rP)t-s|Ns9~
z#rOeNn<=*T@cRC4&iUu}{?YIKbkO<t{r_Rg`SSb!?D_s{&H1p);C<8j-t_+S`~U6q
z`B238{Qm!3$oMh2_TcODCa>)>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN
zo!<LHzxPSJ@i4UU+UD@q<nIk_s|j3`3t5Q^SB6%oxX}Or0LMv0K~y-)?T|?lf-n>X
zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY
zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW
z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7<pBH$sJ!Z4uL5R#lHLQMbsjPyu3lS&P#-eI
z`6<26X6SmpL7JKc%xiDVU{Pl_!$sZ9a08>{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx
ACIA2c

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
deleted file mode 100644
index 6ed2d933e1120817fe9182483a228007b18ab6ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 450
zcmV;z0X_bSP)<h;3K|Lk000e1NJLTq002Ay002A)0{{R34I(K(0001lP)t-s|Ns9~
z#rP?<_5oL$SH}2R$N25}{-ogh<M#fP+xy+~{#%p3>iGWQ_5NJQ_~rNh*z)}eT%KUb
z`7gNk0#AwF^#0T0?hIa^`~Ck;!}#m+_uT050aTR(J!bU#|IzRL%<lbB#Q5Uu^d+k2
z=<oI?ukI$R=x3Y5T$8^FSCIxweE~vt7!iLQ0002_Nkl<ZNXPBd*$#p*5J1sd7O_$`
zL2y9@cm4nWvj#$kn3N2CAVlsX$w}KOB~w%1>^UsMS#KsYnTF*!YeDOytlP4VhV?b}
z%rz_<=#CPc)tU1MZTq~*2=8~iZ!lSa<{9b@2Jl;?IEV8)=fG217*|@)CCYgFze-x?
zIFODUIA>nWKpE+bn~n7;-89sa>#DR>TSlqWk*!2hSN6D~Qb#VqbP~4Fk&m`@1$JGr
zXPIdeRE&b2Thd#{MtDK$px*d3-Wx``>!oimf%|A-&-q*6KAH)e$3|6JV%HX{Hig)k
suLT-RhftRq8b9;(V=235Wa|I=027H2wCDra;{X5v07*qoM6N<$f;9x^2LJ#7

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index 4cd7b0099ca80c806f8fe495613e8d6c69460d76..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 282
zcmV+#0p<RQP)<h;3K|Lk000e1NJLTq0012T0012b0{{R3VNI7k00018P)t-s|Ns9~
z#rP?<_5oL$`~LrB%lY{I|Jw8ZvE}@&<NRF6_#kYjrQ!RX-urIO`M2l%l-v6OR+-lE
z{q_0#LcjMxzV|k|_lCRKdZ){Ir^+0L!WDhE7ImlrRF(lrfr8uVB>(^bcu7P-R4C8Q
z&e;xxFbF_Vrezo%_kH*OKhshZ6BFpG-Y1e10`QXJKbND7AMQ&cMj<Rt#L#B&<}(k`
z&v(Q6!rV_O+)5cqL@s8;Rzfa9z}^^#8AwrQTna*FxEVpNbhuQB&g))Tm50r`l1Aal
gdM1U(lMx>60B5TNObaZxYybcN07*qoM6N<$g3m;S%K!iX

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
deleted file mode 100644
index fe730945a01f64a61e2235dbe3f45b08f7729182..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 462
zcmV;<0WtoGP)<h;3K|Lk000e1NJLTq0024w0024&0{{R3)@8aH0001%P)t-s|Ns9~
z#rOeNn<=*Tp5FVy>-}iV`2<;=$?g5M=KQbZ{F&YRNy7Nn@%_*5{gvDM0aKI4?ESmw
z{NnZg)A0R`+4?NF_RZexyVB&^^ZvN!{I28tr{Vje;QNTz`dG&Jz0~Ek&f<Ki%5tK}
z7<#M$PKy9Rbn5v2y6F7V;_h?9>2;*Z7>B|cg}xYpxEFY+0YrKLF;^Q+-HreN0P{&i
zK~zY`?b7ECf-n?@;d<&orQ*Q7KoR%4|C>{W^h6@&01>0SKS`dn{Q}GT%Qj_{PLZ_&
zs`MFI#j-(>?bvdZ!8^xTwlY{qA)T4QLbY@j(!YJ7aXJervHy6HaG_2SB`6CC{He}f
zHVw(fJWApwPq!6VY7r1w-Fs)@ox~N<e>+q|w~e;JI~C4Vf^@d>Wvj=fl`^u9x9wd9
zR%3*Q+)t%S!MU_`id^@&Y{y7-r98lZX0?YrHlfmwb?#}^1b{8g&KzmkE(L>Z&)179
zp<)v6Y}pR<EODy^$f#TG0Y$V+eC{BDH50toV0pja4PB58a@&T&ng9R*07*qoM6N<$
Ef{9-9n*aa+

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
deleted file mode 100644
index 321773cd857a8a0f0c9c7d3dc3f5ff4fb298dc10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq003720037A0{{R3Miwbv0002DP)t-s|Ns9~
z#rP?<_5oL$`~Ls={r^|S_*KRDf7JSX)B5oG{`C0!9BHKkS)BI#|MUC*n%(<~*ZTeb
z|GVh?ujKrB()j^anupf<QpEU_+WP@eji}=Lgx30GnZmQ?{7s6v0aKNr-}{c)`Z&Ay
zF1Yp=d8+|Sg#kcvxaa&jy!U#i%XOs58Hd7OmB8}){x`e#aiYgnkGvRyx&c*~05e+j
z`~TbX{-WUfio)L<X{G{5egHIG0Web~wJ>l100G2FL_t(o!|l{-Q-VMg#&MKg7c{O0
z2wJImOS3Gy*Z2Qifdv~JYOp;v+U)a|nLoc7hNH;I$;lzDt$}rkaFw1mYK5_0Q(Sut
zvbEloxON7$+HSOgC9Z8ltuC&0OSF!-mXv5caV>#bc3@hBPX@I$58-z}(ZZE!t-aOG
zpjNkbau@>yEzH(5Yj4kZiMH32XI!4~gVXNnjAvRx;Sdg^`>2DpUEwoMhTs_st8pKG
z(%SHyHdU&v%f36~uERh!bd`!T2dw;z6PrOTQ7Vt*#9F2uHlUVnb#ev_o^fh}Dzmq}
zWtlk35}k=?xj28uO|5>>$yXadTUE@@IPpgH`gJ~Ro4>jd1IF|(+IX>8M4Ps{PNvmI
zNj4D+XgN83gPt_Gm}`Ybv{;+&yu-C(Grdiahmo~BjG-l&mWM+{e5M1sm&=xduwgM9
z`8OEh`=F3r`^E{n_;%9weN{cf2%7=VzC@cYj+lg>+3|D|_1C@{hcU(DyQG_BvBWe?
zvTv``=%b1zrol#=R`JB<Q`F~GOz}zuLlL*;1}|cY-IeioVw78<ETDLaB8FiD=WNcO
mkBVDRjE_g)6gfG$f4O%7iYO|SoHw-q0000<MNUMnLSTYxO==DR

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index 797d452e458972bab9d994556c8305db4c827017..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 406
zcmV;H0crk;P)<h;3K|Lk000e1NJLTq001Ze001Zm0{{R3yC6tk0001rP)t-s|Ns9~
z#rOeNn<=*T@cRC4&iUu}{?YIKbkO<t{r_Rg`SSb!?D_s{&H1p);C<8j-t_+S`~U6q
z`B238{Qm!3$oMh2_TcODCa>)>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN
zo!<LHzxPSJ@i4UU+UD@q<nIk_s|j3`3t5Q^SB6%oxX}Or0LMv0K~y-)?T|?lf-n>X
zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY
zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW
z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7<pBH$sJ!Z4uL5R#lHLQMbsjPyu3lS&P#-eI
z`6<26X6SmpL7JKc%xiDVU{Pl_!$sZ9a08>{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx
ACIA2c

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
deleted file mode 100644
index 502f463a9bc882b461c96aadf492d1729e49e725..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 586
zcmV-Q0=4~#P)<h;3K|Lk000e1NJLTq002+`002-30{{R3xz7Th0001}P)t-s|Ns9~
z#rP?<_5oL${r>+}#`wDE{8-2Mebf5<{{PqV{TgVcv*r8?UZ3{-|G?_}T*&y;@cqf{
z{Q*~+qr%%p!1pS*_Uicl#q9lc(D`!D`LN62sNwq{oYw(Wmhk)k<@f$!$@ng~_5)Ru
z0Z)trIA5^j{DIW^c+vT2%lW+2<(RtE2wR;4O@)Tm`Xr*?A(qYoM}7i5Yxw>D(&6ou
zxz!_Xr~yNF+waPe00049Nkl<ZSi|j>*;a!v6h%{rlvIH#gW3s8p;bFr=l}mRqpW2h
zw=OA%hdyL~z+UHOzl0eKhEr$YYOL-c-%Y<)=j?(bzDweB7{b+%_ypvm_cG{SvM=DK
zhv{K@m>#Bw>2W$eUI#iU)Wdgs8Y3U+A$Gd&{+j)d)BmGKx+43U_!tik_YlN)>$7G!
zhkE!s;%oku3;IwG3U^2kw?z+HM)jB{@zFhK8P#KMSytSthr+4!c(5c%+^UBn`0X*2
zy3(k600_CSZj?O$Qu%&$;|TGUJrptR(HzyIx>5E(2r{eA(<6t3e3I0B)7d6s7?Z5J
zZ!rtKvA{MiEBm&KFtoifx>5P^Z=vl)95XJn()aS5%ad(s?4-=Tkis9IG<HyCS`?qT
z)Ro|6_Qh7NQ@~}`rA+~si8eJKUPi2KvJt(SYy``QNE6~^-tErIoNIi%F$_*%27{p$
YU*-TH>u{`Fy8r+H07*qoM6N<$f<k9BS^xk5

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
deleted file mode 100644
index 0ec303439225b78712f49115768196d8d76f6790..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 862
zcmV-k1EKthP)<h;3K|Lk000e1NJLTq004LZ004Lh0{{R34!XwR0002zP)t-s|Ns9~
z#rObMn<=*T{Qmz~#`ydF|4G63{{H_)!1q<f`1$?*a?kkyRhf|4`b@(223wu=`~FbG
z_%68j(ctU=Ns=bC^iqtv`~3aV@cotB`eMoW_Wb_z`u;7!|0=fj9I^Fp&iOXF_5o9s
z8nN{@danRWl$6@~chULM@BMes`C`iW7K6P3OosqIa2R>20Z)wqMt%V?S?~D#06};F
zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU
z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R
zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6;
z1CV9ecD9ZEe87{{NtI*)_aJ<`<r)mO2JY~qH<i}}3%K`^CfiEV%iQNK88@tOg>kJa
z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5
zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh
z<Ot=3TnjL#{3s56++SYyJuk^V_KKHTH-gSG_ln;ze%`ptyY$>xd}eOm`fm3@MQC1<
zIk&aCj<SqPSNj*&T)V4Xl1qEFEV*8u7jv?}yd;}iuRJfwLaw8-PHA3}1zeIDmt-jy
zvzB#9ro9rV<dV$)FD&(DPu;TY*(F)noh0wk<>b~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor
zE!I71Z@ASH3grl8&P^L0Wpa<xz^6=Zk)~<jNhbH%=&&dd_9T;gIXs`jK4o;Dj*o`d
z6Z@3Wy&55W?qH8Hx+j;T<BP+>vHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@
z<lpwc2DnuIWwY0&c|FQG<a_&#RArSZ0Xg^wWdl+<xk%Z9_C`)GB_!mvPit%+KTpKq
oKffp!%tkY_plO<>Y5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
deleted file mode 100644
index 0ec303439225b78712f49115768196d8d76f6790..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 862
zcmV-k1EKthP)<h;3K|Lk000e1NJLTq004LZ004Lh0{{R34!XwR0002zP)t-s|Ns9~
z#rObMn<=*T{Qmz~#`ydF|4G63{{H_)!1q<f`1$?*a?kkyRhf|4`b@(223wu=`~FbG
z_%68j(ctU=Ns=bC^iqtv`~3aV@cotB`eMoW_Wb_z`u;7!|0=fj9I^Fp&iOXF_5o9s
z8nN{@danRWl$6@~chULM@BMes`C`iW7K6P3OosqIa2R>20Z)wqMt%V?S?~D#06};F
zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU
z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R
zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6;
z1CV9ecD9ZEe87{{NtI*)_aJ<`<r)mO2JY~qH<i}}3%K`^CfiEV%iQNK88@tOg>kJa
z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5
zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh
z<Ot=3TnjL#{3s56++SYyJuk^V_KKHTH-gSG_ln;ze%`ptyY$>xd}eOm`fm3@MQC1<
zIk&aCj<SqPSNj*&T)V4Xl1qEFEV*8u7jv?}yd;}iuRJfwLaw8-PHA3}1zeIDmt-jy
zvzB#9ro9rV<dV$)FD&(DPu;TY*(F)noh0wk<>b~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor
zE!I71Z@ASH3grl8&P^L0Wpa<xz^6=Zk)~<jNhbH%=&&dd_9T;gIXs`jK4o;Dj*o`d
z6Z@3Wy&55W?qH8Hx+j;T<BP+>vHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@
z<lpwc2DnuIWwY0&c|FQG<a_&#RArSZ0Xg^wWdl+<xk%Z9_C`)GB_!mvPit%+KTpKq
oKffp!%tkY_plO<>Y5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
deleted file mode 100644
index e9f5fea27c705180eb716271f41b582e76dcbd90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1674
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
Ux%ZwassI2007*qoM6N<$f}6Z;X#fBK

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index 84ac32ae7d989f82d5e46a60405adcc8279e8001..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 762
zcmV<W0tNkvP)<h;3K|Lk000e1NJLTq002w?002w~0{{R3@JXQ=0002qP)t-s|Ns9~
z#rXXG|5(QODYo_jSDX9&{(;o_`ThU+`~6SD_+iQT==c3r#`s3S_Xb*>OTza`!S_YK
z_v-lm^7{VO^8Q@M_^8F)09Ki6%=s?2_5e<mRK)jOlD-01od8IZ-1Gexu=M~@mHz(!
z(eM2^yY?%;|8~&%Fu3+1v-Tvk^(eCP%G~M!P>upee(w1FB%aqSweusQ-T+CH0Xt{`
zFjMvW{@C&TB)k25()nh~_yJ9c<MsW_?fl2<{Nd~J)#L6sujeJC;K<b8pugFfyVhQm
zzhIHOPKmexK#VF>oBRL(0oO@HK~z}7?bm5j;y@69;bvlHb2tf!$ReA~x{22wTq550
z?f?Hnw(;m3ip30;QzdV~7pi!wyMYhDtXW#cO7T>|f=bdFhu+F!zMZ2UFj;GUKX7tI
z;hv3{q~!*pMj75WP_c}>6)IWvg5_yyg<9Op()eD1hWC19M@?_9_MHec{Z8n3FaF{8
z;u`Mw0ly(uE>*CgQYv{be6ab2LWhlaH1^iLIM{olnag$78^Fd}%dR7;JECQ+hmk|o
z!u<uZ-oSPu!itt>2&!3MqPfP5ChDSkFSH8F2WVOEf0(E_M(JL17G}Y+fg0_IuW%WQ
zG(mG&u<d$HDGTG--N>?|->YSdk0;8rc{yw2@2Z&GA}z{Wb91Ooz9VhA{b2DYE7RmG
zjL}?eq#iX%3#k;JWMx_{^2nNax`xPhByFiDX+a7uTGU|otOvIAUy|dEKkXOm-`aWS
z27pUzD{a)Ct<6p{{3)+lq@i`t@%>-wT4r?*S}k)58e09WZYP<FHdyPA5JO8{8|?N+
zqi)hNvlO*O+|i6<gw!<~F3i}+9jB!I_Y=QmeihA(%{U8hIJ^d63fk~TuH^2PD`=;e
s-wR!xNH1D_BdsZ;*`*lFn)Mmo0|Ng&v#M4dp#T5?07*qoM6N<$g6nFR7XSbN

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
deleted file mode 100644
index 8953cba09064923c5daf2d37e7c3c836ccdd794b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1226
zcmV;*1U37KP)<h;3K|Lk000e1NJLTq005W(005W>0{{R3FC5Sl00039P)t-s|Ns9~
z#rP?<_5oL$Q^olD{r_0T`27C={r>*`|Nj71npVa5OTzc(_WfbW_({R{p56NV{r*M2
z_xt?)2V0#0Ns<IwoaFZYD7E$gOO&$Z{I}-(M!@%1kG%Q&{X2ZIEw}bv$M_ep_9e9S
z0acfN)A=K`_9(RUPs8^>fV0u>{42ctGP(8vQj-Btk1n|O0ZD=YLwd&R{Ko41Gr9H=
zY@z@@bOAMB5Ltl$E>bJJ{>JP30ZxkmI%?eW{k`b?Wy<&gOo;dS`~CR$Vwb@XWtR|N
zi~t=w02?-0&j0TD{>bb6sNwsK*!p?V`RMQUl(*DVjk-9Cx+-z1KXab|Ka2oXhX5f%
z`$|e!000AhNkl<Zc-rlk>rxs)5QTeTVRi&#7Emz~MKK1WAjCw(c-JK6eox;2O)?`?
zTG`AHia671e^vgmp!llKp|=5sVHk#C7=~epA~VAf-~%aPC=%Qw01h8mnSZ|p?hz91
z7p83F3%LVu9;S$tSI$C^%^yud1dfTM_6p2|+5Ejp$bd`GD<tQoa;#(tdg*x)^b%Ba
zB<dx&U)Pai49>vbR|xit>i!ZD&F>@CJrPmu*UjD&?DfZs=$@e3FQA(vNiU+$A*%a}
z?`XcG2jDxJ_ZQ#Md`H{4Lpf6QBDp81_KWZ6Tk#yCy1)32zO#3<7>b`eT7UyYH1eGz
z;O(rH$=QR*L%%ZcBpc=eGua?N55nD^K(8<#gl2+pN_j~b2MHs4#mcLmv%DkspS-3<
zpI1F=^9siI0s-;IN_IrA;5xm~3?3!StX}pUv0vkxMaqm+zxrg7X7(I&*N~&dEd0kD
z-FRV|g=|QuUsuh>-xCI}vD2imzYIOIdcCVV=$Bz@*u0+Bs<|L^)32nN*=wu3n%Ynw
z@1|eLG>!8ruU1pFXUfb`j>(=Gy~?Rn4QJ-c3%3T|(Frd!bI`9u&zAnyFYTqlG#&J7
zAkD(jpw|oZLNiA>;><E14vb!C<}61v(|=|!?3p_+{3UDZS8`^UqXVSX3uorc3rX$?
zgBj-N6r7jA4EKZs%)L+cEbx+}6e`CWdL?HT)GI#bCEzgCo0rk-&7lV`DdA{&!{YV0
zy887LPQW<=GWV7@&0eYX=i7@5umH{x5G^fN%Vw|k%=BW>hgp1KX7-wxC~31II47gc
zHcehD6Uxlf%+M^^uN5Wc*G%^;>D5qT{>=uxUhX%WJu^Z*(_Wq9y}npFO{Hhb>s6<9
zNi0pHXWFaVZnb)1+RS&F)xOv6&aeILcI)`k#0YE+?e)5&#r7J#c`3Z7x!LpTc01dx
zrdC3{Z;joZ^KN&))zB_i)I9fWedoN>Zl-6_Iz+^G&*ak2j<V8PXoPq(E5hmbxe_*B
zL8NCzkZaSWt6DUAR)k2Ir6){c{?c5yFzaVYs%JejB}TAkwwd{RZb~T9PxHo^dE6RA
z&7_)HtjuOCl;+mJu^Fa0XQT1s+b4*@8EAHL_T{0Cv$f9<fqUW+UgMUy7!LtFAtQ~9
o<N)eleSl#YhG7_nVQw400riWbnCg0%WB>pF07*qoM6N<$f;w%0(f|Me

diff --git a/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/progress/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
deleted file mode 100644
index 0467bf12aa4d28f374bb26596605a46dcbb3e7c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1418
zcmV;51$Fv~P)<h;3K|Lk000e1NJLTq005@|005^50{{R3L&&_|0002<P)t-s|Ns9~
z#rP?<_5oL$Q^ffF{{Q^_{`&p@SjPDK{{L6T_)f$3M8Ed{N|OOrnTpr?P{a5HTAk4D
z`~z5={{R2(`ToW0{7S+1UdZ?uu=R4G$LIF_V#@f2t<FZk_b#~h^7{VK@BE3@`mW>q
zKfU)WzW*n(@|xWGCA9ScMt*e9`2kdxPQ&<!ug?KelLAhO12k6wP>&>|-UCa7_51w+
zLUsW@ZzZSW0y$)Hp~e9%PvP|a03ks1`~K?q{u;6NC8*{AOqIUq{CL&;p56Lf$oQGq
z^={4hPQv)y=I|4n+?>7Fim=dxt<Pzk!)BSn06mMNcYMVF00dG=L_t(|+U?wHQxh>1
z2H+Dm+1+fh+IF>G0SjJMkQQre1x4|G*Z==(Ot&kCnUrL4I(rf(ucITwmuHf^hXiJT
zkdTm&kdTm&kdTm&kdP`esgWG0BcWCVkVZ&2dUwN`cgM8QJb`Z7Z~e<&Yj2(}>Tmf`
zm1{eLgw!b{bXkjWbF%dTkTZEJWyWOb##Lfw4EK2}<0d6%>AGS{po>WCOy&f$Tay_>
z?NBlkpo@s-O;0V%Y_Xa-G#_O08q5LR*~F%&)}{}r&L%Sbs8AS4t7Y0N<jX*!Zo1T)
zt|ujDdNPm_Uj|b5at$QXrYAL;&a;w9ef8K&nK>Ex*{soY=0MZExqA5XHQkqi#4gW3
zqODM^iyZl;dvf)-bOXtOru(s)Uc7~BFx{w-FK;2{`VA?(g&@3z&bfLFyctOH!cVsF
z7IL=fo-qBndRUm;kAdXR4e6>k-z|21AaN%ubeVrHl*<|s&Ax@W-t?LR(P-24A5=>a
z*R9#QvjzF8n%@1Nw@?CG@6(%>+-0ASK~jEmCV|&a*7-GKT72W<(TbSjf)&Eme6nGE
z>Gkj4Sq&2e+-G%|+NM8OOm5zVl9{Z8Dd8A5z3y8mZ=4Bv4%>as_{9cN#bm~;h>62(
zdqY93Zy}v&c4n($Vv!Uy<K_zKOlD+qWUdUFpAY5dH@%6osjq0CErn{#ykyp^kOXJ|
zicCq>bR8<y)-%R+rrz||Wzz|mSSH5JR}UOW%{1K(MW)nNGvf_6U5B!ao8CgILf1Aw
zG8(21)tipYTWdQR!P(SW&lOZ}Ix;uc9`9tF6EXD_)#ql#Ttg@c6QPVRxq2XT0i|SO
z>ocs7#zbfX1IY-*w~)p}XyZ-SFC~4w>BvMVr`dFbelV{lLL0bx7@*ZZdebr3`sP;?
zVImji)kG)(6Juv0lz@q`F!k1FE;CQ(D0iG$wchPbKZQELlsZ#~rt8#90Y_Xh&3U-<
z{s<&cCV_1`^TD^<AY&knfDgB9%(uhhCkR@o0C;q3ZPUygx3AnIhYBN9F~{R}6uAL?
za|+d%FUCc?y@1B}&Zmf!YDG=VT?Oq`P|6@wXBNfooEf<coiiu<`=wJs9XO-1ER)Wh
zOb-qgPDh|3$JQfrIvoy`(<!K^pvZhSn-$|zr!!DljVEM|CTE-_G;*y>ia9!*mQDq&
zn2{r`j};V|uV%_wsP!zB?m%;FeaRe+X47K0e+KE!8C{gAWF8)lCd1u1%~|M!XNRvw
zvtqy3iz0WSpWdhn6$hP8PaRBmp)q`#PCA`Vd#Tc$@f1tAcM>f_I@bC)hkI9|o(Iqv
zo}Piadq!j76}004RBio<`)70k^`K1NK)q>w?p^C6J2ZC!+UppiK6&y3Kmbv&O!oYF
z34$0Z;QO!JOY#!`qyGH<3Pd}Pt@q*A0V=3SVtWKRR8d8Z&@)3qLPA19LPA19LPEUC
YUoZo%k(ykuW&i*H07*qoM6N<$f+CH{y8r+H

diff --git a/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
deleted file mode 100644
index 0bedcf2fd..000000000
--- a/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchImage.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchImage@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchImage@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
deleted file mode 100644
index 9da19eacad3b03bb08bbddbbf4ac48dd78b3d838..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 68
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J
Q1PU{Fy85}Sb4q9e0B4a5jsO4v

diff --git a/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
deleted file mode 100644
index 9da19eacad3b03bb08bbddbbf4ac48dd78b3d838..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 68
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J
Q1PU{Fy85}Sb4q9e0B4a5jsO4v

diff --git a/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
deleted file mode 100644
index 9da19eacad3b03bb08bbddbbf4ac48dd78b3d838..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 68
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J
Q1PU{Fy85}Sb4q9e0B4a5jsO4v

diff --git a/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
deleted file mode 100644
index 89c2725b7..000000000
--- a/progress/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Launch Screen Assets
-
-You can customize the launch screen with your own desired assets by replacing the image files in this directory.
-
-You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
\ No newline at end of file
diff --git a/progress/ios/Runner/Base.lproj/LaunchScreen.storyboard b/progress/ios/Runner/Base.lproj/LaunchScreen.storyboard
deleted file mode 100644
index f2e259c7c..000000000
--- a/progress/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Ydg-fD-yQy"/>
-                        <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
-                        </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
-                        </constraints>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="53" y="375"/>
-        </scene>
-    </scenes>
-    <resources>
-        <image name="LaunchImage" width="168" height="185"/>
-    </resources>
-</document>
diff --git a/progress/ios/Runner/Base.lproj/Main.storyboard b/progress/ios/Runner/Base.lproj/Main.storyboard
deleted file mode 100644
index f3c28516f..000000000
--- a/progress/ios/Runner/Base.lproj/Main.storyboard
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
-    </dependencies>
-    <scenes>
-        <!--Flutter View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="FlutterViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
-                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-</document>
diff --git a/progress/ios/Runner/Info.plist b/progress/ios/Runner/Info.plist
deleted file mode 100644
index 4d738dd4e..000000000
--- a/progress/ios/Runner/Info.plist
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Progress</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>progress</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-</dict>
-</plist>
diff --git a/progress/ios/Runner/Runner-Bridging-Header.h b/progress/ios/Runner/Runner-Bridging-Header.h
deleted file mode 100644
index 308a2a560..000000000
--- a/progress/ios/Runner/Runner-Bridging-Header.h
+++ /dev/null
@@ -1 +0,0 @@
-#import "GeneratedPluginRegistrant.h"
diff --git a/progress/ios/RunnerTests/RunnerTests.swift b/progress/ios/RunnerTests/RunnerTests.swift
deleted file mode 100644
index 86a7c3b1b..000000000
--- a/progress/ios/RunnerTests/RunnerTests.swift
+++ /dev/null
@@ -1,12 +0,0 @@
-import Flutter
-import UIKit
-import XCTest
-
-class RunnerTests: XCTestCase {
-
-  func testExample() {
-    // If you add code to the Runner application, consider adding tests here.
-    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
-  }
-
-}
diff --git a/progress/lib/main.dart b/progress/lib/main.dart
deleted file mode 100644
index 3e7c7a4ee..000000000
--- a/progress/lib/main.dart
+++ /dev/null
@@ -1,230 +0,0 @@
-import 'package:flutter/material.dart';
-// 假设Progress组件在一个单独的文件中
-import 'td_progress.dart';
-import 'dart:async';
-
-void main() {
-  runApp(const MyApp());
-}
-
-class MyApp extends StatelessWidget {
-  const MyApp({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      title: '进度条演示',
-      theme: ThemeData(
-        primarySwatch: Colors.blue,
-      ),
-      home: const Home(title: '进度条演示主页'),
-    );
-  }
-}
-
-class Home extends StatefulWidget {
-  final String title;
-
-  const Home({super.key, required this.title});
-
-  @override
-  State<Home> createState() => _HomeState();
-}
-
-class _HomeState extends State<Home> {
-  TDLabelWidget buttonLabel = const TDTextLabel("0%");
-  double progressValue = 0.0;
-  Timer? _timer;
-  bool isProgressing = false;
-
-  // 新增：用于微型按钮进度条的状态
-  bool isPlaying = false;
-  double microProgressValue = 0.0;
-  Timer? _microTimer;
-
-  @override
-  void dispose() {
-    _timer?.cancel();
-    _microTimer?.cancel();
-    super.dispose();
-  }
-
-  void _toggleProgress() {
-    if (isProgressing) {
-      // 暂停进度
-      _timer?.cancel();
-      setState(() {
-        buttonLabel = const TDTextLabel("继续");
-        isProgressing = false;
-      });
-    } else {
-      // 开始或继续进度
-      _timer?.cancel();
-      _timer = Timer.periodic(const Duration(milliseconds: 100), (timer) {
-        setState(() {
-          if (progressValue < 1.0) {
-            progressValue += 0.01;
-            buttonLabel = TDTextLabel("${(progressValue * 100).toInt()}%");
-          } else {
-            _timer?.cancel();
-            buttonLabel = const TDTextLabel("完成");
-            isProgressing = false;
-          }
-        });
-      });
-      setState(() {
-        isProgressing = true;
-      });
-    }
-  }
-
-  void _resetProgress() {
-    _timer?.cancel();
-    setState(() {
-      progressValue = 0.0;
-      buttonLabel = const TDTextLabel("开始");
-      isProgressing = false;
-    });
-  }
-  // 新增：控制微型按钮进度条的方法
-  void _toggleMicroProgress() {
-    setState(() {
-      isPlaying = !isPlaying;
-    });
-    if (isPlaying) {
-      _microTimer = Timer.periodic(const Duration(milliseconds: 100), (timer) {
-        setState(() {
-          if (microProgressValue < 1.0) {
-            microProgressValue += 0.01;
-          } else {
-            _microTimer?.cancel();
-            isPlaying = false;
-            microProgressValue = 0.0;
-          }
-        });
-      });
-    } else {
-      _microTimer?.cancel();
-    }
-  }
-
-  void _resetMicroProgress() {
-    _microTimer?.cancel();
-    setState(() {
-      isPlaying = false;
-      microProgressValue = 0.0;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(title: const Text('自定义百分比进度条')),
-      body: ListView(
-        padding: const EdgeInsets.all(16.0),
-        children: [
-          _buildSection("线性进度条", [
-            _buildProgressItem("不确定", const TDProgress(type: TDProgressType.linear, strokeWidth: 5)),
-            _buildProgressItem("确定, ≤ 10%", const TDProgress(type: TDProgressType.linear, value: 0.1)),
-            _buildProgressItem("确定, > 10%", const TDProgress(type: TDProgressType.linear, value: 0.5)),
-            _buildProgressItem("左侧标签, > 10%", const TDProgress(
-                type: TDProgressType.linear, value: 0.5, progressLabelPosition: TDProgressLabelPosition.left)),
-            _buildProgressItem("自定义标签", const TDProgress(type: TDProgressType.linear, value: 0.5, label: TDTextLabel("百分之50"))),
-            _buildProgressItem("右侧标签, > 10%", const TDProgress(
-                type: TDProgressType.linear, value: 0.5, progressLabelPosition: TDProgressLabelPosition.right)),
-            _buildProgressItem("警告状态", const TDProgress(type: TDProgressType.linear, value: 0.5, progressStatus: TDProgressStatus.warning)),
-            _buildProgressItem("危险状态, 外部标签", const TDProgress(
-                type: TDProgressType.linear,
-                value: 0.5,
-                progressStatus: TDProgressStatus.danger,
-                progressLabelPosition: TDProgressLabelPosition.right)),
-          ]),
-          _buildSection("圆形进度条", [
-            const Row(
-              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-              children: [
-                TDProgress(type: TDProgressType.circular),
-                TDProgress(type: TDProgressType.circular, value: 0.5),
-                TDProgress(
-                    type: TDProgressType.circular, value: 0.5, progressStatus: TDProgressStatus.success),
-                TDProgress(
-                    type: TDProgressType.circular, value: 0.7, progressStatus: TDProgressStatus.warning),
-              ],
-            ),
-          ]),
-          _buildSection("微型进度条", [
-            const TDProgress(type: TDProgressType.micro, value: 0.3),
-          ]),
-          _buildSection("微型按钮进度条", [
-            Row(
-                children: [
-                  TDProgress(type: TDProgressType.micro, value: 0.3, onTap: (){}, label: const TDIconLabel(Icons.play_arrow, color: Colors.blue)),
-                  const SizedBox(width: 10),
-                  TDProgress(type: TDProgressType.micro, value: 0.3, onTap: (){}, label: const TDIconLabel(Icons.pause, color: Colors.blue)),
-                  const SizedBox(width: 10),
-                  TDProgress(type: TDProgressType.micro, value: 0.3, onTap: (){}, label: const TDIconLabel(Icons.stop, color: Colors.blue))
-                ]
-            )
-          ]),
-          _buildSection("交互式微型按钮进度条", [
-            Row(
-              mainAxisAlignment: MainAxisAlignment.start,
-              children: [
-                TDProgress(
-                  type: TDProgressType.micro,
-                  value: microProgressValue,
-                  onTap: _toggleMicroProgress,
-                  label: TDIconLabel(isPlaying ? Icons.pause : Icons.play_arrow, color: Colors.blue),
-                ),
-                const SizedBox(width: 10),
-                TDProgress(
-                  type: TDProgressType.micro,
-                  value: microProgressValue,
-                  onTap: _resetMicroProgress,
-                  label: const TDIconLabel(Icons.stop, color: Colors.blue),
-                ),
-              ],
-            ),
-            const SizedBox(height: 10),
-            Text('点击播放/暂停，点击停止重置进度', style: Theme.of(context).textTheme.bodyMedium),
-          ]),
-          _buildSection("按钮进度条", [
-            TDProgress(
-              type: TDProgressType.button,
-              onTap: _toggleProgress,
-              onLongPress: _resetProgress,
-              value: progressValue,
-              label: buttonLabel,
-            ),
-            const SizedBox(height: 10),
-            Text('点击开始/暂停进度，长按重置进度', style: Theme.of(context).textTheme.bodyMedium),
-          ])
-        ],
-      ),
-    );
-  }
-
-  Widget _buildSection(String title, List<Widget> children) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(title, style: Theme.of(context).textTheme.titleLarge),
-        const SizedBox(height: 10),
-        ...children,
-        const SizedBox(height: 20),
-      ],
-    );
-  }
-
-  Widget _buildProgressItem(String label, Widget progressWidget) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(label),
-        const SizedBox(height: 5),
-        progressWidget,
-        const SizedBox(height: 15),
-      ],
-    );
-  }
-}
\ No newline at end of file
diff --git a/progress/lib/old_progress.dart b/progress/lib/old_progress.dart
deleted file mode 100644
index 074502fa1..000000000
--- a/progress/lib/old_progress.dart
+++ /dev/null
@@ -1,589 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:tdesign_flutter/tdesign_flutter.dart';
-
-// 用于区分线性和圆形进度条的枚举
-enum _ProgressType { linear, circular, micro, button }
-
-//label位置的枚举
-enum ProgressLabelPosition { inside, left, right }
-
-//status枚举
-enum ProgressStatus { primary, warning, danger, success }
-
-// label 类型的辅助类
-abstract class LabelWidget extends Widget {
-  const LabelWidget({super.key});
-}
-
-class TextLabel extends Text implements LabelWidget {
-  const TextLabel(String data, {Key? key, TextStyle? style})
-      : super(data, key: key, style: style);
-}
-
-class IconLabel extends Icon implements LabelWidget {
-  const IconLabel(IconData icon, {Key? key, double? size, Color? color})
-      : super(icon, key: key, size: size, color: color);
-}
-
-/// progress工具类
-class Progress {
-  Progress._();
-
-  /// 创建线性进度条
-  static Widget linear<T extends LabelWidget>(
-      {Key? key,
-      double? value,
-      T? label,
-      ProgressStatus progressStatus = ProgressStatus.primary,
-      ProgressLabelPosition progressLabelPosition =
-          ProgressLabelPosition.inside,
-      double strokeWidth = 20.0,
-      Color? color,
-      Color backgroundColor = const Color(0xFFEEEEEE),
-      BorderRadiusGeometry borderRadius =
-          const BorderRadius.all(Radius.circular(20)),
-      bool showLabel = true}) {
-    return _ProgressIndicator<T>(
-        key: key,
-        value: value,
-        label: label,
-        progressStatus: progressStatus,
-        progressLabelPosition: progressLabelPosition,
-        strokeWidth: strokeWidth,
-        color: color,
-        backgroundColor: backgroundColor,
-        borderRadius: borderRadius,
-        showLabel: showLabel,
-        type: _ProgressType.linear);
-  }
-
-  /// 创建圆形进度条
-  static Widget circular<T extends LabelWidget>({
-    Key? key,
-    double? value,
-    T? label,
-    ProgressStatus progressStatus = ProgressStatus.primary,
-    double strokeWidth = 5.0,
-    Color? color,
-    Color backgroundColor = const Color(0xFFEEEEEE),
-    double circleRadius = 80.0,
-    bool showLabel = true,
-  }) {
-    return _ProgressIndicator<T>(
-      key: key,
-      value: value,
-      label: label,
-      progressStatus: progressStatus,
-      strokeWidth: strokeWidth,
-      color: color,
-      backgroundColor: backgroundColor,
-      circleRadius: circleRadius,
-      showLabel: showLabel,
-      type: _ProgressType.circular,
-    );
-  }
-
-  //构建微型进度条
-  static Widget micro<T extends LabelWidget>(
-      {Key? key,
-      double? value,
-      T? label,
-      ProgressStatus progressStatus = ProgressStatus.primary,
-      double strokeWidth = 2.0,
-      Color? color,
-      Color backgroundColor = const Color(0xFFEEEEEE),
-      double circleRadius = 20.0,
-      VoidCallback? onTap,
-      VoidCallback? onLongPress,
-      bool showLabel = true}) {
-    return _ProgressIndicator(
-      key: key,
-      value: value,
-      label: label ?? const TextLabel(""),
-      progressStatus: progressStatus,
-      strokeWidth: strokeWidth,
-      color: color,
-      backgroundColor: backgroundColor,
-      circleRadius: circleRadius,
-      onTap: onTap,
-      onLongPress: onLongPress,
-      showLabel: showLabel,
-      type: _ProgressType.micro,
-    );
-  }
-
-  // 构建按钮进度条
-  static Widget button<T extends LabelWidget>(
-      {Key? key,
-      double? value,
-      T? label,
-      ProgressStatus progressStatus = ProgressStatus.primary,
-      ProgressLabelPosition progressLabelPosition =
-          ProgressLabelPosition.inside,
-      double strokeWidth = 60.0,
-      Color? color,
-      Color backgroundColor = const Color(0xFF0052da),
-      BorderRadiusGeometry borderRadius =
-          const BorderRadius.all(Radius.circular(6)),
-      VoidCallback? onTap,
-      VoidCallback? onLongPress,
-      bool showLabel = true}) {
-    return _ProgressIndicator<T>(
-        key: key,
-        value: value,
-        label: label,
-        progressStatus: progressStatus,
-        progressLabelPosition: progressLabelPosition,
-        strokeWidth: strokeWidth,
-        color: color,
-        backgroundColor: backgroundColor,
-        borderRadius: borderRadius,
-        showLabel: showLabel,
-        onTap: onTap,
-        onLongPress: onLongPress,
-        type: _ProgressType.button);
-  }
-}
-
-// 构建进度条基础小部件类
-class _ProgressIndicator<T extends LabelWidget> extends StatefulWidget {
-  final double? value;
-  final T? label;
-  final ProgressLabelPosition progressLabelPosition;
-  final double strokeWidth;
-  final BorderRadiusGeometry borderRadius;
-  final double circleRadius;
-  final Color? color;
-  final Color backgroundColor;
-  final _ProgressType type;
-  final StrokeCap strokeCap;
-  final ProgressStatus progressStatus;
-  final bool showLabel;
-  final VoidCallback? onTap;
-  final VoidCallback? onLongPress;
-
-  const _ProgressIndicator(
-      {Key? key,
-      this.value,
-      this.label,
-      this.progressLabelPosition = ProgressLabelPosition.inside,
-      this.strokeWidth = 20.0,
-      this.borderRadius = const BorderRadius.all(Radius.circular(20)),
-      this.circleRadius = 80.0,
-      this.color,
-      this.backgroundColor = const Color(0xFFEEEEEE),
-      this.type = _ProgressType.linear,
-      this.strokeCap = StrokeCap.round,
-      this.progressStatus = ProgressStatus.primary,
-      this.showLabel = true,
-      this.onTap,
-      this.onLongPress})
-      : super(key: key);
-
-  @override
-  _ProgressIndicatorState<T> createState() => _ProgressIndicatorState<T>();
-}
-
-class _ProgressIndicatorState<T extends LabelWidget>
-    extends State<_ProgressIndicator<T>> with SingleTickerProviderStateMixin {
-  late AnimationController _animationController;
-  late Animation<double> _animation;
-  late Color _effectiveColor;
-  late Widget _effectiveLabel;
-
-  @override
-  void initState() {
-    super.initState();
-    _animationController = AnimationController(
-      vsync: this,
-      duration: const Duration(seconds: 1),
-    );
-    _updateAnimation();
-    final int duration = (_animation.value * 1000).toInt();
-    _animationController.duration = Duration(milliseconds: duration);
-    _updateEffectiveColor();
-    _updateEffectiveLabel();
-  }
-
-  @override
-  void didUpdateWidget(_ProgressIndicator<T> oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.value != widget.value) {
-      _updateAnimation();
-    }
-    if (oldWidget.color != widget.color ||
-        oldWidget.progressStatus != widget.progressStatus) {
-      _updateEffectiveColor();
-    }
-    if (oldWidget.label != widget.label ||
-        oldWidget.progressStatus != widget.progressStatus) {
-      _updateEffectiveLabel();
-    }
-  }
-
-  void _updateEffectiveColor() {
-    _effectiveColor =
-        widget.color ?? _getColorFromStatus(widget.progressStatus);
-  }
-
-  void _updateEffectiveLabel() {
-    _effectiveLabel =
-        widget.label ?? _getDefaultLabelFromStatus(widget.progressStatus);
-  }
-
-  void _updateAnimation() {
-    _animation = Tween<double>(begin: 0, end: widget.value ?? 0)
-        .animate(_animationController);
-    _animationController.forward(from: 0);
-  }
-
-  //根据status构建默认参数
-  Widget _getDefaultLabelFromStatus(ProgressStatus status) {
-    final bool showAutoText = widget.value != null;
-    final bool showInsideLabel =
-        widget.progressLabelPosition == ProgressLabelPosition.inside &&
-            widget.type != _ProgressType.circular;
-    final bool showIconBorder = widget.type == _ProgressType.linear;
-    // 生成自动文本
-    Widget getAutoText() => showAutoText
-        ? Text('${(widget.value! * 100).round()}%')
-        : const Text("");
-
-    final statusWidgets = {
-      ProgressStatus.primary: getAutoText(),
-      ProgressStatus.warning: showInsideLabel
-          ? getAutoText()
-          : showIconBorder
-              ? const Icon(TDIcons.error_circle_filled)
-              : const Icon(TDIcons.error),
-      ProgressStatus.danger: showInsideLabel
-          ? getAutoText()
-          : showIconBorder
-              ? const Icon(TDIcons.close_circle_filled)
-              : const Icon(TDIcons.close),
-      ProgressStatus.success: showInsideLabel
-          ? getAutoText()
-          : showIconBorder
-              ? const Icon(TDIcons.check_circle_filled)
-              : const Icon(TDIcons.check),
-    };
-
-    return statusWidgets[status] ?? getAutoText(); // 如果状态不匹配，默认返回自动文本
-  }
-
-  //设置默认颜色
-  Color _getColorFromStatus(ProgressStatus status) {
-    switch (status) {
-      case ProgressStatus.primary:
-        return Colors.blue;
-      case ProgressStatus.warning:
-        return Colors.orange;
-      case ProgressStatus.danger:
-        return Colors.red;
-      case ProgressStatus.success:
-        return Colors.green;
-    }
-  }
-
-  @override
-  void dispose() {
-    _animationController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        if (widget.type == _ProgressType.linear)
-          _buildLinearProgress()
-        else if (widget.type == _ProgressType.circular)
-          _buildCircularProgress()
-        else if (widget.type == _ProgressType.micro)
-          _buildMicroProgress()
-        else if (widget.type == _ProgressType.button)
-          _buildButtonProgress()
-      ],
-    );
-  }
-
-  //构建条形指示器
-  Widget _buildLinearProgress() {
-    return LayoutBuilder(
-      builder: (context, constraints) {
-        final maxWidth = constraints.maxWidth;
-
-        if (widget.value != null &&
-            widget.progressLabelPosition == ProgressLabelPosition.inside) {
-          return _buildInsideLabel(maxWidth);
-        } else {
-          return _buildOutsideLabel();
-        }
-      },
-    );
-  }
-
-  //构建百分比内显label
-  Widget _buildInsideLabel(double maxWidth) {
-    return AnimatedBuilder(
-      animation: _animation,
-      builder: (context, child) {
-        final progressWidth = _animation.value * maxWidth;
-        return Stack(
-          children: [
-            _buildBackgroundContainer(),
-            if (widget.value! > 0.1)
-              _buildProgressContainerWithLabel(progressWidth)
-            else
-              _buildProgressContainerWithLabelOutside(progressWidth),
-          ],
-        );
-      },
-    );
-  }
-
-  //构建外显label
-  Widget _buildOutsideLabel() {
-    return AnimatedBuilder(
-      animation: _animation,
-      builder: (context, child) {
-        return Row(
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            if (widget.progressLabelPosition == ProgressLabelPosition.left)
-              Padding(
-                padding: const EdgeInsets.only(right: 8.0),
-                child: _buildLabelWidget(Colors.black),
-              ),
-            Expanded(
-              child: LinearProgressIndicator(
-                borderRadius: widget.borderRadius,
-                value: widget.value != null ? _animation.value : null,
-                backgroundColor: widget.backgroundColor,
-                valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
-                minHeight: widget.strokeWidth,
-              ),
-            ),
-            if (widget.progressLabelPosition == ProgressLabelPosition.right)
-              Padding(
-                padding: const EdgeInsets.only(left: 8.0),
-                child: _buildLabelWidget(Colors.black),
-              ),
-          ],
-        );
-      },
-    );
-  }
-
-  //构建进度条外容器
-  Widget _buildBackgroundContainer() {
-    return Container(
-      height: widget.strokeWidth,
-      decoration: BoxDecoration(
-        color: widget.backgroundColor,
-      ),
-    );
-  }
-
-  //构建内显label的进度条内容器
-  Widget _buildProgressContainerWithLabel(double progressWidth) {
-    return Container(
-      height: widget.strokeWidth,
-      width: progressWidth,
-      decoration: BoxDecoration(
-        color: _effectiveColor,
-        borderRadius: widget.borderRadius,
-      ),
-      child: widget.showLabel
-          ? Align(
-              alignment: Alignment.centerRight,
-              child: Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 10.0),
-                child: _buildLabelWidget(Colors.white),
-              ),
-            )
-          : null,
-    );
-  }
-
-  //构建外显label的进度条内容器
-  Widget _buildProgressContainerWithLabelOutside(double progressWidth) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.start,
-      children: [
-        Container(
-          height: widget.strokeWidth,
-          width: progressWidth,
-          decoration: BoxDecoration(
-            color: _effectiveColor,
-            borderRadius: widget.borderRadius,
-          ),
-        ),
-        if (widget.showLabel)
-          Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 5.0),
-            child: _buildLabelWidget(Colors.black),
-          ),
-      ],
-    );
-  }
-
-  //构建label基础容器
-  Widget _buildLabelWidget(Color labelColor) {
-    late double iconSize;
-    late double fontSize;
-    late FontWeight fontWeight;
-
-    switch (widget.type) {
-      case _ProgressType.linear:
-        iconSize = widget.strokeWidth;
-        fontSize = widget.strokeWidth * 0.6;
-        fontWeight = FontWeight.normal;
-        break;
-      case _ProgressType.circular:
-        iconSize = widget.circleRadius * 0.4;
-        fontSize = widget.circleRadius * 0.2;
-        fontWeight = FontWeight.bold;
-        break;
-      case _ProgressType.micro:
-        iconSize = widget.circleRadius * 0.6;
-        fontSize = widget.circleRadius * 0.2;
-        fontWeight = FontWeight.normal;
-        break;
-      case _ProgressType.button:
-        iconSize = widget.strokeWidth * 0.8;
-        fontSize = widget.strokeWidth * 0.3;
-        fontWeight = FontWeight.normal;
-        break;
-      default:
-        iconSize = 20;
-        fontSize = 12;
-        fontWeight = FontWeight.normal;
-        break;
-    }
-
-    return IconTheme(
-      data: IconThemeData(color: _effectiveColor, size: iconSize),
-      child: DefaultTextStyle(
-        style: TextStyle(
-          color: labelColor,
-          fontSize: fontSize,
-          fontWeight: fontWeight,
-        ),
-        child: _effectiveLabel,
-      ),
-    );
-  }
-
-  // 构建圆形进度条
-  Widget _buildCircularProgress() {
-    return AnimatedBuilder(
-      animation: _animation,
-      builder: (context, child) {
-        return Stack(
-          alignment: Alignment.center,
-          children: [
-            SizedBox(
-              height: widget.circleRadius,
-              width: widget.circleRadius,
-              child: Padding(
-                padding: EdgeInsets.all(widget.strokeWidth / 2),
-                child: CircularProgressIndicator(
-                  value: widget.value != null ? _animation.value : null,
-                  backgroundColor: widget.backgroundColor,
-                  strokeCap: widget.strokeCap,
-                  valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
-                  strokeWidth: widget.strokeWidth,
-                ),
-              ),
-            ),
-            if (widget.showLabel) _buildLabelWidget(Colors.black),
-          ],
-        );
-      },
-    );
-  }
-
-  //构建微型进度条
-  Widget _buildMicroProgress() {
-    return AnimatedBuilder(
-        animation: _animation,
-        builder: (context, child) {
-          return GestureDetector(
-              onTap: widget.onTap,
-              onLongPress: widget.onLongPress,
-              child: Stack(
-                alignment: Alignment.center,
-                children: [
-                  _buildMicroOutline(),
-                  if (widget.showLabel) _buildLabelWidget(Colors.black),
-                ],
-              ));
-        });
-  }
-
-  Widget _buildMicroOutline() {
-    return SizedBox(
-      height: widget.circleRadius,
-      width: widget.circleRadius,
-      child: Padding(
-        padding: EdgeInsets.all(widget.strokeWidth / 2),
-        child: CircularProgressIndicator(
-          value: widget.value != null ? _animation.value : null,
-          backgroundColor: widget.backgroundColor,
-          strokeCap: widget.strokeCap,
-          valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
-          strokeWidth: widget.strokeWidth,
-        ),
-      ),
-    );
-  }
-
-  Widget _buildButtonProgress() {
-    return LayoutBuilder(
-      builder: (context, constraints) {
-        final maxWidth = constraints.maxWidth;
-        return AnimatedBuilder(
-            animation: _animation,
-            builder: (context, child) {
-              final progressWidth = maxWidth * _animation.value;
-              return ClipRRect(
-                borderRadius: widget.borderRadius,
-                child: GestureDetector(
-                    onTap: widget.onTap,
-                    onLongPress: widget.onLongPress,
-                    child: Stack(
-                      children: [
-                        _buildBackgroundContainer(),
-                        _buildButtonActiveContainer(progressWidth),
-                        if (widget.showLabel) _buildButtonLabel(maxWidth),
-                      ],
-                    )),
-              );
-            });
-      },
-    );
-  }
-
-  // 按钮进度条内容器
-  Widget _buildButtonActiveContainer(double progressWidth) {
-    return Container(
-      height: widget.strokeWidth,
-      width: progressWidth,
-      decoration: BoxDecoration(
-        gradient: LinearGradient(
-          colors: [widget.backgroundColor, Colors.white.withOpacity(.4)],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildButtonLabel(double maxWidth) {
-    return Container(
-      height: widget.strokeWidth,
-      alignment: Alignment.center,
-      child: _buildLabelWidget(Colors.white),
-    );
-  }
-}
diff --git a/progress/lib/td_progress.dart b/progress/lib/td_progress.dart
deleted file mode 100644
index 4e44e93b6..000000000
--- a/progress/lib/td_progress.dart
+++ /dev/null
@@ -1,574 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:tdesign_flutter/tdesign_flutter.dart';
-
-enum TDProgressType { linear, circular, micro, button }
-
-enum TDProgressLabelPosition { inside, left, right }
-
-enum TDProgressStatus { primary, warning, danger, success }
-
-enum ProgressStrokeCap {
-  round,
-  square,
-  butt,
-}
-
-abstract class TDLabelWidget extends Widget {
-  const TDLabelWidget({super.key});
-}
-
-class TDTextLabel extends Text implements TDLabelWidget {
-  const TDTextLabel(String data, {Key? key, TextStyle? style})
-      : super(data, key: key, style: style);
-}
-
-class TDIconLabel extends Icon implements TDLabelWidget {
-  const TDIconLabel(IconData icon, {Key? key, double? size, Color? color})
-      : super(icon, key: key, size: size, color: color);
-}
-
-class TDProgress extends StatelessWidget {
-  final TDProgressType type;
-  final double? value;
-  final TDLabelWidget? label;
-  final TDProgressStatus progressStatus;
-  final TDProgressLabelPosition progressLabelPosition;
-  final double? strokeWidth;
-  final Color? color;
-  final Color? backgroundColor;
-  final ProgressStrokeCap? strokeCap;
-  final double? circleRadius;
-  final bool showLabel;
-  final VoidCallback? onTap;
-  final VoidCallback? onLongPress;
-
-  const TDProgress({
-    Key? key,
-    required this.type,
-    this.value,
-    this.label,
-    this.progressStatus = TDProgressStatus.primary,
-    this.progressLabelPosition = TDProgressLabelPosition.inside,
-    this.strokeWidth,
-    this.color,
-    this.backgroundColor,
-    this.strokeCap,
-    this.circleRadius,
-    this.showLabel = true,
-    this.onTap,
-    this.onLongPress,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    final defaultValues = _getDefaultValues(type);
-    return _ProgressIndicator(
-      value: value,
-      label: label,
-      progressStatus: progressStatus,
-      progressLabelPosition: progressLabelPosition,
-      strokeWidth: strokeWidth ?? defaultValues.strokeWidth,
-      color: color,
-      backgroundColor: backgroundColor ?? defaultValues.backgroundColor,
-      strokeCap: strokeCap ?? defaultValues.strokeCap,
-      circleRadius: circleRadius ?? defaultValues.circleRadius,
-      showLabel: showLabel,
-      onTap: onTap,
-      onLongPress: onLongPress,
-      type: type,
-    );
-  }
-
-  _DefaultValues _getDefaultValues(TDProgressType type) {
-    switch (type) {
-      case TDProgressType.linear:
-        return _DefaultValues(
-          strokeWidth: 20.0,
-          backgroundColor: const Color(0xFFEEEEEE),
-          strokeCap: ProgressStrokeCap.round,
-          circleRadius: 0, // Not applicable for linear progress
-        );
-      case TDProgressType.circular:
-        return _DefaultValues(
-          strokeWidth: 5.0,
-          backgroundColor: const Color(0xFFEEEEEE),
-          strokeCap: ProgressStrokeCap.round,
-          circleRadius: 80.0,
-        );
-      case TDProgressType.micro:
-        return _DefaultValues(
-          strokeWidth: 2.0,
-          backgroundColor: const Color(0xFFEEEEEE),
-          strokeCap: ProgressStrokeCap.round,
-          circleRadius: 20.0,
-        );
-      case TDProgressType.button:
-        return _DefaultValues(
-          strokeWidth: 60.0,
-          backgroundColor: const Color(0xFF0052da),
-          strokeCap: ProgressStrokeCap.butt,
-          circleRadius: 0, // Not applicable for button progress
-        );
-    }
-  }
-}
-
-class _DefaultValues {
-  final double strokeWidth;
-  final Color backgroundColor;
-  final ProgressStrokeCap strokeCap;
-  final double circleRadius;
-
-  _DefaultValues({
-    required this.strokeWidth,
-    required this.backgroundColor,
-    required this.strokeCap,
-    required this.circleRadius,
-  });
-}
-
-class _ProgressIndicator extends StatefulWidget {
-  final double? value;
-  final TDLabelWidget? label;
-  final TDProgressLabelPosition progressLabelPosition;
-  final double strokeWidth;
-  final double circleRadius;
-  final ProgressStrokeCap strokeCap;
-  final Color? color;
-  final Color backgroundColor;
-  final TDProgressType type;
-  final TDProgressStatus progressStatus;
-  final bool showLabel;
-  final VoidCallback? onTap;
-  final VoidCallback? onLongPress;
-
-  const _ProgressIndicator({
-    Key? key,
-    this.value,
-    this.label,
-    this.progressLabelPosition = TDProgressLabelPosition.inside,
-    required this.strokeWidth,
-    required this.strokeCap,
-    required this.circleRadius,
-    this.color,
-    required this.backgroundColor,
-    required this.type,
-    this.progressStatus = TDProgressStatus.primary,
-    this.showLabel = true,
-    this.onTap,
-    this.onLongPress,
-  }) : super(key: key);
-
-  @override
-  _ProgressIndicatorState createState() => _ProgressIndicatorState();
-}
-
-class _ProgressIndicatorState extends State<_ProgressIndicator>
-    with SingleTickerProviderStateMixin {
-  late AnimationController _animationController;
-  late Animation<double> _animation;
-  late Color _effectiveColor;
-  late Widget _effectiveLabel;
-
-  @override
-  void initState() {
-    super.initState();
-    _animationController = AnimationController(
-      vsync: this,
-      duration: const Duration(seconds: 1),
-    );
-    _updateAnimation();
-    final int duration = (_animation.value * 1000).toInt();
-    _animationController.duration = Duration(milliseconds: duration);
-    _updateEffectiveColor();
-    _updateEffectiveLabel();
-  }
-
-  @override
-  void didUpdateWidget(_ProgressIndicator oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.value != widget.value) {
-      _updateAnimation();
-    }
-    if (oldWidget.color != widget.color ||
-        oldWidget.progressStatus != widget.progressStatus) {
-      _updateEffectiveColor();
-    }
-    if (oldWidget.label != widget.label ||
-        oldWidget.progressStatus != widget.progressStatus) {
-      _updateEffectiveLabel();
-    }
-  }
-
-  BorderRadius _getBorderRadius() {
-    switch (widget.strokeCap) {
-      case ProgressStrokeCap.round:
-        return BorderRadius.circular(widget.strokeWidth / 2);
-      case ProgressStrokeCap.square:
-        return BorderRadius.zero;
-      case ProgressStrokeCap.butt:
-        return BorderRadius.circular(widget.strokeWidth / 6);
-    }
-  }
-
-  void _updateEffectiveColor() {
-    _effectiveColor =
-        widget.color ?? _getColorFromStatus(widget.progressStatus);
-  }
-
-  void _updateEffectiveLabel() {
-    _effectiveLabel =
-        widget.label ?? _getDefaultLabelFromStatus(widget.progressStatus);
-  }
-
-  void _updateAnimation() {
-    _animation = Tween<double>(begin: 0, end: widget.value ?? 0)
-        .animate(_animationController);
-    _animationController.forward(from: 0);
-  }
-
-  Widget _getDefaultLabelFromStatus(TDProgressStatus status) {
-    final bool showAutoText = widget.value != null;
-    final bool showInsideLabel =
-        widget.progressLabelPosition == TDProgressLabelPosition.inside &&
-            widget.type != TDProgressType.circular;
-    final bool showIconBorder = widget.type == TDProgressType.linear;
-
-    Widget getAutoText() => showAutoText && widget.type != TDProgressType.micro
-        ? Text('${(widget.value! * 100).round()}%')
-        : const Text("");
-
-    final statusWidgets = {
-      TDProgressStatus.primary: getAutoText(),
-      TDProgressStatus.warning: showInsideLabel
-          ? getAutoText()
-          : showIconBorder
-              ? const Icon(TDIcons.error_circle_filled)
-              : const Icon(TDIcons.error),
-      TDProgressStatus.danger: showInsideLabel
-          ? getAutoText()
-          : showIconBorder
-              ? const Icon(TDIcons.close_circle_filled)
-              : const Icon(TDIcons.close),
-      TDProgressStatus.success: showInsideLabel
-          ? getAutoText()
-          : showIconBorder
-              ? const Icon(TDIcons.check_circle_filled)
-              : const Icon(TDIcons.check),
-    };
-
-    return statusWidgets[status] ?? getAutoText();
-  }
-
-  Color _getColorFromStatus(TDProgressStatus status) {
-    switch (status) {
-      case TDProgressStatus.primary:
-        return Colors.blue;
-      case TDProgressStatus.warning:
-        return Colors.orange;
-      case TDProgressStatus.danger:
-        return Colors.red;
-      case TDProgressStatus.success:
-        return Colors.green;
-    }
-  }
-
-  StrokeCap _getFlutterStrokeCap(ProgressStrokeCap cap) {
-    switch (cap) {
-      case ProgressStrokeCap.round:
-        return StrokeCap.round;
-      case ProgressStrokeCap.square:
-        return StrokeCap.square;
-      case ProgressStrokeCap.butt:
-        return StrokeCap.butt;
-    }
-  }
-
-  @override
-  void dispose() {
-    _animationController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        if (widget.type == TDProgressType.linear)
-          _buildLinearProgress()
-        else if (widget.type == TDProgressType.circular)
-          _buildCircularProgress()
-        else if (widget.type == TDProgressType.micro)
-          _buildMicroProgress()
-        else if (widget.type == TDProgressType.button)
-          _buildButtonProgress()
-      ],
-    );
-  }
-
-  Widget _buildLinearProgress() {
-    return LayoutBuilder(
-      builder: (context, constraints) {
-        final maxWidth = constraints.maxWidth;
-
-        if (widget.value != null &&
-            widget.progressLabelPosition == TDProgressLabelPosition.inside) {
-          return _buildInsideLabel(maxWidth);
-        } else {
-          return _buildOutsideLabel();
-        }
-      },
-    );
-  }
-
-  Widget _buildInsideLabel(double maxWidth) {
-    return AnimatedBuilder(
-      animation: _animation,
-      builder: (context, child) {
-        final progressWidth = _animation.value * maxWidth;
-        return Stack(
-          children: [
-            _buildBackgroundContainer(),
-            if (widget.value! > 0.1)
-              _buildProgressContainerWithLabel(progressWidth)
-            else
-              _buildProgressContainerWithLabelOutside(progressWidth),
-          ],
-        );
-      },
-    );
-  }
-
-  Widget _buildOutsideLabel() {
-    return AnimatedBuilder(
-      animation: _animation,
-      builder: (context, child) {
-        return Row(
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            if (widget.progressLabelPosition == TDProgressLabelPosition.left)
-              Padding(
-                padding: const EdgeInsets.only(right: 8.0),
-                child: _buildLabelWidget(Colors.black),
-              ),
-            Expanded(
-              child: LinearProgressIndicator(
-                borderRadius: _getBorderRadius(),
-                value: widget.value != null ? _animation.value : null,
-                backgroundColor: widget.backgroundColor,
-                valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
-                minHeight: widget.strokeWidth,
-              ),
-            ),
-            if (widget.progressLabelPosition == TDProgressLabelPosition.right)
-              Padding(
-                padding: const EdgeInsets.only(left: 8.0),
-                child: _buildLabelWidget(Colors.black),
-              ),
-          ],
-        );
-      },
-    );
-  }
-
-  Widget _buildBackgroundContainer() {
-    return Container(
-      height: widget.strokeWidth,
-      decoration: BoxDecoration(
-        borderRadius: _getBorderRadius(),
-        color: widget.backgroundColor,
-      ),
-    );
-  }
-
-  Widget _buildProgressContainerWithLabel(double progressWidth) {
-    return Container(
-      height: widget.strokeWidth,
-      width: progressWidth,
-      decoration: BoxDecoration(
-        color: _effectiveColor,
-        borderRadius: _getBorderRadius(),
-      ),
-      child: widget.showLabel
-          ? Align(
-              alignment: Alignment.centerRight,
-              child: Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 10.0),
-                child: _buildLabelWidget(Colors.white),
-              ),
-            )
-          : null,
-    );
-  }
-
-  Widget _buildProgressContainerWithLabelOutside(double progressWidth) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.start,
-      children: [
-        Container(
-          height: widget.strokeWidth,
-          width: progressWidth,
-          decoration: BoxDecoration(
-            color: _effectiveColor,
-            borderRadius: _getBorderRadius(),
-          ),
-        ),
-        if (widget.showLabel)
-          Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 5.0),
-            child: _buildLabelWidget(Colors.black),
-          ),
-      ],
-    );
-  }
-
-  Widget _buildLabelWidget(Color labelColor) {
-    late double iconSize;
-    late double fontSize;
-    late FontWeight fontWeight;
-
-    switch (widget.type) {
-      case TDProgressType.linear:
-        iconSize = widget.strokeWidth;
-        fontSize = widget.strokeWidth * 0.6;
-        fontWeight = FontWeight.normal;
-        break;
-      case TDProgressType.circular:
-        iconSize = widget.circleRadius * 0.4;
-        fontSize = widget.circleRadius * 0.2;
-        fontWeight = FontWeight.bold;
-        break;
-      case TDProgressType.micro:
-        iconSize = widget.circleRadius * 0.6;
-        fontSize = widget.circleRadius * 0.2;
-        fontWeight = FontWeight.normal;
-        break;
-      case TDProgressType.button:
-        iconSize = widget.strokeWidth * 0.8;
-        fontSize = widget.strokeWidth * 0.3;
-        fontWeight = FontWeight.normal;
-        break;
-    }
-
-    return IconTheme(
-      data: IconThemeData(color: _effectiveColor, size: iconSize),
-      child: DefaultTextStyle(
-        style: TextStyle(
-          color: labelColor,
-          fontSize: fontSize,
-          fontWeight: fontWeight,
-        ),
-        child: _effectiveLabel,
-      ),
-    );
-  }
-
-  Widget _buildCircularProgress() {
-    return AnimatedBuilder(
-      animation: _animation,
-      builder: (context, child) {
-        return Stack(
-          alignment: Alignment.center,
-          children: [
-            SizedBox(
-              height: widget.circleRadius,
-              width: widget.circleRadius,
-              child: Padding(
-                padding: EdgeInsets.all(widget.strokeWidth / 2),
-                child: CircularProgressIndicator(
-                  value: widget.value != null ? _animation.value : null,
-                  backgroundColor: widget.backgroundColor,
-                  strokeCap: _getFlutterStrokeCap(widget.strokeCap),
-                  valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
-                  strokeWidth: widget.strokeWidth,
-                ),
-              ),
-            ),
-            if (widget.showLabel) _buildLabelWidget(Colors.black),
-          ],
-        );
-      },
-    );
-  }
-
-  Widget _buildMicroProgress() {
-    return AnimatedBuilder(
-        animation: _animation,
-        builder: (context, child) {
-          return GestureDetector(
-              onTap: widget.onTap,
-              onLongPress: widget.onLongPress,
-              child: Stack(
-                alignment: Alignment.center,
-                children: [
-                  _buildMicroOutline(),
-                  if (widget.showLabel) _buildLabelWidget(Colors.black),
-                ],
-              ));
-        });
-  }
-
-  Widget _buildMicroOutline() {
-    return SizedBox(
-      height: widget.circleRadius,
-      width: widget.circleRadius,
-      child: Padding(
-        padding: EdgeInsets.all(widget.strokeWidth / 2),
-        child: CircularProgressIndicator(
-          value: widget.value != null ? _animation.value : null,
-          backgroundColor: widget.backgroundColor,
-          strokeCap: _getFlutterStrokeCap(widget.strokeCap),
-          valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
-          strokeWidth: widget.strokeWidth,
-        ),
-      ),
-    );
-  }
-
-  Widget _buildButtonProgress() {
-    return LayoutBuilder(
-      builder: (context, constraints) {
-        final maxWidth = constraints.maxWidth;
-        return AnimatedBuilder(
-            animation: _animation,
-            builder: (context, child) {
-              final progressWidth = maxWidth * _animation.value;
-              return ClipRRect(
-                borderRadius: _getBorderRadius(),
-                child: GestureDetector(
-                    onTap: widget.onTap,
-                    onLongPress: widget.onLongPress,
-                    child: Stack(
-                      children: [
-                        _buildBackgroundContainer(),
-                        _buildButtonActiveContainer(progressWidth),
-                        if (widget.showLabel) _buildButtonLabel(maxWidth),
-                      ],
-                    )),
-              );
-            });
-      },
-    );
-  }
-
-  Widget _buildButtonActiveContainer(double progressWidth) {
-    return Container(
-      height: widget.strokeWidth,
-      width: progressWidth,
-      decoration: BoxDecoration(
-        gradient: LinearGradient(
-          colors: [widget.backgroundColor, Colors.white.withOpacity(.4)],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildButtonLabel(double maxWidth) {
-    return Container(
-      height: widget.strokeWidth,
-      alignment: Alignment.center,
-      child: _buildLabelWidget(Colors.white),
-    );
-  }
-}
diff --git a/progress/linux/.gitignore b/progress/linux/.gitignore
deleted file mode 100644
index d3896c984..000000000
--- a/progress/linux/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-flutter/ephemeral
diff --git a/progress/linux/CMakeLists.txt b/progress/linux/CMakeLists.txt
deleted file mode 100644
index 0ec65865c..000000000
--- a/progress/linux/CMakeLists.txt
+++ /dev/null
@@ -1,139 +0,0 @@
-# Project-level configuration.
-cmake_minimum_required(VERSION 3.10)
-project(runner LANGUAGES CXX)
-
-# The name of the executable created for the application. Change this to change
-# the on-disk name of your application.
-set(BINARY_NAME "progress")
-# The unique GTK application identifier for this application. See:
-# https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "com.example.progress")
-
-# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
-# versions of CMake.
-cmake_policy(SET CMP0063 NEW)
-
-# Load bundled libraries from the lib/ directory relative to the binary.
-set(CMAKE_INSTALL_RPATH "$ORIGIN/lib")
-
-# Root filesystem for cross-building.
-if(FLUTTER_TARGET_PLATFORM_SYSROOT)
-  set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT})
-  set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
-  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-  set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endif()
-
-# Define build configuration options.
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  set(CMAKE_BUILD_TYPE "Debug" CACHE
-    STRING "Flutter build mode" FORCE)
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-    "Debug" "Profile" "Release")
-endif()
-
-# Compilation settings that should be applied to most targets.
-#
-# Be cautious about adding new options here, as plugins use this function by
-# default. In most cases, you should add new options to specific targets instead
-# of modifying this function.
-function(APPLY_STANDARD_SETTINGS TARGET)
-  target_compile_features(${TARGET} PUBLIC cxx_std_14)
-  target_compile_options(${TARGET} PRIVATE -Wall -Werror)
-  target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
-  target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
-endfunction()
-
-# Flutter library and tool build rules.
-set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
-add_subdirectory(${FLUTTER_MANAGED_DIR})
-
-# System-level dependencies.
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
-
-add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
-
-# Define the application target. To change its name, change BINARY_NAME above,
-# not the value here, or `flutter run` will no longer work.
-#
-# Any new source files that you add to the application should be added here.
-add_executable(${BINARY_NAME}
-  "main.cc"
-  "my_application.cc"
-  "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
-)
-
-# Apply the standard set of build settings. This can be removed for applications
-# that need different build settings.
-apply_standard_settings(${BINARY_NAME})
-
-# Add dependency libraries. Add any application-specific dependencies here.
-target_link_libraries(${BINARY_NAME} PRIVATE flutter)
-target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
-
-# Run the Flutter tool portions of the build. This must not be removed.
-add_dependencies(${BINARY_NAME} flutter_assemble)
-
-# Only the install-generated bundle's copy of the executable will launch
-# correctly, since the resources must in the right relative locations. To avoid
-# people trying to run the unbundled copy, put it in a subdirectory instead of
-# the default top-level location.
-set_target_properties(${BINARY_NAME}
-  PROPERTIES
-  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
-)
-
-
-# Generated plugin build rules, which manage building the plugins and adding
-# them to the application.
-include(flutter/generated_plugins.cmake)
-
-
-# === Installation ===
-# By default, "installing" just makes a relocatable bundle in the build
-# directory.
-set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle")
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
-endif()
-
-# Start with a clean build bundle directory every time.
-install(CODE "
-  file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\")
-  " COMPONENT Runtime)
-
-set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
-set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-
-install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
-  COMPONENT Runtime)
-
-install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
-  COMPONENT Runtime)
-
-install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-  COMPONENT Runtime)
-
-foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES})
-  install(FILES "${bundled_library}"
-    DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-    COMPONENT Runtime)
-endforeach(bundled_library)
-
-# Fully re-copy the assets directory on each build to avoid having stale files
-# from a previous install.
-set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
-install(CODE "
-  file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
-  " COMPONENT Runtime)
-install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
-  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
-
-# Install the AOT library on non-Debug builds only.
-if(NOT CMAKE_BUILD_TYPE MATCHES "Debug")
-  install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-    COMPONENT Runtime)
-endif()
diff --git a/progress/linux/flutter/CMakeLists.txt b/progress/linux/flutter/CMakeLists.txt
deleted file mode 100644
index d5bd01648..000000000
--- a/progress/linux/flutter/CMakeLists.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-# This file controls Flutter-level build steps. It should not be edited.
-cmake_minimum_required(VERSION 3.10)
-
-set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
-
-# Configuration provided via flutter tool.
-include(${EPHEMERAL_DIR}/generated_config.cmake)
-
-# TODO: Move the rest of this into files in ephemeral. See
-# https://github.com/flutter/flutter/issues/57146.
-
-# Serves the same purpose as list(TRANSFORM ... PREPEND ...),
-# which isn't available in 3.10.
-function(list_prepend LIST_NAME PREFIX)
-    set(NEW_LIST "")
-    foreach(element ${${LIST_NAME}})
-        list(APPEND NEW_LIST "${PREFIX}${element}")
-    endforeach(element)
-    set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE)
-endfunction()
-
-# === Flutter Library ===
-# System-level dependencies.
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
-pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
-pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
-
-set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
-
-# Published to parent scope for install step.
-set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE)
-set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE)
-set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE)
-set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE)
-
-list(APPEND FLUTTER_LIBRARY_HEADERS
-  "fl_basic_message_channel.h"
-  "fl_binary_codec.h"
-  "fl_binary_messenger.h"
-  "fl_dart_project.h"
-  "fl_engine.h"
-  "fl_json_message_codec.h"
-  "fl_json_method_codec.h"
-  "fl_message_codec.h"
-  "fl_method_call.h"
-  "fl_method_channel.h"
-  "fl_method_codec.h"
-  "fl_method_response.h"
-  "fl_plugin_registrar.h"
-  "fl_plugin_registry.h"
-  "fl_standard_message_codec.h"
-  "fl_standard_method_codec.h"
-  "fl_string_codec.h"
-  "fl_value.h"
-  "fl_view.h"
-  "flutter_linux.h"
-)
-list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/")
-add_library(flutter INTERFACE)
-target_include_directories(flutter INTERFACE
-  "${EPHEMERAL_DIR}"
-)
-target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}")
-target_link_libraries(flutter INTERFACE
-  PkgConfig::GTK
-  PkgConfig::GLIB
-  PkgConfig::GIO
-)
-add_dependencies(flutter flutter_assemble)
-
-# === Flutter tool backend ===
-# _phony_ is a non-existent file to force this command to run every time,
-# since currently there's no way to get a full input/output list from the
-# flutter tool.
-add_custom_command(
-  OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS}
-    ${CMAKE_CURRENT_BINARY_DIR}/_phony_
-  COMMAND ${CMAKE_COMMAND} -E env
-    ${FLUTTER_TOOL_ENVIRONMENT}
-    "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh"
-      ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE}
-  VERBATIM
-)
-add_custom_target(flutter_assemble DEPENDS
-  "${FLUTTER_LIBRARY}"
-  ${FLUTTER_LIBRARY_HEADERS}
-)
diff --git a/progress/linux/flutter/generated_plugin_registrant.cc b/progress/linux/flutter/generated_plugin_registrant.cc
deleted file mode 100644
index e71a16d23..000000000
--- a/progress/linux/flutter/generated_plugin_registrant.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-//  Generated file. Do not edit.
-//
-
-// clang-format off
-
-#include "generated_plugin_registrant.h"
-
-
-void fl_register_plugins(FlPluginRegistry* registry) {
-}
diff --git a/progress/linux/flutter/generated_plugin_registrant.h b/progress/linux/flutter/generated_plugin_registrant.h
deleted file mode 100644
index e0f0a47bc..000000000
--- a/progress/linux/flutter/generated_plugin_registrant.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  Generated file. Do not edit.
-//
-
-// clang-format off
-
-#ifndef GENERATED_PLUGIN_REGISTRANT_
-#define GENERATED_PLUGIN_REGISTRANT_
-
-#include <flutter_linux/flutter_linux.h>
-
-// Registers Flutter plugins.
-void fl_register_plugins(FlPluginRegistry* registry);
-
-#endif  // GENERATED_PLUGIN_REGISTRANT_
diff --git a/progress/linux/flutter/generated_plugins.cmake b/progress/linux/flutter/generated_plugins.cmake
deleted file mode 100644
index 2e1de87a7..000000000
--- a/progress/linux/flutter/generated_plugins.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Generated file, do not edit.
-#
-
-list(APPEND FLUTTER_PLUGIN_LIST
-)
-
-list(APPEND FLUTTER_FFI_PLUGIN_LIST
-)
-
-set(PLUGIN_BUNDLED_LIBRARIES)
-
-foreach(plugin ${FLUTTER_PLUGIN_LIST})
-  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin})
-  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
-  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
-  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
-endforeach(plugin)
-
-foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
-  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
-  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
-endforeach(ffi_plugin)
diff --git a/progress/linux/main.cc b/progress/linux/main.cc
deleted file mode 100644
index e7c5c5437..000000000
--- a/progress/linux/main.cc
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "my_application.h"
-
-int main(int argc, char** argv) {
-  g_autoptr(MyApplication) app = my_application_new();
-  return g_application_run(G_APPLICATION(app), argc, argv);
-}
diff --git a/progress/linux/my_application.cc b/progress/linux/my_application.cc
deleted file mode 100644
index dbbb6f9df..000000000
--- a/progress/linux/my_application.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-#include "my_application.h"
-
-#include <flutter_linux/flutter_linux.h>
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
-#endif
-
-#include "flutter/generated_plugin_registrant.h"
-
-struct _MyApplication {
-  GtkApplication parent_instance;
-  char** dart_entrypoint_arguments;
-};
-
-G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
-
-// Implements GApplication::activate.
-static void my_application_activate(GApplication* application) {
-  MyApplication* self = MY_APPLICATION(application);
-  GtkWindow* window =
-      GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
-
-  // Use a header bar when running in GNOME as this is the common style used
-  // by applications and is the setup most users will be using (e.g. Ubuntu
-  // desktop).
-  // If running on X and not using GNOME then just use a traditional title bar
-  // in case the window manager does more exotic layout, e.g. tiling.
-  // If running on Wayland assume the header bar will work (may need changing
-  // if future cases occur).
-  gboolean use_header_bar = TRUE;
-#ifdef GDK_WINDOWING_X11
-  GdkScreen* screen = gtk_window_get_screen(window);
-  if (GDK_IS_X11_SCREEN(screen)) {
-    const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
-    if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
-      use_header_bar = FALSE;
-    }
-  }
-#endif
-  if (use_header_bar) {
-    GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
-    gtk_widget_show(GTK_WIDGET(header_bar));
-    gtk_header_bar_set_title(header_bar, "progress");
-    gtk_header_bar_set_show_close_button(header_bar, TRUE);
-    gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
-  } else {
-    gtk_window_set_title(window, "progress");
-  }
-
-  gtk_window_set_default_size(window, 1280, 720);
-  gtk_widget_show(GTK_WIDGET(window));
-
-  g_autoptr(FlDartProject) project = fl_dart_project_new();
-  fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
-
-  FlView* view = fl_view_new(project);
-  gtk_widget_show(GTK_WIDGET(view));
-  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
-
-  fl_register_plugins(FL_PLUGIN_REGISTRY(view));
-
-  gtk_widget_grab_focus(GTK_WIDGET(view));
-}
-
-// Implements GApplication::local_command_line.
-static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
-  MyApplication* self = MY_APPLICATION(application);
-  // Strip out the first argument as it is the binary name.
-  self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
-
-  g_autoptr(GError) error = nullptr;
-  if (!g_application_register(application, nullptr, &error)) {
-     g_warning("Failed to register: %s", error->message);
-     *exit_status = 1;
-     return TRUE;
-  }
-
-  g_application_activate(application);
-  *exit_status = 0;
-
-  return TRUE;
-}
-
-// Implements GObject::dispose.
-static void my_application_dispose(GObject* object) {
-  MyApplication* self = MY_APPLICATION(object);
-  g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
-  G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
-}
-
-static void my_application_class_init(MyApplicationClass* klass) {
-  G_APPLICATION_CLASS(klass)->activate = my_application_activate;
-  G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
-  G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
-}
-
-static void my_application_init(MyApplication* self) {}
-
-MyApplication* my_application_new() {
-  return MY_APPLICATION(g_object_new(my_application_get_type(),
-                                     "application-id", APPLICATION_ID,
-                                     "flags", G_APPLICATION_NON_UNIQUE,
-                                     nullptr));
-}
diff --git a/progress/linux/my_application.h b/progress/linux/my_application.h
deleted file mode 100644
index 72271d5e4..000000000
--- a/progress/linux/my_application.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef FLUTTER_MY_APPLICATION_H_
-#define FLUTTER_MY_APPLICATION_H_
-
-#include <gtk/gtk.h>
-
-G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION,
-                     GtkApplication)
-
-/**
- * my_application_new:
- *
- * Creates a new Flutter-based application.
- *
- * Returns: a new #MyApplication.
- */
-MyApplication* my_application_new();
-
-#endif  // FLUTTER_MY_APPLICATION_H_
diff --git a/progress/macos/.gitignore b/progress/macos/.gitignore
deleted file mode 100644
index 746adbb6b..000000000
--- a/progress/macos/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-# Flutter-related
-**/Flutter/ephemeral/
-**/Pods/
-
-# Xcode-related
-**/dgph
-**/xcuserdata/
diff --git a/progress/macos/Flutter/Flutter-Debug.xcconfig b/progress/macos/Flutter/Flutter-Debug.xcconfig
deleted file mode 100644
index c2efd0b60..000000000
--- a/progress/macos/Flutter/Flutter-Debug.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-#include "ephemeral/Flutter-Generated.xcconfig"
diff --git a/progress/macos/Flutter/Flutter-Release.xcconfig b/progress/macos/Flutter/Flutter-Release.xcconfig
deleted file mode 100644
index c2efd0b60..000000000
--- a/progress/macos/Flutter/Flutter-Release.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-#include "ephemeral/Flutter-Generated.xcconfig"
diff --git a/progress/macos/Flutter/GeneratedPluginRegistrant.swift b/progress/macos/Flutter/GeneratedPluginRegistrant.swift
deleted file mode 100644
index cccf817a5..000000000
--- a/progress/macos/Flutter/GeneratedPluginRegistrant.swift
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-//  Generated file. Do not edit.
-//
-
-import FlutterMacOS
-import Foundation
-
-
-func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-}
diff --git a/progress/macos/Runner.xcodeproj/project.pbxproj b/progress/macos/Runner.xcodeproj/project.pbxproj
deleted file mode 100644
index 4aadc4aca..000000000
--- a/progress/macos/Runner.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,695 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 54;
-	objects = {
-
-/* Begin PBXAggregateTarget section */
-		33CC111A2044C6BA0003C045 /* Flutter Assemble */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */;
-			buildPhases = (
-				33CC111E2044C6BF0003C045 /* ShellScript */,
-			);
-			dependencies = (
-			);
-			name = "Flutter Assemble";
-			productName = FLX;
-		};
-/* End PBXAggregateTarget section */
-
-/* Begin PBXBuildFile section */
-		331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; };
-		335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
-		33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
-		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
-		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
-		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 33CC10E52044A3C60003C045 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 33CC10EC2044A3C60003C045;
-			remoteInfo = Runner;
-		};
-		33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 33CC10E52044A3C60003C045 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 33CC111A2044C6BA0003C045;
-			remoteInfo = FLX;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		33CC110E2044A8840003C045 /* Bundle Framework */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-			);
-			name = "Bundle Framework";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
-		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
-		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
-		33CC10ED2044A3C60003C045 /* progress.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "progress.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
-		33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
-		33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = "<group>"; };
-		33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = "<group>"; };
-		33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = "<group>"; };
-		33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = "<group>"; };
-		33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = "<group>"; };
-		33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
-		33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
-		33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
-		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
-		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		331C80D2294CF70F00263BE5 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		33CC10EA2044A3C60003C045 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		331C80D6294CF71000263BE5 /* RunnerTests */ = {
-			isa = PBXGroup;
-			children = (
-				331C80D7294CF71000263BE5 /* RunnerTests.swift */,
-			);
-			path = RunnerTests;
-			sourceTree = "<group>";
-		};
-		33BA886A226E78AF003329D5 /* Configs */ = {
-			isa = PBXGroup;
-			children = (
-				33E5194F232828860026EE4D /* AppInfo.xcconfig */,
-				9740EEB21CF90195004384FC /* Debug.xcconfig */,
-				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
-				333000ED22D3DE5D00554162 /* Warnings.xcconfig */,
-			);
-			path = Configs;
-			sourceTree = "<group>";
-		};
-		33CC10E42044A3C60003C045 = {
-			isa = PBXGroup;
-			children = (
-				33FAB671232836740065AC1E /* Runner */,
-				33CEB47122A05771004F2AC0 /* Flutter */,
-				331C80D6294CF71000263BE5 /* RunnerTests */,
-				33CC10EE2044A3C60003C045 /* Products */,
-				D73912EC22F37F3D000D13A0 /* Frameworks */,
-			);
-			sourceTree = "<group>";
-		};
-		33CC10EE2044A3C60003C045 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				33CC10ED2044A3C60003C045 /* progress.app */,
-				331C80D5294CF71000263BE5 /* RunnerTests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		33CC11242044D66E0003C045 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				33CC10F22044A3C60003C045 /* Assets.xcassets */,
-				33CC10F42044A3C60003C045 /* MainMenu.xib */,
-				33CC10F72044A3C60003C045 /* Info.plist */,
-			);
-			name = Resources;
-			path = ..;
-			sourceTree = "<group>";
-		};
-		33CEB47122A05771004F2AC0 /* Flutter */ = {
-			isa = PBXGroup;
-			children = (
-				335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */,
-				33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */,
-				33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */,
-				33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */,
-			);
-			path = Flutter;
-			sourceTree = "<group>";
-		};
-		33FAB671232836740065AC1E /* Runner */ = {
-			isa = PBXGroup;
-			children = (
-				33CC10F02044A3C60003C045 /* AppDelegate.swift */,
-				33CC11122044BFA00003C045 /* MainFlutterWindow.swift */,
-				33E51913231747F40026EE4D /* DebugProfile.entitlements */,
-				33E51914231749380026EE4D /* Release.entitlements */,
-				33CC11242044D66E0003C045 /* Resources */,
-				33BA886A226E78AF003329D5 /* Configs */,
-			);
-			path = Runner;
-			sourceTree = "<group>";
-		};
-		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		331C80D4294CF70F00263BE5 /* RunnerTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
-			buildPhases = (
-				331C80D1294CF70F00263BE5 /* Sources */,
-				331C80D2294CF70F00263BE5 /* Frameworks */,
-				331C80D3294CF70F00263BE5 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				331C80DA294CF71000263BE5 /* PBXTargetDependency */,
-			);
-			name = RunnerTests;
-			productName = RunnerTests;
-			productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-		33CC10EC2044A3C60003C045 /* Runner */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
-			buildPhases = (
-				33CC10E92044A3C60003C045 /* Sources */,
-				33CC10EA2044A3C60003C045 /* Frameworks */,
-				33CC10EB2044A3C60003C045 /* Resources */,
-				33CC110E2044A8840003C045 /* Bundle Framework */,
-				3399D490228B24CF009A79C7 /* ShellScript */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				33CC11202044C79F0003C045 /* PBXTargetDependency */,
-			);
-			name = Runner;
-			productName = Runner;
-			productReference = 33CC10ED2044A3C60003C045 /* progress.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		33CC10E52044A3C60003C045 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1430;
-				ORGANIZATIONNAME = "";
-				TargetAttributes = {
-					331C80D4294CF70F00263BE5 = {
-						CreatedOnToolsVersion = 14.0;
-						TestTargetID = 33CC10EC2044A3C60003C045;
-					};
-					33CC10EC2044A3C60003C045 = {
-						CreatedOnToolsVersion = 9.2;
-						LastSwiftMigration = 1100;
-						ProvisioningStyle = Automatic;
-						SystemCapabilities = {
-							com.apple.Sandbox = {
-								enabled = 1;
-							};
-						};
-					};
-					33CC111A2044C6BA0003C045 = {
-						CreatedOnToolsVersion = 9.2;
-						ProvisioningStyle = Manual;
-					};
-				};
-			};
-			buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */;
-			compatibilityVersion = "Xcode 9.3";
-			developmentRegion = en;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 33CC10E42044A3C60003C045;
-			productRefGroup = 33CC10EE2044A3C60003C045 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				33CC10EC2044A3C60003C045 /* Runner */,
-				331C80D4294CF70F00263BE5 /* RunnerTests */,
-				33CC111A2044C6BA0003C045 /* Flutter Assemble */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		331C80D3294CF70F00263BE5 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		33CC10EB2044A3C60003C045 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */,
-				33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		3399D490228B24CF009A79C7 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n";
-		};
-		33CC111E2044C6BF0003C045 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				Flutter/ephemeral/FlutterInputs.xcfilelist,
-			);
-			inputPaths = (
-				Flutter/ephemeral/tripwire,
-			);
-			outputFileListPaths = (
-				Flutter/ephemeral/FlutterOutputs.xcfilelist,
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		331C80D1294CF70F00263BE5 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		33CC10E92044A3C60003C045 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */,
-				33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */,
-				335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		331C80DA294CF71000263BE5 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 33CC10EC2044A3C60003C045 /* Runner */;
-			targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */;
-		};
-		33CC11202044C79F0003C045 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */;
-			targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		33CC10F42044A3C60003C045 /* MainMenu.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				33CC10F52044A3C60003C045 /* Base */,
-			);
-			name = MainMenu.xib;
-			path = Runner;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		331C80DB294CF71000263BE5 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/progress.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/progress";
-			};
-			name = Debug;
-		};
-		331C80DC294CF71000263BE5 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/progress.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/progress";
-			};
-			name = Release;
-		};
-		331C80DD294CF71000263BE5 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.progress.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/progress.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/progress";
-			};
-			name = Profile;
-		};
-		338D0CE9231458BD00FA5F75 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CODE_SIGN_IDENTITY = "-";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = macosx;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
-			};
-			name = Profile;
-		};
-		338D0CEA231458BD00FA5F75 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
-				CODE_SIGN_STYLE = Automatic;
-				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/../Frameworks",
-				);
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 5.0;
-			};
-			name = Profile;
-		};
-		338D0CEB231458BD00FA5F75 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Manual;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Profile;
-		};
-		33CC10F92044A3C60003C045 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CODE_SIGN_IDENTITY = "-";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-			};
-			name = Debug;
-		};
-		33CC10FA2044A3C60003C045 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CODE_SIGN_IDENTITY = "-";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = macosx;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
-			};
-			name = Release;
-		};
-		33CC10FC2044A3C60003C045 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
-				CODE_SIGN_STYLE = Automatic;
-				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/../Frameworks",
-				);
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-			};
-			name = Debug;
-		};
-		33CC10FD2044A3C60003C045 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
-				CODE_SIGN_STYLE = Automatic;
-				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/../Frameworks",
-				);
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 5.0;
-			};
-			name = Release;
-		};
-		33CC111C2044C6BA0003C045 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Manual;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		33CC111D2044C6BA0003C045 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				331C80DB294CF71000263BE5 /* Debug */,
-				331C80DC294CF71000263BE5 /* Release */,
-				331C80DD294CF71000263BE5 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				33CC10F92044A3C60003C045 /* Debug */,
-				33CC10FA2044A3C60003C045 /* Release */,
-				338D0CE9231458BD00FA5F75 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				33CC10FC2044A3C60003C045 /* Debug */,
-				33CC10FD2044A3C60003C045 /* Release */,
-				338D0CEA231458BD00FA5F75 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				33CC111C2044C6BA0003C045 /* Debug */,
-				33CC111D2044C6BA0003C045 /* Release */,
-				338D0CEB231458BD00FA5F75 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 33CC10E52044A3C60003C045 /* Project object */;
-}
diff --git a/progress/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/progress/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d981003..000000000
--- a/progress/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/progress/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/progress/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
deleted file mode 100644
index 5cbe3b8d3..000000000
--- a/progress/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1430"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-               BuildableName = "progress.app"
-               BlueprintName = "Runner"
-               ReferencedContainer = "container:Runner.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "progress.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <Testables>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "331C80D4294CF70F00263BE5"
-               BuildableName = "RunnerTests.xctest"
-               BlueprintName = "RunnerTests"
-               ReferencedContainer = "container:Runner.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "progress.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Profile"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "progress.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/progress/macos/Runner.xcworkspace/contents.xcworkspacedata b/progress/macos/Runner.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 1d526a16e..000000000
--- a/progress/macos/Runner.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:Runner.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/progress/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/progress/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d981003..000000000
--- a/progress/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/progress/macos/Runner/AppDelegate.swift b/progress/macos/Runner/AppDelegate.swift
deleted file mode 100644
index d53ef6437..000000000
--- a/progress/macos/Runner/AppDelegate.swift
+++ /dev/null
@@ -1,9 +0,0 @@
-import Cocoa
-import FlutterMacOS
-
-@NSApplicationMain
-class AppDelegate: FlutterAppDelegate {
-  override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
-    return true
-  }
-}
diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index a2ec33f19..000000000
--- a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "images" : [
-    {
-      "size" : "16x16",
-      "idiom" : "mac",
-      "filename" : "app_icon_16.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "16x16",
-      "idiom" : "mac",
-      "filename" : "app_icon_32.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "32x32",
-      "idiom" : "mac",
-      "filename" : "app_icon_32.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "32x32",
-      "idiom" : "mac",
-      "filename" : "app_icon_64.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "128x128",
-      "idiom" : "mac",
-      "filename" : "app_icon_128.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "128x128",
-      "idiom" : "mac",
-      "filename" : "app_icon_256.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "256x256",
-      "idiom" : "mac",
-      "filename" : "app_icon_256.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "256x256",
-      "idiom" : "mac",
-      "filename" : "app_icon_512.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "512x512",
-      "idiom" : "mac",
-      "filename" : "app_icon_512.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "512x512",
-      "idiom" : "mac",
-      "filename" : "app_icon_1024.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
deleted file mode 100644
index 82b6f9d9a33e198f5747104729e1fcef999772a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 102994
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
Pe7HEdAEg|=c=LY&YVNkY

diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
deleted file mode 100644
index 13b35eba55c6dabc3aac36f33d859266c18fa0d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5680
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

diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
deleted file mode 100644
index 0a3f5fa40fb3d1e0710331a48de5d256da3f275d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 520
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K#jR^;j87-Auq
zoUlN^K<V}W|Nr-^PFT-<B<I8<k2moS-$dQqjwO2}38)2pwoy<M({V6lSaDit{<(Sw
zPXRaPYYNUY7O1^kFoWZ1&9ATX7d}2E-*#lOy=2(EzuoIt*085BSnql>{r-Q+XN;zI
ze|?*NFmgt#V#GwrSWaz^2G&@SBmck6ZcIFMww~vE<1E?M2#KUn1CzsB6D2<IW)xrk
zTF<k-{!d~7Q&wNdv9*#ZTy2c$asSgRzRIqUe32s`sn+(h{GXA{&u{&Xv->+0SuRV@
zV2kK5HvIGB{HX-hQzs0*AB%5$9RJ@a;)Ahq#p$GSP91^&hi#6sg*;a~dt}4AclK>h
z_3MoPRQ{i;==;*1S-mY<(JFzhAxMI&<61&m$J0NDHdJ3tYx~j0%M-u<zsp4Sq6Wua
z5BBhjsWTfpZEpHBEIjPnnRxiIKToJ|*&=PntIR&BpDzYU*}YSmk@;dK=M)=9O`bU(
o30)I1CTw2MWPDjr#qiV&hQFoXIy#f5hk;_j)78&qol`;+052KE`v3p{

diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
deleted file mode 100644
index bdb57226d5f2bd20f11934f4903f16459cf52379..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14142
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
K%C(A?AO9DJ-0fok

diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
deleted file mode 100644
index f083318e09ca1b6b8484b1694a149f0c5d5cac1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1066
zcmV+_1l9YAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91AfN*P1ONa40RR91AOHXW0IY^$^8f$?lu1NER9Fe^SItioK@|V(ZWmgL
zZT;XwPgVuWM>O%^|Dc$VK;n&?9!&g5)aVsG8cjs5UbtxVVnQNOV~7Mrg3+jnU;rhE
z6fhW6P)R>_eXrXo-RW*y6RQ_qc<j#1d-MCvdv9j8z=r(i2q<p&rfD9eu@2G*X@FEG
z6~cb9uStEZLK5`yo%9{)UDA7sqGXR#mxB;+fV7|VZ_5LkFz5hj?;@j8fQ!XEq!(M{
zYz-RZu=m?3<!>b^s1wTu$TwriZ`=JUws>vRi}5x}MW1MR#7p|gIWJlaLK;~xaN}b<
z<-@=RX-%1mt`^O0o^~2=CD7pJ<<$Rp-oUL-7PuG>do^5W_Mk#unlP}6I@6NPxY`Q}
zuXJF}!0l)vwPNAW;@5DjPRj?*rZx<jK$)1#?a4VGrm!=3lJYK6-%z3AD1isd9rK<&
zotoW{3D^d+4f&nH7`%5jZrktykBXBK9scZ-LUvwn+Zf6O*3BH=2BOx=IRz|CDC|>l
zwn;A(cFV!xe^CUu+6SrN?xe#mz?&%N9QHf~=KyK%DoB8HKC)=w=3E?1Bqj9RMJs3U
z5am3Uv`@+{jgqO^f}Lx_Jp~CoP3N4AMZr~4&d)T`R?`(M{W5WWJV^z~2B|-oih@h^
zD#DuzGbl(P5>()u*YGo*Och=oRr~3P1wOlKqI)udc$|)(bacG5>~p(y>?{JD7nQf_
z*`T^YL06-O>T(s$bi5v~_fWMfnE7Vn%2*tqV|?~m;wSJEVGkNMD>+xCu#um(7}0so
zSEu7?_=Q64Q5D+fz~T=Rr=G_!L*P|(-iOK*@X8r{-?oBlnxMNNgCVCN9Y~ocu+?XA
zjjovJ9F1W$Nf!{AEv%W~8oahwM}4Ruc+SLs>_I_*uBxdcn1gQ^2F8a*vGjgAXYyh?
zWCE@c5R=tbD(F4nL9<VTK~ebn>NS?$PN1V_2*WR?gjv3)4MQeizuH`;sqrhgykEzj
z593&TGlm3h`sIXy_U<7(dpRXGgp0TB{>s?}D{fwLe>IV~exweOfH!qM@CV5kib!YA
z6O0gvJi_0J8IdEvyP#;PtqP*=;$iI2t(xG2YI-e!)~kaUn~b{6<BmbAI7C`%X>(&n
zp)?iJ`z2)Xh%sCV@BkU`XL%_|FnCA?cVv@h*-FOZhY5erbG<m)%ac-@w;CT4TyWxt
kNncSvOvqtF{%Hh$1H=*W-r{pWaR2}S07*qoM6N<$g8Wt7Y5)KL

diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
deleted file mode 100644
index 326c0e72c9d820600887813b3b98d0dd69c5d4e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36406
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

diff --git a/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/progress/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
deleted file mode 100644
index 2f1632cfddf3d9dade342351e627a0a75609fb46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2218
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

diff --git a/progress/macos/Runner/Base.lproj/MainMenu.xib b/progress/macos/Runner/Base.lproj/MainMenu.xib
deleted file mode 100644
index 80e867a4e..000000000
--- a/progress/macos/Runner/Base.lproj/MainMenu.xib
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
-            <connections>
-                <outlet property="delegate" destination="Voe-Tx-rLC" id="GzC-gU-4Uq"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Runner" customModuleProvider="target">
-            <connections>
-                <outlet property="applicationMenu" destination="uQy-DD-JDr" id="XBo-yE-nKs"/>
-                <outlet property="mainFlutterWindow" destination="QvC-M9-y7g" id="gIp-Ho-8D9"/>
-            </connections>
-        </customObject>
-        <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
-        <menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
-            <items>
-                <menuItem title="APP_NAME" id="1Xt-HY-uBw">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="APP_NAME" systemMenu="apple" id="uQy-DD-JDr">
-                        <items>
-                            <menuItem title="About APP_NAME" id="5kV-Vb-QxS">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
-                            <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
-                            <menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
-                            <menuItem title="Services" id="NMo-om-nkz">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
-                            <menuItem title="Hide APP_NAME" keyEquivalent="h" id="Olw-nP-bQN">
-                                <connections>
-                                    <action selector="hide:" target="-1" id="PnN-Uc-m68"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
-                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="hideOtherApplications:" target="-1" id="VT4-aY-XCT"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Show All" id="Kd2-mp-pUS">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="unhideAllApplications:" target="-1" id="Dhg-Le-xox"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
-                            <menuItem title="Quit APP_NAME" keyEquivalent="q" id="4sb-4s-VLi">
-                                <connections>
-                                    <action selector="terminate:" target="-1" id="Te7-pn-YzF"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="Edit" id="5QF-Oa-p0T">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Edit" id="W48-6f-4Dl">
-                        <items>
-                            <menuItem title="Undo" keyEquivalent="z" id="dRJ-4n-Yzg">
-                                <connections>
-                                    <action selector="undo:" target="-1" id="M6e-cu-g7V"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Redo" keyEquivalent="Z" id="6dh-zS-Vam">
-                                <connections>
-                                    <action selector="redo:" target="-1" id="oIA-Rs-6OD"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="WRV-NI-Exz"/>
-                            <menuItem title="Cut" keyEquivalent="x" id="uRl-iY-unG">
-                                <connections>
-                                    <action selector="cut:" target="-1" id="YJe-68-I9s"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Copy" keyEquivalent="c" id="x3v-GG-iWU">
-                                <connections>
-                                    <action selector="copy:" target="-1" id="G1f-GL-Joy"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Paste" keyEquivalent="v" id="gVA-U4-sdL">
-                                <connections>
-                                    <action selector="paste:" target="-1" id="UvS-8e-Qdg"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Paste and Match Style" keyEquivalent="V" id="WeT-3V-zwk">
-                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="pasteAsPlainText:" target="-1" id="cEh-KX-wJQ"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Delete" id="pa3-QI-u2k">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="delete:" target="-1" id="0Mk-Ml-PaM"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m">
-                                <connections>
-                                    <action selector="selectAll:" target="-1" id="VNm-Mi-diN"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="uyl-h8-XO2"/>
-                            <menuItem title="Find" id="4EN-yA-p0u">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Find" id="1b7-l0-nxx">
-                                    <items>
-                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="cD7-Qs-BN4"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz">
-                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="WD3-Gg-5AJ"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="NDo-RZ-v9R"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="OwM-mh-QMV">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="HOh-sY-3ay"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="U76-nv-p5D"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="S0p-oC-mLd">
-                                            <connections>
-                                                <action selector="centerSelectionInVisibleArea:" target="-1" id="IOG-6D-g5B"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Spelling and Grammar" id="Dv1-io-Yv7">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Spelling" id="3IN-sU-3Bg">
-                                    <items>
-                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="HFo-cy-zxI">
-                                            <connections>
-                                                <action selector="showGuessPanel:" target="-1" id="vFj-Ks-hy3"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Document Now" keyEquivalent=";" id="hz2-CU-CR7">
-                                            <connections>
-                                                <action selector="checkSpelling:" target="-1" id="fz7-VC-reM"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="bNw-od-mp5"/>
-                                        <menuItem title="Check Spelling While Typing" id="rbD-Rh-wIN">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleContinuousSpellChecking:" target="-1" id="7w6-Qz-0kB"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Grammar With Spelling" id="mK6-2p-4JG">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleGrammarChecking:" target="-1" id="muD-Qn-j4w"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Correct Spelling Automatically" id="78Y-hA-62v">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticSpellingCorrection:" target="-1" id="2lM-Qi-WAP"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Substitutions" id="9ic-FL-obx">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Substitutions" id="FeM-D8-WVr">
-                                    <items>
-                                        <menuItem title="Show Substitutions" id="z6F-FW-3nz">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="orderFrontSubstitutionsPanel:" target="-1" id="oku-mr-iSq"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="gPx-C9-uUO"/>
-                                        <menuItem title="Smart Copy/Paste" id="9yt-4B-nSM">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleSmartInsertDelete:" target="-1" id="3IJ-Se-DZD"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smart Quotes" id="hQb-2v-fYv">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="ptq-xd-QOA"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smart Dashes" id="rgM-f4-ycn">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticDashSubstitution:" target="-1" id="oCt-pO-9gS"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smart Links" id="cwL-P1-jid">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticLinkDetection:" target="-1" id="Gip-E3-Fov"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Data Detectors" id="tRr-pd-1PS">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticDataDetection:" target="-1" id="R1I-Nq-Kbl"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Text Replacement" id="HFQ-gK-NFA">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticTextReplacement:" target="-1" id="DvP-Fe-Py6"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Transformations" id="2oI-Rn-ZJC">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Transformations" id="c8a-y6-VQd">
-                                    <items>
-                                        <menuItem title="Make Upper Case" id="vmV-6d-7jI">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="uppercaseWord:" target="-1" id="sPh-Tk-edu"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Make Lower Case" id="d9M-CD-aMd">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="lowercaseWord:" target="-1" id="iUZ-b5-hil"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Capitalize" id="UEZ-Bs-lqG">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="capitalizeWord:" target="-1" id="26H-TL-nsh"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Speech" id="xrE-MZ-jX0">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Speech" id="3rS-ZA-NoH">
-                                    <items>
-                                        <menuItem title="Start Speaking" id="Ynk-f8-cLZ">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="startSpeaking:" target="-1" id="654-Ng-kyl"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Stop Speaking" id="Oyz-dy-DGm">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="stopSpeaking:" target="-1" id="dX8-6p-jy9"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="View" id="H8h-7b-M4v">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="View" id="HyV-fh-RgO">
-                        <items>
-                            <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
-                                <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                <connections>
-                                    <action selector="toggleFullScreen:" target="-1" id="dU3-MA-1Rq"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="Window" id="aUF-d1-5bR">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo">
-                        <items>
-                            <menuItem title="Minimize" keyEquivalent="m" id="OY7-WF-poV">
-                                <connections>
-                                    <action selector="performMiniaturize:" target="-1" id="VwT-WD-YPe"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Zoom" id="R4o-n2-Eq4">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="performZoom:" target="-1" id="DIl-cC-cCs"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="eu3-7i-yIM"/>
-                            <menuItem title="Bring All to Front" id="LE2-aR-0XJ">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="arrangeInFront:" target="-1" id="DRN-fu-gQh"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="Help" id="EPT-qC-fAb">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Help" systemMenu="help" id="rJ0-wn-3NY"/>
-                </menuItem>
-            </items>
-            <point key="canvasLocation" x="142" y="-258"/>
-        </menu>
-        <window title="APP_NAME" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="MainFlutterWindow" customModule="Runner" customModuleProvider="target">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
-            <rect key="contentRect" x="335" y="390" width="800" height="600"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1577"/>
-            <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
-                <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
-                <autoresizingMask key="autoresizingMask"/>
-            </view>
-        </window>
-    </objects>
-</document>
diff --git a/progress/macos/Runner/Configs/AppInfo.xcconfig b/progress/macos/Runner/Configs/AppInfo.xcconfig
deleted file mode 100644
index 4aa254221..000000000
--- a/progress/macos/Runner/Configs/AppInfo.xcconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-// Application-level settings for the Runner target.
-//
-// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the
-// future. If not, the values below would default to using the project name when this becomes a
-// 'flutter create' template.
-
-// The application's name. By default this is also the title of the Flutter window.
-PRODUCT_NAME = progress
-
-// The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.example.progress
-
-// The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved.
diff --git a/progress/macos/Runner/Configs/Debug.xcconfig b/progress/macos/Runner/Configs/Debug.xcconfig
deleted file mode 100644
index 36b0fd946..000000000
--- a/progress/macos/Runner/Configs/Debug.xcconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "../../Flutter/Flutter-Debug.xcconfig"
-#include "Warnings.xcconfig"
diff --git a/progress/macos/Runner/Configs/Release.xcconfig b/progress/macos/Runner/Configs/Release.xcconfig
deleted file mode 100644
index dff4f4956..000000000
--- a/progress/macos/Runner/Configs/Release.xcconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "../../Flutter/Flutter-Release.xcconfig"
-#include "Warnings.xcconfig"
diff --git a/progress/macos/Runner/Configs/Warnings.xcconfig b/progress/macos/Runner/Configs/Warnings.xcconfig
deleted file mode 100644
index 42bcbf478..000000000
--- a/progress/macos/Runner/Configs/Warnings.xcconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings
-GCC_WARN_UNDECLARED_SELECTOR = YES
-CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES
-CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE
-CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
-CLANG_WARN_PRAGMA_PACK = YES
-CLANG_WARN_STRICT_PROTOTYPES = YES
-CLANG_WARN_COMMA = YES
-GCC_WARN_STRICT_SELECTOR_MATCH = YES
-CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES
-CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES
-GCC_WARN_SHADOW = YES
-CLANG_WARN_UNREACHABLE_CODE = YES
diff --git a/progress/macos/Runner/DebugProfile.entitlements b/progress/macos/Runner/DebugProfile.entitlements
deleted file mode 100644
index dddb8a30c..000000000
--- a/progress/macos/Runner/DebugProfile.entitlements
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.app-sandbox</key>
-	<true/>
-	<key>com.apple.security.cs.allow-jit</key>
-	<true/>
-	<key>com.apple.security.network.server</key>
-	<true/>
-</dict>
-</plist>
diff --git a/progress/macos/Runner/Info.plist b/progress/macos/Runner/Info.plist
deleted file mode 100644
index 4789daa6a..000000000
--- a/progress/macos/Runner/Info.plist
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>$(PRODUCT_COPYRIGHT)</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>
diff --git a/progress/macos/Runner/MainFlutterWindow.swift b/progress/macos/Runner/MainFlutterWindow.swift
deleted file mode 100644
index 3cc05eb23..000000000
--- a/progress/macos/Runner/MainFlutterWindow.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-import Cocoa
-import FlutterMacOS
-
-class MainFlutterWindow: NSWindow {
-  override func awakeFromNib() {
-    let flutterViewController = FlutterViewController()
-    let windowFrame = self.frame
-    self.contentViewController = flutterViewController
-    self.setFrame(windowFrame, display: true)
-
-    RegisterGeneratedPlugins(registry: flutterViewController)
-
-    super.awakeFromNib()
-  }
-}
diff --git a/progress/macos/Runner/Release.entitlements b/progress/macos/Runner/Release.entitlements
deleted file mode 100644
index 852fa1a47..000000000
--- a/progress/macos/Runner/Release.entitlements
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.app-sandbox</key>
-	<true/>
-</dict>
-</plist>
diff --git a/progress/macos/RunnerTests/RunnerTests.swift b/progress/macos/RunnerTests/RunnerTests.swift
deleted file mode 100644
index 5418c9f53..000000000
--- a/progress/macos/RunnerTests/RunnerTests.swift
+++ /dev/null
@@ -1,12 +0,0 @@
-import FlutterMacOS
-import Cocoa
-import XCTest
-
-class RunnerTests: XCTestCase {
-
-  func testExample() {
-    // If you add code to the Runner application, consider adding tests here.
-    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
-  }
-
-}
diff --git a/progress/pubspec.lock b/progress/pubspec.lock
deleted file mode 100644
index b4509f290..000000000
--- a/progress/pubspec.lock
+++ /dev/null
@@ -1,221 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.11.0"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.17.2"
-  cupertino_icons:
-    dependency: "direct main"
-    description:
-      name: cupertino_icons
-      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.6"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.1"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_easyrefresh:
-    dependency: transitive
-    description:
-      name: flutter_easyrefresh
-      sha256: "5d161ee5dcac34da9065116568147d742dd25fb9bff3b10024d9054b195087ad"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.2"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.3"
-  flutter_slidable:
-    dependency: transitive
-    description:
-      name: flutter_slidable
-      sha256: "673403d2eeef1f9e8483bd6d8d92aae73b1d8bd71f382bc3930f699c731bc27c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0"
-  flutter_swiper_null_safety:
-    dependency: transitive
-    description:
-      name: flutter_swiper_null_safety
-      sha256: "5a855e0080d035c08e82f8b7fd2f106344943a30c9ab483b2584860a2f22eaaf"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
-  flutter_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.7"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.12.16"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.5.0"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.8.3"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.0"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.11.0"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
-  tdesign_flutter:
-    dependency: "direct main"
-    description:
-      name: tdesign_flutter
-      sha256: "3e60fab491f04546ca41c7e96033d1ad5d6bea975a7c356b0a47a9a40f4ded45"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.6"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.0"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-sdks:
-  dart: ">=3.1.0-163.1.beta <4.0.0"
-  flutter: ">=3.7.0"
diff --git a/progress/pubspec.yaml b/progress/pubspec.yaml
deleted file mode 100644
index fcc1d0794..000000000
--- a/progress/pubspec.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-name: progress
-description: A new Flutter project.
-# The following line prevents the package from being accidentally published to
-# pub.dev using `flutter pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion.
-# Read more about iOS versioning at
-# 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
-
-environment:
-  sdk: '>=3.1.0-163.1.beta <4.0.0'
-
-# Dependencies specify other packages that your package needs in order to work.
-# To automatically upgrade your package dependencies to the latest versions
-# consider running `flutter pub upgrade --major-versions`. Alternatively,
-# dependencies can be manually updated by changing the version numbers below to
-# the latest version available on pub.dev. To see which dependencies have newer
-# versions available, run `flutter pub outdated`.
-dependencies:
-  flutter:
-    sdk: flutter
-
-
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.2
-  tdesign_flutter: ^0.1.6
-
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
-  # The "flutter_lints" package below contains a set of recommended lints to
-  # encourage good coding practices. The lint set provided by the package is
-  # activated in the `analysis_options.yaml` file located at the root of your
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
-  flutter_lints: ^2.0.0
-
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter packages.
-flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
-  uses-material-design: true
-
-  # To add assets to your application, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/assets-and-images/#from-packages
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages
diff --git a/progress/test/widget_test.dart b/progress/test/widget_test.dart
deleted file mode 100644
index 9cd290de6..000000000
--- a/progress/test/widget_test.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility in the flutter_test package. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:progress/main.dart';
-
-void main() {
-  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(const MyApp());
-
-    // Verify that our counter starts at 0.
-    expect(find.text('0'), findsOneWidget);
-    expect(find.text('1'), findsNothing);
-
-    // Tap the '+' icon and trigger a frame.
-    await tester.tap(find.byIcon(Icons.add));
-    await tester.pump();
-
-    // Verify that our counter has incremented.
-    expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);
-  });
-}
diff --git a/progress/web/favicon.png b/progress/web/favicon.png
deleted file mode 100644
index 8aaa46ac1ae21512746f852a42ba87e4165dfdd1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 917
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7
zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2
zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l<c?^6clWVQqrt~T->1AfjnEK
zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o
z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo
zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8
zTYqUsf!gYFyJnXpu0!n&N*<mM6;!yDy;iI!?0xZxS-@9o){@>SYAX-%d(5<QWisP%
zpKxJ^!zO{CB{zx^b({)M+}nHh%-rj7^M&&ZcU$j%zjx;LVyDXoIuhq|8P;5s=KHG5
z<JUB4<A0$RmNJizixz(PY{v3_`K1HjE{oV$3+pLbhDf-dGF^GSkNIsaZ^^?aj@RFX
zmI#!cuT=hV*<Wg+koNS~T)(gK8EvWbJGDN%Cgswi@;rmS$PYP}{^d1_2Ol_C#PhDD
zFw$(<^hU$>gVjrHJWqXQshj@!<B9Fv+a9JEO;0$m^uEygb*U`#RIBf=|21JrRHoLF
zSVqsI&*oWt$jm+Fz?pMwCX>Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr
zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf
zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od
z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz
oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM

diff --git a/progress/web/icons/Icon-192.png b/progress/web/icons/Icon-192.png
deleted file mode 100644
index b749bfef07473333cf1dd31e9eed89862a5d52aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5292
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

diff --git a/progress/web/icons/Icon-512.png b/progress/web/icons/Icon-512.png
deleted file mode 100644
index 88cfd48dff1169879ba46840804b412fe02fefd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8252
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

diff --git a/progress/web/icons/Icon-maskable-192.png b/progress/web/icons/Icon-maskable-192.png
deleted file mode 100644
index eb9b4d76e525556d5d89141648c724331630325d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5594
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
X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z!

diff --git a/progress/web/icons/Icon-maskable-512.png b/progress/web/icons/Icon-maskable-512.png
deleted file mode 100644
index d69c56691fbdb0b7efa65097c7cc1edac12a6d3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20998
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
MPgg&ebxsLQ025IeI{*Lx

diff --git a/progress/web/index.html b/progress/web/index.html
deleted file mode 100644
index cebd06b99..000000000
--- a/progress/web/index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <!--
-    If you are serving your web app in a path other than the root, change the
-    href value below to reflect the base path you are serving from.
-
-    The path provided below has to start and end with a slash "/" in order for
-    it to work correctly.
-
-    For more details:
-    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
-
-    This is a placeholder for base href that will be replaced by the value of
-    the `--base-href` argument provided to `flutter build`.
-  -->
-  <base href="$FLUTTER_BASE_HREF">
-
-  <meta charset="UTF-8">
-  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
-  <meta name="description" content="A new Flutter project.">
-
-  <!-- iOS meta tags & icons -->
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="progress">
-  <link rel="apple-touch-icon" href="icons/Icon-192.png">
-
-  <!-- Favicon -->
-  <link rel="icon" type="image/png" href="favicon.png"/>
-
-  <title>progress</title>
-  <link rel="manifest" href="manifest.json">
-
-  <script>
-    // The value below is injected by flutter build, do not touch.
-    const serviceWorkerVersion = null;
-  </script>
-  <!-- This script adds the flutter initialization JS code -->
-  <script src="flutter.js" defer></script>
-</head>
-<body>
-  <script>
-    window.addEventListener('load', function(ev) {
-      // Download main.dart.js
-      _flutter.loader.loadEntrypoint({
-        serviceWorker: {
-          serviceWorkerVersion: serviceWorkerVersion,
-        },
-        onEntrypointLoaded: function(engineInitializer) {
-          engineInitializer.initializeEngine().then(function(appRunner) {
-            appRunner.runApp();
-          });
-        }
-      });
-    });
-  </script>
-</body>
-</html>
diff --git a/progress/web/manifest.json b/progress/web/manifest.json
deleted file mode 100644
index a53617ae2..000000000
--- a/progress/web/manifest.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "progress",
-    "short_name": "progress",
-    "start_url": ".",
-    "display": "standalone",
-    "background_color": "#0175C2",
-    "theme_color": "#0175C2",
-    "description": "A new Flutter project.",
-    "orientation": "portrait-primary",
-    "prefer_related_applications": false,
-    "icons": [
-        {
-            "src": "icons/Icon-192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "icons/Icon-512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        },
-        {
-            "src": "icons/Icon-maskable-192.png",
-            "sizes": "192x192",
-            "type": "image/png",
-            "purpose": "maskable"
-        },
-        {
-            "src": "icons/Icon-maskable-512.png",
-            "sizes": "512x512",
-            "type": "image/png",
-            "purpose": "maskable"
-        }
-    ]
-}
diff --git a/progress/windows/.gitignore b/progress/windows/.gitignore
deleted file mode 100644
index d492d0d98..000000000
--- a/progress/windows/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-flutter/ephemeral/
-
-# Visual Studio user-specific files.
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# Visual Studio build-related files.
-x64/
-x86/
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
diff --git a/progress/windows/CMakeLists.txt b/progress/windows/CMakeLists.txt
deleted file mode 100644
index 8ce309bf1..000000000
--- a/progress/windows/CMakeLists.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-# Project-level configuration.
-cmake_minimum_required(VERSION 3.14)
-project(progress LANGUAGES CXX)
-
-# The name of the executable created for the application. Change this to change
-# the on-disk name of your application.
-set(BINARY_NAME "progress")
-
-# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
-# versions of CMake.
-cmake_policy(VERSION 3.14...3.25)
-
-# Define build configuration option.
-get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-if(IS_MULTICONFIG)
-  set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release"
-    CACHE STRING "" FORCE)
-else()
-  if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    set(CMAKE_BUILD_TYPE "Debug" CACHE
-      STRING "Flutter build mode" FORCE)
-    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-      "Debug" "Profile" "Release")
-  endif()
-endif()
-# Define settings for the Profile build mode.
-set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
-set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
-set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}")
-set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}")
-
-# Use Unicode for all projects.
-add_definitions(-DUNICODE -D_UNICODE)
-
-# Compilation settings that should be applied to most targets.
-#
-# Be cautious about adding new options here, as plugins use this function by
-# default. In most cases, you should add new options to specific targets instead
-# of modifying this function.
-function(APPLY_STANDARD_SETTINGS TARGET)
-  target_compile_features(${TARGET} PUBLIC cxx_std_17)
-  target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100")
-  target_compile_options(${TARGET} PRIVATE /EHsc)
-  target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0")
-  target_compile_definitions(${TARGET} PRIVATE "$<$<CONFIG:Debug>:_DEBUG>")
-endfunction()
-
-# Flutter library and tool build rules.
-set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
-add_subdirectory(${FLUTTER_MANAGED_DIR})
-
-# Application build; see runner/CMakeLists.txt.
-add_subdirectory("runner")
-
-
-# Generated plugin build rules, which manage building the plugins and adding
-# them to the application.
-include(flutter/generated_plugins.cmake)
-
-
-# === Installation ===
-# Support files are copied into place next to the executable, so that it can
-# run in place. This is done instead of making a separate bundle (as on Linux)
-# so that building and running from within Visual Studio will work.
-set(BUILD_BUNDLE_DIR "$<TARGET_FILE_DIR:${BINARY_NAME}>")
-# Make the "install" step default, as it's required to run.
-set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1)
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
-endif()
-
-set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
-set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}")
-
-install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
-  COMPONENT Runtime)
-
-install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
-  COMPONENT Runtime)
-
-install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-  COMPONENT Runtime)
-
-if(PLUGIN_BUNDLED_LIBRARIES)
-  install(FILES "${PLUGIN_BUNDLED_LIBRARIES}"
-    DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-    COMPONENT Runtime)
-endif()
-
-# Fully re-copy the assets directory on each build to avoid having stale files
-# from a previous install.
-set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
-install(CODE "
-  file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
-  " COMPONENT Runtime)
-install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
-  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
-
-# Install the AOT library on non-Debug builds only.
-install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
-  CONFIGURATIONS Profile;Release
-  COMPONENT Runtime)
diff --git a/progress/windows/flutter/CMakeLists.txt b/progress/windows/flutter/CMakeLists.txt
deleted file mode 100644
index 930d2071a..000000000
--- a/progress/windows/flutter/CMakeLists.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-# This file controls Flutter-level build steps. It should not be edited.
-cmake_minimum_required(VERSION 3.14)
-
-set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
-
-# Configuration provided via flutter tool.
-include(${EPHEMERAL_DIR}/generated_config.cmake)
-
-# TODO: Move the rest of this into files in ephemeral. See
-# https://github.com/flutter/flutter/issues/57146.
-set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")
-
-# === Flutter Library ===
-set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")
-
-# Published to parent scope for install step.
-set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE)
-set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE)
-set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE)
-set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE)
-
-list(APPEND FLUTTER_LIBRARY_HEADERS
-  "flutter_export.h"
-  "flutter_windows.h"
-  "flutter_messenger.h"
-  "flutter_plugin_registrar.h"
-  "flutter_texture_registrar.h"
-)
-list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/")
-add_library(flutter INTERFACE)
-target_include_directories(flutter INTERFACE
-  "${EPHEMERAL_DIR}"
-)
-target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib")
-add_dependencies(flutter flutter_assemble)
-
-# === Wrapper ===
-list(APPEND CPP_WRAPPER_SOURCES_CORE
-  "core_implementations.cc"
-  "standard_codec.cc"
-)
-list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/")
-list(APPEND CPP_WRAPPER_SOURCES_PLUGIN
-  "plugin_registrar.cc"
-)
-list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/")
-list(APPEND CPP_WRAPPER_SOURCES_APP
-  "flutter_engine.cc"
-  "flutter_view_controller.cc"
-)
-list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/")
-
-# Wrapper sources needed for a plugin.
-add_library(flutter_wrapper_plugin STATIC
-  ${CPP_WRAPPER_SOURCES_CORE}
-  ${CPP_WRAPPER_SOURCES_PLUGIN}
-)
-apply_standard_settings(flutter_wrapper_plugin)
-set_target_properties(flutter_wrapper_plugin PROPERTIES
-  POSITION_INDEPENDENT_CODE ON)
-set_target_properties(flutter_wrapper_plugin PROPERTIES
-  CXX_VISIBILITY_PRESET hidden)
-target_link_libraries(flutter_wrapper_plugin PUBLIC flutter)
-target_include_directories(flutter_wrapper_plugin PUBLIC
-  "${WRAPPER_ROOT}/include"
-)
-add_dependencies(flutter_wrapper_plugin flutter_assemble)
-
-# Wrapper sources needed for the runner.
-add_library(flutter_wrapper_app STATIC
-  ${CPP_WRAPPER_SOURCES_CORE}
-  ${CPP_WRAPPER_SOURCES_APP}
-)
-apply_standard_settings(flutter_wrapper_app)
-target_link_libraries(flutter_wrapper_app PUBLIC flutter)
-target_include_directories(flutter_wrapper_app PUBLIC
-  "${WRAPPER_ROOT}/include"
-)
-add_dependencies(flutter_wrapper_app flutter_assemble)
-
-# === Flutter tool backend ===
-# _phony_ is a non-existent file to force this command to run every time,
-# since currently there's no way to get a full input/output list from the
-# flutter tool.
-set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_")
-set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE)
-add_custom_command(
-  OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS}
-    ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN}
-    ${CPP_WRAPPER_SOURCES_APP}
-    ${PHONY_OUTPUT}
-  COMMAND ${CMAKE_COMMAND} -E env
-    ${FLUTTER_TOOL_ENVIRONMENT}
-    "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
-      windows-x64 $<CONFIG>
-  VERBATIM
-)
-add_custom_target(flutter_assemble DEPENDS
-  "${FLUTTER_LIBRARY}"
-  ${FLUTTER_LIBRARY_HEADERS}
-  ${CPP_WRAPPER_SOURCES_CORE}
-  ${CPP_WRAPPER_SOURCES_PLUGIN}
-  ${CPP_WRAPPER_SOURCES_APP}
-)
diff --git a/progress/windows/flutter/generated_plugin_registrant.cc b/progress/windows/flutter/generated_plugin_registrant.cc
deleted file mode 100644
index 8b6d4680a..000000000
--- a/progress/windows/flutter/generated_plugin_registrant.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-//  Generated file. Do not edit.
-//
-
-// clang-format off
-
-#include "generated_plugin_registrant.h"
-
-
-void RegisterPlugins(flutter::PluginRegistry* registry) {
-}
diff --git a/progress/windows/flutter/generated_plugin_registrant.h b/progress/windows/flutter/generated_plugin_registrant.h
deleted file mode 100644
index dc139d85a..000000000
--- a/progress/windows/flutter/generated_plugin_registrant.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  Generated file. Do not edit.
-//
-
-// clang-format off
-
-#ifndef GENERATED_PLUGIN_REGISTRANT_
-#define GENERATED_PLUGIN_REGISTRANT_
-
-#include <flutter/plugin_registry.h>
-
-// Registers Flutter plugins.
-void RegisterPlugins(flutter::PluginRegistry* registry);
-
-#endif  // GENERATED_PLUGIN_REGISTRANT_
diff --git a/progress/windows/flutter/generated_plugins.cmake b/progress/windows/flutter/generated_plugins.cmake
deleted file mode 100644
index b93c4c30c..000000000
--- a/progress/windows/flutter/generated_plugins.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Generated file, do not edit.
-#
-
-list(APPEND FLUTTER_PLUGIN_LIST
-)
-
-list(APPEND FLUTTER_FFI_PLUGIN_LIST
-)
-
-set(PLUGIN_BUNDLED_LIBRARIES)
-
-foreach(plugin ${FLUTTER_PLUGIN_LIST})
-  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin})
-  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
-  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
-  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
-endforeach(plugin)
-
-foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
-  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
-  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
-endforeach(ffi_plugin)
diff --git a/progress/windows/runner/CMakeLists.txt b/progress/windows/runner/CMakeLists.txt
deleted file mode 100644
index 394917c05..000000000
--- a/progress/windows/runner/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-cmake_minimum_required(VERSION 3.14)
-project(runner LANGUAGES CXX)
-
-# Define the application target. To change its name, change BINARY_NAME in the
-# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer
-# work.
-#
-# Any new source files that you add to the application should be added here.
-add_executable(${BINARY_NAME} WIN32
-  "flutter_window.cpp"
-  "main.cpp"
-  "utils.cpp"
-  "win32_window.cpp"
-  "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
-  "Runner.rc"
-  "runner.exe.manifest"
-)
-
-# Apply the standard set of build settings. This can be removed for applications
-# that need different build settings.
-apply_standard_settings(${BINARY_NAME})
-
-# Add preprocessor definitions for the build version.
-target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"")
-target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}")
-target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}")
-target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}")
-target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}")
-
-# Disable Windows macros that collide with C++ standard library functions.
-target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX")
-
-# Add dependency libraries and include directories. Add any application-specific
-# dependencies here.
-target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app)
-target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib")
-target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}")
-
-# Run the Flutter tool portions of the build. This must not be removed.
-add_dependencies(${BINARY_NAME} flutter_assemble)
diff --git a/progress/windows/runner/Runner.rc b/progress/windows/runner/Runner.rc
deleted file mode 100644
index d387e1182..000000000
--- a/progress/windows/runner/Runner.rc
+++ /dev/null
@@ -1,121 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#pragma code_page(65001)
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
-#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
-#else
-#define VERSION_AS_NUMBER 1,0,0,0
-#endif
-
-#if defined(FLUTTER_VERSION)
-#define VERSION_AS_STRING FLUTTER_VERSION
-#else
-#define VERSION_AS_STRING "1.0.0"
-#endif
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_AS_NUMBER
- PRODUCTVERSION VERSION_AS_NUMBER
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "com.example" "\0"
-            VALUE "FileDescription", "progress" "\0"
-            VALUE "FileVersion", VERSION_AS_STRING "\0"
-            VALUE "InternalName", "progress" "\0"
-            VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0"
-            VALUE "OriginalFilename", "progress.exe" "\0"
-            VALUE "ProductName", "progress" "\0"
-            VALUE "ProductVersion", VERSION_AS_STRING "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
-
-#endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
diff --git a/progress/windows/runner/flutter_window.cpp b/progress/windows/runner/flutter_window.cpp
deleted file mode 100644
index 955ee3038..000000000
--- a/progress/windows/runner/flutter_window.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "flutter_window.h"
-
-#include <optional>
-
-#include "flutter/generated_plugin_registrant.h"
-
-FlutterWindow::FlutterWindow(const flutter::DartProject& project)
-    : project_(project) {}
-
-FlutterWindow::~FlutterWindow() {}
-
-bool FlutterWindow::OnCreate() {
-  if (!Win32Window::OnCreate()) {
-    return false;
-  }
-
-  RECT frame = GetClientArea();
-
-  // The size here must match the window dimensions to avoid unnecessary surface
-  // creation / destruction in the startup path.
-  flutter_controller_ = std::make_unique<flutter::FlutterViewController>(
-      frame.right - frame.left, frame.bottom - frame.top, project_);
-  // Ensure that basic setup of the controller was successful.
-  if (!flutter_controller_->engine() || !flutter_controller_->view()) {
-    return false;
-  }
-  RegisterPlugins(flutter_controller_->engine());
-  SetChildContent(flutter_controller_->view()->GetNativeWindow());
-
-  flutter_controller_->engine()->SetNextFrameCallback([&]() {
-    this->Show();
-  });
-
-  // Flutter can complete the first frame before the "show window" callback is
-  // registered. The following call ensures a frame is pending to ensure the
-  // window is shown. It is a no-op if the first frame hasn't completed yet.
-  flutter_controller_->ForceRedraw();
-
-  return true;
-}
-
-void FlutterWindow::OnDestroy() {
-  if (flutter_controller_) {
-    flutter_controller_ = nullptr;
-  }
-
-  Win32Window::OnDestroy();
-}
-
-LRESULT
-FlutterWindow::MessageHandler(HWND hwnd, UINT const message,
-                              WPARAM const wparam,
-                              LPARAM const lparam) noexcept {
-  // Give Flutter, including plugins, an opportunity to handle window messages.
-  if (flutter_controller_) {
-    std::optional<LRESULT> result =
-        flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam,
-                                                      lparam);
-    if (result) {
-      return *result;
-    }
-  }
-
-  switch (message) {
-    case WM_FONTCHANGE:
-      flutter_controller_->engine()->ReloadSystemFonts();
-      break;
-  }
-
-  return Win32Window::MessageHandler(hwnd, message, wparam, lparam);
-}
diff --git a/progress/windows/runner/flutter_window.h b/progress/windows/runner/flutter_window.h
deleted file mode 100644
index 6da0652f0..000000000
--- a/progress/windows/runner/flutter_window.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef RUNNER_FLUTTER_WINDOW_H_
-#define RUNNER_FLUTTER_WINDOW_H_
-
-#include <flutter/dart_project.h>
-#include <flutter/flutter_view_controller.h>
-
-#include <memory>
-
-#include "win32_window.h"
-
-// A window that does nothing but host a Flutter view.
-class FlutterWindow : public Win32Window {
- public:
-  // Creates a new FlutterWindow hosting a Flutter view running |project|.
-  explicit FlutterWindow(const flutter::DartProject& project);
-  virtual ~FlutterWindow();
-
- protected:
-  // Win32Window:
-  bool OnCreate() override;
-  void OnDestroy() override;
-  LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam,
-                         LPARAM const lparam) noexcept override;
-
- private:
-  // The project to run.
-  flutter::DartProject project_;
-
-  // The Flutter instance hosted by this window.
-  std::unique_ptr<flutter::FlutterViewController> flutter_controller_;
-};
-
-#endif  // RUNNER_FLUTTER_WINDOW_H_
diff --git a/progress/windows/runner/main.cpp b/progress/windows/runner/main.cpp
deleted file mode 100644
index cb85be5e9..000000000
--- a/progress/windows/runner/main.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <flutter/dart_project.h>
-#include <flutter/flutter_view_controller.h>
-#include <windows.h>
-
-#include "flutter_window.h"
-#include "utils.h"
-
-int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
-                      _In_ wchar_t *command_line, _In_ int show_command) {
-  // Attach to console when present (e.g., 'flutter run') or create a
-  // new console when running with a debugger.
-  if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) {
-    CreateAndAttachConsole();
-  }
-
-  // Initialize COM, so that it is available for use in the library and/or
-  // plugins.
-  ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
-
-  flutter::DartProject project(L"data");
-
-  std::vector<std::string> command_line_arguments =
-      GetCommandLineArguments();
-
-  project.set_dart_entrypoint_arguments(std::move(command_line_arguments));
-
-  FlutterWindow window(project);
-  Win32Window::Point origin(10, 10);
-  Win32Window::Size size(1280, 720);
-  if (!window.Create(L"progress", origin, size)) {
-    return EXIT_FAILURE;
-  }
-  window.SetQuitOnClose(true);
-
-  ::MSG msg;
-  while (::GetMessage(&msg, nullptr, 0, 0)) {
-    ::TranslateMessage(&msg);
-    ::DispatchMessage(&msg);
-  }
-
-  ::CoUninitialize();
-  return EXIT_SUCCESS;
-}
diff --git a/progress/windows/runner/resource.h b/progress/windows/runner/resource.h
deleted file mode 100644
index 66a65d1e4..000000000
--- a/progress/windows/runner/resource.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by Runner.rc
-//
-#define IDI_APP_ICON                    101
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/progress/windows/runner/resources/app_icon.ico b/progress/windows/runner/resources/app_icon.ico
deleted file mode 100644
index c04e20caf6370ebb9253ad831cc31de4a9c965f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 33772
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

diff --git a/progress/windows/runner/runner.exe.manifest b/progress/windows/runner/runner.exe.manifest
deleted file mode 100644
index a42ea7687..000000000
--- a/progress/windows/runner/runner.exe.manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-    </windowsSettings>
-  </application>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- Windows 10 and Windows 11 -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-      <!-- Windows 8.1 -->
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-      <!-- Windows 8 -->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-      <!-- Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-    </application>
-  </compatibility>
-</assembly>
diff --git a/progress/windows/runner/utils.cpp b/progress/windows/runner/utils.cpp
deleted file mode 100644
index b2b08734d..000000000
--- a/progress/windows/runner/utils.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "utils.h"
-
-#include <flutter_windows.h>
-#include <io.h>
-#include <stdio.h>
-#include <windows.h>
-
-#include <iostream>
-
-void CreateAndAttachConsole() {
-  if (::AllocConsole()) {
-    FILE *unused;
-    if (freopen_s(&unused, "CONOUT$", "w", stdout)) {
-      _dup2(_fileno(stdout), 1);
-    }
-    if (freopen_s(&unused, "CONOUT$", "w", stderr)) {
-      _dup2(_fileno(stdout), 2);
-    }
-    std::ios::sync_with_stdio();
-    FlutterDesktopResyncOutputStreams();
-  }
-}
-
-std::vector<std::string> GetCommandLineArguments() {
-  // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use.
-  int argc;
-  wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
-  if (argv == nullptr) {
-    return std::vector<std::string>();
-  }
-
-  std::vector<std::string> command_line_arguments;
-
-  // Skip the first argument as it's the binary name.
-  for (int i = 1; i < argc; i++) {
-    command_line_arguments.push_back(Utf8FromUtf16(argv[i]));
-  }
-
-  ::LocalFree(argv);
-
-  return command_line_arguments;
-}
-
-std::string Utf8FromUtf16(const wchar_t* utf16_string) {
-  if (utf16_string == nullptr) {
-    return std::string();
-  }
-  int target_length = ::WideCharToMultiByte(
-      CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
-      -1, nullptr, 0, nullptr, nullptr)
-    -1; // remove the trailing null character
-  int input_length = (int)wcslen(utf16_string);
-  std::string utf8_string;
-  if (target_length <= 0 || target_length > utf8_string.max_size()) {
-    return utf8_string;
-  }
-  utf8_string.resize(target_length);
-  int converted_length = ::WideCharToMultiByte(
-      CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
-      input_length, utf8_string.data(), target_length, nullptr, nullptr);
-  if (converted_length == 0) {
-    return std::string();
-  }
-  return utf8_string;
-}
diff --git a/progress/windows/runner/utils.h b/progress/windows/runner/utils.h
deleted file mode 100644
index 3879d5475..000000000
--- a/progress/windows/runner/utils.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef RUNNER_UTILS_H_
-#define RUNNER_UTILS_H_
-
-#include <string>
-#include <vector>
-
-// Creates a console for the process, and redirects stdout and stderr to
-// it for both the runner and the Flutter library.
-void CreateAndAttachConsole();
-
-// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string
-// encoded in UTF-8. Returns an empty std::string on failure.
-std::string Utf8FromUtf16(const wchar_t* utf16_string);
-
-// Gets the command line arguments passed in as a std::vector<std::string>,
-// encoded in UTF-8. Returns an empty std::vector<std::string> on failure.
-std::vector<std::string> GetCommandLineArguments();
-
-#endif  // RUNNER_UTILS_H_
diff --git a/progress/windows/runner/win32_window.cpp b/progress/windows/runner/win32_window.cpp
deleted file mode 100644
index 60608d0fe..000000000
--- a/progress/windows/runner/win32_window.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-#include "win32_window.h"
-
-#include <dwmapi.h>
-#include <flutter_windows.h>
-
-#include "resource.h"
-
-namespace {
-
-/// Window attribute that enables dark mode window decorations.
-///
-/// Redefined in case the developer's machine has a Windows SDK older than
-/// version 10.0.22000.0.
-/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute
-#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE
-#define DWMWA_USE_IMMERSIVE_DARK_MODE 20
-#endif
-
-constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW";
-
-/// Registry key for app theme preference.
-///
-/// A value of 0 indicates apps should use dark mode. A non-zero or missing
-/// value indicates apps should use light mode.
-constexpr const wchar_t kGetPreferredBrightnessRegKey[] =
-  L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
-constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme";
-
-// The number of Win32Window objects that currently exist.
-static int g_active_window_count = 0;
-
-using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd);
-
-// Scale helper to convert logical scaler values to physical using passed in
-// scale factor
-int Scale(int source, double scale_factor) {
-  return static_cast<int>(source * scale_factor);
-}
-
-// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module.
-// This API is only needed for PerMonitor V1 awareness mode.
-void EnableFullDpiSupportIfAvailable(HWND hwnd) {
-  HMODULE user32_module = LoadLibraryA("User32.dll");
-  if (!user32_module) {
-    return;
-  }
-  auto enable_non_client_dpi_scaling =
-      reinterpret_cast<EnableNonClientDpiScaling*>(
-          GetProcAddress(user32_module, "EnableNonClientDpiScaling"));
-  if (enable_non_client_dpi_scaling != nullptr) {
-    enable_non_client_dpi_scaling(hwnd);
-  }
-  FreeLibrary(user32_module);
-}
-
-}  // namespace
-
-// Manages the Win32Window's window class registration.
-class WindowClassRegistrar {
- public:
-  ~WindowClassRegistrar() = default;
-
-  // Returns the singleton registrar instance.
-  static WindowClassRegistrar* GetInstance() {
-    if (!instance_) {
-      instance_ = new WindowClassRegistrar();
-    }
-    return instance_;
-  }
-
-  // Returns the name of the window class, registering the class if it hasn't
-  // previously been registered.
-  const wchar_t* GetWindowClass();
-
-  // Unregisters the window class. Should only be called if there are no
-  // instances of the window.
-  void UnregisterWindowClass();
-
- private:
-  WindowClassRegistrar() = default;
-
-  static WindowClassRegistrar* instance_;
-
-  bool class_registered_ = false;
-};
-
-WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr;
-
-const wchar_t* WindowClassRegistrar::GetWindowClass() {
-  if (!class_registered_) {
-    WNDCLASS window_class{};
-    window_class.hCursor = LoadCursor(nullptr, IDC_ARROW);
-    window_class.lpszClassName = kWindowClassName;
-    window_class.style = CS_HREDRAW | CS_VREDRAW;
-    window_class.cbClsExtra = 0;
-    window_class.cbWndExtra = 0;
-    window_class.hInstance = GetModuleHandle(nullptr);
-    window_class.hIcon =
-        LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON));
-    window_class.hbrBackground = 0;
-    window_class.lpszMenuName = nullptr;
-    window_class.lpfnWndProc = Win32Window::WndProc;
-    RegisterClass(&window_class);
-    class_registered_ = true;
-  }
-  return kWindowClassName;
-}
-
-void WindowClassRegistrar::UnregisterWindowClass() {
-  UnregisterClass(kWindowClassName, nullptr);
-  class_registered_ = false;
-}
-
-Win32Window::Win32Window() {
-  ++g_active_window_count;
-}
-
-Win32Window::~Win32Window() {
-  --g_active_window_count;
-  Destroy();
-}
-
-bool Win32Window::Create(const std::wstring& title,
-                         const Point& origin,
-                         const Size& size) {
-  Destroy();
-
-  const wchar_t* window_class =
-      WindowClassRegistrar::GetInstance()->GetWindowClass();
-
-  const POINT target_point = {static_cast<LONG>(origin.x),
-                              static_cast<LONG>(origin.y)};
-  HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST);
-  UINT dpi = FlutterDesktopGetDpiForMonitor(monitor);
-  double scale_factor = dpi / 96.0;
-
-  HWND window = CreateWindow(
-      window_class, title.c_str(), WS_OVERLAPPEDWINDOW,
-      Scale(origin.x, scale_factor), Scale(origin.y, scale_factor),
-      Scale(size.width, scale_factor), Scale(size.height, scale_factor),
-      nullptr, nullptr, GetModuleHandle(nullptr), this);
-
-  if (!window) {
-    return false;
-  }
-
-  UpdateTheme(window);
-
-  return OnCreate();
-}
-
-bool Win32Window::Show() {
-  return ShowWindow(window_handle_, SW_SHOWNORMAL);
-}
-
-// static
-LRESULT CALLBACK Win32Window::WndProc(HWND const window,
-                                      UINT const message,
-                                      WPARAM const wparam,
-                                      LPARAM const lparam) noexcept {
-  if (message == WM_NCCREATE) {
-    auto window_struct = reinterpret_cast<CREATESTRUCT*>(lparam);
-    SetWindowLongPtr(window, GWLP_USERDATA,
-                     reinterpret_cast<LONG_PTR>(window_struct->lpCreateParams));
-
-    auto that = static_cast<Win32Window*>(window_struct->lpCreateParams);
-    EnableFullDpiSupportIfAvailable(window);
-    that->window_handle_ = window;
-  } else if (Win32Window* that = GetThisFromHandle(window)) {
-    return that->MessageHandler(window, message, wparam, lparam);
-  }
-
-  return DefWindowProc(window, message, wparam, lparam);
-}
-
-LRESULT
-Win32Window::MessageHandler(HWND hwnd,
-                            UINT const message,
-                            WPARAM const wparam,
-                            LPARAM const lparam) noexcept {
-  switch (message) {
-    case WM_DESTROY:
-      window_handle_ = nullptr;
-      Destroy();
-      if (quit_on_close_) {
-        PostQuitMessage(0);
-      }
-      return 0;
-
-    case WM_DPICHANGED: {
-      auto newRectSize = reinterpret_cast<RECT*>(lparam);
-      LONG newWidth = newRectSize->right - newRectSize->left;
-      LONG newHeight = newRectSize->bottom - newRectSize->top;
-
-      SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth,
-                   newHeight, SWP_NOZORDER | SWP_NOACTIVATE);
-
-      return 0;
-    }
-    case WM_SIZE: {
-      RECT rect = GetClientArea();
-      if (child_content_ != nullptr) {
-        // Size and position the child window.
-        MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left,
-                   rect.bottom - rect.top, TRUE);
-      }
-      return 0;
-    }
-
-    case WM_ACTIVATE:
-      if (child_content_ != nullptr) {
-        SetFocus(child_content_);
-      }
-      return 0;
-
-    case WM_DWMCOLORIZATIONCOLORCHANGED:
-      UpdateTheme(hwnd);
-      return 0;
-  }
-
-  return DefWindowProc(window_handle_, message, wparam, lparam);
-}
-
-void Win32Window::Destroy() {
-  OnDestroy();
-
-  if (window_handle_) {
-    DestroyWindow(window_handle_);
-    window_handle_ = nullptr;
-  }
-  if (g_active_window_count == 0) {
-    WindowClassRegistrar::GetInstance()->UnregisterWindowClass();
-  }
-}
-
-Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept {
-  return reinterpret_cast<Win32Window*>(
-      GetWindowLongPtr(window, GWLP_USERDATA));
-}
-
-void Win32Window::SetChildContent(HWND content) {
-  child_content_ = content;
-  SetParent(content, window_handle_);
-  RECT frame = GetClientArea();
-
-  MoveWindow(content, frame.left, frame.top, frame.right - frame.left,
-             frame.bottom - frame.top, true);
-
-  SetFocus(child_content_);
-}
-
-RECT Win32Window::GetClientArea() {
-  RECT frame;
-  GetClientRect(window_handle_, &frame);
-  return frame;
-}
-
-HWND Win32Window::GetHandle() {
-  return window_handle_;
-}
-
-void Win32Window::SetQuitOnClose(bool quit_on_close) {
-  quit_on_close_ = quit_on_close;
-}
-
-bool Win32Window::OnCreate() {
-  // No-op; provided for subclasses.
-  return true;
-}
-
-void Win32Window::OnDestroy() {
-  // No-op; provided for subclasses.
-}
-
-void Win32Window::UpdateTheme(HWND const window) {
-  DWORD light_mode;
-  DWORD light_mode_size = sizeof(light_mode);
-  LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey,
-                               kGetPreferredBrightnessRegValue,
-                               RRF_RT_REG_DWORD, nullptr, &light_mode,
-                               &light_mode_size);
-
-  if (result == ERROR_SUCCESS) {
-    BOOL enable_dark_mode = light_mode == 0;
-    DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE,
-                          &enable_dark_mode, sizeof(enable_dark_mode));
-  }
-}
diff --git a/progress/windows/runner/win32_window.h b/progress/windows/runner/win32_window.h
deleted file mode 100644
index e901dde68..000000000
--- a/progress/windows/runner/win32_window.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef RUNNER_WIN32_WINDOW_H_
-#define RUNNER_WIN32_WINDOW_H_
-
-#include <windows.h>
-
-#include <functional>
-#include <memory>
-#include <string>
-
-// A class abstraction for a high DPI-aware Win32 Window. Intended to be
-// inherited from by classes that wish to specialize with custom
-// rendering and input handling
-class Win32Window {
- public:
-  struct Point {
-    unsigned int x;
-    unsigned int y;
-    Point(unsigned int x, unsigned int y) : x(x), y(y) {}
-  };
-
-  struct Size {
-    unsigned int width;
-    unsigned int height;
-    Size(unsigned int width, unsigned int height)
-        : width(width), height(height) {}
-  };
-
-  Win32Window();
-  virtual ~Win32Window();
-
-  // Creates a win32 window with |title| that is positioned and sized using
-  // |origin| and |size|. New windows are created on the default monitor. Window
-  // sizes are specified to the OS in physical pixels, hence to ensure a
-  // consistent size this function will scale the inputted width and height as
-  // as appropriate for the default monitor. The window is invisible until
-  // |Show| is called. Returns true if the window was created successfully.
-  bool Create(const std::wstring& title, const Point& origin, const Size& size);
-
-  // Show the current window. Returns true if the window was successfully shown.
-  bool Show();
-
-  // Release OS resources associated with window.
-  void Destroy();
-
-  // Inserts |content| into the window tree.
-  void SetChildContent(HWND content);
-
-  // Returns the backing Window handle to enable clients to set icon and other
-  // window properties. Returns nullptr if the window has been destroyed.
-  HWND GetHandle();
-
-  // If true, closing this window will quit the application.
-  void SetQuitOnClose(bool quit_on_close);
-
-  // Return a RECT representing the bounds of the current client area.
-  RECT GetClientArea();
-
- protected:
-  // Processes and route salient window messages for mouse handling,
-  // size change and DPI. Delegates handling of these to member overloads that
-  // inheriting classes can handle.
-  virtual LRESULT MessageHandler(HWND window,
-                                 UINT const message,
-                                 WPARAM const wparam,
-                                 LPARAM const lparam) noexcept;
-
-  // Called when CreateAndShow is called, allowing subclass window-related
-  // setup. Subclasses should return false if setup fails.
-  virtual bool OnCreate();
-
-  // Called when Destroy is called.
-  virtual void OnDestroy();
-
- private:
-  friend class WindowClassRegistrar;
-
-  // OS callback called by message pump. Handles the WM_NCCREATE message which
-  // is passed when the non-client area is being created and enables automatic
-  // non-client DPI scaling so that the non-client area automatically
-  // responds to changes in DPI. All other messages are handled by
-  // MessageHandler.
-  static LRESULT CALLBACK WndProc(HWND const window,
-                                  UINT const message,
-                                  WPARAM const wparam,
-                                  LPARAM const lparam) noexcept;
-
-  // Retrieves a class instance pointer for |window|
-  static Win32Window* GetThisFromHandle(HWND const window) noexcept;
-
-  // Update the window frame's theme to match the system theme.
-  static void UpdateTheme(HWND const window);
-
-  bool quit_on_close_ = false;
-
-  // window handle for top level window.
-  HWND window_handle_ = nullptr;
-
-  // window handle for hosted content.
-  HWND child_content_ = nullptr;
-};
-
-#endif  // RUNNER_WIN32_WINDOW_H_

From 35a598462d155598064f6fc57dc33e768a867f24 Mon Sep 17 00:00:00 2001
From: Luozf12345 <2515187986@qq.com>
Date: Sat, 24 Aug 2024 17:30:26 +0800
Subject: [PATCH 35/74] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_image_page.dart       |  2 +-
 .../example/lib/page/td_slider_page.dart      | 57 ++++++------
 tdesign-component/example/pubspec.lock        | 86 +++++++++----------
 3 files changed, 77 insertions(+), 68 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_image_page.dart b/tdesign-component/example/lib/page/td_image_page.dart
index 49defe1fc..fd08b1afe 100644
--- a/tdesign-component/example/lib/page/td_image_page.dart
+++ b/tdesign-component/example/lib/page/td_image_page.dart
@@ -244,7 +244,7 @@ class TDImageState extends State<TDImagePage>
           color: Colors.black,
           width: 121,
           height: 72,
-          child: const Stack(
+          child: Stack(
             alignment: Alignment.center,
             children: [
               TDImage(
diff --git a/tdesign-component/example/lib/page/td_slider_page.dart b/tdesign-component/example/lib/page/td_slider_page.dart
index 0d5a25496..45caf3079 100644
--- a/tdesign-component/example/lib/page/td_slider_page.dart
+++ b/tdesign-component/example/lib/page/td_slider_page.dart
@@ -244,30 +244,18 @@ class _TDSliderPageState extends State<TDSliderPage> {
         min: 0,
         max: 100,
         scaleFormatter: (value) => value.toInt().toString(),
-      )..updateSliderThemeData((data) => data.copyWith(
-           activeTickMarkColor: const Color(0xFFE7E7E7),
-           inactiveTickMarkColor: const Color(0xFFE7E7E7),
-      )),
+      )
+        ..updateSliderThemeData((data) =>
+            data.copyWith(
+              activeTickMarkColor: const Color(0xFFE7E7E7),
+              inactiveTickMarkColor: const Color(0xFFE7E7E7),
+            )),
       value: 60,
       onChanged: (value) {},
     );
   }
 
   @Demo(group: 'slider')
-  Widget _buildCapsuleDoubleHandleWithScale(BuildContext context) {
-    return TDRangeSlider(
-      sliderThemeData: TDSliderThemeData.capsule(
-        showScaleValue: true,
-        divisions: 5,
-        min: 0,
-        max: 100,
-        scaleFormatter: (value) => value.toInt().toString(),
-      )..updateSliderThemeData((data) => data.copyWith(
-           activeTickMarkColor: const Color(0xFFE7E7E7),
-           inactiveTickMarkColor: const Color(0xFFE7E7E7),
-      )),
-      value: const RangeValues(20, 60),
-      onChanged: (value) {},
   Widget _buildCapsule(BuildContext context) {
     return Column(
       children: [
@@ -336,10 +324,12 @@ class _TDSliderPageState extends State<TDSliderPage> {
             min: 0,
             max: 100,
             scaleFormatter: (value) => value.toInt().toString(),
-          )..updateSliderThemeData((data) => data.copyWith(
-                activeTickMarkColor: const Color(0xFFE7E7E7),
-                inactiveTickMarkColor: const Color(0xFFE7E7E7),
-              )),
+          )
+            ..updateSliderThemeData((data) =>
+                data.copyWith(
+                  activeTickMarkColor: const Color(0xFFE7E7E7),
+                  inactiveTickMarkColor: const Color(0xFFE7E7E7),
+                )),
           value: 60,
           // divisions: 5,
           onChanged: (value) {},
@@ -378,8 +368,8 @@ class _TDSliderPageState extends State<TDSliderPage> {
             max: 100,
           ),
           value: 40,
-          boxDecoration: BoxDecoration(
-             color: Colors.amber
+          boxDecoration: const BoxDecoration(
+              color: Colors.amber
           ),
           // divisions: 5,
           onChanged: (value) {},
@@ -402,4 +392,23 @@ class _TDSliderPageState extends State<TDSliderPage> {
       ],
     );
   }
+
+
+  @Demo(group: 'slider')
+  Widget _buildCapsuleDoubleHandleWithScale(BuildContext context) {
+    return TDRangeSlider(
+      sliderThemeData: TDSliderThemeData.capsule(
+        showScaleValue: true,
+        divisions: 5,
+        min: 0,
+        max: 100,
+        scaleFormatter: (value) => value.toInt().toString(),
+      )..updateSliderThemeData((data) => data.copyWith(
+        activeTickMarkColor: const Color(0xFFE7E7E7),
+        inactiveTickMarkColor: const Color(0xFFE7E7E7),
+      )),
+      value: const RangeValues(20, 60),
+      onChanged: (value) {},
+    );
+  }
 }
diff --git a/tdesign-component/example/pubspec.lock b/tdesign-component/example/pubspec.lock
index a208e30dd..8007789c3 100644
--- a/tdesign-component/example/pubspec.lock
+++ b/tdesign-component/example/pubspec.lock
@@ -5,18 +5,18 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
+      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.4.2"
   async:
     dependency: transitive
     description:
       name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
       url: "https://pub.dev"
     source: hosted
-    version: "2.11.0"
+    version: "2.10.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -29,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.2.1"
   clock:
     dependency: transitive
     description:
@@ -45,10 +45,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.17.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -69,10 +69,10 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+      sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.0.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -103,10 +103,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      sha256: "21b085a1c185e46701373866144ced56cfb7a0c33f63c916bb8fe2d0c1491278"
+      sha256: dc6d5258653f6857135b32896ccda7f7af0c54dcec832495ad6835154c6c77c0
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.19"
+    version: "0.6.15"
   flutter_slidable:
     dependency: transitive
     description:
@@ -148,18 +148,18 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
+      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.0"
+    version: "0.17.0"
   js:
     dependency: transitive
     description:
       name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.7"
+    version: "0.6.5"
   lints:
     dependency: transitive
     description:
@@ -180,10 +180,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.15"
+    version: "0.12.13"
   material_color_utilities:
     dependency: transitive
     description:
@@ -196,42 +196,42 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.8.0"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.8.2"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
+      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
+      sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.1"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
+      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -244,10 +244,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
+      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   path_provider_windows:
     dependency: transitive
     description:
@@ -260,18 +260,18 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+      sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "3.1.3"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
+      sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.8"
+    version: "2.1.6"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -315,7 +315,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.5"
+    version: "0.1.6"
   term_glyph:
     dependency: transitive
     description:
@@ -328,10 +328,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.4.16"
   typed_data:
     dependency: transitive
     description:
@@ -352,18 +352,18 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
+      sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.9"
+    version: "4.1.4"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.3"
 sdks:
-  dart: ">=3.0.0 <4.0.0"
-  flutter: ">=3.10.0"
+  dart: ">=2.19.0 <4.0.0"
+  flutter: ">=3.7.0"

From 903c0c67c25e12b214eee67f7e8bf062e4604807 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Sat, 24 Aug 2024 18:21:43 +0800
Subject: [PATCH 36/74] =?UTF-8?q?td=5Fmessage=E5=88=9D=E6=AD=A5=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=9B=9B=E4=B8=AA=E4=B8=BB=E9=A2=98=E7=9A=84=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/example/lib/config.dart     |   4 +-
 .../example/lib/page/td_message_page.dart     | 223 ++++++++++++++++++
 tdesign-component/example/pubspec.lock        |   2 +-
 .../src/components/message/td_message.dart    | 180 ++++++++++++++
 tdesign-component/lib/tdesign_flutter.dart    |   1 +
 5 files changed, 407 insertions(+), 3 deletions(-)
 create mode 100644 tdesign-component/example/lib/page/td_message_page.dart
 create mode 100644 tdesign-component/lib/src/components/message/td_message.dart

diff --git a/tdesign-component/example/lib/config.dart b/tdesign-component/example/lib/config.dart
index c787754fe..ea474313b 100644
--- a/tdesign-component/example/lib/config.dart
+++ b/tdesign-component/example/lib/config.dart
@@ -31,6 +31,7 @@ import 'page/td_image_viewer_page.dart';
 import 'page/td_input_page.dart';
 import 'page/td_link_page.dart';
 import 'page/td_loading_page.dart';
+import 'page/td_message_page.dart';
 import 'page/td_navbar_page.dart';
 import 'page/td_picker_page.dart';
 import 'page/td_popup_page.dart';
@@ -224,8 +225,7 @@ Map<String, List<ExamplePageModel>> exampleMap = {
     ExamplePageModel(
         text: 'Message 消息通知',
         name: 'message',
-        isTodo: true,
-        pageBuilder: _wrapInheritedTheme((context) => const TodoPage())),
+        pageBuilder: _wrapInheritedTheme((context) => const TDMessagePage())),
     ExamplePageModel(
         text: 'NoticeBar 公告栏',
         name: 'notice_bar',
diff --git a/tdesign-component/example/lib/page/td_message_page.dart b/tdesign-component/example/lib/page/td_message_page.dart
new file mode 100644
index 000000000..6af0140fe
--- /dev/null
+++ b/tdesign-component/example/lib/page/td_message_page.dart
@@ -0,0 +1,223 @@
+
+import 'package:flutter/material.dart';
+import 'package:tdesign_flutter/tdesign_flutter.dart';
+import '../../base/example_widget.dart';
+import '../annotation/demo.dart';
+
+class TDMessagePage extends StatefulWidget {
+  const TDMessagePage({Key? key}) : super(key: key);
+
+  @override
+  State<StatefulWidget> createState() => _TDMessagePageState();
+}
+
+class _TDMessagePageState extends State<TDMessagePage> {
+
+  final _commonContent = '这是一条普通的通知信息';
+
+  final _demoImage = Image.asset(
+    'assets/img/image.png',
+  );
+
+  @override
+  Widget build(BuildContext context) {
+    return ExamplePage(
+      title: tdTitle(),
+      desc: '用于轻量级反馈或提示，不会打断用户操作。',
+      exampleCodeGroup: 'message',
+      children: [
+        ExampleModule(
+            title: '组件类型',
+            children: [
+                ExampleItem(desc: '纯文字的通知', builder: _buildPlainTextMessage),
+                ExampleItem(desc: '带图标的通知', builder: _buildIconTextMessage),
+                // ExampleItem(desc: '带关闭的通知', builder: _buildInputNormal),
+                // ExampleItem(desc: '可滚动的通知', builder: _buildImageTop),
+                // ExampleItem(desc: '带按钮的通知', builder: _buildImageTopNoTitle),
+        ]),
+        ExampleModule(
+            title: '组件状态',
+            children: [
+                ExampleItem(desc: '普通通知', builder: _buildInfoMessage),
+                ExampleItem(desc: '成功通知', builder: _buildSuccessMessage),
+                ExampleItem(desc: '警示通知', builder: _buildWarningMessage),
+                ExampleItem(desc: '错误通知', builder: _buildErrorMessage),
+              ]),
+      ]);
+  }
+
+  @Demo(group: 'message')
+  Widget _buildPlainTextMessage(BuildContext context) {
+    return TDButton(
+      isBlock: true,
+      text: '纯文字的通知',
+      size: TDButtonSize.large,
+      type: TDButtonType.outline,
+      width: 450,
+      theme: TDButtonTheme.primary,
+      onTap: () {
+        final overlay = Overlay.of(context);
+        late OverlayEntry overlayEntry;
+        overlayEntry = OverlayEntry(
+          builder: (context) => TDMessage(
+            visible: true,
+            icon: false,
+            content: _commonContent,
+            theme: MessageTheme.info,
+            duration: 3000,
+            onDurationEnd: () {
+              overlayEntry.remove();
+            },
+          ),
+        );
+        overlay.insert(overlayEntry);
+      },
+    );
+  }
+  @Demo(group: 'message')
+  Widget _buildIconTextMessage(BuildContext context) {
+    return TDButton(
+      isBlock: true,
+      text: '带图标的通知',
+      size: TDButtonSize.large,
+      type: TDButtonType.outline,
+      width: 450,
+      theme: TDButtonTheme.primary,
+      onTap: () {
+        final overlay = Overlay.of(context);
+        late OverlayEntry overlayEntry;
+        overlayEntry = OverlayEntry(
+          builder: (context) => TDMessage(
+            visible: true,
+            icon: true,
+            content: '带图标的通知',
+            theme: MessageTheme.info,
+            duration: 3000,
+            onDurationEnd: () {
+              overlayEntry.remove();
+            },
+          ),
+        );
+        overlay.insert(overlayEntry);
+      },
+    );
+  }
+
+  @Demo(group: 'message')
+  Widget _buildInfoMessage(BuildContext context) {
+    return TDButton(
+      isBlock: true,
+      text: '普通通知',
+      size: TDButtonSize.large,
+      type: TDButtonType.outline,
+      width: 450,
+      theme: TDButtonTheme.primary,
+      onTap: () {
+        final overlay = Overlay.of(context);
+        late OverlayEntry overlayEntry;
+        overlayEntry = OverlayEntry(
+          builder: (context) => TDMessage(
+            visible: true,
+            icon: true,
+            content: _commonContent,
+            theme: MessageTheme.info,
+            duration: 3000,
+            onDurationEnd: () {
+              overlayEntry.remove();
+            },
+          ),
+        );
+        overlay.insert(overlayEntry);
+      },
+    );
+  }
+
+  @Demo(group: 'message')
+  Widget _buildSuccessMessage(BuildContext context) {
+    return TDButton(
+      isBlock: true,
+      text: '成功通知',
+      size: TDButtonSize.large,
+      type: TDButtonType.outline,
+      width: 450,
+      theme: TDButtonTheme.primary,
+      onTap: () {
+        final overlay = Overlay.of(context);
+        late OverlayEntry overlayEntry;
+        overlayEntry = OverlayEntry(
+          builder: (context) => TDMessage(
+            visible: true,
+            icon: true,
+            content: _commonContent,
+            theme: MessageTheme.success,
+            duration: 3000,
+            onDurationEnd: () {
+              overlayEntry.remove();
+            },
+          ),
+        );
+        overlay.insert(overlayEntry);
+      },
+    );
+  }
+
+  @Demo(group: 'message')
+  Widget _buildWarningMessage(BuildContext context) {
+    return TDButton(
+      isBlock: true,
+      text: '警示通知',
+      size: TDButtonSize.large,
+      type: TDButtonType.outline,
+      width: 450,
+      theme: TDButtonTheme.primary,
+      onTap: () {
+        final overlay = Overlay.of(context);
+        late OverlayEntry overlayEntry;
+        overlayEntry = OverlayEntry(
+          builder: (context) => TDMessage(
+            visible: true,
+            icon: true,
+            content: _commonContent,
+            theme: MessageTheme.warning,
+            duration: 3000,
+            onDurationEnd: () {
+              overlayEntry.remove();
+            },
+          ),
+        );
+        overlay.insert(overlayEntry);
+      },
+    );
+  }
+
+  @Demo(group: 'message')
+  Widget _buildErrorMessage(BuildContext context) {
+    return TDButton(
+      isBlock: true,
+      text: '错误通知',
+      size: TDButtonSize.large,
+      type: TDButtonType.outline,
+      width: 450,
+      theme: TDButtonTheme.primary,
+      onTap: () {
+        final overlay = Overlay.of(context);
+        late OverlayEntry overlayEntry;
+        overlayEntry = OverlayEntry(
+          builder: (context) => TDMessage(
+            visible: true,
+            icon: true,
+            content: _commonContent,
+            theme: MessageTheme.error,
+            duration: 3000,
+            onDurationEnd: () {
+              overlayEntry.remove();
+            },
+          ),
+        );
+        overlay.insert(overlayEntry);
+      },
+    );
+  }
+
+}
+
diff --git a/tdesign-component/example/pubspec.lock b/tdesign-component/example/pubspec.lock
index a208e30dd..6f53022af 100644
--- a/tdesign-component/example/pubspec.lock
+++ b/tdesign-component/example/pubspec.lock
@@ -315,7 +315,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.5"
+    version: "0.1.6"
   term_glyph:
     dependency: transitive
     description:
diff --git a/tdesign-component/lib/src/components/message/td_message.dart b/tdesign-component/lib/src/components/message/td_message.dart
new file mode 100644
index 000000000..8a4f5040f
--- /dev/null
+++ b/tdesign-component/lib/src/components/message/td_message.dart
@@ -0,0 +1,180 @@
+
+import 'package:flutter/material.dart';
+import 'package:flutter/src/scheduler/binding.dart';
+
+import '../../../tdesign_flutter.dart';
+import '../link/td_link.dart';
+
+// 定义消息对齐方式枚举
+enum MessageAlign {
+  /// 左对齐
+  left,
+
+  /// 右对齐
+  center
+}
+
+// 跑马灯配置
+class MessageMarquee {
+  final double? speed;
+  final int? loop;
+  final int? delay;
+
+  MessageMarquee({this.speed, this.loop, this.delay});
+}
+
+// 定义消息主题枚举
+enum MessageTheme {
+  /// 普通通知
+  info,
+
+  /// 成功通知
+  success,
+
+  /// 警示通知
+  warning,
+
+  /// 错误通知
+  error
+}
+
+// TDMessage 组件
+class TDMessage extends StatefulWidget {
+  /// 对齐方式
+  final MessageAlign? align;
+  /// 关闭按钮
+  final Widget? closeBtn;
+  /// 通知内容
+  final String? content;
+  /// 消息内置计时器
+  final int? duration;
+  /// 自定义消息前面的图标
+  final bool? icon;
+  /// 链接名称
+  final Widget? link;
+  /// 跑马灯效果
+  final MessageMarquee? marquee;
+  /// 相对于 placement 的偏移量
+  final List<double>? offset;
+  /// 消息组件风格 info/success/warning/error
+  final MessageTheme? theme;
+  /// 是否显示
+  final bool? visible;
+  /// 点击关闭按钮触发
+  final VoidCallback? onCloseBtnClick;
+  /// 计时结束后触发
+  final VoidCallback? onDurationEnd;
+  /// 点击链接文本时触发
+  final VoidCallback? onLinkClick;
+
+  const TDMessage({
+    Key? key,
+    this.align,
+    this.closeBtn,
+    this.content,
+    this.duration = 3000,
+    this.icon = true,
+    this.link,
+    this.marquee,
+    this.offset,
+    this.theme = MessageTheme.info,
+    this.visible = true,
+    this.onCloseBtnClick,
+    this.onDurationEnd,
+    this.onLinkClick,
+  }) : super(key: key);
+
+  @override
+  _TDMessageState createState() => _TDMessageState();
+}
+
+class _TDMessageState extends State<TDMessage> {
+  bool? _isVisible = true;
+  bool? _isIcon = true;
+
+  @override
+  void initState() {
+    super.initState();
+    _isVisible = widget.visible ?? true;
+    _isIcon = widget.icon ?? true;
+
+    if (widget.duration != null && widget.duration! > 0) {
+      Future.delayed(Duration(milliseconds: widget.duration!), _closeMessage);
+    }
+  }
+
+  void _closeMessage() {
+    if (mounted) {
+      setState(() {
+        _isVisible = false;
+      });
+      if (widget.onDurationEnd != null) {
+        WidgetsBinding.instance.addPostFrameCallback(() {
+          widget.onDurationEnd!();
+        } as FrameCallback);
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (!_isVisible!) {
+      return const SizedBox.shrink();
+    }
+
+    return Positioned(
+      left: widget.offset?[0] ?? (MediaQuery.of(context).size.width - 343) / 2,
+      top: widget.offset?[1] ?? 110,
+      child: Material(
+        color: Colors.transparent,
+        child: Container(
+          width: 343,
+          height: 48,
+          padding: const EdgeInsets.fromLTRB(16, 13, 16, 13),
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.circular(6),
+          ),
+          child: Row(
+            children: [
+              if (_isIcon != null && _isIcon!)
+                Padding(
+                  padding: const EdgeInsets.only(right: 16),
+                  child:
+                    SizedBox(
+                      width: 22,
+                      height: 22,
+                      child: getIcon(context),
+                    ),
+                ),
+              Expanded(
+                child: Text(
+                  widget.content ?? '',
+                  style: const TextStyle(color: Colors.black),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget getIcon(BuildContext context) {
+    if (widget.icon != null) {
+      switch (widget.theme) {
+        case MessageTheme.info:
+          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).brandColor7);
+        case MessageTheme.success:
+          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).successColor5);
+        case MessageTheme.warning:
+          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).warningColor5);
+        case MessageTheme.error:
+          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).errorColor6);
+        case null:
+          return const SizedBox.shrink();
+      }
+    }
+    return const SizedBox.shrink();
+  }
+}
\ No newline at end of file
diff --git a/tdesign-component/lib/tdesign_flutter.dart b/tdesign-component/lib/tdesign_flutter.dart
index 3efc7f50e..332cbecd6 100644
--- a/tdesign-component/lib/tdesign_flutter.dart
+++ b/tdesign-component/lib/tdesign_flutter.dart
@@ -35,6 +35,7 @@ export 'src/components/link/td_link.dart';
 export 'src/components/loading/td_circle_indicator.dart';
 export 'src/components/loading/td_loading.dart';
 export 'src/components/loading/td_loading_controller.dart';
+export 'src/components/message/td_message.dart';
 export 'src/components/navbar/td_nav_bar.dart';
 export 'src/components/picker/td_date_picker.dart';
 export 'src/components/picker/td_item_widget.dart';

From 579d471389be1dd4ccf8d2d722a06c692d1fffdb Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Sat, 24 Aug 2024 18:22:22 +0800
Subject: [PATCH 37/74] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8image?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/example/lib/page/td_message_page.dart | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_message_page.dart b/tdesign-component/example/lib/page/td_message_page.dart
index 6af0140fe..021b3f229 100644
--- a/tdesign-component/example/lib/page/td_message_page.dart
+++ b/tdesign-component/example/lib/page/td_message_page.dart
@@ -15,10 +15,6 @@ class _TDMessagePageState extends State<TDMessagePage> {
 
   final _commonContent = '这是一条普通的通知信息';
 
-  final _demoImage = Image.asset(
-    'assets/img/image.png',
-  );
-
   @override
   Widget build(BuildContext context) {
     return ExamplePage(

From 97173889fdeef1d359d858a31a0531a3597bf418 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Sat, 24 Aug 2024 19:16:06 +0800
Subject: [PATCH 38/74] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A2=E5=85=A5?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/message/td_message.dart    | 131 +++++++++---------
 1 file changed, 68 insertions(+), 63 deletions(-)

diff --git a/tdesign-component/lib/src/components/message/td_message.dart b/tdesign-component/lib/src/components/message/td_message.dart
index 8a4f5040f..4fa886868 100644
--- a/tdesign-component/lib/src/components/message/td_message.dart
+++ b/tdesign-component/lib/src/components/message/td_message.dart
@@ -89,14 +89,19 @@ class TDMessage extends StatefulWidget {
 }
 
 class _TDMessageState extends State<TDMessage> {
-  bool? _isVisible = true;
-  bool? _isIcon = true;
+  bool _isVisible = true;
+  double _topOffset = 0;
 
   @override
   void initState() {
     super.initState();
-    _isVisible = widget.visible ?? true;
-    _isIcon = widget.icon ?? true;
+    _topOffset = (widget.offset?[1] ?? 110) - 30;
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      setState(() {
+        _topOffset = widget.offset?[1] ?? 110;
+      });
+    });
 
     if (widget.duration != null && widget.duration! > 0) {
       Future.delayed(Duration(milliseconds: widget.duration!), _closeMessage);
@@ -104,77 +109,77 @@ class _TDMessageState extends State<TDMessage> {
   }
 
   void _closeMessage() {
-    if (mounted) {
-      setState(() {
-        _isVisible = false;
-      });
-      if (widget.onDurationEnd != null) {
-        WidgetsBinding.instance.addPostFrameCallback(() {
-          widget.onDurationEnd!();
-        } as FrameCallback);
+    setState(() {
+      _topOffset = (widget.offset?[1] ?? 110) - 30;
+    });
+
+    Future.delayed(const Duration(milliseconds: 300), () {
+      if (mounted) {
+        setState(() {
+          _isVisible = false;
+        });
+        widget.onDurationEnd?.call();
       }
-    }
+    });
   }
 
   @override
   Widget build(BuildContext context) {
-    if (!_isVisible!) {
-      return const SizedBox.shrink();
-    }
-
-    return Positioned(
-      left: widget.offset?[0] ?? (MediaQuery.of(context).size.width - 343) / 2,
-      top: widget.offset?[1] ?? 110,
-      child: Material(
-        color: Colors.transparent,
-        child: Container(
-          width: 343,
-          height: 48,
-          padding: const EdgeInsets.fromLTRB(16, 13, 16, 13),
-          decoration: BoxDecoration(
-            color: Colors.white,
-            borderRadius: BorderRadius.circular(6),
-          ),
-          child: Row(
-            children: [
-              if (_isIcon != null && _isIcon!)
-                Padding(
-                  padding: const EdgeInsets.only(right: 16),
-                  child:
-                    SizedBox(
-                      width: 22,
-                      height: 22,
-                      child: getIcon(context),
-                    ),
+    var _leftOffset = widget.offset?[0] ?? (MediaQuery.of(context).size.width - 343) / 2;
+
+    return AnimatedPositioned(
+      duration: const Duration(milliseconds: 300),
+      curve: Curves.easeInOut,
+      top: _topOffset,
+      left: _leftOffset,
+      child: _isVisible
+          ? Material(
+              color: Colors.transparent,
+              child: Container(
+                width: 343,
+                height: 48,
+                padding: const EdgeInsets.fromLTRB(16, 13, 16, 13),
+                decoration: BoxDecoration(
+                  color: Colors.white,
+                  borderRadius: BorderRadius.circular(6),
                 ),
-              Expanded(
-                child: Text(
-                  widget.content ?? '',
-                  style: const TextStyle(color: Colors.black),
+                child: Row(
+                  children: [
+                    if (widget.icon ?? true)
+                      Padding(
+                        padding: const EdgeInsets.only(right: 16),
+                        child: SizedBox(
+                          width: 22,
+                          height: 22,
+                          child: getIcon(context),
+                        ),
+                      ),
+                    Expanded(
+                      child: Text(
+                        widget.content ?? '',
+                        style: const TextStyle(color: Colors.black),
+                      ),
+                    ),
+                  ],
                 ),
               ),
-            ],
-          ),
-        ),
-      ),
+            )
+          : const SizedBox.shrink(),
     );
   }
 
   Widget getIcon(BuildContext context) {
-    if (widget.icon != null) {
-      switch (widget.theme) {
-        case MessageTheme.info:
-          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).brandColor7);
-        case MessageTheme.success:
-          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).successColor5);
-        case MessageTheme.warning:
-          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).warningColor5);
-        case MessageTheme.error:
-          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).errorColor6);
-        case null:
-          return const SizedBox.shrink();
-      }
+    switch (widget.theme) {
+      case MessageTheme.info:
+        return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).brandColor7);
+      case MessageTheme.success:
+        return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).successColor5);
+      case MessageTheme.warning:
+        return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).warningColor5);
+      case MessageTheme.error:
+        return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).errorColor6);
+      case null:
+        return const SizedBox.shrink();
     }
-    return const SizedBox.shrink();
   }
 }
\ No newline at end of file

From 686030cc13a32418d1cdf3784ebe50196ad40a3e Mon Sep 17 00:00:00 2001
From: Luozf12345 <2515187986@qq.com>
Date: Sat, 24 Aug 2024 19:51:42 +0800
Subject: [PATCH 39/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4lock=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/example/pubspec.lock | 369 +++++++++++++++++++++++++
 tdesign-component/pubspec.lock         | 205 ++++++++++++++
 2 files changed, 574 insertions(+)

diff --git a/tdesign-component/example/pubspec.lock b/tdesign-component/example/pubspec.lock
index e69de29bb..8007789c3 100644
--- a/tdesign-component/example/pubspec.lock
+++ b/tdesign-component/example/pubspec.lock
@@ -0,0 +1,369 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  args:
+    dependency: transitive
+    description:
+      name: args
+      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  async:
+    dependency: transitive
+    description:
+      name: async
+      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.10.0"
+  boolean_selector:
+    dependency: transitive
+    description:
+      name: boolean_selector
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.17.0"
+  cupertino_icons:
+    dependency: "direct main"
+    description:
+      name: cupertino_icons
+      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.1"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_easyrefresh:
+    dependency: transitive
+    description:
+      name: flutter_easyrefresh
+      sha256: "5d161ee5dcac34da9065116568147d742dd25fb9bff3b10024d9054b195087ad"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
+  flutter_lints:
+    dependency: "direct dev"
+    description:
+      name: flutter_lints
+      sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  flutter_localizations:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_markdown:
+    dependency: "direct main"
+    description:
+      name: flutter_markdown
+      sha256: dc6d5258653f6857135b32896ccda7f7af0c54dcec832495ad6835154c6c77c0
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.15"
+  flutter_slidable:
+    dependency: transitive
+    description:
+      name: flutter_slidable
+      sha256: "673403d2eeef1f9e8483bd6d8d92aae73b1d8bd71f382bc3930f699c731bc27c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
+  flutter_swiper_null_safety:
+    dependency: "direct main"
+    description:
+      name: flutter_swiper_null_safety
+      sha256: "5a855e0080d035c08e82f8b7fd2f106344943a30c9ab483b2584860a2f22eaaf"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  flutter_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  http:
+    dependency: "direct main"
+    description:
+      name: http
+      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.13.6"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.2"
+  intl:
+    dependency: "direct main"
+    description:
+      name: intl
+      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.17.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.5"
+  lints:
+    dependency: transitive
+    description:
+      name: lints
+      sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  markdown:
+    dependency: transitive
+    description:
+      name: markdown
+      sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.1.1"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.12.13"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.8.0"
+  path:
+    dependency: transitive
+    description:
+      name: path
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.8.2"
+  path_provider:
+    dependency: "direct main"
+    description:
+      name: path_provider
+      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.1"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  path_provider_windows:
+    dependency: transitive
+    description:
+      name: path_provider_windows
+      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.3"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.6"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.99"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.1"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.11.0"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
+  tdesign_flutter:
+    dependency: "direct main"
+    description:
+      path: ".."
+      relative: true
+    source: path
+    version: "0.1.6"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
+  test_api:
+    dependency: transitive
+    description:
+      name: test_api
+      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.16"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.2"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+  win32:
+    dependency: transitive
+    description:
+      name: win32
+      sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.4"
+  xdg_directories:
+    dependency: transitive
+    description:
+      name: xdg_directories
+      sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.3"
+sdks:
+  dart: ">=2.19.0 <4.0.0"
+  flutter: ">=3.7.0"
diff --git a/tdesign-component/pubspec.lock b/tdesign-component/pubspec.lock
index e69de29bb..c6118d91c 100644
--- a/tdesign-component/pubspec.lock
+++ b/tdesign-component/pubspec.lock
@@ -0,0 +1,205 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  async:
+    dependency: transitive
+    description:
+      name: async
+      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.10.0"
+  boolean_selector:
+    dependency: transitive
+    description:
+      name: boolean_selector
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.17.0"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.1"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_easyrefresh:
+    dependency: "direct main"
+    description:
+      name: flutter_easyrefresh
+      sha256: "5d161ee5dcac34da9065116568147d742dd25fb9bff3b10024d9054b195087ad"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
+  flutter_lints:
+    dependency: "direct dev"
+    description:
+      name: flutter_lints
+      sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  flutter_slidable:
+    dependency: "direct main"
+    description:
+      name: flutter_slidable
+      sha256: "673403d2eeef1f9e8483bd6d8d92aae73b1d8bd71f382bc3930f699c731bc27c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
+  flutter_swiper_null_safety:
+    dependency: "direct main"
+    description:
+      name: flutter_swiper_null_safety
+      sha256: "5a855e0080d035c08e82f8b7fd2f106344943a30c9ab483b2584860a2f22eaaf"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  flutter_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.5"
+  lints:
+    dependency: transitive
+    description:
+      name: lints
+      sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.12.13"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.8.0"
+  path:
+    dependency: transitive
+    description:
+      name: path
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.8.2"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.99"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.1"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.11.0"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
+  test_api:
+    dependency: transitive
+    description:
+      name: test_api
+      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.16"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+sdks:
+  dart: ">=2.19.0 <4.0.0"
+  flutter: ">=3.7.0"

From c5d101b64291611e8a4e3a933478eedaa6678230 Mon Sep 17 00:00:00 2001
From: zflyluo <zflyluo@tencent.com>
Date: Sat, 24 Aug 2024 21:24:26 +0800
Subject: [PATCH 40/74] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_date_picker_page.dart | 33 ++++++++++++++++++-
 .../src/components/picker/td_date_picker.dart | 21 +++++-------
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_date_picker_page.dart b/tdesign-component/example/lib/page/td_date_picker_page.dart
index fa73d8026..0ba3d4b9d 100644
--- a/tdesign-component/example/lib/page/td_date_picker_page.dart
+++ b/tdesign-component/example/lib/page/td_date_picker_page.dart
@@ -52,7 +52,10 @@ class _TDDatePickerPageState extends State<TDDatePickerPage> {
               ExampleItem(desc: '不带标题', builder: buildWithoutTitle),
             ],
           )
-        ]);
+        ],
+    test: [
+      ExampleItem(desc: '指定开始时间', builder: _customStartTime),
+    ],);
   }
 
   @Demo(group: 'datetimePicker')
@@ -273,4 +276,32 @@ class _TDDatePickerPageState extends State<TDDatePickerPage> {
       ),
     );
   }
+
+  @Demo(group: 'datetimePicker')
+  Widget _customStartTime(BuildContext context) {
+
+    return GestureDetector(
+      onTap: (){
+        TDPicker.showDatePicker(context, title: '选择时间',
+            onConfirm: (selected) {
+              setState(() {
+                selected_5 = '${selected['year'].toString().padLeft(4, '0')}-'
+                    '${selected['month'].toString().padLeft(2, '0')}-'
+                    '${selected['day'].toString().padLeft(2, '0')} '
+                    '${selected['hour'].toString().padLeft(2, '0')}:'
+                    '${selected['minute'].toString().padLeft(2, '0')}:'
+                    '${selected['second'].toString().padLeft(2, '0')}';
+              });
+              Navigator.of(context).pop();
+            },
+            useHour: true,
+            useMinute: true,
+            useSecond: true,
+            dateStart: [2012, 1, 15,12],
+            dateEnd: [2012, 6, 15,12,48,59],
+            initialDate: [2012, 1, 15,13,20,22]);
+      },
+      child: buildSelectRow(context, selected_5, '选择时间'),
+    );
+  }
 }
diff --git a/tdesign-component/lib/src/components/picker/td_date_picker.dart b/tdesign-component/lib/src/components/picker/td_date_picker.dart
index 1758d3c9a..2f2c8afc7 100644
--- a/tdesign-component/lib/src/components/picker/td_date_picker.dart
+++ b/tdesign-component/lib/src/components/picker/td_date_picker.dart
@@ -446,18 +446,13 @@ class DatePickerModel {
   }
 
   void setInitialTime() {
-    var startTime = DateTime(dateStart[0], dateStart[1], dateStart[2], dateStart.length > 3 ? dateStart[3] : 0,
-        dateStart.length > 4 ? dateStart[4] : 0, dateStart.length > 5 ? dateStart[5] : 0);
-    var endTime = DateTime(dateEnd[0], dateEnd[1], dateEnd[2], dateEnd.length > 3 ? dateEnd[3] : 0,
-        dateEnd.length > 4 ? dateEnd[4] : 0, dateEnd.length > 5 ? dateEnd[5] : 0);
+    dateStart = List.generate(6, (index) => index < dateStart.length ? dateStart[index] : 0);
+    var startTime = DateTime(dateStart[0],dateStart[1],dateStart[2],dateStart[3],dateStart[4],dateStart[5]);
+    dateEnd = List.generate(6, (index) => index < dateEnd.length ? dateEnd[index] : 0);
+    var endTime = DateTime(dateEnd[0],dateEnd[1],dateEnd[2],dateEnd[3],dateEnd[4],dateEnd[5],);
     if (dateInitial != null) {
-      initialTime = DateTime(
-          dateInitial![0],
-          dateInitial![1],
-          dateInitial![2],
-          dateInitial!.length > 3 ? dateInitial![3] : 0,
-          dateInitial!.length > 4 ? dateInitial![4] : 0,
-          dateInitial!.length > 5 ? dateInitial![5] : 0);
+      var initList = List.generate(6, (index) => index < dateInitial!.length ? dateInitial![index] : 0);
+      initialTime = DateTime(initList[0], initList[1], initList[2], initList[3], initList[4], initList[5]);
       if (initialTime.isBefore(startTime)) {
         initialTime = startTime;
       } else if (initialTime.isAfter(endTime)) {
@@ -468,9 +463,9 @@ class DatePickerModel {
 
     var now = DateTime.now();
     if (now.isBefore(startTime)) {
-      initialTime = DateTime(dateStart[0], dateStart[1], dateStart[2], now.hour, now.minute, now.second);
+      initialTime = startTime.copyWith();
     } else if (now.isAfter(endTime)) {
-      initialTime = DateTime(dateEnd[0], dateEnd[1], dateEnd[2], now.hour, now.minute, now.second);
+      initialTime = startTime.copyWith();
     } else {
       initialTime = now;
     }

From db43b41c6a920125d0a19f4957889bd1405f8616 Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Sat, 24 Aug 2024 22:08:06 +0800
Subject: [PATCH 41/74] =?UTF-8?q?merge=20=E6=96=B0=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/example/pubspec.lock | 46 +++++++++++++-------------
 tdesign-component/pubspec.lock         | 42 +++++++++++------------
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/tdesign-component/example/pubspec.lock b/tdesign-component/example/pubspec.lock
index 8007789c3..8afca61e1 100644
--- a/tdesign-component/example/pubspec.lock
+++ b/tdesign-component/example/pubspec.lock
@@ -13,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -29,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
@@ -45,10 +45,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.17.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -148,18 +148,18 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.17.0"
+    version: "0.18.1"
   js:
     dependency: transitive
     description:
       name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.5"
+    version: "0.6.7"
   lints:
     dependency: transitive
     description:
@@ -180,34 +180,34 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
   path_provider:
     dependency: "direct main"
     description:
@@ -281,10 +281,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
@@ -328,10 +328,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.16"
+    version: "0.6.0"
   typed_data:
     dependency: transitive
     description:
@@ -365,5 +365,5 @@ packages:
     source: hosted
     version: "1.0.3"
 sdks:
-  dart: ">=2.19.0 <4.0.0"
+  dart: ">=3.0.0-0 <4.0.0"
   flutter: ">=3.7.0"
diff --git a/tdesign-component/pubspec.lock b/tdesign-component/pubspec.lock
index c6118d91c..0831aa003 100644
--- a/tdesign-component/pubspec.lock
+++ b/tdesign-component/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -21,10 +21,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.17.2"
   fake_async:
     dependency: transitive
     description:
@@ -95,10 +95,10 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.5"
+    version: "0.6.7"
   lints:
     dependency: transitive
     description:
@@ -111,34 +111,34 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -148,10 +148,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
@@ -188,10 +188,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.16"
+    version: "0.6.0"
   vector_math:
     dependency: transitive
     description:
@@ -201,5 +201,5 @@ packages:
     source: hosted
     version: "2.1.4"
 sdks:
-  dart: ">=2.19.0 <4.0.0"
+  dart: ">=3.0.0-0 <4.0.0"
   flutter: ">=3.7.0"

From 3539f6419b7932ab4db7f9c6e38ee54a509c56cc Mon Sep 17 00:00:00 2001
From: 221250009 <221250009@smail.nju.edu.cn>
Date: Sat, 24 Aug 2024 23:42:36 +0800
Subject: [PATCH 42/74] =?UTF-8?q?=E9=A2=9C=E8=89=B2=E8=B7=9F=E9=9A=8F?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=BB=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_progress_page.dart    |  56 +++---
 .../src/components/progress/td_progress.dart  | 160 +++++++++---------
 2 files changed, 109 insertions(+), 107 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_progress_page.dart b/tdesign-component/example/lib/page/td_progress_page.dart
index 9810bfd57..b0ba4c007 100644
--- a/tdesign-component/example/lib/page/td_progress_page.dart
+++ b/tdesign-component/example/lib/page/td_progress_page.dart
@@ -96,31 +96,31 @@ class _TDProgressPageState extends State<TDProgressPage> {
   @Demo(group: 'progress')
   Widget _buildRightLabelLinear(BuildContext context) {
     return TDProgress(
-        type: ProgressType.linear,
+        type: TDProgressType.linear,
         value: 0.8,
         strokeWidth: 6,
-        progressLabelPosition: ProgressLabelPosition.right);
+        progressLabelPosition: TDProgressLabelPosition.right);
   }
 
   @Demo(group: 'progress')
   Widget _buildInsideLabelLinear(BuildContext context) {
-    return TDProgress(type: ProgressType.linear, value: 0.8);
+    return TDProgress(type: TDProgressType.linear, value: 0.8);
   }
 
   @Demo(group: 'progress')
   Widget _buildCircle(BuildContext context) {
-    return TDProgress(type: ProgressType.circular, value: 0.3);
+    return TDProgress(type: TDProgressType.circular, value: 0.3);
   }
 
   @Demo(group: 'progress')
   Widget _buildMicro(BuildContext context) {
-    return TDProgress(type: ProgressType.micro, value: 0.75);
+    return TDProgress(type: TDProgressType.micro, value: 0.75);
   }
 
   @Demo(group: 'progress')
   Widget _buildButton(BuildContext context) {
     return TDProgress(
-        type: ProgressType.button,
+        type: TDProgressType.button,
         onTap: _toggleProgress,
         onLongPress: _resetProgress,
         value: progressValue,
@@ -133,7 +133,7 @@ class _TDProgressPageState extends State<TDProgressPage> {
       mainAxisAlignment: MainAxisAlignment.start,
       children: [
         TDProgress(
-          type: ProgressType.micro,
+          type: TDProgressType.micro,
           value: microProgressValue,
           onTap: _toggleMicroProgress,
           label: TDIconLabel(isPlaying ? Icons.pause : Icons.play_arrow,
@@ -141,7 +141,7 @@ class _TDProgressPageState extends State<TDProgressPage> {
         ),
         const SizedBox(width: 10),
         TDProgress(
-          type: ProgressType.micro,
+          type: TDProgressType.micro,
           value: microProgressValue,
           onTap: _resetMicroProgress,
           label: TDIconLabel(Icons.stop,
@@ -154,72 +154,72 @@ class _TDProgressPageState extends State<TDProgressPage> {
   @Demo(group: 'progress')
   Widget _buildPrimary(BuildContext context) {
     return TDProgress(
-        type: ProgressType.linear,
-        progressStatus: ProgressStatus.primary,
+        type: TDProgressType.linear,
+        progressStatus: TDProgressStatus.primary,
         value: 0.8,
         strokeWidth: 6,
-        progressLabelPosition: ProgressLabelPosition.right);
+        progressLabelPosition: TDProgressLabelPosition.right);
   }
 
   @Demo(group: 'progress')
   Widget _buildWarning(BuildContext context) {
     return TDProgress(
-        type: ProgressType.linear,
-        progressStatus: ProgressStatus.warning,
+        type: TDProgressType.linear,
+        progressStatus: TDProgressStatus.warning,
         value: 0.8,
         strokeWidth: 6,
-        progressLabelPosition: ProgressLabelPosition.right);
+        progressLabelPosition: TDProgressLabelPosition.right);
   }
 
   @Demo(group: 'progress')
   Widget _buildDanger(BuildContext context) {
     return TDProgress(
-        type: ProgressType.linear,
-        progressStatus: ProgressStatus.danger,
+        type: TDProgressType.linear,
+        progressStatus: TDProgressStatus.danger,
         value: 0.8,
         strokeWidth: 6,
-        progressLabelPosition: ProgressLabelPosition.right);
+        progressLabelPosition: TDProgressLabelPosition.right);
   }
 
   @Demo(group: 'progress')
   Widget _buildSuccess(BuildContext context) {
     return TDProgress(
-        type: ProgressType.linear,
-        progressStatus: ProgressStatus.success,
+        type: TDProgressType.linear,
+        progressStatus: TDProgressStatus.success,
         value: 0.8,
         strokeWidth: 6,
-        progressLabelPosition: ProgressLabelPosition.right);
+        progressLabelPosition: TDProgressLabelPosition.right);
   }
 
   @Demo(group: 'progress')
   Widget _buildCirclePrimary(BuildContext context) {
     return TDProgress(
-        type: ProgressType.circular,
-        progressStatus: ProgressStatus.primary,
+        type: TDProgressType.circular,
+        progressStatus: TDProgressStatus.primary,
         value: 0.3);
   }
 
   @Demo(group: 'progress')
   Widget _buildCircleWarning(BuildContext context) {
     return TDProgress(
-        type: ProgressType.circular,
-        progressStatus: ProgressStatus.warning,
+        type: TDProgressType.circular,
+        progressStatus: TDProgressStatus.warning,
         value: 0.3);
   }
 
   @Demo(group: 'progress')
   Widget _buildCircleDanger(BuildContext context) {
     return TDProgress(
-        type: ProgressType.circular,
-        progressStatus: ProgressStatus.danger,
+        type: TDProgressType.circular,
+        progressStatus: TDProgressStatus.danger,
         value: 0.3);
   }
 
   @Demo(group: 'progress')
   Widget _buildCircleSuccess(BuildContext context) {
     return TDProgress(
-        type: ProgressType.circular,
-        progressStatus: ProgressStatus.success,
+        type: TDProgressType.circular,
+        progressStatus: TDProgressStatus.success,
         value: 1);
   }
 
diff --git a/tdesign-component/lib/src/components/progress/td_progress.dart b/tdesign-component/lib/src/components/progress/td_progress.dart
index b0773210c..6cb4067cb 100644
--- a/tdesign-component/lib/src/components/progress/td_progress.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress.dart
@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
 import '../../../tdesign_flutter.dart';
 
-enum ProgressType { linear, circular, micro, button }
+enum TDProgressType { linear, circular, micro, button }
 
-enum ProgressLabelPosition { inside, left, right }
+enum TDProgressLabelPosition { inside, left, right }
 
-enum ProgressStatus { primary, warning, danger, success }
+enum TDProgressStatus { primary, warning, danger, success }
 
-enum ProgressStrokeCap { round, square, butt }
+enum TDProgressStrokeCap { round, square, butt }
 
-enum ProgressAnimationCurve { easeIn, easeOut, easeInout }
+enum TDProgressAnimationCurve { easeIn, easeOut, easeInout }
 
 abstract class TDLabelWidget extends Widget {
   const TDLabelWidget({super.key});
@@ -28,7 +28,7 @@ class TDIconLabel extends Icon implements TDLabelWidget {
 /// 进度条组件
 class TDProgress extends StatelessWidget {
   /// 进度条类型
-  final ProgressType type;
+  final TDProgressType type;
 
   /// 进度值 (0.0 到 1.0 之间的正数)
   final double? value;
@@ -37,10 +37,10 @@ class TDProgress extends StatelessWidget {
   final TDLabelWidget? label;
 
   /// 进度条状态
-  final ProgressStatus progressStatus;
+  final TDProgressStatus progressStatus;
 
   /// 标签显示位置
-  final ProgressLabelPosition progressLabelPosition;
+  final TDProgressLabelPosition progressLabelPosition;
 
   /// 进度条粗细 (正数)
   final double? strokeWidth;
@@ -52,7 +52,7 @@ class TDProgress extends StatelessWidget {
   final Color? backgroundColor;
 
   /// 进度条末端形状
-  final ProgressStrokeCap? strokeCap;
+  final TDProgressStrokeCap? strokeCap;
 
   /// 环形进度条半径 (正数)
   final double? circleRadius;
@@ -74,8 +74,8 @@ class TDProgress extends StatelessWidget {
     required this.type,
     double? value,
     this.label,
-    this.progressStatus = ProgressStatus.primary,
-    this.progressLabelPosition = ProgressLabelPosition.inside,
+    this.progressStatus = TDProgressStatus.primary,
+    this.progressLabelPosition = TDProgressLabelPosition.inside,
     double? strokeWidth,
     this.color,
     this.backgroundColor,
@@ -103,7 +103,7 @@ class TDProgress extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final defaultValues = _getDefaultValues(type);
+    final defaultValues = _getDefaultValues(context, type);
     return ProgressIndicator(
       value: value,
       label: label,
@@ -118,38 +118,38 @@ class TDProgress extends StatelessWidget {
       onTap: onTap,
       onLongPress: onLongPress,
       type: type,
-
+      context: context,
     );
   }
 
-  _DefaultValues _getDefaultValues(ProgressType type) {
+  _DefaultValues _getDefaultValues(BuildContext context, TDProgressType type) {
     switch (type) {
-      case ProgressType.linear:
+      case TDProgressType.linear:
         return _DefaultValues(
           strokeWidth: 20.0,
-          backgroundColor: TDTheme.of().grayColor3,
-          strokeCap: ProgressStrokeCap.round,
+          backgroundColor: TDTheme.of(context).grayColor3,
+          strokeCap: TDProgressStrokeCap.round,
           circleRadius: 0,
         );
-      case ProgressType.circular:
+      case TDProgressType.circular:
         return _DefaultValues(
           strokeWidth: 5.0,
-          backgroundColor: TDTheme.of().grayColor2,
-          strokeCap: ProgressStrokeCap.round,
+          backgroundColor: TDTheme.of(context).grayColor2,
+          strokeCap: TDProgressStrokeCap.round,
           circleRadius: 80.0,
         );
-      case ProgressType.micro:
+      case TDProgressType.micro:
         return _DefaultValues(
           strokeWidth: 2.0,
-          backgroundColor: TDTheme.of().grayColor2,
-          strokeCap: ProgressStrokeCap.round,
+          backgroundColor: TDTheme.of(context).grayColor2,
+          strokeCap: TDProgressStrokeCap.round,
           circleRadius: 20.0,
         );
-      case ProgressType.button:
+      case TDProgressType.button:
         return _DefaultValues(
           strokeWidth: 60.0,
-          backgroundColor: TDTheme.of().brandNormalColor,
-          strokeCap: ProgressStrokeCap.butt,
+          backgroundColor: TDTheme.of(context).brandNormalColor,
+          strokeCap: TDProgressStrokeCap.butt,
           circleRadius: 0,
         );
     }
@@ -159,7 +159,7 @@ class TDProgress extends StatelessWidget {
 class _DefaultValues {
   final double strokeWidth;
   final Color backgroundColor;
-  final ProgressStrokeCap strokeCap;
+  final TDProgressStrokeCap strokeCap;
   final double circleRadius;
 
   _DefaultValues({
@@ -174,35 +174,37 @@ class _DefaultValues {
 class ProgressIndicator extends StatefulWidget {
   final double? value;
   final TDLabelWidget? label;
-  final ProgressLabelPosition progressLabelPosition;
+  final TDProgressLabelPosition progressLabelPosition;
   final double strokeWidth;
   final double circleRadius;
-  final ProgressStrokeCap strokeCap;
+  final TDProgressStrokeCap strokeCap;
   final Color? color;
   final Color backgroundColor;
-  final ProgressType type;
-  final ProgressStatus progressStatus;
+  final TDProgressType type;
+  final TDProgressStatus progressStatus;
   final bool showLabel;
   final VoidCallback? onTap;
   final VoidCallback? onLongPress;
   final int animationDuration;
+  final BuildContext? context;
 
   const ProgressIndicator({
     Key? key,
     this.value,
     this.label,
-    this.progressLabelPosition = ProgressLabelPosition.inside,
+    this.progressLabelPosition = TDProgressLabelPosition.inside,
     required this.strokeWidth,
     required this.strokeCap,
     required this.circleRadius,
     this.color,
     required this.backgroundColor,
     required this.type,
-    this.progressStatus = ProgressStatus.primary,
+    this.progressStatus = TDProgressStatus.primary,
     this.showLabel = true,
     this.onTap,
     this.onLongPress,
     this.animationDuration = 300,
+    this.context,
   }) : super(key: key);
 
   @override
@@ -246,11 +248,11 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
 
   BorderRadius _getBorderRadius() {
     switch (widget.strokeCap) {
-      case ProgressStrokeCap.round:
+      case TDProgressStrokeCap.round:
         return BorderRadius.circular(widget.strokeWidth / 2);
-      case ProgressStrokeCap.square:
+      case TDProgressStrokeCap.square:
         return BorderRadius.zero;
-      case ProgressStrokeCap.butt:
+      case TDProgressStrokeCap.butt:
         return BorderRadius.circular(widget.strokeWidth / 6);
     }
   }
@@ -271,30 +273,30 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
     _animationController.forward(from: 0);
   }
 
-  Widget _getDefaultLabelFromStatus(ProgressStatus status) {
+  Widget _getDefaultLabelFromStatus(TDProgressStatus status) {
     final showAutoText = widget.value != null;
     final showInsideLabel =
-        widget.progressLabelPosition == ProgressLabelPosition.inside &&
-            widget.type != ProgressType.circular;
-    final showIconBorder = widget.type == ProgressType.linear;
+        widget.progressLabelPosition == TDProgressLabelPosition.inside &&
+            widget.type != TDProgressType.circular;
+    final showIconBorder = widget.type == TDProgressType.linear;
 
-    Widget getAutoText() => showAutoText && widget.type != ProgressType.micro
+    Widget getAutoText() => showAutoText && widget.type != TDProgressType.micro
         ? Text('${(widget.value! * 100).round()}%')
         : const Text('');
 
     final statusWidgets = {
-      ProgressStatus.primary: getAutoText(),
-      ProgressStatus.warning: showInsideLabel
+      TDProgressStatus.primary: getAutoText(),
+      TDProgressStatus.warning: showInsideLabel
           ? getAutoText()
           : showIconBorder
               ? const Icon(TDIcons.error_circle_filled)
               : const Icon(TDIcons.error),
-      ProgressStatus.danger: showInsideLabel
+      TDProgressStatus.danger: showInsideLabel
           ? getAutoText()
           : showIconBorder
               ? const Icon(TDIcons.close_circle_filled)
               : const Icon(TDIcons.close),
-      ProgressStatus.success: showInsideLabel
+      TDProgressStatus.success: showInsideLabel
           ? getAutoText()
           : showIconBorder
               ? const Icon(TDIcons.check_circle_filled)
@@ -304,26 +306,26 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
     return statusWidgets[status] ?? getAutoText();
   }
 
-  Color _getColorFromStatus(ProgressStatus status) {
+  Color _getColorFromStatus(TDProgressStatus status) {
     switch (status) {
-      case ProgressStatus.primary:
-        return TDTheme.of().brandNormalColor;
-      case ProgressStatus.warning:
-        return TDTheme.of().warningNormalColor;
-      case ProgressStatus.danger:
-        return TDTheme.of().errorNormalColor;
-      case ProgressStatus.success:
-        return TDTheme.of().successNormalColor;
+      case TDProgressStatus.primary:
+        return TDTheme.of(widget.context).brandNormalColor;
+      case TDProgressStatus.warning:
+        return TDTheme.of(widget.context).warningNormalColor;
+      case TDProgressStatus.danger:
+        return TDTheme.of(widget.context).errorNormalColor;
+      case TDProgressStatus.success:
+        return TDTheme.of(widget.context).successNormalColor;
     }
   }
 
-  StrokeCap _getFlutterStrokeCap(ProgressStrokeCap cap) {
+  StrokeCap _getFlutterStrokeCap(TDProgressStrokeCap cap) {
     switch (cap) {
-      case ProgressStrokeCap.round:
+      case TDProgressStrokeCap.round:
         return StrokeCap.round;
-      case ProgressStrokeCap.square:
+      case TDProgressStrokeCap.square:
         return StrokeCap.square;
-      case ProgressStrokeCap.butt:
+      case TDProgressStrokeCap.butt:
         return StrokeCap.butt;
     }
   }
@@ -339,13 +341,13 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
     return Column(
       mainAxisSize: MainAxisSize.min,
       children: [
-        if (widget.type == ProgressType.linear)
+        if (widget.type == TDProgressType.linear)
           _buildLinearProgress()
-        else if (widget.type == ProgressType.circular)
+        else if (widget.type == TDProgressType.circular)
           _buildCircularProgress()
-        else if (widget.type == ProgressType.micro)
+        else if (widget.type == TDProgressType.micro)
           _buildMicroProgress()
-        else if (widget.type == ProgressType.button)
+        else if (widget.type == TDProgressType.button)
           _buildButtonProgress()
       ],
     );
@@ -357,7 +359,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
         final maxWidth = constraints.maxWidth;
 
         if (widget.value != null &&
-            widget.progressLabelPosition == ProgressLabelPosition.inside) {
+            widget.progressLabelPosition == TDProgressLabelPosition.inside) {
           return _buildInsideLabel(maxWidth);
         } else {
           return _buildOutsideLabel();
@@ -391,10 +393,10 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
         return Row(
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            if (widget.progressLabelPosition == ProgressLabelPosition.left)
+            if (widget.progressLabelPosition == TDProgressLabelPosition.left)
               Padding(
                 padding: const EdgeInsets.only(right: 8.0),
-                child: _buildLabelWidget(TDTheme.of().fontGyColor1),
+                child: _buildLabelWidget(TDTheme.of(context).fontGyColor1),
               ),
             Expanded(
               child: LinearProgressIndicator(
@@ -405,10 +407,10 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
                 minHeight: widget.strokeWidth,
               ),
             ),
-            if (widget.progressLabelPosition == ProgressLabelPosition.right)
+            if (widget.progressLabelPosition == TDProgressLabelPosition.right)
               Padding(
                 padding: const EdgeInsets.only(left: 8.0),
-                child: _buildLabelWidget(TDTheme.of().fontGyColor1),
+                child: _buildLabelWidget(TDTheme.of(context).fontGyColor1),
               ),
           ],
         );
@@ -439,7 +441,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
               alignment: Alignment.centerRight,
               child: Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 10.0),
-                child: _buildLabelWidget(TDTheme.of().fontWhColor1),
+                child: _buildLabelWidget(TDTheme.of(context).fontWhColor1),
               ),
             )
           : null,
@@ -461,7 +463,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
         if (widget.showLabel)
           Padding(
             padding: const EdgeInsets.symmetric(horizontal: 5.0),
-            child: _buildLabelWidget(TDTheme.of().fontGyColor1),
+            child: _buildLabelWidget(TDTheme.of(context).fontGyColor1),
           ),
       ],
     );
@@ -473,8 +475,8 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
     late FontWeight fontWeight;
 
     switch (widget.type) {
-      case ProgressType.linear:
-        if (widget.progressLabelPosition != ProgressLabelPosition.inside) {
+      case TDProgressType.linear:
+        if (widget.progressLabelPosition != TDProgressLabelPosition.inside) {
           fontSize = widget.strokeWidth > 14 ? widget.strokeWidth : 14;
           iconSize = widget.strokeWidth > 20 ? widget.strokeWidth : 20;
         } else {
@@ -483,17 +485,17 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
         }
         fontWeight = FontWeight.normal;
         break;
-      case ProgressType.circular:
+      case TDProgressType.circular:
         iconSize = widget.circleRadius * 0.4;
         fontSize = widget.circleRadius * 0.2;
         fontWeight = FontWeight.bold;
         break;
-      case ProgressType.micro:
+      case TDProgressType.micro:
         iconSize = widget.circleRadius * 0.6;
         fontSize = widget.circleRadius * 0.2;
         fontWeight = FontWeight.normal;
         break;
-      case ProgressType.button:
+      case TDProgressType.button:
         iconSize = widget.strokeWidth * 0.8;
         fontSize = widget.strokeWidth * 0.3;
         fontWeight = FontWeight.normal;
@@ -534,7 +536,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
                 ),
               ),
             ),
-            if (widget.showLabel) _buildLabelWidget(TDTheme.of().fontGyColor1),
+            if (widget.showLabel) _buildLabelWidget(TDTheme.of(widget.context).fontGyColor1),
           ],
         );
       },
@@ -553,7 +555,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
                 children: [
                   _buildMicroOutline(),
                   if (widget.showLabel)
-                    _buildLabelWidget(TDTheme.of().fontGyColor1),
+                    _buildLabelWidget(TDTheme.of(widget.context).fontGyColor1),
                 ],
               ));
         });
@@ -606,9 +608,9 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
     return Container(
       height: widget.strokeWidth,
       width: progressWidth,
-      decoration: const BoxDecoration(
+      decoration: BoxDecoration(
         gradient: LinearGradient(
-          colors: [Color(0x0096bbf8), Color(0x8096bbf8)],
+          colors: [_effectiveColor, TDTheme.of(widget.context).brandDisabledColor],
         ),
       ),
     );
@@ -618,7 +620,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
     return Container(
       height: widget.strokeWidth,
       alignment: Alignment.center,
-      child: _buildLabelWidget(TDTheme.of().fontWhColor1),
+      child: _buildLabelWidget(TDTheme.of(widget.context).fontWhColor1),
     );
   }
 }

From 04a035007d2e5323999e62592cadf00aa7e0bdb2 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Mon, 26 Aug 2024 23:04:28 +0800
Subject: [PATCH 43/74] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=92=8C=E9=93=BE=E6=8E=A5=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=9A=84=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_message_page.dart     | 104 ++++++-
 .../src/components/message/td_message.dart    | 261 +++++++++++++++---
 2 files changed, 322 insertions(+), 43 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_message_page.dart b/tdesign-component/example/lib/page/td_message_page.dart
index 021b3f229..082f3d7d9 100644
--- a/tdesign-component/example/lib/page/td_message_page.dart
+++ b/tdesign-component/example/lib/page/td_message_page.dart
@@ -27,9 +27,9 @@ class _TDMessagePageState extends State<TDMessagePage> {
             children: [
                 ExampleItem(desc: '纯文字的通知', builder: _buildPlainTextMessage),
                 ExampleItem(desc: '带图标的通知', builder: _buildIconTextMessage),
-                // ExampleItem(desc: '带关闭的通知', builder: _buildInputNormal),
-                // ExampleItem(desc: '可滚动的通知', builder: _buildImageTop),
-                // ExampleItem(desc: '带按钮的通知', builder: _buildImageTopNoTitle),
+                ExampleItem(desc: '带关闭的通知', builder: _buildMessageWithCloseButton),
+                ExampleItem(desc: '可滚动的通知', builder: _buildRollingMessage),
+                ExampleItem(desc: '带按钮的通知', builder: _buildLinkMessage),
         ]),
         ExampleModule(
             title: '组件状态',
@@ -86,12 +86,105 @@ class _TDMessagePageState extends State<TDMessagePage> {
           builder: (context) => TDMessage(
             visible: true,
             icon: true,
-            content: '带图标的通知',
+            content: _commonContent,
             theme: MessageTheme.info,
             duration: 3000,
+          ),
+        );
+        overlay.insert(overlayEntry);
+      },
+    );
+  }
+  @Demo(group: 'message')
+  Widget _buildMessageWithCloseButton(BuildContext context) {
+    return TDButton(
+      isBlock: true,
+      text: '带关闭的通知',
+      size: TDButtonSize.large,
+      type: TDButtonType.outline,
+      width: 450,
+      theme: TDButtonTheme.primary,
+      onTap: () {
+        final overlay = Overlay.of(context);
+        late OverlayEntry overlayEntry;
+        overlayEntry = OverlayEntry(
+          builder: (context) => TDMessage(
+            visible: true,
+            icon: true,
+            content: _commonContent,
+            theme: MessageTheme.info,
+            duration: 300000,
+            closeBtn: true,
+            link: '按钮',
+            onDurationEnd: () {
+              overlayEntry.remove();
+            },
+            onCloseBtnClick: () {
+              print('Close button clicked!');
+            },
+          ),
+        );
+        overlay.insert(overlayEntry);
+      },
+    );
+  }
+
+  @Demo(group: 'message')
+  Widget _buildRollingMessage(BuildContext context) {
+    return TDButton(
+      isBlock: true,
+      text: '可滚动的通知',
+      size: TDButtonSize.large,
+      type: TDButtonType.outline,
+      width: 450,
+      theme: TDButtonTheme.primary,
+      onTap: () {
+        final overlay = Overlay.of(context);
+        late OverlayEntry overlayEntry;
+        overlayEntry = OverlayEntry(
+          builder: (context) => TDMessage(
+            visible: true,
+            icon: false,
+            marquee: MessageMarquee(speed: 1000, loop: 1, delay: 0),
+            content: _commonContent,
+            theme: MessageTheme.info,
+            duration: 300000,
+            onDurationEnd: () {
+              overlayEntry.remove();
+            },
+          ),
+        );
+        overlay.insert(overlayEntry);
+      },
+    );
+  }
+  @Demo(group: 'message')
+  Widget _buildLinkMessage(BuildContext context) {
+    return TDButton(
+      isBlock: true,
+      text: '带按钮的通知',
+      size: TDButtonSize.large,
+      type: TDButtonType.outline,
+      width: 450,
+      theme: TDButtonTheme.primary,
+      onTap: () {
+        final overlay = Overlay.of(context);
+        late OverlayEntry overlayEntry;
+        overlayEntry = OverlayEntry(
+          builder: (context) => TDMessage(
+            visible: true,
+            icon: true,
+            content: _commonContent,
+            theme: MessageTheme.info,
+            duration: 300000,
+            link: '按钮',
             onDurationEnd: () {
               overlayEntry.remove();
             },
+            onLinkClick: () {
+              print('link clicked!');
+            },
+
           ),
         );
         overlay.insert(overlayEntry);
@@ -99,6 +192,9 @@ class _TDMessagePageState extends State<TDMessagePage> {
     );
   }
 
+
+
+
   @Demo(group: 'message')
   Widget _buildInfoMessage(BuildContext context) {
     return TDButton(
diff --git a/tdesign-component/lib/src/components/message/td_message.dart b/tdesign-component/lib/src/components/message/td_message.dart
index 4fa886868..572658e72 100644
--- a/tdesign-component/lib/src/components/message/td_message.dart
+++ b/tdesign-component/lib/src/components/message/td_message.dart
@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/src/scheduler/binding.dart';
 
 import '../../../tdesign_flutter.dart';
-import '../link/td_link.dart';
 
 // 定义消息对齐方式枚举
 enum MessageAlign {
@@ -13,14 +12,30 @@ enum MessageAlign {
   /// 右对齐
   center
 }
+//链接设置
+class LinkObj {
+  LinkObj({
+    required this.name,
+    required this.uri,
+    this.color,
+  });
+
+  final String name;
+  final Uri? uri;
+  final Color? color;
+}
 
 // 跑马灯配置
 class MessageMarquee {
-  final double? speed;
+  final int? speed;
   final int? loop;
   final int? delay;
 
-  MessageMarquee({this.speed, this.loop, this.delay});
+  MessageMarquee({
+    this.speed,
+    this.loop,
+    this.delay
+  });
 }
 
 // 定义消息主题枚举
@@ -43,15 +58,15 @@ class TDMessage extends StatefulWidget {
   /// 对齐方式
   final MessageAlign? align;
   /// 关闭按钮
-  final Widget? closeBtn;
+  final dynamic closeBtn;
   /// 通知内容
   final String? content;
   /// 消息内置计时器
   final int? duration;
   /// 自定义消息前面的图标
-  final bool? icon;
+  final dynamic icon;
   /// 链接名称
-  final Widget? link;
+  final dynamic link;
   /// 跑马灯效果
   final MessageMarquee? marquee;
   /// 相对于 placement 的偏移量
@@ -88,18 +103,20 @@ class TDMessage extends StatefulWidget {
   _TDMessageState createState() => _TDMessageState();
 }
 
-class _TDMessageState extends State<TDMessage> {
+class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
   bool _isVisible = true;
   double _topOffset = 0;
+  double initTopOffset = 80;
+
 
   @override
   void initState() {
     super.initState();
-    _topOffset = (widget.offset?[1] ?? 110) - 30;
+    _topOffset = (widget.offset?[1] ?? initTopOffset) - 30;
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
-        _topOffset = widget.offset?[1] ?? 110;
+        _topOffset = widget.offset?[1] ?? initTopOffset;
       });
     });
 
@@ -110,7 +127,7 @@ class _TDMessageState extends State<TDMessage> {
 
   void _closeMessage() {
     setState(() {
-      _topOffset = (widget.offset?[1] ?? 110) - 30;
+      _topOffset = (widget.offset?[1] ?? initTopOffset) - 30;
     });
 
     Future.delayed(const Duration(milliseconds: 300), () {
@@ -134,52 +151,218 @@ class _TDMessageState extends State<TDMessage> {
       left: _leftOffset,
       child: _isVisible
           ? Material(
-              color: Colors.transparent,
-              child: Container(
-                width: 343,
-                height: 48,
-                padding: const EdgeInsets.fromLTRB(16, 13, 16, 13),
-                decoration: BoxDecoration(
-                  color: Colors.white,
-                  borderRadius: BorderRadius.circular(6),
+        color: Colors.transparent,
+        child: Container(
+          width: 343,
+          height: 48,
+          padding: const EdgeInsets.fromLTRB(16, 13, 16, 13),
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.circular(6),
+          ),
+          child: Row(
+            children: [
+              if (widget.icon != false)
+                Padding(
+                  padding: const EdgeInsets.only(right: 10),
+                  child: SizedBox(
+                    width: 20,
+                    height: 22,
+                    child: getIcon(context),
+                  ),
                 ),
+              Expanded(
                 child: Row(
                   children: [
-                    if (widget.icon ?? true)
+                    getText(context),
+
+                    if (widget.link != null)
+                      Padding(
+                        padding: const EdgeInsets.only(left: 8),
+                        child: SizedBox(
+                          width: 28,
+                          height: 60,
+                          child: getLink(context),
+                        ),
+                      ),
+                    if (widget.closeBtn != null)
                       Padding(
-                        padding: const EdgeInsets.only(right: 16),
+                        padding: const EdgeInsets.only(left: 12),
                         child: SizedBox(
                           width: 22,
                           height: 22,
-                          child: getIcon(context),
+                          child: getCloseBtn(context),
                         ),
                       ),
-                    Expanded(
-                      child: Text(
-                        widget.content ?? '',
-                        style: const TextStyle(color: Colors.black),
-                      ),
-                    ),
                   ],
                 ),
               ),
-            )
+            ],
+          ),
+        ),
+      )
           : const SizedBox.shrink(),
     );
   }
 
   Widget getIcon(BuildContext context) {
-    switch (widget.theme) {
-      case MessageTheme.info:
-        return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).brandColor7);
-      case MessageTheme.success:
-        return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).successColor5);
-      case MessageTheme.warning:
-        return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).warningColor5);
-      case MessageTheme.error:
-        return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).errorColor6);
-      case null:
-        return const SizedBox.shrink();
+    if (widget.icon is Widget) { // 如果icon是Widget类型，则返回传入的图标
+      return widget.icon;
+    } else { // 如果icon是true，则返回theme设定图标
+      switch (widget.theme) {
+        case MessageTheme.info:
+          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).brandColor7);
+        case MessageTheme.success:
+          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).successColor5);
+        case MessageTheme.warning:
+          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).warningColor5);
+        case MessageTheme.error:
+          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).errorColor6);
+        case null:
+          return const SizedBox.shrink();
+      }
     }
   }
+  void clickCloseButton() {
+    _closeMessage();
+    widget.onCloseBtnClick?.call();
+  }
+
+  Widget getCloseBtn(BuildContext context) {
+    if(widget.closeBtn is Widget) {
+      return GestureDetector(
+        onTap: clickCloseButton,
+        child: widget.closeBtn!,
+      );
+    } else if(widget.closeBtn == true){
+      return GestureDetector(
+        onTap: clickCloseButton,
+        child: Icon(TDIcons.close),
+      );
+    } else if(widget.closeBtn is String){
+      return GestureDetector(
+        onTap: clickCloseButton,
+        child: Text(widget.closeBtn),
+      );
+    } else {
+      return const SizedBox.shrink();
+    }
+  }
+  void clickLink() {
+    widget.onLinkClick?.call();
+  }
+
+  Widget getLink(BuildContext context) {
+    if (widget.link is LinkObj) {
+      return TDLink(
+        label: widget.link.name,
+        style: TDLinkStyle.primary,
+        type: TDLinkType.basic,
+        uri: widget.link.uri ?? Uri.parse('https://example.com'),
+        size: TDLinkSize.small,
+        color: widget.link.color ?? TDTheme.of(context).brandNormalColor,
+      );
+    } else if (widget.link is String) {
+      return GestureDetector(
+        onTap: clickLink,
+        child: Text(
+          widget.link ?? '',
+          style: TextStyle(
+            color: TDTheme.of(context).brandNormalColor,
+            fontSize: 14,
+          ),
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+        ),
+      );
+    } else {
+      return const SizedBox.shrink();
+    }
+  }
+
+  double calculateTextWidth() {
+    if (widget.link != null && widget.closeBtn != null) {
+      return 211;
+    } else if (widget.link != null || widget.closeBtn != null) {
+      return 245;
+    } else if(widget.link == null && widget.closeBtn == null){
+      return 302;
+    } else {
+      return 245;
+    }
+  }
+
+
+  Widget getText(BuildContext context) {
+    if (widget.marquee == null) {
+      return SizedBox(
+        width: calculateTextWidth(),
+        child: Text(
+          widget.content ?? '',
+          style: const TextStyle(color: Colors.black),
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+        ),
+      );
+    } else {
+      final textSpan = TextSpan(text: widget.content ?? '', style: const TextStyle(color: Colors.black));
+      final textPainter = TextPainter(
+        text: textSpan,
+        textDirection: TextDirection.ltr,
+        maxLines: 1,
+      );
+      textPainter.layout(minWidth: 0, maxWidth: double.infinity);
+
+      final textWidth = textPainter.width;
+
+      print('textWidth is ${textWidth}');
+
+      final containerWidth = calculateTextWidth();
+      final animationController = AnimationController(
+        duration: Duration(milliseconds: widget.marquee!.speed ?? 10000),
+        vsync: this,
+      );
+
+      final tween = Tween<double>(begin: textWidth, end: -textWidth);
+
+      animationController.addListener(() {
+        setState(() {});
+      });
+
+      animationController.addStatusListener((status) {
+        if (status == AnimationStatus.completed) {
+          if (widget.marquee!.loop != null && widget.marquee!.loop! > 0) {
+            animationController.repeat();
+          }
+        } else if (status == AnimationStatus.dismissed) {
+          if (widget.marquee!.loop != null && widget.marquee!.loop! > 0) {
+            animationController.forward();
+          }
+        }
+      });
+
+      if (widget.marquee!.delay != null && widget.marquee!.delay! > 0) {
+        Future.delayed(Duration(milliseconds: widget.marquee!.delay!), animationController.forward);
+      } else {
+        animationController.forward();
+      }
+
+      return SingleChildScrollView(
+        scrollDirection: Axis.horizontal,
+        child: Transform.translate(
+          offset: Offset(tween.evaluate(animationController), 0),
+          child: SizedBox(
+            width: containerWidth,
+            child: Text(
+              widget.content ?? '',
+              style: const TextStyle(color: Colors.black),
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
+        ),
+      );
+    }
+  }
+
 }
\ No newline at end of file

From be45cd38ab79928c527055fd7a34221ec7b99e08 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Mon, 26 Aug 2024 23:04:28 +0800
Subject: [PATCH 44/74] =?UTF-8?q?=E5=AE=8C=E6=88=90message=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=8C=89=E9=92=AE=E5=92=8C=E9=93=BE=E6=8E=A5=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=9A=84=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_message_page.dart     | 104 ++++++-
 .../src/components/message/td_message.dart    | 261 +++++++++++++++---
 2 files changed, 322 insertions(+), 43 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_message_page.dart b/tdesign-component/example/lib/page/td_message_page.dart
index 021b3f229..082f3d7d9 100644
--- a/tdesign-component/example/lib/page/td_message_page.dart
+++ b/tdesign-component/example/lib/page/td_message_page.dart
@@ -27,9 +27,9 @@ class _TDMessagePageState extends State<TDMessagePage> {
             children: [
                 ExampleItem(desc: '纯文字的通知', builder: _buildPlainTextMessage),
                 ExampleItem(desc: '带图标的通知', builder: _buildIconTextMessage),
-                // ExampleItem(desc: '带关闭的通知', builder: _buildInputNormal),
-                // ExampleItem(desc: '可滚动的通知', builder: _buildImageTop),
-                // ExampleItem(desc: '带按钮的通知', builder: _buildImageTopNoTitle),
+                ExampleItem(desc: '带关闭的通知', builder: _buildMessageWithCloseButton),
+                ExampleItem(desc: '可滚动的通知', builder: _buildRollingMessage),
+                ExampleItem(desc: '带按钮的通知', builder: _buildLinkMessage),
         ]),
         ExampleModule(
             title: '组件状态',
@@ -86,12 +86,105 @@ class _TDMessagePageState extends State<TDMessagePage> {
           builder: (context) => TDMessage(
             visible: true,
             icon: true,
-            content: '带图标的通知',
+            content: _commonContent,
             theme: MessageTheme.info,
             duration: 3000,
+          ),
+        );
+        overlay.insert(overlayEntry);
+      },
+    );
+  }
+  @Demo(group: 'message')
+  Widget _buildMessageWithCloseButton(BuildContext context) {
+    return TDButton(
+      isBlock: true,
+      text: '带关闭的通知',
+      size: TDButtonSize.large,
+      type: TDButtonType.outline,
+      width: 450,
+      theme: TDButtonTheme.primary,
+      onTap: () {
+        final overlay = Overlay.of(context);
+        late OverlayEntry overlayEntry;
+        overlayEntry = OverlayEntry(
+          builder: (context) => TDMessage(
+            visible: true,
+            icon: true,
+            content: _commonContent,
+            theme: MessageTheme.info,
+            duration: 300000,
+            closeBtn: true,
+            link: '按钮',
+            onDurationEnd: () {
+              overlayEntry.remove();
+            },
+            onCloseBtnClick: () {
+              print('Close button clicked!');
+            },
+          ),
+        );
+        overlay.insert(overlayEntry);
+      },
+    );
+  }
+
+  @Demo(group: 'message')
+  Widget _buildRollingMessage(BuildContext context) {
+    return TDButton(
+      isBlock: true,
+      text: '可滚动的通知',
+      size: TDButtonSize.large,
+      type: TDButtonType.outline,
+      width: 450,
+      theme: TDButtonTheme.primary,
+      onTap: () {
+        final overlay = Overlay.of(context);
+        late OverlayEntry overlayEntry;
+        overlayEntry = OverlayEntry(
+          builder: (context) => TDMessage(
+            visible: true,
+            icon: false,
+            marquee: MessageMarquee(speed: 1000, loop: 1, delay: 0),
+            content: _commonContent,
+            theme: MessageTheme.info,
+            duration: 300000,
+            onDurationEnd: () {
+              overlayEntry.remove();
+            },
+          ),
+        );
+        overlay.insert(overlayEntry);
+      },
+    );
+  }
+  @Demo(group: 'message')
+  Widget _buildLinkMessage(BuildContext context) {
+    return TDButton(
+      isBlock: true,
+      text: '带按钮的通知',
+      size: TDButtonSize.large,
+      type: TDButtonType.outline,
+      width: 450,
+      theme: TDButtonTheme.primary,
+      onTap: () {
+        final overlay = Overlay.of(context);
+        late OverlayEntry overlayEntry;
+        overlayEntry = OverlayEntry(
+          builder: (context) => TDMessage(
+            visible: true,
+            icon: true,
+            content: _commonContent,
+            theme: MessageTheme.info,
+            duration: 300000,
+            link: '按钮',
             onDurationEnd: () {
               overlayEntry.remove();
             },
+            onLinkClick: () {
+              print('link clicked!');
+            },
+
           ),
         );
         overlay.insert(overlayEntry);
@@ -99,6 +192,9 @@ class _TDMessagePageState extends State<TDMessagePage> {
     );
   }
 
+
+
+
   @Demo(group: 'message')
   Widget _buildInfoMessage(BuildContext context) {
     return TDButton(
diff --git a/tdesign-component/lib/src/components/message/td_message.dart b/tdesign-component/lib/src/components/message/td_message.dart
index 4fa886868..572658e72 100644
--- a/tdesign-component/lib/src/components/message/td_message.dart
+++ b/tdesign-component/lib/src/components/message/td_message.dart
@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/src/scheduler/binding.dart';
 
 import '../../../tdesign_flutter.dart';
-import '../link/td_link.dart';
 
 // 定义消息对齐方式枚举
 enum MessageAlign {
@@ -13,14 +12,30 @@ enum MessageAlign {
   /// 右对齐
   center
 }
+//链接设置
+class LinkObj {
+  LinkObj({
+    required this.name,
+    required this.uri,
+    this.color,
+  });
+
+  final String name;
+  final Uri? uri;
+  final Color? color;
+}
 
 // 跑马灯配置
 class MessageMarquee {
-  final double? speed;
+  final int? speed;
   final int? loop;
   final int? delay;
 
-  MessageMarquee({this.speed, this.loop, this.delay});
+  MessageMarquee({
+    this.speed,
+    this.loop,
+    this.delay
+  });
 }
 
 // 定义消息主题枚举
@@ -43,15 +58,15 @@ class TDMessage extends StatefulWidget {
   /// 对齐方式
   final MessageAlign? align;
   /// 关闭按钮
-  final Widget? closeBtn;
+  final dynamic closeBtn;
   /// 通知内容
   final String? content;
   /// 消息内置计时器
   final int? duration;
   /// 自定义消息前面的图标
-  final bool? icon;
+  final dynamic icon;
   /// 链接名称
-  final Widget? link;
+  final dynamic link;
   /// 跑马灯效果
   final MessageMarquee? marquee;
   /// 相对于 placement 的偏移量
@@ -88,18 +103,20 @@ class TDMessage extends StatefulWidget {
   _TDMessageState createState() => _TDMessageState();
 }
 
-class _TDMessageState extends State<TDMessage> {
+class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
   bool _isVisible = true;
   double _topOffset = 0;
+  double initTopOffset = 80;
+
 
   @override
   void initState() {
     super.initState();
-    _topOffset = (widget.offset?[1] ?? 110) - 30;
+    _topOffset = (widget.offset?[1] ?? initTopOffset) - 30;
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
-        _topOffset = widget.offset?[1] ?? 110;
+        _topOffset = widget.offset?[1] ?? initTopOffset;
       });
     });
 
@@ -110,7 +127,7 @@ class _TDMessageState extends State<TDMessage> {
 
   void _closeMessage() {
     setState(() {
-      _topOffset = (widget.offset?[1] ?? 110) - 30;
+      _topOffset = (widget.offset?[1] ?? initTopOffset) - 30;
     });
 
     Future.delayed(const Duration(milliseconds: 300), () {
@@ -134,52 +151,218 @@ class _TDMessageState extends State<TDMessage> {
       left: _leftOffset,
       child: _isVisible
           ? Material(
-              color: Colors.transparent,
-              child: Container(
-                width: 343,
-                height: 48,
-                padding: const EdgeInsets.fromLTRB(16, 13, 16, 13),
-                decoration: BoxDecoration(
-                  color: Colors.white,
-                  borderRadius: BorderRadius.circular(6),
+        color: Colors.transparent,
+        child: Container(
+          width: 343,
+          height: 48,
+          padding: const EdgeInsets.fromLTRB(16, 13, 16, 13),
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.circular(6),
+          ),
+          child: Row(
+            children: [
+              if (widget.icon != false)
+                Padding(
+                  padding: const EdgeInsets.only(right: 10),
+                  child: SizedBox(
+                    width: 20,
+                    height: 22,
+                    child: getIcon(context),
+                  ),
                 ),
+              Expanded(
                 child: Row(
                   children: [
-                    if (widget.icon ?? true)
+                    getText(context),
+
+                    if (widget.link != null)
+                      Padding(
+                        padding: const EdgeInsets.only(left: 8),
+                        child: SizedBox(
+                          width: 28,
+                          height: 60,
+                          child: getLink(context),
+                        ),
+                      ),
+                    if (widget.closeBtn != null)
                       Padding(
-                        padding: const EdgeInsets.only(right: 16),
+                        padding: const EdgeInsets.only(left: 12),
                         child: SizedBox(
                           width: 22,
                           height: 22,
-                          child: getIcon(context),
+                          child: getCloseBtn(context),
                         ),
                       ),
-                    Expanded(
-                      child: Text(
-                        widget.content ?? '',
-                        style: const TextStyle(color: Colors.black),
-                      ),
-                    ),
                   ],
                 ),
               ),
-            )
+            ],
+          ),
+        ),
+      )
           : const SizedBox.shrink(),
     );
   }
 
   Widget getIcon(BuildContext context) {
-    switch (widget.theme) {
-      case MessageTheme.info:
-        return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).brandColor7);
-      case MessageTheme.success:
-        return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).successColor5);
-      case MessageTheme.warning:
-        return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).warningColor5);
-      case MessageTheme.error:
-        return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).errorColor6);
-      case null:
-        return const SizedBox.shrink();
+    if (widget.icon is Widget) { // 如果icon是Widget类型，则返回传入的图标
+      return widget.icon;
+    } else { // 如果icon是true，则返回theme设定图标
+      switch (widget.theme) {
+        case MessageTheme.info:
+          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).brandColor7);
+        case MessageTheme.success:
+          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).successColor5);
+        case MessageTheme.warning:
+          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).warningColor5);
+        case MessageTheme.error:
+          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).errorColor6);
+        case null:
+          return const SizedBox.shrink();
+      }
     }
   }
+  void clickCloseButton() {
+    _closeMessage();
+    widget.onCloseBtnClick?.call();
+  }
+
+  Widget getCloseBtn(BuildContext context) {
+    if(widget.closeBtn is Widget) {
+      return GestureDetector(
+        onTap: clickCloseButton,
+        child: widget.closeBtn!,
+      );
+    } else if(widget.closeBtn == true){
+      return GestureDetector(
+        onTap: clickCloseButton,
+        child: Icon(TDIcons.close),
+      );
+    } else if(widget.closeBtn is String){
+      return GestureDetector(
+        onTap: clickCloseButton,
+        child: Text(widget.closeBtn),
+      );
+    } else {
+      return const SizedBox.shrink();
+    }
+  }
+  void clickLink() {
+    widget.onLinkClick?.call();
+  }
+
+  Widget getLink(BuildContext context) {
+    if (widget.link is LinkObj) {
+      return TDLink(
+        label: widget.link.name,
+        style: TDLinkStyle.primary,
+        type: TDLinkType.basic,
+        uri: widget.link.uri ?? Uri.parse('https://example.com'),
+        size: TDLinkSize.small,
+        color: widget.link.color ?? TDTheme.of(context).brandNormalColor,
+      );
+    } else if (widget.link is String) {
+      return GestureDetector(
+        onTap: clickLink,
+        child: Text(
+          widget.link ?? '',
+          style: TextStyle(
+            color: TDTheme.of(context).brandNormalColor,
+            fontSize: 14,
+          ),
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+        ),
+      );
+    } else {
+      return const SizedBox.shrink();
+    }
+  }
+
+  double calculateTextWidth() {
+    if (widget.link != null && widget.closeBtn != null) {
+      return 211;
+    } else if (widget.link != null || widget.closeBtn != null) {
+      return 245;
+    } else if(widget.link == null && widget.closeBtn == null){
+      return 302;
+    } else {
+      return 245;
+    }
+  }
+
+
+  Widget getText(BuildContext context) {
+    if (widget.marquee == null) {
+      return SizedBox(
+        width: calculateTextWidth(),
+        child: Text(
+          widget.content ?? '',
+          style: const TextStyle(color: Colors.black),
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+        ),
+      );
+    } else {
+      final textSpan = TextSpan(text: widget.content ?? '', style: const TextStyle(color: Colors.black));
+      final textPainter = TextPainter(
+        text: textSpan,
+        textDirection: TextDirection.ltr,
+        maxLines: 1,
+      );
+      textPainter.layout(minWidth: 0, maxWidth: double.infinity);
+
+      final textWidth = textPainter.width;
+
+      print('textWidth is ${textWidth}');
+
+      final containerWidth = calculateTextWidth();
+      final animationController = AnimationController(
+        duration: Duration(milliseconds: widget.marquee!.speed ?? 10000),
+        vsync: this,
+      );
+
+      final tween = Tween<double>(begin: textWidth, end: -textWidth);
+
+      animationController.addListener(() {
+        setState(() {});
+      });
+
+      animationController.addStatusListener((status) {
+        if (status == AnimationStatus.completed) {
+          if (widget.marquee!.loop != null && widget.marquee!.loop! > 0) {
+            animationController.repeat();
+          }
+        } else if (status == AnimationStatus.dismissed) {
+          if (widget.marquee!.loop != null && widget.marquee!.loop! > 0) {
+            animationController.forward();
+          }
+        }
+      });
+
+      if (widget.marquee!.delay != null && widget.marquee!.delay! > 0) {
+        Future.delayed(Duration(milliseconds: widget.marquee!.delay!), animationController.forward);
+      } else {
+        animationController.forward();
+      }
+
+      return SingleChildScrollView(
+        scrollDirection: Axis.horizontal,
+        child: Transform.translate(
+          offset: Offset(tween.evaluate(animationController), 0),
+          child: SizedBox(
+            width: containerWidth,
+            child: Text(
+              widget.content ?? '',
+              style: const TextStyle(color: Colors.black),
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
+        ),
+      );
+    }
+  }
+
 }
\ No newline at end of file

From 27011586e3602b0735d567913595e77c381d5f78 Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Wed, 28 Aug 2024 20:55:23 +0800
Subject: [PATCH 45/74] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=AF=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/demo_tool/all_build.sh      |   2 +-
 .../example/lib/page/td_progress_page.dart    | 282 +++++++++---------
 .../src/components/progress/td_progress.dart  | 179 ++++++-----
 .../progress/td_progress_circular.dart        |  94 ++++++
 4 files changed, 319 insertions(+), 238 deletions(-)
 create mode 100644 tdesign-component/lib/src/components/progress/td_progress_circular.dart

diff --git a/tdesign-component/demo_tool/all_build.sh b/tdesign-component/demo_tool/all_build.sh
index f986423e4..23283dc34 100644
--- a/tdesign-component/demo_tool/all_build.sh
+++ b/tdesign-component/demo_tool/all_build.sh
@@ -85,6 +85,7 @@
 # imageViewer
 ./bin/demo_tool generate --folder ../lib/src/components/image_viewer  --name TDImageViewer,TDImageViewerWidget,  --folder-name image-viewer --output ../example/assets/api/ --only-api
 # progress
+./bin/demo_tool generate --file ../lib/src/components/image/td_progress.dart --name TDProgress --folder-name image --output ../example/assets/api/ --only-api
 # result
 # skeleton
 # sticky
@@ -124,4 +125,3 @@
 
 
 
-
diff --git a/tdesign-component/example/lib/page/td_progress_page.dart b/tdesign-component/example/lib/page/td_progress_page.dart
index b0ba4c007..be58b0a46 100644
--- a/tdesign-component/example/lib/page/td_progress_page.dart
+++ b/tdesign-component/example/lib/page/td_progress_page.dart
@@ -12,9 +12,7 @@ class TDProgressPage extends StatefulWidget {
   final examplePadding = const EdgeInsets.symmetric(horizontal: 16);
 
   @override
-  State<StatefulWidget> createState() {
-    return _TDProgressPageState();
-  }
+  State<StatefulWidget> createState() => _TDProgressPageState();
 }
 
 class _TDProgressPageState extends State<TDProgressPage> {
@@ -29,82 +27,80 @@ class _TDProgressPageState extends State<TDProgressPage> {
   @override
   Widget build(BuildContext context) {
     return ExamplePage(
-        title: tdTitle(),
-        desc: '用于展示任务当前的进度',
-        exampleCodeGroup: 'progress',
-        backgroundColor: TDTheme.of().whiteColor1,
-        padding: const EdgeInsets.symmetric(vertical: 8),
-        children: [
-          ExampleModule(title: '组件类型', children: [
-            ExampleItem(
-                desc: '线性进度条',
-                padding: widget.examplePadding,
-                builder: _buildRightLabelLinear),
-            ExampleItem(
-                desc: '百分比内显',
-                padding: widget.examplePadding,
-                builder: _buildInsideLabelLinear),
-            ExampleItem(
-                desc: '环形进度条',
-                padding: widget.examplePadding,
-                center: false,
-                builder: _buildCircle),
-            ExampleItem(
-                desc: '微型环形进度条',
-                padding: widget.examplePadding,
-                center: false,
-                builder: _buildMicro),
-            ExampleItem(
-                desc: '按钮进度条',
-                padding: widget.examplePadding,
-                builder: _buildButton),
-            ExampleItem(
-                desc: '微型按钮进度条',
-                padding: widget.examplePadding,
-                center: false,
-                builder: _buildMicroButton),
-          ]),
-          ExampleModule(title: '组件状态', children: [
-            ExampleItem(
-                desc: '线性进度条',
-                padding: widget.examplePadding,
-                builder: _buildPrimary),
-            ExampleItem(padding: widget.examplePadding, builder: _buildWarning),
-            ExampleItem(padding: widget.examplePadding, builder: _buildDanger),
-            ExampleItem(padding: widget.examplePadding, builder: _buildSuccess),
-            ExampleItem(
-                desc: '环形进度条',
-                padding: widget.examplePadding,
-                center: false,
-                builder: _buildCirclePrimary),
-            ExampleItem(
-                padding: widget.examplePadding,
-                center: false,
-                builder: _buildCircleWarning),
-            ExampleItem(
-                padding: widget.examplePadding,
-                center: false,
-                builder: _buildCircleDanger),
-            ExampleItem(
-                padding: widget.examplePadding,
-                center: false,
-                builder: _buildCircleSuccess),
-          ])
-        ]);
+      title: tdTitle(),
+      desc: '用于展示任务当前的进度',
+      exampleCodeGroup: 'progress',
+      backgroundColor: TDTheme.of().whiteColor1,
+      padding: const EdgeInsets.symmetric(vertical: 8),
+      children: [
+        ExampleModule(title: '组件类型', children: [
+          ExampleItem(
+            desc: '线性进度条',
+            padding: widget.examplePadding,
+            builder: _buildRightLabelLinear,
+          ),
+          ExampleItem(
+            desc: '百分比内显',
+            padding: widget.examplePadding,
+            builder: _buildInsideLabelLinear,
+          ),
+          ExampleItem(
+              desc: '环形进度条',
+              padding: widget.examplePadding,
+              builder: _buildCircle,
+              center: false),
+          ExampleItem(
+              desc: '微型环形进度条',
+              padding: widget.examplePadding,
+              builder: _buildMicro,
+              center: false),
+          ExampleItem(
+            desc: '按钮进度条',
+            padding: widget.examplePadding,
+            builder: _buildResizedButton,
+            center: false,
+          ),
+          ExampleItem(
+            desc: '微型按钮进度条',
+            padding: widget.examplePadding,
+            builder: _buildMicroButton,
+          ),
+        ]),
+        ExampleModule(title: '组件状态', children: [
+          ExampleItem(
+            desc: '线性进度条状态',
+            padding: widget.examplePadding,
+            builder: _buildLinearProgressStatus,
+          ),
+          ExampleItem(
+            desc: '环形进度条状态',
+            padding: widget.examplePadding,
+            builder: _buildCircularProgressStatus,
+          ),
+        ])
+      ],
+    );
   }
 
   @Demo(group: 'progress')
   Widget _buildRightLabelLinear(BuildContext context) {
     return TDProgress(
-        type: TDProgressType.linear,
-        value: 0.8,
-        strokeWidth: 6,
-        progressLabelPosition: TDProgressLabelPosition.right);
+      type: TDProgressType.linear,
+      value: 0.8,
+      strokeWidth: 6,
+      progressLabelPosition: TDProgressLabelPosition.right,
+      animationDuration: 1000,
+    );
   }
 
-  @Demo(group: 'progress')
   Widget _buildInsideLabelLinear(BuildContext context) {
-    return TDProgress(type: TDProgressType.linear, value: 0.8);
+    return Column(
+      children: [
+        TDProgress(type: TDProgressType.linear, value: 0.8),
+        const SizedBox(height: 16),
+        TDProgress(type: TDProgressType.linear, value: 0.1),
+      ],
+    );
   }
 
   @Demo(group: 'progress')
@@ -117,17 +113,24 @@ class _TDProgressPageState extends State<TDProgressPage> {
     return TDProgress(type: TDProgressType.micro, value: 0.75);
   }
 
+  Widget _buildResizedButton(BuildContext context) {
+    return SizedBox(
+      width: 300,
+      child: _buildButton(context),
+    );
+  }
+
   @Demo(group: 'progress')
   Widget _buildButton(BuildContext context) {
     return TDProgress(
-        type: TDProgressType.button,
-        onTap: _toggleProgress,
-        onLongPress: _resetProgress,
-        value: progressValue,
-        label: buttonLabel);
+      type: TDProgressType.button,
+      onTap: _toggleProgress,
+      onLongPress: _resetProgress,
+      value: progressValue,
+      label: buttonLabel,
+    );
   }
 
-  @Demo(group: 'progress')
   Widget _buildMicroButton(BuildContext context) {
     return Row(
       mainAxisAlignment: MainAxisAlignment.start,
@@ -151,88 +154,79 @@ class _TDProgressPageState extends State<TDProgressPage> {
     );
   }
 
-  @Demo(group: 'progress')
-  Widget _buildPrimary(BuildContext context) {
-    return TDProgress(
-        type: TDProgressType.linear,
-        progressStatus: TDProgressStatus.primary,
-        value: 0.8,
-        strokeWidth: 6,
-        progressLabelPosition: TDProgressLabelPosition.right);
-  }
-
-  @Demo(group: 'progress')
-  Widget _buildWarning(BuildContext context) {
-    return TDProgress(
-        type: TDProgressType.linear,
-        progressStatus: TDProgressStatus.warning,
-        value: 0.8,
-        strokeWidth: 6,
-        progressLabelPosition: TDProgressLabelPosition.right);
-  }
-
-  @Demo(group: 'progress')
-  Widget _buildDanger(BuildContext context) {
-    return TDProgress(
-        type: TDProgressType.linear,
-        progressStatus: TDProgressStatus.danger,
-        value: 0.8,
-        strokeWidth: 6,
-        progressLabelPosition: TDProgressLabelPosition.right);
-  }
-
-  @Demo(group: 'progress')
-  Widget _buildSuccess(BuildContext context) {
-    return TDProgress(
-        type: TDProgressType.linear,
-        progressStatus: TDProgressStatus.success,
-        value: 0.8,
-        strokeWidth: 6,
-        progressLabelPosition: TDProgressLabelPosition.right);
-  }
-
-  @Demo(group: 'progress')
-  Widget _buildCirclePrimary(BuildContext context) {
-    return TDProgress(
-        type: TDProgressType.circular,
-        progressStatus: TDProgressStatus.primary,
-        value: 0.3);
+  Widget _buildLinearProgressStatus(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        _buildLabeledLinearProgress('Primary', TDProgressStatus.primary),
+        _buildLabeledLinearProgress('Warning', TDProgressStatus.warning),
+        _buildLabeledLinearProgress('Danger', TDProgressStatus.danger),
+        _buildLabeledLinearProgress('Success', TDProgressStatus.success),
+      ],
+    );
   }
 
-  @Demo(group: 'progress')
-  Widget _buildCircleWarning(BuildContext context) {
-    return TDProgress(
-        type: TDProgressType.circular,
-        progressStatus: TDProgressStatus.warning,
-        value: 0.3);
+  Widget _buildLabeledLinearProgress(String label, TDProgressStatus status) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8),
+      child: Row(
+        children: [
+          SizedBox(
+            width: 80,
+            child: Text(label,
+                style: const TextStyle(fontSize: 14, color: Colors.grey)),
+          ),
+          Expanded(
+            child: TDProgress(
+              type: TDProgressType.linear,
+              progressStatus: status,
+              value: 0.8,
+              strokeWidth: 6,
+              progressLabelPosition: TDProgressLabelPosition.right,
+            ),
+          ),
+        ],
+      ),
+    );
   }
 
-  @Demo(group: 'progress')
-  Widget _buildCircleDanger(BuildContext context) {
-    return TDProgress(
-        type: TDProgressType.circular,
-        progressStatus: TDProgressStatus.danger,
-        value: 0.3);
+  Widget _buildCircularProgressStatus(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        _buildLabeledCircularProgress('Primary', TDProgressStatus.primary),
+        const SizedBox(width: 24),
+        _buildLabeledCircularProgress('Warning', TDProgressStatus.warning),
+        const SizedBox(width: 24),
+        _buildLabeledCircularProgress('Danger', TDProgressStatus.danger),
+        const SizedBox(width: 24),
+        _buildLabeledCircularProgress('Success', TDProgressStatus.success),
+      ],
+    );
   }
 
-  @Demo(group: 'progress')
-  Widget _buildCircleSuccess(BuildContext context) {
-    return TDProgress(
-        type: TDProgressType.circular,
-        progressStatus: TDProgressStatus.success,
-        value: 1);
+  Widget _buildLabeledCircularProgress(String label, TDProgressStatus status) {
+    return Column(
+      children: [
+        Text(label, style: const TextStyle(fontSize: 14, color: Colors.grey)),
+        const SizedBox(height: 8),
+        TDProgress(
+          type: TDProgressType.circular,
+          progressStatus: status,
+          value: status == TDProgressStatus.success ? 1 : 0.3,
+        ),
+      ],
+    );
   }
 
   void _toggleProgress() {
     if (isProgressing) {
-      // 暂停进度
       _timer?.cancel();
       setState(() {
         buttonLabel = const TDTextLabel('继续');
         isProgressing = false;
       });
     } else {
-      // 开始或继续进度
       _timer?.cancel();
       _timer = Timer.periodic(const Duration(milliseconds: 100), (timer) {
         setState(() {
@@ -289,4 +283,4 @@ class _TDProgressPageState extends State<TDProgressPage> {
       microProgressValue = 0.0;
     });
   }
-}
+}
\ No newline at end of file
diff --git a/tdesign-component/lib/src/components/progress/td_progress.dart b/tdesign-component/lib/src/components/progress/td_progress.dart
index 6cb4067cb..074e99b6c 100644
--- a/tdesign-component/lib/src/components/progress/td_progress.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import './td_progress_circular.dart';
 import '../../../tdesign_flutter.dart';
 
 enum TDProgressType { linear, circular, micro, button }
@@ -7,10 +8,6 @@ enum TDProgressLabelPosition { inside, left, right }
 
 enum TDProgressStatus { primary, warning, danger, success }
 
-enum TDProgressStrokeCap { round, square, butt }
-
-enum TDProgressAnimationCurve { easeIn, easeOut, easeInout }
-
 abstract class TDLabelWidget extends Widget {
   const TDLabelWidget({super.key});
 }
@@ -25,7 +22,6 @@ class TDIconLabel extends Icon implements TDLabelWidget {
       : super(icon, key: key, size: size, color: color);
 }
 
-/// 进度条组件
 class TDProgress extends StatelessWidget {
   /// 进度条类型
   final TDProgressType type;
@@ -52,7 +48,7 @@ class TDProgress extends StatelessWidget {
   final Color? backgroundColor;
 
   /// 进度条末端形状
-  final TDProgressStrokeCap? strokeCap;
+  final BorderRadiusGeometry? borderRadius;
 
   /// 环形进度条半径 (正数)
   final double? circleRadius;
@@ -79,7 +75,7 @@ class TDProgress extends StatelessWidget {
     double? strokeWidth,
     this.color,
     this.backgroundColor,
-    this.strokeCap,
+    this.borderRadius,
     double? circleRadius,
     this.showLabel = true,
     this.onTap,
@@ -92,15 +88,17 @@ class TDProgress extends StatelessWidget {
         super(key: key);
 
   static double? _validateProgress(double? value) =>
-      value == null ? null : value.clamp(0.0, 1.0);
+      value == null ? 0 : value.clamp(0.0, 1.0);
 
-  static double? _validatePositiveDouble(double? value) =>
-      value == null ? null : value <= 0 ? 0 : value;
+  static double? _validatePositiveDouble(double? value) => value == null
+      ? null
+      : value <= 0
+      ? 0
+      : value;
 
   static int _validatePositiveInt(int? value) =>
       value == null || value <= 0 ? 0 : value;
 
-
   @override
   Widget build(BuildContext context) {
     final defaultValues = _getDefaultValues(context, type);
@@ -112,7 +110,7 @@ class TDProgress extends StatelessWidget {
       strokeWidth: strokeWidth ?? defaultValues.strokeWidth,
       color: color,
       backgroundColor: backgroundColor ?? defaultValues.backgroundColor,
-      strokeCap: strokeCap ?? defaultValues.strokeCap,
+      borderRadius: borderRadius ?? defaultValues.borderRadius,
       circleRadius: circleRadius ?? defaultValues.circleRadius,
       showLabel: showLabel,
       onTap: onTap,
@@ -128,28 +126,28 @@ class TDProgress extends StatelessWidget {
         return _DefaultValues(
           strokeWidth: 20.0,
           backgroundColor: TDTheme.of(context).grayColor3,
-          strokeCap: TDProgressStrokeCap.round,
+          borderRadius: BorderRadius.circular(20),
           circleRadius: 0,
         );
       case TDProgressType.circular:
         return _DefaultValues(
           strokeWidth: 5.0,
           backgroundColor: TDTheme.of(context).grayColor2,
-          strokeCap: TDProgressStrokeCap.round,
+          borderRadius: BorderRadius.circular(20),
           circleRadius: 80.0,
         );
       case TDProgressType.micro:
         return _DefaultValues(
           strokeWidth: 2.0,
           backgroundColor: TDTheme.of(context).grayColor2,
-          strokeCap: TDProgressStrokeCap.round,
-          circleRadius: 20.0,
+          borderRadius: BorderRadius.circular(20),
+          circleRadius: 25.0,
         );
       case TDProgressType.button:
         return _DefaultValues(
-          strokeWidth: 60.0,
+          strokeWidth: 50.0,
           backgroundColor: TDTheme.of(context).brandNormalColor,
-          strokeCap: TDProgressStrokeCap.butt,
+          borderRadius: BorderRadius.circular(8),
           circleRadius: 0,
         );
     }
@@ -159,25 +157,24 @@ class TDProgress extends StatelessWidget {
 class _DefaultValues {
   final double strokeWidth;
   final Color backgroundColor;
-  final TDProgressStrokeCap strokeCap;
+  final BorderRadiusGeometry borderRadius;
   final double circleRadius;
 
   _DefaultValues({
     required this.strokeWidth,
     required this.backgroundColor,
-    required this.strokeCap,
+    required this.borderRadius,
     required this.circleRadius,
   });
 }
 
-/// 构建工具类
 class ProgressIndicator extends StatefulWidget {
   final double? value;
   final TDLabelWidget? label;
   final TDProgressLabelPosition progressLabelPosition;
   final double strokeWidth;
   final double circleRadius;
-  final TDProgressStrokeCap strokeCap;
+  final BorderRadiusGeometry borderRadius;
   final Color? color;
   final Color backgroundColor;
   final TDProgressType type;
@@ -194,7 +191,7 @@ class ProgressIndicator extends StatefulWidget {
     this.label,
     this.progressLabelPosition = TDProgressLabelPosition.inside,
     required this.strokeWidth,
-    required this.strokeCap,
+    required this.borderRadius,
     required this.circleRadius,
     this.color,
     required this.backgroundColor,
@@ -222,9 +219,8 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
   void initState() {
     super.initState();
     _animationController = AnimationController(
-      vsync: this,
-      duration: Duration(milliseconds: widget.animationDuration),
-    );
+        vsync: this,
+        duration: Duration(milliseconds: widget.animationDuration));
     _updateAnimation();
     _updateEffectiveColor();
     _updateEffectiveLabel();
@@ -246,17 +242,6 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
     }
   }
 
-  BorderRadius _getBorderRadius() {
-    switch (widget.strokeCap) {
-      case TDProgressStrokeCap.round:
-        return BorderRadius.circular(widget.strokeWidth / 2);
-      case TDProgressStrokeCap.square:
-        return BorderRadius.zero;
-      case TDProgressStrokeCap.butt:
-        return BorderRadius.circular(widget.strokeWidth / 6);
-    }
-  }
-
   void _updateEffectiveColor() {
     _effectiveColor =
         widget.color ?? _getColorFromStatus(widget.progressStatus);
@@ -268,7 +253,9 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
   }
 
   void _updateAnimation({double? oldWidgetValue}) {
-    _animation = Tween<double>(begin: oldWidgetValue ?? _animationController.value, end: widget.value)
+    _animation = Tween<double>(
+        begin: oldWidgetValue ?? _animationController.value,
+        end: widget.value)
         .animate(_animationController);
     _animationController.forward(from: 0);
   }
@@ -289,18 +276,18 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
       TDProgressStatus.warning: showInsideLabel
           ? getAutoText()
           : showIconBorder
-              ? const Icon(TDIcons.error_circle_filled)
-              : const Icon(TDIcons.error),
+          ? const Icon(TDIcons.error_circle_filled)
+          : const Icon(TDIcons.error),
       TDProgressStatus.danger: showInsideLabel
           ? getAutoText()
           : showIconBorder
-              ? const Icon(TDIcons.close_circle_filled)
-              : const Icon(TDIcons.close),
+          ? const Icon(TDIcons.close_circle_filled)
+          : const Icon(TDIcons.close),
       TDProgressStatus.success: showInsideLabel
           ? getAutoText()
           : showIconBorder
-              ? const Icon(TDIcons.check_circle_filled)
-              : const Icon(TDIcons.check),
+          ? const Icon(TDIcons.check_circle_filled)
+          : const Icon(TDIcons.check),
     };
 
     return statusWidgets[status] ?? getAutoText();
@@ -319,17 +306,6 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
     }
   }
 
-  StrokeCap _getFlutterStrokeCap(TDProgressStrokeCap cap) {
-    switch (cap) {
-      case TDProgressStrokeCap.round:
-        return StrokeCap.round;
-      case TDProgressStrokeCap.square:
-        return StrokeCap.square;
-      case TDProgressStrokeCap.butt:
-        return StrokeCap.butt;
-    }
-  }
-
   @override
   void dispose() {
     _animationController.dispose();
@@ -346,9 +322,9 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
         else if (widget.type == TDProgressType.circular)
           _buildCircularProgress()
         else if (widget.type == TDProgressType.micro)
-          _buildMicroProgress()
-        else if (widget.type == TDProgressType.button)
-          _buildButtonProgress()
+            _buildMicroProgress()
+          else if (widget.type == TDProgressType.button)
+              _buildButtonProgress()
       ],
     );
   }
@@ -362,7 +338,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
             widget.progressLabelPosition == TDProgressLabelPosition.inside) {
           return _buildInsideLabel(maxWidth);
         } else {
-          return _buildOutsideLabel();
+          return _buildOutsideLabel(maxWidth);
         }
       },
     );
@@ -386,10 +362,11 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
     );
   }
 
-  Widget _buildOutsideLabel() {
+  Widget _buildOutsideLabel(double maxWidth) {
     return AnimatedBuilder(
       animation: _animation,
       builder: (context, child) {
+        final progressWidth = _animation.value * maxWidth;
         return Row(
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
@@ -399,14 +376,19 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
                 child: _buildLabelWidget(TDTheme.of(context).fontGyColor1),
               ),
             Expanded(
-              child: LinearProgressIndicator(
-                borderRadius: _getBorderRadius(),
-                value: widget.value != null ? _animation.value : null,
-                backgroundColor: widget.backgroundColor,
-                valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
-                minHeight: widget.strokeWidth,
-              ),
-            ),
+                child: Stack(
+                  children: [
+                    _buildBackgroundContainer(),
+                    Container(
+                      height: widget.strokeWidth,
+                      width: progressWidth,
+                      decoration: BoxDecoration(
+                        color: _effectiveColor,
+                        borderRadius: widget.borderRadius,
+                      ),
+                    )
+                  ],
+                )),
             if (widget.progressLabelPosition == TDProgressLabelPosition.right)
               Padding(
                 padding: const EdgeInsets.only(left: 8.0),
@@ -422,7 +404,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
     return Container(
       height: widget.strokeWidth,
       decoration: BoxDecoration(
-        borderRadius: _getBorderRadius(),
+        borderRadius: widget.borderRadius,
         color: widget.backgroundColor,
       ),
     );
@@ -434,16 +416,16 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
       width: progressWidth,
       decoration: BoxDecoration(
         color: _effectiveColor,
-        borderRadius: _getBorderRadius(),
+        borderRadius: widget.borderRadius,
       ),
       child: widget.showLabel
           ? Align(
-              alignment: Alignment.centerRight,
-              child: Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 10.0),
-                child: _buildLabelWidget(TDTheme.of(context).fontWhColor1),
-              ),
-            )
+        alignment: Alignment.centerRight,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 10.0),
+          child: _buildLabelWidget(TDTheme.of(context).fontWhColor1),
+        ),
+      )
           : null,
     );
   }
@@ -457,12 +439,17 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
           width: progressWidth,
           decoration: BoxDecoration(
             color: _effectiveColor,
-            borderRadius: _getBorderRadius(),
+            borderRadius: BorderRadius.only(
+              topLeft: widget.borderRadius.resolve(TextDirection.ltr).topLeft,
+              bottomLeft: widget.borderRadius.resolve(TextDirection.ltr).bottomLeft,
+              topRight: Radius.circular(widget.borderRadius.resolve(TextDirection.ltr).topRight.x / 2),
+              bottomRight: Radius.circular(widget.borderRadius.resolve(TextDirection.ltr).bottomRight.x / 2),
+            ),
           ),
         ),
         if (widget.showLabel)
           Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 5.0),
+            padding: const EdgeInsets.symmetric(horizontal: 8.0),
             child: _buildLabelWidget(TDTheme.of(context).fontGyColor1),
           ),
       ],
@@ -483,7 +470,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
           fontSize = widget.strokeWidth * 0.6;
           iconSize = widget.strokeWidth;
         }
-        fontWeight = FontWeight.normal;
+        fontWeight = _animation.value <=0.1 ? FontWeight.bold : FontWeight.normal;
         break;
       case TDProgressType.circular:
         iconSize = widget.circleRadius * 0.4;
@@ -491,12 +478,12 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
         fontWeight = FontWeight.bold;
         break;
       case TDProgressType.micro:
-        iconSize = widget.circleRadius * 0.6;
+        iconSize = widget.circleRadius * 0.5;
         fontSize = widget.circleRadius * 0.2;
         fontWeight = FontWeight.normal;
         break;
       case TDProgressType.button:
-        iconSize = widget.strokeWidth * 0.8;
+        iconSize = widget.strokeWidth * 0.3;
         fontSize = widget.strokeWidth * 0.3;
         fontWeight = FontWeight.normal;
         break;
@@ -527,16 +514,18 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
               width: widget.circleRadius,
               child: Padding(
                 padding: EdgeInsets.all(widget.strokeWidth / 2),
-                child: CircularProgressIndicator(
-                  value: widget.value != null ? _animation.value : null,
+                child: TDProgressCircular(
+                  strokeWidth: widget.strokeWidth,
+                  circleRadius: widget.circleRadius,
+                  borderRadius: widget.borderRadius,
+                  value: _animation.value,
                   backgroundColor: widget.backgroundColor,
-                  strokeCap: _getFlutterStrokeCap(widget.strokeCap),
                   valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
-                  strokeWidth: widget.strokeWidth,
                 ),
               ),
             ),
-            if (widget.showLabel) _buildLabelWidget(TDTheme.of(widget.context).fontGyColor1),
+            if (widget.showLabel)
+              _buildLabelWidget(TDTheme.of(widget.context).fontGyColor1),
           ],
         );
       },
@@ -567,12 +556,13 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
       width: widget.circleRadius,
       child: Padding(
         padding: EdgeInsets.all(widget.strokeWidth / 2),
-        child: CircularProgressIndicator(
-          value: widget.value != null ? _animation.value : null,
+        child: TDProgressCircular(
+          strokeWidth: widget.strokeWidth,
+          circleRadius: widget.circleRadius,
+          borderRadius: widget.borderRadius,
+          value: _animation.value,
           backgroundColor: widget.backgroundColor,
-          strokeCap: _getFlutterStrokeCap(widget.strokeCap),
           valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
-          strokeWidth: widget.strokeWidth,
         ),
       ),
     );
@@ -587,7 +577,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
             builder: (context, child) {
               final progressWidth = maxWidth * _animation.value;
               return ClipRRect(
-                borderRadius: _getBorderRadius(),
+                borderRadius: widget.borderRadius,
                 child: GestureDetector(
                     onTap: widget.onTap,
                     onLongPress: widget.onLongPress,
@@ -610,7 +600,10 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
       width: progressWidth,
       decoration: BoxDecoration(
         gradient: LinearGradient(
-          colors: [_effectiveColor, TDTheme.of(widget.context).brandDisabledColor],
+          colors: [
+            _effectiveColor,
+            TDTheme.of(widget.context).brandDisabledColor.withOpacity(.5)
+          ],
         ),
       ),
     );
@@ -623,4 +616,4 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
       child: _buildLabelWidget(TDTheme.of(widget.context).fontWhColor1),
     );
   }
-}
+}
\ No newline at end of file
diff --git a/tdesign-component/lib/src/components/progress/td_progress_circular.dart b/tdesign-component/lib/src/components/progress/td_progress_circular.dart
new file mode 100644
index 000000000..e24b1e9c6
--- /dev/null
+++ b/tdesign-component/lib/src/components/progress/td_progress_circular.dart
@@ -0,0 +1,94 @@
+import 'dart:math' as math;
+
+import 'package:flutter/material.dart';
+
+class TDProgressCircular extends StatelessWidget {
+  final double _value;
+  final double strokeWidth;
+  final Color backgroundColor;
+  final Animation<Color> valueColor;
+  final double circleRadius;
+  final BorderRadiusGeometry borderRadius;
+
+  const TDProgressCircular({
+    Key? key,
+    required double value,
+    required this.strokeWidth,
+    required this.backgroundColor,
+    required this.valueColor,
+    required this.circleRadius,
+    required this.borderRadius,
+  })  : _value = value,
+        super(key: key);
+
+  double get value => _value.clamp(0.0, 1.0);
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: circleRadius * 2,
+      height: circleRadius * 2,
+      child: ClipRRect(
+        borderRadius: borderRadius,
+        child: CustomPaint(
+          painter: _TDProgressCircularPainter(
+            value: value,
+            backgroundColor: backgroundColor,
+            valueColor: valueColor,
+            circleRadius: circleRadius,
+            strokeWidth: strokeWidth,
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _TDProgressCircularPainter extends CustomPainter {
+  final double value;
+  final Color backgroundColor;
+  final Animation<Color> valueColor;
+  final double circleRadius;
+  final double strokeWidth;
+
+  _TDProgressCircularPainter({
+    required this.value,
+    required this.backgroundColor,
+    required this.valueColor,
+    required this.circleRadius,
+    required this.strokeWidth,
+  });
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final center = size.width / 2;
+    final radius = center - strokeWidth / 2;
+
+    final backgroundPaint = Paint()
+      ..color = backgroundColor
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = strokeWidth;
+
+    final valuePaint = Paint()
+      ..color = valueColor.value
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = strokeWidth
+      ..strokeCap = StrokeCap.round;
+
+    canvas.drawCircle(Offset(center, center), radius, backgroundPaint);
+
+    final sweepAngle = 2 * math.pi * value;
+    canvas.drawArc(
+      Rect.fromCircle(center: Offset(center, center), radius: radius),
+      -math.pi / 2,
+      sweepAngle,
+      false,
+      valuePaint,
+    );
+  }
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) {
+    return true;
+  }
+}

From bd93d315465a0de38a454c35d565a661d018ecbf Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Wed, 28 Aug 2024 20:57:44 +0800
Subject: [PATCH 46/74] =?UTF-8?q?=E6=B8=85=E7=90=86=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/DEVELOPER.md | 230 ---------------------------------
 1 file changed, 230 deletions(-)
 delete mode 100644 tdesign-component/DEVELOPER.md

diff --git a/tdesign-component/DEVELOPER.md b/tdesign-component/DEVELOPER.md
deleted file mode 100644
index 55c2f5e78..000000000
--- a/tdesign-component/DEVELOPER.md
+++ /dev/null
@@ -1,230 +0,0 @@
-1. 准备工作
-   a. Fork 项目仓库
-    - 访问 TDesign Flutter 项目的 GitHub 页面
-    - 点击右上角的 "Fork" 按钮
-
-   b. 克隆 fork 的仓库到本地
-      ```
-      git clone https://github.com/你的用户名/tdesign-flutter.git
-      cd tdesign-flutter
-      ```
-
-   c. 设置上游仓库
-      ```
-      git remote add upstream https://github.com/Tencent/tdesign-flutter.git
-      ```
-
-   d. 创建并切换到新的特性分支
-      ```
-      git checkout -b feature/新组件名小写_下划线  //如feature/td_new_component
-      ```
-
-   e. 安装依赖
-      ```
-      flutter pub get
-      ```
-
-2. 组件开发
-   a. 在 `lib/src/components` 下创建新组件文件夹和主文件
-      ```
-      mkdir lib/src/components/new_component
-      touch lib/src/components/new_component/td_new_component.dart
-      ```
-
-   b. 实现组件基本结构
-      ```dart
-      import 'package:flutter/material.dart';
-      import 'package:tdesign_flutter/tdesign_flutter.dart';
-
-      class TDNewComponent extends StatefulWidget {
-        const TDNewComponent({Key? key}) : super(key: key);
-
-        @override
-        _TDNewComponentState createState() => _TDNewComponentState();
-      }
-
-      class _TDNewComponentState extends State<TDNewComponent> {
-        @override
-        Widget build(BuildContext context) {
-          final theme = TDTheme.of(context);
-          return Container(
-            // 使用主题中的颜色和样式
-            color: theme.brandNormalColor,
-            child: Text(
-              // 使用本地化文本
-              TDResources.of(context).textComponentTitle,
-              style: TextStyle(color: theme.fontGyColor1),
-            ),
-          );
-        }
-      }
-      ```
-
-3. 国际化支持
-   a. 打开 `lib/src/localization/td_resources.dart`
-   b. 在 TDResources 类中添加新的 getter
-      ```dart
-      String get newComponentTitle => _getText('newComponentTitle');
-      ```
-
-   c. 在 `lib/src/localization/l10n/intl_en.arb` 和 `intl_zh.arb` 中添加新的文本
-      ```json
-      {
-        "newComponentTitle": "New Component"
-      }
-      ```
-
-4. 示例页面开发
-   a. 创建示例页面文件
-      ```
-      touch example/lib/page/td_new_component_page.dart
-      ```
-
-   b. 实现示例页面
-      ```dart
-      import 'package:flutter/material.dart';
-      import 'package:tdesign_flutter/tdesign_flutter.dart';
-      import '../base/example_base.dart';
-
-      class TDNewComponentPage extends StatelessWidget {
-        const TDNewComponentPage({Key? key}) : super(key: key);
-
-        @override
-        Widget build(BuildContext context) {
-          return ExamplePage(
-            title: 'New Component',
-            exampleCodeGroup: 'newComponent',
-            children: [
-              ExampleModule(title: 'Basic Usage', children: [
-                ExampleItem(
-                  desc: 'Default',
-                  builder: (_) => const TDNewComponent(),
-                ),
-                // 添加更多 ExampleItem
-              ]),
-              // 添加更多 ExampleModule
-            ],
-          );
-        }
-      }
-      ```
-
-5. 注册路由
-   a. 打开 `example/lib/base/example_model.dart`
-   b. 添加新组件的 ExampleModel
-      ```dart
-      ExampleModel('New Component', 'NewComponent', '/new_component', Icons.new_releases, (context, model) => const TDNewComponentPage()),
-      ```
-
-   c. 更新 `example/lib/config.dart`
-      ```dart
-      'Components': [
-        // ... 其他组件
-        ExampleModel('New Component', 'NewComponent', '/new_component', Icons.new_releases, (context, model) => const TDNewComponentPage()),
-      ],
-      ```
-
-6. 演示代码编写
-   在 TDNewComponentPage 中：
-   ```dart
-   @Demo(group: 'newComponent')
-   Widget _buildBasicExample() {
-     return const TDNewComponent();
-   }
-   ```
-
-7. API 文档准备
-   在 td_new_component.dart 中：
-   ```dart
-   /// A new component in the TDesign Flutter library.
-   ///
-   /// This component is used for... (describe the purpose)
-   ///
-   /// Example:
-   /// ```dart
-   /// TDNewComponent(
-   ///   // Add example properties here
-   /// )
-   /// ```
-   class TDNewComponent extends StatefulWidget {
-     /// Creates a TDNewComponent.
-     const TDNewComponent({Key? key}) : super(key: key);
-
-     @override
-     _TDNewComponentState createState() => _TDNewComponentState();
-   }
-   ```
-
-8. 主题支持
-   确保在组件中正确使用主题：
-   ```dart
-   final theme = TDTheme.of(context);
-   // 使用 theme 中的颜色和样式
-   ```
-
-9. 测试
-   a. 创建测试文件
-      ```
-      touch test/components/new_component_test.dart
-      ```
-
-   b. 编写测试用例
-      ```dart
-      import 'package:flutter_test/flutter_test.dart';
-      import 'package:tdesign_flutter/tdesign_flutter.dart';
-
-      void main() {
-        testWidgets('TDNewComponent basic test', (WidgetTester tester) async {
-          await tester.pumpWidget(
-            MaterialApp(
-              home: TDTheme(
-                data: TDThemeData.defaultData(),
-                child: const TDNewComponent(),
-              ),
-            ),
-          );
-          // 添加验证逻辑
-        });
-      }
-      ```
-
-10. 代码规范检查
-    运行以下命令：
-    ```
-    dart analyze
-    dart format .
-    ```
-
-11. 更新文档
-    a. 在 CHANGELOG.md 中添加：
-       ```markdown
-       ## Unreleased
-
-       ### Added
-       - New component: TDNewComponent
-       ```
-
-    b. 更新 README.md 和 README_zh.md
-
-12. 本地测试
-    运行示例应用：
-    ```
-    cd example
-    flutter run
-    ```
-
-13. 代码提交
-    ```
-    git add .
-    git commit -m "Add TDNewComponent"
-    git push origin feature/new_component_name
-    ```
-
-14. 持续集成
-    查看 GitHub Actions（如果配置了）的运行结果，根据需要进行修复。
-
-15. 创建 Pull Request
-    - 打开您的 GitHub fork 仓库页面
-    - 点击 "New pull request"
-    - 选择基础分支为原仓库的 dev 分支
-    - 填写 PR 描述，详细说明新组件的功能和用法
\ No newline at end of file

From 84068209e3d82fe7de0482cd4c5ffd5e9c27775c Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Fri, 30 Aug 2024 10:48:31 +0800
Subject: [PATCH 47/74] =?UTF-8?q?=E6=96=B0=E5=A2=9EAPI=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/example/assets/api/progress_api.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tdesign-component/example/assets/api/progress_api.md

diff --git a/tdesign-component/example/assets/api/progress_api.md b/tdesign-component/example/assets/api/progress_api.md
new file mode 100644
index 000000000..e69de29bb

From 186a929aae02507a3e449489281936ecce5560f6 Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Fri, 30 Aug 2024 10:51:53 +0800
Subject: [PATCH 48/74] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/assets/api/progress_api.md        | 76 ++++++++++++++++++
 .../src/components/progress/td_progress.dart  | 78 ++++++++++---------
 2 files changed, 118 insertions(+), 36 deletions(-)

diff --git a/tdesign-component/example/assets/api/progress_api.md b/tdesign-component/example/assets/api/progress_api.md
index e69de29bb..74186dc51 100644
--- a/tdesign-component/example/assets/api/progress_api.md
+++ b/tdesign-component/example/assets/api/progress_api.md
@@ -0,0 +1,76 @@
+## API
+
+### TDProgress
+
+#### 默认构造方法
+
+| 参数 | 类型 | 默认值 | 说明 |
+| --- | --- | --- | --- |
+| key | Key? | - | Widget 的键值 |
+| type | TDProgressType | - | 进度条类型 |
+| value | double? | 0 | 进度值 (0.0 到 1.0 之间的正数) |
+| label | TDLabelWidget? | - | 进度条标签 |
+| progressStatus | TDProgressStatus | TDProgressStatus.primary | 进度条状态 |
+| progressLabelPosition | TDProgressLabelPosition | TDProgressLabelPosition.inside | 标签显示位置 |
+| strokeWidth | double? | - | 进度条粗细 (正数) |
+| color | Color? | - | 进度条颜色 |
+| backgroundColor | Color? | - | 进度条背景颜色 |
+| borderRadius | BorderRadiusGeometry? | - | 进度条末端形状 |
+| circleRadius | double? | - | 环形进度条半径 (正数) |
+| showLabel | bool | true | 是否显示标签 |
+| onTap | VoidCallback? | - | 点击事件 |
+| onLongPress | VoidCallback? | - | 长按事件 |
+| animationDuration | int | 300 | 动画持续时间 (正整数，单位为毫秒) |
+
+### TDProgressType
+
+进度条类型枚举
+
+| 值 | 说明 |
+| --- | --- |
+| linear | 线性进度条 |
+| circular | 环形进度条 |
+| micro | 微型进度条 |
+| button | 按钮进度条 |
+
+### TDProgressLabelPosition
+
+标签显示位置枚举
+
+| 值 | 说明 |
+| --- | --- |
+| inside | 标签显示在进度条内部 |
+| left | 标签显示在进度条左侧 |
+| right | 标签显示在进度条右侧 |
+
+### TDProgressStatus
+
+进度条状态枚举
+
+| 值 | 说明 |
+| --- | --- |
+| primary | 主要状态 |
+| warning | 警告状态 |
+| danger | 危险状态 |
+| success | 成功状态 |
+
+### TDLabelWidget
+
+进度条标签抽象类
+
+#### TDTextLabel
+
+| 参数 | 类型 | 默认值 | 说明 |
+| --- | --- | --- | --- |
+| data | String | - | 文本内容 |
+| key | Key? | - | Widget 的键值 |
+| style | TextStyle? | - | 文本样式 |
+
+#### TDIconLabel
+
+| 参数 | 类型 | 默认值 | 说明 |
+| --- | --- | --- | --- |
+| icon | IconData | - | 图标数据 |
+| key | Key? | - | Widget 的键值 |
+| size | double? | - | 图标大小 |
+| color | Color? | - | 图标颜色 |
\ No newline at end of file
diff --git a/tdesign-component/lib/src/components/progress/td_progress.dart b/tdesign-component/lib/src/components/progress/td_progress.dart
index 074e99b6c..ed07a5c97 100644
--- a/tdesign-component/lib/src/components/progress/td_progress.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress.dart
@@ -93,8 +93,8 @@ class TDProgress extends StatelessWidget {
   static double? _validatePositiveDouble(double? value) => value == null
       ? null
       : value <= 0
-      ? 0
-      : value;
+          ? 0
+          : value;
 
   static int _validatePositiveInt(int? value) =>
       value == null || value <= 0 ? 0 : value;
@@ -254,8 +254,8 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
 
   void _updateAnimation({double? oldWidgetValue}) {
     _animation = Tween<double>(
-        begin: oldWidgetValue ?? _animationController.value,
-        end: widget.value)
+            begin: oldWidgetValue ?? _animationController.value,
+            end: widget.value)
         .animate(_animationController);
     _animationController.forward(from: 0);
   }
@@ -276,18 +276,18 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
       TDProgressStatus.warning: showInsideLabel
           ? getAutoText()
           : showIconBorder
-          ? const Icon(TDIcons.error_circle_filled)
-          : const Icon(TDIcons.error),
+              ? const Icon(TDIcons.error_circle_filled)
+              : const Icon(TDIcons.error),
       TDProgressStatus.danger: showInsideLabel
           ? getAutoText()
           : showIconBorder
-          ? const Icon(TDIcons.close_circle_filled)
-          : const Icon(TDIcons.close),
+              ? const Icon(TDIcons.close_circle_filled)
+              : const Icon(TDIcons.close),
       TDProgressStatus.success: showInsideLabel
           ? getAutoText()
           : showIconBorder
-          ? const Icon(TDIcons.check_circle_filled)
-          : const Icon(TDIcons.check),
+              ? const Icon(TDIcons.check_circle_filled)
+              : const Icon(TDIcons.check),
     };
 
     return statusWidgets[status] ?? getAutoText();
@@ -322,9 +322,9 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
         else if (widget.type == TDProgressType.circular)
           _buildCircularProgress()
         else if (widget.type == TDProgressType.micro)
-            _buildMicroProgress()
-          else if (widget.type == TDProgressType.button)
-              _buildButtonProgress()
+          _buildMicroProgress()
+        else if (widget.type == TDProgressType.button)
+          _buildButtonProgress()
       ],
     );
   }
@@ -377,18 +377,18 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
               ),
             Expanded(
                 child: Stack(
-                  children: [
-                    _buildBackgroundContainer(),
-                    Container(
-                      height: widget.strokeWidth,
-                      width: progressWidth,
-                      decoration: BoxDecoration(
-                        color: _effectiveColor,
-                        borderRadius: widget.borderRadius,
-                      ),
-                    )
-                  ],
-                )),
+              children: [
+                _buildBackgroundContainer(),
+                Container(
+                  height: widget.strokeWidth,
+                  width: progressWidth,
+                  decoration: BoxDecoration(
+                    color: _effectiveColor,
+                    borderRadius: widget.borderRadius,
+                  ),
+                )
+              ],
+            )),
             if (widget.progressLabelPosition == TDProgressLabelPosition.right)
               Padding(
                 padding: const EdgeInsets.only(left: 8.0),
@@ -420,12 +420,12 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
       ),
       child: widget.showLabel
           ? Align(
-        alignment: Alignment.centerRight,
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 10.0),
-          child: _buildLabelWidget(TDTheme.of(context).fontWhColor1),
-        ),
-      )
+              alignment: Alignment.centerRight,
+              child: Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 10.0),
+                child: _buildLabelWidget(TDTheme.of(context).fontWhColor1),
+              ),
+            )
           : null,
     );
   }
@@ -441,9 +441,14 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
             color: _effectiveColor,
             borderRadius: BorderRadius.only(
               topLeft: widget.borderRadius.resolve(TextDirection.ltr).topLeft,
-              bottomLeft: widget.borderRadius.resolve(TextDirection.ltr).bottomLeft,
-              topRight: Radius.circular(widget.borderRadius.resolve(TextDirection.ltr).topRight.x / 2),
-              bottomRight: Radius.circular(widget.borderRadius.resolve(TextDirection.ltr).bottomRight.x / 2),
+              bottomLeft:
+                  widget.borderRadius.resolve(TextDirection.ltr).bottomLeft,
+              topRight: Radius.circular(
+                  widget.borderRadius.resolve(TextDirection.ltr).topRight.x /
+                      2),
+              bottomRight: Radius.circular(
+                  widget.borderRadius.resolve(TextDirection.ltr).bottomRight.x /
+                      2),
             ),
           ),
         ),
@@ -470,7 +475,8 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
           fontSize = widget.strokeWidth * 0.6;
           iconSize = widget.strokeWidth;
         }
-        fontWeight = _animation.value <=0.1 ? FontWeight.bold : FontWeight.normal;
+        fontWeight =
+            _animation.value <= 0.1 ? FontWeight.bold : FontWeight.normal;
         break;
       case TDProgressType.circular:
         iconSize = widget.circleRadius * 0.4;
@@ -616,4 +622,4 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
       child: _buildLabelWidget(TDTheme.of(widget.context).fontWhColor1),
     );
   }
-}
\ No newline at end of file
+}

From d81412f1af041e89a890967b0c2326dba7d38084 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Fri, 30 Aug 2024 21:52:05 +0800
Subject: [PATCH 49/74] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_message_page.dart     |   7 +-
 .../src/components/message/td_message.dart    | 331 +++++++++---------
 2 files changed, 176 insertions(+), 162 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_message_page.dart b/tdesign-component/example/lib/page/td_message_page.dart
index 082f3d7d9..b5b959fb5 100644
--- a/tdesign-component/example/lib/page/td_message_page.dart
+++ b/tdesign-component/example/lib/page/td_message_page.dart
@@ -14,6 +14,7 @@ class TDMessagePage extends StatefulWidget {
 class _TDMessagePageState extends State<TDMessagePage> {
 
   final _commonContent = '这是一条普通的通知信息';
+  final longContent = '这是一条普通的通知信息看，这是一条普通的通知信息，这是一条普通的通知信息';
 
   @override
   Widget build(BuildContext context) {
@@ -145,10 +146,10 @@ class _TDMessagePageState extends State<TDMessagePage> {
           builder: (context) => TDMessage(
             visible: true,
             icon: false,
-            marquee: MessageMarquee(speed: 1000, loop: 1, delay: 0),
-            content: _commonContent,
+            marquee: MessageMarquee(speed: 5000, loop: 1, delay: 300),
+            content: longContent,
             theme: MessageTheme.info,
-            duration: 300000,
+            duration: 100000,
             onDurationEnd: () {
               overlayEntry.remove();
             },
diff --git a/tdesign-component/lib/src/components/message/td_message.dart b/tdesign-component/lib/src/components/message/td_message.dart
index 572658e72..d81162c2b 100644
--- a/tdesign-component/lib/src/components/message/td_message.dart
+++ b/tdesign-component/lib/src/components/message/td_message.dart
@@ -107,12 +107,16 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
   bool _isVisible = true;
   double _topOffset = 0;
   double initTopOffset = 80;
-
+  double totalWidth = 343;
+  late AnimationController animationController;
 
   @override
   void initState() {
     super.initState();
     _topOffset = (widget.offset?[1] ?? initTopOffset) - 30;
+    animationController = AnimationController(
+      vsync: this,
+    );
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
@@ -125,11 +129,18 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
     }
   }
 
+  @override
+  void dispose() {
+    animationController.stop();
+    animationController.dispose();
+    super.dispose();
+  }
+
   void _closeMessage() {
+    animationController.stop();
     setState(() {
       _topOffset = (widget.offset?[1] ?? initTopOffset) - 30;
     });
-
     Future.delayed(const Duration(milliseconds: 300), () {
       if (mounted) {
         setState(() {
@@ -144,6 +155,155 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
   Widget build(BuildContext context) {
     var _leftOffset = widget.offset?[0] ?? (MediaQuery.of(context).size.width - 343) / 2;
 
+    Widget getText(BuildContext context) {
+      if (widget.marquee == null) {
+        return SizedBox(
+          width: calculateTextWidth(),
+          child: Text(
+            widget.content ?? '',
+            style: const TextStyle(color: Colors.black),
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+          ),
+        );
+      } else {
+        final textPainter = TextPainter(
+          text: TextSpan(text: widget.content ?? '',
+          style: const TextStyle(color: Colors.black)),
+          maxLines: 1,
+          textDirection: TextDirection.ltr,
+        )..layout(minWidth: 0, maxWidth: double.infinity);
+        final textWidth = textPainter.width;
+        print('textWidth is ${textWidth}');
+
+        final containerWidth = calculateTextWidth();
+
+        final animationDuration = Duration(milliseconds: (widget.marquee!.speed ?? 10000));
+        animationController.duration = animationDuration;
+
+        final tween = Tween<Offset>(
+          begin: Offset.zero,
+          end: Offset(-textWidth, 0),
+        );
+
+        void startAnimation() {
+          if (widget.marquee!.loop == 0) {
+            animationController.forward();
+          } else if(widget.marquee!.loop == 1){
+            animationController.repeat();
+          }
+        }
+
+        if (widget.marquee!.delay != null && widget.marquee!.delay! > 0) {
+          Future.delayed(Duration(milliseconds: widget.marquee!.delay!), startAnimation);
+        } else {
+          startAnimation();
+        }
+
+        return ClipRect(
+          child: SizedBox(
+            width: containerWidth,
+            child: AnimatedBuilder(
+              animation: animationController,
+              builder: (context, child) {
+                final offset = tween.evaluate(animationController);
+                return OverflowBox(
+                  minWidth: 0,
+                  maxWidth: double.infinity,
+                  alignment: Alignment.centerLeft,
+                  child: Transform.translate(
+                    offset: offset,
+                    child: SizedBox(
+                      child: Text(
+                        widget.content ?? '',
+                        style: const TextStyle(color: Colors.black),
+                        maxLines: 1,
+                      ),
+                    ),
+                  ),
+                );
+              },
+            ),
+          ),
+        );
+      }
+    }
+
+    Widget getIcon(BuildContext context) {
+      if (widget.icon is Widget) {
+        return widget.icon;
+      } else {
+        switch (widget.theme) {
+          case MessageTheme.info:
+            return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).brandColor7);
+          case MessageTheme.success:
+            return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).successColor5);
+          case MessageTheme.warning:
+            return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).warningColor5);
+          case MessageTheme.error:
+            return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).errorColor6);
+          case null:
+            return const SizedBox.shrink();
+        }
+      }
+    }
+    void clickCloseButton() {
+      _closeMessage();
+      widget.onCloseBtnClick?.call();
+    }
+
+    Widget getCloseBtn(BuildContext context) {
+      if(widget.closeBtn is Widget) {
+        return GestureDetector(
+          onTap: clickCloseButton,
+          child: widget.closeBtn!,
+        );
+      } else if(widget.closeBtn == true){
+        return GestureDetector(
+          onTap: clickCloseButton,
+          child: Icon(TDIcons.close),
+        );
+      } else if(widget.closeBtn is String){
+        return GestureDetector(
+          onTap: clickCloseButton,
+          child: Text(widget.closeBtn),
+        );
+      } else {
+        return const SizedBox.shrink();
+      }
+    }
+    void clickLink() {
+      widget.onLinkClick?.call();
+    }
+
+    Widget getLink(BuildContext context) {
+      if (widget.link is LinkObj) {
+        return TDLink(
+          label: widget.link.name,
+          style: TDLinkStyle.primary,
+          type: TDLinkType.basic,
+          uri: widget.link.uri ?? Uri.parse('https://example.com'),
+          size: TDLinkSize.small,
+          color: widget.link.color ?? TDTheme.of(context).brandNormalColor,
+        );
+      } else if (widget.link is String) {
+        return GestureDetector(
+          onTap: clickLink,
+          child: Text(
+            widget.link ?? '',
+            style: TextStyle(
+              color: TDTheme.of(context).brandNormalColor,
+              fontSize: 14,
+            ),
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+          ),
+        );
+      } else {
+        return const SizedBox.shrink();
+      }
+    }
+
     return AnimatedPositioned(
       duration: const Duration(milliseconds: 300),
       curve: Curves.easeInOut,
@@ -153,7 +313,7 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
           ? Material(
         color: Colors.transparent,
         child: Container(
-          width: 343,
+          width: totalWidth,
           height: 48,
           padding: const EdgeInsets.fromLTRB(16, 13, 16, 13),
           decoration: BoxDecoration(
@@ -205,164 +365,17 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
     );
   }
 
-  Widget getIcon(BuildContext context) {
-    if (widget.icon is Widget) { // 如果icon是Widget类型，则返回传入的图标
-      return widget.icon;
-    } else { // 如果icon是true，则返回theme设定图标
-      switch (widget.theme) {
-        case MessageTheme.info:
-          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).brandColor7);
-        case MessageTheme.success:
-          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).successColor5);
-        case MessageTheme.warning:
-          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).warningColor5);
-        case MessageTheme.error:
-          return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).errorColor6);
-        case null:
-          return const SizedBox.shrink();
-      }
-    }
-  }
-  void clickCloseButton() {
-    _closeMessage();
-    widget.onCloseBtnClick?.call();
-  }
-
-  Widget getCloseBtn(BuildContext context) {
-    if(widget.closeBtn is Widget) {
-      return GestureDetector(
-        onTap: clickCloseButton,
-        child: widget.closeBtn!,
-      );
-    } else if(widget.closeBtn == true){
-      return GestureDetector(
-        onTap: clickCloseButton,
-        child: Icon(TDIcons.close),
-      );
-    } else if(widget.closeBtn is String){
-      return GestureDetector(
-        onTap: clickCloseButton,
-        child: Text(widget.closeBtn),
-      );
-    } else {
-      return const SizedBox.shrink();
-    }
-  }
-  void clickLink() {
-    widget.onLinkClick?.call();
-  }
-
-  Widget getLink(BuildContext context) {
-    if (widget.link is LinkObj) {
-      return TDLink(
-        label: widget.link.name,
-        style: TDLinkStyle.primary,
-        type: TDLinkType.basic,
-        uri: widget.link.uri ?? Uri.parse('https://example.com'),
-        size: TDLinkSize.small,
-        color: widget.link.color ?? TDTheme.of(context).brandNormalColor,
-      );
-    } else if (widget.link is String) {
-      return GestureDetector(
-        onTap: clickLink,
-        child: Text(
-          widget.link ?? '',
-          style: TextStyle(
-            color: TDTheme.of(context).brandNormalColor,
-            fontSize: 14,
-          ),
-          maxLines: 1,
-          overflow: TextOverflow.ellipsis,
-        ),
-      );
-    } else {
-      return const SizedBox.shrink();
-    }
-  }
-
   double calculateTextWidth() {
-    if (widget.link != null && widget.closeBtn != null) {
-      return 211;
-    } else if (widget.link != null || widget.closeBtn != null) {
-      return 245;
-    } else if(widget.link == null && widget.closeBtn == null){
-      return 302;
-    } else {
-      return 245;
+    double width = totalWidth - 32;
+    if (widget.icon != null && widget.icon != false) {
+      width -= 30;
     }
-  }
-
-
-  Widget getText(BuildContext context) {
-    if (widget.marquee == null) {
-      return SizedBox(
-        width: calculateTextWidth(),
-        child: Text(
-          widget.content ?? '',
-          style: const TextStyle(color: Colors.black),
-          maxLines: 1,
-          overflow: TextOverflow.ellipsis,
-        ),
-      );
-    } else {
-      final textSpan = TextSpan(text: widget.content ?? '', style: const TextStyle(color: Colors.black));
-      final textPainter = TextPainter(
-        text: textSpan,
-        textDirection: TextDirection.ltr,
-        maxLines: 1,
-      );
-      textPainter.layout(minWidth: 0, maxWidth: double.infinity);
-
-      final textWidth = textPainter.width;
-
-      print('textWidth is ${textWidth}');
-
-      final containerWidth = calculateTextWidth();
-      final animationController = AnimationController(
-        duration: Duration(milliseconds: widget.marquee!.speed ?? 10000),
-        vsync: this,
-      );
-
-      final tween = Tween<double>(begin: textWidth, end: -textWidth);
-
-      animationController.addListener(() {
-        setState(() {});
-      });
-
-      animationController.addStatusListener((status) {
-        if (status == AnimationStatus.completed) {
-          if (widget.marquee!.loop != null && widget.marquee!.loop! > 0) {
-            animationController.repeat();
-          }
-        } else if (status == AnimationStatus.dismissed) {
-          if (widget.marquee!.loop != null && widget.marquee!.loop! > 0) {
-            animationController.forward();
-          }
-        }
-      });
-
-      if (widget.marquee!.delay != null && widget.marquee!.delay! > 0) {
-        Future.delayed(Duration(milliseconds: widget.marquee!.delay!), animationController.forward);
-      } else {
-        animationController.forward();
-      }
-
-      return SingleChildScrollView(
-        scrollDirection: Axis.horizontal,
-        child: Transform.translate(
-          offset: Offset(tween.evaluate(animationController), 0),
-          child: SizedBox(
-            width: containerWidth,
-            child: Text(
-              widget.content ?? '',
-              style: const TextStyle(color: Colors.black),
-              maxLines: 1,
-              overflow: TextOverflow.ellipsis,
-            ),
-          ),
-        ),
-      );
+    if (widget.link != null) {
+      width -= 36;
     }
+    if (widget.closeBtn != null) {
+      width -= 34;
+    }
+    return width;
   }
-
 }
\ No newline at end of file

From 8fb6a8ede782a109930b73ee159fd2f89594089b Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Sun, 1 Sep 2024 21:21:51 +0800
Subject: [PATCH 50/74] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E8=B0=83=E7=94=A8=E7=A9=BA=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_message_page.dart     | 328 +++++++-----------
 .../src/components/message/td_message.dart    | 269 ++++++++------
 2 files changed, 296 insertions(+), 301 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_message_page.dart b/tdesign-component/example/lib/page/td_message_page.dart
index b5b959fb5..da36348a0 100644
--- a/tdesign-component/example/lib/page/td_message_page.dart
+++ b/tdesign-component/example/lib/page/td_message_page.dart
@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:tdesign_flutter/tdesign_flutter.dart';
 import '../../base/example_widget.dart';
@@ -12,35 +11,31 @@ class TDMessagePage extends StatefulWidget {
 }
 
 class _TDMessagePageState extends State<TDMessagePage> {
-
   final _commonContent = '这是一条普通的通知信息';
   final longContent = '这是一条普通的通知信息看，这是一条普通的通知信息，这是一条普通的通知信息';
 
   @override
   Widget build(BuildContext context) {
     return ExamplePage(
-      title: tdTitle(),
-      desc: '用于轻量级反馈或提示，不会打断用户操作。',
-      exampleCodeGroup: 'message',
-      children: [
-        ExampleModule(
-            title: '组件类型',
-            children: [
-                ExampleItem(desc: '纯文字的通知', builder: _buildPlainTextMessage),
-                ExampleItem(desc: '带图标的通知', builder: _buildIconTextMessage),
-                ExampleItem(desc: '带关闭的通知', builder: _buildMessageWithCloseButton),
-                ExampleItem(desc: '可滚动的通知', builder: _buildRollingMessage),
-                ExampleItem(desc: '带按钮的通知', builder: _buildLinkMessage),
-        ]),
-        ExampleModule(
-            title: '组件状态',
-            children: [
-                ExampleItem(desc: '普通通知', builder: _buildInfoMessage),
-                ExampleItem(desc: '成功通知', builder: _buildSuccessMessage),
-                ExampleItem(desc: '警示通知', builder: _buildWarningMessage),
-                ExampleItem(desc: '错误通知', builder: _buildErrorMessage),
-              ]),
-      ]);
+        title: tdTitle(),
+        backgroundColor: Colors.white,
+        desc: '用于轻量级反馈或提示，不会打断用户操作。',
+        exampleCodeGroup: 'message',
+        children: [
+          ExampleModule(title: '组件类型', children: [
+            ExampleItem(desc: '纯文字的通知', builder: _buildPlainTextMessage),
+            ExampleItem(desc: '带图标的通知', builder: _buildIconTextMessage),
+            ExampleItem(desc: '带关闭的通知', builder: _buildMessageWithCloseButton),
+            ExampleItem(desc: '可滚动的通知', builder: _buildRollingMessage),
+            ExampleItem(desc: '带按钮的通知', builder: _buildLinkMessage),
+          ]),
+          ExampleModule(title: '组件状态', children: [
+            ExampleItem(desc: '普通通知', builder: _buildInfoMessage),
+            ExampleItem(desc: '成功通知', builder: _buildSuccessMessage),
+            ExampleItem(desc: '警示通知', builder: _buildWarningMessage),
+            ExampleItem(desc: '错误通知', builder: _buildErrorMessage),
+          ]),
+        ]);
   }
 
   @Demo(group: 'message')
@@ -53,63 +48,54 @@ class _TDMessagePageState extends State<TDMessagePage> {
       width: 450,
       theme: TDButtonTheme.primary,
       onTap: () {
-        final overlay = Overlay.of(context);
-        late OverlayEntry overlayEntry;
-        overlayEntry = OverlayEntry(
-          builder: (context) => TDMessage(
-            visible: true,
-            icon: false,
-            content: _commonContent,
-            theme: MessageTheme.info,
-            duration: 3000,
-            onDurationEnd: () {
-              overlayEntry.remove();
-            },
-          ),
+        TDMessage.showMessage(
+          context: context,
+          content: _commonContent,
+          visible: true,
+          icon: false,
+          theme: MessageTheme.info,
+          duration: 3000,
+          onDurationEnd: () {
+            print('message end');
+          },
         );
-        overlay.insert(overlayEntry);
       },
     );
   }
+
   @Demo(group: 'message')
   Widget _buildIconTextMessage(BuildContext context) {
     return TDButton(
-      isBlock: true,
-      text: '带图标的通知',
-      size: TDButtonSize.large,
-      type: TDButtonType.outline,
-      width: 450,
-      theme: TDButtonTheme.primary,
-      onTap: () {
-        final overlay = Overlay.of(context);
-        late OverlayEntry overlayEntry;
-        overlayEntry = OverlayEntry(
-          builder: (context) => TDMessage(
+        isBlock: true,
+        text: '带图标的通知',
+        size: TDButtonSize.large,
+        type: TDButtonType.outline,
+        width: 450,
+        theme: TDButtonTheme.primary,
+        onTap: () {
+          TDMessage.showMessage(
+            context: context,
+            content: _commonContent,
             visible: true,
             icon: true,
-            content: _commonContent,
             theme: MessageTheme.info,
             duration: 3000,
-          ),
-        );
-        overlay.insert(overlayEntry);
-      },
-    );
+          );
+        });
   }
+
   @Demo(group: 'message')
   Widget _buildMessageWithCloseButton(BuildContext context) {
     return TDButton(
-      isBlock: true,
-      text: '带关闭的通知',
-      size: TDButtonSize.large,
-      type: TDButtonType.outline,
-      width: 450,
-      theme: TDButtonTheme.primary,
-      onTap: () {
-        final overlay = Overlay.of(context);
-        late OverlayEntry overlayEntry;
-        overlayEntry = OverlayEntry(
-          builder: (context) => TDMessage(
+        isBlock: true,
+        text: '带关闭的通知',
+        size: TDButtonSize.large,
+        type: TDButtonType.outline,
+        width: 450,
+        theme: TDButtonTheme.primary,
+        onTap: () {
+          TDMessage.showMessage(
+            context: context,
             visible: true,
             icon: true,
             content: _commonContent,
@@ -117,85 +103,61 @@ class _TDMessagePageState extends State<TDMessagePage> {
             duration: 300000,
             closeBtn: true,
             link: '按钮',
-            onDurationEnd: () {
-              overlayEntry.remove();
-            },
             onCloseBtnClick: () {
               print('Close button clicked!');
             },
-          ),
-        );
-        overlay.insert(overlayEntry);
-      },
-    );
+          );
+        });
   }
 
   @Demo(group: 'message')
   Widget _buildRollingMessage(BuildContext context) {
     return TDButton(
-      isBlock: true,
-      text: '可滚动的通知',
-      size: TDButtonSize.large,
-      type: TDButtonType.outline,
-      width: 450,
-      theme: TDButtonTheme.primary,
-      onTap: () {
-        final overlay = Overlay.of(context);
-        late OverlayEntry overlayEntry;
-        overlayEntry = OverlayEntry(
-          builder: (context) => TDMessage(
-            visible: true,
-            icon: false,
-            marquee: MessageMarquee(speed: 5000, loop: 1, delay: 300),
-            content: longContent,
-            theme: MessageTheme.info,
-            duration: 100000,
-            onDurationEnd: () {
-              overlayEntry.remove();
-            },
-          ),
-        );
-        overlay.insert(overlayEntry);
-      },
-    );
+        isBlock: true,
+        text: '可滚动的通知',
+        size: TDButtonSize.large,
+        type: TDButtonType.outline,
+        width: 450,
+        theme: TDButtonTheme.primary,
+        onTap: () {
+          TDMessage.showMessage(
+              context: context,
+              visible: true,
+              icon: false,
+              marquee: MessageMarquee(speed: 5000, loop: 1, delay: 300),
+              content: longContent,
+              theme: MessageTheme.info,
+              duration: 8000,
+              onCloseBtnClick: () {
+                print('Close button clicked!');
+              });
+        });
   }
+
   @Demo(group: 'message')
   Widget _buildLinkMessage(BuildContext context) {
     return TDButton(
-      isBlock: true,
-      text: '带按钮的通知',
-      size: TDButtonSize.large,
-      type: TDButtonType.outline,
-      width: 450,
-      theme: TDButtonTheme.primary,
-      onTap: () {
-        final overlay = Overlay.of(context);
-        late OverlayEntry overlayEntry;
-        overlayEntry = OverlayEntry(
-          builder: (context) => TDMessage(
-            visible: true,
-            icon: true,
-            content: _commonContent,
-            theme: MessageTheme.info,
-            duration: 300000,
-            link: '按钮',
-            onDurationEnd: () {
-              overlayEntry.remove();
-            },
-            onLinkClick: () {
-              print('link clicked!');
-            },
-
-          ),
-        );
-        overlay.insert(overlayEntry);
-      },
-    );
+        isBlock: true,
+        text: '带按钮的通知',
+        size: TDButtonSize.large,
+        type: TDButtonType.outline,
+        width: 450,
+        theme: TDButtonTheme.primary,
+        onTap: () {
+          TDMessage.showMessage(
+              context: context,
+              visible: true,
+              icon: true,
+              content: _commonContent,
+              theme: MessageTheme.info,
+              duration: 3000,
+              link: '按钮',
+              onLinkClick: () {
+                print('link clicked!');
+              });
+        });
   }
 
-
-
-
   @Demo(group: 'message')
   Widget _buildInfoMessage(BuildContext context) {
     return TDButton(
@@ -206,21 +168,14 @@ class _TDMessagePageState extends State<TDMessagePage> {
       width: 450,
       theme: TDButtonTheme.primary,
       onTap: () {
-        final overlay = Overlay.of(context);
-        late OverlayEntry overlayEntry;
-        overlayEntry = OverlayEntry(
-          builder: (context) => TDMessage(
-            visible: true,
-            icon: true,
-            content: _commonContent,
-            theme: MessageTheme.info,
-            duration: 3000,
-            onDurationEnd: () {
-              overlayEntry.remove();
-            },
-          ),
+        TDMessage.showMessage(
+          context: context,
+          visible: true,
+          icon: true,
+          content: _commonContent,
+          theme: MessageTheme.info,
+          duration: 3000,
         );
-        overlay.insert(overlayEntry);
       },
     );
   }
@@ -235,21 +190,14 @@ class _TDMessagePageState extends State<TDMessagePage> {
       width: 450,
       theme: TDButtonTheme.primary,
       onTap: () {
-        final overlay = Overlay.of(context);
-        late OverlayEntry overlayEntry;
-        overlayEntry = OverlayEntry(
-          builder: (context) => TDMessage(
-            visible: true,
-            icon: true,
-            content: _commonContent,
-            theme: MessageTheme.success,
-            duration: 3000,
-            onDurationEnd: () {
-              overlayEntry.remove();
-            },
-          ),
+        TDMessage.showMessage(
+          context: context,
+          visible: true,
+          icon: true,
+          content: _commonContent,
+          theme: MessageTheme.success,
+          duration: 3000,
         );
-        overlay.insert(overlayEntry);
       },
     );
   }
@@ -257,60 +205,42 @@ class _TDMessagePageState extends State<TDMessagePage> {
   @Demo(group: 'message')
   Widget _buildWarningMessage(BuildContext context) {
     return TDButton(
-      isBlock: true,
-      text: '警示通知',
-      size: TDButtonSize.large,
-      type: TDButtonType.outline,
-      width: 450,
-      theme: TDButtonTheme.primary,
-      onTap: () {
-        final overlay = Overlay.of(context);
-        late OverlayEntry overlayEntry;
-        overlayEntry = OverlayEntry(
-          builder: (context) => TDMessage(
+        isBlock: true,
+        text: '警示通知',
+        size: TDButtonSize.large,
+        type: TDButtonType.outline,
+        width: 450,
+        theme: TDButtonTheme.primary,
+        onTap: () {
+          TDMessage.showMessage(
+            context: context,
             visible: true,
             icon: true,
             content: _commonContent,
             theme: MessageTheme.warning,
             duration: 3000,
-            onDurationEnd: () {
-              overlayEntry.remove();
-            },
-          ),
-        );
-        overlay.insert(overlayEntry);
-      },
-    );
+          );
+        });
   }
 
   @Demo(group: 'message')
   Widget _buildErrorMessage(BuildContext context) {
     return TDButton(
-      isBlock: true,
-      text: '错误通知',
-      size: TDButtonSize.large,
-      type: TDButtonType.outline,
-      width: 450,
-      theme: TDButtonTheme.primary,
-      onTap: () {
-        final overlay = Overlay.of(context);
-        late OverlayEntry overlayEntry;
-        overlayEntry = OverlayEntry(
-          builder: (context) => TDMessage(
+        isBlock: true,
+        text: '错误通知',
+        size: TDButtonSize.large,
+        type: TDButtonType.outline,
+        width: 450,
+        theme: TDButtonTheme.primary,
+        onTap: () {
+          TDMessage.showMessage(
+            context: context,
             visible: true,
             icon: true,
             content: _commonContent,
             theme: MessageTheme.error,
             duration: 3000,
-            onDurationEnd: () {
-              overlayEntry.remove();
-            },
-          ),
-        );
-        overlay.insert(overlayEntry);
-      },
-    );
+          );
+        });
   }
-
 }
-
diff --git a/tdesign-component/lib/src/components/message/td_message.dart b/tdesign-component/lib/src/components/message/td_message.dart
index d81162c2b..1727ff27f 100644
--- a/tdesign-component/lib/src/components/message/td_message.dart
+++ b/tdesign-component/lib/src/components/message/td_message.dart
@@ -1,17 +1,8 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter/src/scheduler/binding.dart';
 
 import '../../../tdesign_flutter.dart';
 
-// 定义消息对齐方式枚举
-enum MessageAlign {
-  /// 左对齐
-  left,
-
-  /// 右对齐
-  center
-}
 //链接设置
 class LinkObj {
   LinkObj({
@@ -31,11 +22,7 @@ class MessageMarquee {
   final int? loop;
   final int? delay;
 
-  MessageMarquee({
-    this.speed,
-    this.loop,
-    this.delay
-  });
+  MessageMarquee({this.speed, this.loop, this.delay});
 }
 
 // 定义消息主题枚举
@@ -55,36 +42,44 @@ enum MessageTheme {
 
 // TDMessage 组件
 class TDMessage extends StatefulWidget {
-  /// 对齐方式
-  final MessageAlign? align;
-  /// 关闭按钮
-  final dynamic closeBtn;
   /// 通知内容
   final String? content;
+
   /// 消息内置计时器
   final int? duration;
+
+  /// 是否显示
+  final bool? visible;
+
   /// 自定义消息前面的图标
   final dynamic icon;
+
   /// 链接名称
   final dynamic link;
+
+  /// 关闭按钮
+  final dynamic closeBtn;
+
   /// 跑马灯效果
   final MessageMarquee? marquee;
+
   /// 相对于 placement 的偏移量
   final List<double>? offset;
+
   /// 消息组件风格 info/success/warning/error
   final MessageTheme? theme;
-  /// 是否显示
-  final bool? visible;
+
   /// 点击关闭按钮触发
   final VoidCallback? onCloseBtnClick;
+
   /// 计时结束后触发
   final VoidCallback? onDurationEnd;
+
   /// 点击链接文本时触发
   final VoidCallback? onLinkClick;
 
   const TDMessage({
     Key? key,
-    this.align,
     this.closeBtn,
     this.content,
     this.duration = 3000,
@@ -101,6 +96,45 @@ class TDMessage extends StatefulWidget {
 
   @override
   _TDMessageState createState() => _TDMessageState();
+
+  static void showMessage({
+    required BuildContext context,
+    String? content,
+    bool? visible,
+    int? duration,
+    dynamic closeBtn,
+    dynamic icon,
+    dynamic link,
+    MessageMarquee? marquee,
+    List<double>? offset,
+    MessageTheme? theme,
+    VoidCallback? onCloseBtnClick,
+    VoidCallback? onDurationEnd,
+    VoidCallback? onLinkClick,
+  }) {
+    final overlay = Overlay.of(context);
+    late OverlayEntry overlayEntry;
+    overlayEntry = OverlayEntry(
+      builder: (context) => TDMessage(
+        content: content,
+        visible: visible,
+        duration: duration,
+        closeBtn: closeBtn,
+        icon: icon,
+        link: link,
+        marquee: marquee,
+        offset: offset,
+        theme: theme,
+        onDurationEnd: () {
+          onDurationEnd?.call();
+          overlayEntry.remove();
+        },
+        onCloseBtnClick: onCloseBtnClick,
+        onLinkClick: onLinkClick,
+      ),
+    );
+    overlay.insert(overlayEntry);
+  }
 }
 
 class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
@@ -108,7 +142,8 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
   double _topOffset = 0;
   double initTopOffset = 80;
   double totalWidth = 343;
-  late AnimationController animationController;
+  AnimationController? animationController;
+  bool _isAnimationRunning = false;
 
   @override
   void initState() {
@@ -119,41 +154,71 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
     );
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      setState(() {
-        _topOffset = widget.offset?[1] ?? initTopOffset;
-      });
+      if (mounted) {
+        setState(() {
+          _topOffset = widget.offset?[1] ?? initTopOffset;
+        });
+      }
     });
 
     if (widget.duration != null && widget.duration! > 0) {
       Future.delayed(Duration(milliseconds: widget.duration!), _closeMessage);
     }
+
+    if (widget.marquee != null) {
+      animationController = AnimationController(
+        vsync: this,
+        duration: Duration(milliseconds: widget.marquee!.speed ?? 10000),
+      );
+    }
   }
 
   @override
   void dispose() {
-    animationController.stop();
-    animationController.dispose();
+    animationController?.stop();
+    animationController?.dispose();
+    animationController = null;
     super.dispose();
   }
 
   void _closeMessage() {
-    animationController.stop();
-    setState(() {
-      _topOffset = (widget.offset?[1] ?? initTopOffset) - 30;
-    });
-    Future.delayed(const Duration(milliseconds: 300), () {
-      if (mounted) {
-        setState(() {
-          _isVisible = false;
-        });
-        widget.onDurationEnd?.call();
+    if (mounted) {
+      animationController?.stop();
+      setState(() {
+        _topOffset = (widget.offset?[1] ?? initTopOffset) - 30;
+        _isAnimationRunning = false;
+      });
+      Future.delayed(const Duration(milliseconds: 300), () {
+        if (mounted) {
+          setState(() {
+            _isVisible = false;
+          });
+          widget.onDurationEnd?.call();
+        }
+      });
+    }
+  }
+
+  void startAnimation() {
+    if (mounted && animationController != null && !_isAnimationRunning) {
+      setState(() {
+        _isAnimationRunning = true;
+      });
+      if (widget.marquee!.loop == 0) {
+        animationController!.forward();
+      } else if (widget.marquee!.loop == 1) {
+        animationController!.repeat();
       }
-    });
+    }
   }
 
   @override
   Widget build(BuildContext context) {
-    var _leftOffset = widget.offset?[0] ?? (MediaQuery.of(context).size.width - 343) / 2;
+    if (widget.visible == false) {
+      return const SizedBox.shrink();
+    }
+    var _leftOffset =
+        widget.offset?[0] ?? (MediaQuery.of(context).size.width - 343) / 2;
 
     Widget getText(BuildContext context) {
       if (widget.marquee == null) {
@@ -168,34 +233,28 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
         );
       } else {
         final textPainter = TextPainter(
-          text: TextSpan(text: widget.content ?? '',
-          style: const TextStyle(color: Colors.black)),
+          text: TextSpan(
+              text: widget.content ?? '',
+              style: const TextStyle(color: Colors.black)),
           maxLines: 1,
           textDirection: TextDirection.ltr,
         )..layout(minWidth: 0, maxWidth: double.infinity);
         final textWidth = textPainter.width;
-        print('textWidth is ${textWidth}');
 
         final containerWidth = calculateTextWidth();
 
-        final animationDuration = Duration(milliseconds: (widget.marquee!.speed ?? 10000));
-        animationController.duration = animationDuration;
+        final animationDuration =
+            Duration(milliseconds: (widget.marquee!.speed ?? 10000));
+        animationController!.duration = animationDuration;
 
         final tween = Tween<Offset>(
           begin: Offset.zero,
           end: Offset(-textWidth, 0),
         );
 
-        void startAnimation() {
-          if (widget.marquee!.loop == 0) {
-            animationController.forward();
-          } else if(widget.marquee!.loop == 1){
-            animationController.repeat();
-          }
-        }
-
         if (widget.marquee!.delay != null && widget.marquee!.delay! > 0) {
-          Future.delayed(Duration(milliseconds: widget.marquee!.delay!), startAnimation);
+          Future.delayed(
+              Duration(milliseconds: widget.marquee!.delay!), startAnimation);
         } else {
           startAnimation();
         }
@@ -204,9 +263,10 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
           child: SizedBox(
             width: containerWidth,
             child: AnimatedBuilder(
-              animation: animationController,
+              animation: animationController ?? const AlwaysStoppedAnimation(0),
               builder: (context, child) {
-                final offset = tween.evaluate(animationController);
+                final offset = tween.evaluate(
+                    animationController ?? const AlwaysStoppedAnimation(0));
                 return OverflowBox(
                   minWidth: 0,
                   maxWidth: double.infinity,
@@ -235,35 +295,40 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
       } else {
         switch (widget.theme) {
           case MessageTheme.info:
-            return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).brandColor7);
+            return Icon(TDIcons.error_circle_filled,
+                color: TDTheme.of(context).brandColor7);
           case MessageTheme.success:
-            return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).successColor5);
+            return Icon(TDIcons.error_circle_filled,
+                color: TDTheme.of(context).successColor5);
           case MessageTheme.warning:
-            return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).warningColor5);
+            return Icon(TDIcons.error_circle_filled,
+                color: TDTheme.of(context).warningColor5);
           case MessageTheme.error:
-            return Icon(TDIcons.error_circle_filled, color: TDTheme.of(context).errorColor6);
+            return Icon(TDIcons.error_circle_filled,
+                color: TDTheme.of(context).errorColor6);
           case null:
             return const SizedBox.shrink();
         }
       }
     }
+
     void clickCloseButton() {
       _closeMessage();
       widget.onCloseBtnClick?.call();
     }
 
     Widget getCloseBtn(BuildContext context) {
-      if(widget.closeBtn is Widget) {
+      if (widget.closeBtn is Widget) {
         return GestureDetector(
           onTap: clickCloseButton,
           child: widget.closeBtn!,
         );
-      } else if(widget.closeBtn == true){
+      } else if (widget.closeBtn == true) {
         return GestureDetector(
           onTap: clickCloseButton,
           child: Icon(TDIcons.close),
         );
-      } else if(widget.closeBtn is String){
+      } else if (widget.closeBtn is String) {
         return GestureDetector(
           onTap: clickCloseButton,
           child: Text(widget.closeBtn),
@@ -272,6 +337,7 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
         return const SizedBox.shrink();
       }
     }
+
     void clickLink() {
       widget.onLinkClick?.call();
     }
@@ -311,56 +377,55 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
       left: _leftOffset,
       child: _isVisible
           ? Material(
-        color: Colors.transparent,
-        child: Container(
-          width: totalWidth,
-          height: 48,
-          padding: const EdgeInsets.fromLTRB(16, 13, 16, 13),
-          decoration: BoxDecoration(
-            color: Colors.white,
-            borderRadius: BorderRadius.circular(6),
-          ),
-          child: Row(
-            children: [
-              if (widget.icon != false)
-                Padding(
-                  padding: const EdgeInsets.only(right: 10),
-                  child: SizedBox(
-                    width: 20,
-                    height: 22,
-                    child: getIcon(context),
-                  ),
+              color: Colors.transparent,
+              child: Container(
+                width: totalWidth,
+                height: 48,
+                padding: const EdgeInsets.fromLTRB(16, 13, 16, 13),
+                decoration: BoxDecoration(
+                  color: Colors.white,
+                  borderRadius: BorderRadius.circular(6),
                 ),
-              Expanded(
                 child: Row(
                   children: [
-                    getText(context),
-
-                    if (widget.link != null)
+                    if (widget.icon != false)
                       Padding(
-                        padding: const EdgeInsets.only(left: 8),
+                        padding: const EdgeInsets.only(right: 10),
                         child: SizedBox(
-                          width: 28,
-                          height: 60,
-                          child: getLink(context),
-                        ),
-                      ),
-                    if (widget.closeBtn != null)
-                      Padding(
-                        padding: const EdgeInsets.only(left: 12),
-                        child: SizedBox(
-                          width: 22,
+                          width: 20,
                           height: 22,
-                          child: getCloseBtn(context),
+                          child: getIcon(context),
                         ),
                       ),
+                    Expanded(
+                      child: Row(
+                        children: [
+                          getText(context),
+                          if (widget.link != null)
+                            Padding(
+                              padding: const EdgeInsets.only(left: 8),
+                              child: SizedBox(
+                                width: 28,
+                                height: 60,
+                                child: getLink(context),
+                              ),
+                            ),
+                          if (widget.closeBtn != null)
+                            Padding(
+                              padding: const EdgeInsets.only(left: 12),
+                              child: SizedBox(
+                                width: 22,
+                                height: 22,
+                                child: getCloseBtn(context),
+                              ),
+                            ),
+                        ],
+                      ),
+                    ),
                   ],
                 ),
               ),
-            ],
-          ),
-        ),
-      )
+            )
           : const SizedBox.shrink(),
     );
   }
@@ -378,4 +443,4 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
     }
     return width;
   }
-}
\ No newline at end of file
+}

From e29d31341033f983d48f4d0360e5e8fe702b1bea Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Sun, 1 Sep 2024 21:30:32 +0800
Subject: [PATCH 51/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86message?=
 =?UTF-8?q?=E5=A4=96=E8=BE=B9=E6=A1=86=E7=9A=84=E9=98=B4=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/src/components/message/td_message.dart             | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tdesign-component/lib/src/components/message/td_message.dart b/tdesign-component/lib/src/components/message/td_message.dart
index 1727ff27f..e4ec994f8 100644
--- a/tdesign-component/lib/src/components/message/td_message.dart
+++ b/tdesign-component/lib/src/components/message/td_message.dart
@@ -385,6 +385,13 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
                 decoration: BoxDecoration(
                   color: Colors.white,
                   borderRadius: BorderRadius.circular(6),
+                  boxShadow: const [
+                    BoxShadow(
+                      color: Color(0x0F000000),
+                      offset: Offset(0, 2),
+                      blurRadius: 8,
+                    ),
+                  ],
                 ),
                 child: Row(
                   children: [

From 814ff97b933c39ffa637ae96634bcc99033a9046 Mon Sep 17 00:00:00 2001
From: 221250009 <221250009@smail.nju.edu.cn>
Date: Mon, 2 Sep 2024 13:09:38 +0800
Subject: [PATCH 52/74] =?UTF-8?q?=E7=A4=BA=E4=BE=8B=E9=A1=B5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=9B=E4=BF=AE=E6=94=B9=E6=9E=84=E9=80=A0=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/demo_tool/all_build.sh      |   2 +-
 .../example/assets/api/progress_api.md        |  76 -----
 .../example/lib/page/td_progress_page.dart    | 282 +++++++++---------
 .../src/components/progress/td_progress.dart  |  44 +--
 .../progress/td_progress_circular.dart        |   1 +
 5 files changed, 168 insertions(+), 237 deletions(-)
 delete mode 100644 tdesign-component/example/assets/api/progress_api.md

diff --git a/tdesign-component/demo_tool/all_build.sh b/tdesign-component/demo_tool/all_build.sh
index 23283dc34..fcb40a307 100644
--- a/tdesign-component/demo_tool/all_build.sh
+++ b/tdesign-component/demo_tool/all_build.sh
@@ -85,7 +85,7 @@
 # imageViewer
 ./bin/demo_tool generate --folder ../lib/src/components/image_viewer  --name TDImageViewer,TDImageViewerWidget,  --folder-name image-viewer --output ../example/assets/api/ --only-api
 # progress
-./bin/demo_tool generate --file ../lib/src/components/image/td_progress.dart --name TDProgress --folder-name image --output ../example/assets/api/ --only-api
+./bin/demo_tool generate --file ../lib/src/components/image/td_progress.dart --name TDProgress --folder-name progress --output ../example/assets/api/ --only-api
 # result
 # skeleton
 # sticky
diff --git a/tdesign-component/example/assets/api/progress_api.md b/tdesign-component/example/assets/api/progress_api.md
deleted file mode 100644
index 74186dc51..000000000
--- a/tdesign-component/example/assets/api/progress_api.md
+++ /dev/null
@@ -1,76 +0,0 @@
-## API
-
-### TDProgress
-
-#### 默认构造方法
-
-| 参数 | 类型 | 默认值 | 说明 |
-| --- | --- | --- | --- |
-| key | Key? | - | Widget 的键值 |
-| type | TDProgressType | - | 进度条类型 |
-| value | double? | 0 | 进度值 (0.0 到 1.0 之间的正数) |
-| label | TDLabelWidget? | - | 进度条标签 |
-| progressStatus | TDProgressStatus | TDProgressStatus.primary | 进度条状态 |
-| progressLabelPosition | TDProgressLabelPosition | TDProgressLabelPosition.inside | 标签显示位置 |
-| strokeWidth | double? | - | 进度条粗细 (正数) |
-| color | Color? | - | 进度条颜色 |
-| backgroundColor | Color? | - | 进度条背景颜色 |
-| borderRadius | BorderRadiusGeometry? | - | 进度条末端形状 |
-| circleRadius | double? | - | 环形进度条半径 (正数) |
-| showLabel | bool | true | 是否显示标签 |
-| onTap | VoidCallback? | - | 点击事件 |
-| onLongPress | VoidCallback? | - | 长按事件 |
-| animationDuration | int | 300 | 动画持续时间 (正整数，单位为毫秒) |
-
-### TDProgressType
-
-进度条类型枚举
-
-| 值 | 说明 |
-| --- | --- |
-| linear | 线性进度条 |
-| circular | 环形进度条 |
-| micro | 微型进度条 |
-| button | 按钮进度条 |
-
-### TDProgressLabelPosition
-
-标签显示位置枚举
-
-| 值 | 说明 |
-| --- | --- |
-| inside | 标签显示在进度条内部 |
-| left | 标签显示在进度条左侧 |
-| right | 标签显示在进度条右侧 |
-
-### TDProgressStatus
-
-进度条状态枚举
-
-| 值 | 说明 |
-| --- | --- |
-| primary | 主要状态 |
-| warning | 警告状态 |
-| danger | 危险状态 |
-| success | 成功状态 |
-
-### TDLabelWidget
-
-进度条标签抽象类
-
-#### TDTextLabel
-
-| 参数 | 类型 | 默认值 | 说明 |
-| --- | --- | --- | --- |
-| data | String | - | 文本内容 |
-| key | Key? | - | Widget 的键值 |
-| style | TextStyle? | - | 文本样式 |
-
-#### TDIconLabel
-
-| 参数 | 类型 | 默认值 | 说明 |
-| --- | --- | --- | --- |
-| icon | IconData | - | 图标数据 |
-| key | Key? | - | Widget 的键值 |
-| size | double? | - | 图标大小 |
-| color | Color? | - | 图标颜色 |
\ No newline at end of file
diff --git a/tdesign-component/example/lib/page/td_progress_page.dart b/tdesign-component/example/lib/page/td_progress_page.dart
index be58b0a46..b0ba4c007 100644
--- a/tdesign-component/example/lib/page/td_progress_page.dart
+++ b/tdesign-component/example/lib/page/td_progress_page.dart
@@ -12,7 +12,9 @@ class TDProgressPage extends StatefulWidget {
   final examplePadding = const EdgeInsets.symmetric(horizontal: 16);
 
   @override
-  State<StatefulWidget> createState() => _TDProgressPageState();
+  State<StatefulWidget> createState() {
+    return _TDProgressPageState();
+  }
 }
 
 class _TDProgressPageState extends State<TDProgressPage> {
@@ -27,80 +29,82 @@ class _TDProgressPageState extends State<TDProgressPage> {
   @override
   Widget build(BuildContext context) {
     return ExamplePage(
-      title: tdTitle(),
-      desc: '用于展示任务当前的进度',
-      exampleCodeGroup: 'progress',
-      backgroundColor: TDTheme.of().whiteColor1,
-      padding: const EdgeInsets.symmetric(vertical: 8),
-      children: [
-        ExampleModule(title: '组件类型', children: [
-          ExampleItem(
-            desc: '线性进度条',
-            padding: widget.examplePadding,
-            builder: _buildRightLabelLinear,
-          ),
-          ExampleItem(
-            desc: '百分比内显',
-            padding: widget.examplePadding,
-            builder: _buildInsideLabelLinear,
-          ),
-          ExampleItem(
-              desc: '环形进度条',
-              padding: widget.examplePadding,
-              builder: _buildCircle,
-              center: false),
-          ExampleItem(
-              desc: '微型环形进度条',
-              padding: widget.examplePadding,
-              builder: _buildMicro,
-              center: false),
-          ExampleItem(
-            desc: '按钮进度条',
-            padding: widget.examplePadding,
-            builder: _buildResizedButton,
-            center: false,
-          ),
-          ExampleItem(
-            desc: '微型按钮进度条',
-            padding: widget.examplePadding,
-            builder: _buildMicroButton,
-          ),
-        ]),
-        ExampleModule(title: '组件状态', children: [
-          ExampleItem(
-            desc: '线性进度条状态',
-            padding: widget.examplePadding,
-            builder: _buildLinearProgressStatus,
-          ),
-          ExampleItem(
-            desc: '环形进度条状态',
-            padding: widget.examplePadding,
-            builder: _buildCircularProgressStatus,
-          ),
-        ])
-      ],
-    );
+        title: tdTitle(),
+        desc: '用于展示任务当前的进度',
+        exampleCodeGroup: 'progress',
+        backgroundColor: TDTheme.of().whiteColor1,
+        padding: const EdgeInsets.symmetric(vertical: 8),
+        children: [
+          ExampleModule(title: '组件类型', children: [
+            ExampleItem(
+                desc: '线性进度条',
+                padding: widget.examplePadding,
+                builder: _buildRightLabelLinear),
+            ExampleItem(
+                desc: '百分比内显',
+                padding: widget.examplePadding,
+                builder: _buildInsideLabelLinear),
+            ExampleItem(
+                desc: '环形进度条',
+                padding: widget.examplePadding,
+                center: false,
+                builder: _buildCircle),
+            ExampleItem(
+                desc: '微型环形进度条',
+                padding: widget.examplePadding,
+                center: false,
+                builder: _buildMicro),
+            ExampleItem(
+                desc: '按钮进度条',
+                padding: widget.examplePadding,
+                builder: _buildButton),
+            ExampleItem(
+                desc: '微型按钮进度条',
+                padding: widget.examplePadding,
+                center: false,
+                builder: _buildMicroButton),
+          ]),
+          ExampleModule(title: '组件状态', children: [
+            ExampleItem(
+                desc: '线性进度条',
+                padding: widget.examplePadding,
+                builder: _buildPrimary),
+            ExampleItem(padding: widget.examplePadding, builder: _buildWarning),
+            ExampleItem(padding: widget.examplePadding, builder: _buildDanger),
+            ExampleItem(padding: widget.examplePadding, builder: _buildSuccess),
+            ExampleItem(
+                desc: '环形进度条',
+                padding: widget.examplePadding,
+                center: false,
+                builder: _buildCirclePrimary),
+            ExampleItem(
+                padding: widget.examplePadding,
+                center: false,
+                builder: _buildCircleWarning),
+            ExampleItem(
+                padding: widget.examplePadding,
+                center: false,
+                builder: _buildCircleDanger),
+            ExampleItem(
+                padding: widget.examplePadding,
+                center: false,
+                builder: _buildCircleSuccess),
+          ])
+        ]);
   }
 
   @Demo(group: 'progress')
   Widget _buildRightLabelLinear(BuildContext context) {
     return TDProgress(
-      type: TDProgressType.linear,
-      value: 0.8,
-      strokeWidth: 6,
-      progressLabelPosition: TDProgressLabelPosition.right,
-      animationDuration: 1000,
-    );
+        type: TDProgressType.linear,
+        value: 0.8,
+        strokeWidth: 6,
+        progressLabelPosition: TDProgressLabelPosition.right);
   }
 
+  @Demo(group: 'progress')
   Widget _buildInsideLabelLinear(BuildContext context) {
-    return Column(
-      children: [
-        TDProgress(type: TDProgressType.linear, value: 0.8),
-        const SizedBox(height: 16),
-        TDProgress(type: TDProgressType.linear, value: 0.1),
-      ],
-    );
+    return TDProgress(type: TDProgressType.linear, value: 0.8);
   }
 
   @Demo(group: 'progress')
@@ -113,24 +117,17 @@ class _TDProgressPageState extends State<TDProgressPage> {
     return TDProgress(type: TDProgressType.micro, value: 0.75);
   }
 
-  Widget _buildResizedButton(BuildContext context) {
-    return SizedBox(
-      width: 300,
-      child: _buildButton(context),
-    );
-  }
-
   @Demo(group: 'progress')
   Widget _buildButton(BuildContext context) {
     return TDProgress(
-      type: TDProgressType.button,
-      onTap: _toggleProgress,
-      onLongPress: _resetProgress,
-      value: progressValue,
-      label: buttonLabel,
-    );
+        type: TDProgressType.button,
+        onTap: _toggleProgress,
+        onLongPress: _resetProgress,
+        value: progressValue,
+        label: buttonLabel);
   }
 
+  @Demo(group: 'progress')
   Widget _buildMicroButton(BuildContext context) {
     return Row(
       mainAxisAlignment: MainAxisAlignment.start,
@@ -154,79 +151,88 @@ class _TDProgressPageState extends State<TDProgressPage> {
     );
   }
 
-  Widget _buildLinearProgressStatus(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        _buildLabeledLinearProgress('Primary', TDProgressStatus.primary),
-        _buildLabeledLinearProgress('Warning', TDProgressStatus.warning),
-        _buildLabeledLinearProgress('Danger', TDProgressStatus.danger),
-        _buildLabeledLinearProgress('Success', TDProgressStatus.success),
-      ],
-    );
+  @Demo(group: 'progress')
+  Widget _buildPrimary(BuildContext context) {
+    return TDProgress(
+        type: TDProgressType.linear,
+        progressStatus: TDProgressStatus.primary,
+        value: 0.8,
+        strokeWidth: 6,
+        progressLabelPosition: TDProgressLabelPosition.right);
   }
 
-  Widget _buildLabeledLinearProgress(String label, TDProgressStatus status) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 8),
-      child: Row(
-        children: [
-          SizedBox(
-            width: 80,
-            child: Text(label,
-                style: const TextStyle(fontSize: 14, color: Colors.grey)),
-          ),
-          Expanded(
-            child: TDProgress(
-              type: TDProgressType.linear,
-              progressStatus: status,
-              value: 0.8,
-              strokeWidth: 6,
-              progressLabelPosition: TDProgressLabelPosition.right,
-            ),
-          ),
-        ],
-      ),
-    );
+  @Demo(group: 'progress')
+  Widget _buildWarning(BuildContext context) {
+    return TDProgress(
+        type: TDProgressType.linear,
+        progressStatus: TDProgressStatus.warning,
+        value: 0.8,
+        strokeWidth: 6,
+        progressLabelPosition: TDProgressLabelPosition.right);
   }
 
-  Widget _buildCircularProgressStatus(BuildContext context) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.start,
-      children: [
-        _buildLabeledCircularProgress('Primary', TDProgressStatus.primary),
-        const SizedBox(width: 24),
-        _buildLabeledCircularProgress('Warning', TDProgressStatus.warning),
-        const SizedBox(width: 24),
-        _buildLabeledCircularProgress('Danger', TDProgressStatus.danger),
-        const SizedBox(width: 24),
-        _buildLabeledCircularProgress('Success', TDProgressStatus.success),
-      ],
-    );
+  @Demo(group: 'progress')
+  Widget _buildDanger(BuildContext context) {
+    return TDProgress(
+        type: TDProgressType.linear,
+        progressStatus: TDProgressStatus.danger,
+        value: 0.8,
+        strokeWidth: 6,
+        progressLabelPosition: TDProgressLabelPosition.right);
   }
 
-  Widget _buildLabeledCircularProgress(String label, TDProgressStatus status) {
-    return Column(
-      children: [
-        Text(label, style: const TextStyle(fontSize: 14, color: Colors.grey)),
-        const SizedBox(height: 8),
-        TDProgress(
-          type: TDProgressType.circular,
-          progressStatus: status,
-          value: status == TDProgressStatus.success ? 1 : 0.3,
-        ),
-      ],
-    );
+  @Demo(group: 'progress')
+  Widget _buildSuccess(BuildContext context) {
+    return TDProgress(
+        type: TDProgressType.linear,
+        progressStatus: TDProgressStatus.success,
+        value: 0.8,
+        strokeWidth: 6,
+        progressLabelPosition: TDProgressLabelPosition.right);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildCirclePrimary(BuildContext context) {
+    return TDProgress(
+        type: TDProgressType.circular,
+        progressStatus: TDProgressStatus.primary,
+        value: 0.3);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildCircleWarning(BuildContext context) {
+    return TDProgress(
+        type: TDProgressType.circular,
+        progressStatus: TDProgressStatus.warning,
+        value: 0.3);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildCircleDanger(BuildContext context) {
+    return TDProgress(
+        type: TDProgressType.circular,
+        progressStatus: TDProgressStatus.danger,
+        value: 0.3);
+  }
+
+  @Demo(group: 'progress')
+  Widget _buildCircleSuccess(BuildContext context) {
+    return TDProgress(
+        type: TDProgressType.circular,
+        progressStatus: TDProgressStatus.success,
+        value: 1);
   }
 
   void _toggleProgress() {
     if (isProgressing) {
+      // 暂停进度
       _timer?.cancel();
       setState(() {
         buttonLabel = const TDTextLabel('继续');
         isProgressing = false;
       });
     } else {
+      // 开始或继续进度
       _timer?.cancel();
       _timer = Timer.periodic(const Duration(milliseconds: 100), (timer) {
         setState(() {
@@ -283,4 +289,4 @@ class _TDProgressPageState extends State<TDProgressPage> {
       microProgressValue = 0.0;
     });
   }
-}
\ No newline at end of file
+}
diff --git a/tdesign-component/lib/src/components/progress/td_progress.dart b/tdesign-component/lib/src/components/progress/td_progress.dart
index ed07a5c97..9c0f31f30 100644
--- a/tdesign-component/lib/src/components/progress/td_progress.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress.dart
@@ -23,6 +23,28 @@ class TDIconLabel extends Icon implements TDLabelWidget {
 }
 
 class TDProgress extends StatelessWidget {
+  TDProgress({
+    Key? key,
+    required this.type,
+    double? value,
+    this.label,
+    this.progressStatus = TDProgressStatus.primary,
+    this.progressLabelPosition = TDProgressLabelPosition.inside,
+    double? strokeWidth,
+    this.color,
+    this.backgroundColor,
+    this.borderRadius,
+    double? circleRadius,
+    this.showLabel = true,
+    this.onTap,
+    this.onLongPress,
+    int animationDuration = 300,
+  })  : value = _validateProgress(value),
+        strokeWidth = _validatePositiveDouble(strokeWidth),
+        circleRadius = _validatePositiveDouble(circleRadius),
+        animationDuration = _validatePositiveInt(animationDuration),
+        super(key: key);
+
   /// 进度条类型
   final TDProgressType type;
 
@@ -65,28 +87,6 @@ class TDProgress extends StatelessWidget {
   /// 动画持续时间 (正整数，单位为毫秒)
   final int? animationDuration;
 
-  TDProgress({
-    Key? key,
-    required this.type,
-    double? value,
-    this.label,
-    this.progressStatus = TDProgressStatus.primary,
-    this.progressLabelPosition = TDProgressLabelPosition.inside,
-    double? strokeWidth,
-    this.color,
-    this.backgroundColor,
-    this.borderRadius,
-    double? circleRadius,
-    this.showLabel = true,
-    this.onTap,
-    this.onLongPress,
-    int animationDuration = 300,
-  })  : value = _validateProgress(value),
-        strokeWidth = _validatePositiveDouble(strokeWidth),
-        circleRadius = _validatePositiveDouble(circleRadius),
-        animationDuration = _validatePositiveInt(animationDuration),
-        super(key: key);
-
   static double? _validateProgress(double? value) =>
       value == null ? 0 : value.clamp(0.0, 1.0);
 
diff --git a/tdesign-component/lib/src/components/progress/td_progress_circular.dart b/tdesign-component/lib/src/components/progress/td_progress_circular.dart
index e24b1e9c6..bd76d8cd1 100644
--- a/tdesign-component/lib/src/components/progress/td_progress_circular.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress_circular.dart
@@ -2,6 +2,7 @@ import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
 
+/// 私有组件类，用于展示环形进度条
 class TDProgressCircular extends StatelessWidget {
   final double _value;
   final double strokeWidth;

From 79d6f72c03d4588948c77f4efce8f68269aa9d9c Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Mon, 2 Sep 2024 20:32:40 +0800
Subject: [PATCH 53/74] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86message?=
 =?UTF-8?q?=E4=B8=ADlink=E7=9A=84=E5=AF=B9=E9=BD=90=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_message_page.dart     |   2 +-
 .../src/components/message/td_message.dart    | 221 ++++++++++--------
 2 files changed, 122 insertions(+), 101 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_message_page.dart b/tdesign-component/example/lib/page/td_message_page.dart
index da36348a0..f2b6f930a 100644
--- a/tdesign-component/example/lib/page/td_message_page.dart
+++ b/tdesign-component/example/lib/page/td_message_page.dart
@@ -102,7 +102,7 @@ class _TDMessagePageState extends State<TDMessagePage> {
             theme: MessageTheme.info,
             duration: 300000,
             closeBtn: true,
-            link: '按钮',
+            link: LinkObj(name: '按钮', uri: Uri.parse('www')),
             onCloseBtnClick: () {
               print('Close button clicked!');
             },
diff --git a/tdesign-component/lib/src/components/message/td_message.dart b/tdesign-component/lib/src/components/message/td_message.dart
index e4ec994f8..5a5d7e1ac 100644
--- a/tdesign-component/lib/src/components/message/td_message.dart
+++ b/tdesign-component/lib/src/components/message/td_message.dart
@@ -218,19 +218,22 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
       return const SizedBox.shrink();
     }
     var _leftOffset =
-        widget.offset?[0] ?? (MediaQuery.of(context).size.width - 343) / 2;
+        widget.offset?[0] ?? (MediaQuery.of(context).size.width - totalWidth) / 2;
 
     Widget getText(BuildContext context) {
       if (widget.marquee == null) {
-        return SizedBox(
-          width: calculateTextWidth(),
-          child: Text(
-            widget.content ?? '',
-            style: const TextStyle(color: Colors.black),
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-          ),
-        );
+        return Align(
+            alignment: Alignment.center,
+            child: SizedBox(
+              width: calculateTextWidth(),
+              child: Text(
+                widget.content ?? '',
+                style: const TextStyle(color: Colors.black),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+              ),
+            ),
+          );
       } else {
         final textPainter = TextPainter(
           text: TextSpan(
@@ -259,33 +262,39 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
           startAnimation();
         }
 
-        return ClipRect(
-          child: SizedBox(
-            width: containerWidth,
-            child: AnimatedBuilder(
-              animation: animationController ?? const AlwaysStoppedAnimation(0),
-              builder: (context, child) {
-                final offset = tween.evaluate(
-                    animationController ?? const AlwaysStoppedAnimation(0));
-                return OverflowBox(
-                  minWidth: 0,
-                  maxWidth: double.infinity,
-                  alignment: Alignment.centerLeft,
-                  child: Transform.translate(
-                    offset: offset,
-                    child: SizedBox(
-                      child: Text(
-                        widget.content ?? '',
-                        style: const TextStyle(color: Colors.black),
-                        maxLines: 1,
-                      ),
-                    ),
+        return Align(
+            alignment: Alignment.center,
+            child: SizedBox(
+              width: calculateTextWidth(),
+              child: ClipRect(
+                child: SizedBox(
+                  width: containerWidth,
+                  child: AnimatedBuilder(
+                    animation: animationController ?? const AlwaysStoppedAnimation(0),
+                    builder: (context, child) {
+                      final offset = tween.evaluate(
+                          animationController ?? const AlwaysStoppedAnimation(0));
+                      return OverflowBox(
+                        minWidth: 0,
+                        maxWidth: double.infinity,
+                        alignment: Alignment.centerLeft,
+                        child: Transform.translate(
+                          offset: offset,
+                          child: SizedBox(
+                            child: Text(
+                              widget.content ?? '',
+                              style: const TextStyle(color: Colors.black),
+                              maxLines: 1,
+                            ),
+                          ),
+                        ),
+                      );
+                    },
                   ),
-                );
-              },
+                ),
+              )
             ),
-          ),
-        );
+          );
       }
     }
 
@@ -344,27 +353,36 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
 
     Widget getLink(BuildContext context) {
       if (widget.link is LinkObj) {
-        return TDLink(
-          label: widget.link.name,
-          style: TDLinkStyle.primary,
-          type: TDLinkType.basic,
-          uri: widget.link.uri ?? Uri.parse('https://example.com'),
-          size: TDLinkSize.small,
-          color: widget.link.color ?? TDTheme.of(context).brandNormalColor,
+        return Align(
+          alignment: Alignment.center,
+          child:TDLink(
+            label: widget.link.name,
+            style: TDLinkStyle.primary,
+            type: TDLinkType.basic,
+            uri: widget.link.uri ?? Uri.parse('https://example.com'),
+            size: TDLinkSize.small,
+            color: widget.link.color ?? TDTheme.of(context).brandNormalColor,
+          )
         );
+
       } else if (widget.link is String) {
-        return GestureDetector(
-          onTap: clickLink,
-          child: Text(
-            widget.link ?? '',
-            style: TextStyle(
-              color: TDTheme.of(context).brandNormalColor,
-              fontSize: 14,
-            ),
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-          ),
-        );
+        return
+          Align(
+              alignment: Alignment.center,
+              child: GestureDetector(
+                onTap: clickLink,
+                child: Text(
+                  widget.link ?? '',
+                  style: TextStyle(
+                    color: TDTheme.of(context).brandNormalColor,
+                    fontSize: 14,
+                  ),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                ),
+              )
+          );
+
       } else {
         return const SizedBox.shrink();
       }
@@ -377,62 +395,65 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
       left: _leftOffset,
       child: _isVisible
           ? Material(
-              color: Colors.transparent,
-              child: Container(
-                width: totalWidth,
-                height: 48,
-                padding: const EdgeInsets.fromLTRB(16, 13, 16, 13),
-                decoration: BoxDecoration(
-                  color: Colors.white,
-                  borderRadius: BorderRadius.circular(6),
-                  boxShadow: const [
-                    BoxShadow(
-                      color: Color(0x0F000000),
-                      offset: Offset(0, 2),
-                      blurRadius: 8,
+        color: Colors.transparent,
+        child: Container(
+          width: totalWidth,
+          height: 48,
+          padding: const EdgeInsets.fromLTRB(16, 13, 16, 13),
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.circular(6),
+            boxShadow: TDTheme.of(context).shadowsMiddle
+          ),
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.end,
+            children: [
+              if (widget.icon != false)
+                Padding(
+                  padding: const EdgeInsets.only(right: 10),
+                  child: Align(
+                    alignment: Alignment.center,
+                    child: SizedBox(
+                      width: 20,
+                      height: 22,
+                      child: getIcon(context),
                     ),
-                  ],
+                  ),
                 ),
+              Expanded(
                 child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
-                    if (widget.icon != false)
+                    getText(context),
+                    if (widget.link != null)
                       Padding(
-                        padding: const EdgeInsets.only(right: 10),
-                        child: SizedBox(
-                          width: 20,
-                          height: 22,
-                          child: getIcon(context),
-                        ),
+                        padding: const EdgeInsets.only(left: 8),
+                        child:
+                          SizedBox(
+                            width: 28,
+                            height: 22,
+                            child: getLink(context),
+                          ),
                       ),
-                    Expanded(
-                      child: Row(
-                        children: [
-                          getText(context),
-                          if (widget.link != null)
-                            Padding(
-                              padding: const EdgeInsets.only(left: 8),
-                              child: SizedBox(
-                                width: 28,
-                                height: 60,
-                                child: getLink(context),
-                              ),
-                            ),
-                          if (widget.closeBtn != null)
-                            Padding(
-                              padding: const EdgeInsets.only(left: 12),
-                              child: SizedBox(
-                                width: 22,
-                                height: 22,
-                                child: getCloseBtn(context),
-                              ),
-                            ),
-                        ],
+                    if (widget.closeBtn != null)
+                      Padding(
+                        padding: const EdgeInsets.only(left: 12),
+                        child: Align(
+                          alignment: Alignment.center,
+                          child: SizedBox(
+                            width: 22,
+                            height: 22,
+                            child: getCloseBtn(context),
+                          ),
+                        ),
                       ),
-                    ),
                   ],
                 ),
               ),
-            )
+            ],
+          ),
+        ),
+      )
           : const SizedBox.shrink(),
     );
   }

From a8e40bffe05d18f3db9c83e25099a278aed475a8 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Mon, 2 Sep 2024 20:33:55 +0800
Subject: [PATCH 54/74] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_message_page.dart     |   2 +-
 .../src/components/message/td_message.dart    | 179 +++++++++---------
 2 files changed, 87 insertions(+), 94 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_message_page.dart b/tdesign-component/example/lib/page/td_message_page.dart
index f2b6f930a..271a94ac0 100644
--- a/tdesign-component/example/lib/page/td_message_page.dart
+++ b/tdesign-component/example/lib/page/td_message_page.dart
@@ -102,7 +102,7 @@ class _TDMessagePageState extends State<TDMessagePage> {
             theme: MessageTheme.info,
             duration: 300000,
             closeBtn: true,
-            link: LinkObj(name: '按钮', uri: Uri.parse('www')),
+            link: LinkObj(name: '按钮', uri: Uri.parse('www.example.com')),
             onCloseBtnClick: () {
               print('Close button clicked!');
             },
diff --git a/tdesign-component/lib/src/components/message/td_message.dart b/tdesign-component/lib/src/components/message/td_message.dart
index 5a5d7e1ac..99aa26897 100644
--- a/tdesign-component/lib/src/components/message/td_message.dart
+++ b/tdesign-component/lib/src/components/message/td_message.dart
@@ -217,23 +217,23 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
     if (widget.visible == false) {
       return const SizedBox.shrink();
     }
-    var _leftOffset =
-        widget.offset?[0] ?? (MediaQuery.of(context).size.width - totalWidth) / 2;
+    var _leftOffset = widget.offset?[0] ??
+        (MediaQuery.of(context).size.width - totalWidth) / 2;
 
     Widget getText(BuildContext context) {
       if (widget.marquee == null) {
         return Align(
-            alignment: Alignment.center,
-            child: SizedBox(
-              width: calculateTextWidth(),
-              child: Text(
-                widget.content ?? '',
-                style: const TextStyle(color: Colors.black),
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-              ),
+          alignment: Alignment.center,
+          child: SizedBox(
+            width: calculateTextWidth(),
+            child: Text(
+              widget.content ?? '',
+              style: const TextStyle(color: Colors.black),
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
             ),
-          );
+          ),
+        );
       } else {
         final textPainter = TextPainter(
           text: TextSpan(
@@ -263,17 +263,18 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
         }
 
         return Align(
-            alignment: Alignment.center,
-            child: SizedBox(
+          alignment: Alignment.center,
+          child: SizedBox(
               width: calculateTextWidth(),
               child: ClipRect(
                 child: SizedBox(
                   width: containerWidth,
                   child: AnimatedBuilder(
-                    animation: animationController ?? const AlwaysStoppedAnimation(0),
+                    animation:
+                        animationController ?? const AlwaysStoppedAnimation(0),
                     builder: (context, child) {
-                      final offset = tween.evaluate(
-                          animationController ?? const AlwaysStoppedAnimation(0));
+                      final offset = tween.evaluate(animationController ??
+                          const AlwaysStoppedAnimation(0));
                       return OverflowBox(
                         minWidth: 0,
                         maxWidth: double.infinity,
@@ -292,9 +293,8 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
                     },
                   ),
                 ),
-              )
-            ),
-          );
+              )),
+        );
       }
     }
 
@@ -354,35 +354,30 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
     Widget getLink(BuildContext context) {
       if (widget.link is LinkObj) {
         return Align(
-          alignment: Alignment.center,
-          child:TDLink(
-            label: widget.link.name,
-            style: TDLinkStyle.primary,
-            type: TDLinkType.basic,
-            uri: widget.link.uri ?? Uri.parse('https://example.com'),
-            size: TDLinkSize.small,
-            color: widget.link.color ?? TDTheme.of(context).brandNormalColor,
-          )
-        );
-
+            alignment: Alignment.center,
+            child: TDLink(
+              label: widget.link.name,
+              style: TDLinkStyle.primary,
+              type: TDLinkType.basic,
+              uri: widget.link.uri ?? Uri.parse('https://example.com'),
+              size: TDLinkSize.small,
+              color: widget.link.color ?? TDTheme.of(context).brandNormalColor,
+            ));
       } else if (widget.link is String) {
-        return
-          Align(
-              alignment: Alignment.center,
-              child: GestureDetector(
-                onTap: clickLink,
-                child: Text(
-                  widget.link ?? '',
-                  style: TextStyle(
-                    color: TDTheme.of(context).brandNormalColor,
-                    fontSize: 14,
-                  ),
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
+        return Align(
+            alignment: Alignment.center,
+            child: GestureDetector(
+              onTap: clickLink,
+              child: Text(
+                widget.link ?? '',
+                style: TextStyle(
+                  color: TDTheme.of(context).brandNormalColor,
+                  fontSize: 14,
                 ),
-              )
-          );
-
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+              ),
+            ));
       } else {
         return const SizedBox.shrink();
       }
@@ -395,65 +390,63 @@ class _TDMessageState extends State<TDMessage> with TickerProviderStateMixin {
       left: _leftOffset,
       child: _isVisible
           ? Material(
-        color: Colors.transparent,
-        child: Container(
-          width: totalWidth,
-          height: 48,
-          padding: const EdgeInsets.fromLTRB(16, 13, 16, 13),
-          decoration: BoxDecoration(
-            color: Colors.white,
-            borderRadius: BorderRadius.circular(6),
-            boxShadow: TDTheme.of(context).shadowsMiddle
-          ),
-          child: Row(
-            crossAxisAlignment: CrossAxisAlignment.end,
-            children: [
-              if (widget.icon != false)
-                Padding(
-                  padding: const EdgeInsets.only(right: 10),
-                  child: Align(
-                    alignment: Alignment.center,
-                    child: SizedBox(
-                      width: 20,
-                      height: 22,
-                      child: getIcon(context),
-                    ),
-                  ),
-                ),
-              Expanded(
+              color: Colors.transparent,
+              child: Container(
+                width: totalWidth,
+                height: 48,
+                padding: const EdgeInsets.fromLTRB(16, 13, 16, 13),
+                decoration: BoxDecoration(
+                    color: Colors.white,
+                    borderRadius: BorderRadius.circular(6),
+                    boxShadow: TDTheme.of(context).shadowsMiddle),
                 child: Row(
-                  crossAxisAlignment: CrossAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.end,
                   children: [
-                    getText(context),
-                    if (widget.link != null)
+                    if (widget.icon != false)
                       Padding(
-                        padding: const EdgeInsets.only(left: 8),
-                        child:
-                          SizedBox(
-                            width: 28,
-                            height: 22,
-                            child: getLink(context),
-                          ),
-                      ),
-                    if (widget.closeBtn != null)
-                      Padding(
-                        padding: const EdgeInsets.only(left: 12),
+                        padding: const EdgeInsets.only(right: 10),
                         child: Align(
                           alignment: Alignment.center,
                           child: SizedBox(
-                            width: 22,
+                            width: 20,
                             height: 22,
-                            child: getCloseBtn(context),
+                            child: getIcon(context),
                           ),
                         ),
                       ),
+                    Expanded(
+                      child: Row(
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          getText(context),
+                          if (widget.link != null)
+                            Padding(
+                              padding: const EdgeInsets.only(left: 8),
+                              child: SizedBox(
+                                width: 28,
+                                height: 22,
+                                child: getLink(context),
+                              ),
+                            ),
+                          if (widget.closeBtn != null)
+                            Padding(
+                              padding: const EdgeInsets.only(left: 12),
+                              child: Align(
+                                alignment: Alignment.center,
+                                child: SizedBox(
+                                  width: 22,
+                                  height: 22,
+                                  child: getCloseBtn(context),
+                                ),
+                              ),
+                            ),
+                        ],
+                      ),
+                    ),
                   ],
                 ),
               ),
-            ],
-          ),
-        ),
-      )
+            )
           : const SizedBox.shrink(),
     );
   }

From efe76e94a498fafbb8f628a2cae7030f05134623 Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Mon, 2 Sep 2024 20:46:04 +0800
Subject: [PATCH 55/74] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E5=90=8D?=
 =?UTF-8?q?=E7=B1=BBlinkobj=E4=B8=BAmessageobj?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_message_page.dart     |  2 +-
 tdesign-component/example/pubspec.lock        | 38 +++++++++----------
 .../src/components/message/td_message.dart    |  4 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_message_page.dart b/tdesign-component/example/lib/page/td_message_page.dart
index 271a94ac0..7c480d9bf 100644
--- a/tdesign-component/example/lib/page/td_message_page.dart
+++ b/tdesign-component/example/lib/page/td_message_page.dart
@@ -102,7 +102,7 @@ class _TDMessagePageState extends State<TDMessagePage> {
             theme: MessageTheme.info,
             duration: 300000,
             closeBtn: true,
-            link: LinkObj(name: '按钮', uri: Uri.parse('www.example.com')),
+            link: MessageLink(name: '按钮', uri: Uri.parse('www.example.com')),
             onCloseBtnClick: () {
               print('Close button clicked!');
             },
diff --git a/tdesign-component/example/pubspec.lock b/tdesign-component/example/pubspec.lock
index 8007789c3..a33b11c69 100644
--- a/tdesign-component/example/pubspec.lock
+++ b/tdesign-component/example/pubspec.lock
@@ -13,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -29,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
@@ -45,10 +45,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.17.1"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -148,18 +148,18 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
       url: "https://pub.dev"
     source: hosted
-    version: "0.17.0"
+    version: "0.18.0"
   js:
     dependency: transitive
     description:
       name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.5"
+    version: "0.6.7"
   lints:
     dependency: transitive
     description:
@@ -180,10 +180,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.15"
   material_color_utilities:
     dependency: transitive
     description:
@@ -196,18 +196,18 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
   path_provider:
     dependency: "direct main"
     description:
@@ -328,10 +328,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.16"
+    version: "0.5.1"
   typed_data:
     dependency: transitive
     description:
@@ -365,5 +365,5 @@ packages:
     source: hosted
     version: "1.0.3"
 sdks:
-  dart: ">=2.19.0 <4.0.0"
+  dart: ">=3.0.0-0 <4.0.0"
   flutter: ">=3.7.0"
diff --git a/tdesign-component/lib/src/components/message/td_message.dart b/tdesign-component/lib/src/components/message/td_message.dart
index 99aa26897..35ceaee56 100644
--- a/tdesign-component/lib/src/components/message/td_message.dart
+++ b/tdesign-component/lib/src/components/message/td_message.dart
@@ -4,8 +4,8 @@ import 'package:flutter/src/scheduler/binding.dart';
 import '../../../tdesign_flutter.dart';
 
 //链接设置
-class LinkObj {
-  LinkObj({
+class MessageLink {
+  MessageLink({
     required this.name,
     required this.uri,
     this.color,

From 46a6351fef1a22e045be1c5f691ecfe7f73f13eb Mon Sep 17 00:00:00 2001
From: chendingya <211250094@smail.nju.edu.cn>
Date: Mon, 2 Sep 2024 20:54:28 +0800
Subject: [PATCH 56/74] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9E=84=E9=80=A0?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E4=B8=8E=E5=8F=82=E6=95=B0=E7=9A=84=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/message/td_message.dart    | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tdesign-component/lib/src/components/message/td_message.dart b/tdesign-component/lib/src/components/message/td_message.dart
index 35ceaee56..c36367405 100644
--- a/tdesign-component/lib/src/components/message/td_message.dart
+++ b/tdesign-component/lib/src/components/message/td_message.dart
@@ -42,6 +42,22 @@ enum MessageTheme {
 
 // TDMessage 组件
 class TDMessage extends StatefulWidget {
+  const TDMessage({
+    Key? key,
+    this.closeBtn,
+    this.content,
+    this.duration = 3000,
+    this.icon = true,
+    this.link,
+    this.marquee,
+    this.offset,
+    this.theme = MessageTheme.info,
+    this.visible = true,
+    this.onCloseBtnClick,
+    this.onDurationEnd,
+    this.onLinkClick,
+  }) : super(key: key);
+
   /// 通知内容
   final String? content;
 
@@ -78,22 +94,6 @@ class TDMessage extends StatefulWidget {
   /// 点击链接文本时触发
   final VoidCallback? onLinkClick;
 
-  const TDMessage({
-    Key? key,
-    this.closeBtn,
-    this.content,
-    this.duration = 3000,
-    this.icon = true,
-    this.link,
-    this.marquee,
-    this.offset,
-    this.theme = MessageTheme.info,
-    this.visible = true,
-    this.onCloseBtnClick,
-    this.onDurationEnd,
-    this.onLinkClick,
-  }) : super(key: key);
-
   @override
   _TDMessageState createState() => _TDMessageState();
 

From e0919589014dfaa5ef4c6be0baf897ea23325f6d Mon Sep 17 00:00:00 2001
From: ezer <1379242357@qq.com>
Date: Mon, 2 Sep 2024 21:31:49 +0800
Subject: [PATCH 57/74] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=AA=A8?=
 =?UTF-8?q?=E6=9E=B6=E5=B1=8F=E7=BB=84=E4=BB=B6=E5=92=8C=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/assets/api/skeleton_api.md        |  80 ++++++
 .../code/skeleton._buildAvatarSkeleton.txt    |   4 +
 .../code/skeleton._buildCellSkeleton.txt      |  37 +++
 .../code/skeleton._buildCombineSkeleton.txt   |  35 +++
 .../code/skeleton._buildFlashedSkeleton.txt   |   7 +
 .../code/skeleton._buildGradientSkeleton.txt  |   7 +
 .../code/skeleton._buildGridSkeleton.txt      |  15 +
 .../code/skeleton._buildImageSkeleton.txt     |   4 +
 .../code/skeleton._buildParagraphSkeleton.txt |   4 +
 .../code/skeleton._buildTextSkeleton.txt      |   4 +
 tdesign-component/example/lib/config.dart     |   4 +-
 .../example/lib/page/td_skeleton_page.dart    | 224 +++++++++++++++
 .../src/components/skeleton/td_skeleton.dart  | 268 ++++++++++++++++++
 .../skeleton/td_skeleton_rowcol.dart          | 157 ++++++++++
 tdesign-component/lib/tdesign_flutter.dart    |   2 +
 15 files changed, 850 insertions(+), 2 deletions(-)
 create mode 100644 tdesign-component/example/assets/api/skeleton_api.md
 create mode 100644 tdesign-component/example/assets/code/skeleton._buildAvatarSkeleton.txt
 create mode 100644 tdesign-component/example/assets/code/skeleton._buildCellSkeleton.txt
 create mode 100644 tdesign-component/example/assets/code/skeleton._buildCombineSkeleton.txt
 create mode 100644 tdesign-component/example/assets/code/skeleton._buildFlashedSkeleton.txt
 create mode 100644 tdesign-component/example/assets/code/skeleton._buildGradientSkeleton.txt
 create mode 100644 tdesign-component/example/assets/code/skeleton._buildGridSkeleton.txt
 create mode 100644 tdesign-component/example/assets/code/skeleton._buildImageSkeleton.txt
 create mode 100644 tdesign-component/example/assets/code/skeleton._buildParagraphSkeleton.txt
 create mode 100644 tdesign-component/example/assets/code/skeleton._buildTextSkeleton.txt
 create mode 100644 tdesign-component/example/lib/page/td_skeleton_page.dart
 create mode 100644 tdesign-component/lib/src/components/skeleton/td_skeleton.dart
 create mode 100644 tdesign-component/lib/src/components/skeleton/td_skeleton_rowcol.dart

diff --git a/tdesign-component/example/assets/api/skeleton_api.md b/tdesign-component/example/assets/api/skeleton_api.md
new file mode 100644
index 000000000..cc7f8b36e
--- /dev/null
+++ b/tdesign-component/example/assets/api/skeleton_api.md
@@ -0,0 +1,80 @@
+## API
+### TDSkeleton
+#### 默认构造方法
+
+| 参数 | 类型 | 默认值 | 说明 |
+| --- | --- | --- | --- |
+| key |  | - |  |
+| animation | TDSkeletonAnimation? | null | 动画效果 |
+| delay | int | 0 | 延迟显示加载时间 |
+| theme | TDSkeletonTheme | TDSkeletonTheme.text | 风格 |
+
+
+#### 命名构造方法
+
+| 参数 | 类型 | 默认值 | 说明 |
+| --- | --- | --- | --- |
+| key |  | - |  |
+| animation | TDSkeletonAnimation? | null | 动画效果 |
+| delay | int | 0 | 延迟显示加载时间 |
+| rowCol | TDSkeletonRowCol | - | 自定义行列数量、宽度高度、间距等 |
+
+```
+```
+ ### TDSkeletonRowColStyle
+#### 默认构造方法
+
+| 参数 | 类型 | 默认值 | 说明 |
+| --- | --- | --- | --- |
+| rowSpacing | double Function(BuildContext) | (context) => TDTheme.of(context).spacer16 | 行间距 |
+
+```
+```
+ ### TDSkeletonRowCol
+#### 默认构造方法
+
+| 参数 | 类型 | 默认值 | 说明 |
+| --- | --- | --- | --- |
+| objects | List<List<TDSkeletonRowColObj>> | - | 行列对象 |
+| style | TDSkeletonRowColStyle | TDSkeletonRowColStyle() | 样式 |
+
+```
+```
+ ### TDSkeletonRowColObjStyle
+#### 默认构造方法
+
+| 参数 | 类型 | 默认值 | 说明 |
+| --- | --- | --- | --- |
+| background | double Function(BuildContext) | (context) => TDTheme.of(context).grayColor1 | 背景颜色 |
+| borderRadius | double Function(BuildContext) | (context) => TDTheme.of(context).radiusSmall | 圆角 |
+
+
+#### 工厂构造方法
+
+| 参数 | 类型 | 默认值 | 说明 |
+| --- | --- | --- | --- |
+| background | double Function(BuildContext) | (context) => TDTheme.of(context).grayColor1 | 背景颜色 |
+
+```
+```
+ ### TDSkeletonRowColObj
+#### 默认构造方法
+
+| 参数 | 类型 | 默认值 | 说明 |
+| --- | --- | --- | --- |
+| width | double? | null | 宽度 |
+| height | double? | 16 | 高度 |
+| flex | int? | 1 | 弹性因子 |
+| margin | EdgeInsets | EdgeInsets.zero | 间距 |
+| style | TDSkeletonRowColObjStyle | TDSkeletonRowColObjStyle() | 样式 |
+
+
+#### 工厂构造方法
+
+| 参数 | 类型 | 默认值 | 说明 |
+| --- | --- | --- | --- |
+| width | double? | 48 / null | 宽度 |
+| height | double? | 48 / 16 / null | 高度 |
+| flex | int? | null / 1 | 弹性因子 |
+| margin | EdgeInsets | EdgeInsets.zero | 间距 |
+| style | TDSkeletonRowColObjStyle | TDSkeletonRowColObjStyle.circle() / TDSkeletonRowColObjStyle.rect() / TDSkeletonRowColObjStyle.text() / TDSkeletonRowColObjStyle.spacer() | 样式 |
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/skeleton._buildAvatarSkeleton.txt b/tdesign-component/example/assets/code/skeleton._buildAvatarSkeleton.txt
new file mode 100644
index 000000000..48093b0bc
--- /dev/null
+++ b/tdesign-component/example/assets/code/skeleton._buildAvatarSkeleton.txt
@@ -0,0 +1,4 @@
+
+  Widget _buildAvatarSkeleton(BuildContext context) {
+    return TDSkeleton(theme: TDSkeletonTheme.avatar);
+  }
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/skeleton._buildCellSkeleton.txt b/tdesign-component/example/assets/code/skeleton._buildCellSkeleton.txt
new file mode 100644
index 000000000..6b3d864b4
--- /dev/null
+++ b/tdesign-component/example/assets/code/skeleton._buildCellSkeleton.txt
@@ -0,0 +1,37 @@
+
+  Widget _buildCellSkeleton(BuildContext context) {
+    var rowColsAvatar = TDSkeleton(theme: TDSkeletonTheme.avatar);
+    var rowColsImage = TDSkeleton.fromRowCol(
+      rowCol: TDSkeletonRowCol(objects: const [
+        [TDSkeletonRowColObj.rect(width: 48, height: 48, flex: null)]
+      ]),
+    );
+    var rowColsContent = TDSkeleton.fromRowCol(
+      rowCol: TDSkeletonRowCol(
+        objects: const [
+          [TDSkeletonRowColObj(), TDSkeletonRowColObj.spacer(flex: 1)],
+          [TDSkeletonRowColObj()]
+        ],
+      ),
+    );
+
+    return Column(
+      children: [
+        Row(
+          children: [
+            rowColsAvatar,
+            const SizedBox(width: 12),
+            rowColsContent,
+          ],
+        ),
+        const SizedBox(height: 16),
+        Row(
+          children: [
+            rowColsImage,
+            const SizedBox(width: 12),
+            rowColsContent,
+          ],
+        ),
+      ],
+    );
+  }
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/skeleton._buildCombineSkeleton.txt b/tdesign-component/example/assets/code/skeleton._buildCombineSkeleton.txt
new file mode 100644
index 000000000..c687acfdc
--- /dev/null
+++ b/tdesign-component/example/assets/code/skeleton._buildCombineSkeleton.txt
@@ -0,0 +1,35 @@
+
+  Widget _buildCombineSkeleton(BuildContext context) {
+    var rowCols = Flexible(
+        child: LayoutBuilder(
+            builder: (context, constraints) => Row(children: [
+                  TDSkeleton.fromRowCol(
+                    rowCol: TDSkeletonRowCol(
+                      objects: [
+                        [
+                          TDSkeletonRowColObj(
+                              width: constraints.maxWidth,
+                              height: constraints.maxWidth,
+                              flex: null,
+                              style: TDSkeletonRowColObjStyle(
+                                  borderRadius: (context) =>
+                                      TDTheme.of(context).radiusExtraLarge))
+                        ],
+                        const [TDSkeletonRowColObj.text()],
+                        const [
+                          TDSkeletonRowColObj.text(),
+                          TDSkeletonRowColObj.spacer(flex: 1),
+                        ],
+                      ],
+                    ),
+                  )
+                ])));
+
+    return Row(
+      children: [
+        rowCols,
+        SizedBox(width: TDTheme.of(context).spacer4),
+        rowCols,
+      ],
+    );
+  }
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/skeleton._buildFlashedSkeleton.txt b/tdesign-component/example/assets/code/skeleton._buildFlashedSkeleton.txt
new file mode 100644
index 000000000..fe7c32cb3
--- /dev/null
+++ b/tdesign-component/example/assets/code/skeleton._buildFlashedSkeleton.txt
@@ -0,0 +1,7 @@
+
+  Widget _buildFlashedSkeleton(BuildContext context) {
+    return TDSkeleton(
+      animation: TDSkeletonAnimation.flashed,
+      theme: TDSkeletonTheme.paragraph,
+    );
+  }
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/skeleton._buildGradientSkeleton.txt b/tdesign-component/example/assets/code/skeleton._buildGradientSkeleton.txt
new file mode 100644
index 000000000..b3caa7b4f
--- /dev/null
+++ b/tdesign-component/example/assets/code/skeleton._buildGradientSkeleton.txt
@@ -0,0 +1,7 @@
+
+  Widget _buildGradientSkeleton(BuildContext context) {
+    return TDSkeleton(
+      animation: TDSkeletonAnimation.gradient,
+      theme: TDSkeletonTheme.paragraph,
+    );
+  }
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/skeleton._buildGridSkeleton.txt b/tdesign-component/example/assets/code/skeleton._buildGridSkeleton.txt
new file mode 100644
index 000000000..f243b02c8
--- /dev/null
+++ b/tdesign-component/example/assets/code/skeleton._buildGridSkeleton.txt
@@ -0,0 +1,15 @@
+
+  Widget _buildGridSkeleton(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        for (var i = 0; i < 5; i++)
+          TDSkeleton.fromRowCol(
+            rowCol: TDSkeletonRowCol(objects: const [
+              [TDSkeletonRowColObj.rect(width: 48, height: 48, flex: null)],
+              [TDSkeletonRowColObj.text(width: 48, flex: null)],
+            ]),
+          ),
+      ],
+    );
+  }
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/skeleton._buildImageSkeleton.txt b/tdesign-component/example/assets/code/skeleton._buildImageSkeleton.txt
new file mode 100644
index 000000000..889f74594
--- /dev/null
+++ b/tdesign-component/example/assets/code/skeleton._buildImageSkeleton.txt
@@ -0,0 +1,4 @@
+
+  Widget _buildImageSkeleton(BuildContext context) {
+    return TDSkeleton(theme: TDSkeletonTheme.image);
+  }
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/skeleton._buildParagraphSkeleton.txt b/tdesign-component/example/assets/code/skeleton._buildParagraphSkeleton.txt
new file mode 100644
index 000000000..0930c2c68
--- /dev/null
+++ b/tdesign-component/example/assets/code/skeleton._buildParagraphSkeleton.txt
@@ -0,0 +1,4 @@
+
+  Widget _buildParagraphSkeleton(BuildContext context) {
+    return TDSkeleton(theme: TDSkeletonTheme.paragraph);
+  }
\ No newline at end of file
diff --git a/tdesign-component/example/assets/code/skeleton._buildTextSkeleton.txt b/tdesign-component/example/assets/code/skeleton._buildTextSkeleton.txt
new file mode 100644
index 000000000..16220552e
--- /dev/null
+++ b/tdesign-component/example/assets/code/skeleton._buildTextSkeleton.txt
@@ -0,0 +1,4 @@
+
+  Widget _buildTextSkeleton(BuildContext context) {
+    return TDSkeleton(theme: TDSkeletonTheme.text);
+  }
\ No newline at end of file
diff --git a/tdesign-component/example/lib/config.dart b/tdesign-component/example/lib/config.dart
index 386fb93ac..710544298 100644
--- a/tdesign-component/example/lib/config.dart
+++ b/tdesign-component/example/lib/config.dart
@@ -43,6 +43,7 @@ import 'page/td_refresh_page.dart';
 import 'page/td_result_page.dart';
 import 'page/td_search_bar_page.dart';
 import 'page/td_shadows_page.dart';
+import 'page/td_skeleton_page.dart';
 import 'page/td_slider_page.dart';
 import 'page/td_stepper_page.dart';
 import 'page/td_steps_page.dart';
@@ -194,8 +195,7 @@ Map<String, List<ExamplePageModel>> exampleMap = {
     ExamplePageModel(
         text: 'Skeleton 骨架屏',
         name: 'skeleton',
-        isTodo: true,
-        pageBuilder: _wrapInheritedTheme((context) => const TodoPage())),
+        pageBuilder: _wrapInheritedTheme((context) => const TDSkeletonPage())),
     ExamplePageModel(
         text: 'Sticky 吸顶',
         name: 'sticky',
diff --git a/tdesign-component/example/lib/page/td_skeleton_page.dart b/tdesign-component/example/lib/page/td_skeleton_page.dart
new file mode 100644
index 000000000..f49c45af3
--- /dev/null
+++ b/tdesign-component/example/lib/page/td_skeleton_page.dart
@@ -0,0 +1,224 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+import 'package:tdesign_flutter/tdesign_flutter.dart';
+
+import '../../annotation/demo.dart';
+import '../../base/example_widget.dart';
+
+class TDSkeletonPage extends StatefulWidget {
+  const TDSkeletonPage({Key? key}) : super(key: key);
+
+  @override
+  State<StatefulWidget> createState() => _TDSkeletonPageState();
+}
+
+class _TDSkeletonPageState extends State<TDSkeletonPage> {
+  @override
+  Widget build(BuildContext context) {
+    return ExamplePage(
+        title: tdTitle(),
+        desc: '当网络较慢时，在页面真实数据加载之前，给用户展示出页面的大致结构。',
+        exampleCodeGroup: 'skeleton',
+        backgroundColor: TDTheme.of(context).whiteColor1,
+        children: [
+          ExampleModule(
+            title: '类型',
+            children: [
+              ExampleItem(
+                desc: '头像骨架屏',
+                builder: _wrapper(_buildAvatarSkeleton),
+                methodName: '_buildAvatarSkeleton',
+              ),
+              ExampleItem(
+                desc: '图片骨架屏',
+                builder: _wrapper(_buildImageSkeleton),
+                methodName: '_buildImageSkeleton',
+              ),
+              ExampleItem(
+                desc: '文本骨架屏',
+                builder: _wrapper(_buildTextSkeleton, isFlexible: true),
+                methodName: '_buildTextSkeleton',
+              ),
+              ExampleItem(
+                desc: '段落骨架屏',
+                builder: _wrapper(_buildParagraphSkeleton, isFlexible: true),
+                methodName: '_buildParagraphSkeleton',
+              ),
+              ExampleItem(
+                desc: '单元格骨架屏',
+                builder: _wrapper(_buildCellSkeleton),
+                methodName: '_buildCellSkeleton',
+              ),
+              ExampleItem(
+                desc: '宫格骨架屏',
+                builder: _wrapper(_buildGridSkeleton),
+                methodName: '_buildGridSkeleton',
+              ),
+              ExampleItem(
+                desc: '图文组合骨架屏',
+                builder: _wrapper(_buildCombineSkeleton),
+                methodName: '_buildCombineSkeleton',
+              ),
+            ],
+          ),
+          ExampleModule(
+            title: '组件动效',
+            children: [
+              ExampleItem(
+                desc: '渐变加载效果',
+                builder: _wrapper(_buildGradientSkeleton, isFlexible: true),
+                methodName: '_buildGradientSkeleton',
+              ),
+              ExampleItem(
+                desc: '闪烁加载效果',
+                builder: _wrapper(_buildFlashedSkeleton, isFlexible: true),
+                methodName: '_buildFlashedSkeleton',
+              ),
+            ],
+          ),
+        ]);
+  }
+
+  Widget Function(BuildContext) _wrapper(
+    Function(BuildContext) builder, {
+    bool isFlexible = false,
+  }) =>
+      (context) => Container(
+            alignment: Alignment.topLeft,
+            padding: EdgeInsets.fromLTRB(
+              TDTheme.of(context).spacer16,
+              0,
+              TDTheme.of(context).spacer16,
+              0,
+            ),
+            child: isFlexible
+                ? Row(children: [builder(context)])
+                : builder(context),
+          );
+
+  @Demo(group: 'skeleton')
+  Widget _buildAvatarSkeleton(BuildContext context) {
+    return TDSkeleton(theme: TDSkeletonTheme.avatar);
+  }
+
+  @Demo(group: 'skeleton')
+  Widget _buildImageSkeleton(BuildContext context) {
+    return TDSkeleton(theme: TDSkeletonTheme.image);
+  }
+
+  @Demo(group: 'skeleton')
+  Widget _buildTextSkeleton(BuildContext context) {
+    return TDSkeleton(theme: TDSkeletonTheme.text);
+  }
+
+  @Demo(group: 'skeleton')
+  Widget _buildParagraphSkeleton(BuildContext context) {
+    return TDSkeleton(theme: TDSkeletonTheme.paragraph);
+  }
+
+  @Demo(group: 'skeleton')
+  Widget _buildCellSkeleton(BuildContext context) {
+    var rowColsAvatar = TDSkeleton(theme: TDSkeletonTheme.avatar);
+    var rowColsImage = TDSkeleton.fromRowCol(
+      rowCol: TDSkeletonRowCol(objects: const [
+        [TDSkeletonRowColObj.rect(width: 48, height: 48, flex: null)]
+      ]),
+    );
+    var rowColsContent = TDSkeleton.fromRowCol(
+      rowCol: TDSkeletonRowCol(
+        objects: const [
+          [TDSkeletonRowColObj(), TDSkeletonRowColObj.spacer(flex: 1)],
+          [TDSkeletonRowColObj()]
+        ],
+      ),
+    );
+
+    return Column(
+      children: [
+        Row(
+          children: [
+            rowColsAvatar,
+            const SizedBox(width: 12),
+            rowColsContent,
+          ],
+        ),
+        const SizedBox(height: 16),
+        Row(
+          children: [
+            rowColsImage,
+            const SizedBox(width: 12),
+            rowColsContent,
+          ],
+        ),
+      ],
+    );
+  }
+
+  @Demo(group: 'skeleton')
+  Widget _buildGridSkeleton(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        for (var i = 0; i < 5; i++)
+          TDSkeleton.fromRowCol(
+            rowCol: TDSkeletonRowCol(objects: const [
+              [TDSkeletonRowColObj.rect(width: 48, height: 48, flex: null)],
+              [TDSkeletonRowColObj.text(width: 48, flex: null)],
+            ]),
+          ),
+      ],
+    );
+  }
+
+  @Demo(group: 'skeleton')
+  Widget _buildCombineSkeleton(BuildContext context) {
+    var rowCols = Flexible(
+        child: LayoutBuilder(
+            builder: (context, constraints) => Row(children: [
+                  TDSkeleton.fromRowCol(
+                    rowCol: TDSkeletonRowCol(
+                      objects: [
+                        [
+                          TDSkeletonRowColObj(
+                              width: constraints.maxWidth,
+                              height: constraints.maxWidth,
+                              flex: null,
+                              style: TDSkeletonRowColObjStyle(
+                                  borderRadius: (context) =>
+                                      TDTheme.of(context).radiusExtraLarge))
+                        ],
+                        const [TDSkeletonRowColObj.text()],
+                        const [
+                          TDSkeletonRowColObj.text(),
+                          TDSkeletonRowColObj.spacer(flex: 1),
+                        ],
+                      ],
+                    ),
+                  )
+                ])));
+
+    return Row(
+      children: [
+        rowCols,
+        SizedBox(width: TDTheme.of(context).spacer4),
+        rowCols,
+      ],
+    );
+  }
+
+  @Demo(group: 'skeleton')
+  Widget _buildGradientSkeleton(BuildContext context) {
+    return TDSkeleton(
+      animation: TDSkeletonAnimation.gradient,
+      theme: TDSkeletonTheme.paragraph,
+    );
+  }
+
+  @Demo(group: 'skeleton')
+  Widget _buildFlashedSkeleton(BuildContext context) {
+    return TDSkeleton(
+      animation: TDSkeletonAnimation.flashed,
+      theme: TDSkeletonTheme.paragraph,
+    );
+  }
+}
diff --git a/tdesign-component/lib/src/components/skeleton/td_skeleton.dart b/tdesign-component/lib/src/components/skeleton/td_skeleton.dart
new file mode 100644
index 000000000..11f639223
--- /dev/null
+++ b/tdesign-component/lib/src/components/skeleton/td_skeleton.dart
@@ -0,0 +1,268 @@
+import 'package:flutter/material.dart';
+
+import '../../../tdesign_flutter.dart';
+
+///
+/// 骨架图动画
+///
+enum TDSkeletonAnimation {
+  gradient, // 渐变
+  flashed, // 闪烁
+}
+
+///
+/// 骨架图风格
+///
+enum TDSkeletonTheme {
+  avatar, // 头像
+  image, // 图片
+  text, // 文本
+  paragraph, // 段落
+}
+
+class TDSkeleton extends StatefulWidget {
+  factory TDSkeleton({
+    Key? key,
+    TDSkeletonAnimation? animation,
+    int delay = 0,
+    TDSkeletonTheme theme = TDSkeletonTheme.text,
+  }) {
+    assert(delay >= 0);
+    
+    // 根据风格创建骨架图
+    switch (theme) {
+      case TDSkeletonTheme.avatar:
+        return TDSkeleton.fromRowCol(
+          key: key,
+          animation: animation,
+          delay: delay,
+          rowCol: TDSkeletonRowCol(
+            objects: const [
+              [TDSkeletonRowColObj.circle()]
+            ],
+          ),
+        );
+      case TDSkeletonTheme.image:
+        return TDSkeleton.fromRowCol(
+          key: key,
+          animation: animation,
+          delay: delay,
+          rowCol: TDSkeletonRowCol(
+            objects: const [
+              [
+                TDSkeletonRowColObj.rect(
+                  width: 72,
+                  height: 72,
+                  flex: null,
+                )
+              ]
+            ],
+          ),
+        );
+      case TDSkeletonTheme.text:
+        return TDSkeleton.fromRowCol(
+          key: key,
+          animation: animation,
+          delay: delay,
+          rowCol: TDSkeletonRowCol(objects: const [
+            [
+              TDSkeletonRowColObj.text(flex: 24),
+              TDSkeletonRowColObj.spacer(width: 16),
+              TDSkeletonRowColObj.text(flex: 76),
+            ],
+            [TDSkeletonRowColObj.text()],
+          ]),
+        );
+      case TDSkeletonTheme.paragraph:
+        return TDSkeleton.fromRowCol(
+          key: key,
+          animation: animation,
+          delay: delay,
+          rowCol: TDSkeletonRowCol(objects: [
+            for (int i = 0; i < 3; i++) [const TDSkeletonRowColObj.text()],
+            const [
+              TDSkeletonRowColObj.text(flex: 55),
+              TDSkeletonRowColObj.spacer(flex: 45),
+            ],
+          ]),
+        );
+    }
+  }
+
+  const TDSkeleton.fromRowCol({
+    super.key,
+    this.animation,
+    this.delay = 0,
+    required this.rowCol,
+  }): assert(delay >= 0);
+
+  /// 动画效果
+  final TDSkeletonAnimation? animation;
+
+  /// 延迟显示加载时间
+  final int delay;
+
+  /// 自定义行列数量、宽度高度、间距等
+  final TDSkeletonRowCol rowCol;
+
+  @override
+  _TDSkeletonState createState() => _TDSkeletonState();
+}
+
+class _TDSkeletonState extends State<TDSkeleton>
+    with SingleTickerProviderStateMixin {
+  /// 动画控制器
+  late final AnimationController? _controller;
+
+  /// 动画效果
+  late final Animation<double>? _animation;
+
+  /// 加载状态
+  bool _isLoading = true;
+
+  /// 加载控件
+  static final _loadingWidget = Container();
+
+  /// 闪烁透明度
+  static const _animationFlashed = .3;
+
+  /// 静态渐变
+  static LinearGradient _animationGradient(BuildContext context) =>
+      LinearGradient(
+        colors: [
+          Colors.transparent,
+          TDTheme.of(context).fontGyColor3,
+          Colors.transparent,
+        ],
+        // 15 deg
+        begin: const Alignment(-1, -0.268),
+        end: const Alignment(1, 0.268),
+        tileMode: TileMode.clamp,
+      );
+
+  @override
+  void initState() {
+    super.initState();
+
+    // 根据动画效果创建动画控制器
+    switch (widget.animation) {
+      case TDSkeletonAnimation.gradient:
+        _controller = AnimationController(
+          duration: const Duration(milliseconds: 1500),
+          vsync: this,
+        )..repeat();
+        _animation = Tween<double>(begin: -1, end: 1).animate(_controller!)
+          ..addListener(() => setState(() {}));
+        break;
+      case TDSkeletonAnimation.flashed:
+        _controller = AnimationController(
+          duration: const Duration(seconds: 1),
+          vsync: this,
+        )..repeat(reverse: true);
+        _animation = Tween<double>(begin: 1, end: _animationFlashed).animate(_controller!)
+          ..addListener(() => setState(() {}));
+        break;
+      default:
+        _controller = null;
+        _animation = null;
+    }
+
+    // 延迟显示加载效果
+    Future.delayed(Duration(milliseconds: widget.delay),
+        () => setState(() => _isLoading = false));
+  }
+
+  Widget Function(TDSkeletonRowColObj) _buildObj(BuildContext context) =>
+      (TDSkeletonRowColObj obj) {
+        // 骨架图对象
+        Widget skeletonObj = Container(
+          width: obj.width,
+          height: obj.height,
+          margin: obj.margin,
+          decoration: BoxDecoration(
+            color: obj.style.background(context),
+            borderRadius:
+                BorderRadius.circular(obj.style.borderRadius(context)),
+          ),
+        );
+
+        // 动画效果
+        switch (widget.animation) {
+          case TDSkeletonAnimation.gradient:
+            skeletonObj = ShaderMask(
+              blendMode: BlendMode.srcATop,
+              shaderCallback: (bounds) => _animationGradient(context).createShader(
+                Rect.fromLTWH(
+                  bounds.width * _animation!.value,
+                  0,
+                  bounds.width,
+                  bounds.height,
+                ),
+              ),
+              child: skeletonObj,
+            );
+            break;
+          case TDSkeletonAnimation.flashed:
+            skeletonObj = Opacity(
+              opacity: _animation!.value,
+              child: skeletonObj,
+            );
+            break;
+          default:
+        }
+
+        // 根据弹性因子创建弹性布局
+        return obj.flex == null
+            ? skeletonObj
+            : Flexible(flex: obj.flex!, child: skeletonObj);
+      };
+
+  @override
+  Widget build(BuildContext context) {
+    // 加载状态返回空容器
+    if (_isLoading) {
+      return _loadingWidget;
+    }
+
+    if (widget.rowCol.objects.length == 1) {
+      return widget.rowCol.objects.first.length == 1
+          // 单个对象
+          ? _buildObj(context)(widget.rowCol.objects.first.first)
+          // 单行多个对象
+          : Flexible(
+              child: Row(
+              children:
+                  widget.rowCol.objects.first.map(_buildObj(context)).toList(),
+            ));
+    }
+
+    // 多行多个对象
+    List<Widget> skeletonRows = widget.rowCol.objects
+        .map((row) => Row(children: row.map(_buildObj(context)).toList()))
+        .toList();
+    if (widget.rowCol.style.rowSpacing(context) > 0) {
+      skeletonRows = skeletonRows
+          .expand((row) =>
+              [row, SizedBox(height: widget.rowCol.style.rowSpacing(context))])
+          .toList()
+        ..removeLast();
+    } // 添加行间距
+    var skeletonRowCol = Column(children: skeletonRows); // 行列布局
+
+    return widget.rowCol.objects
+            .any((row) => row.any((obj) => obj.flex != null))
+        // 添加弹性布局
+        ? Flexible(
+            child: Container(
+                constraints: BoxConstraints(
+                    maxHeight: widget.rowCol.visualHeight(context)), // 限制最大高度
+                child: skeletonRowCol))
+        : skeletonRowCol;
+  }
+
+  @override
+  void dispose() {
+    _controller?.dispose();
+    super.dispose();
+  }
+}
diff --git a/tdesign-component/lib/src/components/skeleton/td_skeleton_rowcol.dart b/tdesign-component/lib/src/components/skeleton/td_skeleton_rowcol.dart
new file mode 100644
index 000000000..bf92c1fa2
--- /dev/null
+++ b/tdesign-component/lib/src/components/skeleton/td_skeleton_rowcol.dart
@@ -0,0 +1,157 @@
+import 'package:flutter/material.dart';
+
+import '../../../tdesign_flutter.dart';
+
+class TDSkeletonRowColStyle {
+  const TDSkeletonRowColStyle({
+    this.rowSpacing = _defaultRowSpacing,
+  });
+
+  /// 行间距
+  final double Function(BuildContext) rowSpacing;
+
+  /// 默认行间距
+  static double _defaultRowSpacing(BuildContext context) =>
+      TDTheme.of(context).spacer16;
+}
+
+class TDSkeletonRowCol {
+  TDSkeletonRowCol({
+    required this.objects,
+    this.style = const TDSkeletonRowColStyle(),
+  }) : assert(objects.isNotEmpty && objects.every((row) => row.isNotEmpty));
+
+  /// 行列对象
+  final List<List<TDSkeletonRowColObj>> objects;
+
+  /// 样式
+  final TDSkeletonRowColStyle style;
+
+  /// 视觉高度
+  double visualHeight(BuildContext context) {
+    var rowSpacing = style.rowSpacing(context);
+    assert (rowSpacing >= 0); 
+    if (rowSpacing < 0) {
+      rowSpacing = 0;
+    }
+
+    return objects
+            .map((row) =>
+                row.fold(.0, (a, b) => a > b.visualHeight ? a : b.visualHeight))
+            .fold(.0, (a, b) => a + b) +
+        rowSpacing * (objects.length - 1);
+  }
+}
+
+class TDSkeletonRowColObjStyle {
+  const TDSkeletonRowColObjStyle({
+    this.background = _defaultBackground,
+    this.borderRadius = _textBorderRadius,
+  });
+
+  /// 圆形
+  const TDSkeletonRowColObjStyle.circle({this.background = _defaultBackground})
+      : borderRadius = _circleBorderRadius;
+
+  /// 矩形
+  const TDSkeletonRowColObjStyle.rect({this.background = _defaultBackground})
+      : borderRadius = _rectBorderRadius;
+
+  /// 文本
+  const TDSkeletonRowColObjStyle.text({this.background = _defaultBackground})
+      : borderRadius = _textBorderRadius;
+
+  /// 空白占位符
+  const TDSkeletonRowColObjStyle.spacer()
+      : background = _transparentBackground,
+        borderRadius = _textBorderRadius;
+
+  /// 背景颜色
+  final Color Function(BuildContext) background;
+
+  /// 圆角
+  final double Function(BuildContext) borderRadius;
+
+  /// 默认背景颜色
+  static Color _defaultBackground(BuildContext context) =>
+      TDTheme.of(context).grayColor1;
+
+  /// 透明背景颜色
+  static Color _transparentBackground(BuildContext context) =>
+      Colors.transparent;
+
+  /// 圆形圆角
+  static double _circleBorderRadius(BuildContext context) =>
+      TDTheme.of(context).radiusCircle;
+
+  /// 矩形圆角
+  static double _rectBorderRadius(BuildContext context) =>
+      TDTheme.of(context).radiusDefault;
+
+  /// 文本圆角
+  static double _textBorderRadius(BuildContext context) =>
+      TDTheme.of(context).radiusSmall;
+}
+
+class TDSkeletonRowColObj {
+  const TDSkeletonRowColObj({
+    this.width,
+    this.height = 16,
+    this.flex = 1,
+    this.margin = EdgeInsets.zero,
+    this.style = const TDSkeletonRowColObjStyle(),
+  });
+
+  /// 圆形
+  const TDSkeletonRowColObj.circle({
+    this.width = 48,
+    this.height = 48,
+    this.flex,
+    this.margin = EdgeInsets.zero,
+    this.style = const TDSkeletonRowColObjStyle.circle(),
+  });
+
+  /// 矩形
+  const TDSkeletonRowColObj.rect({
+    this.width,
+    this.height = 16,
+    this.flex = 1,
+    this.margin = EdgeInsets.zero,
+    this.style = const TDSkeletonRowColObjStyle.rect(),
+  });
+
+  /// 文本
+  const TDSkeletonRowColObj.text({
+    this.width,
+    this.height = 16,
+    this.flex = 1,
+    this.margin = EdgeInsets.zero,
+    this.style = const TDSkeletonRowColObjStyle.text(),
+  });
+
+  /// 空白占位符
+  const TDSkeletonRowColObj.spacer({
+    this.width,
+    this.height,
+    this.flex,
+    this.margin = EdgeInsets.zero,
+  }) : style = const TDSkeletonRowColObjStyle.spacer();
+
+  /// 宽度
+  final double? width;
+
+  /// 高度
+  final double? height;
+
+  /// 弹性因子
+  final int? flex;
+
+  /// 间距
+  final EdgeInsets margin;
+
+  /// 样式
+  final TDSkeletonRowColObjStyle style;
+
+  /// 视觉高度
+  double get visualHeight => (height ?? 0) + margin.top + margin.bottom;
+}
diff --git a/tdesign-component/lib/tdesign_flutter.dart b/tdesign-component/lib/tdesign_flutter.dart
index 11cde754a..d783d3909 100644
--- a/tdesign-component/lib/tdesign_flutter.dart
+++ b/tdesign-component/lib/tdesign_flutter.dart
@@ -53,6 +53,8 @@ export 'src/components/search/td_search_bar.dart';
 export 'src/components/sidebar/td_sidebar.dart';
 export 'src/components/sidebar/td_sidebar_controller.dart';
 export 'src/components/sidebar/td_sidebar_item.dart';
+export 'src/components/skeleton/td_skeleton.dart';
+export 'src/components/skeleton/td_skeleton_rowcol.dart';
 export 'src/components/slider/td_slider.dart';
 export 'src/components/slider/td_slider_theme.dart';
 export 'src/components/stepper/td_stepper.dart';

From c46d78a3b70fdad1a0fcf416dbfe6670ac165c54 Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Mon, 2 Sep 2024 23:13:38 +0800
Subject: [PATCH 58/74] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_progress_page.dart    | 35 ++++---------------
 .../src/components/progress/td_progress.dart  |  4 +--
 2 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_progress_page.dart b/tdesign-component/example/lib/page/td_progress_page.dart
index b0ba4c007..53455bfca 100644
--- a/tdesign-component/example/lib/page/td_progress_page.dart
+++ b/tdesign-component/example/lib/page/td_progress_page.dart
@@ -23,7 +23,7 @@ class _TDProgressPageState extends State<TDProgressPage> {
   Timer? _timer;
   bool isProgressing = false;
   bool isPlaying = false;
-  double microProgressValue = 0.0;
+  double microProgressValue = 0.3;
   Timer? _microTimer;
 
   @override
@@ -129,25 +129,12 @@ class _TDProgressPageState extends State<TDProgressPage> {
 
   @Demo(group: 'progress')
   Widget _buildMicroButton(BuildContext context) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.start,
-      children: [
-        TDProgress(
-          type: TDProgressType.micro,
-          value: microProgressValue,
-          onTap: _toggleMicroProgress,
-          label: TDIconLabel(isPlaying ? Icons.pause : Icons.play_arrow,
-              color: TDTheme.of(context).brandNormalColor),
-        ),
-        const SizedBox(width: 10),
-        TDProgress(
-          type: TDProgressType.micro,
-          value: microProgressValue,
-          onTap: _resetMicroProgress,
-          label: TDIconLabel(Icons.stop,
-              color: TDTheme.of(context).brandNormalColor),
-        ),
-      ],
+    return TDProgress(
+      type: TDProgressType.micro,
+      value: microProgressValue,
+      onTap: _toggleMicroProgress,
+      label: TDIconLabel(isPlaying ? Icons.pause : Icons.play_arrow,
+          color: TDTheme.of(context).brandNormalColor),
     );
   }
 
@@ -281,12 +268,4 @@ class _TDProgressPageState extends State<TDProgressPage> {
       _microTimer?.cancel();
     }
   }
-
-  void _resetMicroProgress() {
-    _microTimer?.cancel();
-    setState(() {
-      isPlaying = false;
-      microProgressValue = 0.0;
-    });
-  }
 }
diff --git a/tdesign-component/lib/src/components/progress/td_progress.dart b/tdesign-component/lib/src/components/progress/td_progress.dart
index 9c0f31f30..e75055c7d 100644
--- a/tdesign-component/lib/src/components/progress/td_progress.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress.dart
@@ -134,7 +134,7 @@ class TDProgress extends StatelessWidget {
           strokeWidth: 5.0,
           backgroundColor: TDTheme.of(context).grayColor2,
           borderRadius: BorderRadius.circular(20),
-          circleRadius: 80.0,
+          circleRadius: 100.0,
         );
       case TDProgressType.micro:
         return _DefaultValues(
@@ -480,7 +480,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
         break;
       case TDProgressType.circular:
         iconSize = widget.circleRadius * 0.4;
-        fontSize = widget.circleRadius * 0.2;
+        fontSize = widget.circleRadius * 0.15;
         fontWeight = FontWeight.bold;
         break;
       case TDProgressType.micro:

From 9a93372f19934dc1f9fe2c63840b60c80ee91ed6 Mon Sep 17 00:00:00 2001
From: CORCTON <crt@corcton.com>
Date: Wed, 4 Sep 2024 23:04:58 +0800
Subject: [PATCH 59/74] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/progress/td_progress.dart  | 42 +++++++++----------
 .../progress/td_progress_circular.dart        | 19 ++++-----
 2 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/tdesign-component/lib/src/components/progress/td_progress.dart b/tdesign-component/lib/src/components/progress/td_progress.dart
index e75055c7d..98ef07ac2 100644
--- a/tdesign-component/lib/src/components/progress/td_progress.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress.dart
@@ -33,7 +33,7 @@ class TDProgress extends StatelessWidget {
     double? strokeWidth,
     this.color,
     this.backgroundColor,
-    this.borderRadius,
+    this.linearBorderRadius,
     double? circleRadius,
     this.showLabel = true,
     this.onTap,
@@ -69,8 +69,8 @@ class TDProgress extends StatelessWidget {
   /// 进度条背景颜色
   final Color? backgroundColor;
 
-  /// 进度条末端形状
-  final BorderRadiusGeometry? borderRadius;
+  /// 条形进度条末端形状
+  final BorderRadiusGeometry? linearBorderRadius;
 
   /// 环形进度条半径 (正数)
   final double? circleRadius;
@@ -110,7 +110,7 @@ class TDProgress extends StatelessWidget {
       strokeWidth: strokeWidth ?? defaultValues.strokeWidth,
       color: color,
       backgroundColor: backgroundColor ?? defaultValues.backgroundColor,
-      borderRadius: borderRadius ?? defaultValues.borderRadius,
+      linearBorderRadius: linearBorderRadius ?? defaultValues.linearBorderRadius,
       circleRadius: circleRadius ?? defaultValues.circleRadius,
       showLabel: showLabel,
       onTap: onTap,
@@ -126,28 +126,28 @@ class TDProgress extends StatelessWidget {
         return _DefaultValues(
           strokeWidth: 20.0,
           backgroundColor: TDTheme.of(context).grayColor3,
-          borderRadius: BorderRadius.circular(20),
+          linearBorderRadius: BorderRadius.circular(20),
           circleRadius: 0,
         );
       case TDProgressType.circular:
         return _DefaultValues(
           strokeWidth: 5.0,
           backgroundColor: TDTheme.of(context).grayColor2,
-          borderRadius: BorderRadius.circular(20),
+          linearBorderRadius: BorderRadius.circular(20),
           circleRadius: 100.0,
         );
       case TDProgressType.micro:
         return _DefaultValues(
           strokeWidth: 2.0,
           backgroundColor: TDTheme.of(context).grayColor2,
-          borderRadius: BorderRadius.circular(20),
+          linearBorderRadius: BorderRadius.circular(20),
           circleRadius: 25.0,
         );
       case TDProgressType.button:
         return _DefaultValues(
           strokeWidth: 50.0,
           backgroundColor: TDTheme.of(context).brandNormalColor,
-          borderRadius: BorderRadius.circular(8),
+          linearBorderRadius: BorderRadius.circular(8),
           circleRadius: 0,
         );
     }
@@ -157,13 +157,13 @@ class TDProgress extends StatelessWidget {
 class _DefaultValues {
   final double strokeWidth;
   final Color backgroundColor;
-  final BorderRadiusGeometry borderRadius;
+  final BorderRadiusGeometry linearBorderRadius;
   final double circleRadius;
 
   _DefaultValues({
     required this.strokeWidth,
     required this.backgroundColor,
-    required this.borderRadius,
+    required this.linearBorderRadius,
     required this.circleRadius,
   });
 }
@@ -174,7 +174,7 @@ class ProgressIndicator extends StatefulWidget {
   final TDProgressLabelPosition progressLabelPosition;
   final double strokeWidth;
   final double circleRadius;
-  final BorderRadiusGeometry borderRadius;
+  final BorderRadiusGeometry linearBorderRadius;
   final Color? color;
   final Color backgroundColor;
   final TDProgressType type;
@@ -191,7 +191,7 @@ class ProgressIndicator extends StatefulWidget {
     this.label,
     this.progressLabelPosition = TDProgressLabelPosition.inside,
     required this.strokeWidth,
-    required this.borderRadius,
+    required this.linearBorderRadius,
     required this.circleRadius,
     this.color,
     required this.backgroundColor,
@@ -384,7 +384,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
                   width: progressWidth,
                   decoration: BoxDecoration(
                     color: _effectiveColor,
-                    borderRadius: widget.borderRadius,
+                    borderRadius: widget.linearBorderRadius,
                   ),
                 )
               ],
@@ -404,7 +404,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
     return Container(
       height: widget.strokeWidth,
       decoration: BoxDecoration(
-        borderRadius: widget.borderRadius,
+        borderRadius: widget.linearBorderRadius,
         color: widget.backgroundColor,
       ),
     );
@@ -416,7 +416,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
       width: progressWidth,
       decoration: BoxDecoration(
         color: _effectiveColor,
-        borderRadius: widget.borderRadius,
+        borderRadius: widget.linearBorderRadius,
       ),
       child: widget.showLabel
           ? Align(
@@ -440,14 +440,14 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
           decoration: BoxDecoration(
             color: _effectiveColor,
             borderRadius: BorderRadius.only(
-              topLeft: widget.borderRadius.resolve(TextDirection.ltr).topLeft,
+              topLeft: widget.linearBorderRadius.resolve(TextDirection.ltr).topLeft,
               bottomLeft:
-                  widget.borderRadius.resolve(TextDirection.ltr).bottomLeft,
+                  widget.linearBorderRadius.resolve(TextDirection.ltr).bottomLeft,
               topRight: Radius.circular(
-                  widget.borderRadius.resolve(TextDirection.ltr).topRight.x /
+                  widget.linearBorderRadius.resolve(TextDirection.ltr).topRight.x /
                       2),
               bottomRight: Radius.circular(
-                  widget.borderRadius.resolve(TextDirection.ltr).bottomRight.x /
+                  widget.linearBorderRadius.resolve(TextDirection.ltr).bottomRight.x /
                       2),
             ),
           ),
@@ -523,7 +523,6 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
                 child: TDProgressCircular(
                   strokeWidth: widget.strokeWidth,
                   circleRadius: widget.circleRadius,
-                  borderRadius: widget.borderRadius,
                   value: _animation.value,
                   backgroundColor: widget.backgroundColor,
                   valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
@@ -565,7 +564,6 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
         child: TDProgressCircular(
           strokeWidth: widget.strokeWidth,
           circleRadius: widget.circleRadius,
-          borderRadius: widget.borderRadius,
           value: _animation.value,
           backgroundColor: widget.backgroundColor,
           valueColor: AlwaysStoppedAnimation<Color>(_effectiveColor),
@@ -583,7 +581,7 @@ class _ProgressIndicatorState extends State<ProgressIndicator>
             builder: (context, child) {
               final progressWidth = maxWidth * _animation.value;
               return ClipRRect(
-                borderRadius: widget.borderRadius,
+                borderRadius: widget.linearBorderRadius,
                 child: GestureDetector(
                     onTap: widget.onTap,
                     onLongPress: widget.onLongPress,
diff --git a/tdesign-component/lib/src/components/progress/td_progress_circular.dart b/tdesign-component/lib/src/components/progress/td_progress_circular.dart
index bd76d8cd1..9dd5e1d39 100644
--- a/tdesign-component/lib/src/components/progress/td_progress_circular.dart
+++ b/tdesign-component/lib/src/components/progress/td_progress_circular.dart
@@ -9,7 +9,6 @@ class TDProgressCircular extends StatelessWidget {
   final Color backgroundColor;
   final Animation<Color> valueColor;
   final double circleRadius;
-  final BorderRadiusGeometry borderRadius;
 
   const TDProgressCircular({
     Key? key,
@@ -18,7 +17,6 @@ class TDProgressCircular extends StatelessWidget {
     required this.backgroundColor,
     required this.valueColor,
     required this.circleRadius,
-    required this.borderRadius,
   })  : _value = value,
         super(key: key);
 
@@ -29,16 +27,13 @@ class TDProgressCircular extends StatelessWidget {
     return SizedBox(
       width: circleRadius * 2,
       height: circleRadius * 2,
-      child: ClipRRect(
-        borderRadius: borderRadius,
-        child: CustomPaint(
-          painter: _TDProgressCircularPainter(
-            value: value,
-            backgroundColor: backgroundColor,
-            valueColor: valueColor,
-            circleRadius: circleRadius,
-            strokeWidth: strokeWidth,
-          ),
+      child: CustomPaint(
+        painter: _TDProgressCircularPainter(
+          value: value,
+          backgroundColor: backgroundColor,
+          valueColor: valueColor,
+          circleRadius: circleRadius,
+          strokeWidth: strokeWidth,
         ),
       ),
     );

From 5b8c759836501310a43fd9ee09109a1f5e8cd841 Mon Sep 17 00:00:00 2001
From: shinyina <shinyina@foxmail.com>
Date: Thu, 19 Sep 2024 00:08:29 +0800
Subject: [PATCH 60/74] =?UTF-8?q?feat(ActionSheet):=20=E6=96=B0=E5=A2=9EAc?=
 =?UTF-8?q?tionSheet=E7=BB=84=E4=BB=B6=E4=BB=A5=E5=8F=8Ademo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/assets/img/td_action_sheet_1.png  | Bin 0 -> 1345 bytes
 .../example/assets/img/td_action_sheet_2.png  | Bin 0 -> 1867 bytes
 .../example/assets/img/td_action_sheet_3.png  | Bin 0 -> 1833 bytes
 .../example/assets/img/td_action_sheet_4.png  | Bin 0 -> 1511 bytes
 tdesign-component/example/lib/config.dart     |   7 +-
 .../lib/page/td_action_sheet_page.dart        | 504 ++++++++++++++++++
 .../action_sheet/td_action_sheet.dart         | 145 +++++
 .../action_sheet/td_action_sheet_grid.dart    | 257 +++++++++
 .../action_sheet/td_action_sheet_list.dart    | 182 +++++++
 tdesign-component/lib/tdesign_flutter.dart    |   1 +
 10 files changed, 1093 insertions(+), 3 deletions(-)
 create mode 100644 tdesign-component/example/assets/img/td_action_sheet_1.png
 create mode 100644 tdesign-component/example/assets/img/td_action_sheet_2.png
 create mode 100644 tdesign-component/example/assets/img/td_action_sheet_3.png
 create mode 100644 tdesign-component/example/assets/img/td_action_sheet_4.png
 create mode 100644 tdesign-component/example/lib/page/td_action_sheet_page.dart
 create mode 100644 tdesign-component/lib/src/components/action_sheet/td_action_sheet.dart
 create mode 100644 tdesign-component/lib/src/components/action_sheet/td_action_sheet_grid.dart
 create mode 100644 tdesign-component/lib/src/components/action_sheet/td_action_sheet_list.dart

diff --git a/tdesign-component/example/assets/img/td_action_sheet_1.png b/tdesign-component/example/assets/img/td_action_sheet_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1c2df4381f92a1ad15ad45bc8470b9ade88b500
GIT binary patch
literal 1345
zcmV-H1-|-;P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px(`$<GWR9Hvtn0riHRUF5^_tF+hftF{1f(#e~fvKHa_lHx4iX<Ah=tQFiL^q}j
z(`DjJ25!iFY|fcDUzslkX3hw~=`_R#M3JGOW8-B&9%Cyo7>~i4@+h>u=G>%Rd9?So
z;GHo$|Fr4v^*O)aIlpsyDA)||iVXi55xs+<kOm+IfSavcfbW9<s%bM0O(qxBl6aIQ
zsQA|m4b9Le0E7wv!WF{A0Iy6Z6&0|6vY#`9jWo^x2;s66RL&rq1$3{<d=EgjpuzbC
z8>3K?=H{-H4FT}wXCtf@C9Qfg+zdu5Y*_x$D36M#q8PEci@%Amn%4mrn{THxNVa{P
zrwVuZCSa9!1e9Vq+$b7@Gdi@4_u_}kO=#Blzzk-wY^=RgfUCVDQLt<i?(~fZb+yOO
z1F6$>A^&_Cei>_BG$b!TlA&GU_aQH0Bg7QH)6dK>c(?CIywqKa8OG!?C?_B(>AuK^
zSU^|Ck&BghzVmaJOU?<H;+u%C6L+%fj0^@0%10XECGtR$JZ=^<S%ZywEz$xtkkBGl
zMl$($>jyY7eA<=yIbMSz$_<q_@5Wl6Xsh$~$pPGQIv0K-FEp)ro&6-k#F(KuvloAj
z_n|c5Io$8Bw%Ro4FCeMmRT#`hry(6?Fh&~8LfCEyy=e+re}9Squ{RFKq=UBEEQfl^
zQ8C(r!q_Z?x?epxN!B&>`Dh;RSz5pc0#@UTc<1jBqsDQR4%Xp!T_-y^vOJ882^S2*
zXwYjhVKVRrb(q0)<vM&EyP3B$())@Bs@Yzc6_SkgiW{wK*WzT{WWaYLXYrc$B-$tX
zIej|>B>k>@<t|PqM1i!D+;b%ebN9n`RmwcDxlSg{(|DolI12l#9JX|afO3&1S~UmZ
zCz5eOzTNvh+at48DV(|%1+uZWbsWWK1E=iTaJHE@qaVeys(Ty;?J<mC_qh@rjoWH%
z<b?xO_;Roo#c|IdSR!Zb|Il?Ir|UTOM?Hdd@)hiFI^!hN^?B$sj4l|16Hp<N;got0
zmP?g(AxZWkJp!>Y;8v^7_Ksp4yHtZ3bv_bgD)x5*oZ0pf-ib+P*QjN@eEusO(0=P0
zAhAl6h2iAN9E3^~3p&}_UWmLKHXy<yz$zzea%4tt&7MWjKRpJeL_VuM{WRKw4b5*Y
zxE47xXmK3w?vHBqo_PU@oMh!d)WZn2GXbte`P-Ea+}*UFJ$2>|-hiakZJL818>f46
z5P=dOc)NM9{&sdA!<LX_Ybm*a=E_OwpJ@Bg^%4`yWJNqaiQR(S?h=#^)qw_$XlW3F
z#6IYo9>wP1B;<tO>nt0qPtNMHp+6S~=*4D>f!@w3K#sN=^<IQHS>{?@CsG;@*u9eR
zE-|0f+%Au0FA55gCm(fa4I@Zxd;{H6<X`W?V@Ux?2(?!P-d~Z4RbI;+LJmw{!EI*?
z?Djv4@sa})$0CYGs^3l66tD(seU>9g;=^9YNHZo^uR9d6Ae%0xE(c@A35OH;R{*){
zE2Sma5tfQ?hU?Kfaq+(g$Tb05`8CPl{|iuBnV~X^=w4@LC8RF<{3cP#E>VELkb(Ke
zvOHiO0q`_mBcb#t;Ii!#a03AQmp-AWW^G|?oAZcHl>t=PwP2YO)64+-tdHmxp}hJr
zUxQilA_F`Kfc#tM_YkvWGh&7Ts)}N8cxru7HF5h7g=YeGyP?YV00000NkvXXu0mjf
D*ll&{

literal 0
HcmV?d00001

diff --git a/tdesign-component/example/assets/img/td_action_sheet_2.png b/tdesign-component/example/assets/img/td_action_sheet_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b03ef0759639913629f18c6f096bd98df6c8be76
GIT binary patch
literal 1867
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
FV1jB7l0^Uj

literal 0
HcmV?d00001

diff --git a/tdesign-component/example/assets/img/td_action_sheet_3.png b/tdesign-component/example/assets/img/td_action_sheet_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..3aa846d97817b47ef6f9fc8c080431caa4535fe3
GIT binary patch
literal 1833
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
X83B-uG5FNq00000NkvXXu0mjfit1@b

literal 0
HcmV?d00001

diff --git a/tdesign-component/example/assets/img/td_action_sheet_4.png b/tdesign-component/example/assets/img/td_action_sheet_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..630672a695a9af92c3cb348f7196099b07ffbb41
GIT binary patch
literal 1511
zcmV<D1sM8?P)<h;3K|Lk000e1NJLTq001cf001cn1^@s6s9*s000001b5ch_0Itp)
z=>Px)p-DtRR9Hvdn0ahebr8ot`{+%(bi3O^51<!EKr9l`02a!TN?H*TLI4r)i1COT
zf`n62P)y^23QD*PXaY1K7>pqbSdelRA|TilaJy}{P}ts-ZrRek%x_=B7U;gWv@FK?
zZ+GYSozI&$Z)V<VxQ`VT6@`a|g$;5#ouT*p{b7Bl(P$i!B$Xs5Cs(zNp=tY}tgI|C
zFfcGTEG%qtP*6~aBuNj8=f1jbw;Q|N?rv^wK54VrmZzqs9u|&wAdN=j2%S#1FDfcZ
zr_r=y_bcc>!J3+yob~nfixLwPS9@qKUAh#f*XxT627~UA5OomLYPC8o7E87V(rh+w
zNJvO{-QTxYO+qXd%Q=nP?Urh5YpV<fgF($9fBRUiRy4)M#j)}6@z=Ckt-s@|ir3oO
ziss_Qi;3~^@nsPa5vmUP+sWZ@{Es199PnEy{8|EMuR(bO+-!l+K#14EW4&NZ5@hy+
zp5dL#z0aAn*<tG$SbbCmbGf|(=tAMep|D^y^oe{hSf3z^s^Hb#aQdnoEH*;U)aWEg
z)k9<`+;+(Dr?0@l5;%Wd_KofitFvMD6TXA0hCEURQ@26gEr<z+r5P}Hm<-mD3E;z}
zux!6v5&;q{$$*s;z?Xrh3i5IdjM^Xrj_3n<GoY^zb4irQ(*3aJggk@SO@=p~R-aKt
zNKtbFu&@G#C%}PMyl1bY&_ZYNFYsvrbPs~x--dzF>Od7CcV2)QdC((778bSlpk{Z%
zxNqQCIm~z*@@A@2QiL3{2@1+!;TZUMqB>D;UPsGe^hO8{fNM)2Dok0^E2Om*qE>?4
z1x52<a8G4HB@fZD`hNx`b+GFNm^MV|1bBrM?PKU#&;~<84oF?JV$R+L+s?s?36L|s
zlaQkAWNeb3<no2eVro6s6~d8HNQ;GKW0g;-%4B2+)aSHW;gxke^l;<iVD%oZw^T4O
z`ek~CMk%U!g%tfw_klb`F24u;yI|YQula%b7p5U#vwO`Vcks5(L5kDQZh-?vxpqVi
zb=LB(eogM>cRVuM03C<YuM;E%dzDpeLA#4!+IA4P{Or4s<in)7C$j4nO?BJ(uqvN3
zHwvh|ZDG}*Z<!Q3r*n{EQjFa!_saAn_-T&Z*nKj$9c<^}>H>(G1%}tKIvP1tvzM*r
zPgtAwBfUdYJCsz+q&Qhx4<pw@l@-RPz>XR6lA+3K)<MlCXekD57NqWN`xZ@Ub1{d^
zb$nl#?%6}XdR`uzZA}%VI3Om)r0<}y1s0EiTs70D^(y??7jVfj`|Ss9<~`RYCXmn<
zwtmXJ%ZF-6AuxX*d~po6Ooi!bu=zAp+>ke;eg=8OHMh#&ow@>VJ=uW1G#Q*XAiw}a
z%0Oy=3+io<kPD)di1lszbeNg;fSDA>X6=L>f5@xW`a%#(us8cC6BZ9Yg>-WtNW*cR
zIF2-F1qA+E)MABOcM>xDL)HL!N4<Np`IJdfmnSP^tcYNEX&7k5Q-4j)p2$WwNq)x>
zbACc9JU38Yc7?h2EX4g+0aDgdG%2IVx9G_|0vo45ikI!mCrB~JO?5D57%WJKB;{ez
zKGF6T9LonleFcO@V#)fF9vO2z7wpY^f;2aP*kTep(JNg$=i$m<<6+XIjHKJ5<BCnf
zCrCv#6%OvQQ#d~#5B3(M?DypwRWQFpdU&dhxSQ+IBtE6;jqK4tDy8nO-#w5flc`U1
zbhP=u`d^UUZbxG@8iVzEeUnb73-s|K{o-!3+2p^YD=RC1j*E*^Gwl2V);368UEK{2
zq{(D@CMG7PAUr(0i{50q=32z9uB@!gxdUZ3n{#4fVpfEN__~XA4ba^x;(@8It}cj+
ziyPN2b0(AN&B(~eRS^*pQGtPvrbL}iCswP~(b(9yUXr9my?ghz{SAT%kU?r>7&-s|
N002ovPDHLkV1l56)3g8p

literal 0
HcmV?d00001

diff --git a/tdesign-component/example/lib/config.dart b/tdesign-component/example/lib/config.dart
index fa515e92c..bc801d252 100644
--- a/tdesign-component/example/lib/config.dart
+++ b/tdesign-component/example/lib/config.dart
@@ -8,6 +8,7 @@ import 'page/sidebar/td_sidebar_page_custom.dart';
 import 'page/sidebar/td_sidebar_page_icon.dart';
 import 'page/sidebar/td_sidebar_page_outline.dart';
 import 'page/sidebar/td_sidebar_page_pagination.dart';
+import 'page/td_action_sheet_page.dart';
 import 'page/td_avatar_page.dart';
 import 'page/td_backtop_page.dart';
 import 'page/td_badge_page.dart';
@@ -207,11 +208,11 @@ Map<String, List<ExamplePageModel>> exampleMap = {
     ExamplePageModel(text: 'Tag 标签', name: 'tag', pageBuilder: _wrapInheritedTheme((context) => const TDTagPage())),
   ],
   '反馈': [
-    ExamplePageModel(
+    ExamplePageModel( 
         text: 'ActionSheet 动作面板',
         name: 'action_sheet',
-        isTodo: true,
-        pageBuilder: _wrapInheritedTheme((context) => const TodoPage())),
+        isTodo: false,
+        pageBuilder: _wrapInheritedTheme((context) => const TDActionSheetPage())),
     ExamplePageModel(
         text: 'Dialog 对话框', name: 'dialog', pageBuilder: _wrapInheritedTheme((context) => const TDDialogPage())),
     ExamplePageModel(
diff --git a/tdesign-component/example/lib/page/td_action_sheet_page.dart b/tdesign-component/example/lib/page/td_action_sheet_page.dart
new file mode 100644
index 000000000..d8ad35f98
--- /dev/null
+++ b/tdesign-component/example/lib/page/td_action_sheet_page.dart
@@ -0,0 +1,504 @@
+import 'package:flutter/material.dart';
+import 'package:tdesign_flutter/tdesign_flutter.dart';
+import '../annotation/demo.dart';
+import '../base/example_widget.dart';
+
+class IconWithBackground extends StatelessWidget {
+  final IconData icon;
+
+  const IconWithBackground({
+    Key? key,
+    required this.icon,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 40.0,
+      height: 40.0,
+      decoration: BoxDecoration(
+        color: TDTheme.of(context).grayColor1,
+      ),
+      child: Center(
+        child: Icon(
+          icon,
+          size: 24.0,
+        ),
+      ),
+    );
+  }
+}
+
+const _nums = ['一', '二', '三', '四'];
+List<TDActionSheetItem> _gridItems = [
+  TDActionSheetItem(
+      label: '微信', icon: Image.asset('assets/img/td_action_sheet_1.png')),
+  TDActionSheetItem(
+      label: '朋友圈', icon: Image.asset('assets/img/td_action_sheet_2.png')),
+  TDActionSheetItem(
+      label: 'QQ', icon: Image.asset('assets/img/td_action_sheet_3.png')),
+  TDActionSheetItem(
+      label: '企业微信', icon: Image.asset('assets/img/td_action_sheet_4.png')),
+  TDActionSheetItem(label: '收藏', icon: IconWithBackground(icon: TDIcons.star)),
+  TDActionSheetItem(
+      label: '刷新', icon: IconWithBackground(icon: TDIcons.refresh)),
+  TDActionSheetItem(
+      label: '下载', icon: IconWithBackground(icon: TDIcons.download)),
+  TDActionSheetItem(label: '复制', icon: IconWithBackground(icon: TDIcons.queue)),
+];
+
+class TDActionSheetPage extends StatelessWidget {
+  const TDActionSheetPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+        color: TDTheme.of(context).grayColor2,
+        child: ExamplePage(
+          title: tdTitle(context),
+          desc: '从底部弹出的模态框，提供和当前场景相关的操作动作，也支持提供信息输入和描述。',
+          exampleCodeGroup: 'action_sheet',
+          children: [
+            ExampleModule(title: '组件类型', children: [
+              ExampleItem(
+                ignoreCode: true,
+                desc: '列表型动作面板',
+                builder: (BuildContext context) {
+                  return const Column(
+                    children: [
+                      CodeWrapper(builder: _buildBaseListActionSheet),
+                      SizedBox(height: 16),
+                      CodeWrapper(builder: _buildDescListActionSheet),
+                      SizedBox(height: 16),
+                      CodeWrapper(builder: _buildIconListActionSheet),
+                      SizedBox(height: 16),
+                      CodeWrapper(builder: _buildBadgeListActionSheet),
+                    ],
+                  );
+                },
+              ),
+              ExampleItem(
+                ignoreCode: true,
+                desc: '宫格型动作面板',
+                builder: (BuildContext context) {
+                  return const Column(
+                    children: [
+                      CodeWrapper(builder: _buildBaseGridActionSheet),
+                      SizedBox(height: 16),
+                      CodeWrapper(builder: _buildDescGridActionSheet),
+                      SizedBox(height: 16),
+                      CodeWrapper(builder: _buildPaginationGridActionSheet),
+                      SizedBox(height: 16),
+                      CodeWrapper(builder: _buildBadgeGridActionSheet),
+                    ],
+                  );
+                },
+              ),
+            ]),
+            ExampleModule(title: '组件状态', children: [
+              ExampleItem(
+                ignoreCode: true,
+                desc: '列表型选项状态',
+                builder: (BuildContext context) {
+                  return const Column(
+                    children: [
+                      CodeWrapper(builder: _buildBaseListStateActionSheet),
+                      SizedBox(height: 16),
+                      CodeWrapper(builder: _buildIconListStateActionSheet),
+                    ],
+                  );
+                },
+              )
+            ]),
+            ExampleModule(title: '组件样式', children: [
+              ExampleItem(
+                  ignoreCode: true,
+                  desc: '列表型对齐方式',
+                  builder: (BuildContext context) {
+                    return const Column(
+                      children: [
+                        CodeWrapper(builder: _buildBadgeListCenterActionSheet),
+                        SizedBox(height: 16),
+                        CodeWrapper(builder: _buildIconListCenterActionSheet),
+                        SizedBox(height: 16),
+                        CodeWrapper(builder: _buildBadgeListLeftActionSheet),
+                        SizedBox(height: 16),
+                        CodeWrapper(builder: _buildIconListLeftActionSheet),
+                      ],
+                    );
+                  })
+            ])
+          ],
+          test: const [],
+        ));
+  }
+}
+
+@Demo(group: 'action_sheet')
+Widget _buildBaseListActionSheet(BuildContext context) {
+  return TDButton(
+    text: '常规列表型',
+    isBlock: true,
+    type: TDButtonType.outline,
+    theme: TDButtonTheme.primary,
+    size: TDButtonSize.large,
+    onTap: () {
+      TDActionSheet(
+        context,
+        visible: true,
+        items: _nums.map((e) => TDActionSheetItem(label: '选项$e')).toList(),
+      );
+    },
+  );
+}
+
+@Demo(group: 'action_sheet')
+Widget _buildDescListActionSheet(BuildContext context) {
+  return TDButton(
+    text: '带描述列表型',
+    isBlock: true,
+    type: TDButtonType.outline,
+    theme: TDButtonTheme.primary,
+    size: TDButtonSize.large,
+    onTap: () {
+      TDActionSheet(
+        context,
+        visible: true,
+        description: '动作面板描述文字',
+        items: _nums.map((e) => TDActionSheetItem(label: '选项$e')).toList(),
+      );
+    },
+  );
+}
+
+@Demo(group: 'action_sheet')
+Widget _buildIconListActionSheet(BuildContext context) {
+  return TDButton(
+    text: '带图标列表型',
+    isBlock: true,
+    type: TDButtonType.outline,
+    theme: TDButtonTheme.primary,
+    size: TDButtonSize.large,
+    onTap: () {
+      TDActionSheet(
+        context,
+        visible: true,
+        items: _nums
+            .map((e) => TDActionSheetItem(
+                  label: '选项$e',
+                  icon: const Icon(TDIcons.app),
+                ))
+            .toList(),
+      );
+    },
+  );
+}
+
+@Demo(group: 'action_sheet')
+Widget _buildBadgeListActionSheet(BuildContext context) {
+  return TDButton(
+    text: '带徽标列表型',
+    isBlock: true,
+    type: TDButtonType.outline,
+    theme: TDButtonTheme.primary,
+    size: TDButtonSize.large,
+    onTap: () {
+      TDActionSheet(
+        context,
+        visible: true,
+        items: _nums
+            .map((e) => TDActionSheetItem(
+                  label: '选项$e',
+                  badge: TDBadge(TDBadgeType.redPoint),
+                ))
+            .toList(),
+      );
+    },
+  );
+}
+
+@Demo(group: 'action_sheet')
+Widget _buildBaseGridActionSheet(BuildContext context) {
+  return TDButton(
+    text: '常规宫格型',
+    isBlock: true,
+    type: TDButtonType.outline,
+    theme: TDButtonTheme.primary,
+    size: TDButtonSize.large,
+    onTap: () {
+      TDActionSheet(
+        context,
+        visible: true,
+        theme: TDActionSheetTheme.grid,
+        count: 8,
+        items: _gridItems,
+      );
+    },
+  );
+}
+
+@Demo(group: 'action_sheet')
+Widget _buildDescGridActionSheet(BuildContext context) {
+  return TDButton(
+    text: '带描述宫格型',
+    isBlock: true,
+    type: TDButtonType.outline,
+    theme: TDButtonTheme.primary,
+    size: TDButtonSize.large,
+    onTap: () {
+      TDActionSheet(
+        context,
+        visible: true,
+        theme: TDActionSheetTheme.grid,
+        count: 8,
+        description: '动作面板描述文字',
+        items: _gridItems,
+      );
+    },
+  );
+}
+
+@Demo(group: 'action_sheet')
+Widget _buildPaginationGridActionSheet(BuildContext context) {
+  return TDButton(
+    text: '带分页宫格型',
+    isBlock: true,
+    type: TDButtonType.outline,
+    theme: TDButtonTheme.primary,
+    size: TDButtonSize.large,
+    onTap: () {
+      TDActionSheet(
+        context,
+        visible: true,
+        theme: TDActionSheetTheme.grid,
+        count: 8,
+        showPagination: true,
+        items: [
+          ..._gridItems,
+          TDActionSheetItem(
+            label: '安卓',
+            icon: IconWithBackground(icon: TDIcons.logo_android),
+          ),
+          TDActionSheetItem(
+            label: 'Apple',
+            icon: IconWithBackground(icon: TDIcons.logo_apple),
+          ),
+          TDActionSheetItem(
+            label: 'Chrome',
+            icon: IconWithBackground(icon: TDIcons.logo_chrome),
+          ),
+          TDActionSheetItem(
+            label: 'Github',
+            icon: IconWithBackground(icon: TDIcons.logo_github),
+          ),
+        ],
+      );
+    },
+  );
+}
+
+@Demo(group: 'action_sheet')
+Widget _buildBadgeGridActionSheet(BuildContext context) {
+  return TDButton(
+    text: '带徽标宫格型',
+    isBlock: true,
+    type: TDButtonType.outline,
+    theme: TDButtonTheme.primary,
+    size: TDButtonSize.large,
+    onTap: () {
+      TDActionSheet(
+        context,
+        visible: true,
+        theme: TDActionSheetTheme.grid,
+        count: 8,
+        items: _gridItems
+            .map((e) => TDActionSheetItem(
+                  label: e.label,
+                  icon: e.icon,
+                  badge: TDBadge(TDBadgeType.redPoint),
+                ))
+            .toList(),
+      );
+    },
+  );
+}
+
+@Demo(group: 'action_sheet')
+Widget _buildBaseListStateActionSheet(BuildContext context) {
+  return TDButton(
+    text: '列表型选项状态',
+    isBlock: true,
+    type: TDButtonType.outline,
+    theme: TDButtonTheme.primary,
+    size: TDButtonSize.large,
+    onTap: () {
+      TDActionSheet(
+        context,
+        visible: true,
+        items: [
+          TDActionSheetItem(
+            label: '默认选项',
+          ),
+          TDActionSheetItem(
+            label: '自定义选项',
+            textStyle: TextStyle(
+              color: TDTheme.of(context).brandNormalColor,
+            ),
+          ),
+          TDActionSheetItem(
+            label: '失效选项',
+            disabled: true,
+          ),
+          TDActionSheetItem(
+            label: '警告选项',
+            textStyle: TextStyle(
+              color: Colors.red,
+            ),
+          ),
+        ],
+        onSelected: (item, index) {
+          print('选中了：${item.label}');
+        },
+      );
+    },
+  );
+}
+
+@Demo(group: 'action_sheet')
+Widget _buildIconListStateActionSheet(BuildContext context) {
+  return TDButton(
+    text: '列表型带图标状态',
+    isBlock: true,
+    type: TDButtonType.outline,
+    theme: TDButtonTheme.primary,
+    size: TDButtonSize.large,
+    onTap: () {
+      TDActionSheet(
+        context,
+        visible: true,
+        items: [
+          TDActionSheetItem(
+            label: '默认选项',
+            icon: Icon(TDIcons.app),
+          ),
+          TDActionSheetItem(
+            label: '自定义选项',
+            icon: Icon(TDIcons.app),
+            textStyle: TextStyle(
+              color: TDTheme.of(context).brandNormalColor,
+            ),
+          ),
+          TDActionSheetItem(
+            label: '失效选项',
+            icon: Icon(TDIcons.app),
+            disabled: true,
+          ),
+          TDActionSheetItem(
+            label: '警告选项',
+            icon: Icon(TDIcons.app),
+            textStyle: TextStyle(
+              color: Colors.red,
+            ),
+          ),
+        ],
+        onSelected: (item, index) {
+          print('选中了：${item.label}');
+        },
+      );
+    },
+  );
+}
+
+@Demo(group: 'action_sheet')
+Widget _buildBadgeListCenterActionSheet(BuildContext context) {
+  return TDButton(
+    text: '居中带徽标列表型',
+    isBlock: true,
+    type: TDButtonType.outline,
+    theme: TDButtonTheme.primary,
+    size: TDButtonSize.large,
+    onTap: () {
+      TDActionSheet(
+        context,
+        visible: true,
+        items: _nums
+            .map((e) => TDActionSheetItem(
+                  label: '选项$e',
+                  badge: TDBadge(TDBadgeType.redPoint),
+                ))
+            .toList(),
+      );
+    },
+  );
+}
+
+@Demo(group: 'action_sheet')
+Widget _buildIconListCenterActionSheet(BuildContext context) {
+  return TDButton(
+    text: '居中带图标列表型',
+    isBlock: true,
+    type: TDButtonType.outline,
+    theme: TDButtonTheme.primary,
+    size: TDButtonSize.large,
+    onTap: () {
+      TDActionSheet(
+        context,
+        visible: true,
+        items: _nums
+            .map((e) => TDActionSheetItem(
+                  label: '选项$e',
+                  icon: const Icon(TDIcons.app),
+                ))
+            .toList(),
+      );
+    },
+  );
+}
+
+@Demo(group: 'action_sheet')
+Widget _buildBadgeListLeftActionSheet(BuildContext context) {
+  return TDButton(
+    text: '左对齐带徽标列表型',
+    isBlock: true,
+    type: TDButtonType.outline,
+    theme: TDButtonTheme.primary,
+    size: TDButtonSize.large,
+    onTap: () {
+      TDActionSheet(
+        context,
+        visible: true,
+        align: TDActionSheetAlign.left,
+        items: _nums
+            .map((e) => TDActionSheetItem(
+                  label: '选项$e',
+                  badge: TDBadge(TDBadgeType.redPoint),
+                ))
+            .toList(),
+      );
+    },
+  );
+}
+
+@Demo(group: 'action_sheet')
+Widget _buildIconListLeftActionSheet(BuildContext context) {
+  return TDButton(
+    text: '左对齐带图标列表型',
+    isBlock: true,
+    type: TDButtonType.outline,
+    theme: TDButtonTheme.primary,
+    size: TDButtonSize.large,
+    onTap: () {
+      TDActionSheet(
+        context,
+        visible: true,
+        align: TDActionSheetAlign.left,
+        items: _nums
+            .map((e) => TDActionSheetItem(
+                  label: '选项$e',
+                  icon: const Icon(TDIcons.app),
+                ))
+            .toList(),
+      );
+    },
+  );
+}
diff --git a/tdesign-component/lib/src/components/action_sheet/td_action_sheet.dart b/tdesign-component/lib/src/components/action_sheet/td_action_sheet.dart
new file mode 100644
index 000000000..4b5ae0a38
--- /dev/null
+++ b/tdesign-component/lib/src/components/action_sheet/td_action_sheet.dart
@@ -0,0 +1,145 @@
+import 'package:flutter/material.dart';
+import 'package:tdesign_flutter/tdesign_flutter.dart';
+
+import 'td_action_sheet_grid.dart';
+import 'td_action_sheet_list.dart';
+
+typedef VoidCallback = void Function();
+typedef ActionSheetTriggerSource = void Function();
+typedef TDActionSheetItemCallback = void Function(
+    TDActionSheetItem item, int index);
+
+enum TDActionSheetTheme { list, grid }
+enum TDActionSheetAlign { center, left, right }
+
+class TDActionSheetItem {
+  TDActionSheetItem({
+    required this.label,
+    this.textStyle,
+    this.icon,
+    this.badge,
+    this.disabled = false,
+  });
+
+  final String label;
+  final TextStyle? textStyle;
+  final Widget? icon;
+  final TDBadge? badge;
+  final bool disabled;
+}
+
+class TDActionSheet {
+  TDActionSheet(
+    this.context, {
+    this.align = TDActionSheetAlign.center,
+    this.cancelText = '取消',
+    this.count = 8,
+    this.description,
+    required this.items,
+    this.showCancel = true,
+    this.showPagination = false,
+    this.theme = TDActionSheetTheme.list,
+    this.visible = false,
+    this.onCancel,
+    this.onClose,
+    this.onSelected,
+  }) {
+    if (visible) {
+      show();
+    }
+  }
+
+  /// 上下文
+  final BuildContext context;
+
+  /// 对齐方式
+  final TDActionSheetAlign align;
+
+  /// 取消按钮的文本
+  final String cancelText;
+
+  /// 每页显示的项目数
+  final int count;
+
+  /// 描述文本
+  final String? description;
+
+  /// ActionSheet的项目列表
+  final List<TDActionSheetItem> items;
+
+  /// 是否显示取消按钮
+  final bool showCancel;
+
+  /// 是否显示分页
+  final bool showPagination;
+
+  /// 主题样式
+  final TDActionSheetTheme theme;
+
+  /// 是否立即显示
+  final bool visible;
+
+  /// 取消按钮的回调函数
+  final VoidCallback? onCancel;
+
+  /// 关闭时的回调函数
+  final ActionSheetTriggerSource? onClose;
+
+  /// 选择项目时的回调函数
+  final TDActionSheetItemCallback? onSelected;
+  
+  static TDSlidePopupRoute? _actionSheetRoute;
+
+  /// 显示 ActionSheet
+  void show() {
+    if (_actionSheetRoute != null) {
+      return;
+    }
+    _actionSheetRoute = _createRoute();
+    Navigator.of(context).push(_actionSheetRoute!).then((_) {
+      _deleteRoute();
+    });
+  }
+
+  /// 创建路由
+  TDSlidePopupRoute _createRoute() {
+    return TDSlidePopupRoute(
+      slideTransitionFrom: SlideTransitionFrom.bottom,
+      isDismissible: true,
+      modalBarrierColor: Colors.black54,
+      builder: (context) {
+        if (theme == TDActionSheetTheme.list) {
+          return TDActionSheetList(
+            items: items,
+            align: align,
+            cancelText: cancelText,
+            description: description,
+            showCancel: showCancel,
+            onCancel: onCancel,
+            onSelected: onSelected,
+          );
+        } else if (theme == TDActionSheetTheme.grid) {
+          return TDActionSheetGrid(
+            items: items,
+            onSelected: onSelected,
+            showCancel: showCancel,
+            showPagination: showPagination,
+            cancelText: cancelText,
+            description: description,
+            count: count,
+            onCancel: onCancel,
+          );
+        }
+        return Container();
+      },
+    );
+  }
+
+  /// 删除路由
+  void _deleteRoute() {
+    _actionSheetRoute = null;
+    if (onClose != null) {
+      onClose!();
+    }
+  }
+}
diff --git a/tdesign-component/lib/src/components/action_sheet/td_action_sheet_grid.dart b/tdesign-component/lib/src/components/action_sheet/td_action_sheet_grid.dart
new file mode 100644
index 000000000..974f7a02c
--- /dev/null
+++ b/tdesign-component/lib/src/components/action_sheet/td_action_sheet_grid.dart
@@ -0,0 +1,257 @@
+import 'package:flutter/material.dart';
+import '../../theme/td_colors.dart';
+import '../../theme/td_fonts.dart';
+import '../../theme/td_theme.dart';
+import '../badge/td_badge.dart';
+import '../text/td_text.dart';
+import 'td_action_sheet.dart';
+
+class TDActionSheetGrid extends StatefulWidget {
+  final List<TDActionSheetItem> items;
+  final String? description;
+  final int count;
+  final String cancelText;
+  final bool showCancel;
+  final bool showPagination;
+  final VoidCallback? onCancel;
+  final TDActionSheetItemCallback? onSelected;
+
+  TDActionSheetGrid({
+    required this.items,
+    this.description,
+    this.count = 8,
+    this.cancelText = '取消',
+    this.showCancel = true,
+    this.showPagination = false,
+    this.onCancel,
+    this.onSelected,
+  });
+
+  @override
+  _TDActionSheetGridState createState() => _TDActionSheetGridState();
+}
+
+class _TDActionSheetGridState extends State<TDActionSheetGrid> {
+  int currentPage = 0;
+  PageController? _pageController;
+
+  @override
+  void initState() {
+    super.initState();
+    // 如果显示分页，则初始化 PageController
+    if (widget.showPagination) {
+      _pageController = PageController();
+    }
+  }
+
+  @override
+  void dispose() {
+    // 释放 PageController 资源
+    _pageController?.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // 计算每行的项目数
+    final int itemsPerRow = widget.count ~/ 2;
+    // 计算总页数
+    final int pageCount = (widget.items.length / widget.count).ceil();
+    // 获取屏幕宽度
+    final double screenWidth = MediaQuery.of(context).size.width;
+    // 计算子项的宽高比
+    final double childAspectRatio = (screenWidth / itemsPerRow) / 100.0;
+
+    return Material(
+      color: Colors.transparent,
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          // 如果有描述，则显示描述
+          if (widget.description != null) _buildDescription(context),
+          // 构建网格视图
+          _buildGrid(context, pageCount, itemsPerRow, childAspectRatio),
+          // 如果显示分页，则显示分页点
+          if (widget.showPagination) _buildPaginationDots(context, pageCount),
+          // 如果显示取消按钮，则显示取消按钮
+          if (widget.showCancel) _buildCancelButton(context),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildDescription(BuildContext context) {
+    return Column(
+      children: [
+        Container(
+          color: TDTheme.of(context).fontWhColor1,
+          height: 46,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              TDText(
+                widget.description!,
+                font: TDTheme.of(context).fontBodyMedium,
+                textColor: TDTheme.of(context).fontGyColor3,
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildGrid(BuildContext context, int pageCount, int itemsPerRow,
+      double childAspectRatio) {
+    return Container(
+      color: TDTheme.of(context).fontWhColor1,
+      child: Column(
+        children: [
+          Container(
+            height: 208,
+            child: PageView.builder(
+              controller: _pageController,
+              itemCount: pageCount,
+              // 当页面改变时更新当前页码
+              onPageChanged: widget.showPagination
+                  ? (index) {
+                      setState(() {
+                        currentPage = index;
+                      });
+                    }
+                  : null,
+              itemBuilder: (context, pageIndex) {
+                // 获取当前页面的项目
+                final pageItems = widget.items
+                    .skip(pageIndex * widget.count)
+                    .take(widget.count)
+                    .toList();
+                return GridView.builder(
+                  padding: EdgeInsets.zero,
+                  itemCount: pageItems.length,
+                  gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                    crossAxisCount: itemsPerRow,
+                    childAspectRatio: childAspectRatio,
+                  ),
+                  itemBuilder: (context, index) {
+                    final item = pageItems[index];
+                    return _buildGridItem(
+                        context, item, pageIndex * widget.count + index);
+                  },
+                );
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildGridItem(
+      BuildContext context, TDActionSheetItem item, int index) {
+    return GestureDetector(
+      onTap: item.disabled
+          ? null
+          : () {
+              if (widget.onSelected != null) {
+                widget.onSelected!(item, index);
+              }
+              Navigator.maybePop(context);
+            },
+      child: Container(
+        height: 100.0,
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            if (item.icon != null) ...[
+              Stack(
+                children: [
+                  SizedBox(
+                    width: 40.0,
+                    height: 40.0,
+                    child: FittedBox(
+                      fit: BoxFit.contain,
+                      child: item.icon!,
+                    ),
+                  ),
+                  if (item.badge != null)
+                    Positioned(
+                      child: item.badge!,
+                      right: 0,
+                      top: 0,
+                    ),
+                ],
+              ),
+              const SizedBox(height: 8),
+            ],
+            TDText(
+              item.label,
+              font: TDTheme.of(context).fontBodyLarge,
+              textColor: TDTheme.of(context).fontGyColor1,
+              style: item.textStyle,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildPaginationDots(BuildContext context, int pageCount) {
+    return Container(
+        height: 16,
+        color: TDTheme.of(context).fontWhColor1,
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: List.generate(pageCount, (index) {
+            return Container(
+              margin: EdgeInsets.symmetric(horizontal: 4.0),
+              width: 8.0,
+              height: 8.0,
+              decoration: BoxDecoration(
+                shape: BoxShape.circle,
+                color: currentPage == index
+                    ? TDTheme.of(context).brandColor7
+                    : TDTheme.of(context).grayColor4,
+              ),
+            );
+          }),
+        ));
+  }
+
+  Widget _buildCancelButton(BuildContext context) {
+    return Column(
+      children: [
+        GestureDetector(
+          onTap: () {
+            if (widget.onCancel != null) {
+              widget.onCancel!();
+            }
+            Navigator.maybePop(context);
+          },
+          child: Container(
+            decoration: BoxDecoration(
+              color: TDTheme.of(context).fontWhColor1,
+              border: Border(
+                top: BorderSide(
+                  color: TDTheme.of(context).grayColor1,
+                  width: 1.0,
+                ),
+              ),
+            ),
+            height: 48,
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                TDText(
+                  widget.cancelText,
+                  font: TDTheme.of(context).fontBodyLarge,
+                  textColor: TDTheme.of(context).fontGyColor1,
+                ),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/tdesign-component/lib/src/components/action_sheet/td_action_sheet_list.dart b/tdesign-component/lib/src/components/action_sheet/td_action_sheet_list.dart
new file mode 100644
index 000000000..c3c3bb382
--- /dev/null
+++ b/tdesign-component/lib/src/components/action_sheet/td_action_sheet_list.dart
@@ -0,0 +1,182 @@
+import 'package:flutter/material.dart';
+import '../../theme/td_colors.dart';
+import '../../theme/td_fonts.dart';
+import '../../theme/td_theme.dart';
+import '../badge/td_badge.dart';
+import '../text/td_text.dart';
+import 'td_action_sheet.dart';
+
+class TDActionSheetList extends StatelessWidget {
+  final List<TDActionSheetItem> items;
+  final TDActionSheetAlign align;
+  final String cancelText;
+  final String? description;
+  final bool showCancel;
+  final VoidCallback? onCancel;
+  final TDActionSheetItemCallback? onSelected;
+
+  TDActionSheetList({
+    required this.items,
+    this.align = TDActionSheetAlign.center,
+    this.cancelText = '取消',
+    this.description,
+    this.showCancel = true,
+    this.onCancel,
+    this.onSelected,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      color: Colors.transparent,
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          if (description != null) _buildDescription(context),
+          _buildOptionsList(context),
+          if (showCancel) _buildCancelButton(context),
+        ],
+      ),
+    );
+  }
+
+  /// 构建描述文本
+  Widget _buildDescription(BuildContext context) {
+    return Column(
+      children: [
+        Container(
+          color: TDTheme.of(context).fontWhColor1,
+          height: 46,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              TDText(
+                description!,
+                font: TDTheme.of(context).fontBodyMedium,
+                textColor: TDTheme.of(context).fontGyColor3,
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  /// 构建选项列表
+  Widget _buildOptionsList(BuildContext context) {
+    return Container(
+      color: TDTheme.of(context).fontWhColor1,
+      child: ListView.builder(
+        shrinkWrap: true,
+        itemCount: items.length,
+        padding: EdgeInsets.zero,
+        itemBuilder: (context, index) {
+          final item = items[index];
+          return GestureDetector(
+            onTap: item.disabled
+                ? null // 如果项被禁用，则不设置点击事件
+                : () {
+                    if (onSelected != null) {
+                      onSelected!(item, index); // 触发选中回调
+                    }
+                    Navigator.maybePop(context); // 关闭当前页面
+                  },
+            child: Container(
+              height: 56,
+              padding: EdgeInsets.symmetric(horizontal: 16.0),
+              decoration: BoxDecoration(
+                border: Border(
+                  bottom: BorderSide(
+                    color: TDTheme.of(context).grayColor1,
+                    width: 1.0,
+                  ),
+                ),
+              ),
+              child: Row(
+                mainAxisAlignment: _getMainAxisAlignment(),
+                children: [
+                  if (item.icon != null) ...[
+                    IconTheme(
+                      data: IconThemeData(
+                        color: item.disabled
+                            ? TDTheme.of(context).fontGyColor4 // 禁用状态下的图标颜色
+                            : (item.textStyle?.color ??
+                                TDTheme.of(context).fontGyColor1), // 正常状态下的图标颜色
+                        size: item.textStyle?.fontSize,
+                      ),
+                      child: SizedBox(
+                        width: 24,
+                        height: 24,
+                        child: item.icon!,
+                      ),
+                    ),
+                    SizedBox(width: 8),
+                  ],
+                  TDText(
+                    item.label,
+                    font: TDTheme.of(context).fontBodyLarge,
+                    textColor: item.disabled
+                        ? TDTheme.of(context).fontGyColor4 // 禁用状态下的文本颜色
+                        : TDTheme.of(context).fontGyColor1, // 正常状态下的文本颜色
+                    style: item.textStyle,
+                  ),
+                  if (item.badge != null) ...[
+                    SizedBox(width: 8),
+                    item.badge!,
+                  ],
+                ],
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  /// 构建取消按钮
+  Widget _buildCancelButton(BuildContext context) {
+    return Column(
+      children: [
+        Container(
+          color: TDTheme.of(context).grayColor1,
+          height: 8,
+        ),
+        GestureDetector(
+          onTap: () {
+            if (onCancel != null) {
+              onCancel!();
+            }
+            Navigator.maybePop(context);
+          },
+          child: Container(
+            color: TDTheme.of(context).fontWhColor1,
+            height: 48,
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                TDText(
+                  cancelText,
+                  font: TDTheme.of(context).fontBodyLarge,
+                  textColor: TDTheme.of(context).fontGyColor1,
+                ),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  /// 获取主轴对齐方式
+  MainAxisAlignment _getMainAxisAlignment() {
+    switch (align) {
+      case TDActionSheetAlign.left:
+        return MainAxisAlignment.start;
+      case TDActionSheetAlign.right:
+        return MainAxisAlignment.end;
+      case TDActionSheetAlign.center:
+      default:
+        return MainAxisAlignment.center;
+    }
+  }
+}
diff --git a/tdesign-component/lib/tdesign_flutter.dart b/tdesign-component/lib/tdesign_flutter.dart
index c995c207f..fd8bbc51b 100644
--- a/tdesign-component/lib/tdesign_flutter.dart
+++ b/tdesign-component/lib/tdesign_flutter.dart
@@ -1,3 +1,4 @@
+export 'src/components/action_sheet/td_action_sheet.dart';
 export 'src/components/avatar/td_avatar.dart';
 export 'src/components/backtop/td_backtop.dart';
 export 'src/components/badge/td_badge.dart';

From 903e857a19d1b2336319ccfcfbf2e3cb5d0938df Mon Sep 17 00:00:00 2001
From: v_szheshi <v_szheshi@tencent.com>
Date: Fri, 27 Sep 2024 16:40:55 +0800
Subject: [PATCH 61/74] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E9=92=9F?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E4=B8=8E=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_date_picker_page.dart |  9 ++-
 .../src/components/picker/td_date_picker.dart | 77 ++++++++++---------
 .../lib/src/components/picker/td_picker.dart  |  1 +
 3 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_date_picker_page.dart b/tdesign-component/example/lib/page/td_date_picker_page.dart
index 0ba3d4b9d..df595e2b8 100644
--- a/tdesign-component/example/lib/page/td_date_picker_page.dart
+++ b/tdesign-component/example/lib/page/td_date_picker_page.dart
@@ -294,12 +294,15 @@ class _TDDatePickerPageState extends State<TDDatePickerPage> {
               });
               Navigator.of(context).pop();
             },
+            useYear: true,
+            useMonth: true,
+            useDay: true,
             useHour: true,
             useMinute: true,
             useSecond: true,
-            dateStart: [2012, 1, 15,12],
-            dateEnd: [2012, 6, 15,12,48,59],
-            initialDate: [2012, 1, 15,13,20,22]);
+            dateStart: [2012,1, 15,12,28],
+            dateEnd: [2012, 6, 15,12,48],
+            initialDate: [2012, 1, 15,13,20]);
       },
       child: buildSelectRow(context, selected_5, '选择时间'),
     );
diff --git a/tdesign-component/lib/src/components/picker/td_date_picker.dart b/tdesign-component/lib/src/components/picker/td_date_picker.dart
index 2f2c8afc7..4a80bac4c 100644
--- a/tdesign-component/lib/src/components/picker/td_date_picker.dart
+++ b/tdesign-component/lib/src/components/picker/td_date_picker.dart
@@ -297,6 +297,7 @@ class _TDDatePickerState extends State<TDDatePicker> {
                     if (useAll()) {
                       widget.model.refreshTimeDataInitialAndController(whichLine);
                     }
+
                     /// 使用动态高度，强制列表组件的state刷新，以展现更新的数据，详见下方链接
                     /// FIX:https://github.com/flutter/flutter/issues/22999
                     pickerHeight = pickerHeight - Random().nextDouble() / 100000000;
@@ -447,9 +448,16 @@ class DatePickerModel {
 
   void setInitialTime() {
     dateStart = List.generate(6, (index) => index < dateStart.length ? dateStart[index] : 0);
-    var startTime = DateTime(dateStart[0],dateStart[1],dateStart[2],dateStart[3],dateStart[4],dateStart[5]);
+    var startTime = DateTime(dateStart[0], dateStart[1], dateStart[2], dateStart[3], dateStart[4], dateStart[5]);
     dateEnd = List.generate(6, (index) => index < dateEnd.length ? dateEnd[index] : 0);
-    var endTime = DateTime(dateEnd[0],dateEnd[1],dateEnd[2],dateEnd[3],dateEnd[4],dateEnd[5],);
+    var endTime = DateTime(
+      dateEnd[0],
+      dateEnd[1],
+      dateEnd[2],
+      dateEnd[3],
+      dateEnd[4],
+      dateEnd[5],
+    );
     if (dateInitial != null) {
       var initList = List.generate(6, (index) => index < dateInitial!.length ? dateInitial![index] : 0);
       initialTime = DateTime(initList[0], initList[1], initList[2], initList[3], initList[4], initList[5]);
@@ -584,6 +592,7 @@ class DatePickerModel {
     /// 在刷新日数据时，年月数据已经是最新的
     var selectedYear = yearIndex + data[0][0];
     var selectedMonth = monthIndex + data[1][0];
+    int selectHour = dateStart[3];
     if (dateEnd[0] == dateStart[0] && dateEnd[1] == dateStart[1]) {
       data[2] = List.generate(dateEnd[2] - dateStart[2] + 1, (index) => index + dateStart[2]);
     } else if (selectedYear == dateStart[0] && selectedMonth == dateStart[1]) {
@@ -607,48 +616,46 @@ class DatePickerModel {
     var selectedYear = yearIndex + data[0][0];
     var selectedMonth = monthIndex + data[1][0];
     var selectDay = dayIndex + data[2][0];
-    if (selectedYear == dateStart[0] && selectedMonth == dateStart[1] && selectDay == dateStart[2]) {
-      if (wheel <= 2) {
-        refreshHourData();
-        refreshMinuteData();
-        refreshSecondData();
-        return;
-      }
-      if (wheel == 4) {
-        refreshMinuteData();
-        refreshSecondData();
-        return;
-      }
-      refreshSecondData();
+    if (wheel <= 2) {
+      refreshHourData(selectedYear:selectedYear,selectedMonth: selectedMonth,selectDay: selectDay);
+      refreshMinuteData(selectedYear:selectedYear,selectedMonth: selectedMonth,selectDay: selectDay);
     } else {
-      data[4] = List.generate(24, (index) => index);
-      data[5] = List.generate(60, (index) => index);
-      data[6] = List.generate(60, (index) => index);
+      refreshMinuteData(selectedYear:selectedYear,selectedMonth: selectedMonth,selectDay: selectDay);
     }
+    refreshSecondData();
   }
 
-  void refreshHourData() {
-    var selectDay = dayIndex + data[2][0];
-    int hour = selectDay == dateStart[2] ? dateStart[3] : 0;
-    data[4] = List.generate(24 - hour, (index) => index + hour);
-    hourFixedExtentScrollController.jumpToItem(hour > 0 ? 0 : hourIndex);
+  void refreshHourData({required int selectedYear,required int selectedMonth,required int selectDay}) {
+      int selectHour = selectDay == data[2][0] ? 0 : hourIndex;
+    if (selectedYear == dateStart[0] && selectedMonth == dateStart[1] && selectDay == dateStart[2]) {
+      data[4] = List.generate(24 - (dateStart[3]), (index) => index + dateStart[3]);
+    } else if (selectedYear == dateEnd[0] && selectedMonth == dateEnd[1] && selectDay == dateEnd[2]) {
+      data[4] = dateEnd[3] >= dateStart[3] ?  List.generate(dateEnd[3] + 1, (index) => index) : List.generate(24-dateStart[3], (index) => index);
+    } else {
+      data[4] = List.generate(24, (index) => index);
+    }
+    hourFixedExtentScrollController.jumpToItem(selectHour > 0 ? hourIndex : 0);
   }
 
-  void refreshMinuteData() {
-    var selectDay = dayIndex + data[2][0];
-    var selectHour = hourIndex + data[4][0];
-    int minute = selectDay == dateStart[2] ?selectHour>dateStart[3]?0:dateStart[4] : 0;
-    data[5] = List.generate(60 - minute, (index) => index + minute);
-    minuteFixedExtentScrollController.jumpToItem(minute > 0 ? 0 : minute);
+  void refreshMinuteData({required int selectedYear,required int selectedMonth,required int selectDay}) {
+    int selectHour = hourIndex + data[4][0];
+    if (selectedYear == dateStart[0] &&
+        selectedMonth == dateStart[1] &&
+        selectDay == dateStart[2] &&
+        selectHour == dateStart[3]) {
+      data[5] = List.generate(60 - (dateStart[4]), (index) => index + dateStart[4]);
+    } else if (selectedYear == dateEnd[0] &&
+        selectedMonth == dateEnd[1] &&
+        selectDay == dateEnd[2] &&
+        selectHour == dateEnd[3]) {
+      data[5] = dateEnd[4] >= dateStart[4] ? List.generate(dateEnd[4] + 1, (index) => index):List.generate(60 - (dateStart[4]), (index) => index);
+    } else {
+      data[5] = List.generate(60, (index) => index);
+    }
   }
 
   void refreshSecondData() {
-    var selectDay = dayIndex + data[2][0];
-    var selectHour = hourIndex + data[4][0];
-    var selectMinute = minuteIndex + data[5][0];
-    int second = selectDay == dateStart[2] ?selectHour>dateStart[3]||selectMinute>dateStart[4]?0:dateStart[5]: 0;
-    data[6] = List.generate(60 - second, (index) => index + second);
-    secondFixedExtentScrollController.jumpToItem(second > 0 ? 0 : second);
+    data[6] = List.generate(60, (index) => index);
   }
 
   Map<String, int> getSelectedMap() {
diff --git a/tdesign-component/lib/src/components/picker/td_picker.dart b/tdesign-component/lib/src/components/picker/td_picker.dart
index 08f6ed75c..5210fce0d 100644
--- a/tdesign-component/lib/src/components/picker/td_picker.dart
+++ b/tdesign-component/lib/src/components/picker/td_picker.dart
@@ -35,6 +35,7 @@ class TDPicker {
         context: context,
         backgroundColor: Colors.transparent,
         barrierColor: barrierColor ?? TDTheme.of(context).fontGyColor2.withOpacity(0.6),
+        enableDrag:false,
         builder: (context) {
           return TDDatePicker(
               title: title,

From 0071191dc3a846703fc022676b7e7bcedcd1b3b5 Mon Sep 17 00:00:00 2001
From: v_szheshi <v_szheshi@tencent.com>
Date: Fri, 27 Sep 2024 17:19:28 +0800
Subject: [PATCH 62/74] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E8=BE=93=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/dialog/td_input_dialog.dart    | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/tdesign-component/lib/src/components/dialog/td_input_dialog.dart b/tdesign-component/lib/src/components/dialog/td_input_dialog.dart
index 6bad33094..b790e55c3 100644
--- a/tdesign-component/lib/src/components/dialog/td_input_dialog.dart
+++ b/tdesign-component/lib/src/components/dialog/td_input_dialog.dart
@@ -27,6 +27,7 @@ class TDInputDialog extends StatelessWidget {
     this.leftBtn,
     this.rightBtn,
     this.showCloseButton,
+    this.customInputWidget,
   })  : assert((title != null || content != null)),
         super(key: key);
 
@@ -69,6 +70,8 @@ class TDInputDialog extends StatelessWidget {
   /// 显示右上角关闭按钮
   final bool? showCloseButton;
 
+  /// 自定义输入框
+  final Widget? customInputWidget;
   @override
   Widget build(BuildContext context) {
     return TDDialogScaffold(
@@ -88,26 +91,25 @@ class TDInputDialog extends StatelessWidget {
             content: content,
             contentColor: contentColor,
           ),
-          Container(
-            height: 48,
-            margin: const EdgeInsets.fromLTRB(24, 16, 24, 24),
-            decoration: BoxDecoration(
+          SizedBox(
+            child: customInputWidget!=null?customInputWidget!:Container(
               color: Colors.white,
-              borderRadius: BorderRadius.all(Radius.circular(radius)),
-            ),
-            child: TextField(
-              controller: textEditingController,
-              autofocus: true,
-              decoration: InputDecoration(
-                contentPadding: const EdgeInsets.fromLTRB(16, 0, 16, 0),
-                border: OutlineInputBorder(
-                    borderRadius: BorderRadius.circular(6),
-                    borderSide: BorderSide.none),
-                hintText: hintText,
-                hintStyle: const TextStyle(color: Color(0x66000000)),
-                fillColor: const Color(0xFFF3F3F3),
-                filled: true,
-                // labelText: '左上角',
+              height: 48,
+              margin: const EdgeInsets.fromLTRB(24, 16, 24, 24),
+              child: TextField(
+                controller: textEditingController,
+                autofocus: true,
+                decoration: InputDecoration(
+                  contentPadding: const EdgeInsets.fromLTRB(16, 0, 16, 0),
+                  border: OutlineInputBorder(
+                      borderRadius: BorderRadius.circular(6),
+                      borderSide: BorderSide.none),
+                  hintText: hintText,
+                  hintStyle: const TextStyle(color: Color(0x66000000)),
+                  fillColor: const Color(0xFFF3F3F3),
+                  filled: true,
+                  // labelText: '左上角',
+                ),
               ),
             ),
           ),

From 53fa4d4747042d9166599dc9e56fffcf8d5fc0e2 Mon Sep 17 00:00:00 2001
From: v_szheshi <v_szheshi@tencent.com>
Date: Sun, 29 Sep 2024 15:31:20 +0800
Subject: [PATCH 63/74] =?UTF-8?q?=E6=96=B0=E5=A2=9Ebutton=20icon=20?=
 =?UTF-8?q?=E4=B8=8E=E6=96=87=E6=9C=AC=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/src/components/button/td_button.dart           | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tdesign-component/lib/src/components/button/td_button.dart b/tdesign-component/lib/src/components/button/td_button.dart
index db4070f6f..fc4c2f20a 100644
--- a/tdesign-component/lib/src/components/button/td_button.dart
+++ b/tdesign-component/lib/src/components/button/td_button.dart
@@ -36,6 +36,7 @@ class TDButton extends StatefulWidget {
       this.onTap,
       this.icon,
       this.iconWidget,
+      this.iconTextSpacing,
       this.onLongPress,
       this.margin,
       this.padding})
@@ -95,6 +96,9 @@ class TDButton extends StatefulWidget {
   /// 自定义图标icon控件
   final Widget? iconWidget;
 
+ /// 自定义图标与文本之间距离
+  final double? iconTextSpacing;
+
   /// 自定义padding
   final EdgeInsetsGeometry? padding;
 
@@ -187,7 +191,7 @@ class _TDButtonState extends State<TDButton> {
       },
       onTapUp: (TapUpDetails details) {
         Future.delayed(const Duration(milliseconds: 100), () {
-          if (mounted&&!widget.disabled) {
+          if (mounted && !widget.disabled) {
             setState(() {
               _buttonStatus = TDButtonStatus.defaultState;
             });
@@ -239,8 +243,8 @@ class _TDButtonState extends State<TDButton> {
     if (children.length == 2) {
       children.insert(
         1,
-        const SizedBox(
-          width: 8,
+        SizedBox(
+          width:widget.iconTextSpacing??8,
         ),
       );
     }

From 9fc0223ba3a1a286b217b290cf6f431bf1e43307 Mon Sep 17 00:00:00 2001
From: v_szheshi <v_szheshi@tencent.com>
Date: Wed, 9 Oct 2024 14:42:41 +0800
Subject: [PATCH 64/74] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=89=E6=A0=87?=
 =?UTF-8?q?=E9=AB=98=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/src/components/search/td_search_bar.dart           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tdesign-component/lib/src/components/search/td_search_bar.dart b/tdesign-component/lib/src/components/search/td_search_bar.dart
index 3b8e6b6ef..3dbf9ca16 100644
--- a/tdesign-component/lib/src/components/search/td_search_bar.dart
+++ b/tdesign-component/lib/src/components/search/td_search_bar.dart
@@ -35,6 +35,7 @@ class TDSearchBar extends StatefulWidget {
     this.padding = const EdgeInsets.fromLTRB(16, 8, 16, 8),
     this.autoFocus = false,
     this.mediumStyle = false,
+    this.cursorHeight,
     this.needCancel = false,
     this.controller,
     this.backgroundColor = Colors.white,
@@ -66,6 +67,10 @@ class TDSearchBar extends StatefulWidget {
   /// 是否在导航栏中的样式
   final bool mediumStyle;
 
+  /// 光标的高
+  final double? cursorHeight;
+
+
   /// 是否需要取消按钮
   final bool needCancel;
 
@@ -231,7 +236,7 @@ class _TDSearchBarState extends State<TDSearchBar>
                           autofocus: widget.autoFocus,
                           cursorColor: TDTheme.of(context).brandNormalColor,
                           cursorWidth: 1,
-                          cursorHeight: widget.mediumStyle ? 16 : 18,
+                          cursorHeight:widget.cursorHeight ??(widget.mediumStyle ? 16 : 18),
                           textAlign: widget.alignment == TDSearchAlignment.center
                               ? TextAlign.center
                               : TextAlign.left,

From 265c9a6ccb9b5fbadb40b6b949cbd3d36cb3a981 Mon Sep 17 00:00:00 2001
From: zflyluo <zflyluo@tencent.com>
Date: Wed, 9 Oct 2024 21:54:16 +0800
Subject: [PATCH 65/74] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E7=A7=92=E7=BA=A7=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/td_date_picker_page.dart |  4 ++--
 .../src/components/picker/td_date_picker.dart | 24 +++++++++++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/tdesign-component/example/lib/page/td_date_picker_page.dart b/tdesign-component/example/lib/page/td_date_picker_page.dart
index df595e2b8..63f655729 100644
--- a/tdesign-component/example/lib/page/td_date_picker_page.dart
+++ b/tdesign-component/example/lib/page/td_date_picker_page.dart
@@ -300,8 +300,8 @@ class _TDDatePickerPageState extends State<TDDatePickerPage> {
             useHour: true,
             useMinute: true,
             useSecond: true,
-            dateStart: [2012,1, 15,12,28],
-            dateEnd: [2012, 6, 15,12,48],
+            dateStart: [2012,1, 15,12,28,11],
+            dateEnd: [2012, 6, 15,12,48,32],
             initialDate: [2012, 1, 15,13,20]);
       },
       child: buildSelectRow(context, selected_5, '选择时间'),
diff --git a/tdesign-component/lib/src/components/picker/td_date_picker.dart b/tdesign-component/lib/src/components/picker/td_date_picker.dart
index 4a80bac4c..bce76de8e 100644
--- a/tdesign-component/lib/src/components/picker/td_date_picker.dart
+++ b/tdesign-component/lib/src/components/picker/td_date_picker.dart
@@ -271,7 +271,7 @@ class _TDDatePickerState extends State<TDDatePicker> {
               controller: widget.model.controllers[whichLine],
               physics: whichLine == 3 ? const NeverScrollableScrollPhysics() : const FixedExtentScrollPhysics(),
               onSelectedItemChanged: (index) {
-                if (whichLine == 0 || whichLine == 1 || whichLine == 2 || whichLine == 4 || whichLine == 5) {
+                if (whichLine == 0 || whichLine == 1 || whichLine == 2 || whichLine == 4 || whichLine == 5 || whichLine == 6) {
                   // 年月的改变会引起日的改变, 年的改变会引起月的改变
                   setState(() {
                     switch (whichLine) {
@@ -622,7 +622,7 @@ class DatePickerModel {
     } else {
       refreshMinuteData(selectedYear:selectedYear,selectedMonth: selectedMonth,selectDay: selectDay);
     }
-    refreshSecondData();
+    refreshSecondData(selectedYear:selectedYear,selectedMonth: selectedMonth,selectDay: selectDay);
   }
 
   void refreshHourData({required int selectedYear,required int selectedMonth,required int selectDay}) {
@@ -654,8 +654,24 @@ class DatePickerModel {
     }
   }
 
-  void refreshSecondData() {
-    data[6] = List.generate(60, (index) => index);
+  void refreshSecondData({required int selectedYear,required int selectedMonth,required int selectDay}) {
+    var selectHour = hourIndex + data[4][0];
+    var selectMinute = minuteIndex + data[5][0];
+    if (selectedYear == dateStart[0] &&
+        selectedMonth == dateStart[1] &&
+        selectDay == dateStart[2] &&
+        selectHour == dateStart[3] &&
+        selectMinute == dateStart[4]) {
+      data[6] = List.generate(60 - (dateStart[5]), (index) => index + dateStart[5]);
+    } else if (selectedYear == dateEnd[0] &&
+        selectedMonth == dateEnd[1] &&
+        selectDay == dateEnd[2] &&
+        selectHour == dateEnd[3] &&
+        selectMinute == dateEnd[4]) {
+      data[6] = dateEnd[5] >= dateStart[5] ? List.generate(dateEnd[5] + 1, (index) => index):List.generate(60 - (dateStart[5]), (index) => index);
+    } else {
+      data[6] = List.generate(60, (index) => index);
+    }
   }
 
   Map<String, int> getSelectedMap() {

From 6cd61c8d5a8aaf1860f6b3de20e50327ba3d2aab Mon Sep 17 00:00:00 2001
From: zflyluo <zflyluo@tencent.com>
Date: Wed, 9 Oct 2024 22:01:36 +0800
Subject: [PATCH 66/74] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/picker/td_date_picker.dart | 121 ++++++++++--------
 1 file changed, 70 insertions(+), 51 deletions(-)

diff --git a/tdesign-component/lib/src/components/picker/td_date_picker.dart b/tdesign-component/lib/src/components/picker/td_date_picker.dart
index 780d4cc2e..b0a9d9975 100644
--- a/tdesign-component/lib/src/components/picker/td_date_picker.dart
+++ b/tdesign-component/lib/src/components/picker/td_date_picker.dart
@@ -10,31 +10,30 @@ typedef DatePickerCallback = void Function(Map<String, int> selected);
 
 /// 时间选择器
 class TDDatePicker extends StatefulWidget {
-
   const TDDatePicker(
       {required this.title,
-        required this.onConfirm,
-        this.rightText,
-        this.leftText,
-        this.onCancel,
-        this.backgroundColor,
-        this.titleDividerColor,
-        this.topRadius,
-        this.titleHeight,
-        this.padding,
-        this.leftPadding,
-        this.rightPadding,
-        this.leftTextStyle,
-        this.rightTextStyle,
-        this.centerTextStyle,
-        this.customSelectWidget,
-        this.itemDistanceCalculator,
-        required this.model,
-        this.showTitle = true,
-        this.pickerHeight = 200,
-        required this.pickerItemCount,
-        this.onSelectedItemChanged,
-        Key? key})
+      required this.onConfirm,
+      this.rightText,
+      this.leftText,
+      this.onCancel,
+      this.backgroundColor,
+      this.titleDividerColor,
+      this.topRadius,
+      this.titleHeight,
+      this.padding,
+      this.leftPadding,
+      this.rightPadding,
+      this.leftTextStyle,
+      this.rightTextStyle,
+      this.centerTextStyle,
+      this.customSelectWidget,
+      this.itemDistanceCalculator,
+      required this.model,
+      this.showTitle = true,
+      this.pickerHeight = 200,
+      required this.pickerItemCount,
+      this.onSelectedItemChanged,
+      Key? key})
       : super(key: key);
 
   /// 选择器标题
@@ -282,7 +281,12 @@ class _TDDatePickerState extends State<TDDatePicker> {
               controller: widget.model.controllers[whichLine],
               physics: whichLine == 3 ? const NeverScrollableScrollPhysics() : const FixedExtentScrollPhysics(),
               onSelectedItemChanged: (index) {
-                if (whichLine == 0 || whichLine == 1 || whichLine == 2 || whichLine == 4 || whichLine == 5 || whichLine == 6) {
+                if (whichLine == 0 ||
+                    whichLine == 1 ||
+                    whichLine == 2 ||
+                    whichLine == 4 ||
+                    whichLine == 5 ||
+                    whichLine == 6) {
                   // 年月的改变会引起日的改变, 年的改变会引起月的改变
                   setState(() {
                     switch (whichLine) {
@@ -341,13 +345,13 @@ class _TDDatePickerState extends State<TDDatePicker> {
     return Container(
       padding: EdgeInsets.only(left: widget.leftPadding ?? 16, right: widget.rightPadding ?? 16),
       decoration: BoxDecoration(
-        border: Border(
-          bottom: BorderSide(
-            width: 1,
-            color: widget.titleDividerColor ?? Colors.transparent,
-          ),
-        )
-      ),
+          border: Border(
+        bottom: BorderSide(
+          width: 1,
+          color: widget.titleDividerColor ?? Colors.transparent,
+        ),
+      )),
+
       /// 减去分割线的空间
       height: getTitleHeight() - 0.5,
       child: Row(
@@ -584,21 +588,27 @@ class DatePickerModel {
     weekDayIndex = weekDayFixedExtentScrollController.selectedItem;
   }
 
+  void _hourDayListener() {
+    hourIndex = hourFixedExtentScrollController.selectedItem;
+  }
+
+  void _minuteDayListener() {
+    minuteIndex = minuteFixedExtentScrollController.selectedItem;
+  }
+
+  void _secondDayListener() {
+    secondIndex = secondFixedExtentScrollController.selectedItem;
+  }
+
   void addListener() {
     /// 给年月日加上监控
     yearFixedExtentScrollController.addListener(_yearListener);
     monthFixedExtentScrollController.addListener(_monthListener);
     dayFixedExtentScrollController.addListener(_dayListener);
     weekDayFixedExtentScrollController.addListener(_weekDayListener);
-    hourFixedExtentScrollController.addListener(() {
-      hourIndex = hourFixedExtentScrollController.selectedItem;
-    });
-    minuteFixedExtentScrollController.addListener(() {
-      minuteIndex = minuteFixedExtentScrollController.selectedItem;
-    });
-    secondFixedExtentScrollController.addListener(() {
-      secondIndex = secondFixedExtentScrollController.selectedItem;
-    });
+    hourFixedExtentScrollController.addListener(_hourDayListener);
+    minuteFixedExtentScrollController.addListener(_minuteDayListener);
+    secondFixedExtentScrollController.addListener(_secondDayListener);
   }
 
   void removeListener() {
@@ -607,6 +617,9 @@ class DatePickerModel {
     monthFixedExtentScrollController.removeListener(_monthListener);
     dayFixedExtentScrollController.removeListener(_dayListener);
     weekDayFixedExtentScrollController.removeListener(_weekDayListener);
+    hourFixedExtentScrollController.removeListener(_hourDayListener);
+    minuteFixedExtentScrollController.removeListener(_minuteDayListener);
+    secondFixedExtentScrollController.removeListener(_secondDayListener);
   }
 
   void refreshMonthDataAndController() {
@@ -652,27 +665,29 @@ class DatePickerModel {
     var selectedMonth = monthIndex + data[1][0];
     var selectDay = dayIndex + data[2][0];
     if (wheel <= 2) {
-      refreshHourData(selectedYear:selectedYear,selectedMonth: selectedMonth,selectDay: selectDay);
-      refreshMinuteData(selectedYear:selectedYear,selectedMonth: selectedMonth,selectDay: selectDay);
+      refreshHourData(selectedYear: selectedYear, selectedMonth: selectedMonth, selectDay: selectDay);
+      refreshMinuteData(selectedYear: selectedYear, selectedMonth: selectedMonth, selectDay: selectDay);
     } else {
-      refreshMinuteData(selectedYear:selectedYear,selectedMonth: selectedMonth,selectDay: selectDay);
+      refreshMinuteData(selectedYear: selectedYear, selectedMonth: selectedMonth, selectDay: selectDay);
     }
-    refreshSecondData(selectedYear:selectedYear,selectedMonth: selectedMonth,selectDay: selectDay);
+    refreshSecondData(selectedYear: selectedYear, selectedMonth: selectedMonth, selectDay: selectDay);
   }
 
-  void refreshHourData({required int selectedYear,required int selectedMonth,required int selectDay}) {
-      int selectHour = selectDay == data[2][0] ? 0 : hourIndex;
+  void refreshHourData({required int selectedYear, required int selectedMonth, required int selectDay}) {
+    int selectHour = selectDay == data[2][0] ? 0 : hourIndex;
     if (selectedYear == dateStart[0] && selectedMonth == dateStart[1] && selectDay == dateStart[2]) {
       data[4] = List.generate(24 - (dateStart[3]), (index) => index + dateStart[3]);
     } else if (selectedYear == dateEnd[0] && selectedMonth == dateEnd[1] && selectDay == dateEnd[2]) {
-      data[4] = dateEnd[3] >= dateStart[3] ?  List.generate(dateEnd[3] + 1, (index) => index) : List.generate(24-dateStart[3], (index) => index);
+      data[4] = dateEnd[3] >= dateStart[3]
+          ? List.generate(dateEnd[3] + 1, (index) => index)
+          : List.generate(24 - dateStart[3], (index) => index);
     } else {
       data[4] = List.generate(24, (index) => index);
     }
     hourFixedExtentScrollController.jumpToItem(selectHour > 0 ? hourIndex : 0);
   }
 
-  void refreshMinuteData({required int selectedYear,required int selectedMonth,required int selectDay}) {
+  void refreshMinuteData({required int selectedYear, required int selectedMonth, required int selectDay}) {
     int selectHour = hourIndex + data[4][0];
     if (selectedYear == dateStart[0] &&
         selectedMonth == dateStart[1] &&
@@ -683,13 +698,15 @@ class DatePickerModel {
         selectedMonth == dateEnd[1] &&
         selectDay == dateEnd[2] &&
         selectHour == dateEnd[3]) {
-      data[5] = dateEnd[4] >= dateStart[4] ? List.generate(dateEnd[4] + 1, (index) => index):List.generate(60 - (dateStart[4]), (index) => index);
+      data[5] = dateEnd[4] >= dateStart[4]
+          ? List.generate(dateEnd[4] + 1, (index) => index)
+          : List.generate(60 - (dateStart[4]), (index) => index);
     } else {
       data[5] = List.generate(60, (index) => index);
     }
   }
 
-  void refreshSecondData({required int selectedYear,required int selectedMonth,required int selectDay}) {
+  void refreshSecondData({required int selectedYear, required int selectedMonth, required int selectDay}) {
     var selectHour = hourIndex + data[4][0];
     var selectMinute = minuteIndex + data[5][0];
     if (selectedYear == dateStart[0] &&
@@ -703,7 +720,9 @@ class DatePickerModel {
         selectDay == dateEnd[2] &&
         selectHour == dateEnd[3] &&
         selectMinute == dateEnd[4]) {
-      data[6] = dateEnd[5] >= dateStart[5] ? List.generate(dateEnd[5] + 1, (index) => index):List.generate(60 - (dateStart[5]), (index) => index);
+      data[6] = dateEnd[5] >= dateStart[5]
+          ? List.generate(dateEnd[5] + 1, (index) => index)
+          : List.generate(60 - (dateStart[5]), (index) => index);
     } else {
       data[6] = List.generate(60, (index) => index);
     }

From 1fee27cfb5fe8235d3f52048ffd97021ec87cc87 Mon Sep 17 00:00:00 2001
From: zflyluo <zflyluo@tencent.com>
Date: Wed, 9 Oct 2024 22:09:34 +0800
Subject: [PATCH 67/74] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/dialog/td_input_dialog.dart    | 57 ++++++++++---------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/tdesign-component/lib/src/components/dialog/td_input_dialog.dart b/tdesign-component/lib/src/components/dialog/td_input_dialog.dart
index e74fc3eda..0385506e6 100644
--- a/tdesign-component/lib/src/components/dialog/td_input_dialog.dart
+++ b/tdesign-component/lib/src/components/dialog/td_input_dialog.dart
@@ -80,17 +80,17 @@ class TDInputDialog extends StatelessWidget {
 
   /// 自定义输入框
   final Widget? customInputWidget;
+
   @override
   Widget build(BuildContext context) {
     return TDDialogScaffold(
       showCloseButton: showCloseButton,
-      backgroundColor:backgroundColor,
+      backgroundColor: backgroundColor,
       radius: radius,
       body: Material(
-        color:backgroundColor,
+        color: backgroundColor,
         borderRadius: BorderRadius.all(Radius.circular(radius)),
-        child: Column(
-            mainAxisSize: MainAxisSize.min, children: [
+        child: Column(mainAxisSize: MainAxisSize.min, children: [
           TDDialogInfoWidget(
             title: title,
             titleColor: titleColor,
@@ -101,26 +101,26 @@ class TDInputDialog extends StatelessWidget {
             padding: padding,
           ),
           SizedBox(
-            child: customInputWidget!=null?customInputWidget!:Container(
-              color: Colors.white,
-              height: 48,
-              margin: const EdgeInsets.fromLTRB(24, 16, 24, 24),
-              child: TextField(
-                controller: textEditingController,
-                autofocus: true,
-                decoration: InputDecoration(
-                  contentPadding: const EdgeInsets.fromLTRB(16, 0, 16, 0),
-                  border: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(6),
-                      borderSide: BorderSide.none),
-                  hintText: hintText,
-                  hintStyle: const TextStyle(color: Color(0x66000000)),
-                  fillColor: const Color(0xFFF3F3F3),
-                  filled: true,
-                  // labelText: '左上角',
-                ),
-              ),
-            ),
+            child: customInputWidget != null
+                ? customInputWidget!
+                : Container(
+                    color: Colors.white,
+                    height: 48,
+                    margin: const EdgeInsets.fromLTRB(24, 16, 24, 24),
+                    child: TextField(
+                      controller: textEditingController,
+                      autofocus: true,
+                      decoration: InputDecoration(
+                        contentPadding: const EdgeInsets.fromLTRB(16, 0, 16, 0),
+                        border: OutlineInputBorder(borderRadius: BorderRadius.circular(6), borderSide: BorderSide.none),
+                        hintText: hintText,
+                        hintStyle: const TextStyle(color: Color(0x66000000)),
+                        fillColor: const Color(0xFFF3F3F3),
+                        filled: true,
+                        // labelText: '左上角',
+                      ),
+                    ),
+                  ),
           ),
           _horizontalButtons(context),
         ]),
@@ -129,11 +129,16 @@ class TDInputDialog extends StatelessWidget {
   }
 
   Widget _horizontalButtons(BuildContext context) {
-    if(buttonWidget != null) {
+    if (buttonWidget != null) {
       return buttonWidget!;
     }
     final left = leftBtn ??
-        TDDialogButtonOptions(title: context.resource.cancel, titleColor: const Color(0xE6000000), fontWeight: FontWeight.normal, action: null, height: 56);
+        TDDialogButtonOptions(
+            title: context.resource.cancel,
+            titleColor: const Color(0xE6000000),
+            fontWeight: FontWeight.normal,
+            action: null,
+            height: 56);
     final right = rightBtn ??
         TDDialogButtonOptions(title: context.resource.confirm, action: null, fontWeight: FontWeight.w600, height: 56);
     return HorizontalTextButtons(

From 58bbcf2dd44c7af216b35ee05fd6d21ac66663f1 Mon Sep 17 00:00:00 2001
From: Luozf12345 <2515187986@qq.com>
Date: Wed, 9 Oct 2024 22:23:59 +0800
Subject: [PATCH 68/74] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdesign-component/example/lib/page/td_search_bar_page.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tdesign-component/example/lib/page/td_search_bar_page.dart b/tdesign-component/example/lib/page/td_search_bar_page.dart
index 85cba87b0..a6c7d23ab 100644
--- a/tdesign-component/example/lib/page/td_search_bar_page.dart
+++ b/tdesign-component/example/lib/page/td_search_bar_page.dart
@@ -160,7 +160,7 @@ class _TDSearchBarPageState extends State<TDSearchBarPage> {
       action: '搜索',
       needCancel: true,
       controller: inputController,
-      onActionClick: () {
+      onActionClick: (value) {
         showGeneralDialog(
           context: context,
           pageBuilder: (BuildContext buildContext, Animation<double> animation,

From cdbd1356be7cf2f8a1521d169faf2a319dc0e9be Mon Sep 17 00:00:00 2001
From: Luozf12345 <2515187986@qq.com>
Date: Thu, 10 Oct 2024 20:07:41 +0800
Subject: [PATCH 69/74] =?UTF-8?q?=E4=BF=AE=E5=A4=8DLoading=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=90=8E=E7=AB=8B=E5=8D=B3dismiss=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/src/components/loading/td_loading_controller.dart       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tdesign-component/lib/src/components/loading/td_loading_controller.dart b/tdesign-component/lib/src/components/loading/td_loading_controller.dart
index 0bfa665df..1a0c79e41 100644
--- a/tdesign-component/lib/src/components/loading/td_loading_controller.dart
+++ b/tdesign-component/lib/src/components/loading/td_loading_controller.dart
@@ -55,7 +55,7 @@ class TDLoadingController {
   // 消失
   static void dismiss() {
     if (_isShowing) {
-     if (_overlayEntry != null && _overlayEntry!.mounted) {
+     if (_overlayEntry != null) {
        _overlayEntry?.remove();
        _overlayEntry = null;
      }

From 5438326d0ff94cf20d90a006320b1d3a420cbbd1 Mon Sep 17 00:00:00 2001
From: Luozf12345 <2515187986@qq.com>
Date: Thu, 10 Oct 2024 20:36:45 +0800
Subject: [PATCH 70/74] =?UTF-8?q?[TDNavBar]=E6=B7=BB=E5=8A=A0flexibleSpace?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/src/components/navbar/td_nav_bar.dart | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/tdesign-component/lib/src/components/navbar/td_nav_bar.dart b/tdesign-component/lib/src/components/navbar/td_nav_bar.dart
index 40d266b61..a52edbf88 100644
--- a/tdesign-component/lib/src/components/navbar/td_nav_bar.dart
+++ b/tdesign-component/lib/src/components/navbar/td_nav_bar.dart
@@ -28,6 +28,7 @@ class TDNavBar extends StatefulWidget implements PreferredSizeWidget {
     this.border,
     this.belowTitleWidget,
     this.boxShadow,
+    this.flexibleSpace,
   }) : super(key: key);
 
   /// 左边操作项
@@ -81,6 +82,9 @@ class TDNavBar extends StatefulWidget implements PreferredSizeWidget {
   /// 底部阴影
   final List<BoxShadow>? boxShadow;
 
+  /// 固定背景
+  final Widget? flexibleSpace;
+
   @override
   State<StatefulWidget> createState() => _TDNavBarState();
 
@@ -223,16 +227,26 @@ class _TDNavBarState extends State<TDNavBar> {
           horizontal: TDTheme.of(context).spacer16,
           vertical: TDTheme.of(context).spacer4,
         );
-
-    return Container(
-      height: widget.height + paddingTop,
-      padding: padding.add(EdgeInsets.only(top: paddingTop)),
-      decoration: BoxDecoration(
-        color: bcc,
-        boxShadow: widget.boxShadow,
-      ),
-      child: _getNavbarChild()
+    Widget appBar = Container(
+        height: widget.height + paddingTop,
+        padding: padding.add(EdgeInsets.only(top: paddingTop)),
+        decoration: BoxDecoration(
+          color: bcc,
+          boxShadow: widget.boxShadow,
+        ),
+        child: _getNavbarChild()
     );
+    if (widget.flexibleSpace != null) {
+      appBar = Stack(
+        fit: StackFit.passthrough,
+        children: <Widget>[
+          widget.flexibleSpace!,
+          appBar,
+        ],
+      );
+    }
+
+    return appBar;
   }
 }
 

From 029438f4168a90273a579ad5c9dc7cd18a6921df Mon Sep 17 00:00:00 2001
From: Luozf12345 <2515187986@qq.com>
Date: Thu, 10 Oct 2024 21:17:24 +0800
Subject: [PATCH 71/74] =?UTF-8?q?[TDSearch]=E6=B7=BB=E5=8A=A0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A1=86=E7=84=A6=E7=82=B9=E8=8E=B7=E5=8F=96=E5=8F=8A?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/search/td_search_bar.dart  | 44 ++++++++++++++-----
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/tdesign-component/lib/src/components/search/td_search_bar.dart b/tdesign-component/lib/src/components/search/td_search_bar.dart
index 19dbee248..b9982ea09 100644
--- a/tdesign-component/lib/src/components/search/td_search_bar.dart
+++ b/tdesign-component/lib/src/components/search/td_search_bar.dart
@@ -20,6 +20,7 @@ enum TDSearchAlignment {
 }
 
 typedef TDSearchBarEvent = void Function(String value);
+typedef TDSearchBarClearEvent = bool Function(String value);
 typedef TDSearchBarCallBack = void Function();
 
 class TDSearchBar extends StatefulWidget {
@@ -41,6 +42,8 @@ class TDSearchBar extends StatefulWidget {
     this.backgroundColor = Colors.white,
     this.action = '',
     this.onActionClick,
+    this.onClearClick,
+    this.focusNode,
   }) : super(key: key);
 
   /// 预设文案
@@ -92,6 +95,12 @@ class TDSearchBar extends StatefulWidget {
   /// 自定义操作回调
   final TDSearchBarEvent? onActionClick;
 
+  /// 自定义操作回调
+  final TDSearchBarClearEvent? onClearClick;
+
+  /// 自定义焦点
+  final  FocusNode? focusNode;
+
   @override
   State<StatefulWidget> createState() => _TDSearchBarState();
 }
@@ -105,7 +114,7 @@ enum _TDSearchBarStatus {
 
 class _TDSearchBarState extends State<TDSearchBar>
     with TickerProviderStateMixin {
-  final FocusNode focusNode = FocusNode();
+  late FocusNode focusNode = FocusNode();
   final TextEditingController controller = TextEditingController();
   final GlobalKey _textFieldKey = GlobalKey();
   final GlobalKey _phKey = GlobalKey();
@@ -118,9 +127,6 @@ class _TDSearchBarState extends State<TDSearchBar>
   @override
   void initState() {
     super.initState();
-    _status = widget.autoFocus
-        ? _TDSearchBarStatus.focused
-        : _TDSearchBarStatus.unFocus;
     if(widget.controller==null){
       controller.addListener(() {
         var clearVisible = controller.text.isNotEmpty;
@@ -132,6 +138,16 @@ class _TDSearchBarState extends State<TDSearchBar>
         _updateClearBtnVisible(clearVisible!);
       });
     }
+    _animationController = AnimationController(
+        duration: const Duration(milliseconds: 200), vsync: this);
+    _updateFocusNode();
+  }
+
+  void _updateFocusNode() {
+    focusNode = widget.focusNode ?? focusNode;
+    _status = widget.autoFocus
+        ? _TDSearchBarStatus.focused
+        : _TDSearchBarStatus.unFocus;
     focusNode.addListener(() {
       setState(() {
         _status = focusNode.hasFocus
@@ -140,8 +156,6 @@ class _TDSearchBarState extends State<TDSearchBar>
       });
       _updateCancelBtnVisible(focusNode.hasFocus);
     });
-    _animationController = AnimationController(
-        duration: const Duration(milliseconds: 200), vsync: this);
     _animationController.addStatusListener((status) {
       if (status == AnimationStatus.completed) {
         setState(() {
@@ -156,6 +170,12 @@ class _TDSearchBarState extends State<TDSearchBar>
     });
   }
 
+  @override
+  void didUpdateWidget(covariant TDSearchBar oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    _updateFocusNode();
+  }
+
   void _updateClearBtnVisible(bool visible) {
     setState(() {
       clearBtnHide = !visible;
@@ -169,10 +189,13 @@ class _TDSearchBarState extends State<TDSearchBar>
   }
 
   void _cleanInputText(){
-    if(widget.controller==null){
-      controller.clear();
-    }else{
-      widget.controller?.clear();
+    if(!(widget.onClearClick?.call(controller.text) ?? false)){
+      // 如果外部没处理,则走默认清除逻辑
+      if(widget.controller==null){
+        controller.clear();
+      }else{
+        widget.controller?.clear();
+      }
     }
   }
 
@@ -243,6 +266,7 @@ class _TDSearchBarState extends State<TDSearchBar>
                           focusNode: focusNode,
                           onChanged: widget.onTextChanged,
                           onSubmitted: widget.onSubmitted,
+                          onEditingComplete: widget.onEditComplete,
                           style: TextStyle(
                               fontSize: getSize(context)?.size,
                               color: TDTheme.of(context).fontGyColor1),

From 234fe578edfcfa3643a648764aea0f850af6580f Mon Sep 17 00:00:00 2001
From: ccXxx1aoBai <1426169428@qq.com>
Date: Fri, 11 Oct 2024 10:24:01 +0800
Subject: [PATCH 72/74] =?UTF-8?q?SideBar=E5=BB=B6=E8=BF=9F=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=AF=BC=E8=87=B4=E7=9E=84=E7=82=B9=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/lib/page/sidebar/td_sidebar_page_anchor.dart | 1 +
 .../lib/page/sidebar/td_sidebar_page_loading.dart        | 9 +++++++--
 .../lib/src/components/sidebar/td_sidebar.dart           | 1 +
 .../src/components/sidebar/td_sidebar_controller.dart    | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/tdesign-component/example/lib/page/sidebar/td_sidebar_page_anchor.dart b/tdesign-component/example/lib/page/sidebar/td_sidebar_page_anchor.dart
index 01476f082..8aeb78f48 100644
--- a/tdesign-component/example/lib/page/sidebar/td_sidebar_page_anchor.dart
+++ b/tdesign-component/example/lib/page/sidebar/td_sidebar_page_anchor.dart
@@ -107,6 +107,7 @@ class TDSideBarAnchorPageState extends State<TDSideBarAnchorPage> {
     );
 
     var demoHeight = MediaQuery.of(context).size.height;
+    _sideBarController.init(list);
 
     return Row(
       children: [
diff --git a/tdesign-component/example/lib/page/sidebar/td_sidebar_page_loading.dart b/tdesign-component/example/lib/page/sidebar/td_sidebar_page_loading.dart
index 29d1a2032..8b48fc02b 100644
--- a/tdesign-component/example/lib/page/sidebar/td_sidebar_page_loading.dart
+++ b/tdesign-component/example/lib/page/sidebar/td_sidebar_page_loading.dart
@@ -40,6 +40,9 @@ class TDSideBarLoadingPageState extends State<TDSideBarLoadingPage> {
 
       if (currentValue != index) {
         setState(() {
+          if(_sideBarController.loading) {
+            _sideBarController.loading = false;
+          }
           _sideBarController.selectTo(index);
         });
       }
@@ -82,10 +85,12 @@ class TDSideBarLoadingPageState extends State<TDSideBarLoadingPage> {
         ));
   }
 
-  final list = <SideItemProps>[];
-  final pages = <Widget>[];
+  List<SideItemProps> list = <SideItemProps>[];
+  List<Widget> pages = <Widget>[];
 
   void _initData() {
+    list = [];
+    pages = [];
     for (var i = 0; i < 20; i++) {
       list.add(SideItemProps(
         index: i,
diff --git a/tdesign-component/lib/src/components/sidebar/td_sidebar.dart b/tdesign-component/lib/src/components/sidebar/td_sidebar.dart
index 2c714c62d..322d9316c 100644
--- a/tdesign-component/lib/src/components/sidebar/td_sidebar.dart
+++ b/tdesign-component/lib/src/components/sidebar/td_sidebar.dart
@@ -212,6 +212,7 @@ class _TDSideBarState extends State<TDSideBar> {
   @override
   Widget build(BuildContext context) {
     if(_loading) {
+      widget.controller?.loading = true;
       if(widget.loadingWidget != null) {
         return widget.loadingWidget!;
       }
diff --git a/tdesign-component/lib/src/components/sidebar/td_sidebar_controller.dart b/tdesign-component/lib/src/components/sidebar/td_sidebar_controller.dart
index 176fa5b53..637df4451 100644
--- a/tdesign-component/lib/src/components/sidebar/td_sidebar_controller.dart
+++ b/tdesign-component/lib/src/components/sidebar/td_sidebar_controller.dart
@@ -5,7 +5,7 @@ import '../../../tdesign_flutter.dart';
 class TDSideBarController extends ChangeNotifier {
   int currentValue = 0;
   List<SideItemProps> children = [];
-  bool _loading = true;
+  bool _loading = false;
 
   void selectTo(int value) {
     currentValue = value;

From 9788521c39755e99dd50461d370f8ddde0df8fb0 Mon Sep 17 00:00:00 2001
From: ccXxx1aoBai <1426169428@qq.com>
Date: Fri, 11 Oct 2024 10:40:16 +0800
Subject: [PATCH 73/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0onTap=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/src/components/avatar/td_avatar.dart  | 75 +++++++++++--------
 1 file changed, 42 insertions(+), 33 deletions(-)

diff --git a/tdesign-component/lib/src/components/avatar/td_avatar.dart b/tdesign-component/lib/src/components/avatar/td_avatar.dart
index 5cc62beae..f48e303af 100644
--- a/tdesign-component/lib/src/components/avatar/td_avatar.dart
+++ b/tdesign-component/lib/src/components/avatar/td_avatar.dart
@@ -151,46 +151,55 @@ class TDAvatar extends StatelessWidget {
   Widget build(BuildContext context) {
     switch (type) {
       case TDAvatarType.icon:
-        return Container(
-          width: _getAvatarWidth(),
-          height: _getAvatarWidth(),
-          decoration: BoxDecoration(
-            color: backgroundColor ?? TDTheme.of(context).brandColor2,
-            borderRadius: BorderRadius.circular(_getAvatarRadius(context)),
+        return GestureDetector(
+          child: Container(
+            width: _getAvatarWidth(),
+            height: _getAvatarWidth(),
+            decoration: BoxDecoration(
+              color: backgroundColor ?? TDTheme.of(context).brandColor2,
+              borderRadius: BorderRadius.circular(_getAvatarRadius(context)),
+            ),
+            child: Center(
+                child: Icon(icon ?? TDIcons.user, size: _getIconWidth(), color: TDTheme.of(context).brandNormalColor)),
           ),
-          child: Center(
-              child: Icon(icon ?? TDIcons.user, size: _getIconWidth(), color: TDTheme.of(context).brandNormalColor)),
+          onTap: onTap,
         );
       case TDAvatarType.normal:
-        return Container(
-          width: _getAvatarWidth(),
-          height: _getAvatarWidth(),
-          decoration: BoxDecoration(
-              color: backgroundColor ?? TDTheme.of(context).brandColor2,
-              borderRadius: BorderRadius.circular(_getAvatarRadius(context)),
-              image: avatarUrl != null
-                  ? DecorationImage(image: NetworkImage(avatarUrl!))
-                  : defaultUrl != ''
-                      ? DecorationImage(image: AssetImage(defaultUrl))
-                      : null),
+        return GestureDetector(
+          child: Container(
+            width: _getAvatarWidth(),
+            height: _getAvatarWidth(),
+            decoration: BoxDecoration(
+                color: backgroundColor ?? TDTheme.of(context).brandColor2,
+                borderRadius: BorderRadius.circular(_getAvatarRadius(context)),
+                image: avatarUrl != null
+                    ? DecorationImage(image: NetworkImage(avatarUrl!))
+                    : defaultUrl != ''
+                    ? DecorationImage(image: AssetImage(defaultUrl))
+                    : null),
+          ),
+          onTap: onTap,
         );
       case TDAvatarType.customText:
-        return Container(
-          width: _getAvatarWidth(),
-          height: _getAvatarWidth(),
-          decoration: BoxDecoration(
-            color: backgroundColor ?? TDTheme.of(context).brandNormalColor,
-            borderRadius: BorderRadius.circular(_getAvatarRadius(context)),
-          ),
-          child: Center(
-            child: TDText(
-              text,
-              forceVerticalCenter: true,
-              textAlign: TextAlign.center,
-              font: _getTextFont(context),
-              textColor: TDTheme.of(context).whiteColor1,
+        return GestureDetector(
+          child: Container(
+            width: _getAvatarWidth(),
+            height: _getAvatarWidth(),
+            decoration: BoxDecoration(
+              color: backgroundColor ?? TDTheme.of(context).brandNormalColor,
+              borderRadius: BorderRadius.circular(_getAvatarRadius(context)),
+            ),
+            child: Center(
+              child: TDText(
+                text,
+                forceVerticalCenter: true,
+                textAlign: TextAlign.center,
+                font: _getTextFont(context),
+                textColor: TDTheme.of(context).whiteColor1,
+              ),
             ),
           ),
+          onTap: onTap,
         );
       case TDAvatarType.display:
         return buildDisplayAvatar(context);

From 6a4da615ac5f2710bf9f16c217b4935a09874831 Mon Sep 17 00:00:00 2001
From: ccXxx1aoBai <1426169428@qq.com>
Date: Mon, 14 Oct 2024 11:33:08 +0800
Subject: [PATCH 74/74] =?UTF-8?q?sidebar=20loading=E7=94=A8=E6=B3=95?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/sidebar/td_sidebar_page_loading.dart |  7 ++-
 .../src/components/sidebar/td_sidebar.dart    | 47 ++++++++++++++-----
 .../sidebar/td_sidebar_controller.dart        | 11 ++++-
 3 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/tdesign-component/example/lib/page/sidebar/td_sidebar_page_loading.dart b/tdesign-component/example/lib/page/sidebar/td_sidebar_page_loading.dart
index 8b48fc02b..01dca141c 100644
--- a/tdesign-component/example/lib/page/sidebar/td_sidebar_page_loading.dart
+++ b/tdesign-component/example/lib/page/sidebar/td_sidebar_page_loading.dart
@@ -40,9 +40,6 @@ class TDSideBarLoadingPageState extends State<TDSideBarLoadingPage> {
 
       if (currentValue != index) {
         setState(() {
-          if(_sideBarController.loading) {
-            _sideBarController.loading = false;
-          }
           _sideBarController.selectTo(index);
         });
       }
@@ -111,9 +108,11 @@ class TDSideBarLoadingPageState extends State<TDSideBarLoadingPage> {
       count: '8',
     );
     if(_sideBarController.loading) {
-      _sideBarController.loading = false;
       _sideBarController.init(list);
       _sideBarController.selectTo(currentValue);
+      // 初始化时避免右侧内容与左侧item不匹配
+      _demoScroller.animateTo(currentValue.toDouble() * itemHeight,
+          duration: const Duration(milliseconds: 1), curve: Curves.easeIn);
     }
   }
 
diff --git a/tdesign-component/lib/src/components/sidebar/td_sidebar.dart b/tdesign-component/lib/src/components/sidebar/td_sidebar.dart
index 322d9316c..50fc67355 100644
--- a/tdesign-component/lib/src/components/sidebar/td_sidebar.dart
+++ b/tdesign-component/lib/src/components/sidebar/td_sidebar.dart
@@ -139,24 +139,13 @@ class _TDSideBarState extends State<TDSideBar> {
   void initState() {
     super.initState();
 
-    _loading = widget.loading ?? false;
+    _loading = widget.loading ?? widget.controller?.loading ?? false;
     // controller注册事件
     if (widget.controller != null) {
       widget.controller!.addListener(() {
         selectValue(widget.controller!.currentValue, needScroll: true);
         _loading = widget.controller!.loading;
-        displayChildren = widget.controller!.children
-            .asMap()
-            .entries
-            .map((entry) => SideItemProps(
-            index: entry.key,
-            disabled: entry.value.disabled,
-            value: entry.value.value,
-            icon: entry.value.icon,
-            label: entry.value.label,
-            textStyle: entry.value.textStyle,
-            badge: entry.value.badge))
-            .toList();
+        getDisplayChildren();
         setState(() {});
       });
     }
@@ -190,6 +179,38 @@ class _TDSideBarState extends State<TDSideBar> {
     }
   }
 
+  void getDisplayChildren() {
+    if (widget.controller != null && widget.controller!.children.isNotEmpty) {
+      displayChildren = widget.controller!.children
+          .asMap()
+          .entries
+          .map((entry) => SideItemProps(
+            index: entry.key,
+            disabled: entry.value.disabled,
+            value: entry.value.value,
+            icon: entry.value.icon,
+            label: entry.value.label,
+            textStyle: entry.value.textStyle,
+            badge: entry.value.badge))
+          .toList();
+    } else if(widget.children.isNotEmpty) {
+      displayChildren = widget.children
+          .asMap()
+          .entries
+          .map((entry) => SideItemProps(
+            index: entry.key,
+            disabled: entry.value.disabled,
+            value: entry.value.value,
+            icon: entry.value.icon,
+            label: entry.value.label,
+            textStyle: entry.value.textStyle,
+            badge: entry.value.badge))
+          .toList();
+    } else {
+      displayChildren = [];
+    }
+  }
+
   // 选中某项
   void onSelect(SideItemProps item, {isController = false}) {
     if (currentIndex != item.index) {
diff --git a/tdesign-component/lib/src/components/sidebar/td_sidebar_controller.dart b/tdesign-component/lib/src/components/sidebar/td_sidebar_controller.dart
index 637df4451..d21586f3d 100644
--- a/tdesign-component/lib/src/components/sidebar/td_sidebar_controller.dart
+++ b/tdesign-component/lib/src/components/sidebar/td_sidebar_controller.dart
@@ -13,13 +13,20 @@ class TDSideBarController extends ChangeNotifier {
   }
 
   void init(List<SideItemProps> data) {
+    closeLoading(false, needNotify: false);
     children = data;
     notifyListeners();
   }
 
-  set loading(bool load) {
+  void closeLoading(bool load, { bool needNotify = true }) {
+    _loading = load;
+    if(needNotify) {
+      notifyListeners();
+    }
+  }
+
+  set loading (bool load) {
     _loading = load;
-    notifyListeners();
   }
 
   bool get loading => _loading;