Added play/pause functionality

Author: Avjeet

app/src/main/java/org/fossasia/pslab/activity/LuxMeterActivity.java

@@ -78,6 +78,7 @@ public class LuxMeterActivity extends AppCompatActivity {
     public GPSLogger gpsLogger;
     private boolean checkGpsOnResume = false;
     public boolean locationPref;
+    private LuxMeterFragmentData selectedFragment;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -115,7 +116,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
                 });
         try {
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-            Fragment selectedFragment = LuxMeterFragmentData.newInstance();
+            selectedFragment = LuxMeterFragmentData.newInstance();
             transaction.replace(R.id.frame_layout_lux_meter, selectedFragment, selectedFragment.getTag());
             transaction.commit();
         } catch (Exception e) {
@@ -196,6 +197,13 @@ public boolean onCreateOptionsMenu(Menu menu) {
         return true;
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        MenuItem item = menu.findItem(R.id.save_csv_data);
+        item.setIcon(saveData? R.drawable.ic_pause_white_24dp: R.drawable.ic_play_arrow_white_24dp);
+        return super.onPrepareOptionsMenu(menu);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
@@ -208,8 +216,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     return true;
                 }
                 if (saveData) {
+                    ((LuxMeterFragmentData)selectedFragment).stopSensorFetching();
+                    invalidateOptionsMenu();
                     saveData = false;
                 } else {
+                    ((LuxMeterFragmentData)selectedFragment).startSensorFetching();
+                   invalidateOptionsMenu();
                     if (locationPref) {
                         gpsLogger = new GPSLogger(this, (LocationManager) getSystemService(Context.LOCATION_SERVICE));
                         if (gpsLogger.isGPSEnabled()) {

app/src/main/java/org/fossasia/pslab/fragment/LuxMeterFragmentData.java

@@ -12,6 +12,7 @@
 import android.os.Bundle;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -83,6 +84,9 @@ public class LuxMeterFragmentData extends Fragment {
     private boolean logged = false, writeHeader = false;
     private long previousTimeElapsed = (System.currentTimeMillis() - startTime) / 1000;
     private GPSLogger gpsLogger;
+    private Thread dataThread;
+    private Runnable runnable;
+    private long previousRunTime = 0;
 
     public static LuxMeterFragmentData newInstance() {
         return new LuxMeterFragmentData();
@@ -99,6 +103,7 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setRetainInstance(true);
         currentMin = 10000;
+        currentMax = 30;
         entries = new ArrayList<>();
         switch (sensorType) {
             case 0:
@@ -136,7 +141,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_lux_meter_data, container, false);
         unbinder = ButterKnife.bind(this, view);
-        Runnable runnable = new Runnable() {
+        runnable = new Runnable() {
             @Override
             public void run() {
                 if (flag == 0) {
@@ -190,8 +195,6 @@ public void run() {
                 }
             }
         };
-        Thread dataThread = new Thread(runnable);
-        dataThread.start();
 
         lightMeter.setMaxSpeed(10000);
 
@@ -304,7 +307,7 @@ private void visualizeData() {
                 else
                     lightMeter.setPointerColor(Color.WHITE);
 
-                timeElapsed = (System.currentTimeMillis() - startTime) / 1000;
+                timeElapsed = ((System.currentTimeMillis() - startTime) / 1000) + previousRunTime;
                 if (timeElapsed != previousTimeElapsed) {
                     previousTimeElapsed = timeElapsed;
                     entries.add(new Entry((float) timeElapsed, data));
@@ -371,7 +374,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
 
                     mChart.setData(data);
                     mChart.notifyDataSetChanged();
-                    mChart.setVisibleXRangeMaximum(20);
+                    mChart.setVisibleXRangeMaximum(80);
                     mChart.moveViewToX(data.getEntryCount());
                     mChart.invalidate();
                 }
@@ -387,4 +390,25 @@ private void unRegisterListener() {
             sensorManager.unregisterListener(this);
         }
     }
+
+    public void startSensorFetching() {
+        monitor = true;
+        flag = 0;
+        lightMeter.setWithTremble(true);
+        dataThread = new Thread(runnable);
+        dataThread.start();
+    }
+
+    public void stopSensorFetching() {
+        monitor = false;
+        if (sensor != null && sensorDataFetch != null) {
+            sensorManager.unregisterListener(sensorDataFetch);
+            sensorDataFetch.cancel(true);
+            lightMeter.setWithTremble(false);
+            lightMeter.speedTo(0f, 500);
+            lightMeter.setPointerColor(ContextCompat.getColor(getActivity(), R.color.white));
+        }
+        previousRunTime = previousTimeElapsed;
+    }
+
 }

app/src/main/res/drawable/ic_pause_white_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#F9FBFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>

app/src/main/res/drawable/ic_play_arrow_black_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#F9FBFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M8,5v14l11,-7z"/>
+</vector>

app/src/main/res/drawable/ic_play_arrow_white_24dp.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="#FFFFFF"/>
-    <stroke android:width="3dip" android:color="#B1BCBE" />
+    <stroke android:width="1dip" android:color="@color/colorPrimary" />
     <corners android:radius="10dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>

app/src/main/res/drawable/rounded_custom_border.xml

@@ -176,7 +176,7 @@
                         android:layout_marginLeft="@dimen/card_margin"
                         android:layout_marginRight="@dimen/card_margin"
                         android:layout_weight="@dimen/weight_1"
-                        android:background="@drawable/rounded_custom_border"
+                        android:background="@drawable/control_edittext"
                         android:gravity="center_vertical"
                         android:textAlignment="center"
                         android:textColor="@color/black"
@@ -190,7 +190,7 @@
                         android:layout_marginLeft="@dimen/card_margin"
                         android:layout_marginRight="@dimen/card_margin"
                         android:layout_weight="@dimen/weight_1"
-                        android:background="@drawable/rounded_custom_border"
+                        android:background="@drawable/control_edittext"
                         android:gravity="center_vertical"
                         android:textAlignment="center"
                         android:textColor="@color/black"
@@ -204,7 +204,7 @@
                         android:layout_marginLeft="@dimen/card_margin"
                         android:layout_marginRight="@dimen/card_margin"
                         android:layout_weight="@dimen/weight_1"
-                        android:background="@drawable/rounded_custom_border"
+                        android:background="@drawable/control_edittext"
                         android:gravity="center_vertical"
                         android:textAlignment="center"
                         android:textColor="@color/black"

app/src/main/res/layout/fragment_lux_meter_data.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/save_csv_data"
-        android:icon="@drawable/menu_icon_save"
+        android:icon="@drawable/ic_play_arrow_white_24dp"
         android:title="@string/save_csv_data"
         app:showAsAction="ifRoom" />
     <item