peter/Obtainium
1
0
Fork 0
mirror of https://github.com/ImranR98/Obtainium.git synced 2025-07-23 17:39:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added category multi-select to Apps filter

Browse Source 
+ UI tweaks and bugfixes
This commit is contained in:
Imran Remtulla
2022-12-25 21:41:51 -05:00
parent 7af0a8628c
commit 3d6c9bbf98
6 changed files with 294 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

324
lib/components/generated_form.dart
View File

@@ -91,6 +91,7 @@ class GeneratedFormTagInput extends GeneratedFormItem {
late bool singleSelect; late bool singleSelect;
late WrapAlignment alignment; late WrapAlignment alignment;
late String emptyMessage; late String emptyMessage;
late bool showLabelWhenNotEmpty;
GeneratedFormTagInput(String key, GeneratedFormTagInput(String key,
{String label = 'Input', {String label = 'Input',
List<Widget> belowWidgets = const [], List<Widget> belowWidgets = const [],
@@ -100,7 +101,8 @@ class GeneratedFormTagInput extends GeneratedFormItem {
this.deleteConfirmationMessage, this.deleteConfirmationMessage,
this.singleSelect = false, this.singleSelect = false,
this.alignment = WrapAlignment.start, this.alignment = WrapAlignment.start,
this.emptyMessage = 'Input'}) this.emptyMessage = 'Input',
this.showLabelWhenNotEmpty = true})
: super(key, : super(key,
label: label, label: label,
belowWidgets: belowWidgets, belowWidgets: belowWidgets,
@@ -140,11 +142,11 @@ class _GeneratedFormState extends State<GeneratedForm> {
for (int r = 0; r < widget.items.length; r++) { for (int r = 0; r < widget.items.length; r++) {
for (int i = 0; i < widget.items[r].length; i++) { for (int i = 0; i < widget.items[r].length; i++) {
if (formInputs[r][i] is TextFormField) { if (formInputs[r][i] is TextFormField) {
valid = valid && var fieldState =
((formInputs[r][i].key as GlobalKey<FormFieldState>) (formInputs[r][i].key as GlobalKey<FormFieldState>).currentState;
.currentState if (fieldState != null) {
?.isValid ?? valid = valid && fieldState.isValid;
false); }
} }
} }
} }
@@ -259,159 +261,185 @@ class _GeneratedFormState extends State<GeneratedForm> {
], ],
); );
} else if (widget.items[r][e] is GeneratedFormTagInput) { } else if (widget.items[r][e] is GeneratedFormTagInput) {
formInputs[r][e] = Wrap( formInputs[r][e] =
alignment: (widget.items[r][e] as GeneratedFormTagInput).alignment, Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [
crossAxisAlignment: WrapCrossAlignment.center, if ((values[widget.items[r][e].key]
children: [ as Map<String, MapEntry<int, bool>>?)
(values[widget.items[r][e].key] ?.isNotEmpty ==
as Map<String, MapEntry<int, bool>>?) true &&
?.isEmpty == (widget.items[r][e] as GeneratedFormTagInput)
true .showLabelWhenNotEmpty)
? Text( Column(
(widget.items[r][e] as GeneratedFormTagInput) crossAxisAlignment:
.emptyMessage, (widget.items[r][e] as GeneratedFormTagInput).alignment ==
style: const TextStyle(fontWeight: FontWeight.bold), WrapAlignment.center
) ? CrossAxisAlignment.center
: const SizedBox.shrink(), : CrossAxisAlignment.stretch,
...(values[widget.items[r][e].key] children: [
as Map<String, MapEntry<int, bool>>?) Text(widget.items[r][e].label),
?.entries const SizedBox(
.map((e2) { height: 8,
return Padding( ),
padding: const EdgeInsets.symmetric(horizontal: 4), ],
child: ChoiceChip( ),
label: Text(e2.key), Wrap(
backgroundColor: Color(e2.value.key).withAlpha(50), alignment:
selectedColor: Color(e2.value.key), (widget.items[r][e] as GeneratedFormTagInput).alignment,
visualDensity: VisualDensity.compact, crossAxisAlignment: WrapCrossAlignment.center,
selected: e2.value.value, children: [
onSelected: (value) { (values[widget.items[r][e].key]
setState(() { as Map<String, MapEntry<int, bool>>?)
(values[widget.items[r][e].key] as Map<String, ?.isEmpty ==
MapEntry<int, bool>>)[e2.key] = true
MapEntry( ? Text(
(values[widget.items[r][e].key] as Map< (widget.items[r][e] as GeneratedFormTagInput)
String, .emptyMessage,
MapEntry<int, bool>>)[e2.key]! )
.key, : const SizedBox.shrink(),
value); ...(values[widget.items[r][e].key]
if ((widget.items[r][e] as GeneratedFormTagInput) as Map<String, MapEntry<int, bool>>?)
.singleSelect && ?.entries
value == true) { .map((e2) {
for (var key in (values[widget.items[r][e].key] return Padding(
as Map<String, MapEntry<int, bool>>) padding: const EdgeInsets.symmetric(horizontal: 4),
.keys) { child: ChoiceChip(
if (key != e2.key) { label: Text(e2.key),
(values[widget.items[r][e].key] as Map< backgroundColor: Color(e2.value.key).withAlpha(50),
String, selectedColor: Color(e2.value.key),
MapEntry<int, visualDensity: VisualDensity.compact,
bool>>)[key] = MapEntry( selected: e2.value.value,
onSelected: (value) {
setState(() {
(values[widget.items[r][e].key] as Map<String,
MapEntry<int, bool>>)[e2.key] =
MapEntry(
(values[widget.items[r][e].key] as Map< (values[widget.items[r][e].key] as Map<
String, String,
MapEntry<int, bool>>)[key]! MapEntry<int, bool>>)[e2.key]!
.key, .key,
false); value);
if ((widget.items[r][e]
as GeneratedFormTagInput)
.singleSelect &&
value == true) {
for (var key in (values[
widget.items[r][e].key]
as Map<String, MapEntry<int, bool>>)
.keys) {
if (key != e2.key) {
(values[widget.items[r][e].key] as Map<
String,
MapEntry<int, bool>>)[key] =
MapEntry(
(values[widget.items[r][e].key]
as Map<
String,
MapEntry<int,
bool>>)[key]!
.key,
false);
}
} }
} }
} someValueChanged();
someValueChanged(); });
}); },
));
}) ??
[const SizedBox.shrink()],
(values[widget.items[r][e].key]
as Map<String, MapEntry<int, bool>>?)
?.values
.where((e) => e.value)
.isNotEmpty ==
true
? Padding(
padding: const EdgeInsets.symmetric(horizontal: 4),
child: IconButton(
onPressed: () {
fn() {
setState(() {
var temp = values[widget.items[r][e].key]
as Map<String, MapEntry<int, bool>>;
temp.removeWhere((key, value) => value.value);
values[widget.items[r][e].key] = temp;
someValueChanged();
});
}
if ((widget.items[r][e] as GeneratedFormTagInput)
.deleteConfirmationMessage !=
null) {
var message =
(widget.items[r][e] as GeneratedFormTagInput)
.deleteConfirmationMessage!;
showDialog<Map<String, dynamic>?>(
context: context,
builder: (BuildContext ctx) {
return GeneratedFormModal(
title: message.key,
message: message.value,
items: const []);
}).then((value) {
if (value != null) {
fn();
}
});
} else {
fn();
}
}, },
)); icon: const Icon(Icons.remove),
}) ?? visualDensity: VisualDensity.compact,
[const SizedBox.shrink()], tooltip: tr('remove'),
(values[widget.items[r][e].key] ))
as Map<String, MapEntry<int, bool>>?) : const SizedBox.shrink(),
?.values Padding(
.where((e) => e.value) padding: const EdgeInsets.symmetric(horizontal: 4),
.isNotEmpty == child: IconButton(
true onPressed: () {
? Padding( showDialog<Map<String, dynamic>?>(
padding: const EdgeInsets.symmetric(horizontal: 4), context: context,
child: IconButton( builder: (BuildContext ctx) {
onPressed: () { return GeneratedFormModal(
fn() { title: widget.items[r][e].label,
items: [
[
GeneratedFormTextField('label',
label: tr('label'))
]
]);
}).then((value) {
String? label = value?['label'];
if (label != null) {
setState(() { setState(() {
var temp = values[widget.items[r][e].key] var temp = values[widget.items[r][e].key]
as Map<String, MapEntry<int, bool>>; as Map<String, MapEntry<int, bool>>?;
temp.removeWhere((key, value) => value.value); temp ??= {};
values[widget.items[r][e].key] = temp; if (temp[label] == null) {
someValueChanged(); var singleSelect = (widget.items[r][e]
}); as GeneratedFormTagInput)
} .singleSelect;
var someSelected = temp.entries
if ((widget.items[r][e] as GeneratedFormTagInput) .where((element) => element.value.value)
.deleteConfirmationMessage != .isNotEmpty;
null) { temp[label] = MapEntry(
var message = generateRandomLightColor().value,
(widget.items[r][e] as GeneratedFormTagInput) !(someSelected && singleSelect));
.deleteConfirmationMessage!; values[widget.items[r][e].key] = temp;
showDialog<Map<String, dynamic>?>( someValueChanged();
context: context,
builder: (BuildContext ctx) {
return GeneratedFormModal(
title: message.key,
message: message.value,
items: const []);
}).then((value) {
if (value != null) {
fn();
} }
}); });
} else {
fn();
} }
}, });
icon: const Icon(Icons.remove), },
visualDensity: VisualDensity.compact, icon: const Icon(Icons.add),
tooltip: tr('remove'), visualDensity: VisualDensity.compact,
)) tooltip: tr('add'),
: const SizedBox.shrink(), )),
Padding( ],
padding: const EdgeInsets.symmetric(horizontal: 4), )
child: IconButton( ]);
onPressed: () {
showDialog<Map<String, dynamic>?>(
context: context,
builder: (BuildContext ctx) {
return GeneratedFormModal(
title: widget.items[r][e].label,
items: [
[
GeneratedFormTextField('label',
label: tr('label'))
]
]);
}).then((value) {
String? label = value?['label'];
if (label != null) {
setState(() {
var temp = values[widget.items[r][e].key]
as Map<String, MapEntry<int, bool>>?;
temp ??= {};
if (temp[label] == null) {
var singleSelect =
(widget.items[r][e] as GeneratedFormTagInput)
.singleSelect;
var someSelected = temp.entries
.where((element) => element.value.value)
.isNotEmpty;
temp[label] = MapEntry(
generateRandomLightColor().value,
!(someSelected && singleSelect));
values[widget.items[r][e].key] = temp;
someValueChanged();
}
});
}
});
},
icon: const Icon(Icons.add),
visualDensity: VisualDensity.compact,
tooltip: tr('add'),
)),
],
);
} }
} }
} }

