message

CarGuo · CarGuo · commit 725da7d737c2 · 2024-04-29T10:25:08.000+08:00
diff --git a/lib/app.dart b/lib/app.dart
@@ -193,8 +193,7 @@ mixin HttpErrorListener on State<FlutterReduxApp> {
         showToast(GSYLocalizations.i18n(context)!.github_refused);
         break;
       default:
-        showToast("${GSYLocalizations.i18n(context)!.network_error_unknown} " +
-            message);
+        showToast("${GSYLocalizations.i18n(context)!.network_error_unknown} $message");
         break;
     }
   }
diff --git a/lib/common/dao/user_dao.dart b/lib/common/dao/user_dao.dart
@@ -37,7 +37,7 @@ class UserDao {
     );
     dynamic resultData;
     if (res != null && res.result) {
-      var result = Uri.parse("gsy://oauth?" + res.data);
+      var result = Uri.parse("gsy://oauth?$res.data");
       var token = result.queryParameters["access_token"]!;
       var _token = 'token $token';
       await LocalStorage.save(Config.TOKEN_KEY, _token);
diff --git a/lib/common/net/address.dart b/lib/common/net/address.dart
@@ -166,13 +166,14 @@ class Address {
 
   ///仓库路径下的内容 get
   static reposDataDir(reposOwner, repos, path, [branch = 'master']) {
-    return "${host}repos/$reposOwner/$repos/contents/$path${(branch == null || branch == "") ? "" : ("?ref=" + branch)}";
+    return "${host}repos/$reposOwner/$repos/contents/$path${(branch == null || branch == "") ? "" : ("?ref=$branch")}";
   }
 
   ///README 文件地址 get
   static readmeFile(reposNameFullName, curBranch) {
+    // ignore: prefer_interpolation_to_compose_strings
     return "${"${host}repos/" +
-        reposNameFullName}/readme${(curBranch == null || curBranch == "" ) ? "" : ("?ref=" + curBranch)}";
+        reposNameFullName}/readme${(curBranch == null || curBranch == "" ) ? "" : ("?ref=$curBranch")}";
 
   }
 
