diff --git a/lib/modules/tm_module/device_transfer/search_device_page.dart b/lib/modules/tm_module/device_transfer/search_device_page.dart index f2922165..be0eec14 100644 --- a/lib/modules/tm_module/device_transfer/search_device_page.dart +++ b/lib/modules/tm_module/device_transfer/search_device_page.dart @@ -146,7 +146,7 @@ class _SearchDevicePageState extends State { Navigator.of(context).pop(device); } }, - selectButton: Text(title, style: AppTextStyles.bodyText.copyWith(color: AppColor.blueStatus(context))), + selectButton: Text(title, style: AppTextStyles.bodyText.copyWith(color: AppColor.primary10)), ); }, ).expanded, diff --git a/lib/new_views/swipe_module/dialoge/single_btn_dialog.dart b/lib/new_views/swipe_module/dialoge/single_btn_dialog.dart index 9561f318..ceee4a06 100644 --- a/lib/new_views/swipe_module/dialoge/single_btn_dialog.dart +++ b/lib/new_views/swipe_module/dialoge/single_btn_dialog.dart @@ -16,7 +16,7 @@ class SingleBtnDialog extends StatelessWidget { @override Widget build(BuildContext context) { return Dialog( - backgroundColor: Colors.white, + backgroundColor: AppColor.background(context), shape: const RoundedRectangleBorder(), insetPadding: const EdgeInsets.only(left: 21, right: 21), child: Padding( @@ -27,9 +27,9 @@ class SingleBtnDialog extends StatelessWidget { children: [ Text( title ?? "Confirm", - style: const TextStyle(fontSize: 24, fontWeight: FontWeight.w600, color: Colors.black87, height: 35 / 24, letterSpacing: -0.96), + style: TextStyle(fontSize: 24, fontWeight: FontWeight.w600, color: AppColor.headingTextColor(context), height: 35 / 24, letterSpacing: -0.96), ).paddingOnly(top: 16), - message != null ? message!.heading5(context).custom(color: AppColor.neutral70) : const SizedBox(), + message != null ? message!.heading5(context).custom(color: AppColor.headingTextColor(context)) : const SizedBox(), 28.height, AppFilledButton( label: okTitle ?? "OK", diff --git a/lib/views/widgets/equipment/asset_item_listview.dart b/lib/views/widgets/equipment/asset_item_listview.dart index e5fe91e9..6fced692 100644 --- a/lib/views/widgets/equipment/asset_item_listview.dart +++ b/lib/views/widgets/equipment/asset_item_listview.dart @@ -60,7 +60,7 @@ class AssetItemListView extends StatelessWidget { children: [ Text( context.translation.viewDetails, - style: AppTextStyles.bodyText2.copyWith(color: AppColor.blueStatus(context)), + style: AppTextStyles.bodyText2.copyWith(color: AppColor.primary10), ), 4.width, const Icon(Icons.arrow_forward, color: AppColor.primary10, size: 14) diff --git a/lib/views/widgets/equipment/my_assets_page.dart b/lib/views/widgets/equipment/my_assets_page.dart index 066f33f1..19accbc8 100644 --- a/lib/views/widgets/equipment/my_assets_page.dart +++ b/lib/views/widgets/equipment/my_assets_page.dart @@ -228,7 +228,8 @@ class _MyAssetsPageState extends State { ), floatingActionButton: FloatingActionButton( heroTag: "some tag 2", - child: "qr".toSvgAsset(height: 32, fit: BoxFit.fitHeight, color: Theme.of(context).scaffoldBackgroundColor), + backgroundColor: AppColor.primary10, + child: "qr".toSvgAsset(height: 32, fit: BoxFit.fitHeight, color: AppColor.background(context)), onPressed: () async { String? result = await Navigator.of(context).push( MaterialPageRoute(builder: (_) => const ScanQr()),