7
lib/components/generated_form_modal.dart
View File

@@ -9,12 +9,14 @@ class GeneratedFormModal extends StatefulWidget {
required this.title, required this.title,
required this.items, required this.items,
this.initValid = false, this.initValid = false,
this.message = ''}); this.message = '',
this.additionalWidgets = const []});
final String title; final String title;
final String message; final String message;
final List<List<GeneratedFormItem>> items; final List<List<GeneratedFormItem>> items;
final bool initValid; final bool initValid;
final List<Widget> additionalWidgets;
@override @override
State<GeneratedFormModal> createState() => _GeneratedFormModalState(); State<GeneratedFormModal> createState() => _GeneratedFormModalState();
@@ -54,7 +56,8 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
this.valid = valid; this.valid = valid;
}); });
} }
}) }),
if (widget.additionalWidgets.isNotEmpty) ...widget.additionalWidgets
]), ]),
actions: [ actions: [
TextButton( TextButton(

34
lib/pages/add_app.dart
View File

@@ -39,25 +39,19 @@ class _AddAppPageState extends State<AddAppPage> {
changeUserInput(String input, bool valid, bool isBuilding) { changeUserInput(String input, bool valid, bool isBuilding) {
userInput = input; userInput = input;
fn() { if (!isBuilding) {
var source = valid ? sourceProvider.getSource(userInput) : null;
if (pickedSource.runtimeType != source.runtimeType) {
pickedSource = source;
additionalSettings = source != null
? getDefaultValuesFromFormItems(
source.combinedAppSpecificSettingFormItems)
: {};
additionalSettingsValid = source != null
? !sourceProvider.ifRequiredAppSpecificSettingsExist(source)
: true;
}
}
if (isBuilding) {
fn();
} else {
setState(() { setState(() {
fn(); var source = valid ? sourceProvider.getSource(userInput) : null;
if (pickedSource.runtimeType != source.runtimeType) {
pickedSource = source;
additionalSettings = source != null
? getDefaultValuesFromFormItems(
source.combinedAppSpecificSettingFormItems)
: {};
additionalSettingsValid = source != null
? !sourceProvider.ifRequiredAppSpecificSettingsExist(source)
: true;
}
}); });
} }
} }
@@ -243,7 +237,9 @@ class _AddAppPageState extends State<AddAppPage> {
] ]
], ],
onValueChanges: (values, valid, isBuilding) { onValueChanges: (values, valid, isBuilding) {
if (values.isNotEmpty && valid) { if (values.isNotEmpty &&
valid &&
!isBuilding) {
setState(() { setState(() {
searchQuery = searchQuery =
values['searchSomeSources']!.trim(); values['searchSomeSources']!.trim();

4
lib/pages/app.dart
View File

@@ -75,7 +75,7 @@ class _AppPageState extends State<AppPage> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
const SizedBox(height: 100), const SizedBox(height: 150),
app?.installedInfo != null app?.installedInfo != null
? Row( ? Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@@ -168,7 +168,7 @@ class _AppPageState extends State<AppPage> {
appsProvider.saveApps([app.app]); appsProvider.saveApps([app.app]);
} }
}), }),
const SizedBox(height: 100) const SizedBox(height: 150)
], ],
)), )),
], ],

