@hedia/recommendation-screen 1.5.1 → 1.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/.idea/workspace.xml +195 -18
  2. package/package.json +1 -1
  3. package/src/RecommendationScreen.d.ts +4 -0
  4. package/src/RecommendationScreen.jsx +15 -4
  5. package/src/RecommendationScreen.tsx +18 -7
package/.idea/workspace.xml CHANGED
@@ -28,7 +28,9 @@
28
28
  </select>
29
29
  </component>
30
30
  <component name="ChangeListManager">
31
- <list default="true" id="bceba75c-4c15-4bdc-9b41-023f63a30830" name="Default Changelist" comment="" />
31
+ <list default="true" id="bceba75c-4c15-4bdc-9b41-023f63a30830" name="Default Changelist" comment="">
32
+ <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
33
+ </list>
32
34
  <option name="SHOW_DIALOG" value="false" />
33
35
  <option name="HIGHLIGHT_CONFLICTS" value="true" />
34
36
  <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -181,7 +183,10 @@
181
183
  <workItem from="1600240204155" duration="5382000" />
182
184
  <workItem from="1600680315485" duration="15484000" />
183
185
  <workItem from="1600762530394" duration="2312000" />
184
- <workItem from="1601281403601" duration="7842000" />
186
+ <workItem from="1601281403601" duration="8208000" />
187
+ <workItem from="1601639667672" duration="898000" />
188
+ <workItem from="1601883005682" duration="10293000" />
189
+ <workItem from="1601903898220" duration="1722000" />
185
190
  </task>
186
191
  <servers />
187
192
  </component>
@@ -189,7 +194,179 @@
189
194
  <option name="version" value="3" />
190
195
  <option name="exactExcludedFiles">
191
196
  <list>
