From 3a7ae7179639f2bf46f0c57ce49d5682eba104d1 Mon Sep 17 00:00:00 2001 From: DenserMeerkat Date: Sat, 16 Mar 2024 15:01:47 +0530 Subject: [PATCH 01/13] feat: automatic row adding --- .../request_pane/request_form_data.dart | 63 +++++++------------ .../request_pane/request_headers.dart | 59 +++++++---------- .../request_pane/request_params.dart | 58 +++++++---------- 3 files changed, 68 insertions(+), 112 deletions(-) diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart index 5d518e22..f77133e7 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart @@ -27,6 +27,8 @@ class _FormDataBodyState extends ConsumerState { @override Widget build(BuildContext context) { final selectedId = ref.watch(selectedIdStateProvider); + ref.watch(selectedRequestModelProvider + .select((value) => value?.requestFormDataList?.length)); var formRows = ref.read(selectedRequestModelProvider)?.requestFormDataList; rows = formRows == null || formRows.isEmpty ? [kFormDataEmptyModel] : formRows; @@ -47,18 +49,21 @@ class _FormDataBodyState extends ConsumerState { initialValue: rows[idx].name, hintText: " Add Key", onChanged: (value) { - rows[idx] = rows[idx].copyWith( - name: value, - ); + rows[idx] = rows[idx].copyWith(name: value); + if (idx == rows.length - 1) rows.add(kFormDataEmptyModel); _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, formDataType: rows[idx].type, onFormDataTypeChanged: (value) { + bool hasChanged = rows[idx].type != value; rows[idx] = rows[idx].copyWith( type: value ?? FormDataType.text, ); rows[idx] = rows[idx].copyWith(value: ""); + if (idx == rows.length - 1 && hasChanged) { + rows.add(kFormDataEmptyModel); + } setState(() {}); _onFieldChange(selectedId!); }, @@ -137,6 +142,7 @@ class _FormDataBodyState extends ConsumerState { hintText: " Add Value", onChanged: (value) { rows[idx] = rows[idx].copyWith(value: value); + if (idx == rows.length - 1) rows.add(kFormDataEmptyModel); _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, @@ -169,45 +175,22 @@ class _FormDataBodyState extends ConsumerState { ), ], ); - return Stack( - children: [ - Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.background, - borderRadius: kBorderRadius12, - ), - margin: kP10, - child: Column( - children: [ - Expanded( - child: DaviTheme( - data: kTableThemeData, - child: Davi(daviModelRows), - ), - ), - ], - ), - ), - Align( - alignment: Alignment.bottomCenter, - child: Padding( - padding: const EdgeInsets.only(bottom: 30), - child: ElevatedButton.icon( - onPressed: () { - setState(() { - rows.add(kFormDataEmptyModel); - }); - _onFieldChange(selectedId!); - }, - icon: const Icon(Icons.add), - label: const Text( - "Add Form Data", - style: kTextStyleButton, - ), + return Container( + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.background, + borderRadius: kBorderRadius12, + ), + margin: kP10, + child: Column( + children: [ + Expanded( + child: DaviTheme( + data: kTableThemeData, + child: Davi(daviModelRows), ), ), - ), - ], + ], + ), ); } diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart index 503355f8..a6524b23 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart @@ -81,7 +81,12 @@ class EditRequestHeadersState extends ConsumerState { initialValue: rows[idx].name, hintText: "Add Header Name", onChanged: (value) { + isRowEnabledList[idx] = true; rows[idx] = rows[idx].copyWith(name: value); + if (idx == rows.length - 1) { + rows.add(kNameValueEmptyModel); + isRowEnabledList.add(true); + } _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, @@ -109,6 +114,10 @@ class EditRequestHeadersState extends ConsumerState { hintText: " Add Header Value", onChanged: (value) { rows[idx] = rows[idx].copyWith(value: value); + if (idx == rows.length - 1) { + rows.add(kNameValueEmptyModel); + isRowEnabledList.add(true); + } _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, @@ -144,44 +153,22 @@ class EditRequestHeadersState extends ConsumerState { ), ], ); - return Stack( - children: [ - Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.background, - borderRadius: kBorderRadius12, - ), - margin: kP10, - child: Column( - children: [ - Expanded( - child: DaviTheme( - data: kTableThemeData, - child: Davi(model), - ), - ), - ], - ), - ), - Align( - alignment: Alignment.bottomCenter, - child: Padding( - padding: const EdgeInsets.only(bottom: 30), - child: ElevatedButton.icon( - onPressed: () { - rows.add(kNameValueEmptyModel); - isRowEnabledList.add(true); - _onFieldChange(selectedId!); - }, - icon: const Icon(Icons.add), - label: const Text( - "Add Header", - style: kTextStyleButton, - ), + return Container( + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.background, + borderRadius: kBorderRadius12, + ), + margin: kP10, + child: Column( + children: [ + Expanded( + child: DaviTheme( + data: kTableThemeData, + child: Davi(model), ), ), - ), - ], + ], + ), ); } } diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart index 6e3aca4b..f602200d 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart @@ -83,6 +83,10 @@ class EditRequestURLParamsState extends ConsumerState { hintText: "Add URL Parameter", onChanged: (value) { rows[idx] = rows[idx].copyWith(name: value); + if (idx == rows.length - 1) { + rows.add(kNameValueEmptyModel); + isRowEnabledList.add(true); + } _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, @@ -110,6 +114,10 @@ class EditRequestURLParamsState extends ConsumerState { hintText: "Add Value", onChanged: (value) { rows[idx] = rows[idx].copyWith(value: value); + if (idx == rows.length - 1) { + rows.add(kNameValueEmptyModel); + isRowEnabledList.add(true); + } _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, @@ -145,44 +153,22 @@ class EditRequestURLParamsState extends ConsumerState { ), ], ); - return Stack( - children: [ - Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.background, - borderRadius: kBorderRadius12, - ), - margin: kP10, - child: Column( - children: [ - Expanded( - child: DaviTheme( - data: kTableThemeData, - child: Davi(model), - ), - ), - ], - ), - ), - Align( - alignment: Alignment.bottomCenter, - child: Padding( - padding: const EdgeInsets.only(bottom: 30), - child: ElevatedButton.icon( - onPressed: () { - rows.add(kNameValueEmptyModel); - isRowEnabledList.add(true); - _onFieldChange(selectedId!); - }, - icon: const Icon(Icons.add), - label: const Text( - "Add Param", - style: kTextStyleButton, - ), + return Container( + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.background, + borderRadius: kBorderRadius12, + ), + margin: kP10, + child: Column( + children: [ + Expanded( + child: DaviTheme( + data: kTableThemeData, + child: Davi(model), ), ), - ), - ], + ], + ), ); } } From e42165061737b299b7597992328977cfef44d5df Mon Sep 17 00:00:00 2001 From: DenserMeerkat Date: Sat, 16 Mar 2024 16:29:35 +0530 Subject: [PATCH 02/13] fix: checkbox empty selection --- .../request_pane/request_headers.dart | 33 +++++++++++------- .../request_pane/request_params.dart | 34 ++++++++++++------- lib/widgets/checkbox.dart | 2 +- 3 files changed, 42 insertions(+), 27 deletions(-) diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart index a6524b23..560955c0 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart @@ -40,14 +40,16 @@ class EditRequestHeadersState extends ConsumerState { ref.watch(selectedRequestModelProvider .select((value) => value?.requestHeaders?.length)); var rH = ref.read(selectedRequestModelProvider)?.requestHeaders; - rows = (rH == null || rH.isEmpty) + bool isHeadersEmpty = rH == null || rH.isEmpty; + rows = (isHeadersEmpty) ? [ kNameValueEmptyModel, ] : rH; - isRowEnabledList = - ref.read(selectedRequestModelProvider)?.isHeaderEnabledList ?? - List.filled(rows.length, true, growable: true); + isRowEnabledList = ref + .read(selectedRequestModelProvider) + ?.isHeaderEnabledList ?? + List.filled(rows.length, isHeadersEmpty ? false : true, growable: true); DaviModel model = DaviModel( rows: rows, @@ -60,12 +62,17 @@ class EditRequestHeadersState extends ConsumerState { return CheckBox( keyId: "$selectedId-$idx-headers-c-$seed", value: isRowEnabledList[idx], - onChanged: (value) { - setState(() { - isRowEnabledList[idx] = value!; - }); - _onFieldChange(selectedId!); - }, + onChanged: rows.length == 1 && + idx == 0 && + rows[idx].name.isEmpty && + rows[idx].value.isEmpty + ? null + : (value) { + setState(() { + isRowEnabledList[idx] = value!; + }); + _onFieldChange(selectedId!); + }, colorScheme: Theme.of(context).colorScheme, ); }, @@ -85,7 +92,7 @@ class EditRequestHeadersState extends ConsumerState { rows[idx] = rows[idx].copyWith(name: value); if (idx == rows.length - 1) { rows.add(kNameValueEmptyModel); - isRowEnabledList.add(true); + isRowEnabledList.add(false); } _onFieldChange(selectedId!); }, @@ -116,7 +123,7 @@ class EditRequestHeadersState extends ConsumerState { rows[idx] = rows[idx].copyWith(value: value); if (idx == rows.length - 1) { rows.add(kNameValueEmptyModel); - isRowEnabledList.add(true); + isRowEnabledList.add(false); } _onFieldChange(selectedId!); }, @@ -140,7 +147,7 @@ class EditRequestHeadersState extends ConsumerState { rows = [ kNameValueEmptyModel, ]; - isRowEnabledList = [true]; + isRowEnabledList = [false]; }); } else { rows.removeAt(row.index); diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart index f602200d..3bb018cb 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart @@ -41,14 +41,16 @@ class EditRequestURLParamsState extends ConsumerState { ref.watch(selectedRequestModelProvider .select((value) => value?.requestParams?.length)); var rP = ref.read(selectedRequestModelProvider)?.requestParams; - rows = (rP == null || rP.isEmpty) + bool isParamsEmpty = rP == null || rP.isEmpty; + rows = (isParamsEmpty) ? [ kNameValueEmptyModel, ] : rP; - isRowEnabledList = - ref.read(selectedRequestModelProvider)?.isParamEnabledList ?? - List.filled(rows.length, true, growable: true); + isRowEnabledList = ref + .read(selectedRequestModelProvider) + ?.isParamEnabledList ?? + List.filled(rows.length, isParamsEmpty ? false : true, growable: true); DaviModel model = DaviModel( rows: rows, @@ -61,12 +63,16 @@ class EditRequestURLParamsState extends ConsumerState { return CheckBox( keyId: "$selectedId-$idx-params-c-$seed", value: isRowEnabledList[idx], - onChanged: (value) { - setState(() { - isRowEnabledList[idx] = value!; - }); - _onFieldChange(selectedId!); - }, + onChanged: idx + 1 == rows.length && + rows[idx].name.isEmpty && + rows[idx].value.isEmpty + ? null + : (value) { + setState(() { + isRowEnabledList[idx] = value!; + }); + _onFieldChange(selectedId!); + }, colorScheme: Theme.of(context).colorScheme, ); }, @@ -84,8 +90,9 @@ class EditRequestURLParamsState extends ConsumerState { onChanged: (value) { rows[idx] = rows[idx].copyWith(name: value); if (idx == rows.length - 1) { + isRowEnabledList[idx] = true; rows.add(kNameValueEmptyModel); - isRowEnabledList.add(true); + isRowEnabledList.add(false); } _onFieldChange(selectedId!); }, @@ -115,8 +122,9 @@ class EditRequestURLParamsState extends ConsumerState { onChanged: (value) { rows[idx] = rows[idx].copyWith(value: value); if (idx == rows.length - 1) { + isRowEnabledList[idx] = true; rows.add(kNameValueEmptyModel); - isRowEnabledList.add(true); + isRowEnabledList.add(false); } _onFieldChange(selectedId!); }, @@ -140,7 +148,7 @@ class EditRequestURLParamsState extends ConsumerState { rows = [ kNameValueEmptyModel, ]; - isRowEnabledList = [true]; + isRowEnabledList = [false]; }); } else { rows.removeAt(row.index); diff --git a/lib/widgets/checkbox.dart b/lib/widgets/checkbox.dart index 22c3869f..53adf496 100644 --- a/lib/widgets/checkbox.dart +++ b/lib/widgets/checkbox.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; class CheckBox extends StatelessWidget { final String keyId; final bool value; - final ValueChanged onChanged; + final ValueChanged? onChanged; final ColorScheme? colorScheme; const CheckBox({ super.key, From 711e3bd74d018401556704469306e27d94cd16fd Mon Sep 17 00:00:00 2001 From: DenserMeerkat Date: Sun, 17 Mar 2024 18:27:13 +0530 Subject: [PATCH 03/13] fix: add buttons back --- .../request_pane/request_form_data.dart | 65 ++++++++++++------- .../request_pane/request_headers.dart | 50 ++++++++++---- .../request_pane/request_params.dart | 50 ++++++++++---- 3 files changed, 115 insertions(+), 50 deletions(-) diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart index f77133e7..cec94eab 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart @@ -18,12 +18,20 @@ class _FormDataBodyState extends ConsumerState { late int seed; final random = Random.secure(); late List rows; + @override void initState() { super.initState(); seed = random.nextInt(kRandMax); } + void _onFieldChange(String selectedId) { + ref.read(collectionStateNotifierProvider.notifier).update( + selectedId, + requestFormDataList: rows, + ); + } + @override Widget build(BuildContext context) { final selectedId = ref.watch(selectedIdStateProvider); @@ -168,36 +176,49 @@ class _FormDataBodyState extends ConsumerState { rows.removeAt(row.index); } _onFieldChange(selectedId!); - setState(() {}); }, ); }, ), ], ); - return Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.background, - borderRadius: kBorderRadius12, - ), - margin: kP10, - child: Column( - children: [ - Expanded( - child: DaviTheme( - data: kTableThemeData, - child: Davi(daviModelRows), + return Stack( + children: [ + Container( + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.background, + borderRadius: kBorderRadius12, + ), + margin: kP10, + child: Column( + children: [ + Expanded( + child: DaviTheme( + data: kTableThemeData, + child: Davi(daviModelRows), + ), + ), + ], + ), + ), + Align( + alignment: Alignment.bottomCenter, + child: Padding( + padding: const EdgeInsets.only(bottom: 30), + child: ElevatedButton.icon( + onPressed: () { + rows.add(kFormDataEmptyModel); + _onFieldChange(selectedId!); + }, + icon: const Icon(Icons.add), + label: const Text( + "Add Form Data", + style: kTextStyleButton, + ), ), ), - ], - ), + ), + ], ); } - - void _onFieldChange(String selectedId) { - ref.read(collectionStateNotifierProvider.notifier).update( - selectedId, - requestFormDataList: rows, - ); - } } diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart index 560955c0..f77fda32 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart @@ -160,22 +160,44 @@ class EditRequestHeadersState extends ConsumerState { ), ], ); - return Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.background, - borderRadius: kBorderRadius12, - ), - margin: kP10, - child: Column( - children: [ - Expanded( - child: DaviTheme( - data: kTableThemeData, - child: Davi(model), + return Stack( + children: [ + Container( + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.background, + borderRadius: kBorderRadius12, + ), + margin: kP10, + child: Column( + children: [ + Expanded( + child: DaviTheme( + data: kTableThemeData, + child: Davi(model), + ), + ), + ], + ), + ), + Align( + alignment: Alignment.bottomCenter, + child: Padding( + padding: const EdgeInsets.only(bottom: 30), + child: ElevatedButton.icon( + onPressed: () { + rows.add(kNameValueEmptyModel); + isRowEnabledList.add(false); + _onFieldChange(selectedId!); + }, + icon: const Icon(Icons.add), + label: const Text( + "Add Header", + style: kTextStyleButton, + ), ), ), - ], - ), + ), + ], ); } } diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart index 3bb018cb..dfc78c50 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart @@ -161,22 +161,44 @@ class EditRequestURLParamsState extends ConsumerState { ), ], ); - return Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.background, - borderRadius: kBorderRadius12, - ), - margin: kP10, - child: Column( - children: [ - Expanded( - child: DaviTheme( - data: kTableThemeData, - child: Davi(model), + return Stack( + children: [ + Container( + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.background, + borderRadius: kBorderRadius12, + ), + margin: kP10, + child: Column( + children: [ + Expanded( + child: DaviTheme( + data: kTableThemeData, + child: Davi(model), + ), + ), + ], + ), + ), + Align( + alignment: Alignment.bottomCenter, + child: Padding( + padding: const EdgeInsets.only(bottom: 30), + child: ElevatedButton.icon( + onPressed: () { + rows.add(kNameValueEmptyModel); + isRowEnabledList.add(false); + _onFieldChange(selectedId!); + }, + icon: const Icon(Icons.add), + label: const Text( + "Add Param", + style: kTextStyleButton, + ), ), ), - ], - ), + ), + ], ); } } From a2c20eedc153ef58412378be0a14eb5de6e3bc4a Mon Sep 17 00:00:00 2001 From: DenserMeerkat Date: Mon, 18 Mar 2024 01:17:18 +0530 Subject: [PATCH 04/13] fix: empty row when rows exist --- .../request_pane/request_form_data.dart | 80 +++++++++-------- .../request_pane/request_headers.dart | 86 ++++++++++--------- .../request_pane/request_params.dart | 86 +++++++++++-------- 3 files changed, 139 insertions(+), 113 deletions(-) diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart index cec94eab..b3d8f67c 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart @@ -17,7 +17,7 @@ class FormDataWidget extends ConsumerStatefulWidget { class _FormDataBodyState extends ConsumerState { late int seed; final random = Random.secure(); - late List rows; + late List formRows; @override void initState() { @@ -28,7 +28,7 @@ class _FormDataBodyState extends ConsumerState { void _onFieldChange(String selectedId) { ref.read(collectionStateNotifierProvider.notifier).update( selectedId, - requestFormDataList: rows, + requestFormDataList: formRows.sublist(0, formRows.length - 1), ); } @@ -37,12 +37,17 @@ class _FormDataBodyState extends ConsumerState { final selectedId = ref.watch(selectedIdStateProvider); ref.watch(selectedRequestModelProvider .select((value) => value?.requestFormDataList?.length)); - var formRows = ref.read(selectedRequestModelProvider)?.requestFormDataList; - rows = - formRows == null || formRows.isEmpty ? [kFormDataEmptyModel] : formRows; + var rF = ref.read(selectedRequestModelProvider)?.requestFormDataList; + bool isFormDataEmpty = rF == null || rF.isEmpty; + List rows = (isFormDataEmpty) + ? [ + kFormDataEmptyModel, + ] + : rF; + formRows = isFormDataEmpty ? rows : rows + [kFormDataEmptyModel]; DaviModel daviModelRows = DaviModel( - rows: rows, + rows: formRows, columns: [ DaviColumn( cellPadding: kpsV5, @@ -50,27 +55,28 @@ class _FormDataBodyState extends ConsumerState { grow: 4, cellBuilder: (_, row) { int idx = row.index; + bool isLast = idx + 1 == formRows.length; return Theme( data: Theme.of(context), child: FormDataField( keyId: "$selectedId-$idx-form-v-$seed", - initialValue: rows[idx].name, + initialValue: formRows[idx].name, hintText: " Add Key", onChanged: (value) { - rows[idx] = rows[idx].copyWith(name: value); - if (idx == rows.length - 1) rows.add(kFormDataEmptyModel); + formRows[idx] = formRows[idx].copyWith(name: value); + if (isLast) formRows.add(kFormDataEmptyModel); _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, - formDataType: rows[idx].type, + formDataType: formRows[idx].type, onFormDataTypeChanged: (value) { - bool hasChanged = rows[idx].type != value; - rows[idx] = rows[idx].copyWith( + bool hasChanged = formRows[idx].type != value; + formRows[idx] = formRows[idx].copyWith( type: value ?? FormDataType.text, ); - rows[idx] = rows[idx].copyWith(value: ""); - if (idx == rows.length - 1 && hasChanged) { - rows.add(kFormDataEmptyModel); + formRows[idx] = formRows[idx].copyWith(value: ""); + if (idx == formRows.length - 1 && hasChanged) { + formRows.add(kFormDataEmptyModel); } setState(() {}); _onFieldChange(selectedId!); @@ -97,7 +103,8 @@ class _FormDataBodyState extends ConsumerState { cellPadding: kpsV5, cellBuilder: (_, row) { int idx = row.index; - return rows[idx].type == FormDataType.file + bool isLast = idx + 1 == formRows.length; + return formRows[idx].type == FormDataType.file ? Align( alignment: Alignment.centerLeft, child: Row( @@ -122,7 +129,7 @@ class _FormDataBodyState extends ConsumerState { if (pickedResult != null && pickedResult.files.isNotEmpty && pickedResult.files.first.path != null) { - rows[idx] = rows[idx].copyWith( + formRows[idx] = formRows[idx].copyWith( value: pickedResult.files.first.path!, ); setState(() {}); @@ -130,9 +137,9 @@ class _FormDataBodyState extends ConsumerState { } }, label: Text( - (rows[idx].type == FormDataType.file && - rows[idx].value.isNotEmpty) - ? rows[idx].value.toString() + (formRows[idx].type == FormDataType.file && + formRows[idx].value.isNotEmpty) + ? formRows[idx].value.toString() : "Select File", textAlign: TextAlign.center, overflow: TextOverflow.ellipsis, @@ -146,11 +153,11 @@ class _FormDataBodyState extends ConsumerState { ) : CellField( keyId: "$selectedId-$idx-form-v-$seed", - initialValue: rows[idx].value, + initialValue: formRows[idx].value, hintText: " Add Value", onChanged: (value) { - rows[idx] = rows[idx].copyWith(value: value); - if (idx == rows.length - 1) rows.add(kFormDataEmptyModel); + formRows[idx] = formRows[idx].copyWith(value: value); + if (isLast) formRows.add(kFormDataEmptyModel); _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, @@ -162,21 +169,24 @@ class _FormDataBodyState extends ConsumerState { pinStatus: PinStatus.none, width: 30, cellBuilder: (_, row) { + bool isLast = row.index + 1 == formRows.length; return InkWell( + onTap: isLast + ? null + : () { + seed = random.nextInt(kRandMax); + if (formRows.length == 2) { + setState(() { + formRows = [kFormDataEmptyModel]; + }); + } else { + formRows.removeAt(row.index); + } + _onFieldChange(selectedId!); + }, child: Theme.of(context).brightness == Brightness.dark ? kIconRemoveDark : kIconRemoveLight, - onTap: () { - seed = random.nextInt(kRandMax); - if (rows.length == 1) { - setState(() { - rows = [kFormDataEmptyModel]; - }); - } else { - rows.removeAt(row.index); - } - _onFieldChange(selectedId!); - }, ); }, ), @@ -207,7 +217,7 @@ class _FormDataBodyState extends ConsumerState { padding: const EdgeInsets.only(bottom: 30), child: ElevatedButton.icon( onPressed: () { - rows.add(kFormDataEmptyModel); + formRows.add(kFormDataEmptyModel); _onFieldChange(selectedId!); }, icon: const Icon(Icons.add), diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart index f77fda32..e5b0df59 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart @@ -15,10 +15,10 @@ class EditRequestHeaders extends ConsumerStatefulWidget { } class EditRequestHeadersState extends ConsumerState { - final random = Random.secure(); - late List rows; - late List isRowEnabledList; late int seed; + final random = Random.secure(); + late List headerRows; + late List isRowEnabledList; @override void initState() { @@ -29,8 +29,9 @@ class EditRequestHeadersState extends ConsumerState { void _onFieldChange(String selectedId) { ref.read(collectionStateNotifierProvider.notifier).update( selectedId, - requestHeaders: rows, - isHeaderEnabledList: isRowEnabledList, + requestHeaders: headerRows.sublist(0, headerRows.length - 1), + isHeaderEnabledList: + isRowEnabledList.sublist(0, headerRows.length - 1), ); } @@ -41,31 +42,30 @@ class EditRequestHeadersState extends ConsumerState { .select((value) => value?.requestHeaders?.length)); var rH = ref.read(selectedRequestModelProvider)?.requestHeaders; bool isHeadersEmpty = rH == null || rH.isEmpty; - rows = (isHeadersEmpty) + List rows = (isHeadersEmpty) ? [ kNameValueEmptyModel, ] : rH; - isRowEnabledList = ref - .read(selectedRequestModelProvider) - ?.isHeaderEnabledList ?? - List.filled(rows.length, isHeadersEmpty ? false : true, growable: true); + headerRows = isHeadersEmpty ? rows : rows + [kNameValueEmptyModel]; + isRowEnabledList = + ref.read(selectedRequestModelProvider)?.isHeaderEnabledList ?? + List.filled(rH?.length ?? 0, true, growable: true); + isRowEnabledList.add(false); DaviModel model = DaviModel( - rows: rows, + rows: headerRows, columns: [ DaviColumn( name: 'Checkbox', width: 30, cellBuilder: (_, row) { int idx = row.index; + bool isLast = idx + 1 == headerRows.length; return CheckBox( keyId: "$selectedId-$idx-headers-c-$seed", value: isRowEnabledList[idx], - onChanged: rows.length == 1 && - idx == 0 && - rows[idx].name.isEmpty && - rows[idx].value.isEmpty + onChanged: isLast ? null : (value) { setState(() { @@ -83,15 +83,16 @@ class EditRequestHeadersState extends ConsumerState { grow: 1, cellBuilder: (_, row) { int idx = row.index; + bool isLast = idx + 1 == headerRows.length; return HeaderField( keyId: "$selectedId-$idx-headers-k-$seed", - initialValue: rows[idx].name, + initialValue: headerRows[idx].name, hintText: "Add Header Name", onChanged: (value) { - isRowEnabledList[idx] = true; - rows[idx] = rows[idx].copyWith(name: value); - if (idx == rows.length - 1) { - rows.add(kNameValueEmptyModel); + headerRows[idx] = headerRows[idx].copyWith(name: value); + if (isLast) { + isRowEnabledList[idx] = true; + headerRows.add(kNameValueEmptyModel); isRowEnabledList.add(false); } _onFieldChange(selectedId!); @@ -115,14 +116,16 @@ class EditRequestHeadersState extends ConsumerState { grow: 1, cellBuilder: (_, row) { int idx = row.index; + bool isLast = idx + 1 == headerRows.length; return CellField( keyId: "$selectedId-$idx-headers-v-$seed", - initialValue: rows[idx].value, + initialValue: headerRows[idx].value, hintText: " Add Header Value", onChanged: (value) { - rows[idx] = rows[idx].copyWith(value: value); - if (idx == rows.length - 1) { - rows.add(kNameValueEmptyModel); + headerRows[idx] = headerRows[idx].copyWith(value: value); + if (isLast) { + isRowEnabledList[idx] = true; + headerRows.add(kNameValueEmptyModel); isRowEnabledList.add(false); } _onFieldChange(selectedId!); @@ -136,25 +139,28 @@ class EditRequestHeadersState extends ConsumerState { pinStatus: PinStatus.none, width: 30, cellBuilder: (_, row) { + bool isLast = row.index + 1 == headerRows.length; return InkWell( + onTap: isLast + ? null + : () { + seed = random.nextInt(kRandMax); + if (headerRows.length == 2) { + setState(() { + headerRows = [ + kNameValueEmptyModel, + ]; + isRowEnabledList = [false]; + }); + } else { + headerRows.removeAt(row.index); + isRowEnabledList.removeAt(row.index); + } + _onFieldChange(selectedId!); + }, child: Theme.of(context).brightness == Brightness.dark ? kIconRemoveDark : kIconRemoveLight, - onTap: () { - seed = random.nextInt(kRandMax); - if (rows.length == 1) { - setState(() { - rows = [ - kNameValueEmptyModel, - ]; - isRowEnabledList = [false]; - }); - } else { - rows.removeAt(row.index); - isRowEnabledList.removeAt(row.index); - } - _onFieldChange(selectedId!); - }, ); }, ), @@ -185,7 +191,7 @@ class EditRequestHeadersState extends ConsumerState { padding: const EdgeInsets.only(bottom: 30), child: ElevatedButton.icon( onPressed: () { - rows.add(kNameValueEmptyModel); + headerRows.add(kNameValueEmptyModel); isRowEnabledList.add(false); _onFieldChange(selectedId!); }, diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart index dfc78c50..a306b46b 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart @@ -16,10 +16,10 @@ class EditRequestURLParams extends ConsumerStatefulWidget { } class EditRequestURLParamsState extends ConsumerState { - final random = Random.secure(); - late List rows; - late List isRowEnabledList; late int seed; + final random = Random.secure(); + late List paramRows; + late List isRowEnabledList; @override void initState() { @@ -30,9 +30,14 @@ class EditRequestURLParamsState extends ConsumerState { void _onFieldChange(String selectedId) { ref.read(collectionStateNotifierProvider.notifier).update( selectedId, - requestParams: rows, - isParamEnabledList: isRowEnabledList, + requestParams: paramRows.sublist(0, paramRows.length - 1), + isParamEnabledList: isRowEnabledList.sublist(0, paramRows.length - 1), ); + debugPrint("URL Params Updated"); + for (var i = 0; i < paramRows.length - 1; i++) { + debugPrint( + "URL Param $i: (${paramRows[i].name}=${paramRows[i].value}) ==> ${isRowEnabledList[i]}"); + } } @override @@ -42,30 +47,30 @@ class EditRequestURLParamsState extends ConsumerState { .select((value) => value?.requestParams?.length)); var rP = ref.read(selectedRequestModelProvider)?.requestParams; bool isParamsEmpty = rP == null || rP.isEmpty; - rows = (isParamsEmpty) + List rows = (isParamsEmpty) ? [ kNameValueEmptyModel, ] : rP; - isRowEnabledList = ref - .read(selectedRequestModelProvider) - ?.isParamEnabledList ?? - List.filled(rows.length, isParamsEmpty ? false : true, growable: true); + paramRows = isParamsEmpty ? rows : rows + [kNameValueEmptyModel]; + isRowEnabledList = + ref.read(selectedRequestModelProvider)?.isParamEnabledList ?? + List.filled(rP?.length ?? 0, true, growable: true); + isRowEnabledList.add(false); DaviModel model = DaviModel( - rows: rows, + rows: paramRows, columns: [ DaviColumn( name: 'Checkbox', width: 30, cellBuilder: (_, row) { int idx = row.index; + bool isLast = idx + 1 == paramRows.length; return CheckBox( keyId: "$selectedId-$idx-params-c-$seed", value: isRowEnabledList[idx], - onChanged: idx + 1 == rows.length && - rows[idx].name.isEmpty && - rows[idx].value.isEmpty + onChanged: isLast ? null : (value) { setState(() { @@ -83,15 +88,16 @@ class EditRequestURLParamsState extends ConsumerState { grow: 1, cellBuilder: (_, row) { int idx = row.index; + bool isLast = idx + 1 == paramRows.length; return CellField( keyId: "$selectedId-$idx-params-k-$seed", - initialValue: rows[idx].name, + initialValue: paramRows[idx].name, hintText: "Add URL Parameter", onChanged: (value) { - rows[idx] = rows[idx].copyWith(name: value); - if (idx == rows.length - 1) { + paramRows[idx] = paramRows[idx].copyWith(name: value); + if (isLast) { isRowEnabledList[idx] = true; - rows.add(kNameValueEmptyModel); + paramRows.add(kNameValueEmptyModel); isRowEnabledList.add(false); } _onFieldChange(selectedId!); @@ -115,15 +121,16 @@ class EditRequestURLParamsState extends ConsumerState { grow: 1, cellBuilder: (_, row) { int idx = row.index; + bool isLast = idx + 1 == paramRows.length; return CellField( keyId: "$selectedId-$idx-params-v-$seed", - initialValue: rows[idx].value, + initialValue: paramRows[idx].value, hintText: "Add Value", onChanged: (value) { - rows[idx] = rows[idx].copyWith(value: value); - if (idx == rows.length - 1) { + paramRows[idx] = paramRows[idx].copyWith(value: value); + if (isLast) { isRowEnabledList[idx] = true; - rows.add(kNameValueEmptyModel); + paramRows.add(kNameValueEmptyModel); isRowEnabledList.add(false); } _onFieldChange(selectedId!); @@ -137,25 +144,28 @@ class EditRequestURLParamsState extends ConsumerState { pinStatus: PinStatus.none, width: 30, cellBuilder: (_, row) { + bool isLast = row.index + 1 == paramRows.length; return InkWell( + onTap: isLast + ? null + : () { + seed = random.nextInt(kRandMax); + if (paramRows.length == 2) { + setState(() { + paramRows = [ + kNameValueEmptyModel, + ]; + isRowEnabledList = [false]; + }); + } else { + paramRows.removeAt(row.index); + isRowEnabledList.removeAt(row.index); + } + _onFieldChange(selectedId!); + }, child: Theme.of(context).brightness == Brightness.dark ? kIconRemoveDark : kIconRemoveLight, - onTap: () { - seed = random.nextInt(kRandMax); - if (rows.length == 1) { - setState(() { - rows = [ - kNameValueEmptyModel, - ]; - isRowEnabledList = [false]; - }); - } else { - rows.removeAt(row.index); - isRowEnabledList.removeAt(row.index); - } - _onFieldChange(selectedId!); - }, ); }, ), @@ -186,7 +196,7 @@ class EditRequestURLParamsState extends ConsumerState { padding: const EdgeInsets.only(bottom: 30), child: ElevatedButton.icon( onPressed: () { - rows.add(kNameValueEmptyModel); + paramRows.add(kNameValueEmptyModel); isRowEnabledList.add(false); _onFieldChange(selectedId!); }, From fb36f05792d32e881e583d702499b6a03736a5aa Mon Sep 17 00:00:00 2001 From: DenserMeerkat Date: Mon, 18 Mar 2024 01:22:16 +0530 Subject: [PATCH 05/13] refactor: remove debugPrint --- .../details_card/request_pane/request_params.dart | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart index a306b46b..319330ba 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart @@ -33,11 +33,6 @@ class EditRequestURLParamsState extends ConsumerState { requestParams: paramRows.sublist(0, paramRows.length - 1), isParamEnabledList: isRowEnabledList.sublist(0, paramRows.length - 1), ); - debugPrint("URL Params Updated"); - for (var i = 0; i < paramRows.length - 1; i++) { - debugPrint( - "URL Param $i: (${paramRows[i].name}=${paramRows[i].value}) ==> ${isRowEnabledList[i]}"); - } } @override From a65ef99fff3074b452719e896c0d0420e4677da4 Mon Sep 17 00:00:00 2001 From: Tilakraj-B Date: Wed, 20 Mar 2024 19:09:09 +0530 Subject: [PATCH 06/13] Added Overlay widget for having better UX while waiting --- assets/completed.json | 1 + assets/saving.json | 1 + lib/consts.dart | 10 ++- lib/screens/home_page/collection_pane.dart | 19 +++-- lib/widgets/overlay_widget.dart | 87 ++++++++++++++++++++++ 5 files changed, 109 insertions(+), 9 deletions(-) create mode 100644 assets/completed.json create mode 100644 assets/saving.json create mode 100644 lib/widgets/overlay_widget.dart diff --git a/assets/completed.json b/assets/completed.json new file mode 100644 index 00000000..5326bc25 --- /dev/null +++ b/assets/completed.json @@ -0,0 +1 @@ +{"v":"5.1.16","fr":29.9700012207031,"ip":0,"op":30.0000012219251,"w":500,"h":500,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-158,21],[-63,116],[162,-109]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.129411764706,0.8,0.223529411765,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":36,"ix":5},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[100]},{"t":20.0000008146167}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":-149.000006068894,"op":40.0000016292334,"st":-149.000006068894,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/assets/saving.json b/assets/saving.json new file mode 100644 index 00000000..0c9ab2f1 --- /dev/null +++ b/assets/saving.json @@ -0,0 +1 @@ +{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":25,"ip":0,"op":31,"w":200,"h":200,"nm":"save","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 4","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[101.689,94.053,0],"ix":2},"a":{"a":0,"k":[101.689,94.053,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.25,0.25,0.25],"y":[1,1,1]},"o":{"x":[0.33,0.33,0.33],"y":[0,0,0]},"t":13,"s":[100,0,100]},{"i":{"x":[0.67,0.67,0.67],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":23,"s":[100,100,100]},{"i":{"x":[0.67,0.67,0.67],"y":[1,1,1]},"o":{"x":[0.75,0.75,0.75],"y":[0,0,0]},"t":60,"s":[100,100,100]},{"t":68,"s":[100,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[0.5,0.985],[-0.5,0.985],[-0.5,-0.985],[0.5,-0.985]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.20000000298,0.192156866193,0.196078434587,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[101.689,95.038],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 3","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[100.213,92.217,0],"ix":2},"a":{"a":0,"k":[100.213,92.217,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.25,0.25,0.25],"y":[1,1,1]},"o":{"x":[0.33,0.33,0.33],"y":[0,0,0]},"t":7,"s":[0,0,100]},{"i":{"x":[0.67,0.67,0.67],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":21,"s":[100,100,100]},{"i":{"x":[0.67,0.67,0.67],"y":[1,1,1]},"o":{"x":[0.75,0.75,0.75],"y":[0,0,0]},"t":61,"s":[100,100,100]},{"t":70,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.276,0],[0,0],[0,0.276],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[-0.276,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0.276]],"v":[[3.623,3.021],[-3.623,3.021],[-4.123,2.521],[-4.123,-3.021],[-3.123,-3.021],[-3.123,2.021],[3.123,2.021],[3.123,-2.943],[4.123,-2.943],[4.123,2.521]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.20000000298,0.192156866193,0.196078434587,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[100.213,95.238],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Layer 2","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[100.213,109.234,0],"ix":2},"a":{"a":0,"k":[100.213,109.234,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.25,0.25,0.25],"y":[1,1,1]},"o":{"x":[0.33,0.33,0.33],"y":[0,0,0]},"t":4,"s":[0,0,100]},{"i":{"x":[0.67,0.67,0.67],"y":[1,1,1]},"o":{"x":[0.33,0.33,0.33],"y":[0,0,0]},"t":20,"s":[100,100,100]},{"i":{"x":[0.67,0.67,0.67],"y":[1,1,1]},"o":{"x":[0.75,0.75,0.75],"y":[0,0,0]},"t":62,"s":[100,100,100]},{"t":72,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0.37,0],[0,0],[0,-0.37],[0,0],[0,0],[0,0],[-0.921,0],[0,0],[0,-0.921]],"o":[[0,0],[0,0],[0,-0.37],[0,0],[-0.37,0],[0,0],[0,0],[0,0],[0,-0.921],[0,0],[0.921,0],[0,0]],"v":[[5.744,3.929],[4.744,3.929],[4.744,-2.259],[4.074,-2.929],[-4.074,-2.929],[-4.744,-2.259],[-4.744,3.929],[-5.744,3.929],[-5.744,-2.259],[-4.074,-3.929],[4.074,-3.929],[5.744,-2.259]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.20000000298,0.192156866193,0.196078434587,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[100.213,105.305],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[100.739,174.33,0],"ix":2},"a":{"a":0,"k":[100.213,109.734,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.25,0.25,0.25],"y":[1,1,1]},"o":{"x":[0.33,0.33,0.33],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"i":{"x":[0.25,0.25,0.25],"y":[1,1,1]},"o":{"x":[0.33,0.33,0.33],"y":[0,0,0]},"t":12,"s":[830,830,100]},{"i":{"x":[0.67,0.67,0.67],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":19,"s":[815,815,100]},{"i":{"x":[0.67,0.67,0.67],"y":[1,1,1]},"o":{"x":[0.75,0.75,0.75],"y":[0,0,0]},"t":63,"s":[815,815,100]},{"t":74,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-8.522,8.036],[8.522,8.036],[8.522,-4.465],[5.185,-7.882],[-8.522,-8.03]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.276,0],[0,0],[0,0.276],[0,0],[-0.095,0.094],[-0.117,0.009],[0,0],[-0.093,-0.095],[0,0],[0,-0.13],[0,0]],"o":[[0,0],[-0.276,0],[0,0],[0,-0.134],[0.095,-0.094],[0,0],[0.133,0.001],[0,0],[0.091,0.093],[0,0],[0,0.276]],"v":[[9.022,9.036],[-9.022,9.036],[-9.522,8.536],[-9.522,-8.536],[-9.374,-8.891],[-9.017,-9.036],[5.403,-8.879],[5.756,-8.729],[9.38,-5.018],[9.522,-4.668],[9.522,8.536]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.20000000298,0.192156866193,0.196078434587,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[100.213,100.698],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":75,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/lib/consts.dart b/lib/consts.dart index e3d2dc6b..f6ebd6e3 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -1,9 +1,10 @@ -import 'dart:io'; import 'dart:convert'; +import 'dart:io'; + +import 'package:davi/davi.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:davi/davi.dart'; const kDiscordUrl = "https://bit.ly/heyfoss"; const kGitUrl = "https://github.com/foss42/apidash"; @@ -25,6 +26,7 @@ final kColorTransparentState = MaterialStateProperty.all(Colors.transparent); const kColorTransparent = Colors.transparent; const kColorWhite = Colors.white; +const kColorBlack = Colors.black; const kColorRed = Colors.red; final kColorLightDanger = Colors.red.withOpacity(0.9); const kColorDarkDanger = Color(0xffcf6679); @@ -47,6 +49,7 @@ final kCodeStyle = TextStyle( const kHintOpacity = 0.6; const kForegroundOpacity = 0.05; +const kOverlayBackgroundOpacity = 0.5; const kTextStyleButton = TextStyle(fontWeight: FontWeight.bold); const kTextStyleButtonSmall = TextStyle(fontSize: 12); @@ -79,6 +82,7 @@ const kPh20t40 = EdgeInsets.only( top: 40, ); const kPh60 = EdgeInsets.symmetric(horizontal: 60); +const kPh60v60 = EdgeInsets.symmetric(vertical: 60, horizontal: 60); const kP24CollectionPane = EdgeInsets.only( top: 24, left: 4.0, @@ -522,3 +526,5 @@ const kLabelBusy = "Busy"; const kLabelCopy = "Copy"; const kLabelSave = "Save"; const kLabelDownload = "Download"; +const kLabelSaving = "Saving"; +const kLabelSaved = "Saved"; diff --git a/lib/screens/home_page/collection_pane.dart b/lib/screens/home_page/collection_pane.dart index c70db3ad..5e18c002 100644 --- a/lib/screens/home_page/collection_pane.dart +++ b/lib/screens/home_page/collection_pane.dart @@ -1,9 +1,10 @@ +import 'package:apidash/consts.dart'; +import 'package:apidash/models/models.dart'; +import 'package:apidash/providers/providers.dart'; +import 'package:apidash/widgets/overlay_widget.dart'; +import 'package:apidash/widgets/widgets.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:apidash/providers/providers.dart'; -import 'package:apidash/widgets/widgets.dart'; -import 'package:apidash/models/models.dart'; -import 'package:apidash/consts.dart'; class CollectionPane extends ConsumerWidget { const CollectionPane({ @@ -12,7 +13,7 @@ class CollectionPane extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - var sm = ScaffoldMessenger.of(context); + final overlayWidget = OverlayWidgetTemplate(context: context); final collection = ref.watch(collectionStateNotifierProvider); final savingData = ref.watch(saveDataStateProvider); if (collection == null) { @@ -34,12 +35,16 @@ class CollectionPane extends ConsumerWidget { onPressed: savingData ? null : () async { + overlayWidget.show(widget: const SavingOverlay()); + await ref .read(collectionStateNotifierProvider.notifier) .saveData(); - sm.hideCurrentSnackBar(); - sm.showSnackBar(getSnackBar("Saved")); + overlayWidget.hide(); + overlayWidget.show(widget: const CompletedOverlay()); + await Future.delayed(const Duration(seconds: 1)); + overlayWidget.hide(); }, icon: const Icon( Icons.save, diff --git a/lib/widgets/overlay_widget.dart b/lib/widgets/overlay_widget.dart new file mode 100644 index 00000000..ab3b5b16 --- /dev/null +++ b/lib/widgets/overlay_widget.dart @@ -0,0 +1,87 @@ +import 'package:flutter/material.dart'; +import 'package:lottie/lottie.dart'; + +import '../consts.dart'; + +class OverlayWidgetTemplate { + OverlayEntry? _overlay; + BuildContext context; + OverlayState? _overlayState; + OverlayWidgetTemplate({required this.context}) { + _overlayState = Overlay.of(context); + } + + void show({required Widget widget}) { + if (_overlay == null) { + _overlay = OverlayEntry( + // replace with your own layout + builder: (context) => ColoredBox( + color: kColorBlack.withOpacity(kOverlayBackgroundOpacity), + child: widget), + ); + _overlayState!.insert(_overlay!); + } + } + + void hide() { + if (_overlay != null) { + _overlay?.remove(); + _overlay = null; + } + } +} + +class SavingOverlay extends StatelessWidget { + const SavingOverlay({super.key}); + + @override + Widget build(BuildContext context) { + return Center( + child: Card( + child: Padding( + padding: kPh60v60, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Lottie.asset("assets/saving.json", width: 100, height: 100), + kHSpacer20, + const Text( + kLabelSaving, + style: TextStyle( + fontSize: kDefaultFontSize, + ), + ) + ], + ), + ), + ), + ); + } +} + +class CompletedOverlay extends StatelessWidget { + const CompletedOverlay({super.key}); + + @override + Widget build(BuildContext context) { + return Center( + child: Card( + child: Padding( + padding: kPh60v60, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Lottie.asset("assets/completed.json", + width: 100, height: 100, repeat: false), + kHSpacer20, + const Text( + kLabelSaved, + style: TextStyle(fontSize: kDefaultFontSize), + ) + ], + ), + ), + ), + ); + } +} From 719b463483b7617592f22c09e19f8104ecc0afa4 Mon Sep 17 00:00:00 2001 From: Tilakraj-B Date: Wed, 20 Mar 2024 20:00:59 +0530 Subject: [PATCH 07/13] Added Tests for the overlay_widget_test.dart --- test/widgets/overlay_widget_test.dart | 58 +++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 test/widgets/overlay_widget_test.dart diff --git a/test/widgets/overlay_widget_test.dart b/test/widgets/overlay_widget_test.dart new file mode 100644 index 00000000..abd68308 --- /dev/null +++ b/test/widgets/overlay_widget_test.dart @@ -0,0 +1,58 @@ +import 'package:apidash/consts.dart'; +import 'package:apidash/widgets/overlay_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:lottie/lottie.dart'; + +void main() { + testWidgets('OverlayWidgetTemplate Test', (WidgetTester tester) async { + late OverlayWidgetTemplate overlayWidget; + + await tester.pumpWidget( + MaterialApp( + home: Builder( + builder: (BuildContext context) { + overlayWidget = OverlayWidgetTemplate(context: context); + return Container(); // Return any widget here, as OverlayWidgetTemplate doesn't return a widget + }, + ), + ), + ); + + overlayWidget.show(widget: const Text('Test')); + await tester.pump(); + expect(find.text('Test'), findsOneWidget); + + overlayWidget.hide(); + await tester.pump(); + expect(find.text('Test'), findsNothing); + }); + + testWidgets('SavingOverlay Test', (WidgetTester tester) async { + await tester.pumpWidget( + const MaterialApp( + home: Scaffold( + body: SavingOverlay(), + ), + ), + ); + + expect(find.byType(Card), findsOneWidget); + expect(find.byType(Lottie), findsOneWidget); + expect(find.text(kLabelSaving), findsOneWidget); + }); + + testWidgets('CompletedOverlay Test', (WidgetTester tester) async { + await tester.pumpWidget( + const MaterialApp( + home: Scaffold( + body: CompletedOverlay(), + ), + ), + ); + + expect(find.byType(Card), findsOneWidget); + expect(find.byType(Lottie), findsOneWidget); + expect(find.text(kLabelSaved), findsOneWidget); + }); +} From 2235a253de087543c8992590e380cd8c75cc9235 Mon Sep 17 00:00:00 2001 From: Tilakraj-B Date: Thu, 21 Mar 2024 01:20:02 +0530 Subject: [PATCH 08/13] Imports Rearranged,Reduced Redundant Widgets and Updated Tests. --- lib/screens/home_page/collection_pane.dart | 16 ++++---- lib/widgets/overlay_widget.dart | 44 ++++++---------------- test/widgets/overlay_widget_test.dart | 12 +++--- 3 files changed, 26 insertions(+), 46 deletions(-) diff --git a/lib/screens/home_page/collection_pane.dart b/lib/screens/home_page/collection_pane.dart index 5e18c002..090e44fa 100644 --- a/lib/screens/home_page/collection_pane.dart +++ b/lib/screens/home_page/collection_pane.dart @@ -1,10 +1,10 @@ -import 'package:apidash/consts.dart'; -import 'package:apidash/models/models.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:apidash/providers/providers.dart'; import 'package:apidash/widgets/overlay_widget.dart'; import 'package:apidash/widgets/widgets.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:apidash/models/models.dart'; +import 'package:apidash/consts.dart'; class CollectionPane extends ConsumerWidget { const CollectionPane({ @@ -35,14 +35,16 @@ class CollectionPane extends ConsumerWidget { onPressed: savingData ? null : () async { - overlayWidget.show(widget: const SavingOverlay()); + overlayWidget.show( + widget: + const SavingOverlay(saveCompleted: false)); await ref .read(collectionStateNotifierProvider.notifier) .saveData(); - overlayWidget.hide(); - overlayWidget.show(widget: const CompletedOverlay()); + overlayWidget.show( + widget: const SavingOverlay(saveCompleted: true)); await Future.delayed(const Duration(seconds: 1)); overlayWidget.hide(); }, diff --git a/lib/widgets/overlay_widget.dart b/lib/widgets/overlay_widget.dart index ab3b5b16..2eafc9c1 100644 --- a/lib/widgets/overlay_widget.dart +++ b/lib/widgets/overlay_widget.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:lottie/lottie.dart'; - import '../consts.dart'; class OverlayWidgetTemplate { @@ -32,7 +31,8 @@ class OverlayWidgetTemplate { } class SavingOverlay extends StatelessWidget { - const SavingOverlay({super.key}); + final bool saveCompleted; + const SavingOverlay({super.key, required this.saveCompleted}); @override Widget build(BuildContext context) { @@ -43,11 +43,16 @@ class SavingOverlay extends StatelessWidget { child: Column( mainAxisSize: MainAxisSize.min, children: [ - Lottie.asset("assets/saving.json", width: 100, height: 100), + Lottie.asset( + saveCompleted + ? "assets/completed.json" + : "assets/saving.json", + width: 100, + height: 100), kHSpacer20, - const Text( - kLabelSaving, - style: TextStyle( + Text( + saveCompleted ? kLabelSaved : kLabelSaving, + style: const TextStyle( fontSize: kDefaultFontSize, ), ) @@ -58,30 +63,3 @@ class SavingOverlay extends StatelessWidget { ); } } - -class CompletedOverlay extends StatelessWidget { - const CompletedOverlay({super.key}); - - @override - Widget build(BuildContext context) { - return Center( - child: Card( - child: Padding( - padding: kPh60v60, - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Lottie.asset("assets/completed.json", - width: 100, height: 100, repeat: false), - kHSpacer20, - const Text( - kLabelSaved, - style: TextStyle(fontSize: kDefaultFontSize), - ) - ], - ), - ), - ), - ); - } -} diff --git a/test/widgets/overlay_widget_test.dart b/test/widgets/overlay_widget_test.dart index abd68308..288c4798 100644 --- a/test/widgets/overlay_widget_test.dart +++ b/test/widgets/overlay_widget_test.dart @@ -32,25 +32,25 @@ void main() { await tester.pumpWidget( const MaterialApp( home: Scaffold( - body: SavingOverlay(), + body: SavingOverlay( + saveCompleted: false, + ), ), ), ); - expect(find.byType(Card), findsOneWidget); expect(find.byType(Lottie), findsOneWidget); expect(find.text(kLabelSaving), findsOneWidget); - }); - testWidgets('CompletedOverlay Test', (WidgetTester tester) async { await tester.pumpWidget( const MaterialApp( home: Scaffold( - body: CompletedOverlay(), + body: SavingOverlay( + saveCompleted: true, + ), ), ), ); - expect(find.byType(Card), findsOneWidget); expect(find.byType(Lottie), findsOneWidget); expect(find.text(kLabelSaved), findsOneWidget); From 5e63a8a9429fa6f7f285082ca1d9cfff93840954 Mon Sep 17 00:00:00 2001 From: Tilakraj-B <91954236+Tilakraj-B@users.noreply.github.com> Date: Thu, 21 Mar 2024 01:32:42 +0530 Subject: [PATCH 09/13] Update consts.dart --- lib/consts.dart | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/consts.dart b/lib/consts.dart index f6ebd6e3..af6fcb29 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -1,10 +1,9 @@ -import 'dart:convert'; import 'dart:io'; - -import 'package:davi/davi.dart'; +import 'dart:convert'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; +import 'package:davi/davi.dart'; const kDiscordUrl = "https://bit.ly/heyfoss"; const kGitUrl = "https://github.com/foss42/apidash"; From 4495e0f2fbc3f578341718dc1b1178539840948c Mon Sep 17 00:00:00 2001 From: Ankit Mahato Date: Thu, 21 Mar 2024 02:07:34 +0530 Subject: [PATCH 10/13] minor fix --- lib/screens/home_page/collection_pane.dart | 1 - lib/widgets/widgets.dart | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/screens/home_page/collection_pane.dart b/lib/screens/home_page/collection_pane.dart index 090e44fa..fd0b518a 100644 --- a/lib/screens/home_page/collection_pane.dart +++ b/lib/screens/home_page/collection_pane.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:apidash/providers/providers.dart'; -import 'package:apidash/widgets/overlay_widget.dart'; import 'package:apidash/widgets/widgets.dart'; import 'package:apidash/models/models.dart'; import 'package:apidash/consts.dart'; diff --git a/lib/widgets/widgets.dart b/lib/widgets/widgets.dart index bb54b3ff..e4e842fb 100644 --- a/lib/widgets/widgets.dart +++ b/lib/widgets/widgets.dart @@ -13,6 +13,7 @@ export 'intro_message.dart'; export 'json_previewer.dart'; export 'markdown.dart'; export 'menus.dart'; +export 'overlay_widget.dart'; export 'previewer.dart'; export 'request_widgets.dart'; export 'response_widgets.dart'; From 0c5a7d152dd929030034fe051814d7671da91f25 Mon Sep 17 00:00:00 2001 From: Ankit Mahato Date: Thu, 21 Mar 2024 02:15:25 +0530 Subject: [PATCH 11/13] Asset file constants --- lib/consts.dart | 5 +++++ lib/widgets/intro_message.dart | 2 +- lib/widgets/overlay_widget.dart | 4 +--- lib/widgets/response_widgets.dart | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/consts.dart b/lib/consts.dart index af6fcb29..a8828cf8 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -10,6 +10,11 @@ const kGitUrl = "https://github.com/foss42/apidash"; const kIssueUrl = "$kGitUrl/issues"; const kDefaultUri = "api.apidash.dev"; +const kAssetIntroMd = "assets/intro.md"; +const kAssetSendingLottie = "assets/sending.json"; +const kAssetSavingLottie = "assets/saving.json"; +const kAssetSavedLottie = "assets/completed.json"; + final kIsMacOS = !kIsWeb && Platform.isMacOS; final kIsWindows = !kIsWeb && Platform.isWindows; final kIsLinux = !kIsWeb && Platform.isLinux; diff --git a/lib/widgets/intro_message.dart b/lib/widgets/intro_message.dart index 7e7ff2e0..e4e4f49a 100644 --- a/lib/widgets/intro_message.dart +++ b/lib/widgets/intro_message.dart @@ -16,7 +16,7 @@ class IntroMessage extends StatelessWidget { late final String version; Future introData() async { - text = await rootBundle.loadString('assets/intro.md'); + text = await rootBundle.loadString(kAssetIntroMd); version = (await PackageInfo.fromPlatform()).version; } diff --git a/lib/widgets/overlay_widget.dart b/lib/widgets/overlay_widget.dart index 2eafc9c1..ed800521 100644 --- a/lib/widgets/overlay_widget.dart +++ b/lib/widgets/overlay_widget.dart @@ -44,9 +44,7 @@ class SavingOverlay extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ Lottie.asset( - saveCompleted - ? "assets/completed.json" - : "assets/saving.json", + saveCompleted ? kAssetSavedLottie : kAssetSavingLottie, width: 100, height: 100), kHSpacer20, diff --git a/lib/widgets/response_widgets.dart b/lib/widgets/response_widgets.dart index adf74985..e641b03d 100644 --- a/lib/widgets/response_widgets.dart +++ b/lib/widgets/response_widgets.dart @@ -42,7 +42,7 @@ class SendingWidget extends StatelessWidget { child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Lottie.asset("assets/sending.json"), + Lottie.asset(kAssetSendingLottie), ], ), ); From fd03e704b2669f7f055d574234f46cc565681f6d Mon Sep 17 00:00:00 2001 From: Yousef Rabia <78663127+Yousef-Rabia@users.noreply.github.com> Date: Thu, 21 Mar 2024 02:03:00 +0200 Subject: [PATCH 12/13] Add Android Additional Instructions --- CONTRIBUTING.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 211eaf06..ec24ec76 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -131,6 +131,19 @@ Instead of copy pasting from pub.dev, it is recommended that you use `flutter pu ## Platform-specific Additional Instructions +### Android +Add the `multiDexEnabled true` line to the `defaultConfig` section at `android/app/build.gradle file` + +``` +android { + ... + defaultConfig { + ... + multiDexEnabled true + } +} +``` + ### macOS Add below keys to `macos/Runner/DebugProfile.entitlements` and `macos/Runner/Release.entitlements`. From a076a7a6cb3de4bb640a1d4e38091c1a2b7dd502 Mon Sep 17 00:00:00 2001 From: Ankit Mahato Date: Thu, 21 Mar 2024 23:28:24 +0530 Subject: [PATCH 13/13] Update CONTRIBUTING.md --- CONTRIBUTING.md | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ec24ec76..32f79e5c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -131,19 +131,6 @@ Instead of copy pasting from pub.dev, it is recommended that you use `flutter pu ## Platform-specific Additional Instructions -### Android -Add the `multiDexEnabled true` line to the `defaultConfig` section at `android/app/build.gradle file` - -``` -android { - ... - defaultConfig { - ... - multiDexEnabled true - } -} -``` - ### macOS Add below keys to `macos/Runner/DebugProfile.entitlements` and `macos/Runner/Release.entitlements`. @@ -167,4 +154,16 @@ ClientException with SocketException: Connection failed (OS Error: Operation not You can read more [here](https://docs.flutter.dev/platform-integration/macos/building#setting-up-entitlements) +### Android (Work in Progress) +Add the `multiDexEnabled true` line to the `defaultConfig` section at `android/app/build.gradle file` + +``` +android { + ... + defaultConfig { + ... + multiDexEnabled true + } +} +```