caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
5910 commits 1 branch 20 tags 140 MiB
Commit graph

1689 commits

Author SHA1 Message Date
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
Johannes Mockenhaupt
893a604ef9
Fix combo_fragment blunder. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
a28efb4be0
Add "pump error (message)" as a field in Combo fragement. 2017-07-21 17:40:12 +02:00
AdrianLxM
6d1c0feeab Merge pull request #302 from AdrianLxM/cleanups 
Cleanups
 2017-07-21 16:46:48 +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
Milos Kozak
c68eccc328 Merge pull request #306 from boikonur/dev 2017-07-20 20:49:35 +02:00
Boyko Kazakov
3b1407b8dd Added icons for home, actions and care portal screens 2017-07-20 20:57:45 +03:00
Radoslav Radev
3098f0bdfa update bg translation 2017-07-20 09:24:35 +03:00
AdrianLxM
1ba11ed006 spanish emptiy string 2017-07-20 01:06:21 +02:00
AdrianLxM
b5cb68be73 remove extra strings 2017-07-20 01:06:00 +02:00
Johannes Mockenhaupt
a7c77bc177
Add "pump error (message)" as a field in Combo fragement. 2017-07-19 21:45:28 +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
732e225c7d bulgarian removed non-translatable 2017-07-19 19:50:40 +02:00
Milos Kozak
3475b64e1b Merge pull request #299 from MilosKozak/dev-nsclient-quickfix 
NSClient quickfix
 2017-07-19 18:53:38 +02:00
Milos Kozak
62ff62a31f Merge pull request #290 from PoweRGbg/patch-1 2017-07-19 17:21:15 +02:00
Johannes Mockenhaupt
c95879e6ad
Align OpenAS(A)MA fragments with layout of other fragments. 
Removes a margin that makes the top elements jump up and
down when flipping through tabs.
 2017-07-19 12:32:18 +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
7fa59c6c16
Combo tab: we have set a TBR duration, we're not showing how much time is remaing, but what has been set. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
5f43f0f147
* Fix stale data in Combo tab after error 
* Add info about last command ran to the Combo tab
* Don't refresh data more than once a minute.
* Specify not only error, but also command that raised the error in
  alert notification
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
6faa1614ac
ComboFragment: rename Update Button to Refresh. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
ccd81c67fd
UI for pump state. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
8dd714b390
UI crimes 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
8ecf6922f7
Misc improvements: 
* Make command execution (RuffyScripter/ComoboPlugin.runCommand) more robust (I still suck at threading).
* Return all possible states in PumpState
* Add absolute TBR to PumpState
* Add NoOpCommand to fetch state data from pump
* Display returned pump state in Combo fragment/tab.
 2017-07-18 21:20:39 +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
PoweRGbg
c3f85faede removed some "unneeded" translations 2017-07-18 18:10:24 +03:00
Johannes Mockenhaupt
7eacd5021c
Use target ranges from profile, rather than fixed values from prefs. 2017-07-18 13:04:15 +02:00
PoweRGbg
7216418f44 Translated latest additions strings.xml 2017-07-17 11:37:00 +03:00
Milos Kozak
26ebceb4d9 Merge pull request #288 from AdrianLxM/wear-overviewnotification 2017-07-15 16:31:45 +02:00
Boyko Kazakov
7a2db43347 Added Images for different resolutions 2017-07-15 17:03:38 +03: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
4d16b04acd buttons on overview GONE before profile is loaded 2017-06-30 17:50:30 +02:00
Milos Kozak
37055cd917 allow decimal number in NumberPicker 2017-06-30 17:43:10 +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
38002be73d check for units null 2017-06-30 10:35:05 +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
Milos Kozak
fec4e60359 Merge pull request #269 from AdrianLxM/percentagevisualization 
visualize absolute rate emulation as percentage
 2017-06-30 00:00:47 +02:00
AdrianLxM
fcab1a267b adapt diadivisor 2017-06-29 19:39:58 +02:00
AdrianLxM
16e360f200 visualize absolute rate emulation as percentage 2017-06-29 14:14:40 +02:00
Milos Kozak
a8338b2dd1 careportal dialog number picker 2017-06-29 01:37:58 +02:00
Milos Kozak
f58f70bdca wizard tweaking 2017-06-28 23:11:17 +02:00
Milos Kozak
491f0837c8 allow manual input in NumberPicker 2017-06-27 23:23:44 +02:00
Milos Kozak
c3876c730b numberpicker in wizard dialog 2017-06-27 23:16:23 +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
341b0660a8 calibration dialog cancel button 2017-06-27 15:25:11 +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
7b1b9c9881 dialog widths 2017-06-27 00:11:23 +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
240f9618f5 Merge branch 'dev' into newautosens 2017-06-21 09:04:38 +02:00
Milos Kozak
3e7c4b1350 NS high & low alarms with sound 2017-06-21 07:28:04 +02:00
Milos Kozak
7f92f42923 cob on overview 2017-06-20 20:30:50 +02:00
Milos Kozak
134efb04bf fix merge conflict 2017-06-20 20:01:09 +02:00
Milos Kozak
a3757877a3 fix landscape mode 2017-06-20 19:56:25 +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
43b70f9efc loop, MA, AMA new design 2017-06-13 20:48:53 +02:00
Milos Kozak
1de64f06c2 simplify danar activities, fix profiles 2017-06-12 23:31:50 +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
f6650e33e4 remove test buttons 2017-06-10 22:04:59 +02:00
Milos Kozak
1153c33200 tempbasal & extendedbolus 3way sync 2017-06-08 18:15:17 +02:00
Milos Kozak
4d30ba9cdb treatments PumpHistory and NS mark 2017-06-07 19:43:19 +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
1702ce7702 adjusting nsclient mode 2017-06-04 00:46:44 +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
b3d18b2537 disable bolus when pump is suspended 2017-05-30 18:23:07 +02:00
Milos Kozak
f5f7d28cc1 temp basal dialog design 2017-05-30 18:10:05 +02:00
Milos Kozak
3861bece54 extended bolus dialog 2017-05-30 15:07:44 +02:00
Milos Kozak
a9b251ce12 Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history 2017-05-26 10:31:46 +02:00
Milos Kozak
bb4302c02f Merge branch 'dev' into history 2017-05-26 10:24:48 +02:00
Milos Kozak
0b8499cb7f Merge pull request #251 from AdrianLxM/historytest1 
lint disable 'ExtraTranslation'
 2017-05-26 10:23:51 +02:00
