@hedia/recommendation-screen 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedia/recommendation-screen",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Hedia Recommendation Screen for Bolus and Carbohydrates",
   "main": "index.js",
   "scripts": {
@@ -35,22 +35,16 @@
   ],
   "author": "Hedia",
   "license": "ISC",
-  "dependencies": {
-    "@hedia/recommendation-calculator": "1.1.2",
-    "@lingui/react": "2.9.1",
-    "@react-native-community/slider": "3.0.0",
-    "react": "16.13.1",
-    "react-native": "0.62.2",
-    "react-native-linear-gradient": "2.5.6",
-    "react-native-vector-icons": "6.6.0"
-  },
   "devDependencies": {
     "@babel/core": "7.10.3",
     "@babel/preset-env": "7.10.2",
     "@babel/preset-react": "7.10.1",
     "@babel/preset-typescript": "7.10.1",
+    "@hedia/recommendation-calculator": "1.1.2",
     "@lingui/babel-preset-react": "2.9.1",
     "@lingui/cli": "2.9.1",
+    "@lingui/react": "2.9.1",
+    "@react-native-community/slider": "3.0.0",
     "@testing-library/jest-native": "3.1.0",
     "@types/jest": "25.2.3",
     "@types/lingui__core": "2.7.0",
@@ -64,7 +58,11 @@
     "jest": "26.0.1",
     "metro-react-native-babel-preset": "0.58.0",
     "npm-package-json-lint": "5.1.0",
+    "react": "16.13.1",
+    "react-native": "0.62.2",
+    "react-native-linear-gradient": "2.5.6",
     "react-native-testing-library": "2.1.0",
+    "react-native-vector-icons": "6.6.0",
     "react-test-renderer": "16.13.1",
     "tslint": "6.1.2",
     "tslint-config-prettier": "1.18.0",

package/index.d.ts

@@ -1,5 +0,0 @@
-import RecommendationScreen from "./src/RecommendationScreen";
-import { RecommendationErrorEnum } from "./src/types/enum";
-import { ActivityNullError, ActivityRangeError, CarbohydrateLimitError, InsulinLimitError, RecommendationError } from "./src/utils/RecommendationError";
-export default RecommendationScreen;
-export { ActivityNullError, ActivityRangeError, CarbohydrateLimitError, InsulinLimitError, RecommendationError, RecommendationErrorEnum, };

package/index.js

@@ -1,16 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecommendationErrorEnum = exports.RecommendationError = exports.InsulinLimitError = exports.CarbohydrateLimitError = exports.ActivityRangeError = exports.ActivityNullError = void 0;
-const RecommendationScreen_1 = __importDefault(require("./src/RecommendationScreen"));
-const enum_1 = require("./src/types/enum");
-Object.defineProperty(exports, "RecommendationErrorEnum", { enumerable: true, get: function () { return enum_1.RecommendationErrorEnum; } });
-const RecommendationError_1 = require("./src/utils/RecommendationError");
-Object.defineProperty(exports, "ActivityNullError", { enumerable: true, get: function () { return RecommendationError_1.ActivityNullError; } });
-Object.defineProperty(exports, "ActivityRangeError", { enumerable: true, get: function () { return RecommendationError_1.ActivityRangeError; } });
-Object.defineProperty(exports, "CarbohydrateLimitError", { enumerable: true, get: function () { return RecommendationError_1.CarbohydrateLimitError; } });
-Object.defineProperty(exports, "InsulinLimitError", { enumerable: true, get: function () { return RecommendationError_1.InsulinLimitError; } });
-Object.defineProperty(exports, "RecommendationError", { enumerable: true, get: function () { return RecommendationError_1.RecommendationError; } });
-exports.default = RecommendationScreen_1.default;

package/src/RecommendationScreen.d.ts

@@ -1,42 +0,0 @@
-import React from "react";
-import { BGUnit, InjectionMethod, Languages, MoodEnum } from "./types/enum";
-import * as Calculator from "@hedia/recommendation-calculator";
-import { RecommendationError } from "./utils/RecommendationError";
-interface IResult {
-    suggested: number;
-    entered?: number;
-}
-export interface IRecommendationProps {
-    units: BGUnit;
-    language: Languages;
-    calculatorParams: Calculator.IRecommendationParams;
-    injectionMethod: InjectionMethod;
-    exitCallback(): void;
-    removeRecommendedCarbs(): void;
-    onRecentInsulinYes(): void;
-    transferToLogbook(carbs: IResult, insulin: IResult, reminder: number): void;
-    onError(error: RecommendationError): void;
-}
-interface IState {
-    remeasureTime: number;
-    showRecentInsulin: boolean;
-    insulinRecommendation: number;
-    activityReduction?: number;
-    carbRecommendation: number;
-    activeInsulin: number;
-    selectedMood: MoodEnum | 0;
-    enteredCarbs?: number;
-    enteredInsulin?: number;
-}
-export default class RecommendationScreen extends React.Component<IRecommendationProps, IState> {
-    constructor(props: IRecommendationProps);
-    updateRemeasureTime: (remeasureTime: number) => void;
-    handleNoRecentInsulin: () => void;
-    removeCarbRecommendation: () => void;
-    handleMoodSelected: (selectedMood: IState["selectedMood"]) => void;
-    updateCarbRecommendation: (enteredCarbs: number) => void;
-    updateInsulinRecommendation: (enteredInsulin: number) => void;
-    handleTransfer: () => void;
-    render(): JSX.Element;
-}
-export {};

package/src/RecommendationScreen.js

@@ -1,141 +0,0 @@
-"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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-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");
-const Constants_1 = require("./utils/Constants");
-const Header_1 = __importStar(require("./components/Header"));
-const InfoBars_1 = __importStar(require("./components/InfoBars"));
-const RecentInsulin_1 = __importDefault(require("./components/RecentInsulin"));
-const RecommendedCarbs_1 = __importDefault(require("./components/RecommendedCarbs"));
-const RecommendedInsulin_1 = __importDefault(require("./components/RecommendedInsulin"));
-const Remeasure_1 = __importDefault(require("./components/Remeasure"));
-const Calculator = __importStar(require("@hedia/recommendation-calculator"));
-const react_2 = require("@lingui/react");
-const Emotion_1 = __importDefault(require("./components/Emotion"));
-const TransferToLogbook_1 = __importDefault(require("./components/TransferToLogbook"));
-const i18nUtils_1 = require("./locale/i18nUtils");
-const Utils_1 = require("./utils/Utils");
-class RecommendationScreen extends react_1.default.Component {
-    constructor(props) {
-        super(props);
-        this.updateRemeasureTime = (remeasureTime) => {
-            this.setState({
-                remeasureTime,
-            });
-        };
-        this.handleNoRecentInsulin = () => {
-            this.setState({
-                showRecentInsulin: false,
-            });
-        };
-        this.removeCarbRecommendation = () => {
-            this.setState({
-                enteredCarbs: null,
-                carbRecommendation: null,
-            });
-            this.props.removeRecommendedCarbs();
-        };
-        this.handleMoodSelected = (selectedMood) => {
-            this.setState({
-                selectedMood,
-            });
-        };
-        this.updateCarbRecommendation = (enteredCarbs) => {
-            this.setState({
-                enteredCarbs,
-            });
-        };
-        this.updateInsulinRecommendation = (enteredInsulin) => {
-            this.setState({
-                enteredInsulin,
-            });
-        };
-        this.handleTransfer = () => {
-            this.props.transferToLogbook({
-                suggested: this.state.carbRecommendation,
-                entered: this.state.enteredCarbs,
-            }, {
-                suggested: this.state.insulinRecommendation,
-                entered: this.state.enteredInsulin,
-            }, this.state.remeasureTime);
-        };
-        i18nUtils_1.changeLanguage(props.language);
-        const { bolus, carbRecommendation, activityReduction } = Calculator.calculateRecommendation(props.calculatorParams);
-        this.state = {
-            remeasureTime: 1.5,
-            showRecentInsulin: true,
-            insulinRecommendation: Utils_1.Utils.roundValue(bolus, props.injectionMethod),
-            activityReduction,
-            carbRecommendation,
-            activeInsulin: 0.0,
-            selectedMood: 0,
-        };
-    }
-    render() {
-        return (<react_2.I18nProvider language={this.props.language} i18n={i18nUtils_1.i18n}>
-				<react_native_1.ScrollView style={containerStyles.container}>
-					<Header_1.default exitCallback={this.props.exitCallback}/>
-					<InfoBars_1.default label={i18nUtils_1.i18n._("Active Insulin")} value={`${this.state.activeInsulin}`} units={i18nUtils_1.i18n._("units")} showZeroAsDash={false}/>
-					<InfoBars_1.default label={i18nUtils_1.i18n._("Blood Glucose Level")} value={`${this.props.calculatorParams.currentBGL}`} units={this.props.units} showZeroAsDash={true}/>
-					<react_native_1.View style={containerStyles.calcContainer}>
-						<react_native_1.View style={containerStyles.calcMargin}>
-							<react_native_1.View style={[
-            containerStyles.calcBorder,
-            {
-                borderColor: this.state.carbRecommendation
-                    ? Constants_1.BORDER_COLOUR_TEAL
-                    : Constants_1.BORDER_COLOUR_WHITE,
-            },
-        ]}>
-								<RecommendedCarbs_1.default enteredCarbs={`${this.props.calculatorParams.carbohydrates}`} changedRecommendedCarbs={this.updateCarbRecommendation} recommendedCarbs={`${this.state.enteredCarbs ?? this.state.carbRecommendation}`} removeRecommendedCarbs={this.removeCarbRecommendation} onError={this.props.onError}/>
-								<Remeasure_1.default onSliderChange={this.updateRemeasureTime} remeasureTime={this.state.remeasureTime}/>
-							</react_native_1.View>
-						</react_native_1.View>
-					</react_native_1.View>
-					{this.state.showRecentInsulin ? (<RecentInsulin_1.default onRecentInsulinYes={this.props.onRecentInsulinYes} onRecentInsulinNo={this.handleNoRecentInsulin}/>) : (<RecommendedInsulin_1.default injectionMethod={this.props.injectionMethod} insulinRecommendation={this.state.enteredInsulin ?? this.state.insulinRecommendation} activityReduction={this.state.activityReduction} updateRecommendedInsulin={this.updateInsulinRecommendation} onError={this.props.onError}/>)}
-					<Emotion_1.default moodSelected={this.handleMoodSelected}/>
-					<TransferToLogbook_1.default visible={!this.state.showRecentInsulin} transfer={this.handleTransfer}/>
-				</react_native_1.ScrollView>
-			</react_2.I18nProvider>);
-    }
-}
-exports.default = RecommendationScreen;
-const containerStyles = react_native_1.StyleSheet.create({
-    container: {
-        flex: 1,
-        backgroundColor: Constants_1.BACKGROUND_COLOUR_PURPLE,
-    },
-    calcContainer: {
-        flex: 1,
-    },
-    calcMargin: {
-        flex: 1,
-        margin: Header_1.headerStyles.margin.margin,
-    },
-    calcBorder: {
-        ...InfoBars_1.infoStyles.border,
-        borderColor: Constants_1.BORDER_COLOUR_TEAL,
-    },
-});

