lint: update flutter_lints pkg to v3.0.1 and fix warnings

project-violet · Nov 12, 2023 · 2a631da · 2a631da
1 parent 46a075e
commit 2a631da
Show file tree

Hide file tree

Showing 134 changed files with 528 additions and 602 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -22,7 +22,6 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
-    avoid_function_literals_in_foreach_calls: false # TODO(ykh09242): Enable this lint.
     avoid_print: false
     use_build_context_synchronously: false # TODO(ykh09242): Enable this lint.
 

diff --git a/lib/cert/root.dart b/lib/cert/root.dart
@@ -8,7 +8,7 @@ import 'package:violet/cert/cert_data.dart';
 import 'package:violet/cert/cert_util.dart';
 
 class RootCert extends CertData {
-  RootCert({required Map<String, dynamic> data}) : super(data: data);
+  RootCert({required super.data});
 
   RSAPublicKey rsaPublic() => CertUtil.importRSAPublicKey(data['PubKey']);
 

diff --git a/lib/component/eh/eh_bookmark.dart b/lib/component/eh/eh_bookmark.dart
@@ -23,9 +23,9 @@ class EHBookmark {
               'https://exhentai.org/favorites.php?page=$j&favcat=$i');
           var matched = rr.allMatches(html).map((e) => e.group(0));
           if (matched.isEmpty) break;
-          matched.forEach((element) {
+          for (var element in matched) {
             hh.add(int.parse(element!.split('/')[4]));
-          });
+          }
         }
       } catch (_) {}
       result.add(hh);
@@ -39,9 +39,9 @@ class EHBookmark {
               'https://e-hentai.org/favorites.php?page=$j&favcat=$i');
           var matched = r2.allMatches(html).map((e) => e.group(0));
           if (matched.isEmpty) break;
-          matched.forEach((element) {
+          for (var element in matched) {
             result[i].add(int.parse(element!.split('/')[4]));
-          });
+          }
         }
       } catch (_) {}
     }

