AdrianLxM
707d5a480c
insulincurves - rename peak to peak time
2017-08-14 16:02:07 +02:00
AdrianLxM
ced1da09cf
insulincurves - i18n
2017-08-14 15:25:37 +02:00
AdrianLxM
085caddeee
insulincurves - freepeak
2017-08-14 15:24:55 +02:00
Timm Korte
07822811ac
Merge remote-tracking branch 'milosremote/dev' into develop
2017-08-07 22:16:37 +02:00
Milos Kozak
2ae0028495
Swedish
2017-08-07 14:06:11 +02:00
Milos Kozak
4e4088f164
remove unneeded strings
2017-08-05 18:47:01 +02:00
Milos Kozak
f834b3b7e0
remove unneeded texts
2017-08-05 17:43:31 +02:00
Johannes Mockenhaupt
4a1684eb92
Merge remote-tracking branch 'origin/dev' into stable
...
* origin/dev:
remove canceltemp button from all layouts and click handling from overview fragment
correct logging
fix cancel real temp basals from actions
color for active temp
remove translated string not in default strings and add flag to cancel method
Some more German
Some more German
Some German translations, remove unused strings, App name for all
Update strings.xml
CS translations
hide all overview buttons by default
move cancel temp to actions
new temp basal dialog refactor
fix virtual pump crash
Disconnect pump: cancel temp before setting new to make sure it will last as expected
remove notes strings as well
remove notes from temp basal upload
cancel current temp before activating superbolus
2017-08-05 11:02:13 +02:00
Milos Kozak
e933650330
CS translations
2017-08-01 22:17:39 +02:00
Milos Kozak
9596987b35
new temp basal dialog refactor
2017-08-01 20:02:17 +02:00
Milos Kozak
6828e11dd9
remove notes strings as well
2017-08-01 17:25:43 +02:00
AdrianLxM
bfd96b0635
Merge branch 'stable' into '1_5f'
...
# Conflicts:
# app/src/main/res/values/strings.xml
2017-07-29 16:55:55 +00:00
Milos Kozak
0914e67c11
typo
2017-07-25 19:25:58 +02:00
Milos Kozak
f1e21053b5
use key instead of string
2017-07-25 19:24:51 +02:00
Johannes Mockenhaupt
e6eee42081
Merge remote-tracking branch 'origin/dev' into combo
...
* origin/dev:
recategorize cp icons
removed unnecessary text colour and fixed indentation
layout indentation
Moving some buttons to the right categories
removed empty ghost files
remove duplicate IDs and indentation fix
Picture renaming (#311 )
2017-07-24 02:25:28 +02:00
AdrianLxM
10d27f0b6a
Picture renaming ( #311 )
...
* adding icons
2017-07-21 22:24:06 +02:00
Johannes Mockenhaupt
3bd865a870
Merge remote-tracking branch 'origin/dev' into combo
...
* origin/dev:
1.5e
Let CircadianPercentageProfileFragment inherit from SubscriberFragment.
Fix after merge-conflict cleanup
Files renamed
Added icons for home, actions and care portal screens
update bg translation
synchronize interval access from other classes
remove unnecessary semicolons
spanish emptiy string
remove extra strings
self asignment -> comment
string comparison
Add color of chart to corresponding lables/scale
Update InsulinFastactingProlongedFragment.java
Update InsulinFastactingFragment.java
Extract SubscriberFragment base class.
Have most fragments update their content in onResume.
2017-07-21 17:42:27 +02:00
AdrianLxM
31fcf34a2d
Fix after merge-conflict cleanup
2017-07-21 11:59:36 +02:00
PoweRGbg
059e58c640
Files renamed
2017-07-21 11:55:12 +02:00
Johannes Mockenhaupt
8cdd604b84
Merge remote-tracking branch 'origin/dev' into combo
...
* origin/dev:
bulgarian removed non-translatable
synchronize interval access
nsclient remove debug data that puts stress on the broadcast system 3
nsclient remove debug data that puts stress on the broadcast system 2
nsclient remove debug data that puts stress on the broadcast system
Align OpenAS(A)MA fragments with layout of other fragments.
local broadcasts better setting title
setting to disable local broadcasts in NSClient
removed some "unneeded" translations
wear tdd weighted
wear TDD status
wear menu simplification
Translated latest additions strings.xml
ns client quickfix now catch all
NS client quickfix - catch even more
catch TransactionTooLargeException
TT new "old" logic for temp targets
TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals
# Conflicts:
# app/src/main/res/values/strings.xml
2017-07-19 19:54:50 +02:00
AdrianLxM
cfe8e0a23a
local broadcasts better setting title
2017-07-18 22:18:10 +02:00
AdrianLxM
c753873769
setting to disable local broadcasts in NSClient
2017-07-18 22:15:17 +02:00
Johannes Mockenhaupt
ab9908438e
Add Combo short name.
2017-07-18 20:54:57 +02:00
Milos Kozak
253c2a34e5
combo plugin skeleton
2017-07-18 20:54:13 +02:00
AdrianLxM
b79beda971
wear pass through overview notifications
2017-07-15 16:03:04 +02:00
AdrianLxM
39ee68e62a
cpp-watch external-function
2017-07-10 04:44:46 +02:00
Milos Kozak
0b5abae44f
fix conflict
2017-07-07 15:10:29 +02:00
Milos Kozak
8de7e05dd5
weightedaverage sensitivity
2017-07-07 15:08:21 +02:00
drnoname82
e12e4ec55e
Update strings.xml
2017-07-07 01:03:20 +02:00
Milos Kozak
7b9e5fec1e
autosens warning
2017-07-04 00:16:35 +02:00
Milos Kozak
5a27f9afa1
allow lock screen in nsclient mode
2017-07-03 00:02:54 +02:00
Milos Kozak
e9dba7136d
nsclient layout for phones
2017-07-02 11:28:03 +02:00
Milos Kozak
09e5fdc61b
sensitivity prefs cleanup
2017-06-30 11:56:36 +02:00
Milos Kozak
96e4a25f9e
typo
2017-06-30 11:40:12 +02:00
Milos Kozak
9e8c91319e
move ns version to about dialog
2017-06-30 09:55:47 +02:00
Milos Kozak
39c6ae5eae
fix merge conflict
2017-06-30 09:35:20 +02:00
AdrianLxM
16e360f200
visualize absolute rate emulation as percentage
2017-06-29 14:14:40 +02:00
Milos Kozak
f58f70bdca
wizard tweaking
2017-06-28 23:11:17 +02:00
Milos Kozak
4fc935f0bd
bolus dialog numberpickers
2017-06-27 19:14:32 +02:00
Milos Kozak
ef4a1feda2
numberpicker in calibration dialog
2017-06-27 17:06:23 +02:00
Milos Kozak
9fb428c128
fix conflict
2017-06-27 13:52:47 +02:00
Milos Kozak
103836717a
fix conflict
2017-06-27 13:51:45 +02:00
Milos Kozak
dbd721319e
ns uploader status
2017-06-26 22:39:01 +02:00
Milos Kozak
47a9d4b9c8
ns pump status
2017-06-26 12:44:03 +02:00
Milos Kozak
3f641f9c30
carbs absorption settings
2017-06-25 11:16:19 +02:00
Milos Kozak
5360129e5f
sensitivity plugins
2017-06-24 11:04:09 +02:00
Milos Kozak
80962e33d7
allow to ignore profileswitch events
2017-06-20 19:52:46 +02:00
Milos Kozak
e90812634b
work from old autosens branch
2017-06-16 14:37:43 +02:00
Milos Kozak
fb7af2f317
ns alarm setting in xml
2017-06-15 21:33:45 +02:00
Milos Kozak
b41a942d11
update supported NS & NSclient versions
2017-06-12 09:30:04 +02:00
Milos Kozak
77659e20e7
ns alarms & getBasal fix
2017-06-11 17:22:54 +02:00
Milos Kozak
17f59df597
gui tweaking, pump battery event
2017-06-06 08:21:11 +02:00
Milos Kozak
7c7638a7a1
extract color resources
2017-06-05 15:34:22 +02:00
Milos Kozak
e0a6db22a2
run rendering calculations on background
2017-06-05 15:16:07 +02:00
Milos Kozak
b40cf99201
gui tweaking
2017-06-03 22:43:35 +02:00
Milos Kozak
d365fcd6a4
fix bugs & design tweaking
2017-06-02 23:25:11 +02:00
Milos Kozak
f267c85377
it compiles now with profiles
2017-06-02 10:25:49 +02:00
Milos Kozak
f5f7d28cc1
temp basal dialog design
2017-05-30 18:10:05 +02:00
Milos Kozak
650b792099
mark selected tab in treatments
2017-05-26 10:05:42 +02:00
Milos Kozak
5fb72181ee
careportal cage, sage, iage
2017-05-25 20:18:29 +02:00
Milos Kozak
86af9eab3d
stop extended bolus in actions
2017-05-24 20:37:58 +02:00
Milos Kozak
2ae30fe9b4
temptarget design
2017-05-24 19:42:23 +02:00
Milos Kozak
bb9c68fd4d
Merge remote-tracking branch 'origin/dev' into history
2017-05-24 19:18:30 +02:00
Milos Kozak
f936580734
Russsian language
2017-05-24 18:46:19 +02:00
Milos Kozak
5208f23661
Temptargets under treatments
2017-05-23 23:56:53 +02:00
Milos Kozak
771fbdc303
sync of treatments, tempbasals, extended tested and working
2017-05-23 22:59:06 +02:00
Milos Kozak
8db1bd5ae5
tempbasal ns sync
2017-05-23 20:15:14 +02:00
Milos Kozak
6394421017
boluses working
2017-05-22 22:10:56 +02:00
Milos Kozak
6cd046459a
original treatmens plugin removed, temp basals working
2017-05-22 20:58:05 +02:00
Milos Kozak
3330c6a3fd
Merge branch 'dev' into history
2017-05-21 16:46:13 +02:00
Milos Kozak
462849af12
russian language entry
2017-05-21 10:06:34 +02:00
Milos Kozak
3ee9bf5ff7
Merge branch 'dev' into history
2017-05-16 15:15:32 +02:00
Milos Kozak
86c975e9d6
Add Italian language
2017-05-16 13:39:24 +02:00
Milos Kozak
45477f96ee
Merge pull request #243 from AdrianLxM/xdripstatusline
...
basal and bolus step in DanaR Fragment
2017-05-16 13:28:39 +02:00
AdrianLxM
572e726678
basal and bolus step in DanaR Fragment
2017-05-16 13:10:02 +02:00
Milos Kozak
4201709e2a
finish careportal dialog redesign
2017-05-16 11:47:33 +02:00
Milos Kozak
e005d6bd69
Merge branch 'dev' into history
2017-05-12 13:05:57 +02:00
Milos Kozak
df424ea5ff
overview buttons
2017-05-12 11:06:33 +02:00
Milos Kozak
51d52f6b3d
Merge branch 'DanaRv2' into history
2017-05-10 21:53:31 +02:00
Milos Kozak
5b25d28f42
Merge branch 'dev' into DanaRv2
2017-05-10 14:05:43 +02:00
AdrianLxM
298d7a7d9c
Merge branch 'dev' into xdripstatusline
2017-05-09 23:26:31 +02:00
AdrianLxM
1fa3a2a697
bgi on watch status (optional)
2017-05-09 23:23:37 +02:00
Milos Kozak
554fb51a75
profile layout
2017-05-09 19:06:59 +02:00
Milos Kozak
84a6554e07
smaller font size on careportal buttons
2017-05-09 18:36:13 +02:00
Milos Kozak
09fea02ed2
Allow to disable NS upload while client is connected
2017-05-09 16:24:53 +02:00
Milos Kozak
0048366dcf
fix conflict
2017-05-09 10:14:21 +02:00
AdrianLxM
67f21537ea
send status to xDrip
2017-05-06 15:18:19 +02:00
Milos Kozak
352a2a7475
deviations graph
2017-05-04 19:51:58 +02:00
Milos Kozak
289ad394ce
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-05-03 22:30:12 +02:00
Milos Kozak
573256d7d4
catch missing sms permission
2017-05-03 18:30:18 +02:00
AdrianLxM
9cef4c5a01
typo insuin->insulin
2017-05-01 18:09:53 +02:00
Milos Kozak
0f1c2bb193
DanaRv2 1st rev
2017-04-30 21:08:00 +02:00
Milos Kozak
2cb6e275c0
allign design of status pills
2017-04-30 13:17:59 +02:00
Milos Kozak
4dd9281276
remove actionbar
2017-04-29 20:16:50 +02:00
Milos Kozak
974e5e0098
pump fragment redesign
2017-04-29 18:11:15 +02:00
Milos Kozak
f641d40722
virtual pump layout
2017-04-29 17:48:45 +02:00
Milos Kozak
3552d6aa40
bg value colored
2017-04-27 21:26:53 +02:00
Milos Kozak
5ef034b4fc
cob display
2017-04-26 23:45:40 +02:00
Milos Kozak
a07a8755b1
IOB graph
2017-04-24 13:17:14 +02:00
Milos Kozak
1f2967e866
superbolus must be explicitly enabled
2017-04-22 11:08:57 +02:00
Milos Kozak
20f99dffe2
basals rendering redesign
2017-04-22 10:09:54 +02:00
Milos Kozak
90a55966b1
Fast Acting Insulin Prolonged
2017-04-21 15:36:49 +02:00
Milos Kozak
25491fbac6
Insulin interface
2017-04-21 11:45:25 +02:00
Milos Kozak
04ae55ac63
exit app after import settings
2017-04-16 13:27:01 +02:00
Milos Kozak
402768cb87
1.33 app start logging optional
2017-04-14 15:33:39 +02:00
Milos Kozak
2413fae0a9
1.32 superbolus & trend contribution in wizard
2017-04-14 14:50:18 +02:00
Milos Kozak
c5245ae5fd
SMS suspend/resume loop
2017-04-06 21:22:27 +02:00
Milos Kozak
a02da220c9
CS translations
2017-04-05 22:04:55 +02:00
Milos Kozak
f596050239
loop suspend menu
2017-04-05 21:39:39 +02:00
Milos Kozak
d6f31820d9
request battery optimalization whitelisting
2017-03-31 09:21:40 +02:00
Milos Kozak
a4f302ee4a
show if pump is suspended
2017-03-24 12:05:12 +01:00
Milos Kozak
e8edf9eb54
Glimp support
2017-03-21 19:11:39 +01:00
Milos Kozak
de9dbf9243
CS translations
2017-03-04 20:55:13 +01:00
Milos Kozak
b0c828c93e
nsclient build variant
2017-02-23 20:00:33 +01:00
Milos Kozak
15d6de4701
age from product flavor to prefs
2017-02-22 20:29:41 +01:00
Milos Kozak
87ad140eb5
SMS logging and resource refactor
2017-02-22 14:11:05 +01:00
Milos Kozak
34ed92f8aa
fix displaying delta when not available
2017-02-21 10:00:08 +01:00
AdrianLxM
98edfc57e0
dismiss bolus progress via events
2017-02-20 14:49:38 +01:00
Milos Kozak
6200584268
hours to fetch fixed
2017-02-20 09:46:55 +01:00
Milos Kozak
5f4eb1e4c4
pump status tweaking
2017-02-19 19:15:14 +01:00
Milos Kozak
9303bd61fd
Merge branch 'dev' into nsclient
2017-02-19 09:41:16 +01:00
AdrianLxM
d113d39916
wear setting to show detailed IOB
2017-02-18 18:13:13 +01:00
Milos Kozak
29b4f0063b
better handling readonly permission
2017-02-17 22:12:35 +01:00
Milos Kozak
14e37246c2
nsclient gui and pausing tweaking
2017-02-17 18:14:33 +01:00
Milos Kozak
31364ff07b
ignore dbaccess if nsclient not enabled
2017-02-17 16:41:28 +01:00
Milos Kozak
8a374f1b35
Shared preferences cleanup
2017-02-17 16:16:20 +01:00
Milos Kozak
3216ff636a
preference keys to strings
2017-02-17 13:43:17 +01:00
Milos Kozak
71112a90e2
internal nsclient
2017-02-17 13:18:36 +01:00
Milos Kozak
a75c62be35
show notification when aproaching daily limit
2017-02-14 19:47:45 +01:00
Milos Kozak
2e4aec9916
settings password protected
2017-02-14 19:16:34 +01:00
Milos Kozak
8001796f4b
virtual pump status upload optional
2017-02-14 15:41:30 +01:00
Milos Kozak
f9ee3c547a
translations
2017-02-13 21:05:57 +01:00
Milos Kozak
c6b3fe9883
Merge pull request #178 from AdrianLxM/wear-bolus5
...
Wear Bolus
2017-02-13 18:13:36 +01:00
Milos Kozak
1f3aee091e
manual invoke of loop in separate thread
2017-02-12 22:02:42 +01:00
Milos Kozak
4e3cc65d5d
handling pump suspend, show pump actions on overview
2017-02-12 19:51:13 +01:00
Milos Kozak
351a624b83
small string change
2017-02-12 13:48:03 +01:00
AdrianLxM
1f5dd4750a
CPP dismiss info when focus is lost
2017-02-11 22:20:29 +01:00
AdrianLxM
6c5028b4be
CPP dismiss info when focus is lost
2017-02-11 22:18:28 +01:00
AdrianLxM
638b9c263c
Merge pull request #61 from MilosKozak/dev
...
Dev
2017-02-11 02:55:14 +01:00
Milos Kozak
40d166cb7d
CS translations
2017-02-10 21:39:51 +01:00
Milos Kozak
2e40c7b605
sms calibrations
2017-02-10 21:20:55 +01:00
Milos Kozak
8db3f258cd
xdrip calibration
2017-02-10 16:53:39 +01:00
AdrianLxM
8ece312b6a
Merge pull request #60 from MilosKozak/dev
...
Dev
2017-02-09 23:47:12 +01:00
Milos Kozak
715d15b51f
CS translations
2017-02-09 22:44:42 +01:00
Milos Kozak
90061c6f25
Show log
2017-02-09 22:29:21 +01:00
Milos Kozak
8a2846c516
Merge branch 'dev' into dev
2017-02-09 17:01:05 +01:00
Milos Kozak
7f123e4208
warn on wrong entered sms phone number
2017-02-09 16:14:09 +01:00
LadyViktoria
7fc6de17c1
Add prefernces.json changes 2
2017-02-09 10:41:02 +01:00
LadyViktoria
886c1ea359
Add prefernces.json changes
2017-02-09 09:36:51 +01:00
AdrianLxM
bf7a96b3e7
bolus progress dialog without activity context
2017-02-09 03:15:13 +01:00
