Merge branch 'sultan_new_design' into 'development_new_design_2.0'

Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!443
merge-requests/445/merge
Sultan khan 3 years ago
commit e4c8575a7f

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="17" height="17" viewBox="0 0 17 17">
<g id="Group_8364" data-name="Group 8364" transform="translate(-238 -335)">
<circle id="Ellipse_4" data-name="Ellipse 4" cx="8.5" cy="8.5" r="8.5" transform="translate(238 335)" fill="#349745"/>
<text id="Check" transform="translate(242 347)" fill="#fff" font-size="9" font-family="FontAwesome5Free-Solid, 'Font Awesome \35 Free'" letter-spacing="-0.06em"><tspan x="0" y="0"></tspan></text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 503 B

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="14.068" height="14.94" viewBox="0 0 14.068 14.94">
<g id="Group_8471" data-name="Group 8471" transform="translate(-325.503 -184.253)">
<path id="Path_5005" data-name="Path 5005" d="M9.7,3.407h2.814a.7.7,0,0,0,0-1.407H9.7a.7.7,0,0,0,0,1.407Z" transform="translate(321.427 182.253)" fill="#5a282e"/>
<path id="Path_5004" data-name="Path 5004" d="M15.365,5H2.7a.7.7,0,1,0,0,1.407H4.11v8.441a2.111,2.111,0,0,0,2.11,2.11h5.627a2.111,2.111,0,0,0,2.11-2.11V6.407h1.407a.7.7,0,1,0,0-1.407ZM8.331,12.738a.7.7,0,1,1-1.407,0V9.221a.7.7,0,1,1,1.407,0Zm2.814,0a.7.7,0,1,1-1.407,0V9.221a.7.7,0,1,1,1.407,0Z" transform="translate(323.503 182.235)" fill="#5a282e"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 721 B

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="17" height="17" viewBox="0 0 17 17">
<g id="Group_8365" data-name="Group 8365" transform="translate(-238 -335)">
<circle id="Ellipse_4" data-name="Ellipse 4" cx="8.5" cy="8.5" r="8.5" transform="translate(238 335)" fill="#d02127"/>
<path id="close_3_" data-name="close (3)" d="M4.449,3.9,7.377.967A.487.487,0,0,0,6.688.279L3.76,3.207.832.279A.487.487,0,0,0,.143.967L3.071,3.9.143,6.824a.487.487,0,1,0,.689.689L3.76,4.584,6.688,7.512a.487.487,0,0,0,.689-.689Zm0,0" transform="translate(242.74 339.604)" fill="#fff" stroke="#fff" stroke-width="0.75"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 621 B