diff --git a/lib/component/eh/eh_parser.dart b/lib/component/eh/eh_parser.dart
@@ -135,7 +135,7 @@ class EHParser {
         doc.querySelectorAll("div[id='gmid'] div[id='taglist'] table tr");
     var info = <String, List<String>>{};
 
-    nodesData.forEach((element) {
+    for (var element in nodesData) {
       try {
         info[element.querySelector('td')!.text.trim()] = element
             .querySelectorAll('td')[1]
@@ -146,7 +146,7 @@ class EHParser {
         Logger.error('[eh-parser] E: $e\n'
             '$st');
       }
-    });
+    }
 
     if (info.containsKey('language:')) article.languages = info['language:'];
     if (info.containsKey('group:')) article.group = info['group:'];
@@ -162,7 +162,7 @@ class EHParser {
 
     var hu = HtmlUnescape();
     var df = DateFormat('dd MMMM yyyy, H:m');
-    nodeComments.forEach((element) {
+    for (var element in nodeComments) {
       var date =
           hu.convert(element.querySelector('div.c2 div.c3')!.text.trim());
       var author =
@@ -179,7 +179,7 @@ class EHParser {
               true),
           author,
           contents));
-    });
+    }
 
     comments.sort((x, y) => x.item1.compareTo(y.item1));
     article.comment = comments;
@@ -193,7 +193,7 @@ class EHParser {
 
     var nodes = parse(html).querySelectorAll('div.itg > div.id1');
 
-    nodes.forEach((element) {
+    for (var element in nodes) {
       try {
         var article = EHResultArticle();
 
@@ -210,7 +210,7 @@ class EHParser {
 
         result.add(article);
       } catch (_) {}
-    });
+    }
 
     return result;
   }
@@ -223,7 +223,7 @@ class EHParser {
 
     if (nodes.length > 1) nodes.removeAt(0);
 
-    nodes.forEach((element) {
+    for (var element in nodes) {
       try {
         var article = EHResultArticle();
         var tds = element.querySelectorAll('td');
@@ -242,7 +242,7 @@ class EHParser {
 
         result.add(article);
       } catch (_) {}
-    });
+    }
 
     return result;
   }
@@ -325,7 +325,7 @@ class EHParser {
 
     if (nodes.length > 1) nodes.removeAt(0);
 
-    nodes.forEach((element) {
+    for (var element in nodes) {
       var article = EHResultArticle();
 
       article.type =
@@ -365,7 +365,7 @@ class EHParser {
           element.querySelectorAll('td')[5].querySelector('div a')!.text.trim();
 
       result.add(article);
-    });
+    }
 
     return result;
   }

diff --git a/lib/component/hitomi/indexs.dart b/lib/component/hitomi/indexs.dart
@@ -76,10 +76,10 @@ class HitomiIndexs {
             'assets/locale/tag/related-tag-${TagTranslate.defaultLanguage}.json'))
         as List<dynamic>;
     relatedTag = <String, dynamic>{};
-    relatedData.forEach((element) {
+    for (var element in relatedData) {
       var kv = (element as Map<String, dynamic>).entries.first;
       relatedTag[kv.key] = kv.value;
-    });
+    }
   }
 
   static List<Tuple2<String, double>> _calculateSimilars(

diff --git a/lib/component/hitomi/series_finder.dart b/lib/component/hitomi/series_finder.dart
@@ -71,9 +71,9 @@ class SeriesFinder {
     }
 
     seriesList.sort((x, y) => x.length.compareTo(y.length));
-    seriesList.forEach((element) {
+    for (var element in seriesList) {
       print('[${element.length}] ${element.first.artists()}');
-    });
+    }
   }
 
   static Future<void> doFind2() async {
@@ -150,8 +150,8 @@ class SeriesFinder {
     }
 
     seriesList.sort((x, y) => x.item2.length.compareTo(y.item2.length));
-    seriesList.forEach((element) {
+    for (var element in seriesList) {
       print('[${element.item2.length}] ${element.item1}');
-    });
+    }
   }
 }
diff --git a/lib/component/hitomi/tag_translate.dart b/lib/component/hitomi/tag_translate.dart
@@ -123,11 +123,11 @@ class TagTranslate {
     var result = contains(part) + containsAndro(part);
     var overlap = <String>{};
     var rresult = <DisplayedTag>[];
-    result.forEach((element) {
-      if (overlap.contains(element.getTag())) return;
+    for (var element in result) {
+      if (overlap.contains(element.getTag())) continue;
       overlap.add(element.getTag());
       rresult.add(element);
-    });
+    }
     return rresult;
   }
 
@@ -167,11 +167,11 @@ class TagTranslate {
     result.sort((x, y) => x.item2.compareTo(y.item2));
     var overlap = <String>{};
     var rresult = <Tuple2<DisplayedTag, int>>[];
-    result.forEach((element) {
-      if (overlap.contains(element.item1.getTag())) return;
+    for (var element in result) {
+      if (overlap.contains(element.item1.getTag())) continue;
       overlap.add(element.item1.getTag());
       rresult.add(element);
-    });
+    }
     return rresult;
   }
 

diff --git a/lib/component/hitomi/title_cluster.dart b/lib/component/hitomi/title_cluster.dart
@@ -64,28 +64,28 @@ class HitomiTitleCluster {
     if (maxnode > 100) maxnode = 100;
 
     var groups = <List<int>>[];
-    ctitles.forEach((element) {
+    for (var element in ctitles) {
       var near = tree.nearest(element, maxnode, 8);
 
       var rr = <int>[];
-      near.forEach((element) {
+      for (var element in near) {
         rr.add(element[0]['t'].index);
-      });
+      }
 
       rr.sort();
       groups.add(rr);
-    });
+    }
 
     // Group By Same Lists
     var gg = groupBy(groups, (group) => group.join(','));
     var ds = DisjointSet(titles.length);
 
     // Join groups
     gg.forEach((key, value) {
-      value[0].forEach((element) {
-        if (value[0][0] == element) return;
+      for (var element in value[0]) {
+        if (value[0][0] == element) continue;
         ds.union(value[0][0], element);
-      });
+      }
     });
 
     var join = <int, List<int>>{};

diff --git a/lib/database/query.dart b/lib/database/query.dart
@@ -87,9 +87,9 @@ class QueryManager {
         queryRaw + (!Settings.searchPure ? ' AND ExistOnHitomi=1' : ''));
 
     var qr = <String, QueryResult>{};
-    qm.results!.forEach((element) {
+    for (var element in qm.results!) {
       qr[element.id().toString()] = element;
-    });
+    }
 
     var rr = ids
         .where((e) => qr.containsKey(e.toString()))

diff --git a/lib/database/user/bookmark.dart b/lib/database/user/bookmark.dart
@@ -290,9 +290,9 @@ class Bookmark {
       groups[y] = tmp;
     }
 
-    groups.forEach((element) {
+    for (var element in groups) {
       print(element.gorder());
-    });
+    }
 
     if (from < to) {
       for (; from < to; from++) {
@@ -306,9 +306,9 @@ class Bookmark {
       }
     }
 
-    groups.forEach((element) {
+    for (var element in groups) {
       print(element.gorder());
-    });
+    }
   }
 
   Future<List<BookmarkArticle>> getArticle() async {
@@ -354,9 +354,9 @@ class Bookmark {
     if (bookmarkSet == null) {
       var article = await getArticle();
       bookmarkSet = HashSet<int>();
-      article.forEach((element) {
+      for (var element in article) {
         bookmarkSet!.add(int.parse(element.article()));
-      });
+      }
     }
 
     return bookmarkSet!.contains(id);
@@ -385,9 +385,9 @@ class Bookmark {
       bookmarkArtistSet![2] = HashSet<String>();
       bookmarkArtistSet![3] = HashSet<String>();
       bookmarkArtistSet![4] = HashSet<String>();
-      artist.forEach((element) {
+      for (var element in artist) {
         bookmarkArtistSet![element.type()]!.add(element.artist());
-      });
+      }
     }
 
     return bookmarkArtistSet![type]!.contains(name);
@@ -398,9 +398,9 @@ class Bookmark {
     if (bookmarkUserSet == null) {
       var user = await getUser();
       bookmarkUserSet = HashSet<String>();
-      user.forEach((element) {
+      for (var element in user) {
         bookmarkUserSet!.add(element.user());
-      });
+      }
     }
 
     return bookmarkUserSet!.contains(user);
@@ -411,9 +411,9 @@ class Bookmark {
     if (historyUserSet == null) {
       var user = await getHistoryUser();
       historyUserSet = HashSet<String>();
-      user.forEach((element) {
+      for (var element in user) {
         historyUserSet!.add(element.user());
-      });
+      }
     }
 
     return historyUserSet!.contains(user);

diff --git a/lib/downloader/isolate/core.dart b/lib/downloader/isolate/core.dart
@@ -55,9 +55,9 @@ class IsolateDownloaderTask {
     if (task.accept != null) header['accept'] = task.accept!;
     if (task.userAgent != null) header['user-agent'] = task.userAgent!;
     if (task.headers != null) {
-      task.headers!.entries.forEach((element) {
+      for (var element in task.headers!.entries) {
         header[element.key.toLowerCase()] = element.value;
-      });
+      }
     }
     return IsolateDownloaderTask(
       id: taskId,
@@ -282,7 +282,9 @@ void _cancelTask(int taskId) {
 /// cancel all tasks and remove dqueue
 void _terminate() {
   _dqueue.clear();
-  _workingMap.entries.forEach((element) => element.value.cancelToken!.cancel());
+  for (var value in _workingMap.values) {
+    value.cancelToken!.cancel();
+  }
 }
 
 void _modifyTaskPoolSize(int sz) {

diff --git a/lib/log/log.dart b/lib/log/log.dart
@@ -103,9 +103,9 @@ class Logger {
   }
 
   static Future<void> showLogs() async {
-    (await logFile.readAsLines()).forEach((element) {
+    for (var element in (await logFile.readAsLines())) {
       print(element);
-    });
+    }
   }
 
   static Future<void> exportLog() async {

diff --git a/lib/main.dart b/lib/main.dart
@@ -86,7 +86,7 @@ Future<void> initFirebase() async {
 }
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/pages/after_loading/afterloading_page.dart b/lib/pages/after_loading/afterloading_page.dart
@@ -28,7 +28,7 @@ import 'package:violet/version/update_sync.dart';
 import 'package:violet/widgets/toast.dart';
 
 class AfterLoadingPage extends StatefulWidget {
-  const AfterLoadingPage({Key? key}) : super(key: key);
+  const AfterLoadingPage({super.key});
 
   @override
   State<AfterLoadingPage> createState() => AfterLoadingPageState();