Andrei Vereha
|
88b4830a0c
|
show notification only once and if there is no CommandDeactivatePod in progress
|
2021-11-13 12:41:53 +01:00 |
|
Andrei Vereha
|
b0b287303a
|
Revert "do not stop the fake tbr on pod activation"
This reverts commit 041f1a962e .
|
2021-11-12 18:15:52 +01:00 |
|
Andrei Vereha
|
90b8b8ed00
|
create new string for "Delivering .."
|
2021-11-12 18:15:03 +01:00 |
|
Andrei Vereha
|
041f1a962e
|
do not stop the fake tbr on pod activation
|
2021-11-11 20:49:52 +01:00 |
|
Andrei Vereha
|
59c7955126
|
connection quality: count connections after retries
|
2021-11-11 19:04:28 +01:00 |
|
Andrei Vereha
|
7826c41834
|
delay observing for EventPumpStatusChanged
|
2021-11-11 17:41:37 +01:00 |
|
Andrei Vereha
|
3a9213992b
|
fix connnecting quality counter
|
2021-11-11 00:18:56 +01:00 |
|
Andrei Vereha
|
e7f93145a0
|
fix .bolusDelivered in the deliverTreatment response
|
2021-11-09 23:27:42 +01:00 |
|
Andrei Vereha
|
247768c139
|
ktlintFormat
|
2021-11-09 23:26:44 +01:00 |
|
Andrei Vereha
|
ea60e21d1a
|
fix crash
|
2021-11-08 20:51:49 +01:00 |
|
Milos Kozak
|
0db34981d4
|
rename CommandQueue
|
2021-11-07 17:19:06 +01:00 |
|
Milos Kozak
|
381b27d27f
|
New Crowdin updates (#851)
* New translations strings.xml (Spanish)
* New translations strings.xml (Russian)
|
2021-11-06 12:02:53 +01:00 |
|
Milos Kozak
|
1cd2b33b3e
|
New Crowdin updates (#833)
* Update source file strings.xml
* New translations strings.xml (Hebrew)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations alert_descriptions.xml (Turkish)
* New translations alert_titles.xml (Turkish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations exam.xml (Turkish)
* New translations objectives.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations exam.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations validator.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Czech)
* New translations strings.xml (Hungarian)
* New translations strings.xml (Hungarian)
* New translations exceptions.xml (Hungarian)
* New translations alert_titles.xml (Hungarian)
* New translations alert_descriptions.xml (Hungarian)
* New translations alert_codes.xml (Hungarian)
* New translations strings.xml (Hungarian)
* New translations validator.xml (Hungarian)
* New translations strings.xml (Hungarian)
* New translations strings.xml (Hungarian)
* New translations strings.xml (Hungarian)
* New translations strings.xml (Hungarian)
* New translations strings.xml (Hungarian)
* New translations strings.xml (Hungarian)
* New translations strings.xml (Hungarian)
* New translations strings.xml (Hungarian)
* New translations strings.xml (Hungarian)
* New translations objectives.xml (Hungarian)
* New translations exam.xml (Hungarian)
* New translations strings.xml (Hungarian)
* New translations strings.xml (Turkish)
* New translations strings.xml (Hungarian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Italian)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations validator.xml (Turkish)
* New translations strings.xml (French)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations exam.xml (Catalan)
* Update source file strings.xml
* New translations strings.xml (German)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Italian)
* New translations strings.xml (Turkish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations exam.xml (Catalan)
* New translations strings.xml (Catalan)
* New translations strings.xml (Czech)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Slovak)
* New translations strings.xml (Bulgarian)
* New translations exam.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations alert_descriptions.xml (Bulgarian)
* New translations alert_titles.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations exam.xml (Catalan)
* New translations exam.xml (Catalan)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Polish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
|
2021-11-05 23:24:39 +01:00 |
|
Milos Kozak
|
756957ed8c
|
resourceHelper -> rh
|
2021-11-04 10:56:12 +01:00 |
|
Milos Kozak
|
bb2fced905
|
fix NaN in statistics
|
2021-11-02 09:53:16 +01:00 |
|
Milos Kozak
|
561f88e4ff
|
New Crowdin updates (#800)
* New translations strings.xml (Romanian)
* New translations strings.xml (Tamil)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovenian)
* 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 (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Polish)
* New translations strings.xml (French)
* New translations strings.xml (German)
* 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 (Norwegian)
* New translations strings.xml (Irish)
* 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 (Dutch)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Russian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Czech)
* New translations strings.xml (French)
* New translations strings.xml (Italian)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
|
2021-11-01 17:17:28 +01:00 |
|
Milos Kozak
|
ef6270aa85
|
Merge pull request #804 from 0pen-dash/history_colors
DASH History colors
|
2021-11-01 07:34:32 +01:00 |
|
Milos Kozak
|
91af48a7f6
|
Merge pull request #817 from 0pen-dash/avereha/fix-deactivation
fix deactivation
|
2021-11-01 07:33:57 +01:00 |
|
Milos Kozak
|
a7ce4c0150
|
view param nullable
|
2021-10-31 17:46:22 +01:00 |
|
Andrei Vereha
|
c68491ba78
|
fix deactivation
|
2021-10-31 00:22:50 +02:00 |
|
Milos Kozak
|
42daad43f4
|
EROS: so not run commands on UI thread
|
2021-10-30 19:44:54 +02:00 |
|
Theo van Elsberg
|
d966254815
|
klint
|
2021-10-30 01:14:17 +02:00 |
|
Milos Kozak
|
414e57cc63
|
lints
|
2021-10-29 18:16:49 +02:00 |
|
Milos Kozak
|
35a33a3384
|
Merge branch 'dash-history' of https://github.com/0pen-dash/AndroidAPS into 0pen-dash-dash-history
|
2021-10-28 21:07:25 +02:00 |
|
Milos Kozak
|
9842f5cd2f
|
New Crowdin updates (#799)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Spanish)
* New translations exam.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations exam.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 strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations exam.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations validator.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations alert_descriptions.xml (Spanish)
* New translations alert_titles.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Czech)
* New translations strings.xml (Danish)
* New translations strings.xml (Czech)
* New translations strings.xml (Catalan)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
|
2021-10-28 21:03:55 +02:00 |
|
Theo van Elsberg
|
b645185005
|
Refactoring name
|
2021-10-27 22:54:09 +02:00 |
|
Theo van Elsberg
|
f96727224d
|
Add some color to History, include success state
|
2021-10-27 22:46:38 +02:00 |
|
Andrei Vereha
|
7849f45b73
|
count the number of pod activations
|
2021-10-27 09:18:07 +02:00 |
|
Andrei Vereha
|
784f76ca30
|
use the original date for history, not the resolved date
|
2021-10-27 09:11:07 +02:00 |
|
Theo van Elsberg
|
735ff383d9
|
Add some color to History
|
2021-10-27 01:24:41 +02:00 |
|
Andrei Vereha
|
abc051d64e
|
fix alerts. fix display for basal rates
|
2021-10-26 22:53:20 +02:00 |
|
Andrei Vereha
|
45fb0a5a21
|
history updates: auto resolve history entried for activation. update history on deactivation. use the right history name for set_time
|
2021-10-26 22:53:20 +02:00 |
|
Andrei Vereha
|
a51c49f81c
|
create history records on pod activation. save basal profiles to history
|
2021-10-26 22:53:20 +02:00 |
|
Andrei Vereha
|
75f51b1408
|
ktlintFormat
|
2021-10-26 22:53:20 +02:00 |
|
Andrei Vereha
|
64682d01fc
|
kotlin
|
2021-10-26 22:53:20 +02:00 |
|
Andrei Vereha
|
7a608c8146
|
display history
|
2021-10-26 22:53:20 +02:00 |
|
Andrei Vereha
|
6cd06edd29
|
display the correct time. display type
|
2021-10-26 22:53:20 +02:00 |
|
Andrei Vereha
|
abfd71a4b8
|
ktlintFormat
|
2021-10-26 22:53:20 +02:00 |
|
Andrei Vereha
|
89a6a2d2ab
|
kotlin
|
2021-10-26 22:53:20 +02:00 |
|
Andrei Vereha
|
80de823bfa
|
kotlin
|
2021-10-26 22:53:20 +02:00 |
|
Andrei Vereha
|
d1b2fa207c
|
kotlin fixes
|
2021-10-26 22:53:20 +02:00 |
|
Andrei Vereha
|
269e94a8b5
|
get history
|
2021-10-26 22:53:20 +02:00 |
|
Andrei Vereha
|
fdcf75c1d9
|
move to Kotlin
|
2021-10-26 22:53:20 +02:00 |
|
Philoul
|
e161ef6bb9
|
Draft for Dash History
|
2021-10-26 22:53:20 +02:00 |
|
Andrei Vereha
|
15dfbe55e5
|
report 50 if reservoir level is >50
|
2021-10-26 18:45:02 +02:00 |
|
Sam Spycher
|
85f0ff4f67
|
fix: inverse comparator in dash history DAO for allSince & add AAPSLoggerTest
|
2021-10-18 01:15:14 +02:00 |
|
Milos Kozak
|
9c9d7e0ee8
|
New Crowdin updates (#741)
* New translations strings.xml (Swedish)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* Update source file strings.xml
* New translations strings.xml (Czech)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Swedish)
* New translations strings.xml (German)
* New translations strings.xml (Polish)
|
2021-10-17 18:50:12 +02:00 |
|
Milos Kozak
|
d6849fc410
|
New Crowdin updates (#729)
* Update source file strings.xml
* Update source file strings.xml
* New translations strings.xml (Hebrew)
* New translations strings.xml (German)
* New translations strings.xml (Russian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Dutch)
* New translations strings.xml (Czech)
* New translations strings.xml (Dutch)
* New translations exam.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations validator.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations alert_descriptions.xml (Dutch)
* New translations alert_titles.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations exam.xml (Polish)
* New translations strings.xml (Polish)
* New translations exam.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations validator.xml (Polish)
* New translations strings.xml (Polish)
* New translations alert_descriptions.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* Update source file strings.xml
* Update source file strings.xml
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Dutch)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* 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 (German)
* New translations strings.xml (Czech)
* Update source file strings.xml
* Update source file strings.xml
* New translations strings.xml (Hebrew)
* New translations strings.xml (Slovak)
* Update source file strings.xml
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
|
2021-10-17 12:55:45 +02:00 |
|
Milos Kozak
|
fd2dff6b52
|
Merge pull request #733 from 0pen-dash/avereha/set-time
handle timezone changes
|
2021-10-15 22:38:34 +02:00 |
|
Milos Kozak
|
857d75c0e6
|
Merge pull request #731 from 0pen-dash/avereha/fix-low-reservoir-alert
dash small fixes
|
2021-10-15 22:38:23 +02:00 |
|
Andrei Vereha
|
72f819b80d
|
implement setTime. handle timezone changes
|
2021-10-15 18:09:31 +02:00 |
|
Milos Kozak
|
1f65ee38c7
|
RxBusWrapper -> RxBus
|
2021-10-15 14:56:22 +02:00 |
|
Andrei Vereha
|
f48956fd0d
|
fix warning
|
2021-10-14 22:10:50 +02:00 |
|
Andrei Vereha
|
883c2322d2
|
nicer
|
2021-10-14 22:09:13 +02:00 |
|
Andrei Vereha
|
60beb0f5b6
|
fixes: updateLowReservoirAlertSettings, call updateExpirationAlertSettings
|
2021-10-14 22:07:52 +02:00 |
|
Andrei Vereha
|
61c137b22b
|
don't crash when bluetooth is not available
|
2021-10-14 21:28:31 +02:00 |
|
Milos Kozak
|
66e35ac83b
|
New Crowdin updates (#718)
* New translations strings.xml (Hebrew)
* Update source file strings.xml
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (German)
* 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 strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Czech)
* Update source file strings.xml
* 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 (Irish)
* 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
* Update source file strings.xml
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Swedish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Romanian)
* New translations strings.xml (Greek)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations exam.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations validator.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Hebrew)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Hebrew)
|
2021-10-13 18:46:31 +02:00 |
|
Milos Kozak
|
7169c78225
|
Merge pull request #722 from 0pen-dash/dash
Dash updates
|
2021-10-10 16:16:17 +02:00 |
|
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 |
|
Milos Kozak
|
59ecd1818d
|
New Crowdin updates (#714)
* Update source file strings.xml
* New translations strings.xml (German)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Norwegian)
* Update source file strings.xml
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Korean)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Swedish)
* New translations exam.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Swedish)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Swedish)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Irish)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Swedish)
* New translations strings.xml (Czech)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations validator.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (French)
|
2021-10-07 23:30:16 +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 |
|
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
|
03b051eb8c
|
fix remaning units
|
2021-10-05 22:54:35 +02:00 |
|
Theo van Elsberg
|
30342f2e23
|
Move fixed values for expiration alerts to PodConstants
|
2021-10-05 00:07:09 +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
|
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 |
|
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 |
|
Andrei Vereha
|
0312eff327
|
bugfix for 0 TBR
|
2021-10-04 10:10:52 +02:00 |
|
Andrei Vereha
|
a1bd84df16
|
cleanup
|
2021-10-03 16:19:05 +02:00 |
|
Andrei Vereha
|
86ceda76c8
|
cleanup
|
2021-10-03 16:18:28 +02:00 |
|
Andrei Vereha
|
f79e5eca6f
|
clear disposables
|
2021-10-03 12:11:41 +02:00 |
|
Andrei Vereha
|
ff023fbaa8
|
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/warning
|
2021-10-02 10:30:02 +02:00 |
|
Andrei Vereha
|
45c02b9b1e
|
fix warnings
|
2021-10-02 10:29:00 +02:00 |
|
Milos Kozak
|
30a70f9f25
|
New Crowdin updates (#702)
* New translations strings.xml (Korean)
* New translations strings.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 (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 (Romanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Irish)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Italian)
* New translations strings.xml (Korean)
* New translations strings.xml (Greek)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Norwegian)
* New translations strings.xml (French)
* New translations strings.xml (Spanish)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (German)
* New translations strings.xml (Catalan)
* New translations strings.xml (Czech)
* New translations strings.xml (Danish)
* New translations strings.xml (German)
* New translations strings.xml (Polish)
* New translations strings.xml (Portuguese)
* New translations exam.xml (Hebrew)
* New translations strings.xml (Croatian)
* New translations strings.xml (Swedish)
* New translations strings.xml (Russian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovenian)
* New translations strings.xml (Turkish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Tamil)
* New translations strings.xml (German)
* New translations strings.xml (Hebrew)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
|
2021-10-01 16:57:25 +02:00 |
|
Milos Kozak
|
a20c24249b
|
do not translate key
|
2021-10-01 14:22:33 +02:00 |
|
Milos Kozak
|
defdb28f93
|
code cleanup
|
2021-10-01 11:07:16 +02:00 |
|
dependabot[bot]
|
e8ab4f9700
|
Bump kulid from 1.1.2.0 to 2.0.0.0
Bumps kulid from 1.1.2.0 to 2.0.0.0.
---
updated-dependencies:
- dependency-name: com.github.guepardoapps:kulid
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2021-09-30 08:06:08 +00:00 |
|
Milos Kozak
|
82980285de
|
fix tests
|
2021-09-29 23:18:43 +02:00 |
|
Andrei Vereha
|
950c745ab7
|
cleanup before merging to dev
|
2021-09-25 18:51:44 +02:00 |
|
Andrei Vereha
|
abc408bc27
|
Revert "remove connection quality"
This reverts commit e4e1af3829 .
|
2021-09-25 13:08:20 +02:00 |
|
Andrei Vereha
|
e4e1af3829
|
remove connection quality
|
2021-09-25 11:02:18 +02:00 |
|
Andrei Vereha
|
274a94d1f3
|
expiry: color yellow 4h before expiration
do not display lot number and unique id
|
2021-09-24 23:41:47 +02:00 |
|
Andrei Vereha
|
69a5d46be6
|
cleanup
|
2021-09-24 19:16:53 +02:00 |
|
Andrei Vereha
|
e174f3982b
|
set TBR 0 when there is no pod
|
2021-09-24 18:42:50 +02:00 |
|
Andrei Vereha
|
544ee9df6b
|
temp basal duration
|
2021-09-23 18:32:51 +02:00 |
|
Andrei Vereha
|
462cae13b5
|
display deactive buttong if bluetoothAddress != null
|
2021-09-23 09:49:53 +02:00 |
|
Andrei Vereha
|
32aa3e3579
|
keep it simple
|
2021-09-21 22:20:33 +02:00 |
|
Andrei Vereha
|
a8e3934b7a
|
update error messages
|
2021-09-21 21:43:11 +02:00 |
|
Andrei Vereha
|
b84f68c934
|
display disconnected status
|
2021-09-21 21:37:12 +02:00 |
|
Andrei Vereha
|
12fc4175dc
|
update default bluetooth status text
|
2021-09-21 21:37:12 +02:00 |
|
Andrei Vereha
|
8184500467
|
fix warnings
|
2021-09-21 21:37:11 +02:00 |
|
Andrei Vereha
|
2dee60b4e0
|
update bluetooth status. fix warnings.
|
2021-09-21 21:37:11 +02:00 |
|
Andrei Vereha
|
8767065fda
|
format
|
2021-09-21 21:37:11 +02:00 |
|
Andrei Vereha
|
6b441b515e
|
more translation
|
2021-09-21 21:37:11 +02:00 |
|
Andrei Vereha
|
613e7963f2
|
translate exceptions. Display expiration 8h before the real expiration
|
2021-09-21 21:37:11 +02:00 |
|
Andrei Vereha
|
40a56d11ee
|
bufix for ALARM_ILLEGAL_PUMP_STATE
|
2021-09-14 20:01:21 +02:00 |
|
Andrei Vereha
|
d4b0935d6b
|
Merge remote-tracking branch 'upstream/dev' into dash
|
2021-09-13 18:39:23 +02:00 |
|
Andrei Vereha
|
3432dcf85f
|
Merge pull request #113 from vanelsberg/FixPodExpires
Pod expiry datetime drifting until next refresh or connection (issue#92)
|
2021-09-12 13:36:24 +02:00 |
|
Andrei Vereha
|
1b1722cbb3
|
Merge pull request #112 from vanelsberg/tvelsberg-fixes3
Minimum fill amount = 80U
|
2021-09-12 13:35:55 +02:00 |
|
Milos Kozak
|
f505e23d50
|
New Crowdin updates (#627)
* 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 (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Russian)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Russian)
* New translations strings.xml (Slovak)
* Update source file exam.xml
* New translations exam.xml (Romanian)
* New translations exam.xml (Dutch)
* New translations exam.xml (Swedish)
* New translations exam.xml (Slovak)
* New translations exam.xml (Russian)
* New translations exam.xml (Portuguese)
* New translations exam.xml (Polish)
* New translations exam.xml (Norwegian)
* New translations exam.xml (Lithuanian)
* New translations exam.xml (French)
* New translations exam.xml (Korean)
* New translations exam.xml (Italian)
* New translations exam.xml (Hebrew)
* New translations exam.xml (German)
* New translations exam.xml (Czech)
* New translations exam.xml (Spanish)
* New translations exam.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations exam.xml (Slovak)
* New translations exam.xml (Czech)
* New translations exam.xml (Italian)
* New translations exam.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations exam.xml (Russian)
* New translations strings.xml (French)
* New translations strings.xml (Romanian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Swedish)
* New translations strings.xml (Russian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Polish)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Czech)
* New translations strings.xml (Slovak)
* New translations strings.xml (Spanish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Italian)
* New translations strings.xml (German)
* Update source file strings.xml
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Tamil)
* 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 (Slovenian)
* 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 (Dutch)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Danish)
* New translations strings.xml (Czech)
* New translations strings.xml (Catalan)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (Romanian)
* New translations strings.xml (Croatian)
* Update source file strings.xml
* New translations strings.xml (Hebrew)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
|
2021-09-08 19:32:52 +02:00 |
|
Theo van Elsberg
|
9e4c1abd12
|
Pod expiry datetime drifting until next refresh or connection (issue#92)
|
2021-09-04 00:17:41 +02:00 |
|
Theo van Elsberg
|
318bdaca6c
|
Minimum fill amount = 80U
|
2021-09-01 20:33:41 +02:00 |
|
Andrei Vereha
|
f9efb49b8a
|
Merge branch 'dash' into avereha/ui
|
2021-08-10 23:24:55 +02:00 |
|
Theo van Elsberg
|
7dacb18479
|
Fixed connection quality display
|
2021-08-10 21:48:25 +02:00 |
|
Andrei Vereha
|
e318a1a23d
|
store normalized TimeZone
|
2021-08-10 20:38:23 +02:00 |
|
Andrei Vereha
|
cca9324eff
|
add more tests for basal rate
|
2021-08-07 20:29:06 +02:00 |
|
Milos Kozak
|
e8f946ad3f
|
New Crowdin updates (#604)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Romanian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Portuguese, Brazilian)
* 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 (Irish)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Spanish)
* Update source file strings.xml
* New translations strings.xml (Czech)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
|
2021-08-06 23:34:21 +02:00 |
|
Andrei Vereha
|
56852ac60e
|
hide buttons if the pod is not activated
|
2021-08-06 20:55:16 +02:00 |
|
Andrei Vereha
|
2680402f2e
|
comment out the omnipod_common_time_change_event_enabled option
|
2021-08-05 21:50:06 +02:00 |
|
Andrei Vereha
|
471f077320
|
convert to primary constructor
|
2021-08-05 21:29:21 +02:00 |
|
Andrei Vereha
|
6cb742d4e9
|
add logging
|
2021-08-05 21:23:45 +02:00 |
|
Andrei Vereha
|
042a21d8da
|
add logging for timezones
|
2021-08-05 21:20:03 +02:00 |
|
Andrei Vereha
|
324469863b
|
undo TZ
|
2021-08-05 21:17:15 +02:00 |
|
Andrei Vereha
|
ae8ba84adb
|
simplify
|
2021-08-03 21:28:40 +02:00 |
|
Andrei Vereha
|
0c401a84c8
|
bugfix: MAX_POD_LIFETIME is in hours
|
2021-08-02 23:42:44 +02:00 |
|
Andrei Vereha
|
64160d24c2
|
format
|
2021-08-02 23:29:19 +02:00 |
|
Andrei Vereha
|
52eb723db2
|
add notification sound when delivery is suspended
|
2021-08-02 23:28:54 +02:00 |
|
Andrei Vereha
|
770a58abd2
|
sync alarm. bugfix on pod deactivation
|
2021-08-02 22:47:36 +02:00 |
|
Andrei Vereha
|
a77a0b21fb
|
alert on suspend. don't use DST for timezone name
|
2021-08-01 23:02:47 +02:00 |
|
Andrei Vereha
|
26321344eb
|
fix compiler warnings
|
2021-07-31 20:17:59 +02:00 |
|
Andrei Vereha
|
657a8f149b
|
fix warnings reported by android studio
|
2021-07-31 20:10:25 +02:00 |
|
Andrei Vereha
|
40a0f4c4af
|
prevent memory leaks
|
2021-07-31 20:06:13 +02:00 |
|
Andrei Vereha
|
97b2287282
|
ktlintFormat
|
2021-07-31 15:02:08 +02:00 |
|
Andrei Vereha
|
24eecda1c0
|
hide also the connection quality field. fix string formatting
|
2021-07-31 14:57:46 +02:00 |
|
AdrianLxM
|
b6d41e7d73
|
make deliveryStatus engineering mode only
|
2021-07-31 13:34:35 +02:00 |
|
AdrianLxM
|
5f22d0ba89
|
make deliveryStatus engineering mode only
|
2021-07-31 13:33:49 +02:00 |
|
Andrei Vereha
|
8743ae208c
|
add connection quality and delivery status
|
2021-07-31 12:50:23 +02:00 |
|
Andrei Vereha
|
e2b419c7cd
|
update comments
|
2021-07-28 19:20:29 +02:00 |
|
Andrei Vereha
|
ec22bec5a6
|
remove todo
|
2021-07-28 19:05:52 +02:00 |
|
Andrei Vereha
|
2e8a81f38d
|
format. refresh Overview
|
2021-07-25 15:18:59 +02:00 |
|
Andrei Vereha
|
ba5529e868
|
fix race
|
2021-07-23 19:30:25 +02:00 |
|
Andrei Vereha
|
eb33e89ea7
|
fixes:
- read(and log) message on connect if there is RTS waiting
- show yellow pod status on unconfirmed commands
|
2021-07-17 12:09:15 +02:00 |
|
Andrei Vereha
|
b9af0c3f6f
|
format
|
2021-07-17 11:45:28 +02:00 |
|
Andrei Vereha
|
e98e1fb485
|
fix option key
|
2021-07-17 11:36:12 +02:00 |
|
Andrei Vereha
|
5283295eda
|
notification sounds
|
2021-07-17 11:33:49 +02:00 |
|
Andrei Vereha
|
bf7ad8e697
|
fixes:
- closeGatt on stopConnecting
- fix stopBolus
|
2021-07-17 10:35:44 +02:00 |
|
Andrei Vereha
|
f9aa967b46
|
set initial basalProgram. fix handshaking state
|
2021-07-16 23:17:37 +02:00 |
|
Andrei Vereha
|
32183aff37
|
format. remove duplication
|
2021-07-16 22:25:37 +02:00 |
|
Andrei Vereha
|
11fa4d842c
|
improve isConnecting
|
2021-07-16 22:14:29 +02:00 |
|
Andrei Vereha
|
b845c06fca
|
update alerts
|
2021-07-16 21:34:38 +02:00 |
|
Andrei Vereha
|
21b78562e2
|
fix command recovery on start
|
2021-07-13 21:27:37 +02:00 |
|
Andrei Vereha
|
bf81db0f6e
|
read message if it's waiting. stop discovery if connection is lost
|
2021-07-13 21:01:36 +02:00 |
|
Andrei Vereha
|
80b47f57c4
|
fix time display
|
2021-07-11 21:44:15 +02:00 |
|