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

5311 commits

Author SHA1 Message Date
Milos Kozak 11dd1b43fd
Merge pull request #2373 from jotomo/patch-1 
#2369 Set event time for second event plus 1s too
 2020-01-24 18:26:59 +01:00
Roumen Georgiev cd0697fdbd
Allows selecting 12:00AM (#2831) 2020-01-22 14:11:20 +02:00
Sebastian Lenz 4521434f4e BolusProgressDialog not cancelable 2020-01-17 17:22:49 +01:00
Johannes Mockenhaupt a1c7aae794
Refactor: dedup, method abstraction level. 2020-01-16 20:39:25 +01:00
Johannes Mockenhaupt 8f02459849
#2369 Set event time for second event plus 1s too 2020-01-16 15:46:53 +01:00
Sebastian Lenz ef4903253d Fix scaling of the activity graph 2020-01-16 12:45:55 +01:00
Milos Kozak b1a376e68a Fix displying OAPS Offline intervals 2020-01-15 22:42:42 +01:00
Milos Kozak 7607185086 show duration of careportal events 2020-01-15 21:55:53 +01:00
Milos Kozak ab51cb4d01 Merge branch 'dev' into dagger3 2020-01-15 20:47:08 +01:00
Milos Kozak 1e3c979b51 PhoneChecker 2020-01-15 19:56:57 +01:00
Milos Kozak 8c02daf39d Fix NPE 2020-01-15 11:18:25 +01:00
Milos Kozak 344c77ef53 Merge branch 'dev' into dagger3 2020-01-14 13:50:29 +01:00
Milos Kozak dd37ec9bb9 apply only for non faking EB 2020-01-14 09:09:22 +01:00
Milos Kozak a5d153c035
Merge pull request #2359 from MilosKozak/dagger3-stacktracelogger 
add caller to log output
 2020-01-14 00:04:58 +01:00
Milos Kozak d0391147e4 Fix NSClient crash 2020-01-13 23:57:37 +01:00
Milos Kozak 598ae5517c After merge fix 2020-01-13 23:34:29 +01:00
Milos Kozak 9fd71ea538 Merge branch 'dev' into dagger3 2020-01-13 23:28:53 +01:00
Milos Kozak 94dd843825 Allow EB in open loop mode 2020-01-13 22:16:13 +01:00
Milos Kozak 6e40c2ebc6 Add Careportal plugin in NSCLIENT mode only) 2020-01-13 21:06:07 +01:00
Milos Kozak dec6dcf63d Small layout improvements 2020-01-13 20:18:31 +01:00
Milos Kozak 23de3b0a3b Note & Exercise to actions 2020-01-13 19:38:10 +01:00
AdrianLxM 1851ab4084 wrap legacy static logger 2020-01-13 19:22:28 +01:00
AdrianLxM 16836ce535 omit package name while logging 2020-01-13 18:31:11 +01:00
AdrianLxM 70c83c17e0 add caller to log output 2020-01-13 17:47:45 +01:00
Milos Kozak faaa659b3d Dana drivers refactor 2020-01-12 23:43:44 +01:00
Milos Kozak cb12967b17 Insulin tests 2020-01-11 15:19:46 +01:00
Milos Kozak 1c2036d1a3
Merge branch 'dagger3' into dagger3-0111a 2020-01-11 14:50:52 +01:00
AdrianLxM cde7b44606 test with AndroidInjector 2020-01-11 12:40:11 +01:00
AdrianLxM 6326c3f6f9 some work fixing tests 2020-01-11 12:29:25 +01:00
Milos Kozak e192be28d5 VersionCheckerUtilsKtTest 2020-01-11 11:52:33 +01:00
Milos Kozak ccf93d2191 InsulinOrefBasePluginTest 2020-01-11 11:45:41 +01:00
Milos Kozak ac5ea83d38 more of dagger 2020-01-10 23:14:58 +01:00
Milos Kozak d82141e6d6 Bind HasAndroidInjector 2020-01-10 02:27:14 +01:00
Milos Kozak 7853b67a61 Merge branch 'dev' into dagger3 2020-01-10 00:14:56 +01:00
Milos Kozak ae87a6ae0c Fix statistics activity 2020-01-10 00:01:42 +01:00
Milos Kozak 67b3b2613d filter bad records in db 2020-01-09 23:30:40 +01:00
Milos Kozak 6bd6a04710 remove unclear code 2020-01-09 23:29:16 +01:00
Milos Kozak 0d85ad4f69 Preference xml files cleanup 2020-01-09 21:41:02 +01:00
Milos Kozak f3a03cb17b TDDStatsActivity 2020-01-09 17:19:15 +01:00
Milos Kozak d6f4242548 cleanup 2020-01-09 16:56:27 +01:00
Tim Gunn 452ef3ed19
Use simpler deviation count threshold 2020-01-09 19:12:26 +13:00
Tim Gunn 2554185119
Merge branch 'dev' of github.com:Tornado-Tim/AndroidAPS into AS0ref 2020-01-09 16:44:04 +13:00
Tim Gunn 3486ee8b56
Padd 8 and 24 hours worth of Deviations 2020-01-09 16:31:38 +13:00
Milos Kozak 5c8c263c17
Textvalidator (#2343), Preference to jetpack 2020-01-08 20:20:20 +01:00
AdrianLxM f6fe84808e extract interfaces off ConfigBuilder extra functionality 2020-01-07 10:14:12 +01:00
Milos Kozak 3a77fb70fe
Merge pull request #2340 from MilosKozak/dagger3_0601a 
pluginDescription as constructor declaration only
 2020-01-06 21:43:26 +01:00
AdrianLxM e0c8f9dc26 use common data container 2020-01-06 20:34:14 +01:00
Milos Kozak 6a0fe87351 filter bad records in db 2020-01-06 19:47:24 +01:00
AdrianLxM 044c509027 pass bus and logger up to BasePlugin 2020-01-06 17:53:37 +01:00
AdrianLxM 5d975197bd pluginDescription as constructor declaration only 2020-01-06 15:51:10 +01:00
AdrianLxM fa8197f7f9 keep alive dagger 2020-01-06 15:22:28 +01:00
Milos Kozak 1eb375af09 adding, removing triggers properly 2020-01-06 00:38:37 +01:00
Milos Kozak e3766a229b simplify dependencies 2020-01-05 20:20:11 +01:00
Milos Kozak ec84c3fa70 clean time related triggers 2020-01-05 19:23:20 +01:00
Milos Kozak fa4d4c9fa9 automation improvement 2020-01-05 17:19:03 +01:00
swissalpine a58a6540f2
Last inverted function void handleAge() 2020-01-05 16:12:50 +01:00
swissalpine 0326f854db
Adjust handleAge too 2020-01-05 15:51:27 +01:00
Milos Kozak 925de127a7 Triggers injection 2020-01-05 12:02:32 +01:00
Milos Kozak bd1b1d8d76 DanaRS refactor 2020-01-04 13:44:50 +01:00
Milos Kozak c44ae0dea5 VersionChecker cleanup 2020-01-03 23:47:27 +01:00
Milos Kozak 23f5d29e6a fix Action instantiation 2020-01-03 23:26:26 +01:00
Milos Kozak 0ea47a333c Merge branch 'dev' into dagger3 2020-01-03 22:58:33 +01:00
Milos Kozak a5393eff84 revert TRB displaying 2020-01-03 22:52:21 +01:00
Milos Kozak 5602819321 Fix DeviceStatus upload 2020-01-03 21:02:36 +01:00
Milos Kozak 2470cc7b17 EventListener 2020-01-03 17:06:06 +01:00
Milos Kozak e1327b1e1a VersionChecker injection 2020-01-03 16:29:59 +01:00
Milos Kozak a622bfa559 FabricPrivacy, notifications 2020-01-03 14:30:39 +01:00
Milos Kozak c88058752f more dependencies removed 2020-01-03 10:31:42 +01:00
swissalpine 9b6e97e1f2
Fix for mixed up bage_warn, bage_urgent for Combo in Statuslights 
Fixes the small bug mentioned in https://github.com/MilosKozak/AndroidAPS/issues/2320
 2020-01-03 06:56:27 +01:00
Milos Kozak c16131bfc8 LoopPlugin injection 2020-01-03 01:45:26 +01:00
Tim Gunn 2605d13a5e Use different ISF method 2020-01-03 13:22:27 +13:00
Tim Gunn 6c70fd3a06 Update to use 24 and 8 hours worth of sensitivity 2020-01-03 13:12:05 +13:00
Milos Kozak 4fff1f42c1 SMS code cleanup 2020-01-03 00:50:13 +01:00
Milos Kozak 89b1dda10b Tidepool cleanup 2020-01-03 00:26:59 +01:00
Milos Kozak c45b434647 FoodPlugin injection 2020-01-02 23:58:21 +01:00
Milos Kozak 4dbf199685 PersistenNotificationPlugin, services 2020-01-02 23:25:29 +01:00
Milos Kozak 45afd5ec34 DstHelperPlugin refactor 2020-01-02 20:48:36 +01:00
Milos Kozak 88994d1b54 Merge branch 'dev', remote-tracking branch 'origin' into dagger3 2020-01-02 19:38:06 +01:00
Milos Kozak 8faf36295f Actions injection 2020-01-02 19:20:36 +01:00
Milos Kozak 1b4d06101d Fix creating careportal entries in Actions tab 2020-01-02 18:25:49 +01:00
Milos Kozak 9e9ae3cf91 Allow date in CarbsDialog 2020-01-02 00:40:03 +01:00
Milos Kozak bcc3829915 NSClient rafactor 2020-01-01 23:23:16 +01:00
Milos Kozak cc125986ac stats layout 2019-12-31 15:04:20 +01:00
Milos Kozak f8b2b596c6 TDD, TIR calculator 2019-12-31 14:40:06 +01:00
Milos Kozak 416735e916 WizardDialogInfo, ProfileFunction 2019-12-31 13:25:28 +01:00
Milos Kozak db9b453276 remove setDefaultUncaughtExceptionHandler temporary 2019-12-31 12:01:15 +01:00
Milos Kozak 7518537108 wizard injection 2019-12-31 11:57:58 +01:00
Milos Kozak 1610470089 ActivityMonitor injection 2019-12-31 09:41:02 +01:00
Milos Kozak 7706e51954 more injections, quickwizard 2019-12-31 00:37:36 +01:00
Milos Kozak 040d999004 Merge branch 'dagger3' of https://github.com/MilosKozak/AndroidAPS into dagger3 2019-12-30 23:27:01 +01:00
Milos Kozak 1242236821 Source plugins injection 2019-12-30 23:26:48 +01:00
AdrianLxM a12026c73e inject instead of static get 2019-12-30 19:52:51 +01:00
AdrianLxM 389ef01861 resolve cyclic dependency 2019-12-30 19:46:11 +01:00
Milos Kozak 65f107b01d wearplugin -> dagger 2019-12-30 19:23:17 +01:00
Milos Kozak 348936e1b8 IobCobCalculatorPlugin injection 2019-12-30 13:40:42 +01:00
Milos Kozak 295ce489bf LoopPlugin injection 2019-12-30 11:35:49 +01:00
Milos Kozak 270c1c69f4 APS plugins injection 2019-12-30 10:28:56 +01:00
Milos Kozak 716053229a RandomBgPlugin injection 2019-12-30 10:02:40 +01:00
Milos Kozak 2f59cd4f09 TreatmentsCareportalFragment -> kt 2019-12-30 09:50:26 +01:00
Milos Kozak 9ceeaa3136 TreatmentsBolusFragment -> kt 2019-12-30 09:23:02 +01:00
Milos Kozak 7d255d014d resources to SPImplementation 2019-12-30 08:50:27 +01:00
Milos Kozak fef74726b2 daggerize 2019-12-30 00:53:44 +01:00
Milos Kozak 1ac0094f48 Merge branch 'dev' into dagger3 2019-12-29 11:50:15 +01:00
Milos Kozak f0fcd21bb9 TreatmentsFragment -> dagger 2019-12-29 00:07:30 +01:00
Milos Kozak ca9486fab3 TreatmentsPlugin -> dagger 2019-12-28 22:51:04 +01:00
Milos Kozak 82882c52e6
Merge pull request #2305 from osodebailar/refactor-header-area 
refactor overview with new header area and better formated user value…
 2019-12-28 22:06:49 +01:00
Johannes Mockenhaupt 244e99f5c9
Refactor: improve misleading method name. 2019-12-28 17:10:19 +01:00
Milos Kozak 377b5a9991 StatusLinePlugin -> kt, dagger 2019-12-28 15:00:16 +01:00
Milos Kozak 3c58559a75 PluginBase -> kt 2019-12-28 14:12:35 +01:00
AdrianLxM a98b3ed6ac constraintsInterface java -> kotlin 2019-12-28 02:53:55 +01:00
AdrianLxM 93bc179181 add new logger to APS plugins 2019-12-28 02:49:00 +01:00
AdrianLxM 6752cbae94 Merge remote-tracking branch 'origin/dagger3c' into dagger3 2019-12-28 01:56:55 +01:00
AdrianLxM 9a72912281 dagger logging start 2019-12-28 01:52:20 +01:00
Milos Kozak 7805fbc5db APSPlugins, SafetyPlugin -> dagger 2019-12-28 01:14:04 +01:00
AdrianLxM a2d2dd38e3 Merge branch 'dagger3' of https://github.com/MilosKozak/AndroidAPS into dagger3 2019-12-27 23:37:47 +01:00
Milos Kozak fca775a4e7 L -> kt 2019-12-27 22:44:12 +01:00
AdrianLxM 296e5d25db Merge branch 'dagger3' of https://github.com/MilosKozak/AndroidAPS into dagger3 2019-12-27 22:07:57 +01:00
Milos Kozak 5335b075b9 DataService inject SP 2019-12-27 21:43:51 +01:00
Milos Kozak 4b86961235 Use DaggerIntentService 2019-12-27 21:38:59 +01:00
AdrianLxM f24949ba02 deprecate warning and todo for workaround fields 2019-12-27 21:06:56 +01:00
Milos Kozak 7f8abcf591 Constraints, Dialogs daggerize 2019-12-27 19:20:38 +01:00
Milos Kozak dc037cc248 resources to SMSCommunicatorPlugin 2019-12-27 10:52:24 +01:00
AdrianLxM ac05390292 Insulin plugins injectable and Prep for SMS plugin and ConfigBuilder 2019-12-27 04:17:49 +01:00
Milos Kozak 12253007f1 ProfileFunction WIP 2019-12-26 23:26:00 +01:00
Milos Kozak 3654b0b66f ResourceHelper 2019-12-26 17:50:16 +01:00
Milos Kozak 895b32d8f3 SPImplementation cleanup 2019-12-26 15:12:12 +01:00
Milos Kozak ec2a0212f5 Merge branch 'dev' into dagger3 2019-12-26 15:01:23 +01:00
Milos Kozak 48e8888b82 Firebase follow privacy setting 2019-12-26 14:46:14 +01:00
Milos Kozak f8f1fc54be Merge branch 'dev' into dagger3 2019-12-26 14:41:52 +01:00
osodebailar 1186360df4 reactivate bad tuerkis and format basal 2019-12-25 17:01:38 +01:00
osodebailar a746b0fe05 add average delta again and refactor NS Client 2019-12-25 16:04:52 +01:00
AdrianLxM 143a9f8749 dagger testing 2019-12-25 12:19:26 +01:00
osodebailar a4137a2c3b Merge branch 'dev' of git://github.com/MilosKozak/AndroidAps into refactor-header-area 2019-12-25 12:18:14 +01:00
Milos Kozak 967777f0f8
Merge pull request #2309 from andyrozman/bug_2292_doublebolus_again 
- added code to remove Treatment entries, without any insulin (for sy…
 2019-12-25 11:29:15 +01:00
Andy Rozman 86adc19010 - added code to remove Treatment entries, without any insulin (for syncing PH Bolus entries with Treatments) 2019-12-24 17:52:28 +01:00
Milos Kozak 737a2c5386 KeepAlive refactor, MainApp cleanup 2019-12-24 16:07:17 +01:00
Milos Kozak 99b07521ef Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-12-24 11:28:53 +01:00
Milos Kozak e423b5bc06 Upload IOB to NS without available BG 2019-12-24 00:55:09 +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
AdrianLxM cd6dba8a31 injecting insulin... plugin 2019-12-23 13:27:15 +01:00
Milos Kozak 3a6f29d1dc Merge branch 'dev' into dialogs 2019-12-22 23:04:21 +01:00
Milos Kozak 034bf3ecd8 fix parsing profile units 2019-12-22 22:52:26 +01:00
Milos Kozak 60dce8fd15 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-12-22 22:27:58 +01:00
Milos Kozak 32ce8af144 fix loading profiles 2019-12-22 22:27:43 +01:00
Milos Kozak 91000dc1bb Confirmation dialogs cleanup 2019-12-22 21:37:26 +01:00
Milos Kozak 808dd92de1 forgotten code remove 2019-12-22 15:08:31 +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 52380cbd22 CareDialog fix 2019-12-22 02:05:50 +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
AdrianLxM 3d1c1140b5 dagger2! 2019-12-21 20:17:08 +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 33d1d3e82d DanaRS time setting update for protocol #6 2019-12-21 16:53:50 +01:00
Milos Kozak 7176a8654b DanaRHistoryActivity refactor 2019-12-21 16:15:35 +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 d5e8345051 Merge remote-tracking branch 'origin/dialogs' into adrian/dialogs 2019-12-20 23:06:09 +01:00
AdrianLxM 953d6bc029 small cleanup 2019-12-20 23:05:35 +01:00
Milos Kozak c66ca2ea43 NSClient fix 2019-12-20 22:59:16 +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 68533437bb Merge branch 'dev' into dialogs 2019-12-19 23:13:35 +01:00
Milos Kozak 815336c686 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-12-19 23:12:45 +01:00
Milos Kozak 9f27b4ae42 fix NPE 2019-12-19 23:12:24 +01:00
Milos Kozak e58b7f8040 Simplify NSClient 2019-12-19 21:59:07 +01:00
Milos Kozak 5c9ab721ce Careportal actions to Actions plugin 2019-12-19 20:30:35 +01:00
Milos Kozak 19b680039e
Merge pull request #2244 from PoweRGbg/LocationLeft 
Location trigger - added option for Going inside/outside of area
 2019-12-19 14:53:00 +01:00
Roumen Georgiev b90c02a2cc Removed InputOption 2019-12-19 09:23:09 +02:00
Milos Kozak 8a4b17f6f9 cleanup 2019-12-18 23:37:34 +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 e15a2d6b88 move AutoStartReceiver 2019-12-17 23:24:54 +01:00
Milos Kozak 8af8d584eb use profile store units as fallback 2019-12-17 18:08:28 +01:00
Milos Kozak 77904cd1fd stopBolusDelivering not in UI thread 2019-12-17 16:27:36 +01:00
Milos Kozak 9e55b488d2
Merge pull request #2286 from andyrozman/bug_2264_historyproblem_512_2e 
[bug_2264]
 2019-12-17 16:11:16 +01:00
Milos Kozak 4d953cf305 remove profile interface from dana pumps 2019-12-14 21:20:01 +01:00
Milos Kozak 5b345c5ce3 migrate units from last profile 2019-12-13 13:12:36 +01:00
Milos Kozak f2aa21ce82 some dagger code 2019-12-13 02:12:19 +01:00
Milos Kozak 9bd24ffdbe
Merge pull request #2268 from MilosKozak/randombg 
WIP: Instrumentation tests
 2019-12-12 23:04:38 +01:00
Milos Kozak 119f9f4f13 test improvements, bug fixes 2019-12-12 21:37:09 +01:00
Milos Kozak 921655c0e2 SetupWizardActivityTest 2019-12-11 23:15:36 +01:00
Andy Rozman 6043284d93 [bug_2264] 
- fixed problem, with unknnown 2e event, size was changed from 7 to 107
 2019-12-11 19:46:26 +00:00
Roumen Georgiev 543e8d1d69 removed logging and give some time to the LocationService to get correct location 2019-12-11 12:18:55 +02:00
Milos Kozak 7ca9949a10
Merge pull request #2253 from Philoul/WizardInfoDialog_Translation 
Wizard info dialog translation
 2019-12-10 22:27:15 +01:00
AdrianLxM 6b6360d2c6
Don't warn instantly on RC 2019-12-10 16:05:49 +01:00
Roumen Georgiev c113cc23b2
Merge pull request #89 from MilosKozak/dev 
Dev
 2019-12-10 14:25:47 +02:00
Roumen Georgiev 5994a75134 Tests working 2019-12-10 13:38:25 +02:00
Roumen Georgiev 55e6246646 some strings and tests broken 2019-12-10 12:34:27 +02:00
Roumen Georgiev cfdc59c983 fixed initialization and removed dome debugging 2019-12-10 10:01:38 +02:00
Milos Kozak bb98ec94a5 RandomBg source 2019-12-09 22:50:54 +01:00
Milos Kozak b69af95791 apply percentage to QuickWizard entries 2019-12-09 21:26:08 +01:00
Milos Kozak c81536ac46 disable survey menu 2019-12-09 19:22:06 +01:00
Milos Kozak 1c0eb9f803 Stats activity 2019-12-09 19:03:26 +01:00
Roumen Georgiev 70842b269f pass correct number of strings 2019-12-09 15:07:56 +02:00
Philoul d6c58fc35c Set number of decimal for bg value according to unit 2019-12-09 00:24:02 +01:00
Milos Kozak a9e08bd08d Measure activity 2019-12-08 23:14:46 +01:00
Philoul 5a606b5cb9 Merge remote-tracking branch 'origin/WizardInfoDialog_Translation' into WizardInfoDialog_Translation 2019-12-08 23:01:38 +01:00
Milos Kozak 00cd2ba343 Calculate TIR 2019-12-08 21:55:49 +01:00
Philoul 9d22e177bb replaced String.format(MainApp.gs(xx), yy, zz) by MainApp.gs(xx, yy, zz) for bg, cob and carbs 2019-12-08 21:30:25 +01:00
Philoul 1525a30e01
Merge pull request #3 from Philoul/dev 
Dev
 2019-12-08 21:24:13 +01:00
Milos Kozak 0d6743ab82 Merge branch 'survey' of https://github.com/MilosKozak/AndroidAPS into survey 2019-12-08 20:21:29 +01:00
Milos Kozak 0e89ced3e1 Merge branch 'dev' into survey 2019-12-08 19:07:35 +01:00
Milos Kozak 66fd83ccb1 biometrics bolus protection 2019-12-08 18:01:52 +01:00
Milos Kozak 3c7454884d protect MainActivity by biometrics 2019-12-08 17:04:39 +01:00
Milos Kozak 9d787505cf Merge branch 'dev' into biometric 2019-12-08 16:43:07 +01:00
Philoul 6d82ceacf9 Replace the text string in the code with MainApp.gs to allow translation 
For bg I leave a decimal. I tried to use valueToUnitsToString but I don't know how to get units from json (NS data I guess) and this method does not work (missing import?) On the JsonHelper object ...
 2019-12-08 01:03:49 +01:00
AdrianLxM 00702ae924 rc version refactor 2019-12-07 20:02:10 +01:00
Milos Kozak 0c19a4081f ignoreCase = true 2019-12-07 19:18:52 +01:00
Milos Kozak 8124c0ae4d RC warnings 2019-12-07 19:15:26 +01:00
Milos Kozak 517b9a9fa7 Handle NS TempTarget sync properly 2019-12-07 18:14:32 +01:00
Roumen Georgiev 7889e3755d Adding GOING_IN & GOING_OUT modes 2019-12-06 15:03:17 +02:00
Tim Gunn a9e7590756 Merge Dev 2019-12-06 18:34:29 +13:00
Tim Gunn f7b4085445 Round to 2DP 2019-12-06 18:28:44 +13:00
Tim Gunn 457f43b1fe Reuse Variable 2019-12-06 18:25:09 +13:00
Tim Gunn bf45338eb9 Disable high_temptarget_raises_sensitivity and low_temptarget_lowers_sensitivity 2019-12-06 18:22:51 +13:00
Tim Gunn 9e93de4c7b Set the Bolus Increment to the min amount supported by the pump 2019-12-06 18:16:46 +13:00
Roumen Georgiev 6c8a5aee47
Merge pull request #88 from MilosKozak/dev 
Dev
 2019-12-05 15:06:15 +02:00
Roumen Georgiev 14dc7395e0 Created enum for mode & tests 2019-12-04 16:42:47 +02:00
Milos Kozak a66b3f7090 allow sorting of automation tasks 2019-12-03 21:07:31 +01:00
Milos Kozak 3d521fd412 remove rarely used clone library 2019-12-03 18:51:14 +01:00
Milos Kozak 6ba485d9cd fix NPE 2019-12-03 18:44:59 +01:00
Milos Kozak 95d3551931 Make switching language working again 2019-12-03 18:12:37 +01:00
Roumen Georgiev aae2e21bef trigger works 2019-12-03 16:49:08 +02:00
Milos Kozak e4a5616298 wizard & SP improvements 2019-12-03 15:29:14 +01:00
Milos Kozak 7f6eb40b66 WeekdaysPicker set starting day 2019-12-02 23:18:55 +01:00
Milos Kozak 42401453c6 okhttp3, retrofit2 update 2019-12-02 22:35:16 +01:00
Milos Kozak 7cca9892dc materialdatetimepicker update 2019-12-02 22:16:20 +01:00
Milos Kozak 9512b153c2
Merge pull request #2216 from 2flea/dev_auto_loop 
Deactivate Automation if Loop is disabled, not only if it is suspended
 2019-12-02 21:12:27 +01:00
Milos Kozak c76f8d76c8 lint 2019-12-02 21:08:20 +01:00
Milos Kozak 0b559da27d
Merge pull request #1758 from PoweRGbg/patch-1 
try to calculate direction of BG if missing
 2019-12-02 19:00:03 +01:00
Roumen Georgiev 2fa3805030
Merge pull request #87 from anbraten/automation-location-left-trigger 
Automation location left trigger
 2019-12-02 11:22:44 +02:00
Milos Kozak 8496f7dc18
Merge pull request #2172 from gregorybel/feature/expand-status-light 
Add possibility to show Battery info in days instead of percent
 2019-12-02 08:35:15 +01:00
Milos Kozak 87d3c43a33 low_mark, high_mark to setup wizard 2019-12-02 00:07:08 +01:00
Milos Kozak 36b009d56c move processing of unit dependent preferences to extra function 2019-12-01 22:03:17 +01:00
Milos Kozak c0ad125934 warn if profile is not uploadable to NS 2019-12-01 21:59:12 +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