Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix the stepper

Browse Source
merge-requests/431/head
Elham Rababah 4 years ago
parent e4f9d1f155
commit 5f482663dd
3 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File

5
lib/screens/doctor/doctor_repaly_chat.dart
Unescape Escape View File

@ -43,10 +43,11 @@ class DoctorReplayChat extends StatelessWidget {
decoration: BoxDecoration(
color: Colors.white,
),
height: 150,
height: 130,
child: Container(
color: Colors.red,
padding: EdgeInsets.only(
left: 10, right: 10, bottom: 10),
left: 10, right: 10),
margin: EdgeInsets.only(top: 50),
child: Column(
children: [

4
lib/widgets/doctor/my_schedule_widget.dart
Unescape Escape View File

@ -31,7 +31,7 @@ class MyScheduleWidget extends StatelessWidget {
),
AppText(
workingHoursTable.dayName,
fontSize: 2.5 * SizeConfig.textMultiplier,
fontSize: 18,
fontFamily: 'Poppins',
// fontSize: 18
),
@ -40,7 +40,7 @@ class MyScheduleWidget extends StatelessWidget {
),
AppText(
' ${workingHoursTable.date.day} ${(DateUtils.getMonth(workingHoursTable.date.month).toString().substring(0, 3))}',
fontSize: 2.5 * SizeConfig.textMultiplier,
fontSize: 18,
fontWeight: FontWeight.w700,
fontFamily: 'Poppins',
// fontSize: 18

75
lib/widgets/patients/profile/soap_update/steps_widget.dart
Unescape Escape View File

@ -32,7 +32,7 @@ class StepsWidget extends StatelessWidget {
),
),
Positioned(
top: 45,
top: 50,
left: 0,
child: InkWell(
onTap: () => changeCurrentTab(0),
@ -40,8 +40,8 @@ class StepsWidget extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 50,
height:50,
width: 38,
height: 38,
decoration: BoxDecoration(
border: index == 0
? Border.all(color: Color(0xFFCC9B14), width: 2)
@ -57,7 +57,7 @@ class StepsWidget extends StatelessWidget {
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 25,
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
),
@ -70,7 +70,7 @@ class StepsWidget extends StatelessWidget {
AppText(
"Subjective",
fontWeight: FontWeight.bold,
fontSize: 14,
fontSize: 12,
),
StatusLabel(selectedStepId: index, stepId: 0,),
@ -81,7 +81,7 @@ class StepsWidget extends StatelessWidget {
),
),
Positioned(
top: 45,
top: 50,
left: MediaQuery
.of(context)
.size
@ -92,8 +92,8 @@ class StepsWidget extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width: 50,
height: 50,
width: 38,
height: 38,
decoration: BoxDecoration(
border: index == 1
? Border.all(color: Color(0xFFCC9B14), width: 2)
@ -109,7 +109,7 @@ class StepsWidget extends StatelessWidget {
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 25,
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
),
@ -122,7 +122,7 @@ class StepsWidget extends StatelessWidget {
AppText(
"Objective",
fontWeight: FontWeight.bold,
fontSize: 14,
fontSize: 12,
),
StatusLabel(selectedStepId: index, stepId: 1,),
@ -134,7 +134,7 @@ class StepsWidget extends StatelessWidget {
),
),
Positioned(
top: 45,
top: 50,
left: MediaQuery
.of(context)
.size
@ -148,8 +148,8 @@ class StepsWidget extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width:50,
height:50,
width: 38,
height: 38,
decoration: BoxDecoration(
border: index == 2
? Border.all(color: Color(0xFFCC9B14), width: 2)
@ -165,7 +165,7 @@ class StepsWidget extends StatelessWidget {
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 25,
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
),
@ -178,7 +178,7 @@ class StepsWidget extends StatelessWidget {
AppText(
"Assessment",
fontWeight: FontWeight.bold,
fontSize: 14,
fontSize: 12,
),
StatusLabel(selectedStepId: index, stepId: 2,),
],
@ -188,16 +188,16 @@ class StepsWidget extends StatelessWidget {
),
),
Positioned(
top: 45,
top: 50,
right: 0,
child: InkWell(
onTap: () => index >= 3 ? changeCurrentTab(4) : null,
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Container(
width:50,
height:50,
width: 38,
height: 38,
decoration: BoxDecoration(
border: index == 3
? Border.all(color: Color(0xFFCC9B14), width: 2)
@ -213,7 +213,7 @@ class StepsWidget extends StatelessWidget {
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 25,
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
),
@ -227,7 +227,7 @@ class StepsWidget extends StatelessWidget {
"Plan",
fontWeight: FontWeight.bold,
textAlign: TextAlign.center,
fontSize: 14,
fontSize: 12,
),
StatusLabel(selectedStepId: index, stepId: 3,),
],
@ -257,7 +257,7 @@ class StepsWidget extends StatelessWidget {
),
),
Positioned(
top: 45,
top: 50,
right: 0,
child: InkWell(
onTap: () => changeCurrentTab(0),
@ -265,8 +265,8 @@ class StepsWidget extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 50,
height:50,
width: 38,
height: 38,
decoration: BoxDecoration(
border: index == 0
? Border.all(color: Color(0xFFCC9B14), width: 2)
@ -282,7 +282,7 @@ class StepsWidget extends StatelessWidget {
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 25,
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
),
@ -299,7 +299,7 @@ class StepsWidget extends StatelessWidget {
),
),
Positioned(
top: 45,
top: 50,
right: MediaQuery
.of(context)
.size
@ -310,8 +310,8 @@ class StepsWidget extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width: 50,
height: 50,
width: 38,
height: 38,
decoration: BoxDecoration(
border: index == 1
? Border.all(color: Color(0xFFCC9B14), width: 2)
@ -327,7 +327,7 @@ class StepsWidget extends StatelessWidget {
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 25,
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
),
@ -355,8 +355,8 @@ class StepsWidget extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width:50,
height:50,
width: 38,
height: 38,
decoration: BoxDecoration(
border: index == 2
? Border.all(color: Color(0xFFCC9B14), width: 2)
@ -372,7 +372,7 @@ class StepsWidget extends StatelessWidget {
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 25,
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
),
@ -393,7 +393,7 @@ class StepsWidget extends StatelessWidget {
),
),
Positioned(
top: 45,
top: 50,
left: 0,
child: InkWell(
onTap: () => index >= 3 ? changeCurrentTab(4) : null,
@ -401,8 +401,8 @@ class StepsWidget extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width:50,
height:50,
width: 38,
height: 38,
decoration: BoxDecoration(
border: index == 3
? Border.all(color: Color(0xFFCC9B14), width: 2)
@ -418,7 +418,7 @@ class StepsWidget extends StatelessWidget {
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 25,
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
),
@ -453,7 +453,8 @@ class StatusLabel extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
padding: EdgeInsets.symmetric(horizontal: 5, vertical: 3),
width: 65,
padding: EdgeInsets.symmetric(horizontal: 2, vertical: 3),
decoration: BoxDecoration(
color: stepId == selectedStepId ? Color(0xFFF1E9D3) : stepId <
selectedStepId ? Color(0xFFD8E8DB) : Color(0xFFCCCCCC),

Write Preview
Loading…
Cancel
Save