diff --git a/app/build.gradle b/app/build.gradle index bb424b1648..b5b278cbc9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -229,8 +229,6 @@ dependencies { // MainApp api "com.uber.rxdogtag2:rxdogtag:2.0.1" - // DataLayerListenerService - api "com.google.android.gms:play-services-wearable:$play_services_wearable_version" } apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9704265b6d..8198a3d374 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -143,29 +143,6 @@ android:resource="@xml/filepaths" /> - - - - - - - - - - - - - - - - Used for configuring the active plugins Displays the current state of your loop and buttons for most common actions Shows an ongoing notification with a short overview of what your loop is doing - Monitor and control AAPS using your WearOS watch. Delta Config Builder Overview @@ -81,17 +80,12 @@ LOW mark HIGH mark Wear - Resend All Data - Open Settings on Wear Ongoing Notification OLD DATA CONF HOME TREAT - WEAR Shorten tab titles - Wear settings - not successful - please check phone Exiting application to apply settings. Enable superbolus in wizard Enable superbolus functionality in wizard. Do not enable until you learn what it really does. IT MAY CAUSE INSULIN OVERDOSE IF USED BLINDLY! @@ -128,16 +122,12 @@ activity target hypo duration hypo target - Controls from Watch - Set Temp-Targets and enter Treatments from the watch. Gradually increase the volume for alerts and notifications Local alerts Alert if no BG data is received Alert if pump is unreachable Pump unreachable threshold [min] Alert if carbs are required - Show detailed delta - Show delta with one more decimal place BG calculation Bolus IOB calculation Basal IOB calculation @@ -160,10 +150,6 @@ Number of carbs to add when button is pressed Amount of insulin to add when button is pressed Could not launch CGM application. Make sure it is installed. - Notify on SMB - Show SMB on the watch like a standard bolus. - Show the predictions on the watchface. - Predictions Please update your Dexcom app to supported version Dexcom app is not installed. Activity @@ -182,14 +168,6 @@ Second carbs increment Third carbs increment CGM - wearwizard_bg - wearwizard_tt - wearwizard_trend - wearwizard_cob - wearwizard_iob - Calculations included in the Wizard result: - Display Settings - General Settings Open navigation Close navigation keep_screen_on @@ -218,11 +196,8 @@ == ∑ %1$s U Bolus wizard performs calculation but only this part of calculated insulin is delivered. Useful with SMB algorithm. Units - wear_detailediob - wear_showbgi Show removed Clear queue? All data in queue will be lost! - wear_detailed_delta Chart menu Predictions Treatments @@ -246,26 +221,13 @@ dialog Not available - Temptarget unknown preset: %1$s - Cancelling running Temp-Targets? - Different units used on watch and phone! - Zero-Temp-Target - cancelling running Temp-Targets? - Min-BG out of range! - Max-BG out of range! - Temptarget:\nMin: %1$s\nMax: %2$s\nDuration: %3$s - Temptarget:\nTarget: %1$s\nDuration: %2$s - Temptarget:\nReason: %1$s\nTarget: %2$s\nDuration: %3$s - QuickWizard: %1$s\nInsulin: %2$.2fU\nCarbs: %3$dg - Calc. Wizard:\nInsulin: %1$.2fU\nCarbs: %2$dg Show entry on device: - Selected quickwizard no longer available, please refresh your tile Unknown action command: Percentage Application default Remove selected items %1$d selected Sort - Loop status Graph scale open settings All @@ -276,7 +238,6 @@ drag and drop handle Search - (No Watch Connected) Database cleanup Do you want to cleanup the database?\nIt will remove tracked changes and historic data older than 3 months. Cleared entries diff --git a/ui/src/main/res/drawable/ic_settings.xml b/core/ui/src/main/res/drawable/ic_settings.xml similarity index 100% rename from ui/src/main/res/drawable/ic_settings.xml rename to core/ui/src/main/res/drawable/ic_settings.xml diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml index f306028101..1e029863c3 100644 --- a/core/ui/src/main/res/values/strings.xml +++ b/core/ui/src/main/res/values/strings.xml @@ -5,6 +5,9 @@ Basal profile in pump updated Invalid input data Delivering %1$.2f U + Constraint applied! + Total IOB: + TT language diff --git a/core/utils/src/main/res/values/keys.xml b/core/utils/src/main/res/values/keys.xml index 3b5834fa4c..89dc70989e 100644 --- a/core/utils/src/main/res/values/keys.xml +++ b/core/utils/src/main/res/values/keys.xml @@ -106,5 +106,13 @@ high_temptarget_raises_sensitivity low_temptarget_lowers_sensitivity bolussnooze_dia_divisor + wear_detailediob + wear_showbgi + wear_detailed_delta + wearwizard_bg + wearwizard_tt + wearwizard_trend + wearwizard_cob + wearwizard_iob \ No newline at end of file diff --git a/interfaces/src/main/java/info/nightscout/interfaces/Constants.kt b/interfaces/src/main/java/info/nightscout/interfaces/Constants.kt index d72293006b..fccdfcbc8f 100644 --- a/interfaces/src/main/java/info/nightscout/interfaces/Constants.kt +++ b/interfaces/src/main/java/info/nightscout/interfaces/Constants.kt @@ -100,4 +100,15 @@ object Constants { * so we add leeway to still accept given amount of older tokens */ const val OTP_ACCEPT_OLD_TOKENS_COUNT = 1 + + /** + * Button increments + */ + const val INSULIN_PLUS1_DEFAULT = 0.5 + const val INSULIN_PLUS2_DEFAULT = 1.0 + const val INSULIN_PLUS3_DEFAULT = 2.0 + const val CARBS_FAV1_DEFAULT = 5 + const val CARBS_FAV2_DEFAULT = 10 + const val CARBS_FAV3_DEFAULT = 20 + } \ No newline at end of file diff --git a/plugins/main/build.gradle b/plugins/main/build.gradle index d9f2054a51..42602cba46 100644 --- a/plugins/main/build.gradle +++ b/plugins/main/build.gradle @@ -59,4 +59,7 @@ dependencies { // Food api "androidx.work:work-runtime:$work_version" api "androidx.work:work-runtime-ktx:$work_version" + + // DataLayerListenerService + api "com.google.android.gms:play-services-wearable:$play_services_wearable_version" } \ No newline at end of file diff --git a/plugins/main/src/main/AndroidManifest.xml b/plugins/main/src/main/AndroidManifest.xml index c580c2b98a..ba49e1afa5 100644 --- a/plugins/main/src/main/AndroidManifest.xml +++ b/plugins/main/src/main/AndroidManifest.xml @@ -26,6 +26,31 @@ android:name=".sync.nsclient.services.NSClientService" android:enabled="true" android:exported="true" /> + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt index b981fc8a37..778e5f4d4a 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt @@ -15,7 +15,8 @@ import dagger.Module SkinsModule::class, SkinsUiModule::class, LoopModule::class, - ActionsModule::class + ActionsModule::class, + WearModule::class ] ) diff --git a/plugins/main/src/main/java/info/nightscout/plugins/di/WearModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/WearModule.kt new file mode 100644 index 0000000000..f22c0184bc --- /dev/null +++ b/plugins/main/src/main/java/info/nightscout/plugins/di/WearModule.kt @@ -0,0 +1,12 @@ +package info.nightscout.plugins.di + +import dagger.Module +import dagger.android.ContributesAndroidInjector +import info.nightscout.plugins.general.wear.wearintegration.DataLayerListenerServiceMobile + +@Module +@Suppress("unused") +abstract class WearModule { + + @ContributesAndroidInjector abstract fun contributesWatchUpdaterService(): DataLayerListenerServiceMobile +} \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt similarity index 95% rename from app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt index e5163cd0fc..a335885aee 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt @@ -1,12 +1,12 @@ -package info.nightscout.androidaps.plugins.general.wear +package info.nightscout.plugins.general.wear import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import dagger.android.support.DaggerFragment -import info.nightscout.androidaps.databinding.WearFragmentBinding import info.nightscout.core.utils.fabric.FabricPrivacy +import info.nightscout.plugins.databinding.WearFragmentBinding import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGUI import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt similarity index 90% rename from app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt index 9f5e9b550a..ffb3819e74 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt @@ -1,15 +1,15 @@ -package info.nightscout.androidaps.plugins.general.wear +package info.nightscout.plugins.general.wear import android.content.Context import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.R -import info.nightscout.androidaps.plugins.general.wear.wearintegration.DataHandlerMobile -import info.nightscout.androidaps.plugins.general.wear.wearintegration.DataLayerListenerServiceMobileHelper import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.interfaces.plugin.PluginBase import info.nightscout.interfaces.plugin.PluginDescription import info.nightscout.interfaces.plugin.PluginType +import info.nightscout.plugins.R import info.nightscout.plugins.aps.loop.events.EventLoopUpdateGui +import info.nightscout.plugins.general.wear.wearintegration.DataHandlerMobile +import info.nightscout.plugins.general.wear.wearintegration.DataLayerListenerServiceMobileHelper import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventAutosensCalculationFinished @@ -37,7 +37,7 @@ class WearPlugin @Inject constructor( private val rxBus: RxBus, private val context: Context, private val dataHandlerMobile: DataHandlerMobile, - val dataLayerListenerServiceMobileHelper: DataLayerListenerServiceMobileHelper + private val dataLayerListenerServiceMobileHelper: DataLayerListenerServiceMobileHelper ) : PluginBase( PluginDescription() @@ -65,7 +65,7 @@ class WearPlugin @Inject constructor( event.resultSuccess?.let { val status = if (it) rh.gs(R.string.success) - else rh.gs(R.string.nosuccess) + else rh.gs(R.string.no_success) if (isEnabled()) rxBus.send(EventMobileToWear(EventData.BolusProgress(percent = 100, status = status))) } }, fabricPrivacy::logException) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt similarity index 99% rename from app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt index 05a9dd88ba..34a51b1066 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt @@ -1,14 +1,12 @@ -package info.nightscout.androidaps.plugins.general.wear.wearintegration +package info.nightscout.plugins.general.wear.wearintegration import android.app.NotificationManager import android.content.Context import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.R import info.nightscout.androidaps.extensions.convertedToAbsolute import info.nightscout.androidaps.extensions.toStringShort import info.nightscout.androidaps.extensions.valueToUnits import info.nightscout.androidaps.extensions.valueToUnitsString -import info.nightscout.interfaces.logging.UserEntryLogger import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider import info.nightscout.androidaps.services.AlarmSoundServiceHelper import info.nightscout.core.graph.data.GlucoseValueDataPoint @@ -39,6 +37,7 @@ import info.nightscout.interfaces.aps.Loop import info.nightscout.interfaces.constraints.Constraint import info.nightscout.interfaces.constraints.Constraints import info.nightscout.interfaces.iob.IobCobCalculator +import info.nightscout.interfaces.logging.UserEntryLogger import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.plugin.PluginBase import info.nightscout.interfaces.profile.DefaultValueHelper @@ -50,6 +49,7 @@ import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.interfaces.utils.DecimalFormatter import info.nightscout.interfaces.utils.HardLimits import info.nightscout.interfaces.utils.TrendCalculator +import info.nightscout.plugins.R import info.nightscout.plugins.sync.nsclient.data.ProcessedDeviceStatusData import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus @@ -61,8 +61,6 @@ import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.sharedPreferences.SP import info.nightscout.shared.utils.DateUtil import info.nightscout.shared.utils.T -import info.nightscout.ui.dialogs.CarbsDialog -import info.nightscout.ui.dialogs.InsulinDialog import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.text.DateFormat @@ -149,7 +147,7 @@ class DataHandlerMobile @Inject constructor( rxBus.send( EventMobileToWear( EventData.ConfirmAction( - rh.gs(R.string.medtronic_pump_status).uppercase(), + rh.gs(R.string.pump_status).uppercase(), activePlugin.activePump.shortStatus(false), returnCommand = null ) @@ -730,10 +728,10 @@ class DataHandlerMobile @Inject constructor( bolusPercentage = sp.getInt(R.string.key_boluswizard_percentage, 100), maxCarbs = sp.getInt(R.string.key_treatmentssafety_maxcarbs, 48), maxBolus = sp.getDouble(R.string.key_treatmentssafety_maxbolus, 3.0), - insulinButtonIncrement1 = sp.getDouble(R.string.key_insulin_button_increment_1, InsulinDialog.PLUS1_DEFAULT), - insulinButtonIncrement2 = sp.getDouble(R.string.key_insulin_button_increment_2, InsulinDialog.PLUS2_DEFAULT), - carbsButtonIncrement1 = sp.getInt(R.string.key_carbs_button_increment_1, CarbsDialog.FAV1_DEFAULT), - carbsButtonIncrement2 = sp.getInt(R.string.key_carbs_button_increment_2, CarbsDialog.FAV2_DEFAULT) + insulinButtonIncrement1 = sp.getDouble(R.string.key_insulin_button_increment_1, Constants.INSULIN_PLUS1_DEFAULT), + insulinButtonIncrement2 = sp.getDouble(R.string.key_insulin_button_increment_2, Constants.INSULIN_PLUS2_DEFAULT), + carbsButtonIncrement1 = sp.getInt(R.string.key_carbs_button_increment_1, Constants.CARBS_FAV1_DEFAULT), + carbsButtonIncrement2 = sp.getInt(R.string.key_carbs_button_increment_2, Constants.CARBS_FAV2_DEFAULT) ) ) ) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt similarity index 98% rename from app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt index 6d130cc9c3..fdda2ea728 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.general.wear.wearintegration +package info.nightscout.plugins.general.wear.wearintegration import android.os.Binder import android.os.Handler @@ -15,8 +15,6 @@ import com.google.android.gms.wearable.PutDataMapRequest import com.google.android.gms.wearable.Wearable import com.google.android.gms.wearable.WearableListenerService import dagger.android.AndroidInjection -import info.nightscout.androidaps.R -import info.nightscout.androidaps.plugins.general.wear.WearPlugin import info.nightscout.androidaps.plugins.general.wear.events.EventWearUpdateGui import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.core.utils.receivers.ReceiverStatusStore @@ -27,6 +25,8 @@ import info.nightscout.interfaces.iob.IobCobCalculator import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.profile.DefaultValueHelper import info.nightscout.interfaces.profile.ProfileFunction +import info.nightscout.plugins.R +import info.nightscout.plugins.general.wear.WearPlugin import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventMobileToWear diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt similarity index 97% rename from app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt index 8235102867..e38c9f05f9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.general.wear.wearintegration +package info.nightscout.plugins.general.wear.wearintegration import android.content.ComponentName import android.content.Context diff --git a/app/src/main/res/layout/wear_fragment.xml b/plugins/main/src/main/res/layout/wear_fragment.xml similarity index 95% rename from app/src/main/res/layout/wear_fragment.xml rename to plugins/main/src/main/res/layout/wear_fragment.xml index 5c6dd20d9a..cfd22a1f4f 100644 --- a/app/src/main/res/layout/wear_fragment.xml +++ b/plugins/main/src/main/res/layout/wear_fragment.xml @@ -4,7 +4,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:paddingTop="2dp" - tools:context=".plugins.general.wear.WearFragment"> + tools:context="info.nightscout.plugins.general.wear.WearFragment"> Send today\'s log files to developers along with this time. Unexpected situation. IobCobCalculator + + WEAR + Monitor and control AAPS using your WearOS watch. + (No Watch Connected) + Pump status + Loop status + Calc. Wizard:\nInsulin: %1$.2fU\nCarbs: %2$dg + Selected quickwizard no longer available, please refresh your tile + QuickWizard: %1$s\nInsulin: %2$.2fU\nCarbs: %3$dg + Temptarget unknown preset: %1$s + Cancelling running Temp-Targets? + Different units used on watch and phone! + Zero-Temp-Target - cancelling running Temp-Targets? + Min-BG out of range! + Max-BG out of range! + Temptarget:\nMin: %1$s\nMax: %2$s\nDuration: %3$s + Temptarget:\nTarget: %1$s\nDuration: %2$s + Temptarget:\nReason: %1$s\nTarget: %2$s\nDuration: %3$s + not successful - please check phone + Wear settings + Controls from Watch + Set Temp-Targets and enter Treatments from the watch. + Calculations included in the Wizard result: + Display Settings + General Settings + Show detailed delta + Show delta with one more decimal place + Notify on SMB + Show SMB on the watch like a standard bolus. + Show the predictions on the watchface. + Predictions + Resend All Data + Open Settings on Wear + \ No newline at end of file diff --git a/app/src/main/res/xml/pref_wear.xml b/plugins/main/src/main/res/xml/pref_wear.xml similarity index 98% rename from app/src/main/res/xml/pref_wear.xml rename to plugins/main/src/main/res/xml/pref_wear.xml index e0b54e79b0..d2857d0349 100644 --- a/app/src/main/res/xml/pref_wear.xml +++ b/plugins/main/src/main/res/xml/pref_wear.xml @@ -28,7 +28,7 @@ android:defaultValue="false" android:dependency="@string/key_wearwizard_bg" android:key="@string/key_wearwizard_tt" - android:title="@string/treatments_wizard_tt_label" /> + android:title="@string/tt_label" /> @@ -443,7 +443,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:checked="false" - android:text="@string/treatments_wizard_tt_label" /> + android:text="@string/tt_label" /> diff --git a/ui/src/main/res/layout/dialog_wizardinfo.xml b/ui/src/main/res/layout/dialog_wizardinfo.xml index 2e201e94af..fa27b4a76a 100644 --- a/ui/src/main/res/layout/dialog_wizardinfo.xml +++ b/ui/src/main/res/layout/dialog_wizardinfo.xml @@ -76,7 +76,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:width="30dp" - android:text="@string/treatments_wizard_tt_label" + android:text="@string/tt_label" android:textAppearance="?android:attr/textAppearanceSmall" /> - Constraint applied! Bolus constraint applied Carbs constraint applied TT @@ -110,8 +109,6 @@ Ratio: Ins: IOB: - Total IOB: - TT Corr Meal Prime