From 3b3ed5e640d829e483b52b199e9c68f533e57a11 Mon Sep 17 00:00:00 2001 From: Mohammed Al-Samarraie Date: Tue, 13 Jan 2026 15:14:30 +0300 Subject: [PATCH] 1111 --- lib/{ => core}/services/request_service.dart | 4 ++-- lib/main.dart | 2 +- lib/{ => presentation}/screens/about_screen.dart | 0 .../screens/attendence_screen.dart | 6 +++--- lib/{ => presentation}/screens/auth_screen.dart | 4 ++-- lib/{ => presentation}/screens/face_screen.dart | 0 lib/{ => presentation}/screens/finance_screen.dart | 4 ++-- lib/{ => presentation}/screens/holiday_screen.dart | 14 +++++++------- lib/{ => presentation}/screens/main_screen.dart | 8 ++++---- .../screens/notifications_screen.dart | 0 .../screens/onboarding_screen.dart | 2 +- .../screens/request_advance_scrren.dart | 4 ++-- .../screens/request_leave_screen.dart | 4 ++-- lib/{ => presentation}/screens/splash_screen.dart | 0 .../screens/user_settings_screen.dart | 4 ++-- lib/{ => presentation}/widgets/FloatingNavBar.dart | 0 lib/{ => presentation}/widgets/app_background.dart | 0 lib/{ => presentation}/widgets/auth_form.dart | 8 ++++---- .../widgets/change_password_modal.dart | 2 +- .../widgets/finance_summary_card.dart | 0 lib/{ => presentation}/widgets/gradient_line.dart | 0 .../widgets/login_animation.dart | 2 +- .../widgets/onboarding_button.dart | 0 .../widgets/onboarding_page.dart | 0 lib/{ => presentation}/widgets/settings_bar.dart | 0 lib/{ => presentation}/widgets/status_circle.dart | 0 lib/{ => presentation}/widgets/work_day_card.dart | 4 ++-- 27 files changed, 36 insertions(+), 36 deletions(-) rename lib/{ => core}/services/request_service.dart (97%) rename lib/{ => presentation}/screens/about_screen.dart (100%) rename lib/{ => presentation}/screens/attendence_screen.dart (97%) rename lib/{ => presentation}/screens/auth_screen.dart (90%) rename lib/{ => presentation}/screens/face_screen.dart (100%) rename lib/{ => presentation}/screens/finance_screen.dart (95%) rename lib/{ => presentation}/screens/holiday_screen.dart (97%) rename lib/{ => presentation}/screens/main_screen.dart (91%) rename lib/{ => presentation}/screens/notifications_screen.dart (100%) rename lib/{ => presentation}/screens/onboarding_screen.dart (98%) rename lib/{ => presentation}/screens/request_advance_scrren.dart (99%) rename lib/{ => presentation}/screens/request_leave_screen.dart (99%) rename lib/{ => presentation}/screens/splash_screen.dart (100%) rename lib/{ => presentation}/screens/user_settings_screen.dart (99%) rename lib/{ => presentation}/widgets/FloatingNavBar.dart (100%) rename lib/{ => presentation}/widgets/app_background.dart (100%) rename lib/{ => presentation}/widgets/auth_form.dart (97%) rename lib/{ => presentation}/widgets/change_password_modal.dart (99%) rename lib/{ => presentation}/widgets/finance_summary_card.dart (100%) rename lib/{ => presentation}/widgets/gradient_line.dart (100%) rename lib/{ => presentation}/widgets/login_animation.dart (99%) rename lib/{ => presentation}/widgets/onboarding_button.dart (100%) rename lib/{ => presentation}/widgets/onboarding_page.dart (100%) rename lib/{ => presentation}/widgets/settings_bar.dart (100%) rename lib/{ => presentation}/widgets/status_circle.dart (100%) rename lib/{ => presentation}/widgets/work_day_card.dart (97%) diff --git a/lib/services/request_service.dart b/lib/core/services/request_service.dart similarity index 97% rename from lib/services/request_service.dart rename to lib/core/services/request_service.dart index 2126613..7838997 100644 --- a/lib/services/request_service.dart +++ b/lib/core/services/request_service.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import '../models/leave_request.dart'; -import '../models/advance_request.dart'; +import '../../models/leave_request.dart'; +import '../../models/advance_request.dart'; class RequestService { // Singleton implementation diff --git a/lib/main.dart b/lib/main.dart index 80a4edc..c7cb5ec 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_native_splash/flutter_native_splash.dart'; import 'core/di/injection_container.dart'; -import 'screens/splash_screen.dart'; +import 'presentation/screens/splash_screen.dart'; void main() async { WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/screens/about_screen.dart b/lib/presentation/screens/about_screen.dart similarity index 100% rename from lib/screens/about_screen.dart rename to lib/presentation/screens/about_screen.dart diff --git a/lib/screens/attendence_screen.dart b/lib/presentation/screens/attendence_screen.dart similarity index 97% rename from lib/screens/attendence_screen.dart rename to lib/presentation/screens/attendence_screen.dart index 285dcf2..4316091 100644 --- a/lib/screens/attendence_screen.dart +++ b/lib/presentation/screens/attendence_screen.dart @@ -1,6 +1,6 @@ -import 'package:coda_project/screens/face_screen.dart'; -import 'package:coda_project/screens/notifications_screen.dart'; -import 'package:coda_project/screens/user_settings_screen.dart'; +import 'package:coda_project/presentation/screens/face_screen.dart'; +import 'package:coda_project/presentation/screens/notifications_screen.dart'; +import 'package:coda_project/presentation/screens/user_settings_screen.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import '../widgets/settings_bar.dart'; diff --git a/lib/screens/auth_screen.dart b/lib/presentation/screens/auth_screen.dart similarity index 90% rename from lib/screens/auth_screen.dart rename to lib/presentation/screens/auth_screen.dart index e739f0d..8dfcb16 100644 --- a/lib/screens/auth_screen.dart +++ b/lib/presentation/screens/auth_screen.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import '../widgets/app_background.dart'; import '../widgets/auth_form.dart'; -import '../core/di/injection_container.dart'; -import '../presentation/blocs/login/login_bloc.dart'; +import '../../core/di/injection_container.dart'; +import '../blocs/login/login_bloc.dart'; class AuthScreen extends StatelessWidget { const AuthScreen({super.key}); diff --git a/lib/screens/face_screen.dart b/lib/presentation/screens/face_screen.dart similarity index 100% rename from lib/screens/face_screen.dart rename to lib/presentation/screens/face_screen.dart diff --git a/lib/screens/finance_screen.dart b/lib/presentation/screens/finance_screen.dart similarity index 95% rename from lib/screens/finance_screen.dart rename to lib/presentation/screens/finance_screen.dart index 9b093ab..52c0cba 100644 --- a/lib/screens/finance_screen.dart +++ b/lib/presentation/screens/finance_screen.dart @@ -1,5 +1,5 @@ -import 'package:coda_project/screens/notifications_screen.dart'; -import 'package:coda_project/screens/user_settings_screen.dart'; +import 'package:coda_project/presentation/screens/notifications_screen.dart'; +import 'package:coda_project/presentation/screens/user_settings_screen.dart'; import 'package:flutter/material.dart'; import '../widgets/finance_summary_card.dart'; import '../widgets/work_day_card.dart'; diff --git a/lib/screens/holiday_screen.dart b/lib/presentation/screens/holiday_screen.dart similarity index 97% rename from lib/screens/holiday_screen.dart rename to lib/presentation/screens/holiday_screen.dart index 89f16b8..3b9b316 100644 --- a/lib/screens/holiday_screen.dart +++ b/lib/presentation/screens/holiday_screen.dart @@ -1,15 +1,15 @@ -import 'package:coda_project/screens/notifications_screen.dart'; -import 'package:coda_project/screens/user_settings_screen.dart'; +import 'package:coda_project/presentation/screens/notifications_screen.dart'; +import 'package:coda_project/presentation/screens/user_settings_screen.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_svg/flutter_svg.dart'; import '../widgets/settings_bar.dart'; -import '../screens/request_leave_screen.dart'; -import '../screens/request_advance_scrren.dart'; -import '../models/leave_request.dart'; -import '../models/advance_request.dart'; -import '../services/request_service.dart'; +import 'request_leave_screen.dart'; +import 'request_advance_scrren.dart'; +import '../../models/leave_request.dart'; +import '../../models/advance_request.dart'; +import '../../core/services/request_service.dart'; class HolidayScreen extends StatefulWidget { final void Function(bool isScrollingDown)? onScrollEvent; diff --git a/lib/screens/main_screen.dart b/lib/presentation/screens/main_screen.dart similarity index 91% rename from lib/screens/main_screen.dart rename to lib/presentation/screens/main_screen.dart index b18b962..8a87413 100644 --- a/lib/screens/main_screen.dart +++ b/lib/presentation/screens/main_screen.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import '../widgets/app_background.dart'; -import '../widgets/floatingnavbar.dart'; -import '../screens/attendence_screen.dart'; -import '../screens/finance_screen.dart'; -import '../screens/holiday_screen.dart'; +import '../../widgets/floatingnavbar.dart'; +import 'attendence_screen.dart'; +import 'finance_screen.dart'; +import 'holiday_screen.dart'; class MainPage extends StatefulWidget { const MainPage({super.key}); diff --git a/lib/screens/notifications_screen.dart b/lib/presentation/screens/notifications_screen.dart similarity index 100% rename from lib/screens/notifications_screen.dart rename to lib/presentation/screens/notifications_screen.dart diff --git a/lib/screens/onboarding_screen.dart b/lib/presentation/screens/onboarding_screen.dart similarity index 98% rename from lib/screens/onboarding_screen.dart rename to lib/presentation/screens/onboarding_screen.dart index 5c81606..7ff4747 100644 --- a/lib/screens/onboarding_screen.dart +++ b/lib/presentation/screens/onboarding_screen.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:coda_project/screens/auth_screen.dart'; +import 'package:coda_project/presentation/screens/auth_screen.dart'; import 'package:flutter/material.dart'; import '../widgets/onboarding_page.dart'; import '../widgets/onboarding_button.dart'; diff --git a/lib/screens/request_advance_scrren.dart b/lib/presentation/screens/request_advance_scrren.dart similarity index 99% rename from lib/screens/request_advance_scrren.dart rename to lib/presentation/screens/request_advance_scrren.dart index 45fd4e5..a57faad 100644 --- a/lib/screens/request_advance_scrren.dart +++ b/lib/presentation/screens/request_advance_scrren.dart @@ -3,8 +3,8 @@ import 'package:flutter/material.dart'; import '../widgets/app_background.dart'; import '../widgets/settings_bar.dart'; import '../widgets/onboarding_button.dart'; -import '../models/advance_request.dart'; -import '../services/request_service.dart'; +import '../../models/advance_request.dart'; +import '../../core/services/request_service.dart'; class RequestAdvanceScreen extends StatefulWidget { const RequestAdvanceScreen({super.key}); diff --git a/lib/screens/request_leave_screen.dart b/lib/presentation/screens/request_leave_screen.dart similarity index 99% rename from lib/screens/request_leave_screen.dart rename to lib/presentation/screens/request_leave_screen.dart index d664d48..78d24bf 100644 --- a/lib/screens/request_leave_screen.dart +++ b/lib/presentation/screens/request_leave_screen.dart @@ -3,8 +3,8 @@ import 'package:flutter_svg/flutter_svg.dart'; import '../widgets/app_background.dart'; import '../widgets/settings_bar.dart'; import '../widgets/onboarding_button.dart'; -import '../models/leave_request.dart'; -import '../services/request_service.dart'; +import '../../models/leave_request.dart'; +import '../../core/services/request_service.dart'; class RequestLeaveScreen extends StatefulWidget { const RequestLeaveScreen({super.key}); diff --git a/lib/screens/splash_screen.dart b/lib/presentation/screens/splash_screen.dart similarity index 100% rename from lib/screens/splash_screen.dart rename to lib/presentation/screens/splash_screen.dart diff --git a/lib/screens/user_settings_screen.dart b/lib/presentation/screens/user_settings_screen.dart similarity index 99% rename from lib/screens/user_settings_screen.dart rename to lib/presentation/screens/user_settings_screen.dart index ed168fb..12b056a 100644 --- a/lib/screens/user_settings_screen.dart +++ b/lib/presentation/screens/user_settings_screen.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import '../widgets/app_background.dart'; import '../widgets/settings_bar.dart'; -import '../screens/about_screen.dart'; -import '../screens/auth_screen.dart'; +import 'about_screen.dart'; +import 'auth_screen.dart'; import '../widgets/change_password_modal.dart'; diff --git a/lib/widgets/FloatingNavBar.dart b/lib/presentation/widgets/FloatingNavBar.dart similarity index 100% rename from lib/widgets/FloatingNavBar.dart rename to lib/presentation/widgets/FloatingNavBar.dart diff --git a/lib/widgets/app_background.dart b/lib/presentation/widgets/app_background.dart similarity index 100% rename from lib/widgets/app_background.dart rename to lib/presentation/widgets/app_background.dart diff --git a/lib/widgets/auth_form.dart b/lib/presentation/widgets/auth_form.dart similarity index 97% rename from lib/widgets/auth_form.dart rename to lib/presentation/widgets/auth_form.dart index 5f7c3e6..fb8bd37 100644 --- a/lib/widgets/auth_form.dart +++ b/lib/presentation/widgets/auth_form.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import '../screens/main_screen.dart'; -import '../domain/models/login_request.dart'; -import '../presentation/blocs/login/login_bloc.dart'; -import '../presentation/blocs/login/login_event.dart'; -import '../presentation/blocs/login/login_state.dart'; +import '../../domain/models/login_request.dart'; +import '../blocs/login/login_bloc.dart'; +import '../blocs/login/login_event.dart'; +import '../blocs/login/login_state.dart'; import 'onboarding_button.dart'; class AuthForm extends StatefulWidget { diff --git a/lib/widgets/change_password_modal.dart b/lib/presentation/widgets/change_password_modal.dart similarity index 99% rename from lib/widgets/change_password_modal.dart rename to lib/presentation/widgets/change_password_modal.dart index 9f318b1..661ee04 100644 --- a/lib/widgets/change_password_modal.dart +++ b/lib/presentation/widgets/change_password_modal.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../widgets/onboarding_button.dart'; +import 'onboarding_button.dart'; class ChangePasswordModal extends StatefulWidget { const ChangePasswordModal({super.key}); diff --git a/lib/widgets/finance_summary_card.dart b/lib/presentation/widgets/finance_summary_card.dart similarity index 100% rename from lib/widgets/finance_summary_card.dart rename to lib/presentation/widgets/finance_summary_card.dart diff --git a/lib/widgets/gradient_line.dart b/lib/presentation/widgets/gradient_line.dart similarity index 100% rename from lib/widgets/gradient_line.dart rename to lib/presentation/widgets/gradient_line.dart diff --git a/lib/widgets/login_animation.dart b/lib/presentation/widgets/login_animation.dart similarity index 99% rename from lib/widgets/login_animation.dart rename to lib/presentation/widgets/login_animation.dart index 126749c..c60be77 100644 --- a/lib/widgets/login_animation.dart +++ b/lib/presentation/widgets/login_animation.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import '../widgets/app_background.dart'; +import 'app_background.dart'; class LoginAnimationScreen extends StatefulWidget { final bool isLogin; diff --git a/lib/widgets/onboarding_button.dart b/lib/presentation/widgets/onboarding_button.dart similarity index 100% rename from lib/widgets/onboarding_button.dart rename to lib/presentation/widgets/onboarding_button.dart diff --git a/lib/widgets/onboarding_page.dart b/lib/presentation/widgets/onboarding_page.dart similarity index 100% rename from lib/widgets/onboarding_page.dart rename to lib/presentation/widgets/onboarding_page.dart diff --git a/lib/widgets/settings_bar.dart b/lib/presentation/widgets/settings_bar.dart similarity index 100% rename from lib/widgets/settings_bar.dart rename to lib/presentation/widgets/settings_bar.dart diff --git a/lib/widgets/status_circle.dart b/lib/presentation/widgets/status_circle.dart similarity index 100% rename from lib/widgets/status_circle.dart rename to lib/presentation/widgets/status_circle.dart diff --git a/lib/widgets/work_day_card.dart b/lib/presentation/widgets/work_day_card.dart similarity index 97% rename from lib/widgets/work_day_card.dart rename to lib/presentation/widgets/work_day_card.dart index 0527065..6666219 100644 --- a/lib/widgets/work_day_card.dart +++ b/lib/presentation/widgets/work_day_card.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; -import '../widgets/gradient_line.dart'; -import '../widgets/status_circle.dart'; +import 'gradient_line.dart'; +import 'status_circle.dart'; class WorkDayCard extends StatelessWidget { const WorkDayCard({super.key});