From dc48fa6c003f5953ae15e3da9ea15c8da07a9934 Mon Sep 17 00:00:00 2001 From: venbaittech Date: Fri, 17 Oct 2025 15:31:50 +0530 Subject: [PATCH] custom_drawe_changes --- assets/logos/fcscDark.png | Bin 0 -> 5462 bytes .../drawer_routes/custom_drawer_routes.dart | 311 +++++++++++------- 2 files changed, 190 insertions(+), 121 deletions(-) create mode 100644 assets/logos/fcscDark.png diff --git a/assets/logos/fcscDark.png b/assets/logos/fcscDark.png new file mode 100644 index 0000000000000000000000000000000000000000..f01097d580565190cf860fbb7784393d170a37bd GIT binary patch literal 5462 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 literal 0 HcmV?d00001 diff --git a/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart b/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart index f2d04081..0fc700c6 100644 --- a/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart +++ b/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart @@ -1137,134 +1137,203 @@ class _BaseScaffoldState extends ConsumerState { Expanded( child: ListView( children: [ + // DrawerHeader( + // child: Column( + // mainAxisAlignment: MainAxisAlignment.spaceEvenly, + // crossAxisAlignment: CrossAxisAlignment.stretch, + // children: [ + // Row( + // children: [ + // SizedBox( + // width: mywidth / 8, + // child: Image( + // image: AssetImage('assets/logos/fcsc.png'), + // ), + // ), + // ], + // ), + // Divider(thickness: 1, color: Colors.grey), + // InkWell( + // onTap: () { + // if (userId != 'guest') context.go('/editProfile'); + // }, + // child: Row( + // children: [ + // SizedBox( + // width: mywidth / 8, + // height: mywidth / 8, + // child: ClipOval( + // child: _avatarUrl.isNotEmpty + // ? Image( + // image: NetworkImage(_avatarUrl), + // fit: BoxFit.cover, + // width: double.infinity, + // height: double.infinity, + // ) + // : Image( + // image: AssetImage( + // 'assets/edit_profile/profile.jpg', + // ), + // fit: BoxFit.cover, + // width: double.infinity, + // height: double.infinity, + // ), + // ), + // //child: Image(image: AssetImage('assets/edit_profile/profile.png')) + // ), + // SizedBox( + // width: mywidth / 20, + // ), + // Expanded( + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // if (userId == "guest") ...[ + // Text( + // userName ?? 'Guest User', + // style: TextStyle( + // color: isDarkTheme + // ? Color(0xFFAAAAAA) + // : null, + // ), + // ), + // ] else ...[ + // Text( + // userName ?? 'Loading...', + // style: TextStyle( + // color: isDarkTheme + // ? Color(0xFFAAAAAA) + // : null, + // ), + // ), + // Tooltip( + // message: userEmail ?? + // 'Loading...', // Shows full email on hover + // child: SizedBox( + // width: MediaQuery.of(context) + // .size + // .width * + // 0.6, // Adjust width as needed + // child: Text( + // userEmail ?? 'Loading...', + // style: TextStyle( + // fontSize: 12, + // color: isDarkTheme + // ? Color(0xFFAAAAAA) + // : null, + // fontFamily: context.translate( + // 'Roboto', + // 'NotoKufi', + // ), + // ), + // // softWrap: true, + // overflow: TextOverflow.ellipsis, + // maxLines: 1, + // ), + // ), + // ), + // ], + // ], + // ), + // ), + // ], + // ), + // ), + // ], + // ), + // ), DrawerHeader( - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Row( + child: LayoutBuilder( + builder: (context, constraints) { + final width = constraints.maxWidth; + final avatarSize = + width < 600 ? 50.0 : 60.0; // adjust for iPad/tablet + final spacing = width < 600 ? 8.0 : 12.0; + + return Column( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - SizedBox( - width: mywidth / 8, - child: Image( - image: AssetImage('assets/logos/fcsc.png'), + Row( + children: [ + SizedBox( + width: + avatarSize, // fixed size instead of mywidth / 8 + child: isDarkTheme + ? Image.asset('assets/logos/fcscDark.png') + : Image.asset('assets/logos/fcsc.png'), + ), + ], + ), + Divider(thickness: 1, color: Colors.grey), + InkWell( + onTap: () { + if (userId != 'guest') + context.go('/editProfile'); + }, + child: Row( + children: [ + ClipOval( + child: _avatarUrl.isNotEmpty + ? Image.network( + _avatarUrl, + fit: BoxFit.cover, + width: avatarSize, + height: avatarSize, + ) + : Image.asset( + 'assets/edit_profile/profile.jpg', + fit: BoxFit.cover, + width: avatarSize, + height: avatarSize, + ), + ), + SizedBox(width: spacing), + Expanded( + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Text( + userName ?? + (userId == "guest" + ? 'Guest User' + : 'Loading...'), + style: TextStyle( + color: isDarkTheme + ? Color(0xFFAAAAAA) + : null, + ), + ), + if (userId != "guest") + Tooltip( + message: userEmail ?? 'Loading...', + child: Text( + userEmail ?? 'Loading...', + style: TextStyle( + fontSize: 12, + color: isDarkTheme + ? Color(0xFFAAAAAA) + : null, + fontFamily: context.translate( + 'Roboto', 'NotoKufi'), + ), + overflow: TextOverflow.ellipsis, + maxLines: 1, + ), + ), + ], + ), + ), + ], ), ), ], - ), - Divider(thickness: 1, color: Colors.grey), - InkWell( - onTap: () { - if (userId != 'guest') context.go('/editProfile'); - }, - child: Row( - children: [ - SizedBox( - width: mywidth / 8, - height: mywidth / 8, - child: ClipOval( - child: _avatarUrl.isNotEmpty - ? Image( - image: NetworkImage(_avatarUrl), - fit: BoxFit.cover, - width: double.infinity, - height: double.infinity, - ) - : Image( - image: AssetImage( - 'assets/edit_profile/profile.jpg', - ), - fit: BoxFit.cover, - width: double.infinity, - height: double.infinity, - ), - ), - //child: Image(image: AssetImage('assets/edit_profile/profile.png')) - ), - SizedBox( - width: mywidth / 20, - ), - // Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // // Text(userId ?? 'Loading user...'), // Display userId here - // // Text('Mohammad@fcsc.com') - // if (userId == "guest") ...[ - // Text(userName ?? 'Guest User'), - // ] else ...[ - // Text(userName ?? 'Loading...'), - // Tooltip( - // message: userEmail ?? 'Loading...', - // child: Text( - // userEmail ?? 'Loading...', - // style: TextStyle(fontSize: 12), - // softWrap: true, - // maxLines: 1, - // overflow: TextOverflow.ellipsis, - // ), - // ), - // - // ] - // ], - // ), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (userId == "guest") ...[ - Text( - userName ?? 'Guest User', - style: TextStyle( - color: isDarkTheme - ? Color(0xFFAAAAAA) - : null, - ), - ), - ] else ...[ - Text( - userName ?? 'Loading...', - style: TextStyle( - color: isDarkTheme - ? Color(0xFFAAAAAA) - : null, - ), - ), - Tooltip( - message: userEmail ?? - 'Loading...', // Shows full email on hover - child: SizedBox( - width: MediaQuery.of(context) - .size - .width * - 0.6, // Adjust width as needed - child: Text( - userEmail ?? 'Loading...', - style: TextStyle( - fontSize: 12, - color: isDarkTheme - ? Color(0xFFAAAAAA) - : null, - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - ), - // softWrap: true, - overflow: TextOverflow.ellipsis, - maxLines: 1, - ), - ), - ), - ], - ], - ), - ), - ], - ), - ), - ], + ); + }, ), ), + if (userId != 'guest') ListTile( leading: Icon(Icons.notifications_none,