caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
8318 commits 1 branch 20 tags 140 MiB
Commit graph

8318 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philoul 9d22e177bb replaced String.format(MainApp.gs(xx), yy, zz) by MainApp.gs(xx, yy, zz) for bg, cob and carbs 2019-12-08 21:30:25 +01:00
Philoul 1525a30e01
Merge pull request #3 from Philoul/dev 
Dev
 2019-12-08 21:24:13 +01:00
Philoul 967f0f3e5c
Merge pull request #2 from MilosKozak/dev 
Dev
 2019-12-08 21:22:02 +01:00
Milos Kozak 0d6743ab82 Merge branch 'survey' of https://github.com/MilosKozak/AndroidAPS into survey 2019-12-08 20:21:29 +01:00
Milos Kozak fb23cbab54 survey fragment scrollable 2019-12-08 20:12:15 +01:00
Milos Kozak 0e89ced3e1 Merge branch 'dev' into survey 2019-12-08 19:07:35 +01:00
Milos Kozak 66fd83ccb1 biometrics bolus protection 2019-12-08 18:01:52 +01:00
Milos Kozak 3c7454884d protect MainActivity by biometrics 2019-12-08 17:04:39 +01:00
Milos Kozak 9d787505cf Merge branch 'dev' into biometric 2019-12-08 16:43:07 +01:00
Philoul 6d82ceacf9 Replace the text string in the code with MainApp.gs to allow translation 
For bg I leave a decimal. I tried to use valueToUnitsToString but I don't know how to get units from json (NS data I guess) and this method does not work (missing import?) On the JsonHelper object ...
 2019-12-08 01:03:49 +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 ebe4eecaa5
Merge pull request #2250 from MilosKozak/rc 
RC handling
 2019-12-07 22:51:32 +01:00
Milos Kozak c4cf00cc97
Merge pull request #2251 from MilosKozak/adrian/rc2 
rc version refactor
 2019-12-07 20:27:13 +01:00
AdrianLxM 00702ae924 rc version refactor 2019-12-07 20:02:10 +01:00
Milos Kozak 0c19a4081f ignoreCase = true 2019-12-07 19:18:52 +01:00
Milos Kozak 8124c0ae4d RC warnings 2019-12-07 19:15:26 +01:00
Milos Kozak 517b9a9fa7 Handle NS TempTarget sync properly 2019-12-07 18:14:32 +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
Roumen Georgiev 7889e3755d Adding GOING_IN & GOING_OUT modes 2019-12-06 15:03:17 +02:00
Philoul d50f01af3d Missing strings in FillMenuActivity 2019-12-06 09:16:20 +01:00
Tim Gunn a9e7590756 Merge Dev 2019-12-06 18:34:29 +13:00
Tim Gunn f7b4085445 Round to 2DP 2019-12-06 18:28:44 +13:00
Tim Gunn 457f43b1fe Reuse Variable 2019-12-06 18:25:09 +13:00
Tim Gunn bf45338eb9 Disable high_temptarget_raises_sensitivity and low_temptarget_lowers_sensitivity 2019-12-06 18:22:51 +13:00
Tim Gunn 9e93de4c7b Set the Bolus Increment to the min amount supported by the pump 2019-12-06 18:16:46 +13:00
Tim Gunn 280e075ada Remove Bolus Increment setting 2019-12-06 18:16:09 +13:00
Philoul ff96770df9 Cleaning branch 2019-12-05 21:15:22 +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
Philoul 077b39d10b
Merge pull request #1 from MilosKozak/dev 
Dev Sync
 2019-12-05 18:14:27 +01:00
Milos Kozak 48581a0ac6 move wear arrays to extra resources file 2019-12-05 16:39:34 +01:00
Milos Kozak d9651d0d47 Update Crowdin configuration file 2019-12-05 16:34:01 +01:00
Roumen Georgiev 6c8a5aee47
Merge pull request #88 from MilosKozak/dev 
Dev
 2019-12-05 15:06:15 +02:00
Milos Kozak d4fc8492da
Merge pull request #2241 from dlvoy/hotfix/2240_wear_notiffication_channel 
(#2240) Fixed open loop notifications on wear os - support for Androi…
 2019-12-05 12:02:47 +01:00
Roumen Georgiev 14dc7395e0 Created enum for mode & tests 2019-12-04 16:42:47 +02: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
Milos Kozak 5f19e32504 revert mockito version 2019-12-03 21:12:17 +01:00
Milos Kozak a66b3f7090 allow sorting of automation tasks 2019-12-03 21:07:31 +01:00
Milos Kozak a33b90478b
New Crowdin translations (#2237) 
* New translations strings.xml (Slovak)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)
 2019-12-03 19:26:55 +01:00
Milos Kozak 4abc47771b treatment fragment layout centered 2019-12-03 19:26:30 +01:00
Milos Kozak ba6fb9fb94 rhino, commons, slf4j update 2019-12-03 19:03:17 +01:00
Milos Kozak ba6030e1b8 test libraries update 2019-12-03 18:56:43 +01:00
Milos Kozak 3d521fd412 remove rarely used clone library 2019-12-03 18:51:14 +01:00
Milos Kozak 6ba485d9cd fix NPE 2019-12-03 18:44:59 +01:00
Milos Kozak 95d3551931 Make switching language working again 2019-12-03 18:12:37 +01:00
Roumen Georgiev aae2e21bef trigger works 2019-12-03 16:49:08 +02:00
Milos Kozak e4a5616298 wizard & SP improvements 2019-12-03 15:29:14 +01:00