Commit graph

859 commits

Author SHA1 Message Date
osodebailar bff51df41d issue #2318 Refactor header area destroys layout on Atom . Fixed small_layout to 'extra small' displays like atom 2019-12-30 11:02:26 +01:00
osodebailar a746b0fe05 add average delta again and refactor NS Client 2019-12-25 16:04:52 +01:00
osodebailar 1d48536c3c refactor overview with new header area and better formated user values for iob, cob and basal 2019-12-23 18:07:51 +01:00
Milos Kozak 3a6f29d1dc Merge branch 'dev' into dialogs 2019-12-22 23:04:21 +01:00
Milos Kozak 91000dc1bb Confirmation dialogs cleanup 2019-12-22 21:37:26 +01:00
Milos Kozak 9042957585 OKDialog layout 2019-12-22 15:03:00 +01:00
Milos Kozak 06d2a2cfc5 ActionProfileSwitch, ActionFragment improvement 2019-12-22 14:18:36 +01:00
Milos Kozak 648b09717e BLEScanActivity refactor 2019-12-22 12:33:05 +01:00
Milos Kozak 88e456dd1a PairingProgressDialog refactor 2019-12-22 02:00:33 +01:00
Milos Kozak cbfb8a6a0f Automation dialogs refactor 2019-12-21 23:17:20 +01:00
Milos Kozak 0e96eb666e Spinner with larger font 2019-12-21 21:00:43 +01:00
Milos Kozak 592246211f actions layout update 2019-12-21 19:43:29 +01:00
Milos Kozak a928c48ae0 DanaRUserOptionsActivity refactor 2019-12-21 18:21:32 +01:00
Milos Kozak 2e687fe687 DanaRHistoryActivity layout refactor 2019-12-21 15:26:41 +01:00
Milos Kozak 6d46c39fba ProfileViewerDialog refactor 2019-12-21 14:30:14 +01:00
AdrianLxM ddb2306cdc small cleanups 2019-12-20 22:22:58 +01:00
Milos Kozak 2ce590a700 BolusProgressDialog refactor 2019-12-20 21:52:37 +01:00
Milos Kozak 83fe8527ce ErrorDialog refactor 2019-12-20 19:46:07 +01:00
Milos Kozak 44564b91df cleanup, dark dialog title 2019-12-20 18:55:54 +01:00
Milos Kozak 226990b16f CalibrationDialog refactor 2019-12-20 16:33:01 +01:00
Milos Kozak 1a1e51020c TreatmentDialog refactor 2019-12-20 15:36:27 +01:00
Milos Kozak 99d558e99f InsulinDialog refactor 2019-12-20 14:52:10 +01:00
Milos Kozak 230224be0a CarbsDialog refactor 2019-12-20 13:58:51 +01:00
Milos Kozak b0055c3199 ExtendedBolusDialog refactor 2019-12-20 12:29:45 +01:00
Milos Kozak 6d3abd3c22 TempBasalDialog refactor 2019-12-20 11:43:21 +01:00
Milos Kozak 526034292e FillDialog refactor 2019-12-19 23:45:27 +01:00
Milos Kozak 5c9ab721ce Careportal actions to Actions plugin 2019-12-19 20:30:35 +01:00
Milos Kozak f7716c79fe TempTargetDialog 2019-12-18 23:22:03 +01:00
Milos Kozak 8d874e14d3 ProfileSwitchDialog 2019-12-18 20:59:33 +01:00
Milos Kozak 119f9f4f13 test improvements, bug fixes 2019-12-12 21:37:09 +01:00
Milos Kozak 1c0eb9f803 Stats activity 2019-12-09 19:03:26 +01:00
Milos Kozak a9e08bd08d Measure activity 2019-12-08 23:14:46 +01:00
Milos Kozak fb23cbab54 survey fragment scrollable 2019-12-08 20:12:15 +01:00
Milos Kozak 0e89ced3e1 Merge branch 'dev' into survey 2019-12-08 19:07:35 +01:00
Milos Kozak a66b3f7090 allow sorting of automation tasks 2019-12-03 21:07:31 +01:00
Milos Kozak 4abc47771b treatment fragment layout centered 2019-12-03 19:26:30 +01:00
Milos Kozak 95d3551931 Make switching language working again 2019-12-03 18:12:37 +01:00
Milos Kozak e4a5616298 wizard & SP improvements 2019-12-03 15:29:14 +01:00
Milos Kozak 7cca9892dc materialdatetimepicker update 2019-12-02 22:16:20 +01:00
Milos Kozak 702e1f0675 allow clone from existing switch 2019-12-01 20:42:23 +01:00
Milos Kozak 0fdc789e1f Merge branch 'dev' into localprofile 2019-11-30 22:43:15 +01:00
Milos Kozak eba66da4a4 allow go back with objectives 2019-11-29 12:38:07 +01:00
Milos Kozak 9f9c9fd2bc improve layout 2019-11-28 23:41:22 +01:00
Milos Kozak 2dd7c758f4 Local profile clone support 2019-11-28 23:18:42 +01:00
Milos Kozak 8a75d4f6b9 tabs in local profile 2019-11-28 21:58:07 +01:00
Milos Kozak 128e8a024d units selection in setup wizard 2019-11-12 15:19:18 +01:00
Milos Kozak 8fa4c49060 remove simple profile 2019-11-11 16:42:29 +01:00
Milos Kozak 1f622e3517 Merge branch 'dev' into localprofile 2019-11-11 16:37:46 +01:00
Milos Kozak 776e1361df format icon 2019-10-25 00:14:55 +02:00
AdrianLxM 2a7a004afd Merge branch 'adrian/glif-objective' into devmerge 2019-10-24 19:46:24 +02:00
Milos Kozak 414695c5e3 preserve show calculation checkbox state, make wizard better translatable" 2019-10-24 11:34:22 +02:00
Milos Kozak b0e180ef8a fix automation layout 2019-10-21 18:03:32 +02:00
Milos Kozak 7bbf30ec65 Merge branch 'dev' into survey 2019-10-15 23:49:17 +02:00
Milos Kozak da447b8afe LocalProfile allow more profiles 2019-10-15 19:34:29 +02:00
Milos Kozak 60a113bda6 fragment redesign 2019-10-15 19:31:33 +02:00
AdrianLxM fa20af4440 network status before time 2019-10-13 17:58:45 +02:00
Milos Kozak 1340f60b5a WizardDialog refactor 2019-10-10 23:02:35 +02:00
Milos Kozak 450f4fabf0 Survey 2019-10-08 21:20:04 +02:00
Milos Kozak e93b05c73e fix EditQuickWizardDialog, -> kotlin 2019-10-01 17:44:05 +02:00
Milos Kozak 3ecee09443 Automation layouts improvement 2019-10-01 13:11:10 +02:00
Milos Kozak 300eecf27d improved statuslights layout 2019-09-26 16:51:29 +02:00
Milos Kozak b5e4c044ac display hint in exam 2019-09-07 11:32:24 +02:00
Milos Kozak 64a2b45866 add rice to objective bypass code 2019-09-05 20:53:53 +02:00
Milos Kozak 91ebc11d9b ObjectivesExamDialog fine tunning 2019-09-05 20:26:23 +02:00
Milos Kozak 37d10fbcbf Exam objective 2019-09-04 00:00:52 +02:00
Milos Kozak b9e91f3d20 confirm dialog on entering code 2019-09-02 23:10:31 +02:00
Milos Kozak 99893a3ab1 allow bypass objectives 2019-09-02 08:42:25 +02:00
Milos Kozak 3274f372ef show accomplished 2019-09-01 10:33:17 +02:00
Milos Kozak 7d9d70fba8 better notification layout 2019-08-28 17:57:48 +02:00
Milos Kozak 7e5d96f3f3 remove unused resources 2019-08-28 16:55:20 +02:00
Milos Kozak b9c965ac95
Merge branch 'dev' into bw 2019-08-27 21:36:51 +02:00
Milos Kozak 3fed995d51 fix disappearing save button 2019-08-26 22:40:54 +02:00
Milos Kozak 2c712bd1c0 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-08-23 21:48:07 +02:00
Milos Kozak 6d91938b3f allow disable automation event 2019-08-23 21:48:00 +02:00
Milos Kozak 0a77fb9bcb implement percentage in wizard, refactoring to kotlin 2019-08-23 16:31:30 +02:00
Milos Kozak d414b9b651 fixed TimeListEdit when time is localized, larger add/remove buttons 2019-08-22 20:33:18 +02:00
Milos Kozak d8795f4d80 Remove Sync button from DanaRHistoryActivity 2019-08-13 08:16:46 +02:00
Milos Kozak 7eafb76f3e
Merge pull request #1939 from MilosKozak/loopkotlin
Remove butterknife dependency
2019-08-08 19:24:28 +02:00
Milos Kozak 829aa98097 MedtronicFragment -> kotlin 2019-08-07 23:00:02 +02:00
AdrianLxM 82323c3c37
Use AppCompatImageButton 2019-08-07 17:36:48 +02:00
Milos Kozak 8f3c4e25c5 DanaRFragment -> kotlin 2019-08-07 15:50:37 +02:00
Milos Kozak d2c01501a8 ConfigBuilderFragment -> kotlin 2019-08-06 20:46:35 +02:00
Milos Kozak c1a1cc3108 ProfileViewerDialog -> kotlin 2019-08-06 01:19:24 +02:00
Milos Kozak 09270f36bf
Merge branch 'dev' into automation 2019-07-25 16:17:16 +02:00
Milos Kozak 47ed0acec2 ChooseTriggerDialog to kotlin 2019-07-23 00:04:44 +02:00
Milos Kozak 063c27fb89 ChooseActionDialog to kotlin 2019-07-22 22:47:26 +02:00
Milos Kozak a809c0ac35 ActionListAdapter to kotlin 2019-07-22 21:41:42 +02:00
Milos Kozak c3b90275aa relocate trigger dummy objects 2019-07-22 16:28:53 +02:00
Milos Kozak d25f6f07b0 migrate to kotlin, remove butterknife, code claeanup 2019-07-18 23:49:59 +02:00
Milos Kozak 58da7fc854 Preconditions, code cleanup 2019-07-16 21:57:45 +02:00
Andy Rozman f0cc3d4ab2
Merge pull request #5 from jotomo/mdt-dialogs
Mdt dialogs
2019-07-14 20:18:40 +01:00
Milos Kozak c4ba821dc1
Merge branch 'dev' into automation 2019-07-14 20:00:42 +02:00
Milos Kozak 8c2c2b21ea
Merge branch 'dev' into medtronic_andy_merge 2019-07-14 19:50:07 +02:00
Johannes Mockenhaupt 9ee6194ce3
Use OKDialog, ErrorHelper in place of MessageDialog. 2019-07-14 17:18:53 +02:00
Milos Kozak 0710a03479 jetpack 2019-07-13 21:27:26 +02:00
Andy Rozman 675dcc1b5b Fixes:
- removed unneeded classes and xml
- some fixes: MedtronicUtil, using different method to determine if pump driver is selected
2019-07-13 19:15:44 +01:00
Milos Kozak 4df1127a8c jetpack compliance, code cleanup, extracted resources 2019-07-11 18:18:05 +01:00
Andy Rozman 7aa4716870 - changed all ui files to conform to androidx classes/implementation 2019-07-05 16:04:54 +01:00
Andy Rozman 992f69daaa medtronic-0.12.0-SNAPSHOT
- Merge branch 'dev' into medtronic_andy
2019-07-05 14:18:28 +01:00
Milos Kozak c0345ce56c
Merge branch 'dev' into automation 2019-07-04 23:37:36 +01:00
Milos Kozak 323c282b9f Tidepool in engineering mode only 2019-06-30 15:38:30 +02:00
Milos Kozak 7d6ed94491 Scrollview 2019-06-07 15:40:05 +02:00
Milos Kozak 5dbdd5e437 layout improvement 2019-06-06 23:25:21 +02:00
Milos Kozak 8ea5968f4d reset time button 2019-06-05 00:22:57 +02:00
Milos Kozak 048ea4d489 Tidepool test UI 2019-06-03 00:03:06 +02:00
Milos Kozak 9a76f3386d androidx transition 2019-05-16 13:57:37 +02:00
Milos Kozak e679f5eaff ActionNotification 2019-04-21 16:17:25 +02:00
Milos Kozak 27783fe33e TriggerIob, more fixes 2019-04-19 09:20:59 +02:00
Milos Kozak 4ae7efc75f Merge branch 'dev' into automation 2019-04-16 21:08:08 +02:00
Andy Rozman ad17c66b1b Merge branch 'dev' into medtronic_andy 2019-04-10 17:05:56 +01:00
Milos Kozak e7d7a37aeb LINT: input type 2019-04-08 18:13:47 +02:00
Milos Kozak 3b1d96ecc9 LINT: xml 2019-04-08 17:03:18 +02:00
Milos Kozak a339e0cf28 LINT: xml 2019-04-08 16:39:41 +02:00
Milos Kozak 190b9408bd fixed package name 2019-04-08 15:38:20 +02:00
Andy Rozman 8bf284f86d - Changes made in CGMS
- Finished support for Bolus history mapping
- fixed 20 crashalytics errors
2019-04-07 22:27:18 +01:00
Milos Kozak 5a555cdfba AutomationPlugin:processActions and some tweaking 2019-03-31 21:54:31 +02:00
Andy Rozman bd3529e650 Merge branch 'dev' into medtronic_andy 2019-03-31 20:03:49 +01:00
Nico Schmitz 236349a063 Bugfixes. Add remove icon for actions. 2019-03-26 23:28:46 +01:00
Nico Schmitz 97a7a75c86 work on automation plugin
- implement clone() methods for actions and triggers
- add AutomationEventTest
- improve ui
2019-03-26 00:06:37 +01:00
Nico Schmitz fc7e65c4d1 Update to recent upstream/dev 2019-03-22 23:08:13 +01:00
Nico Schmitz f017b7a7a2 Work on automation plugin.
- Remove unused imports
- Add icons for actions and triggers
2019-03-21 23:38:56 +01:00
Nico Schmitz 6dc87db73e Improve EditEventDialog 2019-03-21 00:38:06 +01:00
Nico Schmitz c074ec36c4 Implement temp target dialog for automation action 2019-03-20 00:39:00 +01:00
Milos Kozak 381ae67829
Merge pull request #1420 from tanja3981/improvement/#1269
[2.0] Improvement: Allow some objectives to go back.
2019-03-19 23:42:38 +01:00
Nico Schmitz 91e4b01f10 Display actions and merge recent upstream/dev
- Add ActionListAdapter
- Add ChooseActionDialog
- Merge upstream/dev branch
2019-03-19 19:08:46 +01:00
Andy Rozman 8594525d2c Merge branch 'dev' into ench_1455_custom_actions 2019-03-08 23:49:56 +00:00
Tanja Schmidt a5d1905be8 Allow some objectives to go back. 2019-03-06 19:03:42 +01:00
Andy Rozman 011aaf5336 Moved medtronic to correct package 2019-03-02 20:39:14 +00:00
Andy Rozman f7395c7a2c Changes after merge, compilable, but medtronic is still in old structure. 2019-03-02 20:24:53 +00:00
Andy Rozman 289902633e Merge branch 'dev' into medtronic_andy 2019-03-02 18:20:37 +00:00
Milos Kozak d9a9c933bc package refactor 2019-02-28 23:16:50 +01:00
Milos Kozak 395faa7dc9 pumps package refactor 2019-02-26 20:38:27 +01:00
Andy Rozman b0fe8fc5aa Merge branch 'dev' into ench_1455_custom_actions 2019-02-20 23:41:09 +00:00
Andy Rozman 5aa5d9f749 Merge branch 'dev' into medtronic_andy 2019-02-16 20:50:36 +00:00
Andy Rozman 72eae6e6b8 - refactored commands, removed version out of it
- finished Medtronic History Dialog (middle button)
- refactored Set/Get Basal functionality
2019-02-07 22:41:05 +00:00
TebbeUbben cc189d360f Merge remote-tracking branch 'nico/dev-wip' into dev-nico 2019-02-02 16:58:21 +01:00
TebbeUbben d1f7086651 Merge branch 'master' into insight-dev
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
2019-01-31 13:08:33 +01:00
TebbeUbben 2770a49869 Local Insight driver 2019-01-18 22:40:22 +01:00
Andy Rozman 9c08bfb8bf [0.6]
- bolus finalized: added delay before bolus is delivered (configurable 5, 10, 15s) and if cancel is issued, after
delay, and bolus was already sent to pump, message is displayed saying that you need to manually stop the pump
to cancel bolus
- BLE Scanner refactored and finished (removed un-needed code)
- fixed 5 most common Crashalytics errors found
- fixed Basal Profile problem (I hope)
2019-01-15 20:08:31 +00:00
Andy Rozman 8fc694e812 Merge branch 'dev' into medtronic_andy 2019-01-04 22:24:44 +01:00
Andy Rozman 56eaacb3a2 [0.6]
Configuration:
- added delay for Bolus delivery
- added choice for decoding (done on RL or in software)

