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

7770 commits

Author SHA1 Message Date
Milos Kozak 8ae817cdda nsalarm notifications fix 2020-05-23 21:54:01 +02:00
Milos Kozak 8e49717794
Merge pull request #2647 from Philoul/Insight_Pref_Vibration 
Add vibration in Insight preferences
 2020-05-23 18:08:53 +02:00
Milos Kozak 88adf04652
Merge pull request #2663 from Tornado-Tim/show-targets 
Show oref internal overridden targets
 2020-05-23 18:01:28 +02:00
Tebbe Ubben 6e906dda87
Update pref_insight_local_pumpcontrol.xml 2020-05-23 17:49:49 +02:00
Philoul 4f41890add Add additionnal setting for automated deliveries and add both in pumpcontrol pref 
- previous setting is for manual bolus and extended bolus
- This new setting is for SMB and temp basal with TBR emulation
You can change settings name and summary if you find better...
 2020-05-23 16:30:03 +02:00
Milos Kozak d40188f04e Default language option 2020-05-23 15:39:05 +02:00
Tim Gunn 72943a5236
Add back setting adjustment 2020-05-22 11:08:01 +12:00
AdrianLxM 06e97400f7 Simplify show-targets view logic 2020-05-20 22:34:09 +02:00
Milos Kozak e053d3601d regional independent test 2020-05-20 19:53:16 +02:00
Tim Gunn bf412ea798
refractor 2020-05-21 04:19:22 +12:00
Tim Gunn 723c029228
Deal with 0.0 if AMA is used 2020-05-21 02:20:38 +12:00
Tim Gunn 77a5af75e2
Display when Target BG is overidden 2020-05-21 00:11:36 +12:00
Tim Gunn a20008c0db
Add TargetBG 2020-05-21 00:10:51 +12:00
Tim Gunn 3c2d5ff3d6
Add targetBG 2020-05-21 00:10:16 +12:00
Milos Kozak cbf830353c
New Crowdin translations (#2645) 
* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations exam.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations exam.xml (Swedish)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (German)

* New translations strings.xml (French)
 2020-05-19 21:22:29 +02:00
Milos Kozak 0fe13860aa
Merge pull request #2658 from Philoul/AS_Icon_with_Constraints 
Add constraintChecker for autosens icon in overview
 2020-05-19 20:58:24 +02:00
Philoul 6229161c96 Add constraintChecker for autosens icon in overview 2020-05-19 19:32:27 +02:00
Milos Kozak ddc259648d Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-19 19:27:40 +02:00
Milos Kozak 58a7188ec3 RS hwver 7 2020-05-19 19:27:31 +02:00
Tim Gunn 3ae1bb669d
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-20 00:09:57 +12:00
Milos Kozak b2b1485c27 fix Actions buttons visibility 2020-05-19 13:22:02 +02:00
Milos Kozak d9b8a32aea Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-19 12:52:15 +02:00
Milos Kozak eeb4ce1686 fix HistoryBrowser injection 2020-05-19 12:52:01 +02:00
Philoul 72e541908c Revert "Fix Wear Control Kotlin doesn't like regex... (AAPS crashed on these lines with ""\\s+", replaced by a space)" 
=> Second proposal better than my first one, split works with regex if it is of type Regex (it doesn't recognize first \ as a regex string but as an escape character...)
This reverts commit 480542a1
 2020-05-17 08:09:58 +02:00
Philoul 480542a143 Fix Wear Control 
Kotlin doesn't like regex... (AAPS crashed on these lines with ""\\s+", replaced by a space)
 2020-05-17 01:58:07 +02:00
Milos Kozak 8729fe18bd fix urgent NS alarm preference 2020-05-16 22:43:18 +02:00
Milos Kozak ca94e6cc67 layout #2 2020-05-15 22:41:14 +02:00
Philoul 1dd579fd19 Add disable vibration in insight settings (local_full only) 
Build works but as it related to pump communication, I prefer to not test it on my pump before Tebbe confirmation... (code is very simple, so it should work!)
 2020-05-15 11:37:09 +02:00
Milos Kozak 51ab43416a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-15 08:20:24 +02:00
Milos Kozak c311d593c1 show actions tab in NSC 2020-05-15 08:20:09 +02:00
Tim Gunn b1c6b81bb7
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-15 16:26:23 +12:00
Tim Gunn 32e4bb1220
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into skip-neutral-temps 2020-05-15 16:25:35 +12:00
Milos Kozak be883afabe
Merge pull request #2644 from Philoul/Sensitivity_Icon 
Sensitivity icon
 2020-05-14 21:13:33 +02:00
Milos Kozak 2d3f1323dd layout update 2020-05-14 21:07:51 +02:00
Philoul 66c2bab60f Sensitivity Icon end proposal with a new icon 
Svg file added in icons folder
 2020-05-14 14:39:27 +02:00
Philoul 47725ad5d5 Sensitivity Icon (50% alpha if autosens disable) 2020-05-14 12:42:33 +02:00
Milos Kozak ebc7a973d6
New Crowdin translations (#2639) 
* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Portuguese)

* New translations protection.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations protection.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations insight_alert_titles.xml (Portuguese)

* New translations exam.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations exam.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (French)

* New translations strings.xml (Swedish)

* New translations strings.xml (French)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Bulgarian)
 2020-05-14 10:10:34 +02:00
