Merge pull request #1258 from fossasia/development

chore: merge dev into master (v1.1.14)

Author: CloudyPadmal

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.fossasia.pslab"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 15
-        versionName "1.1.13"
+        versionCode 16
+        versionName "1.1.14"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -28,6 +28,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
+    implementation "com.android.support:support-v13:$rootProject.supportLibraryVersion"
     implementation "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
     implementation "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion"
     implementation "com.android.support:design:$rootProject.supportLibraryVersion"

app/src/main/AndroidManifest.xml

@@ -11,7 +11,6 @@
     <uses-feature
         android:name="android.hardware.sensor.light"
         android:required="true" />
-
     <uses-feature android:name="android.hardware.usb.host" />
 
     <application
@@ -26,13 +25,11 @@
             android:name=".activity.SplashActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppThemeSplash">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
         </activity>
         <activity
             android:name=".activity.MainActivity"
@@ -46,6 +43,9 @@
                 android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
                 android:resource="@xml/device_filter" />
         </activity>
+
+        <activity android:name=".activity.SettingsActivity"/>
+
         <activity android:name=".activity.ShowLoggedData" />
         <activity
             android:name=".activity.PerformExperimentActivity"
@@ -61,25 +61,26 @@
         <activity
             android:name=".activity.LogicalAnalyzerActivity"
             android:configChanges="screenSize|orientation"
-            android:screenOrientation="landscape"/>
+            android:screenOrientation="landscape" />
         <activity android:name=".activity.SensorDataLoggerActivity" />
-
-        <activity android:name=".activity.MultimeterActivity"
-            android:screenOrientation="portrait"/>
-
         <activity
-            android:name=".activity.PowerSourceActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize"
+            android:name=".activity.MultimeterActivity"
             android:screenOrientation="portrait" />
-
-        <activity android:name=".activity.WaveGeneratorActivity"
-            android:screenOrientation="userLandscape"/>
-
+        <activity
+            android:name=".activity.PowerSourceActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
+        <activity
+            android:name=".activity.WaveGeneratorActivity"
+            android:screenOrientation="userLandscape" />
         <activity
             android:name=".activity.LuxMeterActivity"
             android:configChanges="orientation|screenSize|keyboardHidden" />
+        <activity android:name=".activity.AccelerometerActivity" />
 
-        <activity android:name=".activity.AccelerometerActivity"/>
+        <activity
+            android:name=".activity.Barometer_activity"
+            android:configChanges="keyboardHidden|screenSize|orientation"/>
 
         <activity android:name=".activity.MapsActivity" />
 

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

@@ -1,5 +1,6 @@
 package org.fossasia.pslab.activity;
 
+import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
@@ -14,6 +15,7 @@ public class AccelerometerActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_accelerometer);
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         AccelerometerAdapter adapter = new AccelerometerAdapter(new String[]{"X axis", "Y axis", "Z axis"}, getApplicationContext());
 
         RecyclerView recyclerView = this.findViewById(R.id.accelerometer_recycler_view);