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

12703 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philoul 74b911d875 Remove SerializedName (all) and Text (Sources) 2021-03-28 21:45:40 +02:00
Andy Rozman e3a75a55eb Merge branch 'dev' into bug423_historyProblem 2021-03-28 20:45:19 +01:00
Andrei Vereha 8d2d38163a simplify exceptions 2021-03-28 21:43:32 +02:00
Andy Rozman bd72473253 - checked all PumpHistoryEntryType entries and removed most of the ones that are not in go code from Eric 
- fixed problem with BGReceived512
 2021-03-28 20:42:15 +01:00
Andrei Vereha 4b49392200 improve error handling 2021-03-28 20:48:11 +02:00
Philoul 9d4a1d5944 Remove UserEntryExt file and move UserEntryPresentationHelper.kt in utils folder 2021-03-28 18:52:13 +02:00
Philoul 09349fddd4 Fix Action Name and Translator 2021-03-28 17:54:18 +02:00
Philoul 87fecfd255 Fix Build 2 2021-03-28 17:37:32 +02:00
Philoul 654ca35dd1 Merge branch 'UserEntryImprovement' into AdrianVWU_Update 
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.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/LoopDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsUserEntryFragment.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
#	core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormat.kt
#	core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
#	core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt
#	database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
 2021-03-28 17:04:52 +02:00
Philoul b9ffb1ca13 Fix Build 2021-03-28 16:25:37 +02:00
Milos Kozak df1e2c53db Bolus, Carbs, BolusCalcResult new way of upload to NS 2021-03-28 13:45:27 +02:00
AdrianLxM 4e77902bdb correct call of teardown wear plugin 2021-03-27 23:35:57 +01:00
AdrianLxM dc79109f5e load Action String Handler 2021-03-27 23:35:50 +01:00
Milos Kozak c9c02458d6 TT & GV new way of upload to NS 2021-03-27 23:14:51 +01:00
AdrianLxM 57f9fa0730 correct call of teardown wear plugin 2021-03-27 22:49:22 +01:00
AdrianLxM b077b1d5b1 load Action String Handler 2021-03-27 22:47:45 +01:00
AdrianLxM 7db2e112ee UserEntryPresentationHelper 2021-03-27 22:33:39 +01:00
AdrianLxM 60f51cfab9 sealed class serialisation refactored 2021-03-27 21:43:05 +01:00
AdrianLxM fa538f059c sealed class serialisation 2021-03-27 21:14:56 +01:00
Philoul 8214874495 Add Local Profile source 2021-03-27 17:44:50 +01:00
Philoul 23c44b388b Add Treatments source 2021-03-27 16:25:59 +01:00
Philoul 2bd2510bd8 Add Maintenance source 2021-03-27 16:17:38 +01:00
Philoul b375ae45ae Improve Layout (avoid overlap between Action and Icon on low res screen) 2021-03-27 16:02:40 +01:00
Philoul 1876a6064c TimeUnit for ms-> min conversion 2021-03-27 14:15:35 +01:00
Philoul f8a38889a3 Add UserEntry for Automation rules (PS, TT, Loop) 2021-03-27 12:05:07 +01:00
Philoul 2e59dd3112 Add UserEntry for Wear 2021-03-27 00:58:01 +01:00
Milos Kozak 6aa9a0fe12 bypass Queue for TemporaryTargets 2021-03-26 21:16:27 +01:00
Milos Kozak 4edf51d6ea remove nsUpload call for TemporaryTargets 2021-03-26 16:23:47 +01:00
Milos Kozak ff001b0add remove MealLink.class 2021-03-25 23:52:08 +01:00
Philoul b329971d9a Add Filter to hide Loop entries 
I didn't find an easy way to filter with SQL query, so I filtered manually the list, probably not the best solution...
 2021-03-25 23:47:03 +01:00
Philoul 854715955a Add Careportal and actions sources + icons 2021-03-25 23:08:32 +01:00
Philoul 0e835cfb23 Fix Missing eventTime for Prime/Fill Dialog 2021-03-25 18:40:20 +01:00
Philoul a23545bbc1 Avoid SMB with 0.00 value 2021-03-25 17:53:54 +01:00
Milos Kozak 7f0fe881b6 DetailedBolusInfo, MealLink UI 2021-03-25 17:48:07 +01:00
Philoul 6e0d21a874 Add Source icon in UserEntryFragment, Update source in uel.log 2021-03-25 13:32:11 +01:00
AdrianLxM 2c5725717c remove test file 2021-03-25 03:25:57 +01:00
AdrianLxM d9aced595b make new ValueWithUnit translatable 2021-03-25 03:23:28 +01:00
AdrianLxM 8ec8bd60bc make compile 2021-03-25 02:31:39 +01:00
AdrianLxM 2da872bbfe idea: value with unit as sealed class 2021-03-25 02:24:26 +01:00
Philoul d3a9947cb4 Integrate Source for SMS, NS and Bolus Record (Simplify list of actions) 2021-03-23 15:42:55 +01:00
Philoul ac3baab3f3 Merge remote-tracking branch 'Nightscout/dev' into UserEntryImprovement 2021-03-23 15:42:03 +01:00
dependabot[bot] b1e162c713
Bump kotlin_version from 1.4.31 to 1.4.32 
Bumps `kotlin_version` from 1.4.31 to 1.4.32.

Updates `kotlin-gradle-plugin` from 1.4.31 to 1.4.32
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

Updates `kotlin-stdlib-jdk7` from 1.4.31 to 1.4.32
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-23 07:19:32 +00:00
Milos Kozak 616871c95c prepare DetailedBolusInfo 2021-03-22 16:59:09 +01:00
Milos Kozak 906fc35da5
Merge pull request #434 from Philoul/FixMigration6to7 
Fix Migration 6 to 7
 2021-03-21 22:31:13 +01:00
Milos Kozak f491bdd127 gradle-6.8.2 2021-03-21 20:00:55 +01:00
Philoul e762efeaa6 Fix Migration 6 to 7 2021-03-21 19:42:32 +01:00
Milos Kozak 3d08683e57
Merge pull request #428 from nightscout/adrian/automation-rework 
automation elements without injector
 2021-03-21 19:40:18 +01:00
Philoul c3d593f7ae Start implementation of Source 2021-03-21 19:14:42 +01:00
Philoul 0d68290a8c Merge remote-tracking branch 'Nightscout/dev' into UserEntryImprovement 2021-03-21 16:33:54 +01:00
Milos Kozak 8c59b7dc14 missing migration 2021-03-21 15:49:56 +01:00