Commit graph

585 commits

Author SHA1 Message Date
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
Milos Kozak
6bfaec375f use sResources 2016-10-17 21:23:37 +02:00
Milos Kozak
7a3f7098b0 DanaR hardcoded bolus limit 10 -> 17 2016-10-17 09:31:06 +02:00
Milos Kozak
a829a506f2 check for null on getDialog() 2016-10-17 08:57:21 +02:00
Milos Kozak
2354e60f31 allow high temps in open loop mode 2016-10-17 08:44:01 +02:00
Milos Kozak
744a4143f4 retrieve device status with xdrip too 2016-10-16 21:11:16 +02:00
Milos Kozak
af31ca804f correct width on more dialogs on Andriod 6 2016-10-15 11:31:15 +02:00
Milos Kozak
8ff675e8a4 Constant instead of string in profile 2016-10-11 23:55:53 +02:00
Milos Kozak
5ec339e987 fix BolusProgessDialog size on Android 6 2016-10-11 23:49:26 +02:00
Milos Kozak
9cd8602f83 normalize mg/dl mg/dL 2016-10-11 23:30:13 +02:00
Milos Kozak
9f1bbd35bd wizard calculation to extra file 2016-10-11 22:47:48 +02:00
Milos Kozak
b7dfabbe11 version bump 1.0.17 2016-10-10 12:11:34 +02:00
Milos Kozak
777b6cdb0d catch errors on load profile 2016-10-10 12:11:12 +02:00
Milos Kozak
cf65b3f865 version bump 1.0.16 2016-10-09 11:18:24 +02:00
Milos Kozak
2e02521eae Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-10-09 11:17:56 +02:00
Milos Kozak
174d6019ff fix carbs limit in wizard 2016-10-09 11:17:41 +02:00
Milos Kozak
cbb316b599 check for null in NS treatment dialog 2016-10-07 22:35:17 +02:00
Milos Kozak
960cde06cf version bump 1.0.15 2016-10-06 20:57:57 +02:00
Milos Kozak
34c6329b6f fix context in newextendedbolusdialog 2016-10-06 20:57:12 +02:00
Milos Kozak
331d94c78e version bump 1.0.14 2016-10-02 16:13:37 +02:00
Milos Kozak
4f07fea8b2 SafeParse in SimpleProfile 2016-10-02 16:12:44 +02:00
Milos Kozak
b5ecbc11e8 check if pump info is loaded before invoking loop 2016-10-01 19:47:18 +02:00
Milos Kozak
163ccf2d0a hard limits on base basal rate 2016-09-19 15:09:35 +02:00
Milos Kozak
a3721f8932 do set bg on init in careportal dialog 2016-09-18 03:09:53 +02:00
Milos Kozak
4378c9af14 more SMS commands 2016-09-16 14:08:26 +02:00
Milos Kozak
84efccb392 version 1.0.13 bump 2016-09-14 22:03:37 +02:00
Milos Kozak
514fb569e9 show base basal rate and profile in ns pump plugin 2016-09-14 22:02:49 +02:00
Milos Kozak
57db26443e Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-09-13 22:40:55 +02:00
Milos Kozak
5ac2cd5cca try to fix random crash 2016-09-13 22:34:40 +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
e23be121a5 workaround for missing unit in nsprofile 2016-09-11 15:17:33 +02:00
Milos Kozak
841141cd20 recheck pump status if older than 30 min before aplly basal 2016-09-11 13:32:21 +02:00
Milos Kozak
81e82143fc fix treatment dialog in careportal 2016-09-10 21:20:01 +02:00
Milos Kozak
f1564519d3 show icon in toolbar 2016-09-10 16:08:29 +02:00
Milos Kozak
23e8220b12 initialize current profile in careportal 2016-09-10 15:51:07 +02:00
Milos Kozak
87055bef0b show danar prefs only if pump is enabled 2016-09-10 15:37:37 +02:00
Milos Kozak
05831c75a6 SMS LOOP commands 2016-09-10 15:33:00 +02:00
Milos Kozak
61134a550f Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-09-10 12:20:58 +02:00
Milos Kozak
b15fe7541e objectives fix 2016-09-10 12:20:32 +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
Milos Kozak
26c09093d1 version bump 1.0.12 2016-09-09 13:07:32 +02:00
Milos Kozak
a3ea0b5316 Merge branch 'master' of https://github.com/ecorman/AndroidAPS into ecorman-master 2016-09-09 11:08:04 +02:00
Milos Kozak
f48faccdd8 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-09-09 11:05:07 +02:00
Milos Kozak
77916ec4ae fix double carbs when carbtime != 0 2016-09-09 11:04:50 +02:00
Radoslav Radev
829beb5c8f too long 2016-09-09 07:54:16 +03:00
ecorman
5878cbbb75 Change plugins order to have fast access to careportal 2016-09-08 23:37:44 +02:00
ecorman
b7402aa9ea Correction Input negative improvement 2016-09-08 23:29:14 +02: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
Milos Kozak
e8467ec75f check for null 2016-09-08 16:53:48 +02:00
Milos Kozak
2c10ade944 try catch on load settings 2016-09-08 13:15:07 +02:00
Milos Kozak
ae9b03f1ae fix newtempbasaldialogcontext 2016-09-08 12:53:06 +02:00
Milos Kozak
933e081fc5 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-09-08 10:08:24 +02:00
Milos Kozak
7fd59246af use locale string in extended status of DanaR pump 2016-09-08 10:07:55 +02:00
ecorman
96a0d25183 Merge pull request #1 from MilosKozak/master
Update from original repo
2016-09-08 00:04:02 +02:00
ecorman
b4f9fca50d Modificaciones en gradle 2016-09-07 23:47:33 +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
ecorman
581f053e53 Allow negative correction in bolus 2016-09-07 23:38:29 +02:00
Milos Kozak
47bff5ad5e limit requests on openloop mode 2016-09-05 15:27:53 +02:00
Milos Kozak
34d2178878 fix newextendedbolusdialog context 2016-09-05 09:14:39 +02:00
Milos Kozak
b5d2d8d931 danarcontrol build variant 2016-09-05 09:11:30 +02:00
Milos Kozak
b56d3223ab fix passing date in careportal 2016-09-02 14:12:05 +02:00
Milos Kozak
3d238e3adb reset flag when pump is changed 2016-09-02 13:35:10 +02:00
Milos Kozak
ff32764375 remove accents in SMS 2016-09-02 09:43:38 +02:00
Milos Kozak
9f9d348c11 check for null context in wizarddialog 2016-08-27 12:32:18 +02:00
Milos Kozak
65ea11d9a8 v 1.0.11 2016-08-21 22:20:17 +02:00
Milos Kozak
7b82b60324 vars optimalization 2016-08-21 22:14:33 +02:00
Milos Kozak
e46aab8948 updateguiifvisible on resume 2016-08-21 22:06:36 +02:00
Milos Kozak
08d940b2fb temp fix of bolus progress crash 2016-08-18 09:10:32 +02:00
Milos Kozak
38ee1402a4 simple profile fix 2016-08-16 08:32:31 +02:00
Milos Kozak
ced974e96d Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-08-15 10:05:00 +02:00
Milos Kozak
d78d0be270 danar history context fix 2016-08-15 10:04:52 +02:00
Milos Kozak
451a455d3d longer wait in comm after bolus 2016-08-14 20:35:00 +02:00
Milos Kozak
8864886702 more dialogs tweaking 2016-08-14 20:33:29 +02:00
Milos Kozak
bb041b1c06 more progress dialog tweaking 2016-08-14 20:19:47 +02:00
Milos Kozak
e95650d54d Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-08-14 10:14:16 +02:00
Milos Kozak
be8c1c2a83 change to screen lock, better context handling 2016-08-14 10:13:26 +02:00
Milos Kozak
6a6ed7b87a Merge pull request #24 from jotomo/case-sensitive-filesystem
Align class name with file name to fix error on case-sensitive filesy…
2016-08-14 09:44:21 +02:00
Milos Kozak
9c3b8dc2b9 typo 2016-08-13 23:00:10 +02:00
Milos Kozak
b77bbd5bc6 static options in careportal dialog 2016-08-13 22:16:36 +02:00
Milos Kozak
d11f0b1ea1 wakelock on bolusing 2016-08-13 22:16:04 +02:00
Johannes Mockenhaupt
4793561f7c
Align class name with file name to fix error on case-sensitive filesystems/OSs. 2016-08-13 21:01:47 +02:00
Milos Kozak
129c88478f empty constructor in progressdialog 2016-08-13 15:07:57 +02:00
Milos Kozak
d85bb7db4d fix double treatment upload from wizard 2016-08-13 12:47:15 +02:00
Milos Kozak
6c9c0d8223 hide danar profile option when pump disabled 2016-08-13 12:36:33 +02:00
Milos Kozak
609f99dc1c fix danar show in prefs 2016-08-13 12:33:20 +02:00
Milos Kozak
a55a4ba6eb upload only fresh pump status 2016-08-13 12:30:10 +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
b1d5b12f55 fix npe 2016-08-11 22:52:26 +02:00
Milos Kozak
ebee1cdeca scrollview in careportal dialog 2016-08-11 15:36:59 +02:00
Milos Kozak
6228f01bdf initialize treatment inzulin and carbs value 2016-08-11 15:26:23 +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
565e2a831b more static members 2016-08-11 00:15:50 +02:00
Milos Kozak
0e6185064a fix casting after refactor 2016-08-10 23:48:44 +02:00
Milos Kozak
39894cdc40 dataservice optimalization 2016-08-10 23:43:08 +02:00