From 1671d8c5e2e7aa69003668bcbff951b5d62c4e5b Mon Sep 17 00:00:00 2001 From: cp-sneha-s Date: Tue, 5 Mar 2024 16:44:27 +0530 Subject: [PATCH] Reformat and fix lint --- lib/app_router.dart | 156 ++++++++---------- lib/data/configs/theme.dart | 27 +-- lib/main.dart | 12 +- lib/style/app_page.dart | 11 +- lib/style/colors.dart | 13 +- .../forms/form_list/form_list_screen.dart | 1 - .../forms/form_list/widget/form_card.dart | 1 - .../home/home_screen/admin_home_screen.dart | 1 - .../home/home_screen/widget/request_list.dart | 3 +- .../home/invite_member/invite_screen.dart | 1 - .../leaves/details/admin_leave_detail.dart | 1 - .../detail/employee_detail_screen.dart | 24 ++- .../employee_details_leaves_screen.dart | 1 - .../admin_edit_employee_screen.dart | 1 - .../admin/members/list/inivitation_card.dart | 1 - .../members/list/member_list_screen.dart | 7 +- lib/ui/app.dart | 2 +- lib/ui/shared/dashboard/dashboard.dart | 43 +++-- lib/ui/shared/dashboard/navigation_item.dart | 2 +- .../edit_profile/edit_profile_screen.dart | 49 +++--- .../edit_profile/widget/profile_form.dart | 33 ++-- .../widget/basic_detail_section.dart | 3 +- lib/ui/sign_in/sign_in_screen.dart | 1 - .../create_space/create_workspace_screen.dart | 1 - .../space/edit_space/edit_space_screen.dart | 1 - .../space/join_space/join_space_screen.dart | 1 - .../form_list_screen/forms_list_screen.dart | 1 - .../form_list_screen/widget/form_card.dart | 1 - .../home/home_screen/user_home_screen.dart | 1 - .../apply_leave/apply_leave_screen.dart | 1 - .../date_range_selection_leave_request.dart | 7 +- .../widget/leave_request_reason_card.dart | 1 - .../apply_leave/widget/picker_card.dart | 6 +- .../detail/user_leave_detail_screen.dart | 1 - .../bloc/leaves/user_leave_bloc.dart | 1 - .../leaves_screen/user_leave_screen.dart | 1 - .../widget/leave_count_card.dart | 1 - .../detail/user_employee_detail_screen.dart | 1 - .../members_screen/user_members_screen.dart | 1 - lib/ui/widget/employee_card.dart | 4 +- lib/ui/widget/employee_details_textfield.dart | 3 +- lib/ui/widget/error_snack_bar.dart | 5 +- lib/ui/widget/leave_application_card.dart | 6 +- lib/ui/widget/leave_card.dart | 1 - lib/ui/widget/leave_count_view.dart | 1 - ...eave_details_per_day_duration_content.dart | 13 +- .../leave_details_widget/user_content.dart | 3 +- .../pick_user_profile_image.dart | 2 +- lib/ui/widget/space_logo_view.dart | 2 +- lib/ui/widget/user_profile_image.dart | 4 +- 50 files changed, 208 insertions(+), 257 deletions(-) diff --git a/lib/app_router.dart b/lib/app_router.dart index 69c1942b..f5a85230 100644 --- a/lib/app_router.dart +++ b/lib/app_router.dart @@ -1,10 +1,6 @@ import 'package:flutter/cupertino.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; -import 'package:http/http.dart'; import 'package:injectable/injectable.dart'; -import 'package:projectunity/data/bloc/user_state/user_state_controller_bloc.dart'; -import 'package:projectunity/data/di/service_locator.dart'; import 'package:projectunity/ui/admin/forms/form_list/form_list_screen.dart'; import 'package:projectunity/ui/admin/leaves/leave_screen/admin_leaves_screen.dart'; import 'package:projectunity/ui/shared/dashboard/navigation_item.dart'; @@ -50,7 +46,7 @@ class AppRouter { return GoRouter( debugLogDiagnostics: true, errorPageBuilder: (context, state) => - const CupertinoPage(child: PageNotFoundScreen()), + const CupertinoPage(child: PageNotFoundScreen()), refreshListenable: userManager, initialLocation: (userManager.isAdmin || _userManager.isHR) ? Routes.adminHome @@ -62,21 +58,21 @@ class AppRouter { path: Routes.login, name: Routes.login, pageBuilder: (context, state) => - const CupertinoPage(child: SignInPage()), + const CupertinoPage(child: SignInPage()), ), GoRoute( parentNavigatorKey: _rootNavigatorKey, name: Routes.joinSpace, path: Routes.joinSpace, pageBuilder: (context, state) => - const CupertinoPage(child: JoinSpacePage()), + const CupertinoPage(child: JoinSpacePage()), routes: [ GoRoute( parentNavigatorKey: _rootNavigatorKey, name: Routes.createSpace, path: Routes.createSpace, pageBuilder: (context, state) => - const CupertinoPage(child: CreateWorkSpacePage()), + const CupertinoPage(child: CreateWorkSpacePage()), ), ], ), @@ -85,7 +81,6 @@ class AppRouter { builder: (context, state, child) { return DashBoardScreen(tabs: adminTabs, child: child); }, - routes: [ GoRoute( parentNavigatorKey: _adminShellNavigatorKey, @@ -102,55 +97,52 @@ class AppRouter { name: Routes.editSpaceDetails, path: Routes.editSpaceDetails, pageBuilder: (context, state) => - const CupertinoPage(child: EditSpacePage())), + const CupertinoPage(child: EditSpacePage())), GoRoute( parentNavigatorKey: _adminShellNavigatorKey, name: Routes.adminProfile, path: 'profile', pageBuilder: (context, state) => - const CupertinoPage(child: ViewProfilePage()), + const CupertinoPage(child: ViewProfilePage()), routes: [ GoRoute( path: 'edit', name: Routes.adminEditProfile, - pageBuilder: (context, state) => - CupertinoPage( + pageBuilder: (context, state) => CupertinoPage( child: EmployeeEditProfilePage( - employee: _userManager.employee, - ))) + employee: _userManager.employee, + ))) ]), GoRoute( parentNavigatorKey: _adminShellNavigatorKey, name: Routes.adminForms, path: 'forms', pageBuilder: (context, state) => - const CupertinoPage(child: AdminFormListPage()), + const CupertinoPage(child: AdminFormListPage()), routes: [ GoRoute( name: Routes.newForm, path: 'new-form', pageBuilder: (context, state) => - const CupertinoPage( - child: CreateFromPage())), + const CupertinoPage( + child: CreateFromPage())), ]), GoRoute( parentNavigatorKey: _adminShellNavigatorKey, name: Routes.leaveRequestDetail, path: Routes.leaveRequestDetail, - pageBuilder: (context, state) => - CupertinoPage( - child: AdminLeaveDetailsPage( - leaveApplication: + pageBuilder: (context, state) => CupertinoPage( + child: AdminLeaveDetailsPage( + leaveApplication: state.extra as LeaveApplication)), ), GoRoute( parentNavigatorKey: _adminShellNavigatorKey, name: Routes.adminAbsenceDetails, path: 'absence/details', - pageBuilder: (context, state) => - CupertinoPage( - child: AdminLeaveDetailsPage( - leaveApplication: + pageBuilder: (context, state) => CupertinoPage( + child: AdminLeaveDetailsPage( + leaveApplication: state.extra as LeaveApplication)), ) ]), @@ -167,8 +159,7 @@ class AppRouter { GoRoute( name: Routes.hrApplyLeave, path: Routes.hrApplyLeave, - pageBuilder: (context, state) => - const CupertinoPage( + pageBuilder: (context, state) => const CupertinoPage( child: ApplyLeavePage(), ), ), @@ -176,10 +167,9 @@ class AppRouter { parentNavigatorKey: _adminShellNavigatorKey, name: Routes.adminLeaveDetails, path: 'details', - pageBuilder: (context, state) => - CupertinoPage( - child: AdminLeaveDetailsPage( - leaveApplication: + pageBuilder: (context, state) => CupertinoPage( + child: AdminLeaveDetailsPage( + leaveApplication: state.extra as LeaveApplication)), ), ]), @@ -187,17 +177,16 @@ class AppRouter { parentNavigatorKey: _adminShellNavigatorKey, name: Routes.adminMembers, path: Routes.adminMembers, - pageBuilder: (context, state) => - CupertinoPage( - key: ValueKey(userManager.currentSpaceId), - child: const MemberListPage()), + pageBuilder: (context, state) => CupertinoPage( + key: ValueKey(userManager.currentSpaceId), + child: const MemberListPage()), routes: [ GoRoute( path: Routes.inviteMember, name: Routes.inviteMember, parentNavigatorKey: _adminShellNavigatorKey, pageBuilder: (context, state) => - const CupertinoPage(child: InviteMemberPage())), + const CupertinoPage(child: InviteMemberPage())), GoRoute( parentNavigatorKey: _adminShellNavigatorKey, name: Routes.adminMemberDetails, @@ -228,27 +217,25 @@ class AppRouter { CupertinoPage( child: UserLeaveDetailPage( leaveId: state.pathParameters[ - RoutesParamsConst - .leaveId]!)), + RoutesParamsConst + .leaveId]!)), ), ], - pageBuilder: (context, state) => - CupertinoPage( + pageBuilder: (context, state) => CupertinoPage( child: AdminEmployeeDetailsLeavesPage( - employeeName: state.pathParameters[ - RoutesParamsConst.employeeName] ?? - "", - employeeId: state.extra as String, - ))), + employeeName: state.pathParameters[ + RoutesParamsConst.employeeName] ?? + "", + employeeId: state.extra as String, + ))), GoRoute( parentNavigatorKey: _adminShellNavigatorKey, path: Routes.adminEditEmployee, name: Routes.adminEditEmployee, - pageBuilder: (context, state) => - CupertinoPage( - child: AdminEditEmployeeDetailsPage( - employee: state.extra as Employee, - )), + pageBuilder: (context, state) => CupertinoPage( + child: AdminEditEmployeeDetailsPage( + employee: state.extra as Employee, + )), ), ]), ]), @@ -256,34 +243,31 @@ class AppRouter { ShellRoute( navigatorKey: _employeeShellNavigatorKey, builder: (context, state, child) => - DashBoardScreen(tabs: userTabs, child: child), + DashBoardScreen(tabs: userTabs, child: child), routes: [ GoRoute( parentNavigatorKey: _employeeShellNavigatorKey, path: Routes.userHome, name: Routes.userHome, - pageBuilder: (context, state) => - CupertinoPage( - key: ValueKey(userManager.currentSpaceId), - child: const UserHomeScreenPage()), + pageBuilder: (context, state) => CupertinoPage( + key: ValueKey(userManager.currentSpaceId), + child: const UserHomeScreenPage()), routes: [ GoRoute( parentNavigatorKey: _employeeShellNavigatorKey, name: Routes.userProfile, path: 'profile', - pageBuilder: (context, state) => - const CupertinoPage( - child: ViewProfilePage(), - ), + pageBuilder: (context, state) => const CupertinoPage( + child: ViewProfilePage(), + ), routes: [ GoRoute( path: 'edit', name: Routes.userEditProfile, - pageBuilder: (context, state) => - CupertinoPage( - child: EmployeeEditProfilePage( - employee: _userManager.employee, - )), + pageBuilder: (context, state) => CupertinoPage( + child: EmployeeEditProfilePage( + employee: _userManager.employee, + )), ), ]), GoRoute( @@ -291,7 +275,7 @@ class AppRouter { name: Routes.userForms, path: Routes.userForms, pageBuilder: (context, state) => - const CupertinoPage(child: UserFormListPage()), + const CupertinoPage(child: UserFormListPage()), ), GoRoute( name: Routes.userRequestDetail, @@ -300,15 +284,14 @@ class AppRouter { return CupertinoPage( child: UserLeaveDetailPage( leaveId: state.pathParameters[ - RoutesParamsConst.leaveId]!)); + RoutesParamsConst.leaveId]!)); }), GoRoute( name: Routes.userAbsenceDetails, path: Routes.userAbsenceDetails, - pageBuilder: (context, state) => - CupertinoPage( - child: UserLeaveDetailPage( - leaveId: state.pathParameters[ + pageBuilder: (context, state) => CupertinoPage( + child: UserLeaveDetailPage( + leaveId: state.pathParameters[ RoutesParamsConst.leaveId]!)), ), ]), @@ -316,26 +299,23 @@ class AppRouter { parentNavigatorKey: _employeeShellNavigatorKey, path: Routes.userLeaves, name: Routes.userLeaves, - pageBuilder: (context, state) => - CupertinoPage( - key: ValueKey(userManager.currentSpaceId), - child: const UserLeavePage()), + pageBuilder: (context, state) => CupertinoPage( + key: ValueKey(userManager.currentSpaceId), + child: const UserLeavePage()), routes: [ GoRoute( name: Routes.applyLeave, path: Routes.applyLeave, - pageBuilder: (context, state) => - const CupertinoPage( + pageBuilder: (context, state) => const CupertinoPage( child: ApplyLeavePage(), ), ), GoRoute( name: Routes.userLeaveDetail, path: Routes.userLeaveDetail, - pageBuilder: (context, state) => - CupertinoPage( - child: UserLeaveDetailPage( - leaveId: state.pathParameters[ + pageBuilder: (context, state) => CupertinoPage( + child: UserLeaveDetailPage( + leaveId: state.pathParameters[ RoutesParamsConst.leaveId]!)), ), ]), @@ -343,19 +323,17 @@ class AppRouter { parentNavigatorKey: _employeeShellNavigatorKey, path: Routes.userMembers, name: Routes.userMembers, - pageBuilder: (context, state) => - CupertinoPage( - key: ValueKey(userManager.currentSpaceId), - child: const UserMembersPage()), + pageBuilder: (context, state) => CupertinoPage( + key: ValueKey(userManager.currentSpaceId), + child: const UserMembersPage()), routes: [ GoRoute( parentNavigatorKey: _employeeShellNavigatorKey, name: Routes.userEmployeeDetail, path: Routes.userEmployeeDetail, - pageBuilder: (context, state) => - CupertinoPage( - child: UserEmployeeDetailPage( - employee: state.extra as Employee)), + pageBuilder: (context, state) => CupertinoPage( + child: UserEmployeeDetailPage( + employee: state.extra as Employee)), ), ]), ]) diff --git a/lib/data/configs/theme.dart b/lib/data/configs/theme.dart index 76717e41..a0bd9a9d 100644 --- a/lib/data/configs/theme.dart +++ b/lib/data/configs/theme.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; import 'package:projectunity/data/core/extensions/context_extension.dart'; import '../../style/app_text_style.dart'; -import '../../style/colors.dart'; -import 'package:table_calendar/table_calendar.dart' - show CalendarStyle; +import 'package:table_calendar/table_calendar.dart' show CalendarStyle; class AppTheme { static CalendarStyle calendarStyle(BuildContext context) => CalendarStyle( outsideDaysVisible: false, - defaultTextStyle: AppTextStyle.style16.copyWith(color: context.colorScheme.textPrimary), - weekendTextStyle: AppTextStyle.style14.copyWith(color: context.colorScheme.textSecondary), + defaultTextStyle: AppTextStyle.style16 + .copyWith(color: context.colorScheme.textPrimary), + weekendTextStyle: AppTextStyle.style14 + .copyWith(color: context.colorScheme.textSecondary), selectedDecoration: BoxDecoration( color: context.colorScheme.primary, shape: BoxShape.circle), markerDecoration: BoxDecoration( @@ -20,17 +20,18 @@ class AppTheme { border: Border.all(color: context.colorScheme.primary), shape: BoxShape.circle, ), - todayTextStyle: AppTextStyle.style14.copyWith(color: context.colorScheme.textSecondary), + todayTextStyle: AppTextStyle.style14 + .copyWith(color: context.colorScheme.textSecondary), ); static List commonBoxShadow(BuildContext context) => [ - BoxShadow( - color: context.colorScheme.outlineColor.withOpacity(0.60), - blurRadius: 3, - offset: const Offset(0, 0), - spreadRadius: 1, - ) - ]; + BoxShadow( + color: context.colorScheme.outlineColor.withOpacity(0.60), + blurRadius: 3, + offset: const Offset(0, 0), + spreadRadius: 1, + ) + ]; static BorderRadius commonBorderRadius = BorderRadius.circular(12); } diff --git a/lib/main.dart b/lib/main.dart index 2e07d34a..b8ec969d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -6,23 +6,16 @@ import 'package:firebase_crashlytics/firebase_crashlytics.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart' show kDebugMode, kIsWeb; import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_gen/gen_l10n/app_localization.dart'; import 'package:go_router/go_router.dart'; import 'package:projectunity/data/core/extensions/context_extension.dart'; import 'package:projectunity/style/app_theme.dart'; import 'package:projectunity/style/colors.dart'; import 'package:projectunity/ui/app.dart'; -import 'package:projectunity/ui/shared/appbar_drawer/drawer/bloc/app_drawer_bloc.dart'; -import 'package:projectunity/ui/widget/app_dialog.dart'; import 'package:projectunity/ui/widget/error/error_screen.dart'; -import 'package:projectunity/ui/widget/error_snack_bar.dart'; -import 'data/bloc/user_state/user_state_controller_bloc.dart'; import 'data/core/utils/const/app_const.dart'; import 'data/configs/scroll_behavior.dart'; import 'data/bloc/network/network_connection_bloc.dart'; -import 'data/bloc/network/network_connection_event.dart'; -import 'data/bloc/network/network_connection_state.dart'; import 'data/di/service_locator.dart'; import 'package:flutter_web_plugins/url_strategy.dart'; import 'firebase_options.dart'; @@ -55,7 +48,6 @@ Future main() async { class MyApp extends StatelessWidget { MyApp({Key? key}) : super(key: key); final GoRouter _router = getIt().router; - final _networkConnectionBloc = getIt(); @override Widget build(BuildContext context) { @@ -81,7 +73,7 @@ class MyApp extends StatelessWidget { supportedLocales: AppLocalizations.supportedLocales, localizationsDelegates: AppLocalizations.localizationsDelegates, - builder: (context, widget) =>App(child: widget!)) + builder: (context, widget) => App(child: widget!)) : CupertinoApp.router( title: AppConsts.appTitle, scrollBehavior: AppScrollBehaviour(), @@ -98,7 +90,7 @@ class MyApp extends StatelessWidget { supportedLocales: AppLocalizations.supportedLocales, localizationsDelegates: AppLocalizations.localizationsDelegates, - builder: (context, widget) =>App(child: widget!))), + builder: (context, widget) => App(child: widget!))), ); } } diff --git a/lib/style/app_page.dart b/lib/style/app_page.dart index 1941b9df..9ef21586 100644 --- a/lib/style/app_page.dart +++ b/lib/style/app_page.dart @@ -1,10 +1,4 @@ -import 'dart:io'; - -import 'package:flutter/cupertino.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:projectunity/data/core/extensions/context_extension.dart'; import 'package:projectunity/style/app_text_style.dart'; class AppPage extends StatelessWidget { @@ -26,7 +20,8 @@ class AppPage extends StatelessWidget { this.actions, this.leading, this.body, - this.floatingActionButtonLocation= FloatingActionButtonLocation.centerFloat, + this.floatingActionButtonLocation = + FloatingActionButtonLocation.centerFloat, this.automaticallyImplyLeading = true, this.floatingActionButton, }); @@ -40,7 +35,7 @@ class AppPage extends StatelessWidget { leading == null ? null : AppBar( - backgroundColor: backGroundColor, + backgroundColor: backGroundColor, title: titleWidget ?? _title(), actions: actions, leading: leading, diff --git a/lib/style/colors.dart b/lib/style/colors.dart index 760747ad..604ab090 100644 --- a/lib/style/colors.dart +++ b/lib/style/colors.dart @@ -10,7 +10,7 @@ const Color textSecondaryColor = Color(0x99000000); const Color textDisabledColor = Color(0x66000000); const Color textPrimaryDarkColor = Color(0xF7FFFFFF); -const Color textSecondaryDarkColor = Color(0xB3FFFFFF); +const Color textSecondaryDarkColor = Color(0xB3FFFFFF); const outlineLightColor = Color(0x14000000); const outlineDarkColor = Color(0x14FFFFFF); @@ -37,8 +37,6 @@ const Color approveLeaveColor = Color(0xff47A96E); const Color rejectLeaveColor = Color(0xffCA2F27); const Color pendingLeaveColor = Color(0xffF5F5F5); - - final ThemeData _materialLightTheme = ThemeData.light(useMaterial3: true); final ThemeData _materialDarkTheme = ThemeData.dark(useMaterial3: true); @@ -99,7 +97,6 @@ class AppColorScheme { final Color primaryInverseColor; final Color onPrimary; - AppColorScheme( {required this.primary, required this.secondary, @@ -115,8 +112,7 @@ class AppColorScheme { required this.awarenessColor, required this.outlineColor, required this.primaryInverseColor, - required this.onPrimary - }); + required this.onPrimary}); } final appColorSchemeLight = AppColorScheme( @@ -134,8 +130,7 @@ final appColorSchemeLight = AppColorScheme( awarenessColor: awarenessColor, outlineColor: outlineLightColor, primaryInverseColor: primaryDarkColor, - onPrimary: Colors.black -); + onPrimary: Colors.black); final appColorSchemeDark = AppColorScheme( primary: primaryDarkColor, @@ -152,4 +147,4 @@ final appColorSchemeDark = AppColorScheme( awarenessColor: awarenessColor, outlineColor: outlineDarkColor, primaryInverseColor: tertiaryLightColor, -onPrimary: Colors.black); + onPrimary: Colors.black); diff --git a/lib/ui/admin/forms/form_list/form_list_screen.dart b/lib/ui/admin/forms/form_list/form_list_screen.dart index 5d719eb6..eaa4672c 100644 --- a/lib/ui/admin/forms/form_list/form_list_screen.dart +++ b/lib/ui/admin/forms/form_list/form_list_screen.dart @@ -46,7 +46,6 @@ class _AdminFormListScreenState extends State { final bloc = context.read(); return AppPage( backGroundColor: context.colorScheme.surface, - title: context.l10n.forms_title, body: BlocConsumer( listenWhen: (previous, current) => current.status != previous.status, diff --git a/lib/ui/admin/forms/form_list/widget/form_card.dart b/lib/ui/admin/forms/form_list/widget/form_card.dart index cff36a6b..3b5b5c75 100644 --- a/lib/ui/admin/forms/form_list/widget/form_card.dart +++ b/lib/ui/admin/forms/form_list/widget/form_card.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:projectunity/data/core/extensions/context_extension.dart'; -import 'package:projectunity/style/colors.dart'; import '../../../../../data/configs/theme.dart'; import '../../../../../data/model/org_forms/org_form_info/org_form_info.dart'; diff --git a/lib/ui/admin/home/home_screen/admin_home_screen.dart b/lib/ui/admin/home/home_screen/admin_home_screen.dart index 6dc6687b..08aaa207 100644 --- a/lib/ui/admin/home/home_screen/admin_home_screen.dart +++ b/lib/ui/admin/home/home_screen/admin_home_screen.dart @@ -54,7 +54,6 @@ class _AdminHomeScreenState extends State { final locale = AppLocalizations.of(context); return AppPage( backGroundColor: context.colorScheme.surface, - leading: InkWell( onTap: () { Scaffold.of(context).openDrawer(); diff --git a/lib/ui/admin/home/home_screen/widget/request_list.dart b/lib/ui/admin/home/home_screen/widget/request_list.dart index a565ab20..2ba6b64c 100644 --- a/lib/ui/admin/home/home_screen/widget/request_list.dart +++ b/lib/ui/admin/home/home_screen/widget/request_list.dart @@ -25,7 +25,8 @@ class LeaveRequestList extends StatelessWidget { .map( (mapEntry) => StickyHeader( header: Container( - margin: const EdgeInsets.symmetric(horizontal: primaryHorizontalSpacing), + margin: const EdgeInsets.symmetric( + horizontal: primaryHorizontalSpacing), //width: MediaQuery.of(context).size.width, padding: const EdgeInsets.symmetric( horizontal: primaryHorizontalSpacing) diff --git a/lib/ui/admin/home/invite_member/invite_screen.dart b/lib/ui/admin/home/invite_member/invite_screen.dart index cbab31ea..3efc835b 100644 --- a/lib/ui/admin/home/invite_member/invite_screen.dart +++ b/lib/ui/admin/home/invite_member/invite_screen.dart @@ -40,7 +40,6 @@ class _SearchMemberScreenState extends State { final locale = AppLocalizations.of(context); return AppPage( backGroundColor: context.colorScheme.surface, - title: locale.admin_home_invite_member_appbar_tag, body: BlocConsumer( listenWhen: (previous, current) => diff --git a/lib/ui/admin/leaves/details/admin_leave_detail.dart b/lib/ui/admin/leaves/details/admin_leave_detail.dart index 458712f6..9c3f6ef2 100644 --- a/lib/ui/admin/leaves/details/admin_leave_detail.dart +++ b/lib/ui/admin/leaves/details/admin_leave_detail.dart @@ -63,7 +63,6 @@ class _AdminLeaveApplicationDetailScreenState final localization = AppLocalizations.of(context); return AppPage( backGroundColor: context.colorScheme.surface, - title: AppLocalizations.of(context).details_tag, body: BlocListener( listenWhen: (previous, current) => diff --git a/lib/ui/admin/members/detail/employee_detail_screen.dart b/lib/ui/admin/members/detail/employee_detail_screen.dart index 33eb2b4e..9cc8b776 100644 --- a/lib/ui/admin/members/detail/employee_detail_screen.dart +++ b/lib/ui/admin/members/detail/employee_detail_screen.dart @@ -48,14 +48,14 @@ class _EmployeeDetailScreenState extends State { void initState() { super.initState(); } + @override Widget build(BuildContext context) { return BlocProvider( - create: (context)=>getIt.get()..add(EmployeeDetailInitialLoadEvent(employeeId: widget.employeeId)), - + create: (context) => getIt.get() + ..add(EmployeeDetailInitialLoadEvent(employeeId: widget.employeeId)), child: AppPage( backGroundColor: context.colorScheme.surface, - title: context.l10n.details_tag, actions: [ BlocBuilder( @@ -69,7 +69,11 @@ class _EmployeeDetailScreenState extends State { elevation: 6, itemBuilder: (context) => [ PopupMenuItem( - child: Text(context.l10n.edit_tag, style: AppTextStyle.style14.copyWith(color:context.colorScheme.textSecondary ),), + child: Text( + context.l10n.edit_tag, + style: AppTextStyle.style14.copyWith( + color: context.colorScheme.textSecondary), + ), onTap: () { context.goNamed( Routes.adminEditEmployee, @@ -79,12 +83,14 @@ class _EmployeeDetailScreenState extends State { ), PopupMenuItem( child: Text( - state.employee.status == EmployeeStatus.active - ? AppLocalizations.of(context).deactivate_tag - : AppLocalizations.of(context).activate_tag, - style: AppTextStyle.style14.copyWith(color:context.colorScheme.textSecondary) ), + state.employee.status == EmployeeStatus.active + ? AppLocalizations.of(context).deactivate_tag + : AppLocalizations.of(context).activate_tag, + style: AppTextStyle.style14.copyWith( + color: context.colorScheme.textSecondary)), onTap: () { - if (state.employee.status == EmployeeStatus.inactive) { + if (state.employee.status == + EmployeeStatus.inactive) { context.read().add( EmployeeStatusChangeEvent( status: EmployeeStatus.active, diff --git a/lib/ui/admin/members/details_leaves/employee_details_leaves_screen.dart b/lib/ui/admin/members/details_leaves/employee_details_leaves_screen.dart index c8e27dd3..764f9651 100644 --- a/lib/ui/admin/members/details_leaves/employee_details_leaves_screen.dart +++ b/lib/ui/admin/members/details_leaves/employee_details_leaves_screen.dart @@ -43,7 +43,6 @@ class _AdminEmployeeDetailsLeavesScreenState Widget build(BuildContext context) { return AppPage( backGroundColor: context.colorScheme.surface, - title: AppLocalizations.of(context) .employee_details_leaves_title(widget.employeeName.split(" ").first), body: EmployeeLeaveList(employeeName: widget.employeeName), diff --git a/lib/ui/admin/members/edit_employee/admin_edit_employee_screen.dart b/lib/ui/admin/members/edit_employee/admin_edit_employee_screen.dart index b40f026c..48d1be71 100644 --- a/lib/ui/admin/members/edit_employee/admin_edit_employee_screen.dart +++ b/lib/ui/admin/members/edit_employee/admin_edit_employee_screen.dart @@ -76,7 +76,6 @@ class _AdminEditEmployeeDetailsViewState Widget build(BuildContext context) { return AppPage( backGroundColor: context.colorScheme.surface, - title: context.l10n.edit_tag, actions: [ BlocBuilder { Widget build(BuildContext context) { return AppPage( backGroundColor: context.colorScheme.surface, - title: AppLocalizations.of(context).members_tag, actions: [ TextButton( onPressed: () => context.pushNamed(Routes.inviteMember), - child: Text(context.l10n.invite_tag,style: AppTextStyle.style16.copyWith(color: context.colorScheme.primary),)) + child: Text( + context.l10n.invite_tag, + style: AppTextStyle.style16 + .copyWith(color: context.colorScheme.primary), + )) ], body: BlocConsumer( builder: (BuildContext context, AdminMembersState state) { diff --git a/lib/ui/app.dart b/lib/ui/app.dart index 0d7f511f..8d0fea9c 100644 --- a/lib/ui/app.dart +++ b/lib/ui/app.dart @@ -28,7 +28,7 @@ class _AppState extends State { @override Widget build(BuildContext context) { return MultiBlocProvider( - providers:[ + providers: [ BlocProvider(create: (context) => getIt.get()), BlocProvider( create: (context) => getIt() diff --git a/lib/ui/shared/dashboard/dashboard.dart b/lib/ui/shared/dashboard/dashboard.dart index bf4c2452..4fc439ad 100644 --- a/lib/ui/shared/dashboard/dashboard.dart +++ b/lib/ui/shared/dashboard/dashboard.dart @@ -3,7 +3,6 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; import 'package:projectunity/data/core/extensions/context_extension.dart'; import 'package:projectunity/app_router.dart'; -import 'package:projectunity/data/di/service_locator.dart'; import 'package:projectunity/ui/shared/dashboard/navigation_item.dart'; import 'package:projectunity/ui/shared/appbar_drawer/drawer/app_drawer.dart'; import 'package:projectunity/ui/widget/app_dialog.dart'; @@ -12,7 +11,6 @@ import 'package:projectunity/data/bloc/user_state/user_state_controller_bloc.dar import 'package:projectunity/data/bloc/user_state/user_state_controller_event.dart'; import 'package:flutter_gen/gen_l10n/app_localization.dart'; - class DashBoardScreen extends StatefulWidget { final Widget child; final List tabs; @@ -33,32 +31,31 @@ class _DashBoardScreenState extends State { return Scaffold( drawer: const AppDrawer(), body: SafeArea( - child: - BlocListener( - listenWhen: (previous, current)=>current is UserAccessRevokedStatus, - listener: (context, state) { - if (state is UserAccessRevokedStatus) { - showAppAlertDialog( - context: context, - title: locale - .state_controller_access_revoked_alert_dialogue_title, - actionButtonTitle: locale.ok_tag, - description: locale - .state_controller_access_revoked_alert_dialogue_subtitle, - onActionButtonPressed: () => context - .read() - .add(ClearDataForDisableUser())); - } - }, - child: widget.child)), + child: BlocListener( + listenWhen: (previous, current) => + current is UserAccessRevokedStatus, + listener: (context, state) { + if (state is UserAccessRevokedStatus) { + showAppAlertDialog( + context: context, + title: locale + .state_controller_access_revoked_alert_dialogue_title, + actionButtonTitle: locale.ok_tag, + description: locale + .state_controller_access_revoked_alert_dialogue_subtitle, + onActionButtonPressed: () => context + .read() + .add(ClearDataForDisableUser())); + } + }, + child: widget.child)), bottomNavigationBar: BottomNavigationBar( backgroundColor: context.colorScheme.surface, selectedItemColor: context.colorScheme.primary, unselectedItemColor: context.colorScheme.textPrimary, onTap: (int index) => onItemTapped(index), - items: widget.tabs - .map((e) => e.toBottomNavigationItem(context)) - .toList(), + items: + widget.tabs.map((e) => e.toBottomNavigationItem(context)).toList(), currentIndex: _currentIndex, ), ); diff --git a/lib/ui/shared/dashboard/navigation_item.dart b/lib/ui/shared/dashboard/navigation_item.dart index b587339a..fbe9f289 100644 --- a/lib/ui/shared/dashboard/navigation_item.dart +++ b/lib/ui/shared/dashboard/navigation_item.dart @@ -77,7 +77,7 @@ List adminTabs = [ ), BottomNavigationItem( tabIcon: Assets.images.icUsers, - tabActiveIcon: Assets.images.usersFilled , + tabActiveIcon: Assets.images.usersFilled, label: "Members", initialLocation: Routes.adminMembers, ), diff --git a/lib/ui/shared/profile/edit_profile/edit_profile_screen.dart b/lib/ui/shared/profile/edit_profile/edit_profile_screen.dart index 2d698fef..63fc39c2 100644 --- a/lib/ui/shared/profile/edit_profile/edit_profile_screen.dart +++ b/lib/ui/shared/profile/edit_profile/edit_profile_screen.dart @@ -24,8 +24,9 @@ class EmployeeEditProfilePage extends StatelessWidget { @override Widget build(BuildContext context) { return BlocProvider( - create: (context) => getIt()..add(EditProfileInitialLoadEvent( - dateOfBirth: employee.dateOfBirth, gender:employee.gender)), + create: (context) => getIt() + ..add(EditProfileInitialLoadEvent( + dateOfBirth: employee.dateOfBirth, gender: employee.gender)), child: EmployeeEditProfileScreen(employee: employee), ); } @@ -103,26 +104,26 @@ class _EmployeeEditProfileScreenState extends State { style: AppTextStyle.style16 .copyWith(color: context.colorScheme.primary), )), - ) - ], - body: BlocListener( - listenWhen: (previous, current) => previous.status != current.status, - listener: (context, state) { - if (state.status == Status.error) { - showSnackBar(context: context, error: state.error); - } else if (state.status == Status.success) { - context.pop(); - } - }, - child: ProfileForm( - profileImageURL: widget.employee.imageUrl, - nameController: nameController, - levelController: levelController, - designationController: designationController, - addressController: addressController, - phoneNumberController: phoneNumberController, - ), - ), - ); - } + ) + ], + body: BlocListener( + listenWhen: (previous, current) => previous.status != current.status, + listener: (context, state) { + if (state.status == Status.error) { + showSnackBar(context: context, error: state.error); + } else if (state.status == Status.success) { + context.pop(); + } + }, + child: ProfileForm( + profileImageURL: widget.employee.imageUrl, + nameController: nameController, + levelController: levelController, + designationController: designationController, + addressController: addressController, + phoneNumberController: phoneNumberController, + ), + ), + ); + } } diff --git a/lib/ui/shared/profile/edit_profile/widget/profile_form.dart b/lib/ui/shared/profile/edit_profile/widget/profile_form.dart index 0cc39bbb..455a2e9b 100644 --- a/lib/ui/shared/profile/edit_profile/widget/profile_form.dart +++ b/lib/ui/shared/profile/edit_profile/widget/profile_form.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_gen/gen_l10n/app_localization.dart'; -import 'package:projectunity/data/configs/theme.dart'; import 'package:projectunity/data/core/extensions/context_extension.dart'; import 'package:projectunity/style/app_text_style.dart'; import 'package:projectunity/ui/widget/pick_profile_image/pick_user_profile_image.dart'; @@ -102,27 +101,31 @@ class GenderSelection extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ RadioMenuButton( - value: Gender.male, - groupValue: state.gender, - onChanged: (Gender? gender){ - bloc.add(EditProfileChangeGenderEvent(gender: Gender.male)); - }, - child: Text( - localization.gender_male_tag, - style: AppTextStyle.style16 - .copyWith(color: state.gender==Gender.male?context.colorScheme.primary:context.colorScheme.textPrimary), - ), - ), + value: Gender.male, + groupValue: state.gender, + onChanged: (Gender? gender) { + bloc.add(EditProfileChangeGenderEvent(gender: Gender.male)); + }, + child: Text( + localization.gender_male_tag, + style: AppTextStyle.style16.copyWith( + color: state.gender == Gender.male + ? context.colorScheme.primary + : context.colorScheme.textPrimary), + ), + ), RadioMenuButton( value: Gender.female, groupValue: state.gender, - onChanged: (Gender? gender){ + onChanged: (Gender? gender) { bloc.add(EditProfileChangeGenderEvent(gender: Gender.female)); }, child: Text( localization.gender_female_tag, - style: AppTextStyle.style16 - .copyWith(color: state.gender==Gender.female?context.colorScheme.primary:context.colorScheme.textPrimary), + style: AppTextStyle.style16.copyWith( + color: state.gender == Gender.female + ? context.colorScheme.primary + : context.colorScheme.textPrimary), ), ) // Expanded( diff --git a/lib/ui/shared/profile/view_profile/widget/basic_detail_section.dart b/lib/ui/shared/profile/view_profile/widget/basic_detail_section.dart index 0750668d..f2434a6c 100644 --- a/lib/ui/shared/profile/view_profile/widget/basic_detail_section.dart +++ b/lib/ui/shared/profile/view_profile/widget/basic_detail_section.dart @@ -3,7 +3,6 @@ import 'package:projectunity/data/core/extensions/context_extension.dart'; import 'package:projectunity/data/core/extensions/string_extension.dart'; import 'package:flutter_gen/gen_l10n/app_localization.dart'; import 'package:projectunity/style/app_text_style.dart'; -import 'package:projectunity/style/colors.dart'; import '../../../../../data/configs/space_constant.dart'; import '../../../../../data/model/employee/employee.dart'; import '../../../../admin/members/detail/widget/profile_card.dart'; @@ -28,7 +27,7 @@ class BasicDetailSection extends StatelessWidget { role: employee.role, employeeId: employee.employeeId, ), - Divider( + Divider( color: context.colorScheme.containerHigh, ) ]), diff --git a/lib/ui/sign_in/sign_in_screen.dart b/lib/ui/sign_in/sign_in_screen.dart index 22f12156..ab27582c 100644 --- a/lib/ui/sign_in/sign_in_screen.dart +++ b/lib/ui/sign_in/sign_in_screen.dart @@ -34,7 +34,6 @@ class SignInScreenState extends State { Widget build(BuildContext context) { return AppPage( backGroundColor: context.colorScheme.surface, - body: BlocListener( listener: (context, state) { if (state is SignInFailureState) { diff --git a/lib/ui/space/create_space/create_workspace_screen.dart b/lib/ui/space/create_space/create_workspace_screen.dart index dc9f86e9..4c0795e5 100644 --- a/lib/ui/space/create_space/create_workspace_screen.dart +++ b/lib/ui/space/create_space/create_workspace_screen.dart @@ -59,7 +59,6 @@ class _CreateWorkSpaceScreenState extends State final locale = context.l10n; return AppPage( backGroundColor: context.colorScheme.surface, - title: locale.create_new_space_title, body: Material( color: context.colorScheme.surface, diff --git a/lib/ui/space/edit_space/edit_space_screen.dart b/lib/ui/space/edit_space/edit_space_screen.dart index 95997478..0d2a11d0 100644 --- a/lib/ui/space/edit_space/edit_space_screen.dart +++ b/lib/ui/space/edit_space/edit_space_screen.dart @@ -76,7 +76,6 @@ class _EditSpaceScreenState extends State { Widget build(BuildContext context) { return AppPage( backGroundColor: context.colorScheme.surface, - title: context.l10n.space_tag, actions: [ BlocBuilder( diff --git a/lib/ui/space/join_space/join_space_screen.dart b/lib/ui/space/join_space/join_space_screen.dart index 84fb1171..20a530ad 100644 --- a/lib/ui/space/join_space/join_space_screen.dart +++ b/lib/ui/space/join_space/join_space_screen.dart @@ -38,7 +38,6 @@ class _JoinSpaceScreenState extends State { Widget build(BuildContext context) { return AppPage( backGroundColor: context.colorScheme.surface, - body: SafeArea( child: BlocListener( listenWhen: (previous, current) => diff --git a/lib/ui/user/forms/form_list_screen/forms_list_screen.dart b/lib/ui/user/forms/form_list_screen/forms_list_screen.dart index cd175088..b4d5cbbe 100644 --- a/lib/ui/user/forms/form_list_screen/forms_list_screen.dart +++ b/lib/ui/user/forms/form_list_screen/forms_list_screen.dart @@ -43,7 +43,6 @@ class _UserFormListScreenState extends State { Widget build(BuildContext context) { return AppPage( backGroundColor: context.colorScheme.surface, - title: context.l10n.forms_title, body: BlocConsumer( listenWhen: (previous, current) => current.status != previous.status, diff --git a/lib/ui/user/forms/form_list_screen/widget/form_card.dart b/lib/ui/user/forms/form_list_screen/widget/form_card.dart index 2f8dbb21..c50d080d 100644 --- a/lib/ui/user/forms/form_list_screen/widget/form_card.dart +++ b/lib/ui/user/forms/form_list_screen/widget/form_card.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:projectunity/data/core/extensions/context_extension.dart'; import 'package:projectunity/style/app_text_style.dart'; -import 'package:projectunity/style/colors.dart'; import '../../../../../data/configs/theme.dart'; import '../../../../../data/model/org_forms/org_form_info/org_form_info.dart'; diff --git a/lib/ui/user/home/home_screen/user_home_screen.dart b/lib/ui/user/home/home_screen/user_home_screen.dart index 3448c707..8930ff18 100644 --- a/lib/ui/user/home/home_screen/user_home_screen.dart +++ b/lib/ui/user/home/home_screen/user_home_screen.dart @@ -55,7 +55,6 @@ class _UserHomeScreenState extends State { final locale = AppLocalizations.of(context); return AppPage( backGroundColor: context.colorScheme.surface, - leading: InkWell( onTap: () { Scaffold.of(context).openDrawer(); diff --git a/lib/ui/user/leaves/apply_leave/apply_leave_screen.dart b/lib/ui/user/leaves/apply_leave/apply_leave_screen.dart index 0c2b22c3..d05c1f4b 100644 --- a/lib/ui/user/leaves/apply_leave/apply_leave_screen.dart +++ b/lib/ui/user/leaves/apply_leave/apply_leave_screen.dart @@ -41,7 +41,6 @@ class _ApplyLeaveScreenState extends State { Widget build(BuildContext context) { return AppPage( backGroundColor: context.colorScheme.surface, - title: context.l10n.user_leaves_apply_appbar_tag, body: BlocListener( listenWhen: (previous, current) => diff --git a/lib/ui/user/leaves/apply_leave/widget/date_range_selection_leave_request.dart b/lib/ui/user/leaves/apply_leave/widget/date_range_selection_leave_request.dart index 476d90c1..950f03f7 100644 --- a/lib/ui/user/leaves/apply_leave/widget/date_range_selection_leave_request.dart +++ b/lib/ui/user/leaves/apply_leave/widget/date_range_selection_leave_request.dart @@ -6,7 +6,6 @@ import 'package:projectunity/data/core/extensions/context_extension.dart'; import 'package:projectunity/data/model/leave/leave.dart'; import 'package:projectunity/style/app_text_style.dart'; import '../../../../../data/configs/space_constant.dart'; -import '../../../../../style/colors.dart'; import '../bloc/apply_leave_bloc.dart'; import '../bloc/apply_leave_event.dart'; import '../bloc/apply_leave_state.dart'; @@ -30,7 +29,8 @@ class LeaveRequestDateRange extends StatelessWidget { vertical: primaryHalfSpacing), padding: const EdgeInsets.all(12), decoration: BoxDecoration( - border: Border.all(color: context.colorScheme.containerHigh), + border: Border.all( + color: context.colorScheme.containerHigh), borderRadius: BorderRadius.circular(8), ), child: Row( @@ -67,7 +67,8 @@ class LeaveRequestDateRange extends StatelessWidget { margin: const EdgeInsets.symmetric( horizontal: primaryHalfSpacing), decoration: BoxDecoration( - border: Border.all(color: context.colorScheme.containerHigh), + border: Border.all( + color: context.colorScheme.containerHigh), borderRadius: BorderRadius.circular(8), ), child: Column( diff --git a/lib/ui/user/leaves/apply_leave/widget/leave_request_reason_card.dart b/lib/ui/user/leaves/apply_leave/widget/leave_request_reason_card.dart index cac4da1e..e8220e80 100644 --- a/lib/ui/user/leaves/apply_leave/widget/leave_request_reason_card.dart +++ b/lib/ui/user/leaves/apply_leave/widget/leave_request_reason_card.dart @@ -3,7 +3,6 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:projectunity/data/core/extensions/context_extension.dart'; import 'package:projectunity/style/app_text_style.dart'; -import 'package:projectunity/style/colors.dart'; import '../../../../../data/configs/space_constant.dart'; import '../../../../../gen/assets.gen.dart'; import '../bloc/apply_leave_bloc.dart'; diff --git a/lib/ui/user/leaves/apply_leave/widget/picker_card.dart b/lib/ui/user/leaves/apply_leave/widget/picker_card.dart index eb03b1a1..de1161b6 100644 --- a/lib/ui/user/leaves/apply_leave/widget/picker_card.dart +++ b/lib/ui/user/leaves/apply_leave/widget/picker_card.dart @@ -6,7 +6,6 @@ import 'package:projectunity/data/configs/space_constant.dart'; import 'package:projectunity/data/core/extensions/context_extension.dart'; import 'package:projectunity/gen/assets.gen.dart'; import 'package:projectunity/style/app_text_style.dart'; -import 'package:projectunity/style/colors.dart'; class DatePickerCard extends StatelessWidget { final Function() onPress; @@ -26,8 +25,9 @@ class DatePickerCard extends StatelessWidget { return Expanded( child: Container( margin: const EdgeInsets.all(primaryHalfSpacing), - decoration: BoxDecoration( - border: Border(bottom: BorderSide(color: context.colorScheme.containerHigh))), + decoration: BoxDecoration( + border: Border( + bottom: BorderSide(color: context.colorScheme.containerHigh))), child: InkWell( borderRadius: BorderRadius.circular(12), onTap: onPress, diff --git a/lib/ui/user/leaves/detail/user_leave_detail_screen.dart b/lib/ui/user/leaves/detail/user_leave_detail_screen.dart index 540c2e63..26783b82 100644 --- a/lib/ui/user/leaves/detail/user_leave_detail_screen.dart +++ b/lib/ui/user/leaves/detail/user_leave_detail_screen.dart @@ -55,7 +55,6 @@ class _UserLeaveDetailScreenState extends State { final localization = AppLocalizations.of(context); return AppPage( backGroundColor: context.colorScheme.surface, - title: AppLocalizations.of(context).details_tag, body: BlocConsumer( listenWhen: (previous, current) => diff --git a/lib/ui/user/leaves/leaves_screen/bloc/leaves/user_leave_bloc.dart b/lib/ui/user/leaves/leaves_screen/bloc/leaves/user_leave_bloc.dart index 2ea6861a..3c109101 100644 --- a/lib/ui/user/leaves/leaves_screen/bloc/leaves/user_leave_bloc.dart +++ b/lib/ui/user/leaves/leaves_screen/bloc/leaves/user_leave_bloc.dart @@ -131,5 +131,4 @@ class UserLeaveBloc extends Bloc { casualLeaves: casualLeaves.groupByMonth((leave) => leave.appliedOn), urgentLeaves: urgentLeaves.groupByMonth((leave) => leave.appliedOn))); } - } diff --git a/lib/ui/user/leaves/leaves_screen/user_leave_screen.dart b/lib/ui/user/leaves/leaves_screen/user_leave_screen.dart index 6f69b72e..67c3d512 100644 --- a/lib/ui/user/leaves/leaves_screen/user_leave_screen.dart +++ b/lib/ui/user/leaves/leaves_screen/user_leave_screen.dart @@ -71,7 +71,6 @@ class _UserLeaveScreenState extends State return AppPage( backGroundColor: context.colorScheme.surface, - title: AppLocalizations.of(context).leaves_tag, body: Column( children: [ diff --git a/lib/ui/user/leaves/leaves_screen/widget/leave_count_card.dart b/lib/ui/user/leaves/leaves_screen/widget/leave_count_card.dart index 1fe01a94..0442527f 100644 --- a/lib/ui/user/leaves/leaves_screen/widget/leave_count_card.dart +++ b/lib/ui/user/leaves/leaves_screen/widget/leave_count_card.dart @@ -7,7 +7,6 @@ import 'package:projectunity/style/app_text_style.dart'; import 'package:projectunity/ui/widget/error_snack_bar.dart'; import '../../../../../data/core/utils/bloc_status.dart'; import '../../../../../data/model/leave/leave.dart'; -import '../../../../../style/colors.dart'; import '../bloc/leave_count/user_leave_count_bloc.dart'; import '../bloc/leave_count/user_leave_count_state.dart'; diff --git a/lib/ui/user/members/detail/user_employee_detail_screen.dart b/lib/ui/user/members/detail/user_employee_detail_screen.dart index fff02b12..fd865ea1 100644 --- a/lib/ui/user/members/detail/user_employee_detail_screen.dart +++ b/lib/ui/user/members/detail/user_employee_detail_screen.dart @@ -52,7 +52,6 @@ class _UserEmployeeDetailScreenState extends State { Widget build(BuildContext context) { return AppPage( backGroundColor: context.colorScheme.surface, - title: context.l10n.details_tag, body: ListView( padding: diff --git a/lib/ui/user/members/members_screen/user_members_screen.dart b/lib/ui/user/members/members_screen/user_members_screen.dart index 1839101c..6664488b 100644 --- a/lib/ui/user/members/members_screen/user_members_screen.dart +++ b/lib/ui/user/members/members_screen/user_members_screen.dart @@ -38,7 +38,6 @@ class _UserMembersScreenState extends State { Widget build(BuildContext context) { return AppPage( backGroundColor: context.colorScheme.surface, - title: context.l10n.members_tag, body: BlocConsumer( listenWhen: (previous, current) => diff --git a/lib/ui/widget/employee_card.dart b/lib/ui/widget/employee_card.dart index 3e49f7cf..751cddce 100644 --- a/lib/ui/widget/employee_card.dart +++ b/lib/ui/widget/employee_card.dart @@ -38,8 +38,8 @@ class EmployeeCard extends StatelessWidget { children: [ Text(employee.name, style: employee.status == EmployeeStatus.inactive - ? AppTextStyle.style18 - .copyWith(color: context.colorScheme.textSecondary) + ? AppTextStyle.style18.copyWith( + color: context.colorScheme.textSecondary) : AppTextStyle.style18.copyWith( color: context.colorScheme.textPrimary, height: 1.5), diff --git a/lib/ui/widget/employee_details_textfield.dart b/lib/ui/widget/employee_details_textfield.dart index f0f43c40..63f866dd 100644 --- a/lib/ui/widget/employee_details_textfield.dart +++ b/lib/ui/widget/employee_details_textfield.dart @@ -54,7 +54,8 @@ class FieldEntry extends StatelessWidget { maxLength: maxLength, controller: controller, autocorrect: false, - style: AppTextStyle.style16.copyWith(color: context.colorScheme.textSecondary), + style: AppTextStyle.style16 + .copyWith(color: context.colorScheme.textSecondary), textAlignVertical: TextAlignVertical.center, decoration: InputDecoration( isCollapsed: true, diff --git a/lib/ui/widget/error_snack_bar.dart b/lib/ui/widget/error_snack_bar.dart index 4d6c81a3..68bd04d1 100644 --- a/lib/ui/widget/error_snack_bar.dart +++ b/lib/ui/widget/error_snack_bar.dart @@ -4,18 +4,17 @@ import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:projectunity/data/core/exception/exception_msg.dart'; - void showSnackBar({required BuildContext context, String? msg, String? error}) { if (Platform.isIOS) { Fluttertoast.showToast( - msg: error!= null?error.errorMessage(context):msg!, + msg: error != null ? error.errorMessage(context) : msg!, gravity: ToastGravity.BOTTOM, ); } else { final snackBar = SnackBar( content: error != null ? Text(error.errorMessage(context)) : Text(msg!), behavior: SnackBarBehavior.floating, - duration: Duration(seconds: 1), + duration: const Duration(seconds: 1), ); ScaffoldMessenger.of(context).removeCurrentSnackBar(); ScaffoldMessenger.of(context).showSnackBar(snackBar); diff --git a/lib/ui/widget/leave_application_card.dart b/lib/ui/widget/leave_application_card.dart index 12644de7..1e2be6ba 100644 --- a/lib/ui/widget/leave_application_card.dart +++ b/lib/ui/widget/leave_application_card.dart @@ -25,9 +25,9 @@ class LeaveApplicationCard extends StatelessWidget { Widget build(BuildContext context) { return Container( decoration: BoxDecoration( - borderRadius: AppTheme.commonBorderRadius, - color: context.colorScheme.containerLow, - ), + borderRadius: AppTheme.commonBorderRadius, + color: context.colorScheme.containerLow, + ), child: Material( borderRadius: AppTheme.commonBorderRadius, color: context.colorScheme.containerLow, diff --git a/lib/ui/widget/leave_card.dart b/lib/ui/widget/leave_card.dart index 4d8836d1..ce7da956 100644 --- a/lib/ui/widget/leave_card.dart +++ b/lib/ui/widget/leave_card.dart @@ -3,7 +3,6 @@ import 'package:flutter_gen/gen_l10n/app_localization.dart'; import 'package:projectunity/data/configs/theme.dart'; import 'package:projectunity/data/core/extensions/context_extension.dart'; import 'package:projectunity/style/app_text_style.dart'; -import 'package:projectunity/style/colors.dart'; import '../../data/core/utils/date_formatter.dart'; import '../../data/model/leave/leave.dart'; import 'leave_card_status_view.dart'; diff --git a/lib/ui/widget/leave_count_view.dart b/lib/ui/widget/leave_count_view.dart index 4ce676ed..239029c2 100644 --- a/lib/ui/widget/leave_count_view.dart +++ b/lib/ui/widget/leave_count_view.dart @@ -4,7 +4,6 @@ import 'package:projectunity/data/core/extensions/double_extension.dart'; import 'package:projectunity/data/model/leave_count.dart'; import 'package:flutter_gen/gen_l10n/app_localization.dart'; import 'package:projectunity/style/app_text_style.dart'; -import 'package:projectunity/style/colors.dart'; import '../../data/model/leave/leave.dart'; class UsedLeaveCountsView extends StatelessWidget { diff --git a/lib/ui/widget/leave_details_widget/leave_details_per_day_duration_content.dart b/lib/ui/widget/leave_details_widget/leave_details_per_day_duration_content.dart index 162bb345..9dfce393 100644 --- a/lib/ui/widget/leave_details_widget/leave_details_per_day_duration_content.dart +++ b/lib/ui/widget/leave_details_widget/leave_details_per_day_duration_content.dart @@ -4,7 +4,6 @@ import 'package:intl/intl.dart'; import 'package:projectunity/data/core/extensions/context_extension.dart'; import 'package:projectunity/data/model/leave/leave.dart'; import 'package:projectunity/style/app_text_style.dart'; -import 'package:projectunity/style/colors.dart'; import '../../../data/configs/space_constant.dart'; class PerDayDurationDateRange extends StatelessWidget { @@ -28,7 +27,8 @@ class PerDayDurationDateRange extends StatelessWidget { horizontal: primaryVerticalSpacing, ), decoration: BoxDecoration( - border: Border.all(color: context.colorScheme.containerHigh), + border: Border.all( + color: context.colorScheme.containerHigh), borderRadius: BorderRadius.circular(8), ), child: Column( @@ -62,7 +62,8 @@ class PerDayDurationDateRange extends StatelessWidget { width: MediaQuery.of(context).size.width * 0.26, decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), - border: Border.all(color: context.colorScheme.containerHigh), + border: Border.all( + color: context.colorScheme.containerHigh), ), child: Text(AppLocalizations.of(context) .leave_day_duration_tag(date.value.name)), @@ -83,7 +84,8 @@ class PerDayDurationDateRange extends StatelessWidget { vertical: primaryHalfSpacing, ), decoration: BoxDecoration( - border: Border.all(color: context.colorScheme.containerHigh), + border: Border.all( + color: context.colorScheme.containerHigh), borderRadius: BorderRadius.circular(8), ), child: Row( @@ -116,7 +118,8 @@ class PerDayDurationDateRange extends StatelessWidget { width: MediaQuery.of(context).size.width * 0.26, decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), - border: Border.all(color: context.colorScheme.containerHigh), + border: Border.all( + color: context.colorScheme.containerHigh), ), child: Text( context.l10n diff --git a/lib/ui/widget/leave_details_widget/user_content.dart b/lib/ui/widget/leave_details_widget/user_content.dart index 983a689f..a83c97f4 100644 --- a/lib/ui/widget/leave_details_widget/user_content.dart +++ b/lib/ui/widget/leave_details_widget/user_content.dart @@ -28,7 +28,8 @@ class UserContent extends StatelessWidget { children: [ Text( employee.name, - style: AppTextStyle.style16.copyWith(color: context.colorScheme.textPrimary), + style: AppTextStyle.style16 + .copyWith(color: context.colorScheme.textPrimary), overflow: TextOverflow.ellipsis, ), const SizedBox( diff --git a/lib/ui/widget/pick_profile_image/pick_user_profile_image.dart b/lib/ui/widget/pick_profile_image/pick_user_profile_image.dart index 31d54ebc..4405064e 100644 --- a/lib/ui/widget/pick_profile_image/pick_user_profile_image.dart +++ b/lib/ui/widget/pick_profile_image/pick_user_profile_image.dart @@ -78,7 +78,7 @@ class ProfileImage extends StatelessWidget { backgroundColor: context.colorScheme.surface, elevation: 2, mini: true, - child: Icon( + child: Icon( Icons.edit, color: context.colorScheme.containerHigh, )), diff --git a/lib/ui/widget/space_logo_view.dart b/lib/ui/widget/space_logo_view.dart index 49eda8d2..b7b6113a 100644 --- a/lib/ui/widget/space_logo_view.dart +++ b/lib/ui/widget/space_logo_view.dart @@ -43,7 +43,7 @@ class SpaceLogoView extends StatelessWidget { ? Icon( Icons.business, size: (size * 0.5), - color: context.colorScheme.outlineColor, + color: context.colorScheme.outlineColor, ) : null, ); diff --git a/lib/ui/widget/user_profile_image.dart b/lib/ui/widget/user_profile_image.dart index 62688353..1eca335c 100644 --- a/lib/ui/widget/user_profile_image.dart +++ b/lib/ui/widget/user_profile_image.dart @@ -15,7 +15,7 @@ class ImageProfile extends StatelessWidget { {Key? key, this.imageUrl, required this.radius, - this.backgroundColor , + this.backgroundColor, this.pickedImage, this.iconColor}) : super(key: key); @@ -37,7 +37,7 @@ class ImageProfile extends StatelessWidget { Widget build(BuildContext context) { return CircleAvatar( radius: radius, - backgroundColor: backgroundColor?? context.colorScheme.containerHigh, + backgroundColor: backgroundColor ?? context.colorScheme.containerHigh, backgroundImage: setImage(), child: (setImage() != null) ? null