refactor: drop material color references

This commit is contained in:
Rongjian Zhang 2022-10-06 15:13:59 +08:00
parent 9892d87f9b
commit 61d5a3e846
13 changed files with 21 additions and 64 deletions

View File

@ -1,11 +1,9 @@
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:git_touch/app.dart'; import 'package:git_touch/app.dart';
import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/auth.dart';
import 'package:git_touch/models/code.dart'; import 'package:git_touch/models/code.dart';
import 'package:git_touch/models/notification.dart'; import 'package:git_touch/models/notification.dart';
import 'package:git_touch/models/theme.dart'; import 'package:git_touch/models/theme.dart';
import 'package:git_touch/utils/utils.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:sentry_flutter/sentry_flutter.dart'; import 'package:sentry_flutter/sentry_flutter.dart';
@ -27,11 +25,6 @@ void main() async {
codeModel.init(), codeModel.init(),
]); ]);
// To match status bar color to app bar color
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
));
runApp(MultiProvider( runApp(MultiProvider(
providers: [ providers: [
ChangeNotifierProvider(create: (context) => notificationModel), ChangeNotifierProvider(create: (context) => notificationModel),

View File

@ -226,14 +226,14 @@ class GhIssueScreen extends StatelessWidget {
Row( Row(
children: <Widget>[ children: <Widget>[
Text('+${pr.additions}', Text('+${pr.additions}',
style: const TextStyle( style: TextStyle(
color: Colors.green, color: AntTheme.of(context).colorSuccess,
fontSize: 15, fontSize: 15,
)), )),
const SizedBox(width: 2), const SizedBox(width: 2),
Text('-${pr.deletions}', Text('-${pr.deletions}',
style: const TextStyle( style: TextStyle(
color: Colors.red, color: AntTheme.of(context).colorDanger,
fontSize: 15, fontSize: 15,
)), )),
Icon(Ionicons.chevron_forward, Icon(Ionicons.chevron_forward,

View File

@ -1,3 +1,4 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:flutter_gen/gen_l10n/S.dart';
import 'package:flutter_highlight/flutter_highlight.dart'; import 'package:flutter_highlight/flutter_highlight.dart';

View File

@ -10,7 +10,7 @@ import 'package:universal_io/io.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
export 'package:flutter/material.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' export 'package:flutter_vector_icons/flutter_vector_icons.dart'
show Octicons, Ionicons; show Octicons, Ionicons;

View File

@ -1,4 +1,5 @@
import 'package:fimber/fimber.dart'; import 'package:fimber/fimber.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:git_touch/models/theme.dart'; import 'package:git_touch/models/theme.dart';
import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/utils/utils.dart';

View File

@ -1,4 +1,5 @@
import 'package:antd_mobile/antd_mobile.dart'; import 'package:antd_mobile/antd_mobile.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/auth.dart';
import 'package:git_touch/models/theme.dart'; import 'package:git_touch/models/theme.dart';
@ -130,7 +131,7 @@ mutation {
? (theme.brightness == Brightness.dark ? (theme.brightness == Brightness.dark
? PrimerColors.blue900 ? PrimerColors.blue900
: PrimerColors.blue000) : PrimerColors.blue000)
: Colors.transparent, : null,
), ),
child: Wrap( child: Wrap(
crossAxisAlignment: WrapCrossAlignment.center, crossAxisAlignment: WrapCrossAlignment.center,

View File

@ -1,5 +1,6 @@
import 'dart:math'; import 'dart:math';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:from_css_color/from_css_color.dart'; import 'package:from_css_color/from_css_color.dart';
import 'package:git_touch/models/theme.dart'; import 'package:git_touch/models/theme.dart';

View File

@ -1,5 +1,5 @@
import 'package:antd_mobile/antd_mobile.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:git_touch/utils/utils.dart';
class ErrorReload extends StatelessWidget { class ErrorReload extends StatelessWidget {
const ErrorReload({required this.text, required this.onTap}); const ErrorReload({required this.text, required this.onTap});
@ -19,18 +19,19 @@ class ErrorReload extends StatelessWidget {
const Padding(padding: EdgeInsets.only(top: 10)), const Padding(padding: EdgeInsets.only(top: 10)),
Text( Text(
text, text,
style: const TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
color: Colors.redAccent, color: AntTheme.of(context).colorDanger,
), ),
), ),
const Padding(padding: EdgeInsets.only(top: 10)), const Padding(padding: EdgeInsets.only(top: 10)),
GestureDetector( GestureDetector(
onTap: onTap as void Function()?, onTap: onTap as void Function()?,
child: const Text( child: Text(
'Reload', 'Reload',
style: TextStyle(fontSize: 20, color: Colors.blueAccent), style: TextStyle(
fontSize: 20, color: AntTheme.of(context).colorPrimary),
), ),
), ),
], ],

View File

@ -1,4 +1,5 @@
import 'package:antd_mobile/antd_mobile.dart'; import 'package:antd_mobile/antd_mobile.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:flutter_highlight/flutter_highlight.dart'; import 'package:flutter_highlight/flutter_highlight.dart';
import 'package:flutter_highlight/theme_map.dart'; import 'package:flutter_highlight/theme_map.dart';

View File

@ -1,49 +1,6 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:git_touch/utils/utils.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<CupertinoLink> createState() => _CupertinoLinkState();
}
class _CupertinoLinkState extends State<CupertinoLink> {
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 { class LinkWidget extends StatelessWidget {
const LinkWidget({ const LinkWidget({
required this.child, required this.child,

View File

@ -1,4 +1,5 @@
import 'package:antd_mobile/antd_mobile.dart'; import 'package:antd_mobile/antd_mobile.dart';
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:flutter_markdown/flutter_markdown.dart';
import 'package:git_touch/models/code.dart'; import 'package:git_touch/models/code.dart';

View File

@ -24,7 +24,7 @@ class _NotificationItemState extends State<NotificationItem> {
GithubNotificationItem get payload => widget.payload; GithubNotificationItem get payload => widget.payload;
bool loading = false; bool loading = false;
Widget _buildIcon(IconData data, [Color color = Colors.black54]) { Widget _buildIcon(IconData data, [Color? color]) {
return Icon(data, color: color, size: 20); return Icon(data, color: color, size: 20);
} }

View File

@ -18,12 +18,12 @@ class TimelineEventItem extends StatelessWidget {
const TimelineEventItem({ const TimelineEventItem({
this.actor, this.actor,
this.iconData = Octicons.diamond, this.iconData = Octicons.diamond,
this.iconColor = Colors.grey, this.iconColor,
this.textSpan, this.textSpan,
}); });
final String? actor; final String? actor;
final IconData iconData; final IconData iconData;
final Color iconColor; final Color? iconColor;
final TextSpan? textSpan; final TextSpan? textSpan;
@override @override