From 678c1adc9af2d51d446a3a31ea4954ec811b0f4b Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 26 Sep 2023 16:31:08 +0200 Subject: [PATCH] :plugins:source cleanup --- .../aaps/activities/MyPreferenceFragment.kt | 16 +++++------ .../main/kotlin/app/aaps/di/AppComponent.kt | 2 +- .../kotlin/app/aaps/di/PluginsListModule.kt | 28 +++++++++---------- .../kotlin/app/aaps/receivers/DataReceiver.kt | 16 +++++------ .../constraints/ConstraintsCheckerImplTest.kt | 9 +++--- .../constraints/safety/SafetyPluginTest.kt | 3 +- plugins/source/build.gradle | 3 +- plugins/source/src/main/AndroidManifest.xml | 2 +- .../app/aaps/plugins}/source/AidexPlugin.kt | 2 +- .../aaps/plugins}/source/BGSourceFragment.kt | 6 ++-- .../app/aaps/plugins}/source/DexcomPlugin.kt | 4 +-- .../aaps/plugins}/source/EversensePlugin.kt | 2 +- .../app/aaps/plugins}/source/GlimpPlugin.kt | 2 +- .../app/aaps/plugins}/source/GlunovoPlugin.kt | 2 +- .../aaps/plugins}/source/IntelligoPlugin.kt | 2 +- .../app/aaps/plugins}/source/MM640gPlugin.kt | 2 +- .../plugins}/source/NSClientSourcePlugin.kt | 2 +- .../app/aaps/plugins}/source/PoctechPlugin.kt | 2 +- .../aaps/plugins}/source/RandomBgPlugin.kt | 2 +- .../app/aaps/plugins}/source/TomatoPlugin.kt | 2 +- .../aaps/plugins}/source/XdripSourcePlugin.kt | 2 +- .../RequestDexcomPermissionActivity.kt | 4 +-- .../aaps/plugins}/source/di/SourceModule.kt | 24 ++++++++-------- .../aaps/plugins}/source/GlimpPluginTest.kt | 2 +- .../aaps/plugins}/source/MM640GPluginTest.kt | 2 +- .../plugins}/source/NSClientPluginTest.kt | 2 +- .../plugins}/source/XdripSourcePluginTest.kt | 2 +- 27 files changed, 73 insertions(+), 74 deletions(-) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/AidexPlugin.kt (99%) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/BGSourceFragment.kt (98%) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/DexcomPlugin.kt (99%) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/EversensePlugin.kt (99%) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/GlimpPlugin.kt (99%) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/GlunovoPlugin.kt (99%) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/IntelligoPlugin.kt (99%) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/MM640gPlugin.kt (99%) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/NSClientSourcePlugin.kt (98%) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/PoctechPlugin.kt (99%) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/RandomBgPlugin.kt (99%) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/TomatoPlugin.kt (99%) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/XdripSourcePlugin.kt (99%) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/activities/RequestDexcomPermissionActivity.kt (88%) rename plugins/source/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/source/di/SourceModule.kt (74%) rename plugins/source/src/test/{java/info/nightscout => kotlin/app/aaps/plugins}/source/GlimpPluginTest.kt (95%) rename plugins/source/src/test/{java/info/nightscout => kotlin/app/aaps/plugins}/source/MM640GPluginTest.kt (95%) rename plugins/source/src/test/{java/info/nightscout => kotlin/app/aaps/plugins}/source/NSClientPluginTest.kt (96%) rename plugins/source/src/test/{java/info/nightscout => kotlin/app/aaps/plugins}/source/XdripSourcePluginTest.kt (95%) diff --git a/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt b/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt index f9d602f986..f48db9e168 100644 --- a/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt +++ b/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt @@ -46,6 +46,14 @@ import app.aaps.plugins.main.general.wear.WearPlugin import app.aaps.plugins.sensitivity.SensitivityAAPSPlugin import app.aaps.plugins.sensitivity.SensitivityOref1Plugin 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 info.nightscout.androidaps.R 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.medtrum.MedtrumPlugin 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 class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListener { diff --git a/app/src/main/kotlin/app/aaps/di/AppComponent.kt b/app/src/main/kotlin/app/aaps/di/AppComponent.kt index 94ae6cc216..d1d2ac89d9 100644 --- a/app/src/main/kotlin/app/aaps/di/AppComponent.kt +++ b/app/src/main/kotlin/app/aaps/di/AppComponent.kt @@ -10,6 +10,7 @@ import app.aaps.plugins.configuration.di.ConfigurationModule import app.aaps.plugins.constraints.di.PluginsConstraintsModule import app.aaps.plugins.insulin.di.InsulinModule import app.aaps.plugins.main.di.PluginsModule +import app.aaps.plugins.source.di.SourceModule import app.aaps.shared.impl.di.SharedImplModule import dagger.BindsInstance 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.medtrum.di.MedtrumModule import info.nightscout.pump.virtual.di.VirtualPumpModule -import info.nightscout.source.di.SourceModule import info.nightscout.ui.di.UiModule import info.nightscout.workflow.di.WorkflowModule import javax.inject.Singleton diff --git a/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt b/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt index b2b9eab5cc..6dbc709798 100644 --- a/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt +++ b/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt @@ -32,6 +32,20 @@ import app.aaps.plugins.main.profile.ProfilePlugin import app.aaps.plugins.sensitivity.SensitivityAAPSPlugin import app.aaps.plugins.sensitivity.SensitivityOref1Plugin 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.Module import dagger.multibindings.IntKey @@ -55,20 +69,6 @@ import info.nightscout.pump.combov2.ComboV2Plugin import info.nightscout.pump.diaconn.DiaconnG8Plugin import info.nightscout.pump.medtrum.MedtrumPlugin 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 @Suppress("unused") diff --git a/app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt b/app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt index 1eb509ac49..87116cfa14 100644 --- a/app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt +++ b/app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt @@ -13,15 +13,15 @@ import app.aaps.core.utils.extensions.copyLong import app.aaps.core.utils.extensions.copyString import app.aaps.core.utils.receivers.DataWorkerStorage 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 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 open class DataReceiver : DaggerBroadcastReceiver() { diff --git a/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/ConstraintsCheckerImplTest.kt b/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/ConstraintsCheckerImplTest.kt index c107e27f82..20a3b0aa64 100644 --- a/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/ConstraintsCheckerImplTest.kt +++ b/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/ConstraintsCheckerImplTest.kt @@ -21,7 +21,10 @@ import app.aaps.implementation.iob.GlucoseStatusProviderImpl import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin 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 com.google.common.truth.Truth.assertThat 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.plugins.pump.insight.LocalInsightPlugin 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.ruffyscripter.RuffyScripter 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.danars.DanaRSPlugin import info.nightscout.pump.virtual.VirtualPumpPlugin -import info.nightscout.source.GlimpPlugin import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.mockito.Mock diff --git a/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/safety/SafetyPluginTest.kt b/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/safety/SafetyPluginTest.kt index 9b1978f622..a854ecca1e 100644 --- a/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/safety/SafetyPluginTest.kt +++ b/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/safety/SafetyPluginTest.kt @@ -14,14 +14,13 @@ import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.main.constraints.ConstraintObject import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin 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 com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository import info.nightscout.pump.virtual.VirtualPumpPlugin -import info.nightscout.source.GlimpPlugin import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.mockito.Mock diff --git a/plugins/source/build.gradle b/plugins/source/build.gradle index ff926fa02d..95d4773913 100644 --- a/plugins/source/build.gradle +++ b/plugins/source/build.gradle @@ -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/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle" + android { - namespace 'info.nightscout.source' + namespace 'app.aaps.plugins.source' } diff --git a/plugins/source/src/main/AndroidManifest.xml b/plugins/source/src/main/AndroidManifest.xml index 8ab266755d..1770f079cb 100644 --- a/plugins/source/src/main/AndroidManifest.xml +++ b/plugins/source/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ diff --git a/plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/AidexPlugin.kt similarity index 99% rename from plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/AidexPlugin.kt index 96bf398456..1c55e07707 100644 --- a/plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/AidexPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import android.content.Context import androidx.work.WorkerParameters diff --git a/plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/BGSourceFragment.kt similarity index 98% rename from plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/BGSourceFragment.kt index 4996c20ae8..6cc6236a26 100644 --- a/plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/BGSourceFragment.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import android.os.Bundle 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.Sources 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 info.nightscout.database.impl.AppRepository 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.kotlin.plusAssign import java.util.concurrent.TimeUnit diff --git a/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/DexcomPlugin.kt similarity index 99% rename from plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/DexcomPlugin.kt index 18743f2071..c3f92e4cc9 100644 --- a/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/DexcomPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import android.content.Context 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.ValueWithUnit import app.aaps.database.transactions.TransactionGlucoseValue +import app.aaps.plugins.source.activities.RequestDexcomPermissionActivity import app.aaps.shared.impl.extensions.safeGetInstalledPackages import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.CgmSourceTransaction import info.nightscout.database.impl.transactions.InvalidateGlucoseValueTransaction -import info.nightscout.source.activities.RequestDexcomPermissionActivity import kotlinx.coroutines.Dispatchers import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/EversensePlugin.kt similarity index 99% rename from plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/EversensePlugin.kt index 2533bba486..6a94fae92a 100644 --- a/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/EversensePlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import android.content.Context import androidx.work.WorkerParameters diff --git a/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/GlimpPlugin.kt similarity index 99% rename from plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/GlimpPlugin.kt index b483243991..31374b0029 100644 --- a/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/GlimpPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import android.content.Context import androidx.work.WorkerParameters diff --git a/plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/GlunovoPlugin.kt similarity index 99% rename from plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/GlunovoPlugin.kt index 55dfd52cc4..846facaf85 100644 --- a/plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/GlunovoPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import android.content.Context import android.net.Uri diff --git a/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/IntelligoPlugin.kt similarity index 99% rename from plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/IntelligoPlugin.kt index ac84ef3f74..36b36582c5 100644 --- a/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/IntelligoPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import android.content.Context import android.content.pm.PackageManager diff --git a/plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/MM640gPlugin.kt similarity index 99% rename from plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/MM640gPlugin.kt index d33baafc5e..24d090a364 100644 --- a/plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/MM640gPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import android.content.Context import androidx.work.WorkerParameters diff --git a/plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/NSClientSourcePlugin.kt similarity index 98% rename from plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/NSClientSourcePlugin.kt index 84c8290063..6f1dcb9022 100644 --- a/plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/NSClientSourcePlugin.kt @@ -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.logging.AAPSLogger diff --git a/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/PoctechPlugin.kt similarity index 99% rename from plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/PoctechPlugin.kt index 49f18097fb..8d46aa5d98 100644 --- a/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/PoctechPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import android.content.Context import androidx.work.WorkerParameters diff --git a/plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/RandomBgPlugin.kt similarity index 99% rename from plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/RandomBgPlugin.kt index 2611862eef..bf6bc0e3ac 100644 --- a/plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/RandomBgPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import android.os.Handler import android.os.HandlerThread diff --git a/plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/TomatoPlugin.kt similarity index 99% rename from plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/TomatoPlugin.kt index fadcaff381..2f920b7ef1 100644 --- a/plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/TomatoPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import android.content.Context import androidx.work.WorkerParameters diff --git a/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/XdripSourcePlugin.kt similarity index 99% rename from plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/XdripSourcePlugin.kt index 9e5a093c63..7f15daaebe 100644 --- a/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/XdripSourcePlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import android.content.Context import androidx.work.WorkerParameters diff --git a/plugins/source/src/main/java/info/nightscout/source/activities/RequestDexcomPermissionActivity.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/activities/RequestDexcomPermissionActivity.kt similarity index 88% rename from plugins/source/src/main/java/info/nightscout/source/activities/RequestDexcomPermissionActivity.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/activities/RequestDexcomPermissionActivity.kt index eef10403b2..801576e4ac 100644 --- a/plugins/source/src/main/java/info/nightscout/source/activities/RequestDexcomPermissionActivity.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/activities/RequestDexcomPermissionActivity.kt @@ -1,8 +1,8 @@ -package info.nightscout.source.activities +package app.aaps.plugins.source.activities import android.os.Bundle import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.source.DexcomPlugin +import app.aaps.plugins.source.DexcomPlugin class RequestDexcomPermissionActivity : TranslatedDaggerAppCompatActivity() { diff --git a/plugins/source/src/main/java/info/nightscout/source/di/SourceModule.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/di/SourceModule.kt similarity index 74% rename from plugins/source/src/main/java/info/nightscout/source/di/SourceModule.kt rename to plugins/source/src/main/kotlin/app/aaps/plugins/source/di/SourceModule.kt index cd9656711a..5ea000ccb3 100644 --- a/plugins/source/src/main/java/info/nightscout/source/di/SourceModule.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/di/SourceModule.kt @@ -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.NSClientSource 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.Module 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( includes = [ diff --git a/plugins/source/src/test/java/info/nightscout/source/GlimpPluginTest.kt b/plugins/source/src/test/kotlin/app/aaps/plugins/source/GlimpPluginTest.kt similarity index 95% rename from plugins/source/src/test/java/info/nightscout/source/GlimpPluginTest.kt rename to plugins/source/src/test/kotlin/app/aaps/plugins/source/GlimpPluginTest.kt index 0afa695030..1a8aaef660 100644 --- a/plugins/source/src/test/java/info/nightscout/source/GlimpPluginTest.kt +++ b/plugins/source/src/test/kotlin/app/aaps/plugins/source/GlimpPluginTest.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.shared.tests.TestBase diff --git a/plugins/source/src/test/java/info/nightscout/source/MM640GPluginTest.kt b/plugins/source/src/test/kotlin/app/aaps/plugins/source/MM640GPluginTest.kt similarity index 95% rename from plugins/source/src/test/java/info/nightscout/source/MM640GPluginTest.kt rename to plugins/source/src/test/kotlin/app/aaps/plugins/source/MM640GPluginTest.kt index 0d3ceb13c7..66ae9e8ed5 100644 --- a/plugins/source/src/test/java/info/nightscout/source/MM640GPluginTest.kt +++ b/plugins/source/src/test/kotlin/app/aaps/plugins/source/MM640GPluginTest.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.shared.tests.TestBase diff --git a/plugins/source/src/test/java/info/nightscout/source/NSClientPluginTest.kt b/plugins/source/src/test/kotlin/app/aaps/plugins/source/NSClientPluginTest.kt similarity index 96% rename from plugins/source/src/test/java/info/nightscout/source/NSClientPluginTest.kt rename to plugins/source/src/test/kotlin/app/aaps/plugins/source/NSClientPluginTest.kt index 017b2b507e..f41dfa2cff 100644 --- a/plugins/source/src/test/java/info/nightscout/source/NSClientPluginTest.kt +++ b/plugins/source/src/test/kotlin/app/aaps/plugins/source/NSClientPluginTest.kt @@ -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.resources.ResourceHelper diff --git a/plugins/source/src/test/java/info/nightscout/source/XdripSourcePluginTest.kt b/plugins/source/src/test/kotlin/app/aaps/plugins/source/XdripSourcePluginTest.kt similarity index 95% rename from plugins/source/src/test/java/info/nightscout/source/XdripSourcePluginTest.kt rename to plugins/source/src/test/kotlin/app/aaps/plugins/source/XdripSourcePluginTest.kt index c8607b6ae5..3e645fb3e9 100644 --- a/plugins/source/src/test/java/info/nightscout/source/XdripSourcePluginTest.kt +++ b/plugins/source/src/test/kotlin/app/aaps/plugins/source/XdripSourcePluginTest.kt @@ -1,4 +1,4 @@ -package info.nightscout.source +package app.aaps.plugins.source import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.shared.tests.TestBase