diff --git a/lib/common/net/interceptors/token_interceptor.dart b/lib/common/net/interceptors/token_interceptor.dart
@@ -30,7 +30,7 @@ class TokenInterceptors extends InterceptorsWrapper {
     try {
       var responseJson = response.data;
       if (response.statusCode == 201 && responseJson["token"] != null) {
-        _token = 'token ' + responseJson["token"];
+        _token = 'token ${responseJson["token"]}';
         await LocalStorage.save(Config.TOKEN_KEY, _token);
       }
     } catch (e) {
diff --git a/lib/common/scoped_model/scoped_model.dart b/lib/common/scoped_model/scoped_model.dart
@@ -204,7 +204,7 @@ class _InheritedModel<T extends Model> extends InheritedWidget {
 }
 
 /// Builds a child for a [ScopedModelDescendant].
-typedef Widget ScopedModelDescendantBuilder<T extends Model>(
+typedef ScopedModelDescendantBuilder<T extends Model> = Widget Function(
   BuildContext context,
   Widget? child,
   T? model,
diff --git a/lib/common/utils/html_utils.dart b/lib/common/utils/html_utils.dart
@@ -89,6 +89,7 @@ class HtmlUtils {
       {backgroundColor = GSYColors.white,
       String actionColor = GSYColors.actionBlueString,
       userBR = true}) {
+    // ignore: prefer_interpolation_to_compose_strings
     return "${"${"<html>\n" +
         "<head>\n" +
         "<meta charset=\"utf-8\" />\n" +
diff --git a/lib/page/repos/scope/repos_detail_model.dart b/lib/page/repos/scope/repos_detail_model.dart
@@ -75,7 +75,7 @@ class ReposDetailModel extends Model {
   ///#################################################///
 
   ///获取网络端仓库的star等状态
-  getReposStatus(List<Widget> getBottomWidget()) async {
+  getReposStatus(List<Widget> Function() getBottomWidget) async {
     String watchText =
         repository!.isSubscription == "SUBSCRIBED" ? "UnWatch" : "Watch";
     String starText = repository!.isStared! ? "UnStar" : "Star";
diff --git a/lib/page/repos/widget/repos_header_item.dart b/lib/page/repos/widget/repos_header_item.dart
@@ -481,9 +481,9 @@ class ReposHeaderViewModel {
     repositoryIsFork = map.isFork;
     license = map.license != null ? map.license : "";
     repositoryParentName =
-        map.parent != null ? map.parent!.reposName : null;
+        map.parent?.reposName;
     repositoryParentUser =
-        map.parent != null ? map.parent!.ownerName : null;
+        map.parent?.ownerName;
     created_at = CommonUtils.getNewsTimeStr(DateTime.parse(map.createdAt!));
     push_at = CommonUtils.getNewsTimeStr((DateTime.parse(map.pushAt!)));
   }
diff --git a/lib/page/search/widget/gsy_search_drawer.dart b/lib/page/search/widget/gsy_search_drawer.dart
@@ -6,7 +6,7 @@ import 'package:gsy_github_app_flutter/common/style/gsy_style.dart';
 /// Created by guoshuyu
 /// Date: 2018-07-18
 
-typedef void SearchSelectItemChanged<String>(String value);
+typedef SearchSelectItemChanged<String> = void Function(String value);
 
 class GSYSearchDrawer extends StatefulWidget {
   final SearchSelectItemChanged<String?> typeCallback;
diff --git a/lib/widget/flutter_json_widget.dart b/lib/widget/flutter_json_widget.dart
@@ -119,6 +119,7 @@ class JsonViewerWidgetState extends State<JsonViewerWidget> {
     } else if (entry.value is String) {
       return Expanded(
           child: Text(
+        // ignore: prefer_interpolation_to_compose_strings
         '${'\"' + entry.value}\"',
         style: const TextStyle(color: Colors.redAccent),
       ));
diff --git a/lib/widget/gsy_select_item_widget.dart b/lib/widget/gsy_select_item_widget.dart
@@ -6,7 +6,7 @@ import 'package:gsy_github_app_flutter/widget/gsy_card_item.dart';
 /// Created by guoshuyu
 /// Date: 2018-07-19
 
-typedef void SelectItemChanged<int>(int value);
+typedef SelectItemChanged<int> = void Function(int value);
 
 class GSYSelectItemWidget extends StatefulWidget
     implements PreferredSizeWidget {
diff --git a/lib/widget/menu/src/radial_menu.dart b/lib/widget/menu/src/radial_menu.dart
@@ -10,7 +10,7 @@ import 'package:gsy_github_app_flutter/widget/menu/src/radial_menu_item.dart';
 const double _radiansPerDegree = Math.pi / 180;
 const double _startAngle = -90.0 * _radiansPerDegree;
 
-typedef double ItemAngleCalculator(int index);
+typedef ItemAngleCalculator = double Function(int index);
 
 /// A radial menu for selecting from a list of items.
 ///
diff --git a/lib/widget/pull/nested/gsy_sliver_header_delegate.dart b/lib/widget/pull/nested/gsy_sliver_header_delegate.dart
@@ -50,5 +50,5 @@ class GSYSliverHeaderDelegate extends SliverPersistentHeaderDelegate {
   FloatingHeaderSnapConfiguration get snapConfiguration => snapConfig;
 }
 
-typedef Widget Builder(
+typedef Builder = Widget Function(
     BuildContext context, double shrinkOffset, bool overlapsContent);

Original file line number	Diff line number	Diff line change
`@@ -193,8 +193,7 @@ mixin HttpErrorListener on State<FlutterReduxApp> {`
`193`	`193`	`showToast(GSYLocalizations.i18n(context)!.github_refused);`
`194`	`194`	`break;`
`195`	`195`	`default:`
`196`		`- showToast("${GSYLocalizations.i18n(context)!.network_error_unknown} " +`
`197`		`- message);`
	`196`	`+ showToast("${GSYLocalizations.i18n(context)!.network_error_unknown} $message");`
`198`	`197`	`break;`
`199`	`198`	`}`
`200`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,13 +166,14 @@ class Address {`
`166`	`166`
`167`	`167`	`///仓库路径下的内容 get`
`168`	`168`	`static reposDataDir(reposOwner, repos, path, [branch = 'master']) {`
`169`		`- return "${host}repos/$reposOwner/$repos/contents/$path${(branch == null \|\| branch == "") ? "" : ("?ref=" + branch)}";`
	`169`	`+ return "${host}repos/$reposOwner/$repos/contents/$path${(branch == null \|\| branch == "") ? "" : ("?ref=$branch")}";`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`///README 文件地址 get`
`173`	`173`	`static readmeFile(reposNameFullName, curBranch) {`
	`174`	`+ // ignore: prefer_interpolation_to_compose_strings`
`174`	`175`	`return "${"${host}repos/" +`
`175`		`- reposNameFullName}/readme${(curBranch == null \|\| curBranch == "" ) ? "" : ("?ref=" + curBranch)}";`
	`176`	`+ reposNameFullName}/readme${(curBranch == null \|\| curBranch == "" ) ? "" : ("?ref=$curBranch")}";`
`176`	`177`
`177`	`178`	`}`
`178`	`179`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class TokenInterceptors extends InterceptorsWrapper {`
`30`	`30`	`try {`
`31`	`31`	`var responseJson = response.data;`
`32`	`32`	`if (response.statusCode == 201 && responseJson["token"] != null) {`
`33`		`- _token = 'token ' + responseJson["token"];`
	`33`	`+ _token = 'token ${responseJson["token"]}';`
`34`	`34`	`await LocalStorage.save(Config.TOKEN_KEY, _token);`
`35`	`35`	`}`
`36`	`36`	`} catch (e) {`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ class _InheritedModel<T extends Model> extends InheritedWidget {`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`/// Builds a child for a [ScopedModelDescendant].`
`207`		`-typedef Widget ScopedModelDescendantBuilder<T extends Model>(`
	`207`	`+typedef ScopedModelDescendantBuilder<T extends Model> = Widget Function(`
`208`	`208`	`BuildContext context,`
`209`	`209`	`Widget? child,`
`210`	`210`	`T? model,`