197
+ <option value="$PROJECT_DIR$/App.d.ts" />
198
+ <option value="$PROJECT_DIR$/App.jsx" />
199
+ <option value="$PROJECT_DIR$/index.js" />
200
+ <option value="$PROJECT_DIR$/index.d.ts" />
201
+ <option value="$PROJECT_DIR$/src/RecommendationScreen.d.ts" />
202
+ <option value="$PROJECT_DIR$/src/RecommendationScreen.jsx" />
203
+ <option value="$PROJECT_DIR$/src/types/enum.d.ts" />
204
+ <option value="$PROJECT_DIR$/src/types/enum.js" />
205
+ <option value="$PROJECT_DIR$/src/types/types.d.ts" />
206
+ <option value="$PROJECT_DIR$/src/types/types.js" />
207
+ <option value="$PROJECT_DIR$/src/utils/AttentionMessages.jsx" />
208
+ <option value="$PROJECT_DIR$/src/utils/RecommendationUtils.js" />
209
+ <option value="$PROJECT_DIR$/src/utils/AttentionMessages.d.ts" />
210
+ <option value="$PROJECT_DIR$/src/utils/RecommendationError.jsx" />
211
+ <option value="$PROJECT_DIR$/src/utils/RecommendationUtils.d.ts" />
212
+ <option value="$PROJECT_DIR$/src/utils/RecommendationError.d.ts" />
213
+ <option value="$PROJECT_DIR$/src/utils/Constants.d.ts" />
214
+ <option value="$PROJECT_DIR$/src/utils/Utils.d.ts" />
215
+ <option value="$PROJECT_DIR$/src/utils/Validations.js" />
216
+ <option value="$PROJECT_DIR$/src/utils/Utils.js" />
217
+ <option value="$PROJECT_DIR$/src/utils/Validations.d.ts" />
218
+ <option value="$PROJECT_DIR$/src/utils/Constants.js" />
219
+ <option value="$PROJECT_DIR$/src/locale/i18nUtils.js" />
220
+ <option value="$PROJECT_DIR$/src/locale/i18nUtils.d.ts" />
221
+ <option value="$PROJECT_DIR$/src/components/RecommendationModal.jsx" />
222
+ <option value="$PROJECT_DIR$/src/components/RecentInsulin.d.ts" />
223
+ <option value="$PROJECT_DIR$/src/components/Header.jsx" />
224
+ <option value="$PROJECT_DIR$/src/components/InvisibleNumberInput.jsx" />
225
+ <option value="$PROJECT_DIR$/src/components/InfoBars.jsx" />
226
+ <option value="$PROJECT_DIR$/src/components/InvisibleNumberInput.d.ts" />
227
+ <option value="$PROJECT_DIR$/src/components/RecommendedCarbs.d.ts" />
228
+ <option value="$PROJECT_DIR$/src/components/TwoOptionModal.d.ts" />
229
+ <option value="$PROJECT_DIR$/src/components/Remeasure.d.ts" />
230
+ <option value="$PROJECT_DIR$/src/components/Header.d.ts" />
231
+ <option value="$PROJECT_DIR$/src/components/InfoBars.d.ts" />
232
+ <option value="$PROJECT_DIR$/src/components/RecommendationModal.d.ts" />
233
+ <option value="$PROJECT_DIR$/src/components/RecommendedInsulin.jsx" />
234
+ <option value="$PROJECT_DIR$/src/components/TransferToLogbook.d.ts" />
235
+ <option value="$PROJECT_DIR$/src/components/LimitationMessage.jsx" />
236
+ <option value="$PROJECT_DIR$/src/components/LineSeparator.jsx" />
237
+ <option value="$PROJECT_DIR$/src/components/TwoOptionModal.jsx" />
238
+ <option value="$PROJECT_DIR$/src/components/RecentInsulin.jsx" />
239
+ <option value="$PROJECT_DIR$/src/components/LineSeparator.d.ts" />
240
+ <option value="$PROJECT_DIR$/src/components/Remeasure.jsx" />
241
+ <option value="$PROJECT_DIR$/src/components/RecommendedInsulin.d.ts" />
242
+ <option value="$PROJECT_DIR$/src/components/TransferToLogbook.jsx" />
243
+ <option value="$PROJECT_DIR$/src/components/LimitationMessage.d.ts" />
244
+ <option value="$PROJECT_DIR$/src/components/RecommendedCarbs.jsx" />
245
+ <option value="$PROJECT_DIR$/src/components/mood/MoodIcon.jsx" />
246
+ <option value="$PROJECT_DIR$/src/components/mood/Emotion.jsx" />
247
+ <option value="$PROJECT_DIR$/src/components/mood/MoodIcon.d.ts" />
248
+ <option value="$PROJECT_DIR$/src/components/mood/Emotion.d.ts" />
249
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIcon.d.ts" />
250
+ <option value="$PROJECT_DIR$/src/components/activity/Activity.d.ts" />
251
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIntensity.d.ts" />
252
+ <option value="$PROJECT_DIR$/src/components/activity/Activity.jsx" />
253
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIcon.jsx" />
254
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIntensity.jsx" />
255
+ <option value="$PROJECT_DIR$/App.d.ts" />
256
+ <option value="$PROJECT_DIR$/App.jsx" />
257
+ <option value="$PROJECT_DIR$/index.d.ts" />
258
+ <option value="$PROJECT_DIR$/src/RecommendationScreen.d.ts" />
259
+ <option value="$PROJECT_DIR$/src/RecommendationScreen.jsx" />
260
+ <option value="$PROJECT_DIR$/src/types/enum.d.ts" />
261
+ <option value="$PROJECT_DIR$/src/types/enum.js" />
262
+ <option value="$PROJECT_DIR$/src/types/types.d.ts" />
263
+ <option value="$PROJECT_DIR$/src/types/types.js" />
264
+ <option value="$PROJECT_DIR$/src/utils/AttentionMessages.jsx" />
265
+ <option value="$PROJECT_DIR$/src/utils/RecommendationUtils.js" />
266
+ <option value="$PROJECT_DIR$/src/utils/AttentionMessages.d.ts" />
267
+ <option value="$PROJECT_DIR$/src/utils/RecommendationError.jsx" />
268
+ <option value="$PROJECT_DIR$/src/utils/RecommendationUtils.d.ts" />
269
+ <option value="$PROJECT_DIR$/src/utils/RecommendationError.d.ts" />
270
+ <option value="$PROJECT_DIR$/src/utils/Constants.d.ts" />
271
+ <option value="$PROJECT_DIR$/src/utils/Utils.d.ts" />
272
+ <option value="$PROJECT_DIR$/src/utils/Validations.js" />
273
+ <option value="$PROJECT_DIR$/src/utils/Utils.js" />
274
+ <option value="$PROJECT_DIR$/src/utils/Validations.d.ts" />
275
+ <option value="$PROJECT_DIR$/src/utils/Constants.js" />
276
+ <option value="$PROJECT_DIR$/src/locale/i18nUtils.js" />
277
+ <option value="$PROJECT_DIR$/src/locale/i18nUtils.d.ts" />
278
+ <option value="$PROJECT_DIR$/src/components/RecommendationModal.jsx" />
279
+ <option value="$PROJECT_DIR$/src/components/RecentInsulin.d.ts" />
280
+ <option value="$PROJECT_DIR$/src/components/Header.jsx" />
281
+ <option value="$PROJECT_DIR$/src/components/InvisibleNumberInput.jsx" />
282
+ <option value="$PROJECT_DIR$/src/components/InfoBars.jsx" />
283
+ <option value="$PROJECT_DIR$/src/components/InvisibleNumberInput.d.ts" />
284
+ <option value="$PROJECT_DIR$/src/components/RecommendedCarbs.d.ts" />
285
+ <option value="$PROJECT_DIR$/src/components/TwoOptionModal.d.ts" />
286
+ <option value="$PROJECT_DIR$/src/components/Remeasure.d.ts" />
287
+ <option value="$PROJECT_DIR$/src/components/Header.d.ts" />
288
+ <option value="$PROJECT_DIR$/src/components/InfoBars.d.ts" />
289
+ <option value="$PROJECT_DIR$/src/components/RecommendationModal.d.ts" />
290
+ <option value="$PROJECT_DIR$/src/components/RecommendedInsulin.jsx" />
291
+ <option value="$PROJECT_DIR$/src/components/TransferToLogbook.d.ts" />
292
+ <option value="$PROJECT_DIR$/src/components/LimitationMessage.jsx" />
293
+ <option value="$PROJECT_DIR$/src/components/LineSeparator.jsx" />
294
+ <option value="$PROJECT_DIR$/src/components/TwoOptionModal.jsx" />
295
+ <option value="$PROJECT_DIR$/src/components/RecentInsulin.jsx" />
296
+ <option value="$PROJECT_DIR$/src/components/LineSeparator.d.ts" />
297
+ <option value="$PROJECT_DIR$/src/components/Remeasure.jsx" />
298
+ <option value="$PROJECT_DIR$/src/components/RecommendedInsulin.d.ts" />
299
+ <option value="$PROJECT_DIR$/src/components/TransferToLogbook.jsx" />
300
+ <option value="$PROJECT_DIR$/src/components/LimitationMessage.d.ts" />
301
+ <option value="$PROJECT_DIR$/src/components/RecommendedCarbs.jsx" />
302
+ <option value="$PROJECT_DIR$/src/components/mood/MoodIcon.jsx" />
303
+ <option value="$PROJECT_DIR$/src/components/mood/Emotion.jsx" />
304
+ <option value="$PROJECT_DIR$/src/components/mood/MoodIcon.d.ts" />
305
+ <option value="$PROJECT_DIR$/src/components/mood/Emotion.d.ts" />
306
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIcon.d.ts" />
307
+ <option value="$PROJECT_DIR$/src/components/activity/Activity.d.ts" />
308
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIntensity.d.ts" />
309
+ <option value="$PROJECT_DIR$/src/components/activity/Activity.jsx" />
310
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIcon.jsx" />
311
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIntensity.jsx" />
312
+ <option value="$PROJECT_DIR$/App.d.ts" />
313
+ <option value="$PROJECT_DIR$/App.jsx" />
192
314
  <option value="$PROJECT_DIR$/index.js" />
