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

1088 commits

Author SHA1 Message Date
Philoul 4420189310 Merge remote-tracking branch 'Nightscout/dev' into Fix_DisableLoop 2021-09-09 00:03:27 +02:00
Milos Kozak d18c05205c Resolve warnings 2021-09-07 12:08:19 +02:00
TebbeUbben 3aadb92250 Update Open Humans uploader for new database 2021-08-20 19:37:38 +02:00
Philoul 00c07b91e7 Fix Overview LoopDialog trial 2021-08-17 08:30:10 +02:00
Milos Kozak b995243947 Dana-i icon 2021-07-12 15:43:02 +02:00
Milos Kozak 9d29cafbe6 remove old db code 2021-05-29 23:38:19 +02:00
Milos Kozak bee6d289c0 HistoryBrowseActivity 2021-05-25 17:42:21 +02:00
Milos Kozak 966f7b35f2 move treatments to upper right menu 2021-05-23 21:38:30 +02:00
Milos Kozak 6c851b5e7b
Merge pull request #517 from Philoul/LoopDialog_Improvement 
Loop Dialog improvement
 2021-05-13 17:47:33 +02:00
Milos Kozak 61d5565d18 2.8.2.1-dev-e4 2021-05-04 21:27:11 +02:00
Milos Kozak 0f2f5cd1fa Profile sync, removed NSProfile 2021-05-04 21:07:47 +02:00
Milos Kozak 5747f97201 DanaHistoryDatabase 2021-05-03 09:33:14 +02:00
Milos Kozak 37e3c4532a Profiles -> room (no NS sync yet) 2021-04-29 20:42:45 +02:00
Philoul e7578b4c8f Loop Dialog, hide loop buttons if pump disconnected or loop suspended 2021-04-23 00:31:40 +02:00
Milos Kozak 4120e9eef9 DanaR working 2021-04-09 08:02:46 +02:00
Milos Kozak d27b7a6139 Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink 2021-04-05 23:13:17 +02:00
Milos Kozak 2463f8fc47 ExtendedBolus, TemporaryBasal -> room, DanaRS working 2021-04-05 22:41:28 +02:00
Philoul bf218e9ff4 Merge remote-tracking branch 'Nightscout/meallink' into meallink_ValueWithUnit 
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.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
 2021-03-30 23:05:19 +02:00
Milos Kozak 07d060c2b5 carbs with duration 2021-03-30 22:05:44 +02:00
Milos Kozak e9f4f87894 Remove Tratment.class where possible 2021-03-30 19:37:26 +02:00
Philoul 22384ef2e8 Merge branch 'Adrian_ValueWithUnit_Refactor' into meallink_ValueWithUnit 
# 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/TempTargetDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.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/utils/wizard/BolusWizard.kt
#	automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
#	automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt
#	combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
#	core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
#	core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt
#	database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
#	omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java
 2021-03-29 13:51:28 +02:00
Milos Kozak c9c02458d6 TT & GV new way of upload to NS 2021-03-27 23:14:51 +01:00
Philoul b375ae45ae Improve Layout (avoid overlap between Action and Icon on low res screen) 2021-03-27 16:02:40 +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
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
Milos Kozak a2fbab02f9 food -> Room 2021-03-19 18:49:34 +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 dc010adf8c Improve UserEntryitem Layout 2021-03-09 23:02:31 +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 f3d6fff565 Add Export CSV in Maintenance Fragment 2021-03-08 21:42:16 +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
Philoul c259aa345c Csv format (not xml) modified to Excel default 
remove unnecessary " and use ; as separator
 2021-03-07 10:43:33 +01:00
Milos Kozak 021d70bbe6
Merge pull request #399 from Philoul/Fix_Carbs_Layout 
Fix Carbs Layout
 2021-03-07 00:58:23 +01:00
