From 61d5a3e846046797e62fe06974a042e36dc4ac3f Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Thu, 6 Oct 2022 15:13:59 +0800 Subject: [PATCH] refactor: drop material color references --- lib/main.dart | 7 ----- lib/screens/gh_issue.dart | 8 +++--- lib/screens/gl_commit.dart | 1 + lib/utils/utils.dart | 2 +- lib/widgets/avatar.dart | 1 + lib/widgets/comment_item.dart | 3 ++- lib/widgets/contribution.dart | 1 + lib/widgets/error_reload.dart | 11 ++++---- lib/widgets/files_item.dart | 1 + lib/widgets/link.dart | 43 ------------------------------ lib/widgets/markdown_view.dart | 1 + lib/widgets/notification_item.dart | 2 +- lib/widgets/timeline_item.dart | 4 +-- 13 files changed, 21 insertions(+), 64 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 267187a..792cceb 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,11 +1,9 @@ -import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:git_touch/app.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/code.dart'; import 'package:git_touch/models/notification.dart'; import 'package:git_touch/models/theme.dart'; -import 'package:git_touch/utils/utils.dart'; import 'package:provider/provider.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; @@ -27,11 +25,6 @@ void main() async { codeModel.init(), ]); - // To match status bar color to app bar color - SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle( - statusBarColor: Colors.transparent, - )); - runApp(MultiProvider( providers: [ ChangeNotifierProvider(create: (context) => notificationModel), diff --git a/lib/screens/gh_issue.dart b/lib/screens/gh_issue.dart index 6ec26d1..8244329 100644 --- a/lib/screens/gh_issue.dart +++ b/lib/screens/gh_issue.dart @@ -226,14 +226,14 @@ class GhIssueScreen extends StatelessWidget { Row( children: [ Text('+${pr.additions}', - style: const TextStyle( - color: Colors.green, + style: TextStyle( + color: AntTheme.of(context).colorSuccess, fontSize: 15, )), const SizedBox(width: 2), Text('-${pr.deletions}', - style: const TextStyle( - color: Colors.red, + style: TextStyle( + color: AntTheme.of(context).colorDanger, fontSize: 15, )), Icon(Ionicons.chevron_forward, diff --git a/lib/screens/gl_commit.dart b/lib/screens/gl_commit.dart index db3a1f3..c85192d 100644 --- a/lib/screens/gl_commit.dart +++ b/lib/screens/gl_commit.dart @@ -1,3 +1,4 @@ +import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:flutter_highlight/flutter_highlight.dart'; diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 03d808e..a169f0c 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -10,7 +10,7 @@ import 'package:universal_io/io.dart'; import 'package:url_launcher/url_launcher.dart'; export 'package:flutter/material.dart' - show Colors, Brightness, Card, ExpansionTile, IconButton; // TODO: remove + show Card, ExpansionTile, IconButton; // TODO: remove export 'package:flutter_vector_icons/flutter_vector_icons.dart' show Octicons, Ionicons; diff --git a/lib/widgets/avatar.dart b/lib/widgets/avatar.dart index 0cdd1d6..25015c8 100644 --- a/lib/widgets/avatar.dart +++ b/lib/widgets/avatar.dart @@ -1,4 +1,5 @@ import 'package:fimber/fimber.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; diff --git a/lib/widgets/comment_item.dart b/lib/widgets/comment_item.dart index 5e22982..c30caea 100644 --- a/lib/widgets/comment_item.dart +++ b/lib/widgets/comment_item.dart @@ -1,4 +1,5 @@ import 'package:antd_mobile/antd_mobile.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/theme.dart'; @@ -130,7 +131,7 @@ mutation { ? (theme.brightness == Brightness.dark ? PrimerColors.blue900 : PrimerColors.blue000) - : Colors.transparent, + : null, ), child: Wrap( crossAxisAlignment: WrapCrossAlignment.center, diff --git a/lib/widgets/contribution.dart b/lib/widgets/contribution.dart index b2a7d31..dada4ce 100644 --- a/lib/widgets/contribution.dart +++ b/lib/widgets/contribution.dart @@ -1,5 +1,6 @@ import 'dart:math'; +import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; import 'package:from_css_color/from_css_color.dart'; import 'package:git_touch/models/theme.dart'; diff --git a/lib/widgets/error_reload.dart b/lib/widgets/error_reload.dart index 1af5b53..897327a 100644 --- a/lib/widgets/error_reload.dart +++ b/lib/widgets/error_reload.dart @@ -1,5 +1,5 @@ +import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; -import 'package:git_touch/utils/utils.dart'; class ErrorReload extends StatelessWidget { const ErrorReload({required this.text, required this.onTap}); @@ -19,18 +19,19 @@ class ErrorReload extends StatelessWidget { const Padding(padding: EdgeInsets.only(top: 10)), Text( text, - style: const TextStyle( + style: TextStyle( fontSize: 14, fontWeight: FontWeight.w300, - color: Colors.redAccent, + color: AntTheme.of(context).colorDanger, ), ), const Padding(padding: EdgeInsets.only(top: 10)), GestureDetector( onTap: onTap as void Function()?, - child: const Text( + child: Text( 'Reload', - style: TextStyle(fontSize: 20, color: Colors.blueAccent), + style: TextStyle( + fontSize: 20, color: AntTheme.of(context).colorPrimary), ), ), ], diff --git a/lib/widgets/files_item.dart b/lib/widgets/files_item.dart index e3f425d..0ec9b35 100644 --- a/lib/widgets/files_item.dart +++ b/lib/widgets/files_item.dart @@ -1,4 +1,5 @@ import 'package:antd_mobile/antd_mobile.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_highlight/flutter_highlight.dart'; import 'package:flutter_highlight/theme_map.dart'; diff --git a/lib/widgets/link.dart b/lib/widgets/link.dart index 7425884..0cc796a 100644 --- a/lib/widgets/link.dart +++ b/lib/widgets/link.dart @@ -1,49 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:git_touch/utils/utils.dart'; -// TODO: -class CupertinoLink extends StatefulWidget { - const CupertinoLink({this.child, this.onTap}); - final Widget? child; - final Function? onTap; - - @override - State createState() => _CupertinoLinkState(); -} - -class _CupertinoLinkState extends State { - Color? _color; - - @override - Widget build(BuildContext context) { - return Container( - color: _color, - child: GestureDetector( - onTap: widget.onTap as void Function()?, - onTapDown: (_) { - print('down'); - setState(() { - _color = Colors.black12; - }); - }, - onTapUp: (_) { - print('up'); - setState(() { - _color = null; - }); - }, - onTapCancel: () { - print('cacnel'); - setState(() { - _color = null; - }); - }, - child: widget.child, - ), - ); - } -} - class LinkWidget extends StatelessWidget { const LinkWidget({ required this.child, diff --git a/lib/widgets/markdown_view.dart b/lib/widgets/markdown_view.dart index f63cb5b..9b51f8f 100644 --- a/lib/widgets/markdown_view.dart +++ b/lib/widgets/markdown_view.dart @@ -1,4 +1,5 @@ import 'package:antd_mobile/antd_mobile.dart'; +import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:git_touch/models/code.dart'; diff --git a/lib/widgets/notification_item.dart b/lib/widgets/notification_item.dart index d2322f0..ee98acc 100644 --- a/lib/widgets/notification_item.dart +++ b/lib/widgets/notification_item.dart @@ -24,7 +24,7 @@ class _NotificationItemState extends State { GithubNotificationItem get payload => widget.payload; bool loading = false; - Widget _buildIcon(IconData data, [Color color = Colors.black54]) { + Widget _buildIcon(IconData data, [Color? color]) { return Icon(data, color: color, size: 20); } diff --git a/lib/widgets/timeline_item.dart b/lib/widgets/timeline_item.dart index c5c374f..33c706c 100644 --- a/lib/widgets/timeline_item.dart +++ b/lib/widgets/timeline_item.dart @@ -18,12 +18,12 @@ class TimelineEventItem extends StatelessWidget { const TimelineEventItem({ this.actor, this.iconData = Octicons.diamond, - this.iconColor = Colors.grey, + this.iconColor, this.textSpan, }); final String? actor; final IconData iconData; - final Color iconColor; + final Color? iconColor; final TextSpan? textSpan; @override