@ -0,0 +1,10 @@
<svg id="switch" xmlns="http://www.w3.org/2000/svg" width="15.172" height="15.172" viewBox="0 0 15.172 15.172">
<path id="Path_5147" data-name="Path 5147" d="M16.48,8.057a.474.474,0,0,1-.474-.474V4.738a.791.791,0,0,0-.79-.79H10.474a.474.474,0,1,1,0-.948h4.741a1.74,1.74,0,0,1,1.738,1.738V7.583A.474.474,0,0,1,16.48,8.057Z" transform="translate(-3.678 -1.104)" fill="#5a282e"/>
<path id="Path_5148" data-name="Path 5148" d="M19.33,9.8A.47.47,0,0,1,19,9.665L17.889,8.559a.474.474,0,0,1,.335-.809h2.213a.474.474,0,0,1,.335.809L19.666,9.665A.47.47,0,0,1,19.33,9.8Z" transform="translate(-6.529 -2.851)" fill="#5a282e"/>
<path id="Path_5149" data-name="Path 5149" d="M8.215,18.057H4.738A1.74,1.74,0,0,1,3,16.319V13.474a.474.474,0,1,1,.948,0v2.845a.791.791,0,0,0,.79.79H8.215a.474.474,0,1,1,0,.948Z" transform="translate(-1.104 -4.782)" fill="#5a282e"/>
<path id="Path_5150" data-name="Path 5150" d="M3.937,15.055H1.724a.474.474,0,0,1-.335-.809L2.5,13.139a.474.474,0,0,1,.671,0l1.106,1.106a.474.474,0,0,1-.336.809Z" transform="translate(-0.46 -4.782)" fill="#5a282e"/>
<circle id="Ellipse_186" data-name="Ellipse 186" cx="1.58" cy="1.58" r="1.58" transform="translate(1.58)" fill="#5a282e"/>
<path id="Path_5151" data-name="Path 5151" d="M4.583,6H1.738A1.74,1.74,0,0,0,0,7.738v.316a.474.474,0,0,0,.474.474H5.847a.474.474,0,0,0,.474-.474V7.738A1.74,1.74,0,0,0,4.583,6Z" transform="translate(0 -2.207)" fill="#5a282e"/>
<path id="Path_5152" data-name="Path 5152" d="M18.08,17.161a1.58,1.58,0,1,1,1.58-1.58A1.583,1.583,0,0,1,18.08,17.161Z" transform="translate(-6.069 -5.15)" fill="#5a282e"/>
<path id="Path_5153" data-name="Path 5153" d="M19.847,22.529H14.474A.474.474,0,0,1,14,22.055v-.316A1.74,1.74,0,0,1,15.738,20h2.845a1.74,1.74,0,0,1,1.738,1.738v.316A.474.474,0,0,1,19.847,22.529Z" transform="translate(-5.15 -7.357)" fill="#5a282e"/>
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

