Dominik Dzienia
64a95dcdae
Add comments and maxLength to clarify some of Wear OS translations
2019-12-10 19:29:11 +01:00
Milos Kozak
5816488b31
Merge pull request #2247 from Philoul/watch_strings
...
Watch strings
2019-12-10 13:54:03 +01:00
Dominik Dzienia
7ec1bbc260
[FIX] For wear OS, fixes main menu items layout, allowing longer labels to be displayed properly. It uses API26+ autosizing to fit longer menu entries.
2019-12-10 12:16:16 +01:00
Philoul
f6649939aa
Text string in layout (but no sure if it's necessary...)
2019-12-08 00:02:21 +01:00
Philoul
401b4c170f
replacing getRessources.getString with aaps.gs in java files
2019-12-07 23:14:36 +01:00
Milos Kozak
e2e74c0014
New Crowdin translations ( #2242 )
...
* New translations strings.xml (Dutch)
* New translations strings.xml (Czech)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Spanish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Polish)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Croatian)
* New translations strings.xml (Czech)
* New translations strings.xml (Dutch)
* New translations strings.xml (Finnish)
* New translations strings.xml (French)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (German)
* New translations strings.xml (Greek)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Irish)
* New translations strings.xml (Italian)
* New translations strings.xml (Japanese)
* New translations strings.xml (Korean)
* New translations strings.xml (Turkish)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Slovak)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Slovak)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Bulgarian)
2019-12-07 12:42:27 +01:00
Philoul
d50f01af3d
Missing strings in FillMenuActivity
2019-12-06 09:16:20 +01:00
Philoul
bfe7a34735
Second commit with mainly java files
2019-12-05 21:00:39 +01:00
Philoul
c716ac006b
Merge remote-tracking branch 'origin/dev' into watch_strings
...
# Conflicts:
# wear/src/main/res/values/strings.xml
2019-12-05 18:26:57 +01:00
Philoul
c791f67892
First commit (Strings created, title in preferences.xml and BolusActivity.Java updated)
2019-12-05 18:21:48 +01:00
Milos Kozak
48581a0ac6
move wear arrays to extra resources file
2019-12-05 16:39:34 +01:00
Dominik Dzienia
85ee3519fd
( #2240 ) Fixed open loop notifications on wear os - support for Android O channel config
2019-12-04 09:34:59 +01:00
Philoul
d40f6c9fce
I think allmost all strings used in wear watch are created
...
I also created strings for items in menu (ex Quick lefty, Modern Sparse, ...)
And for missing new watchfaces (Cockpit, Steampunk, AAPSv2)
I tried to be simple for string names (category_english_label_lower_case)
2019-12-03 21:31:09 +01:00
dlvoy
b40690d0c2
Merge branch 'dev' into feature/1806_remove_whitebar_wearos
...
Resolved Conflicts in: [...]/watchfaces/Home.java [...]/watchfaces/Home2.java [...]/watchfaces/LargeHome.java
2019-11-28 06:37:32 +01:00
dlvoy
f7b556350c
[ #2210 ][ #728 ] Post-review refactoring (thanks @jotomo !)
2019-11-27 20:32:42 +01:00
dlvoy
0e370fee02
[ #2210 ][ #728 ] Ignoring JaCoCo runtime-injected fields that affected tests
2019-11-26 10:49:01 +01:00
dlvoy
48aa7a887a
[ #2210 ][ #728 ] Tests for complications related, formating, perisitence, utils and data-model code of wear module
2019-11-26 09:30:46 +01:00
dlvoy
1042e8aab8
[ #728 ] Post review / test related minor improvements:
...
- improving mockability when Android classes are used
- POJO Pair instead Java
- old BGWatchData cleanup fix
- Persistence getDataMap fix
- minor fixes and improvements to display formating
2019-11-26 09:30:45 +01:00
dlvoy
20eae8eb12
[ #728 ] Fix for complications update period (from @jotomo review)
2019-11-26 09:30:27 +01:00
dlvoy
1240deb4d3
Merge branch 'dev' into feature/728_wearos_complication
2019-11-22 15:58:41 +01:00
Dominik Dzienia
07ca4b6524
Unit test configuration for Wear OS, first tests
2019-11-21 16:04:18 +01:00
Dominik Dzienia
11665a1d89
[ #728 ] Complication support - Watch OS selection of Short, Long and Image complications with current AAPS status (SGV, trend, delta, BR, IoB, CoB, phone/uploader battery)
2019-11-15 11:23:50 +01:00
Dominik Dzienia
a7589e4758
[ #1806 ] For WearOS app, added option to make white status bar match background of whole watchface and blend in, switchable on Settings -> Matching divider
2019-11-05 17:08:27 +01:00
Milos Kozak
84ecb92771
lint recommendations
2019-07-27 19:56:07 +02:00
Andy Rozman
0b1ef81d40
Updated files that had only formating changes and removed lcoal files.
2019-07-13 12:26:42 +01:00
Andy Rozman
992f69daaa
medtronic-0.12.0-SNAPSHOT
...
- Merge branch 'dev' into medtronic_andy
2019-07-05 14:18:28 +01:00
Milos Kozak
9a76f3386d
androidx transition
2019-05-16 13:57:37 +02:00
Andy Rozman
ad17c66b1b
Merge branch 'dev' into medtronic_andy
2019-04-10 17:05:56 +01:00
Andy Rozman
7392eaeb58
- gradle fixes
...
- remove formatting changes
- moved plugins/general/overview/Dialogs/ to plugins/general/overview/dialogs/
- fixing treatment changes that are received from NS, and extending copying of data to ignore pumpId
2019-04-10 16:24:16 +01:00
Milos Kozak
3b1d96ecc9
LINT: xml
2019-04-08 17:03:18 +02:00
Milos Kozak
eee3bc4838
LINT: WakeLocks
2019-04-08 16:48:19 +02:00
Andy Rozman
bd3529e650
Merge branch 'dev' into medtronic_andy
2019-03-31 20:03:49 +01:00
Andy Rozman
6fcb1ce230
Medtronic 0.8.1-SNAPSHOT
...
- wear changes
- refactoring of decoder
- started work on bolus, tbr, resumes
2019-03-10 19:08:54 +00:00
Andy Rozman
b91ab26863
Wear android manifest
2019-03-06 23:48:45 +00:00
Andy Rozman
6e500c1e75
On both sides changed BIND_LISTENER in manifest and added a lot of logging, some might be commented out.
...
On AAPS side:
- added some capabilites
- fully refactored SendToDataLayerThread (copied from xdrip)
- updated code
- all tasks are now executed on Executor (and not by itself) - main problem that some data was not sent
On Wear side:
- added capabilities and refactored code in ListenerService (by looking at xdrip code)
2019-03-06 23:38:18 +00:00
Andy Rozman
056ad650cd
- changed wear versions
...
- added some code to listener
- added some log entries
2019-03-05 01:05:16 +00:00
Milos Kozak
b6809c9d45
fix compiler warning
2018-10-22 21:27:15 +02:00
AdrianLxM
8716f57978
timeshift can be negative on watch
2018-08-02 21:40:44 +02:00
Sebastian Lenz
971e258265
cancel TBR request notification on wearable if accepted or no longer valid
2018-07-25 23:48:54 +02:00
Sebastian Lenz
8c49119b15
processing the acceptance of the TBR request from the wearable
2018-07-25 23:47:59 +02:00
Sebastian Lenz
e2ef8f2d74
send notification about TBR request to the wearable
2018-07-25 23:46:06 +02:00
AdrianLxM
6e9e9702e0
icons & wear
2018-07-21 21:21:29 +02:00
Milos Kozak
375025f7f0
remove unused string
2018-07-02 15:55:52 +02:00
AdrianLxM
d8603f07be
remove debug clause and smaller fonts
2018-06-27 20:22:19 +02:00
AdrianLxM
15d373f273
vibrate again
2018-06-27 19:03:29 +02:00
AdrianLxM
f160a49ef6
only start one confirm activity
2018-06-27 18:48:09 +02:00
AdrianLxM
815c3c17a9
cleanup.
2018-06-27 18:06:27 +02:00
AdrianLxM
a283586a3c
autodismissing confirm activity.
2018-06-27 18:06:16 +02:00
AdrianLxM
0fe26fda27
confirm activity working
2018-06-27 18:06:07 +02:00
AdrianLxM
aad2b94c8e
first confirm activity
2018-06-27 18:05:55 +02:00
AdrianLxM
b05b300faf
ecarb duration format
2018-05-03 22:08:35 +02:00
AdrianLxM
f2168ff36b
ecarb hang in activity again
2018-05-03 22:08:19 +02:00
AdrianLxM
76277d11ad
ecarb hang in activity
2018-05-03 22:08:11 +02:00
AdrianLxM
71db7b60c9
ecarb first activity
2018-05-03 22:08:02 +02:00
AdrianLxM
917fcb5953
wearwizard reorder menu
2018-05-03 17:49:27 +02:00
AdrianLxM
c394c045c9
wearwizard reduced watch settings
2018-05-03 17:49:09 +02:00
AdrianLxM
bdfce784c0
wearwizard ensure watch apk is up to date
2018-05-03 17:49:05 +02:00
Johannes Mockenhaupt
c51635dba4
Watch: colored preds.
2018-05-02 16:01:40 +02:00
AdrianLxM
2414be85f2
dummy-edit to re-trigger travis
2018-04-10 22:53:27 +02:00
swissalpine
2972138d2a
Fix for black number and labels on black background (aaps wear)
2018-04-10 22:14:52 +02:00
Milos Kozak
132400bb9e
Merge pull request #859 from MilosKozak/watchsmb
...
Watchsmb
2018-04-09 15:19:24 +02:00
Milos Kozak
bcb733e42c
Plugins refactor
2018-03-31 00:36:03 +02:00
AdrianLxM
1738aea4de
Don't overlap time ticks with current time
2018-03-16 23:57:58 +01:00
Andrew Warrington
d8d87e1ffd
BaseWatchFace.java: Update chart with bolus and prediction data. (Affects AAPSv2 and Steampunk watch faces.)
2018-03-11 21:18:03 +01:00
Johannes Mockenhaupt
7bd85c5972
Use meal color parameter.
2018-03-08 14:26:50 +01:00
AdrianLxM
0818f3b419
Merge remote-tracking branch 'swissalpineremote/patch-4' into watchsmb2
2018-03-04 20:18:43 +01:00
AdrianLxM
d7deaa15eb
wear COB string better default
2018-03-04 20:14:58 +01:00
AdrianLxM
62295d001f
wear COB in status
2018-03-04 20:13:16 +01:00
AdrianLxM
2f40feef65
wear empty label needed
2018-03-04 15:41:32 +01:00
AdrianLxM
d500b15947
wear carbs always colour
2018-03-04 15:40:36 +01:00
AdrianLxM
e2b829a60a
wear first carbs
2018-03-04 15:37:55 +01:00
AdrianLxM
ef75e2759c
wear carbonly is valid
2018-03-04 15:09:59 +01:00
AdrianLxM
b98dc5c72f
wear timeframe bolus
2018-03-04 14:47:30 +01:00
AdrianLxM
a4eb82c524
wear bgGraphbuilder isValid bolus
2018-03-04 14:06:19 +01:00
AdrianLxM
acf7e36d61
wear bgGraphbuilder switch to non-deprecated methods
2018-03-04 13:56:17 +01:00
AdrianLxM
5a80215578
wear timeticks
2018-03-04 13:35:17 +01:00
AdrianLxM
a503bfaeef
wear endtime in lowres
2018-03-04 12:50:06 +01:00
AdrianLxM
436e03aa03
wear only print valid boluses
2018-02-24 18:10:59 +01:00
swissalpine
60df8da729
Add files via upload
2018-02-21 20:49:32 +01:00
swissalpine
24ccb1bef3
Update round_activity_bigchart_small.xml
2018-02-21 16:59:07 +01:00
swissalpine
0781266dd2
Update rect_activity_bigchart_small.xml
2018-02-21 16:57:42 +01:00
swissalpine
f0886b4476
Add files via upload
2018-02-21 16:56:25 +01:00
swissalpine
20a005c899
Update NOChart.java
2018-02-21 16:55:25 +01:00
swissalpine
90ce3a524f
Update BIGChart.java
2018-02-21 16:53:31 +01:00
AdrianLxM
28c2779408
wear hour tics for predictions
2018-02-21 15:11:38 +01:00
AdrianLxM
8db4a05e1c
wear high/low line fit to predictions
2018-02-21 14:32:48 +01:00
AdrianLxM
c6a3efb60e
wear adaptive prediction timeframe
2018-02-21 14:23:52 +01:00
AdrianLxM
8ee7309d86
smb and bolus on wear
2018-02-21 01:56:06 +01:00
AdrianLxM
f6253284de
show boluses on bigchart
2018-02-20 15:39:02 +01:00
AdrianLxM
126322053e
pass bolus data to wear graph builder
2018-02-20 14:14:27 +01:00
AdrianLxM
c10468e90f
small cleanup
2018-02-20 13:58:25 +01:00
AdrianLxM
6a1b777bc3
include bigchart watchface for very small watches
2018-02-20 13:51:00 +01:00
Andrew Warrington
0f9273093a
BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
2018-01-29 23:34:03 +01:00
Andrew Warrington
44e6c874c0
BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
2018-01-29 23:31:54 +01:00
Andrew Warrington
13ad74f77b
Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown).
2018-01-06 14:21:31 +01:00
Andrew Warrington
02e7752c3e
Cockpit watch face: Double-tap opens MainMenuActivity
2018-01-05 11:58:57 +01:00
AdrianLxM
41fb92815b
request new data on preference change
2018-01-04 12:22:08 +01:00
AdrianLxM
5270f2cc69
narrower temp basal line for steampunk watchface
2018-01-03 18:58:02 +01:00
AdrianLxM
a75ff0d1f6
darker and gracile steampunk-chart
2018-01-03 18:13:38 +01:00
Andrew Warrington
267bdd6a43
Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen - xml files.
2018-01-03 16:33:39 +01:00
Andrew Warrington
512341e603
Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen.
2018-01-03 15:24:06 +01:00
AdrianLxM
99f0bbb478
move steampunk md to main dir
2018-01-03 14:00:57 +01:00
Andrew Warrington
7ac413553b
Addition of a file linking to the location of the Steampunk source photoshop file. File is not included in the repository as it exceeds Github's 25 mb limit.
2018-01-03 10:58:10 +01:00
Andrew Warrington
8b37826335
Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial).
2018-01-03 10:41:18 +01:00
Andrew Warrington
37f262efdc
Steampunk watch face - unit testing complete.
2018-01-03 01:18:13 +01:00
Andrew Warrington
7b0cc80369
Steampunk watchface: Updated graphics for more accuracy / brighter background, enabled double-tap, corrected issue when changing from mg/dL to mmol/L (glucose would show as "low").
2018-01-02 15:11:59 +01:00
Andrew Warrington
5609fbf738
Steampunk watchface (moto360 support - ignores the chin)
2018-01-02 00:30:20 +01:00
Andrew Warrington
c43afd9d28
Merge remote-tracking branch 'origin/dev' into watchfaces
2017-12-28 01:03:02 +01:00
Andrew Warrington
b180569695
Show watch basal rates, whether temporary or normal.
2017-12-18 21:58:02 +01:00
Andrew Warrington
bc8b93045b
Steampunk watchface (mmol support)
...
Includes delta granularity in the watch preferences.
2017-12-17 23:07:44 +01:00
Andrew Warrington
9e6f124097
Steampunk watchface (interim commit)
2017-12-12 23:17:25 +01:00
Andrew Warrington
ac37d691ee
Steampunk watch face addition of mmol/L drawable
2017-12-12 06:15:47 +01:00
Andrew Warrington
c453eababb
Steampunk watch face layout changes
2017-12-11 07:15:57 +01:00
Andrew Warrington
74e833c873
Steampunk watch face (for testing)
2017-12-10 21:39:21 +01:00
Andrew Warrington
c3aef7b6f2
Steampunk watch face (not yet functional)
2017-12-10 03:29:14 +01:00
Andrew Warrington
2d3333deda
Steampunk watch face (not yet functional)
2017-12-09 14:23:43 +01:00
AdrianLxM
0701dc4a52
make chart zoomable again
2017-12-04 20:08:57 +01:00
AdrianLxM
c83f966d92
wear timestamps long
2017-12-04 18:40:13 +01:00
Andrew Warrington
9dca53f968
Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
2017-12-03 18:53:52 +01:00
Andrew Warrington
ff0607d010
Update following testing! Bug fixes:
...
- Detailed IOB always shown in older watch faces (fixed)
- Cockpit: Loop graphic stays red once set (fixed)
Design changes:
- AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic)
- Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces.
- Changed to 1 decimal point in BGI to gain space. This will affect older watches as well.
- Changed order of preferences to match screen layout more closely
New features:
- Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2
2017-11-28 21:33:43 +01:00
Andrew Warrington
dcf79c710c
Update following testing! Bug fixes:
...
- Detailed IOB always shown in older watch faces (fixed)
- Cockpit: Loop graphic stays red once set (fixed)
Design changes:
- AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic)
- Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces.
- Changed to 1 decimal point in BGI to gain space. This will affect older watches as well.
- Changed order of preferences to match screen layout more closely
New features:
- Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2
2017-11-28 09:24:52 +01:00
Andrew Warrington
d1fbaa29c9
Ready for review. Summary of all changes to date: New watch faces AAPSv2 and AAPS(Cockpit) work on both round and rectangular screens. Tested on Asus Zenwatch 3, Moto 360 42mm, and Sony Smart Watch 3. New watch settings included, to add/remove individual data items from the display. WatchUpdaterService and BaseWatchFace both updated to enable switching on and off of individual data items.
2017-11-22 22:46:43 +01:00
Andrew Warrington
78dd6d165b
Addition of the "airplane cockpit" watch face -- unfinished. This commit is not yet ready to be merged into dev as more work is required for compatibility with multiple watches.
2017-11-19 22:14:28 +01:00
Andrew Warrington
bc485a4783
Refactor of BaseWatchFace.java in order to allow greater flexibility in presenting or removing data from various watch faces.
...
Inclusion of Home2 ("AAPSv2") watch face for round.
2017-11-15 23:07:44 +01:00
Andrew Warrington
45a26da8b3
Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu.
...
Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.
2017-11-12 21:46:32 +01:00
Andrew Warrington
d70860bd97
Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu.
...
Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.
2017-11-05 21:41:50 +01:00
AdrianLxM
f751638a7f
enabling wearcontrols from preferences
2017-10-12 18:01:10 +02:00
Johannes Mockenhaupt
5c3ec9a086
Use SystemClock.sleep instead of Thread.sleep.
...
Gets rid of all those pointless InterruptedException catching.
(cherry picked from commit 6acaa2b)
2017-09-09 16:41:11 +02:00
Johannes Mockenhaupt
c50fad81bb
Log exceptions in catch blocks rather than printing to console.
...
The default code used by Android Studio when generating a
try/catch can be altered in Settings under
Editor->File and Code Templates->Catch Statement body
to
log.error("Unhandled exception", e);
to also do this for newly generated code.
(cherry picked from commit c2ae29f)
(cherry picked from commit 6031a25)
2017-09-09 16:41:06 +02:00
AdrianLxM
7bc0a18f6e
Version-Number in settings
2017-08-08 02:06:46 +02:00
AdrianLxM
5569b42ac3
wear wizard percentage
2017-07-26 09:58:51 +02:00
AdrianLxM
50c26f28fd
wear TDD status
2017-07-17 22:39:48 +02:00
AdrianLxM
387cfcccaf
wear menu simplification
2017-07-17 22:39:00 +02:00
AdrianLxM
7fa8ea7224
cpp-watch working2
2017-07-10 04:46:29 +02:00
AdrianLxM
85d028abff
cpp watch openactivity
2017-07-10 04:45:08 +02:00
AdrianLxM
e81b217c94
wear show oaps result/reason
2017-07-03 01:47:58 +02:00
AdrianLxM
f0521c0197
nighttime watchface
2017-06-30 01:49:32 +02:00
Milos Kozak
43231cc362
use System.currentTimeMillis()
2017-06-15 23:12:12 +02:00
AdrianLxM
37e00d33aa
wear setting for single temp target instead of range
2017-04-30 20:20:04 +02:00
AdrianLxM
1c522d4a4d
wear 5 minute steps for duration of temp targets
2017-02-19 22:42:31 +01:00
AdrianLxM
74562ae548
wear settings same background as menu
2017-02-15 16:27:46 +01:00
AdrianLxM
f0fc3f6688
wear added viktoria's design
2017-02-13 17:48:11 +01:00
AdrianLxM
56e5fae27d
wear allow multiple input layouts
2017-02-13 16:54:06 +01:00
AdrianLxM
e85e651c56
wear full status support and product flavour with/without controls on wear
2017-02-13 01:55:35 +01:00
AdrianLxM
65d1624a5f
wear carb restriction
2017-02-12 19:50:25 +01:00
AdrianLxM
d9103b6823
wear wizard confirm reformat, connection stability, prime not in menu per default
2017-02-11 19:51:33 +01:00
AdrianLxM
c8dc7bf9c8
wear menu list layout
2017-02-11 02:50:18 +01:00
AdrianLxM
705f563f2f
wear TTarget -> TempT
2017-02-10 21:27:50 +01:00
AdrianLxM
108095ad77
wear confirmation timeout and larger text for editplusminus
2017-02-10 21:20:47 +01:00
AdrianLxM
bdcff12b01
wear keep data when looking/swiping back
2017-02-10 12:00:38 +01:00