Commit graph

586 commits

Author SHA1 Message Date
warstar2187
7f97b232da Update Treatment.java 2016-11-29 12:08:45 +09:00
Milos Kozak
2912d1cce1 Merge pull request #79 from AdrianLxM/viktoria-permissions
Viktoria permissions
2016-11-28 19:02:28 +01:00
AdrianLxM
70338ac158 wear PoweRGbg fixes 2016-11-28 18:42:19 +01:00
AdrianLxM
87d49c03c8 wear product flavors 2016-11-26 07:10:22 +01:00
AdrianLxM
b2d2f462f6 first check if element exist, then access it 2016-11-25 13:35:53 +01:00
LadyViktoria
39be1bb4c7 Android 6+ Permissions #6 2016-11-25 13:35:34 +01:00
AdrianLxM
ff29a795db SMS permission crashfix 2016-11-25 13:32:27 +01:00
LadyViktoria
33d783e9b0 Android 6+ Permissions #4 2016-11-25 13:32:17 +01:00
LadyViktoria
1967602c70 Android 6+ Permissions #3 2016-11-25 13:32:07 +01:00
viktoria
dd02fcaa85 Android 6+ Permissions #2 2016-11-25 13:31:52 +01:00
LadyViktoria
f25715d87c Android 6+ Permissions 2016-11-25 13:31:43 +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
AdrianLxM
b306de49dc wear Emma 2016-11-24 16:23:31 +01:00
AdrianLxM
ef0e30b2b3 wear big chart avgDelta working 2016-11-24 16:23:31 +01:00
AdrianLxM
5e3fddcc05 wear arrows working 2016-11-24 16:23:31 +01:00
AdrianLxM
95432e35e0 wear yet again current situation tweaks 2016-11-24 16:23:31 +01:00
AdrianLxM
663a865595 wear intent to express current situation better 2016-11-24 16:23:31 +01:00
AdrianLxM
8af4ac0daf wear bigchart fully functional 2016-11-24 16:23:31 +01:00
AdrianLxM
afa5faf834 wear basal live 2016-11-24 16:23:31 +01:00
AdrianLxM
2b17fc5155 wear painting temps 2016-11-24 16:23:31 +01:00
AdrianLxM
70c3969f85 wear something is painting 2016-11-24 16:23:31 +01:00
AdrianLxM
b93273d706 wear status working 2016-11-24 16:23:31 +01:00
AdrianLxM
e2c3069374 resend(), bigchart watchface layout overhaul, fix nullpointer exception, only send when enabled 2016-11-24 16:23:31 +01:00
AdrianLxM
2e0ac569eb wear first bg and delta on watch 2016-11-24 16:23:31 +01:00
AdrianLxM
761077e8ae wear fix overeager refactoring and plugin pluggable 2016-11-24 16:23:31 +01:00
AdrianLxM
2fd93a8e31 wear installing on watch 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
AdrianLxM
ef847a7cc2 Make bolus progress dialog not cancalable 2016-11-21 19:50:27 +01:00
AdrianLxM
b97920b3ef Integer: comparison by value not by reference
Why is there no compiler warning for this?
2016-11-18 15:21:07 +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
Milos Kozak
41acb2d022 Merge pull request #70 from AdrianLxM/cpp_sum
Add sum to the overview of the basal profile.
2016-11-17 20:09:54 +01:00
AdrianLxM
505a135ac8 CPP add sum to basal rate representation 2016-11-17 13:35:38 +01:00
AdrianLxM
b74c29d202 zip logfiles on daily rollover 2016-11-17 00:23:20 +01:00
AdrianLxM
ade27a9460 CPP proper dialog handling 2016-11-15 18:59:38 +01:00
AdrianLxM
127c85effb CPP delete images that are not used 2016-11-15 17:40:16 +01:00
AdrianLxM
3da9a8c45c CPP limits 50 to 200 percent 2016-11-15 17:25:23 +01:00
AdrianLxM
b01fb6ee6e CPP hard limits for percentage 2016-11-15 07:52:59 +01: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
85b052efda CPP copyprev buttons 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
0e5d18ec86 keep basal in order as required when writing to dana 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
AdrianLxM
12fc454fe1 divisions with doubles to not do whole minute jumps 2016-11-12 13:16:11 +01:00
AdrianLxM
68acc3aca3 deltas per 5 minutes 2016-11-12 13:05:18 +01: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
Milos Kozak
b5bd6749ae fix app crash when no profile set 2016-11-11 16:40:31 +01:00
AdrianLxM
401be6dd5b add U to buttons 2016-11-11 16:29:28 +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
Milos Kozak
ad475ace90 Merge pull request #63 from AdrianLxM/profileLongpress
profile switch dialog on long press on profile pill
2016-11-11 12:57:00 +01:00
Milos Kozak
753fb4664d Merge pull request #61 from AdrianLxM/fill-action
Fill action
2016-11-11 12:56:21 +01:00
AdrianLxM
4a23d4ce0d profile switch dialog on long press on profile pill 2016-11-11 12:29:13 +01:00
AdrianLxM
41e68a03a2 SimpleProfile as profile name 2016-11-11 01:45:41 +01:00
AdrianLxM
4b27c9212a DanaR as part of profile name 2016-11-11 01:45:28 +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
Milos Kozak
86a3df1996 lower allowed diff to perform action from 0.1 to 0.05 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
a5778b4916 Merge pull request #58 from AdrianLxM/loadmorehightemps
Load more "extended bolus" high temps
2016-11-10 13:54:11 +01:00
AdrianLxM
5088b84417 Receive profile updates on uploadOnly when NS-Profiles are used 2016-11-10 13:50:13 +01:00
Milos Kozak
156f42da5f always report active profile 2016-11-10 13:15:23 +01:00
Milos Kozak
770f44118b Merge pull request #56 from AdrianLxM/hapticFeedback
Haptic feedback
2016-11-10 10:02:26 +01:00
Milos Kozak
8d360f837d Merge pull request #57 from warstar2187/master
kr translation update
2016-11-10 10:02:01 +01:00
AdrianLxM
3ee1cf5023 haptic feedback for loop pill on overview 2016-11-10 00:02:51 +01:00
Milos Kozak
8707b42526 Merge pull request #54 from AdrianLxM/confirm_reset_db
Confirm reset db
2016-11-08 23:02:03 +01:00
AdrianLxM
aaba503cd0 Fix crash due to not found theme 2016-11-08 22:57:56 +01:00
Milos Kozak
bad7e5d7c4 gradle fix 2016-11-08 22:55:08 +01:00
AdrianLxM
341d7222e5 Strings for reset DB 2016-11-08 22:36:47 +01:00
AdrianLxM
218ccc803b Ask before resetting DB 2016-11-08 22:35:57 +01:00
Milos Kozak
a2d4f22bd7 added git HEAD and version to pump status and logs 2016-11-08 19:10:25 +01:00
Milos Kozak
94a7033e0c always upload current basal rate 2016-11-08 17:55:39 +01:00
Milos Kozak
a4a9efd812 TAB_VIEW_PADDING_DIPS = 9 2016-11-08 14:24:02 +01:00
warstar2187
1f35018148 Update strings.xml 2016-11-08 20:04:19 +09:00
warstar2187
9ae3d88f9c Update DanaRPlugin.java 2016-11-08 19:59:54 +09:00
Milos Kozak
4a4dc04865 fix iob reporting to NS 2016-11-08 10:29:24 +01:00
AdrianLxM
ff66edf064 Add TDD to DanaR daily view
... also don't show the time for the day. It is always 00:00 anyways.
2016-11-08 06:11:50 +01:00
AdrianLxM
ede982c8c5 Update danar_history_item.xml 2016-11-08 06:08:12 +01:00
AdrianLxM
93accc0d9f Add in basalIOB.activity 2016-11-07 15:18:48 +01:00
AdrianLxM
8bdc86f359 Calculate activityContrib for TempBasal 2016-11-07 15:17:16 +01:00
AdrianLxM
2e6a37dcbd Add base basal rate to Overview when temp is running
Now that there is more space with less buttons, it should fit ;)
2016-11-07 10:18:16 +01:00
Milos Kozak
d67ae5df78 version bump 1.0.20 2016-11-07 10:16:13 +01:00
Milos Kozak
925b5612fc Merge pull request #49 from AdrianLxM/disableLoopLongpress
Disable loop on Longpress on Loop-Status in Overview
2016-11-07 10:14:14 +01:00
Milos Kozak
3533ec16ba Merge pull request #50 from AdrianLxM/patch-7
fix for net IOB
2016-11-07 09:36:16 +01:00
Milos Kozak
6263b98683 Merge pull request #39 from warstar2187/master
Update strings.xml
2016-11-07 09:13:21 +01:00
AdrianLxM
e948a6f955 fix for net IOB 2016-11-07 07:55:41 +01:00
AdrianLxM
686593986c Update PreferencesActivity.java 2016-11-07 01:02:08 +01:00
AdrianLxM
c851aefc8e Update MainActivity.java 2016-11-07 01:01:33 +01:00
AdrianLxM
68be6179f8 Update EventRefreshGui.java 2016-11-07 01:00:50 +01:00
AdrianLxM
be39a35d68 Update ConfigBuilderFragment.java 2016-11-07 00:59:47 +01:00
AdrianLxM
c93322f2da Overview Loopdisable on longclick 1 2016-11-07 00:58:44 +01:00
Milos Kozak
f84777bf00 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-11-06 12:10:55 +01:00
Milos Kozak
95ffb03a26 fix resources crash 2016-11-06 12:10:24 +01:00
AdrianLxM
3f02c8fc8c Show decimal place
The time since last bolus has one decimal place but it was shown as zero.
2016-11-06 02:01:22 +01:00
Milos Kozak
65b8ca00db looper to profile switch 2016-11-05 20:32:47 +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
15ca64e218 Merge pull request #43 from ecorman/master
Basal % rate
2016-11-02 23:37:17 +01: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
AdrianLxM
2294093aab Show current total
The total of the calculation in the wizard was showing the value from the previous calculation when you enable/disable to include Bolus-IOB or Basal-IOB into the calculation.