315
+ <option value="$PROJECT_DIR$/index.d.ts" />
316
+ <option value="$PROJECT_DIR$/src/RecommendationScreen.d.ts" />
317
+ <option value="$PROJECT_DIR$/src/RecommendationScreen.jsx" />
318
+ <option value="$PROJECT_DIR$/src/types/enum.d.ts" />
319
+ <option value="$PROJECT_DIR$/src/types/enum.js" />
320
+ <option value="$PROJECT_DIR$/src/types/types.d.ts" />
321
+ <option value="$PROJECT_DIR$/src/types/types.js" />
322
+ <option value="$PROJECT_DIR$/src/utils/AttentionMessages.jsx" />
323
+ <option value="$PROJECT_DIR$/src/utils/RecommendationUtils.js" />
324
+ <option value="$PROJECT_DIR$/src/utils/AttentionMessages.d.ts" />
325
+ <option value="$PROJECT_DIR$/src/utils/RecommendationError.jsx" />
326
+ <option value="$PROJECT_DIR$/src/utils/RecommendationUtils.d.ts" />
327
+ <option value="$PROJECT_DIR$/src/utils/RecommendationError.d.ts" />
328
+ <option value="$PROJECT_DIR$/src/utils/Constants.d.ts" />
329
+ <option value="$PROJECT_DIR$/src/utils/Utils.d.ts" />
330
+ <option value="$PROJECT_DIR$/src/utils/Validations.js" />
331
+ <option value="$PROJECT_DIR$/src/utils/Utils.js" />
332
+ <option value="$PROJECT_DIR$/src/utils/Validations.d.ts" />
333
+ <option value="$PROJECT_DIR$/src/utils/Constants.js" />
334
+ <option value="$PROJECT_DIR$/src/locale/i18nUtils.js" />
335
+ <option value="$PROJECT_DIR$/src/locale/i18nUtils.d.ts" />
336
+ <option value="$PROJECT_DIR$/src/components/RecommendationModal.jsx" />
337
+ <option value="$PROJECT_DIR$/src/components/RecentInsulin.d.ts" />
338
+ <option value="$PROJECT_DIR$/src/components/Header.jsx" />
339
+ <option value="$PROJECT_DIR$/src/components/InvisibleNumberInput.jsx" />
340
+ <option value="$PROJECT_DIR$/src/components/InfoBars.jsx" />
341
+ <option value="$PROJECT_DIR$/src/components/InvisibleNumberInput.d.ts" />
342
+ <option value="$PROJECT_DIR$/src/components/RecommendedCarbs.d.ts" />
343
+ <option value="$PROJECT_DIR$/src/components/TwoOptionModal.d.ts" />
344
+ <option value="$PROJECT_DIR$/src/components/Remeasure.d.ts" />
345
+ <option value="$PROJECT_DIR$/src/components/Header.d.ts" />
346
+ <option value="$PROJECT_DIR$/src/components/InfoBars.d.ts" />
347
+ <option value="$PROJECT_DIR$/src/components/RecommendationModal.d.ts" />
348
+ <option value="$PROJECT_DIR$/src/components/RecommendedInsulin.jsx" />
349
+ <option value="$PROJECT_DIR$/src/components/TransferToLogbook.d.ts" />
350
+ <option value="$PROJECT_DIR$/src/components/LimitationMessage.jsx" />
351
+ <option value="$PROJECT_DIR$/src/components/LineSeparator.jsx" />
352
+ <option value="$PROJECT_DIR$/src/components/TwoOptionModal.jsx" />
353
+ <option value="$PROJECT_DIR$/src/components/RecentInsulin.jsx" />
354
+ <option value="$PROJECT_DIR$/src/components/LineSeparator.d.ts" />
355
+ <option value="$PROJECT_DIR$/src/components/Remeasure.jsx" />
356
+ <option value="$PROJECT_DIR$/src/components/RecommendedInsulin.d.ts" />
357
+ <option value="$PROJECT_DIR$/src/components/TransferToLogbook.jsx" />
358
+ <option value="$PROJECT_DIR$/src/components/LimitationMessage.d.ts" />
359
+ <option value="$PROJECT_DIR$/src/components/RecommendedCarbs.jsx" />
360
+ <option value="$PROJECT_DIR$/src/components/mood/MoodIcon.jsx" />
361
+ <option value="$PROJECT_DIR$/src/components/mood/Emotion.jsx" />
362
+ <option value="$PROJECT_DIR$/src/components/mood/MoodIcon.d.ts" />
363
+ <option value="$PROJECT_DIR$/src/components/mood/Emotion.d.ts" />
364
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIcon.d.ts" />
365
+ <option value="$PROJECT_DIR$/src/components/activity/Activity.d.ts" />
366
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIntensity.d.ts" />
367
+ <option value="$PROJECT_DIR$/src/components/activity/Activity.jsx" />
368
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIcon.jsx" />
369
+ <option value="$PROJECT_DIR$/src/components/activity/ActivityIntensity.jsx" />
193
370
  </list>
