From c24ba0fa2743f125bdf74209443970b4144bf258 Mon Sep 17 00:00:00 2001 From: Yilmaz Guleryuz <397125+zeusbaba@users.noreply.github.com> Date: Tue, 21 Jul 2020 20:28:28 +0200 Subject: [PATCH 1/4] added option for autoHide Duration --- .gitignore | 7 ++-- lib/progress_dialog.dart | 74 +++++++++++++++++++++++----------------- pubspec.lock | 2 +- 3 files changed, 46 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 446ed0d1..38ced702 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,7 @@ -.DS_Store -.dart_tool/ +.* +!.gitignore -.packages -.pub/ +*.iml build/ ios/.generated/ diff --git a/lib/progress_dialog.dart b/lib/progress_dialog.dart index 2b8b2e23..ea499029 100755 --- a/lib/progress_dialog.dart +++ b/lib/progress_dialog.dart @@ -34,21 +34,26 @@ Widget _progressWidget = Image.asset( package: 'progress_dialog', ); +/// For Auto Hide Dialog after some Duration. +Duration _autoHide; + class ProgressDialog { _Body _dialog; ProgressDialog(BuildContext context, {ProgressDialogType type, - bool isDismissible, - bool showLogs, - TextDirection textDirection, - Widget customBody}) { + bool isDismissible, + bool showLogs, + Duration autoHide, + TextDirection textDirection, + Widget customBody}) { _context = context; _progressDialogType = type ?? ProgressDialogType.Normal; _barrierDismissible = isDismissible ?? true; _showLogs = showLogs ?? false; _customBody = customBody ?? null; _direction = textDirection ?? TextDirection.ltr; + _autoHide = autoHide; } void style( @@ -157,6 +162,11 @@ class ProgressDialog { await Future.delayed(Duration(milliseconds: 200)); if (_showLogs) debugPrint('ProgressDialog shown'); _isShowing = true; + + if (_autoHide != null) { + Future.delayed(_autoHide).then((value) => hide()); + } + return true; } else { if (_showLogs) debugPrint("ProgressDialog already shown/showing"); @@ -211,39 +221,39 @@ class _BodyState extends State<_Body> { final text = Expanded( child: _progressDialogType == ProgressDialogType.Normal ? Text( - _dialogMessage, - textAlign: _textAlign, - style: _messageStyle, - textDirection: _direction, - ) + _dialogMessage, + textAlign: _textAlign, + style: _messageStyle, + textDirection: _direction, + ) : Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - SizedBox(height: 8.0), - Row( - children: [ - Expanded( + padding: const EdgeInsets.all(8.0), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + SizedBox(height: 8.0), + Row( + children: [ + Expanded( + child: Text( + _dialogMessage, + style: _messageStyle, + textDirection: _direction, + )), + ], + ), + SizedBox(height: 4.0), + Align( + alignment: Alignment.bottomRight, child: Text( - _dialogMessage, - style: _messageStyle, + "$_progress/$_maxProgress", + style: _progressTextStyle, textDirection: _direction, - )), - ], - ), - SizedBox(height: 4.0), - Align( - alignment: Alignment.bottomRight, - child: Text( - "$_progress/$_maxProgress", - style: _progressTextStyle, - textDirection: _direction, + ), + ), + ], ), ), - ], - ), - ), ); return _customBody ?? diff --git a/pubspec.lock b/pubspec.lock index 97283e89..3107c6e7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -178,4 +178,4 @@ packages: source: hosted version: "3.6.1" sdks: - dart: ">=2.6.0 <3.0.0" + dart: ">=2.7.0 <3.0.0" From 70c6dd7a6e81726f08d87b57a795a4eda2a2e2e0 Mon Sep 17 00:00:00 2001 From: Yilmaz Guleryuz <397125+zeusbaba@users.noreply.github.com> Date: Wed, 22 Jul 2020 13:47:32 +0200 Subject: [PATCH 2/4] added option for dialogAlignment --- lib/progress_dialog.dart | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/lib/progress_dialog.dart b/lib/progress_dialog.dart index ea499029..235e4f26 100755 --- a/lib/progress_dialog.dart +++ b/lib/progress_dialog.dart @@ -11,6 +11,7 @@ Widget _customBody; TextAlign _textAlign = TextAlign.left; Alignment _progressWidgetAlignment = Alignment.centerLeft; +Alignment _dialogAlignment = Alignment.center; TextDirection _direction = TextDirection.ltr; @@ -56,21 +57,23 @@ class ProgressDialog { _autoHide = autoHide; } - void style( - {Widget child, - double progress, - double maxProgress, - String message, - Widget progressWidget, - Color backgroundColor, - TextStyle progressTextStyle, - TextStyle messageTextStyle, - double elevation, - TextAlign textAlign, - double borderRadius, - Curve insetAnimCurve, - EdgeInsets padding, - Alignment progressWidgetAlignment}) { + void style({ + Widget child, + double progress, + double maxProgress, + String message, + Widget progressWidget, + Color backgroundColor, + TextStyle progressTextStyle, + TextStyle messageTextStyle, + double elevation, + TextAlign textAlign, + double borderRadius, + Curve insetAnimCurve, + EdgeInsets padding, + Alignment progressWidgetAlignment, + Alignment dialogAlignment, + }) { if (_isShowing) return; if (_progressDialogType == ProgressDialogType.Download) { _progress = progress ?? _progress; @@ -90,6 +93,7 @@ class ProgressDialog { _dialogPadding = padding ?? _dialogPadding; _progressWidgetAlignment = progressWidgetAlignment ?? _progressWidgetAlignment; + _dialogAlignment = dialogAlignment ?? _dialogAlignment; } void update( @@ -259,7 +263,11 @@ class _BodyState extends State<_Body> { return _customBody ?? Container( padding: _dialogPadding, + alignment: _dialogAlignment, + width: double.maxFinite, + height: 88, child: Column( + //mainAxisAlignment: MainAxisAlignment.center, mainAxisSize: MainAxisSize.min, children: [ // row body From f4ae5eb0daf6e165b14f62821639d53538ef8a74 Mon Sep 17 00:00:00 2001 From: Yilmaz Guleryuz <397125+zeusbaba@users.noreply.github.com> Date: Fri, 12 Jan 2024 19:44:34 +0100 Subject: [PATCH 3/4] update deps --- .idea/codeStyles/Project.xml | 116 -------- .idea/encodings.xml | 4 - .idea/libraries/Dart_Packages.xml | 144 ++++----- .idea/libraries/Dart_SDK.xml | 38 +-- .idea/misc.xml | 10 +- .idea/modules.xml | 2 +- .idea/progress_dialog.iml | 21 -- .idea/workspace.xml | 278 +++++------------- android/local.properties | 4 +- example/android/local.properties | 4 +- example/ios/Flutter/Generated.xcconfig | 14 +- .../ios/Flutter/flutter_export_environment.sh | 12 +- .../ios/Runner/GeneratedPluginRegistrant.h | 2 + .../ios/Runner/GeneratedPluginRegistrant.m | 2 + example/lib/main.dart | 18 +- example/pubspec.lock | 186 ++++++------ example/pubspec.yaml | 4 +- lib/progress_dialog.dart | 80 +++-- progress_dialog.iml | 18 +- pubspec.lock | 173 +++++------ pubspec.yaml | 2 +- 21 files changed, 417 insertions(+), 715 deletions(-) delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/progress_dialog.iml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 681f41ae..00000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 15a15b21..00000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml index 000f3478..d85e2da3 100644 --- a/.idea/libraries/Dart_Packages.xml +++ b/.idea/libraries/Dart_Packages.xml @@ -2,225 +2,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml index 3f3985c4..c95df3f9 100644 --- a/.idea/libraries/Dart_SDK.xml +++ b/.idea/libraries/Dart_SDK.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 723475c6..f4f6d798 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,11 +1,9 @@ - - - - + + - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 1a42b044..ea1e5a60 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/progress_dialog.iml b/.idea/progress_dialog.iml deleted file mode 100644 index fcfd9064..00000000 --- a/.idea/progress_dialog.iml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 081d2db2..a74cd4ab 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,249 +1,103 @@ + + - + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + { + "customColor": "", + "associatedIndex": 0 +} + - - - - - - - - - - - - - - - - - + { + "keyToString": { + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.go.formatter.settings.were.checked": "true", + "RunOnceActivity.go.migrated.go.modules.settings": "true", + "WebServerToolWindowFactoryState": "false", + "dart.analysis.tool.window.visible": "false", + "git-widget-placeholder": "master", + "go.import.settings.migrated": "true", + "kotlin-language-version-configured": "true", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "show.migrate.to.gradle.popup": "false", + "vue.rearranger.settings.migration": "true" + } +} + + - - - - - - - - - - + - - 1548865170275 + + 1658770831431 - - 1548868693914 - - - 1549384236745 - - - 1549899508973 - - - 1552072646686 - - - 1555951972083 - - - 1586594506630 - - - 1586596153320 - - - 1586596549513 - - - 1586596631993 - - - 1586597000608 - - - 1586597066800 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - 1.8 - - - - - - + + false + true \ No newline at end of file diff --git a/android/local.properties b/android/local.properties index dc526ed7..993df69d 100644 --- a/android/local.properties +++ b/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=/root/Android/Sdk -flutter.sdk=/usr/local/flutter \ No newline at end of file +sdk.dir=/Users/zeus/Library/Android/sdk +flutter.sdk=/Users/zeus/MyProgs/flutter \ No newline at end of file diff --git a/example/android/local.properties b/example/android/local.properties index d2511cc9..6b7fcba8 100644 --- a/example/android/local.properties +++ b/example/android/local.properties @@ -1,4 +1,4 @@ -sdk.dir=/home/fayaz/Android/Sdk -flutter.sdk=/usr/local/flutter +sdk.dir=/Users/zeus/Library/Android/sdk +flutter.sdk=/Users/zeus/MyProgs/flutter flutter.buildMode=debug flutter.versionName=1.0.0 \ No newline at end of file diff --git a/example/ios/Flutter/Generated.xcconfig b/example/ios/Flutter/Generated.xcconfig index 72706146..f8bce5e2 100644 --- a/example/ios/Flutter/Generated.xcconfig +++ b/example/ios/Flutter/Generated.xcconfig @@ -1,10 +1,14 @@ // This is a generated file; do not edit or check into version control. -FLUTTER_ROOT=/usr/local/flutter -FLUTTER_APPLICATION_PATH=/home/fayaz/StudioProjects/progress_dialog/example +FLUTTER_ROOT=/Users/zeus/MyProgs/flutter +FLUTTER_APPLICATION_PATH=/Users/zeus/MyMatrix/beerstorm-open-flutter/flutter-open-forks/progress_dialog/example +COCOAPODS_PARALLEL_CODE_SIGN=true FLUTTER_TARGET=lib/main.dart FLUTTER_BUILD_DIR=build -SYMROOT=${SOURCE_ROOT}/../build/ios -OTHER_LDFLAGS=$(inherited) -framework Flutter -FLUTTER_FRAMEWORK_DIR=/usr/local/flutter/bin/cache/artifacts/engine/ios FLUTTER_BUILD_NAME=1.0.0 FLUTTER_BUILD_NUMBER=1.0.0 +EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386 +EXCLUDED_ARCHS[sdk=iphoneos*]=armv7 +DART_OBFUSCATION=false +TRACK_WIDGET_CREATION=true +TREE_SHAKE_ICONS=false +PACKAGE_CONFIG=.dart_tool/package_config.json diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh index 4f38c0de..bf009c66 100755 --- a/example/ios/Flutter/flutter_export_environment.sh +++ b/example/ios/Flutter/flutter_export_environment.sh @@ -1,11 +1,13 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/usr/local/flutter" -export "FLUTTER_APPLICATION_PATH=/home/fayaz/StudioProjects/progress_dialog/example" +export "FLUTTER_ROOT=/Users/zeus/MyProgs/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/zeus/MyMatrix/beerstorm-open-flutter/flutter-open-forks/progress_dialog/example" +export "COCOAPODS_PARALLEL_CODE_SIGN=true" export "FLUTTER_TARGET=lib/main.dart" export "FLUTTER_BUILD_DIR=build" -export "SYMROOT=${SOURCE_ROOT}/../build/ios" -export "OTHER_LDFLAGS=$(inherited) -framework Flutter" -export "FLUTTER_FRAMEWORK_DIR=/usr/local/flutter/bin/cache/artifacts/engine/ios" export "FLUTTER_BUILD_NAME=1.0.0" export "FLUTTER_BUILD_NUMBER=1.0.0" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=true" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/example/ios/Runner/GeneratedPluginRegistrant.h b/example/ios/Runner/GeneratedPluginRegistrant.h index ed9a5c61..7a890927 100644 --- a/example/ios/Runner/GeneratedPluginRegistrant.h +++ b/example/ios/Runner/GeneratedPluginRegistrant.h @@ -2,6 +2,8 @@ // Generated file. Do not edit. // +// clang-format off + #ifndef GeneratedPluginRegistrant_h #define GeneratedPluginRegistrant_h diff --git a/example/ios/Runner/GeneratedPluginRegistrant.m b/example/ios/Runner/GeneratedPluginRegistrant.m index 60dfa42b..efe65ecc 100644 --- a/example/ios/Runner/GeneratedPluginRegistrant.m +++ b/example/ios/Runner/GeneratedPluginRegistrant.m @@ -2,6 +2,8 @@ // Generated file. Do not edit. // +// clang-format off + #import "GeneratedPluginRegistrant.h" @implementation GeneratedPluginRegistrant diff --git a/example/lib/main.dart b/example/lib/main.dart index 6f440c66..5a850df1 100755 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -4,7 +4,7 @@ import 'package:progress_dialog/progress_dialog.dart'; //import '../../lib/progress_dialog.dart'; -ProgressDialog pr; +late ProgressDialog pr; void main() { runApp(MaterialApp( @@ -52,12 +52,15 @@ class MyApp extends StatelessWidget { return Scaffold( body: Center( - child: RaisedButton( + child: ElevatedButton( child: Text( 'Show Dialog', style: TextStyle(color: Colors.white), ), - color: Colors.blue, + style: ElevatedButton.styleFrom( + foregroundColor: Colors.blue, + backgroundColor: Colors.white, + ), onPressed: () async { await pr.show(); @@ -122,7 +125,7 @@ class FirstScreen extends StatefulWidget { } class _FirstScreenState extends State { - ProgressDialog pr; + late ProgressDialog pr; @override Widget build(BuildContext context) { @@ -131,10 +134,13 @@ class _FirstScreenState extends State { return Scaffold( body: Center( - child: RaisedButton( + child: ElevatedButton( child: Text('Show dialog and go to next screen', style: TextStyle(color: Colors.white)), - color: Colors.blueAccent, + style: ElevatedButton.styleFrom( + foregroundColor: Colors.blueAccent, + backgroundColor: Colors.white, + ), onPressed: () { pr.show(); Future.delayed(Duration(seconds: 3)).then((value) { diff --git a/example/pubspec.lock b/example/pubspec.lock index 00015ad6..f2804548 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -1,69 +1,62 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.13" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.6.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.0.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.3" - collection: + version: "2.1.1" + characters: dependency: transitive description: - name: collection - url: "https://pub.dartlang.org" + name: characters + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.14.12" - convert: + version: "1.3.0" + clock: dependency: transitive description: - name: convert - url: "https://pub.dartlang.org" + name: clock + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "2.1.1" - crypto: + version: "1.1.1" + collection: dependency: transitive description: - name: crypto - url: "https://pub.dartlang.org" + name: collection + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + 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: "0.1.2" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -74,55 +67,61 @@ packages: description: flutter source: sdk version: "0.0.0" - image: + leak_tracker: dependency: transitive description: - name: image - url: "https://pub.dartlang.org" + name: leak_tracker + sha256: "04be76c4a4bb50f14904e64749237e541e7c7bcf7ec0b196907322ab5d2fc739" + url: "https://pub.dev" source: hosted - version: "2.1.12" + version: "9.0.16" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: b06739349ec2477e943055aea30172c5c7000225f79dad4702e2ec0eda79a6ff + url: "https://pub.dev" + source: hosted + version: "1.0.5" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" + source: hosted + version: "0.12.16" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + url: "https://pub.dev" source: hosted - version: "0.12.6" + version: "0.8.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + url: "https://pub.dev" source: hosted - version: "1.1.8" + version: "1.11.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.6.4" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "1.8.3" progress_dialog: dependency: "direct main" description: path: ".." relative: true source: path - version: "1.2.3" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.3" + version: "1.2.4" sky_engine: dependency: transitive description: flutter @@ -132,64 +131,73 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" source: hosted - version: "1.9.3" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + url: "https://pub.dev" source: hosted - version: "0.2.15" - typed_data: + version: "0.6.1" + vector_math: dependency: transitive description: - name: typed_data - url: "https://pub.dartlang.org" + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "1.1.6" - vector_math: + version: "2.1.4" + vm_service: dependency: transitive description: - name: vector_math - url: "https://pub.dartlang.org" + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.dev" source: hosted - version: "2.0.8" - xml: + version: "13.0.0" + web: dependency: transitive description: - name: xml - url: "https://pub.dartlang.org" + name: web + sha256: edc8a9573dd8c5a83a183dae1af2b6fd4131377404706ca4e5420474784906fa + url: "https://pub.dev" source: hosted - version: "3.6.1" + version: "0.4.0" sdks: - dart: ">=2.7.0 <3.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 104648d8..802ee1d3 100755 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,13 +4,13 @@ description: A new Flutter application. version: 1.0.0 environment: - sdk: ">=2.7.0 <3.0.0" + sdk: ">=2.12.0 <3.0.0" dependencies: flutter: sdk: flutter - cupertino_icons: ^0.1.2 + cupertino_icons: ^1.0.6 progress_dialog: path: ../ diff --git a/lib/progress_dialog.dart b/lib/progress_dialog.dart index 235e4f26..23130468 100755 --- a/lib/progress_dialog.dart +++ b/lib/progress_dialog.dart @@ -1,13 +1,11 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/painting.dart'; enum ProgressDialogType { Normal, Download } String _dialogMessage = "Loading..."; double _progress = 0.0, _maxProgress = 100.0; -Widget _customBody; +late Widget _customBody; TextAlign _textAlign = TextAlign.left; Alignment _progressWidgetAlignment = Alignment.centerLeft; @@ -16,8 +14,8 @@ Alignment _dialogAlignment = Alignment.center; TextDirection _direction = TextDirection.ltr; bool _isShowing = false; -BuildContext _context, _dismissingContext; -ProgressDialogType _progressDialogType; +late BuildContext _context, _dismissingContext; +late ProgressDialogType _progressDialogType; bool _barrierDismissible = true, _showLogs = false; TextStyle _progressTextStyle = TextStyle( @@ -36,43 +34,43 @@ Widget _progressWidget = Image.asset( ); /// For Auto Hide Dialog after some Duration. -Duration _autoHide; +late Duration _autoHide; class ProgressDialog { - _Body _dialog; + late _Body _dialog; ProgressDialog(BuildContext context, - {ProgressDialogType type, - bool isDismissible, - bool showLogs, - Duration autoHide, - TextDirection textDirection, - Widget customBody}) { + {ProgressDialogType type = ProgressDialogType.Normal, + bool? isDismissible, + bool showLogs = false, + Duration autoHide = const Duration(seconds: 2), + TextDirection textDirection = TextDirection.ltr, + Widget? customBody}) { _context = context; - _progressDialogType = type ?? ProgressDialogType.Normal; + _progressDialogType = type; _barrierDismissible = isDismissible ?? true; - _showLogs = showLogs ?? false; - _customBody = customBody ?? null; - _direction = textDirection ?? TextDirection.ltr; + _showLogs = showLogs; + _customBody = (customBody ?? null)!; + _direction = textDirection; _autoHide = autoHide; } void style({ - Widget child, - double progress, - double maxProgress, - String message, - Widget progressWidget, - Color backgroundColor, - TextStyle progressTextStyle, - TextStyle messageTextStyle, - double elevation, - TextAlign textAlign, - double borderRadius, - Curve insetAnimCurve, - EdgeInsets padding, - Alignment progressWidgetAlignment, - Alignment dialogAlignment, + Widget? child, + double? progress, + double? maxProgress, + String? message, + Widget? progressWidget, + Color? backgroundColor, + TextStyle? progressTextStyle, + TextStyle? messageTextStyle, + double? elevation, + TextAlign? textAlign, + double? borderRadius, + Curve? insetAnimCurve, + EdgeInsets? padding, + Alignment? progressWidgetAlignment, + Alignment? dialogAlignment, }) { if (_isShowing) return; if (_progressDialogType == ProgressDialogType.Download) { @@ -97,12 +95,12 @@ class ProgressDialog { } void update( - {double progress, - double maxProgress, - String message, - Widget progressWidget, - TextStyle progressTextStyle, - TextStyle messageTextStyle}) { + {double? progress, + double? maxProgress, + String? message, + Widget? progressWidget, + TextStyle? progressTextStyle, + TextStyle? messageTextStyle}) { if (_progressDialogType == ProgressDialogType.Download) { _progress = progress ?? _progress; } @@ -167,10 +165,8 @@ class ProgressDialog { if (_showLogs) debugPrint('ProgressDialog shown'); _isShowing = true; - if (_autoHide != null) { - Future.delayed(_autoHide).then((value) => hide()); - } - + Future.delayed(_autoHide).then((value) => hide()); + return true; } else { if (_showLogs) debugPrint("ProgressDialog already shown/showing"); diff --git a/progress_dialog.iml b/progress_dialog.iml index 8d48a067..a4cf07bc 100644 --- a/progress_dialog.iml +++ b/progress_dialog.iml @@ -1,19 +1,23 @@ + + + + + - - - - + + + + - + - - + \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 3107c6e7..4e303a31 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,62 +1,54 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.13" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.6.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.0.0" - charcode: + version: "2.1.1" + characters: dependency: transitive description: - name: charcode - url: "https://pub.dartlang.org" + name: characters + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.1.3" - collection: + version: "1.3.0" + clock: dependency: transitive description: - name: collection - url: "https://pub.dartlang.org" + name: clock + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.14.12" - convert: + version: "1.1.1" + collection: dependency: transitive description: - name: convert - url: "https://pub.dartlang.org" + name: collection + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" source: hosted - version: "2.1.1" - crypto: + version: "1.18.0" + fake_async: dependency: transitive description: - name: crypto - url: "https://pub.dartlang.org" + name: fake_async + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -67,48 +59,54 @@ packages: description: flutter source: sdk version: "0.0.0" - image: + leak_tracker: dependency: transitive description: - name: image - url: "https://pub.dartlang.org" + name: leak_tracker + sha256: "04be76c4a4bb50f14904e64749237e541e7c7bcf7ec0b196907322ab5d2fc739" + url: "https://pub.dev" source: hosted - version: "2.1.12" - matcher: + version: "9.0.16" + leak_tracker_testing: dependency: transitive description: - name: matcher - url: "https://pub.dartlang.org" + name: leak_tracker_testing + sha256: b06739349ec2477e943055aea30172c5c7000225f79dad4702e2ec0eda79a6ff + url: "https://pub.dev" source: hosted - version: "0.12.6" - meta: + version: "1.0.5" + matcher: dependency: transitive description: - name: meta - url: "https://pub.dartlang.org" + name: matcher + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" source: hosted - version: "1.1.8" - path: + version: "0.12.16" + material_color_utilities: dependency: transitive description: - name: path - url: "https://pub.dartlang.org" + name: material_color_utilities + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + url: "https://pub.dev" source: hosted - version: "1.6.4" - petitparser: + version: "0.8.0" + meta: dependency: transitive description: - name: petitparser - url: "https://pub.dartlang.org" + name: meta + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + url: "https://pub.dev" source: hosted - version: "2.4.0" - quiver: + version: "1.11.0" + path: dependency: transitive description: - name: quiver - url: "https://pub.dartlang.org" + name: path + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "1.8.3" sky_engine: dependency: transitive description: flutter @@ -118,64 +116,73 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" source: hosted - version: "1.9.3" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + url: "https://pub.dev" source: hosted - version: "0.2.15" - typed_data: + version: "0.6.1" + vector_math: dependency: transitive description: - name: typed_data - url: "https://pub.dartlang.org" + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "1.1.6" - vector_math: + version: "2.1.4" + vm_service: dependency: transitive description: - name: vector_math - url: "https://pub.dartlang.org" + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.dev" source: hosted - version: "2.0.8" - xml: + version: "13.0.0" + web: dependency: transitive description: - name: xml - url: "https://pub.dartlang.org" + name: web + sha256: edc8a9573dd8c5a83a183dae1af2b6fd4131377404706ca4e5420474784906fa + url: "https://pub.dev" source: hosted - version: "3.6.1" + version: "0.4.0" sdks: - dart: ">=2.7.0 <3.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 90315ef1..2f79b4fa 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ version: 1.2.4 homepage: https://github.com/fayaz07/progress_dialog environment: - sdk: ">=2.7.0 <3.0.0" + sdk: ">=2.12.0 <3.0.0" dependencies: flutter: From 6a66cbc8342c759f80aa855a266a671504a39daa Mon Sep 17 00:00:00 2001 From: Yilmaz Guleryuz <397125+zeusbaba@users.noreply.github.com> Date: Fri, 12 Jan 2024 19:47:05 +0100 Subject: [PATCH 4/4] update deps --- .idea/libraries/Dart_Packages.xml | 36 +++++++++++++++++++++++++------ .idea/workspace.xml | 34 +++++++++++++---------------- 2 files changed, 45 insertions(+), 25 deletions(-) diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml index d85e2da3..856ec8aa 100644 --- a/.idea/libraries/Dart_Packages.xml +++ b/.idea/libraries/Dart_Packages.xml @@ -65,6 +65,20 @@ + + + + + + + + + + + + @@ -75,14 +89,14 @@ - - @@ -149,10 +163,17 @@ + + + + + + - @@ -166,9 +187,11 @@ + + - - + + @@ -177,7 +200,8 @@ - + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a74cd4ab..20856c65 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,27 +5,8 @@ - - - - - - - - - - - - - - - - - - - + + + false true