Milos Kozak a241a23c99 fix pref parsing 2020-05-13 23:28:07 +02:00
Milos Kozak bc217438e9 fix message call MDT 2020-05-13 21:16:29 +02:00
Tim Gunn bcfd5e0149
revert counter logic 2020-05-13 11:36:32 +12:00
Tim Gunn b49d9d13af
revert counter logic 2020-05-13 10:36:16 +12:00
Tim Gunn 81ea43b218
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into skip-neutral-temps 2020-05-13 10:34:07 +12:00
Tim Gunn 15df6f3349
merge n fix 2020-05-13 10:14:02 +12:00
Milos Kozak c03a89db16 HistoryBrowser fix 2020-05-13 00:11:48 +02:00
Tim Gunn fa74cf4804
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-13 09:37:50 +12:00
Milos Kozak 903555ed9f Dana msg refactor 2020-05-12 23:33:42 +02:00
Milos Kozak 65982ab94a
Merge branch 'dev' into carbs-required 2020-05-12 17:01:29 +02:00
Milos Kozak 666ce54b1f lint & deprecation 2020-05-12 15:07:50 +02:00
Milos Kozak 7060c51681 lint & deprecation 2020-05-12 14:33:47 +02:00
Milos Kozak b7ef191003 lint & deprecation 2020-05-12 13:34:32 +02:00
Milos Kozak 9c472e4e05 simplify RL code 2020-05-12 12:58:59 +02:00
Milos Kozak 66c567f0e7 lint & deprecation 2020-05-12 12:33:23 +02:00
Milos Kozak e1df6c8145 minSdkVersion 24 2020-05-12 00:23:39 +02:00
Milos Kozak 1d1d57a458 fix SPBackupAgent 2020-05-12 00:04:09 +02:00
Milos Kozak 1b625265d0 Merge remote-tracking branch 'origin/master' into dev 2020-05-11 23:53:20 +02:00
Milos Kozak 205ab5220d
New Crowdin translations (#2611) 
* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Romanian)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Czech)

* New translations protection.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations insight_alert_descriptions.xml (Italian)

* New translations insight_alert_titles.xml (Italian)

* New translations exam.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Italian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Italian)

* New translations strings.xml (Russian)

* New translations strings.xml (German)

* New translations strings.xml (Irish)

* New translations strings.xml (Russian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Russian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Finnish)

* New translations strings.xml (Irish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Japanese)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Irish)

* New translations strings.xml (Polish)

* New translations strings.xml (Greek)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (German)

* New translations strings.xml (Spanish)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Italian)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Finnish)

* New translations strings.xml (Irish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Japanese)

