Commit graph

14488 commits

Author SHA1 Message Date
Carlos Rafael Giani adbd1dc9fd Add combov2 to crowdin.yml 2022-11-21 21:52:49 +01:00
Carlos Rafael Giani 865760be52 Revert "Enable data binding in app gradle script"
This reverts commit 5df6084fa8.
2022-11-21 21:24:22 +01:00
Carlos Rafael Giani a7eb7b74ac Revert "IDEA/Android Studio: Restore wildcard import rules"
This reverts commit eb39d44a80.
2022-11-21 21:23:57 +01:00
Carlos Rafael Giani 5745e95244 Update combov2 code to match recent changes in dev branch
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-21 19:58:29 +01:00
Carlos Rafael Giani 0621d1c1d1 Move SP delegates to the correct location
The SP delegates do not belong in impl/ , since they are not
implementation specific; rather, they are part of the interface

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-21 19:58:24 +01:00
Carlos Rafael Giani 4ea6b48047 Merge branch 'dev' into comboctl-dev 2022-11-21 19:58:10 +01:00
Milos Kozak 7725812e4a move SetupWizard 2022-11-21 16:48:45 +01:00
Milos Kozak 0d960c2b44 CompatDbHelper -> implementations 2022-11-21 14:05:22 +01:00
Milos Kozak 0158ac17dd DataBroadcastPlugin -> plugins 2022-11-21 13:58:59 +01:00
Milos Kozak 6fa7877048 merge Config & BuildHelper 2022-11-21 13:51:47 +01:00
Milos Kozak c847b35138 move PrefImportSummaryDialog 2022-11-21 13:05:37 +01:00
Milos Kozak 6519e8fea6 move TabPageAdapter 2022-11-21 12:55:29 +01:00
Milos Kozak 296bf78a60 move IconsProviderImpl 2022-11-21 12:52:36 +01:00
Milos Kozak 97cd02d021 cleanup 2022-11-21 11:48:26 +01:00
Milos Kozak 1cbfae2dc1 di cleanup 2022-11-21 10:46:56 +01:00
Milos Kozak c2fb7811dd
New Crowdin updates (#2206)
* 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 exam.xml (French)

* New translations protection.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Russian)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations validator.xml (Japanese)

* New translations objectives.xml (Japanese)

* New translations exam.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations exceptions.xml (Japanese)

* New translations alert_titles.xml (Japanese)

* New translations alert_descriptions.xml (Japanese)

* New translations alert_codes.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Romanian)

* New translations strings.xml (Danish)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

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

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

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

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

* New translations strings.xml (Chinese Simplified)

