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

7719 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philoul 62cc365dc4 I tried to replace hard coded units for ISF, IC and U by formated text from strings (translated in WizardDialog.kt but not in WizardInfoDialog.kt) 
=> It's not perfect but I don't know how to do it better so I pull this proposal:
    - for BG I think we could replace DecimalFormatter.to1Decimal by DecimalFormatter.to0Decimal but it also doesn't work (in french comma is replaced by point for bg but not for ISF i.e. "83,0 ISF: 50,0" => "83.0 SI: 50,0")
    but if we change default String format : format_bg_isf="%1$s ISF: %2$.1f" by "%1$.0f ISF: %2$.1f" I think it's good
 2019-12-01 21:44:05 +01:00
Philoul 0caf0d5f28 I tried to replace hard coded units for ISF, IC and U by formated text from strings (translated in WizardDialog.kt but not in WizardInfoDialog.kt) 
=> It's not perfect but I don't know how to do it better so I pull this proposal:
    - For Carbs and COB, adding DecimalFormatter.to0Decimal doesn't work (AAPS freeze when I tried to add DecimalFormatter ???) so values has 1 decimal ( I think it's better to have 1 decimal for COB but not for carbs )
    - for BG I think we could replace DecimalFormatter.to1Decimal by DecimalFormatter.to0Decimal but it also doesn't work (in french comma is replaced by point for bg but not for ISF i.e. "83,0 ISF: 50,0" => "83.0 SI: 50,0")
 2019-12-01 21:18:26 +01:00
Milos Kozak d7b1c3837c
New Crowdin translations (#2230) 
* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Swedish)

* New translations objectives.xml (Swedish)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)
 2019-12-01 21:06:28 +01:00
Milos Kozak 702e1f0675 allow clone from existing switch 2019-12-01 20:42:23 +01:00
Milos Kozak 0fdc789e1f Merge branch 'dev' into localprofile 2019-11-30 22:43:15 +01:00
Milos Kozak a3b8caded4 Merge branch 'temp' into dev 2019-11-30 22:15:33 +01:00
Milos Kozak c23794fa6e allow revert objective 2019-11-30 22:15:15 +01:00
Milos Kozak d52b15ff61 kotlin 1.3.61 2019-11-30 19:33:09 +01:00
Milos Kozak 4c23b5e323 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-11-30 18:39:20 +01:00
Milos Kozak 034c16690f temp 2019-11-30 10:16:38 +01:00
gregorybel db2c675024 fix page -> bage 2019-11-29 21:48:35 +01:00
Milos Kozak eba66da4a4 allow go back with objectives 2019-11-29 12:38:07 +01:00
Milos Kozak f82c610d16 allow objective skip only when NS is connected and in RW mode 2019-11-29 12:19:32 +01:00
Milos Kozak 9196bdb2ed handle name properly 2019-11-29 00:11:28 +01:00
Milos Kozak 9f9c9fd2bc improve layout 2019-11-28 23:41:22 +01:00
Milos Kozak 2dd7c758f4 Local profile clone support 2019-11-28 23:18:42 +01:00
gregorybel de9d2da68d show Battery info in days instead of percent for Combo 2019-11-28 22:15:56 +01:00
Milos Kozak 8a75d4f6b9 tabs in local profile 2019-11-28 21:58:07 +01:00
Milos Kozak a000611f11 Merge branch 'dev' into localprofile 2019-11-28 19:55:08 +01:00
Milos Kozak ec535b9c61 low_mark, high_mark units dependent 2019-11-28 19:54:59 +01:00
Milos Kozak b8ba94fa30
New Crowdin translations (#2226) 
* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Swedish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Russian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Korean)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Slovak)