* New translations strings.xml (Croatian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Polish)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Turkish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Japanese)

* New translations strings.xml (Finnish)

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

* New translations strings.xml (Croatian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Czech)

* New translations strings.xml (Portuguese)

* New translations insight_alert_titles.xml (Portuguese)

* New translations insight_exceptions.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations exam.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Czech)
 2020-05-11 22:47:30 +02:00
Milos Kozak b5770d8e1b
Merge pull request #2638 from MilosKozak/danarefactor 
Dana: refactor to modules
 2020-05-11 20:36:50 +02:00
Milos Kozak b0513be8bf remove crashing dump 2020-05-11 20:15:35 +02:00
Milos Kozak 9e8124bc29 fix dana bolusing dialog 2020-05-11 20:05:12 +02:00
Milos Kozak 5368b5c109 update manifests 2020-05-11 17:41:03 +02:00
Milos Kozak 14b9ee3798 update manifests 2020-05-11 17:32:02 +02:00
Milos Kozak 3071d15a5f bump 2.6.6 2020-05-11 17:06:49 +02:00
Milos Kozak 5dea964b89 final dana renaming 2020-05-11 16:58:59 +02:00
Milos Kozak 441e5fdf3e extend pump interface for neutral temps 2020-05-11 14:50:35 +02:00
AdrianLxM 28dd3dedac
fix Java -> Kotlin nullability issue 2020-05-11 13:34:10 +02:00
Tim Gunn a4f4894985
fixes 2020-05-11 21:54:32 +12:00
Tim Gunn add8b71ea3
Internationalisation 2020-05-11 21:51:32 +12:00
Tim Gunn ea3ce995d8
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-11 21:14:33 +12:00
Milos Kozak 5b269f6156 cleanup resources 2020-05-11 01:41:58 +02:00
Milos Kozak b24690c2fa move RSCommModule 2020-05-10 23:45:49 +02:00
Milos Kozak 2375b159fa resources cleanup 2020-05-10 22:31:36 +02:00
Milos Kozak b43e7e5930
Merge pull request #2627 from Philoul/TempBasal_Icon_Switched 
Temp Basal new icons for temp basal in overview
 2020-05-10 21:11:41 +02:00
Milos Kozak 9ac88f7def remove mdtp library 2020-05-10 21:07:58 +02:00
Milos Kozak 05f73cd3ff elimitate careportal 2020-05-10 20:10:08 +02:00
Milos Kozak f727b25bb3 cleanup 2020-05-10 18:42:20 +02:00
AdrianLxM cd84597058
Kotlin interface not stricter than Java superclass 
Intrinsic check in Kotlin if view is null lead to crashes.
view is not even used so we can accept null.
 2020-05-10 16:56:48 +02:00
Milos Kozak 54e68ef248 clean up 2020-05-10 11:49:37 +02:00
Tim Gunn efc25ddcd5
Use preferences 2020-05-10 21:25:14 +12:00
Tim Gunn a501b37159
Show animation if carbs are required 2020-05-10 21:24:46 +12:00
Tim Gunn 68d0e33a9b
Use background for animation 2020-05-10 21:24:09 +12:00
Tim Gunn 9070a1f394
Add Preferences for local carbs req alerts 2020-05-10 21:23:44 +12:00
Tim Gunn e8062e1209
Add Red Carb Icon 2020-05-10 21:21:45 +12:00
Milos Kozak 311f9dd119 danar module 2020-05-10 11:03:19 +02:00
Tim Gunn c9cf2cbae4
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-10 13:05:30 +12:00
Milos Kozak a99be409eb dana module 2020-05-09 20:18:12 +02:00
Milos Kozak 7fc631a729 RS -> danaRS finished 2020-05-09 10:52:20 +02:00
Philoul 84f032a7a2 Revert "Temp Basal icon switched" 
I replace first proposal with a new one with 3 icons

This reverts commit 24112eb4
 2020-05-08 17:58:01 +02:00
