Skip to content

Commit 8dcc32f

Browse files
committed
统一 toast 入口
1 parent d94496e commit 8dcc32f

File tree

13 files changed

+43
-48
lines changed

13 files changed

+43
-48
lines changed

lib/app.dart

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import 'dart:async';
33
import 'package:flutter/material.dart';
44
import 'package:flutter_redux/flutter_redux.dart';
55
import 'package:flutter_riverpod/flutter_riverpod.dart';
6-
import 'package:fluttertoast/fluttertoast.dart';
76
import 'package:gsy_github_app_flutter/common/event/http_error_event.dart';
87
import 'package:gsy_github_app_flutter/common/event/index.dart';
98
import 'package:gsy_github_app_flutter/common/localization/extension.dart';
109
import 'package:gsy_github_app_flutter/common/localization/l10n/app_localizations.dart';
1110
import 'package:gsy_github_app_flutter/common/net/code.dart';
11+
import 'package:gsy_github_app_flutter/common/toast.dart';
1212
import 'package:gsy_github_app_flutter/model/user.dart';
1313
import 'package:gsy_github_app_flutter/page/debug/debug_label.dart';
1414
import 'package:gsy_github_app_flutter/page/home/home_page.dart';
@@ -214,10 +214,4 @@ mixin HttpErrorListener on State<FlutterReduxApp> {
214214
}
215215
}
216216

217-
showToast(String message) {
218-
Fluttertoast.showToast(
219-
msg: message,
220-
gravity: ToastGravity.CENTER,
221-
toastLength: Toast.LENGTH_LONG);
222-
}
223217
}

lib/common/repositories/repos_repository.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import 'dart:io';
55
import 'package:built_value/serializer.dart';
66
import 'package:dio/dio.dart';
77
import 'package:flutter/foundation.dart';
8-
import 'package:fluttertoast/fluttertoast.dart';
98
import 'package:gsy_github_app_flutter/common/net/graphql/client.dart';
109
import 'package:gsy_github_app_flutter/common/net/transformer.dart';
10+
import 'package:gsy_github_app_flutter/common/toast.dart';
1111
import 'package:gsy_github_app_flutter/db/provider/repos/read_history_db_provider.dart';
1212
import 'package:gsy_github_app_flutter/db/provider/repos/repository_commits_db_provider.dart';
1313
import 'package:gsy_github_app_flutter/db/provider/repos/repository_detail_db_provider.dart';
@@ -718,8 +718,7 @@ class ReposRepository {
718718
context, "${release.name!}: ${release.body!}");
719719
} else {
720720
if (showTip) {
721-
Fluttertoast.showToast(
722-
msg: context.l10n.app_not_new_version);
721+
showToast(context.l10n.app_not_new_version);
723722
}
724723
}
725724
}

lib/common/toast.dart

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
import 'package:fluttertoast/fluttertoast.dart';
3+
4+
showToast(String message) {
5+
Fluttertoast.showToast(
6+
msg: message,
7+
gravity: ToastGravity.CENTER,
8+
toastLength: Toast.LENGTH_LONG);
9+
}

