modules cleanup
This commit is contained in:
Milos Kozak
parent
97433c7ace
commit
b38bc5c830
359 changed files with 74 additions and 381 deletions
|
|
@ -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"
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest>
|
||||
|
||||
</manifest>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="connected">Nasctha</string>
|
||||
<string name="disconnecting">Dícheangal</string>
|
||||
</resources>
|
||||
|
|
@ -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>
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources></resources>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources></resources>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources></resources>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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
|
||||
|
|
@ -19,6 +19,5 @@ android {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(':app-wear-shared:rx')
|
||||
implementation project(':app-wear-shared:shared')
|
||||
}
|
||||
|
|
@ -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,
|
||||
|
|
@ -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 {
|
||||
|
||||
|
|
@ -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>
|
||||
|
|
@ -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')
|
||||
|
|
|
|||
|
|
@ -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')
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue