dania/finger_print_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some UI changes has been made

Browse Source
This commit is contained in:
Daniah Ayad Al-sultani
2025-12-09 16:12:13 +03:00
parent f73d3fbb75
commit 6ec8a882ef
1 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/screens/request_leave_screen.dart
View File

@@ -14,7 +14,7 @@ class RequestLeaveScreen extends StatefulWidget {
} }
class _RequestLeaveScreenState extends State<RequestLeaveScreen> { class _RequestLeaveScreenState extends State<RequestLeaveScreen> {
// Dropdown value // Dropdown value - initialize with default
String leaveType = "إجازة مرضية "; String leaveType = "إجازة مرضية ";
// Toggle switch // Toggle switch
@@ -95,7 +95,7 @@ class _RequestLeaveScreenState extends State<RequestLeaveScreen> {
// Create a new leave request with default status "waiting" // Create a new leave request with default status "waiting"
final leaveRequest = LeaveRequest( final leaveRequest = LeaveRequest(
id: DateTime.now().millisecondsSinceEpoch.toString(), id: DateTime.now().millisecondsSinceEpoch.toString(),
leaveType: leaveType, leaveType: leaveType, // Use the current leaveType value
isTimedLeave: isTimedLeave, isTimedLeave: isTimedLeave,
fromDate: fromDate!, fromDate: fromDate!,
toDate: toDate!, toDate: toDate!,
@@ -230,12 +230,13 @@ class _RequestLeaveScreenState extends State<RequestLeaveScreen> {
fontSize: 17, fontSize: 17,
), ),
isExpanded: true, isExpanded: true,
onChanged: onChanged: (value) {
isTimedLeave setState(() {
? null leaveType = value!;
: (value) { // Set toggle based on selected value
setState(() => leaveType = value!); isTimedLeave = value == "أجازة زمنية";
}, });
},
items: [ items: [
DropdownMenuItem( DropdownMenuItem(
value: "إجازة مرضية ", value: "إجازة مرضية ",
@@ -267,6 +268,16 @@ class _RequestLeaveScreenState extends State<RequestLeaveScreen> {
), ),
), ),
), ),
DropdownMenuItem(
value: "أجازة زمنية",
child: Directionality(
textDirection: TextDirection.rtl,
child: Align(
alignment: Alignment.centerRight,
child: Text("أجازة زمنية"),
),
),
),
], ],
), ),
), ),
@@ -281,8 +292,15 @@ class _RequestLeaveScreenState extends State<RequestLeaveScreen> {
// PERFECT CUSTOM TOGGLE (NEW) // PERFECT CUSTOM TOGGLE (NEW)
//============================= //=============================
GestureDetector( GestureDetector(
onTap: onTap: () {
() => setState(() => isTimedLeave = !isTimedLeave), setState(() {
isTimedLeave = !isTimedLeave;
// Set leave type to "أجازة زمنية" when toggle is ON
if (isTimedLeave) {
leaveType = "أجازة زمنية";
}
});
},
child: Row( child: Row(
children: [ children: [
// ---------- TOGGLE ---------- // ---------- TOGGLE ----------
@@ -511,8 +529,7 @@ class _RequestLeaveScreenState extends State<RequestLeaveScreen> {
// CONFIRM BUTTON // CONFIRM BUTTON
Center( Center(
child: // In your RequestLeaveScreen's build method child: OnboardingButton(
OnboardingButton(
text: "تأكيد الطلب", text: "تأكيد الطلب",
backgroundColor: const Color(0xFFD1FEF0), backgroundColor: const Color(0xFFD1FEF0),
textColor: Colors.black, // Changed to black textColor: Colors.black, // Changed to black