edit drawer

lib/new_views/common_widgets/app_drawer.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:provider/provider.dart';
 import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
@@ -23,6 +22,7 @@ class AppDrawer extends StatelessWidget {
     final settingProvider = Provider.of<SettingProvider>(context, listen: false);
     final userProvider = Provider.of<UserProvider>(context, listen: false);
     return Drawer(
+      backgroundColor: AppColor.background(context),
       width: MediaQuery.of(context).size.width * .8,
       child: Column(
         mainAxisAlignment: MainAxisAlignment.start,
@@ -35,7 +35,7 @@ class AppDrawer extends StatelessWidget {
               Consumer<UserProvider>(builder: (context, snapshot, _) {
                 return CircleAvatar(
                   radius: 45,
-                  backgroundColor: const Color(0xFFE4E5E6),
+                  backgroundColor: context.isDark ? AppColor.neutral50 : AppColor.neutral40,
                   child: Padding(
                     padding: const EdgeInsets.all(1), // Border radius
                     child: ClipOval(
@@ -52,24 +52,19 @@ class AppDrawer extends StatelessWidget {
                   ),
                 );
               }).onPress(() => Navigator.of(context).pushNamed(ProfilePage.id)),
-              const Icon(Icons.clear).onPress(() => Navigator.of(context).pop())
+              Icon(
+                Icons.clear,
+                size: 32,
+                color: context.isDark ? AppColor.primary40 : Colors.white,
+              ).onPress(() => Navigator.of(context).pop())
             ],
           ),
           8.height,
           (userProvider.user?.username ?? "").heading3(context).custom(fontWeight: FontWeight.w600),
-          if ((userProvider.user?.email ?? "").isNotEmpty) (userProvider.user?.email).heading6(context).custom(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20),
+          if ((userProvider.user?.email ?? "").isNotEmpty) (userProvider.user?.email)?.heading6(context)?.custom(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20),
           18.height,
           const Divider().defaultStyle(context),
           ListView(
-            // "settings" : " Settings",
-            // "ReportBug " : "Report a bug",
-            // "whatsNew" : "What's New",
-            // "logout" : "Logout"
-
-            // "settings" : " الاعدادات",
-            // "ReportBug " "ابلاغ عن خطا",
-            // "whatsNew" : "ماهو الجديد",
-            // "logout" : "خروج"
             padding: const EdgeInsets.only(top: 24),
             children: [
               drawerItem("drawer_notification", context.translation.notifications, context).onPress(() => Navigator.of(context).pushNamed(NotificationsPage.id)),
@@ -85,7 +80,7 @@ class AppDrawer extends StatelessWidget {
               // drawerItem("whats_new", context.translation.whatsNew, context),
             ],
           ).expanded,
-          drawerItem("logout", context.translation.logout, context, color: AppColor.red50).onPress(() async {
+          drawerItem("logout", context.translation.logout, context, color: AppColor.redStatus(context)).onPress(() async {
             bool result = await showDialog(
               context: context,
               builder: (_) => AAlertDialog(title: context.translation.signOut, content: context.translation.logoutAlert),
@@ -106,7 +101,7 @@ class AppDrawer extends StatelessWidget {
             children: [
               Text(
                 "Powered By Cloud Solutions",
-                style: Theme.of(context).textTheme.headline6.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? AppColor.neutral10 : AppColor.neutral50, fontSize: 12),
+                style: AppTextStyles.heading3.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? AppColor.neutral30 : AppColor.neutral50, fontSize: 12),
                 textScaleFactor: AppStyle.getScaleFactor(context),
               ),
               6.width,
@@ -121,18 +116,11 @@ class AppDrawer extends StatelessWidget {
   Widget drawerItem(String icon, String title, BuildContext context, {Color color}) {
     return Row(
       children: [
-        SvgPicture.asset(
+        (icon ?? "").toSvgAsset(width: 24, height: 24, color: color ?? (context.isDark ? AppColor.neutral10 : AppColor.neutral20)),
-          "assets/images/$icon.svg",
-          color: color ?? const Color(0xFF757575),
-          width: 24,
-          height: 24,
-        ),
         16.width,
         Text(
           title,
-          style: AppTextStyles.heading6.copyWith(
+          style: AppTextStyles.heading6.copyWith(color: color ?? (context.isDark ? AppColor.neutral30 : AppColor.neutral50)),
-            color: context.isDark ? AppColor.neutral10 : AppColor.neutral50,
-          ),
         ),
       ],
     );