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

3222 commits

Author SHA1 Message Date
Milos Kozak b57683eaf5 SW rename package 2018-05-20 21:55:53 +02:00
Milos Kozak f24d296836 SW nsclient screen finalizing 2018-05-20 21:36:17 +02:00
AdrianLxM 953128ffe5
UAM without advanced filtering 2018-05-20 19:17:46 +02:00
Milos Kozak 52a4f9af14 SW loop screen update 2018-05-20 16:29:15 +02:00
Milos Kozak d079052944 Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard 2018-05-20 16:18:10 +02:00
Milos Kozak de8557a115 SW sensitivity plugin 2018-05-20 16:17:53 +02:00
Milos Kozak 5b9594bdbb SW create elements package 2018-05-20 15:09:32 +02:00
Milos Kozak d0ed4bd717 SWString fix 2018-05-20 15:01:03 +02:00
Milos Kozak 7714aa9138 Merge branch 'dev' into startupwizard 2018-05-20 14:18:58 +02:00
Milos Kozak 53cbe05436
Merge pull request #1019 from McHoffi/obj.7-add-info 
Obj.7 add info about using SMB/maxIOB
 2018-05-20 14:14:11 +02:00
Roumen Georgiev 764e035666
remove wizard from backstack and fix the Exit -> returning to SW 2018-05-16 15:35:17 +03:00
Milos Kozak 66e50f5b62
Merge pull request #1038 from jotomo/upstreaming 
[Polish] Dialog/color consistency, translations and other small stuff
 2018-05-15 13:09:50 +02:00
Milos Kozak e58149379a
Merge pull request #1043 from jotomo/issue-646 
[Bugfix] On bolus cancel request, cancel all boluses. Partially addresses #646.
 2018-05-15 10:55:04 +02:00
Johannes Mockenhaupt 25aa6f859f
On bolus cancel request, cancel all boluses. Partially addresses #646. 2018-05-13 23:57:40 +02:00
Johannes Mockenhaupt 29efe11ece
Combo: always send out progress updates (SMB or not). 
Without this, showing SMB progress on wear is broken.

(cherry picked from commit 5ebff72)
 2018-05-13 23:20:29 +02:00
TebbeUbben 3103a0f276 Some styling for SW 2018-05-13 13:40:34 +02:00
Johannes Mockenhaupt 1883ac06dd
Use TT color for TT confirmations in dialogs. 2018-05-13 12:14:49 +02:00
Milos Kozak 4fae6c703c SW autostart SetupWizard 2018-05-11 13:14:59 +02:00
Milos Kozak ff2cc04408 SW warn if exported configuration is missing 2018-05-11 13:04:17 +02:00
Milos Kozak 337a3d9776 SW show ObjectivesFragment 2018-05-11 08:30:21 +02:00
Milos Kozak 0a51c86afb SW Configure APS button 2018-05-11 00:09:35 +02:00
Milos Kozak 376fffa6ec SW Import settings, Skip wizard 2018-05-10 23:59:20 +02:00
Milos Kozak 8d7df64050
Merge pull request #1016 from MilosKozak/pump-notifications 
Pump notifications
 2018-05-10 23:24:45 +02:00
Milos Kozak e105e5149e
Merge pull request #1032 from jotomo/wear-wizard-tt 
Wear wizard: add TT config option.
 2018-05-10 16:53:34 +02:00
Roumen Georgiev 91c0b1a2ec make Objectives visible 2018-05-10 14:36:05 +03:00
Roumen Georgiev 016aa1c069 Added insulin descriptions to SW screen 2018-05-10 13:56:50 +03:00
Roumen Georgiev 2fa77d2a8c Added insulin descriptions to SW screen 2018-05-10 13:49:13 +03:00
Roumen Georgiev 33a6135e75 Added insulin descriptions to SW screen 2018-05-10 13:48:18 +03:00
Roumen Georgiev 06180e3bbd Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into dev 2018-05-10 12:51:12 +03:00
Milos Kozak 71b44edea6 SW enable loop 2018-05-09 19:34:15 +02:00
Milos Kozak fb7067b207 SW profile switch 2018-05-09 19:24:20 +02:00
Milos Kozak 1ba828d20a SWFragment 2018-05-09 18:49:42 +02:00
Roumen Georgiev e3153230e0 added NSClient followup 2018-05-09 17:11:07 +03:00
Milos Kozak 0060a2ba7f SW show pump status 2018-05-09 15:10:47 +02:00
Roumen Georgiev 50f8bf2d18 fix for screens adding up 2018-05-09 15:55:02 +03:00
Roumen Georgiev bfd61a65a0 fix for screens adding up 2018-05-09 15:44:40 +03:00
Roumen Georgiev 41d736e176 updated to latest from Milos 2018-05-09 15:06:34 +03:00
Roumen Georgiev a7bbf93599
Merge pull request #19 from MilosKozak/startupwizard 
Startupwizard
 2018-05-09 14:49:17 +03:00
