From c078a2af705675bd4a96df419c8e3154e2e1a69b Mon Sep 17 00:00:00 2001 From: TheConen Date: Thu, 26 Oct 2023 22:15:51 +0200 Subject: [PATCH 1/2] Add Afrezza, Apidra, Levemir, Basaglar and Tresiba profiles, and correct Lantus, Toujeo and Novo Rapid profiles based on more recent data. (#3) Add Afrezza, Apidra, Levemir, Basaglar and Tresiba profiles, and correct Lantus, Toujeo and Novo Rapid profiles based on more recent data. This is NightscoutFoundation#1388 with the merge conflicts resolved. --- .../dexdrip/insulin/InsulinProfileEditor.java | 17 +++ .../layout/activity_insulinprofile_editor.xml | 29 +++-- app/src/main/res/raw/insulin_profiles.txt | 109 ++++++++++++++++-- 3 files changed, 139 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/InsulinProfileEditor.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/InsulinProfileEditor.java index 92789b895e..b215bf4c42 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/InsulinProfileEditor.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/InsulinProfileEditor.java @@ -1,6 +1,7 @@ package com.eveningoutpost.dexdrip.insulin; import android.os.Bundle; +import android.view.MotionEvent; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; @@ -8,6 +9,7 @@ import android.widget.CheckBox; import android.widget.LinearLayout; import android.widget.Spinner; +import android.widget.ScrollView; import com.eveningoutpost.dexdrip.BaseAppCompatActivity; import com.eveningoutpost.dexdrip.R; @@ -31,6 +33,8 @@ public class InsulinProfileEditor extends BaseAppCompatActivity { private Spinner basalSpinner, bolusSpinner; private HashMap checkboxes; private HashMap profiles; + private ScrollView parentScrollView; + private ScrollView childScrollView; //private Context mContext; @@ -49,6 +53,19 @@ protected void onCreate(Bundle savedInstanceState) { linearLayout = (LinearLayout) findViewById(R.id.profile_layout_view); basalSpinner = (Spinner) findViewById(R.id.basalSpinner); bolusSpinner = (Spinner) findViewById(R.id.bolusSpinner); + parentScrollView = (ScrollView) findViewById(R.id.parent_scroll_view); + childScrollView = (ScrollView) findViewById(R.id.child_scroll_view); + + parentScrollView.setOnTouchListener((v, event) -> { + findViewById(R.id.parent_scroll_view).getParent().requestDisallowInterceptTouchEvent(false); + return false; + }); + + childScrollView.setOnTouchListener((v, event) -> { + // Disallow the touch request for parent scroll on touch of child view + v.getParent().getParent().requestDisallowInterceptTouchEvent(true); + return false; + }); for (Insulin i : InsulinManager.getAllProfiles()) { LinearLayout v = new LinearLayout(this); diff --git a/app/src/main/res/layout/activity_insulinprofile_editor.xml b/app/src/main/res/layout/activity_insulinprofile_editor.xml index 731b3afeb9..14448ddd7c 100644 --- a/app/src/main/res/layout/activity_insulinprofile_editor.xml +++ b/app/src/main/res/layout/activity_insulinprofile_editor.xml @@ -8,6 +8,7 @@ android:fitsSystemWindows="true"> - + android:layout_height="440dp" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingBottom="@dimen/activity_vertical_margin"> + + + + Date: Thu, 2 Nov 2023 18:40:19 +0100 Subject: [PATCH 2/2] Revert changes that were done to already existing insulin profiles. --- app/src/main/res/raw/insulin_profiles.txt | 40 +++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/app/src/main/res/raw/insulin_profiles.txt b/app/src/main/res/raw/insulin_profiles.txt index 5add0d1e48..85db7c9eec 100644 --- a/app/src/main/res/raw/insulin_profiles.txt +++ b/app/src/main/res/raw/insulin_profiles.txt @@ -3,7 +3,7 @@ [ { "name": "FIASP", - "displayName": "FIASP (ultra-fast acting)", + "displayName": "FIASP (ultra fast acting)", "concentration": "U100", "PPN": [ @@ -157,11 +157,11 @@ } }, { - "name": "Levemir", - "displayName": "Levemir (long acting)", + "name": "Toujeo", + "displayName": "Toujeo (long acting)", "PPN": [ - "LevemirU100" + "ToujeoU100" ], "concentration": "U100", "Curve": @@ -169,9 +169,9 @@ "type": "linear trapezoid", "data": { - "onset": "60", - "peak": "180-840", - "duration": "1500" + "onset": "180", + "peak": "480", + "duration": "2160" } } }, @@ -190,16 +190,16 @@ { "onset": "60", "peak": "420-1200", - "duration": "1440" + "duration": "2160" } } }, { - "name": "Basaglar", - "displayName": "Basaglar (long acting)", + "name": "Levemir", + "displayName": "Levemir (long acting)", "PPN": [ - "BasaglarU100" + "LevemirU100" ], "concentration": "U100", "Curve": @@ -208,17 +208,17 @@ "data": { "onset": "60", - "peak": "480-1140", - "duration": "1440" + "peak": "180-840", + "duration": "1500" } } }, { - "name": "Toujeo", - "displayName": "Toujeo (ultra-long acting)", + "name": "Basaglar", + "displayName": "Basaglar (long acting)", "PPN": [ - "ToujeoU100" + "BasaglarU100" ], "concentration": "U100", "Curve": @@ -226,9 +226,9 @@ "type": "linear trapezoid", "data": { - "onset": "180", - "peak": "480-1560", - "duration": "2160" + "onset": "60", + "peak": "480-1140", + "duration": "1440" } } }, @@ -252,4 +252,4 @@ } } ] -} +} \ No newline at end of file