Commit graph

1581 commits

Author SHA1 Message Date
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
Milos Kozak
8042c873a9 position string 2020-12-21 19:40:02 +01:00
Philoul
1d1359dfd4 TT Dialog Add 5 buttons for quick selection of TempTarget 2020-12-20 19:54:54 +01:00
osodebailar
32f37c6b00 change string concetenate with standard coding 2020-12-18 09:05:41 +01:00
Matthew Gray
5dcbd051ff Merge remote-tracking branch 'origin/master' 2020-12-14 13:23:51 +00:00
Matthew Gray
fa7cab9365 Open topics:
1) Typo in Hypo Temp Target - FIXED.
2) Profile switching I:C answer (negate text or expected answer) - FIXED.
3) Douplicated copy in wrongcarbs - FIXED.
4) Possible other strategy in insulin delivery/entry errors. - FIXED.
2020-12-14 13:15:04 +00:00
Milos Kozak
f5f4c655c5 ActionAlarm 2020-12-14 13:52:47 +01:00
Milos Kozak
05c74c0c38 Merge remote-tracking branch 'ns/dev' into pull/84 2020-12-11 22:59:41 +01:00
Milos Kozak
7ed013d44c
Merge branch 'dev' into master 2020-12-11 21:46:00 +01:00
Matthew Gray
d18d17c274 CHO/Bread units changed. 2020-12-07 16:03:45 +00:00
Milos Kozak
26834de458 remove unused resources 2020-12-06 17:32:08 +01:00
Matthew Gray
6ed325f179 Found 1 typo... 2020-12-04 17:44:03 +00:00
Matthew Gray
8c4b2f20a1 Removed question numbers. Added noise and bread units questions. 2020-12-04 17:29:07 +00: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
Matthew Gray
a9cfbde377 RC4 - renumbered CORRECTLY v2. 2020-11-27 15:26:22 +00:00
Matthew Gray
18e914a508 RC4 - renumbered CORRECTLY. 2020-11-27 15:19:38 +00:00
Matthew Gray
80ed590739 RC3 - renumbered. 2020-11-27 15:04:43 +00:00
Brian Quinion
eaba35c024 Add a text filter to the top of preferences 2020-11-24 00:50:09 +00:00
Matthew Gray
865264fc3c Group RC2. 2020-11-17 14:14:29 +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
207a1a522b Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2020-11-08 18:01:37 +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