modules cleanup

app-wear-shared/rx/build.gradle

@@ -1,38 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
-    id 'kotlinx-serialization'
-}
-
-apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
-
-android {
-
-    namespace 'info.nightscout.rx'
-    defaultConfig {
-        minSdkVersion 23  // for wear
-    }
-}
-dependencies {
-    api "com.google.dagger:dagger:$dagger_version"
-    api "com.google.dagger:dagger-android:$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'
-
-    //RxBus
-    api "io.reactivex.rxjava3:rxjava:$rxjava_version"
-    api "io.reactivex.rxjava3:rxkotlin:$rxkotlin_version"
-    api "io.reactivex.rxjava3:rxandroid:$rxandroid_version"
-
-    api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
-    api "org.apache.commons:commons-lang3:$commonslang3_version"
-
-    api "net.danlew:android.joda:$joda_version"
-}

app-wear-shared/rx/src/debug/java/info/nightscout/rx/annotations/RxOpenForTesting.kt

@@ -1,15 +0,0 @@
-package info.nightscout.rx.annotations
-
-/**
- * This is the actual annotation that makes the class open. Don't use it directly, only through [RxOpenForTesting]
- * which has a NOOP replacement in production.
- */
-@Target(AnnotationTarget.ANNOTATION_CLASS)
-annotation class RxOpenClass
-
-/**
- * Annotate a class with [RxOpenForTesting] if it should be extendable for testing.
- */
-@RxOpenClass
-@Target(AnnotationTarget.CLASS)
-annotation class RxOpenForTesting

app-wear-shared/rx/src/main/AndroidManifest.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest>
-
-</manifest>

app-wear-shared/rx/src/main/res/values-af-rZA/strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Handskudding</string>
-    <string name="connected">Gekoppel</string>
-    <string name="disconnecting">Ontkoppel</string>
-</resources>

app-wear-shared/rx/src/main/res/values-bg-rBG/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Сдвояване</string>
-    <string name="connected">Свързана</string>
-    <string name="disconnecting">Разкачане</string>
-    <string name="waiting_for_disconnection">Изчакване за разкачане</string>
-</resources>

app-wear-shared/rx/src/main/res/values-ca-rES/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Establint comunicació</string>
-    <string name="connected">Connectat</string>
-    <string name="disconnecting">Desconnectant</string>
-    <string name="waiting_for_disconnection">S\'està esperant la desconnexió</string>
-</resources>

app-wear-shared/rx/src/main/res/values-cs-rCZ/strings.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="connecting_for">Připojování %1$d sec</string>
-    <string name="handshaking">Navazování spojení</string>
-    <string name="connected">Připojeno</string>
-    <string name="disconnecting">Odpojuji</string>
-    <string name="waiting_for_disconnection">Čekám na odpojení</string>
-</resources>

app-wear-shared/rx/src/main/res/values-da-rDK/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Forbindelse verificeres</string>
-    <string name="connected">Tilsuttet</string>
-    <string name="disconnecting">Afbryder</string>
-    <string name="waiting_for_disconnection">Venter på afbrydelse</string>
-</resources>

app-wear-shared/rx/src/main/res/values-de-rDE/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Handshaking</string>
-    <string name="connected">Verbunden</string>
-    <string name="disconnecting">Verbindung wird getrennt</string>
-    <string name="waiting_for_disconnection">Warte auf Trennung der Verbindung</string>
-</resources>

app-wear-shared/rx/src/main/res/values-el-rGR/strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Δημιουργία σύνδεσης</string>
-    <string name="connected">Συνδέθηκε</string>
-    <string name="disconnecting">Αποσυνδέεται</string>
-</resources>

app-wear-shared/rx/src/main/res/values-es-rES/strings.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="connecting_for">Conectando durante %1$d s</string>
-    <string name="handshaking">Estableciendo comunicacion</string>
-    <string name="connected">Conectado</string>
-    <string name="disconnecting">Desconectando</string>
-    <string name="waiting_for_disconnection">Esperando la desconexión</string>
-</resources>

app-wear-shared/rx/src/main/res/values-fr-rFR/strings.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="connecting_for">Connexion en cours %1$ds</string>
-    <string name="handshaking">Connexion</string>
-    <string name="connected">Connectée</string>
-    <string name="disconnecting">Déconnexion en cours</string>
-    <string name="waiting_for_disconnection">Attente de déconnexion</string>
-</resources>

