Skip to content

GitLab

Commit 9fbbf730 authored by Sai Srinivas's avatar Sai Srinivas
Browse files

Complain bill design changes

parent 2a087139
Hide whitespace changes
Inline Side-by-side
lib/screens/serviceEngineer/VisitDetails.dart
View file @ 9fbbf730
...@@ -1019,6 +1019,8 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -1019,6 +1019,8 @@ class _VisitdetailsState extends State<Visitdetails> {
width: double.infinity, width: double.infinity,
height: 350, height: 350,
child: ListView.builder( child: ListView.builder(
shrinkWrap: true, //
physics: NeverScrollableScrollPhysics(), //
padding: EdgeInsets.all(12), padding: EdgeInsets.all(12),
itemCount: complaintBillList!.length, itemCount: complaintBillList!.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
...@@ -1027,8 +1029,7 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -1027,8 +1029,7 @@ class _VisitdetailsState extends State<Visitdetails> {
margin: EdgeInsets.only(bottom: 12), margin: EdgeInsets.only(bottom: 12),
elevation: 0, elevation: 0,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
child: Padding( child: Padding(padding: const EdgeInsets.all(14),
padding: const EdgeInsets.all(14),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
...@@ -1052,7 +1053,7 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -1052,7 +1053,7 @@ class _VisitdetailsState extends State<Visitdetails> {
), ),
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
child: SvgPicture.asset( child: SvgPicture.asset(
"assets/svg/compliant_list_ic.svg", "assets/svg/order/tpc_details_req_ic.svg",
), ),
), ),
...@@ -1065,30 +1066,34 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -1065,30 +1066,34 @@ class _VisitdetailsState extends State<Visitdetails> {
children: [ children: [
Text( Text(
item.narration ?? "-", item.narration ?? "-",
style: const TextStyle( style: TextStyle(
fontFamily: "Plus Jakarta Sans", fontFamily:
fontWeight: FontWeight.w400, "JakartaMedium",
fontSize: 14, fontSize: 14,
color: Colors.black87, color:
AppColors
.semi_black,
), ),
), ),
const SizedBox(height: 3), const SizedBox(height: 3),
Text( if (item.billPaid != "0")
item.dueDate ?? "-", Text(item.totalAmount ?? "",
style: TextStyle( style: TextStyle(
fontFamily: "JakartaRegular", fontSize: 14,
fontSize: 12, color: AppColors.app_blue,
fontWeight: FontWeight.w400, ),),
color: Colors.grey.shade600,
height: 1.4,
),
),
], ],
), ),
), ),
if (item.billPaid != "1")
Text(item.totalAmount ?? "",
style: TextStyle(
fontSize: 14,
color: AppColors.app_blue,
),),
// Call // Call
if (item.billPaid == "0") if (item.billPaid != "0")
InkResponse( InkResponse(
onTap: (){ onTap: (){
var homeProvider = Provider.of<HomescreenNotifier>( var homeProvider = Provider.of<HomescreenNotifier>(
...@@ -1106,13 +1111,52 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -1106,13 +1111,52 @@ class _VisitdetailsState extends State<Visitdetails> {
)) ))
); );
}, },
child: Text("Pay Now", style: TextStyle( child: Container(
fontSize: 14, padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
color: AppColors.app_blue, decoration: BoxDecoration(
),), color: Colors.white,
border: Border.all(
color: AppColors.app_blue,
width: 1,
),
borderRadius: BorderRadius.circular(8),
),
child: Text("Pay Now", style: TextStyle(
fontSize: 14,
color: Colors.black87,
),),
),
) )
], ],
), ),
SizedBox(height: 10,),
Row(
children: [
Expanded(
flex: 2,
child: Text(
"Time",
style: TextStyle(
fontSize: 14,
fontFamily: "JakartaSemiBold",
),
),
),
Expanded(
flex: 7,
child: DottedLine(
dashGapLength: 4,
dashGapColor: Colors.white,
dashColor: AppColors.grey_semi,
dashLength: 2,
lineThickness: 0.5,
),
),
],
),
SizedBox(height: 4,),
_detailRow("Bill Date", item.billDate),
_detailRow("Due Date", item.dueDate),
], ],
), ),
), ),
...@@ -1345,18 +1389,28 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -1345,18 +1389,28 @@ class _VisitdetailsState extends State<Visitdetails> {
Widget _detailRow(String title, String? value) { Widget _detailRow(String title, String? value) {
return Padding( return Padding(
padding: const EdgeInsets.only(bottom: 8), padding: EdgeInsets.symmetric(
vertical: 3,
),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text(
"$title: ",
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 14),
),
Expanded( Expanded(
child: Text( child: Text(
value ?? "--", "$title: ",
style: TextStyle(fontSize: 14), style: TextStyle(
fontFamily: "JakartaRegular",
fontSize: 14,
color: AppColors.semi_black,
),
),
),
Text(
value ?? "--",
style: TextStyle(
fontSize: 14,
color: AppColors.grey_semi,
), ),
), ),
], ],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment