Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
324 changes: 183 additions & 141 deletions app/src/main/java/io/pslab/activity/MultimeterActivity.java

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions app/src/main/java/io/pslab/activity/SettingsActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import io.pslab.fragment.BaroMeterSettingsFragment;
import io.pslab.fragment.GyroscopeSettingsFragment;
import io.pslab.fragment.LuxMeterSettingFragment;
import io.pslab.fragment.MultimeterSettingsFragment;
import io.pslab.fragment.SettingsFragment;
import io.pslab.fragment.ThermometerSettingsFragment;
import io.pslab.models.PSLabSensor;
Expand Down Expand Up @@ -72,6 +73,9 @@ protected void onCreate(Bundle savedInstanceState) {
case PSLabSensor.THERMOMETER_CONFIGURATIONS:
fragment = new ThermometerSettingsFragment();
break;
case "Multimeter Configurations":
fragment = new MultimeterSettingsFragment();
break;
default:
fragment = new SettingsFragment();
break;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
package io.pslab.fragment;

import android.annotation.SuppressLint;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v7.preference.CheckBoxPreference;
import android.support.v7.preference.EditTextPreference;
import android.support.v7.preference.PreferenceFragmentCompat;
import android.support.v7.preference.PreferenceManager;
import android.widget.Toast;

import io.pslab.R;
import io.pslab.others.PSLabPermission;

public class MultimeterSettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {

public static final String KEY_INCLUDE_LOCATION = "include_location_sensor_data";
public static final String KEY_UPDATE_PERIOD = "setting_multimeter_update_period";

private PSLabPermission psLabPermission;

private EditTextPreference updatePeriodPref;
private CheckBoxPreference locationPreference;
private SharedPreferences sharedPref;

@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
setPreferencesFromResource(R.xml.multimeter_settings, rootKey);
updatePeriodPref = (EditTextPreference) getPreferenceScreen().findPreference(KEY_UPDATE_PERIOD);
locationPreference = (CheckBoxPreference) getPreferenceScreen().findPreference(KEY_INCLUDE_LOCATION);
sharedPref = PreferenceManager.getDefaultSharedPreferences(getActivity());

psLabPermission = PSLabPermission.getInstance();
if (!psLabPermission.checkPermissions(getActivity(), PSLabPermission.MAP_PERMISSION)) {
SharedPreferences.Editor editor = sharedPref.edit();
editor.putBoolean(MultimeterSettingsFragment.KEY_INCLUDE_LOCATION, true);
editor.apply();
}
}

@Override
public void onResume() {
super.onResume();
locationPreference.setChecked(sharedPref.getBoolean(KEY_INCLUDE_LOCATION, true));
updatePeriodPref.setSummary(updatePeriodPref.getText() + " ms");
getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
}

@Override
public void onPause() {
super.onPause();
getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
}

@SuppressLint("ApplySharedPref")
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
switch (s) {
case KEY_INCLUDE_LOCATION:
if (locationPreference.isChecked()) {
psLabPermission.checkPermissions(
getActivity(), PSLabPermission.MAP_PERMISSION);
}
break;
case KEY_UPDATE_PERIOD:
try {
Integer updatePeriod = Integer.parseInt(updatePeriodPref.getText());
if (updatePeriod > 2000 || updatePeriod < 100) {
throw new NumberFormatException();
} else {
updatePeriodPref.setSummary(String.valueOf(updatePeriod) + " ms");
}
} catch (NumberFormatException e) {
Toast.makeText(getActivity(), getActivity().getResources().getString(R.string.update_period_msg), Toast.LENGTH_SHORT).show();
updatePeriodPref.setSummary("1000 ms");
updatePeriodPref.setText("1000");
SharedPreferences.Editor editor = sharedPref.edit();
editor.putString(s, "1000");
editor.commit();
}
break;
default:
break;
}
}
}
Loading