Merge pull request #1566 from DroidPlanner/release-3.2.0

Release 3.2.0

.travis.yml

@@ -9,8 +9,8 @@ android:
 
 before_script:
     - echo yes | android update sdk -u -a -t tools
-    - echo yes | android update sdk -u -a -t build-tools-22.0.1
-    - echo yes | android update sdk -u -a -t android-22,android-21,android-20
+    - echo yes | android update sdk -u -a -t build-tools-23.0.1,build-tools-22.0.1
+    - echo yes | android update sdk -u -a -t android-23,android-22,android-21,android-20
     - echo yes | android update sdk -u -a -t extra-google-m2repository
     - echo yes | android update sdk -u -a -t extra-android-m2repository
     - echo yes | android update sdk -u -a -t extra-android-support,extra-google-google_play_services

Android/.gitignore

@@ -30,6 +30,9 @@ proguard/
 *.iws
 .idea/
 
+# Fabric project files
+fabric.properties
+
 *.pydevproject
 #.project
 .metadata

Android/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.droidplanner.android">
+    package="org.droidplanner.android"
+    android:installLocation="auto">
 
     <supports-screens
         android:requiresSmallestWidthDp="320"/>
@@ -14,6 +15,7 @@
     <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.CHANGE_NETWORK_STATE" />
 
     <uses-feature android:name="android.hardware.screen.portrait"/>
 
@@ -59,6 +61,10 @@
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version"/>
 
+        <meta-data
+            android:name="io.fabric.ApiKey"
+            android:value="5ee4471ba6e8cd8858006c8166469bba33d64b2f" />
+
         <activity
             android:name=".activities.AccountActivity"
             android:launchMode="singleTop"
@@ -119,6 +125,17 @@
             android:launchMode="singleTop"
             android:theme="@style/CustomActionBarTheme.Transparent"/>
 
+        <activity
+            android:name=".activities.WidgetActivity"
+            android:launchMode="singleTop"
+            android:parentActivityName=".activities.FlightActivity"
+            >
+            <!-- Parent activity meta-data to support API level 7+ -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".activities.FlightActivity"/>
+        </activity>
+
         <activity
             android:name=".activities.helpers.BluetoothDevicesActivity"
             android:noHistory="true"
@@ -133,6 +150,8 @@
             android:theme="@style/CustomActionBarTheme.Transparent"
             android:launchMode="singleTask"/>
 
+        <service android:name=".AppService" />
+
     </application>
 
 </manifest>

Android/build.gradle

@@ -1,19 +1,24 @@
 apply plugin: 'com.android.application'