170
lib/pages/apps.dart
View File

@@ -7,6 +7,7 @@ import 'package:obtainium/components/generated_form_modal.dart';
import 'package:obtainium/custom_errors.dart'; import 'package:obtainium/custom_errors.dart';
import 'package:obtainium/main.dart'; import 'package:obtainium/main.dart';
import 'package:obtainium/pages/app.dart'; import 'package:obtainium/pages/app.dart';
import 'package:obtainium/pages/settings.dart';
import 'package:obtainium/providers/apps_provider.dart'; import 'package:obtainium/providers/apps_provider.dart';
import 'package:obtainium/providers/settings_provider.dart'; import 'package:obtainium/providers/settings_provider.dart';
import 'package:obtainium/providers/source_provider.dart'; import 'package:obtainium/providers/source_provider.dart';
@@ -22,7 +23,8 @@ class AppsPage extends StatefulWidget {
} }
class AppsPageState extends State<AppsPage> { class AppsPageState extends State<AppsPage> {
AppsFilter? filter; AppsFilter filter = AppsFilter();
final AppsFilter neutralFilter = AppsFilter();
var updatesOnlyFilter = var updatesOnlyFilter =
AppsFilter(includeUptodate: false, includeNonInstalled: false); AppsFilter(includeUptodate: false, includeNonInstalled: false);
Set<App> selectedApps = {}; Set<App> selectedApps = {};
@@ -53,8 +55,7 @@ class AppsPageState extends State<AppsPage> {
var appsProvider = context.watch<AppsProvider>(); var appsProvider = context.watch<AppsProvider>();
var settingsProvider = context.watch<SettingsProvider>(); var settingsProvider = context.watch<SettingsProvider>();
var sortedApps = appsProvider.apps.values.toList(); var sortedApps = appsProvider.apps.values.toList();
var currentFilterIsUpdatesOnly = var currentFilterIsUpdatesOnly = filter.isIdenticalTo(updatesOnlyFilter);
filter?.isIdenticalTo(updatesOnlyFilter) ?? false;
selectedApps = selectedApps selectedApps = selectedApps
.where((element) => sortedApps.map((e) => e.app).contains(element)) .where((element) => sortedApps.map((e) => e.app).contains(element))
@@ -70,45 +71,42 @@ class AppsPageState extends State<AppsPage> {
}); });
} }
if (filter != null) { sortedApps = sortedApps.where((app) {
sortedApps = sortedApps.where((app) { if (app.app.installedVersion == app.app.latestVersion &&
if (app.app.installedVersion == app.app.latestVersion && !(filter.includeUptodate)) {
!(filter!.includeUptodate)) { return false;
return false; }
} if (app.app.installedVersion == null && !(filter.includeNonInstalled)) {
if (app.app.installedVersion == null && return false;
!(filter!.includeNonInstalled)) { }
return false; if (filter.nameFilter.isNotEmpty || filter.authorFilter.isNotEmpty) {
} List<String> nameTokens = filter.nameFilter
if (filter!.nameFilter.isNotEmpty || filter!.authorFilter.isNotEmpty) { .split(' ')
List<String> nameTokens = filter!.nameFilter .where((element) => element.trim().isNotEmpty)
.split(' ') .toList();
.where((element) => element.trim().isNotEmpty) List<String> authorTokens = filter.authorFilter
.toList(); .split(' ')
List<String> authorTokens = filter!.authorFilter .where((element) => element.trim().isNotEmpty)
.split(' ') .toList();
.where((element) => element.trim().isNotEmpty)
.toList();
for (var t in nameTokens) { for (var t in nameTokens) {
var name = app.installedInfo?.name ?? app.app.name; var name = app.installedInfo?.name ?? app.app.name;
if (!name.toLowerCase().contains(t.toLowerCase())) { if (!name.toLowerCase().contains(t.toLowerCase())) {
return false; return false;
}
}
for (var t in authorTokens) {
if (!app.app.author.toLowerCase().contains(t.toLowerCase())) {
return false;
}
} }
} }
if (filter!.categoryFilter.isNotEmpty && for (var t in authorTokens) {
filter!.categoryFilter != app.app.category) { if (!app.app.author.toLowerCase().contains(t.toLowerCase())) {
return false; return false;
}
} }
return true; }
}).toList(); if (filter.categoryFilter.isNotEmpty &&
} !filter.categoryFilter.contains(app.app.category)) {
return false;
}
return true;
}).toList();
sortedApps.sort((a, b) { sortedApps.sort((a, b) {
var nameA = a.installedInfo?.name ?? a.app.name; var nameA = a.installedInfo?.name ?? a.app.name;
@@ -663,7 +661,7 @@ class AppsPageState extends State<AppsPage> {
onPressed: () { onPressed: () {
setState(() { setState(() {
if (currentFilterIsUpdatesOnly) { if (currentFilterIsUpdatesOnly) {
filter = null; filter = AppsFilter();
} else { } else {
filter = updatesOnlyFilter; filter = updatesOnlyFilter;
} }
@@ -683,9 +681,11 @@ class AppsPageState extends State<AppsPage> {
? const SizedBox() ? const SizedBox()
: TextButton.icon( : TextButton.icon(
label: Text( label: Text(
filter == null ? tr('filter') : tr('filterActive'), filter.isIdenticalTo(neutralFilter)
? tr('filter')
: tr('filterActive'),
style: TextStyle( style: TextStyle(
fontWeight: filter == null fontWeight: filter.isIdenticalTo(neutralFilter)
? FontWeight.normal ? FontWeight.normal
: FontWeight.bold), : FontWeight.bold),
), ),
@@ -693,44 +693,48 @@ class AppsPageState extends State<AppsPage> {
showDialog<Map<String, dynamic>?>( showDialog<Map<String, dynamic>?>(
context: context, context: context,
builder: (BuildContext ctx) { builder: (BuildContext ctx) {
var vals = filter == null var vals = filter.toFormValuesMap();
? AppsFilter().toValuesMap()
: filter!.toValuesMap();
return GeneratedFormModal( return GeneratedFormModal(
title: tr('filterApps'), initValid: true,
items: [ title: tr('filterApps'),
[ items: [
GeneratedFormTextField('appName', [
label: tr('appName'), GeneratedFormTextField('appName',
required: false, label: tr('appName'),
defaultValue: vals['appName']), required: false,
GeneratedFormTextField('author', defaultValue: vals['appName']),
label: tr('author'), GeneratedFormTextField('author',
required: false, label: tr('author'),
defaultValue: vals['author']) required: false,
], defaultValue: vals['author'])
[ ],
GeneratedFormSwitch('upToDateApps', [
label: tr('upToDateApps'), GeneratedFormSwitch('upToDateApps',
defaultValue: vals['upToDateApps']) label: tr('upToDateApps'),
], defaultValue: vals['upToDateApps'])
[ ],
GeneratedFormSwitch('nonInstalledApps', [
label: tr('nonInstalledApps'), GeneratedFormSwitch('nonInstalledApps',
defaultValue: vals['nonInstalledApps']) label: tr('nonInstalledApps'),
], defaultValue: vals['nonInstalledApps'])
[ ]
settingsProvider.getCategoryFormItem( ],
initCategory: vals['category'] ?? '') additionalWidgets: [
] const SizedBox(
]); height: 16,
),
CategoryEditorSelector(
preselected: filter.categoryFilter,
onSelected: (categories) {
filter.categoryFilter = categories.toSet();
},
)
],
);
}).then((values) { }).then((values) {
if (values != null) { if (values != null) {
setState(() { setState(() {
filter = AppsFilter.fromValuesMap(values); filter.setFormValuesFromMap(values);
if (AppsFilter().isIdenticalTo(filter!)) {
filter = null;
}
}); });
} }
}); });
@@ -748,31 +752,29 @@ class AppsFilter {
late String authorFilter; late String authorFilter;
late bool includeUptodate; late bool includeUptodate;
late bool includeNonInstalled; late bool includeNonInstalled;
late String categoryFilter; late Set<String> categoryFilter;
AppsFilter( AppsFilter(
{this.nameFilter = '', {this.nameFilter = '',
this.authorFilter = '', this.authorFilter = '',
this.includeUptodate = true, this.includeUptodate = true,
this.includeNonInstalled = true, this.includeNonInstalled = true,
this.categoryFilter = ''}); this.categoryFilter = const {}});
Map<String, dynamic> toValuesMap() { Map<String, dynamic> toFormValuesMap() {
return { return {
'appName': nameFilter, 'appName': nameFilter,
'author': authorFilter, 'author': authorFilter,
'upToDateApps': includeUptodate, 'upToDateApps': includeUptodate,
'nonInstalledApps': includeNonInstalled, 'nonInstalledApps': includeNonInstalled
'category': categoryFilter
}; };
} }
AppsFilter.fromValuesMap(Map<String, dynamic> values) { setFormValuesFromMap(Map<String, dynamic> values) {
nameFilter = values['appName']!; nameFilter = values['appName']!;
authorFilter = values['author']!; authorFilter = values['author']!;
includeUptodate = values['upToDateApps']; includeUptodate = values['upToDateApps'];
includeNonInstalled = values['nonInstalledApps']; includeNonInstalled = values['nonInstalledApps'];
categoryFilter = values['category']!;
} }
bool isIdenticalTo(AppsFilter other) => bool isIdenticalTo(AppsFilter other) =>
@@ -780,5 +782,7 @@ class AppsFilter {
nameFilter.trim() == other.nameFilter.trim() && nameFilter.trim() == other.nameFilter.trim() &&
includeUptodate == other.includeUptodate && includeUptodate == other.includeUptodate &&
includeNonInstalled == other.includeNonInstalled && includeNonInstalled == other.includeNonInstalled &&
categoryFilter.trim() == other.categoryFilter.trim(); categoryFilter.length == other.categoryFilter.length &&
categoryFilter.union(other.categoryFilter).length ==
categoryFilter.length;
} }

13
lib/pages/settings.dart
View File

@@ -185,7 +185,7 @@ class _SettingsPageState extends State<SettingsPage> {
return [e]; return [e];
}).toList(), }).toList(),
onValueChanges: (values, valid, isBuilding) { onValueChanges: (values, valid, isBuilding) {
if (valid) { if (valid && !isBuilding) {
values.forEach((key, value) { values.forEach((key, value) {
settingsProvider.setSettingString(key, value); settingsProvider.setSettingString(key, value);
}); });
@@ -286,7 +286,9 @@ class _SettingsPageState extends State<SettingsPage> {
color: Theme.of(context).colorScheme.primary), color: Theme.of(context).colorScheme.primary),
), ),
height16, height16,
const CategoryEditorSelector() const CategoryEditorSelector(
showLabelWhenNotEmpty: false,
)
], ],
))), ))),
SliverToBoxAdapter( SliverToBoxAdapter(
@@ -407,12 +409,14 @@ class CategoryEditorSelector extends StatefulWidget {
final bool singleSelect; final bool singleSelect;
final Set<String> preselected; final Set<String> preselected;
final WrapAlignment alignment; final WrapAlignment alignment;
final bool showLabelWhenNotEmpty;
const CategoryEditorSelector( const CategoryEditorSelector(
{super.key, {super.key,
this.onSelected, this.onSelected,
this.singleSelect = false, this.singleSelect = false,
this.preselected = const {}, this.preselected = const {},
this.alignment = WrapAlignment.start}); this.alignment = WrapAlignment.start,
this.showLabelWhenNotEmpty = true});
@override @override
State<CategoryEditorSelector> createState() => _CategoryEditorSelectorState(); State<CategoryEditorSelector> createState() => _CategoryEditorSelectorState();
@@ -439,7 +443,8 @@ class _CategoryEditorSelectorState extends State<CategoryEditorSelector> {
deleteConfirmationMessage: MapEntry( deleteConfirmationMessage: MapEntry(
tr('deleteCategoriesQuestion'), tr('deleteCategoriesQuestion'),
tr('categoryDeleteWarning')), tr('categoryDeleteWarning')),
singleSelect: widget.singleSelect) singleSelect: widget.singleSelect,
showLabelWhenNotEmpty: widget.showLabelWhenNotEmpty)
] ]
], ],
onValueChanges: ((values, valid, isBuilding) { onValueChanges: ((values, valid, isBuilding) {