:profile:main cleanup

app/src/main/kotlin/app/aaps/MainActivity.kt

@@ -62,6 +62,7 @@ import app.aaps.database.entities.UserEntry.Sources
 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 com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.tabs.TabLayoutMediator
 import com.google.firebase.crashlytics.FirebaseCrashlytics
@@ -70,7 +71,6 @@ import com.joanzapata.iconify.fonts.FontAwesomeModule
 import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.ActivityMainBinding
-import app.aaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
 import info.nightscout.ui.activities.ProfileHelperActivity
 import info.nightscout.ui.activities.StatsActivity
 import info.nightscout.ui.activities.TreatmentsActivity
@@ -127,7 +127,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,7 +209,7 @@ 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.plugins.configuration.R.string.configbuilder_nightscoutversion_label)} ${activePlugin.activeNsClient?.detectedNsVersion() ?: rh.gs(info.nightscout.plugins.R.string.not_available_full)}"
+                        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)}"
@@ -334,13 +334,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(app.aaps.plugins.main.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_skin))) recreate()
     }
 
     private fun setupViews() {
@@ -374,7 +374,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())

app/src/main/kotlin/app/aaps/MainApp.kt

@@ -36,6 +36,8 @@ 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
@@ -47,8 +49,6 @@ 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.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
@@ -80,12 +80,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 +110,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)
@@ -228,9 +228,9 @@ class MainApp : DaggerApplication() {
         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(app.aaps.plugins.main.R.string.value_dark_theme, "dark")
-        sp.putString(info.nightscout.plugins.R.string.value_light_theme, "light")
+        sp.putString(app.aaps.plugins.main.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_system_theme, "system")
 
     }
 

app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt

@@ -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.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)
 

app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt

@@ -14,9 +14,9 @@ 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.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import javax.inject.Inject
 import javax.inject.Singleton
 

app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt

@@ -41,6 +41,8 @@ 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 dagger.android.support.AndroidSupportInjection
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
@@ -49,8 +51,6 @@ 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.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
@@ -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)
@@ -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)) {
@@ -475,7 +475,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
                 }

app/src/main/kotlin/app/aaps/di/AppComponent.kt

@@ -9,6 +9,7 @@ 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.shared.impl.di.SharedImplModule
 import dagger.BindsInstance
 import dagger.Component
@@ -23,7 +24,6 @@ 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.database.impl.DatabaseModule
-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

app/src/main/kotlin/app/aaps/di/PluginsListModule.kt

@@ -20,6 +20,15 @@ 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 dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntKey
@@ -32,15 +41,6 @@ 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.plugins.general.actions.ActionsPlugin
-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

app/src/main/kotlin/app/aaps/implementations/InstantiatorImpl.kt

@@ -7,9 +7,9 @@ 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.plugins.iob.iobCobCalculator.data.AutosensDataObject
 import org.json.JSONObject
 import javax.inject.Inject
 

app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt

@@ -17,9 +17,9 @@ import app.aaps.core.interfaces.ui.UiInteraction
 import app.aaps.core.main.events.EventNewNotification
 import app.aaps.core.ui.toast.ToastUtils
 import app.aaps.plugins.configuration.activities.SingleFragmentActivity
+import app.aaps.plugins.main.general.overview.notifications.NotificationWithAction
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-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

app/src/main/kotlin/app/aaps/receivers/AutoStartReceiver.kt

