lifegpc/eh_downloader_flutter
1
0
Fork 0
mirror of https://github.com/lifegpc/eh_downloader_flutter.git synced 2026-07-08 01:30:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor change for gallery when displayed as share mode

Browse Source
This commit is contained in:
lifegpc
2024-08-12 00:45:22 +00:00
committed by GitHub
parent f599d52ce8
commit 32a42df473
11 changed files with 145 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/api/client.dart
View File

@@ -16,6 +16,7 @@ import 'tags.dart';
import 'task.dart';
import 'token.dart';
import 'user.dart';
import '../globals.dart';
part 'client.g.dart';
@@ -245,6 +246,12 @@ abstract class _EHApi {
@Query("tag") String? tag,
@Query("category") String? category,
@CancelRequest() CancelToken? cancel});
@PUT('/shared_token')
@MultiPart()
Future<ApiResult<SharedTokenWithUrl>> shareGallery(@Part(name: "gid") int gid,
{@Part(name: "expired") int? expired,
@Part(name: "type") String type = "gallery",
@CancelRequest() CancelToken? cancel});
@GET('/tag/{id}')
// ignore: unused_element
@@ -437,6 +444,7 @@ class EHApi extends __EHApi {
"jpn_title": jpnTitle?.toString(),
"max_length": maxLength?.toString(),
"export_ad": exportAd?.toString(),
"share": shareToken,
};
queries.removeWhere((key, value) => value == null);
final newUri = uri

52
lib/api/client.g.dart
View File

@@ -1004,6 +1004,58 @@ class __EHApi implements _EHApi {
return _value;
}
@override
Future<ApiResult<SharedTokenWithUrl>> shareGallery(
int gid, {
int? expired,
String type = "gallery",
CancelToken? cancel,
}) async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
queryParameters.removeWhere((k, v) => v == null);
final _headers = <String, dynamic>{};
final _data = FormData();
_data.fields.add(MapEntry(
'gid',
gid.toString(),
));
if (expired != null) {
_data.fields.add(MapEntry(
'expired',
expired.toString(),
));
}
_data.fields.add(MapEntry(
'type',
type,
));
final _result = await _dio.fetch<Map<String, dynamic>>(
_setStreamType<ApiResult<SharedTokenWithUrl>>(Options(
method: 'PUT',
headers: _headers,
extra: _extra,
contentType: 'multipart/form-data',
)
.compose(
_dio.options,
'/shared_token',
queryParameters: queryParameters,
data: _data,
cancelToken: cancel,
)
.copyWith(
baseUrl: _combineBaseUrls(
_dio.options.baseUrl,
baseUrl,
))));
final _value = ApiResult<SharedTokenWithUrl>.fromJson(
_result.data!,
(json) => SharedTokenWithUrl.fromJson(json as Map<String, dynamic>),
);
return _value;
}
@override
Future<ApiResult<Tags>> _getTags(
String id, {

12
lib/api/token.dart
View File

@@ -108,3 +108,15 @@ class SharedToken {
}
}
}
@JsonSerializable(createToJson: false)
class SharedTokenWithUrl {
const SharedTokenWithUrl({
required this.token,
required this.url,
});
final SharedToken token;
final String url;
factory SharedTokenWithUrl.fromJson(Map<String, dynamic> json) =>
_$SharedTokenWithUrlFromJson(json);
}

6
lib/api/token.g.dart
View File