AdrianLxM
8b81960ceb remove unused strings from russion translation 2017-05-26 10:10:57 +02:00
Milos Kozak
650b792099 mark selected tab in treatments 2017-05-26 10:05:42 +02:00
AdrianLxM
cc4419f57a lint ExtraTranslation 2017-05-26 10:00:41 +02:00
AdrianLxM
99b8e48031 lint ExtraTranslation 2017-05-26 09:58:38 +02:00
Milos Kozak
5fb72181ee careportal cage, sage, iage 2017-05-25 20:18:29 +02:00
Milos Kozak
87993c6163 return functionality of faking by extended boluses 2017-05-25 17:26:05 +02:00
fedor apanasenko
4406bb3f06 Update strings.xml 2017-05-25 09:51:08 +03: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
56d54a6988 italian language 2017-05-20 20:41:23 +02:00
Milos Kozak
8c5ce7290d more work on treatments fragment 2017-05-16 17:48:58 +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
6fff6f63a4 bolus dialog redesign 2017-05-16 12:09:32 +02:00
Milos Kozak
4201709e2a finish careportal dialog redesign 2017-05-16 11:47:33 +02:00
Milos Kozak
704ad383e9 careportal layout part1 2017-05-15 21:10:43 +02:00
Milos Kozak
25110cfea4 move database actions from pump to treatments plugin 2017-05-15 18:44:40 +02:00
Milos Kozak
c6830baf8f Merge branch 'dev' into history 2017-05-12 16:35:07 +02:00
Milos Kozak
abdc1022bf merge bolus & basal into one plugin 2017-05-12 16:27:33 +02:00
AdrianLxM
a60afbceb9 typo 2017-05-12 16:08:48 +02:00
AdrianLxM
a9e093ad0d some German translations 2017-05-12 16:06:14 +02:00
AdrianLxM
c88b8eaa9a make buttons scrollable for small heights 2017-05-12 15:26:16 +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
b782a5b8dc Merge branch 'dev' into history 2017-05-12 00:39:20 +02:00
Milos Kozak
a0d31b2118 rename identical functions 2017-05-11 18:54:50 +02:00
Radoslav Radev
d58ddf48c6 Update strings.xml 2017-05-11 17:01:49 +03:00
Milos Kozak
7e99ce416a move buttons back to bottom 2017-05-11 10:59:05 +02:00
Milos Kozak
6b9048cd61 Merge pull request #234 from warstar2187/korean 
Korean translation update
 2017-05-11 09:27:58 +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
d313df0d19 removing treatments 2017-05-09 20:47:02 +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
b30d79c4cb fix conflicts 2017-05-09 10:46:04 +02:00
Milos Kozak
0048366dcf fix conflict 2017-05-09 10:14:21 +02:00
Milos Kozak
8d3be5e958 colors on danar fragment 2017-05-08 23:19:11 +02:00
AdrianLxM
67f21537ea send status to xDrip 2017-05-06 15:18:19 +02:00
Milos Kozak
05d9f16031 hide label too 2017-05-04 23:22:16 +02:00
Milos Kozak
344144d88a pump status equal size 2017-05-04 21:11:51 +02:00
Milos Kozak
aabcee8ea7 fix conflicts 2017-05-04 19:53:45 +02:00
Milos Kozak
352a2a7475 deviations graph 2017-05-04 19:51:58 +02:00
Milos Kozak
070867af28 menu on top 2017-05-04 19:13:56 +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
6d5f2514d0 remove duplicated string 2017-05-03 18:45:29 +02:00
Milos Kozak
573256d7d4 catch missing sms permission 2017-05-03 18:30:18 +02:00
Milos Kozak
602310b70a DanaRv2 1st rev 2017-05-02 17:02:30 +02:00
AdrianLxM
9cef4c5a01 typo insuin->insulin 2017-05-01 18:09:53 +02:00
AdrianLxM
0069f320f8 config builder smallscreen 2017-04-30 21:57:55 +02:00
AdrianLxM
5dc07012d2 overview smallscreen 2017-04-30 21:34:30 +02:00
Milos Kozak
0f1c2bb193 DanaRv2 1st rev 2017-04-30 21:08:00 +02:00
AdrianLxM
d8fb53de69 Making dialogs scrollable 2017-04-30 20:54:35 +02:00
Milos Kozak
3279c297dc equal weight 2017-04-30 13:22:16 +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
warstar2187
dac969b381 Update strings.xml 2017-04-25 10:14:06 +09:00
Milos Kozak
7534f54f19 trend in wizard off by default 2017-04-24 19:24:53 +02:00
Milos Kozak
a07a8755b1 IOB graph 2017-04-24 13:17:14 +02:00
Milos Kozak
b8a8bed6c5 remove butterknife at all, remove unused code, overview graph optimalization 2017-04-23 13:45:49 +02:00
Milos Kozak
1f2967e866 superbolus must be explicitly enabled 2017-04-22 11:08:57 +02:00
Milos Kozak
3b34e55fda CS translations 2017-04-22 10:21:24 +02:00
Milos Kozak
20f99dffe2 basals rendering redesign 2017-04-22 10:09:54 +02:00
Milos Kozak
55a2df470e insulin activity graph 2017-04-21 18:34:40 +02:00
Milos Kozak
7f122f7497 show dia in insulin plugin 2017-04-21 16:13:53 +02:00
Milos Kozak
90a55966b1 Fast Acting Insulin Prolonged 2017-04-21 15:36:49 +02:00
Milos Kozak
17771434aa upgrade travis & plugin packages 2017-04-21 12:15:08 +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
387defbfc7 fix sms pref key 2017-04-09 21:50:05 +02:00
Radoslav Radev
5fe22eac65 Update strings.xml 2017-04-07 13:53:47 +03: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
warstar2187
242428e2cb Update strings.xml 2017-03-09 04:20:40 +09:00
Radoslav Radev
3b129dc7f6 Update strings.xml 2017-03-05 15:58:37 +02:00
Radoslav Radev
a0f2e4f663 Update strings.xml 2017-03-05 15:42:01 +02:00
Radoslav Radev
54f376330a Update strings.xml 2017-03-05 15:28:20 +02:00
Milos Kozak
de9dbf9243 CS translations 2017-03-04 20:55:13 +01:00
Milos Kozak
e25fb9845d hide unneeded labels in nsclient mode 2017-02-23 23:32:26 +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
AdrianLxM
686e16de8d scrollview match parent in width 2017-02-20 13:31:47 +01:00
AdrianLxM
1f464bdae0 Merge remote-tracking branch 'milosremote/dev' into adridev 2017-02-20 13:11:35 +01:00
AdrianLxM
18e2dcffcf make things scrollable 2017-02-20 13:10:07 +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
5d795fbe33 Merge branch 'dev' into nsclient 2017-02-17 22:26:02 +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
Radoslav Radev
09880f029a Update strings.xml 2017-02-16 16:46:47 +02:00
Milos Kozak
dda95dc275 allow to remove treatments from GUI 2017-02-14 21:13:13 +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
e00045155e prefill bg value in careportal dialog 2017-02-14 15:09:22 +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
e003ef8368 Merge pull request #175 from LadyViktoria/dev 
use validation lib in cpp - layout fixes & longer snackbar duration
 2017-02-12 22:29:20 +01:00