Philoul 177bf214fd xml export initialization 2021-03-06 16:14:44 +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 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
Philoul efa9e18f83 Constructor for formated Strings with param, add notes, convert to AAPS units in fragment 2021-03-02 22:43:18 +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 3b5b945fea TemporaryTarget -> room database 2021-03-01 12:42:42 +01:00
Philoul 21784920de Fix witdth of Carbs Layout 2021-02-28 23:20:37 +01:00
Milos Kozak 07bf16b07b rename core strings 2021-02-22 18:04:30 +01:00
Milos Kozak a0632f7753 automation module 2021-02-22 17:22:30 +01:00
Milos Kozak 0322dd48ac insight -> lib 2021-02-21 18:03:26 +01:00
Milos Kozak 32873e0730 combo -> new lib 2021-02-21 14:34:31 +01:00
Milos Kozak fe3c049999 Nitification store logging 2021-02-20 19:34:19 +01:00
AdrianLxM 0457c1bf70 fix tests and switch icon and checkbox 2021-02-16 19:03:38 +01:00
AdrianLxM 2f05c431aa layout CarbDialog alarm and use timer for automation alarms 2021-02-15 23:55:57 +01:00
AdrianLxM b9bf699942 use system countdown for simple reminder all the time 2021-02-13 22:41:33 +01:00
AdrianLxM 8b24becac7 small cleanups carb timer 2021-02-13 21:51:37 +01:00
AdrianLxM a15377b48d carb timer for carbs dialog 2021-02-13 21:45:14 +01:00
Milos Kozak 5a4a662ec1 Merge branch 'dev' into newdb 2021-02-11 21:55:47 +01:00
Milos Kozak 84a2c37055 unused code 2021-02-11 13:48:50 +01:00
Milos Kozak 7b4a30865a UserEntry logging 2021-02-09 17:57:28 +01:00
Milos Kozak e16d661183 OverviewFragment -> jetpack 2021-02-04 12:03:34 +01:00
Milos Kozak f5eba51d5a ActionsFragment -> jetpack 2021-02-04 10:06:19 +01:00
Milos Kozak ee6cd22d24 MedtronicFragment -> jetpack 2021-02-03 23:02:14 +01:00
Milos Kozak 0054fce4d9 treatments UI cleanup 2021-02-03 22:40:13 +01:00
Milos Kozak a6b7beb2d7 TreatmentsTemporaryBasalsFragment -> jetpack 2021-02-03 20:22:03 +01:00
Milos Kozak 327f1ca63b TreatmentsProfileSwitchFragment -> jetpack 2021-02-03 20:08:53 +01:00
Milos Kozak 8a15fe12ba TreatmentsBolusFragment -> jetpack 2021-02-03 16:04:09 +01:00
Milos Kozak 74ae51a9e0 TreatmentsFragment -> jetpack 2021-02-03 15:52:43 +01:00
Milos Kozak fab3c870d7 BGSourceFragment -> jetpack 2021-02-03 15:43:47 +01:00
Milos Kozak 4476d0e0db TreatmentsCareportalFragmentBinding -> jetpack 2021-02-03 15:30:05 +01:00
Milos Kozak 61871a924b LocalProfileFragment -> jetpack 2021-02-02 21:53:57 +01:00
Milos Kozak 29e33a68c2 TreatmentsExtendedBolusesFragment -> jetpack 2021-02-02 21:38:22 +01:00
Milos Kozak 609c1dfad3 InsulinFragment -> jetpack 2021-02-02 21:11:40 +01:00
Milos Kozak 026d6039dc SmsCommunicatorOtpActivity -> jetpack 2021-02-02 21:04:44 +01:00
Milos Kozak 2e58bfc829 SmsCommunicatorOtpActivity -> jetpack 2021-02-02 20:48:03 +01:00
Milos Kozak 2078962057 SmsCommunicatorOtpActivity -> jetpack 2021-02-02 20:32:07 +01:00
Milos Kozak e7d58a8f84 EditQuickWizardDialog -> jetpack #2 2021-02-02 20:25:15 +01:00
Milos Kozak 99185f3d1f EditQuickWizardDialog -> jetpack 2021-02-01 20:36:58 +01:00
Milos Kozak f2e5ef76aa OverviewFragment simplify 2021-01-26 15:44:56 +01:00
Milos Kozak a15522fd50 VirtualPumpFragment -> jetpack 2021-01-26 15:44:14 +01:00
Milos Kozak aeec33eb9e FoodFragment -> jetpack 2021-01-25 11:35:36 +01:00
Milos Kozak c3878de916 QuickWizardListActivity -> jetpack 2021-01-25 10:36:05 +01:00
Milos Kozak 7e0be475f8 ObjectivesExamDialog -> jetpack 2021-01-24 22:12:03 +01:00
Milos Kozak 55da01d4a9 ObjectivesFragment -> jetpack 2021-01-24 16:16:07 +01:00
Milos Kozak fcf67cd014 ConfigBuilderFragment -> jetpack 2021-01-24 15:20:12 +01:00
Milos Kozak 95e97edc74 OpenAPSAMAFragment -> jetpack 2021-01-24 14:50:21 +01:00
Milos Kozak 21095233dc HistoryBrowseActivity -> jetpack 2021-01-24 14:44:11 +01:00
Milos Kozak 1294642feb LoopFragment -> jetpack 2021-01-24 14:19:25 +01:00
Milos Kozak 4e3506007f WearFragment, SkinInterface -> jetpack 2021-01-23 22:42:13 +01:00
Milos Kozak 36d3182b1b LogSettingActivity -> jetpack 2021-01-22 14:34:13 +01:00
Milos Kozak a6449a7578 SurveyActivity -> jetpack 2021-01-22 14:23:49 +01:00
Milos Kozak 9409193935 -> jetpack 2021-01-22 14:20:56 +01:00
Milos Kozak b9477eef16 ProfileHelperActivity -> jetpack 2021-01-22 14:16:59 +01:00
Milos Kozak 0c6cd4aa82 WizardInfoDialog -> jetpack 2021-01-21 20:54:13 +01:00
Milos Kozak 63d328b940 TreatmentDialog -> jetpack 2021-01-21 20:46:21 +01:00
Milos Kozak 4a2213d11e TempTargetDialog -> jetpack 2021-01-21 20:41:29 +01:00
Milos Kozak 19b82f2246 TempBasalDialog -> jetpack 2021-01-21 20:35:14 +01:00
Milos Kozak b09a909d74 InsulinDialog -> jetpack 2021-01-21 20:31:20 +01:00
Milos Kozak 83c709e2bc FillDialog -> jetpack 2021-01-21 20:21:25 +01:00
Milos Kozak f1f0703a88 ExtendedBolusDialog -> jetpack 2021-01-21 20:16:13 +01:00
Milos Kozak d376ee2229 CareDialog -> jetpack 2021-01-21 17:21:29 +01:00
Milos Kozak bcc573202c CarbsDialog -> jetpack 2021-01-21 17:03:05 +01:00
Milos Kozak 24eec08a35 CalibrationDialog -> jetpack 2021-01-21 16:45:54 +01:00