diff --git a/assets/images/asset_scan.svg b/assets/images/asset_scan.svg new file mode 100644 index 00000000..e30a9824 --- /dev/null +++ b/assets/images/asset_scan.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/lib/modules/copilot/screens/copilot_chat_page.dart b/lib/modules/copilot/screens/copilot_chat_page.dart index a629ec45..0841d49c 100644 --- a/lib/modules/copilot/screens/copilot_chat_page.dart +++ b/lib/modules/copilot/screens/copilot_chat_page.dart @@ -211,7 +211,7 @@ class _CopilotChatPageState extends State { size: BeamSize.pulseOutside, reserveGlowSpace: false, borderRadius: 35, - strength: 0.7, + strength: 0.5, child: Row( children: [ if (_inputState == _InputState.idle) ...[ diff --git a/lib/modules/copilot/screens/copilot_history_page.dart b/lib/modules/copilot/screens/copilot_history_page.dart index a9f169de..ffe440c8 100644 --- a/lib/modules/copilot/screens/copilot_history_page.dart +++ b/lib/modules/copilot/screens/copilot_history_page.dart @@ -78,10 +78,10 @@ class _CopilotHistoryPageState extends State { spacing: 8, mainAxisSize: MainAxisSize.min, children: [ - ("edit_icon").toSvgAsset(height: 20, width: 20, color: AppColor.icon2Color(context)), + ("edit_icon").toSvgAsset(height: 20, width: 20, color: AppColor.background(context)), Text( "New Chat", - style: AppTextStyles.bodyText2.copyWith(color: AppColor.textStyleColor(context)), + style: AppTextStyles.bodyText2.copyWith(color: AppColor.background(context)), ), ], ), diff --git a/lib/views/widgets/equipment/my_assets_page.dart b/lib/views/widgets/equipment/my_assets_page.dart index db37941c..80ea7384 100644 --- a/lib/views/widgets/equipment/my_assets_page.dart +++ b/lib/views/widgets/equipment/my_assets_page.dart @@ -327,13 +327,13 @@ class _MyAssetsPageState extends State with SingleTickerProviderSt heroTag: "tag 1", backgroundColor: AppColor.primary10, onPressed: _pickImageFromCamera, - child: Icon(Icons.camera, size: 40, color: AppColor.addItemButtonColor(context)), + child: "asset_scan".toSvgAsset(height: 36, color: AppColor.addItemButtonColor(context)), ), 12.height, FloatingActionButton( heroTag: "some tag 2", backgroundColor: AppColor.primary10, - child: Icon(Icons.qr_code_2_rounded, size: 40, color: AppColor.addItemButtonColor(context)), + child: Icon(Icons.qr_code_2_rounded, size: 36, color: AppColor.addItemButtonColor(context)), onPressed: () async { String? result = await Navigator.of(context).push( MaterialPageRoute(builder: (_) => const ScanQr()), @@ -698,7 +698,7 @@ class _MyAssetsPageState extends State with SingleTickerProviderSt Navigator.push(context, MaterialPageRoute(builder: (context) => PredictDeviceView(predictedAsset: predictedAssetList))); } else { context.showInfoDialog("No Predicted asset found"); - // Fluttertoast.showToast(msg: 'No Predicted asset found', toastLength: Toast.LENGTH_LONG); + // Fluttertoast.showToast(msg: 'No Predicted asset found', toastLength: Toast.LENGTH_LONG); } } } catch (e) { diff --git a/lib/views/widgets/equipment/predict_device_item_view.dart b/lib/views/widgets/equipment/predict_device_item_view.dart index 2e74c864..f5c975fe 100644 --- a/lib/views/widgets/equipment/predict_device_item_view.dart +++ b/lib/views/widgets/equipment/predict_device_item_view.dart @@ -11,10 +11,8 @@ import 'package:test_sa/views/widgets/item_views/info_text_widget.dart'; class PredictDeviceItemView extends StatelessWidget { final PredictedAsset device; final Function(PredictedAsset) onPressed; - final Widget? selectButton; - final bool isSelected; - const PredictDeviceItemView({Key? key, required this.device, required this.onPressed, this.selectButton, this.isSelected = false}) : super(key: key); + const PredictDeviceItemView({Key? key, required this.device, required this.onPressed}) : super(key: key); @override Widget build(BuildContext context) { @@ -30,6 +28,6 @@ class PredictDeviceItemView extends StatelessWidget { InfoTextWidget(label: context.translation.site, value: device.metadata?.siteName), InfoTextWidget(label: context.translation.department, value: device.metadata?.departmentName,showArrow: true,), ], - ).toShadowContainer(context, borderColor: isSelected ? AppColor.primary10 : Colors.transparent).onPress(() => onPressed(device)); + ).toShadowContainer(context).onPress(() => onPressed(device)); } }