From 739ba4902b6226c996d045efcb72546f708595f7 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Mon, 18 Sep 2023 15:16:42 +0200 Subject: [PATCH] merge :pump:pump-core and :pump:pump-common --- app/build.gradle | 1 - pump/medtronic/build.gradle | 1 - pump/omnipod-eros/build.gradle | 1 - .../pump/core/defs/PumpDeviceState.kt | 2 +- .../nightscout/pump/core/utils/ByteUtil.java | 0 .../pump/core/utils/StringUtil.java | 0 .../pump/core/utils/ThreadUtil.java | 0 .../src/main/res/values/strings.xml | 10 +++++++++ pump/pump-core/.gitignore | 1 - pump/pump-core/build.gradle | 19 ----------------- pump/pump-core/consumer-rules.pro | 0 pump/pump-core/proguard-rules.pro | 21 ------------------- pump/pump-core/src/main/AndroidManifest.xml | 4 ---- .../src/main/res/values-af-rZA/strings.xml | 11 ---------- .../src/main/res/values-bg-rBG/strings.xml | 12 ----------- .../src/main/res/values-ca-rES/strings.xml | 11 ---------- .../src/main/res/values-cs-rCZ/strings.xml | 12 ----------- .../src/main/res/values-da-rDK/strings.xml | 11 ---------- .../src/main/res/values-de-rDE/strings.xml | 12 ----------- .../src/main/res/values-el-rGR/strings.xml | 12 ----------- .../src/main/res/values-es-rES/strings.xml | 12 ----------- .../src/main/res/values-fr-rFR/strings.xml | 12 ----------- .../src/main/res/values-ga-rIE/strings.xml | 5 ----- .../src/main/res/values-hr-rHR/strings.xml | 5 ----- .../src/main/res/values-hu-rHU/strings.xml | 5 ----- .../src/main/res/values-it-rIT/strings.xml | 12 ----------- .../src/main/res/values-iw-rIL/strings.xml | 12 ----------- .../src/main/res/values-ja-rJP/strings.xml | 4 ---- .../src/main/res/values-ko-rKR/strings.xml | 12 ----------- .../src/main/res/values-lt-rLT/strings.xml | 12 ----------- .../src/main/res/values-nl-rNL/strings.xml | 12 ----------- .../src/main/res/values-no-rNO/strings.xml | 12 ----------- .../src/main/res/values-pl-rPL/strings.xml | 12 ----------- .../src/main/res/values-pt-rBR/strings.xml | 12 ----------- .../src/main/res/values-pt-rPT/strings.xml | 12 ----------- .../src/main/res/values-ro-rRO/strings.xml | 11 ---------- .../src/main/res/values-ru-rRU/strings.xml | 12 ----------- .../src/main/res/values-sk-rSK/strings.xml | 12 ----------- .../src/main/res/values-sr-rCS/strings.xml | 4 ---- .../src/main/res/values-sv-rSE/strings.xml | 12 ----------- .../src/main/res/values-tr-rTR/strings.xml | 12 ----------- .../src/main/res/values-uk-rUA/strings.xml | 4 ---- .../src/main/res/values-zh-rCN/strings.xml | 11 ---------- .../pump-core/src/main/res/values/strings.xml | 14 ------------- pump/rileylink/build.gradle | 2 +- settings.gradle | 1 - 46 files changed, 12 insertions(+), 375 deletions(-) rename pump/{pump-core => pump-common}/src/main/java/info/nightscout/pump/core/defs/PumpDeviceState.kt (94%) rename pump/{pump-core => pump-common}/src/main/java/info/nightscout/pump/core/utils/ByteUtil.java (100%) rename pump/{pump-core => pump-common}/src/main/java/info/nightscout/pump/core/utils/StringUtil.java (100%) rename pump/{pump-core => pump-common}/src/main/java/info/nightscout/pump/core/utils/ThreadUtil.java (100%) delete mode 100644 pump/pump-core/.gitignore delete mode 100644 pump/pump-core/build.gradle delete mode 100644 pump/pump-core/consumer-rules.pro delete mode 100644 pump/pump-core/proguard-rules.pro delete mode 100644 pump/pump-core/src/main/AndroidManifest.xml delete mode 100644 pump/pump-core/src/main/res/values-af-rZA/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-bg-rBG/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-ca-rES/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-cs-rCZ/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-da-rDK/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-de-rDE/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-el-rGR/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-es-rES/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-fr-rFR/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-ga-rIE/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-hr-rHR/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-hu-rHU/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-it-rIT/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-iw-rIL/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-ja-rJP/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-ko-rKR/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-lt-rLT/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-nl-rNL/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-no-rNO/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-pl-rPL/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-pt-rBR/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-pt-rPT/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-ro-rRO/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-ru-rRU/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-sk-rSK/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-sr-rCS/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-sv-rSE/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-tr-rTR/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-uk-rUA/strings.xml delete mode 100644 pump/pump-core/src/main/res/values-zh-rCN/strings.xml delete mode 100644 pump/pump-core/src/main/res/values/strings.xml diff --git a/app/build.gradle b/app/build.gradle index 53ed090fee..98fb131cb4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -216,7 +216,6 @@ dependencies { implementation project(':insight') implementation project(':pump:medtronic') implementation project(':pump:pump-common') - implementation project(':pump:pump-core') implementation project(':pump:omnipod-common') implementation project(':pump:omnipod-eros') implementation project(':pump:omnipod-dash') diff --git a/pump/medtronic/build.gradle b/pump/medtronic/build.gradle index 507aedc398..b44c33cb15 100644 --- a/pump/medtronic/build.gradle +++ b/pump/medtronic/build.gradle @@ -22,7 +22,6 @@ dependencies { implementation project(':core:utils') implementation project(':core:validators') implementation project(':pump:pump-common') - implementation project(':pump:pump-core') implementation project(':pump:rileylink') testImplementation project(':app-wear-shared:shared-tests') diff --git a/pump/omnipod-eros/build.gradle b/pump/omnipod-eros/build.gradle index a2404ee8ed..c3ff28071f 100644 --- a/pump/omnipod-eros/build.gradle +++ b/pump/omnipod-eros/build.gradle @@ -34,7 +34,6 @@ dependencies { implementation project(':core:ui') implementation project(':core:validators') implementation project(':pump:pump-common') - implementation project(':pump:pump-core') implementation project(':pump:rileylink') implementation project(':pump:omnipod-common') diff --git a/pump/pump-core/src/main/java/info/nightscout/pump/core/defs/PumpDeviceState.kt b/pump/pump-common/src/main/java/info/nightscout/pump/core/defs/PumpDeviceState.kt similarity index 94% rename from pump/pump-core/src/main/java/info/nightscout/pump/core/defs/PumpDeviceState.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/core/defs/PumpDeviceState.kt index 9ebe3463e3..111b7d559f 100644 --- a/pump/pump-core/src/main/java/info/nightscout/pump/core/defs/PumpDeviceState.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/core/defs/PumpDeviceState.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.core.defs -import info.nightscout.pump.core.R +import info.nightscout.pump.common.R enum class PumpDeviceState(var resourceId: Int) { diff --git a/pump/pump-core/src/main/java/info/nightscout/pump/core/utils/ByteUtil.java b/pump/pump-common/src/main/java/info/nightscout/pump/core/utils/ByteUtil.java similarity index 100% rename from pump/pump-core/src/main/java/info/nightscout/pump/core/utils/ByteUtil.java rename to pump/pump-common/src/main/java/info/nightscout/pump/core/utils/ByteUtil.java diff --git a/pump/pump-core/src/main/java/info/nightscout/pump/core/utils/StringUtil.java b/pump/pump-common/src/main/java/info/nightscout/pump/core/utils/StringUtil.java similarity index 100% rename from pump/pump-core/src/main/java/info/nightscout/pump/core/utils/StringUtil.java rename to pump/pump-common/src/main/java/info/nightscout/pump/core/utils/StringUtil.java diff --git a/pump/pump-core/src/main/java/info/nightscout/pump/core/utils/ThreadUtil.java b/pump/pump-common/src/main/java/info/nightscout/pump/core/utils/ThreadUtil.java similarity index 100% rename from pump/pump-core/src/main/java/info/nightscout/pump/core/utils/ThreadUtil.java rename to pump/pump-common/src/main/java/info/nightscout/pump/core/utils/ThreadUtil.java diff --git a/pump/pump-common/src/main/res/values/strings.xml b/pump/pump-common/src/main/res/values/strings.xml index 6a683fd37d..d7323a40f3 100644 --- a/pump/pump-common/src/main/res/values/strings.xml +++ b/pump/pump-common/src/main/res/values/strings.xml @@ -77,6 +77,16 @@ Type: + + Never contacted + Sleeping + Waking up + Active + Error with communication + Timeout on communication + Pump unreachable + Invalid configuration + %1$d day %1$d days diff --git a/pump/pump-core/.gitignore b/pump/pump-core/.gitignore deleted file mode 100644 index 42afabfd2a..0000000000 --- a/pump/pump-core/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/pump/pump-core/build.gradle b/pump/pump-core/build.gradle deleted file mode 100644 index 459c464237..0000000000 --- a/pump/pump-core/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-allopen' -} - -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" -apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/main/test_dependencies.gradle" -apply from: "${project.rootDir}/core/main/jacoco_global.gradle" -android { - namespace 'info.nightscout.pump.core' -} - -dependencies { - api "net.danlew:android.joda:$joda_version" -} diff --git a/pump/pump-core/consumer-rules.pro b/pump/pump-core/consumer-rules.pro deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pump/pump-core/proguard-rules.pro b/pump/pump-core/proguard-rules.pro deleted file mode 100644 index 481bb43481..0000000000 --- a/pump/pump-core/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/pump/pump-core/src/main/AndroidManifest.xml b/pump/pump-core/src/main/AndroidManifest.xml deleted file mode 100644 index 44008a4332..0000000000 --- a/pump/pump-core/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/pump/pump-core/src/main/res/values-af-rZA/strings.xml b/pump/pump-core/src/main/res/values-af-rZA/strings.xml deleted file mode 100644 index fdb48a3660..0000000000 --- a/pump/pump-core/src/main/res/values-af-rZA/strings.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Slaap - Besig om te wek - Aktief - Fout met kommunikasie - Te lank op kommunikasie gewag - Pomp onbereikbaar - Ongeldige konfigirasie - diff --git a/pump/pump-core/src/main/res/values-bg-rBG/strings.xml b/pump/pump-core/src/main/res/values-bg-rBG/strings.xml deleted file mode 100644 index 31c39d7fec..0000000000 --- a/pump/pump-core/src/main/res/values-bg-rBG/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Никога не е свързвана - Спинка си - Събуждане - Активна - Грешка в комуникацията - Изтече времето за връзка - Помпата е недостъпна - Грешна конфигурация - diff --git a/pump/pump-core/src/main/res/values-ca-rES/strings.xml b/pump/pump-core/src/main/res/values-ca-rES/strings.xml deleted file mode 100644 index 5b33ffc3fe..0000000000 --- a/pump/pump-core/src/main/res/values-ca-rES/strings.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - En suspens - Iniciant - Activa - Error de comunicació - Temps d\'espera excedit en la comunicació - Bomba no accessible - Configuració no vàlida - diff --git a/pump/pump-core/src/main/res/values-cs-rCZ/strings.xml b/pump/pump-core/src/main/res/values-cs-rCZ/strings.xml deleted file mode 100644 index d4396a70be..0000000000 --- a/pump/pump-core/src/main/res/values-cs-rCZ/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Nikdy nekontaktováno - Spící - Probouzení - Aktivní - Chyba komunikace - Vypršel časový limit komunikace - Pumpa nedostupná - Neplatná konfigurace - diff --git a/pump/pump-core/src/main/res/values-da-rDK/strings.xml b/pump/pump-core/src/main/res/values-da-rDK/strings.xml deleted file mode 100644 index ff99fdabc1..0000000000 --- a/pump/pump-core/src/main/res/values-da-rDK/strings.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Sover - Vågner - Aktiv - Fejl i kommunikation - Timeout ved kommunikation - Pumpe utilgængelig - Ugyldig konfiguration - diff --git a/pump/pump-core/src/main/res/values-de-rDE/strings.xml b/pump/pump-core/src/main/res/values-de-rDE/strings.xml deleted file mode 100644 index ed19114729..0000000000 --- a/pump/pump-core/src/main/res/values-de-rDE/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Noch nie verbunden - Schlafen - Aufwecken - Aktiv - Fehler bei der Kommunikation - Zeitüberschreitung bei Kommunikation - Pumpe nicht erreichbar - Ungültige Einstellung - diff --git a/pump/pump-core/src/main/res/values-el-rGR/strings.xml b/pump/pump-core/src/main/res/values-el-rGR/strings.xml deleted file mode 100644 index 8f7cca6085..0000000000 --- a/pump/pump-core/src/main/res/values-el-rGR/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Δεν επικοινωνήθηκε ποτέ - Sleeping - Ξύπνημα - Ενεργή - Σφάλμα με επικοινωνία - Λήξη χρόνου επικοινωνίας - Η αντλία δεν είναι διαθέσιμη - Μη έγκυρη παραμετροποίηση - diff --git a/pump/pump-core/src/main/res/values-es-rES/strings.xml b/pump/pump-core/src/main/res/values-es-rES/strings.xml deleted file mode 100644 index 8f5eff070a..0000000000 --- a/pump/pump-core/src/main/res/values-es-rES/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Nunca contactado - Durmiendo - Activando - Activo - Error con la comunicación - Tiempo de espera en la comunicación - Bomba no alcanzable - Configuración inválida - diff --git a/pump/pump-core/src/main/res/values-fr-rFR/strings.xml b/pump/pump-core/src/main/res/values-fr-rFR/strings.xml deleted file mode 100644 index 452f916a90..0000000000 --- a/pump/pump-core/src/main/res/values-fr-rFR/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Jamais contacté - En veille - Réveil en cours - Actif - Erreur de communication - Expiration du délai d\'attente de la communication - Pompe hors de portée - Configuration invalide - diff --git a/pump/pump-core/src/main/res/values-ga-rIE/strings.xml b/pump/pump-core/src/main/res/values-ga-rIE/strings.xml deleted file mode 100644 index 1727c5749f..0000000000 --- a/pump/pump-core/src/main/res/values-ga-rIE/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - Gníomhach - diff --git a/pump/pump-core/src/main/res/values-hr-rHR/strings.xml b/pump/pump-core/src/main/res/values-hr-rHR/strings.xml deleted file mode 100644 index ca36794d35..0000000000 --- a/pump/pump-core/src/main/res/values-hr-rHR/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - Pumpa nedostupna - diff --git a/pump/pump-core/src/main/res/values-hu-rHU/strings.xml b/pump/pump-core/src/main/res/values-hu-rHU/strings.xml deleted file mode 100644 index d67c9a4181..0000000000 --- a/pump/pump-core/src/main/res/values-hu-rHU/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - Pumpa nem elérhető - diff --git a/pump/pump-core/src/main/res/values-it-rIT/strings.xml b/pump/pump-core/src/main/res/values-it-rIT/strings.xml deleted file mode 100644 index b392418f5c..0000000000 --- a/pump/pump-core/src/main/res/values-it-rIT/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Mai contattato - In sospensione - Risveglio - Attivo - Errore nella comunicazione - Timeout della comunicazione - Micro irraggiungibile - Configurazione non valida - diff --git a/pump/pump-core/src/main/res/values-iw-rIL/strings.xml b/pump/pump-core/src/main/res/values-iw-rIL/strings.xml deleted file mode 100644 index 0ee0da1cab..0000000000 --- a/pump/pump-core/src/main/res/values-iw-rIL/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - מעולם לא נוצר קשר - שינה - מתעורר - פעיל - שגיאת תקשורת - חריגה ממגבלת הזמן לתקשורת - המשאבה לא זמינה - תצורה לא חוקית - diff --git a/pump/pump-core/src/main/res/values-ja-rJP/strings.xml b/pump/pump-core/src/main/res/values-ja-rJP/strings.xml deleted file mode 100644 index d287b59687..0000000000 --- a/pump/pump-core/src/main/res/values-ja-rJP/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/pump/pump-core/src/main/res/values-ko-rKR/strings.xml b/pump/pump-core/src/main/res/values-ko-rKR/strings.xml deleted file mode 100644 index a4564d92ac..0000000000 --- a/pump/pump-core/src/main/res/values-ko-rKR/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - 연결되지 않음 - 수면 - 시작중 - 활성 - 연결오류 - 연결시간초과 - 펌프에 연결할 수 없습니다. - 유효하지 않은 설정 - diff --git a/pump/pump-core/src/main/res/values-lt-rLT/strings.xml b/pump/pump-core/src/main/res/values-lt-rLT/strings.xml deleted file mode 100644 index a4d9c7e9e3..0000000000 --- a/pump/pump-core/src/main/res/values-lt-rLT/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Niekada nebuvo sujungta - Miego režime - Pažadinimas - Aktyvi - Ryšio klaida - Ryšiui skirtas laikas baigėsi - Pompa nepasiekiama - Neteisinga konfigūracija - diff --git a/pump/pump-core/src/main/res/values-nl-rNL/strings.xml b/pump/pump-core/src/main/res/values-nl-rNL/strings.xml deleted file mode 100644 index 5bcb0f531b..0000000000 --- a/pump/pump-core/src/main/res/values-nl-rNL/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Nooit verbonden - Slapen - Actief worden - Actief - Communicatiefout - Time-out bij communicatie - Pomp niet beschikbaar - Ongeldige configuratie - diff --git a/pump/pump-core/src/main/res/values-no-rNO/strings.xml b/pump/pump-core/src/main/res/values-no-rNO/strings.xml deleted file mode 100644 index 7dcc8aa0ca..0000000000 --- a/pump/pump-core/src/main/res/values-no-rNO/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Aldri kontaktet - Hvilemodus - Våkner opp - Aktiv - Feil med kommunikasjonen - Tidsavbrudd ved kommunikasjonen - Pumpe er utilgjengelig - Ugyldig oppsett av pumpe - diff --git a/pump/pump-core/src/main/res/values-pl-rPL/strings.xml b/pump/pump-core/src/main/res/values-pl-rPL/strings.xml deleted file mode 100644 index e73238e7b2..0000000000 --- a/pump/pump-core/src/main/res/values-pl-rPL/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Nigdy nie połączona - Uśpiona - Wybudzanie - Aktywna - Błąd komunikacji - Przekroczony limit czasu połączenia - Pompa nieosiągalna - Nieprawidłowe ustawienia - diff --git a/pump/pump-core/src/main/res/values-pt-rBR/strings.xml b/pump/pump-core/src/main/res/values-pt-rBR/strings.xml deleted file mode 100644 index c728ae0625..0000000000 --- a/pump/pump-core/src/main/res/values-pt-rBR/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Nunca contatado - Dormindo - Acordar - Ativo - Erro com comunicação - Tempo limite para comunicação - Bomba inacessível - Configuração inválida - diff --git a/pump/pump-core/src/main/res/values-pt-rPT/strings.xml b/pump/pump-core/src/main/res/values-pt-rPT/strings.xml deleted file mode 100644 index a542775ac3..0000000000 --- a/pump/pump-core/src/main/res/values-pt-rPT/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Nunca contactado - A dormir - A acordar - Activo - Erro com comunicação - Tempo limite para comunicação - Bomba inacessível - Configuração inválida - diff --git a/pump/pump-core/src/main/res/values-ro-rRO/strings.xml b/pump/pump-core/src/main/res/values-ro-rRO/strings.xml deleted file mode 100644 index 45f733d374..0000000000 --- a/pump/pump-core/src/main/res/values-ro-rRO/strings.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - În repaus - Se pornește - Activă - Eroare de comunicație - Comunicația nu a reușit la timp - Pompă indisponibilă - Configurație invalidă - diff --git a/pump/pump-core/src/main/res/values-ru-rRU/strings.xml b/pump/pump-core/src/main/res/values-ru-rRU/strings.xml deleted file mode 100644 index 2b814ec715..0000000000 --- a/pump/pump-core/src/main/res/values-ru-rRU/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Никогда не подключалась - Спящий режим - Пробуждение - Работает - Ошибка связи - Таймаут связи - Помпа недоступна - Недопустимая конфигурация - diff --git a/pump/pump-core/src/main/res/values-sk-rSK/strings.xml b/pump/pump-core/src/main/res/values-sk-rSK/strings.xml deleted file mode 100644 index 0ca4cf05f8..0000000000 --- a/pump/pump-core/src/main/res/values-sk-rSK/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Nikdy nepripojené - Spiaca - Prebúdzanie - Aktívna - Chyba komunikácie - Uplynul časový limit komunikácie - Pumpa nedostupná - Neplatná konfigurácia - diff --git a/pump/pump-core/src/main/res/values-sr-rCS/strings.xml b/pump/pump-core/src/main/res/values-sr-rCS/strings.xml deleted file mode 100644 index d287b59687..0000000000 --- a/pump/pump-core/src/main/res/values-sr-rCS/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/pump/pump-core/src/main/res/values-sv-rSE/strings.xml b/pump/pump-core/src/main/res/values-sv-rSE/strings.xml deleted file mode 100644 index acb1355a65..0000000000 --- a/pump/pump-core/src/main/res/values-sv-rSE/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Aldrig ansluten - Sover - Väcker - Aktiv - Kommunikationsfel - Kommunikationstimeout - Pumpen kan inte nås - Felaktig konfiguration - diff --git a/pump/pump-core/src/main/res/values-tr-rTR/strings.xml b/pump/pump-core/src/main/res/values-tr-rTR/strings.xml deleted file mode 100644 index 5f95481717..0000000000 --- a/pump/pump-core/src/main/res/values-tr-rTR/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Hiç bağlantı yapılmadı - Uyuyor - Uyanıyor - Aktif - İletişim hatası - İletişimde zaman aşımı - Pompa ulaşılamıyor - Geçersiz yapılandırma - diff --git a/pump/pump-core/src/main/res/values-uk-rUA/strings.xml b/pump/pump-core/src/main/res/values-uk-rUA/strings.xml deleted file mode 100644 index d287b59687..0000000000 --- a/pump/pump-core/src/main/res/values-uk-rUA/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/pump/pump-core/src/main/res/values-zh-rCN/strings.xml b/pump/pump-core/src/main/res/values-zh-rCN/strings.xml deleted file mode 100644 index 1565a7375e..0000000000 --- a/pump/pump-core/src/main/res/values-zh-rCN/strings.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - 休眠 - 唤醒中 - 启用 - 通信出错 - 通信超时 - 泵无法连接 - 无效配置 - diff --git a/pump/pump-core/src/main/res/values/strings.xml b/pump/pump-core/src/main/res/values/strings.xml deleted file mode 100644 index d1ffb7471e..0000000000 --- a/pump/pump-core/src/main/res/values/strings.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Never contacted - Sleeping - Waking up - Active - Error with communication - Timeout on communication - Pump unreachable - Invalid configuration - - diff --git a/pump/rileylink/build.gradle b/pump/rileylink/build.gradle index 36a7318e18..03620015ee 100644 --- a/pump/rileylink/build.gradle +++ b/pump/rileylink/build.gradle @@ -18,7 +18,7 @@ dependencies { implementation project(':app-wear-shared:shared') implementation project(':core:interfaces') implementation project(':core:ui') - implementation project(':pump:pump-core') + implementation project(':pump:pump-common') testImplementation project(':app-wear-shared:shared-tests') } diff --git a/settings.gradle b/settings.gradle index 19da8bf565..816e1ae58d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -39,7 +39,6 @@ include ':pump:omnipod-common' include ':pump:omnipod-eros' include ':pump:omnipod-dash' include ':pump:pump-common' -include ':pump:pump-core' include ':pump:rileylink' include ':pump:virtual' include ':implementation'