2026-04-15
This commit is contained in:
mageshwaran committed
1 parent
d01e5ba860
commit
96de59e9be
46 files changed
+1299
-1191
No files matched your search
@@ -4,6 +4,7 @@ import 'package:flutter_riverpod/legacy.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:get/get_core/src/get_main.dart';
|
||||
import 'package:taxglide/consts/app_asstes.dart';
|
||||
import 'package:taxglide/consts/app_style.dart';
|
||||
import 'package:taxglide/controller/api_contoller.dart';
|
||||
import 'package:taxglide/model/chat_model.dart';
|
||||
import 'package:taxglide/view/Mahi_chat/chat_profile_screen.dart';
|
||||
@@ -193,8 +194,11 @@ class _CompletedLiveChatScreenState
|
||||
try {
|
||||
final event = message['event'] as String?;
|
||||
|
||||
if (event == 'message.sent' || event == 'message.received') {
|
||||
debugPrint("🔔 New message detected!");
|
||||
if (event == 'message.sent' ||
|
||||
event == 'message.received' ||
|
||||
event == 'message.read' ||
|
||||
event == 'message.delivered') {
|
||||
debugPrint("🔔 Message status/new message event: $event");
|
||||
|
||||
if (WidgetsBinding.instance.lifecycleState ==
|
||||
AppLifecycleState.resumed) {
|
||||
@@ -332,7 +336,11 @@ class _CompletedLiveChatScreenState
|
||||
return "$hour:$minute $period";
|
||||
}
|
||||
|
||||
Widget buildTick(int isDelivered, int isRead) {
|
||||
Widget buildTick(MessageModel message) {
|
||||
// ⭐ Status 0/1
|
||||
final isRead = message.isRead;
|
||||
final isDelivered = message.isDelivered;
|
||||
|
||||
if (isRead == 1) {
|
||||
return const Icon(Icons.done_all, size: 16, color: Colors.blue);
|
||||
} else if (isDelivered == 1) {
|
||||
@@ -357,9 +365,9 @@ class _CompletedLiveChatScreenState
|
||||
widget.fileid.toString() != "0")
|
||||
? 'File ID : ${widget.fileid.toString()}'
|
||||
: "Live Chat",
|
||||
style: const TextStyle(
|
||||
fontFamily: "Gilroy-SemiBold",
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 16,
|
||||
color: Colors.black,
|
||||
),
|
||||
),
|
||||
backgroundColor: Colors.white,
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:taxglide/consts/app_style.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:taxglide/consts/app_asstes.dart';
|
||||
import 'package:taxglide/consts/comman_button.dart';
|
||||
@@ -183,9 +184,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
label: Text(
|
||||
"Invoice Not Available",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w400,
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: width * 0.045,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.04 * 17.64,
|
||||
@@ -239,9 +238,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
? "View Invoice"
|
||||
: "Download Invoice",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w400,
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: width * 0.045,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.04 * 17.64,
|
||||
@@ -312,9 +309,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
: isDownloaded
|
||||
? "View Proforma"
|
||||
: "Download Proforma",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 12,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.04 * 14.47,
|
||||
@@ -337,6 +332,22 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
|
||||
final detailAsync = ref.watch(serviceDetailProvider(widget.id));
|
||||
|
||||
// 🔄 Silent refresh when notification trigger changes
|
||||
ref.listen(notificationTriggerProvider, (previous, next) {
|
||||
if (previous != null && next != previous) {
|
||||
debugPrint("🔔 Silent refresh triggered for DetailScreen");
|
||||
ref.refresh(serviceDetailProvider(widget.id));
|
||||
|
||||
// Also refresh unread count if available
|
||||
detailAsync.whenData((model) {
|
||||
final chatId = model.data?.chatId;
|
||||
if (chatId != null && chatId.isNotEmpty) {
|
||||
ref.refresh(countProvider(chatId));
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
return Scaffold(
|
||||
body: Container(
|
||||
height: height,
|
||||
@@ -349,16 +360,16 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
),
|
||||
child: SafeArea(
|
||||
child: detailAsync.when(
|
||||
skipLoadingOnRefresh: true,
|
||||
loading: () => const Center(
|
||||
child: CircularProgressIndicator(color: Colors.deepPurple),
|
||||
),
|
||||
error: (e, _) => Center(
|
||||
child: Text(
|
||||
"Error: $e",
|
||||
style: const TextStyle(
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
color: Colors.red,
|
||||
fontSize: 16,
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -391,9 +402,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
Text(
|
||||
"Service Details",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.055,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
@@ -474,9 +483,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
children: [
|
||||
Text(
|
||||
"Detailed Information",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.047,
|
||||
height: 1.4,
|
||||
letterSpacing: 0.03 * 20,
|
||||
@@ -508,9 +515,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
child: Center(
|
||||
child: Text(
|
||||
data.serviceStatus.toString(),
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w400,
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: width * 0.029,
|
||||
color: const Color(0xFFFF0F0F),
|
||||
),
|
||||
@@ -541,9 +546,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
child: Center(
|
||||
child: Text(
|
||||
data.serviceStatus.toString(),
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w400,
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: width * 0.032,
|
||||
letterSpacing: 0.03,
|
||||
color: const Color(0xFF12800C),
|
||||
@@ -575,9 +578,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
child: Center(
|
||||
child: Text(
|
||||
data.serviceStatus.toString(),
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w400,
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: width * 0.029,
|
||||
letterSpacing: 0.03,
|
||||
color: const Color(0xFFFF630F),
|
||||
@@ -616,18 +617,16 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
"Task Final Report",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: width * 0.042,
|
||||
height: 1.4,
|
||||
letterSpacing: 0.03 * 16,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
textAlign: TextAlign.start,
|
||||
Text(
|
||||
"This is your final task document",
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.042,
|
||||
height: 1.4,
|
||||
letterSpacing: 0.03 * 16,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
textAlign: TextAlign.start,
|
||||
),
|
||||
const SizedBox(height: 15),
|
||||
Row(
|
||||
mainAxisAlignment:
|
||||
@@ -640,9 +639,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'Date: ',
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
@@ -651,9 +648,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
),
|
||||
TextSpan(
|
||||
text: data.createdDate ?? "-",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w400,
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
@@ -673,9 +668,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'Payment : ',
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
@@ -684,9 +677,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
),
|
||||
TextSpan(
|
||||
text: data.paymentStatus ?? "-",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w400,
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
@@ -899,7 +890,10 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
],
|
||||
Column(
|
||||
children: [
|
||||
if (data.paymentStatus == "Un Paid") ...[
|
||||
if (data.paymentStatus == "Un Paid" &&
|
||||
!(data.serviceStatus ?? "")
|
||||
.toLowerCase()
|
||||
.contains("cancelled")) ...[
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
vertical: 31,
|
||||
@@ -932,9 +926,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
children: [
|
||||
Text(
|
||||
"Payment Advice",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.042,
|
||||
height: 1.4,
|
||||
letterSpacing: 0.03 * 16,
|
||||
@@ -953,36 +945,22 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'Date: ',
|
||||
style: TextStyle(
|
||||
fontFamily:
|
||||
'Gilroy-SemiBold',
|
||||
fontWeight:
|
||||
FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing:
|
||||
0.04 * 13.97,
|
||||
color: const Color(
|
||||
0xFF111827,
|
||||
),
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text:
|
||||
data.createdDate ??
|
||||
"-",
|
||||
style: TextStyle(
|
||||
fontFamily:
|
||||
'Gilroy-Medium',
|
||||
fontWeight:
|
||||
FontWeight.w400,
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing:
|
||||
0.04 * 13.97,
|
||||
color: const Color(
|
||||
0xFF111827,
|
||||
),
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -998,36 +976,22 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'Payment : ',
|
||||
style: TextStyle(
|
||||
fontFamily:
|
||||
'Gilroy-SemiBold',
|
||||
fontWeight:
|
||||
FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing:
|
||||
0.04 * 13.97,
|
||||
color: const Color(
|
||||
0xFF111827,
|
||||
),
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text:
|
||||
data.paymentStatus ??
|
||||
"-",
|
||||
style: TextStyle(
|
||||
fontFamily:
|
||||
'Gilroy-Medium',
|
||||
fontWeight:
|
||||
FontWeight.w400,
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing:
|
||||
0.04 * 13.97,
|
||||
color: const Color(
|
||||
0xFF111827,
|
||||
),
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -1045,18 +1009,15 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
children: [
|
||||
Text(
|
||||
"Total Amount",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.04,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
Text(
|
||||
"₹ ${data.paymentAmount ?? '0'}",
|
||||
style: TextStyle(
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontFamily: 'Roboto',
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: width * 0.045,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
@@ -1105,9 +1066,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
children: [
|
||||
Text(
|
||||
"Payment Advice",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.042,
|
||||
height: 1.4,
|
||||
letterSpacing: 0.03 * 16,
|
||||
@@ -1126,36 +1085,22 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'Date: ',
|
||||
style: TextStyle(
|
||||
fontFamily:
|
||||
'Gilroy-SemiBold',
|
||||
fontWeight:
|
||||
FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing:
|
||||
0.04 * 13.97,
|
||||
color: const Color(
|
||||
0xFF111827,
|
||||
),
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text:
|
||||
data.createdDate ??
|
||||
"-",
|
||||
style: TextStyle(
|
||||
fontFamily:
|
||||
'Gilroy-Medium',
|
||||
fontWeight:
|
||||
FontWeight.w400,
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing:
|
||||
0.04 * 13.97,
|
||||
color: const Color(
|
||||
0xFF111827,
|
||||
),
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -1171,36 +1116,22 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'Payment: ',
|
||||
style: TextStyle(
|
||||
fontFamily:
|
||||
'Gilroy-SemiBold',
|
||||
fontWeight:
|
||||
FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing:
|
||||
0.04 * 13.97,
|
||||
color: const Color(
|
||||
0xFF111827,
|
||||
),
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text:
|
||||
data.paymentStatus ??
|
||||
"-",
|
||||
style: TextStyle(
|
||||
fontFamily:
|
||||
'Gilroy-Medium',
|
||||
fontWeight:
|
||||
FontWeight.w400,
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing:
|
||||
0.04 * 13.97,
|
||||
color: const Color(
|
||||
0xFF111827,
|
||||
),
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -1218,18 +1149,15 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
children: [
|
||||
Text(
|
||||
"Total Amount",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.04,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
Text(
|
||||
"₹ ${data.paymentAmount ?? '0'}",
|
||||
style: TextStyle(
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontFamily: 'Roboto',
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: width * 0.045,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
@@ -1248,10 +1176,8 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
],
|
||||
),
|
||||
),
|
||||
] else if (data.paymentStatus == "Waiting") ...[
|
||||
const SizedBox.shrink(),
|
||||
] else ...[
|
||||
Text("Unknown Status: ${data.paymentStatus}"),
|
||||
const SizedBox.shrink(),
|
||||
],
|
||||
|
||||
if (data.proforma != null &&
|
||||
@@ -1285,10 +1211,8 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
"Payment Advice",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
"Profoma Advice",
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.042,
|
||||
height: 1.4,
|
||||
letterSpacing: 0.03 * 16,
|
||||
@@ -1308,10 +1232,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'proforma Number : ',
|
||||
style: TextStyle(
|
||||
fontFamily:
|
||||
'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
@@ -1321,12 +1242,9 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text:
|
||||
data.proformaNumber ??
|
||||
text: data.proformaNumber ??
|
||||
"-",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w400,
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
@@ -1349,9 +1267,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'proforma Status : ',
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
@@ -1359,10 +1275,35 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text: data.proformastatus ?? "-",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w400,
|
||||
text: data.proformaStatus ?? "-",
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
RichText(
|
||||
overflow: TextOverflow.ellipsis,
|
||||
textAlign: TextAlign.end,
|
||||
text: TextSpan(
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'Subject : ',
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text: data.subject ?? "-",
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.04 * 13.97,
|
||||
@@ -1372,15 +1313,12 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
const SizedBox(height: 20),
|
||||
if (data.proformastatus != "Accepted") ...[
|
||||
if (data.proformaStatus != "Accepted") ...[
|
||||
Text(
|
||||
"Note : Once you accept this proforma only you can pay the amount for the service",
|
||||
textAlign: TextAlign.start,
|
||||
style: const TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 13,
|
||||
height: 1.78, // 178% line-height
|
||||
letterSpacing: 0.04 * 13, // 4%
|
||||
@@ -1404,7 +1342,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
|
||||
const SizedBox(width: 8),
|
||||
|
||||
if (data.proformastatus != "Accepted")
|
||||
if (data.proformaStatus != "Accepted")
|
||||
/// ✅ Accept (Less width)
|
||||
Expanded(
|
||||
flex: 2,
|
||||
@@ -1525,9 +1463,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
/// 🔹 File List Section
|
||||
Text(
|
||||
"File Attachments:",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.04,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
@@ -1714,18 +1650,19 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
),
|
||||
)
|
||||
else
|
||||
const Text(
|
||||
Text(
|
||||
"No documents uploaded",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
color: Color(0xFF6B7280),
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
color: const Color(0xFF6B7280),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
if (data.chatId != null && data.chatId!.isNotEmpty)
|
||||
if (data.chatId != null &&
|
||||
data.chatId!.isNotEmpty &&
|
||||
!(data.serviceStatus ?? "").toLowerCase().contains("cancelled"))
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 20,
|
||||
@@ -1821,7 +1758,7 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
),
|
||||
),
|
||||
|
||||
const SizedBox(height: 150),
|
||||
SizedBox(height: 80.0 + MediaQuery.of(context).padding.bottom),
|
||||
],
|
||||
),
|
||||
);
|
||||
@@ -1839,18 +1776,14 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: '$label: ',
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.04,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text: value.isEmpty ? '—' : value,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w500,
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: width * 0.04,
|
||||
height: 1.5,
|
||||
color: const Color(0xFF374151),
|
||||
@@ -1879,10 +1812,9 @@ class _DetailScreenState extends ConsumerState<DetailScreen> {
|
||||
),
|
||||
child: Text(
|
||||
count.toString(),
|
||||
style: const TextStyle(
|
||||
style: AppTextStyles.bold.copyWith(
|
||||
color: Colors.white,
|
||||
fontSize: 10,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -145,7 +145,7 @@ class _FilterBottomSheetState extends State<_FilterBottomSheet>
|
||||
child: const Text(
|
||||
"Cancel",
|
||||
style: TextStyle(
|
||||
fontFamily: "Gilroy-SemiBold", // ✅ Font
|
||||
fontFamily: "Gilroy", // ✅ Font
|
||||
fontWeight: FontWeight.w400,
|
||||
fontSize: 16,
|
||||
height: 1.3, // ✅ line-height 130%
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:taxglide/consts/app_style.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:taxglide/controller/api_contoller.dart';
|
||||
import 'package:taxglide/view/Main_controller/main_controller.dart';
|
||||
import 'package:taxglide/view/screens/history/detail_screen.dart';
|
||||
import 'package:taxglide/view/Mahi_chat/live_chat_screen.dart';
|
||||
import 'package:taxglide/view/screens/history/completed_live_chat_screen.dart';
|
||||
|
||||
class PendingScreen extends ConsumerWidget {
|
||||
final String status;
|
||||
@@ -17,6 +20,17 @@ class PendingScreen extends ConsumerWidget {
|
||||
final width = size.width;
|
||||
final height = size.height;
|
||||
|
||||
// 🔄 Silent refresh when notification trigger changes
|
||||
ref.listen(notificationTriggerProvider, (previous, next) {
|
||||
if (previous != null && next != previous) {
|
||||
debugPrint("🔔 Silent refresh triggered for PendingScreen ($status)");
|
||||
ref
|
||||
.read(serviceHistoryNotifierProvider(status).notifier)
|
||||
.fetchServiceHistory(isSilent: true);
|
||||
ref.invalidate(countProvider);
|
||||
}
|
||||
});
|
||||
|
||||
return pendingAsync.when(
|
||||
data: (data) {
|
||||
final list = data.data ?? [];
|
||||
@@ -31,7 +45,7 @@ class PendingScreen extends ConsumerWidget {
|
||||
width * 0.04,
|
||||
height * 0.01,
|
||||
width * 0.04,
|
||||
height * 0.2,
|
||||
80.0 + MediaQuery.of(context).padding.bottom,
|
||||
),
|
||||
itemCount: list.length,
|
||||
separatorBuilder: (_, __) => SizedBox(height: height * 0.01),
|
||||
@@ -58,137 +72,236 @@ class PendingScreen extends ConsumerWidget {
|
||||
children: [
|
||||
// 🔹 File ID Row
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
RichText(
|
||||
text: TextSpan(
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'File ID : ',
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: width * 0.04,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text: '${item.id}',
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: width * 0.04,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
],
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
/// 🔹 File ID
|
||||
RichText(
|
||||
text: TextSpan(
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'File ID : ',
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.04,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text: '${item.id}',
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: width * 0.04,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
/// 🔥 Status + Chat Icon
|
||||
Row(
|
||||
children: [
|
||||
/// 🔴 Waiting / Pending / Cancelled
|
||||
if (item.status == 'Waiting for Admin' ||
|
||||
item.status == 'Payment Pending' ||
|
||||
item.status == 'Cancelled By Admin')
|
||||
Container(
|
||||
width: width * 0.4,
|
||||
height: height * 0.04,
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFFFFE8E8),
|
||||
borderRadius: BorderRadius.circular(5.52),
|
||||
border: Border.all(
|
||||
color: const Color(0xFFFFD7D7),
|
||||
width: 1.84,
|
||||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.25),
|
||||
blurRadius: 7.17,
|
||||
offset: const Offset(0, 3.68),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: Center(
|
||||
child: Text(
|
||||
item.status.toString(),
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: 11.03,
|
||||
color: const Color(0xFFFF0F0F),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
/// 🟢 In Progress
|
||||
if (item.status == 'In Progress')
|
||||
Container(
|
||||
width: 98,
|
||||
height: 34.9,
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFFEAFAE6),
|
||||
borderRadius: BorderRadius.circular(6.21),
|
||||
border: Border.all(
|
||||
color: const Color(0xFFDDFFDD),
|
||||
width: 2.07,
|
||||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.25),
|
||||
blurRadius: 8.08,
|
||||
offset: const Offset(0, 4.14),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: Center(
|
||||
child: Text(
|
||||
'In Progress',
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: 12.43,
|
||||
color: const Color(0xFF12800C),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
/// 🟡 Completed
|
||||
if (item.status == 'Completed')
|
||||
Container(
|
||||
width: 87,
|
||||
height: 31,
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFFFAF7E6),
|
||||
borderRadius: BorderRadius.circular(5.52),
|
||||
border: Border.all(
|
||||
color: const Color(0xFFFFE9DD),
|
||||
width: 1.84,
|
||||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.25),
|
||||
blurRadius: 7.17,
|
||||
offset: const Offset(0, 3.68),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: Center(
|
||||
child: Text(
|
||||
'Completed',
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: 11.03,
|
||||
color: const Color(0xFFFF630F),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
/// 🔥 Space between status & icon
|
||||
const SizedBox(width: 8),
|
||||
if ((item.status == 'Completed' ||
|
||||
item.status == 'Cancelled By Admin' ||
|
||||
item.status == 'In Progress') &&
|
||||
item.chatId != null &&
|
||||
item.chatId.toString().isNotEmpty &&
|
||||
item.chatId.toString() != "0") ...[
|
||||
|
||||
/// 💬 Chat Icon with Badge
|
||||
Builder(builder: (context) {
|
||||
final chatIdStr = item.chatId.toString();
|
||||
final countAsync = ref.watch(countProvider(chatIdStr));
|
||||
|
||||
return GestureDetector(
|
||||
onTap: () {
|
||||
final chatid = int.tryParse(chatIdStr) ?? 0;
|
||||
if (chatid == 0) return;
|
||||
|
||||
if (item.status == 'In Progress') {
|
||||
Get.to(() => LiveChatScreen(
|
||||
fileid: item.id.toString(),
|
||||
chatid: chatid,
|
||||
))?.then((_) {
|
||||
ref.read(notificationTriggerProvider.notifier).state++;
|
||||
ref.invalidate(chatMessagesProvider(chatid));
|
||||
ref.invalidate(countProvider(chatIdStr));
|
||||
});
|
||||
} else {
|
||||
Get.to(() => CompletedLiveChatScreen(
|
||||
fileid: item.id.toString(),
|
||||
chatid: chatid,
|
||||
))?.then((_) {
|
||||
ref.read(notificationTriggerProvider.notifier).state++;
|
||||
ref.invalidate(chatMessagesProvider(chatid));
|
||||
ref.invalidate(countProvider(chatIdStr));
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
child: Stack(
|
||||
clipBehavior: Clip.none,
|
||||
children: [
|
||||
/// 🔵 Chat Icon
|
||||
Container(
|
||||
width: 39,
|
||||
height: 39,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: const Color(0xFF61277A),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.25),
|
||||
blurRadius: 8.08,
|
||||
offset: const Offset(0, 4.14),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: const Center(
|
||||
child: Icon(
|
||||
Icons.message,
|
||||
color: Colors.white,
|
||||
size: 20,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
/// 🔴 Badge
|
||||
countAsync.when(
|
||||
data: (countData) => countData.count > 0
|
||||
? Positioned(
|
||||
top: -4,
|
||||
right: -4,
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(4),
|
||||
decoration: const BoxDecoration(
|
||||
color: Colors.red,
|
||||
shape: BoxShape.circle,
|
||||
),
|
||||
constraints: const BoxConstraints(
|
||||
minWidth: 16,
|
||||
minHeight: 16,
|
||||
),
|
||||
child: Text(
|
||||
'${countData.count}',
|
||||
textAlign: TextAlign.center,
|
||||
style: const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 10,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
: const SizedBox.shrink(),
|
||||
loading: () => const SizedBox.shrink(),
|
||||
error: (_, __) => const SizedBox.shrink(),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}),
|
||||
|
||||
// 🔹 Status Badges
|
||||
if (item.status == 'Waiting for Admin' ||
|
||||
item.status == 'Payment Pending' ||
|
||||
item.status == 'Cancelled By Admin')
|
||||
Container(
|
||||
width: width * 0.3,
|
||||
height: height * 0.04,
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFFFFE8E8),
|
||||
borderRadius: BorderRadius.circular(5.52),
|
||||
border: Border.all(
|
||||
color: const Color(0xFFFFD7D7),
|
||||
width: 1.84,
|
||||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.25),
|
||||
blurRadius: 7.17,
|
||||
offset: const Offset(0, 3.68),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: Center(
|
||||
child: Text(
|
||||
item.status.toString(),
|
||||
style: const TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w400,
|
||||
fontSize: 11.03,
|
||||
color: Color(0xFFFF0F0F),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
// 🔹 In Progress Badge
|
||||
if (item.status == 'In Progress')
|
||||
Container(
|
||||
width: 98,
|
||||
height: 34.9,
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFFEAFAE6),
|
||||
borderRadius: BorderRadius.circular(6.21),
|
||||
border: Border.all(
|
||||
color: const Color(0xFFDDFFDD),
|
||||
width: 2.07,
|
||||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.25),
|
||||
blurRadius: 8.08,
|
||||
offset: const Offset(0, 4.14),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: const Center(
|
||||
child: Text(
|
||||
'In Progress',
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w400,
|
||||
fontSize: 12.43,
|
||||
letterSpacing: 0.03,
|
||||
color: Color(0xFF12800C),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
// 🔹 Completed Badge
|
||||
if (item.status == 'Completed')
|
||||
Container(
|
||||
width: 87,
|
||||
height: 31,
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFFFAF7E6),
|
||||
borderRadius: BorderRadius.circular(5.52),
|
||||
border: Border.all(
|
||||
color: const Color(0xFFFFE9DD),
|
||||
width: 1.84,
|
||||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.25),
|
||||
blurRadius: 7.17,
|
||||
offset: const Offset(0, 3.68),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: const Center(
|
||||
child: Text(
|
||||
'Completed',
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w400,
|
||||
fontSize: 11.03,
|
||||
letterSpacing: 0.03,
|
||||
color: Color(0xFFFF630F),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
]
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
SizedBox(height: height * 0.015),
|
||||
|
||||
@@ -198,18 +311,14 @@ class PendingScreen extends ConsumerWidget {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'Request Type : ',
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: width * 0.035,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text: item.service,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w500,
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
@@ -228,21 +337,17 @@ class PendingScreen extends ConsumerWidget {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'Date : ',
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: width * 0.035,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text: item.createdDate,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: width * 0.035,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
@@ -253,21 +358,17 @@ class PendingScreen extends ConsumerWidget {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'Time : ',
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: width * 0.035,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text: item.createdTime,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: width * 0.035,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
@@ -283,18 +384,14 @@ class PendingScreen extends ConsumerWidget {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: 'Message : ',
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: width * 0.035,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text: item.message,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w500,
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: width * 0.035,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
@@ -314,9 +411,7 @@ class PendingScreen extends ConsumerWidget {
|
||||
children: [
|
||||
Text(
|
||||
"Total Amount",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: width * 0.038,
|
||||
color: const Color(0xFF111827),
|
||||
),
|
||||
@@ -357,14 +452,12 @@ class PendingScreen extends ConsumerWidget {
|
||||
),
|
||||
],
|
||||
),
|
||||
child: const Center(
|
||||
child: Center(
|
||||
child: Text(
|
||||
"Pay Now",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 16,
|
||||
color: Color(0xFF61277A),
|
||||
color: const Color(0xFF61277A),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -399,12 +492,10 @@ class PendingScreen extends ConsumerWidget {
|
||||
),
|
||||
],
|
||||
),
|
||||
child: const Center(
|
||||
child: Center(
|
||||
child: Text(
|
||||
"View Details",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 16,
|
||||
color: Colors.white,
|
||||
),
|
||||
@@ -434,12 +525,10 @@ class PendingScreen extends ConsumerWidget {
|
||||
],
|
||||
),
|
||||
alignment: Alignment.center,
|
||||
child: const Text(
|
||||
child: Text(
|
||||
"Payment Status: Paid",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w400,
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
fontSize: 12.08,
|
||||
letterSpacing: 0.04,
|
||||
height: 1.3,
|
||||
@@ -474,12 +563,10 @@ class PendingScreen extends ConsumerWidget {
|
||||
),
|
||||
],
|
||||
),
|
||||
child: const Center(
|
||||
child: Center(
|
||||
child: Text(
|
||||
"View Details",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 16,
|
||||
color: Colors.white,
|
||||
),
|
||||
@@ -519,12 +606,10 @@ class PendingScreen extends ConsumerWidget {
|
||||
),
|
||||
],
|
||||
),
|
||||
child: const Center(
|
||||
child: Center(
|
||||
child: Text(
|
||||
"View Details",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 16,
|
||||
color: Colors.white,
|
||||
),
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:taxglide/consts/app_style.dart';
|
||||
import 'package:taxglide/view/screens/history/flitter_popup.dart';
|
||||
import 'package:taxglide/view/screens/history/pending_screen.dart';
|
||||
|
||||
@@ -57,15 +58,13 @@ class _ServicesStatusScreenState extends ConsumerState<ServicesStatusScreen>
|
||||
children: [
|
||||
const SizedBox(width: 40), // ✅ Left side space balance
|
||||
// ✅ CENTER TITLE
|
||||
const Text(
|
||||
"Service Status",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: 24,
|
||||
color: Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
Text(
|
||||
"My Task Status",
|
||||
style: AppTextStyles.bold.copyWith(
|
||||
fontSize: 24,
|
||||
color: Color(0xFF111827),
|
||||
),
|
||||
),
|
||||
|
||||
// ✅ RIGHT SIDE FILTER ICON
|
||||
GestureDetector(
|
||||
@@ -126,21 +125,17 @@ class _ServicesStatusScreenState extends ConsumerState<ServicesStatusScreen>
|
||||
),
|
||||
labelColor: const Color(0xFF5F297B),
|
||||
unselectedLabelColor: const Color(0xFF6C7278),
|
||||
labelStyle: const TextStyle(
|
||||
fontFamily: "Gilroy-SemiBold",
|
||||
fontWeight: FontWeight.w600,
|
||||
labelStyle: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 16,
|
||||
height: 1.4,
|
||||
letterSpacing: 0.03,
|
||||
color: Color(0xFF5F297B),
|
||||
color: const Color(0xFF5F297B),
|
||||
),
|
||||
unselectedLabelStyle: const TextStyle(
|
||||
fontFamily: "Gilroy-Regular",
|
||||
fontWeight: FontWeight.w400,
|
||||
unselectedLabelStyle: AppTextStyles.regular.copyWith(
|
||||
fontSize: 16,
|
||||
height: 1.4,
|
||||
letterSpacing: 0.03,
|
||||
color: Color(0xFF6C7278),
|
||||
color: const Color(0xFF6C7278),
|
||||
),
|
||||
tabs: _tabs.map((tab) => Tab(text: tab)).toList(),
|
||||
),
|
||||
|
||||
Reference in new issue
Block a user