Skip to content

GitLab

Commit 528df0d2 authored by Sai Srinivas's avatar Sai Srinivas
Browse files

14-05-2025 By Sai Srinivas 

All UI Adjustments and Font Sizes
parent fd946558
Expand all Show whitespace changes
Inline Side-by-side
lib/screens/serviceEngineer/MonthlyCollection.dart
View file @ 528df0d2
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/PaymentCollectionProvider.dart';
import 'package:generp/Utils/commonWidgets.dart';
import 'package:generp/screens/WebERPScreen.dart';
import 'package:provider/provider.dart';
......@@ -32,60 +33,39 @@ class _MonthlycollectionState extends State<Monthlycollection> {
Widget build(BuildContext context) {
return Consumer<Paymentcollectionprovider>(
builder: (context, provider, child) {
return Scaffold(
backgroundColor: AppColors.scaffold_bg_color,
appBar: AppBar(
automaticallyImplyLeading: false,
elevation: 2.0,
title: SizedBox(
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
InkResponse(
onTap: () => Navigator.pop(context, true),
child: SvgPicture.asset(
"assets/svg/app_bar_back.svg",
height: 25,
),
),
Text(
"Payment Collection",
style: TextStyle(
fontSize: 16,
height: 1.1,
color: AppColors.semi_black,
),
),
Spacer(),
InkResponse(
onTap: () {
Navigator.push(
var sendWidget = InkResponse(
onTap: () async {
var res = await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => Accountsuggestions(),
),
MaterialPageRoute(builder: (context) => Accountsuggestions()),
);
if(res==true){
provider.PaymentCollectionAPI(context);
}
},
child: SvgPicture.asset("assets/svg/scanner.svg"),
),
],
),
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
bottom: Radius.circular(30), // Adjust the radius as needed
),
),
child: SvgPicture.asset(
"assets/svg/add_account.svg",
width: 20,
color: Color(0xFF2D2D2D),
height: 20,
),
body: Container(
);
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
appBar: appbar2(context, "Payment Collection", sendWidget),
body: provider.paymenCollectionList.isNotEmpty?Container(
child: ListView.builder(
scrollDirection: Axis.vertical,
shrinkWrap: true,
physics: AlwaysScrollableScrollPhysics(),
itemCount: provider.paymenCollectionList.length,
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 10),
itemBuilder: (context, index) {
return Container(
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 10),
margin: EdgeInsets.symmetric(vertical: 5),
......@@ -102,27 +82,59 @@ class _MonthlycollectionState extends State<Monthlycollection> {
children: [
Expanded(
flex: 1,
child: Container(
padding: EdgeInsets.symmetric(
horizontal: 10,
vertical: 10,
),
decoration: BoxDecoration(
color: Color(0xFFE6F6FF),
borderRadius: BorderRadius.circular(8),
),
child: SvgPicture.asset(
width: 30,
height: 30,
"assets/svg/se_block_head.svg",
),
),
SizedBox(width: 5),
),
SizedBox(width: 10),
Column(
Expanded(
flex: 4,
child: SizedBox(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"${provider.paymenCollectionList[index].accountName}",
style: TextStyle(
fontFamily: "JakartaMedium"
),
),
Text(
"₹${provider.paymenCollectionList[index].amount}",
style: TextStyle(color: AppColors.app_blue),
),
// Text("Gen Pvt. Ltd"),
],
),
Spacer(),
Expanded(
flex: 2,
),
),
Container(
height: 35,
padding: EdgeInsets.symmetric(horizontal: 10),
decoration: BoxDecoration(
color: Color(0xFFE3FFE0),
borderRadius: BorderRadius.circular(8),
),
child: Center(
child: Text(
"₹${provider.paymenCollectionList[index].amount}",
style: TextStyle(color: AppColors.app_blue),
"${provider.paymenCollectionList[index].approvalStatus}",
style: TextStyle(
fontSize: 13,
color: Color(0xFF0D9C00)),
),
),
),
// Expanded(
......@@ -136,7 +148,14 @@ class _MonthlycollectionState extends State<Monthlycollection> {
// ),
],
),
SizedBox(height: 10),
Padding(
padding: const EdgeInsets.all(8.0),
child: Divider(
thickness: 0.5,
color: Color(0xFFD7D7D7),
),
),
SizedBox(height: 5),
...List.generate(2, (j) {
final textheads = ["ID", "Generator Type"];
final textSubheads = [
......@@ -148,43 +167,26 @@ class _MonthlycollectionState extends State<Monthlycollection> {
child: Column(
children: [
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(textheads[j].toString()),
Text(textSubheads[j].toString()),
],
),
if (j == 1)
Container(
height: 30,
padding: EdgeInsets.symmetric(
horizontal: 10,
),
decoration: BoxDecoration(
color: Color(0xFFE3FFE0),
borderRadius: BorderRadius.circular(8),
Expanded(
flex: 1,
child: Text(textheads[j].toString(),style: TextStyle(
fontFamily: "JakartaMedium"
),),
),
child: Center(
SizedBox(width: 5),
Expanded(
flex: 2,
child: Text(
"${provider.paymenCollectionList[index].approvalStatus}",
textSubheads[j].toString(),
style: TextStyle(
color: Color(0xFF0D9C00),
),
color: Color(0xFF818181),
),
),
),
],
),
if (j == 0)
Divider(
thickness: 0.5,
color: Color(0xFFD7D7D7),
),
],
),
);
......@@ -213,7 +215,7 @@ class _MonthlycollectionState extends State<Monthlycollection> {
children: [
Text(
"View Attachment",
style: TextStyle(color: AppColors.app_blue),
style: TextStyle(color: AppColors.app_blue,fontFamily: "JakartaMedium"),
),
SizedBox(width: 5),
SvgPicture.asset("assets/svg/next_button.svg"),
......@@ -226,6 +228,7 @@ class _MonthlycollectionState extends State<Monthlycollection> {
);
},
),
):Emptywidget(context),
),
);
},
......
lib/screens/serviceEngineer/PCWallet.dart
View file @ 528df0d2
This diff is collapsed.
lib/screens/serviceEngineer/VisitDetails.dart
View file @ 528df0d2
......@@ -37,7 +37,10 @@ class _VisitdetailsState extends State<Visitdetails> {
var customerDetails = provider.customerDetails;
var generatorDetails = provider.generatorDetails;
var complaintDetails = provider.complaintDetailsNew;
return Scaffold(
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar(context, "Visit Details"),
backgroundColor: AppColors.scaffold_bg_color,
body: Container(
......@@ -330,6 +333,7 @@ class _VisitdetailsState extends State<Visitdetails> {
),
floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat,
),
);
},
);
......
lib/screens/serviceEngineer/scanComplaintDetails.dart 0 → 100644
View file @ 528df0d2
This diff is collapsed.
lib/screens/splash.dart
View file @ 528df0d2
This diff is collapsed.
lib/services/api_calling.dart
View file @ 528df0d2
This diff is collapsed.
pubspec.lock
View file @ 528df0d2
This diff is collapsed.
pubspec.yaml
View file @ 528df0d2
This diff is collapsed.
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