app-wear-shared/rx/src/main/res/values-ga-rIE/strings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="connected">Nasctha</string>
-    <string name="disconnecting">Dícheangal</string>
-</resources>

app-wear-shared/rx/src/main/res/values-hr-rHR/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Povezivanje</string>
-    <string name="connected">Povezano</string>
-    <string name="disconnecting">Odspajanje</string>
-    <string name="waiting_for_disconnection">Čeka se prekid veze</string>
-</resources>

app-wear-shared/rx/src/main/res/values-hu-rHU/strings.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>

app-wear-shared/rx/src/main/res/values-it-rIT/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Connessione</string>
-    <string name="connected">Connesso</string>
-    <string name="disconnecting">Disconnessione</string>
-    <string name="waiting_for_disconnection">In attesa della disconnessione</string>
-</resources>

app-wear-shared/rx/src/main/res/values-iw-rIL/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">לוחץ יד</string>
-    <string name="connected">מחובר</string>
-    <string name="disconnecting">מתנתק</string>
-    <string name="waiting_for_disconnection">ממתין לניתוק</string>
-</resources>

app-wear-shared/rx/src/main/res/values-ja-rJP/strings.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>

app-wear-shared/rx/src/main/res/values-ko-rKR/strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">통신 확인</string>
-    <string name="connected">연결됨</string>
-    <string name="disconnecting">연결끊기중</string>
-</resources>

app-wear-shared/rx/src/main/res/values-lt-rLT/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Ryšio užmezgimas</string>
-    <string name="connected">Prisijungta</string>
-    <string name="disconnecting">Atsijungiama</string>
-    <string name="waiting_for_disconnection">Laukiama atsijungimo</string>
-</resources>

app-wear-shared/rx/src/main/res/values-nl-rNL/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Handshaking</string>
-    <string name="connected">Verbonden</string>
-    <string name="disconnecting">Verbinding aan het verbreken</string>
-    <string name="waiting_for_disconnection">Wachten op het loskoppelen</string>
-</resources>

app-wear-shared/rx/src/main/res/values-no-rNO/strings.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="connecting_for">Tilkobler i %1$d sek</string>
-    <string name="handshaking">Tilkobling verifiseres</string>
-    <string name="connected">Tilkoblet</string>
-    <string name="disconnecting">Frakobler</string>
-    <string name="waiting_for_disconnection">Venter på frakobling</string>
-</resources>

app-wear-shared/rx/src/main/res/values-pl-rPL/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Uściskdłoni</string>
-    <string name="connected">Połączono</string>
-    <string name="disconnecting">Rozłączanie</string>
-    <string name="waiting_for_disconnection">Oczekiwanie na rozłączenie</string>
-</resources>

app-wear-shared/rx/src/main/res/values-pt-rBR/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Cumprimento</string>
-    <string name="connected">Conectado</string>
-    <string name="disconnecting">A desligar</string>
-    <string name="waiting_for_disconnection">Aguardando a desconexão</string>
-</resources>

app-wear-shared/rx/src/main/res/values-pt-rPT/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Cumprimento</string>
-    <string name="connected">Ligado</string>
-    <string name="disconnecting">A desconectar</string>
-    <string name="waiting_for_disconnection">A aguardar a desconexão</string>
-</resources>

app-wear-shared/rx/src/main/res/values-ro-rRO/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Împerechere</string>
-    <string name="connected">Conectat</string>
-    <string name="disconnecting">Se deconectează</string>
-    <string name="waiting_for_disconnection">Se așteaptă deconectarea</string>
-</resources>

app-wear-shared/rx/src/main/res/values-ru-rRU/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Подтверждение связи</string>
-    <string name="connected">соединение установлено</string>
-    <string name="disconnecting">разъединение</string>
-    <string name="waiting_for_disconnection">Ожидание разъединения</string>
-</resources>

app-wear-shared/rx/src/main/res/values-sk-rSK/strings.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="connecting_for">Pripájanie %1$d s</string>
-    <string name="handshaking">Overovanie</string>
-    <string name="connected">Pripojené</string>
-    <string name="disconnecting">Odpájanie</string>
-    <string name="waiting_for_disconnection">Čakám na odpojenie</string>
-</resources>

app-wear-shared/rx/src/main/res/values-sr-rCS/strings.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>

