caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:workflow cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-27 09:41:32 +02:00
parent d3e6fb0df9
commit fc707cd11a
20 changed files with 41 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/app/aaps/di/AppComponent.kt
View file

@ -17,6 +17,7 @@ import app.aaps.plugins.sync.di.SyncModule
import app.aaps.pump.virtual.di.VirtualPumpModule import app.aaps.pump.virtual.di.VirtualPumpModule
import app.aaps.shared.impl.di.SharedImplModule import app.aaps.shared.impl.di.SharedImplModule
import app.aaps.ui.di.UiModule import app.aaps.ui.di.UiModule
import app.aaps.workflow.di.WorkflowModule
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Component import dagger.Component
import dagger.android.AndroidInjectionModule import dagger.android.AndroidInjectionModule
@ -37,7 +38,6 @@ import info.nightscout.pump.dana.di.DanaModule
import info.nightscout.pump.danars.di.DanaRSModule import info.nightscout.pump.danars.di.DanaRSModule
import info.nightscout.pump.diaconn.di.DiaconnG8Module import info.nightscout.pump.diaconn.di.DiaconnG8Module
import info.nightscout.pump.medtrum.di.MedtrumModule import info.nightscout.pump.medtrum.di.MedtrumModule
import info.nightscout.workflow.di.WorkflowModule
import javax.inject.Singleton import javax.inject.Singleton
@Singleton @Singleton

17
app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt
View file

@ -30,22 +30,9 @@ import app.aaps.core.main.workflow.CalculationWorkflow.Companion.PASS
import app.aaps.core.utils.receivers.DataWorkerStorage import app.aaps.core.utils.receivers.DataWorkerStorage
import app.aaps.core.utils.worker.then import app.aaps.core.utils.worker.then
import app.aaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin import app.aaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
import app.aaps.workflow.iob.IobCobOref1Worker
import app.aaps.workflow.iob.IobCobOrefWorker
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.workflow.DummyWorker
import info.nightscout.workflow.InvokeLoopWorker
import info.nightscout.workflow.LoadBgDataWorker
import info.nightscout.workflow.PrepareBasalDataWorker
import info.nightscout.workflow.PrepareBgDataWorker
import info.nightscout.workflow.PrepareBucketedDataWorker
import info.nightscout.workflow.PrepareIobAutosensGraphDataWorker
import info.nightscout.workflow.PreparePredictionsWorker
import info.nightscout.workflow.PrepareTemporaryTargetDataWorker
import info.nightscout.workflow.PrepareTreatmentsDataWorker
import info.nightscout.workflow.UpdateGraphWorker
import info.nightscout.workflow.UpdateIobCobSensWorker
import info.nightscout.workflow.UpdateWidgetWorker
import info.nightscout.workflow.iob.IobCobOref1Worker
import info.nightscout.workflow.iob.IobCobOrefWorker
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject import javax.inject.Inject

2
workflow/build.gradle
View file

