diff --git a/app/src/main/java/info/nightscout/androidaps/di/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/di/FragmentsModule.kt
index 63f422301e..cdf10aca23 100644
--- a/app/src/main/java/info/nightscout/androidaps/di/FragmentsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/di/FragmentsModule.kt
@@ -10,7 +10,6 @@ import info.nightscout.androidaps.activities.fragments.TreatmentsProfileSwitchFr
import info.nightscout.androidaps.activities.fragments.TreatmentsTempTargetFragment
import info.nightscout.androidaps.activities.fragments.TreatmentsTemporaryBasalsFragment
import info.nightscout.androidaps.activities.fragments.TreatmentsUserEntryFragment
-import info.nightscout.androidaps.dialogs.CareDialog
import info.nightscout.androidaps.dialogs.ExtendedBolusDialog
import info.nightscout.androidaps.dialogs.FillDialog
import info.nightscout.androidaps.dialogs.InsulinDialog
@@ -74,8 +73,6 @@ abstract class FragmentsModule {
@ContributesAndroidInjector abstract fun contributesVirtualPumpFragment(): VirtualPumpFragment
- @ContributesAndroidInjector abstract fun contributesCareDialog(): CareDialog
-
@ContributesAndroidInjector abstract fun contributesEditQuickWizardDialog(): EditQuickWizardDialog
@ContributesAndroidInjector abstract fun contributesExtendedBolusDialog(): ExtendedBolusDialog
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
index ac03112388..6f06614629 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@@ -17,7 +17,6 @@ import info.nightscout.androidaps.database.ValueWrapper
import info.nightscout.androidaps.database.entities.UserEntry.Action
import info.nightscout.androidaps.database.entities.UserEntry.Sources
import info.nightscout.androidaps.databinding.ActionsFragmentBinding
-import info.nightscout.androidaps.dialogs.CareDialog
import info.nightscout.androidaps.dialogs.ExtendedBolusDialog
import info.nightscout.androidaps.dialogs.FillDialog
import info.nightscout.androidaps.dialogs.ProfileSwitchDialog
@@ -56,6 +55,7 @@ import info.nightscout.androidaps.utils.ui.UIRunnable
import info.nightscout.shared.logging.AAPSLogger
import info.nightscout.shared.sharedPreferences.SP
import info.nightscout.ui.activities.TDDStatsActivity
+import info.nightscout.ui.dialogs.CareDialog
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3d92cf0c2d..71e1884757 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -153,12 +153,8 @@
Carbs Suggestion
Unsupported version of Nightscout
Basal IOB
- Other
- Meter
- Sensor
Carb time
Profile
- Glucose type
TempBasal
Extended Bolus
Nightscout version:
@@ -435,7 +431,6 @@
Controls from Watch
Set Temp-Targets and enter Treatments from the watch.
Food
- ]]>
kJ
En
Pr
diff --git a/ui/src/main/java/info/nightscout/ui/di/UiModule.kt b/ui/src/main/java/info/nightscout/ui/di/UiModule.kt
index 4be8806672..c5f6caac86 100644
--- a/ui/src/main/java/info/nightscout/ui/di/UiModule.kt
+++ b/ui/src/main/java/info/nightscout/ui/di/UiModule.kt
@@ -2,13 +2,14 @@ package info.nightscout.ui.di
import dagger.Module
import dagger.android.ContributesAndroidInjector
-import info.nightscout.ui.activities.SurveyActivity
import info.nightscout.ui.activities.BolusProgressHelperActivity
import info.nightscout.ui.activities.ErrorHelperActivity
import info.nightscout.ui.activities.StatsActivity
+import info.nightscout.ui.activities.SurveyActivity
import info.nightscout.ui.activities.TDDStatsActivity
import info.nightscout.ui.dialogs.CalibrationDialog
import info.nightscout.ui.dialogs.CarbsDialog
+import info.nightscout.ui.dialogs.CareDialog
@Module
@Suppress("unused")
@@ -16,6 +17,7 @@ abstract class UiModule {
@ContributesAndroidInjector abstract fun contributesCalibrationDialog(): CalibrationDialog
@ContributesAndroidInjector abstract fun contributesCarbsDialog(): CarbsDialog
+ @ContributesAndroidInjector abstract fun contributesCareDialog(): CareDialog
@ContributesAndroidInjector abstract fun contributesTDDStatsActivity(): TDDStatsActivity
@ContributesAndroidInjector abstract fun contributeBolusProgressHelperActivity(): BolusProgressHelperActivity
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
rename to ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt
index 41eef58548..4851e400f8 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.dialogs
+package info.nightscout.ui.dialogs
import android.content.Context
import android.os.Bundle
@@ -11,30 +11,30 @@ import androidx.annotation.StringRes
import com.google.common.base.Joiner
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.ValueWithUnit
import info.nightscout.androidaps.database.entities.TherapyEvent
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
+import info.nightscout.androidaps.database.entities.UserEntry
+import info.nightscout.androidaps.database.entities.ValueWithUnit
import info.nightscout.androidaps.database.transactions.InsertIfNewByTimestampTherapyEventTransaction
-import info.nightscout.androidaps.databinding.DialogCareBinding
+import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
+import info.nightscout.androidaps.extensions.fromConstant
+import info.nightscout.androidaps.interfaces.GlucoseUnit
+import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.shared.logging.LTag
+import info.nightscout.androidaps.interfaces.ResourceHelper
import info.nightscout.androidaps.logging.UserEntryLogger
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.androidaps.utils.HtmlHelper
import info.nightscout.androidaps.utils.T
import info.nightscout.androidaps.utils.Translator
import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.extensions.fromConstant
-import info.nightscout.androidaps.interfaces.GlucoseUnit
-import info.nightscout.androidaps.interfaces.ResourceHelper
+import info.nightscout.shared.logging.LTag
+import info.nightscout.ui.R
+import info.nightscout.ui.databinding.DialogCareBinding
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import java.text.DecimalFormat
-import java.util.*
+import java.util.LinkedList
import javax.inject.Inject
class CareDialog : DialogFragmentWithDate() {
@@ -142,8 +142,10 @@ class CareDialog : DialogFragmentWithDate() {
}
}
- val bg = Profile.fromMgdlToUnits(glucoseStatusProvider.glucoseStatusData?.glucose
- ?: 0.0, profileFunction.getUnits())
+ val bg = Profile.fromMgdlToUnits(
+ glucoseStatusProvider.glucoseStatusData?.glucose
+ ?: 0.0, profileFunction.getUnits()
+ )
val bgTextWatcher: TextWatcher = object : TextWatcher {
override fun afterTextChanged(s: Editable) {}
override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
@@ -202,7 +204,7 @@ class CareDialog : DialogFragmentWithDate() {
binding.sensor.isChecked -> TherapyEvent.MeterType.SENSOR
else -> TherapyEvent.MeterType.MANUAL
}
- actions.add(rh.gs(R.string.careportal_newnstreatment_glucosetype) + ": " + translator.translate(meterType))
+ actions.add(rh.gs(R.string.glucose_type) + ": " + translator.translate(meterType))
actions.add(rh.gs(R.string.bg_label) + ": " + Profile.toCurrentUnitsString(profileFunction, binding.bg.value) + " " + rh.gs(unitResId))
therapyEvent.glucoseType = meterType
therapyEvent.glucose = binding.bg.value
@@ -225,13 +227,13 @@ class CareDialog : DialogFragmentWithDate() {
therapyEvent.enteredBy = enteredBy
val source = when (options) {
- EventType.BGCHECK -> Sources.BgCheck
- EventType.SENSOR_INSERT -> Sources.SensorInsert
- EventType.BATTERY_CHANGE -> Sources.BatteryChange
- EventType.NOTE -> Sources.Note
- EventType.EXERCISE -> Sources.Exercise
- EventType.QUESTION -> Sources.Question
- EventType.ANNOUNCEMENT -> Sources.Announcement
+ EventType.BGCHECK -> UserEntry.Sources.BgCheck
+ EventType.SENSOR_INSERT -> UserEntry.Sources.SensorInsert
+ EventType.BATTERY_CHANGE -> UserEntry.Sources.BatteryChange
+ EventType.NOTE -> UserEntry.Sources.Note
+ EventType.EXERCISE -> UserEntry.Sources.Exercise
+ EventType.QUESTION -> UserEntry.Sources.Question
+ EventType.ANNOUNCEMENT -> UserEntry.Sources.Announcement
}
activity?.let { activity ->
@@ -243,9 +245,9 @@ class CareDialog : DialogFragmentWithDate() {
)
valuesWithUnit.add(0, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged })
valuesWithUnit.add(1, ValueWithUnit.TherapyEventType(therapyEvent.type))
- uel.log(Action.CAREPORTAL, source, notes, valuesWithUnit)
+ uel.log(UserEntry.Action.CAREPORTAL, source, notes, valuesWithUnit)
}, null)
}
return true
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_care.xml b/ui/src/main/res/layout/dialog_care.xml
similarity index 96%
rename from app/src/main/res/layout/dialog_care.xml
rename to ui/src/main/res/layout/dialog_care.xml
index 6f2c623fab..b93655d2e6 100644
--- a/app/src/main/res/layout/dialog_care.xml
+++ b/ui/src/main/res/layout/dialog_care.xml
@@ -60,20 +60,20 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="false"
- android:text="@string/careportal_newnstreatment_meter" />
+ android:text="@string/bg_meter" />
+ android:text="@string/bg_sensor" />
+ android:text="@string/bg_other" />
diff --git a/app/src/main/res/layout/okcancel.xml b/ui/src/main/res/layout/okcancel.xml
similarity index 100%
rename from app/src/main/res/layout/okcancel.xml
rename to ui/src/main/res/layout/okcancel.xml
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
index a81409ee9e..0ca9c1a411 100644
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@@ -35,5 +35,11 @@
Most common profile:
Note: Only data visible on this screen will be anonymously uploaded. ID is assigned to this installation of AAPS. You can submit data again if your main profile get changed but let it running at least for a week to make result visible in time in range. Your help is appreciated.
+
+ Glucose type
+ Other
+ Meter
+ Sensor
+ ]]>