Commit graph

15126 commits

Author SHA1 Message Date
Philoul 17673a8ee3 Merge remote-tracking branch 'Nightscout/dev' into New/AddCorrPercentInWizard 2021-12-11 01:56:17 +01:00
Milos Kozak fca58029a4 Wear: tests & cleanup 2021-12-11 00:27:17 +01:00
Milos Kozak 057d072e89 update libs 2021-12-10 16:29:05 +01:00
Milos Kozak ff91ebb994 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-12-10 15:27:13 +01:00
Milos Kozak bca7e433d4 Aaps -> kt 2021-12-10 15:27:09 +01:00
Milos Kozak 0303706658
New Crowdin updates (#1058)
* New translations strings.xml (Polish)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Turkish)
2021-12-10 15:26:43 +01:00
Milos Kozak 466cd97ad7
Merge pull request #1055 from Andries-Smit/wear-title
Wear curved titles
2021-12-10 15:26:15 +01:00
Milos Kozak 3ee6daf832
Merge branch 'dev' into wear-title 2021-12-10 15:20:43 +01:00
Milos Kozak 17b4d6e7ed Wear: less static more injection 2021-12-10 15:19:19 +01:00
Milos Kozak 29559c0413 move SP to shared module 2021-12-10 12:17:03 +01:00
Milos Kozak 0a25fa3c9a share code between aap and wear 2021-12-10 08:58:23 +01:00
Milos Kozak 2275a44959
Merge branch 'dev' into wear-title 2021-12-10 08:45:47 +01:00
Philoul b05a9b7683 Remove rounding CalculatedCorrection 2021-12-09 23:50:55 +01:00
Milos Kozak d08b018edf Wear: add dependency injection 2021-12-09 22:42:43 +01:00
Milos Kozak ca8568c204
New Crowdin updates (#1052)
* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (German)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese, Brazilian)

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

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Hebrew)

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

* Update source file strings.xml

* New translations strings.xml (Spanish)

* New translations strings.xml (Slovak)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)
2021-12-09 19:47:22 +01:00
Andries Smit 91df243d93 Wear allign menu colors with app 2021-12-09 16:01:49 +01:00
Milos Kozak e571f31157
Merge pull request #1057 from nightscout/dependabot/gradle/dev/com.android.tools.build-gradle-7.0.4
Bump gradle from 7.0.3 to 7.0.4
2021-12-09 15:31:13 +01:00
Milos Kozak 5ee94dd783 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-12-09 14:51:46 +01:00
Milos Kozak 9be074045b fix Wiki link 2021-12-09 14:51:24 +01:00
Milos Kozak fb2eaad1d2 eliminate numOfProfiles in ProfilePlugin 2021-12-09 14:49:10 +01:00
dependabot[bot] 0ea6bb9f91
Bump gradle from 7.0.3 to 7.0.4
Bumps gradle from 7.0.3 to 7.0.4.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-09 08:07:16 +00:00
Andries Smit 0969d8339f Wear curved titles 2021-12-08 21:53:15 +01:00
Milos Kozak 42807f30ef
New Crowdin updates (#1023)
* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Russian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Polish)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese, Brazilian)

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

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Hebrew)

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

* Update source file strings.xml

* New translations strings.xml (Dutch)

* New translations strings.xml (Spanish)

* New translations strings.xml (Czech)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Italian)

* New translations strings.xml (Turkish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Catalan)
2021-12-08 10:08:06 +01:00
Milos Kozak f0e6a74538
Merge pull request #1046 from swissalpine/patch-7
TempTarget Dialog: Include missing Event Time
2021-12-07 22:29:47 +01:00
Philoul 88b2a8d0d7 Add selector to allow correction in percentage 2021-12-07 21:38:05 +01:00
swissalpine df8fb69bc0
TempTarget Dialog: Include missing Event Time
In the layout the line "Event Time:" is missing since some time, but in the code (TempTargetDialog.kt) the function is still realised. Here is the fix that adds the line again.
I think some would miss this function ... ;-)
2021-12-07 21:20:36 +01:00
Milos Kozak a83eb1c456
Merge pull request #1041 from Philoul/New/CGM_Icon_and_string
Use xDrip+ or Dexcom icon for CGM button (not only xDrip+ icon) + update preference strings
2021-12-07 10:00:31 +01:00
Milos Kozak 36a1fa15aa
Merge pull request #1042 from Philoul/Fix/FixTranslatedLoggingForCommandQueue
Add untranslated status for logging in Command interface
2021-12-07 09:58:39 +01:00
Milos Kozak 540050f484
Merge pull request #1043 from avereha/logs
Dash: improve logging
2021-12-07 09:57:48 +01:00
Milos Kozak 20623bb0fa
Merge pull request #1044 from nightscout/dependabot/gradle/dev/dagger_version-2.40.5
Bump dagger_version from 2.40.4 to 2.40.5
2021-12-07 09:57:26 +01:00
Milos Kozak bfff13d561
Merge pull request #1037 from swissalpine/patch-6
Allow/reenable the setting of TempTargets while pump is suspended or …
2021-12-07 09:57:15 +01:00
dependabot[bot] cd9f8e946b
Bump dagger_version from 2.40.4 to 2.40.5
Bumps `dagger_version` from 2.40.4 to 2.40.5.

