message of loading can be null

shirne · Jul 1, 2024 · eef30d4 · eef30d4
1 parent 6a9c09d
commit eef30d4
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [4.7.4]
+    * The message of loading can be null
+
 ## [4.7.3]
     * improve code style
     * improve dropdown animate

diff --git a/example/lib/custom_page.dart b/example/lib/custom_page.dart
@@ -134,6 +134,44 @@ class ToastInnerPage extends StatelessWidget {
               ],
             ),
             const SizedBox(height: 8),
+            GridView(
+              shrinkWrap: true,
+              gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                  crossAxisCount: 2),
+              children: [
+                Center(
+                  child: ToastWidget(
+                    '测试消息',
+                  ),
+                ),
+                Center(
+                  child: SnackWidget('testaa'),
+                ),
+                Center(
+                  child: ToastWidget(
+                    '测试消息',
+                    icon: Icon(DialogIcons.checkmarkFill),
+                  ),
+                ),
+                Center(
+                  child: SnackWidget('testaa'),
+                ),
+                Center(
+                  child: ToastWidget(
+                    '测试消息',
+                    style: ToastStyle(
+                      direction: Axis.vertical,
+                      iconPadding: EdgeInsets.all(24),
+                      iconTheme: IconThemeData(size: 42),
+                    ),
+                    icon: Icon(DialogIcons.checkmarkFill),
+                  ),
+                ),
+                Center(
+                  child: SnackWidget('testaa'),
+                ),
+              ],
+            ),
           ],
         ),
       ),

diff --git a/lib/src/my_dialog.dart b/lib/src/my_dialog.dart
@@ -292,7 +292,7 @@ class MyDialog {
 
   /// A wrapper of [ShirneDialog.loading]
   static ProgressController loading(
-    String message, {
+    String? message, {
     bool? showProgress,
     Duration? duration,
 
@@ -772,7 +772,7 @@ class ShirneDialog {
   /// show a loading progress within an [OverlayEntry].
   /// keep in `time` seconds or manual control it's status by pass 0 to `time`
   ProgressController loading(
-    String message, {
+    String? message, {
     bool? showProgress,
     Duration? duration,
 

diff --git a/lib/src/widgets/progress.dart b/lib/src/widgets/progress.dart
@@ -83,15 +83,16 @@ class _ProgressWidgetState extends State<ProgressWidget>
                     ),
                 strokeWidth: widget.style?.strokeWidth ?? 4,
               ),
-              const SizedBox(height: 10),
-              Text(
-                widget.message!,
-                style: const TextStyle(
-                  color: Colors.black54,
-                  decoration: TextDecoration.none,
-                  fontSize: 14,
+              if (widget.message != null) const SizedBox(height: 10),
+              if (widget.message != null)
+                Text(
+                  widget.message!,
+                  style: const TextStyle(
+                    color: Colors.black54,
+                    decoration: TextDecoration.none,
+                    fontSize: 14,
+                  ),
                 ),
-              ),
             ],
           ),
         );

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,10 +1,10 @@
 name: shirne_dialog
 description: A flutter package to use alert, toast, popup, snack, imagePreview, loading etc. with customizable style in anywhere.
-version: 4.7.3
+version: 4.7.4
 homepage: https://shirne.github.io/dialog/
 repository: https://github.com/shirne/shirne_dialog
-screenshots: 
-  - description: 'list of features with some toasts'
+screenshots:
+  - description: "list of features with some toasts"
     path: screenshots/preview.jpg
 topics:
   - dialog
@@ -30,4 +30,4 @@ flutter:
   fonts:
     - family: shirne_dialog_icons
       fonts:
-        - asset: assets/fonts/icons.ttf
+        - asset: assets/fonts/icons.ttf