194
371
  </option>
195
372
  </component>
@@ -242,38 +419,38 @@
242
419
  <state x="1792" y="-66" width="3440" height="1159" key="DiffContextDialog/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1600171230341" />
243
420
  <state x="0" y="123" width="1792" height="897" key="DiffContextDialog/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600096736067" />
244
421
  <state x="1792" y="-314" width="1920" height="865" key="DiffContextDialog/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1598603549140" />
245
- <state width="1321" height="264" key="GridCell.Tab.0.bottom" timestamp="1600268308807">
422
+ <state width="854" height="264" key="GridCell.Tab.0.bottom" timestamp="1601904320102">
246
423
  <screen x="0" y="23" width="1792" height="1097" />
247
424
  </state>
248
425
  <state width="1750" height="261" key="GridCell.Tab.0.bottom/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596194051670" />
249
- <state width="1678" height="263" key="GridCell.Tab.0.bottom/0.23.1792.1097@0.23.1792.1097" timestamp="1599753977842" />
426
+ <state width="854" height="264" key="GridCell.Tab.0.bottom/0.23.1792.1097@0.23.1792.1097" timestamp="1601904320102" />
250
427
  <state width="1750" height="383" key="GridCell.Tab.0.bottom/1792.-195.3440.1417/0.23.1792.1097@0.23.1792.1097" timestamp="1597945008184" />
