mirror of
https://github.com/lifegpc/eh_downloader_flutter.git
synced 2026-07-08 01:30:28 +08:00
Update localization and add ad and SFW marking
This commit is contained in:
@@ -24,10 +24,29 @@ class _GalleryInfo extends State<GalleryInfo> with ThemeModeWidget {
|
||||
setState(() {});
|
||||
}
|
||||
|
||||
void _onAdChanged(dynamic args) {
|
||||
final arguments = args as (String, bool)?;
|
||||
if (arguments == null) return;
|
||||
final token = arguments.$1;
|
||||
final isAd = arguments.$2;
|
||||
var changed = false;
|
||||
for (var e in widget.gData.pages) {
|
||||
if (e.token == token) {
|
||||
e.isAd = isAd;
|
||||
changed = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (changed) {
|
||||
setState(() {});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
listener.on("showNsfwChanged", stateChanged);
|
||||
listener.on("displayAdChanged", stateChanged);
|
||||
listener.on("adChanged", _onAdChanged);
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@@ -100,6 +119,7 @@ class _GalleryInfo extends State<GalleryInfo> with ThemeModeWidget {
|
||||
controller.dispose();
|
||||
listener.removeEventListener("showNsfwChanged", stateChanged);
|
||||
listener.removeEventListener("displayAdChanged", stateChanged);
|
||||
listener.removeEventListener("adChanged", _onAdChanged);
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,13 +10,25 @@ final _log = Logger("ImageWithContextMenu");
|
||||
|
||||
class ImageWithContextMenu extends StatelessWidget {
|
||||
const ImageWithContextMenu(this.data,
|
||||
{Key? key, this.uri, this.dir, this.fileName, this.fmt = ImageFmt.jpg})
|
||||
{Key? key,
|
||||
this.uri,
|
||||
this.dir,
|
||||
this.fileName,
|
||||
this.fmt = ImageFmt.jpg,
|
||||
this.isNsfw,
|
||||
this.changeNsfw,
|
||||
this.isAd,
|
||||
this.changeAd})
|
||||
: super(key: key);
|
||||
final Uint8List data;
|
||||
final String? uri;
|
||||
final ImageFmt fmt;
|
||||
final String? fileName;
|
||||
final String? dir;
|
||||
final bool Function()? isNsfw;
|
||||
final Function(bool isNsfw)? changeNsfw;
|
||||
final bool Function()? isAd;
|
||||
final Function(bool isAd)? changeAd;
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ContextMenuWidget(
|
||||
@@ -53,6 +65,26 @@ class ImageWithContextMenu extends StatelessWidget {
|
||||
}
|
||||
}));
|
||||
}
|
||||
if (isNsfw != null && changeNsfw != null) {
|
||||
final nsfw = isNsfw!();
|
||||
list.add(MenuAction(
|
||||
title: nsfw
|
||||
? AppLocalizations.of(context)!.markAsSfw
|
||||
: AppLocalizations.of(context)!.markAsNsfw,
|
||||
callback: () {
|
||||
changeNsfw!(!isNsfw!());
|
||||
}));
|
||||
}
|
||||
if (isAd != null && changeAd != null) {
|
||||
final ad = isAd!();
|
||||
list.add(MenuAction(
|
||||
title: ad
|
||||
? AppLocalizations.of(context)!.markAsNonAd
|
||||
: AppLocalizations.of(context)!.markAsAd,
|
||||
callback: () {
|
||||
changeAd!(!isAd!());
|
||||
}));
|
||||
}
|
||||
return Menu(children: list);
|
||||
},
|
||||
child: Image.memory(data));
|
||||
|
||||
@@ -64,6 +64,10 @@ enum _ThumbnailMenu {
|
||||
copyImage,
|
||||
copyImgUrl,
|
||||
saveAs,
|
||||
markAsNsfw,
|
||||
markAsSfw,
|
||||
markAsAd,
|
||||
markAsNonAd,
|
||||
}
|
||||
|
||||
class _Thumbnail extends State<Thumbnail> {
|
||||
@@ -74,11 +78,52 @@ class _Thumbnail extends State<Thumbnail> {
|
||||
bool _showNsfw = false;
|
||||
String? _uri;
|
||||
CancelToken? _cancel;
|
||||
CancelToken? _markAsNsfwCancel;
|
||||
CancelToken? _markAsAdCancel;
|
||||
String? _fileName;
|
||||
String _dir = "";
|
||||
Color? _iconColor;
|
||||
double? _iconSize;
|
||||
bool _disposed = false;
|
||||
void _onNsfwChanged(dynamic args) {
|
||||
final arguments = args as (String, bool)?;
|
||||
if (arguments == null) return;
|
||||
final token = arguments.$1;
|
||||
final isNsfw = arguments.$2;
|
||||
if (token != widget._pMeta.token) return;
|
||||
widget._pMeta.isNsfw = isNsfw;
|
||||
setState(() {});
|
||||
}
|
||||
|
||||
Future<void> _markAsNsfw(bool isNsfw) async {
|
||||
try {
|
||||
_markAsNsfwCancel = CancelToken();
|
||||
final token = widget._pMeta.token;
|
||||
(await api.updateFileMeta(token,
|
||||
isNsfw: isNsfw, cancel: _markAsNsfwCancel))
|
||||
.unwrap();
|
||||
listener.tryEmit("nsfwChanged", (token, isNsfw));
|
||||
} catch (e) {
|
||||
if (!_markAsNsfwCancel!.isCancelled) {
|
||||
_log.warning("Failed to mark as nsfw:", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _markAsAd(bool isAd) async {
|
||||
try {
|
||||
_markAsAdCancel = CancelToken();
|
||||
final token = widget._pMeta.token;
|
||||
(await api.updateFileMeta(token, isAd: isAd, cancel: _markAsAdCancel))
|
||||
.unwrap();
|
||||
listener.tryEmit("adChanged", (token, isAd));
|
||||
} catch (e) {
|
||||
if (!_markAsAdCancel!.isCancelled) {
|
||||
_log.warning("Failed to mark as ad:", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _fetchData() async {
|
||||
try {
|
||||
_cancel = CancelToken();
|
||||
@@ -133,6 +178,7 @@ class _Thumbnail extends State<Thumbnail> {
|
||||
_uri = null;
|
||||
_fileName = "${basenameWithoutExtension(widget._pMeta.name)}_thumb";
|
||||
_dir = isAndroid && widget.gid != null ? widget.gid!.toString() : "";
|
||||
listener.on("nsfwChanged", _onNsfwChanged);
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@@ -174,6 +220,9 @@ class _Thumbnail extends State<Thumbnail> {
|
||||
void dispose() {
|
||||
_disposed = true;
|
||||
_cancel?.cancel();
|
||||
_markAsNsfwCancel?.cancel();
|
||||
_markAsAdCancel?.cancel();
|
||||
listener.removeEventListener("nsfwChanged", _onNsfwChanged);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@@ -201,6 +250,18 @@ class _Thumbnail extends State<Thumbnail> {
|
||||
_log.warning("Failed to save image:", err);
|
||||
}
|
||||
break;
|
||||
case _ThumbnailMenu.markAsNsfw:
|
||||
await _markAsNsfw(true);
|
||||
break;
|
||||
case _ThumbnailMenu.markAsSfw:
|
||||
await _markAsNsfw(false);
|
||||
break;
|
||||
case _ThumbnailMenu.markAsAd:
|
||||
await _markAsAd(true);
|
||||
break;
|
||||
case _ThumbnailMenu.markAsNonAd:
|
||||
await _markAsAd(false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -208,6 +269,7 @@ class _Thumbnail extends State<Thumbnail> {
|
||||
Widget build(BuildContext context) {
|
||||
final isLoading = _data == null && _error == null;
|
||||
final isNsfw = widget._pMeta.isNsfw;
|
||||
final isAd = widget._pMeta.isAd;
|
||||
if (isLoading && !_isLoading) _fetchData();
|
||||
_iconSize ??= Theme.of(context).iconTheme.size;
|
||||
final iconSize = MediaQuery.of(context).size.width < 400
|
||||
@@ -234,12 +296,37 @@ class _Thumbnail extends State<Thumbnail> {
|
||||
PopupMenuItem(
|
||||
value: _ThumbnailMenu.saveAs,
|
||||
child: Text(AppLocalizations.of(context)!.saveAs)),
|
||||
const PopupMenuDivider(),
|
||||
PopupMenuItem(
|
||||
value: isNsfw
|
||||
? _ThumbnailMenu.markAsSfw
|
||||
: _ThumbnailMenu.markAsNsfw,
|
||||
child: Text(isNsfw
|
||||
? AppLocalizations.of(context)!.markAsSfw
|
||||
: AppLocalizations.of(context)!.markAsNsfw)),
|
||||
PopupMenuItem(
|
||||
value: isAd
|
||||
? _ThumbnailMenu.markAsNonAd
|
||||
: _ThumbnailMenu.markAsAd,
|
||||
child: Text(isAd
|
||||
? AppLocalizations.of(context)!.markAsNonAd
|
||||
: AppLocalizations.of(context)!.markAsAd)),
|
||||
];
|
||||
return list;
|
||||
}));
|
||||
final timg = _data != null
|
||||
? ImageWithContextMenu(_data!,
|
||||
uri: _uri, fileName: _fileName, dir: _dir)
|
||||
uri: _uri,
|
||||
fileName: _fileName,
|
||||
dir: _dir,
|
||||
isNsfw: () => widget._pMeta.isNsfw,
|
||||
changeNsfw: (isNsfw) {
|
||||
_markAsNsfw(isNsfw);
|
||||
},
|
||||
isAd: () => widget._pMeta.isAd,
|
||||
changeAd: (isAd) {
|
||||
_markAsAd(isAd);
|
||||
})
|
||||
: null;
|
||||
final img = widget.gid != null && widget.index != null && _data != null
|
||||
? GestureDetector(
|
||||
|
||||
@@ -25,9 +25,11 @@ class ThumbnailGridView extends StatelessWidget {
|
||||
final page = npages[index]!;
|
||||
final fileId =
|
||||
files != null ? files!.files[page.token]!.first.id : null;
|
||||
final key = Key("thumbnail$gid-${page.index}");
|
||||
return Container(
|
||||
padding: const EdgeInsets.all(4),
|
||||
child: Thumbnail(page,
|
||||
key: key,
|
||||
fileId: fileId,
|
||||
gid: gid,
|
||||
index: index + 1,
|
||||
|
||||
Reference in New Issue
Block a user