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
4ea6b48047
Merge branch 'dev' into comboctl-dev
2022-11-21 19:58:10 +01:00
Milos Kozak
6fa7877048
merge Config & BuildHelper
2022-11-21 13:51:47 +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
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
232b44b153
move Intents
2022-11-18 19:03:26 +01: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
1b08e78809
make ktlint global, remove detekt
2022-11-16 10:29:20 +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
ae3650793f
optimize SetupWizard
2022-11-15 19:28:21 +01:00
Milos Kozak
07f1168270
move UserEntryMapper
2022-11-14 14:22:41 +01:00
Milos Kozak
d50d1bf9c9
NumberPicker -> :core:ui
2022-11-14 13:53:25 +01:00
Milos Kozak
a2f048adc4
ToastUtils -> :core:ui
2022-11-14 13:25:09 +01:00
Milos Kozak
d8bfcad7e9
classes -> :core:ui
2022-11-14 12:39:38 +01:00
Milos Kozak
b6b3600410
elements -> :core:ui
2022-11-14 11:18:33 +01:00
Milos Kozak
359b3f41b5
Dialogs -> :core:ui
2022-11-14 10:58:59 +01:00
Milos Kozak
f141d003a4
PumpEnactResult
2022-11-14 08:30:50 +01:00
Milos Kozak
c9164e6274
break more dependencies
2022-11-13 18:14:37 +01:00
Milos Kozak
fcd75c35d6
fix build
2022-11-12 09:07:37 +01:00
Milos Kozak
6fab5a9b8d
move to interfaces
2022-11-11 23:17:09 +01:00
Milos Kozak
4e939e0c8c
simplify dependency
2022-11-11 20:22:12 +01:00
Milos Kozak
8c44879150
move to interfaces
2022-11-11 18:54:30 +01:00
Carlos Rafael Giani
3f265c855c
combov2: Fix last bolus field in combov2 UI fragment
...
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-11 18:05:31 +01:00
Milos Kozak
d108755814
move to plugins module
2022-11-11 17:46:09 +01:00
Milos Kozak
3305672ade
rename
2022-11-11 09:43:07 +01:00
Milos Kozak
e4ccc78a7d
ProfileViewerDialog -> ui
2022-11-11 09:38:36 +01:00
Milos Kozak
88899417a9
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2022-11-11 08:31:32 +01:00
Milos Kozak
9d14db71c7
Eopatch: fix pairing
2022-11-11 08:31:19 +01:00
Carlos Rafael Giani
03d226e725
combov2: Show dedicated message when hitting unexpected TBR % limit
...
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-10 23:41:45 +01:00
Milos Kozak
73f876a45d
move to interfaces
2022-11-10 19:27:04 +01:00
Carlos Rafael Giani
ced93e4a53
comboctl-main: Check if RT quantity adjustment hits an unexpected limit
...
This is important for example if the Combo is not properly configured
and the user tries to set a TBR percentage beyond the configured limit.
The RT UI will then clamp the percentage to that limit, and the quantity
won't increase anymore. Without this new check, this causes the code
to be stuck in an endless loop.
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-10 19:21:02 +01:00
Carlos Rafael Giani
c3c894cccb
comboctl-main: Rework longPressRTButtonUntil() implementation
...
The new implementation overshoots less often, runs generally faster,
and correctly forwards exceptions thrown by the checkScreen callback.
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-10 19:21:02 +01:00
Milos Kozak
c31bfc7c23
move profiles to interfaces
2022-11-10 16:55:18 +01:00
Milos Kozak
85f85e388f
move to interfaces
2022-11-10 14:01:14 +01:00
