Commit graph

61 commits

Author SHA1 Message Date
Milos Kozak
ec73c4b0cb Insight vibrate permission 2021-06-02 16:55:19 +02:00
Milos Kozak
fedba23405 code cleanup 2021-06-01 22:51:16 +02:00
Milos Kozak
79833dbdf1
New Crowdin updates (#490)
* New translations strings.xml (Hebrew)

* New translations exam.xml (Lithuanian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations objectives.xml (Hebrew)

* New translations objectives.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations exam.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations alert_descriptions.xml (Hebrew)

* New translations strings.xml (Dutch)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Hebrew)

* New translations exam.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations exam.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (French)

* New translations objectives.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Polish)

* New translations strings.xml (Slovak)

* 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 (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Czech)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* 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 (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Irish)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (German)

* 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 (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)
2021-05-18 18:31:01 +02:00
Milos Kozak
2657830f0d add indexes 2021-05-13 14:11:38 +02:00
Philoul
835a87cfe4 Merge branch 'dev2_insight_dbHelper' into dev2_Insight_v2 2021-05-09 16:37:37 +02:00
Philoul
0020856aae Fix Injection for InsightDbHelper
Thanks Adrian for your help
2021-05-09 16:20:55 +02:00
Philoul
6290192355 Remove redundant CPevents, Fix Site Change with Insight V3 2021-05-09 00:55:05 +02:00
Philoul
cd434ed4bb Merge branch 'dev2_Insight_v2' into dev2_insight_dbHelper
# Conflicts:
#	insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt
#	insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
2021-05-08 20:13:09 +02:00
Philoul
153168a4d4 Remove additional aapsLogger (3 left for further analysis with Insight V3 and site change) 2021-05-08 19:48:10 +02:00
Philoul
dd527d9908 Cleaning 2021-05-08 16:35:12 +02:00
Philoul
931980bcb6 Typo in variable names 2021-05-08 16:20:01 +02:00
Philoul
a146d54a50 Trail Add abstraction layer between InsightPlugin and dao 2021-05-08 16:18:47 +02:00
Philoul
0ea9c98469 Replace hard coded strings for EventType by enum 2021-05-07 23:54:02 +02:00
Philoul
dfd6c6e859 Move Insight database package outside plugins\pump 2021-05-07 11:33:51 +02:00
Philoul
ed7dcea38e Clean Code, remove old code and add some Todo for verification and tests 2021-05-07 10:41:45 +02:00
Philoul
f789888afd Fix SMB
remove comment linked to previous version
2021-05-07 10:21:34 +02:00
Philoul
117fda4244 Fix SMB
remove comment linked to previous version
2021-05-05 08:27:41 +02:00
Philoul
8592ed3249 Update driver with pumpSync for boluses and TBR 2021-05-04 22:40:00 +02:00
Philoul
261fbbc759 Replace Hardcoded key by string 2021-05-04 18:41:11 +02:00
Milos Kozak
c75d4e8e4e eliminate old NS sync style 2021-05-03 12:49:11 +02:00
Milos Kozak
e17f96ac5c
Merge pull request #497 from jotomo/dev2-cd+insight
Insight fixes and refactorings
2021-05-03 09:36:03 +02:00
Milos Kozak
5747f97201 DanaHistoryDatabase 2021-05-03 09:33:14 +02:00
Johannes Mockenhaupt
c62d92e984
Refactor: Remove (now) superflous BLUETOOTH from ACCU_CHEK_INSIGHT_BLUETHOOTH.
This aligns with the naming of other pumps and BLUETOOTH doesn't provide much information.
2021-04-29 14:58:58 +02:00
Johannes Mockenhaupt
c52526cf6f
Fix: Insight; change references to correct Pumpdescription. 2021-04-29 14:51:04 +02:00
Johannes Mockenhaupt
970aebc6db
Refactor: rename PumpDescription.setPumpDescription to pd.fillFor(). 2021-04-29 14:51:04 +02:00
Milos Kozak
cada2919d1 prepare Profile interface 2021-04-19 18:44:17 +02:00
Milos Kozak
3928b579a7 TDD -> room 2021-04-18 13:31:25 +02:00
Milos Kozak
481ba32b3b Merge remote-tracking branch 'ns/dev' into dev2_dana_combo_only 2021-04-15 18:38:32 +02:00
Milos Kozak
6b16e93427
New Crowdin updates (#479)
* New translations exam.xml (Czech)

* New translations exam.xml (Portuguese)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Dutch)

* New translations objectives.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Romanian)

* New translations exam.xml (Dutch)