* New translations strings.xml (Spanish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations exam.xml (Italian)

* New translations exam.xml (Dutch)

* New translations objectives.xml (Italian)

* New translations objectives.xml (Romanian)

* New translations objectives.xml (Russian)

* New translations objectives.xml (Slovak)

* New translations objectives.xml (Spanish)

* New translations objectives.xml (Swedish)

* New translations objectives.xml (Portuguese, Brazilian)

* New translations objectives.xml (Polish)

* New translations objectives.xml (Lithuanian)

* New translations objectives.xml (Greek)

* New translations objectives.xml (French)

* New translations exam.xml (Swedish)

* New translations exam.xml (Spanish)

* New translations objectives.xml (Portuguese)

* New translations objectives.xml (German)

* New translations objectives.xml (Dutch)

* New translations objectives.xml (Czech)

* New translations objectives.xml (Bulgarian)

* New translations insight_alert_titles.xml (Spanish)
 2019-11-28 17:44:46 +01:00
Milos Kozak a050a4c531
Update CONTRIBUTING.md 2019-11-28 11:06:10 +01:00
Milos Kozak 2c8d30ebda
Update CONTRIBUTING.md 2019-11-28 11:05:26 +01:00
Milos Kozak 65bb83406d
Merge pull request #2184 from dlvoy/contributing 
Create CONTRIBUTING.md - First draft of contribution guidelines
 2019-11-28 11:01: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
Milos Kozak 58bceb7a6f update dependencies 2019-11-28 00:56:51 +01:00
Milos Kozak 599261081b upload local profile to NS 2019-11-28 00:30:22 +01:00
Milos Kozak 421c2a955e Merge branch 'dev' into localprofile 2019-11-27 23:42:57 +01:00
Milos Kozak bfb65d0f8a run wizard to setup units 2019-11-27 23:39:16 +01:00
Milos Kozak 5eb4560ad2
Merge pull request #2203 from dlvoy/feature/728_wearos_complication 
[#728] Complication support - Wear OS
 2019-11-27 23:36:09 +01:00
Milos Kozak 3ee9836e66 handle default TT valuses in current units 2019-11-27 23:26:29 +01:00
dlvoy f7b556350c [#2210][#728] Post-review refactoring (thanks @jotomo !) 2019-11-27 20:32:42 +01:00
Milos Kozak 0f631b1d47 fix 2019-11-26 16:59:40 +01:00
Milos Kozak fed2839a72 Merge branch 'dev' into localprofile 2019-11-26 16:40:46 +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 e9e1fbae2f [#2210][#728] - Code coverage config for wear module 
- Fixed mockito configuration for bug in 2.X
 2019-11-26 09:14:39 +01:00
Milos Kozak 23eddb25e7 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-11-26 08:45:27 +01:00
Milos Kozak 6969dc4873
Merge pull request #2222 from MilosKozak/2186 
New SMS commands
 2019-11-25 22:40:00 +01:00
Milos Kozak c33e3994b6 some cleanup and kotlin conversion 2019-11-25 18:07:16 +01:00
Milos Kozak 1ea25b68a8 fix NPE 2019-11-25 17:06:08 +01:00
Milos Kozak 640c7b56f1 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-11-23 12:54:22 +01:00
andreas 63808ad553 Also deactivate Automation if Loop is disabled, not only if it is suspended. 2019-11-22 18:30:22 +01:00
fabriziocasellato 46270d87e2 Removed + control for Phone Numbers, Added Tests for TT, Added TARGET STOP/CANCEL command 2019-11-22 16:41:09 +01:00
Milos Kozak f537c0090a Merge branch 'pull/2185' into dev 2019-11-22 16:10:55 +01:00
Milos Kozak fa765708f1 fix test 2019-11-22 16:10:27 +01:00
dlvoy 1240deb4d3 Merge branch 'dev' into feature/728_wearos_complication 2019-11-22 15:58:41 +01:00
fabriziocasellato f26e683dbe Removed + control for Phone Numbers, Added Tests for TT, Added TARGET STOP/CANCEL command 2019-11-22 15:58:03 +01:00