@ -231,7 +231,7 @@ const Map localizedValues = {
"unit": {"en": "Unit", "ar": "وحدة"},
"request": {"en": "Request", "ar": "طلبات الاضافة"},
"member-name": {"en": "Member Name", "ar": "اسم العضو"},
"switch-login": {"en": "Switch User", "ar": "تغير المستخدم"},
"switch-login": {"en": "Switch", "ar": "تغير "},
"remove-member": {"en": "Remove", "ar": "حذف"},
"allow-view": {"en": "Allow", "ar": "قبول"},
"reject-view": {"en": "Reject", "ar": "رفض"},
@ -1512,10 +1512,9 @@ const Map localizedValues = {
"modesBelow": {"en": "Please select the modes below:", "ar": ":الرجاء تحديد الأوضاع أدناه"},
"prefferedMode": {"en": "Please select the preferred mode below:", "ar": ":الرجاء تحديد الوضع المفضل أدناه"},
"permissionsBellow": {"en": "Please allow the permissions below:", "ar": ":الرجاء السماح الأذونات أدناه"},
"RequesterInfo": {"en": "Requester Info", "ar": "معلومات مقدم الطلب"},
"PatientInfo": {"en": "Patient Info", "ar": "معلومات المريض"},
"OtherInfo": {"en": "Other Info", "ar": "معلومات اخرى"},
"inPrgress": { "en": "In Progress", "ar": "في تقدم" },
"locked": { "en": "Locked", "ar": "مقفل" },
"inPrgress": {"en": "In Progress", "ar": "في تقدم"},
"locked": {"en": "Locked", "ar": "مقفل"},
};

@ -1,6 +1,5 @@
import 'dart:ui';
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
@ -35,6 +34,9 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/widgets/others/app_expandable_notifier.dart';
import 'package:flutter_svg/flutter_svg.dart';
class MyFamily extends StatefulWidget {
final bool isAppbarVisible;
@ -123,7 +125,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
controller: _tabController,
children: [myFamilyDetails(context), myFamilyRequest(context)],
)
: Container(child: AppText('Loading..')),
: Container(child: AppText('')),
),
],
),
@ -153,24 +155,28 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
builder: (BuildContext context, AsyncSnapshot<GetAllSharedRecordsByStatusResponse> snapshot) {
switch (snapshot.connectionState) {
case ConnectionState.waiting:
return Padding(padding: EdgeInsets.only(top: 50), child: Text('Loading....'));
return Padding(padding: EdgeInsets.only(top: 50), child: Text('Loading...'));
default:
if (snapshot.hasError)
return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable));
else
return ListView.separated(
itemBuilder: (context, index) {
snapshot.data.getAllSharedRecordsByStatusList[index].gender = 2;
if (snapshot.data.getAllSharedRecordsByStatusList[index].status == 3)
return Card(
margin: EdgeInsets.all(10),
shape: cardRadius(15),
shape: cardRadius(25),
color: snapshot.data.getAllSharedRecordsByStatusList[index].gender == 1 ? Color(0xff6EA8FF) : Color(0xffFDA4B0),
elevation: 3,
child: Container(
// height: 130,
width: MediaQuery.of(context).size.width,
padding: EdgeInsets.all(10),
child: Column(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Texts(
@ -189,27 +195,26 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
snapshot.data.getAllSharedRecordsByStatusList[index].genderDescription,
fontSize: 12,
color: Colors.white),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
],
),
Column(
children: [
Container(
margin: EdgeInsets.only(top: 5.0),
width: 100.0,
child: DefaultButton(
TranslationBase.of(context).switchUser,
() {
// setState(() {
// isSwitchUser = value;
// });
switchUser(snapshot.data.getAllSharedRecordsByStatusList[index], AppGlobal.context);
SizedBox(height: 10),
InkWell(
onTap: () {
switchUser(snapshot.data.getAllSharedRecordsByStatusList[index], context);
},
fontSize: 12.0,
color: Colors.white,
textColor: Colors.black,
),
child: Container(
decoration: BoxDecoration(color: Colors.black.withOpacity(0.1), borderRadius: BorderRadius.circular(20)),
padding: EdgeInsets.fromLTRB(15, 10, 15, 10),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset("assets/images/new-design/switch.svg",
height: 22, color: snapshot.data.getAllSharedRecordsByStatusList[index].gender == 1 ? Colors.white : Color(0Xff5A282E)),
SizedBox(
width: 5,
),
// Row(
// children: [
// CupertinoSwitch(
// value: isSwitchUser,
// onChanged: (value) {
@ -219,32 +224,39 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
// if (isSwitchUser == true) switchUser(snapshot.data.getAllSharedRecordsByStatusList[index], context);
// },
// ),
// Texts(
// TranslationBase.of(context).switchUser,
// color: Colors.white,
// fontSize: 12,
// )
// ],
// ),
Texts(TranslationBase.of(context).switchUser,
color: snapshot.data.getAllSharedRecordsByStatusList[index].gender == 1 ? Colors.white : Color(0Xff5A282E),
fontSize: 12,
fontWeight: FontWeight.bold)
],
))),
SizedBox(
height: 10,
),
InkWell(
onTap: () {
deleteFamily(snapshot.data.getAllSharedRecordsByStatusList[index], context);
},
child: Container(
decoration: BoxDecoration(color: Colors.black.withOpacity(0.1), borderRadius: BorderRadius.circular(20)),
padding: EdgeInsets.fromLTRB(15, 10, 15, 10),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Texts(
TranslationBase.of(context).delete,
color: Colors.white,
fontSize: 12,
),
Icon(
Icons.delete,
color: Colors.white,
SvgPicture.asset("assets/images/new-design/delete.svg",
height: 22, color: snapshot.data.getAllSharedRecordsByStatusList[index].gender == 1 ? Colors.white : Color(0Xff5A282E)),
SizedBox(
width: 5,
),
Texts(TranslationBase.of(context).delete,
color: snapshot.data.getAllSharedRecordsByStatusList[index].gender == 1 ? Colors.white : Color(0Xff5A282E),
fontSize: 12,
fontWeight: FontWeight.bold),
],
))
))),
SizedBox(height: 10),
],
)
),
],
)));
else if (checkActive(snapshot.data.getAllSharedRecordsByStatusList) == 0)
@ -277,28 +289,41 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
margin: EdgeInsets.only(top: 10),
child: Column(
children: <Widget>[
RoundedContainer(
child: ExpansionTile(
title: Text(
TranslationBase.of(context).userViewRequest,
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold, color: Colors.black),
),
children: <Widget>[
FutureBuilder(
FractionallySizedBox(
widthFactor: 1.0,
child: AppExpandableNotifier(
title: TranslationBase.of(context).userViewRequest,
bodyWidget: FutureBuilder(
future: getUserViewRequest(), // async work
builder: (BuildContext context, AsyncSnapshot<dynamic> snapshot) {
switch (snapshot.connectionState) {
case ConnectionState.waiting:
return Padding(padding: EdgeInsets.only(top: 50), child: Text('Loading....'));
return SizedBox();
default:
if (snapshot.hasError)
return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable));
else
return ListView.separated(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
itemBuilder: (context, _index) {
return Container(
padding: EdgeInsets.all(15),
child: Card(
elevation: 3,
shape: cardRadius(8),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
border: Border.all(width: 1, color: Color(0xffEFEFEF)),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: Colors.white),
child: Column(
children: [
Column(children: [
@ -309,21 +334,24 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
Expanded(flex: 1, child: AppText(TranslationBase.of(context).allow, fontWeight: FontWeight.w600)),
Expanded(flex: 1, child: AppText(TranslationBase.of(context).reject, fontWeight: FontWeight.w600)),
])),
Divider(color: Colors.black, height: 1),
Divider(color: Colors.black, height: 1.5, thickness: 1.5),
Column(
children: familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList.map<Widget>((result) {
return Container(
padding: EdgeInsets.all(10),
child: Row(
children: <Widget>[
Expanded(flex: 3, child: Text(result.patientName)),
Expanded(
flex: 3,
child: Texts(
result.patientName,
fontWeight: FontWeight.w600,
fontSize: 12,
)),
Expanded(
flex: 1,
child: IconButton(
icon: Icon(
Icons.check_circle,
color: Colors.black,
),
icon: SvgPicture.asset("assets/images/new-design/allow.svg", height: 22),
onPressed: () {
acceptRemoveRequest(result.iD, 3, context);
},
@ -331,10 +359,8 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
Expanded(
flex: 1,
child: IconButton(
icon: Icon(
Icons.delete,
color: Colors.black,
),
icon: SvgPicture.asset("assets/images/new-design/reject.svg", height: 22),
color: Colors.white,
onPressed: () {
acceptRemoveRequest(result.iD, 4, context);
},
@ -344,113 +370,247 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
}).toList())
])
],
)));
));
},
separatorBuilder: (context, index) => SizedBox(height: 14),
itemCount: 1);
}
})
],
),
),
RoundedContainer(
child: ExpansionTile(
title: Text(
TranslationBase.of(context).sentRequest,
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold, color: Colors.black),
),
children: <Widget>[
FutureBuilder(
},
))),
// RoundedContainer(
// child: ExpansionTile(
// title: Text(
// TranslationBase.of(context).userViewRequest,
// style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold, color: Colors.black),
// ),
// children: <Widget>[
// FutureBuilder(
// future: getUserViewRequest(), // async work
// builder: (BuildContext context, AsyncSnapshot<dynamic> snapshot) {
// switch (snapshot.connectionState) {
// case ConnectionState.waiting:
// return Padding(padding: EdgeInsets.only(top: 50), child: Text('Loading....'));
// default:
// if (snapshot.hasError)
// return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable));
// else
// return Container(
// padding: EdgeInsets.all(15),
// child: Card(
// elevation: 3,
// shape: cardRadius(8),
// child: Column(
// children: [
// Column(children: [
// Padding(
// padding: EdgeInsets.all(10),
// child: Row(children: [
// Expanded(flex: 3, child: AppText(TranslationBase.of(context).name, fontWeight: FontWeight.w600)),
// Expanded(flex: 1, child: AppText(TranslationBase.of(context).allow, fontWeight: FontWeight.w600)),
// Expanded(flex: 1, child: AppText(TranslationBase.of(context).reject, fontWeight: FontWeight.w600)),
// ])),
// Divider(color: Colors.black, height: 1.5, thickness: 1.5),
// Column(
// children: familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList.map<Widget>((result) {
// return Container(
// padding: EdgeInsets.all(10),
// child: Row(
// children: <Widget>[
// Expanded(
// flex: 3,
// child: Texts(
// result.patientName,
// fontWeight: FontWeight.w600,
// fontSize: 12,
// )),
// Expanded(
// flex: 1,
// child: IconButton(
// icon: Icon(
// Icons.check_circle,
// color: Color(0xff349745),
// ),
// onPressed: () {
// acceptRemoveRequest(result.iD, 3, context);
// },
// )),
// Expanded(
// flex: 1,
// child: IconButton(
// icon: Icon(
// Icons.close,
// color: Colors.red[900],
// ),
// onPressed: () {
// acceptRemoveRequest(result.iD, 4, context);
// },
// ))
// ],
// ));
// }).toList())
// ])
// ],
// )));
// }
// })
// ],
// ),
// ),
SizedBox(height: 15),
FractionallySizedBox(
widthFactor: 1.0,
child: AppExpandableNotifier(
title: TranslationBase.of(context).sentRequest,
bodyWidget: FutureBuilder(
future: getSentRequest(), // async work
builder: (BuildContext context, AsyncSnapshot<GetAllSharedRecordsByStatusResponse> snapshot) {
switch (snapshot.connectionState) {
case ConnectionState.waiting:
return Padding(padding: EdgeInsets.only(top: 50), child: Text('Loading....'));
return SizedBox();
default:
if (snapshot.hasError)
return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable));
else
return ListView.separated(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
itemBuilder: (context, _index) {
return Container(
padding: EdgeInsets.all(15),
height: SizeConfig.screenHeight * .3,
child: Card(
elevation: 3,
shape: cardRadius(8),
child: SingleChildScrollView(
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
border: Border.all(width: 1, color: Color(0xffEFEFEF)),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: Colors.white),
child: Column(
children: [
Padding(
padding: EdgeInsets.all(10),
child: Row(children: [
Expanded(flex: 3, child: AppText(TranslationBase.of(context).theName, fontWeight: FontWeight.w600)),
Expanded(flex: 2, child: AppText(TranslationBase.of(context).status, fontWeight: FontWeight.w600))
Expanded(flex: 3, child: AppText(TranslationBase.of(context).name, fontWeight: FontWeight.w600)),
Expanded(flex: 1, child: AppText(TranslationBase.of(context).status, fontWeight: FontWeight.w600))
])),
Divider(color: Colors.black, height: 1),
Divider(color: Colors.black, height: 1.5, thickness: 1.5),
Column(
children: snapshot.data.getAllSharedRecordsByStatusList.map<Widget>((result) {
return Padding(
padding: EdgeInsets.all(10),
child: Row(
children: <Widget>[
Expanded(flex: 3, child: Text(result.patientName)),
Expanded(
flex: 2,
flex: 3,
child: Texts(
result.patientName,
fontWeight: FontWeight.w600,
fontSize: 12,
)),
Expanded(
flex: 1,
child: Card(
shape: cardRadius(10),
color: result.status == 3 ? Color(0xff349745) : Color(0xffD02127),
child: Padding(
padding: EdgeInsets.all(5),
child: AppText(
result.statusDescription,
color: result.status == 3 ? Colors.green : Colors.red,
)),
color: Colors.white,
textAlign: TextAlign.center,
fontSize: 12,
)))),
],
));
}).toList(),
)
],
))));
));
},
separatorBuilder: (context, index) => SizedBox(height: 14),
itemCount: 1,
);
}
})
],
)),
RoundedContainer(
child: ExpansionTile(
title: Text(
TranslationBase.of(context).userView,
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold, color: Colors.black),
}))),
SizedBox(
height: 15,
),
children: <Widget>[
FutureBuilder(
FractionallySizedBox(
widthFactor: 1.0,
child: AppExpandableNotifier(
title: TranslationBase.of(context).userView,
bodyWidget: FutureBuilder(
future: getUserViewRequest(), // async work
builder: (BuildContext context, AsyncSnapshot<dynamic> snapshot) {
switch (snapshot.connectionState) {
case ConnectionState.waiting:
return Padding(padding: EdgeInsets.only(top: 50), child: Text('Loading....'));
return Padding(padding: EdgeInsets.only(top: 50), child: Text(''));
default:
if (snapshot.hasError)
return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable));
else
return Container(
padding: EdgeInsets.all(15),
child: Card(
elevation: 3,
shape: cardRadius(8),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
border: Border.all(width: 1, color: Color(0xffEFEFEF)),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: Colors.white),
child: Column(
children: [
Column(children: [
Padding(
padding: EdgeInsets.all(10),
child: Row(children: [
Expanded(flex: 3, child: AppText(TranslationBase.of(context).name)),
Expanded(flex: 1, child: AppText(TranslationBase.of(context).delete)),
Expanded(
flex: 3,
child: AppText(
TranslationBase.of(context).name,
fontWeight: FontWeight.w600,
)),
Expanded(
flex: 1,
child: AppText(
TranslationBase.of(context).delete,
fontWeight: FontWeight.w600,
textAlign: TextAlign.center,
)),
])),
Divider(color: Colors.black),
Divider(color: Colors.black, height: 1.5, thickness: 1.5),
Column(
children: familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList.map<Widget>((result) {
return Padding(
padding: EdgeInsets.all(10),
child: Row(
children: <Widget>[
Expanded(flex: 3, child: AppText(result.patientName)),
Expanded(
flex: 3,
child: Texts(
result.patientName,
fontWeight: FontWeight.w600,
fontSize: 12,
)),
Expanded(
flex: 1,
child: IconButton(
icon: Icon(
Icons.delete,
color: Colors.black,
color: Colors.red,
),
onPressed: () {
deactivateRequest(result.iD, 5, context);
@ -461,11 +621,9 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
}).toList())
])
],
)));
));
}
})
],
))
})))
],
),
),

