DroidPlanner · m4gr3d · Aug 8, 2016 · Jun 12, 2016 · Jun 12, 2016 · Jun 14, 2016
diff --git a/Android/AndroidManifest.xml b/Android/AndroidManifest.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.droidplanner.android"
-    android:installLocation="auto">
+<manifest package="org.droidplanner.android"
+          xmlns:android="http://schemas.android.com/apk/res/android"
+          android:installLocation="auto">
 
-    <supports-screens
-        android:requiresSmallestWidthDp="320"/>
+    <supports-screens android:requiresSmallestWidthDp="320"/>
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
@@ -15,7 +14,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-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
 
     <uses-feature android:name="android.hardware.screen.portrait"/>
 
@@ -50,8 +49,7 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_title"
         android:theme="@style/CustomActionBarTheme"
-        android:windowSoftInputMode="adjustPan"
-        >
+        android:windowSoftInputMode="adjustPan">
 
         <!-- You must insert your own Google Maps for Android API v2 key in here. -->
         <meta-data
@@ -60,16 +58,14 @@
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version"/>
-
         <meta-data
             android:name="io.fabric.ApiKey"
-            android:value="${fabricApiKey}" />
+            android:value="${fabricApiKey}"/>
 
         <activity
             android:name=".activities.AccountActivity"
-            android:launchMode="singleTop"
-            android:label="@string/account_label"/>
-
+            android:label="@string/account_label"
+            android:launchMode="singleTop"/>
         <activity
             android:name=".activities.FlightActivity"
             android:launchMode="singleTask"
@@ -81,14 +77,14 @@
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-
         </activity>
         <activity
             android:name=".activities.EditorActivity"
             android:label="@string/editor"
             android:launchMode="singleTop"
             android:theme="@style/CustomActionBarTheme.Transparent"
             android:windowSoftInputMode="adjustNothing">
+
             <!-- Intent for opening mission files -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -100,59 +96,69 @@
         </activity>
         <activity
             android:name=".activities.ConfigurationActivity"
-            android:windowSoftInputMode="adjustPan"
+            android:label="@string/menu_drone_setup"
             android:launchMode="singleTop"
-            android:label="@string/menu_drone_setup"/>
-
+            android:windowSoftInputMode="adjustPan"/>
         <activity
             android:name=".activities.SettingsActivity"
-            android:launchMode="singleTop"
-            android:label="@string/settings"/>
-
+            android:label="@string/settings"
+            android:launchMode="singleTop"/>
         <activity
             android:name=".activities.helpers.MapPreferencesActivity"
-            android:launchMode="singleTop"
             android:label="@string/activity_title_map_provider_preferences"
+            android:launchMode="singleTop"
             android:parentActivityName=".activities.SettingsActivity">
+
             <!-- Parent activity meta-data to support API level 7+ -->
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".activities.SettingsActivity"/>
         </activity>
-
         <activity
             android:name=".activities.LocatorActivity"
             android:label="@string/locator"
             android:launchMode="singleTop"
             android:theme="@style/CustomActionBarTheme.Transparent"/>
-
+        <activity
+            android:name=".tlog.TLogActivity"
+            android:label="@string/locator"
+            android:launchMode="singleTop"
+            android:theme="@style/CustomActionBarTheme.Transparent"/>
         <activity
             android:name=".activities.WidgetActivity"
             android:launchMode="singleTop"
-            android:parentActivityName=".activities.FlightActivity"
-            >
+            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"
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
+            android:noHistory="true"
             android:theme="@style/CustomDialogTheme"/>
-
         <activity
             android:name=".maps.providers.google_map.DownloadMapboxMapActivity"
-            android:noHistory="true"
             android:excludeFromRecents="true"
-            android:theme="@style/CustomActionBarTheme.Transparent"
-            android:launchMode="singleTask"/>
+            android:launchMode="singleTask"
+            android:noHistory="true"
+            android:theme="@style/CustomActionBarTheme.Transparent"/>
+
+        <receiver
+            android:name=".droneshare.NetworkConnectivityReceiver"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+            </intent-filter>
+
+        </receiver>
 
         <service android:name=".AppService" />
+        <service android:name=".droneshare.UploaderService" />
 
     </application>
 