Philoul 7708e5961a Add new icons for basal on ovenview fragment 
I also add photoshop files (it's bitmap but it's easier to work with them)
 2020-05-08 17:56:02 +02:00
Milos Kozak 040c76d839 move pass 1 2020-05-08 14:59:30 +02:00
Milos Kozak 61a077542c DanaRPump -> danars 2020-05-08 11:56:02 +02:00
Milos Kozak 73d132649d fix tests 2020-05-08 11:37:14 +02:00
Milos Kozak 67b4be6963 Merge remote-tracking branch 'origin/dev' into rs2 2020-05-08 11:08:45 +02:00
Milos Kozak 15207d1bf1 Omni comments 2 2020-05-08 01:09:30 +02:00
Milos Kozak 7dc7c9528b Omni comments 2020-05-08 00:23:17 +02:00
Milos Kozak 25bf92300b Merge remote-tracking branch 'origin/dev' into dev2 2020-05-07 23:44:46 +02:00
Milos Kozak 70e9d3e88a fix tests 2020-05-07 23:40:59 +02:00
Bart Sopers eb6eebe853 Restore version for upstream merge from Omnipod repo 2020-05-07 21:17:32 +02:00
Bart Sopers 7f2448adeb Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-05-07 21:16:36 +02:00
Bart Sopers c1fc6d4864 Merge branch 'dev' into omnipod_eros_dev 2020-05-07 21:11:12 +02:00
Milos Kozak 120c526b80 move to core 2020-05-07 09:54:36 +02:00
Philoul 24112eb437 Temp Basal icon switched 2020-05-07 08:29:03 +02:00
Andy Rozman 5527c3d70d - remove omnipod as option from config builder 2020-05-07 01:04:29 +01:00
Andy Rozman 674cd1c0ae Merge branch 'omnipod_eros_dev' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-05-07 00:43:18 +01:00
Andy Rozman 4f79b49e10 - changed loader to OmnipodUtil 
- Modules
 2020-05-06 23:34:05 +01:00
Bart Sopers 25e0b8b190 Add dagger stuff 2020-05-06 23:38:56 +02:00
Bart Sopers bafffad44a Use transient keyword instead of Gson annotation for PodSessionState members that should be exluded of (de)serialization 2020-05-06 21:41:33 +02:00
Milos Kozak ad472beb4a danars di start 2020-05-06 01:27:38 +02:00
Milos Kozak cf291b3adc fix after lib update 2020-05-06 01:18:04 +02:00
Milos Kozak f964011724 Merge remote-tracking branch 'origin/dev' into rs 2020-05-06 00:05:33 +02:00
Milos Kozak 0c287bdef1 icon -> core 2020-05-06 00:04:53 +02:00
Milos Kozak a02bd59dc0 Merge remote-tracking branch 'origin/dev' into rs 2020-05-05 23:28:22 +02:00
Milos Kozak 1f4f5600bc NoSplashAppCompatActivity -> core 2020-05-05 23:27:01 +02:00
Milos Kozak 25c1100330 Merge remote-tracking branch 'origin/dev' into rs 2020-05-05 22:49:49 +02:00
Milos Kozak d114be7344 revert debug code 2020-05-05 22:43:26 +02:00
Milos Kozak bba7adc9aa fix Runnables after protection check, cleanup 2020-05-05 22:42:16 +02:00
Milos Kozak 8858d3b5f9 Merge remote-tracking branch 'origin/dev' into layout 2020-05-05 22:00:54 +02:00
Milos Kozak bbf5e6564f new icons 2020-05-05 22:00:35 +02:00
Dominik Dzienia 9a3cc5af82 Adds support for preferences directory, list of preferences to import, additional check on imported preferences metadata 2020-05-05 18:42:53 +02:00
Andy Rozman f3c4b4e5e7 Merge branch 'omnipod_eros_dev' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-05-05 13:50:53 +01:00
Andy Rozman e51e3daeb1 - added Expose attribute to all varaiables in PodSessionState 
- OmnipodUtil: Gson now uses only Expose fields
 2020-05-05 13:49:55 +01:00