@@ -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() {

app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt

@@ -12,8 +12,8 @@ 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 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

app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt

@@ -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

app/src/main/res/xml/pref_general.xml

@@ -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" />
 

plugins/automation/src/test/kotlin/app/aaps/plugins/automation/triggers/TriggerAutosensValueTest.kt

@@ -2,8 +2,8 @@ package app.aaps.plugins.automation.triggers
 
 import app.aaps.plugins.automation.R
 import app.aaps.plugins.automation.elements.Comparator
+import app.aaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
 import com.google.common.truth.Truth.assertThat
-import info.nightscout.plugins.iob.iobCobCalculator.data.AutosensDataObject
 import org.json.JSONObject
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test

plugins/main/build.gradle

@@ -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.plugins'
+    namespace 'app.aaps.plugins.main'
 }
 
 dependencies {

plugins/main/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
             android:exported="false"
             android:theme="@style/AppTheme">
             <intent-filter>
-                <action android:name="info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity" />
+                <action android:name=".general.smsCommunicator.activities.SmsCommunicatorOtpActivity" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -28,10 +28,10 @@
             android:exported="false"
             android:theme="@style/AppTheme" />
 
-        <service android:name="info.nightscout.plugins.general.persistentNotification.DummyService" />
+        <service android:name=".general.persistentNotification.DummyService" />
 
         <service
-            android:name="info.nightscout.plugins.general.overview.notifications.DismissNotificationService"
+            android:name=".general.overview.notifications.DismissNotificationService"
             android:exported="false" />
 
         <service

plugins/main/src/main/kotlin/app/aaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.iob.iobCobCalculator
+package app.aaps.plugins.iob.iobCobCalculator
 
 import androidx.collection.LongSparseArray
 import app.aaps.annotations.OpenForTesting
@@ -49,10 +49,10 @@ import app.aaps.database.entities.Bolus
 import app.aaps.database.entities.ExtendedBolus
 import app.aaps.database.entities.TemporaryBasal
 import app.aaps.database.entities.interfaces.end
+import app.aaps.plugins.iob.iobCobCalculator.data.AutosensDataStoreObject
+import app.aaps.plugins.main.R
 import dagger.android.HasAndroidInjector
 import info.nightscout.database.impl.AppRepository
-import info.nightscout.plugins.R
-import info.nightscout.plugins.iob.iobCobCalculator.data.AutosensDataStoreObject
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import org.json.JSONArray

plugins/main/src/main/kotlin/app/aaps/plugins/iob/iobCobCalculator/data/AutosensDataObject.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.iob.iobCobCalculator.data
+package app.aaps.plugins.iob.iobCobCalculator.data
 
 import app.aaps.core.interfaces.aps.AutosensData
 import app.aaps.core.interfaces.aps.AutosensResult

plugins/main/src/main/kotlin/app/aaps/plugins/iob/iobCobCalculator/data/AutosensDataStoreObject.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.iob.iobCobCalculator.data
+package app.aaps.plugins.iob.iobCobCalculator.data
 
 import androidx.collection.LongSparseArray
 import androidx.collection.size

plugins/main/src/main/kotlin/app/aaps/plugins/main/di/ActionsModule.kt

@@ -1,8 +1,8 @@
-package info.nightscout.plugins.di
+package app.aaps.plugins.main.di
 
+import app.aaps.plugins.main.general.actions.ActionsFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.plugins.general.actions.ActionsFragment
 
 @Module
 @Suppress("unused")

plugins/main/src/main/kotlin/app/aaps/plugins/main/di/FoodModule.kt

@@ -1,8 +1,8 @@
-package info.nightscout.plugins.di
+package app.aaps.plugins.main.di
 
+import app.aaps.plugins.main.general.food.FoodFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.plugins.general.food.FoodFragment
 
 @Module
 @Suppress("unused")

plugins/main/src/main/kotlin/app/aaps/plugins/main/di/OverviewModule.kt

@@ -1,14 +1,14 @@
-package info.nightscout.plugins.di
+package app.aaps.plugins.main.di
 
 import app.aaps.core.interfaces.overview.OverviewMenus
+import app.aaps.plugins.main.general.overview.OverviewFragment
+import app.aaps.plugins.main.general.overview.OverviewMenusImpl
+import app.aaps.plugins.main.general.overview.graphData.GraphData
+import app.aaps.plugins.main.general.overview.notifications.DismissNotificationService
+import app.aaps.plugins.main.general.overview.notifications.NotificationWithAction
 import dagger.Binds
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.plugins.general.overview.OverviewFragment
-import info.nightscout.plugins.general.overview.OverviewMenusImpl
-import info.nightscout.plugins.general.overview.graphData.GraphData
-import info.nightscout.plugins.general.overview.notifications.DismissNotificationService
-import info.nightscout.plugins.general.overview.notifications.NotificationWithAction
 
 @Module(
     includes = [

plugins/main/src/main/kotlin/app/aaps/plugins/main/di/PluginsModule.kt

@@ -1,15 +1,15 @@
-package info.nightscout.plugins.di
+package app.aaps.plugins.main.di
 
 import app.aaps.core.interfaces.iob.IobCobCalculator
 import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
+import app.aaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import app.aaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
+import app.aaps.plugins.main.general.persistentNotification.DummyService
+import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin
+import app.aaps.plugins.main.general.wear.WearFragment
 import dagger.Binds
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.plugins.general.persistentNotification.DummyService
-import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
-import info.nightscout.plugins.general.wear.WearFragment
-import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
-import info.nightscout.plugins.iob.iobCobCalculator.data.AutosensDataObject
 
 @Module(
     includes = [

plugins/main/src/main/kotlin/app/aaps/plugins/main/di/ProfileModule.kt

@@ -1,11 +1,11 @@
-package info.nightscout.plugins.di
+package app.aaps.plugins.main.di
 
 import app.aaps.core.interfaces.profile.ProfileSource
+import app.aaps.plugins.main.profile.ProfileFragment
+import app.aaps.plugins.main.profile.ProfilePlugin
 import dagger.Binds
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.plugins.profile.ProfileFragment
-import info.nightscout.plugins.profile.ProfilePlugin
 
 @Module
 @Suppress("unused")

plugins/main/src/main/kotlin/app/aaps/plugins/main/di/SMSCommunicatorModule.kt

@@ -1,11 +1,11 @@
-package info.nightscout.plugins.di
+package app.aaps.plugins.main.di
 
+import app.aaps.plugins.main.general.smsCommunicator.AuthRequest
+import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorFragment
+import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin
+import app.aaps.plugins.main.general.smsCommunicator.activities.SmsCommunicatorOtpActivity
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.plugins.general.smsCommunicator.AuthRequest
-import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorFragment
-import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
-import info.nightscout.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity
 
 @Module
 @Suppress("unused")

plugins/main/src/main/kotlin/app/aaps/plugins/main/di/SkinsModule.kt

@@ -1,14 +1,14 @@
-package info.nightscout.plugins.di
+package app.aaps.plugins.main.di
 
+import app.aaps.plugins.main.skins.SkinButtonsOn
+import app.aaps.plugins.main.skins.SkinClassic
+import app.aaps.plugins.main.skins.SkinInterface
+import app.aaps.plugins.main.skins.SkinLargeDisplay
+import app.aaps.plugins.main.skins.SkinLowRes
 import dagger.Module
 import dagger.Provides
 import dagger.multibindings.IntKey
 import dagger.multibindings.IntoMap
-import info.nightscout.plugins.skins.SkinButtonsOn
-import info.nightscout.plugins.skins.SkinClassic
-import info.nightscout.plugins.skins.SkinInterface
-import info.nightscout.plugins.skins.SkinLargeDisplay
-import info.nightscout.plugins.skins.SkinLowRes
 import javax.inject.Qualifier
 
 @Module

plugins/main/src/main/kotlin/app/aaps/plugins/main/di/SkinsUiModule.kt

@@ -1,8 +1,8 @@
-package info.nightscout.plugins.di
+package app.aaps.plugins.main.di
 
+import app.aaps.plugins.main.skins.SkinListPreference
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.plugins.skins.SkinListPreference
 
 @Module
 @Suppress("unused")

plugins/main/src/main/kotlin/app/aaps/plugins/main/di/WearModule.kt

@@ -1,9 +1,9 @@
-package info.nightscout.plugins.di
+package app.aaps.plugins.main.di
 
+import app.aaps.plugins.main.general.wear.activities.CwfInfosActivity
+import app.aaps.plugins.main.general.wear.wearintegration.DataLayerListenerServiceMobile
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.plugins.general.wear.activities.CwfInfosActivity
-import info.nightscout.plugins.general.wear.wearintegration.DataLayerListenerServiceMobile
 
 @Module
 @Suppress("unused")

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/actions/ActionsFragment.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.actions
+package app.aaps.plugins.main.general.actions
 
 import android.content.Intent
 import android.os.Bundle
@@ -40,12 +40,12 @@ import app.aaps.core.ui.elements.SingleClickButton
 import app.aaps.database.ValueWrapper
 import app.aaps.database.entities.UserEntry.Action
 import app.aaps.database.entities.UserEntry.Sources
+import app.aaps.plugins.main.R
+import app.aaps.plugins.main.databinding.ActionsFragmentBinding
+import app.aaps.plugins.main.general.overview.ui.StatusLightHandler
+import app.aaps.plugins.main.skins.SkinProvider
 import dagger.android.support.DaggerFragment
 import info.nightscout.database.impl.AppRepository
-import info.nightscout.plugins.R
-import info.nightscout.plugins.databinding.ActionsFragmentBinding
-import info.nightscout.plugins.general.overview.ui.StatusLightHandler
-import info.nightscout.plugins.skins.SkinProvider
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/actions/ActionsPlugin.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.actions
+package app.aaps.plugins.main.general.actions
 
 import app.aaps.core.interfaces.actions.Actions
 import app.aaps.core.interfaces.configuration.Config
@@ -7,8 +7,8 @@ import app.aaps.core.interfaces.plugin.PluginBase
 import app.aaps.core.interfaces.plugin.PluginDescription
 import app.aaps.core.interfaces.plugin.PluginType
 import app.aaps.core.interfaces.resources.ResourceHelper
+import app.aaps.plugins.main.R
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
 import javax.inject.Inject
 import javax.inject.Singleton
 

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/food/FoodFragment.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.food
+package app.aaps.plugins.main.general.food
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -27,12 +27,12 @@ import app.aaps.core.ui.dialogs.OKDialog
 import app.aaps.database.entities.Food
 import app.aaps.database.entities.UserEntry.Action
 import app.aaps.database.entities.UserEntry.Sources
+import app.aaps.plugins.main.R
+import app.aaps.plugins.main.databinding.FoodFragmentBinding
+import app.aaps.plugins.main.databinding.FoodItemBinding
 import dagger.android.support.DaggerFragment
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.InvalidateFoodTransaction
-import info.nightscout.plugins.R
-import info.nightscout.plugins.databinding.FoodFragmentBinding
-import info.nightscout.plugins.databinding.FoodItemBinding
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.Locale

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/food/FoodPlugin.kt

@@ -1,12 +1,12 @@
-package info.nightscout.plugins.general.food
+package app.aaps.plugins.main.general.food
 
 import app.aaps.core.interfaces.logging.AAPSLogger
 import app.aaps.core.interfaces.plugin.PluginBase
 import app.aaps.core.interfaces.plugin.PluginDescription
 import app.aaps.core.interfaces.plugin.PluginType
 import app.aaps.core.interfaces.resources.ResourceHelper
+import app.aaps.plugins.main.R
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
 import javax.inject.Inject
 import javax.inject.Singleton
 

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.overview
+package app.aaps.plugins.main.general.overview
 
 import android.annotation.SuppressLint
 import android.app.NotificationManager
@@ -91,17 +91,17 @@ import app.aaps.core.utils.JsonHelper
 import app.aaps.database.entities.UserEntry.Action
 import app.aaps.database.entities.UserEntry.Sources
 import app.aaps.database.entities.interfaces.end
+import app.aaps.plugins.main.R
+import app.aaps.plugins.main.databinding.OverviewFragmentBinding
+import app.aaps.plugins.main.general.overview.graphData.GraphData
+import app.aaps.plugins.main.general.overview.notifications.NotificationStore
+import app.aaps.plugins.main.general.overview.notifications.events.EventUpdateOverviewNotification
+import app.aaps.plugins.main.general.overview.ui.StatusLightHandler
+import app.aaps.plugins.main.skins.SkinProvider
 import com.jjoe64.graphview.GraphView
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
 import info.nightscout.database.impl.AppRepository
-import info.nightscout.plugins.R
-import info.nightscout.plugins.databinding.OverviewFragmentBinding
-import info.nightscout.plugins.general.overview.graphData.GraphData
-import info.nightscout.plugins.general.overview.notifications.NotificationStore
-import info.nightscout.plugins.general.overview.notifications.events.EventUpdateOverviewNotification
-import info.nightscout.plugins.general.overview.ui.StatusLightHandler
-import info.nightscout.plugins.skins.SkinProvider
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.Locale

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.overview
+package app.aaps.plugins.main.general.overview
 
 import android.content.Context
 import android.text.SpannableString
@@ -10,7 +10,6 @@ import android.widget.ImageButton
 import androidx.annotation.AttrRes
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.PopupMenu
-import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.core.interfaces.aps.Loop
 import app.aaps.core.interfaces.configuration.Config
 import app.aaps.core.interfaces.logging.AAPSLogger
@@ -20,8 +19,9 @@ import app.aaps.core.interfaces.rx.bus.RxBus
 import app.aaps.core.interfaces.rx.events.EventRefreshOverview
 import app.aaps.core.interfaces.rx.events.EventScale
 import app.aaps.core.interfaces.sharedPreferences.SP
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.plugins.main.R
 import com.google.gson.Gson
-import info.nightscout.plugins.R
 import javax.inject.Inject
 import javax.inject.Singleton
 

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewPlugin.kt

@@ -1,20 +1,9 @@
-package info.nightscout.plugins.general.overview
+package app.aaps.plugins.main.general.overview
 
 import android.content.Context
 import androidx.annotation.StringRes
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
-import app.aaps.core.main.events.EventIobCalculationProgress
-import app.aaps.core.main.events.EventNewNotification
-import app.aaps.core.main.graph.OverviewData
-import app.aaps.core.main.utils.extensions.putDouble
-import app.aaps.core.main.utils.extensions.putInt
-import app.aaps.core.main.utils.extensions.putString
-import app.aaps.core.main.utils.extensions.storeBoolean
-import app.aaps.core.main.utils.extensions.storeDouble
-import app.aaps.core.main.utils.extensions.storeInt
-import app.aaps.core.main.utils.extensions.storeString
-import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.core.interfaces.configuration.Config
 import app.aaps.core.interfaces.constraints.ConstraintsChecker
 import app.aaps.core.interfaces.logging.AAPSLogger
@@ -31,14 +20,25 @@ import app.aaps.core.interfaces.rx.events.EventNewHistoryData
 import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged
 import app.aaps.core.interfaces.rx.events.EventUpdateOverviewCalcProgress
 import app.aaps.core.interfaces.sharedPreferences.SP
-import app.aaps.shared.impl.rx.bus.RxBusImpl
+import app.aaps.core.main.events.EventIobCalculationProgress
-import dagger.android.HasAndroidInjector
+import app.aaps.core.main.events.EventNewNotification
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.utils.extensions.putDouble
+import app.aaps.core.main.utils.extensions.putInt
+import app.aaps.core.main.utils.extensions.putString
+import app.aaps.core.main.utils.extensions.storeBoolean
+import app.aaps.core.main.utils.extensions.storeDouble
+import app.aaps.core.main.utils.extensions.storeInt
+import app.aaps.core.main.utils.extensions.storeString
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.core.ui.dialogs.OKDialog
 import app.aaps.core.validators.ValidatingEditTextPreference
-import info.nightscout.plugins.R
+import app.aaps.plugins.main.R
-import info.nightscout.plugins.general.overview.notifications.NotificationStore
+import app.aaps.plugins.main.general.overview.notifications.NotificationStore
-import info.nightscout.plugins.general.overview.notifications.NotificationWithAction
+import app.aaps.plugins.main.general.overview.notifications.NotificationWithAction
-import info.nightscout.plugins.general.overview.notifications.events.EventUpdateOverviewNotification
+import app.aaps.plugins.main.general.overview.notifications.events.EventUpdateOverviewNotification
+import app.aaps.shared.impl.rx.bus.RxBusImpl
+import dagger.android.HasAndroidInjector
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import org.json.JSONObject

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/graphData/GraphData.kt

@@ -1,25 +1,25 @@
-package info.nightscout.plugins.general.overview.graphData
+package app.aaps.plugins.main.general.overview.graphData
 
 import android.content.Context
 import android.graphics.DashPathEffect
 import android.graphics.Paint
-import app.aaps.core.main.graph.OverviewData
-import app.aaps.core.main.graph.data.BolusDataPoint
-import app.aaps.core.main.graph.data.EffectiveProfileSwitchDataPoint
-import app.aaps.core.main.graph.data.GlucoseValueDataPoint
-import app.aaps.core.main.graph.data.TimeAsXAxisLabelFormatter
 import app.aaps.core.interfaces.db.GlucoseUnit
 import app.aaps.core.interfaces.logging.AAPSLogger
 import app.aaps.core.interfaces.profile.DefaultValueHelper
 import app.aaps.core.interfaces.profile.ProfileFunction
 import app.aaps.core.interfaces.resources.ResourceHelper
 import app.aaps.core.interfaces.utils.Round
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.graph.data.BolusDataPoint
+import app.aaps.core.main.graph.data.EffectiveProfileSwitchDataPoint
+import app.aaps.core.main.graph.data.GlucoseValueDataPoint
+import app.aaps.core.main.graph.data.TimeAsXAxisLabelFormatter
+import app.aaps.core.ui.toast.ToastUtils
 import com.jjoe64.graphview.GraphView
 import com.jjoe64.graphview.series.DataPoint
 import com.jjoe64.graphview.series.LineGraphSeries
 import com.jjoe64.graphview.series.Series
 import dagger.android.HasAndroidInjector
-import app.aaps.core.ui.toast.ToastUtils
 import javax.inject.Inject
 import kotlin.math.abs
 import kotlin.math.max

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/notifications/DismissNotificationService.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.overview.notifications
+package app.aaps.plugins.main.general.overview.notifications
 
 import android.content.Intent
 import app.aaps.core.interfaces.rx.bus.RxBus

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/notifications/NotificationStore.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.overview.notifications
+package app.aaps.plugins.main.general.overview.notifications
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -22,9 +22,9 @@ import app.aaps.core.interfaces.sharedPreferences.SP
 import app.aaps.core.interfaces.ui.IconsProvider
 import app.aaps.core.interfaces.ui.UiInteraction
 import app.aaps.core.interfaces.utils.DateUtil
-import info.nightscout.plugins.R
+import app.aaps.plugins.main.R
-import info.nightscout.plugins.databinding.OverviewNotificationItemBinding
+import app.aaps.plugins.main.databinding.OverviewNotificationItemBinding
-import info.nightscout.plugins.general.overview.notifications.events.EventUpdateOverviewNotification
+import app.aaps.plugins.main.general.overview.notifications.events.EventUpdateOverviewNotification
 import java.util.Collections
 import javax.inject.Inject
 import javax.inject.Singleton

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/notifications/NotificationWithAction.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.overview.notifications
+package app.aaps.plugins.main.general.overview.notifications
 
 import app.aaps.core.interfaces.logging.AAPSLogger
 import app.aaps.core.interfaces.logging.LTag
@@ -8,8 +8,8 @@ import app.aaps.core.interfaces.plugin.ActivePlugin
 import app.aaps.core.interfaces.resources.ResourceHelper
 import app.aaps.core.interfaces.sharedPreferences.SP
 import app.aaps.core.interfaces.utils.T
+import app.aaps.plugins.main.R
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
 import javax.inject.Inject
 
 @Suppress("SpellCheckingInspection")

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/notifications/events/EventUpdateOverviewNotification.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.overview.notifications.events
+package app.aaps.plugins.main.general.overview.notifications.events
 
 import app.aaps.core.interfaces.rx.events.Event
 

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/ui/StatusLightHandler.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.overview.ui
+package app.aaps.plugins.main.general.overview.ui
 
 import android.annotation.SuppressLint
 import android.os.Handler
@@ -17,8 +17,8 @@ import app.aaps.core.interfaces.utils.DateUtil
 import app.aaps.core.interfaces.utils.DecimalFormatter
 import app.aaps.database.ValueWrapper
 import app.aaps.database.entities.TherapyEvent
+import app.aaps.plugins.main.R
 import info.nightscout.database.impl.AppRepository
-import info.nightscout.plugins.R
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/persistentNotification/DummyService.kt

@@ -1,17 +1,17 @@
-package info.nightscout.plugins.general.persistentNotification
+package app.aaps.plugins.main.general.persistentNotification
 
 import android.app.Notification
 import android.app.Service
 import android.content.Intent
 import android.os.Binder
 import android.os.IBinder
-import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.core.interfaces.logging.AAPSLogger
 import app.aaps.core.interfaces.logging.LTag
 import app.aaps.core.interfaces.notifications.NotificationHolder
 import app.aaps.core.interfaces.rx.AapsSchedulers
 import app.aaps.core.interfaces.rx.bus.RxBus
 import app.aaps.core.interfaces.rx.events.EventAppExit
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import dagger.android.DaggerService
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/persistentNotification/DummyServiceHelper.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.persistentNotification
+package app.aaps.plugins.main.general.persistentNotification
 
 import android.content.ComponentName
 import android.content.Context

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/persistentNotification/PersistentNotificationPlugin.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.persistentNotification
+package app.aaps.plugins.main.general.persistentNotification
 
 import android.app.NotificationManager
 import android.app.PendingIntent
@@ -6,10 +6,6 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.app.NotificationCompat
 import androidx.core.app.RemoteInput
-import app.aaps.core.main.extensions.toStringShort
-import app.aaps.core.main.iob.generateCOBString
-import app.aaps.core.main.iob.round
-import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.core.interfaces.configuration.Config
 import app.aaps.core.interfaces.iob.GlucoseStatusProvider
 import app.aaps.core.interfaces.iob.IobCobCalculator
@@ -30,8 +26,12 @@ import app.aaps.core.interfaces.rx.events.EventPreferenceChange
 import app.aaps.core.interfaces.rx.events.EventRefreshOverview
 import app.aaps.core.interfaces.ui.IconsProvider
 import app.aaps.core.interfaces.utils.DecimalFormatter
+import app.aaps.core.main.extensions.toStringShort
+import app.aaps.core.main.iob.generateCOBString
+import app.aaps.core.main.iob.round
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.plugins.main.R
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/AuthRequest.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.smsCommunicator
+package app.aaps.plugins.main.general.smsCommunicator
 
 import android.os.SystemClock
 import app.aaps.core.interfaces.configuration.Constants
@@ -10,10 +10,10 @@ import app.aaps.core.interfaces.smsCommunicator.Sms
 import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
 import app.aaps.core.interfaces.utils.DateUtil
 import app.aaps.core.interfaces.utils.T
+import app.aaps.plugins.main.R
+import app.aaps.plugins.main.general.smsCommunicator.otp.OneTimePassword
+import app.aaps.plugins.main.general.smsCommunicator.otp.OneTimePasswordValidationResult
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
-import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePassword
-import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePasswordValidationResult
 import javax.inject.Inject
 
 class AuthRequest(

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsAction.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.smsCommunicator
+package app.aaps.plugins.main.general.smsCommunicator
 
 abstract class SmsAction(val pumpCommand: Boolean) : Runnable {
 

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsCommunicatorFragment.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.smsCommunicator
+package app.aaps.plugins.main.general.smsCommunicator
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -11,9 +11,9 @@ import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
 import app.aaps.core.interfaces.utils.DateUtil
 import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.core.utils.HtmlHelper
+import app.aaps.plugins.main.databinding.SmscommunicatorFragmentBinding
+import app.aaps.plugins.main.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui
 import dagger.android.support.DaggerFragment
-import info.nightscout.plugins.databinding.SmscommunicatorFragmentBinding
-import info.nightscout.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.Collections

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsCommunicatorPlugin.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.smsCommunicator
+package app.aaps.plugins.main.general.smsCommunicator
 
 import android.content.Context
 import android.telephony.SmsManager
@@ -59,15 +59,15 @@ import app.aaps.database.entities.TemporaryTarget
 import app.aaps.database.entities.UserEntry.Action
 import app.aaps.database.entities.UserEntry.Sources
 import app.aaps.database.entities.ValueWithUnit
+import app.aaps.plugins.main.R
+import app.aaps.plugins.main.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui
+import app.aaps.plugins.main.general.smsCommunicator.otp.OneTimePassword
 import dagger.android.HasAndroidInjector
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction
 import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
 import info.nightscout.database.impl.transactions.InsertAndCancelCurrentOfflineEventTransaction
 import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
-import info.nightscout.plugins.R
-import info.nightscout.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui
-import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePassword
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import kotlinx.coroutines.Dispatchers

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.smsCommunicator.activities
+package app.aaps.plugins.main.general.smsCommunicator.activities
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -19,12 +19,12 @@ import app.aaps.core.ui.dialogs.OKDialog
 import app.aaps.core.ui.toast.ToastUtils
 import app.aaps.database.entities.UserEntry.Action
 import app.aaps.database.entities.UserEntry.Sources
+import app.aaps.plugins.main.R
+import app.aaps.plugins.main.databinding.SmscommunicatorActivityOtpBinding
+import app.aaps.plugins.main.general.smsCommunicator.otp.OneTimePassword
+import app.aaps.plugins.main.general.smsCommunicator.otp.OneTimePasswordValidationResult
 import com.google.common.primitives.Ints.min
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
-import info.nightscout.plugins.R
-import info.nightscout.plugins.databinding.SmscommunicatorActivityOtpBinding
-import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePassword
-import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePasswordValidationResult
 import net.glxn.qrgen.android.QRCode
 import javax.inject.Inject
 

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/events/EventSmsCommunicatorUpdateGui.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.smsCommunicator.events
+package app.aaps.plugins.main.general.smsCommunicator.events
 
 import app.aaps.core.interfaces.rx.events.EventUpdateGui
 

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/otp/OneTimePassword.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.smsCommunicator.otp
+package app.aaps.plugins.main.general.smsCommunicator.otp
 
 import android.util.Base64
 import app.aaps.annotations.OpenForTesting
@@ -6,9 +6,9 @@ import app.aaps.core.interfaces.configuration.Constants
 import app.aaps.core.interfaces.resources.ResourceHelper
 import app.aaps.core.interfaces.sharedPreferences.SP
 import app.aaps.core.interfaces.utils.DateUtil
+import app.aaps.plugins.main.R
 import com.eatthepath.otp.HmacOneTimePasswordGenerator
 import com.google.common.io.BaseEncoding
-import info.nightscout.plugins.R
 import java.net.URLEncoder
 import javax.crypto.KeyGenerator
 import javax.crypto.SecretKey

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/otp/OneTimePasswordValidationResult.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.smsCommunicator.otp
+package app.aaps.plugins.main.general.smsCommunicator.otp
 
 enum class OneTimePasswordValidationResult {
     OK,

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/themes/ThemeSwitcherPlugin.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.themes
+package app.aaps.plugins.main.general.themes
 
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
@@ -13,8 +13,8 @@ import app.aaps.core.interfaces.rx.bus.RxBus
 import app.aaps.core.interfaces.rx.events.EventPreferenceChange
 import app.aaps.core.interfaces.rx.events.EventThemeSwitch
 import app.aaps.core.interfaces.sharedPreferences.SP
+import app.aaps.plugins.main.R
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject
 import javax.inject.Singleton

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/WearFragment.kt

@@ -1,11 +1,10 @@
-package info.nightscout.plugins.general.wear
+package app.aaps.plugins.main.general.wear
 
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.core.interfaces.extensions.toVisibility
 import app.aaps.core.interfaces.logging.AAPSLogger
 import app.aaps.core.interfaces.maintenance.ImportExportPrefs
@@ -20,11 +19,12 @@ import app.aaps.core.interfaces.rx.weardata.EventData
 import app.aaps.core.interfaces.rx.weardata.ResFileMap
 import app.aaps.core.interfaces.sharedPreferences.SP
 import app.aaps.core.interfaces.utils.DateUtil
-import dagger.android.support.DaggerFragment
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.core.ui.toast.ToastUtils
-import info.nightscout.plugins.R
+import app.aaps.plugins.main.R
-import info.nightscout.plugins.databinding.WearFragmentBinding
+import app.aaps.plugins.main.databinding.WearFragmentBinding
-import info.nightscout.plugins.general.wear.activities.CwfInfosActivity
+import app.aaps.plugins.main.general.wear.activities.CwfInfosActivity
+import dagger.android.support.DaggerFragment
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/WearPlugin.kt

@@ -1,7 +1,6 @@
-package info.nightscout.plugins.general.wear
+package app.aaps.plugins.main.general.wear
 
 import android.content.Context
-import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.core.interfaces.logging.AAPSLogger
 import app.aaps.core.interfaces.plugin.PluginBase
 import app.aaps.core.interfaces.plugin.PluginDescription
@@ -21,10 +20,11 @@ import app.aaps.core.interfaces.rx.weardata.CwfData
 import app.aaps.core.interfaces.rx.weardata.CwfMetadataKey
 import app.aaps.core.interfaces.rx.weardata.EventData
 import app.aaps.core.interfaces.sharedPreferences.SP
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.plugins.main.R
+import app.aaps.plugins.main.general.wear.wearintegration.DataHandlerMobile
+import app.aaps.plugins.main.general.wear.wearintegration.DataLayerListenerServiceMobileHelper
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
-import info.nightscout.plugins.general.wear.wearintegration.DataHandlerMobile
-import info.nightscout.plugins.general.wear.wearintegration.DataLayerListenerServiceMobileHelper
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/activities/CwfInfosActivity.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.wear.activities
+package app.aaps.plugins.main.general.wear.activities
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,7 +6,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.core.interfaces.logging.AAPSLogger
 import app.aaps.core.interfaces.logging.LTag
 import app.aaps.core.interfaces.resources.ResourceHelper
@@ -23,12 +22,13 @@ import app.aaps.core.interfaces.rx.weardata.ViewKeys
 import app.aaps.core.interfaces.rx.weardata.ZipWatchfaceFormat
 import app.aaps.core.interfaces.sharedPreferences.SP
 import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
-import info.nightscout.plugins.R
+import app.aaps.plugins.main.R
-import info.nightscout.plugins.databinding.CwfInfosActivityBinding
+import app.aaps.plugins.main.databinding.CwfInfosActivityBinding
-import info.nightscout.plugins.databinding.CwfInfosActivityPrefItemBinding
+import app.aaps.plugins.main.databinding.CwfInfosActivityPrefItemBinding
-import info.nightscout.plugins.databinding.CwfInfosActivityViewItemBinding
+import app.aaps.plugins.main.databinding.CwfInfosActivityViewItemBinding
-import info.nightscout.plugins.general.wear.WearPlugin
+import app.aaps.plugins.main.general.wear.WearPlugin
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import org.json.JSONObject

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/wearintegration/DataHandlerMobile.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.wear.wearintegration
+package app.aaps.plugins.main.general.wear.wearintegration
 
 import android.app.NotificationManager
 import android.content.Context
@@ -62,12 +62,12 @@ import app.aaps.database.entities.TotalDailyDose
 import app.aaps.database.entities.UserEntry
 import app.aaps.database.entities.ValueWithUnit
 import app.aaps.database.entities.interfaces.end
+import app.aaps.plugins.main.R
 import dagger.android.HasAndroidInjector
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
 import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.database.impl.transactions.InsertOrUpdateHeartRateTransaction
-import info.nightscout.plugins.R
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.text.DateFormat

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/wearintegration/DataLayerListenerServiceMobile.kt

@@ -1,9 +1,8 @@
-package info.nightscout.plugins.general.wear.wearintegration
+package app.aaps.plugins.main.general.wear.wearintegration
 
 import android.os.Binder
 import android.os.Handler
 import android.os.HandlerThread
-import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.core.interfaces.aps.Loop
 import app.aaps.core.interfaces.configuration.Config
 import app.aaps.core.interfaces.iob.IobCobCalculator
@@ -19,6 +18,9 @@ import app.aaps.core.interfaces.rx.events.EventMobileToWear
 import app.aaps.core.interfaces.rx.events.EventWearUpdateGui
 import app.aaps.core.interfaces.rx.weardata.EventData
 import app.aaps.core.interfaces.sharedPreferences.SP
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.plugins.main.R
+import app.aaps.plugins.main.general.wear.WearPlugin
 import com.google.android.gms.tasks.Tasks
 import com.google.android.gms.wearable.CapabilityClient
 import com.google.android.gms.wearable.CapabilityInfo
@@ -32,8 +34,6 @@ import com.google.android.gms.wearable.Wearable
 import com.google.android.gms.wearable.WearableListenerService
 import dagger.android.AndroidInjection
 import info.nightscout.database.impl.AppRepository
-import info.nightscout.plugins.R
-import info.nightscout.plugins.general.wear.WearPlugin
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import kotlinx.coroutines.CancellationException

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.wear.wearintegration
+package app.aaps.plugins.main.general.wear.wearintegration
 
 import android.content.ComponentName
 import android.content.Context

plugins/main/src/main/kotlin/app/aaps/plugins/main/profile/ProfileFragment.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.profile
+package app.aaps.plugins.main.profile
 
 import android.os.Bundle
 import android.text.Editable
@@ -31,11 +31,11 @@ import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.core.ui.dialogs.OKDialog
 import app.aaps.database.entities.UserEntry
 import app.aaps.database.entities.ValueWithUnit
+import app.aaps.plugins.main.R
+import app.aaps.plugins.main.databinding.ProfileFragmentBinding
+import app.aaps.plugins.main.profile.ui.TimeListEdit
 import com.google.android.material.tabs.TabLayout
 import dagger.android.support.DaggerFragment
-import info.nightscout.plugins.R
-import info.nightscout.plugins.databinding.ProfileFragmentBinding
-import info.nightscout.plugins.profile.ui.TimeListEdit
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.math.RoundingMode

plugins/main/src/main/kotlin/app/aaps/plugins/main/profile/ProfilePlugin.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.profile
+package app.aaps.plugins.main.profile
 
 import androidx.fragment.app.FragmentActivity
 import app.aaps.annotations.OpenForTesting
@@ -33,8 +33,8 @@ import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.core.ui.dialogs.OKDialog
 import app.aaps.core.ui.toast.ToastUtils
 import app.aaps.core.utils.JsonHelper
+import app.aaps.plugins.main.R
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject

plugins/main/src/main/kotlin/app/aaps/plugins/main/profile/ui/TimeListEdit.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.profile.ui
+package app.aaps.plugins.main.profile.ui
 
 import android.content.Context
 import android.text.Editable
@@ -17,6 +17,7 @@ import app.aaps.core.interfaces.utils.DateUtil
 import app.aaps.core.interfaces.utils.SafeParse.stringToDouble
 import app.aaps.core.ui.elements.NumberPicker
 import app.aaps.core.ui.elements.SpinnerHelper
+import app.aaps.plugins.main.R
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
@@ -94,10 +95,10 @@ class TimeListEdit(
         ImageView(context).also {
             this.finalAdd = it
             it.setImageResource(app.aaps.core.main.R.drawable.ic_add)
-            it.contentDescription = layout.context.resources.getString(info.nightscout.plugins.R.string.a11y_add_new_to_list)
+            it.contentDescription = layout.context.resources.getString(R.string.a11y_add_new_to_list)
             layout.addView(it)
             it.layoutParams = LinearLayout.LayoutParams((35.0 * factor).toInt(), (35 * factor).toInt()).also { llp ->
-                llp.setMargins(0, 25, 0, 25) // llp.setMargins(left, top, right, bottom);
+                llp.setMargins(0, 25, 0, 25)
                 llp.gravity = Gravity.CENTER
             }
             it.setOnClickListener {
@@ -112,13 +113,13 @@ class TimeListEdit(
 
     private fun inflateRow(position: Int) {
         val resource =
-            if (data2 == null) info.nightscout.plugins.R.layout.timelistedit_element
+            if (data2 == null) R.layout.timelistedit_element
-            else info.nightscout.plugins.R.layout.timelistedit_element_vertical
+            else R.layout.timelistedit_element_vertical
         val childView = LayoutInflater.from(context).inflate(resource, layout, false).also {
             intervals[position] = it
             layout?.addView(it)
         }
-        childView.findViewById<ImageView>(info.nightscout.plugins.R.id.timelistedit_add).also {
+        childView.findViewById<ImageView>(R.id.timelistedit_add).also {
             addButtons[position] = it
             it.setOnClickListener {
                 val seconds = secondFromMidnight(position)
@@ -135,7 +136,7 @@ class TimeListEdit(
                 fillView()
             }
         }
-        childView.findViewById<ImageView>(info.nightscout.plugins.R.id.timelistedit_remove).also {
+        childView.findViewById<ImageView>(R.id.timelistedit_remove).also {
             removeButtons[position] = it
             it.setOnClickListener {
                 removeItem(position)
@@ -144,7 +145,7 @@ class TimeListEdit(
                 fillView()
             }
         }
-        SpinnerHelper(childView.findViewById(info.nightscout.plugins.R.id.timelistedit_time)).also {
+        SpinnerHelper(childView.findViewById(R.id.timelistedit_time)).also {
             spinners[position] = it
             it.setOnItemSelectedListener(
                 object : AdapterView.OnItemSelectedListener {
@@ -160,7 +161,7 @@ class TimeListEdit(
                 }
             )
         }
-        childView.findViewById<NumberPicker>(info.nightscout.plugins.R.id.timelistedit_edit1).also {
+        childView.findViewById<NumberPicker>(R.id.timelistedit_edit1).also {
             numberPickers1[position] = it
             it.setTextWatcher(object : TextWatcher {
                 override fun afterTextChanged(s: Editable) {
@@ -180,7 +181,7 @@ class TimeListEdit(
             })
             it.tag = "$tagPrefix-1-$position"
         }
-        childView.findViewById<NumberPicker>(info.nightscout.plugins.R.id.timelistedit_edit2).also {
+        childView.findViewById<NumberPicker>(R.id.timelistedit_edit2).also {
             numberPickers2[position] = it
             it.setTextWatcher(object : TextWatcher {
                 override fun afterTextChanged(s: Editable) {

plugins/main/src/main/kotlin/app/aaps/plugins/main/skins/SkinButtonsOn.kt

@@ -1,7 +1,7 @@
-package info.nightscout.plugins.skins
+package app.aaps.plugins.main.skins
 
 import app.aaps.core.interfaces.configuration.Config
-import info.nightscout.plugins.R
+import app.aaps.plugins.main.R
 import javax.inject.Inject
 import javax.inject.Singleton
 

plugins/main/src/main/kotlin/app/aaps/plugins/main/skins/SkinClassic.kt

@@ -1,8 +1,8 @@
-package info.nightscout.plugins.skins
+package app.aaps.plugins.main.skins
 
 import app.aaps.core.interfaces.configuration.Config
-import info.nightscout.plugins.R
+import app.aaps.plugins.main.R
-import info.nightscout.plugins.databinding.OverviewFragmentBinding
+import app.aaps.plugins.main.databinding.OverviewFragmentBinding
 import javax.inject.Inject
 import javax.inject.Singleton
 

plugins/main/src/main/kotlin/app/aaps/plugins/main/skins/SkinInterface.kt

@@ -1,13 +1,13 @@
-package info.nightscout.plugins.skins
+package app.aaps.plugins.main.skins
 
 import android.util.TypedValue.COMPLEX_UNIT_PX
 import android.view.View
 import android.widget.LinearLayout
 import androidx.annotation.StringRes
 import androidx.constraintlayout.widget.ConstraintLayout
-import info.nightscout.plugins.R
+import app.aaps.plugins.main.R
-import info.nightscout.plugins.databinding.ActionsFragmentBinding
+import app.aaps.plugins.main.databinding.ActionsFragmentBinding
-import info.nightscout.plugins.databinding.OverviewFragmentBinding
+import app.aaps.plugins.main.databinding.OverviewFragmentBinding
 
 interface SkinInterface {
 

plugins/main/src/main/kotlin/app/aaps/plugins/main/skins/SkinLargeDisplay.kt

@@ -1,8 +1,8 @@
-package info.nightscout.plugins.skins
+package app.aaps.plugins.main.skins
 
 import app.aaps.core.interfaces.configuration.Config
-import info.nightscout.plugins.R
+import app.aaps.plugins.main.R
-import info.nightscout.plugins.databinding.OverviewFragmentBinding
+import app.aaps.plugins.main.databinding.OverviewFragmentBinding
 import javax.inject.Inject
 import javax.inject.Singleton
 

plugins/main/src/main/kotlin/app/aaps/plugins/main/skins/SkinListPreference.kt

@@ -1,10 +1,10 @@
-package info.nightscout.plugins.skins
+package app.aaps.plugins.main.skins
 
 import android.content.Context
 import android.util.AttributeSet
 import androidx.preference.ListPreference
 import dagger.android.HasAndroidInjector
-import java.util.*
+import java.util.Vector
 import javax.inject.Inject
 
 class SkinListPreference(context: Context, attrs: AttributeSet?)

plugins/main/src/main/kotlin/app/aaps/plugins/main/skins/SkinLowRes.kt

@@ -1,11 +1,11 @@
-package info.nightscout.plugins.skins
+package app.aaps.plugins.main.skins
 
 import android.view.View.GONE
 import android.view.ViewGroup
 import app.aaps.core.interfaces.configuration.Config
-import info.nightscout.plugins.R
+import app.aaps.plugins.main.R
-import info.nightscout.plugins.databinding.ActionsFragmentBinding
+import app.aaps.plugins.main.databinding.ActionsFragmentBinding
-import info.nightscout.plugins.databinding.OverviewFragmentBinding
+import app.aaps.plugins.main.databinding.OverviewFragmentBinding
 import javax.inject.Inject
 import javax.inject.Singleton
 

plugins/main/src/main/kotlin/app/aaps/plugins/main/skins/SkinProvider.kt

@@ -1,8 +1,8 @@
-package info.nightscout.plugins.skins
+package app.aaps.plugins.main.skins
 
 import app.aaps.core.interfaces.sharedPreferences.SP
-import info.nightscout.plugins.R
+import app.aaps.plugins.main.R
-import info.nightscout.plugins.di.SkinsModule
+import app.aaps.plugins.main.di.SkinsModule
 import java.util.Collections
 import javax.inject.Inject
 import javax.inject.Singleton

plugins/main/src/main/res/layout/actions_stats_fragment.xml

@@ -4,7 +4,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:stretchColumns="0,2,4"
-    tools:context="info.nightscout.plugins.general.actions.ActionsFragment">
+    tools:context=".general.actions.ActionsFragment">
 
     <TableRow
         android:layout_width="fill_parent"

plugins/main/src/main/res/layout/cwf_infos_activity.xml

@@ -1,5 +1,4 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -7,7 +6,7 @@
     android:scrollbarStyle="outsideOverlay"
     android:scrollbars="vertical"
     android:paddingTop="2dp"
-    tools:context="info.nightscout.plugins.general.wear.activities.CwfInfosActivity">
+    tools:context=".general.wear.activities.CwfInfosActivity">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"

plugins/main/src/main/res/layout/profile_fragment.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="info.nightscout.plugins.profile.ProfileFragment">
+    tools:context=".profile.ProfileFragment">
 
     <LinearLayout
         android:layout_width="match_parent"

plugins/main/src/main/res/layout/smscommunicator_fragment.xml

@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorFragment">
+    tools:context=".general.smsCommunicator.SmsCommunicatorFragment">
 
     <TextView
         android:id="@+id/log"

plugins/main/src/main/res/layout/wear_fragment.xml

@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingTop="2dp"
-    tools:context="info.nightscout.plugins.general.wear.WearFragment">
+    tools:context=".general.wear.WearFragment">
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/log"

plugins/main/src/test/kotlin/app/aaps/plugins/main/extensions/BolusExtensionKtTest.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.plugins.main.extensions
 
 import app.aaps.core.interfaces.insulin.Insulin
 import app.aaps.core.interfaces.profile.ProfileFunction

plugins/main/src/test/kotlin/app/aaps/plugins/main/extensions/ExtendedBolusExtensionKtTest.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.plugins.main.extensions
 
 import app.aaps.core.interfaces.aps.AutosensResult
 import app.aaps.core.interfaces.aps.SMBDefaults

plugins/main/src/test/kotlin/app/aaps/plugins/main/extensions/GlucoseValueExtensionKtTest.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.plugins.main.extensions
 
 import app.aaps.core.interfaces.db.GlucoseUnit
 import app.aaps.core.interfaces.iob.InMemoryGlucoseValue

plugins/main/src/test/kotlin/app/aaps/plugins/main/extensions/TemporaryBasalExtensionKtTest.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.plugins.main.extensions
 
 import app.aaps.core.interfaces.aps.AutosensResult
 import app.aaps.core.interfaces.aps.SMBDefaults

plugins/main/src/test/kotlin/app/aaps/plugins/main/extensions/TemporaryTargetExtensionKtTest.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.plugins.main.extensions
 
 import app.aaps.core.interfaces.db.GlucoseUnit
 import app.aaps.core.main.extensions.highValueToUnitsToString

plugins/main/src/test/kotlin/app/aaps/plugins/main/extensions/TherapyEventExtensionKtTest.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.plugins.main.extensions
 
 import app.aaps.core.interfaces.utils.T
 import app.aaps.core.main.extensions.isOlderThan

plugins/main/src/test/kotlin/app/aaps/plugins/main/general/smsCommunicator/AuthRequestTest.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.smsCommunicator
+package app.aaps.plugins.main.general.smsCommunicator
 
 import app.aaps.core.interfaces.configuration.Constants
 import app.aaps.core.interfaces.resources.ResourceHelper
@@ -6,13 +6,13 @@ import app.aaps.core.interfaces.smsCommunicator.Sms
 import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
 import app.aaps.core.interfaces.utils.DateUtil
 import app.aaps.core.interfaces.utils.T
+import app.aaps.plugins.main.R
+import app.aaps.plugins.main.general.smsCommunicator.otp.OneTimePassword
+import app.aaps.plugins.main.general.smsCommunicator.otp.OneTimePasswordValidationResult
 import app.aaps.shared.tests.TestBase
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
-import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePassword
-import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePasswordValidationResult
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mockito.Mock

plugins/main/src/test/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsActionTest.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.smsCommunicator
+package app.aaps.plugins.main.general.smsCommunicator
 
 import com.google.common.truth.Truth.assertThat
 import org.junit.jupiter.api.Test

plugins/main/src/test/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsCommunicatorPluginTest.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.smsCommunicator
+package app.aaps.plugins.main.general.smsCommunicator
 
 import android.telephony.SmsManager
 import app.aaps.core.interfaces.aps.ApsMode
@@ -22,6 +22,9 @@ import app.aaps.core.interfaces.utils.T
 import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.database.entities.GlucoseValue
 import app.aaps.implementation.iob.GlucoseStatusProviderImpl
+import app.aaps.plugins.main.R
+import app.aaps.plugins.main.general.smsCommunicator.otp.OneTimePassword
+import app.aaps.plugins.main.general.smsCommunicator.otp.OneTimePasswordValidationResult
 import app.aaps.shared.tests.TestBaseWithProfile
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
@@ -31,9 +34,6 @@ import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAny
 import info.nightscout.database.impl.transactions.InsertAndCancelCurrentOfflineEventTransaction
 import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.database.impl.transactions.Transaction
-import info.nightscout.plugins.R
-import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePassword
-import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePasswordValidationResult
 import io.reactivex.rxjava3.core.Single
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test

plugins/main/src/test/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsTest.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.general.smsCommunicator
+package app.aaps.plugins.main.general.smsCommunicator
 
 import android.telephony.SmsMessage
 import app.aaps.core.interfaces.smsCommunicator.Sms

plugins/main/src/test/kotlin/app/aaps/plugins/main/iob/AutosensDataStoreTest.kt

@@ -1,4 +1,4 @@
-package info.nightscout.plugins.iob
+package app.aaps.plugins.main.iob
 
 import android.content.Context
 import androidx.collection.LongSparseArray
@@ -9,13 +9,13 @@ import app.aaps.core.interfaces.sharedPreferences.SP
 import app.aaps.core.interfaces.utils.DateUtil
 import app.aaps.core.interfaces.utils.T
 import app.aaps.database.entities.GlucoseValue
+import app.aaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
+import app.aaps.plugins.iob.iobCobCalculator.data.AutosensDataStoreObject
 import app.aaps.shared.impl.utils.DateUtilImpl
 import app.aaps.shared.tests.TestBase
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.iob.iobCobCalculator.data.AutosensDataObject
-import info.nightscout.plugins.iob.iobCobCalculator.data.AutosensDataStoreObject
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mockito.Mock