Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed railway screen overflow #206

Merged
merged 1 commit into from
Jul 15, 2024
Merged

fixed railway screen overflow #206

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 59 additions & 45 deletions lib/new_ui/screens/railway_screen/railway_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,13 +739,13 @@ class _RailwayConcessionScreenState
),
Container(
width: size.width,
height: size.height*0.4,
//height: size.height*0.4,
decoration: const BoxDecoration(
color: oldDateSelectBlue,
border: Border.symmetric(vertical: BorderSide(color: Colors.white),),
),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 10,horizontal: 20),
padding: const EdgeInsets.fromLTRB(20, 10, 20, 40),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
Expand Down Expand Up @@ -797,19 +797,23 @@ class _RailwayConcessionScreenState
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("Certificate Number", style: TextStyle(color: Color(0xffe3e3e3), fontSize: 12),),
Text("${concessionRequestData != null ? concessionRequestData.passNum : "not assigned"}", style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),),
],
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("Certificate Number", style: TextStyle(color: Color(0xffe3e3e3), fontSize: 12),),
Text("${concessionRequestData != null ? concessionRequestData.passNum : "not assigned"}", style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),),
],
),
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text("Date of Issue", style: TextStyle(color: Color(0xffe3e3e3), fontSize: 12),),
Text(formattedDate, style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),),
],
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text("Date of Issue", style: TextStyle(color: Color(0xffe3e3e3), fontSize: 12),),
Text(formattedDate, style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),),
],
),
)
],
),
Expand All @@ -820,26 +824,32 @@ class _RailwayConcessionScreenState
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("Travel Lane", style: TextStyle(color: Color(0xffe3e3e3), fontSize: 12),),
Text("${travelLane}", style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),),
],
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("From", style: TextStyle(color: Color(0xffe3e3e3), fontSize: 12),),
Text("${homeStation}", style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),),
],
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("Travel Lane", style: TextStyle(color: Color(0xffe3e3e3), fontSize: 12),),
Text("${travelLane}", style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),),
],
),
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("From", style: TextStyle(color: Color(0xffe3e3e3), fontSize: 12),),
Text("${homeStation}", style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),),
],
),
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text("To", style: TextStyle(color: Color(0xffe3e3e3), fontSize: 12),),
Text("Bandra", style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),),
],
const Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text("To", style: TextStyle(color: Color(0xffe3e3e3), fontSize: 12),),
Text("Bandra", style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),),
],
),
)
],
),
Expand All @@ -849,19 +859,23 @@ class _RailwayConcessionScreenState
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("Duration of pass", style: TextStyle(color: Color(0xffe3e3e3), fontSize: 12),),
Text("${duration}", style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),),
],
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("Duration of pass", style: TextStyle(color: Color(0xffe3e3e3), fontSize: 12),),
Text("${duration}", style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),),
],
),
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text("Class", style: TextStyle(color: Color(0xffe3e3e3), fontSize: 12),),
Text(travelClass == "I" ? "First Class" : "Second Class", style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),),
],
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text("Class", style: TextStyle(color: Color(0xffe3e3e3), fontSize: 12),),
Text(travelClass == "I" ? "First Class" : "Second Class", style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),),
],
),
),
],
),
Expand Down
Loading