improvement: style tweaks

This commit is contained in:
Rongjian Zhang 2020-01-14 13:33:02 +08:00
parent 4f50190309
commit a1bf2555b7
8 changed files with 43 additions and 37 deletions

View File

@ -141,7 +141,7 @@ class ThemeModel with ChangeNotifier {
);
case Brightness.dark:
return Palette(
primary: Colors.blueAccent.shade400,
primary: Colors.blueAccent.shade200,
text: Colors.grey.shade300,
secondaryText: Colors.grey.shade400,
tertiaryText: Colors.grey.shade500,

View File

@ -280,7 +280,7 @@ class RepositoryScreen extends StatelessWidget {
// color: theme.palette.background,
padding: CommonStyle.padding.copyWith(top: 8, bottom: 8),
child: ClipRRect(
borderRadius: BorderRadius.circular(2),
borderRadius: BorderRadius.circular(5),
child: SizedBox(
height: 10,
child: Row(
@ -307,8 +307,10 @@ class RepositoryScreen extends StatelessWidget {
TableViewItem(
leftIconData: Octicons.code,
text: Text('Code'),
rightWidget: Text((license == null ? '' : license + ' / ') +
filesize(repo.diskUsage * 1000)),
rightWidget: Text(
(license == null ? '' : '$license') +
filesize(repo.diskUsage * 1000),
),
url: '/$owner/$name/blob/${ref.name}',
),
if (repo.hasIssuesEnabled)

View File

@ -52,11 +52,11 @@ class TrendingScreen extends StatelessWidget {
children: <Widget>[
Icon(
Octicons.repo,
size: 17,
size: 15,
color: theme.palette.secondaryText,
),
SizedBox(width: 2),
Text(item.repo.name, style: TextStyle(fontSize: 17))
Text(item.repo.name)
],
),
);

View File

@ -107,7 +107,7 @@ class UserScreen extends StatelessWidget {
Text(
name,
style: TextStyle(
color: theme.palette.primary,
color: theme.palette.text,
fontSize: 20,
fontWeight: FontWeight.w600,
),
@ -117,7 +117,7 @@ class UserScreen extends StatelessWidget {
Text(
login,
style: TextStyle(
color: theme.palette.secondaryText,
color: theme.palette.primary,
fontSize: 18,
),
),

View File

@ -74,14 +74,14 @@ class IssueItem extends StatelessWidget {
text: '#${payload['number']}',
style: TextStyle(
color: theme.palette.tertiaryText,
fontSize: 15,
fontWeight: FontWeight.normal,
),
),
],
),
style: TextStyle(
fontSize: 17,
color: theme.palette.primary,
color: theme.palette.text,
fontWeight: FontWeight.w600,
),
),
@ -107,12 +107,10 @@ class IssueItem extends StatelessWidget {
children: <Widget>[
// FIXME: Deleted user
if (payload['author'] != null) ...[
Link(
url: '/' + payload['author']['login'],
child: Avatar(
size: AvatarSize.extraSmall,
url: payload['author']['avatarUrl'],
),
Avatar(
size: AvatarSize.extraSmall,
url: payload['author']['avatarUrl'],
linkUrl: '/' + payload['author']['login'],
),
SizedBox(width: 4),
Text(

View File

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

View File

@ -19,13 +19,16 @@ class MutationButton extends StatelessWidget {
minSize: 0,
color: theme.palette.primary,
padding: EdgeInsets.symmetric(
horizontal: 12,
vertical: 4,
horizontal: 14,
vertical: 5,
),
borderRadius: BorderRadius.all(Radius.circular(20)),
child: Text(
text,
style: TextStyle(fontSize: 16, color: theme.palette.background),
style: TextStyle(
fontSize: 18,
color: theme.palette.background,
),
),
);
}

View File

@ -43,22 +43,20 @@ class UserItem extends StatelessWidget {
children: <Widget>[
Row(
children: <Widget>[
if (name != null) ...[
Text(
name,
style: TextStyle(
color: theme.palette.primary,
fontSize: 18,
fontWeight: FontWeight.w500,
),
),
SizedBox(width: 8),
],
// Text(
// name ?? login,
// style: TextStyle(
// color: theme.palette.text,
// fontSize: 18,
// ),
// ),
// SizedBox(width: 8),
Text(
login,
style: TextStyle(
color: theme.palette.secondaryText,
fontSize: 16,
color: theme.palette.primary,
fontSize: 18,
// fontWeight: FontWeight.w600,
),
),
],