flutter/apidash
1
0
Fork 0
mirror of https://github.com/foss42/apidash.git synced 2025-12-02 02:39:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: refactor code highlighting and add scripts editor pane

Browse Source 
- replace `flutter_highlighter` and `highlighter` with `flutter_highlight` and `highlight`.
- add `flutter_code_editor` dependency.
- introduce a new scripts editor pane in the REST request view.
This commit is contained in:
Udhay-Adithya
2025-04-22 14:34:43 +05:30
parent ef3867ef43
commit 346e4c3ef0
8 changed files with 182 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/dashbot/widgets/content_renderer.dart
View File

@@ -1,8 +1,8 @@
// lib/dashbot/widgets/content_renderer.dart
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_highlighter/flutter_highlighter.dart';
import 'package:flutter_highlighter/themes/monokai-sublime.dart';
import 'package:flutter_highlight/flutter_highlight.dart';
import 'package:flutter_highlight/themes/monokai-sublime.dart';
import 'package:flutter_markdown/flutter_markdown.dart';
Widget renderContent(BuildContext context, String text) {

3
lib/screens/home_page/editor_pane/details_card/request_pane/request_pane_rest.dart
View File

@@ -1,4 +1,5 @@
import 'package:apidash/consts.dart';
import 'package:apidash/screens/home_page/editor_pane/details_card/request_pane/scripts_code_pane.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:apidash/providers/providers.dart';
@@ -56,7 +57,7 @@ class EditRestRequestPane extends ConsumerWidget {
EditRequestURLParams(),
EditRequestHeaders(),
EditRequestBody(),
SizedBox.shrink(),
ScriptsCodePane(),
],
);
}

81
lib/screens/home_page/editor_pane/details_card/request_pane/scripts_code_pane.dart Normal file
View File

@@ -0,0 +1,81 @@
import 'package:apidash/widgets/scripts_editor_pane.dart';
import 'package:flutter/material.dart';
import 'package:flutter_code_editor/flutter_code_editor.dart';
import 'package:highlight/languages/javascript.dart';
class ScriptsCodePane extends StatefulWidget {
const ScriptsCodePane({super.key});
@override
State<ScriptsCodePane> createState() => _ScriptsCodePaneState();
}
class _ScriptsCodePaneState extends State<ScriptsCodePane> {
int _selectedTabIndex = 0;
final preReqCodeController = CodeController(
text: '// Use javascript to modify this request dynamically',
language: javascript,
);
final postResCodeController = CodeController(
text: '...',
language: javascript,
);
@override
Widget build(BuildContext context) {
final tabs = ["Pre-Req", "Post-Res"];
final content = [
ScriptsEditorPane(
controller: preReqCodeController,
),
ScriptsEditorPane(
controller: postResCodeController,
),
];
return Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
width: 100,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
for (int i = 0; i < tabs.length; i++)
ListTile(
dense: true,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(2),
),
selectedTileColor: _selectedTabIndex == i
? Theme.of(context).colorScheme.secondaryFixed
: Theme.of(context).colorScheme.surface,
title: Text(
tabs[i],
style: TextStyle(
fontSize: 12,
),
),
selected: _selectedTabIndex == i,
onTap: () {
setState(() {
_selectedTabIndex = i;
});
},
),
],
),
),
const VerticalDivider(width: 1),
Expanded(
child: Container(
color: Theme.of(context).colorScheme.surfaceContainerLowest,
child: content[_selectedTabIndex],
),
),
],
);
}
}

2
lib/widgets/previewer_code.dart
View File

@@ -1,7 +1,7 @@
import 'package:apidash_core/apidash_core.dart';
import 'package:flutter/material.dart';
import 'package:highlighter/highlighter.dart' show highlight, Node;
import 'package:apidash/consts.dart';
import 'package:highlight/highlight.dart';
import 'error_message.dart';
(String, bool) sanitize(String input) {

2
lib/widgets/previewer_codegen.dart
View File

@@ -1,8 +1,8 @@
import 'package:apidash_design_system/apidash_design_system.dart';
import 'package:flutter/material.dart';
import 'package:highlighter/highlighter.dart' show highlight;
import 'package:apidash/consts.dart';
import 'package:apidash/utils/utils.dart';
import 'package:highlight/highlight.dart';
import 'button_copy.dart';
import 'button_save_download.dart';
import 'button_share.dart';

44
lib/widgets/scripts_editor_pane.dart Normal file
View File

@@ -0,0 +1,44 @@
import 'package:apidash/providers/settings_providers.dart';
import 'package:flutter/material.dart';
import 'package:flutter_code_editor/flutter_code_editor.dart';
import 'package:flutter_highlight/themes/monokai.dart';
import 'package:flutter_highlight/themes/xcode.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
class ScriptsEditorPane extends ConsumerStatefulWidget {
final CodeController controller;
const ScriptsEditorPane({super.key, required this.controller});
@override
ConsumerState<ScriptsEditorPane> createState() => _ScriptsEditorPaneState();
}
class _ScriptsEditorPaneState extends ConsumerState<ScriptsEditorPane> {
@override
Widget build(BuildContext context) {
final settings = ref.watch(settingsProvider);
return CodeTheme(
data: CodeThemeData(
styles: settings.isDark ? monokaiTheme : xcodeTheme,
),
child: SingleChildScrollView(
child: CodeField(
smartDashesType: SmartDashesType.enabled,
smartQuotesType: SmartQuotesType.enabled,
background: Theme.of(context).colorScheme.surfaceContainerLowest,
gutterStyle: GutterStyle(
width: 40, // TODO: Fix numbers size
margin: 2,
textAlign: TextAlign.left,
),
cursorColor: Theme.of(context).colorScheme.primary,
controller: widget.controller,
textStyle: TextStyle(
fontSize: 12,
fontFamily: 'monospace',
),
),
),
);
}
}