Merge pull request #1730 from fossasia/development

chore: merge dev branch to master
fossasia · May 17, 2019 · 20efd5c · 20efd5c
2 parents 82d4d7c + db6b4c7
commit 20efd5c
Show file tree

Hide file tree

Showing 107 changed files with 4,466 additions and 2,273 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![Build Status](https://travis-ci.org/fossasia/pslab-android.svg?branch=development)](https://travis-ci.org/fossasia/pslab-android)
 [![Gitter](https://badges.gitter.im/fossasia/pslab.svg)](https://gitter.im/fossasia/pslab?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/dd728d91bb5743ff916c16c1251f8dd5)](https://www.codacy.com/app/praveenkumar103/pslab-android?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=fossasia/pslab-android&amp;utm_campaign=Badge_Grade)
-[![Mailing List](https://img.shields.io/badge/Mailing%20List-FOSSASIA-blue.svg)](mailto:pslab-fossasia@googlegroups.com)
+[![Mailing List](https://img.shields.io/badge/Mailing%20List-FOSSASIA-blue.svg)](https://groups.google.com/forum/#!forum/pslab-fossasia)
 [![Twitter Follow](https://img.shields.io/twitter/follow/pslabio.svg?style=social&label=Follow&maxAge=2592000?style=flat-square)](https://twitter.com/pslabio)
 
 This repository holds the Android App for performing experiments with [PSLab](https://pslab.io/). PSLab is a tiny pocket science lab that provides an array of equipment for doing science and engineering experiments. It can function like an oscilloscope, waveform generator, frequency counter, programmable voltage and current source and also as a data logger. Our website is at https://pslab.io
@@ -41,7 +41,7 @@ Please join us on the following channels:
   <table>
     <tr>
      <td><img src="/docs/images/view_about_us.png"></td>
-     <td><img src="/docs/images/view_navigation_drawer.png"></td>
+     <td><img src="/docs/images/view_not_connected_nav_menu.png" width = "500"></td>
      <td><img src="/docs/images/view_pin_layout_front.png"></td>
      <td><img src="/docs/images/view_pin_layout_back.png"></td>
     </tr>
@@ -72,6 +72,12 @@ Please join us on the following channels:
      <td><img src="/docs/images/view_data_logger.png"></td>
     </tr>
   </table>
+  <table>
+    <tr>
+     <td><img src="/docs/images/instrument_accelerometer_view.png" width = "500"></td>
+     <td><img src="/docs/images/instrument_compass_view.png" width = "500"></td>
+    </tr>
+  </table>
 
 ## Video Demo
 - [PSLab Android App Overview](https://www.youtube.com/watch?v=JJfsF0b8M8k)
@@ -90,12 +96,14 @@ Please join us on the following channels:
 |  Wave Generator  | Generates arbitrary analog and digital waveforms      | 		 ✓       |
 |   Power Source   | Generates programmable voltage and currents	       | 		 ✓       |
 |    Lux Meter     | Measures the ambient light intensity                  | 		 ✓       |
-
-
+|    Baro Meter     | Measures the Pressure                  | 		 ✓       |
+|    AcceleroMeter     | Measures the acceleration of the device                  | 		 ✓       |
+|     Gyro Meter     | Measures the rate of rotation                  | 		 ✓       |
+|    Compass     | Measures the absolute rotation relative to earth magnetic poles                  | 		 ✓       |
 ## How to set up the Android app in your development environment
 
   Minimum Android version 4.1 (API Level 16)
-  
+
   Maximum Android version 8.1 (API Level 27)
 
 ### Development Setup

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "io.pslab"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 12
-        versionName "2.0.11"
+        versionCode 13
+        versionName "2.0.12"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -67,6 +67,7 @@ dependencies {
     implementation "com.squareup.picasso:picasso:$rootProject.picassoVersion"
 
     implementation "com.jakewharton:butterknife:$rootProject.butterKnifeVersion"
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterKnifeVersion"
 
     // Map libraries

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -71,15 +71,20 @@
         <activity
             android:name=".activity.WaveGeneratorActivity"
             android:screenOrientation="userLandscape" />
-        <activity android:name=".activity.AccelerometerActivity" />
+        <activity android:name=".activity.AccelerometerActivity"
+            android:screenOrientation="portrait"/>
         <activity android:name=".activity.DataLoggerActivity" />
         <activity
             android:name=".activity.BarometerActivity"
             android:configChanges="keyboardHidden|screenSize|orientation"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".activity.CompassActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.GyroscopeActivity"
+            android:screenOrientation="portrait" />
+
         <activity android:name=".activity.MapsActivity" />
 
         <receiver android:name=".receivers.USBDetachReceiver" />