From 7d70886d52b6a2956cfe626cd2929b833f573cad Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Sun, 16 Oct 2022 16:50:58 +0800 Subject: [PATCH] style: dart fix apply --- packages/github_trending/README.md | 3 +-- .../github_trending/analysis_options.yaml | 24 ++++++++--------- packages/github_trending/lib/src/api.dart | 6 ++--- packages/github_trending/lib/src/model.dart | 26 +++++++++---------- packages/github_trending/pubspec.yaml | 1 - .../test/github_trending_test.dart | 4 +-- 6 files changed, 31 insertions(+), 33 deletions(-) diff --git a/packages/github_trending/README.md b/packages/github_trending/README.md index 2f6c0a4..ebf9afb 100644 --- a/packages/github_trending/README.md +++ b/packages/github_trending/README.md @@ -1,7 +1,6 @@ # github_trending -[![pub](https://img.shields.io/pub/v/github_trending.svg)](https://pub.dev/packages/github_trending) -[![test](https://github.com/pd4d10/github-trending/workflows/test/badge.svg)](https://github.com/pd4d10/github-trending/actions?query=workflow:test) +[![pub](https://img.shields.io/pub/v/github_trending.svg)](https://pub.dev/packages/github_trending) [![test](https://github.com/pd4d10/github-trending/workflows/test/badge.svg)](https://github.com/pd4d10/github-trending/actions?query=workflow:test) A Dart library to get GitHub trending repositories and developers via [github-trending-api](https://github.com/huchenme/github-trending-api). diff --git a/packages/github_trending/analysis_options.yaml b/packages/github_trending/analysis_options.yaml index a686c1b..1b5ba2a 100644 --- a/packages/github_trending/analysis_options.yaml +++ b/packages/github_trending/analysis_options.yaml @@ -1,14 +1,14 @@ -# Defines a default set of lint rules enforced for -# projects at Google. For details and rationale, -# see https://github.com/dart-lang/pedantic#enabled-lints. -include: package:pedantic/analysis_options.yaml +# # Defines a default set of lint rules enforced for +# # projects at Google. For details and rationale, +# # see https://github.com/dart-lang/pedantic#enabled-lints. +# include: package:pedantic/analysis_options.yaml -# For lint rules and documentation, see http://dart-lang.github.io/linter/lints. -# Uncomment to specify additional rules. -# linter: -# rules: -# - camel_case_types +# # For lint rules and documentation, see http://dart-lang.github.io/linter/lints. +# # Uncomment to specify additional rules. +# # linter: +# # rules: +# # - camel_case_types -analyzer: -# exclude: -# - path/to/excluded/files/** +# analyzer: +# # exclude: +# # - path/to/excluded/files/** diff --git a/packages/github_trending/lib/src/api.dart b/packages/github_trending/lib/src/api.dart index 79d33a9..8fa9d99 100644 --- a/packages/github_trending/lib/src/api.dart +++ b/packages/github_trending/lib/src/api.dart @@ -1,17 +1,17 @@ import 'dart:convert'; + import 'package:github_trending/src/model.dart'; import 'package:http/http.dart' as http; class TrendingRepositoryPrimaryLanguage { + TrendingRepositoryPrimaryLanguage({this.name, this.color}); String? name; String? color; - TrendingRepositoryPrimaryLanguage({this.name, this.color}); } class GithubTrending { - String prefix; - GithubTrending({this.prefix = 'https://ghapi.huchen.dev'}); + String prefix; Future _getJson(Uri url) async { final res = await http.get(url); diff --git a/packages/github_trending/lib/src/model.dart b/packages/github_trending/lib/src/model.dart index 0d0192a..41dd2b9 100644 --- a/packages/github_trending/lib/src/model.dart +++ b/packages/github_trending/lib/src/model.dart @@ -4,6 +4,9 @@ part 'model.g.dart'; @JsonSerializable() class GithubTrendingRepository { + factory GithubTrendingRepository.fromJson(Map json) => + _$GithubTrendingRepositoryFromJson(json); + GithubTrendingRepository(); String? author; String? name; String? avatar; @@ -15,41 +18,38 @@ class GithubTrendingRepository { int? forks; int? currentPeriodStars; List? builtBy; - GithubTrendingRepository(); - factory GithubTrendingRepository.fromJson(Map json) => - _$GithubTrendingRepositoryFromJson(json); } @JsonSerializable() class GithubTrendingRepositoryBuiltBy { + factory GithubTrendingRepositoryBuiltBy.fromJson(Map json) => + _$GithubTrendingRepositoryBuiltByFromJson(json); + GithubTrendingRepositoryBuiltBy(); String? href; String? avatar; String? username; - GithubTrendingRepositoryBuiltBy(); - factory GithubTrendingRepositoryBuiltBy.fromJson(Map json) => - _$GithubTrendingRepositoryBuiltByFromJson(json); } @JsonSerializable() class GithubTrendingDeveloper { + factory GithubTrendingDeveloper.fromJson(Map json) => + _$GithubTrendingDeveloperFromJson(json); + GithubTrendingDeveloper(); String? username; String? name; String? type; String? url; String? avatar; GithubTrendingDeveloperRepository? repo; - GithubTrendingDeveloper(); - factory GithubTrendingDeveloper.fromJson(Map json) => - _$GithubTrendingDeveloperFromJson(json); } @JsonSerializable() class GithubTrendingDeveloperRepository { - String? name; - String? description; - String? url; - GithubTrendingDeveloperRepository(); factory GithubTrendingDeveloperRepository.fromJson( Map json) => _$GithubTrendingDeveloperRepositoryFromJson(json); + GithubTrendingDeveloperRepository(); + String? name; + String? description; + String? url; } diff --git a/packages/github_trending/pubspec.yaml b/packages/github_trending/pubspec.yaml index 0a45ad2..82a60ec 100644 --- a/packages/github_trending/pubspec.yaml +++ b/packages/github_trending/pubspec.yaml @@ -11,7 +11,6 @@ dependencies: json_annotation: ^4.0.0 dev_dependencies: - pedantic: ^1.11.0 test: ^1.16.5 build_runner: ^1.11.5 json_serializable: ^4.0.2 diff --git a/packages/github_trending/test/github_trending_test.dart b/packages/github_trending/test/github_trending_test.dart index be79ad2..e153012 100644 --- a/packages/github_trending/test/github_trending_test.dart +++ b/packages/github_trending/test/github_trending_test.dart @@ -26,10 +26,10 @@ void main() { test('star and fork count', () { // make sure at least one item has star or fork // to ensure no parse error - var itemHasStar = items!.where((item) => item.stars != null); + final itemHasStar = items!.where((item) => item.stars != null); expect(itemHasStar, isNotEmpty); - var itemHasFork = items!.where((item) => item.forks != null); + final itemHasFork = items!.where((item) => item.forks != null); expect(itemHasFork, isNotEmpty); });