From 881644a22e81d7d7606e7ce9a03eae9ad2a81d15 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Sun, 17 Oct 2021 09:41:17 +0300 Subject: [PATCH] family files changes --- lib/config/config.dart | 4 ++-- lib/pages/DrawerPages/family/my-family.dart | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 18abad39..acb8d80a 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -12,8 +12,8 @@ const PACKAGES_PRODUCTS = '/api/products'; const PACKAGES_CUSTOMER = '/api/customers'; const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items'; const PACKAGES_ORDERS = '/api/orders'; -// const BASE_URL = 'https://uat.hmgwebservices.com/'; -const BASE_URL = 'https://hmgwebservices.com/'; +const BASE_URL = 'https://uat.hmgwebservices.com/'; +// const BASE_URL = 'https://hmgwebservices.com/'; // Pharmacy UAT URLs // const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; diff --git a/lib/pages/DrawerPages/family/my-family.dart b/lib/pages/DrawerPages/family/my-family.dart index ad4494e6..49ad49ec 100644 --- a/lib/pages/DrawerPages/family/my-family.dart +++ b/lib/pages/DrawerPages/family/my-family.dart @@ -306,7 +306,7 @@ class _MyFamily extends State with TickerProviderStateMixin { child: IconButton( icon: Icon( Icons.check_circle, - color: Colors.black, + color: Color(0xff349745), ), onPressed: () { acceptRemoveRequest(result.iD, 3, context); @@ -363,7 +363,7 @@ class _MyFamily extends State with TickerProviderStateMixin { Padding( padding: EdgeInsets.all(10), child: Row(children: [ - Expanded(flex: 3, child: AppText(TranslationBase.of(context).theName, fontWeight: FontWeight.w600)), + Expanded(flex: 3, child: AppText(TranslationBase.of(context).name, fontWeight: FontWeight.w600)), Expanded(flex: 2, child: AppText(TranslationBase.of(context).status, fontWeight: FontWeight.w600)) ])), Divider(color: Colors.black, height: 1), @@ -418,8 +418,18 @@ class _MyFamily extends State with TickerProviderStateMixin { 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, + )), ])), Divider(color: Colors.black), Column(