Commit graph

1404 commits

Author SHA1 Message Date
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 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
Milos Kozak d7ad8eeefc migrate rest of gradle module files 2021-02-18 23:35:23 +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
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 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
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
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 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
xJoe 9e286b789a
Update strings.xml 2021-01-03 10:50:08 +01:00
Milos Kozak a97b6149ca code cleanup 2020-12-29 18:36:03 +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 03c59d6e19 SMS: report pump unreachable 2020-12-25 12:06:54 +01:00
Milos Kozak 8042c873a9 position string 2020-12-21 19:40:02 +01:00
osodebailar 32f37c6b00 change string concetenate with standard coding 2020-12-18 09:05:41 +01:00
Milos Kozak f5f4c655c5 ActionAlarm 2020-12-14 13:52:47 +01:00
Milos Kozak 26834de458 remove unused resources 2020-12-06 17:32:08 +01:00
Milos Kozak 7a96c90ecf
Merge branch 'dev' into bugfix_clone_invalid_profile_causes_fatal_error 2020-11-29 13:29:44 +01:00
Brian Quinion 559a07fa6d Fix clone local profile to test that profile is valid before adding it (causes a fatal error) 2020-11-29 12:19:03 +00:00
AdrianLxM 124d61577d about dialog cleanup and dkma 2020-11-28 17:26:03 +01:00
Milos Kozak 3f77496c88 automated copy of configuration AAPS -> NSCLIENT 2020-11-27 16:46:33 +01:00
Brian Quinion eaba35c024 Add a text filter to the top of preferences 2020-11-24 00:50:09 +00:00
Philoul dde45ef737 Rename Patient age string because of Pregnant new type 2020-11-10 21:42:03 +01:00
Milos Kozak 71c605e3e0 fix string 2020-11-08 21:01:46 +01:00
Milos Kozak e9d0cb3d5c
Merge pull request #55 from twain47/pregnancy_age
Add 'pregnant' age option to allow for higher insulin requirements during pregnancy
2020-11-08 18:01:01 +01:00
Milos Kozak 6b629a1dda
Merge pull request #41 from Philoul/Action_CarePortalInfo
Level informations added in Action>Careportal
2020-11-08 17:47:14 +01:00
Brian Quinion 21b1117655 Add 'pregnant' age option to allow for higher insulin requirements during pregnancy 2020-10-29 12:53:01 +00:00
Milos Kozak b4ff088974 Allow configuring pump type in NSClient 2020-10-25 23:10:09 +01:00
Milos Kozak 08b363b6a5 Add Norwegian language 2020-10-25 22:44:17 +01:00
Dominik Dzienia b2bd2cafec Allow exporting OTP authenticator secred, for manual provisioning or use in hardware OTP token burning apps 2020-10-22 23:18:52 +02:00
Bart Sopers 6d51224089 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-10-21 14:45:44 +02:00
Philoul 85c2c9bb50 Replace dedicated setting by Low Res Skin
Just a copy of Classic skin for initialization
2020-10-20 21:17:28 +02:00
Philoul ee79588449 Add setting for shorten label on very low res 2020-10-19 22:14:28 +02:00
Sam Spycher 16c0c4cfd3 Fix typo in translation string
Fixes nightscout/AndroidAPS#38
2020-10-18 20:12:20 +02:00
Philoul 84c2e7e86e Update of layout for low res screen to avoid line feed in level values 2020-10-17 23:07:40 +02:00
Bart Sopers f64cc66298 Improve Setup Wizard for Omnipod 2020-10-17 19:47:39 +02:00
Philoul bd3cba8a1a First version of Layout and interface 2020-10-17 11:00:38 +02:00
Sam Spycher b355511f33 Validate durationStep from tbrSettings in Pumptype when setting TBR via SMS
Fixes nightscout/AndroidAPS#38
2020-10-16 18:27:04 +02:00
Milos Kozak cbdee2b81b
Merge pull request #7 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
Latest Omnipod updates + custom queue commands
2020-10-02 09:40:45 +02:00
Bart Sopers 31215ea488 Split Change Pod wizard into Activate Pod wizard and Deactivate Pod wizard 2020-10-01 19:32:56 +02:00
Milos Kozak 05125af9e7 Lyumjev 2020-10-01 18:48:32 +02:00
Bart Sopers 8af6519687 Finish new Change Pod Wizard (and some other small changes) 2020-09-29 20:53:12 +02:00
Bart Sopers 50c3ec702c Merge branch 'omnipod_eros_dev_upstream_merge' into omnipod_eros_dev 2020-09-24 23:13:46 +02:00
TebbeUbben b91ee6808f Update OH information text 2020-09-18 23:29:41 +02:00
Bart Sopers d21a8ed00e Merge branch 'omnipod_eros_dev_upstream_merge' into omnipod_eros_dev 2020-09-13 18:47:10 +02:00
Dominik Dzienia d150730212 Make need for additional PIN at end of security code (after OTP) more obvious
* change hint for code checking edit field to indicate need for PIN
* add additional text about how code is constructed from OTP token and PIN
* change PIN preference label - add that it is mandatory
* add "followed by PIN" to text sent via SMS
2020-09-09 11:53:39 +02:00
Milos Kozak a87a69be38
Merge pull request #2945 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
More Omnipod updates & cleanup
2020-09-08 16:20:24 +02:00
Philoul 9ef85ab563 Typo in String 2020-09-07 22:19:41 +02:00
AdrianLxM 54be27e76a
Merge pull request #2950 from MilosKozak/feature/oh-uploader-2_7
Open Humans Uploader for v2.7
2020-09-05 21:31:43 +02:00
Bart Sopers 503fc9dbf9 Allow to continue in Setup Wizard when Omnipod has been selected and a RL connection has been established 2020-09-05 04:26:22 +02:00
Dominik Dzienia 651c3fc426 Add additional prompt for old master password
Prompt for old master password (used to encrypt exported preferences) if current master password is different and cannot decrypt file.
2020-09-04 03:55:02 +02:00