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

1607 commits

Author SHA1 Message Date
TebbeUbben dbf1772397 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 
 Conflicts:
	build.gradle
 2021-08-20 19:42:59 +02:00
TebbeUbben 3aadb92250 Update Open Humans uploader for new database 2021-08-20 19:37:38 +02:00
Milos Kozak c5857da42f StatsActivity fix 2021-08-11 19:01:19 +02:00
Milos Kozak 62005b437a Improve SMSCommunicator safety 2021-06-10 22:35:50 +02:00
Milos Kozak 9d29cafbe6 remove old db code 2021-05-29 23:38:19 +02:00
Milos Kozak 6735d22934 OfflineEvent -> room 2021-05-28 16:06:44 +02:00
Milos Kozak a0c7e0352d typo 2021-05-17 23:03:52 +02:00
Milos Kozak 0f2f5cd1fa Profile sync, removed NSProfile 2021-05-04 21:07:47 +02:00
Milos Kozak c75d4e8e4e eliminate old NS sync style 2021-05-03 12:49:11 +02:00
Milos Kozak e48d317d55 ProfileSwitch NS sync 2021-04-30 17:21:24 +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 3d9ef71045 Merge branch 'meallink' into meallink_ValueWithUnit 
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
 2021-03-31 22:18:50 +02:00
Milos Kozak a5ea0d9027 DeviceStatus 2021-03-31 21:54:49 +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 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 df1e2c53db Bolus, Carbs, BolusCalcResult new way of upload to NS 2021-03-28 13:45:27 +02:00
Milos Kozak c9c02458d6 TT & GV new way of upload to NS 2021-03-27 23:14:51 +01:00
Milos Kozak 4edf51d6ea remove nsUpload call for TemporaryTargets 2021-03-26 16:23:47 +01:00
Milos Kozak 7f0fe881b6 DetailedBolusInfo, MealLink UI 2021-03-25 17:48:07 +01:00
Philoul d3a9947cb4 Integrate Source for SMS, NS and Bolus Record (Simplify list of actions) 2021-03-23 15:42:55 +01:00
Milos Kozak a2fbab02f9 food -> Room 2021-03-19 18:49:34 +01:00
Philoul accfc24332 Optimize Actions 2021-03-17 22:45:08 +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
Philoul 605ca7def4 Fix TT Reason in TTDialog and add Reason to translator 2021-03-13 17:31:58 +01:00
Philoul 6096825f4c Formatage xml 1ère version 2021-03-07 03:09:30 +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
Milos Kozak 17ceb42df8 better message for out of limit 2021-03-03 00:07:02 +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
Milos Kozak d6e07c45cb
Merge pull request #331 from andyrozman/irish_lang 
irish langugage
 2021-02-25 10:27:54 +01:00
Milos Kozak bf952cca33 Merge branch 'preference_warning_fix' of https://github.com/osodebailar/AndroidAPS-Nightscout_Fork into osodebailar-preference_warning_fix 2021-02-24 17:19:52 +01:00
Milos Kozak a0632f7753 automation module 2021-02-22 17:22:30 +01:00
Milos Kozak 42bedb16f5 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-02-21 18:05:26 +01:00
Milos Kozak 0322dd48ac insight -> lib 2021-02-21 18:03:26 +01:00
Milos Kozak 42b5c94755
Merge pull request #357 from nightscout/combo 
Combo refactor
 2021-02-21 17:16:07 +01:00
Milos Kozak bd342588e8 do not translate key 2021-02-21 15:28:14 +01:00
Milos Kozak 32873e0730 combo -> new lib 2021-02-21 14:34:31 +01:00
Milos Kozak 2b51525719 Privacy option in StartupWizard 2021-02-21 12:30:45 +01:00
Philoul bdd5fe383c Update enum class 
=> Need help for strings location
 2021-02-21 12:03:15 +01:00
Philoul db23a5e9f7 Update Strings (translatable and key removed) 2021-02-21 10:35:04 +01:00
Philoul 73ebc00085 Fix key 2021-02-20 20:25:52 +01:00
Philoul 14454f6c15 Create keys for uel.log 2021-02-20 13:30:34 +01:00
Philoul fa77582856 Merge remote-tracking branch 'Nightscout/dev' into Selected_Item_Background 2021-02-19 22:58:51 +01:00
Philoul 26cb52883b Change Selected item background color 2021-02-19 21:25:55 +01:00
Milos Kozak d7ad8eeefc migrate rest of gradle module files 2021-02-18 23:35:23 +01:00
Milos Kozak 8562a3e481 more test to core 2021-02-18 18:12:39 +01:00
Milos Kozak 86fb53ce34 SetupWizard update 2021-02-15 13:57:01 +01:00
Andy Rozman 217a17d631 - added irish language back into selection box (was removed some time ago) 2021-02-13 17:43:55 +00:00
Milos Kozak e374cdfa98 Merge branch 'dev' into newdb 2021-02-11 12:01:12 +01:00
Milos Kozak 6e4effae55
Merge pull request #276 from Philoul/Graph_Scale 
Secondary graphs : replace Activity by -BGI and align curves scales if same units
 2021-02-11 11:48:01 +01:00
Milos Kozak 7b4a30865a UserEntry logging 2021-02-09 17:57:28 +01:00
Philoul 4f52358516 Change color for BGI curve 
I choose light blue because calculated from insulin but it could be anything else...
 2021-02-06 14:51:38 +01:00
