diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 2742d03..ae820fd 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -4,31 +4,23 @@ PODS: - Flutter - AgoraIrisRTC_iOS (3.6.2-fix.1) - Flutter (1.0.0) - - fluttertoast (0.0.2): - - Flutter - - Toast - "permission_handler (5.1.0+2)": - Flutter - - Toast (4.0.0) DEPENDENCIES: - agora_rtc_engine (from `.symlinks/plugins/agora_rtc_engine/ios`) - Flutter (from `Flutter`) - - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - permission_handler (from `.symlinks/plugins/permission_handler/ios`) SPEC REPOS: trunk: - AgoraIrisRTC_iOS - - Toast EXTERNAL SOURCES: agora_rtc_engine: :path: ".symlinks/plugins/agora_rtc_engine/ios" Flutter: :path: Flutter - fluttertoast: - :path: ".symlinks/plugins/fluttertoast/ios" permission_handler: :path: ".symlinks/plugins/permission_handler/ios" @@ -36,9 +28,7 @@ SPEC CHECKSUMS: agora_rtc_engine: ffc530eff766a38272568ebaead9341d73f58856 AgoraIrisRTC_iOS: 9b11083bb79048ae4db7e2f56109cc51ac9e3834 Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a - fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58 permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 - Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 PODFILE CHECKSUM: bd5ecd90bb4d3dada07dd6c6725bb70ab42e9619 diff --git a/lib/utils/showToast.dart b/lib/utils/showToast.dart index d41a492..54cd9a0 100644 --- a/lib/utils/showToast.dart +++ b/lib/utils/showToast.dart @@ -1,98 +1,98 @@ -import 'package:flutter/material.dart'; -import 'package:fluttertoast/fluttertoast.dart'; +// import 'package:flutter/material.dart'; +// import 'package:fluttertoast/fluttertoast.dart'; -// 普通气泡弹框 -// 使用：showToast("xxxxxxx"); -void showToast( - String text, { - gravity: ToastGravity.CENTER, - toastLength: Toast.LENGTH_SHORT, -}) { - Fluttertoast.showToast( - msg: text, - toastLength: Toast.LENGTH_SHORT, - gravity: ToastGravity.CENTER, - timeInSecForIosWeb: 3, - backgroundColor: Colors.grey[600], // 灰色背景 - fontSize: 16.0, - ); -} +// // 普通气泡弹框 +// // 使用：showToast("xxxxxxx"); +// void showToast( +// String text, { +// gravity: ToastGravity.CENTER, +// toastLength: Toast.LENGTH_SHORT, +// }) { +// Fluttertoast.showToast( +// msg: text, +// toastLength: Toast.LENGTH_SHORT, +// gravity: ToastGravity.CENTER, +// timeInSecForIosWeb: 3, +// backgroundColor: Colors.grey[600], // 灰色背景 +// fontSize: 16.0, +// ); +// } -// 一个加载中的动画，不传text时，默认显示文字Loading... -// 使用：showLoading(context, 'xxxxxxx'); -void showLoading(context, text) { - text = text ?? "Loading..."; - showDialog( - barrierDismissible: false, - context: context, - builder: (context) { - return Center( - child: Container( - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(3.0), - boxShadow: [ - // 阴影 - BoxShadow( - color: Colors.black12, - //offset: Offset(2.0,2.0), - blurRadius: 10.0, - ) - ]), - padding: EdgeInsets.all(16), - margin: EdgeInsets.all(16), - constraints: BoxConstraints(minHeight: 120, minWidth: 180), - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - SizedBox( - height: 30, - width: 30, - child: CircularProgressIndicator( - strokeWidth: 3, - ), - ), - Padding( - padding: const EdgeInsets.only(top: 20.0), - child: Text( - text, - style: Theme.of(context).textTheme.bodyMedium, - ), - ), - ], - ), - ), - ); - }, - ); -} +// // 一个加载中的动画，不传text时，默认显示文字Loading... +// // 使用：showLoading(context, 'xxxxxxx'); +// void showLoading(context, text) { +// text = text ?? "Loading..."; +// showDialog( +// barrierDismissible: false, +// context: context, +// builder: (context) { +// return Center( +// child: Container( +// decoration: BoxDecoration( +// color: Colors.white, +// borderRadius: BorderRadius.circular(3.0), +// boxShadow: [ +// // 阴影 +// BoxShadow( +// color: Colors.black12, +// //offset: Offset(2.0,2.0), +// blurRadius: 10.0, +// ) +// ]), +// padding: EdgeInsets.all(16), +// margin: EdgeInsets.all(16), +// constraints: BoxConstraints(minHeight: 120, minWidth: 180), +// child: Column( +// mainAxisSize: MainAxisSize.min, +// mainAxisAlignment: MainAxisAlignment.center, +// children: [ +// SizedBox( +// height: 30, +// width: 30, +// child: CircularProgressIndicator( +// strokeWidth: 3, +// ), +// ), +// Padding( +// padding: const EdgeInsets.only(top: 20.0), +// child: Text( +// text, +// style: Theme.of(context).textTheme.bodyMedium, +// ), +// ), +// ], +// ), +// ), +// ); +// }, +// ); +// } -// 带有确定取消按钮的提示框，content是提示框的内容文字，confirmCallback是点击确定按钮的回调 -// 使用：showConfirmDialog(context, '确认xxxxxxx吗？', () {print('xxxxxxx');}); -void showConfirmDialog( - BuildContext context, String content, Function confirmCallback) { - showDialog( - context: context, - builder: (context) { - return AlertDialog( - title: Text("提示"), - content: Text(content), - actions: [ - FlatButton( - onPressed: () { - confirmCallback(); - Navigator.of(context).pop(); - }, - child: Text("确认"), - ), - FlatButton( - onPressed: () { - Navigator.of(context).pop(); - }, - child: Text("取消"), - ), - ], - ); - }); -} +// // 带有确定取消按钮的提示框，content是提示框的内容文字，confirmCallback是点击确定按钮的回调 +// // 使用：showConfirmDialog(context, '确认xxxxxxx吗？', () {print('xxxxxxx');}); +// void showConfirmDialog( +// BuildContext context, String content, Function confirmCallback) { +// showDialog( +// context: context, +// builder: (context) { +// return AlertDialog( +// title: Text("提示"), +// content: Text(content), +// actions: [ +// FlatButton( +// onPressed: () { +// confirmCallback(); +// Navigator.of(context).pop(); +// }, +// child: Text("确认"), +// ), +// FlatButton( +// onPressed: () { +// Navigator.of(context).pop(); +// }, +// child: Text("取消"), +// ), +// ], +// ); +// }); +// } diff --git a/pubspec.lock b/pubspec.lock index 7753ed7..71f3645 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -93,13 +93,6 @@ packages: description: flutter source: sdk version: "0.0.0" - fluttertoast: - dependency: "direct main" - description: - name: fluttertoast - url: "https://pub.flutter-io.cn" - source: hosted - version: "7.1.8" http_parser: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 29c60ba..a1db5f3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -37,7 +37,6 @@ dependencies: permission_handler: ^8.3.0 validators: ^3.0.0 dio: ^4.0.6 - fluttertoast: ^7.1.6 dev_dependencies: flutter_test: