From 981328d7021aab2a85487030b0cffef6483d60a4 Mon Sep 17 00:00:00 2001 From: DenserMeerkat Date: Fri, 1 Mar 2024 20:09:23 +0530 Subject: [PATCH] fix: nav bar selectedIcon, color --- lib/screens/mobile/bottom_navbar.dart | 9 +++++++-- lib/screens/mobile/dashboard.dart | 1 + lib/widgets/request_widgets.dart | 9 --------- lib/widgets/response_widgets.dart | 8 ++++---- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/lib/screens/mobile/bottom_navbar.dart b/lib/screens/mobile/bottom_navbar.dart index 29f381f9..6649b20a 100644 --- a/lib/screens/mobile/bottom_navbar.dart +++ b/lib/screens/mobile/bottom_navbar.dart @@ -17,7 +17,12 @@ class BottomNavBar extends ConsumerWidget { width: MediaQuery.of(context).size.width, padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom), decoration: BoxDecoration( - color: Theme.of(context).colorScheme.onInverseSurface, + border: Border( + top: BorderSide( + color: Theme.of(context).colorScheme.onInverseSurface, + ), + ), + color: Theme.of(context).colorScheme.surface, ), child: Material( type: MaterialType.transparency, @@ -121,7 +126,7 @@ Widget customNavigationDestination( onTap?.call(); }, child: Icon( - icon, + isSelected ? selectedIcon : icon, color: isSelected ? Theme.of(context).colorScheme.onSecondaryContainer : Theme.of(context).colorScheme.onSurface.withOpacity(0.65), diff --git a/lib/screens/mobile/dashboard.dart b/lib/screens/mobile/dashboard.dart index c15bf5ae..6117926d 100644 --- a/lib/screens/mobile/dashboard.dart +++ b/lib/screens/mobile/dashboard.dart @@ -117,6 +117,7 @@ class _MobileDashboardState extends ConsumerState { right: 0, height: 70 + MediaQuery.of(context).padding.bottom, duration: const Duration(milliseconds: 200), + curve: Curves.easeOut, child: const BottomNavBar(), ), ], diff --git a/lib/widgets/request_widgets.dart b/lib/widgets/request_widgets.dart index aa0af323..aff482ee 100644 --- a/lib/widgets/request_widgets.dart +++ b/lib/widgets/request_widgets.dart @@ -115,12 +115,3 @@ class _RequestPaneState extends State super.dispose(); } } - -class ViewCodeButton extends StatelessWidget { - const ViewCodeButton({super.key}); - - @override - Widget build(BuildContext context) { - return Container(); - } -} diff --git a/lib/widgets/response_widgets.dart b/lib/widgets/response_widgets.dart index 539a2a34..efa1f888 100644 --- a/lib/widgets/response_widgets.dart +++ b/lib/widgets/response_widgets.dart @@ -73,8 +73,8 @@ class ResponsePaneHeader extends StatelessWidget { Text.rich( TextSpan( children: [ - const TextSpan( - text: "Response (", + TextSpan( + text: !kIsMobile ? "Response (" : "", ), TextSpan( text: "$responseStatus", @@ -86,8 +86,8 @@ class ResponsePaneHeader extends StatelessWidget { fontFamily: kCodeStyle.fontFamily, ), ), - const TextSpan( - text: ")", + TextSpan( + text: !kIsMobile ? ")" : "", ), ], style: Theme.of(context).textTheme.titleMedium,