251
428
  <state width="1678" height="261" key="GridCell.Tab.0.bottom/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1600192512277" />
252
429
  <state width="1321" height="264" key="GridCell.Tab.0.bottom/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600268308807" />
253
430
  <state width="1878" height="183" key="GridCell.Tab.0.bottom/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599837918176" />
254
- <state width="1321" height="264" key="GridCell.Tab.0.center" timestamp="1600268308807">
431
+ <state width="854" height="264" key="GridCell.Tab.0.center" timestamp="1601904320101">
255
432
  <screen x="0" y="23" width="1792" height="1097" />
256
433
  </state>
257
434
  <state width="1750" height="261" key="GridCell.Tab.0.center/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596194051669" />
258
- <state width="1678" height="263" key="GridCell.Tab.0.center/0.23.1792.1097@0.23.1792.1097" timestamp="1599753977841" />
435
+ <state width="854" height="264" key="GridCell.Tab.0.center/0.23.1792.1097@0.23.1792.1097" timestamp="1601904320101" />
259
436
  <state width="1750" height="383" key="GridCell.Tab.0.center/1792.-195.3440.1417/0.23.1792.1097@0.23.1792.1097" timestamp="1597945008183" />
260
437
  <state width="1678" height="261" key="GridCell.Tab.0.center/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1600192512276" />
261
438
  <state width="1321" height="264" key="GridCell.Tab.0.center/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600268308807" />
262
439
  <state width="1878" height="183" key="GridCell.Tab.0.center/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599837918175" />
263
- <state width="1321" height="264" key="GridCell.Tab.0.left" timestamp="1600268308806">
440
+ <state width="854" height="264" key="GridCell.Tab.0.left" timestamp="1601904320101">
264
441
  <screen x="0" y="23" width="1792" height="1097" />
265
442
  </state>
266
443
  <state width="1750" height="261" key="GridCell.Tab.0.left/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596194051668" />
267
- <state width="1678" height="263" key="GridCell.Tab.0.left/0.23.1792.1097@0.23.1792.1097" timestamp="1599753977841" />
444
+ <state width="854" height="264" key="GridCell.Tab.0.left/0.23.1792.1097@0.23.1792.1097" timestamp="1601904320101" />
268
445
  <state width="1750" height="383" key="GridCell.Tab.0.left/1792.-195.3440.1417/0.23.1792.1097@0.23.1792.1097" timestamp="1597945008182" />
