fix: app bar and back button in all sensor activity and add missing MPU925X sensor in sensor list index

app/src/main/java/io/pslab/activity/SensorActivity.java

@@ -11,7 +11,9 @@
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.GestureDetector;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.AdapterView;
@@ -78,6 +80,14 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(R.layout.sensor_main);
         scienceLab = ScienceLabCommon.scienceLab;
 
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setTitle(R.string.sensors);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
         // Bottom Sheet guide
         bottomSheet = findViewById(R.id.bottom_sheet);
         tvShadow = findViewById(R.id.shadow);
@@ -106,6 +116,7 @@ public void onClick(View v) {
         sensorAddr.put(0x68, "MPU6050");
         sensorAddr.put(0x40, "SHT21");
         sensorAddr.put(0x39, "TSL2561");
+        sensorAddr.put(0x69, "MPU925x");
 
         adapter = new ArrayAdapter<>(getApplication(), R.layout.sensor_list_item, R.id.tv_sensor_list_item, dataName);
 
@@ -289,4 +300,12 @@ protected void onPostExecute(Void aVoid) {
             buttonSensorAutoScan.setClickable(true);
         }
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+        }
+        return true;
+    }
 }

app/src/main/java/io/pslab/sensors/SensorADS1115.java

@@ -4,6 +4,8 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -62,6 +64,14 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.sensor_ads1115);
 
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setTitle(R.string.ads1115);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
         sensorDock = (RelativeLayout) findViewById(R.id.sensor_control_dock_layout);
         indefiniteSamplesCheckBox = (CheckBox) findViewById(R.id.checkBox_samples_sensor);
         samplesEditBox = (EditText) findViewById(R.id.editBox_samples_sensors);
@@ -188,13 +198,13 @@ private void setSensorDock() {
             @Override
             public void onClick(View v) {
                 if (play && scienceLab.isConnected()) {
-                    playPauseButton.setImageResource(R.drawable.play);
+                    playPauseButton.setImageResource(R.drawable.circle_play_button);
                     play = false;
                 } else if (!scienceLab.isConnected()) {
-                    playPauseButton.setImageResource(R.drawable.play);
+                    playPauseButton.setImageResource(R.drawable.circle_play_button);
                     play = false;
                 } else {
-                    playPauseButton.setImageResource(R.drawable.pause);
+                    playPauseButton.setImageResource(R.drawable.circle_pause_button);
                     play = true;
                     if (!indefiniteSamplesCheckBox.isChecked()) {
                         counter = Integer.parseInt(samplesEditBox.getText().toString());
@@ -275,11 +285,19 @@ protected void onPostExecute(Void aVoid) {
             samplesEditBox.setText(String.valueOf(counter));
             if (counter == 0 && !runIndefinitely) {
                 play = false;
-                playPauseButton.setImageResource(R.drawable.play);
+                playPauseButton.setImageResource(R.drawable.circle_play_button);
             }
             synchronized (lock) {
                 lock.notify();
             }
         }
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+        }
+        return true;
+    }
 }

app/src/main/java/io/pslab/sensors/SensorBMP180.java

@@ -4,6 +4,8 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -67,6 +69,14 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.sensor_bmp180);
 
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setTitle(R.string.bmp180);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
         sensorDock = (RelativeLayout) findViewById(R.id.sensor_control_dock_layout);
         indefiniteSamplesCheckBox = (CheckBox) findViewById(R.id.checkBox_samples_sensor);
         samplesEditBox = (EditText) findViewById(R.id.editBox_samples_sensors);
@@ -259,13 +269,13 @@ private void setSensorDock() {
             @Override
             public void onClick(View v) {
                 if (play && scienceLab.isConnected()) {
-                    playPauseButton.setImageResource(R.drawable.play);
+                    playPauseButton.setImageResource(R.drawable.circle_play_button);
                     play = false;
                 } else if (!scienceLab.isConnected()) {
-                    playPauseButton.setImageResource(R.drawable.play);
+                    playPauseButton.setImageResource(R.drawable.circle_play_button);
                     play = false;
                 } else {
-                    playPauseButton.setImageResource(R.drawable.pause);
+                    playPauseButton.setImageResource(R.drawable.circle_pause_button);
                     play = true;
                     if (!indefiniteSamplesCheckBox.isChecked()) {
                         counter = Integer.parseInt(samplesEditBox.getText().toString());
@@ -369,11 +379,19 @@ protected void onPostExecute(Void aVoid) {
             samplesEditBox.setText(String.valueOf(counter));
             if (counter == 0 && !runIndefinitely) {
                 play = false;
-                playPauseButton.setImageResource(R.drawable.play);
+                playPauseButton.setImageResource(R.drawable.circle_play_button);
             }
             synchronized (lock) {
                 lock.notify();
             }
         }
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+        }
+        return true;
+    }
 }

app/src/main/java/io/pslab/sensors/SensorHMC5883L.java

@@ -4,6 +4,8 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -67,6 +69,14 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.sensor_hmc5883l);
 
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setTitle(R.string.hmc5883l);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
         sensorDock = (RelativeLayout) findViewById(R.id.sensor_control_dock_layout);
         indefiniteSamplesCheckBox = (CheckBox) findViewById(R.id.checkBox_samples_sensor);
         samplesEditBox = (EditText) findViewById(R.id.editBox_samples_sensors);