@ -16,7 +16,7 @@ defaultTheme({fontName}) {
return ThemeData(
fontFamily: fontName,
//projectProvider.isArabic ? 'Cairo' : 'WorkSans',
primarySwatch: Colors.blue,
primarySwatch: Colors.red,
visualDensity: VisualDensity.adaptivePlatformDensity,
brightness: Brightness.light,
pageTransitionsTheme: const PageTransitionsTheme(
@ -66,7 +66,7 @@ invertThemes({fontName}) {
return ThemeData(
fontFamily: fontName,
//projectProvider.isArabic ? 'Cairo' : 'WorkSans',
primarySwatch: Colors.blue,
primarySwatch: Colors.red,
visualDensity: VisualDensity.adaptivePlatformDensity,
brightness: Brightness.dark,
@ -110,7 +110,7 @@ bwThemes({fontName}) {
return ThemeData(
fontFamily: fontName,
//projectProvider.isArabic ? 'Cairo' : 'WorkSans',
primarySwatch: Colors.blue,
primarySwatch: Colors.red,
visualDensity: VisualDensity.adaptivePlatformDensity,
brightness: Brightness.dark,
@ -165,7 +165,7 @@ dimTheme({fontName}) {
return ThemeData(
fontFamily: fontName,
//projectProvider.isArabic ? 'Cairo' : 'WorkSans',
primarySwatch: Colors.blue,
primarySwatch: Colors.red,
visualDensity: VisualDensity.adaptivePlatformDensity,
brightness: Brightness.dark,

Loading…
Cancel
Save