Skip to content

Adding Bottomsheet guide to the barometer #1339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2018
Merged

Adding Bottomsheet guide to the barometer #1339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion app/src/main/java/io/pslab/activity/Barometer_activity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,9 @@ private void setUpBottomSheet() {
Boolean isFirstTime = settings.getBoolean("BarometerFirstTime", true);

bottomSheetGuideTitle.setText(R.string.barometer);
bottomSheetDesc.setText(R.string.barometer_description);
bottomSheetDesc.setText(R.string.barometer_intro);
bottomSheetSchematic.setImageResource(R.drawable.bmp180_schematic);
bottomSheetDesc.setText(R.string.barometer_desc);

if (isFirstTime) {
bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
Expand Down
Binary file added app/src/main/res/drawable/bmp180_schematic.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,8 +895,14 @@
<string name="ir_thermometer_desc">\u2022 The above pin configuration has to be same except for the pin
GND. You can use any of the PSLab device GND pins.\n</string>

<string name="barometer_description">Measures the pressure of the atmosphere</string>
<string name="barometer">Barometer</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
\u2022 If you want to use the sensor BMP-180, connect the sensor to PSLab device as shown in the figure.</string>
<string name="barometer_desc">\u2022 The above pin configuration has to be same except for the pin
GND. GND is meant for Ground and any of the PSLab device GND pins can be used since they are common.\n\n
\u2022 Select the sensor by going to the <b>Configure</b> tab from the bottom navigation bar and choose BMP-180 in the drop down menu under <b>Select Sensor</b>.</string>

<string name="navigation_lux_meter_data">Data Plot</string>
<string name="navigation_lux_meter_configure">Configure</string>
Expand Down