* New translations strings.xml (Korean)

* New translations strings.xml (Slovak)

* New translations strings.xml (Hebrew)

* New translations objectives.xml (Hebrew)

* New translations strings.xml (Spanish)

* New translations strings.xml (Norwegian)

* New translations exam.xml (Hebrew)

* New translations strings.xml (French)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations alert_titles.xml (Portuguese)

* New translations exceptions.xml (Portuguese)

* New translations strings.xml (Romanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* 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 (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Polish)

* New translations validator.xml (Dutch)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Croatian)

* 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 (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Slovak)

* New translations strings.xml (Catalan)

* New translations strings.xml (Slovak)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Catalan)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations validator.xml (Portuguese)

* New translations strings.xml (Croatian)

* New translations strings.xml (Tamil)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Turkish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Swedish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Danish)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Lithuanian)

* 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 (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)
2021-04-15 18:18:10 +02:00
Milos Kozak
24164eee98 PumpInterface rename 2021-04-14 19:36:13 +02:00
Milos Kozak
176fc4bb47 ConstriantsInterface rename 2021-04-14 19:01:49 +02:00
Milos Kozak
8ecc02c994 rename ConfigInterface 2021-04-14 18:42:12 +02:00
Milos Kozak
998eba8b9f DateUtil -> kt, static funcs removed 2021-04-11 17:47:55 +02:00
Milos Kozak
d27b7a6139 Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink 2021-04-05 23:13:17 +02:00
Milos Kozak
2463f8fc47 ExtendedBolus, TemporaryBasal -> room, DanaRS working 2021-04-05 22:41:28 +02:00
Philoul
22c1233201 Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
2021-04-04 13:51:53 +02:00
Philoul
be35597da4 Add Pump Sources (only Dana currently has an Entry, but required I think for pump history uploaded in AAPS, or Prime/Fill/ReservoirChange from pump) 2021-04-03 18:51:36 +02:00
Milos Kozak
e26e023ebf prepare TemporaryBasal 2021-04-01 23:46:21 +02:00
Philoul
bf218e9ff4 Merge remote-tracking branch 'Nightscout/meallink' into meallink_ValueWithUnit
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
2021-03-30 23:05:19 +02:00
Milos Kozak
e9f4f87894 Remove Tratment.class where possible 2021-03-30 19:37:26 +02:00
Philoul
22384ef2e8 Merge branch 'Adrian_ValueWithUnit_Refactor' into meallink_ValueWithUnit
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
#	automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
#	automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt
#	combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
#	core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
#	core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt
#	database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
#	omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java
2021-03-29 13:51:28 +02:00
Milos Kozak
e3ac451f8d PumpSync interface, VirtualPump, remove pump driver dependency to database 2021-03-29 00:31:40 +02:00
Milos Kozak
df1e2c53db Bolus, Carbs, BolusCalcResult new way of upload to NS 2021-03-28 13:45:27 +02:00
Philoul
2bd2510bd8 Add Maintenance source 2021-03-27 16:17:38 +01:00
Milos Kozak
7f0fe881b6 DetailedBolusInfo, MealLink UI 2021-03-25 17:48:07 +01:00
Milos Kozak
616871c95c prepare DetailedBolusInfo 2021-03-22 16:59:09 +01:00
AdrianLxM
7d2e364c77 use UploadQueue through interface 2021-03-19 21:35:09 +01:00
Milos Kozak
c28fb465fb Merge remote-tracking branch 'ns/dev' into careportal 2021-03-08 20:27:53 +01:00
Milos Kozak
91e323b5f5
New Crowdin updates (#388)
* New translations exam.xml (Portuguese)

* New translations validator.xml (Slovak)

* New translations alert_descriptions.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 (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations alert_titles.xml (Tamil)

* New translations alert_descriptions.xml (Tamil)

* New translations alert_codes.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations validator.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations exam.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations strings.xml (Tamil)

* New translations objectives.xml (Tamil)

* New translations exceptions.xml (Tamil)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations exam.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Romanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* 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)

* New translations strings.xml (French)

* New translations strings.xml (German)

* New translations validator.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Hebrew)

* New translations objectives.xml (Hebrew)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese)

* New translations alert_titles.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations exam.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations validator.xml (French)

* New translations alert_descriptions.xml (French)

* New translations alert_titles.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (French)

* New translations alert_descriptions.xml (Swedish)

* New translations alert_titles.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations exam.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 (Swedish)
2021-03-08 20:22:45 +01:00
Milos Kozak
8db8edc3f6 Careportal -> Room 2021-03-08 20:10:02 +01:00