From 5ea8f0121791dbb674a98ede0eb3fc1613633fba Mon Sep 17 00:00:00 2001 From: Ankit Mahato Date: Sat, 11 Mar 2023 07:11:03 +0530 Subject: [PATCH] Reorganize presentation layer --- lib/consts.dart | 28 ++++++++++++++++++ .../home_page}/collection_pane.dart | 9 +++--- .../details_card}/details_card.dart | 6 ++-- .../request_pane}/request_body.dart | 5 ++-- .../request_pane}/request_headers.dart | 6 ++-- .../request_pane}/request_pane.dart | 4 +-- .../request_pane}/request_params.dart | 6 ++-- .../response_pane}/response_details.dart | 9 +++--- .../response_pane}/response_pane.dart | 4 +-- .../home_page/editor_pane}/editor_pane.dart | 8 ++--- .../home_page}/editor_pane/url_card.dart | 7 ++--- lib/screens/{ => home_page}/home_page.dart | 4 ++- lib/screens/screens.dart | 2 +- lib/widgets/styles.dart | 29 ------------------- lib/widgets/widgets.dart | 3 -- 15 files changed, 62 insertions(+), 68 deletions(-) rename lib/{widgets => screens/home_page}/collection_pane.dart (97%) rename lib/{widgets/editor_pane => screens/home_page/editor_pane/details_card}/details_card.dart (92%) rename lib/{widgets/editor_pane => screens/home_page/editor_pane/details_card/request_pane}/request_body.dart (97%) rename lib/{widgets/editor_pane => screens/home_page/editor_pane/details_card/request_pane}/request_headers.dart (97%) rename lib/{widgets/editor_pane => screens/home_page/editor_pane/details_card/request_pane}/request_pane.dart (96%) rename lib/{widgets/editor_pane => screens/home_page/editor_pane/details_card/request_pane}/request_params.dart (97%) rename lib/{widgets/editor_pane => screens/home_page/editor_pane/details_card/response_pane}/response_details.dart (97%) rename lib/{widgets/editor_pane => screens/home_page/editor_pane/details_card/response_pane}/response_pane.dart (97%) rename lib/{widgets => screens/home_page/editor_pane}/editor_pane.dart (90%) rename lib/{widgets => screens/home_page}/editor_pane/url_card.dart (97%) rename lib/screens/{ => home_page}/home_page.dart (92%) delete mode 100644 lib/widgets/styles.dart delete mode 100644 lib/widgets/widgets.dart diff --git a/lib/consts.dart b/lib/consts.dart index 8c88f09d..54d7bc1e 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -1,4 +1,32 @@ import 'package:flutter/material.dart'; +import 'package:google_fonts/google_fonts.dart'; + +final codeStyle = GoogleFonts.sourceCodePro(); + +const textStyleButton = TextStyle(fontWeight: FontWeight.bold); + +const colorBg = Colors.white; +final colorGrey50 = Colors.grey.shade50; +final colorGrey100 = Colors.grey.shade100; +final colorGrey200 = Colors.grey.shade200; +final colorGrey300 = Colors.grey.shade300; +final colorGrey400 = Colors.grey.shade400; +final colorGrey500 = Colors.grey.shade500; +final colorErrorMsg = colorGrey500; + +final borderRadius10 = BorderRadius.circular(10); +const border12 = BorderRadius.all(Radius.circular(12)); + +const tableContainerDecoration = BoxDecoration( + color: colorBg, + borderRadius: border12, +); + +const p1 = EdgeInsets.all(1); +const p5 = EdgeInsets.all(5); +const p8 = EdgeInsets.all(8); +const ps8 = EdgeInsets.only(left: 8); +const p10 = EdgeInsets.all(10); enum HTTPVerb { get, head, post, put, patch, delete } diff --git a/lib/widgets/collection_pane.dart b/lib/screens/home_page/collection_pane.dart similarity index 97% rename from lib/widgets/collection_pane.dart rename to lib/screens/home_page/collection_pane.dart index e8db9090..0b0292df 100644 --- a/lib/widgets/collection_pane.dart +++ b/lib/screens/home_page/collection_pane.dart @@ -1,10 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../models/models.dart'; -import '../providers/providers.dart'; -import '../utils/utils.dart'; -import 'styles.dart'; -import '../consts.dart'; +import 'package:apidash/providers/providers.dart'; +import 'package:apidash/models/models.dart'; +import 'package:apidash/utils/utils.dart'; +import 'package:apidash/consts.dart'; class CollectionPane extends ConsumerStatefulWidget { const CollectionPane({ diff --git a/lib/widgets/editor_pane/details_card.dart b/lib/screens/home_page/editor_pane/details_card/details_card.dart similarity index 92% rename from lib/widgets/editor_pane/details_card.dart rename to lib/screens/home_page/editor_pane/details_card/details_card.dart index 2cf4668a..17c67189 100644 --- a/lib/widgets/editor_pane/details_card.dart +++ b/lib/screens/home_page/editor_pane/details_card/details_card.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:multi_split_view/multi_split_view.dart'; -import 'request_pane.dart'; -import 'response_pane.dart'; -import '../styles.dart'; +import 'package:apidash/consts.dart'; +import 'request_pane/request_pane.dart'; +import 'response_pane/response_pane.dart'; class EditorPaneRequestDetailsCard extends StatefulWidget { const EditorPaneRequestDetailsCard({super.key}); diff --git a/lib/widgets/editor_pane/request_body.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_body.dart similarity index 97% rename from lib/widgets/editor_pane/request_body.dart rename to lib/screens/home_page/editor_pane/details_card/request_pane/request_body.dart index 64a486ba..ba544de0 100644 --- a/lib/widgets/editor_pane/request_body.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_body.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../../providers/providers.dart'; -import '../styles.dart'; -import '../../consts.dart'; +import 'package:apidash/providers/providers.dart'; +import 'package:apidash/consts.dart'; class EditRequestBody extends StatefulWidget { const EditRequestBody({super.key}); diff --git a/lib/widgets/editor_pane/request_headers.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart similarity index 97% rename from lib/widgets/editor_pane/request_headers.dart rename to lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart index bbc30aa1..a8d92577 100644 --- a/lib/widgets/editor_pane/request_headers.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:davi/davi.dart'; -import '../../models/models.dart'; -import '../../providers/providers.dart'; -import '../styles.dart'; +import 'package:apidash/providers/providers.dart'; +import 'package:apidash/models/models.dart'; +import 'package:apidash/consts.dart'; class EditRequestHeaders extends ConsumerStatefulWidget { const EditRequestHeaders({Key? key}) : super(key: key); diff --git a/lib/widgets/editor_pane/request_pane.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_pane.dart similarity index 96% rename from lib/widgets/editor_pane/request_pane.dart rename to lib/screens/home_page/editor_pane/details_card/request_pane/request_pane.dart index 0e59b97d..598cdb86 100644 --- a/lib/widgets/editor_pane/request_pane.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_pane.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../../providers/providers.dart'; -import '../styles.dart'; +import 'package:apidash/providers/providers.dart'; +import 'package:apidash/consts.dart'; import 'request_headers.dart'; import 'request_params.dart'; import 'request_body.dart'; diff --git a/lib/widgets/editor_pane/request_params.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart similarity index 97% rename from lib/widgets/editor_pane/request_params.dart rename to lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart index 4d89b01c..c1575a81 100644 --- a/lib/widgets/editor_pane/request_params.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:davi/davi.dart'; -import '../../models/models.dart'; -import '../../providers/providers.dart'; -import '../styles.dart'; +import 'package:apidash/providers/providers.dart'; +import 'package:apidash/models/models.dart'; +import 'package:apidash/consts.dart'; class EditRequestURLParams extends ConsumerStatefulWidget { const EditRequestURLParams({Key? key}) : super(key: key); diff --git a/lib/widgets/editor_pane/response_details.dart b/lib/screens/home_page/editor_pane/details_card/response_pane/response_details.dart similarity index 97% rename from lib/widgets/editor_pane/response_details.dart rename to lib/screens/home_page/editor_pane/details_card/response_pane/response_details.dart index 00358d01..5382489a 100644 --- a/lib/widgets/editor_pane/response_details.dart +++ b/lib/screens/home_page/editor_pane/details_card/response_pane/response_details.dart @@ -3,11 +3,10 @@ import 'package:flutter/services.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_json_view/flutter_json_view.dart'; -import '../../models/request_model.dart'; -import '../../providers/providers.dart'; -import '../styles.dart'; -import "../../utils/utils.dart"; -import "../../consts.dart"; +import 'package:apidash/providers/providers.dart'; +import 'package:apidash/models/models.dart'; +import 'package:apidash/utils/utils.dart'; +import 'package:apidash/consts.dart'; final jsonViewTheme = JsonViewTheme( defaultTextStyle: codeStyle, diff --git a/lib/widgets/editor_pane/response_pane.dart b/lib/screens/home_page/editor_pane/details_card/response_pane/response_pane.dart similarity index 97% rename from lib/widgets/editor_pane/response_pane.dart rename to lib/screens/home_page/editor_pane/details_card/response_pane/response_pane.dart index ebd4b16e..6a12333e 100644 --- a/lib/widgets/editor_pane/response_pane.dart +++ b/lib/screens/home_page/editor_pane/details_card/response_pane/response_pane.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../../providers/providers.dart'; -import "../../consts.dart"; +import 'package:apidash/providers/providers.dart'; +import 'package:apidash/consts.dart'; import 'response_details.dart'; class ResponsePane extends ConsumerStatefulWidget { diff --git a/lib/widgets/editor_pane.dart b/lib/screens/home_page/editor_pane/editor_pane.dart similarity index 90% rename from lib/widgets/editor_pane.dart rename to lib/screens/home_page/editor_pane/editor_pane.dart index c1e75199..2b45544f 100644 --- a/lib/widgets/editor_pane.dart +++ b/lib/screens/home_page/editor_pane/editor_pane.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../providers/providers.dart'; -import 'editor_pane/url_card.dart'; -import 'editor_pane/details_card.dart'; -import 'styles.dart'; +import 'package:apidash/providers/providers.dart'; +import 'package:apidash/consts.dart'; +import 'details_card/details_card.dart'; +import 'url_card.dart'; class RequestEditorPane extends ConsumerStatefulWidget { const RequestEditorPane({ diff --git a/lib/widgets/editor_pane/url_card.dart b/lib/screens/home_page/editor_pane/url_card.dart similarity index 97% rename from lib/widgets/editor_pane/url_card.dart rename to lib/screens/home_page/editor_pane/url_card.dart index 6425e073..117d3789 100644 --- a/lib/widgets/editor_pane/url_card.dart +++ b/lib/screens/home_page/editor_pane/url_card.dart @@ -1,9 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../../providers/providers.dart'; -import '../../utils/utils.dart'; -import '../styles.dart'; -import '../../consts.dart'; +import 'package:apidash/providers/providers.dart'; +import 'package:apidash/utils/utils.dart'; +import 'package:apidash/consts.dart'; class EditorPaneRequestURLCard extends StatefulWidget { const EditorPaneRequestURLCard({super.key}); diff --git a/lib/screens/home_page.dart b/lib/screens/home_page/home_page.dart similarity index 92% rename from lib/screens/home_page.dart rename to lib/screens/home_page/home_page.dart index 01df3d8d..b360bdb0 100644 --- a/lib/screens/home_page.dart +++ b/lib/screens/home_page/home_page.dart @@ -1,6 +1,8 @@ import 'package:flutter/material.dart'; import 'package:multi_split_view/multi_split_view.dart'; -import '../widgets/widgets.dart'; +import 'package:apidash/consts.dart'; +import 'editor_pane/editor_pane.dart'; +import 'collection_pane.dart'; class HomePage extends StatefulWidget { const HomePage({Key? key}) : super(key: key); diff --git a/lib/screens/screens.dart b/lib/screens/screens.dart index 6a45182d..e510942e 100644 --- a/lib/screens/screens.dart +++ b/lib/screens/screens.dart @@ -1 +1 @@ -export "home_page.dart"; +export "home_page/home_page.dart"; diff --git a/lib/widgets/styles.dart b/lib/widgets/styles.dart deleted file mode 100644 index 02f8e5b1..00000000 --- a/lib/widgets/styles.dart +++ /dev/null @@ -1,29 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:google_fonts/google_fonts.dart'; - -final codeStyle = GoogleFonts.sourceCodePro(); - -const textStyleButton = TextStyle(fontWeight: FontWeight.bold); - -const colorBg = Colors.white; -final colorGrey50 = Colors.grey.shade50; -final colorGrey100 = Colors.grey.shade100; -final colorGrey200 = Colors.grey.shade200; -final colorGrey300 = Colors.grey.shade300; -final colorGrey400 = Colors.grey.shade400; -final colorGrey500 = Colors.grey.shade500; -final colorErrorMsg = colorGrey500; - -final borderRadius10 = BorderRadius.circular(10); -const border12 = BorderRadius.all(Radius.circular(12)); - -const tableContainerDecoration = BoxDecoration( - color: colorBg, - borderRadius: border12, -); - -const p1 = EdgeInsets.all(1); -const p5 = EdgeInsets.all(5); -const p8 = EdgeInsets.all(8); -const ps8 = EdgeInsets.only(left: 8); -const p10 = EdgeInsets.all(10); diff --git a/lib/widgets/widgets.dart b/lib/widgets/widgets.dart deleted file mode 100644 index aeb6cb19..00000000 --- a/lib/widgets/widgets.dart +++ /dev/null @@ -1,3 +0,0 @@ -export 'editor_pane.dart'; -export 'collection_pane.dart'; -export 'styles.dart';