Skip to content

Commit d403f85

Browse files
authored
feat: Remix improvements and further improvements (#410)
1 parent 2f9c46f commit d403f85

File tree

77 files changed

+1988
-949
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1988
-949
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,5 @@ pubspec_overrides.yaml
9595
pubspec.lock
9696

9797
# FVM Version Cache
98-
.fvm/
98+
.fvm/
99+
packages/remix/context.md

examples/themed_button/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ dev_dependencies:
2525
flutter_test:
2626
sdk: flutter
2727

28-
flutter_lints: ^3.0.0
28+
flutter_lints: ^4.0.0
2929
mix_lint:
3030
path: ../../packages/mix_lint
3131
widgetbook_generator: ^3.7.0
32-
build_runner: ^2.4.0
32+
build_runner: ^2.4.9
3333

3434
flutter:
3535
uses-material-design: true

examples/todo_list/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dev_dependencies:
2525
mix_lint:
2626
path: ../../packages/mix_lint
2727

28-
flutter_lints: ^3.0.0
28+
flutter_lints: ^4.0.0
2929

3030
flutter:
3131
uses-material-design: true

melos.yaml

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# yaml-language-server: $schema=./schemas/melos.yaml.schema.json
12
name: mix_workspace
23

34
sdkPath: .fvm/flutter_sdk
@@ -12,9 +13,13 @@ command:
1213
environment:
1314
sdk: ">=3.3.0 <4.0.0"
1415
flutter: ">=3.19.0"
15-
# publish:
16-
# hooks:
17-
# pre: melos run gen:build
16+
dev_dependencies:
17+
flutter_lints: ^4.0.0
18+
dart_code_metrics_presets: ^2.14.0
19+
build_runner: ^2.4.9
20+
publish:
21+
hooks:
22+
pre: melos run gen:build
1823

1924
scripts:
2025
# ANALYSIS

mix.code-workspace

+6-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
{
2020
"name": "remix",
2121
"path": "packages/remix"
22+
},
23+
{
24+
"name": "mix_animate",
25+
"path": "packages/mix_animate"
2226
}
2327
],
2428
"settings": {
@@ -33,5 +37,6 @@
3337
"files.exclude": {
3438
".fvm/**": true,
3539
"website":true,
36-
},}
40+
},
41+
}
3742
}

packages/mix/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ dependencies:
1414

1515
dev_dependencies:
1616
flutter_lints: ^4.0.0
17+
dart_code_metrics_presets: ^2.14.0
18+
build_runner: ^2.4.9
1719
flutter_test:
1820
sdk: flutter
19-
dart_code_metrics_presets: ^2.13.0
20-
build_runner: ^2.4.9
2121
mix_generator: ^0.2.2+1
2222

2323
# flutter:

packages/mix_generator/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919

2020
dev_dependencies:
2121
test: ^1.24.4
22-
dart_code_metrics_presets: ^2.13.0
22+
dart_code_metrics_presets: ^2.14.0
2323
build_runner: ^2.4.9
2424
build_test: ^2.2.2
2525
source_gen_test: ^1.0.6

packages/remix/build.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ targets:
33
builders:
44
mix_generator|spec:
55
generate_for:
6-
- lib/**/*_spec.dart
6+
- lib/**/*.dart
77
mix_generator|dto:
88
generate_for:
9-
- lib/**/*_dto.dart
9+
- lib/components/**/*.dart

packages/remix/demo/lib/components/avatar_use_case.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
2-
import 'package:remix/components/avatar/avatar_variants.dart';
3-
import 'package:remix/components/avatar/avatar_widget.dart';
2+
import 'package:remix/components/avatar/avatar.dart';
43
import 'package:widgetbook/widgetbook.dart';
54
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
65

packages/remix/demo/lib/components/button_use_case.dart

+8-13
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import 'package:demo/addons/icon_data_knob.dart';
22
import 'package:flutter/material.dart';
3+
import 'package:remix/components/button/button.dart';
34
import 'package:remix/remix.dart';
45
import 'package:widgetbook/widgetbook.dart';
56
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
67

8+
final _key = GlobalKey();
79
@widgetbook.UseCase(
810
name: 'Button Component',
911
type: RxButton,
@@ -16,16 +18,6 @@ Widget buildButtonUseCase(BuildContext context) {
1618
initialValue: 'Button',
1719
),
1820
onPressed: () {},
19-
size: context.knobs.list(
20-
label: 'Size',
21-
options: ButtonSize.values,
22-
initialOption: ButtonSize.medium,
23-
labelBuilder: (value) => value.name.split('.').last,
24-
),
25-
loading: context.knobs.boolean(
26-
label: 'Is loading',
27-
initialValue: false,
28-
),
2921
disabled: context.knobs.boolean(
3022
label: 'Disabled',
3123
initialValue: false,
@@ -42,8 +34,11 @@ Widget buildButtonUseCase(BuildContext context) {
4234
);
4335
}
4436

45-
return Wrap(
46-
spacing: 12,
47-
children: ButtonVariant.values.map(buildButton).toList(),
37+
return KeyedSubtree(
38+
key: _key,
39+
child: Wrap(
40+
spacing: 12,
41+
children: ButtonVariant.values.map(buildButton).toList(),
42+
),
4843
);
4944
}

packages/remix/demo/lib/components/card_use_case.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Widget buildCard(BuildContext context) {
1414
Text(variant.label),
1515
const SizedBox(height: 10),
1616
RxCard(
17-
variant: variant,
17+
type: variant,
1818
children: const [StyledText('Hi'), StyledText('This is a test')],
1919
),
2020
],
@@ -39,7 +39,7 @@ Widget buildRadioUseCase(BuildContext context) {
3939
Text(variant.label),
4040
const SizedBox(height: 10),
4141
RxCard(
42-
variant: variant,
42+
type: variant,
4343
children: const [StyledText('Hi'), StyledText('This is a test')],
4444
),
4545
const SizedBox(height: 10),

packages/remix/demo/lib/components/radio_use_case.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:demo/helpers/use_case_state.dart';
22
import 'package:flutter/material.dart';
3-
import 'package:remix/components/radio/radio_variants.dart';
4-
import 'package:remix/components/radio/radio_widget.dart';
3+
import 'package:remix/components/radio/radio.dart';
54
import 'package:widgetbook/widgetbook.dart';
65
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
76

packages/remix/demo/lib/components/spinner_use_case.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:mix/mix.dart';
3-
import 'package:remix/components/spinner/spinner.variants.dart';
4-
import 'package:remix/components/spinner/spinner_spec.dart';
5-
import 'package:remix/components/spinner/spinner_widget.dart';
3+
import 'package:remix/components/spinner/spinner.dart';
64
import 'package:widgetbook/widgetbook.dart';
75
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
86

packages/remix/demo/lib/components/switch_use_case.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:demo/helpers/use_case_state.dart';
22
import 'package:flutter/material.dart';
3-
import 'package:remix/components/switch/switch_variants.dart';
4-
import 'package:remix/components/switch/switch_widget.dart';
3+
import 'package:remix/components/switch/switch.dart';
54
import 'package:widgetbook/widgetbook.dart';
65
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
76

0 commit comments

Comments
 (0)