Milos Kozak
f6ae267bb5 CS translations 2017-02-12 22:28:42 +01:00
Milos Kozak
1f3aee091e manual invoke of loop in separate thread 2017-02-12 22:02:42 +01:00
viktoria
ba254f8829 Merged branch dev into dev 2017-02-12 20:01:25 +01:00
viktoria
0d02f42714 use validation lib in cpp - layout fixes & longer snackbar duration 2017-02-12 19:51:56 +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
Milos Kozak
dc85bc26fc typo 2017-02-12 13:45:08 +01:00
AdrianLxM
5e96124a2d mmol/l fix 2017-02-11 22:27:04 +01:00
AdrianLxM
2e6d754c86 mmol/l fix 2017-02-11 22:26:16 +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
104c146b2f Merge pull request #63 from AdrianLxM/patch-16 
LadyViktoria validation lib plus safety
 2017-02-11 21:12:22 +01:00
AdrianLxM
638b9c263c Merge pull request #61 from MilosKozak/dev 
Dev
 2017-02-11 02:55:14 +01:00
viktoria
7877235972 Merged branch dev into dev 2017-02-11 00:16:55 +01:00
viktoria
279c67bb70 use validation lib in cpp - add snackbar 2017-02-11 00:16:25 +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
LadyViktoria
48a158b036 use validation lib in cpp - better event handling 2017-02-10 17:29:59 +01:00
Milos Kozak
8db3f258cd xdrip calibration 2017-02-10 16:53:39 +01:00
LadyViktoria
80de9c0cd8 use validation lib in cpp 2017-02-10 11:34:05 +01:00
LadyViktoria
4857259eda ko translation 2017-02-10 07:59:26 +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
ed7dd48612 remove TODOs 2017-02-09 20:18:22 +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
AdrianLxM
650111d1b7 wear event for bolus requests to show card early on 2017-02-07 11:09:16 +01:00
viktoria
b0a9d74b49 Merge remote-tracking branch 'refs/remotes/MilosKozak/dev' 
Conflicts:
	app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/Autosens.java
	app/src/main/res/values/strings.xml
 2017-02-02 19:00:17 +01:00
AdrianLxM
bd75015a58 Correct error for tempbasals 2017-02-01 14:38:55 +01:00
LadyViktoria
1f3b425c44 Remove careportal_temptarget string 2017-01-31 20:28:32 +01:00
Milos Kozak
762b561abb CS translations 2017-01-29 21:15:05 +01:00
Milos Kozak
d6a22be184 remove absorption rate from everywhere 2017-01-29 20:19:02 +01:00
viktoria
75ff6867bc Add prefernces.json make settings work with validator lib 2017-01-29 13:00:52 +01:00
Milos Kozak
3f90ad6a5c sync profile to pump 2017-01-28 23:45:14 +01:00
viktoria
c64d45b758 Merged MilosKozak/dev into dev 
Conflicts:
	app/src/main/res/values/strings.xml
 2017-01-28 22:35:54 +01:00
Milos Kozak
b9b9e21dcb fix merge conflicts 2017-01-28 21:37:51 +01:00
Milos Kozak
538e8fd2fa better detect & display old pump firmware 2017-01-28 20:48:32 +01:00
LadyViktoria
4d4630ca1a Add prefernces.json rename some Strings to match OpenAPS docs 2017-01-27 09:56:32 +01:00
LadyViktoria
f510b0a8cc Add prefernces.json errer message translations 
attention the characters are limited.
maybe its caused by old libs
com.android.support:appcompat-v7:23.4.0
'com.android.support:support-v4:23.4.0
 2017-01-27 09:52:16 +01:00
LadyViktoria
1d2f98abf4 Add prefernces.json remove openapsama_skip_neutral_temps 2017-01-26 15:32:44 +01:00
LadyViktoria
4702a87d8e Add prefernces.json add safety limits 2017-01-26 12:07:25 +01:00
viktoria
2f8b2a382d Merged branch dev into dev 2017-01-26 00:39:28 +01:00
viktoria
74cfa08b81 Change some Prefernces names to match names in OpenAPS docs 2017-01-26 00:35:46 +01:00
Heiner1
5c43c66163 Update strings.xml 2017-01-25 23:35:31 +01:00
viktoria
88d6178a1b Add prefernces.json small fix 2017-01-25 22:20:56 +01:00
viktoria
9d2b645d8c Add prefernces.json default values 2017-01-25 22:11:17 +01:00
viktoria
fd6432f808 Add prefernces.json put hyperlink and warning there 2017-01-25 20:41:33 +01:00
viktoria
8e095fefaf Add prefernces.json layout changes 2017-01-25 20:20:39 +01:00
viktoria
0838ede6a3 Add prefernces.json change secondary text color to white 2017-01-25 20:19:53 +01:00
LadyViktoria
b898fc044e Add prefernces.json to advanced settings 2017-01-25 15:18:01 +01:00
Milos Kozak
044547b594 Merge pull request #143 from AdrianLxM/deltasx 
Settings for deltas
 2017-01-24 10:59:10 +01:00
AdrianLxM
950b638e50 Advanced Settings 2017-01-24 10:28:42 +01:00
AdrianLxM
3a43858948 Settings for deltas 2017-01-24 02:21:25 +01:00
viktoria
bd588af1ba DanaR Stats small Layout fixes 2017-01-23 21:52:24 +01:00
Milos Kozak
da2739f7b7 Merge pull request #140 from PitBeckh/patch-1 
Update strings.xml
 2017-01-23 20:23:30 +01:00
PitBeckh
dc12ef3fec Update strings.xml 2017-01-23 16:26:59 +01:00
PitBeckh
2f72471915 Update strings.xml 2017-01-23 16:24:53 +01:00
Radoslav Radev
fbceeec5b0 Update strings.xml 2017-01-23 11:01:42 +02:00
Radoslav Radev
106bfe4f1c Update strings.xml 2017-01-23 07:14:12 +02:00
Radoslav Radev
2d02449a87 Update strings.xml 2017-01-22 21:44:49 +02:00
PitBeckh
d995910384 Update strings.xml 2017-01-22 20:34:54 +01:00
Milos Kozak
ceaf4f7f78 Merge branch 'dev' into adjusttargetsse 2017-01-22 11:30:59 +01:00
ecorman
24b86a0b99 Update: Perfil->Objetivo 2017-01-22 00:07:10 +01:00
AdrianLxM
f418152059 sorten tab titles active 2017-01-21 23:48:05 +01:00
ecorman
3a2549d0b6 Update Spanish Translation 2017-01-21 23:08:23 +01:00
AdrianLxM
ea78dd5bc1 Shorten tabs first 2017-01-21 19:44:58 +01:00
Milos Kozak
404a4de916 Merge pull request #136 from AdrianLxM/adjusttargetsse 
Preference Switches for Autosens
 2017-01-21 11:22:34 +01:00
