Skip to content

Commit 8963f05

Browse files
committed
🎨 Use super parameters
1 parent 0b06ce6 commit 8963f05

22 files changed

+73
-108
lines changed

example/lib/customs/custom_picker_page.dart

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,9 @@ class _CustomPickerPageState extends State<CustomPickersPage>
6868
}
6969

7070
class _MethodListView extends StatelessWidget {
71-
const _MethodListView({
72-
Key? key,
73-
required this.pickMethods,
74-
}) : super(key: key);
71+
// TODO(Alex): Tracking if it's a false-positive: https://github.com/dart-lang/linter/issues/3386
72+
// ignore: unused_element
73+
const _MethodListView({super.key, required this.pickMethods});
7574

7675
final List<CustomPickMethod> pickMethods;
7776

@@ -93,7 +92,7 @@ class _MethodListView extends StatelessWidget {
9392
child: Center(
9493
child: Text(
9594
model.icon,
96-
style: const TextStyle(fontSize: 24.0),
95+
style: const TextStyle(fontSize: 28.0),
9796
),
9897
),
9998
),

example/lib/customs/pickers/directory_file_asset_picker.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const List<String> imagesExtensions = <String>[
2929
];
3030

3131
class DirectoryFileAssetPicker extends StatefulWidget {
32-
const DirectoryFileAssetPicker({Key? key}) : super(key: key);
32+
const DirectoryFileAssetPicker({super.key});
3333

3434
@override
3535
_DirectoryFileAssetPickerState createState() =>

example/lib/customs/pickers/multi_tabs_assets_picker.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'package:wechat_assets_picker/wechat_assets_picker.dart';
1313
const Color _themeColor = Color(0xfff2223a);
1414

1515
class MultiTabAssetPicker extends StatefulWidget {
16-
const MultiTabAssetPicker({Key? key}) : super(key: key);
16+
const MultiTabAssetPicker({super.key});
1717

1818
@override
1919
_MultiTabAssetPickerState createState() => _MultiTabAssetPickerState();

example/lib/pages/home_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ bool get currentIsDark =>
1616
Screens.mediaQuery.platformBrightness == Brightness.dark;
1717

1818
class HomePage extends StatefulWidget {
19-
const HomePage({Key? key}) : super(key: key);
19+
const HomePage({super.key});
2020

2121
@override
2222
_HomePageState createState() => _HomePageState();

example/lib/widgets/asset_widget_builder.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import 'package:wechat_assets_picker/wechat_assets_picker.dart'
88

99
class AssetWidgetBuilder extends StatelessWidget {
1010
const AssetWidgetBuilder({
11-
Key? key,
11+
super.key,
1212
required this.entity,
1313
required this.isDisplayingDetail,
14-
}) : super(key: key);
14+
});
1515

1616
final AssetEntity entity;
1717
final bool isDisplayingDetail;

example/lib/widgets/method_list_view.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import '../constants/picker_method.dart';
88

99
class MethodListView extends StatefulWidget {
1010
const MethodListView({
11-
Key? key,
11+
super.key,
1212
required this.pickMethods,
1313
required this.onSelectMethod,
14-
}) : super(key: key);
14+
});
1515

1616
final List<PickMethod> pickMethods;
1717
final void Function(PickMethod method) onSelectMethod;
@@ -42,7 +42,7 @@ class _MethodListViewState extends State<MethodListView> {
4242
child: Center(
4343
child: Text(
4444
model.icon,
45-
style: const TextStyle(fontSize: 24.0),
45+
style: const TextStyle(fontSize: 28.0),
4646
),
4747
),
4848
),
@@ -84,7 +84,7 @@ class _MethodListViewState extends State<MethodListView> {
8484
).copyWith(bottom: 10.0),
8585
child: Scrollbar(
8686
controller: _controller,
87-
isAlwaysShown: true,
87+
thumbVisibility: true,
8888
radius: const Radius.circular(999),
8989
child: ListView.builder(
9090
controller: _controller,

example/lib/widgets/selected_assets_list_view.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import 'asset_widget_builder.dart';
1111

1212
class SelectedAssetsListView extends StatelessWidget {
1313
const SelectedAssetsListView({
14-
Key? key,
14+
super.key,
1515
required this.assets,
1616
required this.isDisplayingDetail,
1717
required this.onResult,
1818
required this.onRemoveAsset,
19-
}) : super(key: key);
19+
});
2020

2121
final List<AssetEntity> assets;
2222
final ValueNotifier<bool> isDisplayingDetail;

lib/src/delegates/asset_picker_builder_delegate.dart

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -656,38 +656,24 @@ class DefaultAssetPickerBuilderDelegate
656656
extends AssetPickerBuilderDelegate<AssetEntity, AssetPathEntity> {
657657
DefaultAssetPickerBuilderDelegate({
658658
required this.provider,
659-
required PermissionState initialPermission,
660-
int gridCount = 4,
661-
ThemeData? pickerTheme,
662-
SpecialItemPosition specialItemPosition = SpecialItemPosition.none,
663-
SpecialItemBuilder<AssetPathEntity>? specialItemBuilder,
664-
LoadingIndicatorBuilder? loadingIndicatorBuilder,
665-
AssetSelectPredicate<AssetEntity>? selectPredicate,
666-
bool? shouldRevertGrid,
667-
LimitedPermissionOverlayPredicate? limitedPermissionOverlayPredicate,
668-
PathNameBuilder<AssetPathEntity>? pathNameBuilder,
659+
required super.initialPermission,
660+
super.gridCount,
661+
super.pickerTheme,
662+
super.specialItemPosition,
663+
super.specialItemBuilder,
664+
super.loadingIndicatorBuilder,
665+
super.selectPredicate,
666+
super.shouldRevertGrid,
667+
super.limitedPermissionOverlayPredicate,
668+
super.pathNameBuilder,
669+
super.themeColor,
670+
super.textDelegate,
671+
super.locale,
669672
this.gridThumbnailSize = defaultAssetGridPreviewSize,
670673
this.previewThumbnailSize,
671674
this.specialPickerType,
672675
this.keepScrollOffset = false,
673-
Color? themeColor,
674-
AssetPickerTextDelegate? textDelegate,
675-
Locale? locale,
676-
}) : super(
677-
initialPermission: initialPermission,
678-
gridCount: gridCount,
679-
pickerTheme: pickerTheme,
680-
specialItemPosition: specialItemPosition,
681-
specialItemBuilder: specialItemBuilder,
682-
loadingIndicatorBuilder: loadingIndicatorBuilder,
683-
selectPredicate: selectPredicate,
684-
shouldRevertGrid: shouldRevertGrid,
685-
limitedPermissionOverlayPredicate: limitedPermissionOverlayPredicate,
686-
pathNameBuilder: pathNameBuilder,
687-
themeColor: themeColor,
688-
textDelegate: textDelegate,
689-
locale: locale,
690-
) {
676+
}) {
691677
// Add the listener if [keepScrollOffset] is true.
692678
if (keepScrollOffset) {
693679
gridScrollController.addListener(keepScrollOffsetListener);

lib/src/delegates/asset_picker_viewer_builder_delegate.dart

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -358,28 +358,18 @@ abstract class AssetPickerViewerBuilderDelegate<Asset, Path> {
358358
class DefaultAssetPickerViewerBuilderDelegate
359359
extends AssetPickerViewerBuilderDelegate<AssetEntity, AssetPathEntity> {
360360
DefaultAssetPickerViewerBuilderDelegate({
361-
required int currentIndex,
362-
required List<AssetEntity> previewAssets,
363-
AssetPickerProvider<AssetEntity, AssetPathEntity>? selectorProvider,
364-
required ThemeData themeData,
365-
AssetPickerViewerProvider<AssetEntity>? provider,
366-
List<AssetEntity>? selectedAssets,
361+
required super.currentIndex,
362+
required super.previewAssets,
363+
required super.themeData,
364+
super.selectorProvider,
365+
super.provider,
366+
super.selectedAssets,
367367
this.previewThumbnailSize,
368368
this.specialPickerType,
369-
int? maxAssets,
370-
bool shouldReversePreview = false,
371-
AssetSelectPredicate<AssetEntity>? selectPredicate,
372-
}) : super(
373-
currentIndex: currentIndex,
374-
previewAssets: previewAssets,
375-
provider: provider,
376-
themeData: themeData,
377-
selectedAssets: selectedAssets,
378-
selectorProvider: selectorProvider,
379-
maxAssets: maxAssets,
380-
shouldReversePreview: shouldReversePreview,
381-
selectPredicate: selectPredicate,
382-
);
369+
super.maxAssets,
370+
super.shouldReversePreview,
371+
super.selectPredicate,
372+
});
383373

384374
/// Thumb size for the preview of images in the viewer.
385375
/// 预览时图片的缩略图大小

lib/src/provider/asset_picker_provider.dart

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -229,19 +229,14 @@ abstract class AssetPickerProvider<Asset, Path> extends ChangeNotifier {
229229
class DefaultAssetPickerProvider
230230
extends AssetPickerProvider<AssetEntity, AssetPathEntity> {
231231
DefaultAssetPickerProvider({
232-
List<AssetEntity>? selectedAssets,
232+
super.selectedAssets,
233+
super.maxAssets,
234+
super.pageSize,
235+
super.pathThumbnailSize,
233236
this.requestType = RequestType.image,
234237
this.sortPathDelegate = SortPathDelegate.common,
235238
this.filterOptions,
236-
int maxAssets = 9,
237-
int pageSize = 80,
238-
ThumbnailSize pathThumbnailSize = const ThumbnailSize.square(80),
239-
}) : super(
240-
maxAssets: maxAssets,
241-
pageSize: pageSize,
242-
pathThumbnailSize: pathThumbnailSize,
243-
selectedAssets: selectedAssets,
244-
) {
239+
}) {
245240
Singleton.sortPathDelegate = sortPathDelegate ?? SortPathDelegate.common;
246241
// Call [getAssetList] with route duration when constructing.
247242
Future<void>(() async {

0 commit comments

Comments
 (0)