Resolves #2 Double click to rename requests

This commit is contained in:
Ankit Mahato
2023-04-24 00:54:45 +05:30
parent 8e5c88cc33
commit a55f918cd6
4 changed files with 99 additions and 17 deletions

View File

@ -10,6 +10,8 @@ class RequestModel {
required this.id, required this.id,
this.method = kDefaultHttpMethod, this.method = kDefaultHttpMethod,
this.url = "", this.url = "",
this.name = "",
this.description = "",
this.requestTabIndex = 0, this.requestTabIndex = 0,
this.requestHeaders, this.requestHeaders,
this.requestParams, this.requestParams,
@ -23,6 +25,8 @@ class RequestModel {
final String id; final String id;
final HTTPVerb method; final HTTPVerb method;
final String url; final String url;
final String name;
final String description;
final int requestTabIndex; final int requestTabIndex;
final List<KVRow>? requestHeaders; final List<KVRow>? requestHeaders;
final List<KVRow>? requestParams; final List<KVRow>? requestParams;
@ -39,6 +43,8 @@ class RequestModel {
id: id, id: id,
method: method, method: method,
url: url, url: url,
name: name,
description: description,
requestHeaders: requestHeaders, requestHeaders: requestHeaders,
requestParams: requestParams, requestParams: requestParams,
requestBodyContentType: requestBodyContentType, requestBodyContentType: requestBodyContentType,
@ -50,6 +56,8 @@ class RequestModel {
String? id, String? id,
HTTPVerb? method, HTTPVerb? method,
String? url, String? url,
String? name,
String? description,
int? requestTabIndex, int? requestTabIndex,
List<KVRow>? requestHeaders, List<KVRow>? requestHeaders,
List<KVRow>? requestParams, List<KVRow>? requestParams,
@ -63,6 +71,8 @@ class RequestModel {
id: id ?? this.id, id: id ?? this.id,
method: method ?? this.method, method: method ?? this.method,
url: url ?? this.url, url: url ?? this.url,
name: name ?? this.name,
description: description ?? this.description,
requestTabIndex: requestTabIndex ?? this.requestTabIndex, requestTabIndex: requestTabIndex ?? this.requestTabIndex,
requestHeaders: requestHeaders ?? this.requestHeaders, requestHeaders: requestHeaders ?? this.requestHeaders,
requestParams: requestParams ?? this.requestParams, requestParams: requestParams ?? this.requestParams,
@ -87,6 +97,8 @@ class RequestModel {
method = kDefaultHttpMethod; method = kDefaultHttpMethod;
} }
final url = data["url"] as String; final url = data["url"] as String;
final name = data["name"] as String?;
final description = data["description"] as String?;
final requestHeaders = data["requestHeaders"]; final requestHeaders = data["requestHeaders"];
final requestParams = data["requestParams"]; final requestParams = data["requestParams"];
try { try {
@ -110,6 +122,8 @@ class RequestModel {
id: id, id: id,
method: method, method: method,
url: url, url: url,
name: name ?? "",
description: description ?? "",
requestTabIndex: 0, requestTabIndex: 0,
requestHeaders: requestHeaders != null requestHeaders: requestHeaders != null
? mapToRows(Map<String, String>.from(requestHeaders)) ? mapToRows(Map<String, String>.from(requestHeaders))
@ -130,6 +144,8 @@ class RequestModel {
"id": id, "id": id,
"method": method.name, "method": method.name,
"url": url, "url": url,
"name": name,
"description": description,
"requestHeaders": rowsToMap(requestHeaders), "requestHeaders": rowsToMap(requestHeaders),
"requestParams": rowsToMap(requestParams), "requestParams": rowsToMap(requestParams),
"requestBodyContentType": requestBodyContentType.name, "requestBodyContentType": requestBodyContentType.name,
@ -146,6 +162,8 @@ class RequestModel {
"Request Id: $id", "Request Id: $id",
"Request Method: ${method.name}", "Request Method: ${method.name}",
"Request URL: $url", "Request URL: $url",
"Request Name: $name",
"Request Description: $description",
"Request Tab Index: ${requestTabIndex.toString()}", "Request Tab Index: ${requestTabIndex.toString()}",
"Request Headers: ${requestHeaders.toString()}", "Request Headers: ${requestHeaders.toString()}",
"Request Params: ${requestParams.toString()}", "Request Params: ${requestParams.toString()}",

View File

@ -24,6 +24,7 @@ class ThemeStateNotifier extends StateNotifier<bool> {
} }
final activeIdStateProvider = StateProvider<String?>((ref) => null); final activeIdStateProvider = StateProvider<String?>((ref) => null);
final activeIdEditStateProvider = StateProvider<String?>((ref) => null);
final sentRequestIdStateProvider = StateProvider<String?>((ref) => null); final sentRequestIdStateProvider = StateProvider<String?>((ref) => null);
final codePaneVisibleStateProvider = StateProvider<bool>((ref) => false); final codePaneVisibleStateProvider = StateProvider<bool>((ref) => false);
final saveDataStateProvider = StateProvider<bool>((ref) => false); final saveDataStateProvider = StateProvider<bool>((ref) => false);
@ -102,6 +103,8 @@ class CollectionStateNotifier extends StateNotifier<List<RequestModel>?> {
String id, { String id, {
HTTPVerb? method, HTTPVerb? method,
String? url, String? url,
String? name,
String? description,
int? requestTabIndex, int? requestTabIndex,
List<KVRow>? requestHeaders, List<KVRow>? requestHeaders,
List<KVRow>? requestParams, List<KVRow>? requestParams,
@ -115,6 +118,8 @@ class CollectionStateNotifier extends StateNotifier<List<RequestModel>?> {
final newModel = state![idx].copyWith( final newModel = state![idx].copyWith(
method: method, method: method,
url: url, url: url,
name: name,
description: description,
requestTabIndex: requestTabIndex, requestTabIndex: requestTabIndex,
requestHeaders: requestHeaders, requestHeaders: requestHeaders,
requestParams: requestParams, requestParams: requestParams,

View File

@ -175,15 +175,33 @@ class _RequestItemState extends ConsumerState<RequestItem> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final activeRequestId = ref.watch(activeIdStateProvider); final activeRequestId = ref.watch(activeIdStateProvider);
final editRequestId = ref.watch(activeIdEditStateProvider);
return SidebarRequestCard( return SidebarRequestCard(
id: widget.id, id: widget.id,
activeRequestId: activeRequestId,
url: widget.requestModel.url,
method: widget.requestModel.method, method: widget.requestModel.method,
name: widget.requestModel.name,
url: widget.requestModel.url,
activeRequestId: activeRequestId,
editRequestId: editRequestId,
onTap: () { onTap: () {
ref.read(activeIdStateProvider.notifier).update((state) => widget.id); ref.read(activeIdStateProvider.notifier).update((state) => widget.id);
}, },
onDoubleTap: () {
ref.read(activeIdStateProvider.notifier).update((state) => widget.id);
ref
.read(activeIdEditStateProvider.notifier)
.update((state) => widget.id);
},
onChangedNameEditor: (value) {
value = value.trim();
ref
.read(collectionStateNotifierProvider.notifier)
.update(editRequestId!, name: value);
},
onTapOutsideNameEditor: () {
ref.read(activeIdEditStateProvider.notifier).update((state) => null);
},
onMenuSelected: (RequestItemMenuOption item) { onMenuSelected: (RequestItemMenuOption item) {
if (item == RequestItemMenuOption.delete) { if (item == RequestItemMenuOption.delete) {
ref.read(activeIdStateProvider.notifier).update((state) => null); ref.read(activeIdStateProvider.notifier).update((state) => null);

View File

@ -8,18 +8,28 @@ class SidebarRequestCard extends StatefulWidget {
const SidebarRequestCard({ const SidebarRequestCard({
super.key, super.key,
required this.id, required this.id,
required this.activeRequestId,
required this.url,
required this.method, required this.method,
this.name,
this.url,
this.activeRequestId,
this.editRequestId,
this.onTap, this.onTap,
this.onDoubleTap,
this.onChangedNameEditor,
this.onTapOutsideNameEditor,
this.onMenuSelected, this.onMenuSelected,
}); });
final String id; final String id;
final String? activeRequestId; final String? name;
final String url; final String? url;
final HTTPVerb method; final HTTPVerb method;
final String? activeRequestId;
final String? editRequestId;
final void Function()? onTap; final void Function()? onTap;
final void Function()? onDoubleTap;
final Function(String)? onChangedNameEditor;
final Function()? onTapOutsideNameEditor;
final Function(RequestItemMenuOption)? onMenuSelected; final Function(RequestItemMenuOption)? onMenuSelected;
@override @override
@ -30,17 +40,29 @@ class _SidebarRequestCardState extends State<SidebarRequestCard> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final Color color = Theme.of(context).colorScheme.surface; final Color color = Theme.of(context).colorScheme.surface;
final Color colorVariant =
Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.5);
final Color surfaceTint = Theme.of(context).colorScheme.primary; final Color surfaceTint = Theme.of(context).colorScheme.primary;
bool isActiveId = widget.activeRequestId == widget.id; bool isActiveId = widget.activeRequestId == widget.id;
return Material( bool inEditMode = widget.editRequestId == widget.id;
borderRadius: kBorderRadius12, return Card(
shape: const RoundedRectangleBorder(
borderRadius: kBorderRadius12,
),
elevation: isActiveId ? 1 : 0, elevation: isActiveId ? 1 : 0,
surfaceTintColor: isActiveId ? surfaceTint : null, surfaceTintColor: isActiveId ? surfaceTint : null,
color: color, color: isActiveId
type: MaterialType.card, ? Theme.of(context).colorScheme.brightness == Brightness.dark
? colorVariant
: color
: color,
margin: EdgeInsets.zero,
child: InkWell( child: InkWell(
borderRadius: kBorderRadius12, borderRadius: kBorderRadius12,
onTap: widget.onTap, hoverColor: colorVariant,
focusColor: colorVariant.withOpacity(0.5),
onTap: inEditMode ? null : widget.onTap,
onDoubleTap: inEditMode ? null : widget.onDoubleTap,
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 10, left: 10,
@ -55,14 +77,33 @@ class _SidebarRequestCardState extends State<SidebarRequestCard> {
MethodBox(method: widget.method), MethodBox(method: widget.method),
kHSpacer5, kHSpacer5,
Expanded( Expanded(
child: Text( child: inEditMode
getRequestTitleFromUrl(widget.url), ? TextFormField(
softWrap: false, initialValue: widget.name,
overflow: TextOverflow.fade, autofocus: true,
), style: Theme.of(context).textTheme.bodyMedium,
onTapOutside: (_) {
widget.onTapOutsideNameEditor?.call();
FocusScope.of(context).unfocus();
},
onChanged: widget.onChangedNameEditor,
decoration: const InputDecoration(
isCollapsed: true,
contentPadding: EdgeInsets.zero,
border: InputBorder.none,
),
)
: Text(
(widget.name != null &&
widget.name!.trim().isNotEmpty)
? widget.name!
: getRequestTitleFromUrl(widget.url),
softWrap: false,
overflow: TextOverflow.fade,
),
), ),
Visibility( Visibility(
visible: isActiveId, visible: isActiveId && !inEditMode,
child: RequestCardMenu( child: RequestCardMenu(
onSelected: widget.onMenuSelected, onSelected: widget.onMenuSelected,
), ),