Milos Kozak
53f9b30b3e temp target display update 2017-01-21 11:22:03 +01:00
AdrianLxM
50b7e619fc Preference switches for Autosens 2017-01-21 01:35:15 +01:00
Milos Kozak
ea37d9eaa8 Merge pull request #131 from AdrianLxM/tempt-pill 
Tempt pill
 2017-01-21 00:11:07 +01:00
viktoria
33bb7d80a6 DanaR Stats small fixes and move Listeners 2017-01-20 16:45:01 +01:00
viktoria
722976f6b0 DanaR Stats beautify layout and add some listeners 2017-01-20 14:51:16 +01:00
viktoria
2d966c9feb DanaR Stats some improvements 2017-01-20 03:13:41 +01:00
AdrianLxM
88a1dcde51 remove empty language translation 2017-01-19 21:32:09 +01:00
AdrianLxM
0c11f78ed3 cleanup after merge 2017-01-19 21:15:08 +01:00
LadyViktoria
1597f74bd0 Merge branch 'dev' into danarstats 2017-01-19 20:52:01 +01:00
AdrianLxM
6c3a07cc62 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into MilosKozak-dev 2017-01-19 20:47:53 +01:00
Milos Kozak
2754e23c08 CS translations 2017-01-19 19:52:14 +01:00
Milos Kozak
c701b5d125 waiting for pump message 2017-01-19 19:21:25 +01:00
Milos Kozak
f8feaf565b show how is value hard limited 2017-01-19 18:40:08 +01:00
viktoria
b70e895b95 DanaR Stats fixes 2017-01-18 04:31:47 +01:00
viktoria
9ba24b4ffd DanaR Stats Beautify 2017-01-18 03:08:19 +01:00
viktoria
678fbedcbf Merge branch 'dev' 
Conflicts:
	app/src/main/res/values/strings.xml
 2017-01-18 03:03:58 +01:00
AdrianLxM
d36a515d45 temp target overview 2017-01-17 21:32:30 +01:00
Milos Kozak
0e21b67a42 fix merge conflicts 2017-01-17 18:00:44 +01:00
Milos Kozak
432c937a46 Merge branch 'dev' into AMA 2017-01-17 17:49:21 +01:00
Milos Kozak
08c078466a Merge pull request #127 from MilosKozak/temptarget 
Temptarget
 2017-01-17 17:47:14 +01:00
Milos Kozak
7c90dfe03c confirm dialog on removing temptarget 2017-01-16 23:54:46 +01:00
Milos Kozak
218190e92f support for removing temp targets from GUI 2017-01-16 23:23:20 +01:00
Milos Kozak
eaa16402a7 show running temp target on overview 2017-01-16 20:47:57 +01:00
Milos Kozak
61b1ee781f temp target treatment dialog & sync fix 2017-01-16 16:59:12 +01:00
viktoria
e851d15aff DanaR Stats Activity 2017-01-16 13:23:41 +01:00
Milos Kozak
262dae3ab3 Merge pull request #129 from slavidex/patch-26 
Update pref_others.xml
 2017-01-14 16:37:57 +01:00
Milos Kozak
61a8cad4e8 allow refrest temp targets from NS & fix bugs 2017-01-14 16:36:42 +01:00
Radoslav Radev
8f0a28419d Update pref_others.xml 2017-01-14 15:25:06 +02:00
Radoslav Radev
cbd7aa74eb Update strings.xml 2017-01-14 15:21:47 +02:00
Milos Kozak
458bee4538 display temptargets 2017-01-13 23:43:17 +01:00
Milos Kozak
1b53cde2bf plain temptarget plugin 2017-01-13 21:14:04 +01:00
Milos Kozak
ea15659050 Merge pull request #122 from AdrianLxM/patch-11 
Typo German (Ereignis with one s)
 2017-01-10 08:30:29 +01:00
AdrianLxM
dfc176d1bd Typo German (Ereignis with one s) 2017-01-10 02:39:16 +01:00
AdrianLxM
856c025e2b typo spanish 2017-01-10 02:37:20 +01:00
Milos Kozak
74afdb6874 Merge branch 'dev' into AMA 2017-01-09 17:34:49 +01:00
Milos Kozak
26a76217bf Greek language 2017-01-09 17:23:56 +01:00
Milos Kozak
e9b900d74a show predictions in graph 2017-01-08 23:10:27 +01:00
Milos Kozak
68a127d804 make autosens configurable in settings, determinebasaladapter refactoring 2017-01-08 14:21:29 +01:00
Milos Kozak
e71b478941 show both deltas on overview 2017-01-08 12:04:42 +01:00
Milos Kozak
6621c2f610 log script debug in fragment 2017-01-08 00:27:13 +01:00
Milos Kozak
9c93d3ad7d log autosens input data in fragment 2017-01-08 00:07:18 +01:00
Milos Kozak
25a3b678e9 most new AMA code added 2017-01-06 22:42:37 +01:00
Milos Kozak
3dfac49b82 duplicate MA -> AMA 2017-01-03 21:15:40 +01:00
viktoria
f3551dda7f german translation 2017-01-02 16:44:20 +01:00
Milos Kozak
952a2342a8 Merge pull request #104 from MilosKozak/mm640g 
MM640g bg source
 2017-01-02 13:58:56 +01:00
Milos Kozak
4408146f23 disable entering basals in profiles only if pump is not tempbasal capable 2017-01-01 14:34:57 +01:00
Milos Kozak
ef2e7b1a62 show basal line only if pump is tempbasal capable 2017-01-01 14:19:35 +01:00
Milos Kozak
38a9c94258 Local Profile 2016-12-31 20:10:36 +01:00
Milos Kozak
6b18336fa2 LocalProfile plugin 2016-12-31 15:06:45 +01:00
Milos Kozak
2e6c168adc TimeListEdit most work done 2016-12-31 13:11:32 +01:00
Milos Kozak
e1c2e4c492 TimeListEdit initial work 2016-12-30 16:43:43 +01:00
Milos Kozak
b2be49e631 simple profile layout 2016-12-29 22:40:30 +01:00
Milos Kozak
1e99c00626 allow sms string to be translated separately 2016-12-29 16:22:40 +01:00
Milos Kozak
8e46a55e48 allow better translation of min ago 2016-12-29 16:06:00 +01:00
Milos Kozak
0059266791 loop status font size 2016-12-29 14:23:05 +01:00
Milos Kozak
24c5bb9303 Merge branch 'master' into mm640g 2016-12-29 14:01:24 +01:00
Milos Kozak
83f4dbf9ca Merge pull request #103 from AdrianLxM/patch-8 
remove mm640g translation again
 2016-12-29 13:51:24 +01:00
