merge issue resolution some import were missing from master.

watch_integration
tahaalam 2 weeks ago
parent 151fcf23d1
commit dda4dbeba9

@ -124,6 +124,7 @@
</queries> </queries>
<application <application
android:foregroundServiceType="mediaPlayback|connectedDevice|dataSync" android:foregroundServiceType="mediaPlayback|connectedDevice|dataSync"
android:name=".Application" android:name=".Application"
android:allowBackup="false" android:allowBackup="false"

@ -1,3 +1,10 @@
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError #org.gradle.jvmargs=-xmx4608m
android.useAndroidX=true android.enableR8=true
android.enableJetifier=true android.enableJetifier=true
android.useDeprecatedNdk=true
org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.configureondemand=true
android.useAndroidX=true
android.enableImpeller=false

@ -1587,7 +1587,6 @@
"whoophealthapplicationshouldbeinstalledinyourphone": "Whoop Health application should be installed in your phone", "whoophealthapplicationshouldbeinstalledinyourphone": "Whoop Health application should be installed in your phone",
"whoopwatchshouldbeconnected": "Whoop Watch should be connected", "whoopwatchshouldbeconnected": "Whoop Watch should be connected",
"updatetheinformation": "This will allow to gather the most up to date information from your apple watch", "updatetheinformation": "This will allow to gather the most up to date information from your apple watch",
"continueCash": "Continue as cash",
"timeFor": "Time For", "timeFor": "Time For",
"hmgPolicies": "HMG Policies", "hmgPolicies": "HMG Policies",
"darkMode": "Dark Mode" "darkMode": "Dark Mode"

