Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: [DX-1216] Add 24x24 icons #668

Merged
merged 3 commits into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions melos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ command:

scripts:
gen_icons:
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"
description: Generate the list of all icons for the storybook story
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"
description: Generate the list of all icons
gen_theme:
run: melos exec --depends-on=build_runner -- "dart run build_runner build -d"
description: Build all generated files
Expand Down
Binary file modified optimus_icons/lib/fonts/OptimusIcons.ttf
Binary file not shown.
7,418 changes: 6,089 additions & 1,329 deletions optimus_icons/lib/fonts/config/config.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions optimus_icons/lib/optimus_icons.dart
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export 'src/icons_list.dart';
export 'src/optimus_icons.dart';
689 changes: 689 additions & 0 deletions optimus_icons/lib/src/icons_list.dart

Large diffs are not rendered by default.

1,343 changes: 1,011 additions & 332 deletions optimus_icons/lib/src/optimus_icons.dart

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions optimus_icons/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dev_dependencies:
flutter_test:
sdk: flutter
mews_pedantic: ^0.30.0
path: ^1.9.0

flutter:
fonts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/// DAMAGE.

/// Generates icons list from fluttericon config
/// dart ./gen_examples.dart ../../optimus/lib/ ../lib
/// dart ./gen_examples.dart ../../optimus_icons/lib/ ../lib

import 'dart:convert';
import 'dart:io';
Expand All @@ -50,7 +50,7 @@ void main(List<String> arguments) {
[
'',
"import 'package:flutter/widgets.dart';",
"import 'package:optimus/optimus_icons.dart';",
"import 'package:optimus_icons/src/optimus_icons.dart';",
'',
'// NB: DO NOT EDIT! This file is auto-generated. See utils/gen_icons.dart',
'',
Expand All @@ -65,8 +65,8 @@ void main(List<String> arguments) {
..writeln('const optimusIcons = <IconDetails>[');

for (int i = 0; i < icons.length; i++) {
final Map<String, dynamic> glyps = icons[i] as Map<String, dynamic>;
final glyphName = convertGlyphName(glyps['css'].toString());
final Map<String, dynamic> glyphs = icons[i] as Map<String, dynamic>;
final glyphName = convertGlyphName(glyphs['css'].toString());
buffer.writeln(
" IconDetails($fontFamilyName.$glyphName, '$glyphName'),",
);
Expand Down
22 changes: 2 additions & 20 deletions storybook/lib/stories/icon/icons.dart
Original file line number Diff line number Diff line change
@@ -1,26 +1,8 @@
import 'package:flutter/widgets.dart';
import 'package:optimus/optimus.dart';
import 'package:storybook/stories/icon/icons_list.dart';
import 'package:storybook_flutter/storybook_flutter.dart';

final Story allIconsStory = Story(
name: 'Media/Icons/All Icons',
builder: (context) => GridView.builder(
itemCount: optimusIcons.length,
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 5,
),
itemBuilder: (context, index) => Padding(
padding: const EdgeInsets.all(8),
child: Column(
children: [
OptimusIcon(iconData: optimusIcons[index].data),
Text(
optimusIcons[index].name,
overflow: TextOverflow.ellipsis,
),
],
),
),
),
builder: (context) =>
const Center(), // TODO(witwash): return after new optimus_icons is released
);
343 changes: 0 additions & 343 deletions storybook/lib/stories/icon/icons_list.dart

This file was deleted.

4 changes: 2 additions & 2 deletions storybook/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -231,15 +231,15 @@ packages:
source: path
version: "0.37.0"
optimus_icons:
dependency: "direct main"
dependency: transitive
description:
name: optimus_icons
sha256: e79dba5ca6574be6de22f3c9863da45f03ac5679c507eb91e1b671765ec0f8dd
url: "https://pub.dev"
source: hosted
version: "0.1.0+1"
path:
dependency: "direct dev"
dependency: transitive
description:
name: path
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
Expand Down
1 change: 0 additions & 1 deletion storybook/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ dev_dependencies:
flutter_test:
sdk: flutter
mews_pedantic: ^0.30.0
path: ^1.9.0
flutter:
uses-material-design: true
Loading