Merge pull request #1900 from fossasia/development

Merge dev into master branch

Author: CloudyPadmal

.travis.yml

@@ -4,6 +4,8 @@ sudo: false
 
 jdk: oraclejdk8
 
+dist: trusty
+
 android:
   components:
     - tools
@@ -24,10 +26,12 @@ cache:
 install:
     - echo yes | ${ANDROID_HOME}/tools/bin/sdkmanager "platforms;android-28"
 
+before_script:
+  - bash scripts/prep-key.sh
+
 script:
-  - 'if [ "$TRAVIS_BRANCH" != "apk" ]; then ./gradlew build --stacktrace; fi'
+  - ./gradlew build --stacktrace
 
 after_success:
-  - bash scripts/prep-key.sh
-  - 'if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then bash scripts/upload-apk.sh; fi'
+  - bash scripts/upload-apk.sh
 

app/build.gradle

@@ -1,5 +1,10 @@
 apply plugin: 'com.android.application'
 apply plugin: 'realm-android'
+apply plugin: "com.github.b3er.local.properties"
+
+def KEYSTORE_FILE = rootProject.file('scripts/key.jks')
+def TRAVIS_BUILD = System.getenv("TRAVIS") == "true" && KEYSTORE_FILE.exists()
+def LOCAL_KEY_PRESENT = project.hasProperty('SIGNING_KEY_FILE') && rootProject.file(SIGNING_KEY_FILE).exists()
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
@@ -8,20 +13,43 @@ android {
         applicationId "io.pslab"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 17
-        versionName "2.0.16"
+        versionCode 18
+        versionName "2.0.17"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+
+    signingConfigs {
+        if (TRAVIS_BUILD) {
+            release {
+                storeFile KEYSTORE_FILE
+                storePassword System.getenv("STORE_PASS")
+                keyAlias System.getenv("ALIAS")
+                keyPassword System.getenv("KEY_PASS")
+            }
+        } else if (LOCAL_KEY_PRESENT) {
+            release {
+                storeFile rootProject.file(SIGNING_KEY_FILE)
+                storePassword STORE_PASS
+                keyAlias ALIAS
+                keyPassword KEY_PASS
+            }
+        }
+    }
+
     buildTypes {
         debug {
             versionNameSuffix "Version: "
             resValue "string", "version", "${versionNameSuffix}${defaultConfig.versionName}"
+            resValue "string", "google_maps_key", google_key
         }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             resValue "string", "version", "${defaultConfig.versionName}"
+            resValue "string", "google_maps_key", google_key
+            if (LOCAL_KEY_PRESENT || TRAVIS_BUILD)
+                signingConfig signingConfigs.release
         }
     }
     lintOptions {
@@ -31,6 +59,16 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    flavorDimensions 'default'
+    productFlavors {
+        fdroid {
+            dimension = 'default'
+        }
+        playstore {
+            dimension = 'default'
+        }
+    }
 }
 
 dependencies {
@@ -73,9 +111,10 @@ dependencies {
     annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterKnifeVersion"
 
     // Map libraries
-    implementation "org.osmdroid:osmdroid-android:$rootProject.osmVersion"
-    implementation "org.osmdroid:osmdroid-mapsforge:$rootProject.mapsforgeVersion"
-    implementation "org.osmdroid:osmdroid-geopackage:$rootProject.geoPackageVersion"
+    fdroidImplementation "org.osmdroid:osmdroid-android:$rootProject.osmVersion"
+    fdroidImplementation "org.osmdroid:osmdroid-mapsforge:$rootProject.mapsforgeVersion"
+    fdroidImplementation "org.osmdroid:osmdroid-geopackage:$rootProject.geoPackageVersion"
+    playstoreImplementation "com.google.android.gms:play-services-maps:$rootProject.googleMapsVersion"
 
     implementation "com.android.support:multidex:$rootProject.multiDexVersion"
     implementation "io.realm:android-adapters:$rootProject.realmAdapter"

…java/io/pslab/activity/MapsActivity.java …java/io/pslab/activity/MapsActivity.javaapp/src/main/java/io/pslab/activity/MapsActivity.java renamed to app/src/fdroid/java/io/pslab/activity/MapsActivity.java app/src/main/java/io/pslab/activity/MapsActivity.java renamed to app/src/fdroid/java/io/pslab/activity/MapsActivity.java

@@ -7,17 +7,15 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.osmdroid.api.IMapController;
+import org.osmdroid.config.Configuration;
 import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.MapView;
 import org.osmdroid.views.overlay.Marker;
 
+import io.pslab.BuildConfig;
 import io.pslab.R;
 
-/**
- * Created by Padmal on 11/7/18.
- */
-
 public class MapsActivity extends AppCompatActivity {
 
     MapView map = null;
@@ -28,6 +26,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_maps);
 
+        Configuration.getInstance().setUserAgentValue(BuildConfig.APPLICATION_ID);
         map = findViewById(R.id.osmmap);
         map.setTileSource(TileSourceFactory.MAPNIK);
         map.setBuiltInZoomControls(true);
@@ -76,4 +75,4 @@ protected void onPause() {
         super.onPause();
         map.onPause();
     }
-}
+}

app/src/main/AndroidManifest.xml

@@ -8,26 +8,32 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <uses-feature
         android:name="android.hardware.sensor.light"
         android:required="false" />
     <uses-feature android:name="android.hardware.usb.host" />
 
     <application
-        tools:replace="android:icon"
         android:name=".PSLabApplication"
         android:allowBackup="true"
         android:icon="@drawable/app_icon"
         android:label="@string/app_name"
         android:roundIcon="@drawable/app_icon_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".activity.ThermometerActivity"
+        android:theme="@style/AppTheme"
+        tools:replace="android:icon">
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+        <activity
+            android:name=".activity.ThermometerActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"></activity>
-        <activity android:name=".activity.RoboticArmActivity"
-            android:screenOrientation="landscape"/>
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name=".activity.RoboticArmActivity"
+            android:screenOrientation="landscape" />
         <activity
             android:name=".activity.SplashActivity"
             android:screenOrientation="portrait"
@@ -104,7 +110,6 @@
         <activity android:name=".sensors.SensorSHT21" />
         <activity android:name=".sensors.SensorMPU6050" />
         <activity android:name=".sensors.SensorTSL2561" />
-        <activity android:name=".activity.SensorGraphViewActivity" />
     </application>
 
 </manifest>

app/src/main/java/io/pslab/activity/CompassActivity.java

@@ -2,8 +2,11 @@
 
 import android.content.SharedPreferences;
 import android.support.v4.app.Fragment;
+import android.support.v7.preference.PreferenceManager;
+
 import io.pslab.R;
 import io.pslab.fragment.CompassDataFragment;
+import io.pslab.fragment.CompassSettingsFragment;
 import io.pslab.models.CompassData;
 import io.pslab.models.PSLabSensor;
 import io.pslab.models.SensorDataBlock;
@@ -96,4 +99,18 @@ public void getDataFromDataLogger() {
             getSupportActionBar().setTitle(title);
         }
     }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        reinstateConfigurations();
+    }
+
+    private void reinstateConfigurations() {
+        SharedPreferences compassConfigurations;
+        compassConfigurations = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
+        locationEnabled = compassConfigurations.getBoolean(CompassSettingsFragment.KEY_INCLUDE_LOCATION, true);
+        CompassDataFragment.setParameters(
+                compassConfigurations.getString(CompassSettingsFragment.KEY_COMPASS_SENSOR_TYPE, "0"));
+    }
 }