From 2e3159fd6067606c57399fb6bb27be90ed6b18e2 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 26 Sep 2023 17:20:32 +0200 Subject: [PATCH] :ui cleanup --- app/src/main/AndroidManifest.xml | 4 -- app/src/main/kotlin/app/aaps/MainActivity.kt | 8 +-- app/src/main/kotlin/app/aaps/MainApp.kt | 4 +- .../main/kotlin/app/aaps/di/AppComponent.kt | 2 +- .../aaps/implementations/UiInteractionImpl.kt | 42 +++++------ ui/build.gradle | 2 +- ui/src/main/AndroidManifest.xml | 11 ++- .../activities/BolusProgressHelperActivity.kt | 4 +- .../ui/activities/ErrorHelperActivity.kt | 6 +- .../ui/activities/ProfileHelperActivity.kt | 12 ++-- .../ui/activities/QuickWizardListActivity.kt | 12 ++-- .../app/aaps}/ui/activities/StatsActivity.kt | 8 +-- .../app/aaps}/ui/activities/SurveyActivity.kt | 8 +-- .../aaps}/ui/activities/TDDStatsActivity.kt | 4 +- .../aaps}/ui/activities/TreatmentsActivity.kt | 20 +++--- .../fragments/TreatmentsBolusCarbsFragment.kt | 12 ++-- .../fragments/TreatmentsCareportalFragment.kt | 10 +-- .../TreatmentsExtendedBolusesFragment.kt | 10 +-- .../TreatmentsProfileSwitchFragment.kt | 12 ++-- .../fragments/TreatmentsTempTargetFragment.kt | 10 +-- .../TreatmentsTemporaryBasalsFragment.kt | 10 +-- .../fragments/TreatmentsUserEntryFragment.kt | 8 +-- .../ui/activityMonitor/ActivityMonitor.kt | 4 +- .../app/aaps}/ui/alertDialogs/ErrorDialog.kt | 4 +- .../aaps}/ui/defaultProfile/DefaultProfile.kt | 2 +- .../ui/defaultProfile/DefaultProfileDPV.kt | 2 +- .../app/aaps}/ui/di/UiModule.kt | 72 +++++++++---------- .../aaps}/ui/dialogs/BolusProgressDialog.kt | 4 +- .../app/aaps}/ui/dialogs/CalibrationDialog.kt | 4 +- .../app/aaps}/ui/dialogs/CarbsDialog.kt | 6 +- .../app/aaps}/ui/dialogs/CareDialog.kt | 6 +- .../ui/dialogs/DialogFragmentWithDate.kt | 2 +- .../aaps}/ui/dialogs/EditQuickWizardDialog.kt | 8 +-- .../aaps}/ui/dialogs/ExtendedBolusDialog.kt | 6 +- .../app/aaps}/ui/dialogs/FillDialog.kt | 6 +- .../app/aaps}/ui/dialogs/InsulinDialog.kt | 8 +-- .../app/aaps}/ui/dialogs/LoopDialog.kt | 6 +- .../aaps}/ui/dialogs/ProfileSwitchDialog.kt | 6 +- .../aaps}/ui/dialogs/ProfileViewerDialog.kt | 4 +- .../app/aaps}/ui/dialogs/TempBasalDialog.kt | 6 +- .../app/aaps}/ui/dialogs/TempTargetDialog.kt | 6 +- .../app/aaps}/ui/dialogs/TreatmentDialog.kt | 6 +- .../app/aaps}/ui/dialogs/WizardDialog.kt | 6 +- .../app/aaps}/ui/dialogs/WizardInfoDialog.kt | 6 +- .../aaps}/ui/elements/EmptyRecyclerView.kt | 2 +- .../aaps}/ui/events/EventQuickWizardChange.kt | 2 +- .../ui/extensions/DoubleToSignedString.kt | 2 +- .../ui/extensions/InterfaceIDsExtension.kt | 2 +- .../aaps}/ui/services/AlarmSoundService.kt | 2 +- .../ui/services/AlarmSoundServiceHelper.kt | 2 +- .../app/aaps}/ui/tabs/TabPageAdapter.kt | 2 +- .../app/aaps}/ui/widget/Widget.kt | 4 +- .../ui/widget/WidgetConfigureActivity.kt | 4 +- .../res/layout/activity_profilehelper.xml | 2 +- .../res/layout/activity_quickwizard_list.xml | 2 +- ui/src/main/res/layout/activity_stats.xml | 2 +- ui/src/main/res/layout/activity_tdd_stats.xml | 2 +- ui/src/main/res/layout/dialog_carbs.xml | 2 +- .../res/layout/dialog_edit_quickwizard.xml | 2 +- ui/src/main/res/layout/dialog_wizard.xml | 2 +- .../treatments_bolus_carbs_fragment.xml | 2 +- .../layout/treatments_careportal_fragment.xml | 2 +- .../treatments_extendedbolus_fragment.xml | 2 +- .../treatments_profileswitch_fragment.xml | 2 +- .../layout/treatments_tempbasals_fragment.xml | 2 +- .../layout/treatments_temptarget_fragment.xml | 2 +- .../layout/treatments_user_entry_fragment.xml | 2 +- ui/src/main/res/xml/widget_info.xml | 2 +- .../ui/defaultProfile/DefaultProfileTest.kt | 2 +- .../extensions/InterfaceIDsExtensionKtTest.kt | 2 +- 70 files changed, 228 insertions(+), 227 deletions(-) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/BolusProgressHelperActivity.kt (84%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/ErrorHelperActivity.kt (90%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/ProfileHelperActivity.kt (98%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/QuickWizardListActivity.kt (96%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/StatsActivity.kt (96%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/SurveyActivity.kt (96%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/TDDStatsActivity.kt (99%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/TreatmentsActivity.kt (80%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt (98%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/fragments/TreatmentsCareportalFragment.kt (97%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt (97%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt (97%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/fragments/TreatmentsTempTargetFragment.kt (97%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt (97%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activities/fragments/TreatmentsUserEntryFragment.kt (97%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/activityMonitor/ActivityMonitor.kt (98%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/alertDialogs/ErrorDialog.kt (97%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/defaultProfile/DefaultProfile.kt (99%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/defaultProfile/DefaultProfileDPV.kt (98%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/di/UiModule.kt (63%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/BolusProgressDialog.kt (98%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/CalibrationDialog.kt (97%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/CarbsDialog.kt (99%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/CareDialog.kt (99%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/DialogFragmentWithDate.kt (99%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/EditQuickWizardDialog.kt (97%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/ExtendedBolusDialog.kt (97%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/FillDialog.kt (99%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/InsulinDialog.kt (98%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/LoopDialog.kt (99%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/ProfileSwitchDialog.kt (99%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/ProfileViewerDialog.kt (99%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/TempBasalDialog.kt (98%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/TempTargetDialog.kt (99%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/TreatmentDialog.kt (98%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/WizardDialog.kt (99%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/dialogs/WizardInfoDialog.kt (97%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/elements/EmptyRecyclerView.kt (98%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/events/EventQuickWizardChange.kt (72%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/extensions/DoubleToSignedString.kt (89%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/extensions/InterfaceIDsExtension.kt (77%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/services/AlarmSoundService.kt (99%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/services/AlarmSoundServiceHelper.kt (98%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/tabs/TabPageAdapter.kt (97%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/widget/Widget.kt (99%) rename ui/src/main/{java/info/nightscout => kotlin/app/aaps}/ui/widget/WidgetConfigureActivity.kt (96%) rename ui/src/test/{java/info/nightscout => kotlin/app/aaps}/ui/defaultProfile/DefaultProfileTest.kt (97%) rename ui/src/test/{java/info/nightscout => kotlin/app/aaps}/ui/extensions/InterfaceIDsExtensionKtTest.kt (94%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2ce0ccee01..6baa3a5a34 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -134,10 +134,6 @@ android:resource="@xml/filepaths" /> - diff --git a/app/src/main/kotlin/app/aaps/MainActivity.kt b/app/src/main/kotlin/app/aaps/MainActivity.kt index 7b68857b63..fcb1e69c17 100644 --- a/app/src/main/kotlin/app/aaps/MainActivity.kt +++ b/app/src/main/kotlin/app/aaps/MainActivity.kt @@ -71,10 +71,10 @@ import com.joanzapata.iconify.fonts.FontAwesomeModule import info.nightscout.androidaps.BuildConfig import info.nightscout.androidaps.R import info.nightscout.androidaps.databinding.ActivityMainBinding -import info.nightscout.ui.activities.ProfileHelperActivity -import info.nightscout.ui.activities.StatsActivity -import info.nightscout.ui.activities.TreatmentsActivity -import info.nightscout.ui.tabs.TabPageAdapter +import app.aaps.ui.activities.ProfileHelperActivity +import app.aaps.ui.activities.StatsActivity +import app.aaps.ui.activities.TreatmentsActivity +import app.aaps.ui.tabs.TabPageAdapter import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.io.File diff --git a/app/src/main/kotlin/app/aaps/MainApp.kt b/app/src/main/kotlin/app/aaps/MainApp.kt index 997ad70478..3621ae4c12 100644 --- a/app/src/main/kotlin/app/aaps/MainApp.kt +++ b/app/src/main/kotlin/app/aaps/MainApp.kt @@ -49,8 +49,8 @@ import info.nightscout.androidaps.R import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction import info.nightscout.database.impl.transactions.VersionChangeTransaction -import info.nightscout.ui.activityMonitor.ActivityMonitor -import info.nightscout.ui.widget.Widget +import app.aaps.ui.activityMonitor.ActivityMonitor +import app.aaps.ui.widget.Widget import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.exceptions.UndeliverableException import io.reactivex.rxjava3.kotlin.plusAssign diff --git a/app/src/main/kotlin/app/aaps/di/AppComponent.kt b/app/src/main/kotlin/app/aaps/di/AppComponent.kt index 1768733100..703601777d 100644 --- a/app/src/main/kotlin/app/aaps/di/AppComponent.kt +++ b/app/src/main/kotlin/app/aaps/di/AppComponent.kt @@ -36,7 +36,7 @@ import info.nightscout.pump.danars.di.DanaRSModule import info.nightscout.pump.diaconn.di.DiaconnG8Module import info.nightscout.pump.medtrum.di.MedtrumModule import info.nightscout.pump.virtual.di.VirtualPumpModule -import info.nightscout.ui.di.UiModule +import app.aaps.ui.di.UiModule import info.nightscout.workflow.di.WorkflowModule import javax.inject.Singleton diff --git a/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt b/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt index 2218d96113..b7d41ceda3 100644 --- a/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt +++ b/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt @@ -20,27 +20,27 @@ import app.aaps.plugins.configuration.activities.SingleFragmentActivity import app.aaps.plugins.main.general.overview.notifications.NotificationWithAction import dagger.android.HasAndroidInjector import info.nightscout.androidaps.R -import info.nightscout.ui.activities.BolusProgressHelperActivity -import info.nightscout.ui.activities.ErrorHelperActivity -import info.nightscout.ui.activities.QuickWizardListActivity -import info.nightscout.ui.activities.TDDStatsActivity -import info.nightscout.ui.dialogs.BolusProgressDialog -import info.nightscout.ui.dialogs.CalibrationDialog -import info.nightscout.ui.dialogs.CarbsDialog -import info.nightscout.ui.dialogs.CareDialog -import info.nightscout.ui.dialogs.ExtendedBolusDialog -import info.nightscout.ui.dialogs.FillDialog -import info.nightscout.ui.dialogs.InsulinDialog -import info.nightscout.ui.dialogs.LoopDialog -import info.nightscout.ui.dialogs.ProfileSwitchDialog -import info.nightscout.ui.dialogs.ProfileViewerDialog -import info.nightscout.ui.dialogs.TempBasalDialog -import info.nightscout.ui.dialogs.TempTargetDialog -import info.nightscout.ui.dialogs.TreatmentDialog -import info.nightscout.ui.dialogs.WizardDialog -import info.nightscout.ui.services.AlarmSoundService -import info.nightscout.ui.services.AlarmSoundServiceHelper -import info.nightscout.ui.widget.Widget +import app.aaps.ui.activities.BolusProgressHelperActivity +import app.aaps.ui.activities.ErrorHelperActivity +import app.aaps.ui.activities.QuickWizardListActivity +import app.aaps.ui.activities.TDDStatsActivity +import app.aaps.ui.dialogs.BolusProgressDialog +import app.aaps.ui.dialogs.CalibrationDialog +import app.aaps.ui.dialogs.CarbsDialog +import app.aaps.ui.dialogs.CareDialog +import app.aaps.ui.dialogs.ExtendedBolusDialog +import app.aaps.ui.dialogs.FillDialog +import app.aaps.ui.dialogs.InsulinDialog +import app.aaps.ui.dialogs.LoopDialog +import app.aaps.ui.dialogs.ProfileSwitchDialog +import app.aaps.ui.dialogs.ProfileViewerDialog +import app.aaps.ui.dialogs.TempBasalDialog +import app.aaps.ui.dialogs.TempTargetDialog +import app.aaps.ui.dialogs.TreatmentDialog +import app.aaps.ui.dialogs.WizardDialog +import app.aaps.ui.services.AlarmSoundService +import app.aaps.ui.services.AlarmSoundServiceHelper +import app.aaps.ui.widget.Widget import javax.inject.Inject class UiInteractionImpl @Inject constructor( diff --git a/ui/build.gradle b/ui/build.gradle index 4e92419efc..c75e9364c1 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -11,7 +11,7 @@ apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle" android { - namespace 'info.nightscout.ui' + namespace 'app.aaps.ui' } dependencies { diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml index 76fe1b6ba9..3b6e32a84e 100644 --- a/ui/src/main/AndroidManifest.xml +++ b/ui/src/main/AndroidManifest.xml @@ -29,7 +29,7 @@ android:exported="false" android:theme="@style/AppTheme" /> - + + + \ No newline at end of file diff --git a/ui/src/main/java/info/nightscout/ui/activities/BolusProgressHelperActivity.kt b/ui/src/main/kotlin/app/aaps/ui/activities/BolusProgressHelperActivity.kt similarity index 84% rename from ui/src/main/java/info/nightscout/ui/activities/BolusProgressHelperActivity.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/BolusProgressHelperActivity.kt index 4713d4d5e7..3efe8a01ed 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/BolusProgressHelperActivity.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/BolusProgressHelperActivity.kt @@ -1,8 +1,8 @@ -package info.nightscout.ui.activities +package app.aaps.ui.activities import android.os.Bundle import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.ui.dialogs.BolusProgressDialog +import app.aaps.ui.dialogs.BolusProgressDialog class BolusProgressHelperActivity : TranslatedDaggerAppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt b/ui/src/main/kotlin/app/aaps/ui/activities/ErrorHelperActivity.kt similarity index 90% rename from ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/ErrorHelperActivity.kt index a27156395a..0e64b71213 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/ErrorHelperActivity.kt @@ -1,12 +1,12 @@ -package info.nightscout.ui.activities +package app.aaps.ui.activities import android.os.Bundle import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction -import info.nightscout.ui.alertDialogs.ErrorDialog -import info.nightscout.ui.services.AlarmSoundService +import app.aaps.ui.alertDialogs.ErrorDialog +import app.aaps.ui.services.AlarmSoundService import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject diff --git a/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt b/ui/src/main/kotlin/app/aaps/ui/activities/ProfileHelperActivity.kt similarity index 98% rename from ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/ProfileHelperActivity.kt index e9d9ce8e0a..2e7915ab12 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/ProfileHelperActivity.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.activities +package app.aaps.ui.activities import android.annotation.SuppressLint import android.os.Bundle @@ -27,11 +27,11 @@ import app.aaps.database.entities.EffectiveProfileSwitch import com.google.android.material.tabs.TabLayout import com.google.common.collect.Lists import info.nightscout.database.impl.AppRepository -import info.nightscout.ui.R -import info.nightscout.ui.databinding.ActivityProfilehelperBinding -import info.nightscout.ui.defaultProfile.DefaultProfile -import info.nightscout.ui.defaultProfile.DefaultProfileDPV -import info.nightscout.ui.dialogs.ProfileViewerDialog +import app.aaps.ui.R +import app.aaps.ui.databinding.ActivityProfilehelperBinding +import app.aaps.ui.defaultProfile.DefaultProfile +import app.aaps.ui.defaultProfile.DefaultProfileDPV +import app.aaps.ui.dialogs.ProfileViewerDialog import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign diff --git a/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt b/ui/src/main/kotlin/app/aaps/ui/activities/QuickWizardListActivity.kt similarity index 96% rename from ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/QuickWizardListActivity.kt index 58a81a105d..2f3975914a 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/QuickWizardListActivity.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.activities +package app.aaps.ui.activities import android.annotation.SuppressLint import android.os.Bundle @@ -31,11 +31,11 @@ import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.dragHelpers.ItemTouchHelperAdapter import app.aaps.core.ui.dragHelpers.OnStartDragListener import app.aaps.core.ui.dragHelpers.SimpleItemTouchHelperCallback -import info.nightscout.ui.R -import info.nightscout.ui.databinding.ActivityQuickwizardListBinding -import info.nightscout.ui.databinding.QuickwizardListItemBinding -import info.nightscout.ui.dialogs.EditQuickWizardDialog -import info.nightscout.ui.events.EventQuickWizardChange +import app.aaps.ui.R +import app.aaps.ui.databinding.ActivityQuickwizardListBinding +import app.aaps.ui.databinding.QuickwizardListItemBinding +import app.aaps.ui.dialogs.EditQuickWizardDialog +import app.aaps.ui.events.EventQuickWizardChange import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject diff --git a/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt b/ui/src/main/kotlin/app/aaps/ui/activities/StatsActivity.kt similarity index 96% rename from ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/StatsActivity.kt index b31f9e11e3..d13b904b33 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/StatsActivity.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.activities +package app.aaps.ui.activities import android.annotation.SuppressLint import android.os.Bundle @@ -17,9 +17,9 @@ import app.aaps.core.ui.dialogs.OKDialog import app.aaps.database.entities.UserEntry.Action import app.aaps.database.entities.UserEntry.Sources import info.nightscout.database.impl.AppRepository -import info.nightscout.ui.R -import info.nightscout.ui.activityMonitor.ActivityMonitor -import info.nightscout.ui.databinding.ActivityStatsBinding +import app.aaps.ui.R +import app.aaps.ui.activityMonitor.ActivityMonitor +import app.aaps.ui.databinding.ActivityStatsBinding import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign diff --git a/ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt b/ui/src/main/kotlin/app/aaps/ui/activities/SurveyActivity.kt similarity index 96% rename from ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/SurveyActivity.kt index 88b81219b0..cf3d13277d 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/SurveyActivity.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.activities +package app.aaps.ui.activities import android.os.Bundle import android.widget.ArrayAdapter @@ -10,9 +10,9 @@ import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.toast.ToastUtils import app.aaps.core.utils.fabric.InstanceId -import info.nightscout.ui.R -import info.nightscout.ui.databinding.ActivitySurveyBinding -import info.nightscout.ui.defaultProfile.DefaultProfile +import app.aaps.ui.R +import app.aaps.ui.databinding.ActivitySurveyBinding +import app.aaps.ui.defaultProfile.DefaultProfile import javax.inject.Inject class SurveyActivity : TranslatedDaggerAppCompatActivity() { diff --git a/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt b/ui/src/main/kotlin/app/aaps/ui/activities/TDDStatsActivity.kt similarity index 99% rename from ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/TDDStatsActivity.kt index a518fe58ca..581164660d 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/TDDStatsActivity.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.activities +package app.aaps.ui.activities import android.annotation.SuppressLint import android.graphics.Rect @@ -32,7 +32,7 @@ import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.database.entities.TotalDailyDose import info.nightscout.database.impl.AppRepository -import info.nightscout.ui.databinding.ActivityTddStatsBinding +import app.aaps.ui.databinding.ActivityTddStatsBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import java.text.DateFormat import java.text.DecimalFormat diff --git a/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt b/ui/src/main/kotlin/app/aaps/ui/activities/TreatmentsActivity.kt similarity index 80% rename from ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/TreatmentsActivity.kt index 94fab6bb7c..b8d4b9d1e4 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/TreatmentsActivity.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.activities +package app.aaps.ui.activities import android.os.Bundle import androidx.fragment.app.Fragment @@ -9,15 +9,15 @@ import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.resources.ResourceHelper import com.google.android.material.tabs.TabLayout import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.ui.R -import info.nightscout.ui.activities.fragments.TreatmentsBolusCarbsFragment -import info.nightscout.ui.activities.fragments.TreatmentsCareportalFragment -import info.nightscout.ui.activities.fragments.TreatmentsExtendedBolusesFragment -import info.nightscout.ui.activities.fragments.TreatmentsProfileSwitchFragment -import info.nightscout.ui.activities.fragments.TreatmentsTempTargetFragment -import info.nightscout.ui.activities.fragments.TreatmentsTemporaryBasalsFragment -import info.nightscout.ui.activities.fragments.TreatmentsUserEntryFragment -import info.nightscout.ui.databinding.TreatmentsFragmentBinding +import app.aaps.ui.R +import app.aaps.ui.activities.fragments.TreatmentsBolusCarbsFragment +import app.aaps.ui.activities.fragments.TreatmentsCareportalFragment +import app.aaps.ui.activities.fragments.TreatmentsExtendedBolusesFragment +import app.aaps.ui.activities.fragments.TreatmentsProfileSwitchFragment +import app.aaps.ui.activities.fragments.TreatmentsTempTargetFragment +import app.aaps.ui.activities.fragments.TreatmentsTemporaryBasalsFragment +import app.aaps.ui.activities.fragments.TreatmentsUserEntryFragment +import app.aaps.ui.databinding.TreatmentsFragmentBinding import javax.inject.Inject class TreatmentsActivity : TranslatedDaggerAppCompatActivity() { diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt similarity index 98% rename from ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt index 90f20ceab9..fd7ed567bd 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.activities.fragments +package app.aaps.ui.activities.fragments import android.annotation.SuppressLint import android.graphics.Paint @@ -47,11 +47,11 @@ import info.nightscout.database.impl.transactions.CutCarbsTransaction import info.nightscout.database.impl.transactions.InvalidateBolusCalculatorResultTransaction import info.nightscout.database.impl.transactions.InvalidateBolusTransaction import info.nightscout.database.impl.transactions.InvalidateCarbsTransaction -import info.nightscout.ui.R -import info.nightscout.ui.databinding.TreatmentsBolusCarbsFragmentBinding -import info.nightscout.ui.databinding.TreatmentsBolusCarbsItemBinding -import info.nightscout.ui.dialogs.WizardInfoDialog -import info.nightscout.ui.extensions.isPumpHistory +import app.aaps.ui.R +import app.aaps.ui.databinding.TreatmentsBolusCarbsFragmentBinding +import app.aaps.ui.databinding.TreatmentsBolusCarbsItemBinding +import app.aaps.ui.dialogs.WizardInfoDialog +import app.aaps.ui.extensions.isPumpHistory import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.util.concurrent.TimeUnit diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsCareportalFragment.kt similarity index 97% rename from ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsCareportalFragment.kt index 33e99806d9..5a6be8d5ae 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsCareportalFragment.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.activities.fragments +package app.aaps.ui.activities.fragments import android.os.Bundle import android.util.SparseArray @@ -38,10 +38,10 @@ import dagger.android.support.DaggerFragment import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InvalidateAAPSStartedTherapyEventTransaction import info.nightscout.database.impl.transactions.InvalidateTherapyEventTransaction -import info.nightscout.ui.R -import info.nightscout.ui.activities.fragments.TreatmentsCareportalFragment.RecyclerViewAdapter.TherapyEventsViewHolder -import info.nightscout.ui.databinding.TreatmentsCareportalFragmentBinding -import info.nightscout.ui.databinding.TreatmentsCareportalItemBinding +import app.aaps.ui.R +import app.aaps.ui.activities.fragments.TreatmentsCareportalFragment.RecyclerViewAdapter.TherapyEventsViewHolder +import app.aaps.ui.databinding.TreatmentsCareportalFragmentBinding +import app.aaps.ui.databinding.TreatmentsCareportalItemBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.util.concurrent.TimeUnit diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt similarity index 97% rename from ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt index a4ccad549b..5f4b9975ed 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.activities.fragments +package app.aaps.ui.activities.fragments import android.annotation.SuppressLint import android.os.Bundle @@ -40,10 +40,10 @@ import app.aaps.database.entities.interfaces.end import dagger.android.support.DaggerFragment import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InvalidateExtendedBolusTransaction -import info.nightscout.ui.R -import info.nightscout.ui.activities.fragments.TreatmentsExtendedBolusesFragment.RecyclerViewAdapter.ExtendedBolusesViewHolder -import info.nightscout.ui.databinding.TreatmentsExtendedbolusFragmentBinding -import info.nightscout.ui.databinding.TreatmentsExtendedbolusItemBinding +import app.aaps.ui.R +import app.aaps.ui.activities.fragments.TreatmentsExtendedBolusesFragment.RecyclerViewAdapter.ExtendedBolusesViewHolder +import app.aaps.ui.databinding.TreatmentsExtendedbolusFragmentBinding +import app.aaps.ui.databinding.TreatmentsExtendedbolusItemBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.util.concurrent.TimeUnit diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt similarity index 97% rename from ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt index 88d925c0ef..36d1bf62b7 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.activities.fragments +package app.aaps.ui.activities.fragments import android.annotation.SuppressLint import android.graphics.Paint @@ -44,11 +44,11 @@ import app.aaps.database.entities.ValueWithUnit import dagger.android.support.DaggerFragment import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InvalidateProfileSwitchTransaction -import info.nightscout.ui.R -import info.nightscout.ui.activities.fragments.TreatmentsProfileSwitchFragment.RecyclerProfileViewAdapter.ProfileSwitchViewHolder -import info.nightscout.ui.databinding.TreatmentsProfileswitchFragmentBinding -import info.nightscout.ui.databinding.TreatmentsProfileswitchItemBinding -import info.nightscout.ui.dialogs.ProfileViewerDialog +import app.aaps.ui.R +import app.aaps.ui.activities.fragments.TreatmentsProfileSwitchFragment.RecyclerProfileViewAdapter.ProfileSwitchViewHolder +import app.aaps.ui.databinding.TreatmentsProfileswitchFragmentBinding +import app.aaps.ui.databinding.TreatmentsProfileswitchItemBinding +import app.aaps.ui.dialogs.ProfileViewerDialog import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTempTargetFragment.kt similarity index 97% rename from ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTempTargetFragment.kt index ab92b23e54..e6f463c722 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTempTargetFragment.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.activities.fragments +package app.aaps.ui.activities.fragments import android.annotation.SuppressLint import android.os.Bundle @@ -45,10 +45,10 @@ import app.aaps.database.entities.interfaces.end import dagger.android.support.DaggerFragment import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InvalidateTemporaryTargetTransaction -import info.nightscout.ui.R -import info.nightscout.ui.activities.fragments.TreatmentsTempTargetFragment.RecyclerViewAdapter.TempTargetsViewHolder -import info.nightscout.ui.databinding.TreatmentsTemptargetFragmentBinding -import info.nightscout.ui.databinding.TreatmentsTemptargetItemBinding +import app.aaps.ui.R +import app.aaps.ui.activities.fragments.TreatmentsTempTargetFragment.RecyclerViewAdapter.TempTargetsViewHolder +import app.aaps.ui.databinding.TreatmentsTemptargetFragmentBinding +import app.aaps.ui.databinding.TreatmentsTemptargetItemBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.util.concurrent.TimeUnit diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt similarity index 97% rename from ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt index 583d022a25..0d5d213f22 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.activities.fragments +package app.aaps.ui.activities.fragments import android.annotation.SuppressLint import android.os.Bundle @@ -46,10 +46,10 @@ import dagger.android.support.DaggerFragment import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InvalidateExtendedBolusTransaction import info.nightscout.database.impl.transactions.InvalidateTemporaryBasalTransaction -import info.nightscout.ui.R -import info.nightscout.ui.activities.fragments.TreatmentsTemporaryBasalsFragment.RecyclerViewAdapter.TempBasalsViewHolder -import info.nightscout.ui.databinding.TreatmentsTempbasalsFragmentBinding -import info.nightscout.ui.databinding.TreatmentsTempbasalsItemBinding +import app.aaps.ui.R +import app.aaps.ui.activities.fragments.TreatmentsTemporaryBasalsFragment.RecyclerViewAdapter.TempBasalsViewHolder +import app.aaps.ui.databinding.TreatmentsTempbasalsFragmentBinding +import app.aaps.ui.databinding.TreatmentsTempbasalsItemBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.util.concurrent.TimeUnit diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsUserEntryFragment.kt similarity index 97% rename from ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt rename to ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsUserEntryFragment.kt index 1b7f5c54b0..7b798df036 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsUserEntryFragment.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.activities.fragments +package app.aaps.ui.activities.fragments import android.os.Bundle import android.view.LayoutInflater @@ -30,9 +30,9 @@ import app.aaps.database.entities.UserEntry.Action import app.aaps.database.entities.UserEntry.Sources import dagger.android.support.DaggerFragment import info.nightscout.database.impl.AppRepository -import info.nightscout.ui.R -import info.nightscout.ui.databinding.TreatmentsUserEntryFragmentBinding -import info.nightscout.ui.databinding.TreatmentsUserEntryItemBinding +import app.aaps.ui.R +import app.aaps.ui.databinding.TreatmentsUserEntryFragmentBinding +import app.aaps.ui.databinding.TreatmentsUserEntryItemBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject diff --git a/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt b/ui/src/main/kotlin/app/aaps/ui/activityMonitor/ActivityMonitor.kt similarity index 98% rename from ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt rename to ui/src/main/kotlin/app/aaps/ui/activityMonitor/ActivityMonitor.kt index 948ba28c41..566c381d4e 100644 --- a/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activityMonitor/ActivityMonitor.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.activityMonitor +package app.aaps.ui.activityMonitor import android.app.Activity import android.app.Application @@ -17,7 +17,7 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.interfaces.utils.T -import info.nightscout.ui.R +import app.aaps.ui.R import javax.inject.Inject import javax.inject.Singleton diff --git a/ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt b/ui/src/main/kotlin/app/aaps/ui/alertDialogs/ErrorDialog.kt similarity index 97% rename from ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/alertDialogs/ErrorDialog.kt index 7c5fdd5c18..dd00c57b27 100644 --- a/ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/alertDialogs/ErrorDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.alertDialogs +package app.aaps.ui.alertDialogs import android.content.res.Resources import android.os.Bundle @@ -17,7 +17,7 @@ import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.database.entities.UserEntry.Action import app.aaps.database.entities.UserEntry.Sources import dagger.android.support.DaggerDialogFragment -import info.nightscout.ui.databinding.DialogErrorBinding +import app.aaps.ui.databinding.DialogErrorBinding import javax.inject.Inject class ErrorDialog : DaggerDialogFragment() { diff --git a/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt b/ui/src/main/kotlin/app/aaps/ui/defaultProfile/DefaultProfile.kt similarity index 99% rename from ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt rename to ui/src/main/kotlin/app/aaps/ui/defaultProfile/DefaultProfile.kt index 19b5d92377..50a49f29e2 100644 --- a/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt +++ b/ui/src/main/kotlin/app/aaps/ui/defaultProfile/DefaultProfile.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.defaultProfile +package app.aaps.ui.defaultProfile import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.interfaces.db.GlucoseUnit diff --git a/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt b/ui/src/main/kotlin/app/aaps/ui/defaultProfile/DefaultProfileDPV.kt similarity index 98% rename from ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt rename to ui/src/main/kotlin/app/aaps/ui/defaultProfile/DefaultProfileDPV.kt index 36a7898288..3bd0887bd4 100644 --- a/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt +++ b/ui/src/main/kotlin/app/aaps/ui/defaultProfile/DefaultProfileDPV.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.defaultProfile +package app.aaps.ui.defaultProfile import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.interfaces.db.GlucoseUnit diff --git a/ui/src/main/java/info/nightscout/ui/di/UiModule.kt b/ui/src/main/kotlin/app/aaps/ui/di/UiModule.kt similarity index 63% rename from ui/src/main/java/info/nightscout/ui/di/UiModule.kt rename to ui/src/main/kotlin/app/aaps/ui/di/UiModule.kt index e00e2e2e6f..a261dfcabf 100644 --- a/ui/src/main/java/info/nightscout/ui/di/UiModule.kt +++ b/ui/src/main/kotlin/app/aaps/ui/di/UiModule.kt @@ -1,42 +1,42 @@ -package info.nightscout.ui.di +package app.aaps.ui.di import dagger.Module import dagger.android.ContributesAndroidInjector -import info.nightscout.ui.activities.BolusProgressHelperActivity -import info.nightscout.ui.activities.ErrorHelperActivity -import info.nightscout.ui.activities.ProfileHelperActivity -import info.nightscout.ui.activities.QuickWizardListActivity -import info.nightscout.ui.activities.StatsActivity -import info.nightscout.ui.activities.SurveyActivity -import info.nightscout.ui.activities.TDDStatsActivity -import info.nightscout.ui.activities.TreatmentsActivity -import info.nightscout.ui.activities.fragments.TreatmentsBolusCarbsFragment -import info.nightscout.ui.activities.fragments.TreatmentsCareportalFragment -import info.nightscout.ui.activities.fragments.TreatmentsExtendedBolusesFragment -import info.nightscout.ui.activities.fragments.TreatmentsProfileSwitchFragment -import info.nightscout.ui.activities.fragments.TreatmentsTempTargetFragment -import info.nightscout.ui.activities.fragments.TreatmentsTemporaryBasalsFragment -import info.nightscout.ui.activities.fragments.TreatmentsUserEntryFragment -import info.nightscout.ui.alertDialogs.ErrorDialog -import info.nightscout.ui.dialogs.BolusProgressDialog -import info.nightscout.ui.dialogs.CalibrationDialog -import info.nightscout.ui.dialogs.CarbsDialog -import info.nightscout.ui.dialogs.CareDialog -import info.nightscout.ui.dialogs.EditQuickWizardDialog -import info.nightscout.ui.dialogs.ExtendedBolusDialog -import info.nightscout.ui.dialogs.FillDialog -import info.nightscout.ui.dialogs.InsulinDialog -import info.nightscout.ui.dialogs.LoopDialog -import info.nightscout.ui.dialogs.ProfileSwitchDialog -import info.nightscout.ui.dialogs.ProfileViewerDialog -import info.nightscout.ui.dialogs.TempBasalDialog -import info.nightscout.ui.dialogs.TempTargetDialog -import info.nightscout.ui.dialogs.TreatmentDialog -import info.nightscout.ui.dialogs.WizardDialog -import info.nightscout.ui.dialogs.WizardInfoDialog -import info.nightscout.ui.services.AlarmSoundService -import info.nightscout.ui.widget.Widget -import info.nightscout.ui.widget.WidgetConfigureActivity +import app.aaps.ui.activities.BolusProgressHelperActivity +import app.aaps.ui.activities.ErrorHelperActivity +import app.aaps.ui.activities.ProfileHelperActivity +import app.aaps.ui.activities.QuickWizardListActivity +import app.aaps.ui.activities.StatsActivity +import app.aaps.ui.activities.SurveyActivity +import app.aaps.ui.activities.TDDStatsActivity +import app.aaps.ui.activities.TreatmentsActivity +import app.aaps.ui.activities.fragments.TreatmentsBolusCarbsFragment +import app.aaps.ui.activities.fragments.TreatmentsCareportalFragment +import app.aaps.ui.activities.fragments.TreatmentsExtendedBolusesFragment +import app.aaps.ui.activities.fragments.TreatmentsProfileSwitchFragment +import app.aaps.ui.activities.fragments.TreatmentsTempTargetFragment +import app.aaps.ui.activities.fragments.TreatmentsTemporaryBasalsFragment +import app.aaps.ui.activities.fragments.TreatmentsUserEntryFragment +import app.aaps.ui.alertDialogs.ErrorDialog +import app.aaps.ui.dialogs.BolusProgressDialog +import app.aaps.ui.dialogs.CalibrationDialog +import app.aaps.ui.dialogs.CarbsDialog +import app.aaps.ui.dialogs.CareDialog +import app.aaps.ui.dialogs.EditQuickWizardDialog +import app.aaps.ui.dialogs.ExtendedBolusDialog +import app.aaps.ui.dialogs.FillDialog +import app.aaps.ui.dialogs.InsulinDialog +import app.aaps.ui.dialogs.LoopDialog +import app.aaps.ui.dialogs.ProfileSwitchDialog +import app.aaps.ui.dialogs.ProfileViewerDialog +import app.aaps.ui.dialogs.TempBasalDialog +import app.aaps.ui.dialogs.TempTargetDialog +import app.aaps.ui.dialogs.TreatmentDialog +import app.aaps.ui.dialogs.WizardDialog +import app.aaps.ui.dialogs.WizardInfoDialog +import app.aaps.ui.services.AlarmSoundService +import app.aaps.ui.widget.Widget +import app.aaps.ui.widget.WidgetConfigureActivity @Module @Suppress("unused") diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/BolusProgressDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/BolusProgressDialog.kt similarity index 98% rename from ui/src/main/java/info/nightscout/ui/dialogs/BolusProgressDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/BolusProgressDialog.kt index 2a919dc44c..4be8aadeb7 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/BolusProgressDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/BolusProgressDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.os.Bundle import android.os.SystemClock @@ -22,7 +22,7 @@ import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.database.entities.UserEntry.Action import app.aaps.database.entities.UserEntry.Sources import dagger.android.support.DaggerDialogFragment -import info.nightscout.ui.databinding.DialogBolusprogressBinding +import app.aaps.ui.databinding.DialogBolusprogressBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/CalibrationDialog.kt similarity index 97% rename from ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/CalibrationDialog.kt index 5a1ae44b3b..1e8d2745c5 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/CalibrationDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.os.Bundle import android.view.LayoutInflater @@ -17,7 +17,7 @@ import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.ValueWithUnit import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import info.nightscout.ui.databinding.DialogCalibrationBinding +import app.aaps.ui.databinding.DialogCalibrationBinding import java.text.DecimalFormat import java.util.LinkedList import javax.inject.Inject diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/CarbsDialog.kt similarity index 99% rename from ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/CarbsDialog.kt index 6f55bc0b98..9461d8056e 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/CarbsDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.content.Context import android.os.Bundle @@ -41,8 +41,8 @@ import com.google.common.base.Joiner import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction -import info.nightscout.ui.R -import info.nightscout.ui.databinding.DialogCarbsBinding +import app.aaps.ui.R +import app.aaps.ui.databinding.DialogCarbsBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.text.DecimalFormat diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/CareDialog.kt similarity index 99% rename from ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/CareDialog.kt index 9e36c7b299..9ebd072483 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/CareDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.content.Context import android.os.Bundle @@ -29,8 +29,8 @@ import com.google.common.base.Joiner import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction -import info.nightscout.ui.R -import info.nightscout.ui.databinding.DialogCareBinding +import app.aaps.ui.R +import app.aaps.ui.databinding.DialogCareBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.text.DecimalFormat diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/DialogFragmentWithDate.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/DialogFragmentWithDate.kt similarity index 99% rename from ui/src/main/java/info/nightscout/ui/dialogs/DialogFragmentWithDate.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/DialogFragmentWithDate.kt index 926302c5c4..168021894b 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/DialogFragmentWithDate.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/DialogFragmentWithDate.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.os.Bundle import android.text.format.DateFormat diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/EditQuickWizardDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/EditQuickWizardDialog.kt similarity index 97% rename from ui/src/main/java/info/nightscout/ui/dialogs/EditQuickWizardDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/EditQuickWizardDialog.kt index 4e58840e86..a0e4578ed8 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/EditQuickWizardDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/EditQuickWizardDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.os.Bundle import android.text.format.DateFormat @@ -21,9 +21,9 @@ import dagger.android.support.DaggerDialogFragment import app.aaps.core.ui.extensions.selectedItemPosition import app.aaps.core.ui.extensions.setEnableForChildren import app.aaps.core.ui.extensions.setSelection -import info.nightscout.ui.R -import info.nightscout.ui.databinding.DialogEditQuickwizardBinding -import info.nightscout.ui.events.EventQuickWizardChange +import app.aaps.ui.R +import app.aaps.ui.databinding.DialogEditQuickwizardBinding +import app.aaps.ui.events.EventQuickWizardChange import org.json.JSONException import javax.inject.Inject diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/ExtendedBolusDialog.kt similarity index 97% rename from ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/ExtendedBolusDialog.kt index 956f235c60..9edad6902c 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/ExtendedBolusDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.content.Context import android.os.Bundle @@ -24,8 +24,8 @@ import app.aaps.database.entities.UserEntry import app.aaps.database.entities.ValueWithUnit import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import info.nightscout.ui.R -import info.nightscout.ui.databinding.DialogExtendedbolusBinding +import app.aaps.ui.R +import app.aaps.ui.databinding.DialogExtendedbolusBinding import java.text.DecimalFormat import java.util.LinkedList import javax.inject.Inject diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/FillDialog.kt similarity index 99% rename from ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/FillDialog.kt index edaa077451..b17fa0fb56 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/FillDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.content.Context import android.os.Bundle @@ -29,8 +29,8 @@ import com.google.common.base.Joiner import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction -import info.nightscout.ui.R -import info.nightscout.ui.databinding.DialogFillBinding +import app.aaps.ui.R +import app.aaps.ui.databinding.DialogFillBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.util.LinkedList diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/InsulinDialog.kt similarity index 98% rename from ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/InsulinDialog.kt index 5a2891bc1e..c8204825d3 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/InsulinDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.content.Context import android.os.Bundle @@ -43,9 +43,9 @@ import com.google.common.base.Joiner import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction -import info.nightscout.ui.R -import info.nightscout.ui.databinding.DialogInsulinBinding -import info.nightscout.ui.extensions.toSignedString +import app.aaps.ui.R +import app.aaps.ui.databinding.DialogInsulinBinding +import app.aaps.ui.extensions.toSignedString import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.text.DecimalFormat diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/LoopDialog.kt similarity index 99% rename from ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/LoopDialog.kt index e729ac4f1c..aa5a717e1f 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/LoopDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.content.Context import android.os.Bundle @@ -48,8 +48,8 @@ import dagger.android.support.DaggerDialogFragment import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction import info.nightscout.database.impl.transactions.InsertAndCancelCurrentOfflineEventTransaction -import info.nightscout.ui.R -import info.nightscout.ui.databinding.DialogLoopBinding +import app.aaps.ui.R +import app.aaps.ui.databinding.DialogLoopBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/ProfileSwitchDialog.kt similarity index 99% rename from ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/ProfileSwitchDialog.kt index 96f4dfdf38..b3b25ab920 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/ProfileSwitchDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.content.Context import android.os.Bundle @@ -32,8 +32,8 @@ import app.aaps.database.entities.ValueWithUnit import com.google.common.base.Joiner import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction -import info.nightscout.ui.R -import info.nightscout.ui.databinding.DialogProfileswitchBinding +import app.aaps.ui.R +import app.aaps.ui.databinding.DialogProfileswitchBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.text.DecimalFormat diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/ProfileViewerDialog.kt similarity index 99% rename from ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/ProfileViewerDialog.kt index 0a4497bc42..013714dd1d 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/ProfileViewerDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.os.Bundle import android.text.Spanned @@ -28,7 +28,7 @@ import app.aaps.database.ValueWrapper import dagger.android.HasAndroidInjector import dagger.android.support.DaggerDialogFragment import info.nightscout.database.impl.AppRepository -import info.nightscout.ui.databinding.DialogProfileviewerBinding +import app.aaps.ui.databinding.DialogProfileviewerBinding import org.json.JSONObject import java.text.DecimalFormat import javax.inject.Inject diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/TempBasalDialog.kt similarity index 98% rename from ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/TempBasalDialog.kt index 46ec6fb416..5d484530d3 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/TempBasalDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.content.Context import android.os.Bundle @@ -27,8 +27,8 @@ import app.aaps.database.entities.UserEntry import app.aaps.database.entities.ValueWithUnit import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import info.nightscout.ui.R -import info.nightscout.ui.databinding.DialogTempbasalBinding +import app.aaps.ui.R +import app.aaps.ui.databinding.DialogTempbasalBinding import java.text.DecimalFormat import java.util.LinkedList import javax.inject.Inject diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/TempTargetDialog.kt similarity index 99% rename from ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/TempTargetDialog.kt index 609ed2c967..5cab4b5cf8 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/TempTargetDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.content.Context import android.os.Bundle @@ -28,8 +28,8 @@ import com.google.common.collect.Lists import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIfAnyTransaction import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction -import info.nightscout.ui.R -import info.nightscout.ui.databinding.DialogTemptargetBinding +import app.aaps.ui.R +import app.aaps.ui.databinding.DialogTemptargetBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.text.DecimalFormat diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/TreatmentDialog.kt similarity index 98% rename from ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/TreatmentDialog.kt index 1c9106d315..0fbb229a40 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/TreatmentDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.content.Context import android.os.Bundle @@ -31,8 +31,8 @@ import app.aaps.database.entities.ValueWithUnit import com.google.common.base.Joiner import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository -import info.nightscout.ui.R -import info.nightscout.ui.databinding.DialogTreatmentBinding +import app.aaps.ui.R +import app.aaps.ui.databinding.DialogTreatmentBinding import java.text.DecimalFormat import java.util.LinkedList import javax.inject.Inject diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/WizardDialog.kt similarity index 99% rename from ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/WizardDialog.kt index 07067fc3cb..103e71f81d 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/WizardDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.annotation.SuppressLint import android.content.Context @@ -52,8 +52,8 @@ import app.aaps.database.ValueWrapper import dagger.android.HasAndroidInjector import dagger.android.support.DaggerDialogFragment import info.nightscout.database.impl.AppRepository -import info.nightscout.ui.R -import info.nightscout.ui.databinding.DialogWizardBinding +import app.aaps.ui.R +import app.aaps.ui.databinding.DialogWizardBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.text.DecimalFormat diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/WizardInfoDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/WizardInfoDialog.kt similarity index 97% rename from ui/src/main/java/info/nightscout/ui/dialogs/WizardInfoDialog.kt rename to ui/src/main/kotlin/app/aaps/ui/dialogs/WizardInfoDialog.kt index 5801977701..309578fec1 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/WizardInfoDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/WizardInfoDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.dialogs +package app.aaps.ui.dialogs import android.os.Bundle import android.view.LayoutInflater @@ -13,8 +13,8 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.database.entities.BolusCalculatorResult import com.google.gson.Gson import dagger.android.support.DaggerDialogFragment -import info.nightscout.ui.R -import info.nightscout.ui.databinding.DialogWizardinfoBinding +import app.aaps.ui.R +import app.aaps.ui.databinding.DialogWizardinfoBinding import javax.inject.Inject class WizardInfoDialog : DaggerDialogFragment() { diff --git a/ui/src/main/java/info/nightscout/ui/elements/EmptyRecyclerView.kt b/ui/src/main/kotlin/app/aaps/ui/elements/EmptyRecyclerView.kt similarity index 98% rename from ui/src/main/java/info/nightscout/ui/elements/EmptyRecyclerView.kt rename to ui/src/main/kotlin/app/aaps/ui/elements/EmptyRecyclerView.kt index 9036237dda..aab1731032 100644 --- a/ui/src/main/java/info/nightscout/ui/elements/EmptyRecyclerView.kt +++ b/ui/src/main/kotlin/app/aaps/ui/elements/EmptyRecyclerView.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.elements +package app.aaps.ui.elements import android.content.Context import android.util.AttributeSet diff --git a/ui/src/main/java/info/nightscout/ui/events/EventQuickWizardChange.kt b/ui/src/main/kotlin/app/aaps/ui/events/EventQuickWizardChange.kt similarity index 72% rename from ui/src/main/java/info/nightscout/ui/events/EventQuickWizardChange.kt rename to ui/src/main/kotlin/app/aaps/ui/events/EventQuickWizardChange.kt index fc6bdcbe95..3f3229fa74 100644 --- a/ui/src/main/java/info/nightscout/ui/events/EventQuickWizardChange.kt +++ b/ui/src/main/kotlin/app/aaps/ui/events/EventQuickWizardChange.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.events +package app.aaps.ui.events import app.aaps.core.interfaces.rx.events.Event diff --git a/ui/src/main/java/info/nightscout/ui/extensions/DoubleToSignedString.kt b/ui/src/main/kotlin/app/aaps/ui/extensions/DoubleToSignedString.kt similarity index 89% rename from ui/src/main/java/info/nightscout/ui/extensions/DoubleToSignedString.kt rename to ui/src/main/kotlin/app/aaps/ui/extensions/DoubleToSignedString.kt index 417d8dda59..6d5ccf86dc 100644 --- a/ui/src/main/java/info/nightscout/ui/extensions/DoubleToSignedString.kt +++ b/ui/src/main/kotlin/app/aaps/ui/extensions/DoubleToSignedString.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.extensions +package app.aaps.ui.extensions import app.aaps.core.interfaces.pump.Pump import app.aaps.core.interfaces.utils.DecimalFormatter diff --git a/ui/src/main/java/info/nightscout/ui/extensions/InterfaceIDsExtension.kt b/ui/src/main/kotlin/app/aaps/ui/extensions/InterfaceIDsExtension.kt similarity index 77% rename from ui/src/main/java/info/nightscout/ui/extensions/InterfaceIDsExtension.kt rename to ui/src/main/kotlin/app/aaps/ui/extensions/InterfaceIDsExtension.kt index e757904c9f..e5919e56bc 100644 --- a/ui/src/main/java/info/nightscout/ui/extensions/InterfaceIDsExtension.kt +++ b/ui/src/main/kotlin/app/aaps/ui/extensions/InterfaceIDsExtension.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.extensions +package app.aaps.ui.extensions import app.aaps.database.entities.embedments.InterfaceIDs diff --git a/ui/src/main/java/info/nightscout/ui/services/AlarmSoundService.kt b/ui/src/main/kotlin/app/aaps/ui/services/AlarmSoundService.kt similarity index 99% rename from ui/src/main/java/info/nightscout/ui/services/AlarmSoundService.kt rename to ui/src/main/kotlin/app/aaps/ui/services/AlarmSoundService.kt index 179e2bd0fd..d853d6cc52 100644 --- a/ui/src/main/java/info/nightscout/ui/services/AlarmSoundService.kt +++ b/ui/src/main/kotlin/app/aaps/ui/services/AlarmSoundService.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.services +package app.aaps.ui.services import android.content.Context import android.content.Intent diff --git a/ui/src/main/java/info/nightscout/ui/services/AlarmSoundServiceHelper.kt b/ui/src/main/kotlin/app/aaps/ui/services/AlarmSoundServiceHelper.kt similarity index 98% rename from ui/src/main/java/info/nightscout/ui/services/AlarmSoundServiceHelper.kt rename to ui/src/main/kotlin/app/aaps/ui/services/AlarmSoundServiceHelper.kt index 7bae3ba610..ecb582154e 100644 --- a/ui/src/main/java/info/nightscout/ui/services/AlarmSoundServiceHelper.kt +++ b/ui/src/main/kotlin/app/aaps/ui/services/AlarmSoundServiceHelper.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.services +package app.aaps.ui.services import android.content.ComponentName import android.content.Context diff --git a/ui/src/main/java/info/nightscout/ui/tabs/TabPageAdapter.kt b/ui/src/main/kotlin/app/aaps/ui/tabs/TabPageAdapter.kt similarity index 97% rename from ui/src/main/java/info/nightscout/ui/tabs/TabPageAdapter.kt rename to ui/src/main/kotlin/app/aaps/ui/tabs/TabPageAdapter.kt index 8964a60b9e..4e8b8f5116 100644 --- a/ui/src/main/java/info/nightscout/ui/tabs/TabPageAdapter.kt +++ b/ui/src/main/kotlin/app/aaps/ui/tabs/TabPageAdapter.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.tabs +package app.aaps.ui.tabs import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment diff --git a/ui/src/main/java/info/nightscout/ui/widget/Widget.kt b/ui/src/main/kotlin/app/aaps/ui/widget/Widget.kt similarity index 99% rename from ui/src/main/java/info/nightscout/ui/widget/Widget.kt rename to ui/src/main/kotlin/app/aaps/ui/widget/Widget.kt index 48d031420a..0b3dfd892d 100644 --- a/ui/src/main/java/info/nightscout/ui/widget/Widget.kt +++ b/ui/src/main/kotlin/app/aaps/ui/widget/Widget.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.widget +package app.aaps.ui.widget import android.app.PendingIntent import android.appwidget.AppWidgetManager @@ -38,7 +38,7 @@ import app.aaps.core.main.iob.displayText import app.aaps.core.main.profile.ProfileSealed import app.aaps.database.entities.interfaces.end import dagger.android.HasAndroidInjector -import info.nightscout.ui.R +import app.aaps.ui.R import java.util.Locale import javax.inject.Inject import kotlin.math.abs diff --git a/ui/src/main/java/info/nightscout/ui/widget/WidgetConfigureActivity.kt b/ui/src/main/kotlin/app/aaps/ui/widget/WidgetConfigureActivity.kt similarity index 96% rename from ui/src/main/java/info/nightscout/ui/widget/WidgetConfigureActivity.kt rename to ui/src/main/kotlin/app/aaps/ui/widget/WidgetConfigureActivity.kt index 9ad3fa4633..2879016bbd 100644 --- a/ui/src/main/java/info/nightscout/ui/widget/WidgetConfigureActivity.kt +++ b/ui/src/main/kotlin/app/aaps/ui/widget/WidgetConfigureActivity.kt @@ -1,4 +1,4 @@ -package info.nightscout.ui.widget +package app.aaps.ui.widget import android.appwidget.AppWidgetManager import android.content.Intent @@ -6,7 +6,7 @@ import android.os.Bundle import android.widget.SeekBar import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.DaggerActivity -import info.nightscout.ui.databinding.WidgetConfigureBinding +import app.aaps.ui.databinding.WidgetConfigureBinding import javax.inject.Inject /** diff --git a/ui/src/main/res/layout/activity_profilehelper.xml b/ui/src/main/res/layout/activity_profilehelper.xml index b901895a53..a665199c1a 100644 --- a/ui/src/main/res/layout/activity_profilehelper.xml +++ b/ui/src/main/res/layout/activity_profilehelper.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context="info.nightscout.ui.activities.ProfileHelperActivity"> + tools:context=".activities.ProfileHelperActivity"> + tools:context=".activities.QuickWizardListActivity"> + tools:context=".activities.StatsActivity"> + tools:context=".activities.TDDStatsActivity"> + tools:context=".ui.dialogs.CarbsDialog"> + tools:context=".dialogs.EditQuickWizardDialog"> + tools:context=".dialogs.InsulinDialog"> - - - - - - -