lib/common/utils/common_utils.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import 'package:device_info_plus/device_info_plus.dart';
66
import 'package:flutter/material.dart';
77
import 'package:flutter/services.dart';
88
import 'package:flutter_riverpod/flutter_riverpod.dart';
9-
import 'package:fluttertoast/fluttertoast.dart';
109
import 'package:gsy_github_app_flutter/common/config/config.dart';
1110
import 'package:gsy_github_app_flutter/common/local/local_storage.dart';
1211
import 'package:gsy_github_app_flutter/common/localization/extension.dart';
1312
import 'package:gsy_github_app_flutter/common/net/address.dart';
13+
import 'package:gsy_github_app_flutter/common/toast.dart';
1414
import 'package:gsy_github_app_flutter/provider/app_state_provider.dart';
1515
import 'package:gsy_github_app_flutter/common/style/gsy_style.dart';
1616
import 'package:gsy_github_app_flutter/common/utils/navigator_utils.dart';
@@ -288,7 +288,7 @@ class CommonUtils {
288288
static copy(String? data, BuildContext context) {
289289
if (data != null) {
290290
Clipboard.setData(ClipboardData(text: data));
291-
Fluttertoast.showToast(msg: context.l10n.option_share_copy_success);
291+
showToast(context.l10n.option_share_copy_success);
292292
}
293293
}
294294

@@ -344,9 +344,9 @@ class CommonUtils {
344344
if (url != null && await canLaunchUrl(Uri.parse(url))) {
345345
await launchUrl(Uri.parse(url), mode: LaunchMode.externalApplication);
346346
} else {
347-
Fluttertoast.showToast(
347+
showToast(
348348
// ignore: use_build_context_synchronously
349-
msg: "${context.l10n.option_web_launcher_error}: ${url ?? ""}");
349+
"${context.l10n.option_web_launcher_error}: ${url ?? ""}");
350350
}
351351
}
352352

lib/page/debug/debug_data_page.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import 'package:flutter/foundation.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter/services.dart';
4-
import 'package:fluttertoast/fluttertoast.dart';
54
import 'package:gsy_github_app_flutter/common/net/interceptors/log_interceptor.dart';
65
import 'package:gsy_github_app_flutter/common/style/gsy_style.dart';
6+
import 'package:gsy_github_app_flutter/common/toast.dart';
77
import 'package:gsy_github_app_flutter/page/error_page.dart';
88
import 'package:gsy_github_app_flutter/test/demo_tab_page.dart';
99
import 'package:gsy_github_app_flutter/widget/flutter_json_widget.dart';
@@ -127,7 +127,7 @@ class _DebugDataListState extends State<DebugDataList>
127127
try {
128128
Clipboard.setData(
129129
ClipboardData(text: "${widget.titles[index]}"));
130-
Fluttertoast.showToast(msg: "复制链接成功");
130+
showToast("复制链接成功");
131131
} catch (e) {
132132
if (kDebugMode) {
133133
print(e);
@@ -138,7 +138,7 @@ class _DebugDataListState extends State<DebugDataList>
138138
try {
139139
Clipboard.setData(
140140
ClipboardData(text: "${widget.dataList[index]}"));
141-
Fluttertoast.showToast(msg: "复制数据成功");
141+
showToast("复制数据成功");
142142
} catch (e) {
143143
if (kDebugMode) {
144144
print(e);

lib/page/issue/issue_detail_page.dart

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import 'dart:async';
22

33
import 'package:flutter/material.dart';
4-
import 'package:fluttertoast/fluttertoast.dart';
54
import 'package:gsy_github_app_flutter/common/localization/extension.dart';
65
import 'package:gsy_github_app_flutter/common/repositories/issue_repository.dart';
6+
import 'package:gsy_github_app_flutter/common/toast.dart';
77
import 'package:gsy_github_app_flutter/model/issue.dart';
88
import 'package:gsy_github_app_flutter/common/style/gsy_style.dart';
99
import 'package:gsy_github_app_flutter/common/utils/common_utils.dart';
@@ -168,8 +168,7 @@ class _IssueDetailPageState extends State<IssueDetailPage>
168168
},
169169
() {
170170
if (contentData == null || contentData!.trim().isEmpty) {
171-
Fluttertoast.showToast(
172-
msg: context.l10n.issue_edit_issue_content_not_be_null);
171+
showToast(context.l10n.issue_edit_issue_content_not_be_null);
173172
return;
174173
}
175174
CommonUtils.showLoadingDialog(context);
@@ -217,13 +216,11 @@ class _IssueDetailPageState extends State<IssueDetailPage>
217216
},
218217
() {
219218
if (title == null || title!.trim().isEmpty) {
220-
Fluttertoast.showToast(
221-
msg: context.l10n.issue_edit_issue_title_not_be_null);
219+
showToast(context.l10n.issue_edit_issue_title_not_be_null);
222220
return;
223221
}
224222
if (content == null || content!.trim().isEmpty) {
225-
Fluttertoast.showToast(
226-
msg: context.l10n.issue_edit_issue_content_not_be_null);
223+
showToast(context.l10n.issue_edit_issue_content_not_be_null);
227224
return;
228225
}
229226
CommonUtils.showLoadingDialog(context);
@@ -256,8 +253,7 @@ class _IssueDetailPageState extends State<IssueDetailPage>
256253
},
257254
() {
258255
if (content == null || content?.trim().isEmpty == true) {
259-
Fluttertoast.showToast(
260-
msg: context.l10n.issue_edit_issue_content_not_be_null);
256+
showToast(context.l10n.issue_edit_issue_content_not_be_null);
261257
return;
262258
}
263259
CommonUtils.showLoadingDialog(context);

lib/page/login/login_page.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_redux/flutter_redux.dart';
33
import 'package:flutter_riverpod/flutter_riverpod.dart';
4-
import 'package:fluttertoast/fluttertoast.dart';
54
import 'package:gsy_github_app_flutter/common/config/config.dart';
65
import 'package:gsy_github_app_flutter/common/local/local_storage.dart';
76
import 'package:gsy_github_app_flutter/common/localization/extension.dart';
87
import 'package:gsy_github_app_flutter/common/net/address.dart';
8+
import 'package:gsy_github_app_flutter/common/toast.dart';
99
import 'package:gsy_github_app_flutter/common/utils/navigator_utils.dart';
1010
import 'package:gsy_github_app_flutter/redux/gsy_state.dart';
1111
import 'package:gsy_github_app_flutter/redux/login_redux.dart';
@@ -183,10 +183,7 @@ mixin LoginBLoC on State<LoginPage> {
183183
}
184184

185185
loginIn() async {
186-
Fluttertoast.showToast(
187-
msg: context.l10n.login_deprecated,
188-
gravity: ToastGravity.CENTER,
189-
toastLength: Toast.LENGTH_LONG);
186+
showToast(context.l10n.login_deprecated);
190187
return;
191188
// if (_userName == null || _userName.isEmpty) {
192189
// return;

lib/page/release/release_page.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'package:flutter/material.dart';
2-
import 'package:fluttertoast/fluttertoast.dart';
32
import 'package:gsy_github_app_flutter/common/localization/extension.dart';
43
import 'package:gsy_github_app_flutter/common/repositories/repos_repository.dart';
54
import 'package:gsy_github_app_flutter/common/style/gsy_style.dart';
5+
import 'package:gsy_github_app_flutter/common/toast.dart';
66
import 'package:gsy_github_app_flutter/common/utils/common_utils.dart';
77
import 'package:gsy_github_app_flutter/common/utils/html_utils.dart';
88
import 'package:gsy_github_app_flutter/widget/gsy_common_option_widget.dart';
@@ -68,7 +68,7 @@ class _ReleasePageState extends State<ReleasePage>
6868
if (await canLaunchUrl(Uri.parse(url))) {
6969
await launchUrl(Uri.parse(url), mode: LaunchMode.externalApplication);
7070
} else {
71-
Fluttertoast.showToast(msg: "${gl.option_web_launcher_error}: $url");
71+
showToast("${gl.option_web_launcher_error}: $url");
7272
}
7373
}
7474

lib/page/repos/repository_detail_page.dart

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
2-
import 'package:fluttertoast/fluttertoast.dart';
32
import 'package:gsy_github_app_flutter/common/localization/extension.dart';
43
import 'package:gsy_github_app_flutter/common/style/gsy_style.dart';
4+
import 'package:gsy_github_app_flutter/common/toast.dart';
55
import 'package:gsy_github_app_flutter/common/utils/common_utils.dart';
66
import 'package:gsy_github_app_flutter/common/utils/navigator_utils.dart';
77
import 'package:gsy_github_app_flutter/model/repository_ql.dart';
@@ -145,13 +145,11 @@ class _RepositoryDetailPageState extends State<RepositoryDetailPage>
145145
content = contentValue;
146146
}, () {
147147
if (title.trim().isEmpty) {
148-
Fluttertoast.showToast(
149-
msg: context.l10n.issue_edit_issue_title_not_be_null);
148+
showToast(context.l10n.issue_edit_issue_title_not_be_null);
150149
return;
151150
}
152151
if (content.trim().isEmpty) {
153-
Fluttertoast.showToast(
154-
msg: context.l10n.issue_edit_issue_content_not_be_null);
152+
showToast(context.l10n.issue_edit_issue_content_not_be_null);
155153
return;
156154
}
157155
CommonUtils.showLoadingDialog(context);
@@ -242,8 +240,7 @@ class _RepositoryDetailPageState extends State<RepositoryDetailPage>
242240
child: FloatingActionButton(
243241
onPressed: () {
244242
if (provider.repository?.hasIssuesEnabled == false) {
245-
Fluttertoast.showToast(
246-
msg: context.l10n.repos_no_support_issue);
243+
showToast(context.l10n.repos_no_support_issue);
247244
return;
248245
}
249246
_createIssue(provider);

lib/page/repos/repository_file_list_page.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import 'package:easy_refresh/easy_refresh.dart';
22
import 'package:flutter/foundation.dart';
33
import 'package:flutter/material.dart';
4-
import 'package:fluttertoast/fluttertoast.dart';
54
import 'package:gsy_github_app_flutter/common/localization/extension.dart';
65
import 'package:gsy_github_app_flutter/common/repositories/data_result.dart';
6+
import 'package:gsy_github_app_flutter/common/toast.dart';
77
import 'package:gsy_github_app_flutter/model/file_model.dart';
88
import 'package:gsy_github_app_flutter/common/style/gsy_style.dart';
99
import 'package:gsy_github_app_flutter/common/utils/common_utils.dart';
@@ -95,7 +95,7 @@ class RepositoryDetailFileListPageState
9595
///头部列表点击
9696
_resolveHeaderClick(index) {
9797
if (_isLoading) {
98-
Fluttertoast.showToast(msg: context.l10n.loading_text);
98+
showToast(context.l10n.loading_text);
9999
return;
100100
}
101101
if (headerList.isNotEmpty && index != -1 && headerList[index] != ".") {
@@ -116,7 +116,7 @@ class RepositoryDetailFileListPageState
116116
var provider = context.read<ReposDetailProvider>();
117117
if (fileItemViewModel.type == "dir") {
118118
if (_isLoading) {
119-
Fluttertoast.showToast(msg: context.l10n.loading_text);
119+
showToast(context.l10n.loading_text);
120120
return;
121121
}
122122

0 commit comments

Comments
 (0)