Commit graph

15868 commits

Author SHA1 Message Date
jbr7rr ae5c4ddeeb Medtrum: Lints 2023-09-17 20:22:13 +02:00
jbr7rr 5074195315 Medtrum: Add more tests to GetRecordPacketTest 2023-09-17 20:19:35 +02:00
jbr7rr 7627fcce7d Medtrum: Allow reset of all suspended states 2023-09-17 20:19:35 +02:00
jbr7rr 9dee913977 Medtrum: Fix Suspended not syncing, fix duration in extended bolus 2023-09-17 20:19:35 +02:00
Milos Kozak f717d7a0b2 fix typo 2023-09-16 21:18:42 +02:00
Milos Kozak dec3b1ca2f unify aaps and wear wizard 2023-09-16 20:57:43 +02:00
Milos Kozak c44374c6dd Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2023-09-16 20:52:36 +02:00
Milos Kozak 275e52a546 Show PH values properly 2023-09-16 20:52:16 +02:00
Milos Kozak 24c7647d09
Merge pull request #2784 from Philoul/wear/new_custom_watchface
Wear CWF Add Week Number field and custom background image for text fields
2023-09-16 16:28:05 +02:00
Milos Kozak c4f4b2484b
Merge pull request #2785 from nightscout/dependabot/gradle/dev/com.google.gms-google-services-4.4.0
chore(deps): bump com.google.gms:google-services from 4.3.15 to 4.4.0
2023-09-16 16:27:29 +02:00
Milos Kozak d374acbde1
Merge pull request #2787 from ryanhaining/wear_util_test
Updates WearUtil for easier mocking
2023-09-16 16:25:47 +02:00
Milos Kozak 7bed95f131
Merge pull request #2788 from jbr7rr/medtrum-fixes
Medtrum: Move Initializers to onStart()
2023-09-16 16:24:49 +02:00
Ryan Haining 86b259e244 Uses injected clock rather than System for time
This is better for mocking
2023-09-15 08:35:49 -07:00
Ryan Haining 1bed0251d2 Provides kotlinx.datetime.Clock in wear 2023-09-15 08:33:49 -07:00
dependabot[bot] a7dabcf983
chore(deps): bump com.google.gms:google-services from 4.3.15 to 4.4.0
Bumps com.google.gms:google-services from 4.3.15 to 4.4.0.

---
updated-dependencies:
- dependency-name: com.google.gms:google-services
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-15 08:27:27 +00:00
Philoul ed4910d786 Merge remote-tracking branch 'Nightscout/dev' into wear/new_custom_watchface 2023-09-15 08:45:31 +02:00
Philoul 4ba7ab7e09 Wear CWF Add Week number field and include it within BaseWatchFace 2023-09-15 08:41:04 +02:00
Ryan Haining 0c1224faf6 Updates visibility and openness of attributes and methods
More mock-friendly, better access visibility
2023-09-14 22:02:56 -07:00
Milos Kozak c6f0da396f merge :core:graph to :core:main to speedup build 2023-09-14 23:12:46 +02:00
Philoul 130391eb99 Wear CWF Allow custom image in textView background 2023-09-14 21:32:10 +02:00
jbr7rr ac50149563 Medtrum: Move Initializers to onStart() 2023-09-14 21:14:09 +02:00
Milos Kozak 471ed28a04 NSC: improve profile sync 2023-09-14 20:20:08 +02:00
Milos Kozak d2247dc9bc NSC: improve sync 2023-09-14 20:07:26 +02:00
Milos Kozak 081f9ab463
Merge pull request #2779 from jbr7rr/medtrum-fixes
Medtrum: Refactor setBolus(), Improve connection lost and app restart handling
2023-09-14 18:23:09 +02:00
Milos Kozak d302e6eb55 NSC: fix sync of recordonly boluses 2023-09-14 18:16:58 +02:00
jbr7rr 18893dfe63 Medtrum: Refactor setBolus()
Reconnect when connection is lost during bolus.
After crash/restart of AAPS during bolus wait for bolus progress and show Bolus is running.
2023-09-14 17:42:07 +02:00
Milos Kozak de3f24a8fb
New Crowdin updates (#2766)
* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations exam.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Korean)

* New translations strings.xml (Russian)

* New translations strings.xml (Korean)

* New translations strings.xml (Greek)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations protection.xml (Korean)

* New translations strings.xml (Korean)

* New translations exam.xml (Korean)

* New translations objectives.xml (Korean)

* New translations exam.xml (Portuguese, Brazilian)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations oh_strings.xml (Korean)

* New translations strings_alarm.xml (Korean)

* New translations arrays.xml (Korean)

* Update source file strings.xml

* New translations strings.xml (Czech)

* New translations strings.xml (Polish)

* New translations exam.xml (Russian)

* New translations exam.xml (Russian)

* New translations strings.xml (Norwegian)

* New translations exam.xml (Greek)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations exam.xml (Greek)

* New translations objectives.xml (Greek)

* New translations strings.xml (Greek)

* New translations oh_strings.xml (Greek)

* New translations strings.xml (Dutch)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Polish)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings_alarm.xml (Greek)

* New translations strings.xml (Greek)

* New translations arrays.xml (Greek)

* New translations strings.xml (Danish)

