refactor: tag widgets

This commit is contained in:
Rongjian Zhang
2022-09-12 11:46:42 +08:00
parent 3261db8fee
commit 9207d52cf3
14 changed files with 80 additions and 77 deletions

View File

@@ -0,0 +1,23 @@
import 'package:antd_mobile/antd_mobile.dart';
import 'package:flutter/material.dart';
import 'package:git_touch/utils/utils.dart';
class HexColorTag extends StatelessWidget {
final String name;
final String color;
const HexColorTag({
super.key,
required this.name,
required this.color,
});
@override
Widget build(BuildContext context) {
return AntTag(
round: true,
color: convertColor(color),
child: Text(name),
);
}
}

View File

@@ -1,36 +0,0 @@
import 'package:flutter/material.dart';
import 'package:git_touch/utils/utils.dart';
class MyLabel extends StatelessWidget {
final String? name;
final Color? color;
final String? cssColor;
final Color? textColor;
const MyLabel({
required this.name,
this.color,
this.cssColor,
this.textColor,
});
@override
Widget build(BuildContext context) {
final finalColor = color ?? convertColor(cssColor);
return Container(
padding: const EdgeInsets.symmetric(vertical: 2, horizontal: 6),
decoration: BoxDecoration(
color: finalColor,
borderRadius: const BorderRadius.all(Radius.circular(4)),
),
child: Text(
name!,
style: TextStyle(
fontSize: 13,
color: textColor ?? getFontColorByBrightness(finalColor),
// fontWeight: FontWeight.w600,
),
),
);
}
}

View File

@@ -1,13 +1,15 @@
import 'dart:core';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/S.dart';
import 'package:git_touch/graphql/__generated__/github.data.gql.dart';
import 'package:git_touch/graphql/__generated__/schema.schema.gql.dart';
import 'package:git_touch/models/theme.dart';
import 'package:git_touch/widgets/label.dart';
import 'package:git_touch/widgets/hex_color_tag.dart';
import 'package:provider/provider.dart';
import '../utils/utils.dart';
import 'comment_item.dart';
import 'package:flutter_gen/gen_l10n/S.dart';
TextSpan createUserSpan(BuildContext context, String? login) {
return createLinkSpan(context, login, '/github/$login');
@@ -202,7 +204,7 @@ class TimelineItem extends StatelessWidget {
textSpan: TextSpan(children: [
TextSpan(text: ' ${AppLocalizations.of(context)!.added} '),
WidgetSpan(
child: MyLabel(name: p.label.name, cssColor: p.label.color)),
child: HexColorTag(name: p.label.name, color: p.label.color)),
TextSpan(text: ' ${AppLocalizations.of(context)!.label}'),
]),
);
@@ -214,7 +216,7 @@ class TimelineItem extends StatelessWidget {
textSpan: TextSpan(children: [
TextSpan(text: ' ${AppLocalizations.of(context)!.removed} '),
WidgetSpan(
child: MyLabel(name: p.label.name, cssColor: p.label.color)),
child: HexColorTag(name: p.label.name, color: p.label.color)),
TextSpan(text: ' ${AppLocalizations.of(context)!.label}'),
]),
);