Updates `dagger-compiler` from 2.40.4 to 2.40.5
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.4...dagger-2.40.5)

Updates `dagger-android-processor` from 2.40.4 to 2.40.5
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.4...dagger-2.40.5)

Updates `dagger-android` from 2.40.4 to 2.40.5
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.4...dagger-2.40.5)

Updates `dagger-android-support` from 2.40.4 to 2.40.5
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.4...dagger-2.40.5)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-android-processor
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-android-support
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-07 08:07:44 +00:00
Philoul d6ade59cd3 Add untranslated status for logging in Command interface 2021-12-07 00:40:13 +01:00
Philoul 9145a11563 Simplify code 2021-12-07 00:02:58 +01:00
Milos Kozak 9d11323e0f
Merge pull request #1011 from Andries-Smit/dev
Wear OS improvements
2021-12-06 23:53:50 +01:00
Philoul 61017e1b54 Set icon and text color in Overview according to MGC plugin 2021-12-06 23:48:40 +01:00
Milos Kozak fa4f0eb688 Automation: Fix removing trigger 2021-12-06 23:47:20 +01:00
Philoul a75451e80e Add byoda in strings for CGM and Calibration buttons summary 2021-12-06 23:11:07 +01:00
Philoul 7fc215db90 Add byoda icon for CGM button 2021-12-06 23:06:27 +01:00
Andries Smit 6083bb4b89 Wear improve action menu 2021-12-06 20:45:29 +01:00
Andrei Vereha a43beccdda fix logging tags 2021-12-06 20:21:46 +01:00
Andrei Vereha e41fdfdd4b log when service not found 2021-12-06 20:21:35 +01:00
Milos Kozak 3875957801 DANA: make data in history activity descending 2021-12-06 16:50:12 +01:00
Milos Kozak 119d2c8f0e fix test 2021-12-06 16:07:17 +01:00
Milos Kozak 952278a93a EROS: try to resolve false fake tbr message 2021-12-06 15:56:43 +01:00
Milos Kozak 0b102376c6 MDT TBR fix 2021-12-06 13:46:44 +01:00
Milos Kozak a2c7f2a6d9
Merge pull request #1039 from nightscout/dependabot/gradle/dev/org.json-json-20211205
Bump json from 20210307 to 20211205
2021-12-06 09:55:00 +01:00
dependabot[bot] 9d39b9f83a
Bump json from 20210307 to 20211205
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20210307 to 20211205.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-06 08:08:13 +00:00
swissalpine 98f2df943c
Allow/reenable the setting of TempTargets while pump is suspended or disconnected
Unfortunately, it is currently no longer possible to set a TempTarget when the pump is disconnected or suspended (TBR: 0%). This seems logical at first sight (why a TempTarget when the pump is not connected or the loop suspended!), but prevents many useful possibilities, namely when the TempTarget should be set immediately after the disconnection or suspension has expired.
An example of this are f. e. sport activities: To reduce IOB, I set a 0% TBR half an hour before sport for one hour with the function "pump disconnected", so that the associated 0% TBR continues for a while while sport starts. I also set a three hour Activity TempTarget. This continues to be active when the pump loops again with the pump disconnected time expired.
The fix allows/reenables setting a TempTarget even if the pump is suspended or disconnected.
2021-12-05 14:11:51 +01:00
Milos Kozak 2ec9517b02
Merge pull request #1030 from Philoul/Fix/UserEntryUnitsConvertion
User entry Add Glucose Value in TherapyEvents NSClient
2021-12-04 13:35:23 +01:00