Skip to content

Commit 029beba

Browse files
committed
feat: repo language ratio bar
1 parent 354520d commit 029beba

File tree

3 files changed

+80
-38
lines changed

3 files changed

+80
-38
lines changed

lib/screens/repo.dart

+77-33
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ import 'dart:convert';
22
import 'package:flutter/material.dart';
33
import 'package:flutter/cupertino.dart';
44
import 'package:git_touch/models/settings.dart';
5+
import 'package:git_touch/utils/utils.dart';
6+
import 'package:git_touch/widgets/table_view.dart';
7+
import 'package:primer/primer.dart';
58
import 'package:provider/provider.dart';
69
import 'package:flutter_markdown/flutter_markdown.dart';
710
import 'package:git_touch/models/theme.dart';
@@ -21,6 +24,8 @@ class RepoScreen extends StatelessWidget {
2124
final String owner;
2225
final String name;
2326

27+
static const _languageBarPadding = 10.0;
28+
2429
RepoScreen(this.owner, this.name);
2530
RepoScreen.fromFullName(String fullName)
2631
: owner = fullName.split('/')[0],
@@ -50,13 +55,23 @@ class RepoScreen extends StatelessWidget {
5055
primaryLanguage {
5156
color
5257
name
53-
}
58+
}
5459
issues(states: OPEN) {
5560
totalCount
5661
}
5762
pullRequests(states: OPEN) {
5863
totalCount
5964
}
65+
languages(first: 10, orderBy: {field: SIZE, direction: DESC}) {
66+
totalSize
67+
edges {
68+
size
69+
node {
70+
name
71+
color
72+
}
73+
}
74+
}
6075
url
6176
defaultBranchRef {
6277
name
@@ -158,44 +173,73 @@ class RepoScreen extends StatelessWidget {
158173
var payload = data[0];
159174
var readme = data[1];
160175

176+
final langWidth =
177+
MediaQuery.of(context).size.width - _languageBarPadding * 2;
178+
161179
return Column(
180+
crossAxisAlignment: CrossAxisAlignment.stretch,
162181
children: <Widget>[
163182
RepoItem(payload, isLink: false),
164-
Container(
165-
decoration: BoxDecoration(
166-
border: Border(
167-
bottom: BorderSide(color: Colors.black12),
168-
top: BorderSide(color: Colors.black12),
183+
BorderView(),
184+
Row(
185+
children: <Widget>[
186+
EntryItem(
187+
count: payload['issues']['totalCount'],
188+
text: 'Issues',
189+
screenBuilder: (context) =>
190+
IssuesScreen(owner: owner, name: name),
191+
),
192+
EntryItem(
193+
count: payload['pullRequests']['totalCount'],
194+
text: 'Pull Requests',
195+
screenBuilder: (context) => IssuesScreen(
196+
owner: owner, name: name, isPullRequest: true),
197+
),
198+
EntryItem(
199+
count: payload['defaultBranchRef']['target']['history']
200+
['totalCount'],
201+
text: 'Commits',
202+
screenBuilder: (context) => CommitsScreen(owner, name),
203+
),
204+
],
205+
),
206+
BorderView(height: 10),
207+
Padding(
208+
padding: const EdgeInsets.all(_languageBarPadding),
209+
child: ClipRRect(
210+
borderRadius: BorderRadius.circular(4),
211+
child: Container(
212+
height: 10,
213+
child: Row(
214+
children: (payload['languages']['edges'] as List)
215+
.map((lang) => Container(
216+
color: convertColor(lang['node']['color']),
217+
width: langWidth *
218+
lang['size'] /
219+
payload['languages']['totalSize']))
220+
.toList()),
169221
),
170-
),
171-
child: Row(
172-
children: <Widget>[
173-
EntryItem(
174-
count: payload['issues']['totalCount'],
175-
text: 'Issues',
176-
screenBuilder: (context) =>
177-
IssuesScreen(owner: owner, name: name),
178-
),
179-
EntryItem(
180-
count: payload['pullRequests']['totalCount'],
181-
text: 'Pull Requests',
182-
screenBuilder: (context) => IssuesScreen(
183-
owner: owner, name: name, isPullRequest: true),
184-
),
185-
EntryItem(
186-
text: 'Files',
187-
screenBuilder: (context) =>
188-
ObjectScreen(owner: owner, name: name),
189-
),
190-
EntryItem(
191-
count: payload['defaultBranchRef']['target']['history']
192-
['totalCount'],
193-
text: 'Commits',
194-
screenBuilder: (context) => CommitsScreen(owner, name),
195-
),
196-
],
197222
),
198223
),
224+
TableView(items: [
225+
TableViewItem(
226+
leftWidget: Icon(Octicons.code,
227+
size: 20,
228+
color: convertColor(payload['primaryLanguage'] == null
229+
? null
230+
: payload['primaryLanguage']['color'])),
231+
text: Text(payload['primaryLanguage'] == null
232+
? 'Unknown'
233+
: payload['primaryLanguage']['name']),
234+
rightWidget: Icon(
235+
CupertinoIcons.right_chevron,
236+
size: 18,
237+
color: PrimerColors.gray300,
238+
),
239+
screenBuilder: (_) => ObjectScreen(owner: owner, name: name),
240+
)
241+
]),
242+
BorderView(height: 10),
199243
Container(
200244
padding: EdgeInsets.all(16),
201245
child: MarkdownBody(data: readme),

lib/screens/user.dart

+2-4
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,8 @@ class _UserScreenState extends State<UserScreen> {
108108
var leftWidget = Icon(iconData, size: 20, color: PrimerColors.blue500);
109109
var usePlaceholder = text == null || text.isEmpty;
110110
var itemText = usePlaceholder
111-
? Text(placeholder,
112-
style: TextStyle(color: PrimerColors.gray300, fontSize: 16))
113-
: Text(text,
114-
style: TextStyle(color: PrimerColors.gray900, fontSize: 16));
111+
? Text(placeholder, style: TextStyle(color: PrimerColors.gray300))
112+
: Text(text);
115113

116114
return TableViewItem(
117115
leftWidget: leftWidget,

lib/widgets/table_view.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class TableView extends StatelessWidget {
5353
Expanded(
5454
child: DefaultTextStyle(
5555
child: item.text,
56-
style: TextStyle(fontSize: 18, color: PrimerColors.gray900),
56+
style: TextStyle(fontSize: 16, color: PrimerColors.gray900),
5757
),
5858
),
5959
...(item.rightWidget == null ? [] : [item.rightWidget]),

0 commit comments

Comments
 (0)