app-wear-shared/rx/src/main/res/values-sv-rSE/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Anslutningen verifieras</string>
-    <string name="connected">Ansluten</string>
-    <string name="disconnecting">Kopplar från</string>
-    <string name="waiting_for_disconnection">Väntar på frånkoppling</string>
-</resources>

app-wear-shared/rx/src/main/res/values-tr-rTR/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Bağlandı</string>
-    <string name="connected">Bağlanıldı</string>
-    <string name="disconnecting">Bağlantı kesiliyor</string>
-    <string name="waiting_for_disconnection">Bağlantının kesilmesi bekleniyor</string>
-</resources>

app-wear-shared/rx/src/main/res/values-zh-rCN/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">握手</string>
-    <string name="connected">已连接</string>
-    <string name="disconnecting">正在断开连接</string>
-    <string name="waiting_for_disconnection">正在等待连接</string>
-</resources>

app-wear-shared/rx/src/main/res/values/strings.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="connecting_for">Connecting for %1$d s</string>
-    <string name="handshaking">Handshaking</string>
-    <string name="connected">Connected</string>
-    <string name="disconnecting">Disconnecting</string>
-    <string name="waiting_for_disconnection">Waiting for disconnection</string>
-
-</resources>

app-wear-shared/rx/src/release/java/info/nightscout/rx/annotations/RxOpenForTesting.kt

@@ -1,8 +0,0 @@
-package info.nightscout.rx.annotations
-
-/**
- * Annotate a class with [RxOpenForTesting] if it should be extendable for testing.
- * In production the class remains final.
- */
-@Target(AnnotationTarget.CLASS)
-annotation class RxOpenForTesting

app-wear-shared/shared-impl/build.gradle

@@ -19,6 +19,5 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
 }

app-wear-shared/shared/src/main/java/info/nightscout/rx/bus/RxBus.kt

@@ -1,7 +1,7 @@
 package info.nightscout.rx.bus
 
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.rx.AapsSchedulers
-import info.nightscout.rx.annotations.RxOpenForTesting
 import info.nightscout.rx.events.Event
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
@@ -10,7 +10,7 @@ import io.reactivex.rxjava3.subjects.PublishSubject
 import javax.inject.Inject
 import javax.inject.Singleton
 
-@RxOpenForTesting
+@OpenForTesting
 @Singleton
 class RxBus @Inject constructor(
     val aapsSchedulers: AapsSchedulers,

app-wear-shared/shared/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.rx.R
+import info.nightscout.shared.R
 
 class EventPumpStatusChanged : EventStatus {
 

app-wear-shared/shared/src/main/res/values/strings.xml

@@ -31,4 +31,12 @@
     <string name="tomorrow">Tomorrow</string>
     <string name="today">Today</string>
     <string name="yesterday">Yesterday</string>
+
+    <!-- Rx -->
+    <string name="connecting_for">Connecting for %1$d s</string>
+    <string name="handshaking">Handshaking</string>
+    <string name="connected">Connected</string>
+    <string name="disconnecting">Disconnecting</string>
+    <string name="waiting_for_disconnection">Waiting for disconnection</string>
+
 </resources>

app/build.gradle

@@ -183,17 +183,16 @@ 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(':graphview')
-    implementation project(':libraries')
-    implementation project(':ns-sdk')
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
     implementation project(':app-wear-shared:shared-impl')
     implementation project(':core:core-main')
     implementation project(':core:graph')
+    implementation project(':core:graphview')
+    implementation project(':core:interfaces')
+    implementation project(':core:libraries')
+    implementation project(':core:ns-sdk')
     implementation project(':core:utils')
     implementation project(':core:ui')
-    implementation project(':interfaces')
     implementation project(':ui')
     implementation project(':plugins:aps')
     implementation project(':plugins:automation')

core/core-main/build.gradle

@@ -14,11 +14,10 @@ apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
 
 dependencies {
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
-    implementation project(':interfaces')
     implementation project(':core:graph')
+    implementation project(':core:interfaces')
     implementation project(':core:ui')
     implementation project(':core:utils')
 

core/graph/build.gradle

@@ -14,10 +14,10 @@ apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
 
 dependencies {
-    implementation project(':graphview')
+    implementation project(':core:graphview')
     implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
-    implementation project(':interfaces')
+    implementation project(':core:interfaces')
     implementation project(':core:ui')
 
     api "com.google.android.material:material:$material_version"