The button to send to the pump showed the current amount of units.
2016-10-31 13:01:50 +01:00
ecorman
f2baa32e40 Basal % rate 2016-10-31 13:01:38 +01:00
ecorman
cf3bb52c7b Add percent to result to allow manual adjust 2016-10-31 02:29:19 +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
5443bb4fba Update SmsCommunicatorPlugin.java 2016-10-27 02:23:47 +09:00
warstar2187
79a6b65bb9 Update SmsCommunicatorPlugin.java 2016-10-26 19:38:36 +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
8f17ecdd89 version bump 1.0.19 2016-10-25 23:40:03 +02: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
Milos Kozak
8614469a35 test activity for null 2016-10-23 23:34:14 +02:00
Milos Kozak
1597ee77b5 typo 2016-10-22 18:04:26 +02:00
AdrianLxM
d2906e8fd4 overview_quickwizardentry translated but does not exist 2016-10-21 22:18:17 +02:00
AdrianLxM
e2956db141 don't complain on missing translations 2016-10-21 22:16:20 +02:00
Milos Kozak
05f8c2d1ba default constructor only in WizardDialog 2016-10-21 22:00:14 +02:00
Milos Kozak
8d05845c4f default constructor only in BolusProgressDialog 2016-10-21 21:50:21 +02:00
Milos Kozak
f167174151 version bump 1.0.18 2016-10-21 00:04:54 +02:00
Milos Kozak
38cf01eb62 more build types with maxbolus: full fullteenage fullchild 2016-10-21 00:03:52 +02:00
Milos Kozak
6f8d828ec2 QuickWizard 2016-10-20 23:50:31 +02:00