Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Bump to 1.8.80+119

Barnabasa508a91fe8ae
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index ad8aae18..f9efdb1f 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -679,6 +679,8 @@
"authorLabel": "Author",
"narratorLabel": "Narrator",
"seriesLabel": "Series",
+ "addSeries": "Add series",
+ "removeSeries": "Remove series",
"descriptionLabel": "Description",
"publisherLabel": "Publisher",
"yearLabel": "Year",
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index a53a10b7..a232cce5 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -3632,6 +3632,18 @@ abstract class AppLocalizations {
/// **'Series'**
String get seriesLabel;
+ /// No description provided for @addSeries.
+ ///
+ /// In en, this message translates to:
+ /// **'Add series'**
+ String get addSeries;
+
+ /// No description provided for @removeSeries.
+ ///
+ /// In en, this message translates to:
+ /// **'Remove series'**
+ String get removeSeries;
+
/// No description provided for @descriptionLabel.
///
/// In en, this message translates to:
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index 9021baf5..e36c1a99 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -1971,6 +1971,12 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get seriesLabel => 'Series';
+ @override
+ String get addSeries => 'Add series';
+
+ @override
+ String get removeSeries => 'Remove series';
+
@override
String get descriptionLabel => 'Description';
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index 058d7498..4b912bec 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -1902,6 +1902,12 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get seriesLabel => '系列';
+ @override
+ String get addSeries => 'Add series';
+
+ @override
+ String get removeSeries => 'Remove series';
+
@override
String get descriptionLabel => '描述';
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index 01543883..93524cc5 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -679,6 +679,8 @@
"authorLabel": "作者",
"narratorLabel": "朗读者",
"seriesLabel": "系列",
+ "addSeries": "Add series",
+ "removeSeries": "Remove series",
"descriptionLabel": "描述",
"publisherLabel": "出版商",
"yearLabel": "年份",
diff --git a/lib/widgets/edit_metadata_sheet.dart b/lib/widgets/edit_metadata_sheet.dart
index 7b0809bb..8e260472 100644
--- a/lib/widgets/edit_metadata_sheet.dart
+++ b/lib/widgets/edit_metadata_sheet.dart
@@ -57,8 +57,7 @@ class _EditMetadataContentState extends State<_EditMetadataContent>
late final TextEditingController _subtitleCtrl;
late final TextEditingController _authorCtrl;
late final TextEditingController _narratorCtrl;
- late final TextEditingController _seriesCtrl;
- late final TextEditingController _seriesSeqCtrl;
+ final List<({TextEditingController name, TextEditingController seq})> _seriesRows = [];
late final TextEditingController _descCtrl;
late final TextEditingController _publisherCtrl;
late final TextEditingController _yearCtrl;
@@ -107,13 +106,16 @@ class _EditMetadataContentState extends State<_EditMetadataContent>
_coverUrlCtrl = TextEditingController();
final series = m['series'] as List<dynamic>? ?? [];
- if (series.isNotEmpty) {
- final first = series[0] as Map<String, dynamic>;
- _seriesCtrl = TextEditingController(text: first['name'] as String? ?? '');
- _seriesSeqCtrl = TextEditingController(text: first['sequence'] as String? ?? '');
- } else {
- _seriesCtrl = TextEditingController();
- _seriesSeqCtrl = TextEditingController();
+ for (final s in series) {
+ if (s is Map<String, dynamic>) {
+ _seriesRows.add((
+ name: TextEditingController(text: s['name'] as String? ?? ''),
+ seq: TextEditingController(text: s['sequence'] as String? ?? ''),
+ ));
+ }
+ }
+ if (_seriesRows.isEmpty) {
+ _seriesRows.add((name: TextEditingController(), seq: TextEditingController()));
}
final genres = (m['genres'] as List<dynamic>?)?.cast<String>() ?? [];
@@ -131,8 +133,10 @@ class _EditMetadataContentState extends State<_EditMetadataContent>
_subtitleCtrl.dispose();
_authorCtrl.dispose();
_narratorCtrl.dispose();
- _seriesCtrl.dispose();
- _seriesSeqCtrl.dispose();
+ for (final row in _seriesRows) {
+ row.name.dispose();
+ row.seq.dispose();
+ }
_descCtrl.dispose();
_publisherCtrl.dispose();
_yearCtrl.dispose();
@@ -320,10 +324,14 @@ class _EditMetadataContentState extends State<_EditMetadataContent>
? genresText.split(',').map((g) => g.trim()).where((g) => g.isNotEmpty).toList()
: <String>[];
- final seriesName = _seriesCtrl.text.trim();
- update['series'] = seriesName.isNotEmpty
- ? [{'name': seriesName, 'sequence': _seriesSeqCtrl.text.trim()}]
- : <Map<String, dynamic>>[];
+ final seriesList = <Map<String, dynamic>>[];
+ for (final row in _seriesRows) {
+ final name = row.name.text.trim();
+ if (name.isNotEmpty) {
+ seriesList.add({'name': name, 'sequence': row.seq.text.trim()});
+ }
+ }
+ update['series'] = seriesList;
bool ok = await api.updateItemMedia(widget.itemId, update);
@@ -654,11 +662,43 @@ class _EditMetadataContentState extends State<_EditMetadataContent>
_field(l.subtitleLabel, _subtitleCtrl, tt),
_field(l.authorLabel, _authorCtrl, tt),
_field(l.narratorLabel, _narratorCtrl, tt),
- Row(children: [
- Expanded(child: _field(l.seriesLabel, _seriesCtrl, tt)),
- const SizedBox(width: 12),
- SizedBox(width: 80, child: _field('#', _seriesSeqCtrl, tt)),
- ]),
+ for (int i = 0; i < _seriesRows.length; i++)
+ Row(crossAxisAlignment: CrossAxisAlignment.start, children: [
+ Expanded(child: _field(l.seriesLabel, _seriesRows[i].name, tt)),
+ const SizedBox(width: 12),
+ SizedBox(width: 80, child: _field('#', _seriesRows[i].seq, tt)),
+ IconButton(
+ tooltip: l.removeSeries,
+ onPressed: _seriesRows.length == 1 && _seriesRows[i].name.text.isEmpty && _seriesRows[i].seq.text.isEmpty
+ ? null
+ : () => setState(() {
+ if (_seriesRows.length == 1) {
+ _seriesRows[i].name.clear();
+ _seriesRows[i].seq.clear();
+ } else {
+ final removed = _seriesRows.removeAt(i);
+ removed.name.dispose();
+ removed.seq.dispose();
+ }
+ }),
+ icon: Icon(Icons.remove_circle_outline_rounded, size: 20, color: cs.onSurfaceVariant),
+ padding: const EdgeInsets.only(top: 8),
+ constraints: const BoxConstraints(),
+ ),
+ ]),
+ Padding(
+ padding: const EdgeInsets.only(bottom: 12),
+ child: Align(
+ alignment: Alignment.centerLeft,
+ child: TextButton.icon(
+ onPressed: () => setState(() {
+ _seriesRows.add((name: TextEditingController(), seq: TextEditingController()));
+ }),
+ icon: const Icon(Icons.add_rounded, size: 18),
+ label: Text(l.addSeries),
+ ),
+ ),
+ ),
_field(l.descriptionLabel, _descCtrl, tt, maxLines: 5),
_field(l.publisherLabel, _publisherCtrl, tt),
Row(children: [
diff --git a/pubspec.yaml b/pubspec.yaml
index b69a19e5..d8ed3fa9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
name: absorb
description: An Audiobookshelf Client
publish_to: 'none'
-version: 1.8.79+118
+version: 1.8.80+119
environment:
sdk: '>=3.1.0 <4.0.0'