Milos Kozak
c06d25b235 more rearrangements 2016-12-29 00:12:52 +01:00
Milos Kozak
f127e7bec1 better allign bg arrows 2016-12-28 23:48:43 +01:00
AdrianLxM
834398b8f0 remove mm640g translation again 2016-12-28 23:31:02 +01:00
AdrianLxM
d70c9673d5 average delta 2016-12-28 22:39:40 +01:00
Milos Kozak
d2d3e024a2 Merge branch 'ongoingnotif' of https://github.com/AdrianLxM/AndroidAPS 2016-12-28 15:15:24 +01:00
Milos Kozak
e2c2f49f6f MM640g bg source 2016-12-28 14:57:11 +01:00
Radoslav Radev
71461e38ca Update strings.xml 2016-12-28 12:17:17 +02:00
warstar2187
804cdba7cf Update strings.xml 2016-12-28 18:22:50 +09:00
AdrianLxM
6ac889cecd ongoing notification integration 2016-12-28 00:03:08 +01:00
AdrianLxM
d597be71de ongoing notification 2016-12-27 23:39:16 +01:00
Milos Kozak
405ae28e38 cz translations 2016-12-27 23:39:00 +01:00
Milos Kozak
29327aef01 MDI pump driver 2016-12-27 23:35:50 +01:00
Milos Kozak
fdb252b62d show direction next to BG 2016-12-27 20:41:28 +01:00
Milos Kozak
cd41bff2bb SMS command BG 2016-12-27 12:17:26 +01:00
Milos Kozak
3bd7568d34 dismiss button not hardcoded 2016-12-24 23:56:47 +01:00
Milos Kozak
052ac47595 Better profile handling 2016-12-24 23:53:17 +01:00
Milos Kozak
2b0c74c56f CZ translations 2016-12-24 14:21:24 +01:00
Milos Kozak
7719e2ac63 use notifications for profile update 2016-12-22 12:17:38 +01:00
Milos Kozak
cb4330ddcd notify when pump settings is wrong 2016-12-13 22:10:13 +01:00
AdrianLxM
e1dc624a47 fully remove mm640g 2016-12-10 22:58:31 +01:00
Milos Kozak
6ba532d178 notify about setting basal profile 2016-12-09 16:04:07 +01:00
Milos Kozak
4103e4bf4a allow set profile to pump from simpleprofile plugin 2016-12-09 12:40:15 +01:00
Milos Kozak
be8003da4b Merge branch 'master' into koreandanar 2016-12-06 23:18:02 +01:00
Milos Kozak
0af894aa56 change info color to green 2016-12-06 22:57:49 +01:00
Milos Kozak
abfb832a10 basic notification functionality 2016-12-05 15:20:44 +01:00
Milos Kozak
4b389c2cad dana drivers switching working 2016-12-03 17:42:08 +01:00
Milos Kozak
db2fd55f7c copy files for Korean DanaR 2016-11-29 20:52:40 +01:00
Milos Kozak
97a22344e3 CZ translations 2016-11-29 19:07:09 +01:00
Milos Kozak
36d5f1dc29 proper danar errors detection 2016-11-29 18:28:36 +01:00
AdrianLxM
896503918c wear extract strings 2016-11-29 15:01:00 +01:00
AdrianLxM
1eacf35e47 Merge pull request #25 from AdrianLxM/wear-prepare-final 
wear merge current master
 2016-11-29 13:17:21 +01:00
Milos Kozak
ee408ada79 Merge pull request #80 from warstar2187/master 
Fix Insulin Activity and Korean update
 2016-11-29 07:44:58 +01:00
Milos Kozak
2912d1cce1 Merge pull request #79 from AdrianLxM/viktoria-permissions 
Viktoria permissions
 2016-11-28 19:02:28 +01:00
LadyViktoria
39be1bb4c7 Android 6+ Permissions #6 2016-11-25 13:35:34 +01:00
LadyViktoria
1967602c70 Android 6+ Permissions #3 2016-11-25 13:32:07 +01:00
AdrianLxM
12e78656b7 wear settings 2016-11-24 16:23:31 +01:00
AdrianLxM
c633904e8c wear fragment and reset button 2016-11-24 16:23:31 +01:00
ecorman
da861a7108 Note basal start / end to see note in Xdrip+ with data 2016-11-23 23:59:11 +01:00
Radoslav Radev
8b5ee91c95 Update strings.xml 2016-11-17 22:40:51 +02:00
Radoslav Radev
56c83aac2f bg translation 
1
 2016-11-17 22:12:19 +02:00
AdrianLxM
513b2966c9 CPP cleanup and i18n 2016-11-14 18:19:17 +01:00
AdrianLxM
74ea6c4011 CPP working 2016-11-14 18:19:17 +01:00
AdrianLxM
c2d1fdb39e CPP edit base basal gui - without function yet 2016-11-14 18:19:17 +01:00
AdrianLxM
dba81ede2a calculation for isf and ic. Tooltips. 2016-11-14 18:19:17 +01:00
AdrianLxM
3fe7c7a0fa CPP shiftfix and base profile view 2016-11-14 18:19:17 +01:00
AdrianLxM
2c5b20a721 CPP html-ify and send to pump button 2016-11-14 18:19:17 +01:00
AdrianLxM
a57a864c24 CPP icons 2016-11-14 18:19:17 +01:00
AdrianLxM
4dbb20b8c5 CPP small redesign 2016-11-14 18:19:17 +01:00
AdrianLxM
f815f7fce6 CPP ic and isf data 2016-11-14 18:19:17 +01:00
AdrianLxM
8c93925865 CPP simple representation string 2016-11-14 18:19:17 +01:00
AdrianLxM
364b3d6710 CPP percentage and shift working on hard coded basal rate 2016-11-14 18:19:17 +01:00
AdrianLxM
be556cf388 CPP copy simple profile 2016-11-14 18:19:17 +01:00
AdrianLxM
d94136bc95 overview dymanic height 2016-11-12 20:39:11 +01:00
warstar2187
2365dbac86 Update strings.xml 2016-11-13 01:54:28 +09:00
Milos Kozak
0b56b7554c Merge pull request #64 from AdrianLxM/fill-presets2 
Fill presets
 2016-11-12 10:41:54 +01:00
