Mirrors/nc-photos
1
0
Fork 0
mirror of https://gitlab.com/nkming2/nc-photos.git synced 2025-01-22 16:56:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Simplify code

Browse source
This commit is contained in:
Ming Ming 2022-09-07 17:30:23 +08:00
parent 3acc5d1825
commit fd676e0ac4
3 changed files with 117 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

169
app/lib/widget/album_browser.dart
View file

@ -903,14 +903,11 @@ abstract class _ListItem implements SelectableItem, DraggableItem {
const _ListItem({
required this.index,
this.onTap,
DragTargetAccept<DraggableItem>? onDropBefore,
DragTargetAccept<DraggableItem>? onDropAfter,
VoidCallback? onDragStarted,
VoidCallback? onDragEndedAny,
}) : _onDropBefore = onDropBefore,
_onDropAfter = onDropAfter,
_onDragStarted = onDragStarted,
_onDragEndedAny = onDragEndedAny;
this.onDropBefore,
this.onDropAfter,
this.onDragStarted,
this.onDragEndedAny,
});
@override
get isTappable => onTap != null;
@ -921,18 +918,6 @@ abstract class _ListItem implements SelectableItem, DraggableItem {
@override
get isDraggable => true;
@override
get onDropBefore => _onDropBefore;
@override
get onDropAfter => _onDropAfter;
@override
get onDragStarted => _onDragStarted;
@override
get onDragEndedAny => _onDragEndedAny;
@override
get staggeredTile => const StaggeredTile.count(1, 1);
@ -940,71 +925,56 @@ abstract class _ListItem implements SelectableItem, DraggableItem {
buildDragFeedbackWidget(BuildContext context) => null;
@override
toString() {
return "$runtimeType {"
toString() => "$runtimeType {"
"index: $index, "
"}";
}
final int index;
final VoidCallback? onTap;
final DragTargetAccept<DraggableItem>? _onDropBefore;
final DragTargetAccept<DraggableItem>? _onDropAfter;
final VoidCallback? _onDragStarted;
final VoidCallback? _onDragEndedAny;
@override
final DragTargetAccept<DraggableItem>? onDropBefore;
@override
final DragTargetAccept<DraggableItem>? onDropAfter;
@override
final VoidCallback? onDragStarted;
@override
final VoidCallback? onDragEndedAny;
}
abstract class _FileListItem extends _ListItem {
_FileListItem({
required int index,
required super.index,
required this.file,
VoidCallback? onTap,
DragTargetAccept<DraggableItem>? onDropBefore,
DragTargetAccept<DraggableItem>? onDropAfter,
VoidCallback? onDragStarted,
VoidCallback? onDragEndedAny,
}) : super(
index: index,
onTap: onTap,
onDropBefore: onDropBefore,
onDropAfter: onDropAfter,
onDragStarted: onDragStarted,
onDragEndedAny: onDragEndedAny,
);
super.onTap,
super.onDropBefore,
super.onDropAfter,
super.onDragStarted,
super.onDragEndedAny,
});
final File file;
}
class _ImageListItem extends _FileListItem {
_ImageListItem({
required int index,
required File file,
required super.index,
required super.file,
required this.account,
required this.previewUrl,
VoidCallback? onTap,
DragTargetAccept<DraggableItem>? onDropBefore,
DragTargetAccept<DraggableItem>? onDropAfter,
VoidCallback? onDragStarted,
VoidCallback? onDragEndedAny,
}) : super(
index: index,
file: file,
onTap: onTap,
onDropBefore: onDropBefore,
onDropAfter: onDropAfter,
onDragStarted: onDragStarted,
onDragEndedAny: onDragEndedAny,
);
super.onTap,
super.onDropBefore,
super.onDropAfter,
super.onDragStarted,
super.onDragEndedAny,
});
@override
buildWidget(BuildContext context) {
return PhotoListImage(
buildWidget(BuildContext context) => PhotoListImage(
account: account,
previewUrl: previewUrl,
isGif: file.contentType == "image/gif",
);
}
final Account account;
final String previewUrl;
@ -1012,32 +982,22 @@ class _ImageListItem extends _FileListItem {
class _VideoListItem extends _FileListItem {
_VideoListItem({
required int index,
required File file,
required super.index,
required super.file,
required this.account,
required this.previewUrl,
VoidCallback? onTap,
DragTargetAccept<DraggableItem>? onDropBefore,
DragTargetAccept<DraggableItem>? onDropAfter,
VoidCallback? onDragStarted,
VoidCallback? onDragEndedAny,
}) : super(
index: index,
file: file,
onTap: onTap,
onDropBefore: onDropBefore,
onDropAfter: onDropAfter,
onDragStarted: onDragStarted,
onDragEndedAny: onDragEndedAny,
);
super.onTap,
super.onDropBefore,
super.onDropAfter,
super.onDragStarted,
super.onDragEndedAny,
});
@override
buildWidget(BuildContext context) {
return PhotoListVideo(
buildWidget(BuildContext context) => PhotoListVideo(
account: account,
previewUrl: previewUrl,
);
}
final Account account;
final String previewUrl;
@ -1045,58 +1005,41 @@ class _VideoListItem extends _FileListItem {
class _LabelListItem extends _ListItem {
_LabelListItem({
required int index,
required super.index,
required this.text,
DragTargetAccept<DraggableItem>? onDropBefore,
DragTargetAccept<DraggableItem>? onDropAfter,
VoidCallback? onDragStarted,
VoidCallback? onDragEndedAny,
}) : super(
index: index,
onDropBefore: onDropBefore,
onDropAfter: onDropAfter,
onDragStarted: onDragStarted,
onDragEndedAny: onDragEndedAny,
);
super.onDropBefore,
super.onDropAfter,
super.onDragStarted,
super.onDragEndedAny,
});
@override
get staggeredTile => const StaggeredTile.extent(99, 56);
@override
buildWidget(BuildContext context) {
return PhotoListLabel(
buildWidget(BuildContext context) => PhotoListLabel(
text: text,
);
}
final String text;
}
class _EditLabelListItem extends _LabelListItem {
_EditLabelListItem({
required int index,
required String text,
required super.index,
required super.text,
required this.onEditPressed,
DragTargetAccept<DraggableItem>? onDropBefore,
DragTargetAccept<DraggableItem>? onDropAfter,
VoidCallback? onDragStarted,
VoidCallback? onDragEndedAny,
}) : super(
index: index,
text: text,
onDropBefore: onDropBefore,
onDropAfter: onDropAfter,
onDragStarted: onDragStarted,
onDragEndedAny: onDragEndedAny,
);
super.onDropBefore,
super.onDropAfter,
super.onDragStarted,
super.onDragEndedAny,
});
@override
buildWidget(BuildContext context) {
return PhotoListLabelEdit(
buildWidget(BuildContext context) => PhotoListLabelEdit(
text: text,
onEditPressed: onEditPressed,
);
}
@override
buildDragFeedbackWidget(BuildContext context) {
@ -1118,11 +1061,9 @@ class _DateListItem extends _ListItem {
get staggeredTile => const StaggeredTile.extent(99, 32);
@override
buildWidget(BuildContext context) {
return PhotoListDate(
buildWidget(BuildContext context) => PhotoListDate(
date: date,
);
}
final DateTime date;
}

40
app/lib/widget/dynamic_album_browser.dart
View file

@ -680,11 +680,9 @@ abstract class _ListItem implements SelectableItem {
get staggeredTile => const StaggeredTile.count(1, 1);
@override
toString() {
return "$runtimeType {"
toString() => "$runtimeType {"
"index: $index, "
"}";
}
final int index;
@ -706,25 +704,19 @@ abstract class _FileListItem extends _ListItem {
class _ImageListItem extends _FileListItem {
_ImageListItem({
required int index,
required File file,
required super.index,
required super.file,
required this.account,
required this.previewUrl,
VoidCallback? onTap,
}) : super(
index: index,
file: file,
onTap: onTap,
);
super.onTap,
});
@override
buildWidget(BuildContext context) {
return PhotoListImage(
buildWidget(BuildContext context) => PhotoListImage(
account: account,
previewUrl: previewUrl,
isGif: file.contentType == "image/gif",
);
}
final Account account;
final String previewUrl;
@ -732,24 +724,18 @@ class _ImageListItem extends _FileListItem {
class _VideoListItem extends _FileListItem {
_VideoListItem({
required int index,
required File file,
required super.index,
required super.file,
required this.account,
required this.previewUrl,
VoidCallback? onTap,
}) : super(
index: index,
file: file,
onTap: onTap,
);
super.onTap,
});
@override
buildWidget(BuildContext context) {
return PhotoListVideo(
buildWidget(BuildContext context) => PhotoListVideo(
account: account,
previewUrl: previewUrl,
);
}
final Account account;
final String previewUrl;
@ -767,11 +753,9 @@ class _DateListItem extends _ListItem {
get staggeredTile => const StaggeredTile.extent(99, 32);
@override
buildWidget(BuildContext context) {
return PhotoListDate(
buildWidget(BuildContext context) => PhotoListDate(
date: date,
);
}
final DateTime date;
}

45
app/lib/widget/smart_album_browser.dart
View file

@ -352,11 +352,9 @@ abstract class _ListItem implements SelectableItem {
get staggeredTile => const StaggeredTile.count(1, 1);
@override
toString() {
return "$runtimeType {"
toString() => "$runtimeType {"
"index: $index, "
"}";
}
final int index;
@ -365,38 +363,29 @@ abstract class _ListItem implements SelectableItem {
abstract class _FileListItem extends _ListItem {
_FileListItem({
required int index,
required super.index,
required this.file,
VoidCallback? onTap,
}) : super(
index: index,
onTap: onTap,
);
super.onTap,
});
final File file;
}
class _ImageListItem extends _FileListItem {
_ImageListItem({
required int index,
required File file,
required super.index,
required super.file,
required this.account,
required this.previewUrl,
VoidCallback? onTap,
}) : super(
index: index,
file: file,
onTap: onTap,
);
super.onTap,
});
@override
buildWidget(BuildContext context) {
return PhotoListImage(
buildWidget(BuildContext context) => PhotoListImage(
account: account,
previewUrl: previewUrl,
isGif: file.contentType == "image/gif",
);
}
final Account account;
final String previewUrl;
@ -404,24 +393,18 @@ class _ImageListItem extends _FileListItem {
class _VideoListItem extends _FileListItem {
_VideoListItem({
required int index,
required File file,
required super.index,
required super.file,
required this.account,
required this.previewUrl,
VoidCallback? onTap,
}) : super(
index: index,
file: file,
onTap: onTap,
);
super.onTap,
});
@override
buildWidget(BuildContext context) {
return PhotoListVideo(
buildWidget(BuildContext context) => PhotoListVideo(
account: account,
previewUrl: previewUrl,
);
}
final Account account;
final String previewUrl;