+// This does not break the build when Android Studio is missing the JRebel for Android plugin.
+apply plugin: 'com.zeroturnaround.jrebel.android'
+apply plugin: 'io.fabric'
 apply plugin: 'kotlin-android'
 
 dependencies {
-    compile 'com.google.android.gms:play-services-maps:7.3.0'
-    compile 'com.google.android.gms:play-services-location:7.3.0'
-    compile 'com.google.android.gms:play-services-analytics:7.3.0'
+    compile 'com.google.android.gms:play-services-maps:7.8.0'
+    compile 'com.google.android.gms:play-services-location:7.8.0'
+    compile 'com.google.android.gms:play-services-analytics:7.8.0'
 
     compile 'com.sothree.slidinguppanel:library:2.0.2'
 
-    compile 'com.android.support:support-v4:22.1.1'
-    compile 'com.android.support:appcompat-v7:22.1.1'
-    compile 'com.android.support:cardview-v7:22.1.0'
-    compile 'com.android.support:recyclerview-v7:22.1.0'
+    compile 'com.android.support:support-v4:23.0.1'
+    compile 'com.android.support:appcompat-v7:23.0.1'
+    compile 'com.android.support:cardview-v7:23.0.1'
+    compile 'com.android.support:recyclerview-v7:23.0.1'
+    compile 'com.android.support:design:23.0.1'
 
-    compile 'com.o3dr.android:dronekit-android:2.3.34'
+    //DroneKit-Android client library.
+    compile 'com.o3dr.android:dronekit-android:2.6.6'
 
     compile 'me.grantland:autofittextview:0.2.1'
     compile(name:'shimmer-android-release', ext:'aar')
@@ -22,25 +27,49 @@ dependencies {
     compile files('libs/j2xx.jar')
     compile files('libs/protobuf-java-2.5.0.jar')
     compile files('libs/jeromq-0.3.4.jar')
-    compile files('libs/sius-0.3.2-SNAPSHOT.jar')
+    compile files('libs/sius-0.3.0-SNAPSHOT.jar')
 
     compile 'com.squareup.okhttp:okhttp:2.3.0'
     compile 'com.squareup.okhttp:okhttp-urlconnection:2.3.0'
 
     compile 'com.jakewharton.timber:timber:3.1.0'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile('com.crashlytics.sdk.android:crashlytics:2.5.0@aar') {
+        transitive = true;
+    }
+
+    //Charts and graph library
+    compile 'com.github.lecho:hellocharts-library:1.5.5@aar'
 }
 
+//Decomposed version name and code (https://plus.google.com/+JakeWharton/posts/6f5TcVPRZij)
+def versionMajor = 3
+def versionMinor = 2
+def versionPatch = 0
+def versionBuild = 7 //bump for dogfood builds, public betas, etc.
+
+//Logging levels
+def logLevelVerbose = 2;
+def logLevelDebug = 3;
+def logLevelInfo = 4;
+def logLevelWarn = 5;
+def logLevelError = 6;
+def logLevelAssert = 7;
+
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId 'org.droidplanner.android'
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 30106
-        versionName getGitVersion()
+        versionCode versionMajor * 100000 + versionMinor * 1000 + versionPatch * 100 + versionBuild
+        versionName "Tower-v${versionMajor}.${versionMinor}.${versionPatch}"
+
+        buildConfigField "boolean", "WRITE_LOG_FILE", "true"
+        buildConfigField "int", "LOG_FILE_LEVEL", "$logLevelDebug"
+        buildConfigField "boolean", "ENABLE_CRASHLYTICS", "false"
     }
 
     compileOptions {
@@ -59,11 +88,6 @@ android {
             assets.srcDirs = ['assets']
         }
 
-        // Move the tests to tests/java, tests/res, etc...
-        androidTest {
-            java.srcDirs = ['test']
-        }
-
         // Move the build types to build-types/<type>
         // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
         // This moves them out of them default location under src/<type>/... which would
@@ -102,11 +126,23 @@ android {
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
-            versionNameSuffix ".debug"
+            versionNameSuffix ".debug.${versionBuild}"
+            resValue "string", "app_title", "Tower Dev"
+        }
+
+        beta {
+            signingConfig signingConfigs.release
+            applicationIdSuffix ".beta"
+            versionNameSuffix ".beta.${versionBuild}"
+            resValue "string", "app_title", "Tower Beta"
+            buildConfigField "boolean", "ENABLE_CRASHLYTICS", "true"
         }
 
         release {
             signingConfig signingConfigs.release
+            resValue "string", "app_title", "Tower"
+            buildConfigField "boolean", "WRITE_LOG_FILE", "false"
+            buildConfigField "boolean", "ENABLE_CRASHLYTICS", "true"
         }
     }
 }

Android/res/color/flight_action_row_bg_selector.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+        <item android:color="@android:color/holo_blue_light" android:state_pressed="true" />
+        <item android:color="@android:color/holo_blue_light" android:state_focused="true" />
+        <item android:color="@android:color/holo_blue_light" android:state_selected="true" />
+        <item android:color="@android:color/holo_blue_light" android:state_hovered="true" />
+        <item android:color="@android:color/holo_blue_light" android:state_activated="true" />
+        <item android:color="@android:color/white" />
+</selector>