caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'Nightscout/dev' into wear/new_custom_watchface

Browse source 
# Conflicts:
#	wear/src/main/kotlin/app/aaps/wear/watchfaces/CustomWatchface.kt
This commit is contained in:
Philoul 2023-09-26 20:43:15 +02:00
parent bd182f9728 7c417e3519
commit bade105725
793 changed files with 4169 additions and 4064 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -99,7 +99,7 @@ def allCommitted = { ->
android {
namespace 'info.nightscout.androidaps'
namespace 'app.aaps'
ndkVersion "21.1.6352462"
defaultConfig {

6
app/src/main/AndroidManifest.xml
View file

@ -112,7 +112,7 @@
</receiver>
<!-- Receive ignore 5m, 15m, 30m requests for carb notifications -->
<receiver android:name="info.nightscout.plugins.aps.loop.CarbSuggestionReceiver" />
<receiver android:name="app.aaps.plugins.aps.loop.CarbSuggestionReceiver" />
<!-- Auto start -->
<receiver
@ -134,10 +134,6 @@
android:resource="@xml/filepaths" />
</provider>
<service
android:name="info.nightscout.ui.services.AlarmSoundService"
android:enabled="true"
android:exported="true" />
<uses-library
android:name="org.apache.http.legacy"
android:required="false" />

36
app/src/main/kotlin/app/aaps/MainActivity.kt
View file

@ -31,9 +31,6 @@ import androidx.core.view.MenuProvider
import androidx.viewpager2.widget.ViewPager2
import app.aaps.activities.HistoryBrowseActivity
import app.aaps.activities.PreferencesActivity
import app.aaps.configuration.activities.DaggerAppCompatActivityWithResult
import app.aaps.configuration.activities.SingleFragmentActivity
import app.aaps.configuration.setupwizard.SetupWizardActivity
import app.aaps.core.interfaces.androidPermissions.AndroidPermission
import app.aaps.core.interfaces.aps.Loop
import app.aaps.core.interfaces.configuration.Config
@ -62,19 +59,20 @@ import app.aaps.core.ui.toast.ToastUtils
import app.aaps.core.utils.isRunningRealPumpTest
import app.aaps.database.entities.UserEntry.Action
import app.aaps.database.entities.UserEntry.Sources
import app.aaps.databinding.ActivityMainBinding
import app.aaps.plugins.configuration.activities.DaggerAppCompatActivityWithResult
import app.aaps.plugins.configuration.activities.SingleFragmentActivity
import app.aaps.plugins.configuration.setupwizard.SetupWizardActivity
import app.aaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
import app.aaps.ui.activities.ProfileHelperActivity
import app.aaps.ui.activities.StatsActivity
import app.aaps.ui.activities.TreatmentsActivity
import app.aaps.ui.tabs.TabPageAdapter
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.tabs.TabLayoutMediator
import com.google.firebase.crashlytics.FirebaseCrashlytics
import com.joanzapata.iconify.Iconify
import com.joanzapata.iconify.fonts.FontAwesomeModule
import info.nightscout.androidaps.BuildConfig
import info.nightscout.androidaps.R
import info.nightscout.androidaps.databinding.ActivityMainBinding
import info.nightscout.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
import info.nightscout.ui.activities.ProfileHelperActivity
import info.nightscout.ui.activities.StatsActivity
import info.nightscout.ui.activities.TreatmentsActivity
import info.nightscout.ui.tabs.TabPageAdapter
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import java.io.File
@ -127,7 +125,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
}
// initialize screen wake lock
processPreferenceChange(EventPreferenceChange(rh.gs(info.nightscout.plugins.R.string.key_keep_screen_on)))
processPreferenceChange(EventPreferenceChange(rh.gs(app.aaps.plugins.main.R.string.key_keep_screen_on)))
binding.mainPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
override fun onPageScrollStateChanged(state: Int) {}
override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
@ -209,8 +207,8 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
R.id.nav_about -> {
var message = "Build: ${BuildConfig.BUILDVERSION}\n"
message += "Flavor: ${BuildConfig.FLAVOR}${BuildConfig.BUILD_TYPE}\n"
message += "${rh.gs(app.aaps.configuration.R.string.configbuilder_nightscoutversion_label)} ${activePlugin.activeNsClient?.detectedNsVersion() ?: rh.gs(info.nightscout.plugins.R.string.not_available_full)}"
if (config.isEngineeringMode()) message += "\n${rh.gs(app.aaps.configuration.R.string.engineering_mode_enabled)}"
message += "${rh.gs(app.aaps.plugins.configuration.R.string.configbuilder_nightscoutversion_label)} ${activePlugin.activeNsClient?.detectedNsVersion() ?: rh.gs(app.aaps.plugins.main.R.string.not_available_full)}"
if (config.isEngineeringMode()) message += "\n${rh.gs(app.aaps.plugins.configuration.R.string.engineering_mode_enabled)}"
if (config.isUnfinishedMode()) message += "\nUnfinished mode enabled"
if (!fabricPrivacy.fabricEnabled()) message += "\n${rh.gs(app.aaps.core.ui.R.string.fabric_upload_disabled)}"
message += rh.gs(app.aaps.core.ui.R.string.about_link_urls)
@ -309,7 +307,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
}
private fun startWizard(): Boolean =
!sp.getBoolean(app.aaps.configuration.R.string.key_setupwizard_processed, false)
!sp.getBoolean(app.aaps.plugins.configuration.R.string.key_setupwizard_processed, false)
override fun onPostCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
super.onPostCreate(savedInstanceState, persistentState)
@ -334,13 +332,13 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
}
private fun setWakeLock() {
val keepScreenOn = sp.getBoolean(info.nightscout.plugins.R.string.key_keep_screen_on, false)
val keepScreenOn = sp.getBoolean(app.aaps.plugins.main.R.string.key_keep_screen_on, false)
if (keepScreenOn) window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) else window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
}
private fun processPreferenceChange(ev: EventPreferenceChange) {
if (ev.isChanged(rh.gs(info.nightscout.plugins.R.string.key_keep_screen_on))) setWakeLock()
if (ev.isChanged(rh.gs(info.nightscout.plugins.R.string.key_skin))) recreate()
if (ev.isChanged(rh.gs(app.aaps.plugins.main.R.string.key_keep_screen_on))) setWakeLock()
if (ev.isChanged(rh.gs(app.aaps.plugins.main.R.string.key_skin))) recreate()
}
private fun setupViews() {
@ -374,7 +372,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
checkPluginPreferences(binding.mainPager)
// Tabs
if (sp.getBoolean(info.nightscout.plugins.R.string.key_short_tabtitles, false)) {
if (sp.getBoolean(app.aaps.plugins.main.R.string.key_short_tabtitles, false)) {
binding.tabsNormal.visibility = View.GONE
binding.tabsCompact.visibility = View.VISIBLE
binding.toolbar.layoutParams = LinearLayout.LayoutParams(Toolbar.LayoutParams.MATCH_PARENT, resources.getDimension(app.aaps.core.ui.R.dimen.compact_height).toInt())

58
app/src/main/kotlin/app/aaps/MainApp.kt
View file

@ -31,26 +31,24 @@ import app.aaps.core.ui.locale.LocaleHelper
import app.aaps.database.entities.TherapyEvent
import app.aaps.database.entities.UserEntry
import app.aaps.di.DaggerAppComponent
import app.aaps.implementation.db.CompatDBHelper
import app.aaps.implementation.lifecycle.ProcessLifecycleListener
import app.aaps.implementation.plugin.PluginStore
import app.aaps.implementation.receivers.NetworkChangeReceiver
import app.aaps.plugins.aps.utils.StaticInjector
import app.aaps.plugins.main.general.overview.notifications.NotificationStore
import app.aaps.plugins.main.general.themes.ThemeSwitcherPlugin
import app.aaps.receivers.BTReceiver
import app.aaps.receivers.ChargingStateReceiver
import app.aaps.receivers.KeepAliveWorker
import app.aaps.receivers.TimeDateOrTZChangeReceiver
import app.aaps.ui.activityMonitor.ActivityMonitor
import app.aaps.ui.widget.Widget
import dagger.android.AndroidInjector
import dagger.android.DaggerApplication
import info.nightscout.androidaps.BuildConfig
import info.nightscout.androidaps.R
import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
import info.nightscout.database.impl.transactions.VersionChangeTransaction
import info.nightscout.implementation.db.CompatDBHelper
import info.nightscout.implementation.lifecycle.ProcessLifecycleListener
import info.nightscout.implementation.plugin.PluginStore
import info.nightscout.implementation.receivers.NetworkChangeReceiver
import info.nightscout.plugins.aps.utils.StaticInjector
import info.nightscout.plugins.general.overview.notifications.NotificationStore
import info.nightscout.plugins.general.themes.ThemeSwitcherPlugin
import info.nightscout.ui.activityMonitor.ActivityMonitor
import info.nightscout.ui.widget.Widget
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.exceptions.UndeliverableException
import io.reactivex.rxjava3.kotlin.plusAssign
@ -80,12 +78,12 @@ class MainApp : DaggerApplication() {
@Inject lateinit var compatDBHelper: CompatDBHelper
@Inject lateinit var repository: AppRepository
@Inject lateinit var dateUtil: DateUtil
@Suppress("unused") @Inject lateinit var staticInjector: StaticInjector// TODO avoid , here fake only to initialize
@Suppress("unused") @Inject lateinit var staticInjector: StaticInjector// better avoid, here fake only to initialize
@Inject lateinit var uel: UserEntryLogger
@Inject lateinit var uiInteraction: UiInteraction
@Inject lateinit var notificationStore: NotificationStore
@Inject lateinit var processLifecycleListener: Provider<ProcessLifecycleListener>
@Inject lateinit var profileSwitchPlugin: ThemeSwitcherPlugin
@Inject lateinit var themeSwitcherPlugin: ThemeSwitcherPlugin
@Inject lateinit var localAlertUtils: LocalAlertUtils
@Inject lateinit var rh: Provider<ResourceHelper>
@ -110,7 +108,7 @@ class MainApp : DaggerApplication() {
}
disposable += compatDBHelper.dbChangeDisposable()
registerActivityLifecycleCallbacks(activityMonitor)
runOnUiThread { profileSwitchPlugin.setThemeMode() }
runOnUiThread { themeSwitcherPlugin.setThemeMode() }
aapsLogger.debug("Version: " + BuildConfig.VERSION_NAME)
aapsLogger.debug("BuildVersion: " + BuildConfig.BUILDVERSION)
aapsLogger.debug("Remote: " + BuildConfig.REMOTE)
@ -132,7 +130,7 @@ class MainApp : DaggerApplication() {
// log version
disposable += repository.runTransaction(VersionChangeTransaction(BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, gitRemote, commitHash)).subscribe()
// log app start
if (sp.getBoolean(info.nightscout.plugins.sync.R.string.key_ns_log_app_started_event, config.APS))
if (sp.getBoolean(app.aaps.plugins.sync.R.string.key_ns_log_app_started_event, config.APS))
disposable += repository
.runTransaction(
InsertIfNewByTimestampTherapyEventTransaction(
@ -205,32 +203,32 @@ class MainApp : DaggerApplication() {
// 3.1.0
if (sp.contains("ns_wifionly")) {
if (sp.getBoolean("ns_wifionly", false)) {
sp.putBoolean(info.nightscout.plugins.sync.R.string.key_ns_cellular, false)
sp.putBoolean(info.nightscout.plugins.sync.R.string.key_ns_wifi, true)
sp.putBoolean(app.aaps.plugins.sync.R.string.key_ns_cellular, false)
sp.putBoolean(app.aaps.plugins.sync.R.string.key_ns_wifi, true)
} else {
sp.putBoolean(info.nightscout.plugins.sync.R.string.key_ns_cellular, true)
sp.putBoolean(info.nightscout.plugins.sync.R.string.key_ns_wifi, false)
sp.putBoolean(app.aaps.plugins.sync.R.string.key_ns_cellular, true)
sp.putBoolean(app.aaps.plugins.sync.R.string.key_ns_wifi, false)
}
sp.remove("ns_wifionly")
}
if (sp.contains("ns_charginonly")) {
if (sp.getBoolean("ns_charginonly", false)) {
sp.putBoolean(info.nightscout.plugins.sync.R.string.key_ns_battery, false)
sp.putBoolean(info.nightscout.plugins.sync.R.string.key_ns_charging, true)
sp.putBoolean(app.aaps.plugins.sync.R.string.key_ns_battery, false)
sp.putBoolean(app.aaps.plugins.sync.R.string.key_ns_charging, true)
} else {
sp.putBoolean(info.nightscout.plugins.sync.R.string.key_ns_battery, true)
sp.putBoolean(info.nightscout.plugins.sync.R.string.key_ns_charging, true)
sp.putBoolean(app.aaps.plugins.sync.R.string.key_ns_battery, true)
sp.putBoolean(app.aaps.plugins.sync.R.string.key_ns_charging, true)
}
sp.remove("ns_charginonly")
}
if (!sp.contains(info.nightscout.plugins.sync.R.string.key_ns_log_app_started_event))
sp.putBoolean(info.nightscout.plugins.sync.R.string.key_ns_log_app_started_event, config.APS)
if (sp.getString(app.aaps.configuration.R.string.key_maintenance_logs_email, "") == "logs@androidaps.org")
sp.putString(app.aaps.configuration.R.string.key_maintenance_logs_email, "logs@aaps.app")
if (!sp.contains(app.aaps.plugins.sync.R.string.key_ns_log_app_started_event))
sp.putBoolean(app.aaps.plugins.sync.R.string.key_ns_log_app_started_event, config.APS)
if (sp.getString(app.aaps.plugins.configuration.R.string.key_maintenance_logs_email, "") == "logs@androidaps.org")
sp.putString(app.aaps.plugins.configuration.R.string.key_maintenance_logs_email, "logs@aaps.app")
// fix values for theme switching
sp.putString(info.nightscout.plugins.R.string.value_dark_theme, "dark")
sp.putString(info.nightscout.plugins.R.string.value_light_theme, "light")
sp.putString(info.nightscout.plugins.R.string.value_system_theme, "system")
sp.putString(app.aaps.plugins.main.R.string.value_dark_theme, "dark")
sp.putString(app.aaps.plugins.main.R.string.value_light_theme, "light")
sp.putString(app.aaps.plugins.main.R.string.value_system_theme, "system")
}

14
app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt
View file

@ -8,9 +8,6 @@ import android.view.ViewGroup
import android.widget.LinearLayout
import android.widget.RelativeLayout
import android.widget.TextView
import app.aaps.core.main.events.EventIobCalculationProgress
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.workflow.CalculationWorkflow
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.extensions.toVisibility
import app.aaps.core.interfaces.extensions.toVisibilityKeepSpace
@ -29,12 +26,15 @@ import app.aaps.core.interfaces.rx.events.EventScale
import app.aaps.core.interfaces.rx.events.EventUpdateOverviewGraph
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.events.EventIobCalculationProgress
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.workflow.CalculationWorkflow
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.databinding.ActivityHistorybrowseBinding
import app.aaps.plugins.main.general.overview.graphData.GraphData
import com.google.android.material.datepicker.MaterialDatePicker
import com.jjoe64.graphview.GraphView
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.databinding.ActivityHistorybrowseBinding
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import info.nightscout.plugins.general.overview.graphData.GraphData
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import java.util.Calendar
@ -76,7 +76,7 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() {
binding = ActivityHistorybrowseBinding.inflate(layoutInflater)
setContentView(binding.root)
title = rh.gs(info.nightscout.plugins.R.string.nav_history_browser)
title = rh.gs(app.aaps.plugins.main.R.string.nav_history_browser)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar?.setDisplayShowHomeEnabled(true)

10
app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt
View file

@ -1,8 +1,5 @@
package app.aaps.activities
import app.aaps.core.main.graph.OverviewData
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.workflow.CalculationWorkflow
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.profile.DefaultValueHelper
@ -13,10 +10,13 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.main.graph.OverviewData
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.workflow.CalculationWorkflow
import app.aaps.implementation.overview.OverviewDataImpl
import app.aaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository
import info.nightscout.implementation.overview.OverviewDataImpl
import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
import javax.inject.Inject
import javax.inject.Singleton

78
app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt
View file

@ -15,7 +15,7 @@ import androidx.preference.PreferenceGroup
import androidx.preference.PreferenceManager
import androidx.preference.PreferenceScreen
import androidx.preference.size
import app.aaps.configuration.maintenance.MaintenancePlugin
import app.aaps.R
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.nsclient.NSSettingsStatus
import app.aaps.core.interfaces.plugin.PluginBase
@ -31,47 +31,47 @@ import app.aaps.core.interfaces.rx.events.EventPreferenceChange
import app.aaps.core.interfaces.rx.events.EventRebuildTabs
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.SafeParse
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.implementation.plugin.PluginStore
import app.aaps.plugins.aps.autotune.AutotunePlugin
import app.aaps.plugins.aps.loop.LoopPlugin
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.automation.AutomationPlugin
import app.aaps.plugins.configuration.maintenance.MaintenancePlugin
import app.aaps.plugins.constraints.safety.SafetyPlugin
import app.aaps.plugins.insulin.InsulinOrefFreePeakPlugin
import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin
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 app.aaps.plugins.sync.nsclient.NSClientPlugin
import app.aaps.plugins.sync.nsclientV3.NSClientV3Plugin
import app.aaps.plugins.sync.openhumans.OpenHumansUploaderPlugin
import app.aaps.plugins.sync.tidepool.TidepoolPlugin
import app.aaps.plugins.sync.xdrip.XdripPlugin
import dagger.android.support.AndroidSupportInjection
import info.nightscout.androidaps.R
import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
import info.nightscout.androidaps.danar.DanaRPlugin
import info.nightscout.androidaps.plugins.pump.eopatch.EopatchPumpPlugin
import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
import info.nightscout.automation.AutomationPlugin
import app.aaps.core.ui.dialogs.OKDialog
import info.nightscout.implementation.plugin.PluginStore
import info.nightscout.insulin.InsulinOrefFreePeakPlugin
import info.nightscout.plugins.aps.loop.LoopPlugin
import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import info.nightscout.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import info.nightscout.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
import info.nightscout.plugins.constraints.safety.SafetyPlugin
import info.nightscout.plugins.general.autotune.AutotunePlugin
import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
import info.nightscout.plugins.general.wear.WearPlugin
import info.nightscout.plugins.sync.nsclient.NSClientPlugin
import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
import info.nightscout.plugins.sync.openhumans.OpenHumansUploaderPlugin
import info.nightscout.plugins.sync.tidepool.TidepoolPlugin
import info.nightscout.plugins.sync.xdrip.XdripPlugin
import info.nightscout.pump.combo.ComboPlugin
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.sensitivity.SensitivityAAPSPlugin
import info.nightscout.sensitivity.SensitivityOref1Plugin
import info.nightscout.sensitivity.SensitivityWeightedAveragePlugin
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 {
@ -186,7 +186,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
addPreferencesFromResource(pluginId, rootKey)
} else {
addPreferencesFromResource(R.xml.pref_general, rootKey)
addPreferencesFromResource(info.nightscout.plugins.R.xml.pref_overview, rootKey)
addPreferencesFromResource(app.aaps.plugins.main.R.xml.pref_overview, rootKey)
addPreferencesFromResourceIfEnabled(safetyPlugin, rootKey)
addPreferencesFromResourceIfEnabled(eversensePlugin, rootKey)
addPreferencesFromResourceIfEnabled(dexcomPlugin, rootKey)
@ -226,7 +226,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
addPreferencesFromResourceIfEnabled(wearPlugin, rootKey)
addPreferencesFromResourceIfEnabled(statusLinePlugin, rootKey)
addPreferencesFromResource(R.xml.pref_alerts, rootKey)
addPreferencesFromResource(app.aaps.configuration.R.xml.pref_datachoices, rootKey)
addPreferencesFromResource(app.aaps.plugins.configuration.R.xml.pref_datachoices, rootKey)
addPreferencesFromResourceIfEnabled(maintenancePlugin, rootKey)
addPreferencesFromResourceIfEnabled(openHumansUploaderPlugin, rootKey)
}
@ -243,7 +243,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
//recreate() does not update language so better close settings
activity?.finish()
}
if (key == rh.gs(info.nightscout.plugins.R.string.key_short_tabtitles)) {
if (key == rh.gs(app.aaps.plugins.main.R.string.key_short_tabtitles)) {
rxBus.send(EventRebuildTabs())
}
if (key == rh.gs(info.nightscout.core.utils.R.string.key_units)) {
@ -252,7 +252,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
}
if (key == rh.gs(info.nightscout.core.utils.R.string.key_use_autosens) && sp.getBoolean(info.nightscout.core.utils.R.string.key_use_autosens, false)) {
activity?.let {
OKDialog.show(it, rh.gs(app.aaps.configuration.R.string.configbuilder_sensitivity), rh.gs(R.string.sensitivity_warning))
OKDialog.show(it, rh.gs(app.aaps.plugins.configuration.R.string.configbuilder_sensitivity), rh.gs(R.string.sensitivity_warning))
}
}
checkForBiometricFallback(key)
@ -278,7 +278,11 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
activity?.let {
val title = rh.gs(app.aaps.core.ui.R.string.unsecure_fallback_biometric)
val message =
rh.gs(app.aaps.configuration.R.string.master_password_missing, rh.gs(app.aaps.configuration.R.string.configbuilder_general), rh.gs(app.aaps.configuration.R.string.protection))
rh.gs(
app.aaps.plugins.configuration.R.string.master_password_missing,
rh.gs(app.aaps.plugins.configuration.R.string.configbuilder_general),
rh.gs(app.aaps.plugins.configuration.R.string.protection)
)
OKDialog.show(it, title = title, message = message)
}
}
@ -439,7 +443,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
context?.let { context ->
when (preference.key) {
rh.gs(info.nightscout.core.utils.R.string.key_master_password) -> {
passwordCheck.queryPassword(context, app.aaps.configuration.R.string.current_master_password, info.nightscout.core.utils.R.string.key_master_password, {
passwordCheck.queryPassword(context, app.aaps.plugins.configuration.R.string.current_master_password, info.nightscout.core.utils.R.string.key_master_password, {
passwordCheck.setPassword(context, app.aaps.core.ui.R.string.master_password, info.nightscout.core.utils.R.string.key_master_password)
})
true
@ -475,7 +479,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
true
}
// NSClient copy settings
rh.gs(info.nightscout.plugins.R.string.key_statuslights_copy_ns) -> {
rh.gs(app.aaps.plugins.main.R.string.key_statuslights_copy_ns) -> {
nsSettingStatus.copyStatusLightsNsSettings(context)
true
}

8
app/src/main/kotlin/app/aaps/activities/PreferencesActivity.kt
View file

@ -8,9 +8,9 @@ import androidx.appcompat.widget.SearchView
import androidx.core.view.MenuProvider
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceScreen
import app.aaps.configuration.activities.DaggerAppCompatActivityWithResult
import info.nightscout.androidaps.R
import info.nightscout.androidaps.databinding.ActivityPreferencesBinding
import app.aaps.R
import app.aaps.databinding.ActivityPreferencesBinding
import app.aaps.plugins.configuration.activities.DaggerAppCompatActivityWithResult
class PreferencesActivity : DaggerAppCompatActivityWithResult(), PreferenceFragmentCompat.OnPreferenceStartScreenCallback {
@ -25,7 +25,7 @@ class PreferencesActivity : DaggerAppCompatActivityWithResult(), PreferenceFragm
binding = ActivityPreferencesBinding.inflate(layoutInflater)
setContentView(binding.root)
title = rh.gs(app.aaps.configuration.R.string.nav_preferences)
title = rh.gs(app.aaps.plugins.configuration.R.string.nav_preferences)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar?.setDisplayShowHomeEnabled(true)
myPreferenceFragment = MyPreferenceFragment()

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

@ -1,8 +1,18 @@
package app.aaps.di
import app.aaps.MainApp
import app.aaps.configuration.di.ConfigurationModule
import app.aaps.core.main.di.CoreModule
import app.aaps.core.validators.di.ValidatorsModule
import app.aaps.implementation.di.ImplementationModule
import app.aaps.plugins.aps.di.ApsModule
import app.aaps.plugins.automation.di.AutomationModule
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.plugins.sync.di.OpenHumansModule
import app.aaps.plugins.sync.di.SyncModule
import app.aaps.shared.impl.di.SharedImplModule
import dagger.BindsInstance
import dagger.Component
@ -16,16 +26,7 @@ import info.nightscout.androidaps.plugins.pump.eopatch.dagger.EopatchModule
import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
import info.nightscout.androidaps.plugins.pump.omnipod.dash.di.OmnipodDashModule
import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule
import info.nightscout.automation.di.AutomationModule
import app.aaps.core.validators.di.ValidatorsModule
import info.nightscout.database.impl.DatabaseModule
import info.nightscout.implementation.di.ImplementationModule
import info.nightscout.insulin.di.InsulinModule
import info.nightscout.plugins.aps.di.ApsModule
import info.nightscout.plugins.constraints.di.PluginsConstraintsModule
import info.nightscout.plugins.di.PluginsModule
import info.nightscout.plugins.sync.di.OpenHumansModule
import info.nightscout.plugins.sync.di.SyncModule
import info.nightscout.pump.combo.di.ComboModule
import info.nightscout.pump.combov2.di.ComboV2Module
import info.nightscout.pump.common.di.PumpCommonModule
@ -35,8 +36,7 @@ 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 app.aaps.ui.di.UiModule
import info.nightscout.workflow.di.WorkflowModule
import javax.inject.Singleton

105
app/src/main/kotlin/app/aaps/di/PluginsListModule.kt
View file

@ -1,8 +1,57 @@
package app.aaps.di
import app.aaps.configuration.configBuilder.ConfigBuilderPlugin
import app.aaps.configuration.maintenance.MaintenancePlugin
import app.aaps.core.interfaces.plugin.PluginBase
import app.aaps.plugins.aps.autotune.AutotunePlugin
import app.aaps.plugins.aps.loop.LoopPlugin
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.automation.AutomationPlugin
import app.aaps.plugins.configuration.configBuilder.ConfigBuilderPlugin
import app.aaps.plugins.configuration.maintenance.MaintenancePlugin
import app.aaps.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
import app.aaps.plugins.constraints.dstHelper.DstHelperPlugin
import app.aaps.plugins.constraints.objectives.ObjectivesPlugin
import app.aaps.plugins.constraints.safety.SafetyPlugin
import app.aaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
import app.aaps.plugins.constraints.storage.StorageConstraintPlugin
import app.aaps.plugins.constraints.versionChecker.VersionCheckerPlugin
import app.aaps.plugins.insulin.InsulinLyumjevPlugin
import app.aaps.plugins.insulin.InsulinOrefFreePeakPlugin
import app.aaps.plugins.insulin.InsulinOrefRapidActingPlugin
import app.aaps.plugins.insulin.InsulinOrefUltraRapidActingPlugin
import app.aaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
import app.aaps.plugins.main.general.actions.ActionsPlugin
import app.aaps.plugins.main.general.food.FoodPlugin
import app.aaps.plugins.main.general.overview.OverviewPlugin
import app.aaps.plugins.main.general.persistentNotification.PersistentNotificationPlugin
import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin
import app.aaps.plugins.main.general.themes.ThemeSwitcherPlugin
import app.aaps.plugins.main.general.wear.WearPlugin
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 app.aaps.plugins.sync.dataBroadcaster.DataBroadcastPlugin
import app.aaps.plugins.sync.nsclient.NSClientPlugin
import app.aaps.plugins.sync.nsclientV3.NSClientV3Plugin
import app.aaps.plugins.sync.openhumans.OpenHumansUploaderPlugin
import app.aaps.plugins.sync.tidepool.TidepoolPlugin
import app.aaps.plugins.sync.xdrip.XdripPlugin
import dagger.Binds
import dagger.Module
import dagger.multibindings.IntKey
@ -15,57 +64,11 @@ import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
import info.nightscout.androidaps.plugins.pump.omnipod.dash.OmnipodDashPumpPlugin
import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
import info.nightscout.automation.AutomationPlugin
import info.nightscout.insulin.InsulinLyumjevPlugin
import info.nightscout.insulin.InsulinOrefFreePeakPlugin
import info.nightscout.insulin.InsulinOrefRapidActingPlugin
import info.nightscout.insulin.InsulinOrefUltraRapidActingPlugin
import info.nightscout.plugins.aps.loop.LoopPlugin
import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import info.nightscout.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import info.nightscout.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
import info.nightscout.plugins.constraints.objectives.ObjectivesPlugin
import info.nightscout.plugins.constraints.safety.SafetyPlugin
import info.nightscout.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
import info.nightscout.plugins.general.actions.ActionsPlugin
import info.nightscout.plugins.general.autotune.AutotunePlugin
import info.nightscout.plugins.general.food.FoodPlugin
import info.nightscout.plugins.general.overview.OverviewPlugin
import info.nightscout.plugins.general.persistentNotification.PersistentNotificationPlugin
import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
import info.nightscout.plugins.general.themes.ThemeSwitcherPlugin
import info.nightscout.plugins.general.wear.WearPlugin
import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
import info.nightscout.plugins.profile.ProfilePlugin
import info.nightscout.plugins.sync.dataBroadcaster.DataBroadcastPlugin
import info.nightscout.plugins.sync.nsclient.NSClientPlugin
import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
import info.nightscout.plugins.sync.openhumans.OpenHumansUploaderPlugin
import info.nightscout.plugins.sync.tidepool.TidepoolPlugin
import info.nightscout.plugins.sync.xdrip.XdripPlugin
import info.nightscout.pump.combo.ComboPlugin
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.sensitivity.SensitivityAAPSPlugin
import info.nightscout.sensitivity.SensitivityOref1Plugin
import info.nightscout.sensitivity.SensitivityWeightedAveragePlugin
import info.nightscout.smoothing.AvgSmoothingPlugin
import info.nightscout.smoothing.ExponentialSmoothingPlugin
import info.nightscout.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")
@ -274,7 +277,7 @@ abstract class PluginsListModule {
@NotNSClient
@IntoMap
@IntKey(270)
abstract fun bindVersionCheckerPlugin(plugin: info.nightscout.plugins.constraints.versionChecker.VersionCheckerPlugin): PluginBase
abstract fun bindVersionCheckerPlugin(plugin: VersionCheckerPlugin): PluginBase
@Binds
@NotNSClient
@ -286,7 +289,7 @@ abstract class PluginsListModule {
@APS
@IntoMap
@IntKey(290)
abstract fun bindStorageConstraintPlugin(plugin: info.nightscout.plugins.constraints.storage.StorageConstraintPlugin): PluginBase
abstract fun bindStorageConstraintPlugin(plugin: StorageConstraintPlugin): PluginBase
@Binds
@APS
@ -358,7 +361,7 @@ abstract class PluginsListModule {
@AllConfigs
@IntoMap
@IntKey(380)
abstract fun bindDstHelperPlugin(plugin: info.nightscout.plugins.constraints.dstHelper.DstHelperPlugin): PluginBase
abstract fun bindDstHelperPlugin(plugin: DstHelperPlugin): PluginBase
@Binds
@AllConfigs

4
app/src/main/kotlin/app/aaps/implementations/ConfigImpl.kt
View file

@ -1,10 +1,10 @@
package app.aaps.implementations
import android.os.Build
import app.aaps.BuildConfig
import app.aaps.R
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.maintenance.PrefFileListProvider
import info.nightscout.androidaps.BuildConfig
import info.nightscout.androidaps.R
import java.io.File
import javax.inject.Inject
import javax.inject.Singleton

6
app/src/main/kotlin/app/aaps/implementations/InstantiatorImpl.kt
View file

@ -5,11 +5,11 @@ import app.aaps.core.interfaces.aps.AutosensData
import app.aaps.core.interfaces.objects.Instantiator
import app.aaps.core.interfaces.profile.ProfileStore
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.implementation.profile.ProfileStoreObject
import app.aaps.plugins.aps.APSResultObject
import app.aaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
import dagger.Reusable
import dagger.android.HasAndroidInjector
import info.nightscout.implementation.profile.ProfileStoreObject
import info.nightscout.plugins.aps.APSResultObject
import info.nightscout.plugins.iob.iobCobCalculator.data.AutosensDataObject
import org.json.JSONObject
import javax.inject.Inject

52
app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt
View file

@ -7,40 +7,40 @@ import androidx.annotation.RawRes
import androidx.annotation.StringRes
import androidx.fragment.app.FragmentManager
import app.aaps.MainActivity
import app.aaps.R
import app.aaps.activities.HistoryBrowseActivity
import app.aaps.activities.MyPreferenceFragment
import app.aaps.activities.PreferencesActivity
import app.aaps.configuration.activities.SingleFragmentActivity
import app.aaps.core.main.events.EventNewNotification
import app.aaps.core.interfaces.notifications.Notification
import app.aaps.core.interfaces.nsclient.NSAlarm
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.ui.UiInteraction
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.R
import app.aaps.core.main.events.EventNewNotification
import app.aaps.core.ui.toast.ToastUtils
import info.nightscout.plugins.general.overview.notifications.NotificationWithAction
import info.nightscout.ui.activities.BolusProgressHelperActivity
import info.nightscout.ui.activities.ErrorHelperActivity
import info.nightscout.ui.activities.QuickWizardListActivity
import info.nightscout.ui.activities.TDDStatsActivity
import info.nightscout.ui.dialogs.BolusProgressDialog
import info.nightscout.ui.dialogs.CalibrationDialog
import info.nightscout.ui.dialogs.CarbsDialog
import info.nightscout.ui.dialogs.CareDialog
import info.nightscout.ui.dialogs.ExtendedBolusDialog
import info.nightscout.ui.dialogs.FillDialog
import info.nightscout.ui.dialogs.InsulinDialog
import info.nightscout.ui.dialogs.LoopDialog
import info.nightscout.ui.dialogs.ProfileSwitchDialog
import info.nightscout.ui.dialogs.ProfileViewerDialog
import info.nightscout.ui.dialogs.TempBasalDialog
import info.nightscout.ui.dialogs.TempTargetDialog
import info.nightscout.ui.dialogs.TreatmentDialog
import info.nightscout.ui.dialogs.WizardDialog
import info.nightscout.ui.services.AlarmSoundService
import info.nightscout.ui.services.AlarmSoundServiceHelper
import info.nightscout.ui.widget.Widget
import app.aaps.plugins.configuration.activities.SingleFragmentActivity
import app.aaps.plugins.main.general.overview.notifications.NotificationWithAction
import app.aaps.ui.activities.BolusProgressHelperActivity
import app.aaps.ui.activities.ErrorHelperActivity
import app.aaps.ui.activities.QuickWizardListActivity
import app.aaps.ui.activities.TDDStatsActivity
import app.aaps.ui.dialogs.BolusProgressDialog
import app.aaps.ui.dialogs.CalibrationDialog
import app.aaps.ui.dialogs.CarbsDialog
import app.aaps.ui.dialogs.CareDialog
import app.aaps.ui.dialogs.ExtendedBolusDialog
import app.aaps.ui.dialogs.FillDialog
import app.aaps.ui.dialogs.InsulinDialog
import app.aaps.ui.dialogs.LoopDialog
import app.aaps.ui.dialogs.ProfileSwitchDialog
import app.aaps.ui.dialogs.ProfileViewerDialog
import app.aaps.ui.dialogs.TempBasalDialog
import app.aaps.ui.dialogs.TempTargetDialog
import app.aaps.ui.dialogs.TreatmentDialog
import app.aaps.ui.dialogs.WizardDialog
import app.aaps.ui.services.AlarmSoundService
import app.aaps.ui.services.AlarmSoundServiceHelper
import app.aaps.ui.widget.Widget
import dagger.android.HasAndroidInjector
import javax.inject.Inject
class UiInteractionImpl @Inject constructor(

2
app/src/main/kotlin/app/aaps/receivers/AutoStartReceiver.kt
View file

@ -2,8 +2,8 @@ package app.aaps.receivers
import android.content.Context
import android.content.Intent
import app.aaps.plugins.main.general.persistentNotification.DummyServiceHelper
import dagger.android.DaggerBroadcastReceiver
import info.nightscout.plugins.general.persistentNotification.DummyServiceHelper
import javax.inject.Inject
class AutoStartReceiver : DaggerBroadcastReceiver() {

18
app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt
View file

@ -12,16 +12,16 @@ import app.aaps.core.utils.extensions.copyDouble
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.plugins.general.smsCommunicator.SmsCommunicatorPlugin
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() {

8
app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt
View file

@ -9,9 +9,7 @@ import androidx.work.WorkManager
import androidx.work.WorkQuery
import androidx.work.WorkerParameters
import androidx.work.workDataOf
import app.aaps.configuration.maintenance.MaintenancePlugin
import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.worker.LoggingWorker
import app.aaps.R
import app.aaps.core.interfaces.alerts.LocalAlertUtils
import app.aaps.core.interfaces.aps.Loop
import app.aaps.core.interfaces.configuration.Config
@ -27,8 +25,10 @@ import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.worker.LoggingWorker
import app.aaps.plugins.configuration.maintenance.MaintenancePlugin
import com.google.common.util.concurrent.ListenableFuture
import info.nightscout.androidaps.R
import info.nightscout.database.impl.AppRepository
import kotlinx.coroutines.Dispatchers
import java.util.concurrent.TimeUnit

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

@ -29,8 +29,8 @@ import app.aaps.core.main.workflow.CalculationWorkflow.Companion.MAIN_CALCULATIO
import app.aaps.core.main.workflow.CalculationWorkflow.Companion.PASS
import app.aaps.core.utils.receivers.DataWorkerStorage
import app.aaps.core.utils.worker.then
import app.aaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
import info.nightscout.workflow.DummyWorker
import info.nightscout.workflow.InvokeLoopWorker
import info.nightscout.workflow.LoadBgDataWorker

2
app/src/main/res/xml/pref_general.xml
View file

@ -97,7 +97,7 @@
</PreferenceCategory>
<info.nightscout.plugins.skins.SkinListPreference
<app.aaps.plugins.main.skins.SkinListPreference
android:key="@string/key_skin"
android:title="@string/skin" />

2
app/src/test/kotlin/app/aaps/configuration/maintenance/MaintenancePluginTest.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.maintenance
package app.aaps.plugins.configuration.maintenance
import android.content.Context
import app.aaps.core.interfaces.configuration.Config

2
core/ui/src/main/kotlin/app/aaps/core/ui/elements/DigitsKeyListenerWithComma.kt
View file

@ -36,7 +36,7 @@ internal class DigitsKeyListenerWithComma @JvmOverloads constructor(private val
override fun filter(
source: CharSequence, start: Int, end: Int,
dest: Spanned, dstart: Int, dend: Int
): CharSequence {
): CharSequence? {
var sourceSequence = source
var startIndex = start
var endIndex = end

2
core/utils/src/main/kotlin/app/aaps/core/utils/EspressoTestHelper.kt
View file

@ -13,7 +13,7 @@ fun isRunningTest(): Boolean {
@Synchronized
fun isRunningRealPumpTest(): Boolean {
return try {
Class.forName("info.nightscout.androidaps.RealPumpTest")
Class.forName("app.aaps.RealPumpTest")
true
} catch (e: ClassNotFoundException) {
false

2
implementation/build.gradle
View file

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

2
implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/alerts/LocalAlertUtilsImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation
package app.aaps.implementation.alerts
import app.aaps.core.interfaces.alerts.LocalAlertUtils
import app.aaps.core.interfaces.configuration.Config

2
implementation/src/main/java/info/nightscout/implementation/androidNotification/NotificationHolderImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/androidNotification/NotificationHolderImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.androidNotification
package app.aaps.implementation.androidNotification
import android.app.Notification
import android.app.NotificationChannel

2
implementation/src/main/java/info/nightscout/implementation/db/CompatDBHelper.kt → implementation/src/main/kotlin/app/aaps/implementation/db/CompatDBHelper.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.db
package app.aaps.implementation.db
import android.content.Context
import app.aaps.core.interfaces.logging.AAPSLogger

2
implementation/src/main/java/info/nightscout/implementation/db/PersistenceLayerImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/db/PersistenceLayerImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.db
package app.aaps.implementation.db
import app.aaps.core.interfaces.db.PersistenceLayer
import app.aaps.core.interfaces.logging.AAPSLogger

44
implementation/src/main/java/info/nightscout/implementation/di/CommandQueueModule.kt → implementation/src/main/kotlin/app/aaps/implementation/di/CommandQueueModule.kt
View file

@ -1,28 +1,28 @@
package info.nightscout.implementation.di
package app.aaps.implementation.di
import app.aaps.implementation.queue.CommandQueueImplementation
import app.aaps.implementation.queue.commands.CommandBolus
import app.aaps.implementation.queue.commands.CommandCancelExtendedBolus
import app.aaps.implementation.queue.commands.CommandCancelTempBasal
import app.aaps.implementation.queue.commands.CommandClearAlarms
import app.aaps.implementation.queue.commands.CommandCustomCommand
import app.aaps.implementation.queue.commands.CommandDeactivate
import app.aaps.implementation.queue.commands.CommandExtendedBolus
import app.aaps.implementation.queue.commands.CommandInsightSetTBROverNotification
import app.aaps.implementation.queue.commands.CommandLoadEvents
import app.aaps.implementation.queue.commands.CommandLoadHistory
import app.aaps.implementation.queue.commands.CommandLoadTDDs
import app.aaps.implementation.queue.commands.CommandReadStatus
import app.aaps.implementation.queue.commands.CommandSMBBolus
import app.aaps.implementation.queue.commands.CommandSetProfile
import app.aaps.implementation.queue.commands.CommandSetUserSettings
import app.aaps.implementation.queue.commands.CommandStartPump
import app.aaps.implementation.queue.commands.CommandStopPump
import app.aaps.implementation.queue.commands.CommandTempBasalAbsolute
import app.aaps.implementation.queue.commands.CommandTempBasalPercent
import app.aaps.implementation.queue.commands.CommandUpdateTime
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.implementation.queue.CommandQueueImplementation
import info.nightscout.implementation.queue.commands.CommandReadStatus
import info.nightscout.implementation.queue.commands.CommandSMBBolus
import info.nightscout.implementation.queue.commands.CommandSetProfile
import info.nightscout.implementation.queue.commands.CommandSetUserSettings
import info.nightscout.implementation.queue.commands.CommandStartPump
import info.nightscout.implementation.queue.commands.CommandStopPump
import info.nightscout.implementation.queue.commands.CommandTempBasalAbsolute
import info.nightscout.implementation.queue.commands.CommandTempBasalPercent
import info.nightscout.implementation.queue.commands.CommandBolus
import info.nightscout.implementation.queue.commands.CommandCancelExtendedBolus
import info.nightscout.implementation.queue.commands.CommandCancelTempBasal
import info.nightscout.implementation.queue.commands.CommandClearAlarms
import info.nightscout.implementation.queue.commands.CommandCustomCommand
import info.nightscout.implementation.queue.commands.CommandDeactivate
import info.nightscout.implementation.queue.commands.CommandExtendedBolus
import info.nightscout.implementation.queue.commands.CommandInsightSetTBROverNotification
import info.nightscout.implementation.queue.commands.CommandLoadEvents
import info.nightscout.implementation.queue.commands.CommandLoadHistory
import info.nightscout.implementation.queue.commands.CommandLoadTDDs
import info.nightscout.implementation.queue.commands.CommandUpdateTime
@Module
@Suppress("unused")

72
implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt → implementation/src/main/kotlin/app/aaps/implementation/di/ImplementationModule.kt
View file

@ -1,6 +1,5 @@
package info.nightscout.implementation.di
package app.aaps.implementation.di
import app.aaps.core.main.graph.OverviewData
import app.aaps.core.interfaces.alerts.LocalAlertUtils
import app.aaps.core.interfaces.db.PersistenceLayer
import app.aaps.core.interfaces.iob.GlucoseStatusProvider
@ -32,43 +31,44 @@ import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.HardLimits
import app.aaps.core.interfaces.utils.Translator
import app.aaps.core.interfaces.utils.TrendCalculator
import app.aaps.core.main.graph.OverviewData
import app.aaps.implementation.alerts.LocalAlertUtilsImpl
import app.aaps.implementation.androidNotification.NotificationHolderImpl
import app.aaps.implementation.db.PersistenceLayerImpl
import app.aaps.implementation.iob.GlucoseStatusProviderImpl
import app.aaps.implementation.logging.LoggerUtilsImpl
import app.aaps.implementation.logging.UserEntryLoggerImpl
import app.aaps.implementation.overview.OverviewDataImpl
import app.aaps.implementation.plugin.PluginStore
import app.aaps.implementation.profile.DefaultValueHelperImpl
import app.aaps.implementation.profile.ProfileFunctionImpl
import app.aaps.implementation.profile.ProfileStoreObject
import app.aaps.implementation.profile.ProfileUtilImpl
import app.aaps.implementation.profiling.ProfilerImpl
import app.aaps.implementation.protection.PasswordCheckImpl
import app.aaps.implementation.protection.ProtectionCheckImpl
import app.aaps.implementation.pump.BlePreCheckImpl
import app.aaps.implementation.pump.DetailedBolusInfoStorageImpl
import app.aaps.implementation.pump.PumpSyncImplementation
import app.aaps.implementation.pump.TemporaryBasalStorageImpl
import app.aaps.implementation.pump.WarnColorsImpl
import app.aaps.implementation.queue.CommandQueueImplementation
import app.aaps.implementation.receivers.NetworkChangeReceiver
import app.aaps.implementation.receivers.ReceiverStatusStoreImpl
import app.aaps.implementation.resources.IconsProviderImplementation
import app.aaps.implementation.resources.ResourceHelperImpl
import app.aaps.implementation.stats.DexcomTirCalculatorImpl
import app.aaps.implementation.stats.TddCalculatorImpl
import app.aaps.implementation.stats.TirCalculatorImpl
import app.aaps.implementation.storage.FileStorage
import app.aaps.implementation.userEntry.UserEntryPresentationHelperImpl
import app.aaps.implementation.utils.DecimalFormatterImpl
import app.aaps.implementation.utils.HardLimitsImpl
import app.aaps.implementation.utils.TranslatorImpl
import app.aaps.implementation.utils.TrendCalculatorImpl
import dagger.Binds
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.implementation.DefaultValueHelperImpl
import info.nightscout.implementation.HardLimitsImpl
import info.nightscout.implementation.LocalAlertUtilsImpl
import info.nightscout.implementation.TranslatorImpl
import info.nightscout.implementation.TrendCalculatorImpl
import info.nightscout.implementation.UserEntryLoggerImpl
import info.nightscout.implementation.androidNotification.NotificationHolderImpl
import info.nightscout.implementation.db.PersistenceLayerImpl
import info.nightscout.implementation.iob.GlucoseStatusProviderImpl
import info.nightscout.implementation.logging.LoggerUtilsImpl
import info.nightscout.implementation.overview.OverviewDataImpl
import info.nightscout.implementation.plugin.PluginStore
import info.nightscout.implementation.profile.ProfileFunctionImpl
import info.nightscout.implementation.profile.ProfileStoreObject
import info.nightscout.implementation.profile.ProfileUtilImpl
import info.nightscout.implementation.profiling.ProfilerImpl
import info.nightscout.implementation.protection.PasswordCheckImpl
import info.nightscout.implementation.protection.ProtectionCheckImpl
import info.nightscout.implementation.pump.BlePreCheckImpl
import info.nightscout.implementation.pump.DetailedBolusInfoStorageImpl
import info.nightscout.implementation.pump.PumpSyncImplementation
import info.nightscout.implementation.pump.TemporaryBasalStorageImpl
import info.nightscout.implementation.pump.WarnColorsImpl
import info.nightscout.implementation.queue.CommandQueueImplementation
import info.nightscout.implementation.receivers.NetworkChangeReceiver
import info.nightscout.implementation.receivers.ReceiverStatusStoreImpl
import info.nightscout.implementation.resources.IconsProviderImplementation
import info.nightscout.implementation.resources.ResourceHelperImpl
import info.nightscout.implementation.stats.DexcomTirCalculatorImpl
import info.nightscout.implementation.stats.TddCalculatorImpl
import info.nightscout.implementation.stats.TirCalculatorImpl
import info.nightscout.implementation.storage.FileStorage
import info.nightscout.implementation.userEntry.UserEntryPresentationHelperImpl
import info.nightscout.implementation.utils.DecimalFormatterImpl
@Module(
includes = [

6
implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/iob/GlucoseStatusProviderImpl.kt
View file

@ -1,8 +1,6 @@
package info.nightscout.implementation.iob
package app.aaps.implementation.iob
import app.aaps.annotations.OpenForTesting
import app.aaps.core.main.iob.asRounded
import app.aaps.core.main.iob.log
import app.aaps.core.interfaces.iob.GlucoseStatus
import app.aaps.core.interfaces.iob.GlucoseStatusProvider
import app.aaps.core.interfaces.iob.IobCobCalculator
@ -10,6 +8,8 @@ import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.main.iob.asRounded
import app.aaps.core.main.iob.log
import dagger.Reusable
import javax.inject.Inject
import kotlin.math.roundToLong

2
implementation/src/main/java/info/nightscout/implementation/lifecycle/ProcessLifecycleListener.kt → implementation/src/main/kotlin/app/aaps/implementation/lifecycle/ProcessLifecycleListener.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.lifecycle
package app.aaps.implementation.lifecycle
import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.LifecycleOwner

2
implementation/src/main/java/info/nightscout/implementation/logging/LoggerUtilsImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/logging/LoggerUtilsImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.logging
package app.aaps.implementation.logging
import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.logging.LoggerUtils

2
implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/logging/UserEntryLoggerImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation
package app.aaps.implementation.logging
import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.logging.AAPSLogger

2
implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/overview/OverviewDataImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.overview
package app.aaps.implementation.overview
import android.content.Context
import androidx.annotation.AttrRes

2
implementation/src/main/java/info/nightscout/implementation/plugin/PluginStore.kt → implementation/src/main/kotlin/app/aaps/implementation/plugin/PluginStore.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.plugin
package app.aaps.implementation.plugin
import app.aaps.core.interfaces.aps.APS
import app.aaps.core.interfaces.aps.Sensitivity

2
implementation/src/main/java/info/nightscout/implementation/DefaultValueHelperImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/profile/DefaultValueHelperImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation
package app.aaps.implementation.profile
import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.configuration.Constants

2
implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileFunctionImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.profile
package app.aaps.implementation.profile
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.db.GlucoseUnit

2
implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt → implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileStoreObject.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.profile
package app.aaps.implementation.profile
import androidx.collection.ArrayMap
import app.aaps.core.interfaces.configuration.Config

2
implementation/src/main/java/info/nightscout/implementation/profile/ProfileUtilImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileUtilImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.profile
package app.aaps.implementation.profile
import app.aaps.core.interfaces.db.GlucoseUnit
import app.aaps.core.interfaces.profile.ProfileUtil

2
implementation/src/main/java/info/nightscout/implementation/profiling/ProfilerImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/profiling/ProfilerImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.profiling
package app.aaps.implementation.profiling
import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.logging.AAPSLogger

2
implementation/src/main/java/info/nightscout/implementation/protection/BiometricCheck.kt → implementation/src/main/kotlin/app/aaps/implementation/protection/BiometricCheck.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.protection
package app.aaps.implementation.protection
import androidx.biometric.BiometricPrompt
import androidx.biometric.BiometricPrompt.AuthenticationResult

8
implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/protection/PasswordCheckImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.protection
package app.aaps.implementation.protection
import android.annotation.SuppressLint
import android.content.Context
@ -11,13 +11,13 @@ import android.view.inputmethod.InputMethodManager
import android.widget.EditText
import android.widget.TextView
import androidx.annotation.StringRes
import app.aaps.core.main.R
import app.aaps.core.main.utils.CryptoUtil
import app.aaps.core.interfaces.protection.PasswordCheck
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.main.R
import app.aaps.core.main.utils.CryptoUtil
import app.aaps.core.ui.toast.ToastUtils
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import dagger.Reusable
import app.aaps.core.ui.toast.ToastUtils
import javax.inject.Inject
@Reusable

2
implementation/src/main/java/info/nightscout/implementation/protection/ProtectionCheckImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/protection/ProtectionCheckImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.protection
package app.aaps.implementation.protection
import androidx.fragment.app.FragmentActivity
import app.aaps.core.interfaces.protection.PasswordCheck

2
implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/pump/BlePreCheckImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.pump
package app.aaps.implementation.pump
import android.Manifest
import android.bluetooth.BluetoothManager

4
implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/pump/DetailedBolusInfoStorageImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.pump
package app.aaps.implementation.pump
import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.logging.AAPSLogger
@ -8,9 +8,9 @@ import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.T
import app.aaps.implementation.R
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import info.nightscout.implementation.R
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.math.abs

2
implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt → implementation/src/main/kotlin/app/aaps/implementation/pump/PumpSyncImplementation.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.pump
package app.aaps.implementation.pump
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag

2
implementation/src/main/java/info/nightscout/implementation/pump/TemporaryBasalStorageImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/pump/TemporaryBasalStorageImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.pump
package app.aaps.implementation.pump
import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.logging.AAPSLogger

2
implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/pump/WarnColorsImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.pump
package app.aaps.implementation.pump
import android.widget.TextView
import app.aaps.core.interfaces.pump.WarnColors

44
implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/CommandQueueImplementation.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue
package app.aaps.implementation.queue
import android.content.Context
import android.content.Intent
@ -48,29 +48,29 @@ import app.aaps.database.ValueWrapper
import app.aaps.database.entities.EffectiveProfileSwitch
import app.aaps.database.entities.ProfileSwitch
import app.aaps.database.entities.interfaces.end
import app.aaps.implementation.R
import app.aaps.implementation.queue.commands.CommandBolus
import app.aaps.implementation.queue.commands.CommandCancelExtendedBolus
import app.aaps.implementation.queue.commands.CommandCancelTempBasal
import app.aaps.implementation.queue.commands.CommandClearAlarms
import app.aaps.implementation.queue.commands.CommandCustomCommand
import app.aaps.implementation.queue.commands.CommandDeactivate
import app.aaps.implementation.queue.commands.CommandExtendedBolus
import app.aaps.implementation.queue.commands.CommandInsightSetTBROverNotification
import app.aaps.implementation.queue.commands.CommandLoadEvents
import app.aaps.implementation.queue.commands.CommandLoadHistory
import app.aaps.implementation.queue.commands.CommandLoadTDDs
import app.aaps.implementation.queue.commands.CommandReadStatus
import app.aaps.implementation.queue.commands.CommandSMBBolus
import app.aaps.implementation.queue.commands.CommandSetProfile
import app.aaps.implementation.queue.commands.CommandSetUserSettings
import app.aaps.implementation.queue.commands.CommandStartPump
import app.aaps.implementation.queue.commands.CommandStopPump
import app.aaps.implementation.queue.commands.CommandTempBasalAbsolute
import app.aaps.implementation.queue.commands.CommandTempBasalPercent
import app.aaps.implementation.queue.commands.CommandUpdateTime
import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository
import info.nightscout.implementation.R
import info.nightscout.implementation.queue.commands.CommandBolus
import info.nightscout.implementation.queue.commands.CommandCancelExtendedBolus
import info.nightscout.implementation.queue.commands.CommandCancelTempBasal
import info.nightscout.implementation.queue.commands.CommandClearAlarms
import info.nightscout.implementation.queue.commands.CommandCustomCommand
import info.nightscout.implementation.queue.commands.CommandDeactivate
import info.nightscout.implementation.queue.commands.CommandExtendedBolus
import info.nightscout.implementation.queue.commands.CommandInsightSetTBROverNotification
import info.nightscout.implementation.queue.commands.CommandLoadEvents
import info.nightscout.implementation.queue.commands.CommandLoadHistory
import info.nightscout.implementation.queue.commands.CommandLoadTDDs
import info.nightscout.implementation.queue.commands.CommandReadStatus
import info.nightscout.implementation.queue.commands.CommandSMBBolus
import info.nightscout.implementation.queue.commands.CommandSetProfile
import info.nightscout.implementation.queue.commands.CommandSetUserSettings
import info.nightscout.implementation.queue.commands.CommandStartPump
import info.nightscout.implementation.queue.commands.CommandStopPump
import info.nightscout.implementation.queue.commands.CommandTempBasalAbsolute
import info.nightscout.implementation.queue.commands.CommandTempBasalPercent
import info.nightscout.implementation.queue.commands.CommandUpdateTime
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import java.util.LinkedList

2
implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/QueueThread.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue
package app.aaps.implementation.queue
import android.bluetooth.BluetoothManager
import android.content.Context

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandBolus.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelExtendedBolus.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCancelExtendedBolus.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelTempBasal.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCancelTempBasal.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandClearAlarms.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandClearAlarms.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCustomCommand.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCustomCommand.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandDeactivate.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandDeactivate.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandExtendedBolus.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandExtendedBolus.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandInsightSetTBROverNotification.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandInsightSetTBROverNotification.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadEvents.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadEvents.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadHistory.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadHistory.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadTDDs.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadTDDs.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandReadStatus.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandReadStatus.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.alerts.LocalAlertUtils
import app.aaps.core.interfaces.logging.LTag

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSMBBolus.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSMBBolus.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSetProfile.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.logging.LTag

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetUserSettings.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSetUserSettings.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStartPump.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandStartPump.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStopPump.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandStopPump.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalAbsolute.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandTempBasalAbsolute.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalPercent.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandTempBasalPercent.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandUpdateTime.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandUpdateTime.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue.commands
package app.aaps.implementation.queue.commands
import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/receivers/NetworkChangeReceiver.kt → implementation/src/main/kotlin/app/aaps/implementation/receivers/NetworkChangeReceiver.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.receivers
package app.aaps.implementation.receivers
import android.content.Context
import android.content.Intent

2
implementation/src/main/java/info/nightscout/implementation/receivers/ReceiverStatusStoreImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/receivers/ReceiverStatusStoreImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.receivers
package app.aaps.implementation.receivers
import android.content.Context
import android.content.Intent

4
implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt → implementation/src/main/kotlin/app/aaps/implementation/resources/IconsProviderImplementation.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.implementation.resources
package app.aaps.implementation.resources
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.ui.IconsProvider
import info.nightscout.implementation.R
import app.aaps.implementation.R
import javax.inject.Inject
import javax.inject.Singleton

4
implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/resources/ResourceHelperImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.resources
package app.aaps.implementation.resources
import android.annotation.SuppressLint
import android.content.Context
@ -18,8 +18,8 @@ import androidx.annotation.StringRes
import androidx.appcompat.app.AppCompatDelegate
import androidx.appcompat.view.ContextThemeWrapper
import androidx.core.content.ContextCompat
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.ui.getThemeColor
import app.aaps.core.ui.locale.LocaleHelper
import java.util.Locale

2
implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirCalculatorImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/stats/DexcomTirCalculatorImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.stats
package app.aaps.implementation.stats
import android.annotation.SuppressLint
import android.content.Context

4
implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/stats/DexcomTirImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.stats
package app.aaps.implementation.stats
import android.annotation.SuppressLint
import android.content.Context
@ -9,7 +9,7 @@ import android.widget.TextView
import app.aaps.core.interfaces.configuration.Constants
import app.aaps.core.interfaces.profile.ProfileUtil
import app.aaps.core.interfaces.stats.DexcomTIR
import info.nightscout.implementation.R
import app.aaps.implementation.R
import java.util.Calendar
import kotlin.math.pow
import kotlin.math.roundToInt

2
implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/stats/TddCalculatorImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.stats
package app.aaps.implementation.stats
import android.content.Context
import android.graphics.Typeface

2
implementation/src/main/java/info/nightscout/implementation/stats/TirCalculatorImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/stats/TirCalculatorImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.stats
package app.aaps.implementation.stats
import android.annotation.SuppressLint
import android.content.Context

4
implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/stats/TirImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.stats
package app.aaps.implementation.stats
import android.annotation.SuppressLint
import android.content.Context
@ -8,7 +8,7 @@ import android.widget.TextView
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.stats.TIR
import app.aaps.core.interfaces.utils.DateUtil
import info.nightscout.implementation.R
import app.aaps.implementation.R
class TirImpl(override val date: Long, override val lowThreshold: Double, override val highThreshold: Double) : TIR {

4
implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt → implementation/src/main/kotlin/app/aaps/implementation/stats/TotalDailyDoseExtension.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.stats
package app.aaps.implementation.stats
import android.annotation.SuppressLint
import android.content.Context
@ -8,7 +8,7 @@ import android.widget.TextView
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.database.entities.TotalDailyDose
import info.nightscout.implementation.R
import app.aaps.implementation.R
val TotalDailyDose.total
get() = if (totalAmount > 0) totalAmount else basalAmount + bolusAmount

2
implementation/src/main/java/info/nightscout/implementation/storage/FileStorage.kt → implementation/src/main/kotlin/app/aaps/implementation/storage/FileStorage.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.storage
package app.aaps.implementation.storage
import app.aaps.core.interfaces.storage.Storage
import java.io.File

2
implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/userEntry/UserEntryPresentationHelperImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.userEntry
package app.aaps.implementation.userEntry
import android.text.Spanned
import app.aaps.core.interfaces.configuration.Constants

2
implementation/src/main/java/info/nightscout/implementation/utils/DecimalFormatterImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/utils/DecimalFormatterImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.utils
package app.aaps.implementation.utils
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.utils.DecimalFormatter

2
implementation/src/main/java/info/nightscout/implementation/HardLimitsImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/utils/HardLimitsImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation
package app.aaps.implementation.utils
import android.content.Context
import app.aaps.annotations.OpenForTesting

2
implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/utils/TranslatorImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation
package app.aaps.implementation.utils
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.utils.Translator

2
implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/utils/TrendCalculatorImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation
package app.aaps.implementation.utils
import app.aaps.core.interfaces.aps.AutosensDataStore
import app.aaps.core.interfaces.iob.InMemoryGlucoseValue

2
implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt → implementation/src/test/kotlin/app/aaps/implementation/iob/GlucoseStatusTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.iob
package app.aaps.implementation.iob
import app.aaps.core.interfaces.aps.AutosensDataStore
import app.aaps.core.interfaces.iob.GlucoseStatus

2
implementation/src/test/java/info/nightscout/implementation/overview/OverviewDataImplTest.kt → implementation/src/test/kotlin/app/aaps/implementation/overview/OverviewDataImplTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.overview
package app.aaps.implementation.overview
import app.aaps.core.interfaces.aps.AutosensDataStore
import app.aaps.core.interfaces.db.GlucoseUnit

4
implementation/src/test/java/info/nightscout/implementation/profile/ProfileStoreTest.kt → implementation/src/test/kotlin/app/aaps/implementation/profile/ProfileStoreTest.kt
View file

@ -1,10 +1,10 @@
package info.nightscout.implementation.profile
package app.aaps.implementation.profile
import app.aaps.core.interfaces.profile.PureProfile
import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat
import kotlin.test.assertIs
import org.junit.jupiter.api.Test
import kotlin.test.assertIs
internal class ProfileStoreTest : TestBaseWithProfile() {

4
implementation/src/test/java/info/nightscout/implementation/profile/ProfileUtilImplTest.kt → implementation/src/test/kotlin/app/aaps/implementation/profile/ProfileUtilImplTest.kt
View file

@ -1,12 +1,12 @@
package info.nightscout.implementation.profile
package app.aaps.implementation.profile
import app.aaps.core.interfaces.db.GlucoseUnit
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.database.entities.GlucoseValue
import app.aaps.implementation.utils.DecimalFormatterImpl
import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat
import info.nightscout.implementation.utils.DecimalFormatterImpl
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.mockito.Mock

4
implementation/src/test/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageTest.kt → implementation/src/test/kotlin/app/aaps/implementation/pump/DetailedBolusInfoStorageTest.kt
View file

@ -1,11 +1,11 @@
package info.nightscout.implementation.pump
package app.aaps.implementation.pump
import app.aaps.core.interfaces.pump.DetailedBolusInfo
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.implementation.R
import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat
import info.nightscout.implementation.R
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.mockito.Mock

2
implementation/src/test/java/info/nightscout/implementation/pump/TemporaryBasalStorageTest.kt → implementation/src/test/kotlin/app/aaps/implementation/pump/TemporaryBasalStorageTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.pump
package app.aaps.implementation.pump
import app.aaps.core.interfaces.pump.PumpSync
import app.aaps.shared.tests.TestBase

12
implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt → implementation/src/test/kotlin/app/aaps/implementation/queue/CommandQueueImplementationTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue
package app.aaps.implementation.queue
import android.content.Context
import android.os.Handler
@ -27,17 +27,17 @@ import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.database.ValueWrapper
import app.aaps.database.entities.Bolus
import app.aaps.implementation.queue.commands.CommandBolus
import app.aaps.implementation.queue.commands.CommandCustomCommand
import app.aaps.implementation.queue.commands.CommandExtendedBolus
import app.aaps.implementation.queue.commands.CommandLoadHistory
import app.aaps.implementation.queue.commands.CommandTempBasalPercent
import app.aaps.shared.tests.TestBaseWithProfile
import app.aaps.shared.tests.TestPumpPlugin
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository
import info.nightscout.implementation.queue.commands.CommandBolus
import info.nightscout.implementation.queue.commands.CommandCustomCommand
import info.nightscout.implementation.queue.commands.CommandExtendedBolus
import info.nightscout.implementation.queue.commands.CommandLoadHistory
import info.nightscout.implementation.queue.commands.CommandTempBasalPercent
import io.reactivex.rxjava3.core.Single
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test

6
implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt → implementation/src/test/kotlin/app/aaps/implementation/queue/QueueThreadTest.kt
View file

@ -1,8 +1,7 @@
package info.nightscout.implementation.queue
package app.aaps.implementation.queue
import android.content.Context
import android.os.PowerManager
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.interfaces.androidPermissions.AndroidPermission
import app.aaps.core.interfaces.constraints.ConstraintsChecker
import app.aaps.core.interfaces.db.PersistenceLayer
@ -10,13 +9,14 @@ import app.aaps.core.interfaces.pump.PumpSync
import app.aaps.core.interfaces.pump.defs.PumpDescription
import app.aaps.core.interfaces.queue.Command
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.implementation.queue.commands.CommandTempBasalAbsolute
import app.aaps.shared.tests.TestBaseWithProfile
import app.aaps.shared.tests.TestPumpPlugin
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository
import info.nightscout.implementation.queue.commands.CommandTempBasalAbsolute
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.mockito.ArgumentMatchers

2
implementation/src/test/java/info/nightscout/implementation/utils/DecimalFormatterTest.kt → implementation/src/test/kotlin/app/aaps/implementation/utils/DecimalFormatterTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.utils
package app.aaps.implementation.utils
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.utils.DecimalFormatter

6
implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt → implementation/src/test/kotlin/app/aaps/implementation/wizard/BolusWizardTest.kt
View file

@ -1,6 +1,5 @@
package info.nightscout.implementation.wizard
package app.aaps.implementation.wizard
import app.aaps.core.main.wizard.BolusWizard
import app.aaps.core.interfaces.aps.AutosensDataStore
import app.aaps.core.interfaces.aps.Loop
import app.aaps.core.interfaces.constraints.Constraint
@ -9,11 +8,12 @@ import app.aaps.core.interfaces.iob.IobTotal
import app.aaps.core.interfaces.profile.Profile
import app.aaps.core.interfaces.pump.defs.PumpDescription
import app.aaps.core.interfaces.queue.CommandQueue
import app.aaps.core.main.wizard.BolusWizard
import app.aaps.implementation.iob.GlucoseStatusProviderImpl
import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.implementation.iob.GlucoseStatusProviderImpl
import org.junit.jupiter.api.Test
import org.mockito.Mock
import org.mockito.Mockito

6
implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt → implementation/src/test/kotlin/app/aaps/interfaces/pump/PumpEnactResultTest.kt
View file

@ -1,12 +1,12 @@
package info.nightscout.interfaces.pump
package app.aaps.interfaces.pump
import app.aaps.core.main.pump.toHtml
import app.aaps.core.interfaces.pump.PumpEnactResult
import app.aaps.core.main.pump.toHtml
import app.aaps.plugins.aps.loop.extensions.json
import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.aps.loop.extensions.json
import info.nightscout.pump.virtual.extensions.toText
import org.json.JSONObject
import org.junit.jupiter.api.BeforeEach

3
plugins/aps/build.gradle
View file

@ -10,8 +10,9 @@ apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
android {
namespace 'info.nightscout.plugins.aps'
namespace 'app.aaps.plugins.aps'
}
dependencies {

16
plugins/aps/src/main/java/info/nightscout/plugins/aps/di/AlgModule.kt
View file

@ -1,16 +0,0 @@
package info.nightscout.plugins.aps.di
import dagger.Module
import dagger.android.ContributesAndroidInjector
@Module
@Suppress("unused")
abstract class AlgModule {
@ContributesAndroidInjector abstract fun loggerCallbackInjector(): info.nightscout.plugins.aps.logger.LoggerCallback
@ContributesAndroidInjector abstract fun determineBasalResultSMBInjector(): info.nightscout.plugins.aps.openAPSSMB.DetermineBasalResultSMB
@ContributesAndroidInjector abstract fun determineBasalResultAMAInjector(): info.nightscout.plugins.aps.openAPSAMA.DetermineBasalResultAMA
@ContributesAndroidInjector abstract fun determineBasalAdapterAMAJSInjector(): info.nightscout.plugins.aps.openAPSAMA.DetermineBasalAdapterAMAJS
@ContributesAndroidInjector abstract fun determineBasalAdapterSMBJSInjector(): info.nightscout.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS
@ContributesAndroidInjector abstract fun determineBasalAdapterSMBAutoISFJSInjector(): info.nightscout.plugins.aps.openAPSSMBDynamicISF.DetermineBasalAdapterSMBDynamicISFJS
}

2
plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/APSResultObject.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps
package app.aaps.plugins.aps
import android.text.Spanned
import app.aaps.core.interfaces.aps.APSResult

12
plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/OpenAPSFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps
package app.aaps.plugins.aps
import android.os.Bundle
import android.os.Handler
@ -13,7 +13,6 @@ import android.view.ViewGroup
import androidx.core.view.MenuCompat
import androidx.core.view.MenuProvider
import androidx.lifecycle.Lifecycle
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.aps.AutosensResult
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
@ -22,11 +21,12 @@ import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.plugins.aps.databinding.OpenapsFragmentBinding
import app.aaps.plugins.aps.events.EventOpenAPSUpdateGui
import app.aaps.plugins.aps.events.EventResetOpenAPSGui
import app.aaps.plugins.aps.utils.JSONFormatter
import dagger.android.support.DaggerFragment
import info.nightscout.plugins.aps.databinding.OpenapsFragmentBinding
import info.nightscout.plugins.aps.events.EventOpenAPSUpdateGui
import info.nightscout.plugins.aps.events.EventResetOpenAPSGui
import info.nightscout.plugins.aps.utils.JSONFormatter
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import org.json.JSONArray

Some files were not shown because too many files have changed in this diff Show more