Milos Kozak
dce6acba54 Merge pull request #65 from AdrianLxM/german-update 
German update
 2016-11-12 10:28:01 +01:00
AdrianLxM
2fef497ce9 German updates 02 2016-11-11 17:59:23 +01:00
AdrianLxM
75889c24b3 German updates 01 2016-11-11 17:59:10 +01:00
AdrianLxM
1568f77229 fill preset buttons 2016-11-11 16:24:00 +01:00
warstar2187
2d54a068ad Update strings.xml 2016-11-11 23:07:32 +09:00
Milos Kozak
c034f77b71 fix merge conflict 2 2016-11-11 13:09:50 +01:00
Milos Kozak
a341fa4343 fix merge conflict 2016-11-11 13:09:11 +01:00
AdrianLxM
a6d5d68938 fill action 2016-11-11 00:56:15 +01:00
Milos Kozak
e8d169f078 allow automated actions only whem pump is initialized 2016-11-10 23:33:12 +01:00
AdrianLxM
7b4b4f7cfc Overview profile redesign 2016-11-10 23:20:23 +01:00
AdrianLxM
4ee87d1cca basal profile on overview 2016-11-10 21:03:26 +01:00
AdrianLxM
a6ae92bb2f Receive profile updates on uploadOnly when NS-Profiles are used 2016-11-10 18:53:01 +01:00
AdrianLxM
c900d6611c Warn on "refresh treatments from NS" button in upload only mode. 2016-11-10 18:52:42 +01:00
AdrianLxM
f85f04d33f NS upload only 2016-11-10 18:33:50 +01:00
Milos Kozak
21f732b378 report app start/restart to NS 2016-11-10 16:42:59 +01:00
Milos Kozak
8d360f837d Merge pull request #57 from warstar2187/master 
kr translation update
 2016-11-10 10:02:01 +01:00
AdrianLxM
341d7222e5 Strings for reset DB 2016-11-08 22:36:47 +01:00
warstar2187
1f35018148 Update strings.xml 2016-11-08 20:04:19 +09:00
AdrianLxM
ede982c8c5 Update danar_history_item.xml 2016-11-08 06:08:12 +01:00
Milos Kozak
6263b98683 Merge pull request #39 from warstar2187/master 
Update strings.xml
 2016-11-07 09:13:21 +01:00
Milos Kozak
45ffc18d25 move set temp and set extended buttons to actions 2016-11-05 20:12:58 +01:00
Milos Kozak
3ac9811d9a Actions page & offline profile switch 2016-11-05 15:46:11 +01:00
Radoslav Radev
b9d4a5fc0a Update strings.xml 2016-11-03 07:47:24 +02:00
Milos Kozak
57b032065f Merge pull request #45 from AdrianLxM/disableLoopLabel 
Disable loop label
 2016-11-02 22:20:48 +01:00
AdrianLxM
b7f4dd3366 borders again on loopmode label 2016-11-02 18:27:46 +01:00
AdrianLxM
b1f3bb17bb Show in Overview when loop is disabled 2016-11-02 18:04:14 +01:00
AdrianLxM
80e8ac465a Update German translation 2016-11-02 14:33:41 +01:00
AdrianLxM
b265be3536 Some updates on German translation 2016-11-02 14:17:16 +01:00
warstar2187
46fd0c87dd Update strings.xml 2016-10-27 08:16:19 +09:00
warstar2187
e4e2ea3aac Update strings.xml 2016-10-27 02:53:23 +09:00
warstar2187
a49afea27c Update strings.xml 2016-10-26 15:57:21 +09:00
warstar2187
58591514f7 Update strings.xml 2016-10-26 15:34:26 +09:00
warstar2187
02c231a236 Update strings.xml 2016-10-26 12:36:15 +09:00
warstar2187
f39b009ca3 Update strings.xml 2016-10-26 10:10:33 +09:00
warstar2187
70249c7e3e Update strings.xml 2016-10-26 09:49:46 +09:00
Milos Kozak
4c3d67535c Korean language template 2016-10-25 23:38:44 +02:00
Milos Kozak
861c24fc45 distinguish between meal and correction bulus 2016-10-25 23:33:02 +02:00
AdrianLxM
d2906e8fd4 overview_quickwizardentry translated but does not exist 2016-10-21 22:18:17 +02:00
Milos Kozak
6f8d828ec2 QuickWizard 2016-10-20 23:50:31 +02:00
Milos Kozak
5ec339e987 fix BolusProgessDialog size on Android 6 2016-10-11 23:49:26 +02:00
Milos Kozak
4378c9af14 more SMS commands 2016-09-16 14:08:26 +02:00
Milos Kozak
57db26443e Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-09-13 22:40:55 +02:00
Milos Kozak
ecb685f7f6 hard limits on openaps params 2016-09-13 22:15:17 +02:00
ecorman
83c4214710 Reduce width, + sign was not visible 2016-09-12 00:34:31 +02:00
ecorman
52525b69f4 Updated Translation 2016-09-12 00:33:14 +02:00
ecorman
0221a14f7c Updated translation 2016-09-12 00:07:50 +02:00
Milos Kozak
05831c75a6 SMS LOOP commands 2016-09-10 15:33:00 +02:00
Radoslav Radev
9c82350c1e Update strings.xml 2016-09-10 10:37:33 +03:00
Milos Kozak
bdeb7d6061 Merge pull request #30 from slavidex/patch-11 
too long
 2016-09-09 13:08:37 +02:00
Radoslav Radev
829beb5c8f too long 2016-09-09 07:54:16 +03:00
ecorman
e5c1c1df4d Improve Spanish Translation 2016-09-08 23:19:07 +02:00
ecorman
fcdd07a182 Reduce size to better fit screen 2016-09-08 23:18:15 +02:00
ecorman
dd032b19e0 Spanish translation update strings.xml 2016-09-07 23:40:37 +02:00
ecorman
b3857f7794 Spanish translation 2016-09-07 23:39:06 +02:00
Milos Kozak
3fb84636db fix objectives import/export 2016-08-13 11:30:43 +02:00
Milos Kozak
40aada0eb4 ajdust some danar pump comm params 2016-08-12 20:22:44 +02:00
Milos Kozak
ebee1cdeca scrollview in careportal dialog 2016-08-11 15:36:59 +02:00
Milos Kozak
4da0f345cf fix wizard gui 2016-08-11 09:54:03 +02:00
Radoslav Radev
9bbc1e97a5 BG translation 2016-08-11 07:45:35 +03:00
Milos Kozak
d023e4ae32 move targets from fragment to plugin 2016-08-10 23:27:26 +02:00
Milos Kozak
d2b01dcc32 fix BG lang 2016-08-10 18:25:49 +02:00
Radoslav Radev
098aa22da6 BG translation 
fix
 2016-08-10 16:44:13 +03:00
