AdrianLxM
296e5d25db
Merge branch 'dagger3' of https://github.com/MilosKozak/AndroidAPS into dagger3
2019-12-27 22:07:57 +01:00
Milos Kozak
5335b075b9
DataService inject SP
2019-12-27 21:43:51 +01:00
Milos Kozak
4b86961235
Use DaggerIntentService
2019-12-27 21:38:59 +01:00
AdrianLxM
f24949ba02
deprecate warning and todo for workaround fields
2019-12-27 21:06:56 +01:00
Milos Kozak
7f8abcf591
Constraints, Dialogs daggerize
2019-12-27 19:20:38 +01:00
Milos Kozak
dc037cc248
resources to SMSCommunicatorPlugin
2019-12-27 10:52:24 +01:00
AdrianLxM
ac05390292
Insulin plugins injectable and Prep for SMS plugin and ConfigBuilder
2019-12-27 04:17:49 +01:00
Milos Kozak
12253007f1
ProfileFunction WIP
2019-12-26 23:26:00 +01:00
Milos Kozak
3654b0b66f
ResourceHelper
2019-12-26 17:50:16 +01:00
Milos Kozak
895b32d8f3
SPImplementation cleanup
2019-12-26 15:12:12 +01:00
Milos Kozak
ec2a0212f5
Merge branch 'dev' into dagger3
2019-12-26 15:01:23 +01:00
Milos Kozak
48e8888b82
Firebase follow privacy setting
2019-12-26 14:46:14 +01:00
Milos Kozak
f8f1fc54be
Merge branch 'dev' into dagger3
2019-12-26 14:41:52 +01:00
osodebailar
1186360df4
reactivate bad tuerkis and format basal
2019-12-25 17:01:38 +01:00
osodebailar
a746b0fe05
add average delta again and refactor NS Client
2019-12-25 16:04:52 +01:00
AdrianLxM
143a9f8749
dagger testing
2019-12-25 12:19:26 +01:00
osodebailar
a4137a2c3b
Merge branch 'dev' of git://github.com/MilosKozak/AndroidAps into refactor-header-area
2019-12-25 12:18:14 +01:00
Milos Kozak
967777f0f8
Merge pull request #2309 from andyrozman/bug_2292_doublebolus_again
...
- added code to remove Treatment entries, without any insulin (for sy…
2019-12-25 11:29:15 +01:00
Andy Rozman
86adc19010
- added code to remove Treatment entries, without any insulin (for syncing PH Bolus entries with Treatments)
2019-12-24 17:52:28 +01:00
Milos Kozak
737a2c5386
KeepAlive refactor, MainApp cleanup
2019-12-24 16:07:17 +01:00
Milos Kozak
99b07521ef
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2019-12-24 11:28:53 +01:00
Milos Kozak
e423b5bc06
Upload IOB to NS without available BG
2019-12-24 00:55:09 +01:00
osodebailar
1d48536c3c
refactor overview with new header area and better formated user values for iob, cob and basal
2019-12-23 18:07:51 +01:00
AdrianLxM
cd6dba8a31
injecting insulin... plugin
2019-12-23 13:27:15 +01:00
Milos Kozak
3a6f29d1dc
Merge branch 'dev' into dialogs
2019-12-22 23:04:21 +01:00
Milos Kozak
034bf3ecd8
fix parsing profile units
2019-12-22 22:52:26 +01:00
Milos Kozak
60dce8fd15
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2019-12-22 22:27:58 +01:00
Milos Kozak
32ce8af144
fix loading profiles
2019-12-22 22:27:43 +01:00
Milos Kozak
91000dc1bb
Confirmation dialogs cleanup
2019-12-22 21:37:26 +01:00
Milos Kozak
808dd92de1
forgotten code remove
2019-12-22 15:08:31 +01:00
Milos Kozak
9042957585
OKDialog layout
2019-12-22 15:03:00 +01:00
Milos Kozak
06d2a2cfc5
ActionProfileSwitch, ActionFragment improvement
2019-12-22 14:18:36 +01:00
Milos Kozak
648b09717e
BLEScanActivity refactor
2019-12-22 12:33:05 +01:00
Milos Kozak
52380cbd22
CareDialog fix
2019-12-22 02:05:50 +01:00
Milos Kozak
88e456dd1a
PairingProgressDialog refactor
2019-12-22 02:00:33 +01:00
Milos Kozak
cbfb8a6a0f
Automation dialogs refactor
2019-12-21 23:17:20 +01:00
Milos Kozak
0e96eb666e
Spinner with larger font
2019-12-21 21:00:43 +01:00
AdrianLxM
3d1c1140b5
dagger2!
2019-12-21 20:17:08 +01:00
Milos Kozak
592246211f
actions layout update
2019-12-21 19:43:29 +01:00
Milos Kozak
a928c48ae0
DanaRUserOptionsActivity refactor
2019-12-21 18:21:32 +01:00
Milos Kozak
33d1d3e82d
DanaRS time setting update for protocol #6
2019-12-21 16:53:50 +01:00
Milos Kozak
7176a8654b
DanaRHistoryActivity refactor
2019-12-21 16:15:35 +01:00
Milos Kozak
2e687fe687
DanaRHistoryActivity layout refactor
2019-12-21 15:26:41 +01:00
Milos Kozak
6d46c39fba
ProfileViewerDialog refactor
2019-12-21 14:30:14 +01:00
AdrianLxM
d5e8345051
Merge remote-tracking branch 'origin/dialogs' into adrian/dialogs
2019-12-20 23:06:09 +01:00
AdrianLxM
953d6bc029
small cleanup
2019-12-20 23:05:35 +01:00
Milos Kozak
c66ca2ea43
NSClient fix
2019-12-20 22:59:16 +01:00
AdrianLxM
ddb2306cdc
small cleanups
2019-12-20 22:22:58 +01:00
Milos Kozak
2ce590a700
BolusProgressDialog refactor
2019-12-20 21:52:37 +01:00
Milos Kozak
83fe8527ce
ErrorDialog refactor
2019-12-20 19:46:07 +01:00
Milos Kozak
44564b91df
cleanup, dark dialog title
2019-12-20 18:55:54 +01:00
Milos Kozak
226990b16f
CalibrationDialog refactor
2019-12-20 16:33:01 +01:00
Milos Kozak
1a1e51020c
TreatmentDialog refactor
2019-12-20 15:36:27 +01:00
Milos Kozak
99d558e99f
InsulinDialog refactor
2019-12-20 14:52:10 +01:00
Milos Kozak
230224be0a
CarbsDialog refactor
2019-12-20 13:58:51 +01:00
Milos Kozak
b0055c3199
ExtendedBolusDialog refactor
2019-12-20 12:29:45 +01:00
Milos Kozak
6d3abd3c22
TempBasalDialog refactor
2019-12-20 11:43:21 +01:00
Milos Kozak
526034292e
FillDialog refactor
2019-12-19 23:45:27 +01:00
Milos Kozak
68533437bb
Merge branch 'dev' into dialogs
2019-12-19 23:13:35 +01:00
Milos Kozak
815336c686
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2019-12-19 23:12:45 +01:00
Milos Kozak
9f27b4ae42
fix NPE
2019-12-19 23:12:24 +01:00
Milos Kozak
e58b7f8040
Simplify NSClient
2019-12-19 21:59:07 +01:00
Milos Kozak
5c9ab721ce
Careportal actions to Actions plugin
2019-12-19 20:30:35 +01:00
Milos Kozak
19b680039e
Merge pull request #2244 from PoweRGbg/LocationLeft
...
Location trigger - added option for Going inside/outside of area
2019-12-19 14:53:00 +01:00
Roumen Georgiev
b90c02a2cc
Removed InputOption
2019-12-19 09:23:09 +02:00
Milos Kozak
8a4b17f6f9
cleanup
2019-12-18 23:37:34 +01:00
Milos Kozak
f7716c79fe
TempTargetDialog
2019-12-18 23:22:03 +01:00
Milos Kozak
8d874e14d3
ProfileSwitchDialog
2019-12-18 20:59:33 +01:00
Milos Kozak
e15a2d6b88
move AutoStartReceiver
2019-12-17 23:24:54 +01:00
Milos Kozak
8af8d584eb
use profile store units as fallback
2019-12-17 18:08:28 +01:00
Milos Kozak
77904cd1fd
stopBolusDelivering not in UI thread
2019-12-17 16:27:36 +01:00
Milos Kozak
9e55b488d2
Merge pull request #2286 from andyrozman/bug_2264_historyproblem_512_2e
...
[bug_2264]
2019-12-17 16:11:16 +01:00
Milos Kozak
4d953cf305
remove profile interface from dana pumps
2019-12-14 21:20:01 +01:00
Milos Kozak
5b345c5ce3
migrate units from last profile
2019-12-13 13:12:36 +01:00
Milos Kozak
f2aa21ce82
some dagger code
2019-12-13 02:12:19 +01:00
Milos Kozak
9bd24ffdbe
Merge pull request #2268 from MilosKozak/randombg
...
WIP: Instrumentation tests
2019-12-12 23:04:38 +01:00
Milos Kozak
119f9f4f13
test improvements, bug fixes
2019-12-12 21:37:09 +01:00
Milos Kozak
921655c0e2
SetupWizardActivityTest
2019-12-11 23:15:36 +01:00
Andy Rozman
6043284d93
[bug_2264]
...
- fixed problem, with unknnown 2e event, size was changed from 7 to 107
2019-12-11 19:46:26 +00:00
Roumen Georgiev
543e8d1d69
removed logging and give some time to the LocationService to get correct location
2019-12-11 12:18:55 +02:00
Milos Kozak
7ca9949a10
Merge pull request #2253 from Philoul/WizardInfoDialog_Translation
...
Wizard info dialog translation
2019-12-10 22:27:15 +01:00
AdrianLxM
6b6360d2c6
Don't warn instantly on RC
2019-12-10 16:05:49 +01:00
Roumen Georgiev
c113cc23b2
Merge pull request #89 from MilosKozak/dev
...
Dev
2019-12-10 14:25:47 +02:00
Roumen Georgiev
5994a75134
Tests working
2019-12-10 13:38:25 +02:00
Roumen Georgiev
55e6246646
some strings and tests broken
2019-12-10 12:34:27 +02:00
Roumen Georgiev
cfdc59c983
fixed initialization and removed dome debugging
2019-12-10 10:01:38 +02:00
Milos Kozak
bb98ec94a5
RandomBg source
2019-12-09 22:50:54 +01:00
Milos Kozak
b69af95791
apply percentage to QuickWizard entries
2019-12-09 21:26:08 +01:00
Milos Kozak
c81536ac46
disable survey menu
2019-12-09 19:22:06 +01:00
Milos Kozak
1c0eb9f803
Stats activity
2019-12-09 19:03:26 +01:00
Roumen Georgiev
70842b269f
pass correct number of strings
2019-12-09 15:07:56 +02:00
Philoul
d6c58fc35c
Set number of decimal for bg value according to unit
2019-12-09 00:24:02 +01:00
Milos Kozak
a9e08bd08d
Measure activity
2019-12-08 23:14:46 +01:00
Philoul
5a606b5cb9
Merge remote-tracking branch 'origin/WizardInfoDialog_Translation' into WizardInfoDialog_Translation
2019-12-08 23:01:38 +01:00
Milos Kozak
00cd2ba343
Calculate TIR
2019-12-08 21:55:49 +01:00
Philoul
9d22e177bb
replaced String.format(MainApp.gs(xx), yy, zz) by MainApp.gs(xx, yy, zz) for bg, cob and carbs
2019-12-08 21:30:25 +01:00
Philoul
1525a30e01
Merge pull request #3 from Philoul/dev
...
Dev
2019-12-08 21:24:13 +01:00
Milos Kozak
0d6743ab82
Merge branch 'survey' of https://github.com/MilosKozak/AndroidAPS into survey
2019-12-08 20:21:29 +01:00
Milos Kozak
0e89ced3e1
Merge branch 'dev' into survey
2019-12-08 19:07:35 +01:00
Philoul
6d82ceacf9
Replace the text string in the code with MainApp.gs to allow translation
...
For bg I leave a decimal. I tried to use valueToUnitsToString but I don't know how to get units from json (NS data I guess) and this method does not work (missing import?) On the JsonHelper object ...
2019-12-08 01:03:49 +01:00
AdrianLxM
00702ae924
rc version refactor
2019-12-07 20:02:10 +01:00
Milos Kozak
0c19a4081f
ignoreCase = true
2019-12-07 19:18:52 +01:00
Milos Kozak
8124c0ae4d
RC warnings
2019-12-07 19:15:26 +01:00
Milos Kozak
517b9a9fa7
Handle NS TempTarget sync properly
2019-12-07 18:14:32 +01:00
Roumen Georgiev
7889e3755d
Adding GOING_IN & GOING_OUT modes
2019-12-06 15:03:17 +02:00
Roumen Georgiev
6c8a5aee47
Merge pull request #88 from MilosKozak/dev
...
Dev
2019-12-05 15:06:15 +02:00
Roumen Georgiev
14dc7395e0
Created enum for mode & tests
2019-12-04 16:42:47 +02:00
Milos Kozak
a66b3f7090
allow sorting of automation tasks
2019-12-03 21:07:31 +01:00
Milos Kozak
3d521fd412
remove rarely used clone library
2019-12-03 18:51:14 +01:00
Milos Kozak
6ba485d9cd
fix NPE
2019-12-03 18:44:59 +01:00
Milos Kozak
95d3551931
Make switching language working again
2019-12-03 18:12:37 +01:00
Roumen Georgiev
aae2e21bef
trigger works
2019-12-03 16:49:08 +02:00
Milos Kozak
e4a5616298
wizard & SP improvements
2019-12-03 15:29:14 +01:00
Milos Kozak
7f6eb40b66
WeekdaysPicker set starting day
2019-12-02 23:18:55 +01:00
Milos Kozak
42401453c6
okhttp3, retrofit2 update
2019-12-02 22:35:16 +01:00
Milos Kozak
7cca9892dc
materialdatetimepicker update
2019-12-02 22:16:20 +01:00
Milos Kozak
9512b153c2
Merge pull request #2216 from 2flea/dev_auto_loop
...
Deactivate Automation if Loop is disabled, not only if it is suspended
2019-12-02 21:12:27 +01:00
Milos Kozak
c76f8d76c8
lint
2019-12-02 21:08:20 +01:00
Milos Kozak
0b559da27d
Merge pull request #1758 from PoweRGbg/patch-1
...
try to calculate direction of BG if missing
2019-12-02 19:00:03 +01:00
Roumen Georgiev
2fa3805030
Merge pull request #87 from anbraten/automation-location-left-trigger
...
Automation location left trigger
2019-12-02 11:22:44 +02:00
Milos Kozak
8496f7dc18
Merge pull request #2172 from gregorybel/feature/expand-status-light
...
Add possibility to show Battery info in days instead of percent
2019-12-02 08:35:15 +01:00
Milos Kozak
87d3c43a33
low_mark, high_mark to setup wizard
2019-12-02 00:07:08 +01:00
Milos Kozak
36b009d56c
move processing of unit dependent preferences to extra function
2019-12-01 22:03:17 +01:00
Milos Kozak
c0ad125934
warn if profile is not uploadable to NS
2019-12-01 21:59:12 +01:00
Milos Kozak
702e1f0675
allow clone from existing switch
2019-12-01 20:42:23 +01:00
Milos Kozak
0fdc789e1f
Merge branch 'dev' into localprofile
2019-11-30 22:43:15 +01:00
Milos Kozak
c23794fa6e
allow revert objective
2019-11-30 22:15:15 +01:00
Milos Kozak
034c16690f
temp
2019-11-30 10:16:38 +01:00
gregorybel
db2c675024
fix page -> bage
2019-11-29 21:48:35 +01:00
Milos Kozak
eba66da4a4
allow go back with objectives
2019-11-29 12:38:07 +01:00
Milos Kozak
f82c610d16
allow objective skip only when NS is connected and in RW mode
2019-11-29 12:19:32 +01:00
Milos Kozak
9196bdb2ed
handle name properly
2019-11-29 00:11:28 +01:00
Milos Kozak
2dd7c758f4
Local profile clone support
2019-11-28 23:18:42 +01:00
gregorybel
de9d2da68d
show Battery info in days instead of percent for Combo
2019-11-28 22:15:56 +01:00
Milos Kozak
8a75d4f6b9
tabs in local profile
2019-11-28 21:58:07 +01:00
Milos Kozak
ec535b9c61
low_mark, high_mark units dependent
2019-11-28 19:54:59 +01:00
Milos Kozak
599261081b
upload local profile to NS
2019-11-28 00:30:22 +01:00
Milos Kozak
bfb65d0f8a
run wizard to setup units
2019-11-27 23:39:16 +01:00
Milos Kozak
3ee9836e66
handle default TT valuses in current units
2019-11-27 23:26:29 +01:00
Milos Kozak
0f631b1d47
fix
2019-11-26 16:59:40 +01:00
Milos Kozak
fed2839a72
Merge branch 'dev' into localprofile
2019-11-26 16:40:46 +01:00
Milos Kozak
6969dc4873
Merge pull request #2222 from MilosKozak/2186
...
New SMS commands
2019-11-25 22:40:00 +01:00
Milos Kozak
c33e3994b6
some cleanup and kotlin conversion
2019-11-25 18:07:16 +01:00
Milos Kozak
1ea25b68a8
fix NPE
2019-11-25 17:06:08 +01:00
andreas
63808ad553
Also deactivate Automation if Loop is disabled, not only if it is suspended.
2019-11-22 18:30:22 +01:00
fabriziocasellato
46270d87e2
Removed + control for Phone Numbers, Added Tests for TT, Added TARGET STOP/CANCEL command
2019-11-22 16:41:09 +01:00
fabriziocasellato
f26e683dbe
Removed + control for Phone Numbers, Added Tests for TT, Added TARGET STOP/CANCEL command
2019-11-22 15:58:03 +01:00
Milos Kozak
bcfb1feda3
Merge branch 'dev' into pull/2185
2019-11-22 15:39:16 +01:00
Milos Kozak
16038caed8
Merge branch 'sms' into 2186
2019-11-22 14:30:19 +01:00
fabriziocasellato
ebc89e7526
New tests for SMS commands: TARGET MEAL/HYPO/ACTIVITY and SMS STOP/DISABLE
2019-11-22 12:31:59 +01:00
