@hedia/recommendation-screen 2.2.0-alpha.29 → 2.2.0-alpha.30

package/dist/src/RecommendationScreen.d.ts

@@ -10,20 +10,6 @@ export interface IResult {
     /** The actual amount (of insulin in units or carbohydrates in grams) */
     entered: number | null;
 }
-/** Represents forecast data */
-export interface IForecast {
-    /** The forecasted glucose value to display. */
-    forecastGlucoseMmoll: number;
-    /** Forecasted time value to display. */
-    forecastTimestamp: Date | string;
-}
-/** Represents CGM data */
-export interface ICGMReading {
-    /** Latest CGM reading timestamp. */
-    cgmTimestamp: Date | string;
-    /** Latest CGM reading value to display. */
-    latestCGMReadingMmoll: number;
-}
 export interface IRecommendationProps {
     /** The blood glucose measurement unit that the user prefers. */
     bloodGlucoseUnit: BloodGlucoseUnit;
@@ -44,9 +30,9 @@ export interface IRecommendationProps {
     /** The properties of the entered activity that are not used for making the calculation itself, but will be used on the recommendation screen. */
     activityDisplayProps: IActivityDisplayProps | null;
     /** Forecast data received from the app */
-    forecast?: IForecast;
+    forecast?: Logbook.Types.ILogbookEntry[`forecast_glucose`];
     /** CGM data received from the app */
-    cgm?: ICGMReading;
+    cgm?: Logbook.Types.ILogbookEntry[`cgm_reading`];
     /**
      * Callback function taking a single boolean argument and returning nothing.
      * To be called when the user decides on a presented carbohydrate recommendation.

package/dist/src/components/ForecastInfoBar.d.ts

@@ -1,14 +1,13 @@
 /// <reference types="react" />
-import { BloodGlucoseUnit } from "@hedia/types";
-import { ICGMReading, IForecast } from "../RecommendationScreen";
+import { BloodGlucoseUnit, Logbook } from "@hedia/types";
 import { Testing } from "../types/enum";
 export interface IProps {
     /** The display label that describes the value to the user. */
     label: string;
     /** The forecast value to display. */
-    forecast: IForecast;
+    forecast: Logbook.Types.ILogbookEntry[`forecast_glucose`];
     /** The cgm value to display. */
-    cgm: ICGMReading;
+    cgm: Logbook.Types.ILogbookEntry[`cgm_reading`];
     /** Unit label to print after the value. */
     unit: BloodGlucoseUnit;
     /**  optional object that contains as properties a valueID and a unitID */

package/dist/src/components/ForecastInfoBar.js

@@ -22,7 +22,7 @@ const ForecastInfoBar = (props) => {
      * @returns JSX element to display a card with the entered value.
      */
     return (<View style={container}>
-			<LinearGradient style={gradient} colors={[`#8B38F5`, `#D593E5`]} useAngle={true} angle={170}>
+			<LinearGradient style={gradient} colors={colors.gradientMain} useAngle={true} angle={170}>
 				<View style={border}>
 					<View style={row}>
 						<View style={labelContainer}>
@@ -31,7 +31,7 @@ const ForecastInfoBar = (props) => {
 						<View style={valueUnitContainer}>
 							<View style={valueContainer}>
 								<TextBold style={value} testID={testID?.valueID}>
-									{forecast.forecastGlucoseMmoll}
+									{forecast?.forecastGlucoseMmoll}
 								</TextBold>
 							</View>
 							<View style={unitContainer}>
@@ -44,15 +44,15 @@ const ForecastInfoBar = (props) => {
 
 					<View style={row}>
 						<View style={forecastSubtitle}>
-							<LinearGradient colors={[`#8B38F5`, `#D593E5`]} useAngle={true} angle={135} style={forecastDot}/>
+							<LinearGradient colors={colors.gradientMain} useAngle={true} angle={135} style={forecastDot}/>
 							<TextRegular style={forecastText}>{i18n._(t `Forecast time:`)}</TextRegular>
-							<TextRegular style={forecastTime}>{String(forecast.forecastTimestamp)}</TextRegular>
+							<TextRegular style={forecastTime}>{String(forecast?.forecastTimestamp)}</TextRegular>
 						</View>
 					</View>
 
 					<View style={row}>
 						<TextRegular style={infoStyles.currentCGM}>
-							{i18n._(t `Current glucose: ${cgm.latestCGMReadingMmoll} ${displayUnit(unit)}`)}
+							{i18n._(t `Current glucose: ${cgm?.latestCGMReadingMmoll} ${displayUnit(unit)}`)}
 						</TextRegular>
 					</View>
 				</View>

package/dist/src/components/RecentInsulin.js

@@ -17,7 +17,7 @@ export default class RecentInsulin extends React.Component {
      */
     render = () => {
         const { container, title, buttonContainer, yesNoContainer, yesNoText } = styles;
-        return (<LinearGradient style={container} colors={[`rgba(87, 138, 255, 0.3)`, `rgba(162, 0, 255, 0.3)`]} useAngle={true} angle={170}>
+        return (<LinearGradient style={container} colors={colors.gradientWithOpacity} useAngle={true} angle={170}>
 				<TextBold style={title}>
 					{i18n._(t `Have you taken rapid-acting insulin within the last 4 hours?`)}
 				</TextBold>

package/dist/src/components/RecommendedInsulin.d.ts

@@ -1,6 +1,5 @@
-import { UserSettings } from "@hedia/types";
+import { Logbook, UserSettings } from "@hedia/types";
 import React from "react";
-import { IForecast } from "../RecommendationScreen";
 export interface IProps {
     /** The amount of insulin in units to display to the user as a recommendation. */
     insulinRecommendation: number;
@@ -15,7 +14,7 @@ export interface IProps {
     /** Used to determine how the insulin amount should be rounded. */
     injectionMethod: UserSettings.Enums.InjectionMethod;
     /** Used to show different text depending on different insulin ranges. */
-    forecast?: IForecast;
+    forecast?: Logbook.Types.ILogbookEntry[`forecast_glucose`];
     /**
      * Callback function taking a number as argument and giving no return value.
      * To be called with the new value every time the content of the insulin input field gets changed.

package/dist/src/components/RecommendedInsulin.js

@@ -110,7 +110,7 @@ export default class RecommendedInsulin extends React.Component {
             : i18n._(t `Recommended amount of rapid-acting insulin for immidiate injection`);
         return (<>
 				<TouchableOpacity testID={RecommendedInsulinTestIds.EditRecommendedInsulin} onPress={this.handleOnPress}>
-					<LinearGradient style={container} colors={[colors.purple, colors.blue]} useAngle={true} angle={315}>
+					<LinearGradient style={container} colors={colors.gradientPurple} useAngle={true} angle={315}>
 						<TextBold style={title}>{titleText}</TextBold>
 						<View style={recommendedContainer}>
 							<View style={valueContainer}>

package/dist/src/utils/Constants.d.ts

@@ -10,6 +10,9 @@ export declare const colors: {
     purple: string;
     semiDarkBlue: string;
     teal: string;
+    gradientMain: string[];
+    gradientWithOpacity: string[];
+    gradientPurple: string[];
 };
 /** The threshold above which hyperglycemia is considered to be severe in mmol/L */
 export declare const SEVERE_HYPERGLYCEMIA_START_MMOL = 15;

package/dist/src/utils/Constants.js

@@ -10,6 +10,9 @@ export const colors = {
     purple: `#a200ff`,
     semiDarkBlue: `#1B1F48`,
     teal: `#01FFFC`,
+    gradientMain: [`#8B38F5`, `#D593E5`],
+    gradientWithOpacity: [`rgba(87, 138, 255, 0.3)`, `rgba(162, 0, 255, 0.3)`],
+    gradientPurple: [`#a200ff`, `#578aff`],
 };
 /** The threshold above which hyperglycemia is considered to be severe in mmol/L */
 export const SEVERE_HYPERGLYCEMIA_START_MMOL = 15;

package/dist/src/utils/Validations.d.ts

@@ -5,7 +5,7 @@
  * @module
  */
 import { Activity, BloodGlucoseUnit, BloodKetonesUnit, BolusCalculator, Languages, Logbook, UserSettings } from "@hedia/types";
-import { IForecast, IRecommendationProps } from "../RecommendationScreen";
+import { IRecommendationProps } from "../RecommendationScreen";
 /**
  * Main function for validating all input properties for the insulin recommendation screen component.
  * Throws an exception if any of the individual checks fail.
@@ -255,4 +255,4 @@ export declare function checkCarbohydrates(carbohydrates: number): void;
  * 1. Check if forecasted glucose is above very low limit. If it isn’t then throw a ForecastedGlucoseIsVeryLowError().
  * @param forecast The forecast data, that includes `forecastGlucoseMmoll` and `forecastTimestamp`
  */
-export declare function checkVeryLowForecastedGlucose(forecast: IForecast | undefined): void;
+export declare function checkVeryLowForecastedGlucose(forecast: Logbook.Types.ILogbookEntry[`forecast_glucose`] | undefined): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedia/recommendation-screen",
-  "version": "2.2.0-alpha.29",
+  "version": "2.2.0-alpha.30",
   "description": "Hedia Recommendation Screen for Bolus and Carbohydrates",
   "main": "dist/index.js",
   "files": [