Roumen Georgiev 0e8f0669c5
Update SWDefinition.java 2018-05-09 14:48:35 +03:00
Milos Kozak bacb3fb337 SW pump screen 2018-05-09 13:38:17 +02:00
Roumen Georgiev 1f2f2f54fc added SWCheckbox item 2018-05-09 14:15:53 +03:00
Milos Kozak ed43eddc83 SWInfotext 2018-05-09 11:55:21 +02:00
Milos Kozak 61a7d69a65 Merge branch 'dev' into startupwizard 2018-05-09 11:41:05 +02:00
Milos Kozak 8c2d0d80ee
Merge pull request #1017 from MilosKozak/notification-height 
Tests required: Notification height
 2018-05-09 10:16:29 +02:00
Roumen Georgiev d5a3177c35 trying pump followup screen -NOT WORKING 2018-05-09 11:06:52 +03:00
Milos Kozak e29a590cad
Merge pull request #1020 from MilosKozak/dia-refactor 
default DIA
 2018-05-08 23:43:54 +02:00
Roumen Georgiev 85d4ef4419 trying pump followup screen 2018-05-08 17:09:37 +03:00
Roumen Georgiev e357c7fd1b adding pump selection 2018-05-08 15:14:36 +03:00
Johannes Mockenhaupt ce6e53e9c6
Wear wizard: add TT config option. 2018-05-08 13:28:01 +02:00
Markus M. May b0d8d547d8 Add isConnected, enable NSClient only, if really connected to internet 2018-05-07 20:43:13 +02:00
Johannes Mockenhaupt 785c402848
LP: Don't notify about invalid values during editing. 2018-05-07 02:11:59 +02:00
AdrianLxM cdc8e45f32
Merge pull request #1015 from jotomo/lemming-treatment 
Fix finding BG in graph for treatments before the first displayed BG.
 2018-05-06 19:51:01 +02:00
McHoffi 9d367c1fa1
Update ObjectivesFragment.java 2018-05-06 18:18:34 +02:00
AdrianLxM f0351834ff default DIA 2018-05-06 12:49:03 +02:00
Johannes Mockenhaupt 56cbac3b4d
Leftover MainApp.gs rewrite. 2018-05-06 11:49:16 +02:00
Johannes Mockenhaupt ef70c1f244
MainApp.sResources.getColor -> MainApp.gc. 2018-05-06 11:47:15 +02:00
Johannes Mockenhaupt b9c649bd68
Uso blue/orange for carbs/insulin in confirmation dialogs. 
Aligns with the graph's use of using blueish colors insulin and
orange for carbs stuff.
 2018-05-06 11:46:09 +02:00
AdrianLxM 1ac41323e6 fix notification last line cutoff 2018-05-05 21:55:49 +02:00
AdrianLxM 116222858e update lastApproachingDailyLimit 2018-05-05 21:12:09 +02:00
AdrianLxM d99fafe375 restrict aproaching daily limit to once every 30 minutes RS 2018-05-05 21:10:15 +02:00
AdrianLxM 5458df0907 restrict aproaching daily limit to once every 30 minutes Rv2 2018-05-05 21:08:17 +02:00
AdrianLxM c2315b7bea restrict aproaching daily limit to once every 30 minutes R-Korean 2018-05-05 21:03:35 +02:00
AdrianLxM b43eff8e55 restrict aproaching daily limit to once every 30 minutes R 2018-05-05 21:02:31 +02:00
AdrianLxM 70b2b1502f restrict wrong password notification to once every 30 seconds 2018-05-05 20:59:11 +02:00
AdrianLxM c8c7e12056 Wrong password notification 2018-05-05 20:54:10 +02:00
AdrianLxM 246c8922df Korean wrong password notification 2018-05-05 20:51:46 +02:00
Johannes Mockenhaupt 1e0b7d331a
Fix finding BG in graph for treatments before the first displayed BG. 
(cherry picked from commit 8bdafe3)
 2018-05-05 19:13:38 +02:00
