Skip to content

Commit 0884a14

Browse files
animatoranimator
committed
Code cleanup & Refactoring
1 parent 19c8406 commit 0884a14

File tree

10 files changed

+103
-114
lines changed

10 files changed

+103
-114
lines changed

‎lib/consts.dart‎

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ const kForegroundOpacity = 0.05;
5656
const kOverlayBackgroundOpacity = 0.5;
5757

5858
const kTextStyleButton = TextStyle(fontWeight: FontWeight.bold);
59+
const kTextStyleTab = TextStyle(fontSize: 14);
5960
const kTextStyleButtonSmall = TextStyle(fontSize: 12);
6061
const kFormDataButtonLabelTextStyle = TextStyle(
6162
fontSize: 12,
@@ -71,9 +72,13 @@ const kP5 = EdgeInsets.all(5);
7172
const kP8 = EdgeInsets.all(8);
7273
const kPs8 = EdgeInsets.only(left: 8);
7374
const kPs2 = EdgeInsets.only(left: 2);
75+
const kPe8 = EdgeInsets.only(right: 8.0);
7476
const kPh20v5 = EdgeInsets.symmetric(horizontal: 20, vertical: 5);
7577
const kPh20v10 = EdgeInsets.symmetric(horizontal: 20, vertical: 10);
7678
const kP10 = EdgeInsets.all(10);
79+
const kPv8 = EdgeInsets.symmetric(vertical: 8);
80+
const kPv2 = EdgeInsets.symmetric(vertical: 2);
81+
const kPh2 = EdgeInsets.symmetric(horizontal: 2);
7782
const kPt24o8 = EdgeInsets.only(top: 24, left: 8.0, right: 8.0, bottom: 8.0);
7883
const kPt5o10 =
7984
EdgeInsets.only(left: 10.0, right: 10.0, top: 5.0, bottom: 10.0);
@@ -105,8 +110,6 @@ const kPb10 = EdgeInsets.only(
105110
const kPb15 = EdgeInsets.only(
106111
bottom: 15,
107112
);
108-
const kPr8CollectionPane = EdgeInsets.only(right: 8.0);
109-
const kpsV5 = EdgeInsets.symmetric(vertical: 2);
110113
const kHSpacer4 = SizedBox(width: 4);
111114
const kHSpacer5 = SizedBox(width: 5);
112115
const kHSpacer10 = SizedBox(width: 10);
@@ -118,7 +121,7 @@ const kVSpacer20 = SizedBox(height: 20);
118121
const kVSpacer40 = SizedBox(height: 40);
119122

120123
const kTabAnimationDuration = Duration(milliseconds: 200);
121-
const kTabHeight = 45.0;
124+
const kTabHeight = 32.0;
122125
const kHeaderHeight = 32.0;
123126
const kSegmentHeight = 24.0;
124127
const kTextButtonMinWidth = 44.0;
@@ -537,3 +540,36 @@ const kLabelSave = "Save";
537540
const kLabelDownload = "Download";
538541
const kLabelSaving = "Saving";
539542
const kLabelSaved = "Saved";
543+
// Request Pane
544+
const kLabelRequest = "Request";
545+
const kLabelHideCode = "Hide Code";
546+
const kLabelViewCode = "View Code";
547+
const kLabelURLParams = "URL Params";
548+
const kLabelHeaders = "Headers";
549+
const kLabelBody = "Body";
550+
const kNameCheckbox = "Checkbox";
551+
const kNameURLParam = "URL Parameter";
552+
const kNameHeader = "Header Name";
553+
const kNameValue = "Value";
554+
const kNameField = "Field";
555+
const kHintAddURLParam = "Add URL Parameter";
556+
const kHintAddValue = "Add Value";
557+
const kHintAddName = "Add Name";
558+
const kHintAddFieldName = "Add Field Name";
559+
const kLabelAddParam = "Add Param";
560+
const kLabelAddHeader = "Add Header";
561+
const kLabelSelectFile = "Select File";
562+
const kLabelAddFormField = "Add Form Field";
563+
// Response Pane
564+
const kLabelNotSent = "Not Sent";
565+
const kLabelResponse = "Response";
566+
const kLabelResponseBody = "Response Body";
567+
const kTooltipClearResponse = "Clear Response";
568+
const kHeaderRow = ["Header Name", "Header Value"];
569+
const kLabelRequestHeaders = "Request Headers";
570+
const kLabelResponseHeaders = "Response Headers";
571+
const kLabelItems = "items";
572+
const kMsgError = "Error: Response data does not exist.";
573+
const kMsgNullBody = "Response body is missing (null).";
574+
const kMsgNoContent = "No content";
575+
const kMsgUnknowContentType = "Unknown Response Content-Type";

‎lib/screens/home_page/collection_pane.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class CollectionPane extends ConsumerWidget {
2626
crossAxisAlignment: CrossAxisAlignment.stretch,
2727
children: [
2828
Padding(
29-
padding: kPr8CollectionPane,
29+
padding: kPe8,
3030
child: Wrap(
3131
alignment: WrapAlignment.spaceBetween,
3232
children: [
@@ -115,7 +115,7 @@ class _RequestListState extends ConsumerState<RequestList> {
115115
thumbVisibility: alwaysShowCollectionPaneScrollbar ? true : null,
116116
radius: const Radius.circular(12),
117117
child: ReorderableListView.builder(
118-
padding: kPr8CollectionPane,
118+
padding: kPe8,
119119
scrollController: controller,
120120
buildDefaultDragHandles: false,
121121
itemCount: requestSequence.length,

‎lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
5252
rows: formRows,
5353
columns: [
5454
DaviColumn(
55-
cellPadding: kpsV5,
56-
name: 'Key',
55+
cellPadding: kPv2,
56+
name: kNameField,
5757
grow: 4,
5858
cellBuilder: (_, row) {
5959
int idx = row.index;
@@ -63,7 +63,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
6363
child: FormDataField(
6464
keyId: "$selectedId-$idx-form-v-$seed",
6565
initialValue: formRows[idx].name,
66-
hintText: " Add Key",
66+
hintText: kHintAddFieldName,
6767
onChanged: (value) {
6868
formRows[idx] = formRows[idx].copyWith(name: value);
6969
if (isLast && !isAddingRow) {
@@ -93,7 +93,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
9393
),
9494
DaviColumn(
9595
width: 40,
96-
cellPadding: kpsV5,
96+
cellPadding: kPv2,
9797
cellAlignment: Alignment.center,
9898
cellBuilder: (_, row) {
9999
return Text(
@@ -103,9 +103,9 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
103103
},
104104
),
105105
DaviColumn(
106-
name: 'Value',
106+
name: kNameValue,
107107
grow: 4,
108-
cellPadding: kpsV5,
108+
cellPadding: kPv2,
109109
cellBuilder: (_, row) {
110110
int idx = row.index;
111111
bool isLast = idx + 1 == formRows.length;
@@ -145,7 +145,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
145145
(formRows[idx].type == FormDataType.file &&
146146
formRows[idx].value.isNotEmpty)
147147
? formRows[idx].value.toString()
148-
: "Select File",
148+
: kLabelSelectFile,
149149
textAlign: TextAlign.center,
150150
overflow: TextOverflow.ellipsis,
151151
style: kFormDataButtonLabelTextStyle,
@@ -159,7 +159,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
159159
: CellField(
160160
keyId: "$selectedId-$idx-form-v-$seed",
161161
initialValue: formRows[idx].value,
162-
hintText: " Add Value",
162+
hintText: kHintAddValue,
163163
onChanged: (value) {
164164
formRows[idx] = formRows[idx].copyWith(value: value);
165165
if (isLast && !isAddingRow) {
@@ -231,7 +231,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
231231
},
232232
icon: const Icon(Icons.add),
233233
label: const Text(
234-
"Add Form Data",
234+
kLabelAddFormField,
235235
style: kTextStyleButton,
236236
),
237237
),

‎lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
5959
rows: headerRows,
6060
columns: [
6161
DaviColumn(
62-
name: 'Checkbox',
62+
name: kNameCheckbox,
6363
width: 30,
6464
cellBuilder: (_, row) {
6565
int idx = row.index;
@@ -80,7 +80,7 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
8080
},
8181
),
8282
DaviColumn(
83-
name: 'Header Name',
83+
name: kNameHeader,
8484
width: 70,
8585
grow: 1,
8686
cellBuilder: (_, row) {
@@ -89,7 +89,7 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
8989
return HeaderField(
9090
keyId: "$selectedId-$idx-headers-k-$seed",
9191
initialValue: headerRows[idx].name,
92-
hintText: "Add Header Name",
92+
hintText: kHintAddName,
9393
onChanged: (value) {
9494
headerRows[idx] = headerRows[idx].copyWith(name: value);
9595
if (isLast && !isAddingRow) {
@@ -115,15 +115,15 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
115115
},
116116
),
117117
DaviColumn(
118-
name: 'Header Value',
118+
name: kNameValue,
119119
grow: 1,
120120
cellBuilder: (_, row) {
121121
int idx = row.index;
122122
bool isLast = idx + 1 == headerRows.length;
123123
return CellField(
124124
keyId: "$selectedId-$idx-headers-v-$seed",
125125
initialValue: headerRows[idx].value,
126-
hintText: " Add Header Value",
126+
hintText: kHintAddValue,
127127
onChanged: (value) {
128128
headerRows[idx] = headerRows[idx].copyWith(value: value);
129129
if (isLast && !isAddingRow) {
@@ -202,7 +202,7 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
202202
},
203203
icon: const Icon(Icons.add),
204204
label: const Text(
205-
"Add Header",
205+
kLabelAddHeader,
206206
style: kTextStyleButton,
207207
),
208208
),

‎lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
5959
rows: paramRows,
6060
columns: [
6161
DaviColumn(
62-
name: 'Checkbox',
62+
name: kNameCheckbox,
6363
width: 30,
6464
cellBuilder: (_, row) {
6565
int idx = row.index;
@@ -80,7 +80,7 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
8080
},
8181
),
8282
DaviColumn(
83-
name: 'URL Parameter',
83+
name: kNameURLParam,
8484
width: 70,
8585
grow: 1,
8686
cellBuilder: (_, row) {
@@ -89,7 +89,7 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
8989
return CellField(
9090
keyId: "$selectedId-$idx-params-k-$seed",
9191
initialValue: paramRows[idx].name,
92-
hintText: "Add URL Parameter",
92+
hintText: kHintAddURLParam,
9393
onChanged: (value) {
9494
paramRows[idx] = paramRows[idx].copyWith(name: value);
9595
if (isLast && !isAddingRow) {
@@ -115,15 +115,15 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
115115
},
116116
),
117117
DaviColumn(
118-
name: 'Value',
118+
name: kNameValue,
119119
grow: 1,
120120
cellBuilder: (_, row) {
121121
int idx = row.index;
122122
bool isLast = idx + 1 == paramRows.length;
123123
return CellField(
124124
keyId: "$selectedId-$idx-params-v-$seed",
125125
initialValue: paramRows[idx].value,
126-
hintText: "Add Value",
126+
hintText: kHintAddValue,
127127
onChanged: (value) {
128128
paramRows[idx] = paramRows[idx].copyWith(value: value);
129129
if (isLast && !isAddingRow) {
@@ -202,7 +202,7 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
202202
},
203203
icon: const Icon(Icons.add),
204204
label: const Text(
205-
"Add Param",
205+
kLabelAddParam,
206206
style: kTextStyleButton,
207207
),
208208
),

‎lib/screens/home_page/editor_pane/details_card/response_pane.dart‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class ResponseDetails extends ConsumerWidget {
3434

3535
@override
3636
Widget build(BuildContext context, WidgetRef ref) {
37-
var sm = ScaffoldMessenger.of(context);
3837
final responseStatus = ref.watch(
3938
selectedRequestModelProvider.select((value) => value?.responseStatus));
4039
final message = ref
@@ -52,8 +51,6 @@ class ResponseDetails extends ConsumerWidget {
5251
ref
5352
.read(collectionStateNotifierProvider.notifier)
5453
.clearResponse(selectedRequest?.id);
55-
sm.hideCurrentSnackBar();
56-
sm.showSnackBar(getSnackBar('Response cleared'));
5754
},
5855
),
5956
const Expanded(

‎lib/widgets/buttons.dart‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -246,15 +246,12 @@ class ClearResponseButton extends StatelessWidget {
246246

247247
@override
248248
Widget build(BuildContext context) {
249-
return Tooltip(
250-
message: 'Clear response',
251-
child: TextButton(
252-
style: TextButton.styleFrom(minimumSize: const Size(40, 40)),
253-
onPressed: onPressed,
254-
child: const Icon(
255-
Icons.delete,
256-
size: 20,
257-
),
249+
return IconButton(
250+
tooltip: kTooltipClearResponse,
251+
onPressed: onPressed,
252+
icon: const Icon(
253+
Icons.delete,
254+
size: 16,
258255
),
259256
);
260257
}

‎lib/widgets/request_widgets.dart‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,12 @@ class _RequestPaneState extends State<RequestPane>
4848
return Column(
4949
children: [
5050
Padding(
51-
padding: kPh20v10,
51+
padding: kP8,
5252
child: SizedBox(
5353
height: kHeaderHeight,
5454
child: Row(
55-
mainAxisAlignment: MainAxisAlignment.spaceBetween,
55+
mainAxisAlignment: MainAxisAlignment.end,
5656
children: [
57-
Text(
58-
"Request",
59-
style: Theme.of(context).textTheme.titleMedium,
60-
),
6157
FilledButton.tonalIcon(
6258
onPressed: widget.onPressedCodeButton,
6359
icon: Icon(
@@ -68,7 +64,8 @@ class _RequestPaneState extends State<RequestPane>
6864
label: SizedBox(
6965
width: 75,
7066
child: Text(
71-
widget.codePaneVisible ? "Hide Code" : "View Code"),
67+
widget.codePaneVisible ? kLabelHideCode : kLabelViewCode,
68+
),
7269
),
7370
),
7471
],
@@ -79,18 +76,19 @@ class _RequestPaneState extends State<RequestPane>
7976
key: Key(widget.selectedId!),
8077
controller: _controller,
8178
overlayColor: kColorTransparentState,
79+
labelPadding: kPh2,
8280
onTap: widget.onTapTabBar,
8381
tabs: [
8482
TabLabel(
85-
text: 'URL Params',
83+
text: kLabelURLParams,
8684
showIndicator: widget.showIndicators[0],
8785
),
8886
TabLabel(
89-
text: 'Headers',
87+
text: kLabelHeaders,
9088
showIndicator: widget.showIndicators[1],
9189
),
9290
TabLabel(
93-
text: 'Body',
91+
text: kLabelBody,
9492
showIndicator: widget.showIndicators[2],
9593
),
9694
],

0 commit comments

Comments
 (0)