some UI changes has been made

This commit is contained in:
Daniah Ayad Al-sultani
2025-12-09 16:12:13 +03:00
parent f73d3fbb75
commit 6ec8a882ef

View File

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