Milos Kozak e16d661183 OverviewFragment -> jetpack 2021-02-04 12:03:34 +01:00
Milos Kozak ee6cd22d24 MedtronicFragment -> jetpack 2021-02-03 23:02:14 +01:00
Milos Kozak 99185f3d1f EditQuickWizardDialog -> jetpack 2021-02-01 20:36:58 +01:00
Milos Kozak acf3b23bf7 cleanup 2021-02-01 15:24:48 +01:00
Philoul 71af958fca Replace Activity by -BGI in secondary graphs 
Align scales (IOB / Absolute) and (deviation / -BGI) if selected in the same graph
 2021-01-30 21:27:22 +01:00
parapenT1sta cd0f4d3b74
Update exam.xml 2021-01-30 12:30:43 +00:00
parapenT1sta 1befbb278e
Update exam.xml 2021-01-30 11:55:34 +00:00
parapenT1sta 59995419d4
fix double space 2021-01-30 11:54:24 +00:00
Milos Kozak aeec33eb9e FoodFragment -> jetpack 2021-01-25 11:35:36 +01:00
Milos Kozak 21095233dc HistoryBrowseActivity -> jetpack 2021-01-24 14:44:11 +01:00
Milos Kozak bcc573202c CarbsDialog -> jetpack 2021-01-21 17:03:05 +01:00
Milos Kozak 157642649e ProfileSwitchDialog -> jetpack 2021-01-21 16:38:42 +01:00
Andy Rozman a7daa83955 - little fix displaying values for special Bolus/Basal steps 
- added YpsoPump to Virtual Pumps
 2021-01-20 23:49:10 +00:00
Milos Kozak e26ae1af7d asking for permissions refactor 2021-01-18 22:47:55 +01:00
Milos Kozak 65a39d91be refactor import/export to create DaggerAppCompatActivityWithResult 2021-01-18 17:36:18 +01:00
Milos Kozak 23d649a0d8
Merge branch 'dev' into dev 2021-01-10 20:41:36 +01:00
Milos Kozak e3ee5eeb1a
Merge pull request #214 from nightscout/soft-force-upload-only 
Rename upload only key and description
 2021-01-10 20:26:30 +01:00
AdrianLxM 68be654fd4 Rename upload only key and description 
This renames the key that people that have disabled it in the past will actively have to re-enable it.
Adds extra warning that it is dangerous to disable it.
 2021-01-10 19:56:44 +01:00
Milos Kozak c5afc6daca
Merge pull request #211 from nightscout/dana/fix-menu-crash-plus-i18n 
fix menu crash and make graph label translatable
 2021-01-10 19:50:25 +01:00
AdrianLxM 301c44627f fix menu crash and make graph label translatable 2021-01-10 04:10:21 +01:00
parapenT1sta 50dcf7d8bb
Update strings.xml 2021-01-09 21:56:31 +00:00
parapenT1sta e8be0fbd79
Update strings.xml 2021-01-09 16:48:17 +00:00
Milos Kozak 48084ff7bf add keys to crash report 2021-01-08 18:55:01 +01:00
xJoe 2b52dbda80
Correction xDrip -> xDrip+ 2021-01-08 18:21:36 +01:00
Milos Kozak c847a5a340 add warning to ns_upload_only 2021-01-08 14:20:18 +01:00
Milos Kozak 5d53029b54
Merge pull request #181 from xJoe/dev 
Status lights battery
 2021-01-07 10:29:09 +01:00
Milos Kozak 2524fc705d
Update app/src/main/res/values/strings.xml 
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
 2021-01-07 10:28:27 +01:00
xJoe 27cd727643
Status lights battery 
added "pump" as there is also sensor battery as of AAPS 2.8
 2021-01-03 18:07:41 +01:00
Milos Kozak cac28dd01f trying to fix crowdin 2021-01-03 11:37:31 +01:00
Milos Kozak bd218a58a2 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-01-03 11:32:47 +01:00
Milos Kozak e5902b73c7 trying to fix crowdin 2021-01-03 11:32:37 +01:00
xJoe 9e286b789a
Update strings.xml 2021-01-03 10:50:08 +01:00
Milos Kozak 815cbbd21d
Merge pull request #150 from CapnGrumpy/master 
Update exam.xml
 2020-12-29 18:36:53 +01:00
Milos Kozak a97b6149ca code cleanup 2020-12-29 18:36:03 +01:00
Matthew Gray 40871717bc
Update exam.xml 
Consistency in use of I:C and not using 'Topic'.
 2020-12-29 13:39:56 +00:00
Milos Kozak 6ed733f8cf Objectives correction 2020-12-28 22:59:45 +01:00
Milos Kozak 52c6d762f5 Merge branch 'dev' into objectives 2020-12-28 18:40:10 +01:00
Milos Kozak c8f7dae2c8 Bolus advisor 2020-12-28 16:42:00 +01:00
Philoul b4710b4936 Merge remote-tracking branch 'Nightscout/dev' into LoopDialog 2020-12-27 13:18:04 +01:00
Philoul cefdaa471d Replace Loop Menu by Loop Dialog 2020-12-26 17:40:16 +01:00
Bart Sopers b783364e81 Fix string resources 2020-12-25 19:36:38 +01:00
Bart Sopers 00b67713b8 Improve string for Omnipod in Setup Wizard 2020-12-25 19:10:02 +01:00
Milos Kozak 3c32583d8c ProfileHelper layout buttons fix 2020-12-25 14:42:39 +01:00
Milos Kozak 03c59d6e19 SMS: report pump unreachable 2020-12-25 12:06:54 +01:00
Milos Kozak 3be91d83f6
Merge pull request #129 from Philoul/TempTargetButtons 
TT Dialog Add 5 buttons for quick selection of TempTarget's type
 2020-12-23 20:55:34 +01:00
Milos Kozak 46c35880e9
Merge branch 'objectives' into master 2020-12-21 21:48:06 +01:00