Bart Sopers 9b089621fa Use allowed default for SP.getString in RileyLinkOmnipodService 2020-05-05 13:35:49 +02:00
Andy Rozman 2de1761555 - look at current pump service (either MDT or POD), RL Boradcast Receiver worked with internal instance, which wasn't correct, might need to refactor RileyLinkBroadcastReceiver further to be singelton... 2020-05-05 10:32:25 +01:00
Bart Sopers 32ce3ee18a enable PUMPBTCOMM by default for Omnipod branch 2020-05-05 02:34:08 +02:00
Bart Sopers 53e6cd4ef2 Apply several fixed from @andyrozman after Omnipod dagger merge 2020-05-05 02:03:01 +02:00
Bart Sopers e20d8a1ff5 Improve Omnipod preference screen 2020-05-05 01:35:39 +02:00
Bart Sopers 0f8503032e Use correct RL address preference in Omnipod preferences 2020-05-05 01:25:34 +02:00
Bart Sopers 20f9f88d4b Use allowed default for SP.getString 2020-05-05 01:05:57 +02:00
Bart Sopers d78b921b1f Fix test case 2020-05-05 00:39:20 +02:00
Bart Sopers f7f5e0ce19 Replace static reference with member reference 2020-05-05 00:28:27 +02:00
Andy Rozman 7db7e07a70 - added SP to OmnipodUtil 2020-05-04 23:25:03 +01:00
Bart Sopers 7fa1ebfe38 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_dagger_with_initialization_fixes 2020-05-05 00:15:44 +02:00
Milos Kozak 0a63e1f29d Merge branch 'dev' into rs 2020-05-05 00:08:29 +02:00
Milos Kozak d8f27c609c BlePreCheck -> core 2020-05-05 00:02:31 +02:00
Bart Sopers ce435be382 Fix merge error 2020-05-04 23:56:24 +02:00
Bart Sopers 5e3e947d8e Restore more formatting 2020-05-04 23:55:01 +02:00
Bart Sopers e7fe05dbeb Restore more formatting 2020-05-04 23:52:51 +02:00
Bart Sopers 1bdc474b51 Properly ignore PodSessionState test cases 2020-05-04 23:52:44 +02:00
Bart Sopers d8eb777b4c Restore more formatting 2020-05-04 23:36:00 +02:00
Bart Sopers acf6b50b66 Restore formatting in AndroidManifest.xml 2020-05-04 23:22:42 +02:00
Bart Sopers df2de82810 Apply @andyrozman's fixes for compilation errors 2020-05-04 23:06:15 +02:00
Bart Sopers 71d5409344 Revert "- removed dependencies to omnipod: Myprefernces, ActivitiesmOdules, AppComponent" 
This reverts commit ea0b89cbf8.
 2020-05-04 22:50:08 +02:00
Milos Kozak 4a17fdc9a0 Merge remote-tracking branch 'origin/dev' into layout 2020-05-04 21:55:20 +02:00
Milos Kozak 47fd4bd1fe libraries update 2020-05-04 21:37:03 +02:00
Milos Kozak d0fc697183 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-04 21:03:34 +02:00
Milos Kozak ee913cffd8 gradle tweaking 2020-05-04 21:03:30 +02:00
Andy Rozman ea0b89cbf8 - removed dependencies to omnipod: Myprefernces, ActivitiesmOdules, AppComponent 
- fixed commpiling problem
- removed OmnipodService from Manifest
 2020-05-04 17:51:06 +01:00
TebbeUbben 1c075c526e 2.6.1.4 2020-05-04 17:36:37 +02:00
Bart Sopers 1798d260eb Merge branch 'dev' into omnipod_eros_dev_dagger_history_fix 2020-05-04 17:36:29 +02:00
Andy Rozman 5ed86e571d - fixed problem with RL selector in omnipod prefs 2020-05-04 12:09:57 +01:00
Andy Rozman 6aaca5899c - changed Omnipod module 2020-05-04 11:27:12 +01:00