diff --git a/app-wear-shared/rx/build.gradle b/app-wear-shared/rx/build.gradle index 1b00eee9b4..6a22f8ff1f 100644 --- a/app-wear-shared/rx/build.gradle +++ b/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { diff --git a/app-wear-shared/shared-impl/build.gradle b/app-wear-shared/shared-impl/build.gradle index 04dcfe1d45..8d49bea8d6 100644 --- a/app-wear-shared/shared-impl/build.gradle +++ b/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/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" android { diff --git a/app-wear-shared/shared/build.gradle b/app-wear-shared/shared/build.gradle index 8556ce1965..0c1a53de8a 100644 --- a/app-wear-shared/shared/build.gradle +++ b/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { diff --git a/app/build.gradle b/app/build.gradle index 2107271ee5..6c3d114856 100644 --- a/app/build.gradle +++ b/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/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.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" /* diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.kt b/app/src/main/java/info/nightscout/androidaps/MainApp.kt index 7999cebb51..f5ff42cd2d 100644 --- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt +++ b/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 ) ) diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/NtpProgressDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/NtpProgressDialog.kt index 5336b64407..0c067964ab 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/NtpProgressDialog.kt +++ b/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.androidaps.core.databinding.DialogBolusprogressBinding +import info.nightscout.core.main.R +import info.nightscout.core.main.databinding.DialogBolusprogressBinding import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.rx.AapsSchedulers diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImpl.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImpl.kt index 4602046b05..d18e935800 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImpl.kt +++ b/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 diff --git a/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt b/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt index 9ca879b894..a0ddbacf5b 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt +++ b/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 diff --git a/automation/build.gradle b/automation/build.gradle index 0b7f76f4f4..c7f2486120 100644 --- a/automation/build.gradle +++ b/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.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') diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt index a734eed337..5cee80adf0 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt +++ b/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.androidaps.core.R.string.alarm)).thenReturn("Alarm") + `when`(rh.gs(info.nightscout.core.main.R.string.ok)).thenReturn("OK") + `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() { diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt index 39cef728f3..61bebe6282 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt +++ b/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() { diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt index bd2e39f48e..4d9679164d 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt +++ b/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 diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt index 5d7b09a612..f353efeb29 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt +++ b/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() { diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt index 6bfb258359..da7e057b1a 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt +++ b/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() { diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt index 38526d0f3a..22a8d204c6 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt +++ b/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() { diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt index 1b6c5f3c11..9b5084943b 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt +++ b/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.androidaps.core.R.string.notification)).thenReturn("Notification") + `when`(rh.gs(info.nightscout.core.main.R.string.ok)).thenReturn("OK") + `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() { diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchPercentTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchPercentTest.kt index 6d535ec8f5..f65294c664 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchPercentTest.kt +++ b/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() { diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt index efefe49f18..ae0b862b72 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt +++ b/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.androidaps.core.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.notexists)).thenReturn("not exists") + `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.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()) } } \ No newline at end of file diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionStartTempTargetTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionStartTempTargetTest.kt index 2232f77f26..9959e3f08d 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionStartTempTargetTest.kt +++ b/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() { diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt index f0f8b5a72c..771befbe00 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt +++ b/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.androidaps.core.R.string.error)).thenReturn("Error") + `when`(rh.gs(info.nightscout.core.main.R.string.ok)).thenReturn("OK") + `when`(rh.gs(info.nightscout.core.main.R.string.error)).thenReturn("Error") } } \ No newline at end of file diff --git a/automation/src/test/java/info/nightscout/automation/elements/StaticLabelTest.kt b/automation/src/test/java/info/nightscout/automation/elements/StaticLabelTest.kt index 64a9058643..a67f8470c6 100644 --- a/automation/src/test/java/info/nightscout/automation/elements/StaticLabelTest.kt +++ b/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") - sl = StaticLabel(rh, info.nightscout.androidaps.core.R.string.pumplimit, TriggerDummy(injector)) + `when`(rh.gs(info.nightscout.core.main.R.string.pumplimit)).thenReturn("pump limit") + sl = StaticLabel(rh, info.nightscout.core.main.R.string.pumplimit, TriggerDummy(injector)) Assert.assertEquals("pump limit", sl.label) } } \ No newline at end of file diff --git a/automation/src/test/java/info/nightscout/automation/triggers/TriggerAutosensValueTest.kt b/automation/src/test/java/info/nightscout/automation/triggers/TriggerAutosensValueTest.kt index e054fd2f8c..8c51fbf35a 100644 --- a/automation/src/test/java/info/nightscout/automation/triggers/TriggerAutosensValueTest.kt +++ b/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.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_max), ArgumentMatchers.anyDouble())).thenReturn(1.2) + `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 diff --git a/automation/src/test/java/info/nightscout/automation/triggers/TriggerBTDeviceTest.kt b/automation/src/test/java/info/nightscout/automation/triggers/TriggerBTDeviceTest.kt index c717c94d4f..c37dcb33ec 100644 --- a/automation/src/test/java/info/nightscout/automation/triggers/TriggerBTDeviceTest.kt +++ b/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() { diff --git a/automation/src/test/java/info/nightscout/automation/triggers/TriggerBgTest.kt b/automation/src/test/java/info/nightscout/automation/triggers/TriggerBgTest.kt index 98296a35c1..da9cf0d5b2 100644 --- a/automation/src/test/java/info/nightscout/automation/triggers/TriggerBgTest.kt +++ b/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 { diff --git a/automation/src/test/java/info/nightscout/automation/triggers/TriggerBolusAgoTest.kt b/automation/src/test/java/info/nightscout/automation/triggers/TriggerBolusAgoTest.kt index f2d2322a5f..30eff00a5a 100644 --- a/automation/src/test/java/info/nightscout/automation/triggers/TriggerBolusAgoTest.kt +++ b/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()) } } \ No newline at end of file diff --git a/automation/src/test/java/info/nightscout/automation/triggers/TriggerCOBTest.kt b/automation/src/test/java/info/nightscout/automation/triggers/TriggerCOBTest.kt index 7e7d3634b1..5d362d3657 100644 --- a/automation/src/test/java/info/nightscout/automation/triggers/TriggerCOBTest.kt +++ b/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 { diff --git a/automation/src/test/java/info/nightscout/automation/triggers/TriggerProfilePercentTest.kt b/automation/src/test/java/info/nightscout/automation/triggers/TriggerProfilePercentTest.kt index 961e624221..6006fc7ed5 100644 --- a/automation/src/test/java/info/nightscout/automation/triggers/TriggerProfilePercentTest.kt +++ b/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() { diff --git a/automation/src/test/java/info/nightscout/automation/triggers/TriggerPumpLastConnectionTest.kt b/automation/src/test/java/info/nightscout/automation/triggers/TriggerPumpLastConnectionTest.kt index bbb6ad5173..b29c0bde46 100644 --- a/automation/src/test/java/info/nightscout/automation/triggers/TriggerPumpLastConnectionTest.kt +++ b/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() { diff --git a/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeRangeTest.kt b/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeRangeTest.kt index f6268a57aa..636af3e650 100644 --- a/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeRangeTest.kt +++ b/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()) } } \ No newline at end of file diff --git a/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt b/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt index bdab5ffc22..27fbd804bc 100644 --- a/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt +++ b/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()) } } \ No newline at end of file diff --git a/automation/src/test/java/info/nightscout/automation/triggers/TriggerWifiSsidTest.kt b/automation/src/test/java/info/nightscout/automation/triggers/TriggerWifiSsidTest.kt index c7b8968427..ad114e9432 100644 --- a/automation/src/test/java/info/nightscout/automation/triggers/TriggerWifiSsidTest.kt +++ b/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() { diff --git a/core/.gitignore b/core/core-main/.gitignore similarity index 100% rename from core/.gitignore rename to core/core-main/.gitignore diff --git a/core/allopen_dependencies.gradle b/core/core-main/allopen_dependencies.gradle similarity index 100% rename from core/allopen_dependencies.gradle rename to core/core-main/allopen_dependencies.gradle diff --git a/core/android_dependencies.gradle b/core/core-main/android_dependencies.gradle similarity index 100% rename from core/android_dependencies.gradle rename to core/core-main/android_dependencies.gradle diff --git a/core/android_module_dependencies.gradle b/core/core-main/android_module_dependencies.gradle similarity index 100% rename from core/android_module_dependencies.gradle rename to core/core-main/android_module_dependencies.gradle diff --git a/core/build.gradle b/core/core-main/build.gradle similarity index 89% rename from core/build.gradle rename to core/core-main/build.gradle index e1c2733b7a..a9c7b2c2bc 100644 --- a/core/build.gradle +++ b/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.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' } diff --git a/core/consumer-rules.pro b/core/core-main/consumer-rules.pro similarity index 100% rename from core/consumer-rules.pro rename to core/core-main/consumer-rules.pro diff --git a/core/jacoco_global.gradle b/core/core-main/jacoco_global.gradle similarity index 100% rename from core/jacoco_global.gradle rename to core/core-main/jacoco_global.gradle diff --git a/core/proguard-rules.pro b/core/core-main/proguard-rules.pro similarity index 100% rename from core/proguard-rules.pro rename to core/core-main/proguard-rules.pro diff --git a/core/src/main/AndroidManifest.xml b/core/core-main/src/main/AndroidManifest.xml similarity index 100% rename from core/src/main/AndroidManifest.xml rename to core/core-main/src/main/AndroidManifest.xml diff --git a/core/src/main/java/info/nightscout/androidaps/activities/DaggerAppCompatActivityWithResult.kt b/core/core-main/src/main/java/info/nightscout/androidaps/activities/DaggerAppCompatActivityWithResult.kt similarity index 98% rename from core/src/main/java/info/nightscout/androidaps/activities/DaggerAppCompatActivityWithResult.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/activities/DaggerAppCompatActivityWithResult.kt index 90e2fe706f..b4d6d72760 100644 --- a/core/src/main/java/info/nightscout/androidaps/activities/DaggerAppCompatActivityWithResult.kt +++ b/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 diff --git a/core/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt b/core/core-main/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt diff --git a/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt b/core/core-main/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt similarity index 96% rename from core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt index c08dd5a6d9..7962fb0127 100644 --- a/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt +++ b/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 diff --git a/core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.kt b/core/core-main/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.kt diff --git a/core/src/main/java/info/nightscout/androidaps/data/InMemoryGlucoseValue.kt b/core/core-main/src/main/java/info/nightscout/androidaps/data/InMemoryGlucoseValue.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/data/InMemoryGlucoseValue.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/data/InMemoryGlucoseValue.kt diff --git a/core/src/main/java/info/nightscout/androidaps/data/IobTotal.kt b/core/core-main/src/main/java/info/nightscout/androidaps/data/IobTotal.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/data/IobTotal.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/data/IobTotal.kt diff --git a/core/src/main/java/info/nightscout/androidaps/data/LocalInsulin.kt b/core/core-main/src/main/java/info/nightscout/androidaps/data/LocalInsulin.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/data/LocalInsulin.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/data/LocalInsulin.kt diff --git a/core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt b/core/core-main/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt index 07b27916c1..2ffeeaaebf 100644 --- a/core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt +++ b/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 diff --git a/core/src/main/java/info/nightscout/androidaps/data/PumpEnactResultImpl.kt b/core/core-main/src/main/java/info/nightscout/androidaps/data/PumpEnactResultImpl.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/data/PumpEnactResultImpl.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/data/PumpEnactResultImpl.kt index eed77b2044..d3249b9959 100644 --- a/core/src/main/java/info/nightscout/androidaps/data/PumpEnactResultImpl.kt +++ b/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 diff --git a/core/src/main/java/info/nightscout/androidaps/data/PureProfile.kt b/core/core-main/src/main/java/info/nightscout/androidaps/data/PureProfile.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/data/PureProfile.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/data/PureProfile.kt diff --git a/core/src/main/java/info/nightscout/androidaps/data/Sms.kt b/core/core-main/src/main/java/info/nightscout/androidaps/data/Sms.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/data/Sms.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/data/Sms.kt diff --git a/core/src/main/java/info/nightscout/androidaps/di/CoreDataClassesModule.kt b/core/core-main/src/main/java/info/nightscout/androidaps/di/CoreDataClassesModule.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/di/CoreDataClassesModule.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/di/CoreDataClassesModule.kt diff --git a/core/src/main/java/info/nightscout/androidaps/di/CoreFragmentsModule.kt b/core/core-main/src/main/java/info/nightscout/androidaps/di/CoreFragmentsModule.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/di/CoreFragmentsModule.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/di/CoreFragmentsModule.kt diff --git a/core/src/main/java/info/nightscout/androidaps/di/CoreModule.kt b/core/core-main/src/main/java/info/nightscout/androidaps/di/CoreModule.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/di/CoreModule.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/di/CoreModule.kt diff --git a/core/src/main/java/info/nightscout/androidaps/di/CoreReceiversModule.kt b/core/core-main/src/main/java/info/nightscout/androidaps/di/CoreReceiversModule.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/di/CoreReceiversModule.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/di/CoreReceiversModule.kt diff --git a/core/src/main/java/info/nightscout/androidaps/di/StaticInjector.kt b/core/core-main/src/main/java/info/nightscout/androidaps/di/StaticInjector.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/di/StaticInjector.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/di/StaticInjector.kt diff --git a/core/src/main/java/info/nightscout/androidaps/di/ValidatorsModule.kt b/core/core-main/src/main/java/info/nightscout/androidaps/di/ValidatorsModule.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/di/ValidatorsModule.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/di/ValidatorsModule.kt diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt b/core/core-main/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt similarity index 98% rename from core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt index 0258993c5c..873714cfe7 100644 --- a/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt +++ b/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.androidaps.core.databinding.DialogBolusprogressBinding +import info.nightscout.core.main.R +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 diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt b/core/core-main/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt index 3417716d58..d9a175484a 100644 --- a/core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt +++ b/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 diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt b/core/core-main/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt similarity index 97% rename from core/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt index 9b901f2814..2faf1346d7 100644 --- a/core/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt +++ b/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.androidaps.core.databinding.DialogErrorBinding +import info.nightscout.core.main.R +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 diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt b/core/core-main/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt index 4206dad71c..83500f2793 100644 --- a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt +++ b/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.androidaps.core.databinding.DialogProfileviewerBinding +import info.nightscout.core.main.R +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 diff --git a/core/src/main/java/info/nightscout/androidaps/events/EventEffectiveProfileSwitchChanged.kt b/core/core-main/src/main/java/info/nightscout/androidaps/events/EventEffectiveProfileSwitchChanged.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/events/EventEffectiveProfileSwitchChanged.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/events/EventEffectiveProfileSwitchChanged.kt diff --git a/core/src/main/java/info/nightscout/androidaps/events/EventNewBG.kt b/core/core-main/src/main/java/info/nightscout/androidaps/events/EventNewBG.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/events/EventNewBG.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/events/EventNewBG.kt diff --git a/core/src/main/java/info/nightscout/androidaps/events/EventNewHistoryData.kt b/core/core-main/src/main/java/info/nightscout/androidaps/events/EventNewHistoryData.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/events/EventNewHistoryData.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/events/EventNewHistoryData.kt diff --git a/core/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt b/core/core-main/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt diff --git a/core/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt b/core/core-main/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt similarity index 97% rename from core/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt index b8e251c0eb..0f4b7dbb08 100644 --- a/core/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt +++ b/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 { diff --git a/core/src/main/java/info/nightscout/androidaps/events/EventStatus.kt b/core/core-main/src/main/java/info/nightscout/androidaps/events/EventStatus.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/events/EventStatus.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/events/EventStatus.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/BlockExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/BlockExtension.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/BlockExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/BlockExtension.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/BluetoothAdapterExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/BluetoothAdapterExtension.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/BluetoothAdapterExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/BluetoothAdapterExtension.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/BolusExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/BolusExtension.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/BolusExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/BolusExtension.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/Concurrency.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/Concurrency.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/Concurrency.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/Concurrency.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/EmptyRecyclerView.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/EmptyRecyclerView.kt similarity index 96% rename from core/src/main/java/info/nightscout/androidaps/extensions/EmptyRecyclerView.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/EmptyRecyclerView.kt index 7601bc1f08..6bb2afac9b 100644 --- a/core/src/main/java/info/nightscout/androidaps/extensions/EmptyRecyclerView.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/EmptyRecyclerView.kt @@ -1,91 +1,91 @@ -package info.nightscout.androidaps.extensions - -import android.content.Context -import android.util.AttributeSet -import android.view.View -import androidx.recyclerview.widget.RecyclerView -import info.nightscout.shared.extensions.runOnUiThread -import info.nightscout.shared.extensions.toVisibility - -class EmptyRecyclerView : RecyclerView { - - private var mEmptyView: View? = null - private var mLoadingView: View? = null - private var mIsLoading = true - - constructor(context: Context) : super(context) - constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) - constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle) - - private fun updateEmptyView() { - runOnUiThread { - val isEmpty = !mIsLoading && (adapter == null || adapter?.itemCount == 0) - visibility = isEmpty.not().toVisibility() - mEmptyView?.visibility = isEmpty.toVisibility() - } - } - - private fun updateLoadingView() { - runOnUiThread { - mLoadingView?.visibility = mIsLoading.toVisibility() - } - } - - private val observer: AdapterDataObserver = object : AdapterDataObserver() { - override fun onChanged() { - super.onChanged() - updateEmptyView() - } - - override fun onItemRangeInserted(positionStart: Int, itemCount: Int) { - super.onItemRangeInserted(positionStart, itemCount) - updateEmptyView() - } - - override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) { - super.onItemRangeRemoved(positionStart, itemCount) - updateEmptyView() - } - } - - override fun setAdapter(adapter: Adapter<*>?) { - val oldAdapter = getAdapter() - super.setAdapter(adapter) - update(oldAdapter, adapter) - } - - override fun swapAdapter(adapter: Adapter<*>?, removeAndRecycleExistingViews: Boolean) { - val oldAdapter = getAdapter() - super.swapAdapter(adapter, removeAndRecycleExistingViews) - update(oldAdapter, adapter) - } - - var emptyView: View? - get() = mEmptyView - set(view) { - mEmptyView = view - updateEmptyView() - } - - var loadingView: View? - get() = mLoadingView - set(view) { - mLoadingView = view - updateLoadingView() - } - - var isLoading: Boolean - get() = mIsLoading - set(loading) { - mIsLoading = loading - updateLoadingView() - } - - private fun update(oldAdapter: Adapter<*>?, newAdapter: Adapter<*>?) { - oldAdapter?.unregisterAdapterDataObserver(observer) - newAdapter?.registerAdapterDataObserver(observer) - updateEmptyView() - isLoading = false - updateLoadingView() - } -} +package info.nightscout.androidaps.extensions + +import android.content.Context +import android.util.AttributeSet +import android.view.View +import androidx.recyclerview.widget.RecyclerView +import info.nightscout.shared.extensions.runOnUiThread +import info.nightscout.shared.extensions.toVisibility + +class EmptyRecyclerView : RecyclerView { + + private var mEmptyView: View? = null + private var mLoadingView: View? = null + private var mIsLoading = true + + constructor(context: Context) : super(context) + constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) + constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle) + + private fun updateEmptyView() { + runOnUiThread { + val isEmpty = !mIsLoading && (adapter == null || adapter?.itemCount == 0) + visibility = isEmpty.not().toVisibility() + mEmptyView?.visibility = isEmpty.toVisibility() + } + } + + private fun updateLoadingView() { + runOnUiThread { + mLoadingView?.visibility = mIsLoading.toVisibility() + } + } + + private val observer: AdapterDataObserver = object : AdapterDataObserver() { + override fun onChanged() { + super.onChanged() + updateEmptyView() + } + + override fun onItemRangeInserted(positionStart: Int, itemCount: Int) { + super.onItemRangeInserted(positionStart, itemCount) + updateEmptyView() + } + + override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) { + super.onItemRangeRemoved(positionStart, itemCount) + updateEmptyView() + } + } + + override fun setAdapter(adapter: Adapter<*>?) { + val oldAdapter = getAdapter() + super.setAdapter(adapter) + update(oldAdapter, adapter) + } + + override fun swapAdapter(adapter: Adapter<*>?, removeAndRecycleExistingViews: Boolean) { + val oldAdapter = getAdapter() + super.swapAdapter(adapter, removeAndRecycleExistingViews) + update(oldAdapter, adapter) + } + + var emptyView: View? + get() = mEmptyView + set(view) { + mEmptyView = view + updateEmptyView() + } + + var loadingView: View? + get() = mLoadingView + set(view) { + mLoadingView = view + updateLoadingView() + } + + var isLoading: Boolean + get() = mIsLoading + set(loading) { + mIsLoading = loading + updateLoadingView() + } + + private fun update(oldAdapter: Adapter<*>?, newAdapter: Adapter<*>?) { + oldAdapter?.unregisterAdapterDataObserver(observer) + newAdapter?.registerAdapterDataObserver(observer) + updateEmptyView() + isLoading = false + updateLoadingView() + } +} diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/ExtendedBolusExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/ExtendedBolusExtension.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/ExtendedBolusExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/ExtendedBolusExtension.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/FoodExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/FoodExtension.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/FoodExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/FoodExtension.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/GlucoseValueExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/GlucoseValueExtension.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/GlucoseValueExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/GlucoseValueExtension.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/HexByteArrayConversion.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/HexByteArrayConversion.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/HexByteArrayConversion.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/HexByteArrayConversion.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/HtmlString.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/HtmlString.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/HtmlString.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/HtmlString.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/IntentExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/IntentExtension.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/IntentExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/IntentExtension.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/JSONObjectExt.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/JSONObjectExt.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/JSONObjectExt.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/JSONObjectExt.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/PumpStateExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/PumpStateExtension.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/PumpStateExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/PumpStateExtension.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/PumpTypeExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/PumpTypeExtension.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/PumpTypeExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/PumpTypeExtension.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt similarity index 97% rename from core/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt index 8e4e3f8998..763505043a 100644 --- a/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt +++ b/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 diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/TotalDailyDoseExtension.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/TotalDailyDoseExtension.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/extensions/TotalDailyDoseExtension.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/TotalDailyDoseExtension.kt index fa5afa61c9..417daeaefb 100644 --- a/core/src/main/java/info/nightscout/androidaps/extensions/TotalDailyDoseExtension.kt +++ b/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 diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/TrendArrowIcon.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/TrendArrowIcon.kt similarity index 95% rename from core/src/main/java/info/nightscout/androidaps/extensions/TrendArrowIcon.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/TrendArrowIcon.kt index 01fbcbe91a..1331e7c4c5 100644 --- a/core/src/main/java/info/nightscout/androidaps/extensions/TrendArrowIcon.kt +++ b/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 { diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/UserEntryExt.kt b/core/core-main/src/main/java/info/nightscout/androidaps/extensions/UserEntryExt.kt similarity index 94% rename from core/src/main/java/info/nightscout/androidaps/extensions/UserEntryExt.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/extensions/UserEntryExt.kt index 2e5c75787f..f766b727f0 100644 --- a/core/src/main/java/info/nightscout/androidaps/extensions/UserEntryExt.kt +++ b/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 { diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/APS.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/APS.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/APS.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/APS.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ActivePlugin.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/ActivePlugin.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/ActivePlugin.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/ActivePlugin.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/BgSource.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/BgSource.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/BgSource.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/BgSource.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueue.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/CommandQueue.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueue.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/CommandQueue.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Constraints.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Constraints.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/Constraints.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Constraints.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DataSyncSelector.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/DataSyncSelector.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/DataSyncSelector.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/DataSyncSelector.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DetermineBasalAdapterInterface.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/DetermineBasalAdapterInterface.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/DetermineBasalAdapterInterface.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/DetermineBasalAdapterInterface.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Insulin.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Insulin.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/Insulin.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Insulin.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Loop.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Loop.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/Loop.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Loop.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileSource.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/ProfileSource.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/ProfileSource.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/ProfileSource.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt similarity index 95% rename from core/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt index 32d42efefd..f9744b0681 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.interfaces import android.os.SystemClock import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.interfaces.PluginBase import info.nightscout.interfaces.PluginDescription import info.nightscout.interfaces.PluginType diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Sensitivity.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Sensitivity.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/Sensitivity.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Sensitivity.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/TrendCalculator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/TrendCalculator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/TrendCalculator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/TrendCalculator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/XDripBroadcast.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/XDripBroadcast.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/XDripBroadcast.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/XDripBroadcast.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/stats/DexcomTIR.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/stats/DexcomTIR.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/stats/DexcomTIR.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/stats/DexcomTIR.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/stats/DexcomTirCalculator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/stats/DexcomTirCalculator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/stats/DexcomTirCalculator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/stats/DexcomTirCalculator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/stats/TIR.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/stats/TIR.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/stats/TIR.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/stats/TIR.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/stats/TddCalculator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/stats/TddCalculator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/stats/TddCalculator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/stats/TddCalculator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/stats/TirCalculator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/interfaces/stats/TirCalculator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/interfaces/stats/TirCalculator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/interfaces/stats/TirCalculator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt b/core/core-main/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt index f8414ac217..5820ea7c86 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.aps.loop import android.text.Spanned import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.data.IobTotal import info.nightscout.androidaps.database.entities.GlucoseValue import info.nightscout.androidaps.extensions.convertedToAbsolute diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt index c0b656bed7..1c7980e542 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.constraints.versionChecker import android.os.Build -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.interfaces.Config import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt index 79aabc5acc..67a8a3f3e3 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.maintenance import android.content.Context import android.os.Environment import info.nightscout.androidaps.annotations.OpenForTesting -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils import info.nightscout.androidaps.plugins.general.maintenance.formats.EncryptedPrefsFormat import info.nightscout.interfaces.Config diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFileContract.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFileContract.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFileContract.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFileContract.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt similarity index 96% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt index 1534c51271..b01410c029 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt @@ -11,9 +11,9 @@ import androidx.fragment.app.FragmentActivity import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import dagger.android.support.DaggerAppCompatActivity -import info.nightscout.androidaps.core.R -import info.nightscout.androidaps.core.databinding.MaintenanceImportListActivityBinding -import info.nightscout.androidaps.core.databinding.MaintenanceImportListItemBinding +import info.nightscout.core.main.R +import info.nightscout.core.main.databinding.MaintenanceImportListActivityBinding +import info.nightscout.core.main.databinding.MaintenanceImportListItemBinding import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider import info.nightscout.interfaces.data.maintenance.PrefsFile import info.nightscout.androidaps.plugins.general.maintenance.PrefsFileContract diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt index ac7b2a4323..80fb603c22 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.general.maintenance.formats -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.utils.CryptoUtil import info.nightscout.androidaps.extensions.hexStringToByteArray import info.nightscout.androidaps.extensions.toHex diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt index c5b98edc1f..894d572117 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt @@ -7,7 +7,7 @@ import androidx.annotation.DrawableRes import com.jjoe64.graphview.series.BarGraphSeries import com.jjoe64.graphview.series.DataPoint import com.jjoe64.graphview.series.LineGraphSeries -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.data.IobTotal import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.database.ValueWrapper diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusProgressIfRunning.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusProgressIfRunning.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusProgressIfRunning.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusProgressIfRunning.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissNotification.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissNotification.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissNotification.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissNotification.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventNewNotification.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventNewNotification.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventNewNotification.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventNewNotification.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/AreaGraphSeries.java b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/AreaGraphSeries.java similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/AreaGraphSeries.java rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/AreaGraphSeries.java diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/BolusDataPoint.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/BolusDataPoint.kt similarity index 97% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/BolusDataPoint.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/BolusDataPoint.kt index de29e58319..e457c921f7 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/BolusDataPoint.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/BolusDataPoint.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.general.overview.graphExtensions import android.content.Context -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.entities.Bolus import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.shared.interfaces.ResourceHelper diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/CarbsDataPoint.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/CarbsDataPoint.kt similarity index 95% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/CarbsDataPoint.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/CarbsDataPoint.kt index ca9c3bcf7f..9290e87b5e 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/CarbsDataPoint.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/CarbsDataPoint.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.general.overview.graphExtensions import android.content.Context -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.entities.Carbs import info.nightscout.shared.interfaces.ResourceHelper diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DataPointWithLabelInterface.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DataPointWithLabelInterface.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DataPointWithLabelInterface.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DataPointWithLabelInterface.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DeviationDataPoint.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DeviationDataPoint.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DeviationDataPoint.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DeviationDataPoint.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DoubleDataPoint.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DoubleDataPoint.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DoubleDataPoint.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DoubleDataPoint.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/EffectiveProfileSwitchDataPoint.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/EffectiveProfileSwitchDataPoint.kt similarity index 96% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/EffectiveProfileSwitchDataPoint.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/EffectiveProfileSwitchDataPoint.kt index e17131a927..05f3dcbe89 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/EffectiveProfileSwitchDataPoint.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/EffectiveProfileSwitchDataPoint.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.general.overview.graphExtensions import android.content.Context -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.utils.T diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ExtendedBolusDataPoint.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ExtendedBolusDataPoint.kt similarity index 95% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ExtendedBolusDataPoint.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ExtendedBolusDataPoint.kt index 19a9b037f4..00ad4ce522 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ExtendedBolusDataPoint.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ExtendedBolusDataPoint.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.general.overview.graphExtensions import android.content.Context -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.entities.ExtendedBolus import info.nightscout.androidaps.extensions.toStringTotal import info.nightscout.shared.interfaces.ResourceHelper diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/FixedLineGraphSeries.java b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/FixedLineGraphSeries.java similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/FixedLineGraphSeries.java rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/FixedLineGraphSeries.java diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/GlucoseValueDataPoint.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/GlucoseValueDataPoint.kt similarity index 98% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/GlucoseValueDataPoint.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/GlucoseValueDataPoint.kt index e6e6968ef6..433183be52 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/GlucoseValueDataPoint.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/GlucoseValueDataPoint.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.general.overview.graphExtensions import android.content.Context import info.nightscout.interfaces.Constants -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.entities.GlucoseValue import info.nightscout.interfaces.GlucoseUnit import info.nightscout.androidaps.interfaces.Profile diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/InMemoryGlucoseValueDataPoint.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/InMemoryGlucoseValueDataPoint.kt similarity index 96% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/InMemoryGlucoseValueDataPoint.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/InMemoryGlucoseValueDataPoint.kt index 59b26025e7..58ea6df7b6 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/InMemoryGlucoseValueDataPoint.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/InMemoryGlucoseValueDataPoint.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.general.overview.graphExtensions import android.content.Context import info.nightscout.interfaces.Constants -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.data.InMemoryGlucoseValue import info.nightscout.interfaces.GlucoseUnit import info.nightscout.androidaps.interfaces.ProfileFunction diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java index 1edec982f5..8347de420b 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java @@ -17,7 +17,7 @@ import com.jjoe64.graphview.series.BaseSeries; import java.util.Iterator; -import info.nightscout.androidaps.core.R; +import info.nightscout.core.main.R; /** * Series that plots the data as points. diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ScaledDataPoint.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ScaledDataPoint.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ScaledDataPoint.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ScaledDataPoint.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TherapyEventDataPoint.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TherapyEventDataPoint.kt similarity index 98% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TherapyEventDataPoint.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TherapyEventDataPoint.kt index d1ca2efca4..44a9af4aa9 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TherapyEventDataPoint.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TherapyEventDataPoint.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.general.overview.graphExtensions import android.content.Context import info.nightscout.interfaces.Constants -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.entities.TherapyEvent import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TimeAsXAxisLabelFormatter.java b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TimeAsXAxisLabelFormatter.java similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TimeAsXAxisLabelFormatter.java rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TimeAsXAxisLabelFormatter.java diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/BasalData.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/BasalData.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/BasalData.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/BasalData.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.kt similarity index 96% rename from core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.kt index 65e6ae87b9..59151086ff 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.shared.utils.DateUtil import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.shared.interfaces.ResourceHelper diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatusProvider.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatusProvider.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatusProvider.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatusProvider.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.kt index 798aa29f95..d24d58611e 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator.data import android.content.Context import dagger.android.HasAndroidInjector import info.nightscout.interfaces.Constants -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.entities.Carbs import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.shared.interfaces.ResourceHelper diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventBucketedDataCreated.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventBucketedDataCreated.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventBucketedDataCreated.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventBucketedDataCreated.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt index 95cdceeac5..026b20030d 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt @@ -11,7 +11,7 @@ import android.provider.Settings import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.extensions.safeEnable import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.androidaps.utils.alertDialogs.OKDialog diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/TemporaryBasalStorage.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/TemporaryBasalStorage.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/TemporaryBasalStorage.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/TemporaryBasalStorage.kt diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java rename to core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java diff --git a/core/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt b/core/core-main/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt similarity index 97% rename from core/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt index faba5a75a8..652d04c773 100644 --- a/core/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.queue.commands import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.data.PumpEnactResultImpl import info.nightscout.androidaps.database.AppRepository import info.nightscout.shared.interfaces.ResourceHelper diff --git a/core/src/main/java/info/nightscout/androidaps/receivers/DataWorkerStorage.kt b/core/core-main/src/main/java/info/nightscout/androidaps/receivers/DataWorkerStorage.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/receivers/DataWorkerStorage.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/receivers/DataWorkerStorage.kt diff --git a/core/src/main/java/info/nightscout/androidaps/receivers/Intents.kt b/core/core-main/src/main/java/info/nightscout/androidaps/receivers/Intents.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/receivers/Intents.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/receivers/Intents.kt diff --git a/core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt b/core/core-main/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt diff --git a/core/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt b/core/core-main/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt diff --git a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt b/core/core-main/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt index 396e1ca8d0..f16e684a4b 100644 --- a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt @@ -9,7 +9,7 @@ import android.os.Handler import android.os.IBinder import android.os.Looper import dagger.android.DaggerService -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.interfaces.NotificationHolder import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.rx.logging.AAPSLogger diff --git a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt b/core/core-main/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ActionModeHelper.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ActionModeHelper.kt similarity index 96% rename from core/src/main/java/info/nightscout/androidaps/utils/ActionModeHelper.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ActionModeHelper.kt index 97d023cca9..01aafc2a4d 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/ActionModeHelper.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ActionModeHelper.kt @@ -1,185 +1,185 @@ -package info.nightscout.androidaps.utils - -import android.util.SparseArray -import android.view.ActionMode -import android.view.Menu -import android.view.MenuInflater -import android.view.MenuItem -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentActivity -import info.nightscout.androidaps.core.R - -import info.nightscout.shared.interfaces.ResourceHelper - -class ActionModeHelper(val rh: ResourceHelper, val activity: FragmentActivity?, val fragment: Fragment?) { - - var enableSort = false - private var selectedItems: SparseArray = SparseArray() - private var actionMode: ActionMode? = null - private var removeActionMode: ActionMode? = null - private var sortActionMode: ActionMode? = null - private var onRemove: ((selectedItems: SparseArray) -> Unit)? = null - private var onUpdate: (() -> Unit)? = null - - private val inSingleFragment: Boolean - get() { - val parentClass = this.activity?.let { it::class.simpleName } - return parentClass == "SingleFragmentActivity" - } - - private val enableRemove: Boolean - get() = onRemove != null - - val isNoAction: Boolean - get() = actionMode == null && removeActionMode == null && sortActionMode == null - - val isSorting: Boolean - get() = sortActionMode != null - - val isRemoving: Boolean - get() = removeActionMode != null - - fun onOptionsItemSelected(item: MenuItem): Boolean { - return when (item.itemId) { - R.id.nav_remove_items -> { - removeActionMode = activity?.startActionMode(RemoveActionModeCallback()) - true - } - - R.id.nav_sort_items -> { - sortActionMode = activity?.startActionMode(SortActionModeCallback()) - true - } - - else -> false - } - } - - fun updateSelection(position: Int, item: T, selected: Boolean) { - if (selected) { - selectedItems.put(position, item) - } else { - selectedItems.remove(position) - } - removeActionMode?.title = rh.gs(R.string.count_selected, selectedItems.size()) - } - - fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - if (inSingleFragment) { - inflater.inflate(R.menu.menu_actions, menu) - } else if (fragment?.isResumed == true) { - menu.add(Menu.FIRST, R.id.nav_remove_items, 0, rh.gs(R.string.remove_items)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) - menu.add(Menu.FIRST, R.id.nav_sort_items, 0, rh.gs(R.string.sort_items)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) - menu.setGroupDividerEnabled(true) - } - } - - fun onPrepareOptionsMenu(menu: Menu) { - menu.findItem(R.id.nav_remove_items)?.isVisible = enableRemove - menu.findItem(R.id.nav_sort_items)?.isVisible = enableSort - } - - fun startAction(): Boolean { - if (isNoAction) { - actionMode = activity?.startActionMode(ActionModeCallback()) - return true - } - return false - } - - fun startRemove(): Boolean { - if (removeActionMode == null) { - removeActionMode = activity?.startActionMode(RemoveActionModeCallback()) - return true - } - return false - } - - fun isSelected(position: Int) = - selectedItems.get(position) != null - - fun setOnRemoveHandler(onRemove: (selectedItems: SparseArray) -> Unit) { - this.onRemove = onRemove - } - - fun setUpdateListHandler(onUpdate: () -> Unit) { - this.onUpdate = onUpdate - } - - fun finish() { - actionMode?.finish() - removeActionMode?.finish() - sortActionMode?.finish() - } - - private inner class ActionModeCallback : ActionMode.Callback { - - override fun onCreateActionMode(mode: ActionMode, menu: Menu?): Boolean { - mode.title = activity?.title - mode.menuInflater.inflate(R.menu.menu_actions, menu) - onUpdate?.let { it() } - return true - } - - override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?) = false - - override fun onActionItemClicked(mode: ActionMode, item: MenuItem) = - onOptionsItemSelected(item) - - override fun onDestroyActionMode(mode: ActionMode?) { - actionMode = null - } - } - - private inner class SortActionModeCallback : ActionMode.Callback { - - override fun onCreateActionMode(mode: ActionMode, menu: Menu?): Boolean { - mode.title = rh.gs(R.string.sort_label) - onUpdate?.let { it() } - return true - } - - override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?) = false - - override fun onActionItemClicked(mode: ActionMode, item: MenuItem) = false - - override fun onDestroyActionMode(mode: ActionMode?) { - sortActionMode = null - onUpdate?.let { it() } - } - } - - private inner class RemoveActionModeCallback : ActionMode.Callback { - - override fun onCreateActionMode(mode: ActionMode, menu: Menu?): Boolean { - mode.menuInflater.inflate(R.menu.menu_delete_selection, menu) - selectedItems.clear() - mode.title = rh.gs(R.string.count_selected, selectedItems.size()) - onUpdate?.let { it() } - return true - } - - override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?) = false - - override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean { - return when (item.itemId) { - R.id.remove_selected -> { - if (selectedItems.size() > 0) { - onRemove?.let { it(selectedItems) } - } else { - finish() - } - true - } - - else -> false - } - } - - override fun onDestroyActionMode(mode: ActionMode?) { - removeActionMode = null - onUpdate?.let { it() } - } - } - -} +package info.nightscout.androidaps.utils + +import android.util.SparseArray +import android.view.ActionMode +import android.view.Menu +import android.view.MenuInflater +import android.view.MenuItem +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity +import info.nightscout.core.main.R + +import info.nightscout.shared.interfaces.ResourceHelper + +class ActionModeHelper(val rh: ResourceHelper, val activity: FragmentActivity?, val fragment: Fragment?) { + + var enableSort = false + private var selectedItems: SparseArray = SparseArray() + private var actionMode: ActionMode? = null + private var removeActionMode: ActionMode? = null + private var sortActionMode: ActionMode? = null + private var onRemove: ((selectedItems: SparseArray) -> Unit)? = null + private var onUpdate: (() -> Unit)? = null + + private val inSingleFragment: Boolean + get() { + val parentClass = this.activity?.let { it::class.simpleName } + return parentClass == "SingleFragmentActivity" + } + + private val enableRemove: Boolean + get() = onRemove != null + + val isNoAction: Boolean + get() = actionMode == null && removeActionMode == null && sortActionMode == null + + val isSorting: Boolean + get() = sortActionMode != null + + val isRemoving: Boolean + get() = removeActionMode != null + + fun onOptionsItemSelected(item: MenuItem): Boolean { + return when (item.itemId) { + R.id.nav_remove_items -> { + removeActionMode = activity?.startActionMode(RemoveActionModeCallback()) + true + } + + R.id.nav_sort_items -> { + sortActionMode = activity?.startActionMode(SortActionModeCallback()) + true + } + + else -> false + } + } + + fun updateSelection(position: Int, item: T, selected: Boolean) { + if (selected) { + selectedItems.put(position, item) + } else { + selectedItems.remove(position) + } + removeActionMode?.title = rh.gs(R.string.count_selected, selectedItems.size()) + } + + fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + if (inSingleFragment) { + inflater.inflate(R.menu.menu_actions, menu) + } else if (fragment?.isResumed == true) { + menu.add(Menu.FIRST, R.id.nav_remove_items, 0, rh.gs(R.string.remove_items)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) + menu.add(Menu.FIRST, R.id.nav_sort_items, 0, rh.gs(R.string.sort_items)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) + menu.setGroupDividerEnabled(true) + } + } + + fun onPrepareOptionsMenu(menu: Menu) { + menu.findItem(R.id.nav_remove_items)?.isVisible = enableRemove + menu.findItem(R.id.nav_sort_items)?.isVisible = enableSort + } + + fun startAction(): Boolean { + if (isNoAction) { + actionMode = activity?.startActionMode(ActionModeCallback()) + return true + } + return false + } + + fun startRemove(): Boolean { + if (removeActionMode == null) { + removeActionMode = activity?.startActionMode(RemoveActionModeCallback()) + return true + } + return false + } + + fun isSelected(position: Int) = + selectedItems.get(position) != null + + fun setOnRemoveHandler(onRemove: (selectedItems: SparseArray) -> Unit) { + this.onRemove = onRemove + } + + fun setUpdateListHandler(onUpdate: () -> Unit) { + this.onUpdate = onUpdate + } + + fun finish() { + actionMode?.finish() + removeActionMode?.finish() + sortActionMode?.finish() + } + + private inner class ActionModeCallback : ActionMode.Callback { + + override fun onCreateActionMode(mode: ActionMode, menu: Menu?): Boolean { + mode.title = activity?.title + mode.menuInflater.inflate(R.menu.menu_actions, menu) + onUpdate?.let { it() } + return true + } + + override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?) = false + + override fun onActionItemClicked(mode: ActionMode, item: MenuItem) = + onOptionsItemSelected(item) + + override fun onDestroyActionMode(mode: ActionMode?) { + actionMode = null + } + } + + private inner class SortActionModeCallback : ActionMode.Callback { + + override fun onCreateActionMode(mode: ActionMode, menu: Menu?): Boolean { + mode.title = rh.gs(R.string.sort_label) + onUpdate?.let { it() } + return true + } + + override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?) = false + + override fun onActionItemClicked(mode: ActionMode, item: MenuItem) = false + + override fun onDestroyActionMode(mode: ActionMode?) { + sortActionMode = null + onUpdate?.let { it() } + } + } + + private inner class RemoveActionModeCallback : ActionMode.Callback { + + override fun onCreateActionMode(mode: ActionMode, menu: Menu?): Boolean { + mode.menuInflater.inflate(R.menu.menu_delete_selection, menu) + selectedItems.clear() + mode.title = rh.gs(R.string.count_selected, selectedItems.size()) + onUpdate?.let { it() } + return true + } + + override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?) = false + + override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean { + return when (item.itemId) { + R.id.remove_selected -> { + if (selectedItems.size() > 0) { + onRemove?.let { it(selectedItems) } + } else { + finish() + } + true + } + + else -> false + } + } + + override fun onDestroyActionMode(mode: ActionMode?) { + removeActionMode = null + onUpdate?.let { it() } + } + } + +} diff --git a/core/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt similarity index 97% rename from core/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt index 18beeac298..7146746b1d 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt @@ -1,127 +1,127 @@ -package info.nightscout.androidaps.utils - -import info.nightscout.androidaps.extensions.toHex -import info.nightscout.rx.logging.AAPSLogger -import org.spongycastle.util.encoders.Base64 -import java.nio.ByteBuffer -import java.security.MessageDigest -import java.security.SecureRandom -import java.security.spec.KeySpec -import javax.crypto.Cipher -import javax.crypto.Mac -import javax.crypto.SecretKey -import javax.crypto.SecretKeyFactory -import javax.crypto.spec.GCMParameterSpec -import javax.crypto.spec.PBEKeySpec -import javax.crypto.spec.SecretKeySpec -import javax.inject.Inject -import javax.inject.Singleton - -@Suppress("SpellCheckingInspection") -@Singleton -class CryptoUtil @Inject constructor( - val aapsLogger: AAPSLogger -) { - - companion object { - private const val IV_LENGTH_BYTE = 12 - private const val TAG_LENGTH_BIT = 128 - private const val AES_KEY_SIZE_BIT = 256 - private const val PBKDF2_ITERATIONS = 50000 // check delays it cause on real device - private const val SALT_SIZE_BYTE = 32 - } - - private val secureRandom: SecureRandom = SecureRandom() - var lastException: Exception? = null - - fun sha256(source: String): String { - val digest = MessageDigest.getInstance("SHA-256") - val hashRaw = digest.digest(source.toByteArray()) - return hashRaw.toHex() - } - - fun hmac256(str: String, secret: String): String { - val sha256HMAC = Mac.getInstance("HmacSHA256") - val secretKey = SecretKeySpec(secret.toByteArray(), "HmacSHA256") - sha256HMAC.init(secretKey) - return sha256HMAC.doFinal(str.toByteArray()).toHex() - } - - private fun prepCipherKey(passPhrase: String, salt: ByteArray, iterationCount: Int = PBKDF2_ITERATIONS, keyStrength: Int = AES_KEY_SIZE_BIT): SecretKeySpec { - val factory: SecretKeyFactory = SecretKeyFactory.getInstance("PBKDF2withHmacSHA1") - val spec: KeySpec = PBEKeySpec(passPhrase.toCharArray(), salt, iterationCount, keyStrength) - val tmp: SecretKey = factory.generateSecret(spec) - return SecretKeySpec(tmp.encoded, "AES") - } - - fun mineSalt(len: Int = SALT_SIZE_BYTE): ByteArray { - val salt = ByteArray(len) - secureRandom.nextBytes(salt) - return salt - } - - fun encrypt(passPhrase: String, salt: ByteArray, rawData: String): String? { - val iv: ByteArray? - val encrypted: ByteArray? - return try { - lastException = null - iv = ByteArray(IV_LENGTH_BYTE) - secureRandom.nextBytes(iv) - val cipherEnc: Cipher = Cipher.getInstance("AES/GCM/NoPadding") - cipherEnc.init(Cipher.ENCRYPT_MODE, prepCipherKey(passPhrase, salt), GCMParameterSpec(TAG_LENGTH_BIT, iv)) - encrypted = cipherEnc.doFinal(rawData.toByteArray()) ?: return null - val byteBuffer: ByteBuffer = ByteBuffer.allocate(1 + iv.size + encrypted.size) - byteBuffer.put(iv.size.toByte()) - byteBuffer.put(iv) - byteBuffer.put(encrypted) - String(Base64.encode(byteBuffer.array())) - } catch (e: Exception) { - lastException = e - aapsLogger.error("Encryption failed due to technical exception: $e") - null - } - } - - fun decrypt(passPhrase: String, salt: ByteArray, encryptedData: String): String? { - val iv: ByteArray? - val encrypted: ByteArray? - return try { - lastException = null - val byteBuffer = ByteBuffer.wrap(Base64.decode(encryptedData)) - val ivLength = byteBuffer.get().toInt() - iv = ByteArray(ivLength) - byteBuffer[iv] - encrypted = ByteArray(byteBuffer.remaining()) - byteBuffer[encrypted] - val cipherDec: Cipher = Cipher.getInstance("AES/GCM/NoPadding") - cipherDec.init(Cipher.DECRYPT_MODE, prepCipherKey(passPhrase, salt), GCMParameterSpec(TAG_LENGTH_BIT, iv)) - val dec = cipherDec.doFinal(encrypted) - String(dec) - } catch (e: Exception) { - lastException = e - aapsLogger.error("Decryption failed due to technical exception: $e") - null - } - } - - fun checkPassword(password: String, referenceHash: String): Boolean { - return if (referenceHash.startsWith("hmac:")) { - val hashSegments = referenceHash.split(":") - if (hashSegments.size != 3) - return false - return hmac256(password, hashSegments[1]) == hashSegments[2] - } else { - password == referenceHash - } - } - - fun hashPassword(password: String): String { - return if (!password.startsWith("hmac:")) { - val salt = mineSalt().toHex() - return "hmac:${salt}:${hmac256(password, salt)}" - } else { - password - } - } - +package info.nightscout.androidaps.utils + +import info.nightscout.androidaps.extensions.toHex +import info.nightscout.rx.logging.AAPSLogger +import org.spongycastle.util.encoders.Base64 +import java.nio.ByteBuffer +import java.security.MessageDigest +import java.security.SecureRandom +import java.security.spec.KeySpec +import javax.crypto.Cipher +import javax.crypto.Mac +import javax.crypto.SecretKey +import javax.crypto.SecretKeyFactory +import javax.crypto.spec.GCMParameterSpec +import javax.crypto.spec.PBEKeySpec +import javax.crypto.spec.SecretKeySpec +import javax.inject.Inject +import javax.inject.Singleton + +@Suppress("SpellCheckingInspection") +@Singleton +class CryptoUtil @Inject constructor( + val aapsLogger: AAPSLogger +) { + + companion object { + private const val IV_LENGTH_BYTE = 12 + private const val TAG_LENGTH_BIT = 128 + private const val AES_KEY_SIZE_BIT = 256 + private const val PBKDF2_ITERATIONS = 50000 // check delays it cause on real device + private const val SALT_SIZE_BYTE = 32 + } + + private val secureRandom: SecureRandom = SecureRandom() + var lastException: Exception? = null + + fun sha256(source: String): String { + val digest = MessageDigest.getInstance("SHA-256") + val hashRaw = digest.digest(source.toByteArray()) + return hashRaw.toHex() + } + + fun hmac256(str: String, secret: String): String { + val sha256HMAC = Mac.getInstance("HmacSHA256") + val secretKey = SecretKeySpec(secret.toByteArray(), "HmacSHA256") + sha256HMAC.init(secretKey) + return sha256HMAC.doFinal(str.toByteArray()).toHex() + } + + private fun prepCipherKey(passPhrase: String, salt: ByteArray, iterationCount: Int = PBKDF2_ITERATIONS, keyStrength: Int = AES_KEY_SIZE_BIT): SecretKeySpec { + val factory: SecretKeyFactory = SecretKeyFactory.getInstance("PBKDF2withHmacSHA1") + val spec: KeySpec = PBEKeySpec(passPhrase.toCharArray(), salt, iterationCount, keyStrength) + val tmp: SecretKey = factory.generateSecret(spec) + return SecretKeySpec(tmp.encoded, "AES") + } + + fun mineSalt(len: Int = SALT_SIZE_BYTE): ByteArray { + val salt = ByteArray(len) + secureRandom.nextBytes(salt) + return salt + } + + fun encrypt(passPhrase: String, salt: ByteArray, rawData: String): String? { + val iv: ByteArray? + val encrypted: ByteArray? + return try { + lastException = null + iv = ByteArray(IV_LENGTH_BYTE) + secureRandom.nextBytes(iv) + val cipherEnc: Cipher = Cipher.getInstance("AES/GCM/NoPadding") + cipherEnc.init(Cipher.ENCRYPT_MODE, prepCipherKey(passPhrase, salt), GCMParameterSpec(TAG_LENGTH_BIT, iv)) + encrypted = cipherEnc.doFinal(rawData.toByteArray()) ?: return null + val byteBuffer: ByteBuffer = ByteBuffer.allocate(1 + iv.size + encrypted.size) + byteBuffer.put(iv.size.toByte()) + byteBuffer.put(iv) + byteBuffer.put(encrypted) + String(Base64.encode(byteBuffer.array())) + } catch (e: Exception) { + lastException = e + aapsLogger.error("Encryption failed due to technical exception: $e") + null + } + } + + fun decrypt(passPhrase: String, salt: ByteArray, encryptedData: String): String? { + val iv: ByteArray? + val encrypted: ByteArray? + return try { + lastException = null + val byteBuffer = ByteBuffer.wrap(Base64.decode(encryptedData)) + val ivLength = byteBuffer.get().toInt() + iv = ByteArray(ivLength) + byteBuffer[iv] + encrypted = ByteArray(byteBuffer.remaining()) + byteBuffer[encrypted] + val cipherDec: Cipher = Cipher.getInstance("AES/GCM/NoPadding") + cipherDec.init(Cipher.DECRYPT_MODE, prepCipherKey(passPhrase, salt), GCMParameterSpec(TAG_LENGTH_BIT, iv)) + val dec = cipherDec.doFinal(encrypted) + String(dec) + } catch (e: Exception) { + lastException = e + aapsLogger.error("Decryption failed due to technical exception: $e") + null + } + } + + fun checkPassword(password: String, referenceHash: String): Boolean { + return if (referenceHash.startsWith("hmac:")) { + val hashSegments = referenceHash.split(":") + if (hashSegments.size != 3) + return false + return hmac256(password, hashSegments[1]) == hashSegments[2] + } else { + password == referenceHash + } + } + + fun hashPassword(password: String): String { + return if (!password.startsWith("hmac:")) { + val salt = mineSalt().toHex() + return "hmac:${salt}:${hmac256(password, salt)}" + } else { + password + } + } + } \ No newline at end of file diff --git a/core/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.kt similarity index 97% rename from core/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.kt index 787be730c0..811888d85e 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.utils -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.interfaces.Pump import info.nightscout.shared.interfaces.ResourceHelper import java.text.DecimalFormat diff --git a/core/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt index 27c49d87a8..b346feaffc 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.utils import info.nightscout.interfaces.Constants import info.nightscout.androidaps.annotations.OpenForTesting -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.interfaces.GlucoseUnit import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction diff --git a/core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt index 1b9cc5b517..8d3f433c62 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt @@ -6,7 +6,7 @@ import com.google.firebase.analytics.ktx.analytics import com.google.firebase.crashlytics.FirebaseCrashlytics import com.google.firebase.ktx.Firebase import info.nightscout.androidaps.annotations.OpenForTesting -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag import info.nightscout.shared.sharedPreferences.SP diff --git a/core/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt index c077c761be..42f95d4e2c 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.utils import android.content.Context import info.nightscout.androidaps.annotations.OpenForTesting -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.database.transactions.InsertTherapyEventAnnouncementTransaction import info.nightscout.shared.interfaces.ResourceHelper diff --git a/core/src/main/java/info/nightscout/androidaps/utils/InstanceId.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/InstanceId.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/InstanceId.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/InstanceId.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ToastUtils.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ToastUtils.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/utils/ToastUtils.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ToastUtils.kt index 4cff217013..deb391ed0c 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/ToastUtils.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ToastUtils.kt @@ -12,7 +12,7 @@ import android.widget.Toast import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.appcompat.view.ContextThemeWrapper -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification import info.nightscout.interfaces.notifications.Notification import info.nightscout.androidaps.utils.resources.getThemeColor diff --git a/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/Translator.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/utils/Translator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/Translator.kt index 601d64a0aa..86eadfbda1 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/Translator.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.utils -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.entities.OfflineEvent import info.nightscout.androidaps.database.entities.TemporaryTarget import info.nightscout.androidaps.database.entities.TherapyEvent diff --git a/core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt similarity index 97% rename from core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt index b705d64e3c..5567bf256c 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.utils import android.widget.TextView -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.entities.TherapyEvent import info.nightscout.androidaps.extensions.isOlderThan import info.nightscout.shared.interfaces.ResourceHelper diff --git a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt similarity index 97% rename from core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt index fd68b96034..f839a8fd57 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt @@ -10,7 +10,7 @@ import androidx.annotation.LayoutRes import androidx.annotation.StyleRes import androidx.appcompat.view.ContextThemeWrapper import com.google.android.material.dialog.MaterialAlertDialogBuilder -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R object AlertDialogHelper { diff --git a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt index b7f53746c1..b613bfc76e 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt @@ -7,7 +7,7 @@ import android.os.SystemClock import android.text.Spanned import androidx.fragment.app.FragmentActivity import com.google.android.material.dialog.MaterialAlertDialogBuilder -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.shared.extensions.runOnUiThread object OKDialog { diff --git a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt similarity index 98% rename from core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt index 8206f74ccb..85df84f366 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt @@ -6,7 +6,7 @@ import android.content.DialogInterface import android.os.SystemClock import androidx.annotation.StringRes import com.google.android.material.dialog.MaterialAlertDialogBuilder -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.shared.extensions.runOnUiThread // if you need error dialog - duplicate to ErrorDialog and make it and use: AppThemeErrorDialog & R.drawable.ic_header_error instead diff --git a/core/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt similarity index 98% rename from core/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt index a9df635e47..31be63bbb5 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.utils.protection import androidx.biometric.BiometricPrompt import androidx.biometric.BiometricPrompt.* import androidx.fragment.app.FragmentActivity -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.utils.ToastUtils import info.nightscout.shared.extensions.runOnUiThread import java.util.concurrent.Executors diff --git a/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt index 24b67debb7..18d6f68b2f 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt @@ -12,7 +12,7 @@ import android.widget.EditText import android.widget.TextView import androidx.annotation.StringRes import com.google.android.material.dialog.MaterialAlertDialogBuilder -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider import info.nightscout.androidaps.utils.CryptoUtil diff --git a/core/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt index b810fa8b56..27fb7c29f9 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.utils.protection import androidx.fragment.app.FragmentActivity -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.shared.utils.DateUtil import info.nightscout.shared.sharedPreferences.SP import java.util.concurrent.TimeUnit diff --git a/core/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperExtensions.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperExtensions.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperExtensions.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperExtensions.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperImplementation.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperImplementation.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperImplementation.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperImplementation.kt index d943766c3e..ea58448e7c 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperImplementation.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperImplementation.kt @@ -13,7 +13,7 @@ import androidx.annotation.* import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.view.ContextThemeWrapper import androidx.core.content.ContextCompat -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.androidaps.utils.FabricPrivacy import java.util.* diff --git a/core/src/main/java/info/nightscout/androidaps/utils/serialisation/SealedClassHelper.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/serialisation/SealedClassHelper.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/serialisation/SealedClassHelper.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/serialisation/SealedClassHelper.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/serialisation/ValueWithUnitSerialiser.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/serialisation/ValueWithUnitSerialiser.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/serialisation/ValueWithUnitSerialiser.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/serialisation/ValueWithUnitSerialiser.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt index 26d108b25f..16bbc77974 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt @@ -7,7 +7,7 @@ import android.text.TextWatcher import android.widget.EditText import com.google.android.material.textfield.TextInputLayout import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.utils.textValidator.validators.* diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt index 5ebdd6dbfa..354ad7daab 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt @@ -5,7 +5,7 @@ import android.util.AttributeSet import androidx.preference.EditTextPreference import androidx.preference.PreferenceViewHolder import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.shared.SafeParse diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaNumericValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaNumericValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaNumericValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaNumericValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/BgRangeValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/BgRangeValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/BgRangeValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/BgRangeValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/BasalProfileGraph.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/BasalProfileGraph.kt similarity index 98% rename from core/src/main/java/info/nightscout/androidaps/utils/ui/BasalProfileGraph.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/BasalProfileGraph.kt index 15a5a86449..1517b19d39 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/ui/BasalProfileGraph.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/BasalProfileGraph.kt @@ -6,7 +6,7 @@ import com.jjoe64.graphview.DefaultLabelFormatter import com.jjoe64.graphview.GraphView import com.jjoe64.graphview.series.DataPoint import com.jjoe64.graphview.series.LineGraphSeries -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.interfaces.Profile import info.nightscout.interfaces.utils.Round import java.text.NumberFormat diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/BluetoothDevicePreference.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/BluetoothDevicePreference.kt similarity index 97% rename from core/src/main/java/info/nightscout/androidaps/utils/ui/BluetoothDevicePreference.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/BluetoothDevicePreference.kt index 20bbfd38a0..00d3e0d556 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/ui/BluetoothDevicePreference.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/BluetoothDevicePreference.kt @@ -9,7 +9,7 @@ import android.os.Build import android.util.AttributeSet import androidx.core.app.ActivityCompat import androidx.preference.ListPreference -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.utils.ToastUtils import java.util.* diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/DigitsKeyListenerWithComma.java b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/DigitsKeyListenerWithComma.java similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/ui/DigitsKeyListenerWithComma.java rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/DigitsKeyListenerWithComma.java diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/IcProfileGraph.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/IcProfileGraph.kt similarity index 98% rename from core/src/main/java/info/nightscout/androidaps/utils/ui/IcProfileGraph.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/IcProfileGraph.kt index e70b7b0da2..4af96b9f65 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/ui/IcProfileGraph.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/IcProfileGraph.kt @@ -6,7 +6,7 @@ import com.jjoe64.graphview.DefaultLabelFormatter import com.jjoe64.graphview.GraphView import com.jjoe64.graphview.series.DataPoint import com.jjoe64.graphview.series.LineGraphSeries -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.interfaces.Profile import info.nightscout.interfaces.utils.Round import java.text.NumberFormat diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/IsfProfileGraph.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/IsfProfileGraph.kt similarity index 98% rename from core/src/main/java/info/nightscout/androidaps/utils/ui/IsfProfileGraph.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/IsfProfileGraph.kt index fae4aa98e8..3906db112e 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/ui/IsfProfileGraph.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/IsfProfileGraph.kt @@ -6,7 +6,7 @@ import com.jjoe64.graphview.DefaultLabelFormatter import com.jjoe64.graphview.GraphView import com.jjoe64.graphview.series.DataPoint import com.jjoe64.graphview.series.LineGraphSeries -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.interfaces.Profile import info.nightscout.interfaces.utils.Round import java.text.NumberFormat diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/MinutesNumberPicker.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/MinutesNumberPicker.kt similarity index 96% rename from core/src/main/java/info/nightscout/androidaps/utils/ui/MinutesNumberPicker.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/MinutesNumberPicker.kt index aa2575d996..04a14700ea 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/ui/MinutesNumberPicker.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/MinutesNumberPicker.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.utils.ui import android.content.Context import android.util.AttributeSet import android.widget.Button -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import java.text.DecimalFormat class MinutesNumberPicker constructor(context: Context, attrs: AttributeSet? = null) : NumberPicker(context, attrs) { diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.kt index b4a198f2ff..3f93fdeae2 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.kt @@ -21,8 +21,8 @@ import android.view.accessibility.AccessibilityManager import android.view.inputmethod.InputMethodManager import android.widget.Button import android.widget.LinearLayout -import info.nightscout.androidaps.core.R -import info.nightscout.androidaps.core.databinding.NumberPickerLayoutBinding +import info.nightscout.core.main.R +import info.nightscout.core.main.databinding.NumberPickerLayoutBinding import info.nightscout.shared.extensions.toVisibility import info.nightscout.androidaps.utils.ToastUtils import info.nightscout.shared.SafeParse diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerVertical.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerVertical.kt similarity index 85% rename from core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerVertical.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerVertical.kt index ec94040cdb..94745da4d5 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerVertical.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerVertical.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.utils.ui import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater -import info.nightscout.androidaps.core.databinding.NumberPickerLayoutVerticalBinding +import info.nightscout.core.main.databinding.NumberPickerLayoutVerticalBinding class NumberPickerVertical(context: Context, attrs: AttributeSet? = null) : NumberPicker(context, attrs) { diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerViewAdapter.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerViewAdapter.kt similarity index 88% rename from core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerViewAdapter.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerViewAdapter.kt index 43ab2e2f72..30a648165c 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerViewAdapter.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerViewAdapter.kt @@ -1,36 +1,36 @@ -package info.nightscout.androidaps.utils.ui - -import info.nightscout.androidaps.core.databinding.NumberPickerLayoutBinding -import info.nightscout.androidaps.core.databinding.NumberPickerLayoutVerticalBinding - -/** - * NumberPickerViewAdapter binds both NumberPickerLayoutBinding and NumberPickerLayoutVerticalBinding shared attributes to one common view adapter. - * Requires at least one of the ViewBinding as a parameter. Recommended to use the factory object to create the binding. - */ -class NumberPickerViewAdapter( - val nH: NumberPickerLayoutBinding?, - val nV: NumberPickerLayoutVerticalBinding?, -) { - - init { - if (nH == null && nV == null) { - throw IllegalArgumentException("Require at least on Binding parameter") - } - } - - val editText = nH?.display ?: nV?.display ?: throw IllegalArgumentException("Missing require View Binding parameter display") - val minusButton = nH?.decrement ?: nV?.decrement ?: throw IllegalArgumentException("require at least on Binding parameter decrement") - val plusButton = nH?.increment ?: nV?.increment ?: throw IllegalArgumentException("require at least on Binding parameter increment") - var textInputLayout = nH?.textInputLayout ?: nV?.textInputLayout ?: throw IllegalArgumentException("require at least on Binding parameter textInputLayout") - - companion object { - - fun getBinding(bindLayout: NumberPickerLayoutBinding): NumberPickerViewAdapter { - return NumberPickerViewAdapter(bindLayout, null) - } - - fun getBinding(bindLayout: NumberPickerLayoutVerticalBinding): NumberPickerViewAdapter { - return NumberPickerViewAdapter(null, bindLayout) - } - } -} +package info.nightscout.androidaps.utils.ui + +import info.nightscout.core.main.databinding.NumberPickerLayoutBinding +import info.nightscout.core.main.databinding.NumberPickerLayoutVerticalBinding + +/** + * NumberPickerViewAdapter binds both NumberPickerLayoutBinding and NumberPickerLayoutVerticalBinding shared attributes to one common view adapter. + * Requires at least one of the ViewBinding as a parameter. Recommended to use the factory object to create the binding. + */ +class NumberPickerViewAdapter( + val nH: NumberPickerLayoutBinding?, + val nV: NumberPickerLayoutVerticalBinding?, +) { + + init { + if (nH == null && nV == null) { + throw IllegalArgumentException("Require at least on Binding parameter") + } + } + + val editText = nH?.display ?: nV?.display ?: throw IllegalArgumentException("Missing require View Binding parameter display") + val minusButton = nH?.decrement ?: nV?.decrement ?: throw IllegalArgumentException("require at least on Binding parameter decrement") + val plusButton = nH?.increment ?: nV?.increment ?: throw IllegalArgumentException("require at least on Binding parameter increment") + var textInputLayout = nH?.textInputLayout ?: nV?.textInputLayout ?: throw IllegalArgumentException("require at least on Binding parameter textInputLayout") + + companion object { + + fun getBinding(bindLayout: NumberPickerLayoutBinding): NumberPickerViewAdapter { + return NumberPickerViewAdapter(bindLayout, null) + } + + fun getBinding(bindLayout: NumberPickerLayoutVerticalBinding): NumberPickerViewAdapter { + return NumberPickerViewAdapter(null, bindLayout) + } + } +} diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/SingleClickButton.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/SingleClickButton.kt similarity index 96% rename from core/src/main/java/info/nightscout/androidaps/utils/ui/SingleClickButton.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/SingleClickButton.kt index 8fa18c3e67..996a22a30f 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/ui/SingleClickButton.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/SingleClickButton.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.utils.ui import android.content.Context import android.util.AttributeSet import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/TargetBgProfileGraph.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/TargetBgProfileGraph.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/utils/ui/TargetBgProfileGraph.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/TargetBgProfileGraph.kt index c10ead7998..f2feee5ed9 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/ui/TargetBgProfileGraph.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/TargetBgProfileGraph.kt @@ -4,7 +4,7 @@ import android.content.Context import android.util.AttributeSet import com.jjoe64.graphview.DefaultLabelFormatter import com.jjoe64.graphview.GraphView -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.interfaces.GlucoseUnit import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.plugins.general.overview.graphExtensions.AreaGraphSeries diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/UIRunnable.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/UIRunnable.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/ui/UIRunnable.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/UIRunnable.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/VerticalTextView.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/VerticalTextView.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/ui/VerticalTextView.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/ui/VerticalTextView.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryMapper.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryMapper.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryMapper.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryMapper.kt diff --git a/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt similarity index 99% rename from core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt index ed075845d1..cc6cc86028 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.utils.userEntry import android.text.Spanned import dagger.Reusable import info.nightscout.interfaces.Constants -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.entities.UserEntry import info.nightscout.androidaps.database.entities.UserEntry.Action import info.nightscout.androidaps.database.entities.UserEntry.ColorGroup diff --git a/core/src/main/java/info/nightscout/androidaps/utils/userEntry/ValueWithUnitMapper.kt b/core/core-main/src/main/java/info/nightscout/androidaps/utils/userEntry/ValueWithUnitMapper.kt similarity index 100% rename from core/src/main/java/info/nightscout/androidaps/utils/userEntry/ValueWithUnitMapper.kt rename to core/core-main/src/main/java/info/nightscout/androidaps/utils/userEntry/ValueWithUnitMapper.kt diff --git a/core/src/main/res/color/day_selection_background.xml b/core/core-main/src/main/res/color/day_selection_background.xml similarity index 100% rename from core/src/main/res/color/day_selection_background.xml rename to core/core-main/src/main/res/color/day_selection_background.xml diff --git a/core/src/main/res/color/mtrl_btn_bg_color_selector_grey.xml b/core/core-main/src/main/res/color/mtrl_btn_bg_color_selector_grey.xml similarity index 100% rename from core/src/main/res/color/mtrl_btn_bg_color_selector_grey.xml rename to core/core-main/src/main/res/color/mtrl_btn_bg_color_selector_grey.xml diff --git a/core/src/main/res/drawable-hdpi/background_input_border.xml b/core/core-main/src/main/res/drawable-hdpi/background_input_border.xml similarity index 100% rename from core/src/main/res/drawable-hdpi/background_input_border.xml rename to core/core-main/src/main/res/drawable-hdpi/background_input_border.xml diff --git a/core/src/main/res/drawable-hdpi/dialog.xml b/core/core-main/src/main/res/drawable-hdpi/dialog.xml similarity index 100% rename from core/src/main/res/drawable-hdpi/dialog.xml rename to core/core-main/src/main/res/drawable-hdpi/dialog.xml diff --git a/core/src/main/res/drawable-hdpi/dialog_header.xml b/core/core-main/src/main/res/drawable-hdpi/dialog_header.xml similarity index 100% rename from core/src/main/res/drawable-hdpi/dialog_header.xml rename to core/core-main/src/main/res/drawable-hdpi/dialog_header.xml diff --git a/core/src/main/res/drawable-hdpi/toast_border_ok.xml b/core/core-main/src/main/res/drawable-hdpi/toast_border_ok.xml similarity index 100% rename from core/src/main/res/drawable-hdpi/toast_border_ok.xml rename to core/core-main/src/main/res/drawable-hdpi/toast_border_ok.xml diff --git a/core/src/main/res/drawable/alert_border_error.xml b/core/core-main/src/main/res/drawable/alert_border_error.xml similarity index 100% rename from core/src/main/res/drawable/alert_border_error.xml rename to core/core-main/src/main/res/drawable/alert_border_error.xml diff --git a/core/src/main/res/drawable/alert_border_warning.xml b/core/core-main/src/main/res/drawable/alert_border_warning.xml similarity index 100% rename from core/src/main/res/drawable/alert_border_warning.xml rename to core/core-main/src/main/res/drawable/alert_border_warning.xml diff --git a/core/src/main/res/drawable/anim_carbs.xml b/core/core-main/src/main/res/drawable/anim_carbs.xml similarity index 100% rename from core/src/main/res/drawable/anim_carbs.xml rename to core/core-main/src/main/res/drawable/anim_carbs.xml diff --git a/core/src/main/res/drawable/ic_aaps.xml b/core/core-main/src/main/res/drawable/ic_aaps.xml similarity index 100% rename from core/src/main/res/drawable/ic_aaps.xml rename to core/core-main/src/main/res/drawable/ic_aaps.xml diff --git a/core/src/main/res/drawable/ic_access_alarm_24dp.xml b/core/core-main/src/main/res/drawable/ic_access_alarm_24dp.xml similarity index 100% rename from core/src/main/res/drawable/ic_access_alarm_24dp.xml rename to core/core-main/src/main/res/drawable/ic_access_alarm_24dp.xml diff --git a/core/src/main/res/drawable/ic_action.xml b/core/core-main/src/main/res/drawable/ic_action.xml similarity index 100% rename from core/src/main/res/drawable/ic_action.xml rename to core/core-main/src/main/res/drawable/ic_action.xml diff --git a/core/src/main/res/drawable/ic_actions_refill.xml b/core/core-main/src/main/res/drawable/ic_actions_refill.xml similarity index 100% rename from core/src/main/res/drawable/ic_actions_refill.xml rename to core/core-main/src/main/res/drawable/ic_actions_refill.xml diff --git a/core/src/main/res/drawable/ic_actions_start_extended_bolus.xml b/core/core-main/src/main/res/drawable/ic_actions_start_extended_bolus.xml similarity index 100% rename from core/src/main/res/drawable/ic_actions_start_extended_bolus.xml rename to core/core-main/src/main/res/drawable/ic_actions_start_extended_bolus.xml diff --git a/core/src/main/res/drawable/ic_actions_starttempbasal.xml b/core/core-main/src/main/res/drawable/ic_actions_starttempbasal.xml similarity index 100% rename from core/src/main/res/drawable/ic_actions_starttempbasal.xml rename to core/core-main/src/main/res/drawable/ic_actions_starttempbasal.xml diff --git a/core/src/main/res/drawable/ic_add.xml b/core/core-main/src/main/res/drawable/ic_add.xml similarity index 100% rename from core/src/main/res/drawable/ic_add.xml rename to core/core-main/src/main/res/drawable/ic_add.xml diff --git a/core/src/main/res/drawable/ic_automation.xml b/core/core-main/src/main/res/drawable/ic_automation.xml similarity index 100% rename from core/src/main/res/drawable/ic_automation.xml rename to core/core-main/src/main/res/drawable/ic_automation.xml diff --git a/core/src/main/res/drawable/ic_autotune.xml b/core/core-main/src/main/res/drawable/ic_autotune.xml similarity index 100% rename from core/src/main/res/drawable/ic_autotune.xml rename to core/core-main/src/main/res/drawable/ic_autotune.xml diff --git a/core/src/main/res/drawable/ic_blooddrop_48.xml b/core/core-main/src/main/res/drawable/ic_blooddrop_48.xml similarity index 100% rename from core/src/main/res/drawable/ic_blooddrop_48.xml rename to core/core-main/src/main/res/drawable/ic_blooddrop_48.xml diff --git a/core/src/main/res/drawable/ic_bluetooth_white_48dp.xml b/core/core-main/src/main/res/drawable/ic_bluetooth_white_48dp.xml similarity index 100% rename from core/src/main/res/drawable/ic_bluetooth_white_48dp.xml rename to core/core-main/src/main/res/drawable/ic_bluetooth_white_48dp.xml diff --git a/core/src/main/res/drawable/ic_bolus.xml b/core/core-main/src/main/res/drawable/ic_bolus.xml similarity index 100% rename from core/src/main/res/drawable/ic_bolus.xml rename to core/core-main/src/main/res/drawable/ic_bolus.xml diff --git a/core/src/main/res/drawable/ic_calculator.xml b/core/core-main/src/main/res/drawable/ic_calculator.xml similarity index 100% rename from core/src/main/res/drawable/ic_calculator.xml rename to core/core-main/src/main/res/drawable/ic_calculator.xml diff --git a/core/src/main/res/drawable/ic_calibration.xml b/core/core-main/src/main/res/drawable/ic_calibration.xml similarity index 100% rename from core/src/main/res/drawable/ic_calibration.xml rename to core/core-main/src/main/res/drawable/ic_calibration.xml diff --git a/core/src/main/res/drawable/ic_check_while_48dp.xml b/core/core-main/src/main/res/drawable/ic_check_while_48dp.xml similarity index 100% rename from core/src/main/res/drawable/ic_check_while_48dp.xml rename to core/core-main/src/main/res/drawable/ic_check_while_48dp.xml diff --git a/core/src/main/res/drawable/ic_clone.xml b/core/core-main/src/main/res/drawable/ic_clone.xml similarity index 100% rename from core/src/main/res/drawable/ic_clone.xml rename to core/core-main/src/main/res/drawable/ic_clone.xml diff --git a/core/src/main/res/drawable/ic_close.xml b/core/core-main/src/main/res/drawable/ic_close.xml similarity index 100% rename from core/src/main/res/drawable/ic_close.xml rename to core/core-main/src/main/res/drawable/ic_close.xml diff --git a/core/src/main/res/drawable/ic_cogs.xml b/core/core-main/src/main/res/drawable/ic_cogs.xml similarity index 100% rename from core/src/main/res/drawable/ic_cogs.xml rename to core/core-main/src/main/res/drawable/ic_cogs.xml diff --git a/core/src/main/res/drawable/ic_combo_128.xml b/core/core-main/src/main/res/drawable/ic_combo_128.xml similarity index 100% rename from core/src/main/res/drawable/ic_combo_128.xml rename to core/core-main/src/main/res/drawable/ic_combo_128.xml diff --git a/core/src/main/res/drawable/ic_compare_profiles.xml b/core/core-main/src/main/res/drawable/ic_compare_profiles.xml similarity index 100% rename from core/src/main/res/drawable/ic_compare_profiles.xml rename to core/core-main/src/main/res/drawable/ic_compare_profiles.xml diff --git a/core/src/main/res/drawable/ic_cp_announcement.xml b/core/core-main/src/main/res/drawable/ic_cp_announcement.xml similarity index 100% rename from core/src/main/res/drawable/ic_cp_announcement.xml rename to core/core-main/src/main/res/drawable/ic_cp_announcement.xml diff --git a/core/src/main/res/drawable/ic_cp_basal_no_tbr.xml b/core/core-main/src/main/res/drawable/ic_cp_basal_no_tbr.xml similarity index 100% rename from core/src/main/res/drawable/ic_cp_basal_no_tbr.xml rename to core/core-main/src/main/res/drawable/ic_cp_basal_no_tbr.xml diff --git a/core/src/main/res/drawable/ic_cp_basal_tbr_high.xml b/core/core-main/src/main/res/drawable/ic_cp_basal_tbr_high.xml similarity index 100% rename from core/src/main/res/drawable/ic_cp_basal_tbr_high.xml rename to core/core-main/src/main/res/drawable/ic_cp_basal_tbr_high.xml diff --git a/core/src/main/res/drawable/ic_cp_basal_tbr_low.xml b/core/core-main/src/main/res/drawable/ic_cp_basal_tbr_low.xml similarity index 100% rename from core/src/main/res/drawable/ic_cp_basal_tbr_low.xml rename to core/core-main/src/main/res/drawable/ic_cp_basal_tbr_low.xml diff --git a/core/src/main/res/drawable/ic_cp_bgcheck.xml b/core/core-main/src/main/res/drawable/ic_cp_bgcheck.xml similarity index 100% rename from core/src/main/res/drawable/ic_cp_bgcheck.xml rename to core/core-main/src/main/res/drawable/ic_cp_bgcheck.xml diff --git a/core/src/main/res/drawable/ic_cp_bolus_carbs.xml b/core/core-main/src/main/res/drawable/ic_cp_bolus_carbs.xml similarity index 100% rename from core/src/main/res/drawable/ic_cp_bolus_carbs.xml rename to core/core-main/src/main/res/drawable/ic_cp_bolus_carbs.xml diff --git a/core/src/main/res/drawable/ic_cp_bolus_carbs_red.xml b/core/core-main/src/main/res/drawable/ic_cp_bolus_carbs_red.xml similarity index 100% rename from core/src/main/res/drawable/ic_cp_bolus_carbs_red.xml rename to core/core-main/src/main/res/drawable/ic_cp_bolus_carbs_red.xml diff --git a/core/src/main/res/drawable/ic_cp_cgm_insert.xml b/core/core-main/src/main/res/drawable/ic_cp_cgm_insert.xml similarity index 100% rename from core/src/main/res/drawable/ic_cp_cgm_insert.xml rename to core/core-main/src/main/res/drawable/ic_cp_cgm_insert.xml diff --git a/core/src/main/res/drawable/ic_cp_exercise.xml b/core/core-main/src/main/res/drawable/ic_cp_exercise.xml similarity index 100% rename from core/src/main/res/drawable/ic_cp_exercise.xml rename to core/core-main/src/main/res/drawable/ic_cp_exercise.xml diff --git a/core/src/main/res/drawable/ic_cp_note.xml b/core/core-main/src/main/res/drawable/ic_cp_note.xml similarity index 100% rename from core/src/main/res/drawable/ic_cp_note.xml rename to core/core-main/src/main/res/drawable/ic_cp_note.xml diff --git a/core/src/main/res/drawable/ic_cp_pump_battery.xml b/core/core-main/src/main/res/drawable/ic_cp_pump_battery.xml similarity index 100% rename from core/src/main/res/drawable/ic_cp_pump_battery.xml rename to core/core-main/src/main/res/drawable/ic_cp_pump_battery.xml diff --git a/core/src/main/res/drawable/ic_cp_pump_canula.xml b/core/core-main/src/main/res/drawable/ic_cp_pump_canula.xml similarity index 100% rename from core/src/main/res/drawable/ic_cp_pump_canula.xml rename to core/core-main/src/main/res/drawable/ic_cp_pump_canula.xml diff --git a/core/src/main/res/drawable/ic_cp_question.xml b/core/core-main/src/main/res/drawable/ic_cp_question.xml similarity index 100% rename from core/src/main/res/drawable/ic_cp_question.xml rename to core/core-main/src/main/res/drawable/ic_cp_question.xml diff --git a/core/src/main/res/drawable/ic_cp_stats.xml b/core/core-main/src/main/res/drawable/ic_cp_stats.xml similarity index 100% rename from core/src/main/res/drawable/ic_cp_stats.xml rename to core/core-main/src/main/res/drawable/ic_cp_stats.xml diff --git a/core/src/main/res/drawable/ic_danai_128.xml b/core/core-main/src/main/res/drawable/ic_danai_128.xml similarity index 100% rename from core/src/main/res/drawable/ic_danai_128.xml rename to core/core-main/src/main/res/drawable/ic_danai_128.xml diff --git a/core/src/main/res/drawable/ic_danar_useropt.xml b/core/core-main/src/main/res/drawable/ic_danar_useropt.xml similarity index 100% rename from core/src/main/res/drawable/ic_danar_useropt.xml rename to core/core-main/src/main/res/drawable/ic_danar_useropt.xml diff --git a/core/src/main/res/drawable/ic_danarprofile.xml b/core/core-main/src/main/res/drawable/ic_danarprofile.xml similarity index 100% rename from core/src/main/res/drawable/ic_danarprofile.xml rename to core/core-main/src/main/res/drawable/ic_danarprofile.xml diff --git a/core/src/main/res/drawable/ic_danars_128.xml b/core/core-main/src/main/res/drawable/ic_danars_128.xml similarity index 100% rename from core/src/main/res/drawable/ic_danars_128.xml rename to core/core-main/src/main/res/drawable/ic_danars_128.xml diff --git a/core/src/main/res/drawable/ic_danarstats.xml b/core/core-main/src/main/res/drawable/ic_danarstats.xml similarity index 100% rename from core/src/main/res/drawable/ic_danarstats.xml rename to core/core-main/src/main/res/drawable/ic_danarstats.xml diff --git a/core/src/main/res/drawable/ic_dexcom_g6.xml b/core/core-main/src/main/res/drawable/ic_dexcom_g6.xml similarity index 100% rename from core/src/main/res/drawable/ic_dexcom_g6.xml rename to core/core-main/src/main/res/drawable/ic_dexcom_g6.xml diff --git a/core/src/main/res/drawable/ic_diaconn_g8.xml b/core/core-main/src/main/res/drawable/ic_diaconn_g8.xml similarity index 100% rename from core/src/main/res/drawable/ic_diaconn_g8.xml rename to core/core-main/src/main/res/drawable/ic_diaconn_g8.xml diff --git a/core/src/main/res/drawable/ic_doubledown.xml b/core/core-main/src/main/res/drawable/ic_doubledown.xml similarity index 100% rename from core/src/main/res/drawable/ic_doubledown.xml rename to core/core-main/src/main/res/drawable/ic_doubledown.xml diff --git a/core/src/main/res/drawable/ic_doubleup.xml b/core/core-main/src/main/res/drawable/ic_doubleup.xml similarity index 100% rename from core/src/main/res/drawable/ic_doubleup.xml rename to core/core-main/src/main/res/drawable/ic_doubleup.xml diff --git a/core/src/main/res/drawable/ic_eopatch2_128.xml b/core/core-main/src/main/res/drawable/ic_eopatch2_128.xml similarity index 100% rename from core/src/main/res/drawable/ic_eopatch2_128.xml rename to core/core-main/src/main/res/drawable/ic_eopatch2_128.xml diff --git a/core/src/main/res/drawable/ic_error_red_48dp.xml b/core/core-main/src/main/res/drawable/ic_error_red_48dp.xml similarity index 100% rename from core/src/main/res/drawable/ic_error_red_48dp.xml rename to core/core-main/src/main/res/drawable/ic_error_red_48dp.xml diff --git a/core/src/main/res/drawable/ic_eversense.xml b/core/core-main/src/main/res/drawable/ic_eversense.xml similarity index 100% rename from core/src/main/res/drawable/ic_eversense.xml rename to core/core-main/src/main/res/drawable/ic_eversense.xml diff --git a/core/src/main/res/drawable/ic_flat.xml b/core/core-main/src/main/res/drawable/ic_flat.xml similarity index 100% rename from core/src/main/res/drawable/ic_flat.xml rename to core/core-main/src/main/res/drawable/ic_flat.xml diff --git a/core/src/main/res/drawable/ic_food.xml b/core/core-main/src/main/res/drawable/ic_food.xml similarity index 100% rename from core/src/main/res/drawable/ic_food.xml rename to core/core-main/src/main/res/drawable/ic_food.xml diff --git a/core/src/main/res/drawable/ic_fortyfivedown.xml b/core/core-main/src/main/res/drawable/ic_fortyfivedown.xml similarity index 100% rename from core/src/main/res/drawable/ic_fortyfivedown.xml rename to core/core-main/src/main/res/drawable/ic_fortyfivedown.xml diff --git a/core/src/main/res/drawable/ic_fortyfiveup.xml b/core/core-main/src/main/res/drawable/ic_fortyfiveup.xml similarity index 100% rename from core/src/main/res/drawable/ic_fortyfiveup.xml rename to core/core-main/src/main/res/drawable/ic_fortyfiveup.xml diff --git a/core/src/main/res/drawable/ic_generic_cgm.xml b/core/core-main/src/main/res/drawable/ic_generic_cgm.xml similarity index 100% rename from core/src/main/res/drawable/ic_generic_cgm.xml rename to core/core-main/src/main/res/drawable/ic_generic_cgm.xml diff --git a/core/src/main/res/drawable/ic_generic_icon.xml b/core/core-main/src/main/res/drawable/ic_generic_icon.xml similarity index 100% rename from core/src/main/res/drawable/ic_generic_icon.xml rename to core/core-main/src/main/res/drawable/ic_generic_icon.xml diff --git a/core/src/main/res/drawable/ic_glimp.xml b/core/core-main/src/main/res/drawable/ic_glimp.xml similarity index 100% rename from core/src/main/res/drawable/ic_glimp.xml rename to core/core-main/src/main/res/drawable/ic_glimp.xml diff --git a/core/src/main/res/drawable/ic_glunovo.xml b/core/core-main/src/main/res/drawable/ic_glunovo.xml similarity index 100% rename from core/src/main/res/drawable/ic_glunovo.xml rename to core/core-main/src/main/res/drawable/ic_glunovo.xml diff --git a/core/src/main/res/drawable/ic_graduation.xml b/core/core-main/src/main/res/drawable/ic_graduation.xml similarity index 100% rename from core/src/main/res/drawable/ic_graduation.xml rename to core/core-main/src/main/res/drawable/ic_graduation.xml diff --git a/core/src/main/res/drawable/ic_header_key.xml b/core/core-main/src/main/res/drawable/ic_header_key.xml similarity index 100% rename from core/src/main/res/drawable/ic_header_key.xml rename to core/core-main/src/main/res/drawable/ic_header_key.xml diff --git a/core/src/main/res/drawable/ic_header_warning.xml b/core/core-main/src/main/res/drawable/ic_header_warning.xml similarity index 100% rename from core/src/main/res/drawable/ic_header_warning.xml rename to core/core-main/src/main/res/drawable/ic_header_warning.xml diff --git a/core/src/main/res/drawable/ic_home.xml b/core/core-main/src/main/res/drawable/ic_home.xml similarity index 100% rename from core/src/main/res/drawable/ic_home.xml rename to core/core-main/src/main/res/drawable/ic_home.xml diff --git a/core/src/main/res/drawable/ic_home_profile.xml b/core/core-main/src/main/res/drawable/ic_home_profile.xml similarity index 100% rename from core/src/main/res/drawable/ic_home_profile.xml rename to core/core-main/src/main/res/drawable/ic_home_profile.xml diff --git a/core/src/main/res/drawable/ic_ict.xml b/core/core-main/src/main/res/drawable/ic_ict.xml similarity index 100% rename from core/src/main/res/drawable/ic_ict.xml rename to core/core-main/src/main/res/drawable/ic_ict.xml diff --git a/core/src/main/res/drawable/ic_insight_128.xml b/core/core-main/src/main/res/drawable/ic_insight_128.xml similarity index 100% rename from core/src/main/res/drawable/ic_insight_128.xml rename to core/core-main/src/main/res/drawable/ic_insight_128.xml diff --git a/core/src/main/res/drawable/ic_insulin.xml b/core/core-main/src/main/res/drawable/ic_insulin.xml similarity index 100% rename from core/src/main/res/drawable/ic_insulin.xml rename to core/core-main/src/main/res/drawable/ic_insulin.xml diff --git a/core/src/main/res/drawable/ic_intelligo.xml b/core/core-main/src/main/res/drawable/ic_intelligo.xml similarity index 100% rename from core/src/main/res/drawable/ic_intelligo.xml rename to core/core-main/src/main/res/drawable/ic_intelligo.xml diff --git a/core/src/main/res/drawable/ic_invalid.xml b/core/core-main/src/main/res/drawable/ic_invalid.xml similarity index 100% rename from core/src/main/res/drawable/ic_invalid.xml rename to core/core-main/src/main/res/drawable/ic_invalid.xml diff --git a/core/src/main/res/drawable/ic_local_profile.xml b/core/core-main/src/main/res/drawable/ic_local_profile.xml similarity index 100% rename from core/src/main/res/drawable/ic_local_profile.xml rename to core/core-main/src/main/res/drawable/ic_local_profile.xml diff --git a/core/src/main/res/drawable/ic_local_save.xml b/core/core-main/src/main/res/drawable/ic_local_save.xml similarity index 100% rename from core/src/main/res/drawable/ic_local_save.xml rename to core/core-main/src/main/res/drawable/ic_local_save.xml diff --git a/core/src/main/res/drawable/ic_loop_closed.xml b/core/core-main/src/main/res/drawable/ic_loop_closed.xml similarity index 100% rename from core/src/main/res/drawable/ic_loop_closed.xml rename to core/core-main/src/main/res/drawable/ic_loop_closed.xml diff --git a/core/src/main/res/drawable/ic_loop_closed_off.xml b/core/core-main/src/main/res/drawable/ic_loop_closed_off.xml similarity index 100% rename from core/src/main/res/drawable/ic_loop_closed_off.xml rename to core/core-main/src/main/res/drawable/ic_loop_closed_off.xml diff --git a/core/src/main/res/drawable/ic_loop_closed_white.xml b/core/core-main/src/main/res/drawable/ic_loop_closed_white.xml similarity index 100% rename from core/src/main/res/drawable/ic_loop_closed_white.xml rename to core/core-main/src/main/res/drawable/ic_loop_closed_white.xml diff --git a/core/src/main/res/drawable/ic_maintenance.xml b/core/core-main/src/main/res/drawable/ic_maintenance.xml similarity index 100% rename from core/src/main/res/drawable/ic_maintenance.xml rename to core/core-main/src/main/res/drawable/ic_maintenance.xml diff --git a/core/src/main/res/drawable/ic_minus.xml b/core/core-main/src/main/res/drawable/ic_minus.xml similarity index 100% rename from core/src/main/res/drawable/ic_minus.xml rename to core/core-main/src/main/res/drawable/ic_minus.xml diff --git a/core/src/main/res/drawable/ic_nightscout_profile.xml b/core/core-main/src/main/res/drawable/ic_nightscout_profile.xml similarity index 100% rename from core/src/main/res/drawable/ic_nightscout_profile.xml rename to core/core-main/src/main/res/drawable/ic_nightscout_profile.xml diff --git a/core/src/main/res/drawable/ic_nightscout_syncs.xml b/core/core-main/src/main/res/drawable/ic_nightscout_syncs.xml similarity index 100% rename from core/src/main/res/drawable/ic_nightscout_syncs.xml rename to core/core-main/src/main/res/drawable/ic_nightscout_syncs.xml diff --git a/core/src/main/res/drawable/ic_notif_aaps.xml b/core/core-main/src/main/res/drawable/ic_notif_aaps.xml similarity index 100% rename from core/src/main/res/drawable/ic_notif_aaps.xml rename to core/core-main/src/main/res/drawable/ic_notif_aaps.xml diff --git a/core/src/main/res/drawable/ic_nsclient_bg.xml b/core/core-main/src/main/res/drawable/ic_nsclient_bg.xml similarity index 100% rename from core/src/main/res/drawable/ic_nsclient_bg.xml rename to core/core-main/src/main/res/drawable/ic_nsclient_bg.xml diff --git a/core/src/main/res/drawable/ic_patch_pump_outline.xml b/core/core-main/src/main/res/drawable/ic_patch_pump_outline.xml similarity index 100% rename from core/src/main/res/drawable/ic_patch_pump_outline.xml rename to core/core-main/src/main/res/drawable/ic_patch_pump_outline.xml diff --git a/core/src/main/res/drawable/ic_plus.xml b/core/core-main/src/main/res/drawable/ic_plus.xml similarity index 100% rename from core/src/main/res/drawable/ic_plus.xml rename to core/core-main/src/main/res/drawable/ic_plus.xml diff --git a/core/src/main/res/drawable/ic_poctech.xml b/core/core-main/src/main/res/drawable/ic_poctech.xml similarity index 100% rename from core/src/main/res/drawable/ic_poctech.xml rename to core/core-main/src/main/res/drawable/ic_poctech.xml diff --git a/core/src/main/res/drawable/ic_pod_128.xml b/core/core-main/src/main/res/drawable/ic_pod_128.xml similarity index 100% rename from core/src/main/res/drawable/ic_pod_128.xml rename to core/core-main/src/main/res/drawable/ic_pod_128.xml diff --git a/core/src/main/res/drawable/ic_pump_history.xml b/core/core-main/src/main/res/drawable/ic_pump_history.xml similarity index 100% rename from core/src/main/res/drawable/ic_pump_history.xml rename to core/core-main/src/main/res/drawable/ic_pump_history.xml diff --git a/core/src/main/res/drawable/ic_quick_wizard.xml b/core/core-main/src/main/res/drawable/ic_quick_wizard.xml similarity index 100% rename from core/src/main/res/drawable/ic_quick_wizard.xml rename to core/core-main/src/main/res/drawable/ic_quick_wizard.xml diff --git a/core/src/main/res/drawable/ic_refresh.xml b/core/core-main/src/main/res/drawable/ic_refresh.xml similarity index 100% rename from core/src/main/res/drawable/ic_refresh.xml rename to core/core-main/src/main/res/drawable/ic_refresh.xml diff --git a/core/src/main/res/drawable/ic_remove.xml b/core/core-main/src/main/res/drawable/ic_remove.xml similarity index 100% rename from core/src/main/res/drawable/ic_remove.xml rename to core/core-main/src/main/res/drawable/ic_remove.xml diff --git a/core/src/main/res/drawable/ic_ribbon_profile.xml b/core/core-main/src/main/res/drawable/ic_ribbon_profile.xml similarity index 100% rename from core/src/main/res/drawable/ic_ribbon_profile.xml rename to core/core-main/src/main/res/drawable/ic_ribbon_profile.xml diff --git a/core/src/main/res/drawable/ic_sensor.xml b/core/core-main/src/main/res/drawable/ic_sensor.xml similarity index 100% rename from core/src/main/res/drawable/ic_sensor.xml rename to core/core-main/src/main/res/drawable/ic_sensor.xml diff --git a/core/src/main/res/drawable/ic_singledown.xml b/core/core-main/src/main/res/drawable/ic_singledown.xml similarity index 100% rename from core/src/main/res/drawable/ic_singledown.xml rename to core/core-main/src/main/res/drawable/ic_singledown.xml diff --git a/core/src/main/res/drawable/ic_singleup.xml b/core/core-main/src/main/res/drawable/ic_singleup.xml similarity index 100% rename from core/src/main/res/drawable/ic_singleup.xml rename to core/core-main/src/main/res/drawable/ic_singleup.xml diff --git a/core/src/main/res/drawable/ic_smartphone.xml b/core/core-main/src/main/res/drawable/ic_smartphone.xml similarity index 100% rename from core/src/main/res/drawable/ic_smartphone.xml rename to core/core-main/src/main/res/drawable/ic_smartphone.xml diff --git a/core/src/main/res/drawable/ic_sms.xml b/core/core-main/src/main/res/drawable/ic_sms.xml similarity index 100% rename from core/src/main/res/drawable/ic_sms.xml rename to core/core-main/src/main/res/drawable/ic_sms.xml diff --git a/core/src/main/res/drawable/ic_sort.xml b/core/core-main/src/main/res/drawable/ic_sort.xml similarity index 100% rename from core/src/main/res/drawable/ic_sort.xml rename to core/core-main/src/main/res/drawable/ic_sort.xml diff --git a/core/src/main/res/drawable/ic_swap_vert_black_48dp_green.xml b/core/core-main/src/main/res/drawable/ic_swap_vert_black_48dp_green.xml similarity index 100% rename from core/src/main/res/drawable/ic_swap_vert_black_48dp_green.xml rename to core/core-main/src/main/res/drawable/ic_swap_vert_black_48dp_green.xml diff --git a/core/src/main/res/drawable/ic_temptarget_high.xml b/core/core-main/src/main/res/drawable/ic_temptarget_high.xml similarity index 100% rename from core/src/main/res/drawable/ic_temptarget_high.xml rename to core/core-main/src/main/res/drawable/ic_temptarget_high.xml diff --git a/core/src/main/res/drawable/ic_toast_check.xml b/core/core-main/src/main/res/drawable/ic_toast_check.xml similarity index 100% rename from core/src/main/res/drawable/ic_toast_check.xml rename to core/core-main/src/main/res/drawable/ic_toast_check.xml diff --git a/core/src/main/res/drawable/ic_toast_delete_confirm.xml b/core/core-main/src/main/res/drawable/ic_toast_delete_confirm.xml similarity index 100% rename from core/src/main/res/drawable/ic_toast_delete_confirm.xml rename to core/core-main/src/main/res/drawable/ic_toast_delete_confirm.xml diff --git a/core/src/main/res/drawable/ic_toast_error.xml b/core/core-main/src/main/res/drawable/ic_toast_error.xml similarity index 100% rename from core/src/main/res/drawable/ic_toast_error.xml rename to core/core-main/src/main/res/drawable/ic_toast_error.xml diff --git a/core/src/main/res/drawable/ic_toast_info.xml b/core/core-main/src/main/res/drawable/ic_toast_info.xml similarity index 100% rename from core/src/main/res/drawable/ic_toast_info.xml rename to core/core-main/src/main/res/drawable/ic_toast_info.xml diff --git a/core/src/main/res/drawable/ic_toast_warn.xml b/core/core-main/src/main/res/drawable/ic_toast_warn.xml similarity index 100% rename from core/src/main/res/drawable/ic_toast_warn.xml rename to core/core-main/src/main/res/drawable/ic_toast_warn.xml diff --git a/core/src/main/res/drawable/ic_trash.xml b/core/core-main/src/main/res/drawable/ic_trash.xml similarity index 100% rename from core/src/main/res/drawable/ic_trash.xml rename to core/core-main/src/main/res/drawable/ic_trash.xml diff --git a/core/src/main/res/drawable/ic_trash_outline.xml b/core/core-main/src/main/res/drawable/ic_trash_outline.xml similarity index 100% rename from core/src/main/res/drawable/ic_trash_outline.xml rename to core/core-main/src/main/res/drawable/ic_trash_outline.xml diff --git a/core/src/main/res/drawable/ic_treatments.xml b/core/core-main/src/main/res/drawable/ic_treatments.xml similarity index 100% rename from core/src/main/res/drawable/ic_treatments.xml rename to core/core-main/src/main/res/drawable/ic_treatments.xml diff --git a/core/src/main/res/drawable/ic_trending_flat_white_48dp.xml b/core/core-main/src/main/res/drawable/ic_trending_flat_white_48dp.xml similarity index 100% rename from core/src/main/res/drawable/ic_trending_flat_white_48dp.xml rename to core/core-main/src/main/res/drawable/ic_trending_flat_white_48dp.xml diff --git a/core/src/main/res/drawable/ic_veo.xml b/core/core-main/src/main/res/drawable/ic_veo.xml similarity index 100% rename from core/src/main/res/drawable/ic_veo.xml rename to core/core-main/src/main/res/drawable/ic_veo.xml diff --git a/core/src/main/res/drawable/ic_veo_128.xml b/core/core-main/src/main/res/drawable/ic_veo_128.xml similarity index 100% rename from core/src/main/res/drawable/ic_veo_128.xml rename to core/core-main/src/main/res/drawable/ic_veo_128.xml diff --git a/core/src/main/res/drawable/ic_virtual_pump.xml b/core/core-main/src/main/res/drawable/ic_virtual_pump.xml similarity index 100% rename from core/src/main/res/drawable/ic_virtual_pump.xml rename to core/core-main/src/main/res/drawable/ic_virtual_pump.xml diff --git a/core/src/main/res/drawable/ic_watch.xml b/core/core-main/src/main/res/drawable/ic_watch.xml similarity index 100% rename from core/src/main/res/drawable/ic_watch.xml rename to core/core-main/src/main/res/drawable/ic_watch.xml diff --git a/core/src/main/res/drawable/ic_x_swap_vert.xml b/core/core-main/src/main/res/drawable/ic_x_swap_vert.xml similarity index 100% rename from core/src/main/res/drawable/ic_x_swap_vert.xml rename to core/core-main/src/main/res/drawable/ic_x_swap_vert.xml diff --git a/core/src/main/res/drawable/icon_insulin_carbs.xml b/core/core-main/src/main/res/drawable/icon_insulin_carbs.xml similarity index 100% rename from core/src/main/res/drawable/icon_insulin_carbs.xml rename to core/core-main/src/main/res/drawable/icon_insulin_carbs.xml diff --git a/core/src/main/res/drawable/launch_screen.xml b/core/core-main/src/main/res/drawable/launch_screen.xml similarity index 100% rename from core/src/main/res/drawable/launch_screen.xml rename to core/core-main/src/main/res/drawable/launch_screen.xml diff --git a/core/src/main/res/drawable/material_button_background.xml b/core/core-main/src/main/res/drawable/material_button_background.xml similarity index 100% rename from core/src/main/res/drawable/material_button_background.xml rename to core/core-main/src/main/res/drawable/material_button_background.xml diff --git a/core/src/main/res/drawable/material_button_selected.xml b/core/core-main/src/main/res/drawable/material_button_selected.xml similarity index 100% rename from core/src/main/res/drawable/material_button_selected.xml rename to core/core-main/src/main/res/drawable/material_button_selected.xml diff --git a/core/src/main/res/drawable/pillborder.xml b/core/core-main/src/main/res/drawable/pillborder.xml similarity index 100% rename from core/src/main/res/drawable/pillborder.xml rename to core/core-main/src/main/res/drawable/pillborder.xml diff --git a/core/src/main/res/drawable/splash_icon.png b/core/core-main/src/main/res/drawable/splash_icon.png similarity index 100% rename from core/src/main/res/drawable/splash_icon.png rename to core/core-main/src/main/res/drawable/splash_icon.png diff --git a/core/src/main/res/layout/close.xml b/core/core-main/src/main/res/layout/close.xml similarity index 100% rename from core/src/main/res/layout/close.xml rename to core/core-main/src/main/res/layout/close.xml diff --git a/core/src/main/res/layout/datetime.xml b/core/core-main/src/main/res/layout/datetime.xml similarity index 100% rename from core/src/main/res/layout/datetime.xml rename to core/core-main/src/main/res/layout/datetime.xml diff --git a/core/src/main/res/layout/dialog_alert_custom_title.xml b/core/core-main/src/main/res/layout/dialog_alert_custom_title.xml similarity index 100% rename from core/src/main/res/layout/dialog_alert_custom_title.xml rename to core/core-main/src/main/res/layout/dialog_alert_custom_title.xml diff --git a/core/src/main/res/layout/dialog_bolusprogress.xml b/core/core-main/src/main/res/layout/dialog_bolusprogress.xml similarity index 100% rename from core/src/main/res/layout/dialog_bolusprogress.xml rename to core/core-main/src/main/res/layout/dialog_bolusprogress.xml diff --git a/core/src/main/res/layout/dialog_error.xml b/core/core-main/src/main/res/layout/dialog_error.xml similarity index 100% rename from core/src/main/res/layout/dialog_error.xml rename to core/core-main/src/main/res/layout/dialog_error.xml diff --git a/core/src/main/res/layout/dialog_profileviewer.xml b/core/core-main/src/main/res/layout/dialog_profileviewer.xml similarity index 100% rename from core/src/main/res/layout/dialog_profileviewer.xml rename to core/core-main/src/main/res/layout/dialog_profileviewer.xml diff --git a/core/src/main/res/layout/maintenance_import_list_activity.xml b/core/core-main/src/main/res/layout/maintenance_import_list_activity.xml similarity index 100% rename from core/src/main/res/layout/maintenance_import_list_activity.xml rename to core/core-main/src/main/res/layout/maintenance_import_list_activity.xml diff --git a/core/src/main/res/layout/maintenance_import_list_item.xml b/core/core-main/src/main/res/layout/maintenance_import_list_item.xml similarity index 100% rename from core/src/main/res/layout/maintenance_import_list_item.xml rename to core/core-main/src/main/res/layout/maintenance_import_list_item.xml diff --git a/core/src/main/res/layout/notes.xml b/core/core-main/src/main/res/layout/notes.xml similarity index 100% rename from core/src/main/res/layout/notes.xml rename to core/core-main/src/main/res/layout/notes.xml diff --git a/core/src/main/res/layout/number_picker_layout.xml b/core/core-main/src/main/res/layout/number_picker_layout.xml similarity index 100% rename from core/src/main/res/layout/number_picker_layout.xml rename to core/core-main/src/main/res/layout/number_picker_layout.xml diff --git a/core/src/main/res/layout/number_picker_layout_vertical.xml b/core/core-main/src/main/res/layout/number_picker_layout_vertical.xml similarity index 100% rename from core/src/main/res/layout/number_picker_layout_vertical.xml rename to core/core-main/src/main/res/layout/number_picker_layout_vertical.xml diff --git a/core/src/main/res/layout/okcancel.xml b/core/core-main/src/main/res/layout/okcancel.xml similarity index 100% rename from core/src/main/res/layout/okcancel.xml rename to core/core-main/src/main/res/layout/okcancel.xml diff --git a/core/src/main/res/layout/passwordprompt.xml b/core/core-main/src/main/res/layout/passwordprompt.xml similarity index 100% rename from core/src/main/res/layout/passwordprompt.xml rename to core/core-main/src/main/res/layout/passwordprompt.xml diff --git a/core/src/main/res/layout/spinner_centered.xml b/core/core-main/src/main/res/layout/spinner_centered.xml similarity index 100% rename from core/src/main/res/layout/spinner_centered.xml rename to core/core-main/src/main/res/layout/spinner_centered.xml diff --git a/core/src/main/res/layout/toast.xml b/core/core-main/src/main/res/layout/toast.xml similarity index 100% rename from core/src/main/res/layout/toast.xml rename to core/core-main/src/main/res/layout/toast.xml diff --git a/core/src/main/res/menu/menu_actions.xml b/core/core-main/src/main/res/menu/menu_actions.xml similarity index 96% rename from core/src/main/res/menu/menu_actions.xml rename to core/core-main/src/main/res/menu/menu_actions.xml index 798c6a5da2..05dc8da163 100644 --- a/core/src/main/res/menu/menu_actions.xml +++ b/core/core-main/src/main/res/menu/menu_actions.xml @@ -1,19 +1,19 @@ - - - - - - - + + + + + + + diff --git a/core/src/main/res/menu/menu_delete_selection.xml b/core/core-main/src/main/res/menu/menu_delete_selection.xml similarity index 100% rename from core/src/main/res/menu/menu_delete_selection.xml rename to core/core-main/src/main/res/menu/menu_delete_selection.xml diff --git a/core/src/main/res/raw/alarm.mp3 b/core/core-main/src/main/res/raw/alarm.mp3 similarity index 100% rename from core/src/main/res/raw/alarm.mp3 rename to core/core-main/src/main/res/raw/alarm.mp3 diff --git a/core/src/main/res/raw/boluserror.mp3 b/core/core-main/src/main/res/raw/boluserror.mp3 similarity index 100% rename from core/src/main/res/raw/boluserror.mp3 rename to core/core-main/src/main/res/raw/boluserror.mp3 diff --git a/core/src/main/res/raw/error.mp3 b/core/core-main/src/main/res/raw/error.mp3 similarity index 100% rename from core/src/main/res/raw/error.mp3 rename to core/core-main/src/main/res/raw/error.mp3 diff --git a/core/src/main/res/values-af-rZA/protection.xml b/core/core-main/src/main/res/values-af-rZA/protection.xml similarity index 100% rename from core/src/main/res/values-af-rZA/protection.xml rename to core/core-main/src/main/res/values-af-rZA/protection.xml diff --git a/core/src/main/res/values-af-rZA/strings.xml b/core/core-main/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from core/src/main/res/values-af-rZA/strings.xml rename to core/core-main/src/main/res/values-af-rZA/strings.xml diff --git a/core/src/main/res/values-af-rZA/validator.xml b/core/core-main/src/main/res/values-af-rZA/validator.xml similarity index 100% rename from core/src/main/res/values-af-rZA/validator.xml rename to core/core-main/src/main/res/values-af-rZA/validator.xml diff --git a/core/src/main/res/values-ar-rSA/protection.xml b/core/core-main/src/main/res/values-ar-rSA/protection.xml similarity index 100% rename from core/src/main/res/values-ar-rSA/protection.xml rename to core/core-main/src/main/res/values-ar-rSA/protection.xml diff --git a/core/src/main/res/values-ar-rSA/strings.xml b/core/core-main/src/main/res/values-ar-rSA/strings.xml similarity index 100% rename from core/src/main/res/values-ar-rSA/strings.xml rename to core/core-main/src/main/res/values-ar-rSA/strings.xml diff --git a/core/src/main/res/values-bg-rBG/protection.xml b/core/core-main/src/main/res/values-bg-rBG/protection.xml similarity index 100% rename from core/src/main/res/values-bg-rBG/protection.xml rename to core/core-main/src/main/res/values-bg-rBG/protection.xml diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/core-main/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from core/src/main/res/values-bg-rBG/strings.xml rename to core/core-main/src/main/res/values-bg-rBG/strings.xml diff --git a/core/src/main/res/values-bg-rBG/validator.xml b/core/core-main/src/main/res/values-bg-rBG/validator.xml similarity index 100% rename from core/src/main/res/values-bg-rBG/validator.xml rename to core/core-main/src/main/res/values-bg-rBG/validator.xml diff --git a/core/src/main/res/values-ca-rES/strings.xml b/core/core-main/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from core/src/main/res/values-ca-rES/strings.xml rename to core/core-main/src/main/res/values-ca-rES/strings.xml diff --git a/core/src/main/res/values-ca-rES/validator.xml b/core/core-main/src/main/res/values-ca-rES/validator.xml similarity index 100% rename from core/src/main/res/values-ca-rES/validator.xml rename to core/core-main/src/main/res/values-ca-rES/validator.xml diff --git a/core/src/main/res/values-cs-rCZ/protection.xml b/core/core-main/src/main/res/values-cs-rCZ/protection.xml similarity index 100% rename from core/src/main/res/values-cs-rCZ/protection.xml rename to core/core-main/src/main/res/values-cs-rCZ/protection.xml diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/core-main/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from core/src/main/res/values-cs-rCZ/strings.xml rename to core/core-main/src/main/res/values-cs-rCZ/strings.xml diff --git a/core/src/main/res/values-cs-rCZ/validator.xml b/core/core-main/src/main/res/values-cs-rCZ/validator.xml similarity index 100% rename from core/src/main/res/values-cs-rCZ/validator.xml rename to core/core-main/src/main/res/values-cs-rCZ/validator.xml diff --git a/core/src/main/res/values-cy-rGB/protection.xml b/core/core-main/src/main/res/values-cy-rGB/protection.xml similarity index 100% rename from core/src/main/res/values-cy-rGB/protection.xml rename to core/core-main/src/main/res/values-cy-rGB/protection.xml diff --git a/core/src/main/res/values-cy-rGB/strings.xml b/core/core-main/src/main/res/values-cy-rGB/strings.xml similarity index 100% rename from core/src/main/res/values-cy-rGB/strings.xml rename to core/core-main/src/main/res/values-cy-rGB/strings.xml diff --git a/core/src/main/res/values-da-rDK/strings.xml b/core/core-main/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from core/src/main/res/values-da-rDK/strings.xml rename to core/core-main/src/main/res/values-da-rDK/strings.xml diff --git a/core/src/main/res/values-da-rDK/validator.xml b/core/core-main/src/main/res/values-da-rDK/validator.xml similarity index 100% rename from core/src/main/res/values-da-rDK/validator.xml rename to core/core-main/src/main/res/values-da-rDK/validator.xml diff --git a/core/src/main/res/values-de-rDE/protection.xml b/core/core-main/src/main/res/values-de-rDE/protection.xml similarity index 100% rename from core/src/main/res/values-de-rDE/protection.xml rename to core/core-main/src/main/res/values-de-rDE/protection.xml diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/core-main/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from core/src/main/res/values-de-rDE/strings.xml rename to core/core-main/src/main/res/values-de-rDE/strings.xml diff --git a/core/src/main/res/values-de-rDE/validator.xml b/core/core-main/src/main/res/values-de-rDE/validator.xml similarity index 100% rename from core/src/main/res/values-de-rDE/validator.xml rename to core/core-main/src/main/res/values-de-rDE/validator.xml diff --git a/core/src/main/res/values-el-rGR/protection.xml b/core/core-main/src/main/res/values-el-rGR/protection.xml similarity index 100% rename from core/src/main/res/values-el-rGR/protection.xml rename to core/core-main/src/main/res/values-el-rGR/protection.xml diff --git a/core/src/main/res/values-el-rGR/strings.xml b/core/core-main/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from core/src/main/res/values-el-rGR/strings.xml rename to core/core-main/src/main/res/values-el-rGR/strings.xml diff --git a/core/src/main/res/values-el-rGR/validator.xml b/core/core-main/src/main/res/values-el-rGR/validator.xml similarity index 100% rename from core/src/main/res/values-el-rGR/validator.xml rename to core/core-main/src/main/res/values-el-rGR/validator.xml diff --git a/core/src/main/res/values-es-rES/protection.xml b/core/core-main/src/main/res/values-es-rES/protection.xml similarity index 100% rename from core/src/main/res/values-es-rES/protection.xml rename to core/core-main/src/main/res/values-es-rES/protection.xml diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/core-main/src/main/res/values-es-rES/strings.xml similarity index 100% rename from core/src/main/res/values-es-rES/strings.xml rename to core/core-main/src/main/res/values-es-rES/strings.xml diff --git a/core/src/main/res/values-es-rES/validator.xml b/core/core-main/src/main/res/values-es-rES/validator.xml similarity index 100% rename from core/src/main/res/values-es-rES/validator.xml rename to core/core-main/src/main/res/values-es-rES/validator.xml diff --git a/core/src/main/res/values-fi-rFI/protection.xml b/core/core-main/src/main/res/values-fi-rFI/protection.xml similarity index 100% rename from core/src/main/res/values-fi-rFI/protection.xml rename to core/core-main/src/main/res/values-fi-rFI/protection.xml diff --git a/core/src/main/res/values-fi-rFI/strings.xml b/core/core-main/src/main/res/values-fi-rFI/strings.xml similarity index 100% rename from core/src/main/res/values-fi-rFI/strings.xml rename to core/core-main/src/main/res/values-fi-rFI/strings.xml diff --git a/core/src/main/res/values-fr-rFR/protection.xml b/core/core-main/src/main/res/values-fr-rFR/protection.xml similarity index 100% rename from core/src/main/res/values-fr-rFR/protection.xml rename to core/core-main/src/main/res/values-fr-rFR/protection.xml diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/core-main/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from core/src/main/res/values-fr-rFR/strings.xml rename to core/core-main/src/main/res/values-fr-rFR/strings.xml diff --git a/core/src/main/res/values-fr-rFR/validator.xml b/core/core-main/src/main/res/values-fr-rFR/validator.xml similarity index 100% rename from core/src/main/res/values-fr-rFR/validator.xml rename to core/core-main/src/main/res/values-fr-rFR/validator.xml diff --git a/core/src/main/res/values-ga-rIE/protection.xml b/core/core-main/src/main/res/values-ga-rIE/protection.xml similarity index 100% rename from core/src/main/res/values-ga-rIE/protection.xml rename to core/core-main/src/main/res/values-ga-rIE/protection.xml diff --git a/core/src/main/res/values-ga-rIE/strings.xml b/core/core-main/src/main/res/values-ga-rIE/strings.xml similarity index 100% rename from core/src/main/res/values-ga-rIE/strings.xml rename to core/core-main/src/main/res/values-ga-rIE/strings.xml diff --git a/core/src/main/res/values-ga-rIE/validator.xml b/core/core-main/src/main/res/values-ga-rIE/validator.xml similarity index 100% rename from core/src/main/res/values-ga-rIE/validator.xml rename to core/core-main/src/main/res/values-ga-rIE/validator.xml diff --git a/core/src/main/res/values-hr-rHR/protection.xml b/core/core-main/src/main/res/values-hr-rHR/protection.xml similarity index 100% rename from core/src/main/res/values-hr-rHR/protection.xml rename to core/core-main/src/main/res/values-hr-rHR/protection.xml diff --git a/core/src/main/res/values-hr-rHR/strings.xml b/core/core-main/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from core/src/main/res/values-hr-rHR/strings.xml rename to core/core-main/src/main/res/values-hr-rHR/strings.xml diff --git a/core/src/main/res/values-hr-rHR/validator.xml b/core/core-main/src/main/res/values-hr-rHR/validator.xml similarity index 100% rename from core/src/main/res/values-hr-rHR/validator.xml rename to core/core-main/src/main/res/values-hr-rHR/validator.xml diff --git a/core/src/main/res/values-hu-rHU/strings.xml b/core/core-main/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from core/src/main/res/values-hu-rHU/strings.xml rename to core/core-main/src/main/res/values-hu-rHU/strings.xml diff --git a/core/src/main/res/values-hu-rHU/validator.xml b/core/core-main/src/main/res/values-hu-rHU/validator.xml similarity index 100% rename from core/src/main/res/values-hu-rHU/validator.xml rename to core/core-main/src/main/res/values-hu-rHU/validator.xml diff --git a/core/src/main/res/values-it-rIT/protection.xml b/core/core-main/src/main/res/values-it-rIT/protection.xml similarity index 100% rename from core/src/main/res/values-it-rIT/protection.xml rename to core/core-main/src/main/res/values-it-rIT/protection.xml diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/core-main/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from core/src/main/res/values-it-rIT/strings.xml rename to core/core-main/src/main/res/values-it-rIT/strings.xml diff --git a/core/src/main/res/values-it-rIT/validator.xml b/core/core-main/src/main/res/values-it-rIT/validator.xml similarity index 100% rename from core/src/main/res/values-it-rIT/validator.xml rename to core/core-main/src/main/res/values-it-rIT/validator.xml diff --git a/core/src/main/res/values-iw-rIL/protection.xml b/core/core-main/src/main/res/values-iw-rIL/protection.xml similarity index 100% rename from core/src/main/res/values-iw-rIL/protection.xml rename to core/core-main/src/main/res/values-iw-rIL/protection.xml diff --git a/core/src/main/res/values-iw-rIL/strings.xml b/core/core-main/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from core/src/main/res/values-iw-rIL/strings.xml rename to core/core-main/src/main/res/values-iw-rIL/strings.xml diff --git a/core/src/main/res/values-iw-rIL/validator.xml b/core/core-main/src/main/res/values-iw-rIL/validator.xml similarity index 100% rename from core/src/main/res/values-iw-rIL/validator.xml rename to core/core-main/src/main/res/values-iw-rIL/validator.xml diff --git a/core/src/main/res/values-ja-rJP/protection.xml b/core/core-main/src/main/res/values-ja-rJP/protection.xml similarity index 100% rename from core/src/main/res/values-ja-rJP/protection.xml rename to core/core-main/src/main/res/values-ja-rJP/protection.xml diff --git a/core/src/main/res/values-ja-rJP/strings.xml b/core/core-main/src/main/res/values-ja-rJP/strings.xml similarity index 100% rename from core/src/main/res/values-ja-rJP/strings.xml rename to core/core-main/src/main/res/values-ja-rJP/strings.xml diff --git a/core/src/main/res/values-ko-rKR/protection.xml b/core/core-main/src/main/res/values-ko-rKR/protection.xml similarity index 100% rename from core/src/main/res/values-ko-rKR/protection.xml rename to core/core-main/src/main/res/values-ko-rKR/protection.xml diff --git a/core/src/main/res/values-ko-rKR/strings.xml b/core/core-main/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from core/src/main/res/values-ko-rKR/strings.xml rename to core/core-main/src/main/res/values-ko-rKR/strings.xml diff --git a/core/src/main/res/values-ko-rKR/validator.xml b/core/core-main/src/main/res/values-ko-rKR/validator.xml similarity index 100% rename from core/src/main/res/values-ko-rKR/validator.xml rename to core/core-main/src/main/res/values-ko-rKR/validator.xml diff --git a/core/src/main/res/values-lt-rLT/protection.xml b/core/core-main/src/main/res/values-lt-rLT/protection.xml similarity index 100% rename from core/src/main/res/values-lt-rLT/protection.xml rename to core/core-main/src/main/res/values-lt-rLT/protection.xml diff --git a/core/src/main/res/values-lt-rLT/strings.xml b/core/core-main/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from core/src/main/res/values-lt-rLT/strings.xml rename to core/core-main/src/main/res/values-lt-rLT/strings.xml diff --git a/core/src/main/res/values-lt-rLT/validator.xml b/core/core-main/src/main/res/values-lt-rLT/validator.xml similarity index 100% rename from core/src/main/res/values-lt-rLT/validator.xml rename to core/core-main/src/main/res/values-lt-rLT/validator.xml diff --git a/core/src/main/res/values-night/colors.xml b/core/core-main/src/main/res/values-night/colors.xml similarity index 100% rename from core/src/main/res/values-night/colors.xml rename to core/core-main/src/main/res/values-night/colors.xml diff --git a/core/src/main/res/values-night/styles.xml b/core/core-main/src/main/res/values-night/styles.xml similarity index 100% rename from core/src/main/res/values-night/styles.xml rename to core/core-main/src/main/res/values-night/styles.xml diff --git a/core/src/main/res/values-nl-rNL/protection.xml b/core/core-main/src/main/res/values-nl-rNL/protection.xml similarity index 100% rename from core/src/main/res/values-nl-rNL/protection.xml rename to core/core-main/src/main/res/values-nl-rNL/protection.xml diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/core-main/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from core/src/main/res/values-nl-rNL/strings.xml rename to core/core-main/src/main/res/values-nl-rNL/strings.xml diff --git a/core/src/main/res/values-nl-rNL/validator.xml b/core/core-main/src/main/res/values-nl-rNL/validator.xml similarity index 100% rename from core/src/main/res/values-nl-rNL/validator.xml rename to core/core-main/src/main/res/values-nl-rNL/validator.xml diff --git a/core/src/main/res/values-no-rNO/strings.xml b/core/core-main/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from core/src/main/res/values-no-rNO/strings.xml rename to core/core-main/src/main/res/values-no-rNO/strings.xml diff --git a/core/src/main/res/values-no-rNO/validator.xml b/core/core-main/src/main/res/values-no-rNO/validator.xml similarity index 100% rename from core/src/main/res/values-no-rNO/validator.xml rename to core/core-main/src/main/res/values-no-rNO/validator.xml diff --git a/core/src/main/res/values-pl-rPL/protection.xml b/core/core-main/src/main/res/values-pl-rPL/protection.xml similarity index 100% rename from core/src/main/res/values-pl-rPL/protection.xml rename to core/core-main/src/main/res/values-pl-rPL/protection.xml diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/core-main/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from core/src/main/res/values-pl-rPL/strings.xml rename to core/core-main/src/main/res/values-pl-rPL/strings.xml diff --git a/core/src/main/res/values-pl-rPL/validator.xml b/core/core-main/src/main/res/values-pl-rPL/validator.xml similarity index 100% rename from core/src/main/res/values-pl-rPL/validator.xml rename to core/core-main/src/main/res/values-pl-rPL/validator.xml diff --git a/core/src/main/res/values-pt-rBR/protection.xml b/core/core-main/src/main/res/values-pt-rBR/protection.xml similarity index 100% rename from core/src/main/res/values-pt-rBR/protection.xml rename to core/core-main/src/main/res/values-pt-rBR/protection.xml diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/core-main/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from core/src/main/res/values-pt-rBR/strings.xml rename to core/core-main/src/main/res/values-pt-rBR/strings.xml diff --git a/core/src/main/res/values-pt-rBR/validator.xml b/core/core-main/src/main/res/values-pt-rBR/validator.xml similarity index 100% rename from core/src/main/res/values-pt-rBR/validator.xml rename to core/core-main/src/main/res/values-pt-rBR/validator.xml diff --git a/core/src/main/res/values-pt-rPT/protection.xml b/core/core-main/src/main/res/values-pt-rPT/protection.xml similarity index 100% rename from core/src/main/res/values-pt-rPT/protection.xml rename to core/core-main/src/main/res/values-pt-rPT/protection.xml diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/core-main/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from core/src/main/res/values-pt-rPT/strings.xml rename to core/core-main/src/main/res/values-pt-rPT/strings.xml diff --git a/core/src/main/res/values-pt-rPT/validator.xml b/core/core-main/src/main/res/values-pt-rPT/validator.xml similarity index 100% rename from core/src/main/res/values-pt-rPT/validator.xml rename to core/core-main/src/main/res/values-pt-rPT/validator.xml diff --git a/core/src/main/res/values-ro-rRO/protection.xml b/core/core-main/src/main/res/values-ro-rRO/protection.xml similarity index 100% rename from core/src/main/res/values-ro-rRO/protection.xml rename to core/core-main/src/main/res/values-ro-rRO/protection.xml diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/core-main/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from core/src/main/res/values-ro-rRO/strings.xml rename to core/core-main/src/main/res/values-ro-rRO/strings.xml diff --git a/core/src/main/res/values-ro-rRO/validator.xml b/core/core-main/src/main/res/values-ro-rRO/validator.xml similarity index 100% rename from core/src/main/res/values-ro-rRO/validator.xml rename to core/core-main/src/main/res/values-ro-rRO/validator.xml diff --git a/core/src/main/res/values-ru-rRU/protection.xml b/core/core-main/src/main/res/values-ru-rRU/protection.xml similarity index 100% rename from core/src/main/res/values-ru-rRU/protection.xml rename to core/core-main/src/main/res/values-ru-rRU/protection.xml diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/core-main/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from core/src/main/res/values-ru-rRU/strings.xml rename to core/core-main/src/main/res/values-ru-rRU/strings.xml diff --git a/core/src/main/res/values-ru-rRU/validator.xml b/core/core-main/src/main/res/values-ru-rRU/validator.xml similarity index 100% rename from core/src/main/res/values-ru-rRU/validator.xml rename to core/core-main/src/main/res/values-ru-rRU/validator.xml diff --git a/core/src/main/res/values-sk-rSK/protection.xml b/core/core-main/src/main/res/values-sk-rSK/protection.xml similarity index 100% rename from core/src/main/res/values-sk-rSK/protection.xml rename to core/core-main/src/main/res/values-sk-rSK/protection.xml diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/core-main/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from core/src/main/res/values-sk-rSK/strings.xml rename to core/core-main/src/main/res/values-sk-rSK/strings.xml diff --git a/core/src/main/res/values-sk-rSK/validator.xml b/core/core-main/src/main/res/values-sk-rSK/validator.xml similarity index 100% rename from core/src/main/res/values-sk-rSK/validator.xml rename to core/core-main/src/main/res/values-sk-rSK/validator.xml diff --git a/core/src/main/res/values-sl-rSI/protection.xml b/core/core-main/src/main/res/values-sl-rSI/protection.xml similarity index 100% rename from core/src/main/res/values-sl-rSI/protection.xml rename to core/core-main/src/main/res/values-sl-rSI/protection.xml diff --git a/core/src/main/res/values-sl-rSI/strings.xml b/core/core-main/src/main/res/values-sl-rSI/strings.xml similarity index 100% rename from core/src/main/res/values-sl-rSI/strings.xml rename to core/core-main/src/main/res/values-sl-rSI/strings.xml diff --git a/core/src/main/res/values-sl-rSI/validator.xml b/core/core-main/src/main/res/values-sl-rSI/validator.xml similarity index 100% rename from core/src/main/res/values-sl-rSI/validator.xml rename to core/core-main/src/main/res/values-sl-rSI/validator.xml diff --git a/core/src/main/res/values-sr-rCS/strings.xml b/core/core-main/src/main/res/values-sr-rCS/strings.xml similarity index 100% rename from core/src/main/res/values-sr-rCS/strings.xml rename to core/core-main/src/main/res/values-sr-rCS/strings.xml diff --git a/core/src/main/res/values-sr-rCS/validator.xml b/core/core-main/src/main/res/values-sr-rCS/validator.xml similarity index 100% rename from core/src/main/res/values-sr-rCS/validator.xml rename to core/core-main/src/main/res/values-sr-rCS/validator.xml diff --git a/core/src/main/res/values-sv-rSE/protection.xml b/core/core-main/src/main/res/values-sv-rSE/protection.xml similarity index 100% rename from core/src/main/res/values-sv-rSE/protection.xml rename to core/core-main/src/main/res/values-sv-rSE/protection.xml diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/core-main/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from core/src/main/res/values-sv-rSE/strings.xml rename to core/core-main/src/main/res/values-sv-rSE/strings.xml diff --git a/core/src/main/res/values-sv-rSE/validator.xml b/core/core-main/src/main/res/values-sv-rSE/validator.xml similarity index 100% rename from core/src/main/res/values-sv-rSE/validator.xml rename to core/core-main/src/main/res/values-sv-rSE/validator.xml diff --git a/core/src/main/res/values-ta-rIN/strings.xml b/core/core-main/src/main/res/values-ta-rIN/strings.xml similarity index 100% rename from core/src/main/res/values-ta-rIN/strings.xml rename to core/core-main/src/main/res/values-ta-rIN/strings.xml diff --git a/core/src/main/res/values-ta-rIN/validator.xml b/core/core-main/src/main/res/values-ta-rIN/validator.xml similarity index 100% rename from core/src/main/res/values-ta-rIN/validator.xml rename to core/core-main/src/main/res/values-ta-rIN/validator.xml diff --git a/core/src/main/res/values-tr-rTR/protection.xml b/core/core-main/src/main/res/values-tr-rTR/protection.xml similarity index 100% rename from core/src/main/res/values-tr-rTR/protection.xml rename to core/core-main/src/main/res/values-tr-rTR/protection.xml diff --git a/core/src/main/res/values-tr-rTR/strings.xml b/core/core-main/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from core/src/main/res/values-tr-rTR/strings.xml rename to core/core-main/src/main/res/values-tr-rTR/strings.xml diff --git a/core/src/main/res/values-tr-rTR/validator.xml b/core/core-main/src/main/res/values-tr-rTR/validator.xml similarity index 100% rename from core/src/main/res/values-tr-rTR/validator.xml rename to core/core-main/src/main/res/values-tr-rTR/validator.xml diff --git a/core/src/main/res/values-zh-rCN/protection.xml b/core/core-main/src/main/res/values-zh-rCN/protection.xml similarity index 100% rename from core/src/main/res/values-zh-rCN/protection.xml rename to core/core-main/src/main/res/values-zh-rCN/protection.xml diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/core-main/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from core/src/main/res/values-zh-rCN/strings.xml rename to core/core-main/src/main/res/values-zh-rCN/strings.xml diff --git a/core/src/main/res/values-zh-rCN/validator.xml b/core/core-main/src/main/res/values-zh-rCN/validator.xml similarity index 100% rename from core/src/main/res/values-zh-rCN/validator.xml rename to core/core-main/src/main/res/values-zh-rCN/validator.xml diff --git a/core/src/main/res/values/attrs.xml b/core/core-main/src/main/res/values/attrs.xml similarity index 100% rename from core/src/main/res/values/attrs.xml rename to core/core-main/src/main/res/values/attrs.xml diff --git a/core/src/main/res/values/colors.xml b/core/core-main/src/main/res/values/colors.xml similarity index 100% rename from core/src/main/res/values/colors.xml rename to core/core-main/src/main/res/values/colors.xml diff --git a/core/src/main/res/values/dimens.xml b/core/core-main/src/main/res/values/dimens.xml similarity index 100% rename from core/src/main/res/values/dimens.xml rename to core/core-main/src/main/res/values/dimens.xml diff --git a/core/src/main/res/values/fet_attrs.xml b/core/core-main/src/main/res/values/fet_attrs.xml similarity index 100% rename from core/src/main/res/values/fet_attrs.xml rename to core/core-main/src/main/res/values/fet_attrs.xml diff --git a/core/core-main/src/main/res/values/protection.xml b/core/core-main/src/main/res/values/protection.xml new file mode 100644 index 0000000000..9f6c0e279b --- /dev/null +++ b/core/core-main/src/main/res/values/protection.xml @@ -0,0 +1,49 @@ + + + Authentication required + Place your finger on the fingerprint reader to verify your identity + Settings protection + Application protection + Bolus protection + Master password + Settings password + Settings PIN + Application password + Application PIN + Bolus password + Bolus PIN + Password and PIN retention [s] + Time before the password or PIN should be entered + Unlock settings + Biometric + Custom password + Custom PIN + No protection + Protection + Master password is not set!\n\nPlease set your Master password in Preferences (%1$s → %2$s) + Unsecure Fallback + In order to be effective, biometric protection needs a master password set for fallback.\n\nPlease set a master password! + + Password set! + PIN set! + Password not set + PIN not set + Password not changed + PIN not changed + Password cleared! + PIN cleared! + Enter password here + Enter PIN here + + master_password + settings_password + settings_pin + application_password + application_pin + bolus_password + bolus_pin + settings_protection + application_protection + bolus_protection + protection_timeout + diff --git a/core/core-main/src/main/res/values/strings.xml b/core/core-main/src/main/res/values/strings.xml new file mode 100644 index 0000000000..441a580345 --- /dev/null +++ b/core/core-main/src/main/res/values/strings.xml @@ -0,0 +1,673 @@ + + + + enable_fabric2 + units + loop_openmode_min_change + absorption_maxtime + openapsama_min_5m_carbimpact + absorption_cutoff + danar_useextended + eatingsoon_duration + eatingsoon_target + activity_duration + activity_target + hypo_duration + hypo_target + low_mark + high_mark + ns_create_announcements_from_errors + bt_watchdog + bt_watchdog_last + pump_unreachable_threshold + missed_bg_readings_threshold + gradually_increase_notification_volume + virtualpump_type + QuickWizard + wearcontrol + units_mgdl + show_notes_entry_dialogs + autosens_max + autosens_min + treatmentssafety_maxcarbs + bgsource_upload_settings + localalert_settings + wear_settings + configbuilder_general_settings + maintenance_settings + smscommunicator_settings + openapssmb_settings + treatmentssafety_settings + loop_settings + virtualpump_settings + pump_settings + tidepool_settings + absorption_settings + overview_settings + openapsma_settings + medtronic_settings + danars_settings + nsclientinternal_settings + insight_local_settings + data_choices_settings + dexcom_settings + active_pump_change_timestamp + active_pump_type + active_pump_serial_number + age + child + teenage + adult + resistantadult + pregnant + app_expiration + use_dark_mode + insulin_oref_peak + autotune_auto + categorize_uam_as_basal + autotune_tune_insulin_curve + autotune_default_tune_days + autotune_circadian_ic_isf + autotune_additional_log + key_autotune_plugin + key_autotune_last_run + dexcomg5_xdripupload + nsclient_localbroadcasts + use_bolus_reminder + carbs_button_increment_1 + carbs_button_increment_2 + carbs_button_increment_3 + enable_pump_unreachable_alert + enable_missed_bg_readings + enable_carbs_required_alert_local + smscommunicator_report_pump_unreachable + rangetodisplay + local_profile_last_change + ns_receive_profile_store + nsclientinternal_url + nsclientinternal_api_secret + ns_receive_insulin + ns_receive_carbs + ns_receive_therapy_events + ns_receive_profile_switch + ns_receive_offline_event + ns_receive_temp_target + + + Refresh + Error + Save + Not set + Failed to update basal profile + Basal profile in pump updated + Invalid input data + Tempbasal delivery error + Going to deliver %1$.2f U + Waiting for pump + Connecting for %1$d s + Delivering %1$.2f U + Handshaking + Connecting + Connected + Disconnected + Disconnecting + Waiting for disconnection + AAPS started + %1$.1f U + %1$.2f U + %1$+.2f U + %1$d g + %1$.0f / %2$d U + %1$.2f U/h + %1$.2f h + %1$d mins + Pump is busy + Pump connection error + Allowed limit reached + Objectives + Close + Please wait… + Mute + Reload + STOP PRESSED + Stop + Carbs + Invalid profile! + NO PROFILE SET + ]]> + Date + Units + DIA + IC + ISF + Basal + Target + Duration of Insulin Action + Insulin to Carb ratio + Insulin Sensitivity Factor + Basal rate + Blood Glucose Target + Initializing ... + Serial number + Battery + Last connection + Last bolus + Daily units + Base basal rate + Temp basal + Extended bolus + Reservoir + Pump history + View profile + Event type + mg/dl + mmol/l + g + % + Advanced Settings + Bluetooth + BT Watchdog + Switches off the phone\'s bluetooth for one second if no connection to the pump is possible. This may help on some phones where the bluetooth stack freezes. + Pairing + Yes + No + LOOP DISABLED BY CONSTRAINTS + Bolus %1$.2f U delivered successfully + OK + No valid basal rate read from pump + Limiting max IOB to %1$.1f U because of %2$s + unsafe usage + Pump unreachable + Extended bolus + Pump time updated + Exit + Remove record + Loop is disabled + Alarm + Disable loop + Enable loop + Resume loop + Suspend loop + Duration [min] + Notification + No profile loaded from NS yet + exists + not exists + Glucose + IOB + COB + Name: + Time + WiFi SSID + Loading … + Event time + Notes + Remove + Add new + Add new above + Data is coming from different pump. Change pump driver to reset pump state. + BG + Calibration + Run alarm in %1$d min + Bolus reported an error. Manually check real delivered amount + Bolus reminder + Duration + g + Pump suspended + Not configured + Loop suspended + Trend arrow + Auto sens + n/a + req + falling rapidly + falling + falling slowly + stable + rising slowly + rising + rising rapidly + none + unknown + high + in range + low + Average + TIR + TDD Total + ]]> + REMOVE + Activate profile + reset + ProfileSwitch missing. Please do a profile switch or press \"Activate Profile\" in the LocalProfile. + Profile + Select for removal + Are you sure you want to remove %1$d items + Treatment + Create new profile from this profile? + Wizard Settings + 15min trend + COB + Bolus IOB + Basal IOB + %1$d%% + Paused + INVALID + Login + Upload now + + + Limiting max basal rate to %1$.2f U/h because of %2$s + pump limit + Limiting max percent rate to %1$d%% because of %2$s + it must be positive value + Limiting bolus to %1$.1f U because of %2$s + Pump not initialized, profile not set! + + + Confirmation + Message + OK + Cancel + DISMISS + + + Bluetooth Low Energy not supported. + Bluetooth Low Energy not supported or device not paired. + Bluetooth not enabled. + Location Is Not Enabled + For Bluetooth discovery to work on newer devices, location must be enabled. AAPS does not track your location and it can be disabled after pairing is successful. + + + Wrong password + Wrong PIN + Passwords don\'t match + PINs don\'t match + + + Basal values not aligned to hours: %1$s + Basal value replaced by minimum supported value: %1$s + Basal value replaced by maximum supported value: %1$s + /U + U/h + g/U + + + Start profile %1$d%% for %2$d min + + + Cancel temp basal + Let temp basal run + Rate + Duration + Reason + No change requested + + + Invalid profile: %1$s + + + %1$d min + + + Careportal + BG Check + Manual BG or Calibration + Announcement + Note + Question + Exercise + Announcement : %1$s + Note : %1$s + Question : %1$s + Exercise : %1$s + Pump Site Change + CGM Sensor Insert + CGM Sensor Start + CGM Sensor Stop + D.A.D. Alert + Insulin Cartridge Change + Profile switch + Snack Bolus + Meal Bolus + Correction Bolus + Combo Bolus + Temp Basal Start + Temp Basal End + Carbs correction + OpenAPS Offline + Pump Battery Change + Temporary target + Temporary target value + Temporary target cancel + Bolus wizard + Finger + Sensor + Manual + unknown + Eating Soon + Hypo + Activity + Wear + Automation + Custom + Pump + Loop + NS + Record + Reading pump history + Pump icon + + + Connection timed out + + + Enacted + Comment + Success + Percent + Absolute + Insulin + U + Waiting for result + SMB + + + %1$d g additional carbs required within %2$d minutes + + + Stats + Cumulative TDD + Exponentially Weighted TDD + Basal + Bolus + TDD + Ratio + # Days + Weight + Possibly inaccurate if using boluses for priming/filling! + Old data, please press "RELOAD" + Total Base Basal + TBB * 2 + + + Time detection + %1$dh %2$dm + + Mute for 5 minutes + + + exported %1$s ago + exported at %1$s + exported less than hour ago + in directory: %1$s + Select file to import + Preferences were created with different variant of AAPS (%1$s) while you have: %2$s.\n\nSome settings may be missing or invalid - after importing please check and update your preferences. + Preferences were created on a different device. It is OK if you are importing from older/different phone, but make sure imported preferences are correct! + You are using the outdated legacy format from old versions of AAPS, which is not secure! Only use it as a last resort, if you do not have an export in current, JSON format. + Imported preferences are already %1$s days old! Maybe you have more up-to-date preferences or you choose the wrong file? Remember to export preferences regularly! + Invalid date-time format! + Preferences from different minor version of application. It is OK if you are importing after upgrade, but check after import if preferences are still correct! + Preferences from different major version of application. Major versions differ significantly and may have incompatible preferences! Make sure after import that preferences are still correct! + Settings file tampered + Settings file is secure + Using not secure, unencrypted settings format + JSON format error, missing required field (format, content, metadata or security) + Decryption error, the given password cannot decrypt the file + File checksum (hash) missing, cannot verify the authenticity of settings! + File was modified after export! + Decryption error, parsing preferences failed! + Decryption error, the provided password is invalid or settings file was modified! It may happen that the imported file was exported with a different Master password. + Missing encryption configuration, settings format is invalid! + Unsupported or not specified encryption algorithm! + + + last_time_this_version_detected + last_versionchecker_warning + last_expired_version_checker_warning + last_versionchecker_plugin_waring + last_revoked_certs_check + We have detected that you are running an invalid version. Loop disabled! + Version %1$s available + Version %1$s expire on %2$s + + + Please reboot your phone or restart AAPS from the System Settings \notherwise Android APS will not have logging (important to track and verify that the algorithms are working correctly)! + + + BOLUS + BOLUS CALCULATOR + BOLUS ADVISOR + EXTENDED BOLUS + SUPERBOLUS TBR + CARBS + EXTENDED CARBS + TEMP BASAL + TEMP TARGET + NEW PROFILE + CLONE PROFILE + STORE PROFILE + PROFILE SWITCH + PROFILE SWITCH CLONED + CLOSED LOOP MODE + LGS LOOP MODE + OPEN LOOP MODE + LOOP DISABLED + LOOP ENABLED + RECONNECT + DISCONNECT + RESUME + SUSPEND + HW PUMP ALLOWED + CLEAR PAIRING KEYS + ACCEPTS TEMP BASAL + CANCEL TEMP BASAL + CANCEL BOLUS + CANCEL EXTENDED BOLUS + CANCEL TEMP TARGET + CAREPORTAL + SITE CHANGE + RESERVOIR CHANGE + CALIBRATION + PRIME BOLUS + TREATMENT + CAREPORTAL NS REFRESH + PROFILE SWITCH NS REFRESH + TREATMENTS NS REFRESH + TEMP TARGET NS REFRESH + AUTOMATION REMOVED + BG REMOVED + CAREPORTAL REMOVED + BOLUS REMOVED + CARBS REMOVED + TEMP BASAL REMOVED + EXTENDED BOLUS REMOVED + FOOD + FOOD REMOVED + PROFILE REMOVED + PROFILE SWITCH REMOVED + RESTART EVENTS REMOVED + TREATMENT REMOVED + TEMP TARGET REMOVED + NS PAUSED + NS RESUME + NS QUEUE CLEARED + NS SETTINGS COPIED + ERROR DIALOG OK + ERROR DIALOG MUTE + ERROR DIALOG MUTE 5MIN + OBJECTIVE STARTED + OBJECTIVE UNSTARTED + OBJECTIVES SKIPPED + STAT RESET + DELETE LOGS + DELETE FUTURE TREATMENTS + Delete future treatments + EXPORT SETTINGS + IMPORT SETTINGS + RESET DATABASES + CLEANUP DATABASES + EXPORT DATABASES + IMPORT DATABASES + OTP EXPORT + OTP RESET + STOP SMS + EXPORT USER ENTRIES + START AAPS + EXIT AAPS + PLUGIN ENABLED + PLUGIN DISABLED + UNKNOWN + String + Source + UTC Offset + Action + Timestamp + No Unit + Export User Entries to Excel (csv) + "%1$s;%2$s;%3$s;%4$s;%5$s;%6$s;%7$s;%8$s;%9$s;%10$s;%11$s;%12$s;%13$s;%14$s;%15$s;%16$s;%17$s" + LOOP CHANGED + LOOP REMOVED + OTHER + + + Profile low target + Profile high target + Temporary target bottom value + Temporary target top value + Temporary target value + Profile DIA value + Profile sensitivity value + Maximal profile basal value + Current basal value + Profile carbs ratio value + %1$.2f limited to %2$.2f + »%1$s« is out of hard limits + »%1$s« %2$.2f is out of hard limits + Basal value + AAPSClient version doesn\'t match AAPS version. Please update. + + + BOLUS %1$.2f U + CARBS %1$d g + EXTENDED BOLUS %1$.2f U %2$d min + LOAD EVENTS + LOAD HISTORY %1$d + LOAD TDDs + SET PROFILE + SET USER SETTINGS + SMB BOLUS %1$.2f U + START PUMP + STOP PUMP + TEMP BASAL %1$.2f U/h %2$d min + TEMP BASAL %1$d%% %2$d min + INSIGHT SET TBR OVER NOTIFICATION + READSTATUS %1$s + KeepAlive. Status outdated. + KeepAlive. Basal outdated. + SMS + Clicked connect to pump + Pump driver changed. + Pump driver change. + Device changed + Clicked refresh + Scheduled Status Refresh + Unconfirmed command + Requested by user + User request + Bolus OK + Pump paired + Insight Refresh Button + decrement %1$s by %2$s + increment %1$s by %2$s + %1$.0f%% + Basal + Basal % + %1$d selected + Sort + Remove Items + Sort Items + Remove Selected Items + file + user + + + Autotune + Help for potential adjustments of profile (ISF, carb ratio, and basal rates) + AT + Autotune settings + Automation Switch Profile + If enabled, Autotune will automatically update and switch to input profile after calculation from an automation rule. + Categorize UAM as basal + Enable only if you have reliably entered all carbs eaten, with this option sudden rises seen by Autotune will be used to recommend changes to the basal rate. + Tune insulin curve + Enable only if you use free peak. This option will tune peak and DIA durations + Number of days of data + Apply average result in circadian IC/ISF + Autotune will not tune circadian variations, this option only apply the average tuning of IC and ISF to your circadian input profile + Include more log information for debugging + Switch on only if requested by dev to send more log information to help debugging Autotune plugin + Default number of days of data to be processed by Autotune (up to 30) + Tuned + Profile : + Tune days : + Last run : + Warning : + Select profile to tune + Selected profile has %1$d IC values. Autotune will use %2$.2f g/U + Selected profile has %1$d ISF values. Autotune will use %2$.1f %3$s/U + Error in input data, try to run again autotune or reduce the number of days + Autotune calculation started, please be patient + Check the results carefully before using it! + Partial result day %1$d / %2$d tuned + Result: %1$s + Param + % + Missing + Autotune profile %1$s + Run Autotune + Check input profile + Compare profiles + Copy to local profile + Update input profile + Revert input profile + Create a new local profile from this Autotune Profile? + Update %1$s profile with Autotune Profile? + Revert %1$s profile with Input Profile? + Profile invalid + |Param|Profile|Tuned|%/Miss.\n + +------------------------------------------\n + | %1$4.4s |\t%2$d |\t%3$d |\n + | %1$4.4s |\t%2$3.1f |\t%3$3.1f |\n + | %1$4.4s | %2$3.3f |\t%3$3.3f |\n + |\t%1$02.0f\t| %2$3.3f |%3$3.3f\t| %5$.0f%% / %4$d\n + |\t∑\t|\t%1$3.1f |\t%2$3.1f |\n + Autotune ran without profile switch + Autotune ran and profile automatically switched + Error during last Autotune run + Another run of Autotune is detected, run cancelled + Application needs bluetooth permission + + + raise_urgent_alarms_as_android_notification + Use system notifications for alerts and notifications + Urgent Alarm + INFO + + + Missing SMS permission + + + %1$d day + %1$d days + + + %1$d hour + %1$d hours + + + %1$d minute + %1$d minutes + + + diff --git a/core/src/main/res/values/styles.xml b/core/core-main/src/main/res/values/styles.xml similarity index 100% rename from core/src/main/res/values/styles.xml rename to core/core-main/src/main/res/values/styles.xml diff --git a/core/core-main/src/main/res/values/validator.xml b/core/core-main/src/main/res/values/validator.xml new file mode 100644 index 0000000000..4de9c5fab1 --- /dev/null +++ b/core/core-main/src/main/res/values/validator.xml @@ -0,0 +1,30 @@ + + + Only numeric digits are allowed. + Only numeric digits within the range %1$s - %2$s are allowed. + This field cannot contain any special character + Only standard letters are allowed + The field must not be empty + Email address not valid + Credit card number is not valid + Phone number not valid + Domain name not valid + IP Address not valid + Web Url is not valid + Not a valid first or last name. + Not a valid full name. + Format not valid + Must be 4 digit number + Must be 6 digit number + Must be 12 characters of ABCDEF0123456789 + Must be 8 characters of ABCDEF0123456789 + Must be 4 characters of ABCDEF0123456789 + Not a minimum length + Pin should be 3 to 6 digits, not same or in series + + ^\\d{4} + ^[A-F0-9]{12}$ + ^[A-F0-9]{8}$ + ^[A-F0-9]{4}$ + + \ No newline at end of file diff --git a/core/src/test/java/info/nightscout/androidaps/TestBase.kt b/core/core-main/src/test/java/info/nightscout/androidaps/TestBase.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/TestBase.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/TestBase.kt diff --git a/core/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/core/core-main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt diff --git a/core/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt b/core/core-main/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt diff --git a/core/src/test/java/info/nightscout/androidaps/data/ConstraintTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/data/ConstraintTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/data/ConstraintTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/data/ConstraintTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/data/DetailedBolusInfoTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/data/DetailedBolusInfoTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/data/DetailedBolusInfoTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/data/DetailedBolusInfoTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/data/IobTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/data/IobTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/data/IobTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/data/IobTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/data/IobTotalTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/data/IobTotalTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/data/IobTotalTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/data/IobTotalTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/data/MealDataTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/data/MealDataTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/data/MealDataTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/data/MealDataTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt similarity index 99% rename from core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt index 9a37dfbe8e..4fd5150895 100644 --- a/core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt +++ b/core/core-main/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt @@ -4,7 +4,7 @@ import android.content.Context import dagger.android.AndroidInjector import info.nightscout.androidaps.TestBase import info.nightscout.androidaps.TestPumpPlugin -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.interfaces.GlucoseUnit diff --git a/core/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt similarity index 99% rename from core/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt index b759a68d3c..ae1da713f6 100644 --- a/core/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt +++ b/core/core-main/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.data import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.androidaps.TestBaseWithProfile -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.interfaces.data.PumpEnactResult import org.json.JSONObject import org.junit.Assert diff --git a/core/src/test/java/info/nightscout/androidaps/extensions/BlockExtensionKtTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/extensions/BlockExtensionKtTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/extensions/BlockExtensionKtTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/extensions/BlockExtensionKtTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/interfaces/ProfileStoreTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/interfaces/ProfileStoreTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/interfaces/ProfileStoreTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/interfaces/ProfileStoreTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/interfaces/PumpDescriptionTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/interfaces/PumpDescriptionTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/interfaces/PumpDescriptionTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/interfaces/PumpDescriptionTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/SingleStringStorage.kt b/core/core-main/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/SingleStringStorage.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/SingleStringStorage.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/SingleStringStorage.kt diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/iob/iobCalculator/GlucoseStatusTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/plugins/iob/iobCalculator/GlucoseStatusTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/plugins/iob/iobCalculator/GlucoseStatusTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/plugins/iob/iobCalculator/GlucoseStatusTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStoreTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStoreTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStoreTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStoreTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/pump/bolusInfo/DetailedBolusInfoStorageTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/pump/bolusInfo/DetailedBolusInfoStorageTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/pump/bolusInfo/DetailedBolusInfoStorageTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/pump/bolusInfo/DetailedBolusInfoStorageTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/pump/bolusInfo/TemporaryBasalStorageTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/pump/bolusInfo/TemporaryBasalStorageTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/pump/bolusInfo/TemporaryBasalStorageTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/pump/bolusInfo/TemporaryBasalStorageTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/pump/common/utils/DateTimeUtilUTest.java b/core/core-main/src/test/java/info/nightscout/androidaps/pump/common/utils/DateTimeUtilUTest.java similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/pump/common/utils/DateTimeUtilUTest.java rename to core/core-main/src/test/java/info/nightscout/androidaps/pump/common/utils/DateTimeUtilUTest.java diff --git a/core/src/test/java/info/nightscout/androidaps/utils/CryptoUtilTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/utils/CryptoUtilTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/utils/CryptoUtilTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/utils/CryptoUtilTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt similarity index 98% rename from core/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt index 16b0d92740..584236da62 100644 --- a/core/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt +++ b/core/core-main/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.utils import android.content.Context import info.nightscout.androidaps.TestBase -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.utils.DateUtil import info.nightscout.shared.utils.T diff --git a/core/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/utils/JsonHelperTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/utils/JsonHelperTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/utils/JsonHelperTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/utils/JsonHelperTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/utils/MidnightTimeTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/utils/MidnightTimeTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/utils/MidnightTimeTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/utils/MidnightTimeTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/utils/RoundTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/utils/RoundTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/utils/RoundTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/utils/RoundTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/utils/StringUtilsTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/utils/StringUtilsTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/utils/StringUtilsTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/utils/StringUtilsTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/utils/TTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/utils/TTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/utils/TTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/utils/TTest.kt diff --git a/core/src/test/java/info/nightscout/androidaps/utils/serialisation/ValueWithUnitSerialiserTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/utils/serialisation/ValueWithUnitSerialiserTest.kt similarity index 100% rename from core/src/test/java/info/nightscout/androidaps/utils/serialisation/ValueWithUnitSerialiserTest.kt rename to core/core-main/src/test/java/info/nightscout/androidaps/utils/serialisation/ValueWithUnitSerialiserTest.kt diff --git a/core/test_dependencies.gradle b/core/core-main/test_dependencies.gradle similarity index 100% rename from core/test_dependencies.gradle rename to core/core-main/test_dependencies.gradle diff --git a/core/src/main/res/values/protection.xml b/core/src/main/res/values/protection.xml index 9f6c0e279b..045e125f3d 100644 --- a/core/src/main/res/values/protection.xml +++ b/core/src/main/res/values/protection.xml @@ -1,49 +1,3 @@ - Authentication required - Place your finger on the fingerprint reader to verify your identity - Settings protection - Application protection - Bolus protection - Master password - Settings password - Settings PIN - Application password - Application PIN - Bolus password - Bolus PIN - Password and PIN retention [s] - Time before the password or PIN should be entered - Unlock settings - Biometric - Custom password - Custom PIN - No protection - Protection - Master password is not set!\n\nPlease set your Master password in Preferences (%1$s → %2$s) - Unsecure Fallback - In order to be effective, biometric protection needs a master password set for fallback.\n\nPlease set a master password! - - Password set! - PIN set! - Password not set - PIN not set - Password not changed - PIN not changed - Password cleared! - PIN cleared! - Enter password here - Enter PIN here - - master_password - settings_password - settings_pin - application_password - application_pin - bolus_password - bolus_pin - settings_protection - application_protection - bolus_protection - protection_timeout diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 441a580345..045e125f3d 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -1,673 +1,3 @@ - - enable_fabric2 - units - loop_openmode_min_change - absorption_maxtime - openapsama_min_5m_carbimpact - absorption_cutoff - danar_useextended - eatingsoon_duration - eatingsoon_target - activity_duration - activity_target - hypo_duration - hypo_target - low_mark - high_mark - ns_create_announcements_from_errors - bt_watchdog - bt_watchdog_last - pump_unreachable_threshold - missed_bg_readings_threshold - gradually_increase_notification_volume - virtualpump_type - QuickWizard - wearcontrol - units_mgdl - show_notes_entry_dialogs - autosens_max - autosens_min - treatmentssafety_maxcarbs - bgsource_upload_settings - localalert_settings - wear_settings - configbuilder_general_settings - maintenance_settings - smscommunicator_settings - openapssmb_settings - treatmentssafety_settings - loop_settings - virtualpump_settings - pump_settings - tidepool_settings - absorption_settings - overview_settings - openapsma_settings - medtronic_settings - danars_settings - nsclientinternal_settings - insight_local_settings - data_choices_settings - dexcom_settings - active_pump_change_timestamp - active_pump_type - active_pump_serial_number - age - child - teenage - adult - resistantadult - pregnant - app_expiration - use_dark_mode - insulin_oref_peak - autotune_auto - categorize_uam_as_basal - autotune_tune_insulin_curve - autotune_default_tune_days - autotune_circadian_ic_isf - autotune_additional_log - key_autotune_plugin - key_autotune_last_run - dexcomg5_xdripupload - nsclient_localbroadcasts - use_bolus_reminder - carbs_button_increment_1 - carbs_button_increment_2 - carbs_button_increment_3 - enable_pump_unreachable_alert - enable_missed_bg_readings - enable_carbs_required_alert_local - smscommunicator_report_pump_unreachable - rangetodisplay - local_profile_last_change - ns_receive_profile_store - nsclientinternal_url - nsclientinternal_api_secret - ns_receive_insulin - ns_receive_carbs - ns_receive_therapy_events - ns_receive_profile_switch - ns_receive_offline_event - ns_receive_temp_target - - - Refresh - Error - Save - Not set - Failed to update basal profile - Basal profile in pump updated - Invalid input data - Tempbasal delivery error - Going to deliver %1$.2f U - Waiting for pump - Connecting for %1$d s - Delivering %1$.2f U - Handshaking - Connecting - Connected - Disconnected - Disconnecting - Waiting for disconnection - AAPS started - %1$.1f U - %1$.2f U - %1$+.2f U - %1$d g - %1$.0f / %2$d U - %1$.2f U/h - %1$.2f h - %1$d mins - Pump is busy - Pump connection error - Allowed limit reached - Objectives - Close - Please wait… - Mute - Reload - STOP PRESSED - Stop - Carbs - Invalid profile! - NO PROFILE SET - ]]> - Date - Units - DIA - IC - ISF - Basal - Target - Duration of Insulin Action - Insulin to Carb ratio - Insulin Sensitivity Factor - Basal rate - Blood Glucose Target - Initializing ... - Serial number - Battery - Last connection - Last bolus - Daily units - Base basal rate - Temp basal - Extended bolus - Reservoir - Pump history - View profile - Event type - mg/dl - mmol/l - g - % - Advanced Settings - Bluetooth - BT Watchdog - Switches off the phone\'s bluetooth for one second if no connection to the pump is possible. This may help on some phones where the bluetooth stack freezes. - Pairing - Yes - No - LOOP DISABLED BY CONSTRAINTS - Bolus %1$.2f U delivered successfully - OK - No valid basal rate read from pump - Limiting max IOB to %1$.1f U because of %2$s - unsafe usage - Pump unreachable - Extended bolus - Pump time updated - Exit - Remove record - Loop is disabled - Alarm - Disable loop - Enable loop - Resume loop - Suspend loop - Duration [min] - Notification - No profile loaded from NS yet - exists - not exists - Glucose - IOB - COB - Name: - Time - WiFi SSID - Loading … - Event time - Notes - Remove - Add new - Add new above - Data is coming from different pump. Change pump driver to reset pump state. - BG - Calibration - Run alarm in %1$d min - Bolus reported an error. Manually check real delivered amount - Bolus reminder - Duration - g - Pump suspended - Not configured - Loop suspended - Trend arrow - Auto sens - n/a - req - falling rapidly - falling - falling slowly - stable - rising slowly - rising - rising rapidly - none - unknown - high - in range - low - Average - TIR - TDD Total - ]]> - REMOVE - Activate profile - reset - ProfileSwitch missing. Please do a profile switch or press \"Activate Profile\" in the LocalProfile. - Profile - Select for removal - Are you sure you want to remove %1$d items - Treatment - Create new profile from this profile? - Wizard Settings - 15min trend - COB - Bolus IOB - Basal IOB - %1$d%% - Paused - INVALID - Login - Upload now - - - Limiting max basal rate to %1$.2f U/h because of %2$s - pump limit - Limiting max percent rate to %1$d%% because of %2$s - it must be positive value - Limiting bolus to %1$.1f U because of %2$s - Pump not initialized, profile not set! - - - Confirmation - Message - OK - Cancel - DISMISS - - - Bluetooth Low Energy not supported. - Bluetooth Low Energy not supported or device not paired. - Bluetooth not enabled. - Location Is Not Enabled - For Bluetooth discovery to work on newer devices, location must be enabled. AAPS does not track your location and it can be disabled after pairing is successful. - - - Wrong password - Wrong PIN - Passwords don\'t match - PINs don\'t match - - - Basal values not aligned to hours: %1$s - Basal value replaced by minimum supported value: %1$s - Basal value replaced by maximum supported value: %1$s - /U - U/h - g/U - - - Start profile %1$d%% for %2$d min - - - Cancel temp basal - Let temp basal run - Rate - Duration - Reason - No change requested - - - Invalid profile: %1$s - - - %1$d min - - - Careportal - BG Check - Manual BG or Calibration - Announcement - Note - Question - Exercise - Announcement : %1$s - Note : %1$s - Question : %1$s - Exercise : %1$s - Pump Site Change - CGM Sensor Insert - CGM Sensor Start - CGM Sensor Stop - D.A.D. Alert - Insulin Cartridge Change - Profile switch - Snack Bolus - Meal Bolus - Correction Bolus - Combo Bolus - Temp Basal Start - Temp Basal End - Carbs correction - OpenAPS Offline - Pump Battery Change - Temporary target - Temporary target value - Temporary target cancel - Bolus wizard - Finger - Sensor - Manual - unknown - Eating Soon - Hypo - Activity - Wear - Automation - Custom - Pump - Loop - NS - Record - Reading pump history - Pump icon - - - Connection timed out - - - Enacted - Comment - Success - Percent - Absolute - Insulin - U - Waiting for result - SMB - - - %1$d g additional carbs required within %2$d minutes - - - Stats - Cumulative TDD - Exponentially Weighted TDD - Basal - Bolus - TDD - Ratio - # Days - Weight - Possibly inaccurate if using boluses for priming/filling! - Old data, please press "RELOAD" - Total Base Basal - TBB * 2 - - - Time detection - %1$dh %2$dm - - Mute for 5 minutes - - - exported %1$s ago - exported at %1$s - exported less than hour ago - in directory: %1$s - Select file to import - Preferences were created with different variant of AAPS (%1$s) while you have: %2$s.\n\nSome settings may be missing or invalid - after importing please check and update your preferences. - Preferences were created on a different device. It is OK if you are importing from older/different phone, but make sure imported preferences are correct! - You are using the outdated legacy format from old versions of AAPS, which is not secure! Only use it as a last resort, if you do not have an export in current, JSON format. - Imported preferences are already %1$s days old! Maybe you have more up-to-date preferences or you choose the wrong file? Remember to export preferences regularly! - Invalid date-time format! - Preferences from different minor version of application. It is OK if you are importing after upgrade, but check after import if preferences are still correct! - Preferences from different major version of application. Major versions differ significantly and may have incompatible preferences! Make sure after import that preferences are still correct! - Settings file tampered - Settings file is secure - Using not secure, unencrypted settings format - JSON format error, missing required field (format, content, metadata or security) - Decryption error, the given password cannot decrypt the file - File checksum (hash) missing, cannot verify the authenticity of settings! - File was modified after export! - Decryption error, parsing preferences failed! - Decryption error, the provided password is invalid or settings file was modified! It may happen that the imported file was exported with a different Master password. - Missing encryption configuration, settings format is invalid! - Unsupported or not specified encryption algorithm! - - - last_time_this_version_detected - last_versionchecker_warning - last_expired_version_checker_warning - last_versionchecker_plugin_waring - last_revoked_certs_check - We have detected that you are running an invalid version. Loop disabled! - Version %1$s available - Version %1$s expire on %2$s - - - Please reboot your phone or restart AAPS from the System Settings \notherwise Android APS will not have logging (important to track and verify that the algorithms are working correctly)! - - - BOLUS - BOLUS CALCULATOR - BOLUS ADVISOR - EXTENDED BOLUS - SUPERBOLUS TBR - CARBS - EXTENDED CARBS - TEMP BASAL - TEMP TARGET - NEW PROFILE - CLONE PROFILE - STORE PROFILE - PROFILE SWITCH - PROFILE SWITCH CLONED - CLOSED LOOP MODE - LGS LOOP MODE - OPEN LOOP MODE - LOOP DISABLED - LOOP ENABLED - RECONNECT - DISCONNECT - RESUME - SUSPEND - HW PUMP ALLOWED - CLEAR PAIRING KEYS - ACCEPTS TEMP BASAL - CANCEL TEMP BASAL - CANCEL BOLUS - CANCEL EXTENDED BOLUS - CANCEL TEMP TARGET - CAREPORTAL - SITE CHANGE - RESERVOIR CHANGE - CALIBRATION - PRIME BOLUS - TREATMENT - CAREPORTAL NS REFRESH - PROFILE SWITCH NS REFRESH - TREATMENTS NS REFRESH - TEMP TARGET NS REFRESH - AUTOMATION REMOVED - BG REMOVED - CAREPORTAL REMOVED - BOLUS REMOVED - CARBS REMOVED - TEMP BASAL REMOVED - EXTENDED BOLUS REMOVED - FOOD - FOOD REMOVED - PROFILE REMOVED - PROFILE SWITCH REMOVED - RESTART EVENTS REMOVED - TREATMENT REMOVED - TEMP TARGET REMOVED - NS PAUSED - NS RESUME - NS QUEUE CLEARED - NS SETTINGS COPIED - ERROR DIALOG OK - ERROR DIALOG MUTE - ERROR DIALOG MUTE 5MIN - OBJECTIVE STARTED - OBJECTIVE UNSTARTED - OBJECTIVES SKIPPED - STAT RESET - DELETE LOGS - DELETE FUTURE TREATMENTS - Delete future treatments - EXPORT SETTINGS - IMPORT SETTINGS - RESET DATABASES - CLEANUP DATABASES - EXPORT DATABASES - IMPORT DATABASES - OTP EXPORT - OTP RESET - STOP SMS - EXPORT USER ENTRIES - START AAPS - EXIT AAPS - PLUGIN ENABLED - PLUGIN DISABLED - UNKNOWN - String - Source - UTC Offset - Action - Timestamp - No Unit - Export User Entries to Excel (csv) - "%1$s;%2$s;%3$s;%4$s;%5$s;%6$s;%7$s;%8$s;%9$s;%10$s;%11$s;%12$s;%13$s;%14$s;%15$s;%16$s;%17$s" - LOOP CHANGED - LOOP REMOVED - OTHER - - - Profile low target - Profile high target - Temporary target bottom value - Temporary target top value - Temporary target value - Profile DIA value - Profile sensitivity value - Maximal profile basal value - Current basal value - Profile carbs ratio value - %1$.2f limited to %2$.2f - »%1$s« is out of hard limits - »%1$s« %2$.2f is out of hard limits - Basal value - AAPSClient version doesn\'t match AAPS version. Please update. - - - BOLUS %1$.2f U - CARBS %1$d g - EXTENDED BOLUS %1$.2f U %2$d min - LOAD EVENTS - LOAD HISTORY %1$d - LOAD TDDs - SET PROFILE - SET USER SETTINGS - SMB BOLUS %1$.2f U - START PUMP - STOP PUMP - TEMP BASAL %1$.2f U/h %2$d min - TEMP BASAL %1$d%% %2$d min - INSIGHT SET TBR OVER NOTIFICATION - READSTATUS %1$s - KeepAlive. Status outdated. - KeepAlive. Basal outdated. - SMS - Clicked connect to pump - Pump driver changed. - Pump driver change. - Device changed - Clicked refresh - Scheduled Status Refresh - Unconfirmed command - Requested by user - User request - Bolus OK - Pump paired - Insight Refresh Button - decrement %1$s by %2$s - increment %1$s by %2$s - %1$.0f%% - Basal - Basal % - %1$d selected - Sort - Remove Items - Sort Items - Remove Selected Items - file - user - - - Autotune - Help for potential adjustments of profile (ISF, carb ratio, and basal rates) - AT - Autotune settings - Automation Switch Profile - If enabled, Autotune will automatically update and switch to input profile after calculation from an automation rule. - Categorize UAM as basal - Enable only if you have reliably entered all carbs eaten, with this option sudden rises seen by Autotune will be used to recommend changes to the basal rate. - Tune insulin curve - Enable only if you use free peak. This option will tune peak and DIA durations - Number of days of data - Apply average result in circadian IC/ISF - Autotune will not tune circadian variations, this option only apply the average tuning of IC and ISF to your circadian input profile - Include more log information for debugging - Switch on only if requested by dev to send more log information to help debugging Autotune plugin - Default number of days of data to be processed by Autotune (up to 30) - Tuned - Profile : - Tune days : - Last run : - Warning : - Select profile to tune - Selected profile has %1$d IC values. Autotune will use %2$.2f g/U - Selected profile has %1$d ISF values. Autotune will use %2$.1f %3$s/U - Error in input data, try to run again autotune or reduce the number of days - Autotune calculation started, please be patient - Check the results carefully before using it! - Partial result day %1$d / %2$d tuned - Result: %1$s - Param - % - Missing - Autotune profile %1$s - Run Autotune - Check input profile - Compare profiles - Copy to local profile - Update input profile - Revert input profile - Create a new local profile from this Autotune Profile? - Update %1$s profile with Autotune Profile? - Revert %1$s profile with Input Profile? - Profile invalid - |Param|Profile|Tuned|%/Miss.\n - +------------------------------------------\n - | %1$4.4s |\t%2$d |\t%3$d |\n - | %1$4.4s |\t%2$3.1f |\t%3$3.1f |\n - | %1$4.4s | %2$3.3f |\t%3$3.3f |\n - |\t%1$02.0f\t| %2$3.3f |%3$3.3f\t| %5$.0f%% / %4$d\n - |\t∑\t|\t%1$3.1f |\t%2$3.1f |\n - Autotune ran without profile switch - Autotune ran and profile automatically switched - Error during last Autotune run - Another run of Autotune is detected, run cancelled - Application needs bluetooth permission - - - raise_urgent_alarms_as_android_notification - Use system notifications for alerts and notifications - Urgent Alarm - INFO - - - Missing SMS permission - - - %1$d day - %1$d days - - - %1$d hour - %1$d hours - - - %1$d minute - %1$d minutes - - diff --git a/core/src/main/res/values/validator.xml b/core/src/main/res/values/validator.xml index 4de9c5fab1..55344e5192 100644 --- a/core/src/main/res/values/validator.xml +++ b/core/src/main/res/values/validator.xml @@ -1,30 +1,3 @@ - Only numeric digits are allowed. - Only numeric digits within the range %1$s - %2$s are allowed. - This field cannot contain any special character - Only standard letters are allowed - The field must not be empty - Email address not valid - Credit card number is not valid - Phone number not valid - Domain name not valid - IP Address not valid - Web Url is not valid - Not a valid first or last name. - Not a valid full name. - Format not valid - Must be 4 digit number - Must be 6 digit number - Must be 12 characters of ABCDEF0123456789 - Must be 8 characters of ABCDEF0123456789 - Must be 4 characters of ABCDEF0123456789 - Not a minimum length - Pin should be 3 to 6 digits, not same or in series - - ^\\d{4} - ^[A-F0-9]{12}$ - ^[A-F0-9]{8}$ - ^[A-F0-9]{4}$ - \ No newline at end of file diff --git a/database/build.gradle b/database/build.gradle index 82b79ab3f9..3b45869b87 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -6,8 +6,8 @@ plugins { id 'com.hiya.jacoco-android' } -apply from: "${project.rootDir}/core/android_dependencies.gradle" -apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" android { diff --git a/graphview/build.gradle b/graphview/build.gradle index a7e69d8d3e..a5f62389b7 100644 --- a/graphview/build.gradle +++ b/graphview/build.gradle @@ -4,7 +4,7 @@ plugins { id 'kotlin-kapt' } -apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" android { diff --git a/implementation/build.gradle b/implementation/build.gradle index c7648b67ef..5cc3ef317d 100644 --- a/implementation/build.gradle +++ b/implementation/build.gradle @@ -6,17 +6,17 @@ plugins { id 'com.hiya.jacoco-android' } -apply from: "${project.rootDir}/core/android_dependencies.gradle" -apply from: "${project.rootDir}/core/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { namespace 'info.nightscout.implementation' } dependencies { - implementation project(':core') + implementation project(':core:core-main') implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') implementation project(':database') diff --git a/implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt b/implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt index 1df309db04..05799ef818 100644 --- a/implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt @@ -1,6 +1,6 @@ package info.nightscout.implementation -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.database.entities.GlucoseValue import info.nightscout.shared.interfaces.ResourceHelper diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt index 403d1469c7..59e55dcaca 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt +++ b/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt @@ -1,6 +1,6 @@ package info.nightscout.implementation.pump -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.data.DetailedBolusInfo import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.database.ValueWrapper diff --git a/insight/build.gradle b/insight/build.gradle index 55feaf304e..7cf99ebb59 100644 --- a/insight/build.gradle +++ b/insight/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { @@ -27,7 +27,7 @@ android { dependencies { - implementation project(':core') + implementation project(':core:core-main') implementation project(':interfaces') implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') diff --git a/interfaces/build.gradle b/interfaces/build.gradle index 59108b8319..3e5bcf62be 100644 --- a/interfaces/build.gradle +++ b/interfaces/build.gradle @@ -8,8 +8,8 @@ plugins { id 'com.hiya.jacoco-android' } -apply from: "${project.rootDir}/core/android_dependencies.gradle" -apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" android { diff --git a/ns-sdk/build.gradle b/ns-sdk/build.gradle index d8c4d43bd3..7156942277 100644 --- a/ns-sdk/build.gradle +++ b/ns-sdk/build.gradle @@ -5,9 +5,9 @@ plugins { id 'kotlinx-serialization' } -apply from: "${project.rootDir}/core/android_dependencies.gradle" -apply from: "${project.rootDir}/core/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" android { namespace 'info.nightscout.sdk' diff --git a/openhumans/build.gradle b/openhumans/build.gradle index 797ea3d9d3..5e9a0b01f2 100644 --- a/openhumans/build.gradle +++ b/openhumans/build.gradle @@ -6,18 +6,18 @@ plugins { id 'com.hiya.jacoco-android' } -apply from: "${project.rootDir}/core/android_dependencies.gradle" -apply from: "${project.rootDir}/core/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { namespace 'info.nightscout.androidaps.plugin.general.openhumans' } dependencies { - implementation project(':core') + implementation project(':core:core-main') implementation project(':database') implementation project(':interfaces') implementation project(':app-wear-shared:rx') diff --git a/plugins/build.gradle b/plugins/build.gradle index b14ffeda51..9a6b3b6c7a 100644 --- a/plugins/build.gradle +++ b/plugins/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { namespace 'info.nightscout.plugins' } @@ -20,7 +20,7 @@ dependencies { implementation project(':app-wear-shared:shared') implementation project(':database') implementation project(':graphview') - implementation project(':core') + implementation project(':core:core-main') implementation project(':interfaces') implementation project(':ns-sdk') diff --git a/plugins/src/main/java/info/nightscout/plugins/configBuilder/RunningConfiguration.kt b/plugins/src/main/java/info/nightscout/plugins/configBuilder/RunningConfiguration.kt index bb018bda28..54652d33fd 100644 --- a/plugins/src/main/java/info/nightscout/plugins/configBuilder/RunningConfiguration.kt +++ b/plugins/src/main/java/info/nightscout/plugins/configBuilder/RunningConfiguration.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.configBuilder -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.interfaces.ConfigBuilder import info.nightscout.androidaps.interfaces.Insulin diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt b/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt index 6b4e4b6594..326a9bcb8d 100644 --- a/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt +++ b/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.general.autotune.data import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.data.LocalInsulin import info.nightscout.androidaps.data.ProfileSealed import info.nightscout.androidaps.data.PureProfile diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt b/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt index edb2e4ab77..ce2bf354e8 100644 --- a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt +++ b/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclient.extensions -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.entities.TherapyEvent import info.nightscout.interfaces.GlucoseUnit import info.nightscout.interfaces.Constants diff --git a/pump/combo/build.gradle b/pump/combo/build.gradle index b89823c385..42fcb70cfe 100644 --- a/pump/combo/build.gradle +++ b/pump/combo/build.gradle @@ -6,18 +6,18 @@ plugins { id 'com.hiya.jacoco-android' } -apply from: "${project.rootDir}/core/android_dependencies.gradle" -apply from: "${project.rootDir}/core/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { namespace 'info.nightscout.androidaps.combo' } dependencies { implementation project(':libraries') - implementation project(':core') + implementation project(':core:core-main') implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') implementation project(':interfaces') diff --git a/pump/dana/build.gradle b/pump/dana/build.gradle index 2b95c5c310..0d2f194186 100644 --- a/pump/dana/build.gradle +++ b/pump/dana/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { @@ -27,7 +27,7 @@ android { dependencies { implementation project(':libraries') - implementation project(':core') + implementation project(':core:core-main') implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') implementation project(':interfaces') diff --git a/pump/danar/build.gradle b/pump/danar/build.gradle index a42d20830f..06808b1162 100644 --- a/pump/danar/build.gradle +++ b/pump/danar/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { namespace 'info.nightscout.androidaps.danar' } @@ -18,7 +18,7 @@ android { dependencies { implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') - implementation project(':core') + implementation project(':core:core-main') implementation project(':pump:dana') implementation project(':interfaces') } \ No newline at end of file diff --git a/pump/danars/build.gradle b/pump/danars/build.gradle index b2150687f9..5628f1e947 100644 --- a/pump/danars/build.gradle +++ b/pump/danars/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { ndkVersion "21.1.6352462" @@ -31,7 +31,7 @@ android { } dependencies { - implementation project(':core') + implementation project(':core:core-main') implementation project(':pump:dana') implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt index a6cface7dc..96ab578ecc 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt +++ b/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt @@ -66,7 +66,7 @@ class BLEScanActivity : NoSplashAppCompatActivity() { bluetoothAdapter?.safeEnable() startScan() } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission)) + ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.needconnectpermission)) } } @@ -82,7 +82,7 @@ class BLEScanActivity : NoSplashAppCompatActivity() { } catch (ignore: IllegalStateException) { } // ignore BT not on } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission)) + ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.needconnectpermission)) } private fun stopScan() = @@ -92,7 +92,7 @@ class BLEScanActivity : NoSplashAppCompatActivity() { } catch (ignore: IllegalStateException) { } // ignore BT not on } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission)) + ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.needconnectpermission)) } @SuppressLint("MissingPermission") @@ -153,7 +153,7 @@ class BLEScanActivity : NoSplashAppCompatActivity() { item.device.createBond() rxBus.send(EventDanaRSDeviceChange()) } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission)) + ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.needconnectpermission)) } finish() } diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt index 7800ee4fe8..42ebdf60d6 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt +++ b/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt @@ -106,7 +106,7 @@ class BLEComm @Inject internal constructor( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) { - ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission)) + ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.needconnectpermission)) aapsLogger.error(LTag.PUMPBTCOMM, "missing permission: $from") return false } diff --git a/pump/diaconn/build.gradle b/pump/diaconn/build.gradle index bb1b4ad234..e8dfecc216 100644 --- a/pump/diaconn/build.gradle +++ b/pump/diaconn/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { @@ -30,7 +30,7 @@ dependencies { implementation project(':app-wear-shared:shared') implementation project(':libraries') implementation project(':interfaces') - implementation project(':core') + implementation project(':core:core-main') api "androidx.room:room-ktx:$room_version" api "androidx.room:room-runtime:$room_version" diff --git a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt index 1dc392ba5b..8bf851e9c9 100644 --- a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt +++ b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt @@ -73,7 +73,7 @@ class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() { startScan() } } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission)) + ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.needconnectpermission)) } } @@ -112,7 +112,7 @@ class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) { - ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission)) + ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.needconnectpermission)) return } if (device == null || device.name == null || device.name == "") { diff --git a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt index bdf6762e57..821b72c64a 100644 --- a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt +++ b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt @@ -89,7 +89,7 @@ class BLECommonService @Inject internal constructor( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) { - ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission)) + ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.needconnectpermission)) aapsLogger.error(LTag.PUMPBTCOMM, "missing permission: $from") return false } diff --git a/pump/eopatch/build.gradle b/pump/eopatch/build.gradle index 5ecc00dce6..dd99534517 100644 --- a/pump/eopatch/build.gradle +++ b/pump/eopatch/build.gradle @@ -6,10 +6,10 @@ plugins { id 'com.hiya.jacoco-android' } -apply from: "${project.rootDir}/core/android_dependencies.gradle" -apply from: "${project.rootDir}/core/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { namespace 'info.nightscout.androidaps.plugins.pump.eopatch' @@ -25,7 +25,7 @@ dependencies { implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') implementation project(':database') - implementation project(':core') + implementation project(':core:core-main') implementation project(':interfaces') //RxAndroidBle diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt index 30055959ab..6c70dd41d8 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt @@ -320,7 +320,7 @@ class EopatchPumpPlugin @Inject constructor( patchManager.addBolusToHistory(detailedBolusInfo) return PumpEnactResultImpl(injector).success(true).enacted(true).bolusDelivered(0.0) - .carbsDelivered(detailedBolusInfo.carbs).comment(rh.gs(info.nightscout.androidaps.core.R.string.ok)) + .carbsDelivered(detailedBolusInfo.carbs).comment(rh.gs(info.nightscout.core.main.R.string.ok)) } } @@ -421,7 +421,7 @@ class EopatchPumpPlugin @Inject constructor( .map { PumpEnactResultImpl(injector).success(true).enacted(true) } .onErrorReturnItem( PumpEnactResultImpl(injector).success(false).enacted(false).bolusDelivered(0.0) - .comment(rh.gs(info.nightscout.androidaps.core.R.string.error)) + .comment(rh.gs(info.nightscout.core.main.R.string.error)) ) .blockingGet() } @@ -458,7 +458,7 @@ class EopatchPumpPlugin @Inject constructor( .map { PumpEnactResultImpl(injector).success(true).enacted(true).isTempCancel(true) } .onErrorReturnItem( PumpEnactResultImpl(injector).success(false).enacted(false) - .comment(rh.gs(info.nightscout.androidaps.core.R.string.error)) + .comment(rh.gs(info.nightscout.core.main.R.string.error)) ) .blockingGet() } @@ -479,7 +479,7 @@ class EopatchPumpPlugin @Inject constructor( .map { PumpEnactResultImpl(injector).success(true).enacted(true).isTempCancel(true) } .onErrorReturnItem( PumpEnactResultImpl(injector).success(false).enacted(false) - .comment(rh.gs(info.nightscout.androidaps.core.R.string.error)) + .comment(rh.gs(info.nightscout.core.main.R.string.error)) ) .blockingGet() } else { diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/AlarmHelperActivity.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/AlarmHelperActivity.kt index 3fa5f1eedc..69f6086c4e 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/AlarmHelperActivity.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/AlarmHelperActivity.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ui import android.os.Bundle import androidx.appcompat.app.AlertDialog import info.nightscout.androidaps.activities.DialogAppCompatActivity -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode import info.nightscout.androidaps.plugins.pump.eopatch.event.EventDialog import info.nightscout.androidaps.plugins.pump.eopatch.event.EventProgressDialog diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/DialogHelperActivity.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/DialogHelperActivity.kt index 5751066837..294b0eca79 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/DialogHelperActivity.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/DialogHelperActivity.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ui import android.os.Bundle import info.nightscout.androidaps.activities.DialogAppCompatActivity -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.plugins.pump.eopatch.ui.dialogs.ActivationNotCompleteDialog class DialogHelperActivity : DialogAppCompatActivity() { diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EoBaseActivity.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EoBaseActivity.kt index 4a349c175e..d197239f5c 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EoBaseActivity.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EoBaseActivity.kt @@ -8,7 +8,7 @@ import androidx.databinding.DataBindingUtil import androidx.databinding.ViewDataBinding import androidx.lifecycle.ViewModelProvider import info.nightscout.androidaps.activities.NoSplashAppCompatActivity -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.plugins.pump.eopatch.dagger.EopatchPluginQualifier import info.nightscout.rx.AapsSchedulers import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt index a70db271dc..d5b824b01a 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt @@ -10,7 +10,7 @@ import android.view.ViewGroup import android.view.Window import android.view.WindowManager import dagger.android.support.DaggerDialogFragment -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmProcess import info.nightscout.androidaps.plugins.pump.eopatch.alarm.IAlarmProcess diff --git a/pump/medtronic/build.gradle b/pump/medtronic/build.gradle index ade2787122..7873cba6e7 100644 --- a/pump/medtronic/build.gradle +++ b/pump/medtronic/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { namespace 'info.nightscout.androidaps.plugins.pump.medtronic' } @@ -19,7 +19,7 @@ dependencies { implementation project(':libraries') implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') - implementation project(':core') + implementation project(':core:core-main') implementation project(':pump:pump-common') implementation project(':pump:pump-core') implementation project(':pump:rileylink') diff --git a/pump/omnipod-common/build.gradle b/pump/omnipod-common/build.gradle index eb2d92e808..e445bc5d99 100644 --- a/pump/omnipod-common/build.gradle +++ b/pump/omnipod-common/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { namespace 'info.nightscout.androidaps.plugins.pump.omnipod.common' @@ -18,7 +18,7 @@ android { dependencies { implementation project(':libraries') - implementation project(':core') + implementation project(':core:core-main') implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') implementation project(':interfaces') diff --git a/pump/omnipod-dash/build.gradle b/pump/omnipod-dash/build.gradle index c9f3cc718a..0fd002ff78 100644 --- a/pump/omnipod-dash/build.gradle +++ b/pump/omnipod-dash/build.gradle @@ -8,11 +8,11 @@ plugins { id "org.jlleitschuh.gradle.ktlint" // TODO move to `subprojects` section in global build.gradle } -apply from: "${project.rootDir}/core/android_dependencies.gradle" -apply from: "${project.rootDir}/core/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" detekt { // TODO move to `subprojects` section in global build.gradle toolVersion = "1.15.0-RC2" @@ -37,7 +37,7 @@ dependencies { implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') implementation project(':libraries') - implementation project(':core') + implementation project(':core:core-main') implementation project(':pump:pump-common') implementation project(':pump:omnipod-common') implementation project(':interfaces') diff --git a/pump/omnipod-eros/build.gradle b/pump/omnipod-eros/build.gradle index 46fba25214..9e7f496a67 100644 --- a/pump/omnipod-eros/build.gradle +++ b/pump/omnipod-eros/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { @@ -30,7 +30,7 @@ dependencies { implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') implementation project(':libraries') - implementation project(':core') + implementation project(':core:core-main') implementation project(':pump:pump-common') implementation project(':pump:pump-core') implementation project(':pump:rileylink') diff --git a/pump/pump-common/build.gradle b/pump/pump-common/build.gradle index 2c974a7c88..a5bdc109f9 100644 --- a/pump/pump-common/build.gradle +++ b/pump/pump-common/build.gradle @@ -6,17 +6,17 @@ plugins { id 'com.hiya.jacoco-android' } -apply from: "${project.rootDir}/core/android_dependencies.gradle" -apply from: "${project.rootDir}/core/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { namespace 'info.nightscout.androidaps.plugins.pump.common' } dependencies { - implementation project(':core') + implementation project(':core:core-main') implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') implementation project(':interfaces') diff --git a/pump/pump-core/build.gradle b/pump/pump-core/build.gradle index eb744c9963..05256720e0 100644 --- a/pump/pump-core/build.gradle +++ b/pump/pump-core/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { namespace 'info.nightscout.pump.core' } diff --git a/pump/rileylink/build.gradle b/pump/rileylink/build.gradle index 5d7e629096..68cd0ebdd4 100644 --- a/pump/rileylink/build.gradle +++ b/pump/rileylink/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/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { namespace 'info.nightscout.androidaps.plugins.pump.common.hw.rileylink' } @@ -18,7 +18,7 @@ android { dependencies { implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') - implementation project(':core') + implementation project(':core:core-main') implementation project(':pump:pump-common') implementation project(':pump:pump-core') implementation project(':interfaces') diff --git a/settings.gradle b/settings.gradle index 3ab7a61408..44e623fd1d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,7 @@ include ':app' include ':wear' include ':database' -include ':core' +include ':core:core-main' include ':app-wear-shared:rx' include ':app-wear-shared:shared' include ':app-wear-shared:shared-impl' diff --git a/ui/build.gradle b/ui/build.gradle index f7ca3d31e6..431f59397b 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -6,10 +6,10 @@ plugins { id 'com.hiya.jacoco-android' } -apply from: "${project.rootDir}/core/android_dependencies.gradle" -apply from: "${project.rootDir}/core/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { namespace 'info.nightscout.ui' @@ -21,6 +21,6 @@ dependencies { implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') implementation project(':database') - implementation project(':core') + implementation project(':core:core-main') implementation project(':interfaces') } \ No newline at end of file diff --git a/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt index 4acf51ae66..e45d57feea 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.os.Bundle import androidx.annotation.RawRes import info.nightscout.androidaps.activities.DialogAppCompatActivity -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.database.transactions.InsertTherapyEventAnnouncementTransaction import info.nightscout.androidaps.dialogs.ErrorDialog diff --git a/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt index eef0a09e79..9411291005 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt @@ -15,7 +15,7 @@ import android.widget.TableLayout import android.widget.TableRow import android.widget.TextView import info.nightscout.androidaps.activities.NoSplashAppCompatActivity -import info.nightscout.androidaps.core.R +import info.nightscout.core.main.R import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.database.entities.TotalDailyDose import info.nightscout.rx.events.EventDanaRSyncStatus diff --git a/wear/build.gradle b/wear/build.gradle index f6545564b1..2a5e427588 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -19,9 +19,9 @@ plugins { id 'com.hiya.jacoco-android' } -apply from: "${project.rootDir}/core/test_dependencies.gradle" -apply from: "${project.rootDir}/core/android_dependencies.gradle" -apply from: "${project.rootDir}/core/jacoco_global.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" def generateGitBuild = { ->