From 86c796985da4eaf92bc935a8e39c1f0e50c2b5f6 Mon Sep 17 00:00:00 2001 From: Ankit Mahato Date: Mon, 17 Apr 2023 21:44:02 +0530 Subject: [PATCH] Dark mode adaptive icons --- lib/consts.dart | 12 ++++++++++++ .../details_card/request_pane/request_headers.dart | 13 +++++-------- .../details_card/request_pane/request_params.dart | 12 +++++------- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/lib/consts.dart b/lib/consts.dart index bbe53eef..393cf0ed 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -70,6 +70,18 @@ const kTableThemeData = DaviThemeData( ), ); +const kIconRemoveDark = Icon( + Icons.remove_circle, + size: 16, + color: Color(0xffcf6679), +); + +final kIconRemoveLight = Icon( + Icons.remove_circle, + size: 16, + color: Colors.red.withOpacity(0.9), +); + const kCodePreviewLinesLimit = 500; const kCodeCharsPerLineLimit = 200; diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart index f33ef418..56ee65b3 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart @@ -108,7 +108,6 @@ class EditRequestHeadersState extends ConsumerState { final length = ref.watch(collectionStateNotifierProvider .select((value) => value![idIdx].requestHeaders?.length)); rows = collection[idIdx].requestHeaders ?? [const KVRow("", "")]; - DaviModel model = DaviModel( rows: rows, columns: [ @@ -120,7 +119,7 @@ class EditRequestHeadersState extends ConsumerState { ), DaviColumn( width: 30, - cellBuilder: (BuildContext context, DaviRow row) { + cellBuilder: (_, row) { return Text( "=", style: kCodeStyle, @@ -136,13 +135,11 @@ class EditRequestHeadersState extends ConsumerState { DaviColumn( pinStatus: PinStatus.none, width: 30, - cellBuilder: (BuildContext context, DaviRow row) { + cellBuilder: (_, row) { return InkWell( - child: Icon( - Icons.remove_circle, - size: 16, - color: Colors.red.withOpacity(0.9), - ), + child: Theme.of(context).brightness == Brightness.dark + ? kIconRemoveDark + : kIconRemoveLight, onTap: () { rows.removeAt(row.index); seed = random.nextInt(kRandMax); diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart index bda6f06c..dfa7b9de 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart @@ -121,7 +121,7 @@ class EditRequestURLParamsState extends ConsumerState { ), DaviColumn( width: 30, - cellBuilder: (BuildContext context, DaviRow row) { + cellBuilder: (_, row) { return Text( "=", style: kCodeStyle, @@ -137,13 +137,11 @@ class EditRequestURLParamsState extends ConsumerState { DaviColumn( pinStatus: PinStatus.none, width: 30, - cellBuilder: (BuildContext context, DaviRow row) { + cellBuilder: (_, row) { return InkWell( - child: Icon( - Icons.remove_circle, - size: 16, - color: Colors.red.withOpacity(0.9), - ), + child: Theme.of(context).brightness == Brightness.dark + ? kIconRemoveDark + : kIconRemoveLight, onTap: () { rows.removeAt(row.index); seed = random.nextInt(kRandMax);