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

8846 commits

Author SHA1 Message Date
Milos Kozak
8ec991c3d7 LoopPluginTest without powermock 2021-03-21 14:05:05 +01:00
Milos Kozak
ed30e2bf10 fix NPE 2021-03-21 13:52:15 +01:00
Milos Kozak
87ab4fda0e NSSgv -> kt 2021-03-21 13:50:06 +01:00
Milos Kozak
69f8195bbe 2.8.2.1-dev-e 2021-03-20 23:17:05 +01:00
Milos Kozak
70c08d0fe8 Merge remote-tracking branch 'ns/dev' into food 2021-03-20 20:40:51 +01:00
Milos Kozak
415729f243 bypass Intents on NS received data 2021-03-20 20:31:44 +01:00
Milos Kozak
7f95144564
Merge pull request #429 from Philoul/FixCarePortalNoteNull 
Allow null notes in UserEntryLogger
 2021-03-20 18:38:00 +01:00
Milos Kozak
98c7508383 NSClientMbgWorker 2021-03-20 14:51:10 +01:00
Milos Kozak
e53c91fc58 DataWorker, NSDeviceStatus -> kt 2021-03-20 12:30:57 +01:00
Philoul
fdbd7f63e5 Null notes managed in uel.log 2021-03-20 09:36:06 +01:00
Philoul
59abe42032 Timestamp before type for consistency of presentation in TreatmentsUserEntryFragment (Careportal Removed) 2021-03-20 09:27:46 +01:00
Milos Kozak
8be3ccc989 return proper result from Worker 2021-03-19 22:41:19 +01:00
AdrianLxM
7d2e364c77 use UploadQueue through interface 2021-03-19 21:35:09 +01:00
Milos Kozak
a2fbab02f9 food -> Room 2021-03-19 18:49:34 +01:00
Milos Kozak
8736f6db7e Merge branch 'dev' into pull/393 2021-03-19 11:42:59 +01:00
Philoul
400f55f3d9 Remove TT_Reason unit (now the same than TherapyEvent Unit that include all enum key translated with Translator) 
Fix TT Custom missing
 2021-03-18 11:15:45 +01:00
Philoul
accfc24332 Optimize Actions 2021-03-17 22:45:08 +01:00
Philoul
2b6f060eae Translate TT_Reason (UserEntry and csv export) 2021-03-17 12:05:25 +01:00
Milos Kozak
253db21073
Merge pull request #416 from Philoul/Statistic_percentage 
Stats: inRange percentage to always get a sum equal to 100%
 2021-03-17 09:45:37 +01:00
Philoul
919a718a81 Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev 
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
#	core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
 2021-03-17 08:55:26 +01:00
Milos Kozak
02afb58a14 fix of fix 2021-03-16 21:18:44 +01:00
Milos Kozak
91fecb6cc7 fix NPE 2021-03-16 19:06:05 +01:00
Milos Kozak
e2e060b9a9
Merge pull request #414 from Philoul/UpdateTranslator 
Fix TT Reason in TTDialog and add TT Reason to Translator
 2021-03-16 18:17:41 +01:00
Philoul
fc78e5c0b7 Stats: inRange percentage to always get a sum equal to 100% 2021-03-14 17:37:58 +01:00
Philoul
4bd21c2a68 Add string to Activity monitor for translation 2021-03-14 17:07:27 +01:00
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
605ca7def4 Fix TT Reason in TTDialog and add Reason to translator 2021-03-13 17:31:58 +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
91e323b5f5
New Crowdin updates (#388) 
* New translations exam.xml (Portuguese)

* New translations validator.xml (Slovak)

* New translations alert_descriptions.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations alert_titles.xml (Tamil)

* New translations alert_descriptions.xml (Tamil)

* New translations alert_codes.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations validator.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations exam.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations objectives.xml (Tamil)

* New translations exceptions.xml (Tamil)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations exam.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Romanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (German)

* New translations validator.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Hebrew)

* New translations objectives.xml (Hebrew)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese)

* New translations alert_titles.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations exam.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations validator.xml (French)

* New translations alert_descriptions.xml (French)

* New translations alert_titles.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (French)

* New translations alert_descriptions.xml (Swedish)

* New translations alert_titles.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations exam.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)
 2021-03-08 20:22:45 +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
Philoul
c931c8d25a Careportal Remove Duration ValueWithUnit if empty 2021-03-07 15:07:35 +01:00
Milos Kozak
54ad6caf83 interfaces -> kt 2021-03-07 14:37:05 +01:00
Milos Kozak
fcb4d00ba2 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-03-07 14:22:53 +01:00