Milos Kozak
acbd028465 bolus progress in virtual pump 2016-08-10 14:50:53 +02:00
Milos Kozak
49d6690450 OpenAPS MA target value 2016-08-09 15:40:12 +02:00
Milos Kozak
267e0220c0 overview scroll, determinebasal fix 2016-08-08 14:47:24 +02:00
Milos Kozak
88698576a2 plusminis edit shows toast when hit limit 2016-08-08 10:08:30 +02:00
Milos Kozak
ff2e9a82bc fix some crashes 2016-08-07 13:07:13 +02:00
Milos Kozak
b711648bee plugins refactoring 2016-08-05 23:54:03 +02:00
Milos Kozak
7cc0fb593d IOB display & upload fix 2016-08-05 00:32:48 +02:00
Milos Kozak
b42644de39 objectives finalization, some todos 2016-08-04 23:38:43 +02:00
Milos Kozak
a7d3dca752 Bolusing dialog 2016-08-04 09:17:26 +02:00
Milos Kozak
c20026c15a lowsuspend cleanup 2016-08-03 14:40:47 +02:00
Milos Kozak
6b75dd3dc9 error.mp3 2016-08-02 18:39:56 +02:00
Milos Kozak
dbb0a6a659 danar fragment update, danar pump password, toast with sound 2016-08-02 18:39:14 +02:00
Milos Kozak
e94fe1f647 danar history translation support 2016-07-28 13:40:32 +02:00
Milos Kozak
a9218c20d5 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-07-27 17:50:04 +02:00
Milos Kozak
61e8ffeebd DanaR history loader 2016-07-27 17:49:56 +02:00
Ulrich Kopp
4e2d97d42d DE translation 2016-07-24 17:36:54 +02:00
Milos Kozak
978770d70a icon 2016-07-21 15:11:17 +02:00
Milos Kozak
7d568f2c24 cz translation 2016-07-20 23:19:49 +02:00
Milos Kozak
fd91348eba fix bg translation 2016-07-20 23:14:19 +02:00
Radoslav Radev
9007d25e7e translation bg 2016-07-20 22:37:22 +03:00
Milos Kozak
788289c757 remove alert mp3 2016-07-19 11:40:22 +02:00
viktoria
5afe78cf2a German Translation #6 2016-07-18 23:49:25 +02:00
Milos Kozak
a1a64873fd DanaR driver as a service 2016-07-18 12:02:33 +02:00
Milos Kozak
82a16efcc2 bolus wizard full functionality 2016-07-16 22:37:10 +02:00
Milos Kozak
cd86476d6a design of virtual pump 2016-07-15 21:06:39 +02:00
Milos Kozak
7f661b7fa6 danar profile dia&car configurable in preferences 2016-07-15 20:56:07 +02:00
Milos Kozak
c5d40b3a6c careportal eventtypes translations 2016-07-15 19:45:03 +02:00
Milos Kozak
871eaa718d translations 2016-07-15 18:55:14 +02:00
Milos Kozak
90fee59e8a sms communicator: remote bolus, status 2016-07-14 23:29:21 +02:00
Milos Kozak
4a8ecb3a79 better display pump results 2016-07-13 18:57:23 +02:00
Milos Kozak
b81cf8341b MM640g base interface code 2016-07-13 15:56:27 +02:00
Milos Kozak
8681dc5122 overview status update 2016-07-13 14:56:11 +02:00
Milos Kozak
272262b115 SMSCommunicator plugin 2016-07-13 13:54:40 +02:00
Milos Kozak
76d42ef3fb displaying basal fix 2016-07-12 17:56:01 +02:00
Milos Kozak
efa2944c4c translations & fixes 2016-07-11 22:52:23 +02:00
Milos Kozak
f7715a3409 xml reformating, some code cleaning 2016-07-11 17:49:09 +02:00
Milos Kozak
3127870770 DanaR as profile source 2016-07-11 14:04:57 +02:00
Milos Kozak
076135195b Merge pull request #18 from slavidex/patch-3 
Update strings.xml
 2016-07-10 15:05:48 +02:00
Milos Kozak
143d347841 most danar code there 2016-07-10 15:05:13 +02:00
Radoslav Radev
1a57ed07bd Update strings.xml 2016-07-09 00:08:43 +03:00
Milos Kozak
e37917dae4 test alert fix 2016-07-08 13:39:27 +02:00
Milos Kozak
aeae32cc79 Merge pull request #17 from slavidex/patch-2 
Bulgarian translation
 2016-07-08 00:20:07 +02:00
Milos Kozak
dc3eb80d52 basic danar comm 2016-07-08 00:17:02 +02:00
Radoslav Radev
6159a78d81 Update strings.xml 2016-07-07 21:37:54 +03:00
Milos Kozak
690fd06c01 Agreement 2016-07-07 18:04:36 +02:00
Milos Kozak
c844a2ad9a DanaR preferences & preferences cleanup 2016-07-07 17:17:54 +02:00
Milos Kozak
ba015f1140 DanaR service 2016-07-07 10:34:20 +02:00
Milos Kozak
0b19cae903 smaller buttons on careportal 2016-07-07 01:11:24 +02:00
Milos Kozak
ca31195b15 Merge pull request #16 from LadyViktoria/master 
translation fix
 2016-07-06 23:18:38 +02:00
Milos Kozak
85f4a93c11 move languages to preferences 2016-07-06 22:50:25 +02:00
Milos Kozak
7c46407f81 AlarmService 2016-07-06 22:05:28 +02:00
viktoria
89c880eda2 translation fix 2016-07-06 19:23:31 +02:00
Milos Kozak
56225f1851 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-07-06 11:14:09 +02:00
Milos Kozak
a99c8aa75b remove 'language' from label in menu 2016-07-06 11:13:42 +02:00
Milos Kozak
6ca5517aef switch + and - in dialogs 2016-07-06 11:11:12 +02:00
Radoslav Radev
c4a1442c22 BG translation 2016-07-05 21:29:48 +03:00
Milos Kozak
ce7439bc00 add bg language 2016-07-05 20:28:23 +02:00
Milos Kozak
2eed46b3d2 typo 2016-07-04 09:13:11 +02:00
viktoria
4a603a46ad Germany Translation #5 2016-07-03 22:47:26 +02:00
viktoria
da4d73cd52 Array fix 2016-07-03 22:47:08 +02:00
viktoria
9f8015c951 German Translation #4 2016-07-03 21:34:50 +02:00
AdrianLxM
1078514ceb german typos 2016-07-03 21:13:51 +02:00
Milos Kozak
ec3b74aad2 Merge pull request #9 from LadyViktoria/master 
German Translation #3
 2016-07-03 21:06:06 +02:00