* 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 (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 (Serbian (Latin))

* New translations strings.xml (Russian)

* New translations strings.xml (Japanese)

* Update source file strings.xml

* Update source file strings.xml

* New translations strings.xml (Spanish)

* New translations protection.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations exam.xml (Spanish)

* New translations protection.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations exam.xml (Spanish)

* New translations exam.xml (Spanish)

* New translations exam.xml (Spanish)

* New translations exam.xml (Spanish)
2022-11-21 10:13:59 +01:00
Milos Kozak 594d48bc02 remove unused code 2022-11-21 10:13:29 +01:00
Carlos Rafael Giani 61519e43f2 combov2: Disable internal Pump.connect() connection attempt limiter
QueueThread already has a timeout; the limiter is redundant.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 23:05:24 +01:00
Carlos Rafael Giani 90480ab1d9 comboctl-main: Add more argument checks to Pump.connect()
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 23:04:30 +01:00
Carlos Rafael Giani 605fe04d74 comboctl-main: Check for unchanging screen type in navigateToRTScreen()
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 21:58:50 +01:00
Carlos Rafael Giani 5aeb401cc0 combov2: Autodetect reservoir and battery changes and insert them as events
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 21:04:53 +01:00
Carlos Rafael Giani 8bef914eac combov2: Store battery and reservoir levels as plain properties
This fixes https://github.com/dv1/AndroidAPS/issues/2

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 19:55:04 +01:00
Carlos Rafael Giani 2bde0f154d comboctl-main: Add and fix unit tests
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 18:59:21 +01:00
Carlos Rafael Giani 96c8145dc3 comboctl-main: During corrective short button presses check screens
After a long button press, short button presses may be necessary to
fix "overshoots". An alert screen may appear during those short button
presses, so look at the screens to make sure alerts are not missed.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 18:59:17 +01:00
Carlos Rafael Giani 8b2666ff74 comboctl-main: Only receive frames if long RT button press was skipped
The code in adjustQuantityOnScreen() needs an current quantity. This is
determined during the long button press. If no such long button press
happens, get the quantity by explicitly receiving parsed frames. But
don't read those parsed frames if a long button press happened; this
is redundant and just slows down the function.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 18:59:12 +01:00
Carlos Rafael Giani 03a32f09cf comboctl-main: Catch getParsedDisplayFrame() exceptions and rethrow later
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 18:59:08 +01:00
Carlos Rafael Giani 8d6171db49 comboctl-parser: Support main screens with ext/multiwave and TBR symbols
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 18:58:51 +01:00
Carlos Rafael Giani e9294c59a0 comboctl-parser: Parse remaining duration in TBR percentage screen
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 18:58:47 +01:00
Carlos Rafael Giani cc26eb8ed8 combov2: Also limit TBR percentage when AAPS sets absolute TBR
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-19 23:47:49 +01:00
Carlos Rafael Giani d50feec302 comboctl-main: Correctly handle alerts after bolus was delivered
In particular, if a bolus brings the reservoir level below the low
threshold, a W1 warning shows up on the pump itself during bolus delivery.
Once delivery is done, the W1 shows up in the RT mode as well. Bolus
delivery is special in that the deliverBolus() function has to manually
switch back to RT mode to get the reservoir level post-bolus to update
the reservoirLevel value. When that is done, the aforementioned alert
screen can show up. Add code to handle alert screen handling to that
special post-bolus check.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-19 13:56:01 +01:00
Carlos Rafael Giani 20d4a0c692 comboctl-main: Fix computeShortRTButtonPress() cyclic quantity bug
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-19 11:22:10 +01:00
Milos Kozak 72505b6093 remove dependencies from setup wizard 2022-11-18 23:22:00 +01:00
Milos Kozak dd9518b73b Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2022-11-18 19:51:42 +01:00
Milos Kozak 562870723e move Loop to plugins 2022-11-18 19:51:39 +01:00
Milos Kozak 1ea173b83d
Merge pull request #2209 from nightscout/dependabot/gradle/dev/com.google.firebase-firebase-bom-31.1.0
chore(deps): bump firebase-bom from 31.0.3 to 31.1.0
2022-11-18 19:45:39 +01:00
Milos Kozak 232b44b153 move Intents 2022-11-18 19:03:26 +01:00
dependabot[bot] 72d423b471
chore(deps): bump firebase-bom from 31.0.3 to 31.1.0
Bumps firebase-bom from 31.0.3 to 31.1.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-18 16:36:04 +00:00
Milos Kozak cfe9875b68 fix tests 2022-11-18 17:28:13 +01:00
Milos Kozak bd860f4a52 optimize dependencies 2022-11-17 20:37:51 +01:00
Milos Kozak 222a22b45e SHouw only date in About dialog 2022-11-17 18:06:03 +01:00
Milos Kozak c86f25824a rename classes 2022-11-16 10:47:53 +01:00
Milos Kozak 152fd063cb Aaps -> WearApp 2022-11-16 10:36:42 +01:00
Milos Kozak 1b08e78809 make ktlint global, remove detekt 2022-11-16 10:29:20 +01:00
Milos Kozak 4be8c1a554 Gradle test 2022-11-16 09:42:44 +01:00
Milos Kozak 99c232a2e5 fix actions fragment 2022-11-15 23:02:25 +01:00
Milos Kozak c0f9184f7b fix tests 2022-11-15 22:49:58 +01:00
Milos Kozak d8880b36bf fix tests 2022-11-15 21:48:43 +01:00
Milos Kozak 2bfe8c272d
New Crowdin updates (#2203)
* New translations validator.xml (Catalan)

* New translations strings.xml (Catalan)

* New translations strings.xml (Catalan)

* New translations strings.xml (Catalan)

* New translations exam.xml (Czech)

* New translations validator.xml (Afrikaans)

* New translations objectives.xml (Afrikaans)

* New translations objectives.xml (Romanian)

* New translations protection.xml (Romanian)

* New translations validator.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations exam.xml (French)

* New translations objectives.xml (French)

* New translations protection.xml (French)

* New translations validator.xml (French)

* New translations strings.xml (French)

* New translations exam.xml (Afrikaans)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations exam.xml (Spanish)

* New translations objectives.xml (Spanish)

* New translations protection.xml (Spanish)

* New translations validator.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations objectives.xml (Czech)

* New translations protection.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations validator.xml (Czech)

* New translations exam.xml (Hebrew)

* New translations objectives.xml (Irish)

* New translations strings.xml (Irish)

* New translations strings.xml (Irish)

* New translations strings.xml (Irish)

* New translations validator.xml (Hebrew)

* New translations objectives.xml (Hebrew)

* New translations protection.xml (Hebrew)

* New translations strings.xml (Greek)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Greek)

* New translations validator.xml (Greek)

* New translations strings.xml (Greek)

* New translations exam.xml (German)

* New translations exam.xml (Danish)

* New translations objectives.xml (Danish)

* New translations validator.xml (Danish)

* New translations strings.xml (Danish)

* New translations strings.xml (Danish)

* New translations strings.xml (Danish)

* New translations objectives.xml (German)

* New translations protection.xml (German)

* New translations validator.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations exam.xml (Greek)

* New translations objectives.xml (Greek)

* New translations protection.xml (Greek)

* New translations objectives.xml (Norwegian)

* New translations exam.xml (Dutch)

* New translations objectives.xml (Dutch)

* New translations protection.xml (Dutch)

* New translations validator.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations exam.xml (Norwegian)

* New translations strings.xml (Lithuanian)

* New translations validator.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations exam.xml (Polish)

* New translations objectives.xml (Polish)

* New translations protection.xml (Polish)

* New translations validator.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Hungarian)

