nyne/venera
1
0
Fork 0
mirror of https://github.com/venera-app/venera.git synced 2025-09-27 15:57:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev'

Browse Source
This commit is contained in:
nyne
2024-11-02 20:31:43 +08:00
parent b1b516381d eecd30f77d
commit cd607ff337
24 changed files with 576 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
lib/pages/comic_page.dart
View File

@@ -42,12 +42,41 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
bool isDownloaded = false;
void updateHistory() async {
var newHistory = await HistoryManager()
.find(widget.id, ComicType(widget.sourceKey.hashCode));
if(newHistory?.ep != history?.ep || newHistory?.page != history?.page) {
history = newHistory;
update();
}
}
@override
Widget buildLoading() {
return Column(
children: [
const Appbar(title: Text("")),
Expanded(
child: super.buildLoading(),
),
],
);
}
@override
void initState() {
scrollController.addListener(onScroll);
HistoryManager().addListener(updateHistory);
super.initState();
}
@override
void dispose() {
scrollController.removeListener(onScroll);
HistoryManager().removeListener(updateHistory);
super.dispose();
}
@override
void update() {
setState(() {});
@@ -205,6 +234,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
Widget buildActions() {
bool isMobile = context.width < changePoint;
bool hasHistory = history != null && (history!.ep > 1 || history!.page > 1);
return SliverToBoxAdapter(
child: Column(
children: [
@@ -212,17 +242,17 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
scrollDirection: Axis.horizontal,
padding: const EdgeInsets.symmetric(horizontal: 8),
children: [
if (history != null && (history!.ep > 1 || history!.page > 1))
if (hasHistory && !isMobile)
_ActionButton(
icon: const Icon(Icons.menu_book),
text: 'Continue'.tl,
onPressed: continueRead,
iconColor: context.useTextColor(Colors.yellow),
),
if (!isMobile)
if(!isMobile || hasHistory)
_ActionButton(
icon: const Icon(Icons.play_circle_outline),
text: 'Read'.tl,
text: 'Start'.tl,
onPressed: read,
iconColor: context.useTextColor(Colors.orange),
),
@@ -278,7 +308,10 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
),
const SizedBox(width: 16),
Expanded(
child: FilledButton(onPressed: read, child: Text("Read".tl)),
child: hasHistory
? FilledButton(
onPressed: continueRead, child: Text("Continue".tl))
: FilledButton(onPressed: read, child: Text("Read".tl)),
)
],
).paddingHorizontal(16).paddingVertical(8),
@@ -398,23 +431,23 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
Text(comic.stars!.toStringAsFixed(2)),
],
).paddingLeft(16).paddingVertical(8),
for (var e in comic.tags.entries)
buildWrap(
children: [
if(e.value.isNotEmpty)
for (var e in comic.tags.entries)
buildWrap(
children: [
if (e.value.isNotEmpty)
buildTag(text: e.key.ts(comicSource.key), isTitle: true),
for (var tag in e.value)
buildTag(
text: enableTranslation
? TagsTranslation.translationTagWithNamespace(
tag,
e.key.toLowerCase(),
)
: tag,
onTap: () => onTapTag(tag, e.key),
),
],
),
for (var tag in e.value)
buildTag(
text: enableTranslation
? TagsTranslation.translationTagWithNamespace(
tag,
e.key.toLowerCase(),
)
: tag,
onTap: () => onTapTag(tag, e.key),
),
],
),
if (comic.uploader != null)
buildWrap(
children: [
@@ -458,7 +491,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
}
Widget buildRecommend() {
if (comic.recommend == null||comic.recommend!.isEmpty) {
if (comic.recommend == null || comic.recommend!.isEmpty) {
return const SliverPadding(padding: EdgeInsets.zero);
}
return SliverMainAxisGroup(slivers: [
@@ -770,6 +803,7 @@ class _ActionButton extends StatelessWidget {
this.isLoading,
this.iconColor,
});
final Widget icon;
final Widget? activeIcon;
@@ -783,6 +817,7 @@ class _ActionButton extends StatelessWidget {
final bool? isLoading;
final Color? iconColor;
@override
Widget build(BuildContext context) {
return Container(

148
lib/pages/explore_page.dart
View File

@@ -5,8 +5,12 @@ import 'package:venera/foundation/appdata.dart';
import 'package:venera/foundation/comic_source/comic_source.dart';
import 'package:venera/foundation/res.dart';
import 'package:venera/foundation/state_controller.dart';
import 'package:venera/pages/search_result_page.dart';
import 'package:venera/utils/ext.dart';
import 'package:venera/utils/translations.dart';
import 'category_comics_page.dart';
class ExplorePage extends StatefulWidget {
const ExplorePage({super.key});
@@ -15,7 +19,7 @@ class ExplorePage extends StatefulWidget {
}
class _ExplorePageState extends State<ExplorePage>
with TickerProviderStateMixin {
with TickerProviderStateMixin, AutomaticKeepAliveClientMixin<ExplorePage> {
late TabController controller;
bool showFB = true;
@@ -24,6 +28,24 @@ class _ExplorePageState extends State<ExplorePage>
late List<String> pages;
void onSettingsChanged() {
var explorePages = List<String>.from(appdata.settings["explore_pages"]);
var all = ComicSource.all()
.map((e) => e.explorePages)
.expand((e) => e.map((e) => e.title))
.toList();
explorePages = explorePages.where((e) => all.contains(e)).toList();
if (!pages.isEqualsTo(explorePages)) {
setState(() {
pages = explorePages;
controller = TabController(
length: pages.length,
vsync: this,
);
});
}
}
@override
void initState() {
pages = List<String>.from(appdata.settings["explore_pages"]);
@@ -36,9 +58,17 @@ class _ExplorePageState extends State<ExplorePage>
length: pages.length,
vsync: this,
);
appdata.settings.addListener(onSettingsChanged);
super.initState();
}
@override
void dispose() {
controller.dispose();
appdata.settings.removeListener(onSettingsChanged);
super.dispose();
}
void refresh() {
int page = controller.index;
String currentPageId = pages[page];
@@ -83,12 +113,14 @@ class _ExplorePageState extends State<ExplorePage>
@override
Widget build(BuildContext context) {
super.build(context);
if (pages.isEmpty) {
return buildEmpty();
}
Widget tabBar = Material(
child: FilledTabBar(
key: Key(pages.toString()),
tabs: pages.map((e) => buildTab(e)).toList(),
controller: controller,
),
@@ -97,48 +129,50 @@ class _ExplorePageState extends State<ExplorePage>
return Stack(
children: [
Positioned.fill(
child: Column(
children: [
tabBar,
Expanded(
child: NotificationListener<ScrollNotification>(
onNotification: (notifications) {
if (notifications.metrics.axis == Axis.horizontal) {
if (!showFB) {
child: Column(
children: [
tabBar,
Expanded(
child: NotificationListener<ScrollNotification>(
onNotification: (notifications) {
if (notifications.metrics.axis == Axis.horizontal) {
if (!showFB) {
setState(() {
showFB = true;
});
}
return true;
}
var current = notifications.metrics.pixels;
if ((current > location && current != 0) && showFB) {
setState(() {
showFB = false;
});
} else if ((current < location || current == 0) &&
!showFB) {
setState(() {
showFB = true;
});
}
return true;
}
var current = notifications.metrics.pixels;
if ((current > location && current != 0) && showFB) {
setState(() {
showFB = false;
});
} else if ((current < location || current == 0) && !showFB) {
setState(() {
showFB = true;
});
}
location = current;
return false;
},
child: MediaQuery.removePadding(
context: context,
removeTop: true,
child: TabBarView(
controller: controller,
children: pages.map((e) => buildBody(e)).toList(),
location = current;
return false;
},
child: MediaQuery.removePadding(
context: context,
removeTop: true,
child: TabBarView(
controller: controller,
children: pages.map((e) => buildBody(e)).toList(),
),
),
),
),
)
],
)),
)
],
),
),
Positioned(
right: 16,
bottom: 16,
@@ -159,6 +193,9 @@ class _ExplorePageState extends State<ExplorePage>
],
);
}
@override
bool get wantKeepAlive => true;
}
class _SingleExplorePage extends StatefulWidget {
@@ -170,7 +207,8 @@ class _SingleExplorePage extends StatefulWidget {
State<_SingleExplorePage> createState() => _SingleExplorePageState();
}
class _SingleExplorePageState extends StateWithController<_SingleExplorePage> {
class _SingleExplorePageState extends StateWithController<_SingleExplorePage>
with AutomaticKeepAliveClientMixin<_SingleExplorePage> {
late final ExplorePageData data;
bool loading = true;
@@ -183,6 +221,16 @@ class _SingleExplorePageState extends StateWithController<_SingleExplorePage> {
int key = 0;
bool _wantKeepAlive = true;
void onSettingsChanged() {
var explorePages = appdata.settings["explore_pages"];
if (!explorePages.contains(widget.title)) {
_wantKeepAlive = false;
updateKeepAlive();
}
}
@override
void initState() {
super.initState();
@@ -195,11 +243,19 @@ class _SingleExplorePageState extends StateWithController<_SingleExplorePage> {
}
}
}
appdata.settings.addListener(onSettingsChanged);
throw "Explore Page ${widget.title} Not Found!";
}
@override
void dispose() {
appdata.settings.removeListener(onSettingsChanged);
super.dispose();
}
@override
Widget build(BuildContext context) {
super.build(context);
if (data.loadMultiPart != null) {
return buildMultiPart();
} else if (data.loadPage != null || data.loadNext != null) {
@@ -284,6 +340,9 @@ class _SingleExplorePageState extends StateWithController<_SingleExplorePage> {
});
}
}
@override
bool get wantKeepAlive => _wantKeepAlive;
}
class _MixedExplorePage extends StatefulWidget {
@@ -367,13 +426,12 @@ Iterable<Widget> _buildExplorePagePart(
if (part.viewMore != null)
TextButton(
onPressed: () {
// TODO: view more
/*
var context = App.mainNavigatorKey!.currentContext!;
if (part.viewMore!.startsWith("search:")) {
context.to(
() => SearchResultPage(
keyword: part.viewMore!.replaceFirst("search:", ""),
() => SearchResultPage(
text: part.viewMore!.replaceFirst("search:", ""),
options: const [],
sourceKey: sourceKey,
),
);
@@ -385,16 +443,16 @@ Iterable<Widget> _buildExplorePagePart(
p = null;
}
context.to(
() => CategoryComicsPage(
() => CategoryComicsPage(
category: c,
categoryKey:
ComicSource.find(sourceKey)!.categoryData!.key,
ComicSource.find(sourceKey)!.categoryData!.key,
param: p,
),
);
}*/
}
},
child: Text("查看更多".tl),
child: Text("View more".tl),
)
],
),

1
lib/pages/favorites/favorites_page.dart
View File

@@ -17,6 +17,7 @@ part 'favorite_actions.dart';
part 'side_bar.dart';
part 'local_favorites_page.dart';
part 'network_favorites_page.dart';
part 'local_search_page.dart';
const _kLeftBarWidth = 256.0;

41
lib/pages/favorites/local_search_page.dart Normal file
View File

@@ -0,0 +1,41 @@
part of 'favorites_page.dart';
class LocalSearchPage extends StatefulWidget {
const LocalSearchPage({super.key});
@override
State<LocalSearchPage> createState() => _LocalSearchPageState();
}
class _LocalSearchPageState extends State<LocalSearchPage> {
String keyword = '';
var comics = <FavoriteItemWithFolderInfo>[];
late final SearchBarController controller;
@override
void initState() {
super.initState();
controller = SearchBarController(onSearch: (text) {
keyword = text;
comics = LocalFavoritesManager().search(keyword);
setState(() {});
});
}
@override
Widget build(BuildContext context) {
return Scaffold(
body: SmoothCustomScrollView(slivers: [
SliverSearchBar(controller: controller),
SliverGridComics(
comics: comics,
badgeBuilder: (c) {
return (c as FavoriteItemWithFolderInfo).folder;
},
),
]),
);
}
}

8
lib/pages/favorites/side_bar.dart
View File

@@ -88,6 +88,13 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
const SizedBox(width: 12),
Text("Local".tl),
const Spacer(),
IconButton(
icon: const Icon(Icons.search),
color: context.colorScheme.primary,
onPressed: () {
context.to(() => const LocalSearchPage());
},
),
IconButton(
icon: const Icon(Icons.add),
color: context.colorScheme.primary,
@@ -112,6 +119,7 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
if (index == 0) {
return Container(
padding: const EdgeInsets.symmetric(vertical: 12),
margin: const EdgeInsets.only(top: 8),
decoration: BoxDecoration(
border: Border(
top: BorderSide(

152
lib/pages/local_comics_page.dart
View File

@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:venera/components/components.dart';
import 'package:venera/foundation/app.dart';
import 'package:venera/foundation/appdata.dart';
import 'package:venera/foundation/local.dart';
import 'package:venera/pages/downloading_page.dart';
import 'package:venera/utils/cbz.dart';
@@ -17,15 +18,29 @@ class LocalComicsPage extends StatefulWidget {
class _LocalComicsPageState extends State<LocalComicsPage> {
late List<LocalComic> comics;
late LocalSortType sortType;
String keyword = "";
bool searchMode = false;
void update() {
setState(() {
comics = LocalManager().getComics();
});
if(keyword.isEmpty) {
setState(() {
comics = LocalManager().getComics(sortType);
});
} else {
setState(() {
comics = LocalManager().search(keyword);
});
}
}
@override
void initState() {
comics = LocalManager().getComics();
var sort = appdata.implicitData["local_sort"] ?? "name";
sortType = LocalSortType.fromString(sort);
comics = LocalManager().getComics(sortType);
LocalManager().addListener(update);
super.initState();
}
@@ -36,25 +51,129 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
super.dispose();
}
void sort() {
showDialog(
context: context,
builder: (context) {
return StatefulBuilder(builder: (context, setState) {
return ContentDialog(
title: "Sort".tl,
content: Column(
children: [
RadioListTile<LocalSortType>(
title: Text("Name".tl),
value: LocalSortType.name,
groupValue: sortType,
onChanged: (v) {
setState(() {
sortType = v!;
});
},
),
RadioListTile<LocalSortType>(
title: Text("Date".tl),
value: LocalSortType.timeAsc,
groupValue: sortType,
onChanged: (v) {
setState(() {
sortType = v!;
});
},
),
RadioListTile<LocalSortType>(
title: Text("Date Desc".tl),
value: LocalSortType.timeDesc,
groupValue: sortType,
onChanged: (v) {
setState(() {
sortType = v!;
});
},
),
],
),
actions: [
FilledButton(
onPressed: () {
appdata.implicitData["local_sort"] =
sortType.value;
appdata.writeImplicitData();
Navigator.pop(context);
update();
},
child: Text("Confirm".tl),
),
],
);
});
},
);
}
@override
Widget build(BuildContext context) {
return Scaffold(
body: SmoothCustomScrollView(
slivers: [
SliverAppbar(
title: Text("Local".tl),
actions: [
Tooltip(
message: "Downloading".tl,
child: IconButton(
icon: const Icon(Icons.download),
if(!searchMode)
SliverAppbar(
title: Text("Local".tl),
actions: [
Tooltip(
message: "Search".tl,
child: IconButton(
icon: const Icon(Icons.search),
onPressed: () {
setState(() {
searchMode = true;
});
},
),
),
Tooltip(
message: "Sort".tl,
child: IconButton(
icon: const Icon(Icons.sort),
onPressed: sort,
),
),
Tooltip(
message: "Downloading".tl,
child: IconButton(
icon: const Icon(Icons.download),
onPressed: () {
showPopUpWidget(context, const DownloadingPage());
},
),
)
],
)
else
SliverAppbar(
title: TextField(
autofocus: true,
decoration: InputDecoration(
hintText: "Search".tl,
border: InputBorder.none,
),
onChanged: (v) {
keyword = v;
update();
},
),
actions: [
IconButton(
icon: const Icon(Icons.close),
onPressed: () {
showPopUpWidget(context, const DownloadingPage());
setState(() {
searchMode = false;
keyword = "";
update();
});
},
),
)
],
),
],
),
SliverGridComics(
comics: comics,
onTap: (c) {
@@ -80,8 +199,7 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
var file = await CBZ.export(c as LocalComic);
await saveFile(filename: file.name, file: file);
await file.delete();
}
catch (e) {
} catch (e) {
context.showMessage(message: e.toString());
}
controller.close();

30
lib/pages/settings/app.dart
View File

@@ -86,6 +86,36 @@ class _AppSettingsState extends State<AppSettings> {
},
actionTitle: 'Set'.tl,
).toSliver(),
_CallbackSetting(
title: "Export App Data".tl,
callback: () async {
var controller = showLoadingDialog(context);
var file = await exportAppData();
await saveFile(filename: "data.venera", file: file);
controller.close();
},
actionTitle: 'Export'.tl,
).toSliver(),
_CallbackSetting(
title: "Import App Data".tl,
callback: () async {
var controller = showLoadingDialog(context);
var file = await selectFile(ext: ['venera']);
if(file != null) {
var cacheFile = File(FilePath.join(App.cachePath, "temp.venera"));
await file.saveTo(cacheFile.path);
try {
await importAppData(cacheFile);
}
catch(e, s) {
Log.error("Import data", e.toString(), s);
context.showMessage(message: "Failed to import data".tl);
}
}
controller.close();
},
actionTitle: 'Import'.tl,
).toSliver(),
_SettingPartTitle(
title: "Log".tl,
icon: Icons.error_outline,

3
lib/pages/settings/appearance.dart
View File

@@ -21,6 +21,9 @@ class _AppearanceSettingsState extends State<AppearanceSettings> {
"light": "Light".tl,
"dark": "Dark".tl,
},
onChanged: () async {
App.forceRebuild();
},
).toSliver(),
SelectSetting(
title: "Theme Color".tl,

2
lib/pages/settings/setting_components.dart
View File

@@ -434,7 +434,7 @@ class _CallbackSetting extends StatelessWidget {
return ListTile(
title: Text(title),
subtitle: subtitle == null ? null : Text(subtitle!),
trailing: FilledButton(
trailing: Button.normal(
onPressed: callback,
child: Text(actionTitle),
).fixHeight(28),

1
lib/pages/settings/settings_page.dart
View File

@@ -14,6 +14,7 @@ import 'package:venera/foundation/consts.dart';
import 'package:venera/foundation/local.dart';
import 'package:venera/foundation/log.dart';
import 'package:venera/network/app_dio.dart';
import 'package:venera/utils/data.dart';
import 'package:venera/utils/io.dart';
import 'package:venera/utils/translations.dart';
import 'package:yaml/yaml.dart';