diff --git a/app-wear-shared/shared-impl/build.gradle b/app-wear-shared/shared-impl/build.gradle index f2c115b890..da83429250 100644 --- a/app-wear-shared/shared-impl/build.gradle +++ b/app-wear-shared/shared-impl/build.gradle @@ -21,5 +21,5 @@ android { } dependencies { - implementation project(':app-wear-shared:shared') + implementation project(':core:interfaces') } \ No newline at end of file diff --git a/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/utils/DateUtilImpl.kt b/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/utils/DateUtilImpl.kt index ee093019d6..579c21e60c 100644 --- a/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/utils/DateUtilImpl.kt +++ b/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/utils/DateUtilImpl.kt @@ -5,7 +5,7 @@ import android.os.Build import androidx.annotation.RequiresApi import androidx.collection.LongSparseArray import info.nightscout.annotations.OpenForTesting -import info.nightscout.shared.R +import info.nightscout.interfaces.R import info.nightscout.shared.SafeParse import info.nightscout.shared.interfaces.ResourceHelper import org.apache.commons.lang3.time.DateUtils.isSameDay diff --git a/app-wear-shared/shared-tests/build.gradle b/app-wear-shared/shared-tests/build.gradle index 9c4a8730fa..97a502c731 100644 --- a/app-wear-shared/shared-tests/build.gradle +++ b/app-wear-shared/shared-tests/build.gradle @@ -18,7 +18,6 @@ android { dependencies { implementation project(':database:entities') - implementation project(':app-wear-shared:shared') implementation project(':app-wear-shared:shared-impl') implementation project(':core:interfaces') implementation project(':core:main') diff --git a/app-wear-shared/shared/.gitignore b/app-wear-shared/shared/.gitignore deleted file mode 100644 index 42afabfd2a..0000000000 --- a/app-wear-shared/shared/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/app-wear-shared/shared/build.gradle b/app-wear-shared/shared/build.gradle deleted file mode 100644 index c97de505bb..0000000000 --- a/app-wear-shared/shared/build.gradle +++ /dev/null @@ -1,44 +0,0 @@ -plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlinx-serialization' - 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.shared' - defaultConfig { - minSdkVersion 25 // for wear - } -} - -dependencies { - api "androidx.preference:preference-ktx:$preferencektx_version" - api "net.danlew:android.joda:$joda_version" - - api "com.google.dagger:dagger:$dagger_version" - api "com.google.dagger:dagger-android:$dagger_version" - api "com.google.dagger:dagger-android-support:$dagger_version" - - //Logger - api 'org.slf4j:slf4j-api:1.7.36' // 2.0.x breaks logging. Code change needed - api 'com.github.tony19:logback-android:2.0.0' - - api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_serialization_version" - api "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinx_serialization_version" - api "com.caverock:androidsvg:$caverock_androidsvg_version" - api "org.apache.commons:commons-lang3:$commonslang3_version" - - //RxBus - api "io.reactivex.rxjava3:rxjava:$rxjava_version" - api "io.reactivex.rxjava3:rxkotlin:$rxkotlin_version" - api "io.reactivex.rxjava3:rxandroid:$rxandroid_version" -} \ No newline at end of file diff --git a/app-wear-shared/shared/consumer-rules.pro b/app-wear-shared/shared/consumer-rules.pro deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/app-wear-shared/shared/proguard-rules.pro b/app-wear-shared/shared/proguard-rules.pro deleted file mode 100644 index 481bb43481..0000000000 --- a/app-wear-shared/shared/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/app-wear-shared/shared/src/main/AndroidManifest.xml b/app-wear-shared/shared/src/main/AndroidManifest.xml deleted file mode 100644 index 44008a4332..0000000000 --- a/app-wear-shared/shared/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app-wear-shared/shared/src/main/res/values-af-rZA/strings.xml b/app-wear-shared/shared/src/main/res/values-af-rZA/strings.xml deleted file mode 100644 index 6f9ad74f9e..0000000000 --- a/app-wear-shared/shared/src/main/res/values-af-rZA/strings.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - h - dae - ure - sekonde - minuut - uur - dag - week - sekondes - minute - ure - dae - weke - m - d - - Koppel vir %1$d s - Handskudding - Gekoppel - Ontkoppel - - diff --git a/app-wear-shared/shared/src/main/res/values-bg-rBG/strings.xml b/app-wear-shared/shared/src/main/res/values-bg-rBG/strings.xml deleted file mode 100644 index e23a023f6b..0000000000 --- a/app-wear-shared/shared/src/main/res/values-bg-rBG/strings.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - преди %1$d мин - Преди %1$d минути - преди %1$.1f ч - преди %1$.1f дни - преди %1$.0f дни - за %1$.0f дни - за %1$.0f дни - ч - дни - часа - секунда - минута - час - ден - седмица - секунди - минути - часове - дни - седмици - м - д - По-късно днес - Утре - Днес - Вчера - - Свързване %1$d сек - Сдвояване - Свързана - Разкачане - Изчакване за разкачане - - Създадено: %1$s - Автор: %1$s - Име: %1$s - Име на файла: %1$s - Plugin версия: %1$s - Име: %1$s (%2$s) - Покажи IOB - Покажи подробен IOB - Покажи COB - Покажи Делта - Показвай подробна делта - Покажи средна делта - Покажи батерия на телефон - Покажи батерия на устройство - Покажи базал - Покажи Loop Статус - Покажи КЗ - Покажи BGI - Покажи делта стрелка - Покажи \"преди\" - Watchface по подразбиране, можете да изберете бутон ЕКСПОРТИРАНЕ НА WATCHFACE за създаване на шаблон - Watchface по подразбиране - Фоново изображение - Графики (КЗ, базал, прогнозни криви...) - Изображение над графика и под текстови полета - Свободен текст 1 - Свободен текст 2 - Свободен текст 3 - Свободен текст 4 - IOB надпис или IOB Общо (при подробен IOB) - IOB Общо или (Bolus_IOB|Basal_IOB) при подробен IOB - COB надпис - COB стойност - Краткоср. Δ - Средна делта (15мин) - Батерия на телефона (%) - Global loop батерия (%) - Базал - BGI стойност - Време (ЧЧ:MM или ЧЧ:MM:СС) - Час (ЧЧ) - Минути (MM) - Секунди (СС) - AM или PM - Ден от седмицата - Ден (ДД) - Месец (кратко) - Loop статус и \"преди\" - Делта стрелка - Последно получена КЗ преди минути - КЗ стойност - Изображение над текст (циферблат...) - Изображение на стрелка за часове (Аналогов часовник) - Изображение на стрелка за минути (Аналогов часовник) - Изображение на стрелка за секунди (Аналогов часовник) - diff --git a/app-wear-shared/shared/src/main/res/values-ca-rES/strings.xml b/app-wear-shared/shared/src/main/res/values-ca-rES/strings.xml deleted file mode 100644 index e2a9ff86bd..0000000000 --- a/app-wear-shared/shared/src/main/res/values-ca-rES/strings.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - Fa %1$d m - Fa %1$.1f h - h - dies - hores - segon - minut - hora - dia - setmana - segons - minuts - hores - dies - setmanes - m - d - - Connectant %1$d s - Establint comunicació - Connectat - Desconnectant - S\'està esperant la desconnexió - - diff --git a/app-wear-shared/shared/src/main/res/values-cs-rCZ/strings.xml b/app-wear-shared/shared/src/main/res/values-cs-rCZ/strings.xml deleted file mode 100644 index 487005d290..0000000000 --- a/app-wear-shared/shared/src/main/res/values-cs-rCZ/strings.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - před %1$d min - před %1$d minutamí - před %1$.1f h - Před %1$.1f dny - Před %1$.0f dny - za %1$.0f dní - za %1$.0f dní - h - dnů - hodin - sekund - minut - hodina - den - týden - sekund - minut - hodin - dní - týdnů - m - d - Později během dneška - Zítra - Dnes - Včera - - Připojování %1$d sec - Navazování spojení - Připojeno - Odpojuji - Čekám na odpojení - - Vytvořeno: %1$s - Autor: %1$s - Jméno %1$s - Název souboru: %1$s - Verze pluginu: %1$s - Jméno: %1$s (%2$s) - Informace: %1$s - Zobrazit IOB - Zobrazit detailní IOB - Zobrazit COB - Zobrazit deltu - Zobrazit detailní deltu - Zobrazit průměrnou deltu - Zobrazit stav baterie telefonu - Zobrazit stav baterie dalších zařízení - Zobrazit bazál - Zobrazit stav smyčky - Zobrazit glykémii - Zobrazit BGI - Zobrazit trendovou šipku - Zobrazit aktualizováno před - Zobrazit číslo týdne - Výchozí ciferník. Můžete kliknout na tlačítko EXPORTOVAT CIFERNÍK pro vygenerování šablony - Výchozí ciferník - Tapeta - Grafy (glykémie, bazály, křivky předpovědí...) - Obrázek před grafem a za textovými poli - Volný text 1 - Volný text 2 - Volný text 3 - Volný text 4 - Štítek IOB nebo suma IOB při zapnutých detailech - Suma IOB nebo (Bolus_IOB|Basal_IOB) při zapnutých detailech - Štítek COB - Hodnota COB - Krátkodobý průměr - Průměrný rozdíl glykémií (15min) - Baterie telefonu (%) - Baterie smyčky (%) - Bazální dávka - Hodnota BGI - Čas (HH:MM nebo HH:MM:SS) - Hodiny (HH) - Minuty (MM) - Sekundy (SS) - AM nebo PM - Jméno dne v týdnu - Den (DD) - Číslo týdne (ww) - Název měsíce (krátký) - Stav smyčky a čas - Trendová šipka - Před minutami pro poslední přijaté glykémie - Hodnota glykémie - Úvodní obrázek před textem (vytáčení...) - Obrázek hodinové ručičky (Analogové hodinky) - Obrázek minutové ručičky (Analogové hodinky) - Obrázek druhé ručičky (Analogové hodinky) - diff --git a/app-wear-shared/shared/src/main/res/values-da-rDK/strings.xml b/app-wear-shared/shared/src/main/res/values-da-rDK/strings.xml deleted file mode 100644 index f35084621c..0000000000 --- a/app-wear-shared/shared/src/main/res/values-da-rDK/strings.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - %1$d min. siden - %1$d minutter siden - %1$.1f t siden - %1$.1f dage siden - %1$.0f dage siden - om %1$.0f dage - om %1$.0f dage - t - dage - timer - sekund - minut - time - dag - uge - sekunder - minutter - timer - dage - uger - min - d - Senere i dag - I morgen - I dag - I går - - Opretter forbindelse i %1$d s - Forbindelse verificeres - Tilsuttet - Afbryder - Venter på afbrydelse - - Oprettet den: %1$s - Forfatter: %1$s - Navn: %1$s - Filnavn: %1$s - Plugin version: %1$s - Navn: %1$s (%2$s) - Oplysning: %1$s - Vis IOB - Vis detaljeret IOB - Vis COB - Vis Delta - Vis detaljeret Delta - Show GnsDelta - Vis Telefonbatteri - Vis Rig-batteri - Vis Basalrate - Vis Loop-status - Vis BS - Vis BSI - Vis Retningspil - Vis alder - Standard urskive, du kan klikke på EKSPORTÉR URSKIVE-knappen for at generere en skabelon - Standard Urskive - Baggrundsbillede - Grafer (BS, basal, prognoselinjer...) - Billede foran graf og bag tekstfelter - Fritekst 1 - Fri tekst 2 - Fri tekst 3 - Fri tekst 4 - IOB-etiket eller IOB-sum, hvis givet - IOB-sum eller (Bolus_IOB|Basal_IOB) hvis givet - COB-etiket - COB-værdi - Kort BG-delta - Gennemsnitlig BG-delta (15min) - Telefonbatteri (%) - Globalt loop batteri (%) - Basalrate - BGI-værdi - Tid (TT:MM eller TT:MM:SS) - Time (TT) - Minut (MM) - Sekund (SS) - AM eller PM - Navn på ugedag - Dag (DD) - Måned navn (kort) - Loop status og tid - Retningspil - Minutter siden sidst modtaget BS - BS-værdi - Dækbillede foran tekst (opkald...) - Billede af timeviser (Analogur) - Billede af minutviser (Analogur) - Billede af sekundviser (Analogur) - diff --git a/app-wear-shared/shared/src/main/res/values-de-rDE/strings.xml b/app-wear-shared/shared/src/main/res/values-de-rDE/strings.xml deleted file mode 100644 index 94321c069d..0000000000 --- a/app-wear-shared/shared/src/main/res/values-de-rDE/strings.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - vor %1$d Min. - vor %1$d Minuten - vor %1$.1f Stunde - vor %1$.1f Tagen - vor %1$.0f Tagen - in %1$.0f Tagen - in %1$.0f Tagen - h - Tage - Stunden - Sekunde - Minute - Stunde - Tag - Woche - Sekunden - Minuten - Stunden - Tage - Wochen - m - d - Später heute - Morgen - Heute - Gestern - - Verbindungsaufbau seit %1$d s - Handshaking - Verbunden - Verbindung wird getrennt - Warte auf Trennung der Verbindung - - Erstellt am: %1$s - Autor: %1$s - Name: %1$s - Dateiname: %1$s - Plugin-Version: %1$s - Name: %1$s (%2$s) - IOB anzeigen - Zeige detailliertes IOB - COB anzeigen - Abweichung anzeigen - Zeige detailliertes Delta - Durchschnittl. Abweichung anzeigen - Akkustand Smartphone - Akkustand Rig - Basalrate anzeigen - Loop Status anzeigen - BZ anzeigen - Zeige BGI - Trendpfeil anzeigen - Min. seit letztem Wert - Standard-Watchface, Du kannst auf den Knopf WATCHFACE exportieren drücken, um eine Vorlage zu generieren - Standard-Watchface - Hintergrundbild - Diagramme (BG, Basal, Vorhersage...) - Bild vor Graph und hinter Textfeldern - Freitextfeld 1 - Freitextfeld 2 - Freitextfeld 3 - Freitextfeld 4 - IOB Bezeichnung oder IOB Sum wenn detailliert - IOB-Summe oder (Bolus_IOB|Basal_IOB) wenn detailliert - COB-Bezeichnung - COB-Wert - Kurzes BG Delta - Durchschnittliches BG-Delta (15min) - Telefon-Akku (%) - Globale Loop Akku (%) - Basalrate - BGI-Wert - Uhrzeit (HH:MM oder HH:MM:SS) - Stunde (HH) - Minuten (MM) - Sekunde (SS) - AM oder PM - Wochentagname - Tag (DD) - Monatsname (kurz) - Loop-Status und Historie - Richtungspfeil - Minuten vor dem letzten erhaltenen BG - Blutzuckerwert - Titelbild vor dem Text (wählen...) - Bild des Stundenzeiger (Analog Uhr) - Bild des Minutenzeiger (Analog Uhr) - Bild des Sekundenzeigers (Analog Uhr) - diff --git a/app-wear-shared/shared/src/main/res/values-el-rGR/strings.xml b/app-wear-shared/shared/src/main/res/values-el-rGR/strings.xml deleted file mode 100644 index e8c20ac480..0000000000 --- a/app-wear-shared/shared/src/main/res/values-el-rGR/strings.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - %1$d λ πριν - %1$d λεπτά πριν - %1$.1f ω πριν - %1$.1f ημέρες πριν - %1$.0f ημέρες πριν - σε %1$.0f ημέρες - σε %1$.0f ημέρες - h - ημέρες - ώρες - δευτερόλεπτο - λεπτό - ώρα - ημέρα - εβδομάδα - δευτερόλεπτα - λεπτά - ώρες - ημέρες - εβδομάδες - m - ημ - Αργότερα σήμερα - Αύριο - Σήμερα - Χθες - - Σύνδεση για %1$d δευτερόλεπτα - Δημιουργία σύνδεσης - Συνδέθηκε - Αποσυνδέεται - Αναμονή για αποσύνδεση - - Δημιουργήθηκε: %1$s - Συντάκτης: %1$s - Όνομα: %1$s - Όνομα αρχείου: %1$s - Έκδοση πρόσθετου: %1$s - Όνομα: %1$s (%2$s) - Πληροφορίες: %1$s - Εμφάνιση IOB - Εμφάνιση λεπτομερούς IOB - Εμφάνιση COB - Εμφάνιση Διαφοράς - Εμφάνιση λεπτομερούς Διαφοράς - Εμφάνιση Μέσης Διαφοράς - Εμφάνιση Μπαταρίας Τηλεφώνου - Εμφάνιση Μπαταρίας Rig - Εμφάνιση Βασικού Ρυθμού - Εμφάνιση Κατάστασης Κυκλώματος - Εμφάνιση γλυκόζης αίματος - Εμφάνιση BGI - Εμφάνιση Βέλους Κατεύθυνσης - Εμφάνιση Πριν - Εμφάνιση αριθμού Εβδομάδας - Προεπιλεγμένη πρόσοψη ρολογιού, μπορείτε να κάνετε κλικ στο κουμπί ΕΞΑΓΩΓΗ ΠΡΟΣΟΨΗΣ για να δημιουργήσετε ένα πρότυπο - Προεπιλεγμένη πρόσοψη ρολογιού - Εικόνα φόντου - Γραφήματα (BG, βασικός, γραμμές πρόβλεψης...) - Εικόνα μπροστά από το γράφημα και πίσω από τα πεδία κειμένου - Ελεύθερο κείμενο 1 - Ελεύθερο κείμενο 2 - Ελεύθερο κείμενο 3 - Ελεύθερο κείμενο 4 - Ετικέτα IOB ή Άθροισμα IOB εάν είναι λεπτομερές - Άθροισμα IOB ή (Bolus_IOB|Basal_IOB) εάν είναι λεπτομερές - Ετικέτα COB - Τιμή COB - Βραχυπρόθεσμη διαφορά BG - Μέση διαφορά BG (15λεπτά) - Μπαταρία τηλεφώνου (%) - Μπαταρία συνολικού κυκλώματος (%) - Βασικός Ρυθμός - Τιμή BGI - Ώρα (ΩΩ:ΛΛ ή ΩΩ:ΜΜ:ΣΣ) - Ώρα (HH) - Λεπτό (MM) - Δευτερόλεπτο (SS) - ΠΜ ή ΜΜ - Όνομα της ημέρας της εβδομάδας - Ημέρα (DD) - Αριθμός Εβδομάδας (ww) - Όνομα μήνα (σύντομο) - Κατάσταση κυκλώματος και πριν - Βέλος κατεύθυνσης - Λεπτά πριν από την τελευταία λήψη BG - Τιμή γλυκόζης αίματος - Εικόνα εξωφύλλου μπροστά από το κείμενο (κλήσεις...) - Εικόνα ώρας χεριού (Αναλογικό ρολόι) - Εικόνα λεπτού χεριού (Αναλογικό ρολόι) - Εικόνα δευτερολέπτου χεριού (Αναλογικό ρολόι) - diff --git a/app-wear-shared/shared/src/main/res/values-es-rES/strings.xml b/app-wear-shared/shared/src/main/res/values-es-rES/strings.xml deleted file mode 100644 index 026bf80160..0000000000 --- a/app-wear-shared/shared/src/main/res/values-es-rES/strings.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - hace %1$d m - Hace %1$d minutos - hace %1$.1f h - Hace %1$.1f día - Hace %1$.0f días - en %1$.0f días - en %1$.0f días - h - días - horas - segundo - minuto - hora - día - semana - segundos - minutos - horas - días - semanas - m - d - Más tarde hoy - Mañana - Hoy - Ayer - - Conectando durante %1$d s - Estableciendo comunicación - Conectado - Desconectando - Esperando la desconexión - - Creada: %1$s - Autor: %1$s - Nombre: %1$s - Nombre del archivo: %1$s - Versión del plugin: %1$s - Nombre: %1$s (%2$s) - Info: %1$s - Mostrar IOB - Mostrar IOB detallada - Mostrar COB - Mostrar delta - Mostrar delta detallado - Mostrar delta promedio - Mostrar batería del teléfono - Mostrar batería global del lazo - Mostrar la tasa basal - Mostrar estado del lazo - Mostrar glucosa - Mostrar BGI (Índice de glucosa en sangre) - Mostrar flecha de dirección - Mostrar \"hace\" - Mostrar número de semana - Esfera predeterminada, puedes hacer clic en el botón EXPORTAR ESFERA para generar una plantilla - Esfera por defecto - Imagen de fondo - Gráficos (glucosa, basal, líneas de predicción...) - Imagen frente al gráfico y detrás de campos de texto - Texto libre 1 - Texto libre 2 - Texto libre 3 - Texto libre 4 - Etiqueta IOB o Suma IOB si es detallada - Suma de IOB o (Bolos_IOB|Basal_IOB) si se detalla - Etiqueta COB - Valor COB - Delta corto de glucosa - Delta promedio de glucosa (15min) - Batería del teléfono (%) - Batería global de lazo (%) - Tasa Basal - Valor BGI - Tiempo (HH:MM o HH:MM:SS) - Hora (HH) - Minuto (MM) - Segundo (SS) - AM o PM - Nombre del día de la semana - Día (DD) - Número de semana (ww) - Nombre del mes (corto) - Estado del bucle y hace - Flecha de dirección - Minutos atrás del último valor de glucosa recibido - Valor de glucosa - Imagen de portada delante del texto (diales...) - Imagen de la aguja horaria (reloj analógico) - Imagen del minutero (reloj analógico) - Imagen del segundero (reloj analógico) - diff --git a/app-wear-shared/shared/src/main/res/values-fr-rFR/strings.xml b/app-wear-shared/shared/src/main/res/values-fr-rFR/strings.xml deleted file mode 100644 index d5b3b0ac07..0000000000 --- a/app-wear-shared/shared/src/main/res/values-fr-rFR/strings.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - il y a %1$d m - Il y a %1$d minutes - il y a %1$.1f h - Il y a %1$.1f jours - Il y a %1$.0f jours - en %1$.0f jours - en %1$.0f jours - h - jours - heures - seconde - minute - heure - jour - semaine - secondes - minutes - heures - jours - semaines - m - j - Plus tard aujourd\'hui - Demain - Aujourd’hui - Hier - - Connexion en cours %1$ds - Connexion - Connectée - Déconnexion en cours - Attente de déconnexion - - Créé le : %1$s - Auteur : %1$s - Nom : %1$s - Nom du fichier : %1$s - Version du plugin : %1$s - Nom : %1$s (%2$s) - Infos : %1$s - Afficher IA - Afficher IA détaillée - Afficher GA - Montrer le delta - Afficher Delta Détaillé - Afficher le delta moyen - Afficher la batterie du téléphone - Afficher la batterie de la plateforme - Afficher Basale - Afficher État Boucle - Afficher Glycémie - Afficher IGly - Afficher Flèche - Afficher Min Passées - Cadran par défaut, vous pouvez cliquer sur le bouton EXPORTER WATCHFACE pour générer un modèle - Cadran par défaut - Image d\'arrière-plan - Graphiques (Gly, basal, lignes de prédiction...) - Image devant le graphique et derrière les champs de texte - Texte libre 1 - Texte libre 2 - Texte libre 3 - Texte libre 4 - Libellé \"IA\" ou valeur IA globale si détaillé Ok - Valeur IA globale ou (IA_Bolus|IA_Basal) si détaillé Ok - Libellé \"GA\" - Valeur de GA - Delta Glycémie (5min) - Delta glycémie moyen (15min) - Batterie du téléphone (%) - Batterie de la boucle globale (%) - Débit Basal - Valeur de IGly - Heure (HH:MM ou HH:MM:SS) - Heure (HH) - Minute (MM) - Seconde (SS) - AM ou PM - Nom du jour de la semaine - Jour (JJ) - Nom du mois (court) - État de la boucle et délais - Flèche de direction - Minutes depuis la dernière Glycémie reçue - Valeur de Ia Gly - Image de couverture devant le texte (cadrans...) - Image de l\'aiģuille de l\'heure (Montre Analogique) - Image de l\'aiguille des minutes (Montre Analogique) - Image de l\'aiguille des secondes (Montre Analogique) - diff --git a/app-wear-shared/shared/src/main/res/values-ga-rIE/strings.xml b/app-wear-shared/shared/src/main/res/values-ga-rIE/strings.xml deleted file mode 100644 index 7f4c422d88..0000000000 --- a/app-wear-shared/shared/src/main/res/values-ga-rIE/strings.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - %1$d nóim ó shin - %1$.1f u ó shin - u - lá - uair - soicind - nóiméad - uair - lá - seachtain - soicind - nóiméad - uair - lá - seachtaine - n - lá - - Ag nascadh le %1$d s - Nasctha - Dícheangal - - diff --git a/app-wear-shared/shared/src/main/res/values-hr-rHR/strings.xml b/app-wear-shared/shared/src/main/res/values-hr-rHR/strings.xml deleted file mode 100644 index a098b3c42d..0000000000 --- a/app-wear-shared/shared/src/main/res/values-hr-rHR/strings.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - Prije %1$.1f dana - Prije %1$.0f dana - Danas - - Povezivanje %1$d s - Povezivanje - Povezano - Odspajanje - Čeka se prekid veze - - diff --git a/app-wear-shared/shared/src/main/res/values-hu-rHU/strings.xml b/app-wear-shared/shared/src/main/res/values-hu-rHU/strings.xml deleted file mode 100644 index a30f9e054a..0000000000 --- a/app-wear-shared/shared/src/main/res/values-hu-rHU/strings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - p - n - - Kapcsolódva - - diff --git a/app-wear-shared/shared/src/main/res/values-it-rIT/strings.xml b/app-wear-shared/shared/src/main/res/values-it-rIT/strings.xml deleted file mode 100644 index f6dc6021a6..0000000000 --- a/app-wear-shared/shared/src/main/res/values-it-rIT/strings.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - %1$d m fa - %1$d minuti fa - %1$.1f h fa - %1$.1f giorni fa - %1$.0f giorni fa - in %1$.0f giorni - in %1$.0f giorni - h - giorni - ore - secondi - minuti - ora - giorno - settimana - secondi - minuti - ore - giorni - settimane - m - d - Più tardì oggi - Domani - Oggi - Ieri - - In connessione per %1$d s - Connessione - Connesso - Disconnessione - In attesa della disconnessione - - Creato: %1$s - Autore: %1$s - Nome: %1$s - Nome file: %1$s - Versione plugin: %1$s - Nome: %1$s (%2$s) - Info: %1$s - Mostra IOB - Mostra IOB dettagliato - Mostra COB - Mostra delta - Mostra delta dettagliato - Mostra delta medio - Mostra batteria telefono - Mostra batteria rig - Mostra velocità basale - Mostra stato loop - Mostra BG - Mostra BGI - Mostra frecce direzionali - Mostra Indietro - Watchface predefinita, puoi fare click sul tasto ESPORTA WATCHFACE per generare un template - Watchface predefinita - Immagine sfondo - Grafici (BG, basale, linee di previsione...) - Immagine davanti al grafico e dietro i campi di testo - Testo libero 1 - Testo libero 2 - Testo libero 3 - Testo libero 4 - Etichetta IOB o somma IOB se in dettaglio - Somma IOB o (Bolo_IOB|Basale_IOB) se in dettaglio - Etichetta COB - Valore COB - Delta BG breve - Delta BG medio (15min) - Batteria telefono (%) - Batteria globale loop (%) - Velocità basale - Valore BGI - Tempo (HH:MM o HH:MM:SS) - Ora (HH) - Minuto (MM) - Secondo (SS) - AM o PM - Nome del giorno della settimana - Giorno (DD) - Nome del mese (breve) - Stato loop e indietro - Freccia direzionale - Minuti addietro per l\'ultimo valore BG ricevuto - Valore BG - Immagine di copertina davanti al testo (quadranti...) - Immagine lancetta ore (orologio analogico) - Immagine lancetta minuti (orologio analogico) - Immagine lancetta secondi (orologio analogico) - diff --git a/app-wear-shared/shared/src/main/res/values-iw-rIL/strings.xml b/app-wear-shared/shared/src/main/res/values-iw-rIL/strings.xml deleted file mode 100644 index c1642ab32d..0000000000 --- a/app-wear-shared/shared/src/main/res/values-iw-rIL/strings.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - לפני %1$d דקות - לפני %1$d דקות - לפני %1$.1f שעות - לפני %1$.1f ימים - לפני %1$.0f ימים - בעוד %1$.0f ימים - בעוד %1$.0f ימים - ש\' - ימים - שעות - שניה - דקה - שעה - יום - שבוע - שניות - דקות - שעות - ימים - שבועות - דק\' - י\' - מאוחר יותר היום - מחר - היום - אתמול - - חיבור אל %1$s - לוחץ יד - מחובר - מתנתק - ממתין לניתוק - - נוצר ב: %1$s - יוצר/ת: %1$s - שם: %1$s - שם קובץ: %1$s - גרסת פלאגין: %1$s - שם: %1$s (%2$s) - הצג אינסולין פעיל - הצגת אינס\' פעיל מפורט - הצג פח\' פעילות - הצג דלתא - הצג דלתא מפורטת - הצג דלתא ממוצעת - הצג את סוללת הטלפון - הצג סוללת ריג - הצג מינון בזאלי - ברירת המחדל של פני השעון, ניתן ללחוץ על כפתור ייצוא פני שעון כדי ליצור תבנית - ברירת מחדל פני שעון - diff --git a/app-wear-shared/shared/src/main/res/values-ja-rJP/strings.xml b/app-wear-shared/shared/src/main/res/values-ja-rJP/strings.xml deleted file mode 100644 index d78b6c6230..0000000000 --- a/app-wear-shared/shared/src/main/res/values-ja-rJP/strings.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - %1$d 分前 - %1$d 分前 - %1$.1f 時間前 - %1$.1f 日前 - %1$.0f 日前 - in %1$.0f 日 - in %1$.0f 日 - 時 - 日間 - 時間 - 秒 - 分 - 時 - 日 - 週 - 秒 - 分 - 時間 - 日 - 週間 - 分 - 日 - 今日中 - 明日 - 今日 - 昨日 - - %1$d 秒間接続中 - ハンドシェイク中です - 接続されました - 切断中 - 切断待ち - - diff --git a/app-wear-shared/shared/src/main/res/values-ko-rKR/strings.xml b/app-wear-shared/shared/src/main/res/values-ko-rKR/strings.xml deleted file mode 100644 index 09e6124d50..0000000000 --- a/app-wear-shared/shared/src/main/res/values-ko-rKR/strings.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - %1$d 분 전 - %1$d분 전 - %1$.1f 시간 전 - %1$.1f일 전 - %1$.0f 일 전 - %1$.0f 일 이내에 - %1$.0f 일 이내에 - 시간 - 일 - 시간 - 초 - 분 - 시 - 일 - 주 - 초 - 분 - 시 - 일 - 주 - 분 - 일 - 오늘 늦게 - 내일 - 오늘 - 어제 - - %1$d 초 동안 연결중 - 통신 확인 - 연결됨 - 연결끊기중 - 연결 해제 대기 중 - - 생성 시간: %1$s - 작성자: %1$s - 이름: %1$s - 파일 이름: %1$s - 플러그인 버전: %1$s - 이름: %1$s (%2$s) - IOB 표시 - IOB 자세한 표시 - COB 표시 - 델타 표시하기 - 자세한 델타 표시하기 - 평균 델타 표시하기 - 핸드폰 배터리 표시하기 - 리그 베터리 표시하기 - Basal 값 표시하기 - 루프 상태 표시하기 - BG 표시하기 - BGI 표시하기 - 화살표 표시하기 - 이전 표시하기 - 기본 시계, 워치페이스 내보내기 버튼을 클릭하여 템플릿을 생성할 수 있습니다. - 기본 워치페이스 - 배경화면 이미지 - 그래픽 (혈당, basal, 예측 선...) - 그래프 앞 그리고 문자 필드 뒤 이미지 - 무료 문자 1 - 무료 문자 2 - 무료 문자 3 - 무료 문자 4 - 자세한 경우 IOB 레이블 또는 IOB 합계 - 자세한 경우 IOB 합계 또는 (Bolus_IOB|Basal_IOB) - COB 레이블 - COB 값 - 단기 BG 델타 - 평균 BG 델타 (15분) - 핸드폰 베터리 (%) - 글로벌 루프 베터리 (%) - Basal양 - BGI 값 - 시간 (HH:MM 또는 HH:MM:SS) - 시간 (HH) - 분 (MM) - 초 (SS) - 오전 또는 오후 - 요일 - 일 (DD) - 월명 (짧게) - 루프 상태 및 이전 - 방향 화살표 - 몇 분 전에 마지막으로 받은 BG - BG 값 - 문자 앞의 표지 이미지 (다이얼...) - 시침 이미지 (아날로그 시계) - 분침 이미지 (아날로그 시계) - 초침 이미지 (아날로그 시계) - diff --git a/app-wear-shared/shared/src/main/res/values-lt-rLT/strings.xml b/app-wear-shared/shared/src/main/res/values-lt-rLT/strings.xml deleted file mode 100644 index 2c287ad28f..0000000000 --- a/app-wear-shared/shared/src/main/res/values-lt-rLT/strings.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - prieš %1$d min. - Prieš %1$d min. - Prieš %1$.1f val. - Prieš %1$s d. - Prieš %1$.0f d. - Po %1$.0f d. - Po %1$.0f d. - val. - d. - val. - sek. - min. - val. - d. - sav. - sekundės - min. - val. - d. - savaičių - m - d - Šiandien vėliau - Rytoj - Šiandien - Vakar - - Jungiamasi %1$d s - Ryšio užmezgimas - Prisijungta - Atsijungiama - Laukiama atsijungimo - - Sukurta: %1$s - Autorius: %1$s - Vardas: %1$s - Failo pavadinimas: %1$s - Įskiepio versija: %1$s - Pavadinimas: %1$s (%2$s) - Info: %1$s - Rodyti AIO - Rodyti detalų AIO - Rodyti AAO - Rodyti pokytį - Rodyti glikemijos pokyčius detaliai - Rodyti vidutinį pokytį - Rodyti telefono bateriją - Rodyti įrenginio bateriją - Rodyti valandinę bazę - Rodyti Ciklo statusą - Rodyti KG - Rodyti GĮ - Rodyti krypties rodyklę - Laikas nuo pask. vertės - Numatytasis ekranas. Paspaudus EKSPORTUOTI, bus sukurtas ruošinys - Numatytasis ekranas - Fono paveiksliukas - Grafikai (glikemija, bazė, prognozės...) - Paveiksliukas už teksto ir prieš grafiką - Laisvas tekstas 1 - Laisvas tekstas 2 - Laisvas tekstas 3 - Laisvas tekstas 4 - Sudėtinis arba detalus AIO - Sudėtinis arba detalus (Boluso_AIO|Bazės_AIO) AIO - AAO žyma - AAO vertė - Trumpo laikotarpio pokytis - Vidutinis pokytis (15 min) - Telefono baterija (%) - Baterija (%) - Bazė - KGI vertė - Laikas (val:min arba val:min:sek) - Val. - Min. - Sek. - AM ar PM - Savaitės diena - Diena (d.) - Mėnuo (sutrump.) - Ciklo būsena - Tendencijos rodyklė - Prieš kiek minučių nuskaityta glikemija - Glikemija - Paveiksliukas prieš tekstą (skambučius...) - Analoginio laikrodžio valandinė rodyklė - Analoginio laikrodžio minutinė rodyklė - Analoginio laikrodžio sekundinė rodyklė - diff --git a/app-wear-shared/shared/src/main/res/values-nl-rNL/strings.xml b/app-wear-shared/shared/src/main/res/values-nl-rNL/strings.xml deleted file mode 100644 index ecf4281832..0000000000 --- a/app-wear-shared/shared/src/main/res/values-nl-rNL/strings.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - %1$d m geleden - %1$d minuten geleden - %1$.1f uur geleden - %1$.1f dagen geleden - %1$.0f dagen geleden - over %1$.0f dagen - binnen %1$.0f dagen - u - dagen - uren - seconde - minuut - uur - dag - week - seconden - minuten - uren - dagen - weken - m - d - Later vandaag - Morgen - Vandaag - Gisteren - - Verbonden gedurende %1$d s - Handshaking - Verbonden - Verbinding aan het verbreken - Wachten op het loskoppelen - - Gemaakt op: %1$s - Auteur: %1$s - Naam: %1$s - Bestandsnaam: %1$s - Plugin versie: %1$s - Naam: %1$s (%2$s) - Info: %1$s - Toon IOB - Toon gedetailleerde IOB - Toon COB - Toon Delta - Toon gedetailleerde Delta - Toon gemiddelde delta - Toon Telefoon Batterij - Toon Rig batterij - Toon basaalstand - Toon Loop Status - Toon BG - Toon BGI - Toon richtingspijl - Toon tijd geleden - Weeknummer weergeven - Standaard watchface, u kunt op de EXPORT WATCHFACE knop klikken om een sjabloon te genereren - Standaard watchface - Achtergrondafbeelding - Grafieken (BG, basaal, voorspellingslijnen...) - Afbeelding voor de grafiek en achter tekstvelden - Vrije tekst 1 - Vrije tekst 2 - Vrije tekst 3 - Vrije tekst 4 - IOB label of IOB totaal indien gedetailleerd - IOB totaal of (Bolus_IOB|Basal_IOB) indien gedetailleerd - COB label - COB waarde - Korte BG delta - Gemiddelde BG delta (15min) - Batterij Telefoon (%) - Globale loop batterij (%) - Basaal stand - BGI waarde - Tijd (UU:MM of UU:MM:SS) - Uur (UU) - Minuut (MM) - Seconde (SS) - AM of PM - Naam van de dag van de week - Dag (DD) - Weeknummer (ww) - Maand (kort) - Loop status en tijd geleden - Richtingspijl - Minuten geleden voor laatst ontvangen BG - BG waarde - Masker afbeelding over tekst (bijv. uren indicators) - Afbeelding van uren wijzer (analoog horloge) - Afbeelding van minuut wijzer (analoog horloge) - Afbeelding van seconde wijzer (analoog horloge) - diff --git a/app-wear-shared/shared/src/main/res/values-no-rNO/strings.xml b/app-wear-shared/shared/src/main/res/values-no-rNO/strings.xml deleted file mode 100644 index a6024c111f..0000000000 --- a/app-wear-shared/shared/src/main/res/values-no-rNO/strings.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - %1$d min siden - %1$d minutter siden - %1$.1f timer siden - %1$.1f dager siden - %1$.0f dager siden - om %1$.0f dager - om %1$.0f dager - t - dager - timer - sekund - minutt - time - dag - uke - sekunder - minutter - timer - dager - uker - m - d - Senere i dag - I morgen - Idag - I går - - Tilkobler i %1$d sek - Tilkobling verifiseres - Tilkoblet - Frakobler - Venter på frakobling - - Opprettet: %1$s - Laget av: %1$s - Navn: %1$s - Filnavn: %1$s - Plugin-versjon: %1$s - Navn: %1$s (%2$s) - Info: %1$s - Vis IOB - Vis detaljert IOB - Vis COB - Vis Delta - Vis detaljert Delta - Vis Gj. snitt Delta - Vis telefonbatteri - Vis riggens batteri - Vis basalrate - Vis loop status - Vis BS - Vis BS - Vis retningspil - Vis tid siden - Vis ukenummer - Standard klokkebakgrunn, du kan klikke på EKSPORTER KLOKKEBAKGRUNN for å lage en mal - Standard klokkebakgrunn - Bakgrunnsbilde - Grafer (BS, basal, prediksjonslinjer...) - Bilde foran grafer og bak tekstfelter - Fritekst 1 - Fritekst 2 - Fritekst 3 - Fritekst 4 - IOB-merkelapp eller IOB-sum hvis angitt - IOB-sum eller (Bolus_IOB|Basal_IOB) hvis angitt - COB etikett - COB verdi - Kort BS-endring - Gj.snitt BS-endring (15min) - Telefonbatteri (%) - Rig-batteri (%) - Basalrate - BGI verdi - Tid (TT:MM eller TT:MM:SS) - Time (TT) - Minutt (MM) - Sekund (SS) - AM eller PM - Navn på ukedag - Dag (DD) - Ukenummer (ww) - Navn på måned (kort) - Loop-status og tid siden - Retningspil - Minutter siden BS sist ble mottatt - BS-verdi - Bilde foran tekst (urvisere...) - Bilde av timeviser (analog klokke) - Bilde av minuttviser (analog klokke) - Bilde av sekundviser (analog klokke) - diff --git a/app-wear-shared/shared/src/main/res/values-pl-rPL/strings.xml b/app-wear-shared/shared/src/main/res/values-pl-rPL/strings.xml deleted file mode 100644 index b3eedc562a..0000000000 --- a/app-wear-shared/shared/src/main/res/values-pl-rPL/strings.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - %1$d min temu - %1$d minut temu - %1$.1f godz. temu - %1$.1f dni temu - %1$.0f dni temu - za %1$.0f dni - za %1$.0f dni - h - dni - godzin - sekunda - minuta - godzina - dzień - tydzień - sekund - minut - godzin - dni - tygodni - m - d - Dzisiaj, później - Jutro - Dziś - Wczoraj - - Łączenie przez %1$d s - Nawiązywanie połączenia - Połączono - Rozłączanie - Oczekiwanie na rozłączenie - - Utworzono: %1$s - Autor: %1$s - Nazwa: %1$s - Nazwa pliku: %1$s - Wersja wtyczki: %1$s - Nazwa: %1$s (%2$s) - Info: %1$s - Pokaż IOB - Pokaż szczegółowe IOB - Pokaż COB - Pokaż Deltę - Pokaż szczegółowo Deltę - Pokaż Śr. Deltę - Pokaż Baterię Telefonu - Pokaż Baterię Zestawu - Pokaż Dawkę Bazową - Pokaż Status Pętli - Pokaż glikemię - Pokaż BGI - Pokaż Strzałkę Trendu - Pokaż Aktualność - Domyślna tarcza, możesz kliknąć na EXPORTUJ TARCZĘ aby wygenerować szablon - Domyślna Tarcza - Obraz w tle - Wykresy (glikemia, baza, prognozy...) - Obraz przed wykresem i za polami tekstowymi - Wolne pole tekstowe 1 - Wolne pole tekstowe 2 - Wolne pole tekstowe 3 - Wolne pole tekstowe 4 - Etykieta IOB lub suma IOB przy szczegółowym IOB - Suma IOB lub (Bolus_IOB|Basal_IOB) jeśli szczegółowo - Etykieta COB - Wartość COB - Krótka delta glikemii - Średnia delta glikemii (15min) - Bateria telefonu (%) - Globalna bateria pętli (%) - Wartości bazy - Wartość BGI - Czas (HH:MM or HH:MM:SS) - Godzina (HH) - Minuta (MM) - Sekunda (SS) - AM lub PM - Nazwa dnia tygodnia - Dzień (DD) - Nazwa miesiąca (krótka) - Status pętli i aktualność - Strzałka trendu - Minut od ostatniego otrzymania glikemii - Wartość glikemii - Obraz nakładki przed tekstem (tarcze...) - Obraz lub wskazówka godzinowa (Tarcza Analogowa) - Obraz lub wskazówka minutowa (Tarcza Analogowa) - Obraz lub wskazówka sekundowa (Tarcza Analogowa) - diff --git a/app-wear-shared/shared/src/main/res/values-pt-rBR/strings.xml b/app-wear-shared/shared/src/main/res/values-pt-rBR/strings.xml deleted file mode 100644 index 9f5d4585a4..0000000000 --- a/app-wear-shared/shared/src/main/res/values-pt-rBR/strings.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - %1$d min atrás - %1$d minutos atrás - %1$.1fh atrás - %1$d dias atrás - %1$.0f dias atrás - em %1$.0f dias - em %1$.0f dias - h - dias - horas - segundo - minuto - hora - dia - semana - segundos - minutos - horas - dias - semanas - m - d - Hoje, Mais tarde - Amanhã - Hoje - Ontem - - Conectando para %1$d - Cumprimento - Conectado - A desligar - Aguardando a desconexão - - Criado por %1$s - Autor: %1$s - Nome: %1$s - Nome do arquivo: %1$s - Versão do plugin: %1$s - Nome: %1$s (%2$s) - Informações: %1$s - Mostrar IA - Mostrar detalhes da IA - Mostrar CA - Mostrar Delta - Mostrar Delta detalho - Mostrar média de delta - Mostrar bateria do telefone - Mostrar bateria de rig - Mostrar Taxa Basal - Mostrar Status do Loop - Mostrar glicemia - Mostrar BGI - Mostrar seta de tendência - Exibir atrás - Watchface padrão, você pode clicar no botão EXPORTAR WATCHFACE para gerar um modelo - Watchface padrão - diff --git a/app-wear-shared/shared/src/main/res/values-pt-rPT/strings.xml b/app-wear-shared/shared/src/main/res/values-pt-rPT/strings.xml deleted file mode 100644 index 6d5a05175a..0000000000 --- a/app-wear-shared/shared/src/main/res/values-pt-rPT/strings.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - %1$d m atrás - %%1$d minutos atrás - %1$.1f h atrás - %1$.1f dias atrás - %1$.0f dias atrás - em %1$.0f dias - em %1$.0f dias - h - dias - horas - segundo - minuto - hora - dia - semana - segundos - minutos - horas - dias - semanas - m - d - Hoje mais tarde - Amanhã - Hoje - Ontem - - A ligar durante %1$d s - Cumprimento - Ligado - A desconectar - A aguardar a desconexão - - Criado em: %1$s - Autor: %1$s - Nome: %1$s - Nome do ficheiro: %1$s - Versão do plugin: %1$s - Nome: %1$s (%2$s) - Mostrar IA - Mostrar IA detalhada - Mostrar HCA - Mostrar Delta - Mostrar Delta detalhado - Mostrar Delta Médio - Mostrar Bateria Telefone - Mostrar Bateria Equipamento - Mostrar Taxa Basal - Mostrar Estado Loop - Mostrar glicemia - Mostrar IG - Mostrar Seta Direcção - Mostrar Atrás - Watchface padrão, pode clicar no botão EXPORTAR WATCHFACE para gerar um modelo - Watchface padrão - Imagem de fundo - Gráficos (GLIC, basal, linhas de previsão...) - Imagem na frente do gráfico e atrás dos campos de texto - Texto livre 1 - Texto livre 2 - Texto livre 3 - Texto livre 4 - Etiqueta de IA ou Soma IA se detalhada - Soma IA ou (Bolus_IA|Basal_IA) se detalhada - Etiqueta HCA - valor HCA - Delta curto da glicemia - Delta da glicemia média (15min) - Bateria do telefone (%) - Bateria do loop (%) - Taxa Basal - Valor de IG - Horário (HH:MM ou HH:MM:SS) - Hora (HH) - Minuto (MM) - Segundo (SS) - AM ou PM - Nome do Dia da Semana - Dia (DD) - Nome do Mês (curto) - Seta de direção - Minutos desde a recepção do último valor de GLIC - Valor de GLIC - Imagem da capa na frente do texto - Imagem do ponteiro das horas (Relógio Analógico) - Imagem do ponteiro dos minutos (Relógio Analógico) - Imagem do ponteiro dos segundos (Relógio Analógico) - diff --git a/app-wear-shared/shared/src/main/res/values-ro-rRO/strings.xml b/app-wear-shared/shared/src/main/res/values-ro-rRO/strings.xml deleted file mode 100644 index 10ce7af4ed..0000000000 --- a/app-wear-shared/shared/src/main/res/values-ro-rRO/strings.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - %1$d min în urmă - %1$.1f ore în urmă - h - zile - ore - secundă - minut - oră - zi - săptămână - secunde - minute - ore - zile - săptămâni - m - z - - Conectat de %1$d s - Împerechere - Conectat - Se deconectează - Se așteaptă deconectarea - - diff --git a/app-wear-shared/shared/src/main/res/values-ru-rRU/strings.xml b/app-wear-shared/shared/src/main/res/values-ru-rRU/strings.xml deleted file mode 100644 index c2a98e4c23..0000000000 --- a/app-wear-shared/shared/src/main/res/values-ru-rRU/strings.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - %1$d мин. назад - %1$d минут назад - %1$.1fч. назад - %1$s дн назад - %1$s дн назад - через %1$.0f дн - через %1$.0f дн - ч - дн - час - сек - мин - час - дн - нед - сек - мин - час - дн - нед - м - д - Позднее сегодня - Завтра - Cегодня - Вчера - - Связь установлена за %1$d сек - Подтверждение связи - соединение установлено - разъединение - Ожидание разъединения - - Создано: %1$s - Автор: %1$s - Название: %1$s - Имя файла: %1$s - Версия плагина: %1$s - Информация: %1$s - Отображать IOB - Отображать IOB подробно - Отображать COB - Отображать дельту - Отображать дельту подробно - Отображать усредненную дельту - Отображать заряд телефона - Отображать заряд батареи системы - Отображать базал - Отображать состояние цикла - Отображать ГК - Отображать BGI (ГКИ) - Отображать стрелку тренда - Циферблат по умолчанию, вы можете нажать на EXPORT WATCHFACE чтобы создать шаблон - Циферблат по умолчанию - Фоновое изображение - Графики (ГК, базал, линии прогнозов...) - Метка IOB, или общего IOB для подробного отображения - Общий IOB, или (IOB_болюса|IOB_базы) для подробного отображения - Метка COB - Значение COB - Краткая дельта ГК - Средняя дельта ГК (15 мин) - Заряд телефона (%) - Заряд системы ИПЖ (%) - Базальная скорость - Значение ГКИ - Время (ЧЧ:ММ или ЧЧ:ММ:СС) - Часы (ЧЧ) - Минуты (ММ) - Секунды (СС) - AM или PM - Название дня недели - Число (ДД) - Название месяца (краткое) - Стрелка тренда - Минут с последнего чтения ГК - Значение ГК - Изображение для часовой стрелки (Аналоговые часы) - Изображение для минутной стрелки (Аналоговые часы) - Изображение для секундной стрелки (Аналоговые часы) - diff --git a/app-wear-shared/shared/src/main/res/values-sk-rSK/strings.xml b/app-wear-shared/shared/src/main/res/values-sk-rSK/strings.xml deleted file mode 100644 index 150cfd10f9..0000000000 --- a/app-wear-shared/shared/src/main/res/values-sk-rSK/strings.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - pred %1$d min - pred %1$d minútami - pred %1$.1f h - Pred %1$.1f dňami - Pred %1$.0f dňami - za %1$.0f dní - za %1$.0f dní - h - dní - hodín - sekunda - minúta - hodina - deň - týždeň - sekúnd - minút - hodín - dní - týždňov - m - d - Neskôr počas dňa - Zajtra - Dnes - včera - - Pripájanie %1$d sek - Overovanie - Pripojené - Odpájanie - Čakám na odpojenie - - Vytvorené: %1$s - Autor: %1$s - Meno: %1$s - Názov súboru: %1$s - Verzia pluginu: %1$s - Meno: %1$s (%2$s) - Informácie: %1$s - Zobraziť IOB - Zobraziť detailný IOB - Zobraziť COB - Zobraziť odchýlku - Zobraziť detailnú odchylku - Zobraziť priemernú odchýlku - Zobraziť stav batérie telefónu - Zobrazovať stav batérie ďalších zariadení - Zobraziť bazál - Zobraziť stav uzavretého okruhu - Zobraziť glykémiu - Zobraziť BGI - Zobraziť trendovú šípku - Zobraziť aktualizované pred - Zobraziť číslo týždňa - Predvolený ciferník. Môžete kliknúť na tlačítko EXPORTOVAŤ CIFERNÍK pre vygenerovanie šablóny - Predvolený ciferník - Obrázok pozadia - Grafy (glykémie, bazály, krivky predpovedí...) - Obrázok pred grafom a za textovými poliami - Voľný text 1 - Voľný text 2 - Voľný text 3 - Voľný text 4 - Štítok IOB alebo suma IOB pri zapnutých detailoch - Suma IOB alebo (Bolus_IOB|Basal_IOB) pri zapnutých detailoch - Štítok COB - Hodnota COB - Krátkodobý priemer - Priemerný rozdiel glykémií (15min) - Batéria telefónu (%) - Batéria uzavretého okruhu (%) - Bazálna dávka - Hodnota BGI - Čas (HH:MM alebo HH:MM:SS) - Hodiny (HH) - Minúty (MM) - Sekundy (SS) - AM alebo PM - Meno dňa v týždni - Deň (DD) - Číslo týždňa (ww) - Názov mesiaca (krátky) - Stav uzavretého okruhu a čas - Trendová šípka - Pred minútami pre poslednú prijatú glykémiu - Hodnota glykémie - Úvodný obrázok pred textom (číselníky...) - Obrázok hodinovej ručičky (Analógové hodinky) - Obrázok minútovej ručičky (Analógové hodinky) - Obrázok sekundovej ručičky (Analógové hodinky) - diff --git a/app-wear-shared/shared/src/main/res/values-sr-rCS/strings.xml b/app-wear-shared/shared/src/main/res/values-sr-rCS/strings.xml deleted file mode 100644 index dc0f7891d7..0000000000 --- a/app-wear-shared/shared/src/main/res/values-sr-rCS/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app-wear-shared/shared/src/main/res/values-sv-rSE/strings.xml b/app-wear-shared/shared/src/main/res/values-sv-rSE/strings.xml deleted file mode 100644 index 5ad7b03058..0000000000 --- a/app-wear-shared/shared/src/main/res/values-sv-rSE/strings.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - %1$.1f tim sedan - %1$.1f dagar sedan - %1$.0f dagar sedan - om %1$.0f dagar - om %1$.0f dagar - h - dagar - timmar - sekund - minut - timme - dag - vecka - sekunder - minuter - timmar - dagar - veckor - m - d - Senare idag - Imorgon - Idag - Igår - - Ansluter (%1$d s) - Anslutningen verifieras - Ansluten - Kopplar från - Väntar på frånkoppling - - Skapad den: %1$s - Skapad av: %1$s - Namn: %1$s - Filnamn: %1$s - Plugin-version: %1$s - Namn: %1$s (%2$s) - Visa IOB - Visa detaljerad IOB - Visa COB - Visa delta - Visa detaljerad delta - Visa genomsnittlig delta - Visa telefonens batterinivå - Visa riggens batterinivå - Visa basaldos - Visa loop-status - Visa BG - Visa BGI - Visa riktningspil - Visa tid sedan - Standard-urtavla - du kan klicka på EXPORTERA URTAVLA för att generera en mall - Standard-urtavla - Bakgrundsbild - Grafer (BG, basal, prognoslinjer...) - Bild framför graf och bakom textfält - Fritext 1 - Fritext 2 - Fritext 3 - Fritext 4 - IOB-etikett. Total IOB om detaljerad - Total IOB. (Bolus_IOB|Basal_IOB) om detaljerad - COB-etikett - COB-värde - Kort BG-delta - Genomsnittligt BG-delta (15min) - Telefonens batterinivå (%) - Globalt loop-batteri (%) - Basaldos - BGI-värde - Tid (HH:MM eller HH:MM:SS) - Timme (HH) - Minut (MM) - Sekund (SS) - AM eller PM - Namn på veckodagen - Dag (DD) - Månadens namn (kort) - Loop status och tid - Visa riktningspil - Minuter sedan senast mottaget BG - BG-värde - Omslagsbild framför text (visare...) - Bild för timvisare (analog klocka) - Bild för minutvisare (analog klocka) - Bild för sekundvisare (analog klocka) - diff --git a/app-wear-shared/shared/src/main/res/values-tr-rTR/strings.xml b/app-wear-shared/shared/src/main/res/values-tr-rTR/strings.xml deleted file mode 100644 index 0b16af5b0d..0000000000 --- a/app-wear-shared/shared/src/main/res/values-tr-rTR/strings.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - %1$d dak önce - %1$d dakika önce - %1$.1f s önce - %1$.1f gün önce - %1$.0f gün önce - %1$.0f gün içinde - %1$.0f gün içinde - s - gün - saat - saniye - dakika - saat - gün - hafta - saniye - dakika - saat - gün - hafta - d - g - Bugünden sonra - Yarın - Bugün - Dün - - %1$d bağlanıyor - Bağlandı - Bağlandı - Bağlantı kesiliyor - Bağlantının kesilmesi bekleniyor - - Oluşturuldu: %1$s - Yetki: %1$s - İsim: %1$s - Dosya adı: %1$s - Eklenti sürümü: %1$s - İsim: %1$s (%2$s) - Bilgi: %1$s - AİNS Göster - Detalı AİNS göster - AKRB göster - Deltayı göster - Detaylı Delta göster - OrtDelta\'yı Göster - Telefon Pilini Göster - Teçhizat Pilini Göster - Bazal Oranı Göster - Döngü Durumunu Göster - KŞ\'ni göster - KŞ Etkisi Göster - Yön Oku Göster - Önce Göster - Hafta sayısını göster - Varsayılan saat arayüzü; bir şablon oluşturmak için SAAT ARAYÜZÜNÜ DIŞA AKTAR butonuna tıklayabilirsiniz - Varsayılan saat arayüzü - Arka plan görüntüsü - Grafik (KŞ, bazal, tahmin çizgileri...) - Grafiğin önündeki ve metin alanlarının arkasındaki resim - Serbest metin 1 - Serbest metin 2 - Serbest metin 3 - Serbest metin 4 - Ayrıntılıysa AİNS etiketi veya AİNS Toplamı - AİNS Toplamı veya ayrıntılıysa (Bolus_AİNS|Basal_AİNS) - AKRB etiketi - AKRB değeri - Kısa KŞ delta - Ortalama KŞ delta (15dk) - Telefon pili (%) - Global döngü pili (%) - Bazal Oranı - KŞ etkisi değeri - Saat (SS:DD veya SS:DD:SS) - Saat (SS) - Dakika (DD) - Saniye (SS) - AM veya PM - Haftanın gününün adı - Gün (GG) - Hafta sayısı - Ay adı (kısa) - Döngü durumu ve öncesi - Yön Okları - Birkaç dakika önce son alınan KŞ - KŞ değeri - Metnin önündeki kapak resmi (kadranlar...) - Akrep şekli (Analog Saat) - Yelkovan şekli (Analog Saat) - Saniye şekli (Analog Saat) - diff --git a/app-wear-shared/shared/src/main/res/values-uk-rUA/strings.xml b/app-wear-shared/shared/src/main/res/values-uk-rUA/strings.xml deleted file mode 100644 index dc0f7891d7..0000000000 --- a/app-wear-shared/shared/src/main/res/values-uk-rUA/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app-wear-shared/shared/src/main/res/values-zh-rCN/strings.xml b/app-wear-shared/shared/src/main/res/values-zh-rCN/strings.xml deleted file mode 100644 index 484f6371f1..0000000000 --- a/app-wear-shared/shared/src/main/res/values-zh-rCN/strings.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - %1$d 分钟前 - %1$d 分钟前 - %1$.1f 小时前 - %1$.1f 天前 - %1$.0f 天前 - 在 %1$.0f 天内 - 在 %1$.0f 天内 - h - 天 - 小时 - 秒 - 分钟 - 小时 - 天 - 周 - 秒 - 分钟 - 小时 - 天 - 周 - m - d - 今天稍后 - 明天 - 今天 - 昨天 - - 正在连接 %1$d s - 握手 - 已连接 - 正在断开连接 - 正在等待连接 - - diff --git a/app-wear-shared/shared/src/main/res/values/strings.xml b/app-wear-shared/shared/src/main/res/values/strings.xml deleted file mode 100644 index 6198eb283a..0000000000 --- a/app-wear-shared/shared/src/main/res/values/strings.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - insulin_button_increment_1 - insulin_button_increment_2 - insulin_button_increment_3 - - - %1$d m ago - %1$d minutes ago - %1$.1f h ago - %1$.1f days ago - %1$.0f days ago - in %1$.0f days - in %1$.0f days - h - days - hours - second - minute - hour - day - week - seconds - minutes - hours - days - weeks - m - d - Later today - Tomorrow - Today - Yesterday - - - Connecting for %1$d s - Handshaking - Connected - Disconnecting - Waiting for disconnection - - - Created at: %1$s - Author: %1$s - Name: %1$s - File name: %1$s - Plugin version: %1$s - Name: %1$s (%2$s) - Info: %1$s - %1$s - Show IOB - Show detailed IOB - Show COB - Show Delta - Show detailed Delta - Show AvgDelta - Show Phone Battery - Show Rig Battery - Show Basal Rate - Show Loop Status - Show BG - Show BGI - Show Direction Arrow - Show Ago - Show Week number - Default watchface, you can click on EXPORT WATCHFACE button to generate a template - Default Watchface - Background image - Graphs (BG, basal, prediction lines...) - Image in front of graph and behind text fields - Free text 1 - Free text 2 - Free text 3 - Free text 4 - IOB label or IOB Sum if detailed - IOB Sum or (Bolus_IOB|Basal_IOB) if detailed - COB label - COB value - Short BG delta - Average BG delta (15min) - Phone battery (%) - Global loop battery (%) - Basal Rate - BGI value - Time (HH:MM or HH:MM:SS) - Hour (HH) - Minute (MM) - Second (SS) - AM or PM - Name of day of the week - Day (DD) - Week number (ww) - Month name (short) - Loop status and ago - Direction arrow - Mintutes ago for last received BG - BG value - Cover image in front of text (dials…) - Image of hour hand (Analog Watch) - Image of minute hand (Analog Watch) - Image of second hand (Analog Watch) - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 98fb131cb4..78739798b0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -181,7 +181,6 @@ dependencies { // in order to use internet's versions you'd need to enable Jetifier again // https://github.com/nightscout/graphview.git // https://github.com/nightscout/iconify.git - implementation project(':app-wear-shared:shared') implementation project(':app-wear-shared:shared-impl') implementation project(':core:main') implementation project(':core:graphview') diff --git a/core/interfaces/build.gradle b/core/interfaces/build.gradle index 5edc89c128..3cc11c5d58 100644 --- a/core/interfaces/build.gradle +++ b/core/interfaces/build.gradle @@ -9,6 +9,9 @@ plugins { 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 { @@ -19,25 +22,31 @@ android { } dependencies { - // I don't like this low level dependency but it helps - // to move more code to interface module - // database module is compiled longer anyway - // (ResourceHelper, AAPSLogger interface) - implementation project(':app-wear-shared:shared') implementation project(':database:entities') - // implementation project(':core:ns-sdk') api "androidx.appcompat:appcompat:$appcompat_version" + api "androidx.preference:preference-ktx:$preferencektx_version" + api "net.danlew:android.joda:$joda_version" + - // Dagger api "com.google.dagger:dagger:$dagger_version" api "com.google.dagger:dagger-android:$dagger_version" + api "com.google.dagger:dagger-android-support:$dagger_version" + + //Logger + api 'org.slf4j:slf4j-api:1.7.36' // 2.0.x breaks logging. Code change needed + api 'com.github.tony19:logback-android:2.0.0' + + api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_serialization_version" + api "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinx_serialization_version" + api "com.caverock:androidsvg:$caverock_androidsvg_version" + api "org.apache.commons:commons-lang3:$commonslang3_version" + + //RxBus + api "io.reactivex.rxjava3:rxjava:$rxjava_version" + api "io.reactivex.rxjava3:rxkotlin:$rxkotlin_version" + api "io.reactivex.rxjava3:rxandroid:$rxandroid_version" // WorkerClasses api "androidx.work:work-runtime-ktx:$work_version" -} - -allOpen { - // allows mocking for classes w/o directly opening them for release builds - annotation 'info.nightscout.interfaces.annotations.InterfacesOpenForTesting' } \ No newline at end of file diff --git a/app-wear-shared/shared/src/debug/java/info/nightscout/annotations/OpenForTesting.kt b/core/interfaces/src/debug/java/info/nightscout/annotations/OpenForTesting.kt similarity index 100% rename from app-wear-shared/shared/src/debug/java/info/nightscout/annotations/OpenForTesting.kt rename to core/interfaces/src/debug/java/info/nightscout/annotations/OpenForTesting.kt diff --git a/core/interfaces/src/debug/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt b/core/interfaces/src/debug/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt deleted file mode 100644 index e7e07b1a4b..0000000000 --- a/core/interfaces/src/debug/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt +++ /dev/null @@ -1,15 +0,0 @@ -package info.nightscout.interfaces.annotations - -/** - * This is the actual annotation that makes the class open. Don't use it directly, only through [InterfacesOpenForTesting] - * which has a NOOP replacement in production. - */ -@Target(AnnotationTarget.ANNOTATION_CLASS) -annotation class InterfacesOpenClass - -/** - * Annotate a class with [InterfacesOpenForTesting] if it should be extendable for testing. - */ -@InterfacesOpenClass -@Target(AnnotationTarget.CLASS) -annotation class InterfacesOpenForTesting \ No newline at end of file diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/interfaces/GlucoseUnit.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/GlucoseUnit.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/interfaces/GlucoseUnit.kt rename to core/interfaces/src/main/java/info/nightscout/interfaces/GlucoseUnit.kt diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt index af5418d15c..166f009c0d 100644 --- a/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt +++ b/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt @@ -1,8 +1,8 @@ package info.nightscout.interfaces.plugin -import info.nightscout.interfaces.annotations.InterfacesOpenForTesting +import info.nightscout.annotations.OpenForTesting -@InterfacesOpenForTesting +@OpenForTesting class PluginDescription { var mainType = PluginType.GENERAL diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/AapsSchedulers.kt b/core/interfaces/src/main/java/info/nightscout/rx/AapsSchedulers.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/AapsSchedulers.kt rename to core/interfaces/src/main/java/info/nightscout/rx/AapsSchedulers.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/bus/RxBus.kt b/core/interfaces/src/main/java/info/nightscout/rx/bus/RxBus.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/bus/RxBus.kt rename to core/interfaces/src/main/java/info/nightscout/rx/bus/RxBus.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/Event.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/Event.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/Event.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/Event.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAcceptOpenLoopChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventAcceptOpenLoopChange.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAcceptOpenLoopChange.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventAcceptOpenLoopChange.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAppExit.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventAppExit.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAppExit.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventAppExit.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAppInitialized.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventAppInitialized.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAppInitialized.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventAppInitialized.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAutosensCalculationFinished.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventAutosensCalculationFinished.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAutosensCalculationFinished.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventAutosensCalculationFinished.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventBTChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventBTChange.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventBTChange.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventBTChange.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventBucketedDataCreated.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventBucketedDataCreated.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventBucketedDataCreated.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventBucketedDataCreated.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventChargingState.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventChargingState.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventChargingState.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventChargingState.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventConfigBuilderChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventConfigBuilderChange.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventConfigBuilderChange.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventConfigBuilderChange.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventCustomActionsChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventCustomActionsChanged.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventCustomActionsChanged.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventCustomActionsChanged.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventCustomCalculationFinished.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventCustomCalculationFinished.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventCustomCalculationFinished.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventCustomCalculationFinished.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDanaRSyncStatus.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventDanaRSyncStatus.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDanaRSyncStatus.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventDanaRSyncStatus.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDeviceStatusChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventDeviceStatusChange.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDeviceStatusChange.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventDeviceStatusChange.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDiaconnG8PumpLogReset.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventDiaconnG8PumpLogReset.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDiaconnG8PumpLogReset.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventDiaconnG8PumpLogReset.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDismissBolusProgressIfRunning.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventDismissBolusProgressIfRunning.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDismissBolusProgressIfRunning.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventDismissBolusProgressIfRunning.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDismissNotification.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventDismissNotification.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDismissNotification.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventDismissNotification.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventEffectiveProfileSwitchChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventEffectiveProfileSwitchChanged.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventEffectiveProfileSwitchChanged.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventEffectiveProfileSwitchChanged.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventExtendedBolusChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventExtendedBolusChange.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventExtendedBolusChange.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventExtendedBolusChange.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventInitializationChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventInitializationChanged.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventInitializationChanged.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventInitializationChanged.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLocalProfileChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventLocalProfileChanged.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLocalProfileChanged.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventLocalProfileChanged.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLoop.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventLoop.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLoop.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventLoop.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLoopUpdateGui.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventLoopUpdateGui.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLoopUpdateGui.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventLoopUpdateGui.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventMobileDataToWear.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventMobileDataToWear.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventMobileDataToWear.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventMobileDataToWear.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventMobileToWear.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventMobileToWear.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventMobileToWear.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventMobileToWear.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNSClientNewLog.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventNSClientNewLog.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNSClientNewLog.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventNSClientNewLog.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNSClientRestart.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventNSClientRestart.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNSClientRestart.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventNSClientRestart.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNetworkChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventNetworkChange.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNetworkChange.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventNetworkChange.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewBG.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventNewBG.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewBG.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventNewBG.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewHistoryData.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventNewHistoryData.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewHistoryData.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventNewHistoryData.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewOpenLoopNotification.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventNewOpenLoopNotification.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewOpenLoopNotification.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventNewOpenLoopNotification.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNtpStatus.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventNtpStatus.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNtpStatus.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventNtpStatus.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventOfflineChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventOfflineChange.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventOfflineChange.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventOfflineChange.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventOverviewBolusProgress.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventOverviewBolusProgress.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventOverviewBolusProgress.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventOverviewBolusProgress.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPreferenceChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventPreferenceChange.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPreferenceChange.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventPreferenceChange.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventProfileStoreChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventProfileStoreChanged.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventProfileStoreChanged.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventProfileStoreChanged.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventProfileSwitchChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventProfileSwitchChanged.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventProfileSwitchChanged.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventProfileSwitchChanged.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt similarity index 97% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt index 0cf7a63171..84160e7b5d 100644 --- a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt +++ b/core/interfaces/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt @@ -1,7 +1,7 @@ package info.nightscout.rx.events import android.content.Context -import info.nightscout.shared.R +import info.nightscout.interfaces.R class EventPumpStatusChanged : EventStatus { diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventQueueChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventQueueChanged.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventQueueChanged.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventQueueChanged.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRebuildTabs.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventRebuildTabs.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRebuildTabs.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventRebuildTabs.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRefreshOverview.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventRefreshOverview.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRefreshOverview.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventRefreshOverview.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWRLStatus.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventSWRLStatus.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWRLStatus.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventSWRLStatus.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWSyncStatus.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventSWSyncStatus.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWSyncStatus.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventSWSyncStatus.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWUpdate.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventSWUpdate.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWUpdate.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventSWUpdate.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventScale.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventScale.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventScale.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventScale.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventStatus.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventStatus.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventStatus.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventStatus.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTempBasalChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventTempBasalChange.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTempBasalChange.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventTempBasalChange.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTempTargetChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventTempTargetChange.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTempTargetChange.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventTempTargetChange.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventThemeSwitch.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventThemeSwitch.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventThemeSwitch.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventThemeSwitch.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTherapyEventChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventTherapyEventChange.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTherapyEventChange.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventTherapyEventChange.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTreatmentChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventTreatmentChange.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTreatmentChange.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventTreatmentChange.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateGui.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateGui.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateGui.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateGui.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewCalcProgress.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewCalcProgress.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewCalcProgress.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewCalcProgress.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewGraph.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewGraph.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewGraph.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewGraph.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewIobCob.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewIobCob.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewIobCob.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewIobCob.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewSensitivity.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewSensitivity.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewSensitivity.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewSensitivity.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearCwfExported.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventWearCwfExported.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearCwfExported.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventWearCwfExported.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearDataToMobile.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventWearDataToMobile.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearDataToMobile.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventWearDataToMobile.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearToMobile.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventWearToMobile.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearToMobile.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventWearToMobile.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearUpdateGui.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventWearUpdateGui.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearUpdateGui.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventWearUpdateGui.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventXdripNewLog.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventXdripNewLog.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventXdripNewLog.kt rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventXdripNewLog.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/interfaces/L.kt b/core/interfaces/src/main/java/info/nightscout/rx/interfaces/L.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/interfaces/L.kt rename to core/interfaces/src/main/java/info/nightscout/rx/interfaces/L.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/interfaces/LogElement.kt b/core/interfaces/src/main/java/info/nightscout/rx/interfaces/LogElement.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/interfaces/LogElement.kt rename to core/interfaces/src/main/java/info/nightscout/rx/interfaces/LogElement.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLogger.kt b/core/interfaces/src/main/java/info/nightscout/rx/logging/AAPSLogger.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLogger.kt rename to core/interfaces/src/main/java/info/nightscout/rx/logging/AAPSLogger.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/BundleLogger.kt b/core/interfaces/src/main/java/info/nightscout/rx/logging/BundleLogger.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/BundleLogger.kt rename to core/interfaces/src/main/java/info/nightscout/rx/logging/BundleLogger.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/LTag.kt b/core/interfaces/src/main/java/info/nightscout/rx/logging/LTag.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/LTag.kt rename to core/interfaces/src/main/java/info/nightscout/rx/logging/LTag.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt b/core/interfaces/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt similarity index 99% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt rename to core/interfaces/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt index dc659d29f5..a7f56a4e01 100644 --- a/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt +++ b/core/interfaces/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt @@ -8,7 +8,7 @@ import android.graphics.drawable.Drawable import android.graphics.drawable.PictureDrawable import androidx.annotation.StringRes import com.caverock.androidsvg.SVG -import info.nightscout.shared.R +import info.nightscout.interfaces.R import kotlinx.serialization.Serializable import org.json.JSONObject import java.io.BufferedOutputStream diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/EventData.kt b/core/interfaces/src/main/java/info/nightscout/rx/weardata/EventData.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/EventData.kt rename to core/interfaces/src/main/java/info/nightscout/rx/weardata/EventData.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/SafeParse.kt b/core/interfaces/src/main/java/info/nightscout/shared/SafeParse.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/SafeParse.kt rename to core/interfaces/src/main/java/info/nightscout/shared/SafeParse.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/extensions/UIUtils.kt b/core/interfaces/src/main/java/info/nightscout/shared/extensions/UIUtils.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/extensions/UIUtils.kt rename to core/interfaces/src/main/java/info/nightscout/shared/extensions/UIUtils.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/interfaces/ProfileUtil.kt b/core/interfaces/src/main/java/info/nightscout/shared/interfaces/ProfileUtil.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/interfaces/ProfileUtil.kt rename to core/interfaces/src/main/java/info/nightscout/shared/interfaces/ProfileUtil.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/interfaces/ResourceHelper.kt b/core/interfaces/src/main/java/info/nightscout/shared/interfaces/ResourceHelper.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/interfaces/ResourceHelper.kt rename to core/interfaces/src/main/java/info/nightscout/shared/interfaces/ResourceHelper.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/sharedPreferences/SP.kt b/core/interfaces/src/main/java/info/nightscout/shared/sharedPreferences/SP.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/sharedPreferences/SP.kt rename to core/interfaces/src/main/java/info/nightscout/shared/sharedPreferences/SP.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/utils/DateUtil.kt b/core/interfaces/src/main/java/info/nightscout/shared/utils/DateUtil.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/utils/DateUtil.kt rename to core/interfaces/src/main/java/info/nightscout/shared/utils/DateUtil.kt diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/utils/T.kt b/core/interfaces/src/main/java/info/nightscout/shared/utils/T.kt similarity index 100% rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/utils/T.kt rename to core/interfaces/src/main/java/info/nightscout/shared/utils/T.kt diff --git a/core/interfaces/src/main/res/values/strings.xml b/core/interfaces/src/main/res/values/strings.xml index 983f5ad355..25af997279 100644 --- a/core/interfaces/src/main/res/values/strings.xml +++ b/core/interfaces/src/main/res/values/strings.xml @@ -3,4 +3,104 @@ Pump driver changed. + insulin_button_increment_1 + insulin_button_increment_2 + insulin_button_increment_3 + + + %1$d m ago + %1$d minutes ago + %1$.1f h ago + %1$.1f days ago + %1$.0f days ago + in %1$.0f days + in %1$.0f days + h + days + hours + second + minute + hour + day + week + seconds + minutes + hours + days + weeks + m + d + Later today + Tomorrow + Today + Yesterday + + + Connecting for %1$d s + Handshaking + Connected + Disconnecting + Waiting for disconnection + + + Created at: %1$s + Author: %1$s + Name: %1$s + File name: %1$s + Plugin version: %1$s + Name: %1$s (%2$s) + Info: %1$s + %1$s + Show IOB + Show detailed IOB + Show COB + Show Delta + Show detailed Delta + Show AvgDelta + Show Phone Battery + Show Rig Battery + Show Basal Rate + Show Loop Status + Show BG + Show BGI + Show Direction Arrow + Show Ago + Show Week number + Default watchface, you can click on EXPORT WATCHFACE button to generate a template + Default Watchface + Background image + Graphs (BG, basal, prediction lines...) + Image in front of graph and behind text fields + Free text 1 + Free text 2 + Free text 3 + Free text 4 + IOB label or IOB Sum if detailed + IOB Sum or (Bolus_IOB|Basal_IOB) if detailed + COB label + COB value + Short BG delta + Average BG delta (15min) + Phone battery (%) + Global loop battery (%) + Basal Rate + BGI value + Time (HH:MM or HH:MM:SS) + Hour (HH) + Minute (MM) + Second (SS) + AM or PM + Name of day of the week + Day (DD) + Week number (ww) + Month name (short) + Loop status and ago + Direction arrow + Mintutes ago for last received BG + BG value + Cover image in front of text (dials…) + Image of hour hand (Analog Watch) + Image of minute hand (Analog Watch) + Image of second hand (Analog Watch) + diff --git a/app-wear-shared/shared/src/main/res/values/wear_paths.xml b/core/interfaces/src/main/res/values/wear_paths.xml similarity index 100% rename from app-wear-shared/shared/src/main/res/values/wear_paths.xml rename to core/interfaces/src/main/res/values/wear_paths.xml diff --git a/app-wear-shared/shared/src/release/java/info/nightscout/annotations/OpenForTesting.kt b/core/interfaces/src/release/java/info/nightscout/annotations/OpenForTesting.kt similarity index 100% rename from app-wear-shared/shared/src/release/java/info/nightscout/annotations/OpenForTesting.kt rename to core/interfaces/src/release/java/info/nightscout/annotations/OpenForTesting.kt diff --git a/core/interfaces/src/release/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt b/core/interfaces/src/release/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt deleted file mode 100644 index 9f92faa1f7..0000000000 --- a/core/interfaces/src/release/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt +++ /dev/null @@ -1,8 +0,0 @@ -package info.nightscout.interfaces.annotations - -/** - * Annotate a class with InterfacesOpenForTestingif it should be extendable for testing. - * In production the class remains final. - */ -@Target(AnnotationTarget.CLASS) -annotation class InterfacesOpenForTesting \ No newline at end of file diff --git a/app-wear-shared/shared/src/test/java/info/nightscout/rx/RxSchedulerRule.kt b/core/interfaces/src/test/java/info/nightscout/rx/RxSchedulerRule.kt similarity index 100% rename from app-wear-shared/shared/src/test/java/info/nightscout/rx/RxSchedulerRule.kt rename to core/interfaces/src/test/java/info/nightscout/rx/RxSchedulerRule.kt diff --git a/app-wear-shared/shared/src/test/java/info/nightscout/rx/weardata/EventDataTest.kt b/core/interfaces/src/test/java/info/nightscout/rx/weardata/EventDataTest.kt similarity index 100% rename from app-wear-shared/shared/src/test/java/info/nightscout/rx/weardata/EventDataTest.kt rename to core/interfaces/src/test/java/info/nightscout/rx/weardata/EventDataTest.kt diff --git a/app-wear-shared/shared/src/test/java/info/nightscout/shared/SafeParseTest.kt b/core/interfaces/src/test/java/info/nightscout/shared/SafeParseTest.kt similarity index 100% rename from app-wear-shared/shared/src/test/java/info/nightscout/shared/SafeParseTest.kt rename to core/interfaces/src/test/java/info/nightscout/shared/SafeParseTest.kt diff --git a/core/main/build.gradle b/core/main/build.gradle index cc5c7b7392..4f27351da0 100644 --- a/core/main/build.gradle +++ b/core/main/build.gradle @@ -13,7 +13,6 @@ apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle" dependencies { - implementation project(':app-wear-shared:shared') implementation project(':database:entities') implementation project(':core:graphview') implementation project(':core:interfaces') diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt b/core/main/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt index 6588a0d24e..339ffa097e 100644 --- a/core/main/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt +++ b/core/main/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt @@ -19,7 +19,7 @@ class EffectiveProfileSwitchDataPoint( get() = "" + (if (data.originalPercentage != 100) "${data.originalPercentage}%" else "") + (if (data.originalPercentage != 100 && data.originalTimeshift != 0L) "," else "") + - (if (data.originalTimeshift != 0L) (T.msecs(data.originalTimeshift).hours().toString() + rh.gs(info.nightscout.shared.R.string.shorthour)) else "") + (if (data.originalTimeshift != 0L) (T.msecs(data.originalTimeshift).hours().toString() + rh.gs(info.nightscout.interfaces.R.string.shorthour)) else "") override val duration = 0L override val shape = PointsWithLabelGraphSeries.Shape.PROFILE override val size = 2f diff --git a/core/main/src/test/java/info/nightscout/core/utils/DateUtilTest.kt b/core/main/src/test/java/info/nightscout/core/utils/DateUtilTest.kt index e8707962c1..472a062f98 100644 --- a/core/main/src/test/java/info/nightscout/core/utils/DateUtilTest.kt +++ b/core/main/src/test/java/info/nightscout/core/utils/DateUtilTest.kt @@ -89,7 +89,7 @@ class DateUtilTest : TestBase() { } */ @Test fun timeFrameStringTest() { - `when`(rh.gs(info.nightscout.shared.R.string.shorthour)).thenReturn("h") + `when`(rh.gs(info.nightscout.interfaces.R.string.shorthour)).thenReturn("h") Assertions.assertEquals("(1h 1')", DateUtil(context).timeFrameString(T.hours(1).msecs() + T.mins(1).msecs(), rh)) } } diff --git a/core/validators/build.gradle b/core/validators/build.gradle index c96c66abe0..a0233c2a1c 100644 --- a/core/validators/build.gradle +++ b/core/validators/build.gradle @@ -16,7 +16,7 @@ android { dependencies { - implementation project(':app-wear-shared:shared') + implementation project(':core:interfaces') implementation project(':app-wear-shared:shared-impl') api "com.google.android.material:material:$material_version" } \ No newline at end of file diff --git a/implementation/build.gradle b/implementation/build.gradle index 177a3b439f..51b6af396d 100644 --- a/implementation/build.gradle +++ b/implementation/build.gradle @@ -15,7 +15,6 @@ android { } dependencies { - implementation project(':app-wear-shared:shared') implementation project(':database:entities') implementation project(':database:impl') implementation project(':core:main') diff --git a/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt b/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt index 6d6fa99f61..9188069b78 100644 --- a/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt @@ -107,10 +107,10 @@ class TranslatorImpl @Inject internal constructor( override fun translate(units: ValueWithUnit?): String = when (units) { is ValueWithUnit.Gram -> rh.gs(info.nightscout.core.ui.R.string.shortgram) - is ValueWithUnit.Hour -> rh.gs(info.nightscout.shared.R.string.shorthour) + is ValueWithUnit.Hour -> rh.gs(info.nightscout.interfaces.R.string.shorthour) is ValueWithUnit.Insulin -> rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) is ValueWithUnit.Mgdl -> rh.gs(info.nightscout.core.ui.R.string.mgdl) - is ValueWithUnit.Minute -> rh.gs(info.nightscout.shared.R.string.shortminute) + is ValueWithUnit.Minute -> rh.gs(info.nightscout.interfaces.R.string.shortminute) is ValueWithUnit.Mmoll -> rh.gs(info.nightscout.core.ui.R.string.mmol) is ValueWithUnit.Percent -> rh.gs(info.nightscout.core.ui.R.string.shortpercent) is ValueWithUnit.UnitPerHour -> rh.gs(info.nightscout.core.ui.R.string.profile_ins_units_per_hour) diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt index bd68592865..8b6ca19cdf 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt @@ -164,7 +164,7 @@ class TddCalculatorImpl @Inject constructor( } todayTdd?.let { layout.addView(TextView(context).apply { - text = rh.gs(info.nightscout.shared.R.string.today) + text = rh.gs(info.nightscout.interfaces.R.string.today) setTypeface(typeface, Typeface.BOLD) gravity = Gravity.CENTER_HORIZONTAL setTextAppearance(android.R.style.TextAppearance_Material_Medium) diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt index b57ebe56ee..4eed035b41 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt @@ -69,7 +69,7 @@ class TirImpl(override val date: Long, override val lowThreshold: Double, overri val lp = TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, TableRow.LayoutParams.WRAP_CONTENT, 1f) row.layoutParams = TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT) row.gravity = Gravity.CENTER_HORIZONTAL - row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0 }; text = "%02d".format(days) + " " + rh.gs(info.nightscout.shared.R.string.days) }) + row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0 }; text = "%02d".format(days) + " " + rh.gs(info.nightscout.interfaces.R.string.days) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 1 }; text = rh.gs(info.nightscout.core.ui.R.string.formatPercent, belowPct()) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 2 }; text = rh.gs(info.nightscout.core.ui.R.string.formatPercent, inRangePct()) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3 }; text = rh.gs(info.nightscout.core.ui.R.string.formatPercent, abovePct()) }) diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt index 85f711a224..ce57b0bdc2 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt @@ -54,7 +54,7 @@ fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, days: Int, i if ((total.isNaN() || bolusAmount.isNaN() || basalAmount.isNaN() || carbs.isNaN()).not()) { row.layoutParams = TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT) row.gravity = Gravity.CENTER_HORIZONTAL - row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0 }; text = "%02d".format(days) + " " + rh.gs(info.nightscout.shared.R.string.days) }) + row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0 }; text = "%02d".format(days) + " " + rh.gs(info.nightscout.interfaces.R.string.days) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 1 }; text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units1, total) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 2 }; text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units1, bolusAmount) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3 }; text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units1, basalAmount) }) diff --git a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt b/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt index 6a2c4fe9d1..00ac6dd1c7 100644 --- a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt @@ -170,8 +170,8 @@ class UserEntryPresentationHelperImpl @Inject constructor( csvString(info.nightscout.core.ui.R.string.insulin_unit_shortname), csvString(info.nightscout.core.ui.R.string.profile_ins_units_per_hour), csvString(info.nightscout.core.ui.R.string.shortpercent), - csvString(info.nightscout.shared.R.string.shorthour), - csvString(info.nightscout.shared.R.string.shortminute), + csvString(info.nightscout.interfaces.R.string.shorthour), + csvString(info.nightscout.interfaces.R.string.shortminute), csvString(info.nightscout.core.ui.R.string.ue_none) ) + "\n" diff --git a/insight/build.gradle b/insight/build.gradle index 10c064743f..78ebd94579 100644 --- a/insight/build.gradle +++ b/insight/build.gradle @@ -30,7 +30,6 @@ dependencies { implementation project(':core:main') implementation project(':core:utils') implementation project(':core:ui') - implementation project(':app-wear-shared:shared') implementation project(':pump:pump-common') api "androidx.room:room-ktx:$room_version" diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java index 07064764eb..cf0392107d 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java @@ -221,7 +221,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick string = info.nightscout.core.ui.R.string.connecting; break; case CONNECTED: - string = info.nightscout.shared.R.string.connected; + string = info.nightscout.interfaces.R.string.connected; break; case RECOVERING: string = R.string.recovering; diff --git a/plugins/aps/build.gradle b/plugins/aps/build.gradle index 633891e71c..e24cfbe42a 100644 --- a/plugins/aps/build.gradle +++ b/plugins/aps/build.gradle @@ -15,7 +15,6 @@ android { } dependencies { - implementation project(':app-wear-shared:shared') implementation project(':database:entities') implementation project(':database:impl') implementation project(':core:main') diff --git a/plugins/automation/build.gradle b/plugins/automation/build.gradle index c41a3d430d..2fecd1f02e 100644 --- a/plugins/automation/build.gradle +++ b/plugins/automation/build.gradle @@ -17,14 +17,13 @@ android { dependencies { implementation project(':core:graphview') + implementation project(':core:interfaces') implementation project(':core:main') implementation project(':core:utils') implementation project(':core:ui') implementation project(':core:validators') implementation project(':database:entities') implementation project(':database:impl') - implementation project(':app-wear-shared:shared') - implementation project(':core:interfaces') testImplementation project(':app-wear-shared:shared-tests') testImplementation project(':implementation') diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt index d784811c5b..2b0c75b3b2 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt @@ -83,7 +83,7 @@ class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) { LayoutBuilder() .add(StaticLabel(rh, R.string.lastboluslabel, this)) .add(comparator) - .add(LabelWithElement(rh, rh.gs(R.string.lastboluslabel) + ": ", rh.gs(info.nightscout.shared.R.string.unit_minutes), minutesAgo)) + .add(LabelWithElement(rh, rh.gs(R.string.lastboluslabel) + ": ", rh.gs(info.nightscout.interfaces.R.string.unit_minutes), minutesAgo)) .build(root) } } \ No newline at end of file diff --git a/plugins/configuration/build.gradle b/plugins/configuration/build.gradle index e407d97d9e..f052fe6843 100644 --- a/plugins/configuration/build.gradle +++ b/plugins/configuration/build.gradle @@ -17,7 +17,6 @@ android { dependencies { - implementation project(':app-wear-shared:shared') implementation project(':database:entities') implementation project(':core:interfaces') implementation project(':core:main') diff --git a/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt b/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt index 6a4bbc8b2a..f1f5727a53 100644 --- a/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt +++ b/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt @@ -93,7 +93,7 @@ class CustomWatchfaceImportListActivity: TranslatedDaggerAppCompatActivity() { val drawable = customWatchfaceFile.resDatas[ResFileMap.CUSTOM_WATCHFACE.fileName]?.toDrawable(resources) with(holder.customWatchfaceImportListItemBinding) { val fileName = metadata[CWF_FILENAME]?.let { "$it${ZipWatchfaceFormat.CWF_EXTENTION}"} ?:"" - filelistName.text = rh.gs(info.nightscout.shared.R.string.metadata_wear_import_filename, fileName) + filelistName.text = rh.gs(info.nightscout.interfaces.R.string.metadata_wear_import_filename, fileName) filelistName.tag = customWatchfaceFile customWatchface.setImageDrawable(drawable) customName.text = rh.gs(CWF_NAME.label, metadata[CWF_NAME]) diff --git a/plugins/constraints/build.gradle b/plugins/constraints/build.gradle index 05ab1fb88a..119eb33d88 100644 --- a/plugins/constraints/build.gradle +++ b/plugins/constraints/build.gradle @@ -16,7 +16,6 @@ android { } dependencies { - implementation project(':app-wear-shared:shared') implementation project(':core:interfaces') implementation project(':core:main') implementation project(':core:ui') diff --git a/plugins/insulin/build.gradle b/plugins/insulin/build.gradle index 74d0c33bc4..31c8144ae0 100644 --- a/plugins/insulin/build.gradle +++ b/plugins/insulin/build.gradle @@ -16,7 +16,6 @@ android { dependencies { - implementation project(':app-wear-shared:shared') implementation project(':core:graphview') implementation project(':core:interfaces') implementation project(':core:main') diff --git a/plugins/main/build.gradle b/plugins/main/build.gradle index dfd942ee1a..3f14652c4c 100644 --- a/plugins/main/build.gradle +++ b/plugins/main/build.gradle @@ -15,7 +15,6 @@ android { } dependencies { - implementation project(':app-wear-shared:shared') implementation project(':app-wear-shared:shared-impl') implementation project(':database:entities') implementation project(':database:impl') diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt index b55d8710aa..b499553e72 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt @@ -146,11 +146,11 @@ class StatusLightHandler @Inject constructor( } private fun TherapyEvent.age(useShortText: Boolean, rh: ResourceHelper, dateUtil: DateUtil): String { val diff = dateUtil.computeDiff(timestamp, System.currentTimeMillis()) - var days = " " + rh.gs(info.nightscout.shared.R.string.days) + " " - var hours = " " + rh.gs(info.nightscout.shared.R.string.hours) + " " + var days = " " + rh.gs(info.nightscout.interfaces.R.string.days) + " " + var hours = " " + rh.gs(info.nightscout.interfaces.R.string.hours) + " " if (useShortText) { - days = rh.gs(info.nightscout.shared.R.string.shortday) - hours = rh.gs(info.nightscout.shared.R.string.shorthour) + days = rh.gs(info.nightscout.interfaces.R.string.shortday) + hours = rh.gs(info.nightscout.interfaces.R.string.shorthour) } return diff[TimeUnit.DAYS].toString() + days + diff[TimeUnit.HOURS] + hours } diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt index 2f9e46f04b..fbb7e0701a 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt @@ -750,8 +750,8 @@ class DataHandlerMobile @Inject constructor( bolusPercentage = sp.getInt(info.nightscout.core.utils.R.string.key_boluswizard_percentage, 100), maxCarbs = sp.getInt(info.nightscout.core.utils.R.string.key_treatmentssafety_maxcarbs, 48), maxBolus = sp.getDouble(info.nightscout.core.utils.R.string.key_treatmentssafety_maxbolus, 3.0), - insulinButtonIncrement1 = sp.getDouble(info.nightscout.shared.R.string.key_insulin_button_increment_1, Constants.INSULIN_PLUS1_DEFAULT), - insulinButtonIncrement2 = sp.getDouble(info.nightscout.shared.R.string.key_insulin_button_increment_2, Constants.INSULIN_PLUS2_DEFAULT), + insulinButtonIncrement1 = sp.getDouble(info.nightscout.interfaces.R.string.key_insulin_button_increment_1, Constants.INSULIN_PLUS1_DEFAULT), + insulinButtonIncrement2 = sp.getDouble(info.nightscout.interfaces.R.string.key_insulin_button_increment_2, Constants.INSULIN_PLUS2_DEFAULT), carbsButtonIncrement1 = sp.getInt(info.nightscout.core.utils.R.string.key_carbs_button_increment_1, Constants.CARBS_FAV1_DEFAULT), carbsButtonIncrement2 = sp.getInt(info.nightscout.core.utils.R.string.key_carbs_button_increment_2, Constants.CARBS_FAV2_DEFAULT) ) diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt index 5ac3495db4..b868b87f72 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt @@ -77,8 +77,8 @@ class DataLayerListenerServiceMobile : WearableListenerService() { private val disposable = CompositeDisposable() - private val rxPath get() = getString(info.nightscout.shared.R.string.path_rx_bridge) - private val rxDataPath get() = getString(info.nightscout.shared.R.string.path_rx_data_bridge) + private val rxPath get() = getString(info.nightscout.interfaces.R.string.path_rx_bridge) + private val rxDataPath get() = getString(info.nightscout.interfaces.R.string.path_rx_data_bridge) @ExperimentalSerializationApi override fun onCreate() { AndroidInjection.inject(this) diff --git a/plugins/sensitivity/build.gradle b/plugins/sensitivity/build.gradle index 48544e8cd5..451ec3783e 100644 --- a/plugins/sensitivity/build.gradle +++ b/plugins/sensitivity/build.gradle @@ -16,7 +16,6 @@ android { dependencies { - implementation project(':app-wear-shared:shared') implementation project(':database:entities') implementation project(':database:impl') implementation project(':core:interfaces') diff --git a/plugins/smoothing/build.gradle b/plugins/smoothing/build.gradle index 8a10643212..aab84d1216 100644 --- a/plugins/smoothing/build.gradle +++ b/plugins/smoothing/build.gradle @@ -17,7 +17,6 @@ android { dependencies { implementation project(':database:entities') - implementation project(':app-wear-shared:shared') implementation project(':core:interfaces') implementation project(':core:ui') } \ No newline at end of file diff --git a/plugins/source/build.gradle b/plugins/source/build.gradle index 92d8f31d79..962f225c5d 100644 --- a/plugins/source/build.gradle +++ b/plugins/source/build.gradle @@ -16,7 +16,6 @@ android { dependencies { - implementation project(':app-wear-shared:shared') implementation project(':app-wear-shared:shared-impl') implementation project(':database:entities') implementation project(':database:impl') diff --git a/plugins/sync/build.gradle b/plugins/sync/build.gradle index 63f799cc9c..e097e626a7 100644 --- a/plugins/sync/build.gradle +++ b/plugins/sync/build.gradle @@ -15,7 +15,6 @@ android { } dependencies { - implementation project(':app-wear-shared:shared') implementation project(':app-wear-shared:shared-impl') implementation project(':database:entities') implementation project(':database:impl') diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt index 83b32ad668..bf0b62f41c 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt @@ -158,12 +158,12 @@ class NSClientV3Plugin @Inject constructor( when { sp.getBoolean(R.string.key_ns_paused, false) -> rh.gs(info.nightscout.core.ui.R.string.paused) isAllowed.not() -> blockingReason - sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true) && wsConnected -> "WS: " + rh.gs(info.nightscout.shared.R.string.connected) + sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true) && wsConnected -> "WS: " + rh.gs(info.nightscout.interfaces.R.string.connected) sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true) && !wsConnected -> "WS: " + rh.gs(R.string.not_connected) lastOperationError != null -> rh.gs(info.nightscout.core.ui.R.string.error) nsAndroidClient?.lastStatus == null -> rh.gs(R.string.not_connected) workIsRunning() -> rh.gs(R.string.working) - nsAndroidClient?.lastStatus?.apiPermissions?.isFull() == true -> rh.gs(info.nightscout.shared.R.string.connected) + nsAndroidClient?.lastStatus?.apiPermissions?.isFull() == true -> rh.gs(info.nightscout.interfaces.R.string.connected) nsAndroidClient?.lastStatus?.apiPermissions?.isRead() == true -> rh.gs(R.string.read_only) else -> rh.gs(info.nightscout.core.ui.R.string.unknown) } diff --git a/pump/combo/build.gradle b/pump/combo/build.gradle index d558afb179..ea42b5a33f 100644 --- a/pump/combo/build.gradle +++ b/pump/combo/build.gradle @@ -24,7 +24,6 @@ dependencies { implementation project(':core:main') implementation project(':core:ui') implementation project(':core:utils') - implementation project(':app-wear-shared:shared') testImplementation project(':app-wear-shared:shared-tests') diff --git a/pump/combov2/build.gradle b/pump/combov2/build.gradle index 852ed510ac..fd35c11a7e 100644 --- a/pump/combov2/build.gradle +++ b/pump/combov2/build.gradle @@ -15,10 +15,11 @@ dependencies { implementation project(':core:interfaces') implementation project(':core:ui') implementation project(':core:utils') - implementation project(':app-wear-shared:shared') implementation(project(":pump:combov2:comboctl")) - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinx_datetime_version") + + api "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + api "org.jetbrains.kotlinx:kotlinx-datetime:$kotlinx_datetime_version" + // This is necessary to avoid errors like these which otherwise come up often at runtime: // "WARNING: Failed to transform class kotlinx/datetime/TimeZone$Companion // java.lang.NoClassDefFoundError: kotlinx/serialization/KSerializer" diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt index 8439dd4295..4ae87a043c 100644 --- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt +++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt @@ -240,7 +240,7 @@ class ComboV2Fragment : DaggerFragment() { } in 60..(30 * 60) -> { - binding.combov2LastConnection.text = rh.gs(info.nightscout.shared.R.string.minago, secondsPassed / 60) + binding.combov2LastConnection.text = rh.gs(info.nightscout.interfaces.R.string.minago, secondsPassed / 60) binding.combov2LastConnection.setTextColor(Color.WHITE) } @@ -267,7 +267,7 @@ class ComboV2Fragment : DaggerFragment() { rh.gs(R.string.combov2_less_than_one_minute_ago) else -> - rh.gs(info.nightscout.shared.R.string.minago, secondsPassed / 60) + rh.gs(info.nightscout.interfaces.R.string.minago, secondsPassed / 60) } binding.combov2LastBolus.text = diff --git a/pump/dana/build.gradle b/pump/dana/build.gradle index 67222caccc..e15b20fb70 100644 --- a/pump/dana/build.gradle +++ b/pump/dana/build.gradle @@ -30,7 +30,6 @@ dependencies { implementation project(':core:main') implementation project(':core:ui') implementation project(':core:utils') - implementation project(':app-wear-shared:shared') api "androidx.room:room-ktx:$room_version" api "androidx.room:room-runtime:$room_version" diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt index acd4e7b830..87e5817b37 100644 --- a/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt +++ b/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt @@ -207,7 +207,7 @@ class DanaFragment : DaggerFragment() { if (pump.lastConnection != 0L) { val agoMilliseconds = System.currentTimeMillis() - pump.lastConnection val agoMin = (agoMilliseconds.toDouble() / 60.0 / 1000.0).toInt() - binding.lastConnection.text = dateUtil.timeString(pump.lastConnection) + " (" + rh.gs(info.nightscout.shared.R.string.minago, agoMin) + ")" + binding.lastConnection.text = dateUtil.timeString(pump.lastConnection) + " (" + rh.gs(info.nightscout.interfaces.R.string.minago, agoMin) + ")" warnColors.setColor(binding.lastConnection, agoMin.toDouble(), 16.0, 31.0) } if (pump.lastBolusTime != 0L) { diff --git a/pump/danar/build.gradle b/pump/danar/build.gradle index a3ad984f0c..79b21390b3 100644 --- a/pump/danar/build.gradle +++ b/pump/danar/build.gradle @@ -15,8 +15,6 @@ android { } dependencies { - implementation 'androidx.media3:media3-common:1.1.1' - implementation project(':app-wear-shared:shared') implementation project(':core:interfaces') implementation project(':core:main') implementation project(':core:utils') @@ -24,6 +22,8 @@ dependencies { implementation project(':core:validators') implementation project(':pump:dana') + api 'androidx.media3:media3-common:1.1.1' + testImplementation project(':app-wear-shared:shared-tests') testImplementation project(':core:main') } \ No newline at end of file diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java index f723ac765d..9c30704f35 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java @@ -405,7 +405,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService { rxBus.send(new EventPumpStatusChanged(rh.gs(info.nightscout.pump.dana.R.string.gettingbolusstatus))); mSerialIOThread.sendMessage(new MsgStatus(injector)); bolusingEvent.setPercent(100); - rxBus.send(new EventPumpStatusChanged(rh.gs(info.nightscout.shared.R.string.disconnecting))); + rxBus.send(new EventPumpStatusChanged(rh.gs(info.nightscout.interfaces.R.string.disconnecting))); } }); return !start.getFailed(); diff --git a/pump/danars/build.gradle b/pump/danars/build.gradle index dc6142ef05..f8fe783a48 100644 --- a/pump/danars/build.gradle +++ b/pump/danars/build.gradle @@ -36,7 +36,6 @@ dependencies { implementation project(':core:ui') implementation project(':core:validators') implementation project(':pump:dana') - implementation project(':app-wear-shared:shared') testImplementation project(':app-wear-shared:shared-tests') testImplementation project(':core:main') diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt index 1a63f6433c..a230a49c53 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt @@ -346,7 +346,7 @@ class DanaRSService : DaggerService() { rxBus.send(EventPumpStatusChanged(rh.gs(info.nightscout.pump.dana.R.string.gettingbolusstatus))) sendMessage(DanaRSPacketBolusGetStepBolusInformation(injector)) // last bolus bolusingEvent.percent = 100 - rxBus.send(EventPumpStatusChanged(rh.gs(info.nightscout.shared.R.string.disconnecting))) + rxBus.send(EventPumpStatusChanged(rh.gs(info.nightscout.interfaces.R.string.disconnecting))) } }) return !start.failed diff --git a/pump/diaconn/build.gradle b/pump/diaconn/build.gradle index 0d0b4f6d38..95c51bd3af 100644 --- a/pump/diaconn/build.gradle +++ b/pump/diaconn/build.gradle @@ -25,7 +25,6 @@ android { } dependencies { - implementation project(':app-wear-shared:shared') implementation project(':app-wear-shared:shared-impl') implementation project(':core:libraries') implementation project(':core:interfaces') diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt index eab7ce0a82..196134e88b 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt @@ -160,7 +160,7 @@ class DiaconnG8Fragment : DaggerFragment() { if (pump.lastConnection != 0L) { val agoMsec = System.currentTimeMillis() - pump.lastConnection val agoMin = (agoMsec.toDouble() / 60.0 / 1000.0).toInt() - binding.lastconnection.text = dateUtil.timeString(pump.lastConnection) + " (" + rh.gs(info.nightscout.shared.R.string.minago, agoMin) + ")" + binding.lastconnection.text = dateUtil.timeString(pump.lastConnection) + " (" + rh.gs(info.nightscout.interfaces.R.string.minago, agoMin) + ")" warnColors.setColor(binding.lastconnection, agoMin.toDouble(), 16.0, 31.0) } if (pump.lastBolusTime != 0L) { diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt index 3c766a5058..24c0a03ffc 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt @@ -538,7 +538,7 @@ class DiaconnG8Service : DaggerService() { if(!diaconnG8Pump.isPumpVersionGe3_53) { bolusingEvent.percent = 100 } - rxBus.send(EventPumpStatusChanged(rh.gs(info.nightscout.shared.R.string.disconnecting))) + rxBus.send(EventPumpStatusChanged(rh.gs(info.nightscout.interfaces.R.string.disconnecting))) } }) return !start.failed diff --git a/pump/eopatch/build.gradle b/pump/eopatch/build.gradle index a2baa19b46..281a2187b4 100644 --- a/pump/eopatch/build.gradle +++ b/pump/eopatch/build.gradle @@ -21,12 +21,11 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':pump:eopatch-core') implementation project(':core:libraries') - implementation project(':app-wear-shared:shared') - implementation project(':database:entities') implementation project(':core:interfaces') implementation project(':core:main') implementation project(':core:utils') implementation project(':core:ui') + implementation project(':database:entities') api "com.google.guava:guava:$guava_version" diff --git a/pump/medtronic/build.gradle b/pump/medtronic/build.gradle index c724e23a24..f842108c8d 100644 --- a/pump/medtronic/build.gradle +++ b/pump/medtronic/build.gradle @@ -16,7 +16,6 @@ android { dependencies { implementation project(':core:libraries') - implementation project(':app-wear-shared:shared') implementation project(':core:interfaces') implementation project(':core:main') implementation project(':core:ui') diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt index f449b22fb0..bec36b69a6 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt @@ -275,7 +275,7 @@ class MedtronicFragment : DaggerFragment() { } else if (medtronicPumpStatus.lastConnection + 30 * 60 * 1000 < System.currentTimeMillis()) { if (min < 60) { - binding.lastConnection.text = rh.gs(info.nightscout.shared.R.string.minago, min) + binding.lastConnection.text = rh.gs(info.nightscout.interfaces.R.string.minago, min) } else if (min < 1440) { val h = (min / 60).toInt() binding.lastConnection.text = (rh.gq(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R.plurals.duration_hours, h, h) + " " diff --git a/pump/medtrum/build.gradle b/pump/medtrum/build.gradle index f1f2e6a263..9107869f50 100644 --- a/pump/medtrum/build.gradle +++ b/pump/medtrum/build.gradle @@ -19,15 +19,14 @@ android { } dependencies { - implementation project(':app-wear-shared:shared') implementation project(':database:entities') implementation project(':core:libraries') implementation project(':core:interfaces') implementation project(':core:main') implementation project(':core:ui') + implementation project(':core:utils') implementation project(':core:validators') implementation project(':pump:pump-common') - implementation project(':core:utils') testImplementation project(':app-wear-shared:shared-tests') testImplementation project(':core:main') diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt index 8291983817..dcc15dc074 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt @@ -177,7 +177,7 @@ class MedtrumOverviewViewModel @Inject constructor( if (medtrumPump.lastConnection != 0L) { val agoMilliseconds = System.currentTimeMillis() - medtrumPump.lastConnection val agoMinutes = agoMilliseconds / 1000 / 60 - _lastConnectionMinAgo.postValue(rh.gs(info.nightscout.shared.R.string.minago, agoMinutes)) + _lastConnectionMinAgo.postValue(rh.gs(info.nightscout.interfaces.R.string.minago, agoMinutes)) } if (medtrumPump.lastBolusTime != 0L) { val agoMilliseconds = System.currentTimeMillis() - medtrumPump.lastBolusTime diff --git a/pump/omnipod-common/build.gradle b/pump/omnipod-common/build.gradle index 51397ea938..2258b47333 100644 --- a/pump/omnipod-common/build.gradle +++ b/pump/omnipod-common/build.gradle @@ -20,7 +20,6 @@ dependencies { implementation project(':core:interfaces') implementation project(':core:ui') implementation project(':core:utils') - implementation project(':app-wear-shared:shared') api "androidx.constraintlayout:constraintlayout:$constraintlayout_version" api "androidx.fragment:fragment-ktx:$fragmentktx_version" diff --git a/pump/omnipod-dash/build.gradle b/pump/omnipod-dash/build.gradle index f36ba39872..2021a42fa5 100644 --- a/pump/omnipod-dash/build.gradle +++ b/pump/omnipod-dash/build.gradle @@ -27,7 +27,6 @@ android { dependencies { implementation project(':database:entities') implementation project(':database:impl') - implementation project(':app-wear-shared:shared') implementation project(':core:libraries') implementation project(':core:interfaces') implementation project(':core:main') diff --git a/pump/omnipod-eros/build.gradle b/pump/omnipod-eros/build.gradle index 6407f5b795..92da56024e 100644 --- a/pump/omnipod-eros/build.gradle +++ b/pump/omnipod-eros/build.gradle @@ -27,7 +27,6 @@ android { dependencies { implementation project(':database:entities') implementation project(':database:impl') - implementation project(':app-wear-shared:shared') implementation project(':core:libraries') implementation project(':core:interfaces') implementation project(':core:main') diff --git a/pump/pump-common/build.gradle b/pump/pump-common/build.gradle index 9112c217ad..1f69307954 100644 --- a/pump/pump-common/build.gradle +++ b/pump/pump-common/build.gradle @@ -18,7 +18,6 @@ dependencies { implementation project(':core:interfaces') implementation project(':core:main') implementation project(':core:utils') - implementation project(':app-wear-shared:shared') implementation('com.thoughtworks.xstream:xstream:1.4.20') { exclude group: 'xmlpull', module: 'xmlpull' diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt index 432cb2d074..601a0db542 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt @@ -9,14 +9,14 @@ enum class PumpDriverState(var resourceId: Int) { NotInitialized(R.string.pump_status_not_initialized), // this state should be set only when driver is created Connecting(info.nightscout.core.ui.R.string.connecting), // - Connected(info.nightscout.shared.R.string.connected), // + Connected(info.nightscout.interfaces.R.string.connected), // Initialized(R.string.pump_status_initialized), // this is weird state that probably won't be used, since its more driver centric that communication centric EncryptCommunication(R.string.pump_status_encrypt), // Ready(R.string.pump_status_ready), Busy(R.string.pump_status_busy), // Suspended(R.string.pump_status_suspended), // ExecutingCommand(R.string.pump_status_executing_command), - Disconnecting(info.nightscout.shared.R.string.disconnecting), + Disconnecting(info.nightscout.interfaces.R.string.disconnecting), Disconnected(info.nightscout.core.ui.R.string.disconnected); fun isConnected(): Boolean = this == Connected || this == Initialized || this == Busy || this == Suspended diff --git a/pump/rileylink/build.gradle b/pump/rileylink/build.gradle index 03620015ee..439dfa0917 100644 --- a/pump/rileylink/build.gradle +++ b/pump/rileylink/build.gradle @@ -15,7 +15,6 @@ android { } dependencies { - implementation project(':app-wear-shared:shared') implementation project(':core:interfaces') implementation project(':core:ui') implementation project(':pump:pump-common') diff --git a/pump/virtual/build.gradle b/pump/virtual/build.gradle index ecdf3d7798..f22de01853 100644 --- a/pump/virtual/build.gradle +++ b/pump/virtual/build.gradle @@ -17,7 +17,6 @@ android { } dependencies { - implementation project(':app-wear-shared:shared') implementation project(':database:entities') implementation project(':core:interfaces') implementation project(':core:main') diff --git a/settings.gradle b/settings.gradle index 816e1ae58d..02f044b440 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ include ':app' include ':wear' -include ':app-wear-shared:shared' include ':app-wear-shared:shared-impl' include ':app-wear-shared:shared-tests' include ':core:main' diff --git a/ui/build.gradle b/ui/build.gradle index 65f2b951c7..43d3d72941 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -17,7 +17,6 @@ android { dependencies { implementation project(':core:libraries') implementation project(':core:graphview') - implementation project(':app-wear-shared:shared') implementation project(':database:entities') implementation project(':database:impl') implementation project(':core:interfaces') diff --git a/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt b/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt index 07bfea0f9e..410806021b 100644 --- a/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt +++ b/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt @@ -102,7 +102,7 @@ class ActivityMonitor @Inject constructor( row.gravity = Gravity.CENTER_HORIZONTAL row.addView(TextView(context).apply { layoutParams = lp.apply { column = 0 }; text = activity }) row.addView(TextView(context).apply { layoutParams = lp.apply { column = 1 }; text = duration }) - row.addView(TextView(context).apply { layoutParams = lp.apply { column = 2 }; text = rh.gs(info.nightscout.shared.R.string.in_days, days.toDouble()) }) + row.addView(TextView(context).apply { layoutParams = lp.apply { column = 2 }; text = rh.gs(info.nightscout.interfaces.R.string.in_days, days.toDouble()) }) } ) } diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt index 0cc7b4cb5d..927733e1e7 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt @@ -276,7 +276,7 @@ class CarbsDialog : DialogFragmentWithDate() { actions.add(rh.gs(info.nightscout.core.ui.R.string.alarminxmin, timeOffset).formatColor(context, rh, info.nightscout.core.ui.R.attr.infoColor)) val duration = binding.duration.value.toInt() if (duration > 0) - actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + duration + rh.gs(info.nightscout.shared.R.string.shorthour)) + actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + duration + rh.gs(info.nightscout.interfaces.R.string.shorthour)) if (carbsAfterConstraints > 0) { actions.add( rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + "