fix: gas sensor automatic record without sensor #2153
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CloudyPadmal
requested changes
Jan 6, 2021
| @@ -10,6 +10,7 @@ | |||
| import android.support.annotation.Nullable; | |||
| import android.support.design.widget.Snackbar; | |||
| import android.support.v4.app.Fragment; | |||
| import android.util.Log; | |||
| import android.support.v7.app.AppCompatActivity; | ||
| import android.support.v7.widget.Toolbar; | ||
| import android.util.Log; |
app/src/main/res/values/strings.xml
Outdated
| @@ -886,6 +886,9 @@ | |||
| <string name="gas_sensor_description">Air quality sensor for detecting a wide range of gases, including NH3, NOx, alcohol, benzene, smoke and CO2</string> | |||
| <string name="gas_sensor_label">Gas Contents (PPM)</string> | |||
| <string name="gas_sensor_unit">PPM</string> | |||
| <string name="gas_sensor_not_connected">Sensor not Found</string> | |||
There was a problem hiding this comment.
Suggested change
| <string name="gas_sensor_not_connected">Sensor not Found</string> | |
| <string name="gas_sensor_not_connected">Sensor not found</string> |
app/src/main/res/values/strings.xml
Outdated
| @@ -886,6 +886,9 @@ | |||
| <string name="gas_sensor_description">Air quality sensor for detecting a wide range of gases, including NH3, NOx, alcohol, benzene, smoke and CO2</string> | |||
| <string name="gas_sensor_label">Gas Contents (PPM)</string> | |||
| <string name="gas_sensor_unit">PPM</string> | |||
| <string name="gas_sensor_not_connected">Sensor not Found</string> | |||
| <string name="gas_sensor_not_connected_description">Please connect a device or choose an phone sensor (if available)</string> | |||
There was a problem hiding this comment.
Use existing device not connected message instead of this
Comment on lines
347
to
374
| else | ||
| { | ||
| try { | ||
| CustomSnackBar.showSnackBar(sensorParentView, NOT_CONNECTED, null, null, Snackbar.LENGTH_LONG); | ||
|
|
||
| AlertDialog.Builder builder1 = new AlertDialog.Builder(this); | ||
| builder1.setTitle(R.string.gas_sensor_not_connected); | ||
| builder1.setMessage(R.string.gas_sensor_not_connected_description); | ||
| builder1.setCancelable(true); | ||
|
|
||
| builder1.setPositiveButton( | ||
| R.string.gas_sensor_configure_button, | ||
| new DialogInterface.OnClickListener() { | ||
| public void onClick(DialogInterface dialog, int id) { | ||
| dialog.cancel(); | ||
| } | ||
| }); | ||
|
|
||
| builder1.setNegativeButton( | ||
| R.string.cancel, | ||
| new DialogInterface.OnClickListener() { | ||
| public void onClick(DialogInterface dialog, int id) { | ||
| dialog.cancel(); | ||
| } | ||
| }); | ||
| builder1.setIcon(android.R.drawable.ic_dialog_alert); | ||
| AlertDialog alert11 = builder1.create(); | ||
| alert11.show(); |
There was a problem hiding this comment.
No need of many dialog boxes
There was a problem hiding this comment.
ok, sure I will resolve these issues very soon. Thanks.
|
All changes are done, Please review this |
CloudyPadmal
requested changes
Jan 11, 2021
Comment on lines
345
to
356
| } | ||
| else | ||
| { | ||
| try { | ||
| CustomSnackBar.showSnackBar(sensorParentView, NOT_CONNECTED, null, null, Snackbar.LENGTH_LONG); | ||
|
|
||
| }catch (IllegalStateException e) | ||
| { | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
Reformat this file using Android Studio
|
Spaces and indentation perfected |
CloudyPadmal
requested changes
Apr 1, 2021
CloudyPadmal
changed the title
CloudyPadmal
added
the
Status: Abandoned
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2093
Changes: Changes are made in PSLabSensor.java at onOptionsItemSelected(MenuItem item) function a check is added for gas sensor. (If a gas sensor is connected, only then a recording of data will start)
Screenshot/s for the changes:
https://user-images.githubusercontent.com/62503399/103482147-193a8280-4e05-11eb-829d-38a307c52344.mp4
https://user-images.githubusercontent.com/62503399/103482149-1a6baf80-4e05-11eb-9afc-de0b85f6525b.mp4
https://user-images.githubusercontent.com/62503399/103482150-1b044600-4e05-11eb-9a74-d8601a9d366f.mp4
Checklist:
strings.xml,dimens.xmlandcolors.xmlwithout hard-coding themstrings.xml,dimens.xmlorcolors.xmlAPK for testing:
app-fdroid-debug.zip