* New translations strings.xml (Danish)

* New translations strings.xml (Danish)

* New translations strings.xml (Danish)
2023-09-14 17:29:35 +02:00
Milos Kozak d379b769d3 NSCv3: resolve loading issues 2023-09-13 13:15:58 +02:00
Philoul 752202a280 Wear CWF remove optional final poitn in short day name or month name (according to library translation) 2023-09-13 13:00:28 +02:00
Milos Kozak 608130c7ea
Merge pull request #2772 from jbr7rr/medtrum-fixes
Medtrum: Fix and Unit tests
2023-09-12 23:30:20 +02:00
jbr7rr 5b550229d4 Medtrum: Add additional unit tests for pump sync in MedtrumPump() 2023-09-12 22:00:20 +02:00
jbr7rr 67805382df Medtrum: resetPatchParameters() on deactivation and new SN 2023-09-12 13:56:17 +02:00
Milos Kozak 4fcc38ed71
Merge pull request #2768 from Philoul/wear/new_custom_watchface
Wear CWF Include default watchfaces within assets folder
2023-09-12 10:22:48 +02:00
Milos Kozak 40d95c13d9
Merge pull request #2732 from nightscout/dependabot/gradle/dev/org.mockito-mockito-junit-jupiter-5.5.0
chore(deps): bump org.mockito:mockito-junit-jupiter from 4.6.1 to 5.5.0
2023-09-11 23:23:42 +02:00
Milos Kozak 269b296447
Merge pull request #2733 from nightscout/dependabot/gradle/dev/org.mockito.kotlin-mockito-kotlin-5.1.0
chore(deps): bump org.mockito.kotlin:mockito-kotlin from 4.1.0 to 5.1.0
2023-09-11 23:23:27 +02:00
Philoul 52bf463b6a Wear CWF put default watchfaces within assets folder 2023-09-11 22:44:46 +02:00
Milos Kozak c73829faa8 DynISF: notify about fallback to SMB 2023-09-11 22:37:52 +02:00
Milos Kozak 866aaa25f6 tests: increase timeout 2023-09-11 20:04:25 +02:00
Milos Kozak 1204200bf6 kotlin 1.9.10 2023-09-11 19:21:13 +02:00
Milos Kozak c7888e948a Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2023-09-11 18:58:16 +02:00
Milos Kozak 4bde9c9aeb
Merge pull request #2765 from nightscout/jacocotest
Jacocotest
2023-09-11 12:10:59 +02:00
Milos Kozak a29f188b33 remove jacocolog dependency 2023-09-11 11:44:12 +02:00
Milos Kozak 23428f5dbc Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2023-09-11 10:54:19 +02:00
Milos Kozak 975a6c1fbe
New Crowdin updates (#2738)
* Update source file strings.xml

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Portuguese, Brazilian)

* Update source file strings.xml

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Slovak)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Turkish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Romanian)

* New translations protection.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations objectives.xml (Czech)

* New translations strings.xml (Greek)

* New translations strings.xml (Korean)

* 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 (Catalan)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* 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)

* Update source file strings.xml

* Update source file strings.xml

* New translations strings.xml (Czech)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations exam.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Polish)

* New translations strings.xml (Greek)

* New translations strings.xml (Turkish)

* New translations strings.xml (Greek)

* New translations validator.xml (Greek)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Greek)

* New translations strings.xml (Russian)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations protection.xml (Greek)

* New translations exam.xml (Greek)

* Update source file strings.xml

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Russian)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations validator.xml (Greek)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Turkish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations objectives.xml (Russian)

* New translations objectives.xml (Russian)

* New translations strings.xml (Czech)
2023-09-11 10:51:53 +02:00
dependabot[bot] 473920efec
chore(deps): bump org.mockito:mockito-junit-jupiter from 4.6.1 to 5.5.0
Bumps [org.mockito:mockito-junit-jupiter](https://github.com/mockito/mockito) from 4.6.1 to 5.5.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v5.5.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-11 08:02:49 +00:00
dependabot[bot] d37b732870
chore(deps): bump org.mockito.kotlin:mockito-kotlin from 4.1.0 to 5.1.0
Bumps [org.mockito.kotlin:mockito-kotlin](https://github.com/mockito/mockito-kotlin) from 4.1.0 to 5.1.0.
- [Release notes](https://github.com/mockito/mockito-kotlin/releases)
- [Commits](https://github.com/mockito/mockito-kotlin/compare/4.1.0...5.1.0)

---
updated-dependencies:
- dependency-name: org.mockito.kotlin:mockito-kotlin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-11 08:02:05 +00:00
Milos Kozak 5717070a95
Merge pull request #2762 from ryanhaining/update_junit_mockito
Replaces partial Mock WearUtil with a Fake
2023-09-11 10:01:13 +02:00
Milos Kozak 226dec67c1
Merge pull request #2761 from ryanhaining/replace_hamcrest
Drops hamcrest depedency
2023-09-11 10:00:58 +02:00
Ryan Haining 9e24cc1607 Uses Fake instead of incomplete Mock for WearUtil
Unblocks #2732 and #2733
2023-09-10 13:41:19 -07:00
Milos Kozak e632769d65 remove unneeded config 2023-09-10 20:31:15 +02:00