Release 3.2.0 beta 4

.travis.yml

@@ -10,7 +10,7 @@ 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 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/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"/>
 
@@ -148,6 +150,8 @@
             android:theme="@style/CustomActionBarTheme.Transparent"
             android:launchMode="singleTask"/>
 
+        <service android:name=".AppService" />
+
     </application>
 
 </manifest>

Android/build.gradle

@@ -1,4 +1,6 @@
 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'
 
@@ -8,16 +10,15 @@ dependencies {
     compile 'com.google.android.gms:play-services-analytics:7.8.0'
 
     compile 'com.sothree.slidinguppanel:library:2.0.2'
-    compile 'com.github.traex.rippleeffect:library:1.3'
 
-    compile 'com.android.support:support-v4:22.2.1'
-    compile 'com.android.support:appcompat-v7:22.2.1'
-    compile 'com.android.support:cardview-v7:22.2.1'
-    compile 'com.android.support:recyclerview-v7:22.2.1'
-    compile 'com.android.support:design:22.2.1'
+    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'
 
     //DroneKit-Android client library.
-    compile 'com.o3dr.android:dronekit-android:2.5.24'
+    compile 'com.o3dr.android:dronekit-android:2.6.6'
 
     compile 'me.grantland:autofittextview:0.2.1'
     compile(name:'shimmer-android-release', ext:'aar')
@@ -45,10 +46,18 @@ dependencies {
 def versionMajor = 3
 def versionMinor = 2
 def versionPatch = 0
-def versionBuild = 3 //bump for dogfood builds, public betas, etc.
+def versionBuild = 4 //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
+    compileSdkVersion 23
     buildToolsVersion "22.0.1"
 
     defaultConfig {
@@ -57,6 +66,10 @@ android {
         targetSdkVersion 22
         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 {
@@ -122,17 +135,23 @@ android {
             applicationIdSuffix ".beta"
             versionNameSuffix ".beta.${versionBuild}"
             resValue "string", "app_title", "Tower Beta"
+            debuggable true
+            buildConfigField "boolean", "ENABLE_CRASHLYTICS", "true"
         }
 
         beta {
             signingConfig signingConfigs.release
             versionNameSuffix ".beta.${versionBuild}"
             resValue "string", "app_title", "Tower"
+            buildConfigField "boolean", "WRITE_LOG_FILE", "false"
+            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/drawable/ic_camera_drawable.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_camera_alt_blue" android:state_pressed="true" />
+    <item android:drawable="@drawable/ic_camera_alt_black_36dp" />
+
+</selector>

Android/res/drawable/on_off_videocam.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_videocam_alt_blue" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_videocam_alt_blue" android:state_activated="true"/>
+    <item android:drawable="@drawable/ic_videocam_black_36dp" />
+
+</selector>

Android/res/drawable/touch_circle.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+            android:shape="oval">
+            <size
+            android:width="60dp"
+            android:height="60dp" />
+            <stroke
+                android:width="3dp"
+                android:color="#aa000000" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="#aaffffff" />
+            <size
+                android:width="60dp"
+                android:height="60dp" />
+        </shape>
+    </item>
+</layer-list>

Android/res/layout-land/fragment_vibration_viewer.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="3dp"
+        android:layout_weight="2">
+
+        <TableLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:stretchColumns="*"
+            android:padding="5dp">
+
+            <TableRow>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:layout_span="2"
+                    android:gravity="center"
+                    android:text="@string/label_clipping"
+                    android:textStyle="bold" />
+            </TableRow>
+
+            <TableRow>
+
+                <TextView android:text="@string/label_primary" />
+
+                <TextView
+                    android:id="@+id/primary_clipping_value"
+                    tools:background="@android:color/holo_red_light"
+                    android:gravity="center"
+                    android:text="@string/empty_content"
+                    tools:text="200" />
+            </TableRow>
+
+            <TableRow>
+
+                <TextView android:text="@string/label_secondary" />
+
+                <TextView
+                    android:id="@+id/secondary_clipping_value"
+                    tools:background="@android:color/holo_green_light"
+                    android:gravity="center"
+                    android:text="@string/empty_content"
+                    tools:text="0" />
+            </TableRow>
+
+            <TableRow>
+
+                <TextView android:text="@string/label_tertiary" />
+
+                <TextView
+                    android:id="@+id/tertiary_clipping_value"
+                    tools:background="@android:color/holo_green_light"
+                    android:gravity="center"
+                    android:text="@string/empty_content"
+                    tools:text="200" />
+            </TableRow>
+
+        </TableLayout>
+    </android.support.v7.widget.CardView>
+
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="3dp"
+        android:layout_marginLeft="3dp"
+        android:layout_marginStart="3dp"
+        android:layout_marginRight="3dp"
+        android:layout_marginEnd="3dp"
+        android:layout_weight="1">
+
+        <lecho.lib.hellocharts.view.ColumnChartView
+            android:id="@+id/column_chart"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </android.support.v7.widget.CardView>
+
+</LinearLayout>