@@ -62,3 +62,9 @@ Map<String, dynamic> _$GallerySharedTokenInfoToJson(
<String, dynamic>{
'gid': instance.gid,
};
SharedTokenWithUrl _$SharedTokenWithUrlFromJson(Map<String, dynamic> json) =>
SharedTokenWithUrl(
token: SharedToken.fromJson(json['token'] as Map<String, dynamic>),
url: json['url'] as String,
);

7
lib/api/user.dart
View File

@@ -9,7 +9,8 @@ enum UserPermission with EnumFlag {
readGallery,
editGallery,
deleteGallery,
manageTasks;
manageTasks,
shareGallery;
String localText(BuildContext context) {
final i18n = AppLocalizations.of(context)!;
@@ -22,11 +23,13 @@ enum UserPermission with EnumFlag {
return i18n.deleteGallery;
case UserPermission.manageTasks:
return i18n.manageTasks;
case UserPermission.shareGallery:
return i18n.shareGallery;
}
}
}
const userPermissionAll = 15;
const userPermissionAll = 31;
class UserPermissions {
UserPermissions(this.code);

27
lib/components/gallery_info.dart
View File

@@ -86,18 +86,21 @@ class _GalleryInfo extends State<GalleryInfo> with ThemeModeWidget {
controller: controller,
slivers: [
SliverAppBar(
leading: IconButton(
icon: Icon(widget.isSelectMode ? Icons.close : Icons.arrow_back),
onPressed: () {
if (widget.isSelectMode) {
if (widget.onSelectChanged != null) {
widget.onSelectChanged!(false);
}
} else {
context.canPop() ? context.pop() : context.go("/");
}
},
),
leading: shareToken != null && !widget.isSelectMode
? Container()
: IconButton(
icon: Icon(
widget.isSelectMode ? Icons.close : Icons.arrow_back),
onPressed: () {
if (widget.isSelectMode) {
if (widget.onSelectChanged != null) {
widget.onSelectChanged!(false);
}
} else {
context.canPop() ? context.pop() : context.go("/");
}
},
),
title: SelectableText(widget.gData.meta.preferredTitle,
maxLines: 1, minLines: 1),
actions: [

51
lib/components/gallery_info_desktop.dart
View File

@@ -1,3 +1,4 @@
import 'package:eh_downloader_flutter/globals.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -94,28 +95,34 @@ class GalleryInfoDesktop extends StatelessWidget {
SizedBox(
width: 170,
child: Column(children: [
SelectableText.rich(TextSpan(
text: gData.meta.category,
style: TextStyle(color: cs.secondary),
mouseCursor: SystemMouseCursors.click,
recognizer: TapGestureRecognizer()
..onTap = () {
context.pushNamed("/galleries",
queryParameters: {
"category": gData.meta.category
});
})),
SelectableText.rich(TextSpan(
text: gData.meta.uploader,
style: TextStyle(color: cs.secondary),
mouseCursor: SystemMouseCursors.click,
recognizer: TapGestureRecognizer()
..onTap = () {
context.pushNamed("/galleries",
queryParameters: {
"uploader": gData.meta.uploader
});
})),
shareToken != null
? SelectableText(gData.meta.category,
style: TextStyle(color: cs.secondary))
: SelectableText.rich(TextSpan(
text: gData.meta.category,
style: TextStyle(color: cs.secondary),
mouseCursor: SystemMouseCursors.click,
recognizer: TapGestureRecognizer()
..onTap = () {
context.pushNamed("/galleries",
queryParameters: {
"category": gData.meta.category
});
})),
shareToken != null
? SelectableText(gData.meta.uploader,
style: TextStyle(color: cs.secondary))
: SelectableText.rich(TextSpan(
text: gData.meta.uploader,
style: TextStyle(color: cs.secondary),
mouseCursor: SystemMouseCursors.click,
recognizer: TapGestureRecognizer()
..onTap = () {
context.pushNamed("/galleries",
queryParameters: {
"uploader": gData.meta.uploader
});
})),
_KeyValue(
"${i18n.posted}${i18n.colon}",
DateFormat.yMd(locale)

5
lib/components/tag.dart
View File

@@ -10,6 +10,9 @@ class TagWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
final t =
Text(name ?? (tag.tag.contains(':') ? tag.tag.split(':')[1] : tag.tag));
if (shareToken != null) return t;
return InkWell(
onTap: () {
context.pushNamed("/galleries",
@@ -18,6 +21,6 @@ class TagWidget extends StatelessWidget {
},
extra: GalleriesPageExtra(translatedTag: tag.translated));
},
child: Text(name ?? (tag.tag.contains(':') ? tag.tag.split(':')[1] : tag.tag)));
child: t);
}
}

3
lib/l10n/app_en.arb
View File

@@ -314,5 +314,6 @@
}
}
},
"enableServerTiming": "Enable server time tracking"
"enableServerTiming": "Enable server time tracking",
"shareGallery": "Share gallery"
}

3
lib/l10n/app_zh.arb
View File

@@ -314,5 +314,6 @@
}
}
},
"enableServerTiming": "测量服务器所用时间"
"enableServerTiming": "测量服务器所用时间",
"shareGallery": "分享画廊"
}

16
lib/pages/gallery.dart
View File

@@ -151,12 +151,16 @@ class _GalleryPage extends State<GalleryPage>
return Scaffold(
appBar: _data == null
? AppBar(
leading: IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () {
context.canPop() ? context.pop() : context.go("/gallery");
},
),
leading: shareToken != null
? Container()
: IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () {
context.canPop()
? context.pop()
: context.go("/gallery");
},
),
title: Text(title),
actions: [
buildThemeModeIcon(context),