feat: ui detail upgrade

This commit is contained in:
Simon Ding
2024-07-21 17:46:05 +08:00
parent f7d858f920
commit 254de1d018
4 changed files with 213 additions and 212 deletions

View File

@@ -62,17 +62,17 @@ class ActivityDataSource extends DataTableSource {
DataCell(() { DataCell(() {
if (activity.status == "uploading") { if (activity.status == "uploading") {
return const SizedBox( return const SizedBox(
width: 20, height: 20, child: CircularProgressIndicator()); width: 20, height: 20, child: Tooltip(message: "正在上传到指定存储",child: CircularProgressIndicator(),) );
} else if (activity.status == "fail") { } else if (activity.status == "fail") {
return const Icon( return const Tooltip(message: "下载失败",child: Icon(
Icons.close, Icons.close,
color: Colors.red, color: Colors.red,
); ));
} else if (activity.status == "success") { } else if (activity.status == "success") {
return const Icon( return const Tooltip(message: "下载成功",child: Icon(
Icons.check, Icons.check,
color: Colors.green, color: Colors.green,
); ),) ;
} }
double p = double p =

View File

@@ -27,7 +27,6 @@ class MovieDetailsPage extends ConsumerStatefulWidget {
} }
class _MovieDetailsPageState extends ConsumerState<MovieDetailsPage> { class _MovieDetailsPageState extends ConsumerState<MovieDetailsPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var seriesDetails = ref.watch(mediaDetailsProvider(widget.id)); var seriesDetails = ref.watch(mediaDetailsProvider(widget.id));
@@ -104,10 +103,14 @@ class _MovieDetailsPageState extends ConsumerState<MovieDetailsPage> {
IconButton( IconButton(
onPressed: () { onPressed: () {
ref ref
.read( .read(mediaDetailsProvider(widget.id)
mediaDetailsProvider(widget.id).notifier) .notifier)
.delete(); .delete()
context.go(WelcomePage.routeMoivie); .whenComplete(() => context
.go(WelcomePage.routeMoivie))
.onError((error, trace) =>
Utils.showSnakeBar(
"删除失败:$error"));
}, },
icon: const Icon(Icons.delete)) icon: const Icon(Icons.delete))
], ],
@@ -138,11 +141,13 @@ class _MovieDetailsPageState extends ConsumerState<MovieDetailsPage> {
DataCell(Text("${torrent.peers}")), DataCell(Text("${torrent.peers}")),
DataCell(IconButton( DataCell(IconButton(
icon: const Icon(Icons.download), icon: const Icon(Icons.download),
onPressed: () async { onPressed: () {
await ref ref
.read(movieTorrentsDataProvider(widget.id) .read(movieTorrentsDataProvider(widget.id)
.notifier) .notifier)
.download(torrent.link!); .download(torrent.link!)
.whenComplete(() => Utils.showSnakeBar(
"开始下载:${torrent.name}")).onError((error, trace) => Utils.showSnakeBar("操作失败: $error"));
}, },
)) ))
]); ]);

View File

@@ -43,6 +43,7 @@ class SeriesDetailData
if (sp.code != 0) { if (sp.code != 0) {
throw sp.message; throw sp.message;
} }
ref.invalidateSelf();
var name = (sp.data as Map<String, dynamic>)["name"]; var name = (sp.data as Map<String, dynamic>)["name"];
return name; return name;
} }

View File

