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

Bugfix in HTML intermediate link UI (incomplete)

Browse Source
This commit is contained in:
Imran Remtulla
2023-12-28 19:16:16 -05:00
parent 9e6dbe2465
commit 85d103f3f6
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/components/generated_form.dart
View File

@@ -147,6 +147,14 @@ Color generateRandomLightColor() {
return Color.fromARGB(255, rgbValues[0], rgbValues[1], rgbValues[2]); return Color.fromARGB(255, rgbValues[0], rgbValues[1], rgbValues[2]);
} }
int generateRandomNumber(int seed1,
{int seed2 = 0, int seed3 = 0, max = 10000}) {
int combinedSeed = seed1.hashCode ^ seed2.hashCode ^ seed3.hashCode;
Random random = Random(combinedSeed);
int randomNumber = random.nextInt(max);
return randomNumber;
}
bool validateTextField(TextFormField tf) => bool validateTextField(TextFormField tf) =>
(tf.key as GlobalKey<FormFieldState>).currentState?.isValid == true; (tf.key as GlobalKey<FormFieldState>).currentState?.isValid == true;
@@ -156,6 +164,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
late List<List<Widget>> formInputs; late List<List<Widget>> formInputs;
List<List<Widget>> rows = []; List<List<Widget>> rows = [];
String? initKey; String? initKey;
int forceUpdateKeyCount = 0;
// If any value changes, call this to update the parent with value and validity // If any value changes, call this to update the parent with value and validity
void someValueChanged({bool isBuilding = false, bool forceInvalid = false}) { void someValueChanged({bool isBuilding = false, bool forceInvalid = false}) {
@@ -502,6 +511,17 @@ class _GeneratedFormState extends State<GeneratedForm> {
} else if (widget.items[r][e] is GeneratedFormSubForm) { } else if (widget.items[r][e] is GeneratedFormSubForm) {
List<Widget> subformColumn = []; List<Widget> subformColumn = [];
for (int i = 0; i < values[fieldKey].length; i++) { for (int i = 0; i < values[fieldKey].length; i++) {
var items = (widget.items[r][e] as GeneratedFormSubForm)
.items
.map((x) => x.map((y) {
y.defaultValue = values[fieldKey]?[i]?[y.key];
return y;
}).toList())
.toList();
var internalFormKey = ValueKey(generateRandomNumber(
values[fieldKey].length,
seed2: i,
seed3: forceUpdateKeyCount));
subformColumn.add(Column( subformColumn.add(Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@@ -514,13 +534,8 @@ class _GeneratedFormState extends State<GeneratedForm> {
style: const TextStyle(fontWeight: FontWeight.bold), style: const TextStyle(fontWeight: FontWeight.bold),
), ),
GeneratedForm( GeneratedForm(
items: (widget.items[r][e] as GeneratedFormSubForm) key: internalFormKey,
.items items: items,
.map((x) => x.map((y) {
y.defaultValue = values[fieldKey]?[i]?[y.key];
return y;
}).toList())
.toList(),
onValueChanges: (values, valid, isBuilding) { onValueChanges: (values, valid, isBuilding) {
if (valid) { if (valid) {
this.values[fieldKey]?[i] = values; this.values[fieldKey]?[i] = values;
@@ -541,6 +556,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
var temp = List.from(values[fieldKey]); var temp = List.from(values[fieldKey]);
temp.removeAt(i); temp.removeAt(i);
values[fieldKey] = List.from(temp); values[fieldKey] = List.from(temp);
forceUpdateKeyCount++;
someValueChanged(); someValueChanged();
} }
: null, : null,
@@ -566,6 +582,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
values[fieldKey].add(getDefaultValuesFromFormItems( values[fieldKey].add(getDefaultValuesFromFormItems(
(widget.items[r][e] as GeneratedFormSubForm) (widget.items[r][e] as GeneratedFormSubForm)
.items)); .items));
forceUpdateKeyCount++;
someValueChanged(); someValueChanged();
}, },
icon: const Icon(Icons.add), icon: const Icon(Icons.add),