269
446
  <state width="1678" height="261" key="GridCell.Tab.0.left/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1600192512276" />
270
447
  <state width="1321" height="264" key="GridCell.Tab.0.left/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600268308806" />
271
448
  <state width="1878" height="183" key="GridCell.Tab.0.left/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599837918175" />
272
- <state width="1321" height="264" key="GridCell.Tab.0.right" timestamp="1600268308807">
449
+ <state width="854" height="264" key="GridCell.Tab.0.right" timestamp="1601904320102">
273
450
  <screen x="0" y="23" width="1792" height="1097" />
274
451
  </state>
275
452
  <state width="1750" height="261" key="GridCell.Tab.0.right/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596194051669" />
276
- <state width="1678" height="263" key="GridCell.Tab.0.right/0.23.1792.1097@0.23.1792.1097" timestamp="1599753977842" />
453
+ <state width="854" height="264" key="GridCell.Tab.0.right/0.23.1792.1097@0.23.1792.1097" timestamp="1601904320102" />
277
454
  <state width="1750" height="383" key="GridCell.Tab.0.right/1792.-195.3440.1417/0.23.1792.1097@0.23.1792.1097" timestamp="1597945008183" />
278
455
  <state width="1678" height="261" key="GridCell.Tab.0.right/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1600192512277" />
279
456
  <state width="1321" height="264" key="GridCell.Tab.0.right/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600268308807" />
@@ -309,13 +486,13 @@
309
486
  <screen x="0" y="23" width="1792" height="1097" />
310
487
  </state>
311
488
  <state x="428" y="230" key="com.intellij.openapi.vcs.changes.SpecificFilesViewDialog/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596103115204" />
312
- <state x="2491" y="140" width="2369" height="738" key="find.popup" timestamp="1600765004086">
313
- <screen x="1792" y="-195" width="3440" height="1417" />
489
+ <state x="559" y="310" width="1233" height="522" key="find.popup" timestamp="1601887937088">
490
+ <screen x="0" y="23" width="1792" height="1097" />
314
491
  </state>
315
492
  <state x="559" y="310" width="1233" height="522" key="find.popup/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596116959250" />
316
- <state x="559" y="310" width="1233" height="522" key="find.popup/0.23.1792.1097@0.23.1792.1097" timestamp="1596191045450" />
493
+ <state x="559" y="310" width="1233" height="522" key="find.popup/0.23.1792.1097@0.23.1792.1097" timestamp="1601887937088" />
317
494
  <state x="558" y="310" width="1234" height="580" key="find.popup/1792.-195.3440.1417/0.23.1792.1097@0.23.1792.1097" timestamp="1597748403272" />
318
- <state x="2491" y="140" width="2369" height="738" key="find.popup/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1600765004086" />
495
+ <state x="2491" y="140" width="2369" height="738" key="find.popup/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1601639674275" />
319
496
  <state x="558" y="310" width="1234" height="580" key="find.popup/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600240789477" />
320
497
  <state x="2390" y="-133" width="1322" height="582" key="find.popup/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599833255779" />
321
498
  <state width="600" height="440" key="javadoc.popup" timestamp="1600096493461">
@@ -326,13 +503,13 @@
326
503
  <screen x="1792" y="-410" width="1920" height="1057" />
327
504
  </state>
328
505
  <state x="2477" y="-143" key="refactoring.ChangeSignatureDialog/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599040674381" />
329
- <state x="2484" y="121" width="1287" height="875" key="search.everywhere.popup" timestamp="1601289666373">
330
- <screen x="1792" y="-195" width="3440" height="1417" />
506
+ <state x="360" y="268" width="670" height="676" key="search.everywhere.popup" timestamp="1601904301010">
507
+ <screen x="0" y="23" width="1792" height="1097" />
331
508
  </state>
332
509
  <state x="360" y="268" width="670" height="676" key="search.everywhere.popup/-1920.-66.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1596101738778" />
