Commit graph

76 commits

Author SHA1 Message Date
Philoul 816fd531a2 Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits 2021-03-08 18:21:57 +01:00
Milos Kozak 65770ecbf6 RS pairing improvement 2021-03-05 21:19:53 +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 e89aaf4d11 Merge Dev, Fix new uel.log in NSClientPlugin 2021-03-03 23:53:15 +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
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
Philoul 8798be0c34 Update uel.log entries, Increase database version 3=>4, update migration3to4 2021-02-28 15:54:37 +01:00
Philoul 274cac8ff9 First draft with bug 2021-02-25 12:28:36 +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 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
Philoul dec7232d42 Add Converter, companion object and unknow string 2021-02-21 22:46:43 +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
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 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 8562a3e481 more test to core 2021-02-18 18:12:39 +01:00
osodebailar a2b0ae47f9 remove preference warning 2021-02-16 20:04:38 +01:00
Milos Kozak 1b132fd589 cleanup 2021-02-14 11:38:28 +01:00
AdrianLxM ff6a8f30c1 weekday component working 2021-02-13 19:10:12 +01:00
AdrianLxM c7e261d0e6 weekday picker working without view 2021-02-13 18:30:35 +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 6fbdda5716 force reset fabric upload 2021-01-27 15:40:13 +01:00
Milos Kozak 30547af0b4 make ok/cancel button brighter 2021-01-22 10:42:35 +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 c8f7dae2c8 Bolus advisor 2020-12-28 16:42:00 +01:00
Philoul 363fe638af Second verion (only increase a little bit Compact height) 2020-12-25 17:05:41 +01:00
osodebailar df8616e60b new nav header with plugin icons and extend colors for black and white transparence for future extensions 2020-12-17 13:59:06 +01:00
Milos Kozak 6cb62412c5 ErrorDialog improvemnts 2020-12-14 14:20:02 +01:00
Milos Kozak 30624053e3 transfer overview configuration to NSClient 2020-12-04 17:55:35 +01:00
Milos Kozak 3f77496c88 automated copy of configuration AAPS -> NSCLIENT 2020-11-27 16:46:33 +01:00
Milos Kozak e223cd5de3 fix string 2020-11-08 18:11:08 +01:00
Milos Kozak 6c19edbf1c Improve NSClient preferences in NSC mode 2020-10-26 10:37:55 +01: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
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
Bart Sopers adaba8b4ea Remove duplicate string resource after merge 2020-09-01 21:58:35 +02:00
Bart Sopers b0d0ea3476 Merge remote-tracking branch 'upstream/2.7.0-rc5' into omnipod_eros_dev_upstream_merge 2020-09-01 21:57:40 +02:00
Bart Sopers e5b6cf7231 Add option to gradually increase alarm volume 2020-08-29 05:37:26 +02:00
Bart Sopers 01c4d34df8 Display last connection in Omnipod tab in either red or white based on local alerts settings 2020-08-29 01:44:31 +02:00
Milos Kozak cc8b22aa31
Merge pull request #2919 from Philoul/AddCalibrationInTreatmentTab
Add Manual BG or Calibration in CarePortal Tab of Treatment
2020-08-24 21:45:56 +02:00
Philoul 5bb9775aaa Modify String name (mbg = Manual Bg and not only calibration) 2020-08-22 19:01:58 +02:00
Philoul 0d3d83806b Add Calibration in Translator.kt
Replace strings by Constants defined in CareportalEvent (most of them already defined)
8 Constants added in CareportalEvent file (3 types used in CareDialog.kt and Translator.kt, 5 only used in translator.kt)
=> I don't know if these types still exists now without CarePortal Plugin...
2020-08-22 18:33:13 +02:00
Bart Sopers 1f3e8a4102 Merge remote-tracking branch 'upstream/2.7.0-rc4' into omnipod_eros_dev 2020-08-21 15:34:47 +02:00
Milos Kozak 09e5c82d4d unify units spacing 2020-08-19 21:24:01 +02:00
Steffen Müthing d0cbaeeb32 Move protection infrastructure to core
The protection infrastructure is useful for other modules like pump drivers,
so it should be in core.
2020-08-18 19:33:50 +02:00