dlvoy
b40690d0c2
Merge branch 'dev' into feature/1806_remove_whitebar_wearos
...
Resolved Conflicts in: [...]/watchfaces/Home.java [...]/watchfaces/Home2.java [...]/watchfaces/LargeHome.java
2019-11-28 06:37:32 +01:00
Milos Kozak
58bceb7a6f
update dependencies
2019-11-28 00:56:51 +01:00
Milos Kozak
599261081b
upload local profile to NS
2019-11-28 00:30:22 +01:00
Milos Kozak
421c2a955e
Merge branch 'dev' into localprofile
2019-11-27 23:42:57 +01:00
Milos Kozak
bfb65d0f8a
run wizard to setup units
2019-11-27 23:39:16 +01:00
Milos Kozak
5eb4560ad2
Merge pull request #2203 from dlvoy/feature/728_wearos_complication
...
[#728 ] Complication support - Wear OS
2019-11-27 23:36:09 +01:00
Milos Kozak
3ee9836e66
handle default TT valuses in current units
2019-11-27 23:26:29 +01:00
dlvoy
f7b556350c
[ #2210 ][ #728 ] Post-review refactoring (thanks @jotomo !)
2019-11-27 20:32:42 +01:00
Milos Kozak
0f631b1d47
fix
2019-11-26 16:59:40 +01:00
Milos Kozak
fed2839a72
Merge branch 'dev' into localprofile
2019-11-26 16:40:46 +01:00
dlvoy
0e370fee02
[ #2210 ][ #728 ] Ignoring JaCoCo runtime-injected fields that affected tests
2019-11-26 10:49:01 +01:00
dlvoy
48aa7a887a
[ #2210 ][ #728 ] Tests for complications related, formating, perisitence, utils and data-model code of wear module
2019-11-26 09:30:46 +01:00
dlvoy
1042e8aab8
[ #728 ] Post review / test related minor improvements:
...
- improving mockability when Android classes are used
- POJO Pair instead Java
- old BGWatchData cleanup fix
- Persistence getDataMap fix
- minor fixes and improvements to display formating
2019-11-26 09:30:45 +01:00
dlvoy
20eae8eb12
[ #728 ] Fix for complications update period (from @jotomo review)
2019-11-26 09:30:27 +01:00
dlvoy
e9e1fbae2f
[ #2210 ][ #728 ] - Code coverage config for wear module
...
- Fixed mockito configuration for bug in 2.X
2019-11-26 09:14:39 +01:00
Milos Kozak
23eddb25e7
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2019-11-26 08:45:27 +01:00
Milos Kozak
6969dc4873
Merge pull request #2222 from MilosKozak/2186
...
New SMS commands
2019-11-25 22:40:00 +01:00
Milos Kozak
c33e3994b6
some cleanup and kotlin conversion
2019-11-25 18:07:16 +01:00
Milos Kozak
1ea25b68a8
fix NPE
2019-11-25 17:06:08 +01:00
Milos Kozak
640c7b56f1
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2019-11-23 12:54:22 +01:00
andreas
63808ad553
Also deactivate Automation if Loop is disabled, not only if it is suspended.
2019-11-22 18:30:22 +01:00
fabriziocasellato
46270d87e2
Removed + control for Phone Numbers, Added Tests for TT, Added TARGET STOP/CANCEL command
2019-11-22 16:41:09 +01:00
Milos Kozak
f537c0090a
Merge branch 'pull/2185' into dev
2019-11-22 16:10:55 +01:00
Milos Kozak
fa765708f1
fix test
2019-11-22 16:10:27 +01:00
dlvoy
1240deb4d3
Merge branch 'dev' into feature/728_wearos_complication
2019-11-22 15:58:41 +01:00
fabriziocasellato
f26e683dbe
Removed + control for Phone Numbers, Added Tests for TT, Added TARGET STOP/CANCEL command
2019-11-22 15:58:03 +01:00
Milos Kozak
bcfb1feda3
Merge branch 'dev' into pull/2185
2019-11-22 15:39:16 +01:00
Fabrizio Casellato
aab9d695fe
Merge pull request #4 from MilosKozak/2186
...
More SMS commands
2019-11-22 14:42:30 +01:00
Milos Kozak
16038caed8
Merge branch 'sms' into 2186
2019-11-22 14:30:19 +01:00
fabriziocasellato
ebc89e7526
New tests for SMS commands: TARGET MEAL/HYPO/ACTIVITY and SMS STOP/DISABLE
2019-11-22 12:31:59 +01:00
Milos Kozak
820b704bfe
fix test
2019-11-22 11:40:51 +01:00
Milos Kozak
17ea3843ae
SMS HELP command
2019-11-22 11:19:09 +01:00
Fabrizio Casellato
32f4de2c1a
Merge pull request #3 from MilosKozak/2186
...
Kotlin refactor
2019-11-22 11:13:14 +01:00
Milos Kozak
e9aa4835ed
SBS CARBS command
2019-11-22 10:40:48 +01:00
Milos Kozak
477f78203d
Merge pull request #2212 from dlvoy/feature/2210_wearos_unit_tests
...
Unit test configuration for Wear OS, first tests
2019-11-22 00:42:02 +01:00
Milos Kozak
a62750c3a3
SmsCommunicatorFragment -> kt
2019-11-22 00:33:13 +01:00
Milos Kozak
d227013496
SmsCommunicatorPlugin -> kt
2019-11-22 00:12:46 +01:00
Dominik Dzienia
07ca4b6524
Unit test configuration for Wear OS, first tests
2019-11-21 16:04:18 +01:00
Fabrizio Casellato
f3f5bb0d7e
Merge pull request #2 from MilosKozak/2186
...
fix test
2019-11-21 09:33:19 +01:00
Milos Kozak
64faea691f
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2019-11-21 09:01:52 +01:00
Milos Kozak
b2079aa316
Warn 12h before DST change
2019-11-21 00:20:01 +01:00
Milos Kozak
9aa77122ba
Use on Rx for NetworkChange
2019-11-21 00:07:50 +01:00
Milos Kozak
2fe276d101
accept data 1 month back in Dexcom plugin
2019-11-20 22:03:31 +01:00
Milos Kozak
baf77e2e67
fix tests
2019-11-20 21:50:02 +01:00
fabriziocasellato
1f4f3fb687
Added the new MEAL feature to tests
2019-11-20 16:44:33 +01:00
Fabrizio Casellato
c32d87feb7
Merge pull request #1 from MilosKozak/2186
...
Move plugin related code from preferences to plugin
2019-11-20 16:29:32 +01:00
Milos Kozak
5d768bd368
Move plugin related code from preferences to plugin
2019-11-20 00:20:08 +01:00
Milos Kozak
788ff545ca
Merge branch 'dev' into localprofile
2019-11-19 23:22:08 +01:00
Milos Kozak
822731ada8
Merge branch 'dev' into localprofile
2019-11-19 23:21:20 +01:00
Milos Kozak
363d6d48be
ProfileStore -> kt
2019-11-19 23:17:14 +01:00
