From 3af37a6a5c3be857828f37664bf461c219fe554c Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Fri, 5 Mar 2021 23:38:10 +0200 Subject: [PATCH 1/2] hussam --- lib/pages/pharmacy_categorise.dart | 63 ++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/lib/pages/pharmacy_categorise.dart b/lib/pages/pharmacy_categorise.dart index f0062a1c..2e5088c1 100644 --- a/lib/pages/pharmacy_categorise.dart +++ b/lib/pages/pharmacy_categorise.dart @@ -29,7 +29,9 @@ class _PharmacyCategorisePageState extends State { ProjectViewModel projectViewModel = Provider.of(context); return BaseView( onModelReady: (model) => model.getCategorise(), - builder: (BuildContext context, PharmacyCategoriseViewModel model, Widget child) => AppScaffold( + builder: (BuildContext context, PharmacyCategoriseViewModel model, + Widget child) => + AppScaffold( isShowDecPage: false, baseViewModel: model, body: Column( @@ -57,7 +59,9 @@ class _PharmacyCategorisePageState extends State { child: Padding( padding: EdgeInsets.symmetric(horizontal: 10.0), child: Texts( - projectViewModel.isArabic ? model.categorise[index].namen : model.categorise[index].name, + projectViewModel.isArabic + ? model.categorise[index].namen + : model.categorise[index].name, fontWeight: FontWeight.w600, ), ), @@ -66,14 +70,15 @@ class _PharmacyCategorisePageState extends State { Navigator.push( context, MaterialPageRoute( - builder: (context) => model.categorise[index].id != '12' - ? ParentCategorisePage( - id: model.categorise[index].id, - titleName: model.categorise[index].name, - ) - : FinalProductsPage( - id: model.categorise[index].id, - ), + builder: (context) => + model.categorise[index].id != '12' + ? ParentCategorisePage( + id: model.categorise[index].id, + titleName: model.categorise[index].name, + ) + : FinalProductsPage( + id: model.categorise[index].id, + ), ), ), }, @@ -86,7 +91,10 @@ class _PharmacyCategorisePageState extends State { height: 140, child: Column( children: [ - Divider(height: 2.0, thickness: 1.0, color: Colors.black12.withOpacity(0.14)), + Divider( + height: 2.0, + thickness: 1.0, + color: Colors.black12.withOpacity(0.14)), SizedBox( height: 10.0, ), @@ -102,12 +110,16 @@ class _PharmacyCategorisePageState extends State { width: 55.0, decoration: BoxDecoration( borderRadius: BorderRadius.circular(5.0), - color: Colors.green.shade300.withOpacity(0.34), + color: + Colors.green.shade300.withOpacity(0.34), ), child: Padding( - padding: EdgeInsets.symmetric(horizontal: 10.0), + padding: + EdgeInsets.symmetric(horizontal: 10.0), child: Texts( - projectViewModel.isArabic ? 'الاكثر مبيعا' : 'Best Sellers', + projectViewModel.isArabic + ? 'الاكثر مبيعا' + : 'Best Sellers', fontWeight: FontWeight.w600, ), ), @@ -122,13 +134,16 @@ class _PharmacyCategorisePageState extends State { height: 50.0, width: 55.0, decoration: BoxDecoration( - color: Colors.orangeAccent.shade200.withOpacity(0.34), + color: Colors.orangeAccent.shade200 + .withOpacity(0.34), borderRadius: BorderRadius.circular(5.0), ), child: Padding( padding: EdgeInsets.symmetric(horizontal: 10.0), child: Texts( - projectViewModel.isArabic ? 'الاكثر مشاهدة' : 'Most Viewed', + projectViewModel.isArabic + ? 'الاكثر مشاهدة' + : 'Most Viewed', fontWeight: FontWeight.w600, ), ), @@ -152,7 +167,9 @@ class _PharmacyCategorisePageState extends State { child: Padding( padding: EdgeInsets.symmetric(horizontal: 10.0), child: Texts( - projectViewModel.isArabic ? 'منتجات جديدة' : 'New Products', + projectViewModel.isArabic + ? 'منتجات جديدة' + : 'New Products', fontWeight: FontWeight.w600, ), ), @@ -164,19 +181,23 @@ class _PharmacyCategorisePageState extends State { padding: EdgeInsets.all(4.0), child: InkWell( onTap: () { - _scanQrAndGetPatient(context, model); + // _scanQrAndGetPatient(context, model); }, child: Container( height: 50.0, width: 55.0, decoration: BoxDecoration( - color: Colors.purple.shade200.withOpacity(0.34), + color: + Colors.purple.shade200.withOpacity(0.34), borderRadius: BorderRadius.circular(5.0), ), child: Padding( - padding: EdgeInsets.symmetric(horizontal: 10.0), + padding: + EdgeInsets.symmetric(horizontal: 10.0), child: Texts( - projectViewModel.isArabic ? 'شوهد مؤخرا' : 'Recently Viewed', + projectViewModel.isArabic + ? 'شوهد مؤخرا' + : 'Recently Viewed', fontWeight: FontWeight.w600, ), ), From 299a1bed25c6e77bb0c34656d8946f180b5cb88e Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Fri, 5 Mar 2021 23:45:32 +0200 Subject: [PATCH 2/2] hussam --- lib/pages/pharmacy_categorise.dart | 44 ++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/lib/pages/pharmacy_categorise.dart b/lib/pages/pharmacy_categorise.dart index d8a0ef20..033c7087 100644 --- a/lib/pages/pharmacy_categorise.dart +++ b/lib/pages/pharmacy_categorise.dart @@ -30,7 +30,9 @@ class _PharmacyCategorisePageState extends State { ProjectViewModel projectViewModel = Provider.of(context); return BaseView( onModelReady: (model) => model.getCategorise(), - builder: (BuildContext context, PharmacyCategoriseViewModel model, Widget child) => AppScaffold( + builder: (BuildContext context, PharmacyCategoriseViewModel model, + Widget child) => + AppScaffold( isShowDecPage: false, baseViewModel: model, body: Column( @@ -58,7 +60,9 @@ class _PharmacyCategorisePageState extends State { child: Padding( padding: EdgeInsets.symmetric(horizontal: 10.0), child: Texts( - projectViewModel.isArabic ? model.categorise[index].namen : model.categorise[index].name, + projectViewModel.isArabic + ? model.categorise[index].namen + : model.categorise[index].name, fontWeight: FontWeight.w600, ), ), @@ -87,7 +91,10 @@ class _PharmacyCategorisePageState extends State { height: 140, child: Column( children: [ - Divider(height: 2.0, thickness: 1.0, color: Colors.black12.withOpacity(0.14)), + Divider( + height: 2.0, + thickness: 1.0, + color: Colors.black12.withOpacity(0.14)), SizedBox( height: 10.0, ), @@ -103,12 +110,16 @@ class _PharmacyCategorisePageState extends State { width: 55.0, decoration: BoxDecoration( borderRadius: BorderRadius.circular(5.0), - color: Colors.green.shade300.withOpacity(0.34), + color: + Colors.green.shade300.withOpacity(0.34), ), child: Padding( - padding: EdgeInsets.symmetric(horizontal: 10.0), + padding: + EdgeInsets.symmetric(horizontal: 10.0), child: Texts( - projectViewModel.isArabic ? 'الاكثر مبيعا' : 'Best Sellers', + projectViewModel.isArabic + ? 'الاكثر مبيعا' + : 'Best Sellers', fontWeight: FontWeight.w600, ), ), @@ -123,13 +134,16 @@ class _PharmacyCategorisePageState extends State { height: 50.0, width: 55.0, decoration: BoxDecoration( - color: Colors.orangeAccent.shade200.withOpacity(0.34), + color: Colors.orangeAccent.shade200 + .withOpacity(0.34), borderRadius: BorderRadius.circular(5.0), ), child: Padding( padding: EdgeInsets.symmetric(horizontal: 10.0), child: Texts( - projectViewModel.isArabic ? 'الاكثر مشاهدة' : 'Most Viewed', + projectViewModel.isArabic + ? 'الاكثر مشاهدة' + : 'Most Viewed', fontWeight: FontWeight.w600, ), ), @@ -153,7 +167,9 @@ class _PharmacyCategorisePageState extends State { child: Padding( padding: EdgeInsets.symmetric(horizontal: 10.0), child: Texts( - projectViewModel.isArabic ? 'منتجات جديدة' : 'New Products', + projectViewModel.isArabic + ? 'منتجات جديدة' + : 'New Products', fontWeight: FontWeight.w600, ), ), @@ -171,13 +187,17 @@ class _PharmacyCategorisePageState extends State { height: 50.0, width: 55.0, decoration: BoxDecoration( - color: Colors.purple.shade200.withOpacity(0.34), + color: + Colors.purple.shade200.withOpacity(0.34), borderRadius: BorderRadius.circular(5.0), ), child: Padding( - padding: EdgeInsets.symmetric(horizontal: 10.0), + padding: + EdgeInsets.symmetric(horizontal: 10.0), child: Texts( - projectViewModel.isArabic ? 'شوهد مؤخرا' : 'Recently Viewed', + projectViewModel.isArabic + ? 'شوهد مؤخرا' + : 'Recently Viewed', fontWeight: FontWeight.w600, ), ),