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

472 commits

Author SHA1 Message Date
Milos Kozak
3d58fe6bb5 cleanup 2017-10-04 23:24:56 +02:00
Milos Kozak
96edac5ddf LocalProfile fix 2017-10-04 23:17:19 +02:00
Milos Kozak
6d08a608a2 dana layout 2017-10-03 22:37:53 +02:00
Milos Kozak
58ed0416d1 fix conflict 2017-10-03 22:33:35 +02:00
Milos Kozak
8cecac0a7f more LocalProfile work 2017-10-02 19:57:41 +02:00
Roumen Georgiev
ef803d6a41 In one line 2017-09-29 15:06:23 +03:00
Roumen Georgiev
e004b95a60 Update danar_fragment.xml 2017-09-29 09:50:07 +03:00
Roumen Georgiev
7444bc11fa text identation 2017-09-29 09:47:29 +03:00
Roumen Georgiev
92e2008692 Adding button Icons 2017-09-29 09:40:11 +03:00
Milos Kozak
91b02d4d39 fill dialog refactor & code clean 2017-09-24 14:51:16 +02:00
Milos Kozak
1823cd3f24 extended bolus dialog refactor 2017-09-24 13:00:59 +02:00
Milos Kozak
082414f0d3 CPP support to profile switch 2017-09-24 10:39:54 +02:00
Milos Kozak
349b27e31a NS profile fragment shows all profiles 2017-09-23 23:54:43 +02:00
Johannes Mockenhaupt
1bd5dc3719
Merge remote-tracking branch 'origin/dev' into develop 
* origin/dev: (53 commits)
  bump 1.53
  BG & IOB contribution on by default in wizard
  check for NaN
  Revert "Rounding issues visible in nightscout insulin field"
  Clarified boolean logic with parentheses :)
  loadEvents after bolus in separate thread
  use notification for bolus delivery failed message when window has been destroyed
  fix null pointer exception
  Added cases to accept both a.m./p.m. and AM/PM
  split JSON arrays to 50 elements
  Update strings.xml
  Changed rounding to use BigDecimals to avoid noisy long doubles in output
  Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."
  Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
  Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.
  Removed unused imports
  Rounding fix
  VirtualPump: set PumpEnactResult.enacted.
  Use correct units for low/high from TT.
  Remove duplicate logging.
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/java/info/nightscout/androidaps/MainApp.java
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
#	app/src/main/res/values/strings.xml
 2017-09-18 22:54:35 +02:00
Milos Kozak
fdc3c49a2a fix merge conflits 2017-09-18 22:03:26 +02:00
Milos Kozak
04994924c5 GUI tweaking, small fixes 2017-09-18 18:41:45 +02:00
Milos Kozak
ed6cabe7fa initial RS work 2017-09-13 00:35:03 +02:00
Johannes Mockenhaupt
627cb8e9b2
WizardDialog: don't persist state of tt checkbox, default to false. 
This assumes that a default is not useful, as it needs to be decided
whether this is needed on each case (using tt when bolusing to
start eating soon, but not using it when bolusing for the meal
at the end of a tt).
 2017-09-09 16:37:08 +02:00
Johannes Mockenhaupt
b1e3b45ce9
Add temp target to Wizard dialog 
Also, store checkboxes' state as prefereces.

(cherry picked from commit 6e1c66e)
 2017-09-09 16:30:17 +02:00
Milos Kozak
db952759e1 Insulin fragments consolidation 2017-08-31 22:00:45 +02:00
Milos Kozak
7da8b2de5c visibility icon 2017-08-29 21:40:06 +02:00
Milos Kozak
7dfe77dc9c single line in configbuilder 2017-08-29 19:47:32 +02:00
Milos Kozak
981a96aa16 ConfigBuilder layout 2017-08-29 17:59:46 +02:00
Johannes Mockenhaupt
c8f7b535c2
Remove code to determine pump capabilities for the time being. 2017-08-27 18:45:22 +02:00
Johannes Mockenhaupt
1d3411ba56
Show connection, execution time in combo fragment. 
(cherry picked from commit 4078c23)
 2017-08-27 12:36:28 +02:00
Milos Kozak
ba967df2e3 disable careportal buttons until profile is set 2017-08-27 11:44:39 +02:00
Johannes Mockenhaupt
bffcd3ceee
Merge remote-tracking branch 'origin/dev' into develop 
* origin/dev: (35 commits)
  fix displaying target in mmol
  Profile.getValuesList: don't add trailing newline.
  Fix some warnings.
  Use OK/Cancel buttons for profile removal dialog.
  static variables -> object variables
  Avoid npe if no string is assigned to the profile switch
  isValid implementation
  Show profile on tap in Treatments->ProfileSwitch
  Check for tempbasal not RealTempbasla
  Overlapping interval - regard first element on cut
  AcceptTempButton visible
  show notification on toast alarm
  parse 12h format properly
  fix index
  Show profile switch button in profiles
  set pump time only if needed
  restrict DIA for expectedDelta
  Overlappinginterfals - find first element
  Extract method Profile.toTargetRangeString.
  Simplify.
  ...

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
 2017-08-19 22:38:58 +02:00