333
- <state x="360" y="268" width="670" height="676" key="search.everywhere.popup/0.23.1792.1097@0.23.1792.1097" timestamp="1600244083107" />
510
+ <state x="360" y="268" width="670" height="676" key="search.everywhere.popup/0.23.1792.1097@0.23.1792.1097" timestamp="1601904301010" />
334
511
  <state x="360" y="268" width="671" height="677" key="search.everywhere.popup/1792.-195.3440.1417/0.23.1792.1097@0.23.1792.1097" timestamp="1597748285464" />
335
- <state x="2484" y="121" width="1287" height="875" key="search.everywhere.popup/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1601289666373" />
512
+ <state x="2484" y="121" width="1287" height="875" key="search.everywhere.popup/1792.-195.3440.1417/0.23.1792.1097@1792.-195.3440.1417" timestamp="1601639679448" />
336
513
  <state x="360" y="268" width="671" height="677" key="search.everywhere.popup/1792.-410.1920.1057/0.23.1792.1097@0.23.1792.1097" timestamp="1600242616490" />
337
514
  <state x="2178" y="-174" width="718" height="652" key="search.everywhere.popup/1792.-410.1920.1057/0.23.1792.1097@1792.-410.1920.1057" timestamp="1599833679258" />
338
515
  </component>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hedia/recommendation-screen",
3
- "version": "1.5.1",
3
+ "version": "1.5.2",
4
4
  "description": "Hedia Recommendation Screen for Bolus and Carbohydrates",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/RecommendationScreen.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import React from "react";
2
+ import { AppStateStatus } from "react-native";
2
3
  import { BGUnit, InjectionMethod, Language, MoodEnum } from "./types/enum";
3
4
  import * as Calculator from "@hedia/recommendation-calculator";
4
5
  import { RecommendationError } from "./utils/RecommendationError";
@@ -48,7 +49,10 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
48
49
  private readonly recommendationDate;
49
50
  private scrollView;
50
51
  constructor(props: IRecommendationProps);
52
+ componentDidMount(): void;
51
53
  componentWillUnmount(): void;
54
+ handleAppStateChange: (nextAppState: AppStateStatus) => void;
55
+ showTimeoutModal: () => void;
52
56
  recalculateInsulin: (calculatorParams: Calculator.IRecommendationParams) => void;
53
57
  onExit: () => void;
54
58
  hideAttentionModal: () => void;
