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

UI fixes

Browse Source
dev_v3.13.6
haroon amjad 5 years ago
parent 8d6278a59b
commit 5943522163
3 changed files with 135 additions and 154 deletions
Show Stats Download Patch File Download Diff File

13
lib/pages/Blood/blood_donation.dart
Unescape Escape View File

@ -38,9 +38,6 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
TextEditingController _notesTextController = TextEditingController();
BeneficiaryType beneficiaryType = BeneficiaryType.NON;
// Gender gender = Gender.Male; //Gender.NON;
// Blood blood = Blood.Aminus; //Blood.NON;
//HospitalsModel _selectedHospital;
CitiesModel _selectedHospital;
int _selectedHospitalIndex = 0;
@ -80,7 +77,6 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
cityID = element.iD;
}
});
return cityID;
}
@ -90,6 +86,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
return BaseView<MyBalanceViewModel>(
onModelReady: (model) {
if (projectProvider.isLogin) {
model.getCities().then((value) {
model.getBlood().then((value) {
if (model.bloodModelList.length > 0) {
@ -104,6 +101,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
}
});
});
}
},
builder: (_, model, w) => AppScaffold(
isShowAppBar: true,
@ -130,12 +128,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
),
SizedBox(height: 12),
if (projectProvider.isLogin && model.state != ViewState.Busy)
CommonDropDownView(
TranslationBase.of(context).city,
// (model.bloodModelList.isNotEmpty && model.CitiesModelList.isNotEmpty)
// ? model.bloodModelList[0].city
// :
projectProvider.isArabic ? _selectedHospital.descriptionN : _selectedHospital.description, () {
CommonDropDownView(TranslationBase.of(context).city, projectProvider.isArabic ? _selectedHospital.descriptionN : _selectedHospital.description, () {
List<RadioSelectionDialogModel> list = [
for (int i = 0; i < model.CitiesModelList.length; i++)
RadioSelectionDialogModel(projectProvider.isArabic ? model.CitiesModelList[i].descriptionN : model.CitiesModelList[i].description, i),

44
lib/pages/pharmacies/widgets/home/PrescriptionsWidget.dart
Unescape Escape View File

@ -13,9 +13,7 @@ import 'package:provider/provider.dart';
import 'package:rating_bar/rating_bar.dart';
class PrescriptionsWidget extends StatelessWidget {
AuthenticatedUserObject authenticatedUserObject =
locator<AuthenticatedUserObject>();
AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>();
@override
Widget build(BuildContext context) {
@ -36,7 +34,7 @@ class PrescriptionsWidget extends StatelessWidget {
ViewAllHomeWidget(TranslationBase.of(context).myPrescription, HomePrescriptionsPage()),
Container(
margin: EdgeInsets.only(right: 10.0, left: 10.0),
height: MediaQuery.of(context).size.height * 0.18,
height: MediaQuery.of(context).size.height * 0.2,
child: ListView.builder(
scrollDirection: Axis.horizontal,
shrinkWrap: true,
@ -57,7 +55,6 @@ class PrescriptionsWidget extends StatelessWidget {
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
Row(
children: <Widget>[
Column(children: [
Container(
padding: EdgeInsets.only(
top: 10.0,
@ -70,16 +67,14 @@ class PrescriptionsWidget extends StatelessWidget {
backgroundColor: Colors.transparent,
child: Image.network(
model.prescriptionsList[index].doctorImageURL,
width: 60,
height: 60,
width: 50,
height: 50,
),
),
),
]),
Column(
children: [
Container(
margin: EdgeInsets.only(left: 1),
padding: EdgeInsets.only(left: 15.0, right: 15.0),
decoration: BoxDecoration(
border: Border.all(
@ -116,9 +111,6 @@ class PrescriptionsWidget extends StatelessWidget {
),
],
),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
margin: EdgeInsets.only(left: 5),
child: Row(children: <Widget>[
@ -140,11 +132,6 @@ class PrescriptionsWidget extends StatelessWidget {
),
]),
),
],
),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
margin: EdgeInsets.only(left: 5),
child: Text(
@ -152,20 +139,14 @@ class PrescriptionsWidget extends StatelessWidget {
style: TextStyle(
color: Colors.green,
fontSize: 15.0,
// fontWeight: FontWeight.bold,
),
),
),
],
),
Row(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
Row(children: <Widget>[
Container(
margin: EdgeInsets.only(left: 5),
child: Align(
alignment: Alignment.topLeft,
child: RatingBar.readOnly(
initialRating: model.prescriptionsList[index].actualDoctorRate.toDouble(),
// initialRating: productRate,
size: 15.0,
filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500],
@ -175,18 +156,25 @@ class PrescriptionsWidget extends StatelessWidget {
emptyIcon: Icons.star,
),
),
)
SizedBox(
width: 100.0,
),
Container(
child: Icon(
Icons.arrow_forward,
color: Theme.of(context).primaryColor,
)),
]),
]),
);
}),
},
),
),
],
),
),
)
: Container(
),
: Container(),
);
}
}

2
lib/widgets/pharmacy/bottom_nav_pharmacy_item.dart
Unescape Escape View File

@ -96,7 +96,7 @@ class BottomNavPharmacyItem extends StatelessWidget {
fontWeight: currentIndex == index
? FontWeight.normal
: FontWeight.w400,
fontSize: currentIndex == index ? 13 : 11,
fontSize: currentIndex == index ? 11 : 9,
),
],
),

Write Preview
Loading…
Cancel
Save