@ -1,6 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:async/src/result/result.dart'; import 'package:async/src/result/result.dart';
import 'package:flutter/material.dart';
import 'package:health/health.dart'; import 'package:health/health.dart';
import 'package:hmg_patient_app_new/features/smartwatch_health_data/watch_connectors/watch_helper.dart' show WatchHelper; import 'package:hmg_patient_app_new/features/smartwatch_health_data/watch_connectors/watch_helper.dart' show WatchHelper;
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
@ -57,9 +58,9 @@ class HealthConnectHelper extends WatchHelper {
final startDate = endDate.subtract(Duration(days: 365)); final startDate = endDate.subtract(Duration(days: 365));
final data = await getData(startDate, endDate, types); final data = await getData(startDate, endDate, types);
addDataToMap("steps",data ); addDataToMap("steps",data );
print('Steps Data: $data'); debugPrint('Steps Data: $data');
} catch (e) { } catch (e) {
print('Error getting steps: $e'); debugPrint('Error getting steps: $e');
} }
} }
@ -71,9 +72,9 @@ class HealthConnectHelper extends WatchHelper {
final startDate = endDate.subtract(Duration(days: 365)); final startDate = endDate.subtract(Duration(days: 365));
final data = await getData(startDate, endDate, types); final data = await getData(startDate, endDate, types);
addDataToMap("activity",data ); addDataToMap("activity",data );
print('Activity Data: $data'); debugPrint('Activity Data: $data');
} catch (e) { } catch (e) {
print('Error getting activity: $e'); debugPrint('Error getting activity: $e');
} }
} }
@ -91,7 +92,7 @@ class HealthConnectHelper extends WatchHelper {
final data = await getData(startDate, endDate, types); final data = await getData(startDate, endDate, types);
addDataToMapBloodOxygen("bloodOxygen", data); addDataToMapBloodOxygen("bloodOxygen", data);
} catch (e) { } catch (e) {
print('Error getting blood oxygen: $e'); debugPrint('Error getting blood oxygen: $e');
} }
} }
@ -104,7 +105,7 @@ class HealthConnectHelper extends WatchHelper {
final data = await getData(startDate, endDate, types); final data = await getData(startDate, endDate, types);
addDataToMap("bodyTemperature",data ); addDataToMap("bodyTemperature",data );
} catch (e) { } catch (e) {
print('Error getting body temp erature: $e'); debugPrint('Error getting body temp erature: $e');
} }
} }
@ -117,7 +118,7 @@ class HealthConnectHelper extends WatchHelper {
final data = await getData(startDate, endDate, types); final data = await getData(startDate, endDate, types);
addDataToMap("distance",data ); addDataToMap("distance",data );
} catch (e) { } catch (e) {
print('Error getting distance: $e'); debugPrint('Error getting distance: $e');
} }
} }
@ -128,12 +129,10 @@ class HealthConnectHelper extends WatchHelper {
final granted = await health.requestAuthorization(types); final granted = await health.requestAuthorization(types);
await Permission.activityRecognition.request(); await Permission.activityRecognition.request();
await Permission.location.request(); await Permission.location.request();
// request access to read historic data
await Health().requestHealthDataHistoryAuthorization(); await Health().requestHealthDataHistoryAuthorization();
// await authorize();
return Result.value(granted); return Result.value(granted);
} catch (e) { } catch (e) {
print('Authorization error: $e'); debugPrint('Authorization error: $e');
return Result.error(false); return Result.error(false);
} }
} }
@ -143,7 +142,6 @@ class HealthConnectHelper extends WatchHelper {
startDate: startTime, startDate: startTime,
endDate: endTime, endDate: endTime,
types: [type], types: [type],
// interval: 86400,
interval: 3600, interval: 3600,
); );
} }
@ -153,9 +151,6 @@ class HealthConnectHelper extends WatchHelper {
for (var point in data) { for (var point in data) {
if (point.value is NumericHealthValue) { if (point.value is NumericHealthValue) {
final numericValue = (point.value as NumericHealthValue).numericValue; final numericValue = (point.value as NumericHealthValue).numericValue;
// point.value = NumericHealthValue(
// numericValue: numericValue * 100,
// );
Vitals vitals = Vitals( Vitals vitals = Vitals(
value: (point.value as NumericHealthValue).numericValue.toStringAsFixed(2), value: (point.value as NumericHealthValue).numericValue.toStringAsFixed(2),
timestamp: point.dateFrom.toString() timestamp: point.dateFrom.toString()

@ -66,7 +66,7 @@ class CustomTabBarState extends State<CustomTabBar> {
late Widget parentWidget; late Widget parentWidget;
if(widget.shouldTabExpanded){ if(widget.shouldTabExpanded){
return Row( 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),
); );
} }

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; 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/extensions/widget_extensions.dart';
import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/theme/colors.dart';
@ -52,7 +53,7 @@ class DatePickerWidget extends StatelessWidget {
Widget _buildLabelText() { Widget _buildLabelText() {
return Text( return Text(
labelText, labelText,
style: const TextStyle( style: TextStyle(
fontSize: 12.f, fontSize: 12.f,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Color(0xff898A8D), color: Color(0xff898A8D),

@ -48,10 +48,10 @@ class CustomBarChart extends StatelessWidget {
final double? maxY; final double? maxY;
final double? maxX; final double? maxX;
final double? minX; final double? minX;
final Color barColor; Color? barColor;
final Color? secondaryBarColor; final Color? secondaryBarColor;
final Color barGridColor; Color? barGridColor;
final Color bottomLabelColor; Color? bottomLabelColor;
final double? bottomLabelSize; final double? bottomLabelSize;
final FontWeight? bottomLabelFontWeight; final FontWeight? bottomLabelFontWeight;
final double? leftLabelInterval; final double? leftLabelInterval;
@ -73,7 +73,7 @@ class CustomBarChart extends StatelessWidget {
final bool isFullScreeGraph; final bool isFullScreeGraph;
final bool makeGraphBasedOnActualValue; final bool makeGraphBasedOnActualValue;
const CustomBarChart( CustomBarChart(
{super.key, {super.key,
required this.dataPoints, required this.dataPoints,
this.secondaryDataPoints, this.secondaryDataPoints,
@ -84,10 +84,7 @@ class CustomBarChart extends StatelessWidget {
this.maxX, this.maxX,
this.showBottomTitleDates = true, this.showBottomTitleDates = true,
this.isFullScreeGraph = false, this.isFullScreeGraph = false,
this.barColor = AppColors.bgGreenColor,
this.secondaryBarColor, this.secondaryBarColor,
this.barGridColor = AppColors.graphGridColor,
this.bottomLabelColor = AppColors.textColor,
this.bottomLabelFontWeight = FontWeight.w500, this.bottomLabelFontWeight = FontWeight.w500,
this.bottomLabelSize, this.bottomLabelSize,
this.leftLabelInterval, this.leftLabelInterval,
@ -102,11 +99,17 @@ class CustomBarChart extends StatelessWidget {
this.minY, this.minY,
this.barRadius, this.barRadius,
this.barWidth = 16, this.barWidth = 16,
this.getTooltipItem this.getTooltipItem,
this.barColor ,
this.barGridColor ,
this.bottomLabelColor,
}); });
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
barColor ??= AppColors.bgGreenColor;
barGridColor ??= AppColors.graphGridColor;
bottomLabelColor ??= AppColors.textColor;
return Material( return Material(
color: Colors.white, color: Colors.white,
child: SizedBox( child: SizedBox(
@ -124,7 +127,7 @@ class CustomBarChart extends StatelessWidget {
}, },
touchTooltipData: BarTouchTooltipData( touchTooltipData: BarTouchTooltipData(
getTooltipColor: (_)=>AppColors.tooltipColor, getTooltipColor: (_)=>AppColorsContext.tooltipColor,
getTooltipItem: (group, groupIndex, rod, rodIndex) { getTooltipItem: (group, groupIndex, rod, rodIndex) {
final dataPoint = dataPoints[groupIndex]; final dataPoint = dataPoints[groupIndex];
if(getTooltipItem != null) { if(getTooltipItem != null) {

@ -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/extensions/string_extensions.dart';
import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/theme/colors.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -99,7 +100,7 @@ class _PhoneNumberInputState extends State<PhoneNumberInput> {
letterSpacing: 2, letterSpacing: 2,
), ),
), ),
style: const TextStyle( style: TextStyle(
fontSize: 18.f, fontSize: 18.f,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
letterSpacing: 2, letterSpacing: 2,

Loading…
Cancel
Save