-</manifest>
+</manifest>
diff --git a/Android/build.gradle b/Android/build.gradle
@@ -21,10 +21,10 @@ dependencies {
     compile 'com.github.gabrielemariotti.changeloglib:changelog:2.0.0'
 
     //DroneKit-Android client lib
-    compile 'com.o3dr.android:dronekit-android:3.0.0-alpha4'
+    compile 'com.o3dr.android:dronekit-android:3.0.0-alpha6'
     //Comment line above, and uncomment line below to use your local version of the dronekit-android client lib
     //Don't forget to uncomment the lines in the settings.gradle file as well.
-    /* compile project(':ClientLib') */
+//     compile project(':ClientLib')
 
     compile 'me.grantland:autofittextview:0.2.1'
     compile(name:'shimmer-android-release', ext:'aar')

diff --git a/Android/res/drawable/fastscroller_handle.xml b/Android/res/drawable/fastscroller_handle.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <corners
+        android:topLeftRadius="@dimen/fastscroller_handle_corner"
+        android:topRightRadius="@dimen/fastscroller_handle_corner"
+        android:bottomLeftRadius="@dimen/fastscroller_handle_corner"
+        android:bottomRightRadius="0dp" />
+
+    <solid android:color="@android:color/holo_green_dark" />
+
+    <size
+        android:height="@dimen/fastscroller_handle_size"
+        android:width="@dimen/fastscroller_handle_size" />
+</shape>
diff --git a/Android/res/drawable/horizontal_fastscroller_bubble.xml b/Android/res/drawable/horizontal_fastscroller_bubble.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <corners android:radius="@dimen/fastscroller_reack_corner" />
+
+    <solid android:color="@android:color/holo_green_dark" />
+
+    <size
+        android:height="@dimen/fastscroller_track_height"
+        android:width="@dimen/fastscroller_track_width" />
+</shape>
diff --git a/Android/res/drawable/horizontal_fastscroller_handle.xml b/Android/res/drawable/horizontal_fastscroller_handle.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <corners
+        android:radius="4dp" />
+
+    <solid android:color="@android:color/holo_green_dark" />
+
+    <size
+        android:height="30dp"
+        android:width="48dp" />
+</shape>
diff --git a/Android/res/drawable/ic_clear_black_24dp.xml b/Android/res/drawable/ic_clear_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@android:color/darker_gray"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/Android/res/drawable/list_item_tlog_data_bg.xml b/Android/res/drawable/list_item_tlog_data_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/holo_green_light" android:state_activated="true"/>
+    <item android:drawable="@android:color/transparent"/>
+</selector>
diff --git a/Android/res/drawable/position_event_thumbnail_background.xml b/Android/res/drawable/position_event_thumbnail_background.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="@android:color/holo_green_light" android:state_activated="true"/>
+    <item android:drawable="@android:color/darker_gray" android:state_pressed="true"/>
+    <item android:drawable="@android:color/holo_green_light" android:state_selected="true"/>
+    <item android:drawable="@android:color/white"/>
+</selector>
diff --git a/Android/res/drawable/vertical_fastscroller_bubble.xml b/Android/res/drawable/vertical_fastscroller_bubble.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <corners android:radius="@dimen/fastscroller_reack_corner" />
+
+    <solid android:color="@android:color/holo_green_dark" />
+
+    <size
+        android:height="@dimen/fastscroller_track_width"
+        android:width="@dimen/fastscroller_track_height" />
+</shape>
diff --git a/Android/res/layout/activity_tlog.xml b/Android/res/layout/activity_tlog.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout android:id="@+id/main_content"
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fitsSystemWindows="true"
+                android:theme="@style/CustomActionBarTheme.AppBarOverlay"
+                tools:context=".tlog.TLogActivity">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:layout_alignParentTop="true"
+        android:background="?attr/colorPrimary"
+        app:popupTheme="@style/CustomActionBarTheme.PopupOverlay"/>
+
+    <android.support.design.widget.TabLayout
+        android:id="@+id/tabs"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/toolbar"
+        android:background="?attr/colorPrimary"
+        app:tabGravity="fill"
+        app:tabMaxWidth="0dp"
+        app:tabMode="fixed"
+        app:tabSelectedTextColor="@color/navigation_entry_color"
+        app:tabTextColor="@color/navigation_entry_color"/>
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/tabs"/>
+
+    <TextView
+        android:id="@+id/tlog_session_title"
+        android:layout_width="match_parent"
+        android:layout_height="24dp"
+        tools:text="11/11/2011 12:12:12"
+        android:layout_below="@+id/tabs"
+        android:gravity="center"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:background="@color/transparent_dark"/>
+
+    <ProgressBar
+        android:id="@+id/progress_bar_container"
+        style="?android:progressBarStyleHorizontal"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:layout_below="@+id/tabs"
+        android:indeterminate="true"/>
+
+
+</RelativeLayout>
diff --git a/Android/res/layout/fragment_tlog_data_picker.xml b/Android/res/layout/fragment_tlog_data_picker.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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">
+
+    <TextView
+        android:id="@+id/dialog_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:minHeight="70dp"
+        android:padding="15dp"
+        android:text="@string/label_tlogs_title"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_alignParentTop="true"/>
+
+    <View
+        android:id="@+id/dialog_title_divider"
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:background="@android:color/holo_blue_dark"
+        android:layout_below="@+id/dialog_title"/>
+
+    <android.support.v7.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/tlogs_selector"
+        android:layout_below="@+id/dialog_title_divider"
+        android:scrollbars="vertical"/>
+
+    <TextView
+        android:id="@+id/no_tlogs_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="56dp"
+        android:padding="16dp"
+        android:text="No available tlog files"
+        android:textStyle="bold"
+        android:background="?selectableItemBackground"
+        android:gravity="center"
+        android:layout_below="@+id/dialog_title_divider"
+        android:visibility="gone"
+        android:fadeScrollbars="false"
+        tools:visibility="visible"/>
+
+</RelativeLayout>
diff --git a/Android/res/layout/fragment_tlog_event_detail.xml b/Android/res/layout/fragment_tlog_event_detail.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+                                    xmlns:tools="http://schemas.android.com/tools"
+                                    android:id="@+id/event_detail_container"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:layout_margin="8dp"
+                                    android:orientation="vertical"
+    android:visibility="gone">
+
+    <TextView
+        android:id="@+id/event_info_dump"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical|start"
+        android:padding="8dp"
+        tools:text="{}"/>
+
+</android.support.v7.widget.CardView>