Milos Kozak
ca3d94a8ca fix merge conflict 2017-08-17 21:21:38 +02:00
Milos Kozak
73c2be5248 isValid implementation 2017-08-17 20:51:24 +02:00
AdrianLxM
92077dcb6a Show profile on tap in Treatments->ProfileSwitch 2017-08-17 17:03:08 +02:00
AdrianLxM
8287fe22cf AcceptTempButton visible 2017-08-16 23:22:14 +02:00
Timm Korte
882f9d7869 Merge remote-tracking branch 'milosremote/dev' into develop 2017-08-13 23:57:07 +02:00
Savek-CC
d520643d45 Merge branch 'develop' into 'mainline' 
# Conflicts:
#   app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
 2017-08-06 22:35:07 +00: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
RoumenGeorgiev
714a292d78 fixed wrong pasting 2017-08-04 15:05:09 +03:00
RoumenGeorgiev
529d267b9d Added check for staleData and notification 
with every loop
 2017-08-04 12:29:48 +03:00
AdrianLxM
36e6cb8497 remove canceltemp button from all layouts and click handling from overview fragment 2017-08-03 08:22:59 +02:00
Milos Kozak
9cf5c6b6c3 hide all overview buttons by default 2017-08-01 20:52:23 +02:00
Milos Kozak
34d4bec556 move cancel temp to actions 2017-08-01 20:45:57 +02:00
Milos Kozak
9596987b35 new temp basal dialog refactor 2017-08-01 20:02:17 +02:00
AdrianLxM
2697ac9420 battery and insulinstate 2017-07-27 12:20:59 +02:00
AdrianLxM
13173e48c1 tbr capability in ComboFragment 2017-07-26 22:16:35 +02:00
AdrianLxM
76c0b999ff determine max possible tbr firstshot 2017-07-26 18:11:45 +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
1c0e97c175 recategorize cp icons 2017-07-22 20:57:30 +02:00
AdrianLxM
2e32d12bc0 removed unnecessary text colour and fixed indentation 2017-07-22 14:34:59 +02:00
AdrianLxM
c187bf1575 layout indentation 2017-07-22 14:30:55 +02:00
Roumen Georgiev
54697df358 Moving some buttons to the right categories 2017-07-22 14:27:51 +02:00
AdrianLxM
3d4fa0cebf remove duplicate IDs and indentation fix 2017-07-22 02:15:55 +02:00
AdrianLxM
10d27f0b6a Picture renaming (#311) 
* adding icons
 2017-07-21 22:24:06 +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
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
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
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
Milos Kozak
253c2a34e5
combo plugin skeleton 2017-07-18 20:54:13 +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
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
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
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
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
e90812634b work from old autosens branch 2017-06-16 14:37:43 +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
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
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
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
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
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
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
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
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
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
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
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
Milos Kozak
7e99ce416a move buttons back to bottom 2017-05-11 10:59:05 +02:00
Milos Kozak
5b25d28f42 Merge branch 'dev' into DanaRv2 2017-05-10 14:05:43 +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
b30d79c4cb fix conflicts 2017-05-09 10:46:04 +02:00
Milos Kozak
8d3be5e958 colors on danar fragment 2017-05-08 23:19:11 +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
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
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
5ef034b4fc cob display 2017-04-26 23:45:40 +02: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
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
2413fae0a9 1.32 superbolus & trend contribution in wizard 2017-04-14 14:50:18 +02:00
Milos Kozak
e25fb9845d hide unneeded labels in nsclient mode 2017-02-23 23:32:26 +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
5f4eb1e4c4 pump status tweaking 2017-02-19 19:15:14 +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
71112a90e2 internal nsclient 2017-02-17 13:18:36 +01:00
Milos Kozak
dda95dc275 allow to remove treatments from GUI 2017-02-14 21:13:13 +01:00
Milos Kozak
2e4aec9916 settings password protected 2017-02-14 19:16:34 +01:00
Milos Kozak
e00045155e prefill bg value in careportal dialog 2017-02-14 15:09:22 +01:00
viktoria
0d02f42714 use validation lib in cpp - layout fixes & longer snackbar duration 2017-02-12 19:51:56 +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
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
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
Milos Kozak
ed7dd48612 remove TODOs 2017-02-09 20:18:22 +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
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
viktoria
bd588af1ba DanaR Stats small Layout fixes 2017-01-23 21:52:24 +01:00
Milos Kozak
53f9b30b3e temp target display update 2017-01-21 11:22:03 +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
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
c701b5d125 waiting for pump message 2017-01-19 19:21:25 +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
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
61a8cad4e8 allow refrest temp targets from NS & fix bugs 2017-01-14 16:36:42 +01: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