Johannes Mockenhaupt d15ada5cd9
Combo: Fix visual glitch in fragment. 2018-05-04 21:27:54 +02:00
AdrianLxM f511b9ed39
Merge pull request #1000 from MilosKozak/bolusprogress-dismiss 
IDEA: dismiss bolus progress dialog when Queue is empty
 2018-05-04 19:03:11 +02:00
Milos Kozak 57973d4d3a
Merge pull request #1001 from jotomo/carbs-gen-refactor 
Extract and deduplicate eCarbs generation
 2018-05-04 16:10:23 +02:00
Milos Kozak 61e6404bbe
Merge pull request #995 from MilosKozak/wear-wizard 
Wear eCarbs
 2018-05-04 14:33:55 +02:00
Johannes Mockenhaupt 35a6bbb6a7
Set CareportalEvent.MEALBOLUS for eCarbs. 2018-05-04 14:22:43 +02:00
Johannes Mockenhaupt 43cc3c4908
Extract CarbsGenerator class. 2018-05-04 14:18:55 +02:00
Milos Kozak 963f1e1abf
Merge branch 'dev' into startupwizard 2018-05-04 13:26:40 +02:00
swissalpine 10b67a0c11
Update GraphData.java 2018-05-04 12:31:11 +02:00
AdrianLxM 5c8e99b191 dismiss bolus progress dialog when Queue is empty 2018-05-04 12:24:37 +02:00
Milos Kozak 91f3db782d SWButton rename option to text 2018-05-04 10:20:22 +02:00
Milos Kozak 55661ca7a0 SWButton 2018-05-04 10:17:50 +02:00
swissalpine 010a2f3fd8 Make deviation bars transparent 2018-05-04 10:04:45 +02:00
Milos Kozak 88d964f135 SW reuse save, cleanup 2018-05-04 09:35:57 +02:00
AdrianLxM c34cc73b1e fix wear wizard 2018-05-03 23:08:16 +02:00
AdrianLxM 8d6997f519 ecarb ignore 0 carbs 2018-05-03 22:08:54 +02:00
AdrianLxM 61f07da1a2 ecarb doECarb 2018-05-03 22:08:43 +02:00
AdrianLxM c69a541b75 ecarb ash first response 2018-05-03 22:08:27 +02:00
Milos Kozak d1958a3e2d
Merge branch 'dev' into startupwizard 2018-05-03 21:31:55 +02:00
Milos Kozak 02590ddd72 SW remove unneeded code 2018-05-03 21:29:34 +02:00
Milos Kozak cc532b9107 SWRadioButton cleanup 2018-05-03 20:13:27 +02:00
Milos Kozak 94db444acb SW validator, language, cleanup 2018-05-03 20:06:13 +02:00
Milos Kozak 36265ab1c6 SWPlugin 2018-05-03 18:41:47 +02:00
AdrianLxM 62a38ed537 wearwizard fix NPE when CobInfo not available - missing part 2018-05-03 17:49:22 +02:00
AdrianLxM b37b892eea wearwizard fix NPE when CobInfo not available 2018-05-03 17:49:17 +02:00
AdrianLxM fe0f2e3ce6 wearwizard settings on phone 2018-05-03 17:49:13 +02:00
AdrianLxM c394c045c9 wearwizard reduced watch settings 2018-05-03 17:49:09 +02:00
AdrianLxM bdfce784c0 wearwizard ensure watch apk is up to date 2018-05-03 17:49:05 +02:00
AdrianLxM ec106726a7 wearwizard trend 2018-05-03 17:49:01 +02:00
AdrianLxM 24dd4e1710 wearwizard cob 2018-05-03 17:48:54 +02:00
Roumen Georgiev 515590cdf6 other screens 2018-05-03 17:04:56 +03:00
Roumen Georgiev 425ba77200 other screens 2018-05-03 16:59:23 +03:00
AdrianLxM 012593a480
Update NotificationStore.java 2018-05-03 12:18:48 +02:00
Roumen Georgiev 083730f476 WIP: BGSOURCE screen 2018-05-03 09:02:16 +03:00