From e5c2864b4071b17d24916ae1ebf1eb17fb6bd39e Mon Sep 17 00:00:00 2001 From: FlashOnFire_ Date: Thu, 21 Dec 2023 21:26:55 +0100 Subject: [PATCH] Colloscope icon --- .../extensions/functionalities_extension.dart | 7 ++++--- .../screens/colloscope/colloscope_export.dart | 1 - .../colloscope_bottom_nav_bar_icon.dart | 20 +++++++++++++++++++ .../colloscope/widgets/colloscope_export.dart | 1 + apps/onyx/lib/screens/izly/izly_export.dart | 4 ++-- ...get.dart => izly_bottom_nav_bar_icon.dart} | 4 ++-- 6 files changed, 29 insertions(+), 8 deletions(-) delete mode 100644 apps/onyx/lib/screens/colloscope/colloscope_export.dart create mode 100644 apps/onyx/lib/screens/colloscope/widgets/colloscope_bottom_nav_bar_icon.dart create mode 100644 apps/onyx/lib/screens/colloscope/widgets/colloscope_export.dart rename apps/onyx/lib/screens/izly/widgets/{izly_bottom_nav_bar_icon_widget.dart => izly_bottom_nav_bar_icon.dart} (76%) diff --git a/apps/onyx/lib/core/extensions/functionalities_extension.dart b/apps/onyx/lib/core/extensions/functionalities_extension.dart index 667fef7d..d2c4701f 100644 --- a/apps/onyx/lib/core/extensions/functionalities_extension.dart +++ b/apps/onyx/lib/core/extensions/functionalities_extension.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:onyx/core/res.dart'; import 'package:onyx/screens/agenda/agenda_export.dart'; import 'package:onyx/screens/colloscope/pages/colloscope_page.dart'; +import 'package:onyx/screens/colloscope/widgets/colloscope_bottom_nav_bar_icon.dart'; import 'package:onyx/screens/izly/izly_export.dart'; import 'package:onyx/screens/mails/mails_export.dart'; import 'package:onyx/screens/map/map_export.dart'; @@ -45,7 +46,7 @@ extension FunctionalitiesExtention on Functionalities { case Functionalities.settings: return Icons.settings_rounded; case Functionalities.colloscope: - return Icons.settings_rounded; + return Icons.school_rounded; } } @@ -79,11 +80,11 @@ extension FunctionalitiesExtention on Functionalities { case Functionalities.map: return MapBottomNavBarIcon(selected: selected); case Functionalities.izly: - return IzlyBottomNavBarIconWidget(selected: selected); + return IzlyBottomNavBarIcon(selected: selected); case Functionalities.settings: return SettingsBottomNavBarIcon(selected: selected); case Functionalities.colloscope: - return SettingsBottomNavBarIcon(selected: selected); + return ColloscopeBottomNavBarIcon(selected: selected); } } diff --git a/apps/onyx/lib/screens/colloscope/colloscope_export.dart b/apps/onyx/lib/screens/colloscope/colloscope_export.dart deleted file mode 100644 index 18f014be..00000000 --- a/apps/onyx/lib/screens/colloscope/colloscope_export.dart +++ /dev/null @@ -1 +0,0 @@ -export 'pages/colloscope_page.dart'; diff --git a/apps/onyx/lib/screens/colloscope/widgets/colloscope_bottom_nav_bar_icon.dart b/apps/onyx/lib/screens/colloscope/widgets/colloscope_bottom_nav_bar_icon.dart new file mode 100644 index 00000000..39947177 --- /dev/null +++ b/apps/onyx/lib/screens/colloscope/widgets/colloscope_bottom_nav_bar_icon.dart @@ -0,0 +1,20 @@ +import 'package:flutter/material.dart'; + +class ColloscopeBottomNavBarIcon extends StatelessWidget { + const ColloscopeBottomNavBarIcon({super.key, required this.selected}); + + final bool selected; + + @override + Widget build(BuildContext context) { + return FittedBox( + fit: BoxFit.fitHeight, + child: Icon( + Icons.school_rounded, + color: selected + ? Theme.of(context).bottomNavigationBarTheme.selectedItemColor + : Theme.of(context).bottomNavigationBarTheme.unselectedItemColor, + ), + ); + } +} diff --git a/apps/onyx/lib/screens/colloscope/widgets/colloscope_export.dart b/apps/onyx/lib/screens/colloscope/widgets/colloscope_export.dart new file mode 100644 index 00000000..8b0f2577 --- /dev/null +++ b/apps/onyx/lib/screens/colloscope/widgets/colloscope_export.dart @@ -0,0 +1 @@ +export '../pages/colloscope_page.dart'; diff --git a/apps/onyx/lib/screens/izly/izly_export.dart b/apps/onyx/lib/screens/izly/izly_export.dart index ed427f2a..0ab71905 100644 --- a/apps/onyx/lib/screens/izly/izly_export.dart +++ b/apps/onyx/lib/screens/izly/izly_export.dart @@ -1,14 +1,14 @@ export 'logic/izly_logic.dart'; export 'pages/izly_login_page.dart'; export 'pages/izly_page.dart'; +export 'pages/izly_payment_history.dart'; export 'pages/izly_recharge_cb_page.dart'; export 'pages/izly_recharge_page.dart'; export 'pages/izly_recharge_tiers_page.dart'; export 'pages/izly_recharge_transfer_page.dart'; export 'pages/izly_working_page.dart'; -export 'pages/izly_payment_history.dart'; export 'states/izly_cubit.dart'; -export 'widgets/izly_bottom_nav_bar_icon_widget.dart'; +export 'widgets/izly_bottom_nav_bar_icon.dart'; export 'widgets/izly_rechage_card_widget.dart'; export 'widgets/izly_recharge_amount_widget.dart'; export 'widgets/izly_recharge_header_widget.dart'; diff --git a/apps/onyx/lib/screens/izly/widgets/izly_bottom_nav_bar_icon_widget.dart b/apps/onyx/lib/screens/izly/widgets/izly_bottom_nav_bar_icon.dart similarity index 76% rename from apps/onyx/lib/screens/izly/widgets/izly_bottom_nav_bar_icon_widget.dart rename to apps/onyx/lib/screens/izly/widgets/izly_bottom_nav_bar_icon.dart index 9b17ed2c..71822d25 100644 --- a/apps/onyx/lib/screens/izly/widgets/izly_bottom_nav_bar_icon_widget.dart +++ b/apps/onyx/lib/screens/izly/widgets/izly_bottom_nav_bar_icon.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -class IzlyBottomNavBarIconWidget extends StatelessWidget { - const IzlyBottomNavBarIconWidget({super.key, required this.selected}); +class IzlyBottomNavBarIcon extends StatelessWidget { + const IzlyBottomNavBarIcon({super.key, required this.selected}); final bool selected; @override