:plugins:source cleanup

This commit is contained in:
Milos Kozak 2023-09-26 16:31:08 +02:00
parent b79d653be2
commit 678c1adc9a
27 changed files with 73 additions and 74 deletions

View file

@ -46,6 +46,14 @@ import app.aaps.plugins.main.general.wear.WearPlugin
import app.aaps.plugins.sensitivity.SensitivityAAPSPlugin import app.aaps.plugins.sensitivity.SensitivityAAPSPlugin
import app.aaps.plugins.sensitivity.SensitivityOref1Plugin import app.aaps.plugins.sensitivity.SensitivityOref1Plugin
import app.aaps.plugins.sensitivity.SensitivityWeightedAveragePlugin import app.aaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
import app.aaps.plugins.source.AidexPlugin
import app.aaps.plugins.source.DexcomPlugin
import app.aaps.plugins.source.EversensePlugin
import app.aaps.plugins.source.GlimpPlugin
import app.aaps.plugins.source.GlunovoPlugin
import app.aaps.plugins.source.IntelligoPlugin
import app.aaps.plugins.source.PoctechPlugin
import app.aaps.plugins.source.TomatoPlugin
import dagger.android.support.AndroidSupportInjection import dagger.android.support.AndroidSupportInjection
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
@ -64,14 +72,6 @@ import info.nightscout.pump.combov2.ComboV2Plugin
import info.nightscout.pump.diaconn.DiaconnG8Plugin import info.nightscout.pump.diaconn.DiaconnG8Plugin
import info.nightscout.pump.medtrum.MedtrumPlugin import info.nightscout.pump.medtrum.MedtrumPlugin
import info.nightscout.pump.virtual.VirtualPumpPlugin import info.nightscout.pump.virtual.VirtualPumpPlugin
import info.nightscout.source.AidexPlugin
import info.nightscout.source.DexcomPlugin
import info.nightscout.source.EversensePlugin
import info.nightscout.source.GlimpPlugin
import info.nightscout.source.GlunovoPlugin
import info.nightscout.source.IntelligoPlugin
import info.nightscout.source.PoctechPlugin
import info.nightscout.source.TomatoPlugin
import javax.inject.Inject import javax.inject.Inject
class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListener { class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListener {

View file

@ -10,6 +10,7 @@ import app.aaps.plugins.configuration.di.ConfigurationModule
import app.aaps.plugins.constraints.di.PluginsConstraintsModule import app.aaps.plugins.constraints.di.PluginsConstraintsModule
import app.aaps.plugins.insulin.di.InsulinModule import app.aaps.plugins.insulin.di.InsulinModule
import app.aaps.plugins.main.di.PluginsModule import app.aaps.plugins.main.di.PluginsModule
import app.aaps.plugins.source.di.SourceModule
import app.aaps.shared.impl.di.SharedImplModule import app.aaps.shared.impl.di.SharedImplModule
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Component import dagger.Component
@ -35,7 +36,6 @@ 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.pump.virtual.di.VirtualPumpModule import info.nightscout.pump.virtual.di.VirtualPumpModule
import info.nightscout.source.di.SourceModule
import info.nightscout.ui.di.UiModule import info.nightscout.ui.di.UiModule
import info.nightscout.workflow.di.WorkflowModule import info.nightscout.workflow.di.WorkflowModule
import javax.inject.Singleton import javax.inject.Singleton

View file

@ -32,6 +32,20 @@ import app.aaps.plugins.main.profile.ProfilePlugin
import app.aaps.plugins.sensitivity.SensitivityAAPSPlugin import app.aaps.plugins.sensitivity.SensitivityAAPSPlugin
import app.aaps.plugins.sensitivity.SensitivityOref1Plugin import app.aaps.plugins.sensitivity.SensitivityOref1Plugin
import app.aaps.plugins.sensitivity.SensitivityWeightedAveragePlugin import app.aaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
import app.aaps.plugins.smoothing.AvgSmoothingPlugin
import app.aaps.plugins.smoothing.ExponentialSmoothingPlugin
import app.aaps.plugins.smoothing.NoSmoothingPlugin
import app.aaps.plugins.source.AidexPlugin
import app.aaps.plugins.source.DexcomPlugin
import app.aaps.plugins.source.GlimpPlugin
import app.aaps.plugins.source.GlunovoPlugin
import app.aaps.plugins.source.IntelligoPlugin
import app.aaps.plugins.source.MM640gPlugin
import app.aaps.plugins.source.NSClientSourcePlugin
import app.aaps.plugins.source.PoctechPlugin
import app.aaps.plugins.source.RandomBgPlugin
import app.aaps.plugins.source.TomatoPlugin
import app.aaps.plugins.source.XdripSourcePlugin
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
import dagger.multibindings.IntKey import dagger.multibindings.IntKey
@ -55,20 +69,6 @@ import info.nightscout.pump.combov2.ComboV2Plugin
import info.nightscout.pump.diaconn.DiaconnG8Plugin import info.nightscout.pump.diaconn.DiaconnG8Plugin
import info.nightscout.pump.medtrum.MedtrumPlugin import info.nightscout.pump.medtrum.MedtrumPlugin
import info.nightscout.pump.virtual.VirtualPumpPlugin import info.nightscout.pump.virtual.VirtualPumpPlugin
import app.aaps.plugins.smoothing.AvgSmoothingPlugin
import app.aaps.plugins.smoothing.ExponentialSmoothingPlugin
import app.aaps.plugins.smoothing.NoSmoothingPlugin
import info.nightscout.source.AidexPlugin
import info.nightscout.source.DexcomPlugin
import info.nightscout.source.GlimpPlugin
import info.nightscout.source.GlunovoPlugin
import info.nightscout.source.IntelligoPlugin
import info.nightscout.source.MM640gPlugin
import info.nightscout.source.NSClientSourcePlugin
import info.nightscout.source.PoctechPlugin
import info.nightscout.source.RandomBgPlugin
import info.nightscout.source.TomatoPlugin
import info.nightscout.source.XdripSourcePlugin
import javax.inject.Qualifier import javax.inject.Qualifier
@Suppress("unused") @Suppress("unused")

View file

@ -13,15 +13,15 @@ import app.aaps.core.utils.extensions.copyLong
import app.aaps.core.utils.extensions.copyString import app.aaps.core.utils.extensions.copyString
import app.aaps.core.utils.receivers.DataWorkerStorage import app.aaps.core.utils.receivers.DataWorkerStorage
import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin
import app.aaps.plugins.source.AidexPlugin
import app.aaps.plugins.source.DexcomPlugin
import app.aaps.plugins.source.EversensePlugin
import app.aaps.plugins.source.GlimpPlugin
import app.aaps.plugins.source.MM640gPlugin
import app.aaps.plugins.source.PoctechPlugin
import app.aaps.plugins.source.TomatoPlugin
import app.aaps.plugins.source.XdripSourcePlugin
import dagger.android.DaggerBroadcastReceiver import dagger.android.DaggerBroadcastReceiver
import info.nightscout.source.AidexPlugin
import info.nightscout.source.DexcomPlugin
import info.nightscout.source.EversensePlugin
import info.nightscout.source.GlimpPlugin
import info.nightscout.source.MM640gPlugin
import info.nightscout.source.PoctechPlugin
import info.nightscout.source.TomatoPlugin
import info.nightscout.source.XdripSourcePlugin
import javax.inject.Inject import javax.inject.Inject
open class DataReceiver : DaggerBroadcastReceiver() { open class DataReceiver : DaggerBroadcastReceiver() {

View file

@ -21,7 +21,10 @@ import app.aaps.implementation.iob.GlucoseStatusProviderImpl
import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
import app.aaps.plugins.constraints.ConstraintsCheckerImpl import app.aaps.plugins.constraints.objectives.ObjectivesPlugin
import app.aaps.plugins.constraints.objectives.objectives.Objective
import app.aaps.plugins.constraints.safety.SafetyPlugin
import app.aaps.plugins.source.GlimpPlugin
import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
@ -32,9 +35,6 @@ import info.nightscout.androidaps.insight.database.InsightDatabaseDao
import info.nightscout.androidaps.insight.database.InsightDbHelper import info.nightscout.androidaps.insight.database.InsightDbHelper
import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import app.aaps.plugins.constraints.objectives.ObjectivesPlugin
import app.aaps.plugins.constraints.objectives.objectives.Objective
import app.aaps.plugins.constraints.safety.SafetyPlugin
import info.nightscout.pump.combo.ComboPlugin import info.nightscout.pump.combo.ComboPlugin
import info.nightscout.pump.combo.ruffyscripter.RuffyScripter import info.nightscout.pump.combo.ruffyscripter.RuffyScripter
import info.nightscout.pump.dana.DanaPump import info.nightscout.pump.dana.DanaPump
@ -42,7 +42,6 @@ import info.nightscout.pump.dana.R
import info.nightscout.pump.dana.database.DanaHistoryDatabase import info.nightscout.pump.dana.database.DanaHistoryDatabase
import info.nightscout.pump.danars.DanaRSPlugin import info.nightscout.pump.danars.DanaRSPlugin
import info.nightscout.pump.virtual.VirtualPumpPlugin import info.nightscout.pump.virtual.VirtualPumpPlugin
import info.nightscout.source.GlimpPlugin
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.mockito.Mock import org.mockito.Mock

View file

@ -14,14 +14,13 @@ import app.aaps.core.interfaces.utils.HardLimits
import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import app.aaps.plugins.constraints.safety.SafetyPlugin import app.aaps.plugins.source.GlimpPlugin
import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.pump.virtual.VirtualPumpPlugin import info.nightscout.pump.virtual.VirtualPumpPlugin
import info.nightscout.source.GlimpPlugin
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.mockito.Mock import org.mockito.Mock

View file

@ -10,8 +10,9 @@ 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/allopen_dependencies.gradle"
apply from: "${project.rootDir}/core/main/test_dependencies.gradle" 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.source' namespace 'app.aaps.plugins.source'
} }

View file

@ -4,7 +4,7 @@
<application> <application>
<activity <activity
android:name="info.nightscout.source.activities.RequestDexcomPermissionActivity" android:name=".activities.RequestDexcomPermissionActivity"
android:exported="false" /> android:exported="false" />
</application> </application>

View file

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

View file

@ -1,4 +1,4 @@
package info.nightscout.source package app.aaps.plugins.source
import android.os.Bundle import android.os.Bundle
import android.util.SparseArray import android.util.SparseArray
@ -36,11 +36,11 @@ import app.aaps.database.entities.GlucoseValue
import app.aaps.database.entities.UserEntry.Action import app.aaps.database.entities.UserEntry.Action
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.database.entities.ValueWithUnit import app.aaps.database.entities.ValueWithUnit
import app.aaps.plugins.source.databinding.SourceFragmentBinding
import app.aaps.plugins.source.databinding.SourceItemBinding
import dagger.android.support.DaggerFragment import dagger.android.support.DaggerFragment
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InvalidateGlucoseValueTransaction import info.nightscout.database.impl.transactions.InvalidateGlucoseValueTransaction
import info.nightscout.source.databinding.SourceFragmentBinding
import info.nightscout.source.databinding.SourceItemBinding
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 java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit

View file

@ -1,4 +1,4 @@
package info.nightscout.source package app.aaps.plugins.source
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -29,12 +29,12 @@ import app.aaps.database.entities.UserEntry.Action
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.database.entities.ValueWithUnit import app.aaps.database.entities.ValueWithUnit
import app.aaps.database.transactions.TransactionGlucoseValue import app.aaps.database.transactions.TransactionGlucoseValue
import app.aaps.plugins.source.activities.RequestDexcomPermissionActivity
import app.aaps.shared.impl.extensions.safeGetInstalledPackages import app.aaps.shared.impl.extensions.safeGetInstalledPackages
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.CgmSourceTransaction import info.nightscout.database.impl.transactions.CgmSourceTransaction
import info.nightscout.database.impl.transactions.InvalidateGlucoseValueTransaction import info.nightscout.database.impl.transactions.InvalidateGlucoseValueTransaction
import info.nightscout.source.activities.RequestDexcomPermissionActivity
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton

View file

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

View file

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

View file

@ -1,4 +1,4 @@
package info.nightscout.source package app.aaps.plugins.source
import android.content.Context import android.content.Context
import android.net.Uri import android.net.Uri

View file

@ -1,4 +1,4 @@
package info.nightscout.source package app.aaps.plugins.source
import android.content.Context import android.content.Context
import android.content.pm.PackageManager import android.content.pm.PackageManager

View file

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

View file

@ -1,4 +1,4 @@
package info.nightscout.source package app.aaps.plugins.source
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger

View file

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

View file

@ -1,4 +1,4 @@
package info.nightscout.source package app.aaps.plugins.source
import android.os.Handler import android.os.Handler
import android.os.HandlerThread import android.os.HandlerThread

View file

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

View file

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

View file

@ -1,8 +1,8 @@
package info.nightscout.source.activities package app.aaps.plugins.source.activities
import android.os.Bundle import android.os.Bundle
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import info.nightscout.source.DexcomPlugin import app.aaps.plugins.source.DexcomPlugin
class RequestDexcomPermissionActivity : TranslatedDaggerAppCompatActivity() { class RequestDexcomPermissionActivity : TranslatedDaggerAppCompatActivity() {

View file

@ -1,22 +1,22 @@
package info.nightscout.source.di package app.aaps.plugins.source.di
import app.aaps.core.interfaces.source.DexcomBoyda import app.aaps.core.interfaces.source.DexcomBoyda
import app.aaps.core.interfaces.source.NSClientSource import app.aaps.core.interfaces.source.NSClientSource
import app.aaps.core.interfaces.source.XDripSource import app.aaps.core.interfaces.source.XDripSource
import app.aaps.plugins.source.AidexPlugin
import app.aaps.plugins.source.BGSourceFragment
import app.aaps.plugins.source.DexcomPlugin
import app.aaps.plugins.source.EversensePlugin
import app.aaps.plugins.source.GlimpPlugin
import app.aaps.plugins.source.MM640gPlugin
import app.aaps.plugins.source.NSClientSourcePlugin
import app.aaps.plugins.source.PoctechPlugin
import app.aaps.plugins.source.TomatoPlugin
import app.aaps.plugins.source.XdripSourcePlugin
import app.aaps.plugins.source.activities.RequestDexcomPermissionActivity
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector
import info.nightscout.source.AidexPlugin
import info.nightscout.source.BGSourceFragment
import info.nightscout.source.DexcomPlugin
import info.nightscout.source.EversensePlugin
import info.nightscout.source.GlimpPlugin
import info.nightscout.source.MM640gPlugin
import info.nightscout.source.NSClientSourcePlugin
import info.nightscout.source.PoctechPlugin
import info.nightscout.source.TomatoPlugin
import info.nightscout.source.XdripSourcePlugin
import info.nightscout.source.activities.RequestDexcomPermissionActivity
@Module( @Module(
includes = [ includes = [

View file

@ -1,4 +1,4 @@
package info.nightscout.source package app.aaps.plugins.source
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase

View file

@ -1,4 +1,4 @@
package info.nightscout.source package app.aaps.plugins.source
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase

View file

@ -1,4 +1,4 @@
package info.nightscout.source package app.aaps.plugins.source
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper

View file

@ -1,4 +1,4 @@
package info.nightscout.source package app.aaps.plugins.source
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase