Add support to list galleries with sort

This commit is contained in:
2023-09-08 22:09:41 +08:00
parent f6956e0989
commit de18ca304c
6 changed files with 91 additions and 8 deletions

View File

@@ -43,6 +43,22 @@ enum ThumbnailAlign {
static const bottom = right;
}
enum SortByGid {
none,
asc,
desc;
bool? toBool() {
switch (this) {
case SortByGid.asc:
return true;
case SortByGid.desc:
return false;
default:
return null;
}
}
}
@RestApi()
abstract class _EHApi {
factory _EHApi(Dio dio, {required String baseUrl}) = __EHApi;
@@ -130,6 +146,7 @@ abstract class _EHApi {
{@Query("all") bool? all,
@Query("offset") int? offset,
@Query("limit") int? limit,
@Query("sort_by_gid") bool? sortByGid,
@CancelRequest() CancelToken? cancel});
@GET('/tag/{id}')

View File

@@ -530,6 +530,7 @@ class __EHApi implements _EHApi {
bool? all,
int? offset,
int? limit,
bool? sortByGid,
CancelToken? cancel,
}) async {
const _extra = <String, dynamic>{};
@@ -537,6 +538,7 @@ class __EHApi implements _EHApi {
r'all': all,
r'offset': offset,
r'limit': limit,
r'sort_by_gid': sortByGid,
};
queryParameters.removeWhere((k, v) => v == null);
final _headers = <String, dynamic>{};

View File

@@ -3,13 +3,15 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:go_router/go_router.dart';
import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
import 'package:logging/logging.dart';
import 'api/client.dart';
import 'api/gallery.dart';
import 'globals.dart';
final _log = Logger("GalleriesPage");
class GalleriesPage extends StatefulWidget {
const GalleriesPage({Key? key}) : super(key: key);
const GalleriesPage({Key? key, this.sortByGid}) : super(key: key);
final SortByGid? sortByGid;
static const String routeName = '/galleries';
@@ -19,14 +21,17 @@ class GalleriesPage extends StatefulWidget {
class _GalleriesPage extends State<GalleriesPage> with ThemeModeWidget {
static const int _pageSize = 20;
bool? _sortByGid;
SortByGid _sortByGid2 = SortByGid.none;
final PagingController<int, GMeta> _pagingController =
PagingController(firstPageKey: 0);
Future<void> _fetchPage(int pageKey) async {
try {
final list =
(await api.listGalleries(offset: pageKey, limit: _pageSize)).unwrap();
final list = (await api.listGalleries(
offset: pageKey, limit: _pageSize, sortByGid: _sortByGid))
.unwrap();
final isLastPage = list.length < _pageSize;
if (isLastPage) {
_pagingController.appendLastPage(list);
@@ -42,6 +47,14 @@ class _GalleriesPage extends State<GalleriesPage> with ThemeModeWidget {
@override
void initState() {
try {
_sortByGid2 = widget.sortByGid != null
? widget.sortByGid!
: SortByGid.values[prefs.getInt("sortByGid") ?? 0];
_sortByGid = _sortByGid2.toBool();
} catch (e) {
_log.warning("Failed to load sortByGid from prefs:", e);
}
_pagingController.addPageRequestListener((pageKey) {
_fetchPage(pageKey);
});
@@ -61,6 +74,37 @@ class _GalleriesPage extends State<GalleriesPage> with ThemeModeWidget {
),
title: Text(AppLocalizations.of(context)!.galleries),
actions: [
Padding(
padding: const EdgeInsets.only(top: 4.0),
child: DropdownMenu<SortByGid>(
initialSelection: _sortByGid2,
onSelected: (v) {
if (v != null) {
prefs.setInt("sortByGid", v!.index).catchError((error) {
_log.warning(
"Failed to save sortByGid to prefs:", error);
});
context.pushReplacementNamed("/galleries",
queryParameters: {
"sortByGid": [v!.index.toString()],
});
}
},
label: Text(AppLocalizations.of(context)!.sortByGid,
style: Theme.of(context).primaryTextTheme.labelMedium),
dropdownMenuEntries: [
DropdownMenuEntry(
value: SortByGid.none,
label: AppLocalizations.of(context)!.none),
DropdownMenuEntry(
value: SortByGid.asc,
label: AppLocalizations.of(context)!.asc),
DropdownMenuEntry(
value: SortByGid.desc,
label: AppLocalizations.of(context)!.desc),
],
leadingIcon: const Icon(Icons.sort),
)),
buildThemeModeIcon(context),
buildMoreVertSettingsButon(context),
]),

View File

@@ -31,5 +31,9 @@
"copyImgUrl": "Copy image URL to clipboard",
"retry": "Retry",
"displayAd": "Display Ad pages",
"showTranslatedTag": "Show translated tag (Chinese only)"
"showTranslatedTag": "Show translated tag (Chinese only)",
"none": "none",
"sortByGid": "Sort by gallery id",
"asc": "Ascending",
"desc": "Descending"
}

View File

@@ -31,5 +31,9 @@
"copyImgUrl": "复制图片链接到剪贴板",
"retry": "重试",
"displayAd": "显示广告页面",
"showTranslatedTag": "显示标签翻译(仅限中文)"
"showTranslatedTag": "显示标签翻译(仅限中文)",
"none": "无",
"sortByGid": "按画廊ID排序",
"asc": "升序",
"desc": "降序"
}

View File

@@ -6,6 +6,7 @@ import 'package:flutter_web_plugins/url_strategy.dart';
import 'package:go_router/go_router.dart';
import 'package:logging/logging.dart';
import 'package:window_manager/window_manager.dart';
import 'api/client.dart';
import 'create_root_user.dart';
import 'galleries.dart';
import 'gallery.dart';
@@ -42,9 +43,20 @@ final _router = GoRouter(
builder: (context, state) => const SettingsPage(),
),
GoRoute(
path: GalleriesPage.routeName,
builder: (context, state) => const GalleriesPage(),
),
name: GalleriesPage.routeName,
path: GalleriesPage.routeName,
builder: (context, state) {
SortByGid? sortByGid;
try {
if (state.uri.queryParameters.containsKey("sortByGid")) {
sortByGid = SortByGid
.values[int.parse(state.uri.queryParameters["sortByGid"]!)];
}
} catch (e) {
_routerLog.warning("Failed to load sortByGid from prefs:", e);
}
return GalleriesPage(sortByGid: sortByGid);
}),
GoRoute(
path: GalleryPage.routeName,
builder: (context, state) => GalleryPage(