mirror of
https://github.com/ImranR98/Obtainium.git
synced 2025-07-24 18:09:42 +02:00
Adds Source-specific options + other changes (#26)
* Started work on dynamic forms * dynamic form progress (switch doesn't work) * dynamic forms work * Gen. form improvements, source specific data (untested) * Gen form bugfix * Removed redundant generated modal code * Added custom validators to gen. forms * Progress on source options (incomplete), gen form bugfixes * Tweaks, more * More * Progress * Changed a default * Additional options done!
This commit is contained in:
Imran Remtulla
GitHub
175
lib/components/generated_form.dart
Normal file
175
lib/components/generated_form.dart
Normal file
@@ -0,0 +1,175 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
enum FormItemType { string, bool }
|
||||
|
||||
typedef OnValueChanges = void Function(List<String> values, bool valid);
|
||||
|
||||
class GeneratedFormItem {
|
||||
late String label;
|
||||
late FormItemType type;
|
||||
late bool required;
|
||||
late int max;
|
||||
late List<String? Function(String? value)> additionalValidators;
|
||||
|
||||
GeneratedFormItem(
|
||||
{this.label = "Input",
|
||||
this.type = FormItemType.string,
|
||||
this.required = true,
|
||||
this.max = 1,
|
||||
this.additionalValidators = const []});
|
||||
}
|
||||
|
||||
class GeneratedForm extends StatefulWidget {
|
||||
const GeneratedForm(
|
||||
{super.key,
|
||||
required this.items,
|
||||
required this.onValueChanges,
|
||||
required this.defaultValues});
|
||||
|
||||
final List<List<GeneratedFormItem>> items;
|
||||
final OnValueChanges onValueChanges;
|
||||
final List<String> defaultValues;
|
||||
|
||||
@override
|
||||
State<GeneratedForm> createState() => _GeneratedFormState();
|
||||
}
|
||||
|
||||
class _GeneratedFormState extends State<GeneratedForm> {
|
||||
final _formKey = GlobalKey<FormState>();
|
||||
late List<List<String>> values;
|
||||
late List<List<Widget>> formInputs;
|
||||
List<List<Widget>> rows = [];
|
||||
|
||||
// If any value changes, call this to update the parent with value and validity
|
||||
void someValueChanged() {
|
||||
List<String> returnValues = [];
|
||||
var valid = true;
|
||||
for (int r = 0; r < values.length; r++) {
|
||||
for (int i = 0; i < values[r].length; i++) {
|
||||
returnValues.add(values[r][i]);
|
||||
if (formInputs[r][i] is TextFormField) {
|
||||
valid = valid &&
|
||||
((formInputs[r][i].key as GlobalKey<FormFieldState>)
|
||||
.currentState
|
||||
?.isValid ??
|
||||
false);
|
||||
}
|
||||
}
|
||||
}
|
||||
widget.onValueChanges(returnValues, valid);
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
|
||||
// Initialize form values as all empty
|
||||
int j = 0;
|
||||
values = widget.items
|
||||
.map((row) => row.map((e) {
|
||||
return j < widget.defaultValues.length
|
||||
? widget.defaultValues[j++]
|
||||
: "";
|
||||
}).toList())
|
||||
.toList();
|
||||
|
||||
// Dynamically create form inputs
|
||||
formInputs = widget.items.asMap().entries.map((row) {
|
||||
return row.value.asMap().entries.map((e) {
|
||||
if (e.value.type == FormItemType.string) {
|
||||
final formFieldKey = GlobalKey<FormFieldState>();
|
||||
return TextFormField(
|
||||
key: formFieldKey,
|
||||
initialValue: values[row.key][e.key],
|
||||
autovalidateMode: AutovalidateMode.onUserInteraction,
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
values[row.key][e.key] = value;
|
||||
someValueChanged();
|
||||
});
|
||||
},
|
||||
decoration: InputDecoration(
|
||||
helperText: e.value.label + (e.value.required ? " *" : "")),
|
||||
minLines: e.value.max <= 1 ? null : e.value.max,
|
||||
maxLines: e.value.max <= 1 ? 1 : e.value.max,
|
||||
validator: (value) {
|
||||
if (e.value.required && (value == null || value.trim().isEmpty)) {
|
||||
return '${e.value.label} (required)';
|
||||
}
|
||||
for (var validator in e.value.additionalValidators) {
|
||||
String? result = validator(value);
|
||||
if (result != null) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
},
|
||||
);
|
||||
} else {
|
||||
return Container(); // Some input types added in build
|
||||
}
|
||||
}).toList();
|
||||
}).toList();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
for (var r = 0; r < formInputs.length; r++) {
|
||||
for (var e = 0; e < formInputs[r].length; e++) {
|
||||
if (widget.items[r][e].type == FormItemType.bool) {
|
||||
formInputs[r][e] = Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(widget.items[r][e].label),
|
||||
Switch(
|
||||
value: values[r][e] == "true",
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
values[r][e] = value ? "true" : "";
|
||||
someValueChanged();
|
||||
});
|
||||
})
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
rows.clear();
|
||||
formInputs.asMap().entries.forEach((rowInputs) {
|
||||
if (rowInputs.key > 0) {
|
||||
rows.add([
|
||||
SizedBox(
|
||||
height: widget.items[rowInputs.key][0].type == FormItemType.bool &&
|
||||
widget.items[rowInputs.key - 1][0].type ==
|
||||
FormItemType.string
|
||||
? 25
|
||||
: 8,
|
||||
)
|
||||
]);
|
||||
}
|
||||
List<Widget> rowItems = [];
|
||||
rowInputs.value.asMap().entries.forEach((rowInput) {
|
||||
if (rowInput.key > 0) {
|
||||
rowItems.add(const SizedBox(
|
||||
width: 20,
|
||||
));
|
||||
}
|
||||
rowItems.add(Expanded(child: rowInput.value));
|
||||
});
|
||||
rows.add(rowItems);
|
||||
});
|
||||
|
||||
return Form(
|
||||
key: _formKey,
|
||||
child: Column(
|
||||
children: [
|
||||
...rows.map((row) => Row(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [...row.map((e) => e)],
|
||||
))
|
||||
],
|
||||
));
|
||||
}
|
||||
}
|
||||
@@ -1,61 +1,40 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
|
||||
class GeneratedFormItem {
|
||||
late String message;
|
||||
late bool required;
|
||||
late int lines;
|
||||
|
||||
GeneratedFormItem(this.message, this.required, this.lines);
|
||||
}
|
||||
import 'package:obtainium/components/generated_form.dart';
|
||||
|
||||
class GeneratedFormModal extends StatefulWidget {
|
||||
const GeneratedFormModal(
|
||||
{super.key, required this.title, required this.items});
|
||||
{super.key,
|
||||
required this.title,
|
||||
required this.items,
|
||||
required this.defaultValues});
|
||||
|
||||
final String title;
|
||||
final List<GeneratedFormItem> items;
|
||||
final List<List<GeneratedFormItem>> items;
|
||||
final List<String> defaultValues;
|
||||
|
||||
@override
|
||||
State<GeneratedFormModal> createState() => _GeneratedFormModalState();
|
||||
}
|
||||
|
||||
class _GeneratedFormModalState extends State<GeneratedFormModal> {
|
||||
final _formKey = GlobalKey<FormState>();
|
||||
|
||||
final urlInputController = TextEditingController();
|
||||
List<String> values = [];
|
||||
bool valid = false;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final formInputs = widget.items.map((e) {
|
||||
final controller = TextEditingController();
|
||||
return [
|
||||
controller,
|
||||
TextFormField(
|
||||
decoration: InputDecoration(helperText: e.message),
|
||||
controller: controller,
|
||||
minLines: e.lines <= 1 ? null : e.lines,
|
||||
maxLines: e.lines <= 1 ? 1 : e.lines,
|
||||
validator: e.required
|
||||
? (value) {
|
||||
if (value == null || value.isEmpty) {
|
||||
return '${e.message} (required)';
|
||||
}
|
||||
return null;
|
||||
}
|
||||
: null,
|
||||
)
|
||||
];
|
||||
}).toList();
|
||||
return AlertDialog(
|
||||
scrollable: true,
|
||||
title: Text(widget.title),
|
||||
content: Form(
|
||||
key: _formKey,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [...formInputs.map((e) => e[1] as Widget)],
|
||||
)),
|
||||
content: GeneratedForm(
|
||||
items: widget.items,
|
||||
onValueChanges: (values, valid) {
|
||||
setState(() {
|
||||
this.values = values;
|
||||
this.valid = valid;
|
||||
});
|
||||
},
|
||||
defaultValues: widget.defaultValues),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
@@ -63,18 +42,16 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
|
||||
},
|
||||
child: const Text('Cancel')),
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
if (_formKey.currentState?.validate() == true) {
|
||||
HapticFeedback.selectionClick();
|
||||
Navigator.of(context).pop(formInputs
|
||||
.map((e) => (e[0] as TextEditingController).value.text)
|
||||
.toList());
|
||||
}
|
||||
},
|
||||
onPressed: !valid
|
||||
? null
|
||||
: () {
|
||||
if (valid) {
|
||||
HapticFeedback.selectionClick();
|
||||
Navigator.of(context).pop(values);
|
||||
}
|
||||
},
|
||||
child: const Text('Continue'))
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Add support for larger textarea so this can be used for text/json imports
|
||||
Reference in New Issue
Block a user