core -> core-main

app-wear-shared/rx/build.gradle

@@ -7,9 +7,9 @@ plugins {
     id 'kotlinx-serialization'
 }
 
-apply from: "${project.rootDir}/core/android_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/jacoco_global.gradle"
+apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
 
 android {
 

app-wear-shared/shared-impl/build.gradle

@@ -7,8 +7,8 @@ plugins {
     id 'kotlinx-serialization'
 }
 
-apply from: "${project.rootDir}/core/android_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle"
 
 android {
 

app-wear-shared/shared/build.gradle

@@ -7,11 +7,11 @@ plugins {
     id 'com.hiya.jacoco-android'
 }
 
-apply from: "${project.rootDir}/core/android_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/allopen_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/test_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/jacoco_global.gradle"
+apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
 
 android {
 

app/build.gradle

@@ -9,8 +9,8 @@ plugins {
     id 'com.google.firebase.crashlytics'
 }
 
-apply from: "${project.rootDir}/core/android_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/jacoco_global.gradle"
+apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
 
 repositories {
     mavenCentral()
@@ -185,7 +185,7 @@ dependencies {
     implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
     implementation project(':app-wear-shared:shared-impl')
-    implementation project(':core')
+    implementation project(':core:core-main')
     implementation project(':interfaces')
     implementation project(':ui')
     implementation project(':plugins')
@@ -227,7 +227,7 @@ dependencies {
 
 }
 
-apply from: "${project.rootDir}/core/test_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle"
 
 
 /*

app/src/main/java/info/nightscout/androidaps/MainApp.kt

@@ -130,7 +130,7 @@ class MainApp : DaggerApplication() {
                             InsertIfNewByTimestampTherapyEventTransaction(
                                 timestamp = dateUtil.now(),
                                 type = TherapyEvent.Type.NOTE,
-                                note = rh.get().gs(info.nightscout.androidaps.core.R.string.androidaps_start) + " - " + Build.MANUFACTURER + " " + Build.MODEL,
+                                note = rh.get().gs(info.nightscout.core.main.R.string.androidaps_start) + " - " + Build.MANUFACTURER + " " + Build.MODEL,
                                 glucoseUnit = TherapyEvent.GlucoseUnit.MGDL
                             )
                         )

app/src/main/java/info/nightscout/androidaps/dialogs/NtpProgressDialog.kt

@@ -6,8 +6,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
-import info.nightscout.androidaps.core.databinding.DialogBolusprogressBinding
+import info.nightscout.core.main.databinding.DialogBolusprogressBinding
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.rx.AapsSchedulers

app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImpl.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.configBuilder
 
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.ValueWrapper

app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt

@@ -9,7 +9,7 @@ import android.content.Intent
 import androidx.core.app.NotificationCompat
 import androidx.core.app.TaskStackBuilder
 import info.nightscout.androidaps.MainActivity
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
 import info.nightscout.interfaces.IconsProvider
 import info.nightscout.interfaces.NotificationHolder
 import info.nightscout.shared.interfaces.ResourceHelper

automation/build.gradle

@@ -6,11 +6,11 @@ plugins {
     id 'com.hiya.jacoco-android'
 }
 
-apply from: "${project.rootDir}/core/android_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/allopen_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/test_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/jacoco_global.gradle"
+apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
 
 android {
     namespace 'info.nightscout.automation'
@@ -18,7 +18,7 @@ android {
 
 dependencies {
     implementation project(':graphview')
-    implementation project(':core')
+    implementation project(':core:core-main')
     implementation project(':database')
     implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')

automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt

@@ -45,15 +45,15 @@ class ActionAlarmTest : TestBase() {
 
     @Before
     fun setup() {
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.ok)).thenReturn("OK")
+        `when`(rh.gs(info.nightscout.core.main.R.string.ok)).thenReturn("OK")
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.alarm)).thenReturn("Alarm")
+        `when`(rh.gs(info.nightscout.core.main.R.string.alarm)).thenReturn("Alarm")
         `when`(rh.gs(ArgumentMatchers.eq(R.string.alarm_message), ArgumentMatchers.anyString())).thenReturn("Alarm: %s")
 
         sut = ActionAlarm(injector)
     }
 
     @Test fun friendlyNameTest() {
-        Assert.assertEquals(info.nightscout.androidaps.core.R.string.alarm, sut.friendlyName())
+        Assert.assertEquals(info.nightscout.core.main.R.string.alarm, sut.friendlyName())
     }
 
     @Test fun shortDescriptionTest() {
@@ -62,7 +62,7 @@ class ActionAlarmTest : TestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(info.nightscout.androidaps.core.R.drawable.ic_access_alarm_24dp, sut.icon())
+        Assert.assertEquals(info.nightscout.core.main.R.drawable.ic_access_alarm_24dp, sut.icon())
     }
 
     @Test fun doActionTest() {

automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt

@@ -23,7 +23,7 @@ class ActionCarePortalEventTest : ActionsTestBase() {
         `when`(sp.getString(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn("AAPS")
         `when`(
             rh.gs(
-                ArgumentMatchers.eq(info.nightscout.androidaps.core.R.string.careportal_note_message),
+                ArgumentMatchers.eq(info.nightscout.core.main.R.string.careportal_note_message),
                 ArgumentMatchers.anyString()
             )
         ).thenReturn("Note : %s")
@@ -40,7 +40,7 @@ class ActionCarePortalEventTest : ActionsTestBase() {
     }
 
     @Test fun friendlyNameTest() {
-        Assert.assertEquals(info.nightscout.androidaps.core.R.string.careportal, sut.friendlyName())
+        Assert.assertEquals(info.nightscout.core.main.R.string.careportal, sut.friendlyName())
     }
 
     @Test fun shortDescriptionTest() {
@@ -48,7 +48,7 @@ class ActionCarePortalEventTest : ActionsTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(info.nightscout.androidaps.core.R.drawable.ic_cp_note, sut.icon())
+        Assert.assertEquals(info.nightscout.core.main.R.drawable.ic_cp_note, sut.icon())
     }
 
     @Test fun doActionTest() {

automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt

@@ -18,7 +18,7 @@ class ActionLoopDisableTest : ActionsTestBase() {
     fun setup() {
 
         testPumpPlugin.pumpDescription.isTempBasalCapable = true
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.disableloop)).thenReturn("Disable loop")
+        `when`(rh.gs(info.nightscout.core.main.R.string.disableloop)).thenReturn("Disable loop")
         `when`(rh.gs(R.string.alreadydisabled)).thenReturn("Disable loop")
 
         sut = ActionLoopDisable(injector)
@@ -26,7 +26,7 @@ class ActionLoopDisableTest : ActionsTestBase() {
 
     @Test
     fun friendlyNameTest() {
-        Assert.assertEquals(info.nightscout.androidaps.core.R.string.disableloop, sut.friendlyName())
+        Assert.assertEquals(info.nightscout.core.main.R.string.disableloop, sut.friendlyName())
     }
 
     @Test

automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt

@@ -17,14 +17,14 @@ class ActionLoopEnableTest : ActionsTestBase() {
     fun setup() {
 
         testPumpPlugin.pumpDescription.isTempBasalCapable = true
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.enableloop)).thenReturn("Enable loop")
+        `when`(rh.gs(info.nightscout.core.main.R.string.enableloop)).thenReturn("Enable loop")
         `when`(rh.gs(R.string.alreadyenabled)).thenReturn("Already enabled")
 
         sut = ActionLoopEnable(injector)
     }
 
     @Test fun friendlyNameTest() {
-        Assert.assertEquals(info.nightscout.androidaps.core.R.string.enableloop, sut.friendlyName())
+        Assert.assertEquals(info.nightscout.core.main.R.string.enableloop, sut.friendlyName())
     }
 
     @Test fun shortDescriptionTest() {

automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt

@@ -18,14 +18,14 @@ class ActionLoopResumeTest : ActionsTestBase() {
     @Before
     fun setup() {
 
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.resumeloop)).thenReturn("Resume loop")
+        `when`(rh.gs(info.nightscout.core.main.R.string.resumeloop)).thenReturn("Resume loop")
         `when`(rh.gs(R.string.notsuspended)).thenReturn("Not suspended")
 
         sut = ActionLoopResume(injector)
     }
 
     @Test fun friendlyNameTest() {
-        Assert.assertEquals(info.nightscout.androidaps.core.R.string.resumeloop, sut.friendlyName())
+        Assert.assertEquals(info.nightscout.core.main.R.string.resumeloop, sut.friendlyName())
     }
 
     @Test fun shortDescriptionTest() {

automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt

@@ -17,7 +17,7 @@ class ActionLoopSuspendTest : ActionsTestBase() {
     @Before
     fun setup() {
 
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.suspendloop)).thenReturn("Suspend loop")
+        `when`(rh.gs(info.nightscout.core.main.R.string.suspendloop)).thenReturn("Suspend loop")
         `when`(rh.gs(ArgumentMatchers.eq(R.string.suspendloopforXmin), ArgumentMatchers.anyInt())).thenReturn("Suspend loop for %d min")
         `when`(rh.gs(R.string.alreadysuspended)).thenReturn("Already suspended")
 
@@ -25,7 +25,7 @@ class ActionLoopSuspendTest : ActionsTestBase() {
     }
 
     @Test fun friendlyNameTest() {
-        Assert.assertEquals(info.nightscout.androidaps.core.R.string.suspendloop, sut.friendlyName())
+        Assert.assertEquals(info.nightscout.core.main.R.string.suspendloop, sut.friendlyName())
     }
 
     @Test fun shortDescriptionTest() {

automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt

@@ -43,8 +43,8 @@ class ActionNotificationTest : TestBase() {
 
     @Before
     fun setup() {
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.ok)).thenReturn("OK")
+        `when`(rh.gs(info.nightscout.core.main.R.string.ok)).thenReturn("OK")
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.notification)).thenReturn("Notification")
+        `when`(rh.gs(info.nightscout.core.main.R.string.notification)).thenReturn("Notification")
         `when`(
             rh.gs(
                 ArgumentMatchers.eq(R.string.notification_message),
@@ -58,7 +58,7 @@ class ActionNotificationTest : TestBase() {
     }
 
     @Test fun friendlyNameTest() {
-        Assert.assertEquals(info.nightscout.androidaps.core.R.string.notification, sut.friendlyName())
+        Assert.assertEquals(info.nightscout.core.main.R.string.notification, sut.friendlyName())
     }
 
     @Test fun shortDescriptionTest() {

automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchPercentTest.kt

@@ -18,7 +18,7 @@ class ActionProfileSwitchPercentTest : ActionsTestBase() {
     fun setup() {
 
         `when`(rh.gs(R.string.startprofileforever)).thenReturn("Start profile %d%%")
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.startprofile)).thenReturn("Start profile %d%% for %d min")
+        `when`(rh.gs(info.nightscout.core.main.R.string.startprofile)).thenReturn("Start profile %d%% for %d min")
 
         sut = ActionProfileSwitchPercent(injector)
     }
@@ -34,7 +34,7 @@ class ActionProfileSwitchPercentTest : ActionsTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(info.nightscout.androidaps.core.R.drawable.ic_actions_profileswitch, sut.icon())
+        Assert.assertEquals(info.nightscout.core.main.R.drawable.ic_actions_profileswitch, sut.icon())
     }
 
     @Test fun doActionTest() {

automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt

@@ -23,9 +23,9 @@ class ActionProfileSwitchTest : ActionsTestBase() {
         `when`(rh.gs(R.string.profilename)).thenReturn("Change profile to")
         `when`(rh.gs(ArgumentMatchers.eq(R.string.changengetoprofilename), ArgumentMatchers.anyString())).thenReturn("Change profile to %s")
         `when`(rh.gs(R.string.alreadyset)).thenReturn("Already set")
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.notexists)).thenReturn("not exists")
+        `when`(rh.gs(info.nightscout.core.main.R.string.notexists)).thenReturn("not exists")
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.error_field_must_not_be_empty)).thenReturn("The field must not be empty")
+        `when`(rh.gs(info.nightscout.core.main.R.string.error_field_must_not_be_empty)).thenReturn("The field must not be empty")
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.noprofile)).thenReturn("No profile loaded from NS yet")
+        `when`(rh.gs(info.nightscout.core.main.R.string.noprofile)).thenReturn("No profile loaded from NS yet")
 
         sut = ActionProfileSwitch(injector)
     }
@@ -107,6 +107,6 @@ class ActionProfileSwitchTest : ActionsTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(info.nightscout.androidaps.core.R.drawable.ic_actions_profileswitch, sut.icon())
+        Assert.assertEquals(info.nightscout.core.main.R.drawable.ic_actions_profileswitch, sut.icon())
     }
 }

automation/src/test/java/info/nightscout/automation/actions/ActionStartTempTargetTest.kt

@@ -38,7 +38,7 @@ class ActionStartTempTargetTest : ActionsTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(info.nightscout.androidaps.core.R.drawable.ic_temptarget_high, sut.icon())
+        Assert.assertEquals(info.nightscout.core.main.R.drawable.ic_temptarget_high, sut.icon())
     }
 
     @Test fun doActionTest() {

automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt

@@ -180,7 +180,7 @@ ActionsTestBase : TestBaseWithProfile() {
         `when`(activePlugin.activeProfileSource).thenReturn(profilePlugin)
         `when`(profilePlugin.profile).thenReturn(getValidProfileStore())
 
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.ok)).thenReturn("OK")
+        `when`(rh.gs(info.nightscout.core.main.R.string.ok)).thenReturn("OK")
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.error)).thenReturn("Error")
+        `when`(rh.gs(info.nightscout.core.main.R.string.error)).thenReturn("Error")
     }
 }

automation/src/test/java/info/nightscout/automation/elements/StaticLabelTest.kt

@@ -11,8 +11,8 @@ class StaticLabelTest : TriggerTestBase() {
     @Test fun constructor() {
         var sl = StaticLabel(rh, "any", TriggerDummy(injector))
         Assert.assertEquals("any", sl.label)
-        `when`(rh.gs(info.nightscout.androidaps.core.R.string.pumplimit)).thenReturn("pump limit")
+        `when`(rh.gs(info.nightscout.core.main.R.string.pumplimit)).thenReturn("pump limit")
-        sl = StaticLabel(rh, info.nightscout.androidaps.core.R.string.pumplimit, TriggerDummy(injector))
+        sl = StaticLabel(rh, info.nightscout.core.main.R.string.pumplimit, TriggerDummy(injector))
         Assert.assertEquals("pump limit", sl.label)
     }
 }

automation/src/test/java/info/nightscout/automation/triggers/TriggerAutosensValueTest.kt

@@ -16,8 +16,8 @@ class TriggerAutosensValueTest : TriggerTestBase() {
 
     var now = 1514766900000L
     @Test fun shouldRunTest() {
-        `when`(sp.getDouble(Mockito.eq(info.nightscout.androidaps.core.R.string.key_openapsama_autosens_max), ArgumentMatchers.anyDouble())).thenReturn(1.2)
+        `when`(sp.getDouble(Mockito.eq(info.nightscout.core.main.R.string.key_openapsama_autosens_max), ArgumentMatchers.anyDouble())).thenReturn(1.2)
-        `when`(sp.getDouble(Mockito.eq(info.nightscout.androidaps.core.R.string.key_openapsama_autosens_min), ArgumentMatchers.anyDouble())).thenReturn(0.7)
+        `when`(sp.getDouble(Mockito.eq(info.nightscout.core.main.R.string.key_openapsama_autosens_min), ArgumentMatchers.anyDouble())).thenReturn(0.7)
         `when`(autosensDataStore.getLastAutosensData(anyObject(), anyObject(), anyObject())).thenReturn(generateAutosensData())
         var t = TriggerAutosensValue(injector)
         t.autosens.value = 110.0

automation/src/test/java/info/nightscout/automation/triggers/TriggerBTDeviceTest.kt

@@ -33,7 +33,7 @@ class TriggerBTDeviceTest : TriggerTestBase() {
 
     @Test
     fun icon() {
-        Assert.assertEquals(Optional.of(info.nightscout.androidaps.core.R.drawable.ic_bluetooth_white_48dp), TriggerBTDevice(injector).icon())
+        Assert.assertEquals(Optional.of(info.nightscout.core.main.R.drawable.ic_bluetooth_white_48dp), TriggerBTDevice(injector).icon())
     }
 
     @Test fun duplicate() {

automation/src/test/java/info/nightscout/automation/triggers/TriggerBgTest.kt

@@ -76,7 +76,7 @@ class TriggerBgTest : TriggerTestBase() {
 
     @Test
     fun iconTest() {
-        Assert.assertEquals(Optional.of(info.nightscout.androidaps.core.R.drawable.ic_cp_bgcheck), TriggerBg(injector).icon())
+        Assert.assertEquals(Optional.of(info.nightscout.core.main.R.drawable.ic_cp_bgcheck), TriggerBg(injector).icon())
     }
 
     private fun generateOneCurrentRecordBgData(): List<GlucoseValue> {

automation/src/test/java/info/nightscout/automation/triggers/TriggerBolusAgoTest.kt

@@ -94,6 +94,6 @@ class TriggerBolusAgoTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(Optional.of(info.nightscout.androidaps.core.R.drawable.ic_bolus), TriggerBolusAgo(injector).icon())
+        Assert.assertEquals(Optional.of(info.nightscout.core.main.R.drawable.ic_bolus), TriggerBolusAgo(injector).icon())
     }
 }

automation/src/test/java/info/nightscout/automation/triggers/TriggerCOBTest.kt

@@ -61,7 +61,7 @@ class TriggerCOBTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(Optional.of(info.nightscout.androidaps.core.R.drawable.ic_cp_bolus_carbs), TriggerCOB(injector).icon())
+        Assert.assertEquals(Optional.of(info.nightscout.core.main.R.drawable.ic_cp_bolus_carbs), TriggerCOB(injector).icon())
     }
 
     fun generateCobInfo(): CobInfo {

automation/src/test/java/info/nightscout/automation/triggers/TriggerProfilePercentTest.kt

@@ -60,7 +60,7 @@ class TriggerProfilePercentTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(Optional.of(info.nightscout.androidaps.core.R.drawable.ic_actions_profileswitch), TriggerProfilePercent(injector).icon())
+        Assert.assertEquals(Optional.of(info.nightscout.core.main.R.drawable.ic_actions_profileswitch), TriggerProfilePercent(injector).icon())
     }
 
     @Test fun friendlyNameTest() {

automation/src/test/java/info/nightscout/automation/triggers/TriggerPumpLastConnectionTest.kt

@@ -61,7 +61,7 @@ class TriggerPumpLastConnectionTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(Optional.of(info.nightscout.androidaps.core.R.drawable.ic_remove), TriggerPumpLastConnection(injector).icon())
+        Assert.assertEquals(Optional.of(info.nightscout.core.main.R.drawable.ic_remove), TriggerPumpLastConnection(injector).icon())
     }
 
     @Test fun friendlyNameTest() {

automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeRangeTest.kt

@@ -65,6 +65,6 @@ class TriggerTimeRangeTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(Optional.of(info.nightscout.androidaps.core.R.drawable.ic_access_alarm_24dp), TriggerTimeRange(injector).icon())
+        Assert.assertEquals(Optional.of(info.nightscout.core.main.R.drawable.ic_access_alarm_24dp), TriggerTimeRange(injector).icon())
     }
 }

automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt

@@ -48,7 +48,7 @@ class TriggerTimeTest : TriggerTestBase() {
     }
 
     @Test fun friendlyNameTest() {
-        Assert.assertEquals(info.nightscout.androidaps.core.R.string.time, TriggerTime(injector).friendlyName())
+        Assert.assertEquals(info.nightscout.core.main.R.string.time, TriggerTime(injector).friendlyName())
     }
 
     @Test fun friendlyDescriptionTest() {
@@ -56,6 +56,6 @@ class TriggerTimeTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(Optional.of(info.nightscout.androidaps.core.R.drawable.ic_access_alarm_24dp), TriggerTime(injector).icon())
+        Assert.assertEquals(Optional.of(info.nightscout.core.main.R.drawable.ic_access_alarm_24dp), TriggerTime(injector).icon())
     }
 }

automation/src/test/java/info/nightscout/automation/triggers/TriggerWifiSsidTest.kt

@@ -65,7 +65,7 @@ class TriggerWifiSsidTest : TriggerTestBase() {
     }
 
     @Test fun friendlyNameTest() {
-        Assert.assertEquals(info.nightscout.androidaps.core.R.string.ns_wifi_ssids, TriggerWifiSsid(injector).friendlyName())
+        Assert.assertEquals(info.nightscout.core.main.R.string.ns_wifi_ssids, TriggerWifiSsid(injector).friendlyName())
     }
 
     @Test fun friendlyDescriptionTest() {

core/core-main/build.gradle

@@ -7,11 +7,11 @@ plugins {
     id 'com.hiya.jacoco-android'
 }
 
-apply from: "${project.rootDir}/core/android_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/allopen_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/test_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/jacoco_global.gradle"
+apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
 
 dependencies {
     implementation project(':graphview')
@@ -92,5 +92,5 @@ dependencies {
 }
 
 android {
-    namespace 'info.nightscout.androidaps.core'
+    namespace 'info.nightscout.core.main'
 }

core/core-main/src/main/java/info/nightscout/androidaps/activities/DaggerAppCompatActivityWithResult.kt

@@ -5,7 +5,7 @@ import android.content.pm.PackageManager
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.app.ActivityCompat
 import dagger.android.support.DaggerAppCompatActivity
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
 import info.nightscout.interfaces.ImportExportPrefs
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.general.maintenance.PrefsFileContract

core/core-main/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.activities
 import android.content.Context
 import android.os.Bundle
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
 import info.nightscout.interfaces.locale.LocaleHelper
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventThemeSwitch

core/core-main/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.data
 
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
 import info.nightscout.androidaps.database.data.Block
 import info.nightscout.androidaps.database.data.TargetBlock
 import info.nightscout.androidaps.database.embedments.InsulinConfiguration

core/core-main/src/main/java/info/nightscout/androidaps/data/PumpEnactResultImpl.kt

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.data
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.interfaces.utils.Round

core/core-main/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt

@@ -9,8 +9,8 @@ import android.view.Window
 import android.view.WindowManager
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.activities.DialogAppCompatActivity
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
-import info.nightscout.androidaps.core.databinding.DialogBolusprogressBinding
+import info.nightscout.core.main.databinding.DialogBolusprogressBinding
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.events.EventPumpStatusChanged

core/core-main/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt

@@ -13,7 +13,7 @@ import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.timepicker.MaterialTimePicker
 import com.google.android.material.timepicker.TimeFormat
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
 import info.nightscout.shared.extensions.toVisibility
 import info.nightscout.shared.utils.DateUtil
 import info.nightscout.rx.logging.AAPSLogger

core/core-main/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt

@@ -12,8 +12,8 @@ import android.view.Window
 import android.view.WindowManager
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.activities.DialogAppCompatActivity
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
-import info.nightscout.androidaps.core.databinding.DialogErrorBinding
+import info.nightscout.core.main.databinding.DialogErrorBinding
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.logging.UserEntryLogger

core/core-main/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt

@@ -9,8 +9,8 @@ import android.view.Window
 import android.view.WindowManager
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
-import info.nightscout.androidaps.core.databinding.DialogProfileviewerBinding
+import info.nightscout.core.main.databinding.DialogProfileviewerBinding
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.ValueWrapper

core/core-main/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.events
 
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
 import info.nightscout.shared.interfaces.ResourceHelper
 
 class EventPumpStatusChanged : EventStatus {

core/core-main/src/main/java/info/nightscout/androidaps/extensions/EmptyRecyclerView.kt

@@ -1,91 +1,91 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.androidaps.extensions
-
+
-import android.content.Context
+import android.content.Context
-import android.util.AttributeSet
+import android.util.AttributeSet
-import android.view.View
+import android.view.View
-import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
-import info.nightscout.shared.extensions.runOnUiThread
+import info.nightscout.shared.extensions.runOnUiThread
-import info.nightscout.shared.extensions.toVisibility
+import info.nightscout.shared.extensions.toVisibility
-
+
-class EmptyRecyclerView : RecyclerView {
+class EmptyRecyclerView : RecyclerView {
-
+
-    private var mEmptyView: View? = null
+    private var mEmptyView: View? = null
-    private var mLoadingView: View? = null
+    private var mLoadingView: View? = null
-    private var mIsLoading = true
+    private var mIsLoading = true
-
+
-    constructor(context: Context) : super(context)
+    constructor(context: Context) : super(context)
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
-    constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
+    constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
-
+
-    private fun updateEmptyView() {
+    private fun updateEmptyView() {
-        runOnUiThread {
+        runOnUiThread {
-            val isEmpty = !mIsLoading && (adapter == null || adapter?.itemCount == 0)
+            val isEmpty = !mIsLoading && (adapter == null || adapter?.itemCount == 0)
-            visibility = isEmpty.not().toVisibility()
+            visibility = isEmpty.not().toVisibility()
-            mEmptyView?.visibility = isEmpty.toVisibility()
+            mEmptyView?.visibility = isEmpty.toVisibility()
-        }
+        }
-    }
+    }
-
+
-    private fun updateLoadingView() {
+    private fun updateLoadingView() {
-        runOnUiThread {
+        runOnUiThread {
-            mLoadingView?.visibility = mIsLoading.toVisibility()
+            mLoadingView?.visibility = mIsLoading.toVisibility()
-        }
+        }
-    }
+    }
-
+
-    private val observer: AdapterDataObserver = object : AdapterDataObserver() {
+    private val observer: AdapterDataObserver = object : AdapterDataObserver() {
-        override fun onChanged() {
+        override fun onChanged() {
-            super.onChanged()
+            super.onChanged()
-            updateEmptyView()
+            updateEmptyView()
-        }
+        }
-
+
-        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-            super.onItemRangeInserted(positionStart, itemCount)
+            super.onItemRangeInserted(positionStart, itemCount)
-            updateEmptyView()
+            updateEmptyView()
-        }
+        }
-
+
-        override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
+        override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
-            super.onItemRangeRemoved(positionStart, itemCount)
+            super.onItemRangeRemoved(positionStart, itemCount)
-            updateEmptyView()
+            updateEmptyView()
-        }
+        }
-    }
+    }
-
+
-    override fun setAdapter(adapter: Adapter<*>?) {
+    override fun setAdapter(adapter: Adapter<*>?) {
-        val oldAdapter = getAdapter()
+        val oldAdapter = getAdapter()
-        super.setAdapter(adapter)
+        super.setAdapter(adapter)
-        update(oldAdapter, adapter)
+        update(oldAdapter, adapter)
-    }
+    }
-
+
-    override fun swapAdapter(adapter: Adapter<*>?, removeAndRecycleExistingViews: Boolean) {
+    override fun swapAdapter(adapter: Adapter<*>?, removeAndRecycleExistingViews: Boolean) {
-        val oldAdapter = getAdapter()
+        val oldAdapter = getAdapter()
-        super.swapAdapter(adapter, removeAndRecycleExistingViews)
+        super.swapAdapter(adapter, removeAndRecycleExistingViews)
-        update(oldAdapter, adapter)
+        update(oldAdapter, adapter)
-    }
+    }
-
+
-    var emptyView: View?
+    var emptyView: View?
-        get() = mEmptyView
+        get() = mEmptyView
-        set(view) {
+        set(view) {
-            mEmptyView = view
+            mEmptyView = view
-            updateEmptyView()
+            updateEmptyView()
-        }
+        }
-
+
-    var loadingView: View?
+    var loadingView: View?
-        get() = mLoadingView
+        get() = mLoadingView
-        set(view) {
+        set(view) {
-            mLoadingView = view
+            mLoadingView = view
-            updateLoadingView()
+            updateLoadingView()
-        }
+        }
-
+
-    var isLoading: Boolean
+    var isLoading: Boolean
-        get() = mIsLoading
+        get() = mIsLoading
-        set(loading) {
+        set(loading) {
-            mIsLoading = loading
+            mIsLoading = loading
-            updateLoadingView()
+            updateLoadingView()
-        }
+        }
-
+
-    private fun update(oldAdapter: Adapter<*>?, newAdapter: Adapter<*>?) {
+    private fun update(oldAdapter: Adapter<*>?, newAdapter: Adapter<*>?) {
-        oldAdapter?.unregisterAdapterDataObserver(observer)
+        oldAdapter?.unregisterAdapterDataObserver(observer)
-        newAdapter?.registerAdapterDataObserver(observer)
+        newAdapter?.registerAdapterDataObserver(observer)
-        updateEmptyView()
+        updateEmptyView()
-        isLoading = false
+        isLoading = false
-        updateLoadingView()
+        updateLoadingView()
-    }
+    }
-}
+}

core/core-main/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.extensions
 
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
 import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.Profile

core/core-main/src/main/java/info/nightscout/androidaps/extensions/TotalDailyDoseExtension.kt

@@ -5,7 +5,7 @@ import android.content.Context
 import android.view.Gravity
 import android.widget.TableRow
 import android.widget.TextView
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
 import info.nightscout.androidaps.database.entities.TotalDailyDose
 import info.nightscout.shared.utils.DateUtil
 import info.nightscout.shared.interfaces.ResourceHelper

core/core-main/src/main/java/info/nightscout/androidaps/extensions/TrendArrowIcon.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.extensions
 
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
 import info.nightscout.androidaps.database.entities.GlucoseValue
 
 fun GlucoseValue.TrendArrow.directionToIcon(): Int {

core/core-main/src/main/java/info/nightscout/androidaps/extensions/UserEntryExt.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.extensions
 
-import info.nightscout.androidaps.core.R
+import info.nightscout.core.main.R
 import info.nightscout.androidaps.database.entities.UserEntry.*
 
 fun ColorGroup.colorId(): Int {