caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Move Insight database package outside plugins\pump

Browse source
This commit is contained in:
Philoul 2021-05-07 11:21:47 +02:00
parent ed7dcea38e
commit dfd6c6e859
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
View file

@ -13,6 +13,7 @@ import info.nightscout.androidaps.database.entities.UserEntry.Action
import info.nightscout.androidaps.database.entities.UserEntry.Sources import info.nightscout.androidaps.database.entities.UserEntry.Sources
import info.nightscout.androidaps.databinding.MaintenanceFragmentBinding import info.nightscout.androidaps.databinding.MaintenanceFragmentBinding
import info.nightscout.androidaps.events.EventNewBG import info.nightscout.androidaps.events.EventNewBG
import info.nightscout.androidaps.insight.database.InsightDatabase
import info.nightscout.androidaps.interfaces.DataSyncSelector import info.nightscout.androidaps.interfaces.DataSyncSelector
import info.nightscout.androidaps.interfaces.ImportExportPrefs import info.nightscout.androidaps.interfaces.ImportExportPrefs
import info.nightscout.androidaps.interfaces.PumpSync import info.nightscout.androidaps.interfaces.PumpSync
@ -21,7 +22,6 @@ import info.nightscout.androidaps.logging.UserEntryLogger
import info.nightscout.androidaps.plugins.bus.RxBusWrapper import info.nightscout.androidaps.plugins.bus.RxBusWrapper
import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData
import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabase
import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.alertDialogs.OKDialog
import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.resources.ResourceHelper
import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.androidaps.utils.rx.AapsSchedulers

2
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.kt → insight/src/main/java/info/nightscout/androidaps/insight/database/InsightBolusID.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.plugins.pump.insight.database package info.nightscout.androidaps.insight.database
import androidx.room.Entity import androidx.room.Entity
import androidx.room.Index import androidx.room.Index

2
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabase.kt → insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.plugins.pump.insight.database package info.nightscout.androidaps.insight.database
import android.content.Context import android.content.Context
import androidx.room.Database import androidx.room.Database

2
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabaseDao.kt → insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.plugins.pump.insight.database package info.nightscout.androidaps.insight.database
import androidx.room.Dao import androidx.room.Dao
import androidx.room.Insert import androidx.room.Insert

2
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.kt → insight/src/main/java/info/nightscout/androidaps/insight/database/InsightHistoryOffset.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.plugins.pump.insight.database package info.nightscout.androidaps.insight.database
import androidx.room.Entity import androidx.room.Entity
import androidx.room.Index import androidx.room.Index

2
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.kt → insight/src/main/java/info/nightscout/androidaps/insight/database/InsightPumpID.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.plugins.pump.insight.database package info.nightscout.androidaps.insight.database
import androidx.room.Entity import androidx.room.Entity
import androidx.room.Index import androidx.room.Index

4
insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt
View file

@ -3,8 +3,8 @@ package info.nightscout.androidaps.insight.di
import android.content.Context import android.content.Context
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabase import info.nightscout.androidaps.insight.database.InsightDatabase
import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabaseDao import info.nightscout.androidaps.insight.database.InsightDatabaseDao
import javax.inject.Singleton import javax.inject.Singleton
@Module @Module

8
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
View file

@ -35,6 +35,10 @@ import info.nightscout.androidaps.interfaces.Profile;
import info.nightscout.androidaps.data.PumpEnactResult; import info.nightscout.androidaps.data.PumpEnactResult;
import info.nightscout.androidaps.events.EventInitializationChanged; import info.nightscout.androidaps.events.EventInitializationChanged;
import info.nightscout.androidaps.events.EventRefreshOverview; import info.nightscout.androidaps.events.EventRefreshOverview;
import info.nightscout.androidaps.insight.database.InsightBolusID;
import info.nightscout.androidaps.insight.database.InsightDatabaseDao;
import info.nightscout.androidaps.insight.database.InsightHistoryOffset;
import info.nightscout.androidaps.insight.database.InsightPumpID;
import info.nightscout.androidaps.insight.R; import info.nightscout.androidaps.insight.R;
import info.nightscout.androidaps.interfaces.CommandQueueProvider; import info.nightscout.androidaps.interfaces.CommandQueueProvider;
import info.nightscout.androidaps.interfaces.Config; import info.nightscout.androidaps.interfaces.Config;
@ -104,10 +108,6 @@ import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetPumpS
import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetTotalDailyDoseMessage; import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetTotalDailyDoseMessage;
import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.ResetPumpStatusRegisterMessage; import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.ResetPumpStatusRegisterMessage;
import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService; import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService;
import info.nightscout.androidaps.plugins.pump.insight.database.InsightBolusID;
import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabaseDao;
import info.nightscout.androidaps.plugins.pump.insight.database.InsightHistoryOffset;
import info.nightscout.androidaps.plugins.pump.insight.database.InsightPumpID;
import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBasalRate; import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBasalRate;
import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBolus; import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBolus;
import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveTBR; import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveTBR;