From dda4dbeba9715a1460ffe6c64b9334c56a48689e Mon Sep 17 00:00:00 2001 From: tahaalam Date: Thu, 12 Mar 2026 14:40:39 +0300 Subject: [PATCH] merge issue resolution some import were missing from master. --- android/app/src/main/AndroidManifest.xml | 1 + android/gradle.properties | 11 +++++++-- assets/langs/en-US.json | 1 - .../health_connect_helper.dart | 23 ++++++++----------- lib/widgets/custom_tab_bar.dart | 2 +- lib/widgets/datepicker_widget.dart | 3 ++- lib/widgets/graph/CustomBarGraph.dart | 21 +++++++++-------- lib/widgets/phone_number_input.dart | 3 ++- 8 files changed, 36 insertions(+), 29 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 0e77b6b6..ffa3a908 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -124,6 +124,7 @@ { late Widget parentWidget; if(widget.shouldTabExpanded){ return Row( - children:List.generate(widget.tabs.length, (index)=>myTab(widget.tabs[index], index).expanded), + children:List.generate(widget.tabs.length, (index)=>myTab(widget.tabs[index], index, resolvedActiveTextColor, resolvedInActiveTextColor, resolvedActiveBgColor, resolvedInActiveBgColor).expanded), ); } diff --git a/lib/widgets/datepicker_widget.dart b/lib/widgets/datepicker_widget.dart index f9d8ff73..bac05512 100644 --- a/lib/widgets/datepicker_widget.dart +++ b/lib/widgets/datepicker_widget.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; @@ -52,7 +53,7 @@ class DatePickerWidget extends StatelessWidget { Widget _buildLabelText() { return Text( labelText, - style: const TextStyle( + style: TextStyle( fontSize: 12.f, fontWeight: FontWeight.w500, color: Color(0xff898A8D), diff --git a/lib/widgets/graph/CustomBarGraph.dart b/lib/widgets/graph/CustomBarGraph.dart index bacdf0c7..2f50f20d 100644 --- a/lib/widgets/graph/CustomBarGraph.dart +++ b/lib/widgets/graph/CustomBarGraph.dart @@ -48,10 +48,10 @@ class CustomBarChart extends StatelessWidget { final double? maxY; final double? maxX; final double? minX; - final Color barColor; + Color? barColor; final Color? secondaryBarColor; - final Color barGridColor; - final Color bottomLabelColor; + Color? barGridColor; + Color? bottomLabelColor; final double? bottomLabelSize; final FontWeight? bottomLabelFontWeight; final double? leftLabelInterval; @@ -73,7 +73,7 @@ class CustomBarChart extends StatelessWidget { final bool isFullScreeGraph; final bool makeGraphBasedOnActualValue; - const CustomBarChart( + CustomBarChart( {super.key, required this.dataPoints, this.secondaryDataPoints, @@ -84,10 +84,7 @@ class CustomBarChart extends StatelessWidget { this.maxX, this.showBottomTitleDates = true, this.isFullScreeGraph = false, - this.barColor = AppColors.bgGreenColor, this.secondaryBarColor, - this.barGridColor = AppColors.graphGridColor, - this.bottomLabelColor = AppColors.textColor, this.bottomLabelFontWeight = FontWeight.w500, this.bottomLabelSize, this.leftLabelInterval, @@ -102,11 +99,17 @@ class CustomBarChart extends StatelessWidget { this.minY, this.barRadius, this.barWidth = 16, - this.getTooltipItem + this.getTooltipItem, + this.barColor , + this.barGridColor , + this.bottomLabelColor, }); @override Widget build(BuildContext context) { + barColor ??= AppColors.bgGreenColor; + barGridColor ??= AppColors.graphGridColor; + bottomLabelColor ??= AppColors.textColor; return Material( color: Colors.white, child: SizedBox( @@ -124,7 +127,7 @@ class CustomBarChart extends StatelessWidget { }, touchTooltipData: BarTouchTooltipData( - getTooltipColor: (_)=>AppColors.tooltipColor, + getTooltipColor: (_)=>AppColorsContext.tooltipColor, getTooltipItem: (group, groupIndex, rod, rodIndex) { final dataPoint = dataPoints[groupIndex]; if(getTooltipItem != null) { diff --git a/lib/widgets/phone_number_input.dart b/lib/widgets/phone_number_input.dart index 6ea07141..2055969f 100644 --- a/lib/widgets/phone_number_input.dart +++ b/lib/widgets/phone_number_input.dart @@ -1,3 +1,4 @@ +import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:flutter/material.dart'; @@ -99,7 +100,7 @@ class _PhoneNumberInputState extends State { letterSpacing: 2, ), ), - style: const TextStyle( + style: TextStyle( fontSize: 18.f, fontWeight: FontWeight.bold, letterSpacing: 2,