diff --git a/app/build.gradle b/app/build.gradle index 04e6925025..d7d4befc5f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -123,6 +123,7 @@ tasks.matching { it instanceof Test }.all { android { compileSdkVersion 28 + ndkVersion "21.1.6352462" defaultConfig { minSdkVersion 23 diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt index 3972faefba..778d2cf985 100644 --- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt @@ -23,10 +23,8 @@ import androidx.appcompat.app.ActionBarDrawerToggle import androidx.appcompat.app.AlertDialog import androidx.appcompat.widget.Toolbar import androidx.core.app.ActivityCompat -import androidx.drawerlayout.widget.DrawerLayout -import androidx.viewpager.widget.ViewPager -import com.google.android.material.navigation.NavigationView -import com.google.android.material.tabs.TabLayout +import androidx.viewpager2.widget.ViewPager2 +import com.google.android.material.tabs.TabLayoutMediator import com.joanzapata.iconify.Iconify import com.joanzapata.iconify.fonts.FontAwesomeModule import info.nightscout.androidaps.activities.NoSplashAppCompatActivity @@ -47,10 +45,10 @@ import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionChec import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin import info.nightscout.androidaps.setupwizard.SetupWizardActivity -import info.nightscout.androidaps.tabs.TabPageAdapter +import info.nightscout.androidaps.utils.tabs.TabPageAdapter import info.nightscout.androidaps.utils.AndroidPermission import info.nightscout.androidaps.utils.FabricPrivacy -import info.nightscout.androidaps.utils.LocaleHelper.update +import info.nightscout.androidaps.utils.LocaleHelper import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.buildHelper.BuildHelper import info.nightscout.androidaps.utils.extensions.isRunningRealPumpTest @@ -86,50 +84,44 @@ class MainActivity : NoSplashAppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) Iconify.with(FontAwesomeModule()) - update(applicationContext) + LocaleHelper.update(applicationContext) setContentView(R.layout.activity_main) setSupportActionBar(toolbar) supportActionBar?.setDisplayShowTitleEnabled(false) supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setHomeButtonEnabled(true) - actionBarDrawerToggle = ActionBarDrawerToggle(this, drawer_layout, R.string.open_navigation, R.string.close_navigation).also { - drawer_layout.addDrawerListener(it) + actionBarDrawerToggle = ActionBarDrawerToggle(this, main_drawer_layout, R.string.open_navigation, R.string.close_navigation).also { + main_drawer_layout.addDrawerListener(it) it.syncState() } // initialize screen wake lock processPreferenceChange(EventPreferenceChange(resourceHelper.gs(R.string.key_keep_screen_on))) - pager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + main_pager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { + override fun onPageScrollStateChanged(state: Int) {} override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {} override fun onPageSelected(position: Int) { - checkPluginPreferences(pager) + checkPluginPreferences(main_pager) } - - override fun onPageScrollStateChanged(state: Int) {} }) //Check here if loop plugin is disabled. Else check via constraints if (!loopPlugin.isEnabled(PluginType.LOOP)) versionCheckerUtils.triggerCheckVersion() fabricPrivacy.setUserStats() - setupTabs() setupViews() disposable.add(rxBus .toObservable(EventRebuildTabs::class.java) .observeOn(AndroidSchedulers.mainThread()) .subscribe({ - update(applicationContext) if (it.recreate) recreate() - else { - setupTabs() - setupViews() - } + else setupViews() setWakeLock() - }) { fabricPrivacy.logException(it) } + }) { fabricPrivacy::logException } ) disposable.add(rxBus .toObservable(EventPreferenceChange::class.java) .observeOn(AndroidSchedulers.mainThread()) - .subscribe({ processPreferenceChange(it) }) { fabricPrivacy.logException(it) } + .subscribe({ processPreferenceChange(it) }) { fabricPrivacy::logException } ) if (!sp.getBoolean(R.string.key_setupwizard_processed, false) && !isRunningRealPumpTest()) { val intent = Intent(this, SetupWizardActivity::class.java) @@ -144,7 +136,7 @@ class MainActivity : NoSplashAppCompatActivity() { } } - private fun checkPluginPreferences(viewPager: ViewPager) { + private fun checkPluginPreferences(viewPager: ViewPager2) { pluginPreferencesMenuItem?.isEnabled = (viewPager.adapter as TabPageAdapter).getPluginAt(viewPager.currentItem).preferencesId != -1 } @@ -179,50 +171,46 @@ class MainActivity : NoSplashAppCompatActivity() { } private fun setupViews() { - val pageAdapter = TabPageAdapter(supportFragmentManager, this) - val navigationView = findViewById(R.id.navigation_view) - navigationView.setNavigationItemSelectedListener { true } - val menu = navigationView.menu.also { it.clear() } + // Menu + val pageAdapter = TabPageAdapter(this) + main_navigation_view.setNavigationItemSelectedListener { true } + val menu = main_navigation_view.menu.also { it.clear() } for (p in activePlugin.pluginsList) { pageAdapter.registerNewFragment(p) - if (p.hasFragment() && !p.isFragmentVisible() && p.isEnabled(p.pluginDescription.type) && !p.pluginDescription.neverVisible) { + if (p.isEnabled() && p.hasFragment() && !p.isFragmentVisible() && !p.pluginDescription.neverVisible) { val menuItem = menu.add(p.name) menuItem.isCheckable = true menuItem.setOnMenuItemClickListener { val intent = Intent(this, SingleFragmentActivity::class.java) intent.putExtra("plugin", activePlugin.pluginsList.indexOf(p)) startActivity(intent) - (findViewById(R.id.drawer_layout) as DrawerLayout).closeDrawers() + main_drawer_layout.closeDrawers() true } } } - val mPager = findViewById(R.id.pager) - mPager.adapter = pageAdapter - //if (switchToLast) - // mPager.setCurrentItem(pageAdapter.getCount() - 1, false); - checkPluginPreferences(mPager) - } + main_pager.adapter = pageAdapter + checkPluginPreferences(main_pager) - private fun setupTabs() { - val viewPager = findViewById(R.id.pager) - val normalTabs = findViewById(R.id.tabs_normal) - normalTabs.setupWithViewPager(viewPager, true) - val compactTabs = findViewById(R.id.tabs_compact) - compactTabs.setupWithViewPager(viewPager, true) - val toolbar = findViewById(R.id.toolbar) + // Tabs if (sp.getBoolean(R.string.key_short_tabtitles, false)) { - normalTabs.visibility = View.GONE - compactTabs.visibility = View.VISIBLE + tabs_normal.visibility = View.GONE + tabs_compact.visibility = View.VISIBLE toolbar.layoutParams = LinearLayout.LayoutParams(Toolbar.LayoutParams.MATCH_PARENT, resources.getDimension(R.dimen.compact_height).toInt()) + TabLayoutMediator(tabs_compact, main_pager) { tab, position -> + tab.text = (main_pager.adapter as TabPageAdapter).getPluginAt(position).nameShort + }.attach() } else { - normalTabs.visibility = View.VISIBLE - compactTabs.visibility = View.GONE + tabs_normal.visibility = View.VISIBLE + tabs_compact.visibility = View.GONE val typedValue = TypedValue() if (theme.resolveAttribute(R.attr.actionBarSize, typedValue, true)) { toolbar.layoutParams = LinearLayout.LayoutParams(Toolbar.LayoutParams.MATCH_PARENT, TypedValue.complexToDimensionPixelSize(typedValue.data, resources.displayMetrics)) } + TabLayoutMediator(tabs_normal, main_pager) { tab, position -> + tab.text = (main_pager.adapter as TabPageAdapter).getPluginAt(position).name + }.attach() } } @@ -260,7 +248,7 @@ class MainActivity : NoSplashAppCompatActivity() { override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.menu_main, menu) pluginPreferencesMenuItem = menu.findItem(R.id.nav_plugin_preferences) - checkPluginPreferences(findViewById(R.id.pager)) + checkPluginPreferences(main_pager) return true } @@ -314,8 +302,7 @@ class MainActivity : NoSplashAppCompatActivity() { } R.id.nav_plugin_preferences -> { - val viewPager = findViewById(R.id.pager) - val plugin = (viewPager.adapter as TabPageAdapter).getPluginAt(viewPager.currentItem) + val plugin = (main_pager.adapter as TabPageAdapter).getPluginAt(main_pager.currentItem) protectionCheck.queryProtection(this, ProtectionCheck.Protection.PREFERENCES, Runnable { val i = Intent(this, PreferencesActivity::class.java) i.putExtra("id", plugin.preferencesId) diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt index ee782c5fd1..96daa35d1f 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt @@ -215,7 +215,8 @@ abstract class PluginsModule { @Binds @AllConfigs - @IntoSet + @IntoMap + @IntKey(265) abstract fun bindSafetyPlugin(plugin: SafetyPlugin): PluginBase @Binds diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventChargingState.kt b/app/src/main/java/info/nightscout/androidaps/events/EventChargingState.kt index f9ff60a71d..71c36ca387 100644 --- a/app/src/main/java/info/nightscout/androidaps/events/EventChargingState.kt +++ b/app/src/main/java/info/nightscout/androidaps/events/EventChargingState.kt @@ -1,3 +1,3 @@ package info.nightscout.androidaps.events -class EventChargingState(val isCharging: Boolean) : Event() +class EventChargingState(val isCharging: Boolean, val batterLevel: Int) : Event() diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java index 24e86220c2..fefd50f132 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java @@ -17,8 +17,6 @@ import org.jetbrains.annotations.Nullable; import org.json.JSONException; import org.json.JSONObject; -import java.util.Date; - import javax.inject.Inject; import javax.inject.Singleton; @@ -49,7 +47,6 @@ import info.nightscout.androidaps.interfaces.PluginType; import info.nightscout.androidaps.interfaces.PumpDescription; import info.nightscout.androidaps.interfaces.PumpInterface; import info.nightscout.androidaps.logging.AAPSLogger; -import info.nightscout.androidaps.logging.L; import info.nightscout.androidaps.logging.LTag; import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopSetLastRunGui; import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui; @@ -65,6 +62,7 @@ import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin; import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin; import info.nightscout.androidaps.queue.Callback; import info.nightscout.androidaps.queue.commands.Command; +import info.nightscout.androidaps.receivers.ReceiverStatusStore; import info.nightscout.androidaps.utils.DateUtil; import info.nightscout.androidaps.utils.FabricPrivacy; import info.nightscout.androidaps.utils.T; @@ -88,6 +86,8 @@ public class LoopPlugin extends PluginBase { private final VirtualPumpPlugin virtualPumpPlugin; private final Lazy actionStringHandler; private final IobCobCalculatorPlugin iobCobCalculatorPlugin; + private final ReceiverStatusStore receiverStatusStore; + private final FabricPrivacy fabricPrivacy; private CompositeDisposable disposable = new CompositeDisposable(); @@ -105,7 +105,7 @@ public class LoopPlugin extends PluginBase { public PumpEnactResult tbrSetByPump = null; public PumpEnactResult smbSetByPump = null; public String source = null; - public long lastAPSRun = DateUtil.now(); + public long lastAPSRun = DateUtil.now(); public long lastTBREnact = 0; public long lastSMBEnact = 0; public long lastTBRRequest = 0; @@ -130,7 +130,9 @@ public class LoopPlugin extends PluginBase { TreatmentsPlugin treatmentsPlugin, VirtualPumpPlugin virtualPumpPlugin, Lazy actionStringHandler, // TODO Adrian use RxBus instead of Lazy - IobCobCalculatorPlugin iobCobCalculatorPlugin + IobCobCalculatorPlugin iobCobCalculatorPlugin, + ReceiverStatusStore receiverStatusStore, + FabricPrivacy fabricPrivacy ) { super(new PluginDescription() .mainType(PluginType.LOOP) @@ -154,6 +156,8 @@ public class LoopPlugin extends PluginBase { this.virtualPumpPlugin = virtualPumpPlugin; this.actionStringHandler = actionStringHandler; this.iobCobCalculatorPlugin = iobCobCalculatorPlugin; + this.receiverStatusStore = receiverStatusStore; + this.fabricPrivacy = fabricPrivacy; loopSuspendedTill = sp.getLong("loopSuspendedTill", 0L); isSuperBolus = sp.getBoolean("isSuperBolus", false); @@ -167,7 +171,7 @@ public class LoopPlugin extends PluginBase { disposable.add(rxBus .toObservable(EventTempTargetChange.class) .observeOn(Schedulers.io()) - .subscribe(event -> invoke("EventTempTargetChange", true), exception -> FabricPrivacy.getInstance().logException(exception)) + .subscribe(event -> invoke("EventTempTargetChange", true), fabricPrivacy::logException) ); /** * This method is triggered once autosens calculation has completed, so the LoopPlugin @@ -191,7 +195,7 @@ public class LoopPlugin extends PluginBase { lastBgTriggeredRun = bgReading.date; invoke("AutosenseCalculation for " + bgReading, true); - }, exception -> FabricPrivacy.getInstance().logException(exception)) + }, fabricPrivacy::logException) ); } @@ -391,7 +395,7 @@ public class LoopPlugin extends PluginBase { lastRun.lastSMBEnact = 0; lastRun.lastSMBRequest = 0; - NSUpload.uploadDeviceStatus(this, iobCobCalculatorPlugin, profileFunction, activePlugin.getActivePump()); + NSUpload.uploadDeviceStatus(this, iobCobCalculatorPlugin, profileFunction, activePlugin.getActivePump(), receiverStatusStore); if (isSuspended()) { getAapsLogger().debug(LTag.APS, resourceHelper.gs(R.string.loopsuspended)); @@ -418,7 +422,7 @@ public class LoopPlugin extends PluginBase { if (resultAfterConstraints.bolusRequested) lastRun.smbSetByPump = waiting; rxBus.send(new EventLoopUpdateGui()); - FabricPrivacy.getInstance().logCustom("APSRequest"); + fabricPrivacy.logCustom("APSRequest"); applyTBRRequest(resultAfterConstraints, profile, new Callback() { @Override public void run() { @@ -516,13 +520,13 @@ public class LoopPlugin extends PluginBase { lastRun.lastTBRRequest = lastRun.lastAPSRun; lastRun.lastTBREnact = DateUtil.now(); lastRun.lastOpenModeAccept = DateUtil.now(); - NSUpload.uploadDeviceStatus(lp, iobCobCalculatorPlugin, profileFunction, activePlugin.getActivePump()); + NSUpload.uploadDeviceStatus(lp, iobCobCalculatorPlugin, profileFunction, activePlugin.getActivePump(), receiverStatusStore); sp.incInt(R.string.key_ObjectivesmanualEnacts); } rxBus.send(new EventAcceptOpenLoopChange()); } }); - FabricPrivacy.getInstance().logCustom("AcceptTemp"); + fabricPrivacy.logCustom("AcceptTemp"); } /** diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt index 6380bd5fcf..63a32edc41 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt @@ -4,7 +4,6 @@ import android.content.Context import android.content.Intent import android.content.pm.ResolveInfo import android.os.Bundle -import dagger.Lazy import dagger.android.HasAndroidInjector import info.nightscout.androidaps.Config import info.nightscout.androidaps.R @@ -30,8 +29,8 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewB import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished +import info.nightscout.androidaps.receivers.ReceiverStatusStore import info.nightscout.androidaps.services.Intents -import info.nightscout.androidaps.utils.BatteryLevel import info.nightscout.androidaps.utils.DefaultValueHelper import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.resources.ResourceHelper @@ -52,8 +51,10 @@ class DataBroadcastPlugin @Inject constructor( private val profileFunction: ProfileFunction, private val defaultValueHelper: DefaultValueHelper, private val nsDeviceStatus: NSDeviceStatus, - private val lazyLoopPlugin: Lazy, - private val activePlugin: ActivePluginProvider + private val loopPlugin: LoopPlugin, + private val activePlugin: ActivePluginProvider, + private var receiverStatusStore: ReceiverStatusStore + ) : PluginBase(PluginDescription() .mainType(PluginType.GENERAL) @@ -154,16 +155,16 @@ class DataBroadcastPlugin @Inject constructor( private fun loopStatus(bundle: Bundle) { //batteries - bundle.putInt("phoneBattery", BatteryLevel.getBatteryLevel()) + bundle.putInt("phoneBattery", receiverStatusStore.batteryLevel) bundle.putInt("rigBattery", nsDeviceStatus.uploaderStatus.replace("%", "").trim { it <= ' ' }.toInt()) - if (Config.APS && lazyLoopPlugin.get().lastRun?.lastTBREnact != 0L) { //we are AndroidAPS - bundle.putLong("suggestedTimeStamp", lazyLoopPlugin.get().lastRun?.lastAPSRun ?: -1L) - bundle.putString("suggested", lazyLoopPlugin.get().lastRun?.request?.json().toString()) - if (lazyLoopPlugin.get().lastRun?.tbrSetByPump != null && lazyLoopPlugin.get().lastRun?.tbrSetByPump?.enacted == true) { - bundle.putLong("enactedTimeStamp", lazyLoopPlugin.get().lastRun?.lastTBREnact + if (Config.APS && loopPlugin.lastRun?.lastTBREnact != 0L) { //we are AndroidAPS + bundle.putLong("suggestedTimeStamp", loopPlugin.lastRun?.lastAPSRun ?: -1L) + bundle.putString("suggested", loopPlugin.lastRun?.request?.json().toString()) + if (loopPlugin.lastRun?.tbrSetByPump != null && loopPlugin.lastRun?.tbrSetByPump?.enacted == true) { + bundle.putLong("enactedTimeStamp", loopPlugin.lastRun?.lastTBREnact ?: -1L) - bundle.putString("enacted", lazyLoopPlugin.get().lastRun?.request?.json().toString()) + bundle.putString("enacted", loopPlugin.lastRun?.request?.json().toString()) } } else { //NSClient or remote val data = NSDeviceStatus.deviceStatusOpenAPSData diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java index 44ec38041f..5b2fd496c7 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java @@ -39,11 +39,9 @@ import info.nightscout.androidaps.logging.StacktraceLoggerWrapper; import info.nightscout.androidaps.plugins.aps.loop.APSResult; import info.nightscout.androidaps.plugins.aps.loop.DeviceStatus; import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin; -import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin; -import info.nightscout.androidaps.plugins.configBuilder.PluginStore; import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction; import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin; -import info.nightscout.androidaps.utils.BatteryLevel; +import info.nightscout.androidaps.receivers.ReceiverStatusStore; import info.nightscout.androidaps.utils.DateUtil; import info.nightscout.androidaps.utils.JsonHelper; import info.nightscout.androidaps.utils.SP; @@ -160,7 +158,7 @@ public class NSUpload { } } - public static void uploadDeviceStatus(LoopPlugin loopPlugin, IobCobCalculatorPlugin iobCobCalculatorPlugin, ProfileFunction profileFunction, PumpInterface pumpInterface) { + public static void uploadDeviceStatus(LoopPlugin loopPlugin, IobCobCalculatorPlugin iobCobCalculatorPlugin, ProfileFunction profileFunction, PumpInterface pumpInterface, ReceiverStatusStore receiverStatusStore) { Profile profile = profileFunction.getProfile(); String profileName = profileFunction.getProfileName(); @@ -216,7 +214,7 @@ public class NSUpload { deviceStatus.pump = pumpstatus; } - int batteryLevel = BatteryLevel.getBatteryLevel(); + int batteryLevel = receiverStatusStore.getBatteryLevel(); deviceStatus.uploaderBattery = batteryLevel; deviceStatus.created_at = DateUtil.toISOString(new Date()); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java index 11eb0b39c8..b60dd1f1fd 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java @@ -50,7 +50,7 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus; import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin; import info.nightscout.androidaps.plugins.treatments.Treatment; import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin; -import info.nightscout.androidaps.utils.BatteryLevel; +import info.nightscout.androidaps.receivers.ReceiverStatusStore; import info.nightscout.androidaps.utils.DecimalFormatter; import info.nightscout.androidaps.utils.DefaultValueHelper; import info.nightscout.androidaps.utils.ToastUtils; @@ -71,6 +71,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog @Inject public IobCobCalculatorPlugin iobCobCalculatorPlugin; @Inject public TreatmentsPlugin treatmentsPlugin; @Inject public ActionStringHandler actionStringHandler; + @Inject ReceiverStatusStore receiverStatusStore; public static final String ACTION_RESEND = WatchUpdaterService.class.getName().concat(".Resend"); public static final String ACTION_OPEN_SETTINGS = WatchUpdaterService.class.getName().concat(".OpenSettings"); @@ -705,7 +706,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog //batteries - int phoneBattery = BatteryLevel.getBatteryLevel(); + int phoneBattery = receiverStatusStore.getBatteryLevel(); String rigBattery = nsDeviceStatus.getUploaderStatus().trim(); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.java index dab8470daf..8917d3e834 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.java @@ -70,4 +70,4 @@ public enum PumpCapability { -} \ No newline at end of file +} diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java index c1f6f19dd8..3fff66fdf7 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java @@ -23,7 +23,7 @@ public enum PumpType { new DoseSettings(0.05d, 30, 8 * 60, 0.05d), // PumpTempBasalType.Percent, // new DoseSettings(10, 30, 24 * 60, 0d, 500d), PumpCapability.BasalRate_Duration15and30minAllowed, // - 0.01d, 0.01d, null, PumpCapability.VirtualPumpCapabilities, false, false), // + 0.01d, 0.01d, null, PumpCapability.VirtualPumpCapabilities), // // Cellnovo @@ -31,7 +31,7 @@ public enum PumpType { new DoseSettings(0.05d, 30, 24 * 60, 1d, null), PumpTempBasalType.Percent, new DoseSettings(5, 30, 24 * 60, 0d, 200d), PumpCapability.BasalRate_Duration30minAllowed, // - 0.05d, 0.05d, null, PumpCapability.VirtualPumpCapabilities, false, false), // + 0.05d, 0.05d, null, PumpCapability.VirtualPumpCapabilities), // // Accu-Chek @@ -39,31 +39,31 @@ public enum PumpType { new DoseSettings(0.1d, 15, 12 * 60, 0.1d), // PumpTempBasalType.Percent, new DoseSettings(10, 15, 12 * 60, 0d, 500d), PumpCapability.BasalRate_Duration15and30minAllowed, // - 0.01d, 0.01d, DoseStepSize.ComboBasal, PumpCapability.ComboCapabilities, false, false), // + 0.01d, 0.01d, DoseStepSize.ComboBasal, PumpCapability.ComboCapabilities), // AccuChekSpirit("Accu-Chek Spirit", ManufacturerType.Roche, "Spirit", 0.1d, null, // new DoseSettings(0.1d, 15, 12 * 60, 0.1d), // PumpTempBasalType.Percent, new DoseSettings(10, 15, 12 * 60, 0d, 500d), PumpCapability.BasalRate_Duration15and30minAllowed, // - 0.01d, 0.1d, null, PumpCapability.VirtualPumpCapabilities, false, false), // + 0.01d, 0.1d, null, PumpCapability.VirtualPumpCapabilities), // AccuChekInsight("Accu-Chek Insight", ManufacturerType.Roche, "Insight", 0.05d, DoseStepSize.InsightBolus, // new DoseSettings(0.05d, 15, 24 * 60, 0.05d), // PumpTempBasalType.Percent, new DoseSettings(10, 15, 24 * 60, 0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, // - 0.02d, 0.01d, null, PumpCapability.InsightCapabilities, false, false), // + 0.02d, 0.01d, null, PumpCapability.InsightCapabilities), // AccuChekInsightBluetooth("Accu-Chek Insight", ManufacturerType.Roche, "Insight", 0.01d, null, // new DoseSettings(0.01d, 15, 24 * 60, 0.05d), // PumpTempBasalType.Percent, new DoseSettings(10, 15, 24 * 60, 0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, // - 0.02d, 0.01d, DoseStepSize.InsightBolus, PumpCapability.InsightCapabilities, false, false), // + 0.02d, null, 0.01d, DoseStepSize.InsightBolus, PumpCapability.InsightCapabilities), // AccuChekSolo("Accu-Chek Solo", ManufacturerType.Roche, "Solo", 0.01d, null, // new DoseSettings(0.01d, 15, 24 * 60, 0.05d), // PumpTempBasalType.Percent, new DoseSettings(10, 15, 24 * 60, 0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, // - 0.02d, 0.01d, DoseStepSize.InsightBolus, PumpCapability.InsightCapabilities, false, false), // + 0.02d, null, 0.01d, DoseStepSize.InsightBolus, PumpCapability.InsightCapabilities), // // Animas @@ -71,7 +71,7 @@ public enum PumpType { new DoseSettings(0.05d, 30, 12 * 60, 0.05d), // PumpTempBasalType.Percent, // new DoseSettings(10, 30, 24 * 60, 0d, 300d), PumpCapability.BasalRate_Duration30minAllowed, // - 0.025d, 5d, 0d, null, PumpCapability.VirtualPumpCapabilities, false, false), // + 0.025d, 5d, 0d, null, PumpCapability.VirtualPumpCapabilities), // AnimasPing("Animas Ping", "Ping", AnimasVibe), @@ -80,41 +80,42 @@ public enum PumpType { new DoseSettings(0.05d, 30, 8 * 60, 0.05d), // PumpTempBasalType.Percent, // new DoseSettings(10d, 60, 24 * 60, 0d, 200d), PumpCapability.BasalRate_Duration15and30minNotAllowed, // - 0.04d, 0.01d, null, PumpCapability.DanaCapabilities, false, false), + 0.04d, 0.01d, null, PumpCapability.DanaCapabilities), DanaRKorean("DanaR Korean", ManufacturerType.Sooil, "DanaRKorean", 0.05d, null, // new DoseSettings(0.05d, 30, 8 * 60, 0.05d), // PumpTempBasalType.Percent, // new DoseSettings(10d, 60, 24 * 60, 0d, 200d), PumpCapability.BasalRate_Duration15and30minNotAllowed, // - 0.1d, 0.01d, null, PumpCapability.DanaCapabilities, false, false), + 0.1d, 0.01d, null, PumpCapability.DanaCapabilities), DanaRS("DanaRS", ManufacturerType.Sooil, "DanaRS", 0.05d, null, // new DoseSettings(0.05d, 30, 8 * 60, 0.05d), // PumpTempBasalType.Percent, // new DoseSettings(10d, 60, 24 * 60, 0d, 200d), PumpCapability.BasalRate_Duration15and30minAllowed, // - 0.04d, 0.01d, null, PumpCapability.DanaWithHistoryCapabilities, false, false), + 0.04d, 0.01d, null, PumpCapability.DanaWithHistoryCapabilities), DanaRv2("DanaRv2", "DanaRv2", DanaRS), + // Insulet Insulet_Omnipod("Insulet Omnipod", ManufacturerType.Insulet, "Omnipod (Eros)", 0.05d, null, // new DoseSettings(0.05d, 30, 8 * 60, 0.05d), // PumpTempBasalType.Absolute, // new DoseSettings(0.05d, 30, 12 * 60, 0d, 30.0d), PumpCapability.BasalRate_Duration30minAllowed, // - 0.05d, 0.05d, null, PumpCapability.OmnipodCapabilities, true, true), + 0.05d, null, 0.05d, null, PumpCapability.OmnipodCapabilities, true, true), Insulet_Omnipod_Dash("Insulet Omnipod Dash", ManufacturerType.Insulet, "Omnipod Dash", 0.05d, null, // new DoseSettings(0.05d, 30, 8 * 60, 0.05d), // PumpTempBasalType.Absolute, // new DoseSettings(0.05d, 30, 12 * 60, 0d, 30.0d), PumpCapability.BasalRate_Duration30minAllowed, // - 0.05d, 0.05d, null, PumpCapability.OmnipodCapabilities, true, true), // TODO just copied OmniPod for now + 0.05d, null, 0.05d, null, PumpCapability.OmnipodCapabilities, true, true), // TODO just copied OmniPod for now // Medtronic Medtronic_512_712("Medtronic 512/712", ManufacturerType.Medtronic, "512/712", 0.1d, null, // new DoseSettings(0.05d, 30, 8 * 60, 0.05d), // PumpTempBasalType.Absolute, // new DoseSettings(0.05d, 30, 24 * 60, 0d, 35d), PumpCapability.BasalRate_Duration30minAllowed, // - 0.05d, 0.05d, null, PumpCapability.MedtronicCapabilities, false, false), // + 0.05d, 0.05d, null, PumpCapability.MedtronicCapabilities), // Medtronic_515_715("Medtronic 515/715", "515/715", Medtronic_512_712), Medtronic_522_722("Medtronic 522/722", "522/722", Medtronic_512_712), @@ -123,7 +124,7 @@ public enum PumpType { new DoseSettings(0.05d, 30, 8 * 60, 0.05d), // PumpTempBasalType.Absolute, // new DoseSettings(0.05d, 30, 24 * 60, 0d, 35d), PumpCapability.BasalRate_Duration30minAllowed, // - 0.025d, 0.025d, DoseStepSize.MedtronicVeoBasal, PumpCapability.MedtronicCapabilities, false, false), // + 0.025d, 0.025d, DoseStepSize.MedtronicVeoBasal, PumpCapability.MedtronicCapabilities), // Medtronic_554_754_Veo("Medtronic 554/754 (Veo)", "554/754 (Veo)", Medtronic_523_723_Revel), // TODO @@ -131,14 +132,14 @@ public enum PumpType { new DoseSettings(0.05d, 30, 8 * 60, 0.05d), // PumpTempBasalType.Absolute, // new DoseSettings(0.05d, 30, 24 * 60, 0d, 35d), PumpCapability.BasalRate_Duration30minAllowed, // - 0.025d, 0.025d, DoseStepSize.MedtronicVeoBasal, PumpCapability.VirtualPumpCapabilities, false, false), // + 0.025d, 0.025d, DoseStepSize.MedtronicVeoBasal, PumpCapability.VirtualPumpCapabilities), // // Tandem TandemTSlim("Tandem t:slim", ManufacturerType.Tandem, "t:slim", 0.01d, null, // new DoseSettings(0.01d, 15, 8 * 60, 0.4d), PumpTempBasalType.Percent, new DoseSettings(1, 15, 8 * 60, 0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, // - 0.1d, 0.001d, null, PumpCapability.VirtualPumpCapabilities, false, false), + 0.1d, 0.001d, null, PumpCapability.VirtualPumpCapabilities), TandemTFlex("Tandem t:flex", "t:flex", TandemTSlim), // TandemTSlimG4("Tandem t:slim G4", "t:slim G4", TandemTSlim), // @@ -147,6 +148,7 @@ public enum PumpType { // MDI MDI("MDI", ManufacturerType.AndroidAPS, "MDI"); + private String description; private ManufacturerType manufacturer; private String model; @@ -197,18 +199,58 @@ public enum PumpType { parent.model = model; } - PumpType(String description, ManufacturerType manufacturer, String model, double bolusSize, DoseStepSize specialBolusSize, // + PumpType(String description, + ManufacturerType manufacturer, + String model, + double bolusSize, + DoseStepSize specialBolusSize, // DoseSettings extendedBolusSettings, // - PumpTempBasalType pumpTempBasalType, DoseSettings tbrSettings, PumpCapability specialBasalDurations, // - double baseBasalMinValue, double baseBasalStep, DoseStepSize baseBasalSpecialSteps, PumpCapability pumpCapability, boolean hasFixedUnreachableAlert, boolean hasCustomUnreachableAlertCheck) { - this(description, manufacturer, model, bolusSize, specialBolusSize, extendedBolusSettings, pumpTempBasalType, tbrSettings, specialBasalDurations, baseBasalMinValue, null, baseBasalStep, baseBasalSpecialSteps, pumpCapability, hasFixedUnreachableAlert, hasCustomUnreachableAlertCheck); + PumpTempBasalType pumpTempBasalType, + DoseSettings tbrSettings, + PumpCapability specialBasalDurations, // + double baseBasalMinValue, + double baseBasalStep, + DoseStepSize baseBasalSpecialSteps, + PumpCapability pumpCapability) { + this(description, manufacturer, model, bolusSize, specialBolusSize, extendedBolusSettings, pumpTempBasalType, tbrSettings, specialBasalDurations, baseBasalMinValue, null, baseBasalStep, baseBasalSpecialSteps, pumpCapability); } - PumpType(String description, ManufacturerType manufacturer, String model, double bolusSize, DoseStepSize specialBolusSize, // + PumpType(String description, + ManufacturerType manufacturer, + String model, + double bolusSize, + DoseStepSize specialBolusSize, // DoseSettings extendedBolusSettings, // - PumpTempBasalType pumpTempBasalType, DoseSettings tbrSettings, PumpCapability specialBasalDurations, // - double baseBasalMinValue, Double baseBasalMaxValue, double baseBasalStep, DoseStepSize baseBasalSpecialSteps, // - PumpCapability pumpCapability, boolean hasFixedUnreachableAlert, boolean hasCustomUnreachableAlertCheck) { + PumpTempBasalType pumpTempBasalType, + DoseSettings tbrSettings, + PumpCapability specialBasalDurations, // + double baseBasalMinValue, + Double baseBasalMaxValue, + double baseBasalStep, + DoseStepSize baseBasalSpecialSteps, + PumpCapability pumpCapability) { + this(description, manufacturer, model, bolusSize, specialBolusSize, extendedBolusSettings, pumpTempBasalType, + tbrSettings, specialBasalDurations, baseBasalMinValue, null, baseBasalStep, + baseBasalSpecialSteps, pumpCapability, false, false); + } + + + PumpType(String description, + ManufacturerType manufacturer, + String model, + double bolusSize, + DoseStepSize specialBolusSize, // + DoseSettings extendedBolusSettings, // + PumpTempBasalType pumpTempBasalType, + DoseSettings tbrSettings, + PumpCapability specialBasalDurations, // + double baseBasalMinValue, + Double baseBasalMaxValue, + double baseBasalStep, + DoseStepSize baseBasalSpecialSteps, // + PumpCapability pumpCapability, + boolean hasFixedUnreachableAlert, + boolean hasCustomUnreachableAlertCheck) { this.description = description; this.manufacturer = manufacturer; this.model = model; @@ -227,6 +269,7 @@ public enum PumpType { this.hasCustomUnreachableAlertCheck = hasCustomUnreachableAlertCheck; } + public boolean getHasFixedUnreachableAlert() { return hasFixedUnreachableAlert; } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistory.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistory.java index db0884867e..ae32018111 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistory.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistory.java @@ -1,7 +1,6 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -21,7 +20,6 @@ import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterfac import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem; import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil; -import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry; import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState; import info.nightscout.androidaps.utils.DateUtil; diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt index f6456fc749..674a84b2c8 100644 --- a/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt +++ b/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt @@ -19,16 +19,24 @@ class ChargingStateReceiver : DaggerBroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { super.onReceive(context, intent) rxBus.send(grabChargingState(context)) - aapsLogger.debug(LTag.CORE, receiverStatusStore.lastChargingEvent!!.toString()) + aapsLogger.debug(LTag.CORE, receiverStatusStore.lastChargingEvent?.toString() + ?: "Unknown charging state") } private fun grabChargingState(context: Context): EventChargingState { - val batteryStatus: Intent? = IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { iFilter -> - context.registerReceiver(null, iFilter) - } + val batteryStatus = context.registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED)) + + // Level + var batteryLevel = 0 + val level = batteryStatus?.getIntExtra(BatteryManager.EXTRA_LEVEL, -1) ?: -1 + val scale = batteryStatus?.getIntExtra(BatteryManager.EXTRA_SCALE, -1) ?: -1 + if (level != -1 && scale != -1) + batteryLevel = (level.toFloat() / scale.toFloat() * 100.0f).toInt() + // Status val status: Int = batteryStatus?.getIntExtra(BatteryManager.EXTRA_STATUS, -1) ?: -1 val isCharging: Boolean = status == BatteryManager.BATTERY_STATUS_CHARGING || status == BatteryManager.BATTERY_STATUS_FULL - return EventChargingState(isCharging).also { receiverStatusStore.lastChargingEvent = it } + + return EventChargingState(isCharging, batteryLevel).also { receiverStatusStore.lastChargingEvent = it } } } \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt index 521537e2d4..2c99b1e4f1 100644 --- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt +++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt @@ -37,6 +37,7 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() { @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin @Inject lateinit var localAlertUtils: LocalAlertUtils @Inject lateinit var fabricPrivacy: FabricPrivacy + @Inject lateinit var receiverStatusStore: ReceiverStatusStore companion object { @@ -106,7 +107,7 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() { else if (DateUtil.isOlderThan(activePlugin.activeAPS.lastAPSRun, 5)) shouldUploadStatus = true if (DateUtil.isOlderThan(lastIobUpload, IOB_UPDATE_FREQUENCY) && shouldUploadStatus) { lastIobUpload = DateUtil.now() - NSUpload.uploadDeviceStatus(loopPlugin, iobCobCalculatorPlugin, profileFunction, activePlugin.activePump) + NSUpload.uploadDeviceStatus(loopPlugin, iobCobCalculatorPlugin, profileFunction, activePlugin.activePump, receiverStatusStore) } } diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt b/app/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt index a55b95f650..30090d386f 100644 --- a/app/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt +++ b/app/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt @@ -28,6 +28,9 @@ class ReceiverStatusStore @Inject constructor(val context: Context, val rxBus: R val isCharging: Boolean get() = lastChargingEvent?.isCharging ?: false + val batteryLevel: Int + get() = lastChargingEvent?.batterLevel ?: 0 + fun broadcastChargingState() { lastChargingEvent?.let { rxBus.send(it) } } diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt index 564ce70582..46cf58d99f 100644 --- a/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt +++ b/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt @@ -2,12 +2,12 @@ package info.nightscout.androidaps.receivers import android.content.Context import android.content.Intent +import com.google.gson.Gson import dagger.android.DaggerBroadcastReceiver import info.nightscout.androidaps.interfaces.ActivePluginProvider import info.nightscout.androidaps.interfaces.PumpInterface import info.nightscout.androidaps.logging.AAPSLogger import info.nightscout.androidaps.logging.LTag -import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodUtil import info.nightscout.androidaps.utils.TimeChangeType import java.util.* import javax.inject.Inject @@ -15,11 +15,13 @@ import javax.inject.Inject class TimeDateOrTZChangeReceiver : DaggerBroadcastReceiver() { @Inject lateinit var aapsLogger: AAPSLogger @Inject lateinit var activePlugin: ActivePluginProvider + var gson: Gson private var isDST = false init { isDST = calculateDST() + gson = Gson() } private fun calculateDST(): Boolean { @@ -42,7 +44,7 @@ class TimeDateOrTZChangeReceiver : DaggerBroadcastReceiver() { } aapsLogger.debug(LTag.PUMP,"TimeDateOrTZChangeReceiver::Date, Time and/or TimeZone changed. [action={}]", action) - aapsLogger.debug(LTag.PUMP,"TimeDateOrTZChangeReceiver::Intent::{}", OmnipodUtil.getGsonInstance().toJson(intent)) + aapsLogger.debug(LTag.PUMP,"TimeDateOrTZChangeReceiver::Intent::{}", gson.toJson(intent)) if (action == null) { aapsLogger.error(LTag.PUMP,"TimeDateOrTZChangeReceiver::Action is null. Exiting.") diff --git a/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java b/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java deleted file mode 100644 index 9fee472cf0..0000000000 --- a/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java +++ /dev/null @@ -1,84 +0,0 @@ -package info.nightscout.androidaps.tabs; - -import android.content.Context; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; -import android.view.ViewGroup; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; - -import info.nightscout.androidaps.R; -import info.nightscout.androidaps.interfaces.PluginBase; -import info.nightscout.androidaps.logging.L; -import info.nightscout.androidaps.logging.StacktraceLoggerWrapper; -import info.nightscout.androidaps.utils.SP; - -/** - * Created by mike on 30.05.2016. - */ -public class TabPageAdapter extends FragmentPagerAdapter { - - ArrayList visibleFragmentList = new ArrayList<>(); - - Context context; - - private static Logger log = StacktraceLoggerWrapper.getLogger(L.CORE); - - public TabPageAdapter(FragmentManager fm, Context context) { - super(fm); - this.context = context; - } - - @Override - @Nullable - public Fragment getItem(int position) { - //Fragment fragment = (Fragment) visibleFragmentList.get(position); - return Fragment.instantiate(context, visibleFragmentList.get(position).getPluginDescription().getFragmentClass()); - } - - public PluginBase getPluginAt(int position) { - return visibleFragmentList.get(position); - } - - @Override - public void finishUpdate(ViewGroup container) { - try { - super.finishUpdate(container); - } catch (NullPointerException nullPointerException) { - System.out.println("Catch the NullPointerException in FragmentStatePagerAdapter.finishUpdate"); - } catch (IllegalStateException e) { - log.error("Unhandled exception", e); - } - } - - @Override - public CharSequence getPageTitle(int position) { - if (SP.getBoolean(R.string.key_short_tabtitles, false)) { - return visibleFragmentList.get(position).getNameShort(); - } - return visibleFragmentList.get(position).getName(); - - } - - @Override - public int getCount() { - return visibleFragmentList.size(); - } - - public void registerNewFragment(PluginBase plugin) { - if (plugin.hasFragment() && plugin.isFragmentVisible()) { - visibleFragmentList.add(plugin); - notifyDataSetChanged(); - } - } - - @Override - public long getItemId(int position) { - return System.identityHashCode(visibleFragmentList.get(position)); - } -} diff --git a/app/src/main/java/info/nightscout/androidaps/utils/BatteryLevel.java b/app/src/main/java/info/nightscout/androidaps/utils/BatteryLevel.java deleted file mode 100644 index b346125e6f..0000000000 --- a/app/src/main/java/info/nightscout/androidaps/utils/BatteryLevel.java +++ /dev/null @@ -1,35 +0,0 @@ -package info.nightscout.androidaps.utils; - -import android.content.Intent; -import android.content.IntentFilter; -import android.os.BatteryManager; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import info.nightscout.androidaps.MainApp; -import info.nightscout.androidaps.logging.StacktraceLoggerWrapper; - -/** - * Created by mike on 20.02.2017. - */ - -public class BatteryLevel { - private static Logger log = StacktraceLoggerWrapper.getLogger(BatteryLevel.class); - static public int lastUploadedLevel = 0; - - static public int getBatteryLevel() { - int batteryLevel = 0; - Intent batteryIntent = MainApp.instance().registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); - if (batteryIntent != null) { - int level = batteryIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1); - int scale = batteryIntent.getIntExtra(BatteryManager.EXTRA_SCALE, -1); - if (level != -1 && scale != -1) { - batteryLevel = (int) (((float) level / (float) scale) * 100.0f); - } - } - log.debug("Battery level: " + batteryLevel); - return batteryLevel; - } - -} diff --git a/app/src/main/java/info/nightscout/androidaps/utils/tabs/TabPageAdapter.kt b/app/src/main/java/info/nightscout/androidaps/utils/tabs/TabPageAdapter.kt new file mode 100644 index 0000000000..983593759f --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/utils/tabs/TabPageAdapter.kt @@ -0,0 +1,24 @@ +package info.nightscout.androidaps.utils.tabs + +import androidx.appcompat.app.AppCompatActivity +import androidx.fragment.app.Fragment +import androidx.viewpager2.adapter.FragmentStateAdapter +import info.nightscout.androidaps.interfaces.PluginBase +import java.util.* + +class TabPageAdapter(private val activity: AppCompatActivity) : FragmentStateAdapter(activity) { + + private val visibleFragmentList = ArrayList() + + override fun getItemCount(): Int = visibleFragmentList.size + override fun createFragment(position: Int): Fragment = + activity.supportFragmentManager.fragmentFactory.instantiate(ClassLoader.getSystemClassLoader(), visibleFragmentList[position].pluginDescription.fragmentClass) + + fun getPluginAt(position: Int): PluginBase = visibleFragmentList[position] + + fun registerNewFragment(plugin: PluginBase) { + if (plugin.hasFragment() && plugin.isFragmentVisible()) { + visibleFragmentList.add(plugin) + } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 268dd336f3..28164e3ef3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -36,18 +36,18 @@ - diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt index 1daab6553e..cd090dbde4 100644 --- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt @@ -26,7 +26,9 @@ import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin import info.nightscout.androidaps.plugins.source.GlimpPlugin import info.nightscout.androidaps.plugins.treatments.TreatmentService import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin +import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.HardLimits +import info.nightscout.androidaps.utils.Profiler import info.nightscout.androidaps.utils.buildHelper.BuildHelper import info.nightscout.androidaps.utils.sharedPreferences.SP import org.junit.Assert @@ -43,7 +45,7 @@ import java.util.* * Created by mike on 18.03.2018. */ @RunWith(PowerMockRunner::class) -@PrepareForTest(MainApp::class, ConfigBuilderPlugin::class, ConstraintChecker::class, SP::class, Context::class, OpenAPSAMAPlugin::class, OpenAPSSMBPlugin::class, TreatmentsPlugin::class, TreatmentService::class, VirtualPumpPlugin::class, DetailedBolusInfoStorage::class, GlimpPlugin::class) +@PrepareForTest(MainApp::class, ConfigBuilderPlugin::class, ConstraintChecker::class, SP::class, Context::class, OpenAPSAMAPlugin::class, OpenAPSSMBPlugin::class, TreatmentsPlugin::class, TreatmentService::class, VirtualPumpPlugin::class, DetailedBolusInfoStorage::class, GlimpPlugin::class, Profiler::class) class ConstraintsCheckerTest : TestBaseWithProfile() { @Mock lateinit var activePlugin: ActivePluginProvider @@ -55,6 +57,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() { @Mock lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin @Mock lateinit var glimpPlugin: GlimpPlugin @Mock lateinit var sensitivityOref1Plugin: SensitivityOref1Plugin + @Mock lateinit var profiler: Profiler private var buildHelper = BuildHelper() lateinit var danaRPump: DanaRPump @@ -114,8 +117,8 @@ class ConstraintsCheckerTest : TestBaseWithProfile() { danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, danaRPump) danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage) insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsPlugin, sp, commandQueue, profileFunction, context) - openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits) - openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits) + openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy) + openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy) safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, buildHelper, treatmentsPlugin) val constraintsPluginsList = ArrayList() constraintsPluginsList.add(safetyPlugin) diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt index 804f68a91f..dbfa209d11 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt @@ -10,7 +10,6 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider import info.nightscout.androidaps.interfaces.CommandQueueProvider import info.nightscout.androidaps.interfaces.PluginType import info.nightscout.androidaps.interfaces.PumpDescription -import info.nightscout.androidaps.logging.AAPSLogger import info.nightscout.androidaps.plugins.bus.RxBusWrapper import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction @@ -18,6 +17,8 @@ import info.nightscout.androidaps.plugins.general.wear.ActionStringHandler import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin +import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.sharedPreferences.SP import org.junit.Assert @@ -30,7 +31,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest import org.powermock.modules.junit4.PowerMockRunner @RunWith(PowerMockRunner::class) -@PrepareForTest(ConstraintChecker::class, VirtualPumpPlugin::class) +@PrepareForTest(ConstraintChecker::class, VirtualPumpPlugin::class, FabricPrivacy::class, ReceiverStatusStore::class) class LoopPluginTest : TestBase() { @Mock lateinit var sp: SP @@ -45,12 +46,14 @@ class LoopPluginTest : TestBase() { @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin @Mock lateinit var actionStringHandler: Lazy @Mock lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin + @Mock lateinit var fabricPrivacy: FabricPrivacy + @Mock lateinit var receiverStatusStore: ReceiverStatusStore lateinit var loopPlugin: LoopPlugin val injector = HasAndroidInjector { AndroidInjector { } } @Before fun prepareMock() { - loopPlugin = LoopPlugin(injector, aapsLogger, rxBus, sp, constraintChecker, resourceHelper, profileFunction, context, commandQueue, activePlugin, treatmentsPlugin, virtualPumpPlugin, actionStringHandler, iobCobCalculatorPlugin) + loopPlugin = LoopPlugin(injector, aapsLogger, rxBus, sp, constraintChecker, resourceHelper, profileFunction, context, commandQueue, activePlugin, treatmentsPlugin, virtualPumpPlugin, actionStringHandler, iobCobCalculatorPlugin, receiverStatusStore, fabricPrivacy) `when`(activePlugin.getActivePump()).thenReturn(virtualPumpPlugin) } diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt index 7388178df6..b0441c289f 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt @@ -52,14 +52,14 @@ class NsClientReceiverDelegateTest : TestBase() { @Test fun testCalculateStatusChargingState() { PowerMockito.mockStatic(SP::class.java) Mockito.`when`(sp.getBoolean(ArgumentMatchers.anyInt(), ArgumentMatchers.anyBoolean())).thenReturn(false) - var ev = EventChargingState(true) + var ev = EventChargingState(true, 0) Assert.assertTrue(sut!!.calculateStatus(ev)) - ev = EventChargingState(false) + ev = EventChargingState(false, 0) Assert.assertTrue(sut!!.calculateStatus(ev)) Mockito.`when`(sp.getBoolean(ArgumentMatchers.anyInt(), ArgumentMatchers.anyBoolean())).thenReturn(true) - ev = EventChargingState(true) + ev = EventChargingState(true, 0) Assert.assertTrue(sut!!.calculateStatus(ev)) - ev = EventChargingState(false) + ev = EventChargingState(false, 0) Assert.assertTrue(!sut!!.calculateStatus(ev)) }