@@ -26,7 +26,6 @@ class TvDetailsPage extends ConsumerStatefulWidget {
} }
class _TvDetailsPageState extends ConsumerState<TvDetailsPage> { class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
Future<String>? _pendingFuture;
@override @override
void initState() { void initState() {
@@ -37,211 +36,207 @@ class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
var seriesDetails = ref.watch(mediaDetailsProvider(widget.seriesId)); var seriesDetails = ref.watch(mediaDetailsProvider(widget.seriesId));
var storage = ref.watch(storageSettingProvider); var storage = ref.watch(storageSettingProvider);
return FutureBuilder( return seriesDetails.when(
// We listen to the pending operation, to update the UI accordingly. data: (details) {
future: _pendingFuture, Map<int, List<DataRow>> m = {};
builder: (context, snapshot) { for (final ep in details.episodes!) {
return seriesDetails.when( var row = DataRow(cells: [
data: (details) { DataCell(Text("${ep.episodeNumber}")),
Map<int, List<DataRow>> m = {}; DataCell(Text("${ep.title}")),
for (final ep in details.episodes!) { DataCell(Opacity(
var row = DataRow(cells: [ opacity: 0.5,
DataCell(Text("${ep.episodeNumber}")), child: Text("${ep.airDate}"),
DataCell(Text("${ep.title}")), )),
DataCell(Opacity( DataCell(
opacity: 0.5, Opacity(
child: Text("${ep.airDate}"), opacity: 0.7,
)), child: ep.status == "downloading"
DataCell( ? const Tooltip(
Opacity( message: "下载中",
opacity: 0.7, child: Icon(Icons.downloading),
child: ep.status == "downloading" )
? const Tooltip(message: "下载中",child: Icon(Icons.downloading),) : (ep.status == "downloaded"
: (ep.status == "downloaded" ? const Tooltip(
? const Tooltip(message: "已下载",child: Icon(Icons.download_done),) message: "已下载",
: const Tooltip(message: "未下载",child: Icon(Icons.warning_amber_rounded),) )), child: Icon(Icons.download_done),
), )
DataCell(Row( : const Tooltip(
children: [ message: "未下载",
Tooltip( child: Icon(Icons.warning_amber_rounded),
message: "搜索下载对应剧集", ))),
child: IconButton( ),
onPressed: () async { DataCell(Row(
var f = ref children: [
.read(mediaDetailsProvider(widget.seriesId) Tooltip(
.notifier) message: "搜索下载对应剧集",
.searchAndDownload(widget.seriesId, child: IconButton(
ep.seasonNumber!, ep.episodeNumber!); onPressed: () {
setState(() { ref
_pendingFuture = f; .read(mediaDetailsProvider(widget.seriesId)
}); .notifier)
if (!Utils.showError(context, snapshot)) { .searchAndDownload(widget.seriesId,
var name = await f; ep.seasonNumber!, ep.episodeNumber!)
Utils.showSnakeBar("开始下载: $name"); .then((v) => Utils.showSnakeBar("开始下载: $v"))
} .onError((error, trace) =>
}, Utils.showSnakeBar("操作失败: $error"));
icon: const Icon(Icons.search)), },
) icon: const Icon(Icons.search)),
, ),
const SizedBox( const SizedBox(
width: 10, width: 10,
), ),
IconButton( IconButton(
onPressed: () {}, onPressed: () {}, icon: const Icon(Icons.manage_search))
icon: const Icon(Icons.manage_search)) ],
], ))
)) ]);
]);
if (m[ep.seasonNumber] == null) { if (m[ep.seasonNumber] == null) {
m[ep.seasonNumber!] = List.empty(growable: true); m[ep.seasonNumber!] = List.empty(growable: true);
} }
m[ep.seasonNumber!]!.add(row); m[ep.seasonNumber!]!.add(row);
} }
List<ExpansionTile> list = List.empty(growable: true); List<ExpansionTile> list = List.empty(growable: true);
for (final k in m.keys.toList().reversed) { for (final k in m.keys.toList().reversed) {
var seasonList = ExpansionTile( var seasonList = ExpansionTile(
tilePadding: const EdgeInsets.fromLTRB(10, 0, 10, 0), tilePadding: const EdgeInsets.fromLTRB(10, 0, 10, 0),
//childrenPadding: const EdgeInsets.fromLTRB(50, 0, 50, 0), //childrenPadding: const EdgeInsets.fromLTRB(50, 0, 50, 0),
initiallyExpanded: false, initiallyExpanded: false,
title: k == 0 ? const Text("特别篇") : Text("$k"), title: k == 0 ? const Text("特别篇") : Text("$k"),
expandedCrossAxisAlignment: CrossAxisAlignment.stretch, expandedCrossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
DataTable(columns: [ DataTable(columns: [
const DataColumn(label: Text("#")), const DataColumn(label: Text("#")),
const DataColumn( const DataColumn(
label: Text("标题"), label: Text("标题"),
),
const DataColumn(label: Text("播出时间")),
const DataColumn(label: Text("状态")),
DataColumn(
label: Tooltip(
message: "搜索下载全部剧集",
child: IconButton(
onPressed: () {
ref
.read(mediaDetailsProvider(widget.seriesId)
.notifier)
.searchAndDownload(widget.seriesId, k, 0)
.then((v) => Utils.showSnakeBar("开始下载: $v"))
.onError((error, trace) =>
Utils.showSnakeBar("操作失败: $error"));
},
icon: const Icon(Icons.search)),
))
], rows: m[k]!),
],
);
list.add(seasonList);
}
return ListView(
children: [
Card(
margin: const EdgeInsets.all(4),
clipBehavior: Clip.hardEdge,
child: Container(
decoration: BoxDecoration(
image: DecorationImage(
fit: BoxFit.fitWidth,
opacity: 0.5,
image: NetworkImage(
"${APIs.imagesUrl}/${details.id}/backdrop.jpg",
headers: APIs.authHeaders))),
child: Padding(
padding: const EdgeInsets.all(10),
child: Row(
children: <Widget>[
Flexible(
flex: 1,
child: Padding(
padding: const EdgeInsets.all(10),
child: Image.network(
"${APIs.imagesUrl}/${details.id}/poster.jpg",
fit: BoxFit.contain,
headers: APIs.authHeaders,
),
),
), ),
const DataColumn(label: Text("播出时间")), Flexible(
const DataColumn(label: Text("状态")), flex: 6,
DataColumn(label: Tooltip(
message: "搜索下载全部剧集",
child: IconButton(
onPressed: () async {
var f = ref
.read(mediaDetailsProvider(widget.seriesId)
.notifier)
.searchAndDownload(widget.seriesId,
k, 0);
setState(() {
_pendingFuture = f;
});
if (!Utils.showError(context, snapshot)) {
var name = await f;
Utils.showSnakeBar("开始下载: $name");
}
},
icon: const Icon(Icons.search)),) )
], rows: m[k]!),
],
);
list.add(seasonList);
}
return ListView(
children: [
Card(
margin: const EdgeInsets.all(4),
clipBehavior: Clip.hardEdge,
child: Container(
decoration: BoxDecoration(
image: DecorationImage(
fit: BoxFit.fitWidth,
opacity: 0.5,
image: NetworkImage(
"${APIs.imagesUrl}/${details.id}/backdrop.jpg",
headers: APIs.authHeaders))),
child: Padding(
padding: const EdgeInsets.all(10),
child: Row( child: Row(
children: <Widget>[ children: [
Flexible( Expanded(
flex: 1, child: Column(
child: Padding( crossAxisAlignment: CrossAxisAlignment.start,
padding: const EdgeInsets.all(10), children: [
child: Image.network( Row(
"${APIs.imagesUrl}/${details.id}/poster.jpg", children: [
fit: BoxFit.contain, Text("${details.resolution}"),
headers: APIs.authHeaders, const SizedBox(
width: 30,
),
storage.when(
data: (value) {
for (final s in value) {
if (s.id == details.storageId) {
return Text(
"${s.name}(${s.implementation})");
}
}
return const Text("未知存储");
},
error: (error, stackTrace) =>
Text("$error"),
loading: () => const Text("")),
],
), ),
), const Divider(thickness: 1, height: 1),
), Text(
Flexible( "${details.name} ${details.name != details.originalName ? details.originalName : ''} (${details.airDate!.split("-")[0]})",
flex: 6, style: const TextStyle(
child: Row( fontSize: 20,
children: [ fontWeight: FontWeight.bold),
Expanded( ),
child: Column( const Text(""),
crossAxisAlignment: Text(
CrossAxisAlignment.start, details.overview!,
children: [ ),
Row( ],
children: [ )),
Text("${details.resolution}"), Column(
const SizedBox( children: [
width: 30, IconButton(
), onPressed: () {
storage.when( ref
data: (value) { .read(mediaDetailsProvider(
for (final s in value) { widget.seriesId)
if (s.id == .notifier)
details.storageId) { .delete()
return Text( .whenComplete(() =>
"${s.name}(${s.implementation})"); context.go(WelcomePage.routeTv))
} .onError((error, trace) =>
} Utils.showSnakeBar(
return const Text("未知存储"); "删除失败: $error"));
}, },
error: (error, stackTrace) => icon: const Icon(Icons.delete))
Text("$error"), ],
loading: () => )
const Text("")),
],
),
const Divider(thickness: 1, height: 1),
Text(
"${details.name} ${details.name != details.originalName ? details.originalName : ''} (${details.airDate!.split("-")[0]})",
style: const TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold),
),
const Text(""),
Text(
details.overview!,
),
],
)),
Column(
children: [
IconButton(
onPressed: () {
ref
.read(mediaDetailsProvider(
widget.seriesId)
.notifier)
.delete();
context.go(WelcomePage.routeTv);
},
icon: const Icon(Icons.delete))
],
)
],
),
),
], ],
), ),
), ),
), ],
), ),
Column( ),
children: list, ),
), ),
], Column(
); children: list,
}, ),
error: (err, trace) { ],
return Text("$err"); );
}, },
loading: () => const MyProgressIndicator()); error: (err, trace) {
}); return Text("$err");
},
loading: () => const MyProgressIndicator());
} }
} }