package/src/RecommendationScreen.jsx CHANGED
@@ -53,6 +53,15 @@ class RecommendationScreen extends react_1.default.Component {
53
53
  constructor(props) {
54
54
  super(props);
55
55
  this.hasError = false;
56
+ this.handleAppStateChange = (nextAppState) => {
57
+ const isOlderThan15Minutes = global.Date.now() - this.recommendationDate.getTime() > enum_1.Milliseconds.Minute * 15;
58
+ if (nextAppState === `active` && isOlderThan15Minutes) {
59
+ this.showTimeoutModal();
60
+ }
61
+ };
62
+ this.showTimeoutModal = () => {
63
+ this.setState({ showTimeoutModal: true }, () => this.props.showBolusBar(!this.state.showTimeoutModal));
64
+ };
56
65
  this.recalculateInsulin = (calculatorParams) => {
57
66
  const { bolus, wasLimited, activityReduction } = Calculator.calculateRecommendation(calculatorParams);
58
67
  this.setState({
@@ -148,8 +157,8 @@ class RecommendationScreen extends react_1.default.Component {
148
157
  };
149
158
  try {
150
159
  Validations_1.validateParams(props);
151
- i18nUtils_1.changeLanguage(props.language);
152
160
  this.recommendationDate = new Date(global.Date.now());
161
+ i18nUtils_1.changeLanguage(props.language);
153
162
  const { recentBoluses } = props.calculatorParams;
154
163
  const { bolus, carbRecommendation, activityReduction, wasLimited, activeInsulin, } = Calculator.calculateRecommendation(props.calculatorParams);
155
164
  this.suggestedCarbs = carbRecommendation;
@@ -167,17 +176,19 @@ class RecommendationScreen extends react_1.default.Component {
167
176
  showLimitationMessage: false,
168
177
  showTimeoutModal: false,
169
178
  };
170
- this.timer = setTimeout(() => {
171
- this.setState({ showTimeoutModal: true }, () => this.props.showBolusBar(!this.state.showTimeoutModal));
172
- }, enum_1.Milliseconds.Minute * 15);
179
+ this.timer = setTimeout(this.showTimeoutModal, enum_1.Milliseconds.Minute * 15);
173
180
  }
174
181
  catch (error) {
175
182
  this.hasError = true;
176
183
  props.onError(error);
177
184
  }
178
185
  }
186
+ componentDidMount() {
187
+ react_native_1.AppState.addEventListener(`change`, this.handleAppStateChange);
188
+ }
179
189
  componentWillUnmount() {
180
190
  clearTimeout(this.timer);
191
+ react_native_1.AppState.removeEventListener(`change`, this.handleAppStateChange);
181
192
  }
182
193
  render() {
183
194
  if (this.hasError) {
package/src/RecommendationScreen.tsx CHANGED
@@ -1,5 +1,5 @@
1
1
  import React from "react";
2
- import { ScrollView, StyleSheet, View, YellowBox } from "react-native";
2
+ import { AppState, AppStateStatus, ScrollView, StyleSheet, View, YellowBox } from "react-native";
3
3
 
4
4
  import { BGUnit, InjectionMethod, Language, Milliseconds, MoodEnum } from "./types/enum";
5
5
  import { BACKGROUND_COLOUR_PURPLE, BORDER_COLOUR_GREY, BORDER_COLOUR_TEAL } from "./utils/Constants";
@@ -18,6 +18,7 @@ import TransferToLogbook from "./components/TransferToLogbook";
18
18
  import { RecommendationError } from "./utils/RecommendationError";
19
19
 
20
20
  import { t } from "@lingui/macro";
21
+
21
22
  import Activity from "./components/activity/Activity";
22
23
  import LimitationMessage from "./components/LimitationMessage";
23
24
  import RecommendationModal from "./components/RecommendationModal";
@@ -87,9 +88,9 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
87
88
  super(props);
88
89
  try {
89
90
  validateParams(props);
91
+ this.recommendationDate = new Date(global.Date.now());
90
92
 
91
93
  changeLanguage(props.language);
92
- this.recommendationDate = new Date(global.Date.now());
93
94
  const { recentBoluses } = props.calculatorParams;
94
95
  const {
95
96
  bolus,
@@ -117,21 +118,31 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
117
118
  showTimeoutModal: false,
118
119
  };
119
120
 
120
- this.timer = setTimeout((): void => {
121
- this.setState({ showTimeoutModal: true }, (): void =>
122
- this.props.showBolusBar(!this.state.showTimeoutModal),
123
- );
124
- }, Milliseconds.Minute * 15);
121
+ this.timer = setTimeout(this.showTimeoutModal, Milliseconds.Minute * 15);
125
122
  } catch (error) {
126
123
  this.hasError = true;
127
124
  props.onError(error);
128
125
  }
129
126
  }
127
+ public componentDidMount(): void {
128
+ AppState.addEventListener(`change`, this.handleAppStateChange);
129
+ }
130
130
 
131
131
  public componentWillUnmount(): void {
132
132
  clearTimeout(this.timer);
133
+ AppState.removeEventListener(`change`, this.handleAppStateChange);
133
134
  }
134
135
 
136
+ public handleAppStateChange = (nextAppState: AppStateStatus): void => {
137
+ const isOlderThan15Minutes = global.Date.now() - this.recommendationDate.getTime() > Milliseconds.Minute * 15;
138
+ if (nextAppState === `active` && isOlderThan15Minutes) {
139
+ this.showTimeoutModal();
140
+ }
141
+ };
142
+ public showTimeoutModal = (): void => {
143
+ this.setState({ showTimeoutModal: true }, (): void => this.props.showBolusBar(!this.state.showTimeoutModal));
144
+ };
145
+
135
146
  public recalculateInsulin = (calculatorParams: Calculator.IRecommendationParams): void => {
136
147
  const { bolus, wasLimited, activityReduction } = Calculator.calculateRecommendation(calculatorParams);
137
148
  this.setState({