Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 44 additions & 27 deletions lib/screens/home_page/editor_pane/editor_request.dart
Original file line number Diff line number Diff line change
@@ -1,42 +1,59 @@
import 'package:apidash_design_system/apidash_design_system.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:apidash/consts.dart';
import 'package:apidash/providers/providers.dart';
import 'details_card/details_card.dart';
import 'details_card/request_pane/request_pane.dart';
import 'request_editor_top_bar.dart';
import 'url_card.dart';

class RequestEditor extends StatelessWidget {
class RequestEditor extends ConsumerWidget {
const RequestEditor({super.key});

@override
Widget build(BuildContext context) {
return context.isMediumWindow
? const Padding(
padding: kPb10,
child: Column(
children: [
kVSpacer20,
Expanded(
child: EditRequestPane(
showViewCodeButton: false,
),
Widget build(BuildContext context, WidgetRef ref) {
final sendRequestShortcut = kIsMacOS
? const SingleActivator(LogicalKeyboardKey.enter, meta: true)
: const SingleActivator(LogicalKeyboardKey.enter, control: true);

return CallbackShortcuts(
bindings: <ShortcutActivator, VoidCallback>{
sendRequestShortcut: () {
ref.read(collectionStateNotifierProvider.notifier).sendRequest();
},
},
child: Focus(
autofocus: true,
child: context.isMediumWindow
? const Padding(
padding: kPb10,
child: Column(
children: [
kVSpacer20,
Expanded(
child: EditRequestPane(
showViewCodeButton: false,
),
),
],
),
],
),
)
: Padding(
padding: kIsMacOS || kIsWindows ? kPt28o8 : kP8,
child: const Column(
children: [
RequestEditorTopBar(),
EditorPaneRequestURLCard(),
kVSpacer10,
Expanded(
child: EditorPaneRequestDetailsCard(),
)
: Padding(
padding: kIsMacOS || kIsWindows ? kPt28o8 : kP8,
child: const Column(
children: [
RequestEditorTopBar(),
EditorPaneRequestURLCard(),
kVSpacer10,
Expanded(
child: EditorPaneRequestDetailsCard(),
),
],
),
],
),
);
),
),
);
}
}
96 changes: 56 additions & 40 deletions lib/screens/mobile/requests_page/request_response_page.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:apidash_design_system/apidash_design_system.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:apidash/providers/providers.dart';
import 'package:apidash/utils/http_utils.dart';
Expand Down Expand Up @@ -31,48 +32,63 @@ class _RequestResponsePageState extends ConsumerState<RequestResponsePage>
ref.watch(selectedRequestModelProvider.select((value) => value?.name)));
final TabController requestTabController =
useTabController(initialLength: 3, vsync: this);
return DrawerSplitView(
scaffoldKey: kHomeScaffoldKey,
title: Row(
children: [
APITypeDropdown(),
Expanded(
child: EditorTitle(
title: name,
onSelected: (ItemMenuOption item) {
if (item == ItemMenuOption.edit) {
showRenameDialog(context, "Rename Request", name, (val) {
ref
.read(collectionStateNotifierProvider.notifier)
.update(name: val);
});
}
if (item == ItemMenuOption.delete) {
ref.read(collectionStateNotifierProvider.notifier).remove();
}
if (item == ItemMenuOption.duplicate) {
ref
.read(collectionStateNotifierProvider.notifier)
.duplicate();
}
},
),
final sendRequestShortcut = kIsMacOS
? const SingleActivator(LogicalKeyboardKey.enter, meta: true)
: const SingleActivator(LogicalKeyboardKey.enter, control: true);
return CallbackShortcuts(
bindings: <ShortcutActivator, VoidCallback>{
sendRequestShortcut: () {
ref.read(collectionStateNotifierProvider.notifier).sendRequest();
},
},
child: Focus(
autofocus: true,
child: DrawerSplitView(
scaffoldKey: kHomeScaffoldKey,
title: Row(
children: [
APITypeDropdown(),
Expanded(
child: EditorTitle(
title: name,
onSelected: (ItemMenuOption item) {
if (item == ItemMenuOption.edit) {
showRenameDialog(context, "Rename Request", name, (val) {
ref
.read(collectionStateNotifierProvider.notifier)
.update(name: val);
});
}
if (item == ItemMenuOption.delete) {
ref
.read(collectionStateNotifierProvider.notifier)
.remove();
}
if (item == ItemMenuOption.duplicate) {
ref
.read(collectionStateNotifierProvider.notifier)
.duplicate();
}
},
),
),
],
),
],
),
leftDrawerContent: const CollectionPane(),
actions: const [kHSpacer12],
mainContent: id == null
? const RequestEditorDefault()
: RequestTabs(
controller: requestTabController,
showDashbot: ref.watch(dashbotShowMobileProvider),
),
bottomNavigationBar: RequestResponsePageBottombar(
requestTabController: requestTabController,
leftDrawerContent: const CollectionPane(),
actions: const [kHSpacer12],
mainContent: id == null
? const RequestEditorDefault()
: RequestTabs(
controller: requestTabController,
showDashbot: ref.watch(dashbotShowMobileProvider),
),
bottomNavigationBar: RequestResponsePageBottombar(
requestTabController: requestTabController,
),
onDrawerChanged: (value) =>
ref.read(leftDrawerStateProvider.notifier).state = value,
),
),
onDrawerChanged: (value) =>
ref.read(leftDrawerStateProvider.notifier).state = value,
);
}
}