caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
10774 commits 1 branch 20 tags 140 MiB
Commit graph

5533 commits

Author SHA1 Message Date
Philoul
c08af324e2 Refactor UserEntry.Units and UserEntry.Actions translations (now included in Translator.kt) 
=> Just missing TT_Reason included in #414
 2021-03-13 22:46:14 +01:00
Philoul
fcb3bfc6eb Fix Missing Profile Name 2021-03-13 22:35:37 +01:00
Philoul
d731762c70 Add optional condition in ValueWithUnit constructor and remove tests for uel.log 2021-03-13 12:15:21 +01:00
Philoul
391c5e19f7 Fix Notes visibility + Update UE on Pref change 2021-03-10 20:55:22 +01:00
Philoul
dc010adf8c Improve UserEntryitem Layout 2021-03-09 23:02:31 +01:00
Philoul
441f419bfa Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_DevMerge 2021-03-09 22:44:33 +01:00
Philoul
9e2ce1cc27 Fix uel after last merge (Mainly Careportal entries form NS) 2021-03-09 22:41:57 +01:00
Milos Kozak
8ec346cd35 specify glucoseUnit, DB++ 2021-03-09 22:11:30 +01:00
Philoul
f3787304f8 Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_DevMerge 
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
#	database/schemas/info.nightscout.androidaps.database.AppDatabase/4.json
 2021-03-09 21:50:17 +01:00
Philoul
01a1321cbb Clean and simplify code 
Add comment in UserEntry (data type for each Unit)
 2021-03-09 21:09:59 +01:00
Philoul
f3d6fff565 Add Export CSV in Maintenance Fragment 2021-03-08 21:42:16 +01:00
Milos Kozak
c28fb465fb Merge remote-tracking branch 'ns/dev' into careportal 2021-03-08 20:27:53 +01:00
Milos Kozak
6c072dbe6e
Merge pull request #402 from nightscout/adrian/cleanup-glucosestatus 
Refactor GlucoseStatusProvider out of GlucoseStatus
 2021-03-08 20:20:10 +01:00
Milos Kozak
8db8edc3f6 Careportal -> Room 2021-03-08 20:10:02 +01:00
Philoul
f7f6f4b7c1 Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML 2021-03-08 18:22:50 +01:00
Philoul
816fd531a2 Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits 2021-03-08 18:21:57 +01:00
AdrianLxM
3cb07c215e Refactor GlucoseStatusProvider out of GlucoseStatus 2021-03-07 20:22:03 +01:00
Milos Kozak
bcfa449ec8 lints 2021-03-07 19:26:08 +01:00
Milos Kozak
658f565cf2 Notofocation -> kt 2021-03-07 17:46:21 +01:00
Milos Kozak
563bee2faf PumpDescription -> kt 2021-03-07 15:19:51 +01:00
Milos Kozak
54ad6caf83 interfaces -> kt 2021-03-07 14:37:05 +01:00
Milos Kozak
2ea423c704 PumpEnactResult -> kt 2021-03-07 13:31:11 +01:00
Philoul
c259aa345c Csv format (not xml) modified to Excel default 
remove unnecessary " and use ; as separator
 2021-03-07 10:43:33 +01:00
Philoul
6096825f4c Formatage xml 1ère version 2021-03-07 03:09:30 +01:00
Milos Kozak
72176edfb9 core -> kt, move tests to core 2021-03-07 00:49:18 +01:00
Philoul
cf83d20e13 Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML 
# Conflicts:
#	core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt
#	database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
 2021-03-06 22:31:39 +01:00
Philoul
5d827d123e 8 ColorGroup added for UI + Fix Carbs in WizardDialog 2021-03-06 17:42:41 +01:00
Philoul
177bf214fd xml export initialization 2021-03-06 16:14:44 +01:00
Milos Kozak
23c23ea0b8 TrendArrow calculation 2021-03-05 23:08:43 +01:00
Philoul
c065672179 Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev 
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
 2021-03-04 23:19:08 +01:00
Milos Kozak
04f074caf9 MainApp -> kt, the rest of DatabaseHelperInterface 2021-03-04 19:23:01 +01:00
Philoul
db4268f408 UserEntry text format and colors.xml 
ValueWithUnit Bold
Note standard grey color
Action Colored (table in UserEntryExt.kt)
 2021-03-04 14:52:30 +01:00
Philoul
37777d7d82 Convert Long duration to min (TT from NS) 2021-03-04 00:22:40 +01:00
Philoul
e89aaf4d11 Merge Dev, Fix new uel.log in NSClientPlugin 2021-03-03 23:53:15 +01:00
Philoul
4ce59b929a Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU 
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
 2021-03-03 22:49:31 +01:00
swissalpine
98e2d9ec86
Update XdripPlugin.kt 2021-03-03 11:06:55 +01:00
Philoul
a556df86c5 uel log, put name in value with unit 2021-03-03 08:53:48 +01:00
Philoul
e0610a8341 Fix 0 value not hidden and add separator for VWU 2021-03-03 00:31:28 +01:00
Milos Kozak
17ceb42df8 better message for out of limit 2021-03-03 00:07:02 +01:00
Milos Kozak
94edd017dd show TBR tab in engineering mode only 2021-03-02 23:32:30 +01:00
Philoul
efa9e18f83 Constructor for formated Strings with param, add notes, convert to AAPS units in fragment 2021-03-02 22:43:18 +01:00
Milos Kozak
efddea0eee
Merge pull request #386 from nightscout/tt 
TempTarget -> room
 2021-03-02 22:41:36 +01:00
Philoul
f226a03c83 Fix Converters.kt 
Initialize a first version of Layout with Card and TreamentsUserEntryFragment
 2021-03-02 13:31:07 +01:00
Milos Kozak
06f35dc522 small fixes 2021-03-01 23:37:14 +01:00
Milos Kozak
ae86cfea77 log errors without tags 2021-03-01 23:11:59 +01:00
Milos Kozak
05d5f8217c fix tests 2021-03-01 17:22:12 +01:00
Milos Kozak
3b5b945fea TemporaryTarget -> room database 2021-03-01 12:42:42 +01:00
Philoul
df995724a7 Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft 
# Conflicts:
#	automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
 2021-03-01 08:34:40 +01:00
AdrianLxM
d098f81241 missing import 2021-02-28 20:02:36 +01:00
AdrianLxM
d42e8fbe92 call confirm wear event 2021-02-28 19:48:33 +01:00