package/src/components/Emotion.d.ts

@@ -1,14 +0,0 @@
-import React from "react";
-import { MoodEnum } from "../types/enum";
-interface IProps {
-    moodSelected(mood: MoodEnum | 0): void;
-}
-interface IState {
-    selected: MoodEnum | 0;
-}
-export default class Emotion extends React.Component<IProps, IState> {
-    state: IState;
-    handleIconPress: (selected: number, toggle: boolean) => void;
-    render(): JSX.Element;
-}
-export {};

package/src/components/Emotion.js

@@ -1,54 +0,0 @@
-"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");
-const i18nUtils_1 = require("../locale/i18nUtils");
-const enum_1 = require("../types/enum");
-const MoodIcon_1 = __importDefault(require("./MoodIcon"));
-class Emotion extends react_1.default.Component {
-    constructor() {
-        super(...arguments);
-        this.state = {
-            selected: 0,
-        };
-        this.handleIconPress = (selected, toggle) => {
-            const select = toggle ? selected : 0;
-            this.setState({
-                selected: select,
-            });
-            this.props.moodSelected(select);
-        };
-    }
-    render() {
-        const values = Object.values(enum_1.MoodEnum).filter((val) => isNaN(Number(val)));
-        const mapped = values.map((key) => {
-            const moodValue = enum_1.MoodEnum[key];
-            return (<MoodIcon_1.default onPress={(toggle) => this.handleIconPress(moodValue, toggle)} active={moodValue === this.state.selected} mood={moodValue} key={moodValue}/>);
-        });
-        return (<react_native_1.View style={emotionStyles.container}>
-				<react_native_1.View style={emotionStyles.feelingContainer}>
-					<react_native_1.Text style={emotionStyles.feelingText}>{i18nUtils_1.i18n._("How are you feeling?")}</react_native_1.Text>
-				</react_native_1.View>
-				<react_native_1.View style={emotionStyles.moodIconContainer}>{mapped}</react_native_1.View>
-			</react_native_1.View>);
-    }
-}
-exports.default = Emotion;
-const emotionStyles = react_native_1.StyleSheet.create({
-    container: {
-        flex: 1,
-    },
-    feelingContainer: {
-        marginVertical: `3%`,
-    },
-    feelingText: {
-        textAlign: `center`,
-        color: `white`,
-        fontWeight: `bold`,
-        fontSize: react_native_1.Dimensions.get(`screen`).width / 26,
-    },
-    moodIconContainer: { flex: 1, flexDirection: `row`, justifyContent: `center` },
-});

package/src/components/Header.d.ts

@@ -1,52 +0,0 @@
-import React from "react";
-import { IRecommendationProps } from "../RecommendationScreen";
-interface IProps {
-    exitCallback: IRecommendationProps["exitCallback"];
-}
-interface IState {
-    hello: string;
-}
-export default class Header extends React.Component<IProps, IState> {
-    state: IState;
-    render(): JSX.Element;
-}
-export declare const headerStyles: {
-    backgroundColour: {
-        backgroundColor: string;
-    };
-    margin: {
-        margin: string;
-        flexDirection: "row";
-        flex: number;
-    };
-    headerContainer: {
-        flexDirection: "row";
-        flex: number;
-    };
-    exitButtonContainer: {
-        flex: number;
-    };
-    exitButton: {
-        flex: number;
-    };
-    iconStyle: {
-        fontSize: number;
-        color: string;
-    };
-    headerTextContainer: {
-        flex: number;
-        justifyContent: "center";
-        alignItems: "center";
-        marginTop: string;
-    };
-    headerText: {
-        fontSize: number;
-        fontWeight: "bold";
-        textAlign: "center";
-        color: string;
-    };
-    headerFiller: {
-        flex: number;
-    };
-};
-export {};