ce2b1e4d10
* origin/dev: (40 commits) bump 1.53 BG & IOB contribution on by default in wizard check for NaN Revert "Rounding issues visible in nightscout insulin field" Clarified boolean logic with parentheses :) loadEvents after bolus in separate thread use notification for bolus delivery failed message when window has been destroyed fix null pointer exception Added cases to accept both a.m./p.m. and AM/PM split JSON arrays to 50 elements Update strings.xml Changed rounding to use BigDecimals to avoid noisy long doubles in output Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts." Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts. Removed unused imports Rounding fix VirtualPump: set PumpEnactResult.enacted. Use correct units for low/high from TT. Remove duplicate logging. ... # Conflicts: # app/build.gradle # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java # app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java # app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
182 lines
9.6 KiB
Java
182 lines
9.6 KiB
Java
package info.nightscout.androidaps;
|
|
|
|
import android.content.SharedPreferences;
|
|
import android.os.Bundle;
|
|
import android.preference.EditTextPreference;
|
|
import android.preference.ListPreference;
|
|
import android.preference.MultiSelectListPreference;
|
|
import android.preference.Preference;
|
|
import android.preference.PreferenceActivity;
|
|
import android.preference.PreferenceFragment;
|
|
import android.preference.PreferenceGroup;
|
|
import android.preference.PreferenceManager;
|
|
|
|
import info.nightscout.androidaps.events.EventPreferenceChange;
|
|
import info.nightscout.androidaps.events.EventRefreshGui;
|
|
import info.nightscout.androidaps.interfaces.PluginBase;
|
|
import info.nightscout.androidaps.plugins.OpenAPSSMB.OpenAPSSMBPlugin;
|
|
import info.nightscout.androidaps.plugins.Insulin.InsulinOrefFreePeakPlugin;
|
|
import info.nightscout.androidaps.plugins.PumpDanaR.BluetoothDevicePreference;
|
|
import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
|
|
import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
|
|
import info.nightscout.androidaps.plugins.NSClientInternal.NSClientInternalPlugin;
|
|
import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
|
|
import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
|
|
import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
|
|
import info.nightscout.androidaps.plugins.SensitivityAAPS.SensitivityAAPSPlugin;
|
|
import info.nightscout.androidaps.plugins.SensitivityOref0.SensitivityOref0Plugin;
|
|
import info.nightscout.androidaps.plugins.SensitivityWeightedAverage.SensitivityWeightedAveragePlugin;
|
|
import info.nightscout.androidaps.plugins.Wear.WearPlugin;
|
|
import info.nightscout.androidaps.plugins.XDripStatusline.StatuslinePlugin;
|
|
import info.nightscout.utils.LocaleHelper;
|
|
import info.nightscout.utils.OKDialog;
|
|
import info.nightscout.utils.SP;
|
|
|
|
public class PreferencesActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
|
|
MyPreferenceFragment myPreferenceFragment;
|
|
|
|
@Override
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
myPreferenceFragment = new MyPreferenceFragment();
|
|
getFragmentManager().beginTransaction().replace(android.R.id.content, myPreferenceFragment).commit();
|
|
PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
|
|
}
|
|
|
|
@Override
|
|
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
|
|
MainApp.bus().post(new EventPreferenceChange(key));
|
|
if (key.equals("language")) {
|
|
String lang = sharedPreferences.getString("language", "en");
|
|
LocaleHelper.setLocale(getApplicationContext(), lang);
|
|
recreate();
|
|
MainApp.bus().post(new EventRefreshGui());
|
|
}
|
|
if (key.equals("short_tabtitles")) {
|
|
MainApp.bus().post(new EventRefreshGui());
|
|
}
|
|
if (key.equals("openapsama_useautosens") && SP.getBoolean("openapsama_useautosens", false)) {
|
|
OKDialog.show(this, MainApp.sResources.getString(R.string.configbuilder_sensitivity), MainApp.sResources.getString(R.string.sensitivity_warning), null);
|
|
}
|
|
updatePrefSummary(myPreferenceFragment.getPreference(key));
|
|
}
|
|
|
|
private static void updatePrefSummary(Preference pref) {
|
|
if (pref instanceof ListPreference || pref instanceof BluetoothDevicePreference) {
|
|
ListPreference listPref = (ListPreference) pref;
|
|
pref.setSummary(listPref.getEntry());
|
|
}
|
|
if (pref instanceof EditTextPreference) {
|
|
EditTextPreference editTextPref = (EditTextPreference) pref;
|
|
if (pref.getKey().contains("password") || pref.getKey().contains("secret")) {
|
|
pref.setSummary("******");
|
|
} else if (editTextPref.getText() != null && !editTextPref.getText().equals("")) {
|
|
((EditTextPreference) pref).setDialogMessage(editTextPref.getDialogMessage());
|
|
pref.setSummary(editTextPref.getText());
|
|
}
|
|
}
|
|
if (pref instanceof MultiSelectListPreference) {
|
|
EditTextPreference editTextPref = (EditTextPreference) pref;
|
|
pref.setSummary(editTextPref.getText());
|
|
}
|
|
}
|
|
|
|
public static void initSummary(Preference p) {
|
|
if (p instanceof PreferenceGroup) {
|
|
PreferenceGroup pGrp = (PreferenceGroup) p;
|
|
for (int i = 0; i < pGrp.getPreferenceCount(); i++) {
|
|
initSummary(pGrp.getPreference(i));
|
|
}
|
|
} else {
|
|
updatePrefSummary(p);
|
|
}
|
|
}
|
|
|
|
public static class MyPreferenceFragment extends PreferenceFragment {
|
|
@Override
|
|
public void onCreate(final Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
if (Config.ALLPREFERENCES) {
|
|
addPreferencesFromResource(R.xml.pref_password);
|
|
}
|
|
addPreferencesFromResource(R.xml.pref_age);
|
|
addPreferencesFromResource(R.xml.pref_language);
|
|
if (Config.ALLPREFERENCES) {
|
|
addPreferencesFromResource(R.xml.pref_quickwizard);
|
|
}
|
|
addPreferencesFromResource(R.xml.pref_careportal);
|
|
if (Config.ALLPREFERENCES) {
|
|
addPreferencesFromResource(R.xml.pref_treatments);
|
|
}
|
|
if (Config.APS)
|
|
addPreferencesFromResource(R.xml.pref_closedmode);
|
|
if (Config.OPENAPSENABLED) {
|
|
addPreferencesFromResource(R.xml.pref_openapsma);
|
|
if (MainApp.getSpecificPlugin(OpenAPSAMAPlugin.class) != null && MainApp.getSpecificPlugin(OpenAPSAMAPlugin.class).isEnabled(PluginBase.APS))
|
|
addPreferencesFromResource(R.xml.pref_openapsama);
|
|
if (MainApp.getSpecificPlugin(OpenAPSSMBPlugin.class) != null && MainApp.getSpecificPlugin(OpenAPSSMBPlugin.class).isEnabled(PluginBase.APS))
|
|
addPreferencesFromResource(R.xml.pref_openapsama);
|
|
}
|
|
if (MainApp.getSpecificPlugin(SensitivityAAPSPlugin.class) != null && MainApp.getSpecificPlugin(SensitivityAAPSPlugin.class).isEnabled(PluginBase.SENSITIVITY)
|
|
|| MainApp.getSpecificPlugin(SensitivityWeightedAveragePlugin.class) != null && MainApp.getSpecificPlugin(SensitivityWeightedAveragePlugin.class).isEnabled(PluginBase.SENSITIVITY))
|
|
addPreferencesFromResource(R.xml.pref_absorption_aaps);
|
|
if (MainApp.getSpecificPlugin(SensitivityOref0Plugin.class) != null && MainApp.getSpecificPlugin(SensitivityOref0Plugin.class).isEnabled(PluginBase.SENSITIVITY))
|
|
addPreferencesFromResource(R.xml.pref_absorption_oref0);
|
|
if (Config.ALLPREFERENCES) {
|
|
addPreferencesFromResource(R.xml.pref_profile);
|
|
}
|
|
if (Config.DANAR) {
|
|
DanaRPlugin danaRPlugin = MainApp.getSpecificPlugin(DanaRPlugin.class);
|
|
DanaRKoreanPlugin danaRKoreanPlugin = MainApp.getSpecificPlugin(DanaRKoreanPlugin.class);
|
|
DanaRv2Plugin danaRv2Plugin = MainApp.getSpecificPlugin(DanaRv2Plugin.class);
|
|
if (danaRPlugin.isEnabled(PluginBase.PUMP) || danaRKoreanPlugin.isEnabled(PluginBase.PUMP)) {
|
|
addPreferencesFromResource(R.xml.pref_danar);
|
|
}
|
|
if (danaRv2Plugin != null && danaRv2Plugin.isEnabled(PluginBase.PUMP)) {
|
|
addPreferencesFromResource(R.xml.pref_danarv2);
|
|
}
|
|
if (danaRPlugin.isEnabled(PluginBase.PROFILE) || danaRKoreanPlugin.isEnabled(PluginBase.PROFILE) || danaRv2Plugin != null && danaRv2Plugin.isEnabled(PluginBase.PROFILE)) {
|
|
addPreferencesFromResource(R.xml.pref_danarprofile);
|
|
}
|
|
}
|
|
VirtualPumpPlugin virtualPumpPlugin = MainApp.getSpecificPlugin(VirtualPumpPlugin.class);
|
|
if (virtualPumpPlugin != null && virtualPumpPlugin.isEnabled(PluginBase.PUMP)) {
|
|
addPreferencesFromResource(R.xml.pref_virtualpump);
|
|
}
|
|
InsulinOrefFreePeakPlugin insulinOrefFreePeakPlugin = MainApp.getSpecificPlugin(InsulinOrefFreePeakPlugin.class);
|
|
if(insulinOrefFreePeakPlugin.isEnabled(PluginBase.INSULIN)){
|
|
addPreferencesFromResource(R.xml.pref_insulinoreffreepeak);
|
|
}
|
|
|
|
NSClientInternalPlugin nsClientInternalPlugin = MainApp.getSpecificPlugin(NSClientInternalPlugin.class);
|
|
if (nsClientInternalPlugin != null && nsClientInternalPlugin.isEnabled(PluginBase.GENERAL)) {
|
|
addPreferencesFromResource(R.xml.pref_nsclientinternal);
|
|
}
|
|
if (Config.SMSCOMMUNICATORENABLED)
|
|
addPreferencesFromResource(R.xml.pref_smscommunicator);
|
|
if (Config.ALLPREFERENCES) {
|
|
addPreferencesFromResource(R.xml.pref_others);
|
|
}
|
|
addPreferencesFromResource(R.xml.pref_advanced);
|
|
|
|
if (Config.WEAR) {
|
|
WearPlugin wearPlugin = MainApp.getSpecificPlugin(WearPlugin.class);
|
|
if (wearPlugin != null && wearPlugin.isEnabled(PluginBase.GENERAL)) {
|
|
addPreferencesFromResource(R.xml.pref_wear);
|
|
}
|
|
}
|
|
|
|
StatuslinePlugin statuslinePlugin = MainApp.getSpecificPlugin(StatuslinePlugin.class);
|
|
if (statuslinePlugin != null && statuslinePlugin.isEnabled(PluginBase.GENERAL)) {
|
|
addPreferencesFromResource(R.xml.pref_xdripstatus);
|
|
}
|
|
|
|
initSummary(getPreferenceScreen());
|
|
}
|
|
|
|
public Preference getPreference(String key) {
|
|
return findPreference(key);
|
|
}
|
|
}
|
|
}
|