* New translations exam.xml (Korean)

* New translations strings.xml (Hungarian)

* New translations exam.xml (Italian)

* New translations objectives.xml (Italian)

* New translations protection.xml (Italian)

* New translations validator.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations objectives.xml (Korean)

* New translations protection.xml (Korean)

* New translations validator.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations exam.xml (Lithuanian)

* New translations objectives.xml (Lithuanian)

* New translations protection.xml (Lithuanian)

* New translations validator.xml (Lithuanian)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations validator.xml (Portuguese)

* New translations protection.xml (Portuguese)

* New translations objectives.xml (Portuguese)

* New translations exam.xml (Portuguese)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations exam.xml (Turkish)

* New translations objectives.xml (Turkish)

* New translations protection.xml (Turkish)

* New translations validator.xml (Turkish)

* New translations protection.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations exam.xml (Chinese Simplified)

* New translations objectives.xml (Chinese Simplified)

* New translations validator.xml (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations validator.xml (Swedish)

* New translations strings.xml (Russian)

* New translations exam.xml (Russian)

* New translations objectives.xml (Russian)

* New translations protection.xml (Russian)

* New translations validator.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations exam.xml (Slovak)

* New translations protection.xml (Swedish)

* New translations objectives.xml (Slovak)

* New translations protection.xml (Slovak)

* New translations validator.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations exam.xml (Swedish)

* New translations objectives.xml (Swedish)

* New translations strings.xml (Chinese Simplified)

* New translations exam.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Croatian)

* New translations objectives.xml (Portuguese, Brazilian)

* New translations objectives.xml (Croatian)

* New translations exam.xml (Croatian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations validator.xml (Portuguese, Brazilian)

* New translations protection.xml (Portuguese, Brazilian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Hebrew)

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

* New translations strings.xml (Czech)

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

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (French)

* New translations strings.xml (Hungarian)

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

* New translations strings.xml (Hebrew)

* New translations strings.xml (Korean)

* New translations strings.xml (Croatian)

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

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Russian)

* New translations strings.xml (Swedish)

* New translations exam.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Turkish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (German)

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

* New translations strings.xml (Russian)

* New translations strings.xml (Hebrew)

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

* New translations strings.xml (Norwegian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)
2022-11-15 19:29:03 +01:00
Milos Kozak ae5dec334d Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2022-11-15 19:28:31 +01:00
Milos Kozak ae3650793f optimize SetupWizard 2022-11-15 19:28:21 +01:00