@hedia/recommendation-screen 2.1.3-beta.6 → 2.1.3-beta.7

package/src/components/Header.js

@@ -1,45 +1,38 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.headerStyles = void 0;
-const macro_1 = require("@lingui/macro");
-const react_1 = __importDefault(require("react"));
-const react_native_1 = require("react-native");
-const i18nUtils_1 = require("../locale/i18nUtils");
-const enum_1 = require("../types/enum");
-const Constants_1 = require("../utils/Constants");
-const Icon_1 = __importDefault(require("./Icon"));
-class Header extends react_1.default.Component {
+import { t } from "@lingui/macro";
+import React from "react";
+import { Dimensions, SafeAreaView, StyleSheet, Text, TouchableOpacity, View } from "react-native";
+import { i18n } from "../locale/i18nUtils";
+import { HeaderTestIds } from "../types/enum";
+import { BACKGROUND_COLOUR_PURPLE, BORDER_COLOUR_GREY } from "../utils/Constants";
+import Icon from "./Icon";
+export default class Header extends React.Component {
     render() {
-        return (<react_1.default.Fragment>
-				<react_native_1.SafeAreaView style={exports.headerStyles.backgroundColour}/>
-				<react_native_1.View style={exports.headerStyles.headerContainer}>
-					<react_native_1.View style={exports.headerStyles.margin}>
-						<react_native_1.View style={exports.headerStyles.exitButtonContainer}>
-							<react_native_1.View style={exports.headerStyles.exitButton}>
-								<react_native_1.TouchableOpacity testID={enum_1.HeaderTestIds.ExitCalculation} accessibilityLabel="exitButton" style={exports.headerStyles.exitButton} onPress={this.props.exitCallback}>
-									<Icon_1.default iconIdentifier={`Ionicons/ios-close-circle-outline`} style={exports.headerStyles.iconStyle}/>
-								</react_native_1.TouchableOpacity>
-								<react_native_1.View style={exports.headerStyles.headerFiller}/>
-							</react_native_1.View>
-						</react_native_1.View>
-						<react_native_1.View style={exports.headerStyles.headerTextContainer}>
-							<react_native_1.Text style={exports.headerStyles.headerText} testID="headerText">
-								{i18nUtils_1.i18n._(macro_1.t `INSULIN${`\n`}RECOMMENDATION`)}
-							</react_native_1.Text>
-						</react_native_1.View>
-						<react_native_1.View style={exports.headerStyles.headerFiller}/>
-					</react_native_1.View>
-				</react_native_1.View>
-			</react_1.default.Fragment>);
+        return (<React.Fragment>
+				<SafeAreaView style={headerStyles.backgroundColour}/>
+				<View style={headerStyles.headerContainer}>
+					<View style={headerStyles.margin}>
+						<View style={headerStyles.exitButtonContainer}>
+							<View style={headerStyles.exitButton}>
+								<TouchableOpacity testID={HeaderTestIds.ExitCalculation} accessibilityLabel="exitButton" style={headerStyles.exitButton} onPress={this.props.exitCallback}>
+									<Icon iconIdentifier={`Ionicons/ios-close-circle-outline`} style={headerStyles.iconStyle}/>
+								</TouchableOpacity>
+								<View style={headerStyles.headerFiller}/>
+							</View>
+						</View>
+						<View style={headerStyles.headerTextContainer}>
+							<Text style={headerStyles.headerText} testID="headerText">
+								{i18n._(t `INSULIN${`\n`}RECOMMENDATION`)}
+							</Text>
+						</View>
+						<View style={headerStyles.headerFiller}/>
+					</View>
+				</View>
+			</React.Fragment>);
     }
 }
-exports.default = Header;
-exports.headerStyles = react_native_1.StyleSheet.create({
+export const headerStyles = StyleSheet.create({
     backgroundColour: {
-        backgroundColor: Constants_1.BACKGROUND_COLOUR_PURPLE,
+        backgroundColor: BACKGROUND_COLOUR_PURPLE,
     },
     margin: {
         margin: `1%`,
@@ -59,8 +52,8 @@ exports.headerStyles = react_native_1.StyleSheet.create({
         flex: 1,
     },
     iconStyle: {
-        fontSize: react_native_1.Dimensions.get(`screen`).width / 12,
-        color: Constants_1.BORDER_COLOUR_GREY,
+        fontSize: Dimensions.get(`screen`).width / 12,
+        color: BORDER_COLOUR_GREY,
     },
     headerTextContainer: {
         flex: 6,
@@ -69,7 +62,7 @@ exports.headerStyles = react_native_1.StyleSheet.create({
         marginTop: `5%`,
     },
     headerText: {
-        fontSize: react_native_1.Dimensions.get(`screen`).width / 18,
+        fontSize: Dimensions.get(`screen`).width / 18,
         fontWeight: `bold`,
         textAlign: `center`,
         color: `white`,

package/src/components/Icon.js

@@ -1,11 +1,6 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 /* tslint:disable */
-const react_1 = __importDefault(require("react"));
+import React from "react";
 const IconSets = {
     AntDesign: require(`react-native-vector-icons/AntDesign`),
     Feather: require(`react-native-vector-icons/Feather`),
@@ -14,7 +9,7 @@ const IconSets = {
     FontAwesome: require(`react-native-vector-icons/FontAwesome`),
     Entypo: require(`react-native-vector-icons/Entypo`),
 };
-class Icon extends react_1.default.Component {
+export default class Icon extends React.Component {
     setNativeProps(nativeProps) {
         this._root.setNativeProps(nativeProps);
     }
@@ -36,7 +31,6 @@ class Icon extends react_1.default.Component {
         return <IconClass {...clonedProps}/>;
     }
 }
-exports.default = Icon;
 Icon.defaultProps = {
     iconIdentifier: `FontAwesome/question`,
 };

package/src/components/InfoBars.js

@@ -1,22 +1,16 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.infoStyles = void 0;
-const types_1 = require("@hedia/types");
-const macro_1 = require("@lingui/macro");
-const react_1 = __importDefault(require("react"));
-const react_native_1 = require("react-native");
-const i18nUtils_1 = require("../locale/i18nUtils");
-const Constants_1 = require("../utils/Constants");
-const Utils_1 = require("../utils/Utils");
-class InfoBars extends react_1.default.Component {
+import { BloodGlucoseUnit, BloodKetonesUnit } from "@hedia/types";
+import { t } from "@lingui/macro";
+import React from "react";
+import { Dimensions, StyleSheet, Text, View } from "react-native";
+import { i18n } from "../locale/i18nUtils";
+import { BORDER_COLOUR_GREY } from "../utils/Constants";
+import { Utils } from "../utils/Utils";
+export default class InfoBars extends React.Component {
     constructor() {
         super(...arguments);
         this.displayValue = () => {
             const { showNullAsDash, unit, value } = this.props;
-            const noDecimal = unit === types_1.BloodGlucoseUnit.MG_DL || unit === types_1.BloodKetonesUnit.MG_DL;
+            const noDecimal = unit === BloodGlucoseUnit.MG_DL || unit === BloodKetonesUnit.MG_DL;
             const nullPlaceholder = noDecimal || !unit ? `-` : `-.-`;
             return value ?? (showNullAsDash ? nullPlaceholder : `0`);
         };
@@ -25,38 +19,37 @@ class InfoBars extends react_1.default.Component {
             if (!unit) {
                 return null;
             }
-            return unit === i18nUtils_1.i18n._(macro_1.t `units`) ? unit : Utils_1.Utils.formatUnit(unit);
+            return unit === i18n._(t `units`) ? unit : Utils.formatUnit(unit);
         };
     }
     render() {
         const { testID } = this.props;
-        return (<react_native_1.View style={exports.infoStyles.container}>
-				<react_native_1.View style={exports.infoStyles.margin}>
-					<react_native_1.View style={exports.infoStyles.border}>
-						<react_native_1.View style={exports.infoStyles.borderContainer}>
-							<react_native_1.View style={exports.infoStyles.labelContainer}>
-								<react_native_1.Text style={exports.infoStyles.label}>{this.props.label}</react_native_1.Text>
-							</react_native_1.View>
-							<react_native_1.View style={exports.infoStyles.valueUnitContainer}>
-								<react_native_1.View style={exports.infoStyles.valueContainer}>
-									<react_native_1.Text style={exports.infoStyles.value} testID={testID?.valueID}>
+        return (<View style={infoStyles.container}>
+				<View style={infoStyles.margin}>
+					<View style={infoStyles.border}>
+						<View style={infoStyles.borderContainer}>
+							<View style={infoStyles.labelContainer}>
+								<Text style={infoStyles.label}>{this.props.label}</Text>
+							</View>
+							<View style={infoStyles.valueUnitContainer}>
+								<View style={infoStyles.valueContainer}>
+									<Text style={infoStyles.value} testID={testID?.valueID}>
 										{this.displayValue()}
-									</react_native_1.Text>
-								</react_native_1.View>
-								<react_native_1.View style={exports.infoStyles.unitContainer}>
-									<react_native_1.Text style={exports.infoStyles.units} testID={testID?.unitID}>
+									</Text>
+								</View>
+								<View style={infoStyles.unitContainer}>
+									<Text style={infoStyles.units} testID={testID?.unitID}>
 										{this.displayUnit()}
-									</react_native_1.Text>
-								</react_native_1.View>
-							</react_native_1.View>
-						</react_native_1.View>
-					</react_native_1.View>
-				</react_native_1.View>
-			</react_native_1.View>);
+									</Text>
+								</View>
+							</View>
+						</View>
+					</View>
+				</View>
+			</View>);
     }
 }
-exports.default = InfoBars;
-exports.infoStyles = react_native_1.StyleSheet.create({
+export const infoStyles = StyleSheet.create({
     container: { flex: 1 },
     margin: {
         flex: 1,
@@ -65,7 +58,7 @@ exports.infoStyles = react_native_1.StyleSheet.create({
     },
     border: {
         borderWidth: 2,
-        borderColor: Constants_1.BORDER_COLOUR_GREY,
+        borderColor: BORDER_COLOUR_GREY,
         borderRadius: 5,
         paddingVertical: `1%`,
     },
@@ -81,7 +74,7 @@ exports.infoStyles = react_native_1.StyleSheet.create({
     },
     label: {
         color: `white`,
-        fontSize: react_native_1.Dimensions.get(`screen`).width / 22,
+        fontSize: Dimensions.get(`screen`).width / 22,
         fontWeight: `bold`,
     },
     valueUnitContainer: {
@@ -95,7 +88,7 @@ exports.infoStyles = react_native_1.StyleSheet.create({
     },
     value: {
         color: `white`,
-        fontSize: react_native_1.Dimensions.get(`screen`).width / 15,
+        fontSize: Dimensions.get(`screen`).width / 15,
         fontWeight: `bold`,
         textAlign: `right`,
     },
@@ -106,7 +99,7 @@ exports.infoStyles = react_native_1.StyleSheet.create({
     },
     units: {
         color: `white`,
-        fontSize: react_native_1.Dimensions.get(`screen`).width / 30,
+        fontSize: Dimensions.get(`screen`).width / 30,
         textAlign: `left`,
         paddingLeft: `5%`,
     },

package/src/components/InvisibleNumberInput.js

@@ -1,11 +1,6 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const react_1 = __importDefault(require("react"));
-const react_native_1 = require("react-native");
-class InvisibleNumberInput extends react_1.default.Component {
+import React from "react";
+import { StyleSheet, TextInput } from "react-native";
+export default class InvisibleNumberInput extends React.Component {
     constructor() {
         super(...arguments);
         this.state = {
@@ -52,15 +47,14 @@ class InvisibleNumberInput extends react_1.default.Component {
     }
     render() {
         const { testID } = this.props;
-        return (<react_native_1.TextInput testID={testID} accessibilityLabel="InvisibleNumberInput" value={`${this.state.value}`} ref={(textInput) => {
+        return (<TextInput testID={testID} accessibilityLabel="InvisibleNumberInput" value={`${this.state.value}`} ref={(textInput) => {
             if (textInput !== null) {
                 this.textInput = textInput;
             }
         }} style={inputStyles.textInput} keyboardType="numeric" onChangeText={this.handleOnChangeText} onEndEditing={this.onEndEdit} maxLength={this.props.maxLength} selectTextOnFocus/>);
     }
 }
-exports.default = InvisibleNumberInput;
-const inputStyles = react_native_1.StyleSheet.create({
+const inputStyles = StyleSheet.create({
     textInput: {
         width: 0,
         height: 0,

package/src/components/LimitationMessage.js

@@ -1,49 +1,27 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const macro_1 = require("@lingui/macro");
-const React = __importStar(require("react"));
-const react_native_1 = require("react-native");
-const i18nUtils_1 = require("../locale/i18nUtils");
-const enum_1 = require("../types/enum");
-const RecommendationModal_1 = require("./RecommendationModal");
-class LimitationMessage extends React.Component {
+import { t } from "@lingui/macro";
+import * as React from "react";
+import { Text, TouchableOpacity, View } from "react-native";
+import { i18n } from "../locale/i18nUtils";
+import { LimitationMessageTestIds } from "../types/enum";
+import { stylesModal } from "./RecommendationModal";
+export default class LimitationMessage extends React.Component {
     constructor() {
         super(...arguments);
         this.render = () => {
             const { limitationMessage } = this.props;
             return (<React.Fragment>
-				<react_native_1.View style={RecommendationModal_1.stylesModal.container}>
-					<react_native_1.View style={RecommendationModal_1.stylesModal.titleContainer}>
-						<react_native_1.Text style={RecommendationModal_1.stylesModal.textTittleMessage}>{i18nUtils_1.i18n._(macro_1.t `Attention`)}</react_native_1.Text>
-					</react_native_1.View>
-					<react_native_1.Text style={RecommendationModal_1.stylesModal.textMessage}>{limitationMessage}</react_native_1.Text>
-				</react_native_1.View>
-				<react_native_1.View style={RecommendationModal_1.stylesModal.containerAcceptButton}>
-					<react_native_1.TouchableOpacity testID={enum_1.LimitationMessageTestIds.OkButton} accessibilityLabel="nextButtonModal" style={RecommendationModal_1.stylesModal.okButton} onPress={this.props.onPressNextButton}>
-						<react_native_1.Text style={RecommendationModal_1.stylesModal.buttonText}>{i18nUtils_1.i18n._(macro_1.t `OK`)}</react_native_1.Text>
-					</react_native_1.TouchableOpacity>
-				</react_native_1.View>
+				<View style={stylesModal.container}>
+					<View style={stylesModal.titleContainer}>
+						<Text style={stylesModal.textTittleMessage}>{i18n._(t `Attention`)}</Text>
+					</View>
+					<Text style={stylesModal.textMessage}>{limitationMessage}</Text>
+				</View>
+				<View style={stylesModal.containerAcceptButton}>
+					<TouchableOpacity testID={LimitationMessageTestIds.OkButton} accessibilityLabel="nextButtonModal" style={stylesModal.okButton} onPress={this.props.onPressNextButton}>
+						<Text style={stylesModal.buttonText}>{i18n._(t `OK`)}</Text>
+					</TouchableOpacity>
+				</View>
 			</React.Fragment>);
         };
     }
 }
-exports.default = LimitationMessage;

package/src/components/LineSeparator.js

@@ -1,19 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const react_1 = __importDefault(require("react"));
-const react_native_1 = require("react-native");
-class LineSeparator extends react_1.default.Component {
+import React from "react";
+import { StyleSheet, View } from "react-native";
+export default class LineSeparator extends React.Component {
     render() {
-        return (<react_1.default.Fragment>
-				<react_native_1.View style={[lineSeparatorStyles.lineStyle, { borderBottomColor: this.props.color }]}/>
-			</react_1.default.Fragment>);
+        return (<React.Fragment>
+				<View style={[lineSeparatorStyles.lineStyle, { borderBottomColor: this.props.color }]}/>
+			</React.Fragment>);
     }
 }
-exports.default = LineSeparator;
-const lineSeparatorStyles = react_native_1.StyleSheet.create({
+const lineSeparatorStyles = StyleSheet.create({
     lineStyle: {
         marginHorizontal: `3%`,
         marginVertical: `2%`,

package/src/components/RecentInsulin.js

@@ -1,45 +1,39 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const macro_1 = require("@lingui/macro");
-const react_1 = __importDefault(require("react"));
-const react_native_1 = require("react-native");
-const i18nUtils_1 = require("../locale/i18nUtils");
-const enum_1 = require("../types/enum");
-const InfoBars_1 = require("./InfoBars");
-class RecentInsulin extends react_1.default.Component {
+import { t } from "@lingui/macro";
+import React from "react";
+import { Dimensions, StyleSheet, Text, TouchableOpacity, View } from "react-native";
+import { i18n } from "../locale/i18nUtils";
+import { RecentInsulinTestIds } from "../types/enum";
+import { infoStyles } from "./InfoBars";
+export default class RecentInsulin extends React.Component {
     constructor() {
         super(...arguments);
         this.render = () => {
-            return (<react_native_1.View style={recentInsulinStyles.container}>
-				<react_native_1.View style={recentInsulinStyles.titleContainer}>
-					<react_native_1.Text style={recentInsulinStyles.recommended}>{i18nUtils_1.i18n._(macro_1.t `Recommended amount of insulin`)}</react_native_1.Text>
-				</react_native_1.View>
-				<react_native_1.View style={recentInsulinStyles.takenInsulinContainer}>
-					<react_native_1.Text style={recentInsulinStyles.takenInsulin}>
-						{i18nUtils_1.i18n._(macro_1.t `Have you taken insulin within the last 4 hours?`)}
-					</react_native_1.Text>
-				</react_native_1.View>
-				<react_native_1.View style={recentInsulinStyles.buttonContainer}>
-					<react_native_1.View style={recentInsulinStyles.filler}/>
-					<react_native_1.TouchableOpacity testID={enum_1.RecentInsulinTestIds.Yes} onPress={this.props.onRecentInsulinYes} style={[recentInsulinStyles.yesNoContainer, { marginRight: `2%` }]}>
-						<react_native_1.Text style={recentInsulinStyles.yesNoText}>{i18nUtils_1.i18n._(macro_1.t `Yes`)}</react_native_1.Text>
-					</react_native_1.TouchableOpacity>
-					<react_native_1.TouchableOpacity testID={enum_1.RecentInsulinTestIds.No} onPress={this.props.onRecentInsulinNo} style={[recentInsulinStyles.yesNoContainer, { marginLeft: `2%` }]}>
-						<react_native_1.Text style={recentInsulinStyles.yesNoText}>{i18nUtils_1.i18n._(macro_1.t `No`)}</react_native_1.Text>
-					</react_native_1.TouchableOpacity>
-					<react_native_1.View style={recentInsulinStyles.filler}/>
-				</react_native_1.View>
-			</react_native_1.View>);
+            return (<View style={recentInsulinStyles.container}>
+				<View style={recentInsulinStyles.titleContainer}>
+					<Text style={recentInsulinStyles.recommended}>{i18n._(t `Recommended amount of insulin`)}</Text>
+				</View>
+				<View style={recentInsulinStyles.takenInsulinContainer}>
+					<Text style={recentInsulinStyles.takenInsulin}>
+						{i18n._(t `Have you taken insulin within the last 4 hours?`)}
+					</Text>
+				</View>
+				<View style={recentInsulinStyles.buttonContainer}>
+					<View style={recentInsulinStyles.filler}/>
+					<TouchableOpacity testID={RecentInsulinTestIds.Yes} onPress={this.props.onRecentInsulinYes} style={[recentInsulinStyles.yesNoContainer, { marginRight: `2%` }]}>
+						<Text style={recentInsulinStyles.yesNoText}>{i18n._(t `Yes`)}</Text>
+					</TouchableOpacity>
+					<TouchableOpacity testID={RecentInsulinTestIds.No} onPress={this.props.onRecentInsulinNo} style={[recentInsulinStyles.yesNoContainer, { marginLeft: `2%` }]}>
+						<Text style={recentInsulinStyles.yesNoText}>{i18n._(t `No`)}</Text>
+					</TouchableOpacity>
+					<View style={recentInsulinStyles.filler}/>
+				</View>
+			</View>);
         };
     }
 }
-exports.default = RecentInsulin;
-const recentInsulinStyles = react_native_1.StyleSheet.create({
+const recentInsulinStyles = StyleSheet.create({
     container: {
-        ...InfoBars_1.infoStyles.margin,
+        ...infoStyles.margin,
         backgroundColor: `rgba(118, 82, 255, 0.5)`,
         borderRadius: 5,
     },
@@ -51,7 +45,7 @@ const recentInsulinStyles = react_native_1.StyleSheet.create({
         marginBottom: `4%`,
     },
     recommended: {
-        ...InfoBars_1.infoStyles.label,
+        ...infoStyles.label,
     },
     takenInsulinContainer: {
         flex: 1,
@@ -60,8 +54,8 @@ const recentInsulinStyles = react_native_1.StyleSheet.create({
         marginTop: `2%`,
     },
     takenInsulin: {
-        ...InfoBars_1.infoStyles.label,
-        fontSize: react_native_1.Dimensions.get(`screen`).width / 27,
+        ...infoStyles.label,
+        fontSize: Dimensions.get(`screen`).width / 27,
         textAlign: `center`,
     },
     buttonContainer: {
@@ -84,7 +78,7 @@ const recentInsulinStyles = react_native_1.StyleSheet.create({
         paddingTop: `1%`,
         paddingBottom: `1%`,
         color: `white`,
-        fontSize: react_native_1.Dimensions.get(`screen`).width / 25,
+        fontSize: Dimensions.get(`screen`).width / 25,
         fontWeight: `bold`,
     },
     filler: {