Commit graph

12064 commits

Author SHA1 Message Date
Andrei Vereha 5f1293ff96 Implement ShortStatus 2021-10-09 15:17:14 +02:00
Andrei Vereha 058ed9d79f getJSONstatus. format 2021-10-09 14:55:36 +02:00
Andrei Vereha 00de96cba3
Merge pull request #142 from 0pen-dash/avereha/fixes
Fixes
2021-10-09 13:07:25 +02:00
Andrei Vereha 9071068bad
Merge pull request #139 from vanelsberg/fixes-3refactored
Fixes-3 refactoring
2021-10-09 13:07:14 +02:00
Andrei Vereha 0853e98de6 check that deliveredBolus amount is positive 2021-10-09 13:02:06 +02:00
Andrei Vereha 3a2ac68a6f bugfix: bolusPulsesRemaining 2021-10-09 12:56:49 +02:00
Theo van Elsberg 875cd893e2 Refactoring Pod constants:
- Const values now defined in "hours"
- Use TimeUnit().HOURS.toMinutes() method to convert
2021-10-06 23:41:16 +02:00
Andrei Vereha 2b5a1020af
Merge pull request #137 from 0pen-dash/avereha/merge-dev-11
merge with dev
2021-10-06 20:38:09 +02:00
Andrei Vereha fe5b416f38 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-11 2021-10-06 20:37:48 +02:00
Milos Kozak bfaa392eb0 fix Nan error 2021-10-06 15:00:37 +02:00
Theo van Elsberg 99ae6b4b84 PodConstants:
- Fixed type
- PRIMING/CANULLA/PULSE are the same, move to one single const
2021-10-06 11:33:47 +02:00
Andrei Vereha 4a3cff1688 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-11 2021-10-05 22:56:41 +02:00
Andrei Vereha 263f7678e0
Merge pull request #136 from 0pen-dash/avereha/fix-remaning
Fix remaning units
2021-10-05 22:56:16 +02:00
Andrei Vereha 03b051eb8c fix remaning units 2021-10-05 22:54:35 +02:00
Milos Kozak c0f911ad14 minSdkVersion 28 2021-10-05 21:43:23 +02:00
Milos Kozak 4239e38547 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-10-05 20:38:19 +02:00
Milos Kozak a0c2b258cb Merge branch 'master' into dev 2021-10-05 19:46:53 +02:00
Milos Kozak 783343a50d 2.8.2.1 2021-10-05 18:54:45 +02:00
Milos Kozak ea286c0dfe Merge remote-tracking branch 'origin/master' 2021-10-05 18:53:52 +02:00
Milos Kozak 972fdbfe9e 2.6.2 version check 2021-10-05 17:55:19 +02:00
Milos Kozak b55df715e6 2.8.2.4-dev 2021-10-05 11:37:29 +02:00
Milos Kozak e3374271b6
Merge pull request #712 from Philoul/Fix/InsightFragmentImprovement
Insight Fragment improvement (Add Last Connected ago and last bolus)
2021-10-05 11:36:31 +02:00
Theo van Elsberg 30342f2e23 Move fixed values for expiration alerts to PodConstants 2021-10-05 00:07:09 +02:00
Philoul 980a997f79 Add lastConnection ago and last bolus (Standard only) in fragment 2021-10-05 00:05:00 +02:00
Milos Kozak a4aae47b8b pass safety values to NSClient 2021-10-04 23:47:47 +02:00
Milos Kozak 1b45d4fe31 allow start activity TT from profile switch 2021-10-04 22:40:02 +02:00
Theo van Elsberg 5ffe61d6c4 Move fixed values to PodConstants 2021-10-04 22:38:37 +02:00
Theo van Elsberg 0546976cbb Prevent connection quality to exceed 100% 2021-10-04 22:36:38 +02:00
Andrei Vereha 25b991a924
Merge pull request #135 from 0pen-dash/avereha/fake-tbr
Avereha/fake tbr
2021-10-04 18:42:47 +02:00
Andrei Vereha 51c8c65222 ktlintFormat 2021-10-04 18:01:05 +02:00
Andrei Vereha 9ebb7cd82d Merge branch 'dash' of github.com:0pen-dash/AndroidAPS into avereha/fake-tbr 2021-10-04 17:56:25 +02:00
Andrei Vereha 3f6c922455
Merge pull request #134 from 0pen-dash/avereha/warnings
fix warnings. merge with dev
2021-10-04 17:55:51 +02:00
Andrei Vereha 01c88b0de3 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/warnings 2021-10-04 17:55:05 +02:00
Milos Kozak feef3d4a03 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-10-04 17:35:24 +02:00
Milos Kozak f802cc488e Pump status line refactor 2021-10-04 17:35:17 +02:00
Milos Kozak 7a0dc362c4
New Crowdin updates (#703)
* Update source file strings.xml

* Update source file strings.xml

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* Update source file strings.xml

* Update source file strings.xml

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* Update source file strings.xml

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (German)
2021-10-04 14:55:23 +02:00
Milos Kozak e7eb5a03da
Merge pull request #710 from nightscout/dependabot/gradle/dev/dagger_version-2.39.1
Bump dagger_version from 2.39 to 2.39.1
2021-10-04 14:54:51 +02:00
Andrei Vereha 0312eff327 bugfix for 0 TBR 2021-10-04 10:10:52 +02:00
dependabot[bot] 5f46c9c585
Bump dagger_version from 2.39 to 2.39.1
Bumps `dagger_version` from 2.39 to 2.39.1.

Updates `dagger-compiler` from 2.39 to 2.39.1
- [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.39...dagger-2.39.1)

Updates `dagger-android-processor` from 2.39 to 2.39.1
- [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.39...dagger-2.39.1)

Updates `dagger-android` from 2.39 to 2.39.1
- [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.39...dagger-2.39.1)

Updates `dagger-android-support` from 2.39 to 2.39.1
- [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.39...dagger-2.39.1)

---
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-10-04 08:06:27 +00:00
Milos Kozak da481f0da4 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-10-04 00:35:22 +02:00
Milos Kozak f790c06b27 fix recalculated bucketed data 2021-10-04 00:34:46 +02:00
Andrei Vereha d5619dc469 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/warnings 2021-10-03 23:32:18 +02:00
Milos Kozak 5881e4936d
Merge pull request #709 from Philoul/Fix/NSBGAddShortName
Add shortname for NSClient BG Plugin
2021-10-03 21:57:15 +02:00
Philoul 9a1de97564 Add shortname for NSClient BG plugin 2021-10-03 21:48:02 +02:00
Andrei Vereha a4a6f45372 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/warnings 2021-10-03 21:01:50 +02:00
Milos Kozak 9d99913282 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-10-03 19:01:07 +02:00
Milos Kozak 214078b477 fix displaying profile status 2021-10-03 19:01:03 +02:00
Milos Kozak 8728fd83d0
Merge pull request #707 from 0pen-dash/avereha/fix-warnings
Fix Dash warnings
2021-10-03 18:53:26 +02:00
Milos Kozak 917ecaa479
Merge pull request #708 from Philoul/Fix/CrashMissingTrigger
Fix crash if trigger not found (minor improvement)
2021-10-03 18:53:07 +02:00
Milos Kozak c7f1521c75 org.gradle.warning.mode 2021-10-03 18:36:59 +02:00