@@ -185,13 +195,13 @@ private void setSensorDock() {
             @Override
             public void onClick(View v) {
                 if (play && scienceLab.isConnected()) {
-                    playPauseButton.setImageResource(R.drawable.play);
+                    playPauseButton.setImageResource(R.drawable.circle_play_button);
                     play = false;
                 } else if (!scienceLab.isConnected()) {
-                    playPauseButton.setImageResource(R.drawable.play);
+                    playPauseButton.setImageResource(R.drawable.circle_play_button);
                     play = false;
                 } else {
-                    playPauseButton.setImageResource(R.drawable.pause);
+                    playPauseButton.setImageResource(R.drawable.circle_pause_button);
                     play = true;
                     if (!indefiniteSamplesCheckBox.isChecked()) {
                         counter = Integer.parseInt(samplesEditBox.getText().toString());
@@ -292,11 +302,19 @@ protected void onPostExecute(Void aVoid) {
             samplesEditBox.setText(String.valueOf(counter));
             if (counter == 0 && !runIndefinitely) {
                 play = false;
-                playPauseButton.setImageResource(R.drawable.play);
+                playPauseButton.setImageResource(R.drawable.circle_play_button);
             }
             synchronized (lock) {
                 lock.notify();
             }
         }
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+        }
+        return true;
+    }
 }

app/src/main/java/io/pslab/sensors/SensorMLX90614.java

@@ -7,7 +7,9 @@
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
@@ -73,6 +75,15 @@ public class SensorMLX90614 extends AppCompatActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.sensor_mlx90614);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setTitle(R.string.mlx90614);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
         howToConnectDialog(getString(R.string.ir_thermometer), getString(R.string.ir_thermometer_intro), R.drawable.mlx90614_schematic, getString(R.string.ir_thermometer_desc));
 
         sensorDock = (RelativeLayout) findViewById(R.id.sensor_control_dock_layout);
@@ -229,13 +240,13 @@ private void setSensorDock() {
             @Override
             public void onClick(View v) {
                 if (play && scienceLab.isConnected()) {
-                    playPauseButton.setImageResource(R.drawable.play);
+                    playPauseButton.setImageResource(R.drawable.circle_play_button);
                     play = false;
                 } else if (!scienceLab.isConnected()) {
-                    playPauseButton.setImageResource(R.drawable.play);
+                    playPauseButton.setImageResource(R.drawable.circle_play_button);
                     play = false;
                 } else {
-                    playPauseButton.setImageResource(R.drawable.pause);
+                    playPauseButton.setImageResource(R.drawable.circle_pause_button);
                     play = true;
                     if (!indefiniteSamplesCheckBox.isChecked()) {
                         counter = Integer.parseInt(samplesEditBox.getText().toString());
@@ -370,11 +381,19 @@ protected void onPostExecute(Void aVoid) {
             samplesEditBox.setText(String.valueOf(counter));
             if (counter == 0 && !runIndefinitely) {
                 play = false;
-                playPauseButton.setImageResource(R.drawable.play);
+                playPauseButton.setImageResource(R.drawable.circle_play_button);
             }
             synchronized (lock) {
                 lock.notify();
             }
         }
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+        }
+        return true;
+    }
 }

app/src/main/java/io/pslab/sensors/SensorMPU6050.java

@@ -4,6 +4,8 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -76,6 +78,14 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.sensor_mpu6050);
 
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setTitle(R.string.mpu6050);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
         sensorDock = (RelativeLayout) findViewById(R.id.sensor_control_dock_layout);
         indefiniteSamplesCheckBox = (CheckBox) findViewById(R.id.checkBox_samples_sensor);
         samplesEditBox = (EditText) findViewById(R.id.editBox_samples_sensors);
@@ -262,13 +272,13 @@ private void setSensorDock() {
             @Override
             public void onClick(View v) {
                 if (play && scienceLab.isConnected()) {
-                    playPauseButton.setImageResource(R.drawable.play);
+                    playPauseButton.setImageResource(R.drawable.circle_play_button);
                     play = false;
                 } else if (!scienceLab.isConnected()) {
-                    playPauseButton.setImageResource(R.drawable.play);
+                    playPauseButton.setImageResource(R.drawable.circle_play_button);
                     play = false;
                 } else {
-                    playPauseButton.setImageResource(R.drawable.pause);
+                    playPauseButton.setImageResource(R.drawable.circle_pause_button);
                     play = true;
                     if (!indefiniteSamplesCheckBox.isChecked()) {
                         counter = Integer.parseInt(samplesEditBox.getText().toString());
@@ -393,11 +403,19 @@ protected void onPostExecute(Void aVoid) {
             samplesEditBox.setText(String.valueOf(counter));
             if (counter == 0 && !runIndefinitely) {
                 play = false;
-                playPauseButton.setImageResource(R.drawable.play);
+                playPauseButton.setImageResource(R.drawable.circle_play_button);
             }
             synchronized (lock) {
                 lock.notify();
             }
         }
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+        }
+        return true;
+    }
 }