@ -11,7 +11,7 @@ apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
apply from: "${project.rootDir}/core/main/jacoco_global.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
android { android {
namespace 'info.nightscout.workflow' namespace 'app.aaps.workflow'
} }
dependencies { dependencies {

2
workflow/src/main/java/info/nightscout/workflow/DummyWorker.kt → workflow/src/main/kotlin/app/aaps/workflow/DummyWorker.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.workflow package app.aaps.workflow
import android.content.Context import android.content.Context
import androidx.work.WorkerParameters import androidx.work.WorkerParameters

2
workflow/src/main/java/info/nightscout/workflow/InvokeLoopWorker.kt → workflow/src/main/kotlin/app/aaps/workflow/InvokeLoopWorker.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.workflow package app.aaps.workflow
import android.content.Context import android.content.Context
import androidx.work.WorkerParameters import androidx.work.WorkerParameters

2
workflow/src/main/java/info/nightscout/workflow/LoadBgDataWorker.kt → workflow/src/main/kotlin/app/aaps/workflow/LoadBgDataWorker.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.workflow package app.aaps.workflow
import android.content.Context import android.content.Context
import androidx.work.WorkerParameters import androidx.work.WorkerParameters

2
workflow/src/main/java/info/nightscout/workflow/PrepareBasalDataWorker.kt → workflow/src/main/kotlin/app/aaps/workflow/PrepareBasalDataWorker.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.workflow package app.aaps.workflow
import android.content.Context import android.content.Context
import android.graphics.DashPathEffect import android.graphics.DashPathEffect

2
workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt → workflow/src/main/kotlin/app/aaps/workflow/PrepareBgDataWorker.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.workflow package app.aaps.workflow
import android.content.Context import android.content.Context
import androidx.work.WorkerParameters import androidx.work.WorkerParameters

2
workflow/src/main/java/info/nightscout/workflow/PrepareBucketedDataWorker.kt → workflow/src/main/kotlin/app/aaps/workflow/PrepareBucketedDataWorker.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.workflow package app.aaps.workflow
import android.content.Context import android.content.Context
import androidx.work.WorkerParameters import androidx.work.WorkerParameters

2
workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt → workflow/src/main/kotlin/app/aaps/workflow/PrepareIobAutosensGraphDataWorker.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.workflow package app.aaps.workflow
import android.content.Context import android.content.Context
import android.graphics.DashPathEffect import android.graphics.DashPathEffect

2
workflow/src/main/java/info/nightscout/workflow/PreparePredictionsWorker.kt → workflow/src/main/kotlin/app/aaps/workflow/PreparePredictionsWorker.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.workflow package app.aaps.workflow
import android.content.Context import android.content.Context
import androidx.work.WorkerParameters import androidx.work.WorkerParameters

2
workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt → workflow/src/main/kotlin/app/aaps/workflow/PrepareTemporaryTargetDataWorker.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.workflow package app.aaps.workflow
import android.content.Context import android.content.Context
import androidx.work.WorkerParameters import androidx.work.WorkerParameters

2
workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt → workflow/src/main/kotlin/app/aaps/workflow/PrepareTreatmentsDataWorker.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.workflow package app.aaps.workflow
import android.content.Context import android.content.Context
import androidx.work.WorkerParameters import androidx.work.WorkerParameters

8
workflow/src/main/java/info/nightscout/workflow/UpdateGraphWorker.kt → workflow/src/main/kotlin/app/aaps/workflow/UpdateGraphWorker.kt
View file

@ -1,13 +1,13 @@
package info.nightscout.workflow package app.aaps.workflow
import android.content.Context import android.content.Context
import androidx.work.WorkerParameters import androidx.work.WorkerParameters
import app.aaps.core.main.events.EventIobCalculationProgress
import app.aaps.core.main.utils.worker.LoggingWorker
import app.aaps.core.main.workflow.CalculationWorkflow
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventUpdateOverviewGraph import app.aaps.core.interfaces.rx.events.EventUpdateOverviewGraph
import app.aaps.core.main.events.EventIobCalculationProgress
import app.aaps.core.main.utils.worker.LoggingWorker
import app.aaps.core.main.workflow.CalculationWorkflow
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import java.security.spec.InvalidParameterSpecException import java.security.spec.InvalidParameterSpecException
import javax.inject.Inject import javax.inject.Inject

4
workflow/src/main/java/info/nightscout/workflow/UpdateIobCobSensWorker.kt → workflow/src/main/kotlin/app/aaps/workflow/UpdateIobCobSensWorker.kt
View file

@ -1,12 +1,12 @@
package info.nightscout.workflow package app.aaps.workflow
import android.content.Context import android.content.Context
import androidx.work.WorkerParameters import androidx.work.WorkerParameters
import app.aaps.core.main.utils.worker.LoggingWorker
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventUpdateOverviewIobCob import app.aaps.core.interfaces.rx.events.EventUpdateOverviewIobCob
import app.aaps.core.interfaces.rx.events.EventUpdateOverviewSensitivity import app.aaps.core.interfaces.rx.events.EventUpdateOverviewSensitivity
import app.aaps.core.main.utils.worker.LoggingWorker
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import javax.inject.Inject import javax.inject.Inject

4
workflow/src/main/java/info/nightscout/workflow/UpdateWidgetWorker.kt → workflow/src/main/kotlin/app/aaps/workflow/UpdateWidgetWorker.kt
View file

@ -1,9 +1,9 @@
package info.nightscout.workflow package app.aaps.workflow
import android.content.Context import android.content.Context
import androidx.work.WorkerParameters import androidx.work.WorkerParameters
import app.aaps.core.main.utils.worker.LoggingWorker
import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.main.utils.worker.LoggingWorker
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import javax.inject.Inject import javax.inject.Inject

32
workflow/src/main/java/info/nightscout/workflow/di/WorkflowModule.kt → workflow/src/main/kotlin/app/aaps/workflow/di/WorkflowModule.kt
View file

@ -1,22 +1,22 @@
package info.nightscout.workflow.di package app.aaps.workflow.di
import app.aaps.workflow.DummyWorker
import app.aaps.workflow.InvokeLoopWorker
import app.aaps.workflow.LoadBgDataWorker
import app.aaps.workflow.PrepareBasalDataWorker
import app.aaps.workflow.PrepareBgDataWorker
import app.aaps.workflow.PrepareBucketedDataWorker
import app.aaps.workflow.PrepareIobAutosensGraphDataWorker
import app.aaps.workflow.PreparePredictionsWorker
import app.aaps.workflow.PrepareTemporaryTargetDataWorker
import app.aaps.workflow.PrepareTreatmentsDataWorker
import app.aaps.workflow.UpdateGraphWorker
import app.aaps.workflow.UpdateIobCobSensWorker
import app.aaps.workflow.UpdateWidgetWorker
import app.aaps.workflow.iob.IobCobOref1Worker
import app.aaps.workflow.iob.IobCobOrefWorker
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector
import info.nightscout.workflow.DummyWorker
import info.nightscout.workflow.InvokeLoopWorker
import info.nightscout.workflow.LoadBgDataWorker
import info.nightscout.workflow.PrepareBasalDataWorker
import info.nightscout.workflow.PrepareBgDataWorker
import info.nightscout.workflow.PrepareBucketedDataWorker
import info.nightscout.workflow.PrepareIobAutosensGraphDataWorker
import info.nightscout.workflow.PreparePredictionsWorker
import info.nightscout.workflow.PrepareTemporaryTargetDataWorker
import info.nightscout.workflow.PrepareTreatmentsDataWorker
import info.nightscout.workflow.UpdateGraphWorker
import info.nightscout.workflow.UpdateIobCobSensWorker
import info.nightscout.workflow.UpdateWidgetWorker
import info.nightscout.workflow.iob.IobCobOref1Worker
import info.nightscout.workflow.iob.IobCobOrefWorker
@Module @Module
@Suppress("unused") @Suppress("unused")

2
workflow/src/main/java/info/nightscout/workflow/iob/CarbsInPastExtension.kt → workflow/src/main/kotlin/app/aaps/workflow/iob/CarbsInPastExtension.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.workflow.iob package app.aaps.workflow.iob
import app.aaps.core.interfaces.aps.AutosensData import app.aaps.core.interfaces.aps.AutosensData
import app.aaps.core.interfaces.aps.SMBDefaults import app.aaps.core.interfaces.aps.SMBDefaults

2
workflow/src/main/java/info/nightscout/workflow/iob/IobCobOref1Worker.kt → workflow/src/main/kotlin/app/aaps/workflow/iob/IobCobOref1Worker.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.workflow.iob package app.aaps.workflow.iob
import android.content.Context import android.content.Context
import android.os.SystemClock import android.os.SystemClock

2
workflow/src/main/java/info/nightscout/workflow/iob/IobCobOrefWorker.kt → workflow/src/main/kotlin/app/aaps/workflow/iob/IobCobOrefWorker.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.workflow.iob package app.aaps.workflow.iob
import android.content.Context import android.content.Context
import android.os.SystemClock import android.os.SystemClock