From b1fa689fcf747e61578ed78283529315af6e9b9c Mon Sep 17 00:00:00 2001
From: Abhinav  Raj <abhinav.23.april@gmail.com>
Date: Sun, 12 Aug 2018 10:59:47 +0530
Subject: [PATCH] Created alert-box and changed file-name for barometer

---
 app/src/main/AndroidManifest.xml              |  2 +-
 ...r_activity.java => BarometerActivity.java} | 37 +++++++++++++++----
 .../pslab/fragment/InstrumentsFragment.java   |  4 +-
 app/src/main/res/values/strings.xml           |  2 +
 4 files changed, 34 insertions(+), 11 deletions(-)
 rename app/src/main/java/io/pslab/activity/{Barometer_activity.java => BarometerActivity.java} (90%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7369108fc..f5ed6fd9a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,7 +77,7 @@
         <activity android:name=".activity.AccelerometerActivity" />
         <activity android:name=".activity.DataLoggerActivity" />
         <activity
-            android:name=".activity.Barometer_activity"
+            android:name=".activity.BarometerActivity"
             android:configChanges="keyboardHidden|screenSize|orientation" />
         <activity
             android:name=".activity.CompassActivity"
diff --git a/app/src/main/java/io/pslab/activity/Barometer_activity.java b/app/src/main/java/io/pslab/activity/BarometerActivity.java
similarity index 90%
rename from app/src/main/java/io/pslab/activity/Barometer_activity.java
rename to app/src/main/java/io/pslab/activity/BarometerActivity.java
index 1f1ec31d2..1655fb4ca 100644
--- a/app/src/main/java/io/pslab/activity/Barometer_activity.java
+++ b/app/src/main/java/io/pslab/activity/BarometerActivity.java
@@ -1,6 +1,7 @@
 package io.pslab.activity;
 
 import android.annotation.SuppressLint;
+import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.hardware.Sensor;
@@ -11,6 +12,7 @@
 import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.design.widget.BottomSheetBehavior;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.GestureDetector;
@@ -47,7 +49,7 @@
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
 
-public class Barometer_activity extends AppCompatActivity {
+public class BarometerActivity extends AppCompatActivity {
     BottomSheetBehavior bottomSheetBehavior;
     GestureDetector gestureDetector;
     private static final String PREF_NAME = "customDialogPreference";
@@ -55,7 +57,7 @@ public class Barometer_activity extends AppCompatActivity {
     private static int sensorType = 0;
     private static int highLimit = 1000;
     private static int updatePeriod = 100;
-    private Barometer_activity.SensorDataFetch sensorDataFetch;
+    private BarometerActivity.SensorDataFetch sensorDataFetch;
 
     @BindView(R.id.barometer_max)
     TextView statMax;
@@ -101,8 +103,8 @@ public class Barometer_activity extends AppCompatActivity {
     @BindView(R.id.custom_dialog_desc)
     TextView bottomSheetDesc;
 
-    public static Barometer_activity newInstance() {
-        return new Barometer_activity();
+    public static BarometerActivity newInstance() {
+        return new BarometerActivity();
     }
 
     @SuppressLint("ResourceType")
@@ -112,7 +114,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_barometer_main);
         ButterKnife.bind(this);
         setUpBottomSheet();
-        Barometer_activity.newInstance();
+        BarometerActivity.newInstance();
 
         currentMin = 10000;
         entries = new ArrayList<>();
@@ -120,6 +122,25 @@ protected void onCreate(Bundle savedInstanceState) {
             case 0:
                 sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
                 sensor = sensorManager != null ? sensorManager.getDefaultSensor(Sensor.TYPE_PRESSURE) : null;
+                if (sensor == null) {
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (!isFinishing()) {
+                                new AlertDialog.Builder(BarometerActivity.this)
+                                        .setTitle(R.string.barometer_alert_title)
+                                        .setMessage(R.string.barometer_alert_description)
+                                        .setCancelable(false)
+                                        .setPositiveButton("ok", new DialogInterface.OnClickListener() {
+                                            @Override
+                                            public void onClick(DialogInterface dialog, int which) {
+                                                dialog.dismiss();
+                                            }
+                                        }).show();
+                            }
+                        }
+                    });
+                }
                 break;
             case 1:
                 scienceLab = ScienceLabCommon.scienceLab;
@@ -228,9 +249,9 @@ public void run() {
     }
 
     public static void setParameters(int sensorType, int highLimit, int updatePeriod) {
-        Barometer_activity.sensorType = sensorType;
-        Barometer_activity.highLimit = highLimit;
-        Barometer_activity.updatePeriod = updatePeriod;
+        BarometerActivity.sensorType = sensorType;
+        BarometerActivity.highLimit = highLimit;
+        BarometerActivity.updatePeriod = updatePeriod;
     }
 
 
diff --git a/app/src/main/java/io/pslab/fragment/InstrumentsFragment.java b/app/src/main/java/io/pslab/fragment/InstrumentsFragment.java
index bb10d935b..6e0b5e6b0 100644
--- a/app/src/main/java/io/pslab/fragment/InstrumentsFragment.java
+++ b/app/src/main/java/io/pslab/fragment/InstrumentsFragment.java
@@ -26,7 +26,7 @@
 import io.pslab.activity.WaveGeneratorActivity;
 import io.pslab.adapters.ApplicationAdapter;
 import io.pslab.items.ApplicationItem;
-import io.pslab.activity.Barometer_activity;
+import io.pslab.activity.BarometerActivity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -93,7 +93,7 @@ public void onItemClick(ApplicationItem item) {
                                 startActivity(intent);
                                 break;
                             case "Barometer":
-                                intent = new Intent(context, Barometer_activity.class);
+                                intent = new Intent(context, BarometerActivity.class);
                                 startActivity(intent);
                                 break;
                             case "Compass":
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7f35acab6..f067b392e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -896,6 +896,8 @@
     GND. You can use any of the PSLab device GND pins.\n</string>
 
     <string name="barometer">Barometer</string>
+    <string name="barometer_alert_title">No barometer sensor in device</string>
+    <string name="barometer_alert_description">Connect a BMP180 sensor using I2C pins on PSLab to use this instrument</string>
     <string name="barometer_description">Measures the atmospheric pressure</string>
     <string name="barometer_intro">\u2022 The Barometer can be used to measure Atmospheric pressure. This instrument
     is compatible with either the built in pressure sensor on any android device or the BMP-180 pressure sensor.\n\n