Code:
- encoding DailyTotals for 522 and 523
- some minor fixes reported by Crashalytics
- refactoring history
- added history display
- changes to delivering Bolus (canceling)
- started adding 6b4b hardware decoding
2019-01-04 14:02:10 +01:00
Nico Schmitz 9e03f0f8ca Update to current dev branch 2018-12-11 14:51:26 +01:00
Nico Schmitz 49b0e3ab71 Add EditTriggerDialog 2018-12-05 21:22:32 +01:00
triplem eea79c5d0f fixes PR#1550 2018-11-08 21:14:44 +01:00
Andy Rozman 3fdbc0400e Files missed on previous checkin. 2018-11-06 17:39:16 +00:00
Nico Schmitz 04574d759f Improve dialogs. Add JSON serialization for actions and events. 2018-10-29 21:24:30 +01:00
Andy Rozman 75d3f3b4bc Merge branch 'dev' into medtronic_andy (2.0i - 24.10.2018) 2018-10-24 12:18:20 +01:00
Andy Rozman f228475617 Merge the code from RileyLinkAAPS
- First real results with Pump History (not complete yet)
- Set Basal Profile changes (not complete yet)
- version set to medtronic-0.4.0-SNAPSHOT
2018-10-24 11:25:18 +01:00
Nico Schmitz 2e4f18794f Add ChooseTriggerDialog 2018-10-16 00:07:13 +02:00
Nico Schmitz f98d40f71b Work on automation plugin.
- Add MainApp.dpToPx() helper function
- Remove trigger layout resources
- Generate trigger layout programmatically
- Improve ux (when composing trigger logic)
- Refactoring
2018-10-15 23:20:06 +02:00