Skip to content

Commit a940399

Browse files
authored
Merge pull request #668 from MewsSystems/DX-1216
2 parents b7f2ed9 + 47f381d commit a940399

File tree

12 files changed

+7801
-2033
lines changed

12 files changed

+7801
-2033
lines changed

melos.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ command:
66

77
scripts:
88
gen_icons:
9-
run: melos exec --scope="storybook" -- "dart utils/gen_icons.dart $MELOS_ROOT_PATH/optimus/lib/fonts/config/ lib/stories/icon && dart format lib/stories/icon/icons_list.dart"
10-
description: Generate the list of all icons for the storybook story
9+
run: melos exec --scope="optimus_icons" -- "dart utils/gen_icons.dart $MELOS_ROOT_PATH/optimus_icons/lib/fonts/config/ lib/src && dart format lib/src/icons_list.dart"
10+
description: Generate the list of all icons
1111
gen_theme:
1212
run: melos exec --depends-on=build_runner -- "dart run build_runner build -d"
1313
description: Build all generated files
77.3 KB
Binary file not shown.

optimus_icons/lib/fonts/config/config.json

Lines changed: 6089 additions & 1329 deletions
Large diffs are not rendered by default.

optimus_icons/lib/optimus_icons.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
export 'src/icons_list.dart';
12
export 'src/optimus_icons.dart';

optimus_icons/lib/src/icons_list.dart

Lines changed: 689 additions & 0 deletions
Large diffs are not rendered by default.

optimus_icons/lib/src/optimus_icons.dart

Lines changed: 1011 additions & 332 deletions
Large diffs are not rendered by default.

optimus_icons/pubspec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ dev_dependencies:
1515
flutter_test:
1616
sdk: flutter
1717
mews_pedantic: ^0.30.0
18+
path: ^1.9.0
1819

1920
flutter:
2021
fonts:

storybook/utils/gen_icons.dart renamed to optimus_icons/utils/gen_icons.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/// DAMAGE.
2626
2727
/// Generates icons list from fluttericon config
28-
/// dart ./gen_examples.dart ../../optimus/lib/ ../lib
28+
/// dart ./gen_examples.dart ../../optimus_icons/lib/ ../lib
2929
3030
import 'dart:convert';
3131
import 'dart:io';
@@ -50,7 +50,7 @@ void main(List<String> arguments) {
5050
[
5151
'',
5252
"import 'package:flutter/widgets.dart';",
53-
"import 'package:optimus/optimus_icons.dart';",
53+
"import 'package:optimus_icons/src/optimus_icons.dart';",
5454
'',
5555
'// NB: DO NOT EDIT! This file is auto-generated. See utils/gen_icons.dart',
5656
'',
@@ -65,8 +65,8 @@ void main(List<String> arguments) {
6565
..writeln('const optimusIcons = <IconDetails>[');
6666

6767
for (int i = 0; i < icons.length; i++) {
68-
final Map<String, dynamic> glyps = icons[i] as Map<String, dynamic>;
69-
final glyphName = convertGlyphName(glyps['css'].toString());
68+
final Map<String, dynamic> glyphs = icons[i] as Map<String, dynamic>;
69+
final glyphName = convertGlyphName(glyphs['css'].toString());
7070
buffer.writeln(
7171
" IconDetails($fontFamilyName.$glyphName, '$glyphName'),",
7272
);

storybook/lib/stories/icon/icons.dart

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,8 @@
11
import 'package:flutter/widgets.dart';
2-
import 'package:optimus/optimus.dart';
3-
import 'package:storybook/stories/icon/icons_list.dart';
42
import 'package:storybook_flutter/storybook_flutter.dart';
53

64
final Story allIconsStory = Story(
75
name: 'Media/Icons/All Icons',
8-
builder: (context) => GridView.builder(
9-
itemCount: optimusIcons.length,
10-
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
11-
crossAxisCount: 5,
12-
),
13-
itemBuilder: (context, index) => Padding(
14-
padding: const EdgeInsets.all(8),
15-
child: Column(
16-
children: [
17-
OptimusIcon(iconData: optimusIcons[index].data),
18-
Text(
19-
optimusIcons[index].name,
20-
overflow: TextOverflow.ellipsis,
21-
),
22-
],
23-
),
24-
),
25-
),
6+
builder: (context) =>
7+
const Center(), // TODO(witwash): return after new optimus_icons is released
268
);

storybook/lib/stories/icon/icons_list.dart

Lines changed: 0 additions & 343 deletions
This file was deleted.

0 commit comments

Comments
 (0)