Milos Kozak
02f5806832 preferences translations 2016-07-03 21:05:36 +02:00
viktoria
d5b9406636 German Translation #3 2016-07-03 21:04:40 +02:00
Milos Kozak
59aba8d9be german language to menu 2016-07-03 20:54:00 +02:00
Milos Kozak
f6623c7a62 Merge pull request #8 from LadyViktoria/master 
German Translation #2
 2016-07-03 20:38:13 +02:00
Milos Kozak
afa4332d28 import/export preferences 2016-07-03 20:37:42 +02:00
viktoria
4d9661dff2 German Translation #2 2016-07-03 20:19:11 +02:00
viktoria
cac60bd296 german translation 2016-07-03 15:38:44 +02:00
Milos Kozak
9f8d7d3dca configbuilder fragment translations 2016-07-03 13:56:57 +02:00
Milos Kozak
2b01b2a10b combobolus dialog plus/minus buttons 2016-07-03 13:46:49 +02:00
Milos Kozak
07b01cd8d0 some missing translations 2016-07-03 13:35:02 +02:00
Milos Kozak
5cad7f1cb4 temp basal dialog plus/minus buttons 2016-07-03 13:25:23 +02:00
Milos Kozak
000fafced3 some missing CZ translations 2016-07-03 11:13:50 +02:00
Milos Kozak
7459acfc34 finished CZ translation 2016-07-03 11:04:24 +02:00
Milos Kozak
ea4eef88ed 1st round of CZ translation 2016-07-03 01:02:35 +02:00
Milos Kozak
92f4c37fac careportal 2016-07-02 23:58:57 +02:00
Milos Kozak
f3c15aca75 plus minus controls 2016-06-28 11:19:27 +02:00
Milos Kozak
caa4f3402e split iob in wizard dialog, fixies for no data in app 2016-06-27 23:34:33 +02:00
Milos Kozak
af904b24bb add notify icon to git 2016-06-27 20:53:33 +02:00
Milos Kozak
aa6c5764c4 language selector in menu 2016-06-27 20:14:31 +02:00
Milos Kozak
a3d32fcb44 objectives fragment complete 2016-06-27 18:48:48 +02:00
Milos Kozak
6ebbfdc339 1st translation test 2016-06-26 15:13:57 +02:00
Milos Kozak
a4bdebdedf detect ns versions 2016-06-26 14:56:43 +02:00
Milos Kozak
2f16c9b998 open loop mode & notification 2016-06-26 11:43:26 +02:00
Milos Kozak
5dfddfdfee fix counting and displaying iob 2016-06-25 15:00:42 +02:00
viktoria
f90138ea54 Add border Buttons 2016-06-25 00:09:52 +02:00
Milos Kozak
270503fe74 Merge pull request #2 from LadyViktoria/master 
Material Design and Buttons
 2016-06-24 23:36:01 +02:00
viktoria
4eaa2c6f1d Material Design and Buttons 2016-06-24 23:20:38 +02:00
Milos Kozak
35ff53dbb4 iob & basal on overview tab 2016-06-24 23:17:46 +02:00
Milos Kozak
120341b706 devicestatus, lot of gui and internal improvements, temp&extended in db only 2016-06-24 17:16:17 +02:00
Milos Kozak
91b36a8528 work on tempbasals 2016-06-22 18:08:21 +02:00
Milos Kozak
edddfed004 add source selection xdrip/nsclient 2016-06-21 00:34:36 +02:00
Milos Kozak
fdf09b9daf extended bolus dialog 2016-06-20 22:55:49 +02:00
Milos Kozak
4645c2bc4d apply constraints on new treatment dialog 2016-06-20 21:43:29 +02:00
Milos Kozak
7cb0e0e588 manual tempbasal dialog 2016-06-20 20:45:55 +02:00
Milos Kozak
5ac31bd0ca menu, preferences, treatment&wizard buttons, ns upload 2016-06-19 20:06:00 +02:00
Milos Kozak
aa97722283 loop & safety fragment 2016-06-19 13:17:16 +02:00
Milos Kozak
d69701a092 SimpleProfile plugin, ConfigBuilder GUI improvements 2016-06-16 19:22:58 +02:00
Milos Kozak
ddb1868018 Constrains interface 2016-06-15 21:47:26 +02:00
Milos Kozak
26724ecbda ConfigBuilder most work done 2016-06-14 23:45:55 +02:00
Milos Kozak
b8eca8a802 rename profileviewer -> nsprofileviewer 2016-06-14 13:01:37 +02:00
Milos Kozak
f424c9c642 ConfigBuilder fragment formating 2016-06-13 22:59:31 +02:00
Milos Kozak
32bfea8d18 base ConfigBuilder plugin 2016-06-13 22:53:41 +02:00
Milos Kozak
b310310511 GUI improvements 2016-06-12 13:30:34 +02:00
Milos Kozak
a66ece9af5 Lowsuspend finished 2016-06-12 10:53:19 +02:00
Milos Kozak
74dcbb1864 glucoseReading fix 2016-06-11 22:46:47 +02:00
Milos Kozak
54a25aa1ed remove static debug texts 2016-06-11 22:30:08 +02:00
Milos Kozak
a8ab671d78 OpenApsMA invoke 2016-06-11 22:21:44 +02:00
Milos Kozak
73ebf3ffeb typo in VIRTUAL 2016-06-11 20:47:00 +02:00
Milos Kozak
68b5570d35 VirtualPump 2016-06-11 20:45:40 +02:00
Milos Kozak
a5088584a2 OpenAPS MA initial work 2016-06-10 18:50:46 +02:00
Milos Kozak
891c5dd4d7 show units in profile 2016-06-09 09:21:33 +02:00
Milos Kozak
45cceddfcc basic graph on everview fragment 2016-06-09 00:01:28 +02:00
Milos Kozak
3b883dee31 basic overview fragment + some gui fixes 2016-06-07 23:36:22 +02:00
Milos Kozak
701e6a2055 receive BGs from xDrip and NSClient 2016-06-07 21:48:17 +02:00
Milos Kozak
bd47fb8624 button refresh treatments from nightscout 2016-06-06 12:17:37 +02:00
Milos Kozak
627ce66852 TempBasals & some IOB adjustments 2016-06-06 10:42:46 +02:00
Milos Kozak
f7779bd9f1 Treatments fragment 2016-06-05 14:53:03 +02:00
Milos Kozak
629ed62e03 Profile fragment 2016-06-05 01:40:35 +02:00
Milos Kozak
9b749202fd Objectives design 2016-06-04 17:28:05 +02:00