Skip to content

Commit

Permalink
Reformat and fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
cp-sneha-s committed Mar 5, 2024
1 parent b33ee5d commit 1671d8c
Show file tree
Hide file tree
Showing 50 changed files with 208 additions and 257 deletions.
156 changes: 67 additions & 89 deletions lib/app_router.dart

Large diffs are not rendered by default.

27 changes: 14 additions & 13 deletions lib/data/configs/theme.dart
Original file line number Diff line number Diff line change
@@ -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(
Expand All @@ -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<BoxShadow> 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);
}
12 changes: 2 additions & 10 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -55,7 +48,6 @@ Future<void> main() async {
class MyApp extends StatelessWidget {
MyApp({Key? key}) : super(key: key);
final GoRouter _router = getIt<AppRouter>().router;
final _networkConnectionBloc = getIt<NetworkConnectionBloc>();

@override
Widget build(BuildContext context) {
Expand All @@ -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(),
Expand All @@ -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!))),
);
}
}
11 changes: 3 additions & 8 deletions lib/style/app_page.dart
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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,
});
Expand All @@ -40,7 +35,7 @@ class AppPage extends StatelessWidget {
leading == null
? null
: AppBar(
backgroundColor: backGroundColor,
backgroundColor: backGroundColor,
title: titleWidget ?? _title(),
actions: actions,
leading: leading,
Expand Down
13 changes: 4 additions & 9 deletions lib/style/colors.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);

Expand Down Expand Up @@ -99,7 +97,6 @@ class AppColorScheme {
final Color primaryInverseColor;
final Color onPrimary;


AppColorScheme(
{required this.primary,
required this.secondary,
Expand All @@ -115,8 +112,7 @@ class AppColorScheme {
required this.awarenessColor,
required this.outlineColor,
required this.primaryInverseColor,
required this.onPrimary
});
required this.onPrimary});
}

final appColorSchemeLight = AppColorScheme(
Expand All @@ -134,8 +130,7 @@ final appColorSchemeLight = AppColorScheme(
awarenessColor: awarenessColor,
outlineColor: outlineLightColor,
primaryInverseColor: primaryDarkColor,
onPrimary: Colors.black
);
onPrimary: Colors.black);

final appColorSchemeDark = AppColorScheme(
primary: primaryDarkColor,
Expand All @@ -152,4 +147,4 @@ final appColorSchemeDark = AppColorScheme(
awarenessColor: awarenessColor,
outlineColor: outlineDarkColor,
primaryInverseColor: tertiaryLightColor,
onPrimary: Colors.black);
onPrimary: Colors.black);
1 change: 0 additions & 1 deletion lib/ui/admin/forms/form_list/form_list_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ class _AdminFormListScreenState extends State<AdminFormListScreen> {
final bloc = context.read<AdminFormListBloc>();
return AppPage(
backGroundColor: context.colorScheme.surface,

title: context.l10n.forms_title,
body: BlocConsumer<AdminFormListBloc, AdminFormListState>(
listenWhen: (previous, current) => current.status != previous.status,
Expand Down
1 change: 0 additions & 1 deletion lib/ui/admin/forms/form_list/widget/form_card.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
1 change: 0 additions & 1 deletion lib/ui/admin/home/home_screen/admin_home_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ class _AdminHomeScreenState extends State<AdminHomeScreen> {
final locale = AppLocalizations.of(context);
return AppPage(
backGroundColor: context.colorScheme.surface,

leading: InkWell(
onTap: () {
Scaffold.of(context).openDrawer();
Expand Down
3 changes: 2 additions & 1 deletion lib/ui/admin/home/home_screen/widget/request_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion lib/ui/admin/home/invite_member/invite_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ class _SearchMemberScreenState extends State<SearchMemberScreen> {
final locale = AppLocalizations.of(context);
return AppPage(
backGroundColor: context.colorScheme.surface,

title: locale.admin_home_invite_member_appbar_tag,
body: BlocConsumer<InviteMemberBloc, InviteMemberState>(
listenWhen: (previous, current) =>
Expand Down
1 change: 0 additions & 1 deletion lib/ui/admin/leaves/details/admin_leave_detail.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<AdminLeaveDetailsBloc, AdminLeaveDetailsState>(
listenWhen: (previous, current) =>
Expand Down
24 changes: 15 additions & 9 deletions lib/ui/admin/members/detail/employee_detail_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ class _EmployeeDetailScreenState extends State<EmployeeDetailScreen> {
void initState() {
super.initState();
}

@override
Widget build(BuildContext context) {
return BlocProvider(
create: (context)=>getIt.get<EmployeeDetailBloc>()..add(EmployeeDetailInitialLoadEvent(employeeId: widget.employeeId)),

create: (context) => getIt.get<EmployeeDetailBloc>()
..add(EmployeeDetailInitialLoadEvent(employeeId: widget.employeeId)),
child: AppPage(
backGroundColor: context.colorScheme.surface,

title: context.l10n.details_tag,
actions: [
BlocBuilder<EmployeeDetailBloc, AdminEmployeeDetailState>(
Expand All @@ -69,7 +69,11 @@ class _EmployeeDetailScreenState extends State<EmployeeDetailScreen> {
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,
Expand All @@ -79,12 +83,14 @@ class _EmployeeDetailScreenState extends State<EmployeeDetailScreen> {
),
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<EmployeeDetailBloc>().add(
EmployeeStatusChangeEvent(
status: EmployeeStatus.active,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ class _AdminEditEmployeeDetailsViewState
Widget build(BuildContext context) {
return AppPage(
backGroundColor: context.colorScheme.surface,

title: context.l10n.edit_tag,
actions: [
BlocBuilder<AdminEditEmployeeDetailsBloc,
Expand Down
1 change: 0 additions & 1 deletion lib/ui/admin/members/list/inivitation_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ 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';
import 'package:projectunity/style/colors.dart';
import 'package:projectunity/ui/admin/members/list/bloc/member_list_bloc.dart';
import 'package:projectunity/ui/admin/members/list/bloc/member_list_event.dart';
import '../../../../data/configs/space_constant.dart';
Expand Down
7 changes: 5 additions & 2 deletions lib/ui/admin/members/list/member_list_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,15 @@ class _MemberListScreenState extends State<MemberListScreen> {
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<AdminMembersBloc, AdminMembersState>(
builder: (BuildContext context, AdminMembersState state) {
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class _AppState extends State<App> {
@override
Widget build(BuildContext context) {
return MultiBlocProvider(
providers:[
providers: [
BlocProvider(create: (context) => getIt.get<DrawerBloc>()),
BlocProvider(
create: (context) => getIt<NetworkConnectionBloc>()
Expand Down
43 changes: 20 additions & 23 deletions lib/ui/shared/dashboard/dashboard.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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<BottomNavigationItem> tabs;
Expand All @@ -33,32 +31,31 @@ class _DashBoardScreenState extends State<DashBoardScreen> {
return Scaffold(
drawer: const AppDrawer(),
body: SafeArea(
child:
BlocListener<UserStateControllerBloc, UserControllerStatus>(
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<UserStateControllerBloc>()
.add(ClearDataForDisableUser()));
}
},
child: widget.child)),
child: BlocListener<UserStateControllerBloc, UserControllerStatus>(
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<UserStateControllerBloc>()
.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,
),
);
Expand Down
Loading

0 comments on commit 1671d8c

Please sign in to comment.