diff --git a/lib/pages/pharmacies/widgets/ProductTileItem.dart b/lib/pages/pharmacies/widgets/ProductTileItem.dart index 248901b6..b349d675 100644 --- a/lib/pages/pharmacies/widgets/ProductTileItem.dart +++ b/lib/pages/pharmacies/widgets/ProductTileItem.dart @@ -85,6 +85,7 @@ class ProductTileItem extends StatelessWidget { border: Border.all(color: Colors.grey.shade300, width: 0.2), borderRadius: BorderRadius.circular(10), color: Colors.white, + shape: BoxShape.rectangle, boxShadow: [ BoxShadow( color: Color(0xffF1F1F1), @@ -145,7 +146,7 @@ class ProductTileItem extends StatelessWidget { Container( decoration: BoxDecoration( border: Border.all( - color: Colors.grey.shade300, width: 1.1), + color: Color(0xffF0F0F0), width: 1.0), borderRadius: BorderRadius.only( topRight: Radius.circular( item.rxMessage != null && @@ -157,7 +158,7 @@ class ProductTileItem extends StatelessWidget { topLeft: Radius.circular( item.rxMessage != null && !projectProvider.isArabic - ? 25 + ? 9 : 8), ), ), @@ -192,14 +193,13 @@ class ProductTileItem extends StatelessWidget { child: Container( padding: EdgeInsets.only( left: 18, right: 18, top: 6, bottom: 3), - color: CustomColors.accentColor, child: Padding( padding: EdgeInsets.all(2.0), child: Text( "الوصفة\n مطلوبة", style: TextStyle( color: Colors.white, - fontSize: 7.5, + fontSize: 7.0, height: 0.8, fontWeight: FontWeight.bold, letterSpacing: -0.27, @@ -222,7 +222,7 @@ class ProductTileItem extends StatelessWidget { "\n E-Prescription \n Is required", style: TextStyle( color: Colors.white, - fontSize: 7.5, + fontSize: 7.0, //letterSpacing: -0.27, height: 1.2, fontWeight: FontWeight.w600, @@ -244,7 +244,7 @@ class ProductTileItem extends StatelessWidget { //regular: true, fontSize: 10, color: Color(0xff2B353E), - fontWeight: FontWeight.w500, + fontWeight: FontWeight.w600, ), ), ), @@ -266,7 +266,7 @@ class ProductTileItem extends StatelessWidget { horizontal: 10, vertical: 2), child: Texts( "SAR ${item.price}", - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w700, fontSize: 11, color: Color(0xff2B353E), ), diff --git a/lib/pages/pharmacies/widgets/home/MostViewedWidget.dart b/lib/pages/pharmacies/widgets/home/MostViewedWidget.dart index a1ce0bc4..01fea98e 100644 --- a/lib/pages/pharmacies/widgets/home/MostViewedWidget.dart +++ b/lib/pages/pharmacies/widgets/home/MostViewedWidget.dart @@ -31,11 +31,6 @@ class MostViewedWidget extends StatelessWidget { )), if (model.state != ViewState.BusyLocal) Container( - decoration: BoxDecoration( - border: Border.all( - color: Colors.grey.shade300, width: 0.1), - borderRadius: BorderRadius.circular(8), - ), height: MediaQuery.of(context).size.height / 3 + 1, child: ListView.builder( itemBuilder: (ctx, i) => ProductTileItem( diff --git a/lib/pages/pharmacies/widgets/home/RecentlyViewedWidget.dart b/lib/pages/pharmacies/widgets/home/RecentlyViewedWidget.dart index f03c384d..e1eab06c 100644 --- a/lib/pages/pharmacies/widgets/home/RecentlyViewedWidget.dart +++ b/lib/pages/pharmacies/widgets/home/RecentlyViewedWidget.dart @@ -16,48 +16,44 @@ class RecentlyViewedWidget extends StatelessWidget { onModelReady: (model) => model.getLastVisitedProducts(), allowAny: true, builder: (_, model, wi) => NetworkBaseView( - isLocalLoader: true, - baseViewModel: model, - child: model.lastVisitedProducts.isNotEmpty - ? Container( - child: Column( - children: [ - ViewAllHomeWidget( - TranslationBase.of(context).recentlyViewed, - FinalProductsPage( - id: "", - productType: 3, - )), - if (model.state != ViewState.BusyLocal) - Container( - height: model.lastVisitedProducts.length > 0 - ? MediaQuery.of(context).size.height / 3 + 1 - : 0, - child: ListView.builder( - itemBuilder: (ctx, i) => ProductTileItem( - model.lastVisitedProducts[i], - MediaQuery.of(context).size.height / 4 + - 20), - scrollDirection: Axis.horizontal, - itemCount: model.lastVisitedProducts.length, - ), - ) - else - Container( - height: 80, - child: Center( - child: CircularProgressIndicator( - backgroundColor: Colors.white, - valueColor: AlwaysStoppedAnimation( - Colors.grey[500], - ), - ), - ), - ), - ], + isLocalLoader: true, + baseViewModel: model, + child: Container( + child: Column( + children: [ + ViewAllHomeWidget( + TranslationBase.of(context).recentlyViewed, + FinalProductsPage( + id: "", + productType: 3, + )), + if (model.state != ViewState.BusyLocal) + Container( + height: model.lastVisitedProducts.length > 0 + ? MediaQuery.of(context).size.height / 3 + 1 + : 0, + child: ListView.builder( + itemBuilder: (ctx, i) => ProductTileItem( + model.lastVisitedProducts[i], + MediaQuery.of(context).size.height / 4 + 20), + scrollDirection: Axis.horizontal, + itemCount: model.lastVisitedProducts.length, ), ) - : Container(), - )); + else + Container( + height: 80, + child: Center( + child: CircularProgressIndicator( + backgroundColor: Colors.white, + valueColor: AlwaysStoppedAnimation( + Colors.grey[500], + ), + ), + ), + ), + ], + ), + ))); } } diff --git a/lib/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart b/lib/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart index 9d56deff..2b73a15a 100644 --- a/lib/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart +++ b/lib/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart @@ -19,7 +19,7 @@ class ViewAllHomeWidget extends StatelessWidget { Texts( title, color: Color(0xff2E303A), - bold: true, + fontWeight: FontWeight.w700, fontSize: 19, ), InkWell(