Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Resolving merge conflict
  • Loading branch information
audaciouscode committed Jan 7, 2017
2 parents 3d0e21d + 5a7bb83 commit b26d339
Show file tree
Hide file tree
Showing 39 changed files with 1,773 additions and 541 deletions.
5 changes: 3 additions & 2 deletions AndroidManifest.xml
@@ -1,10 +1,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.audacious_software.pdk.passivedatakit">
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
<uses-permission android:name="android.permission.READ_CALL_LOG" />
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name">
<uses-permission android:name="android.permission.READ_SMS" />
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:theme="@style/AppTheme">
<activity android:name="com.audacious_software.passive_data_kit.activities.generators.MicrosoftBandAuthActivity" android:label="@string/app_name" />
<activity android:name="com.audacious_software.passive_data_kit.activities.generators.RequestPermissionActivity" android:label="@string/app_name" />
<activity android:name="com.audacious_software.passive_data_kit.activities.DiagnosticsActivity" android:label="@string/app_name" />
Expand Down
21 changes: 11 additions & 10 deletions build.gradle
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:2.2.2'
classpath 'com.android.tools.build:gradle:2.2.3'
}
}

Expand All @@ -17,7 +17,7 @@ repositories {

android {
compileSdkVersion 25
buildToolsVersion "25"
buildToolsVersion "25.0.2"

useLibrary 'org.apache.http.legacy'

Expand Down Expand Up @@ -45,14 +45,15 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
// testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.0.0'
compile 'com.android.support:recyclerview-v7:25.0.0'
compile 'com.android.support:cardview-v7:25.0.0'
compile 'com.google.android.gms:play-services-location:9.4.0'
compile 'com.google.android.gms:play-services-maps:9.4.0'
compile 'com.google.android.gms:play-services-nearby:9.4.0'
compile 'com.google.android.gms:play-services-places:9.4.0'
compile 'com.google.android.gms:play-services-contextmanager:9.4.0'
compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.support:recyclerview-v7:25.1.0'
compile 'com.android.support:cardview-v7:25.1.0'
compile 'com.google.android.gms:play-services-location:10.0.1'
compile 'com.google.android.gms:play-services-maps:10.0.1'
compile 'com.google.android.gms:play-services-nearby:10.0.1'
compile 'com.google.android.gms:play-services-places:10.0.1'
compile 'com.google.android.gms:play-services-awareness:10.0.1'
compile 'com.google.maps.android:android-maps-utils:0.4'
compile 'com.squareup.okhttp3:okhttp:3.2.0'
compile 'commons-io:commons-io:2.4'
compile 'commons-codec:commons-codec:1.10'
Expand Down
Binary file added res/drawable-hdpi/ic_pdk_diagnostic.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/ic_text_messages.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/ic_pdk_diagnostic.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/ic_text_messages.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/ic_pdk_diagnostic.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/ic_text_messages.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxhdpi/ic_pdk_diagnostic.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxhdpi/ic_text_messages.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxxhdpi/ic_pdk_diagnostic.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxxhdpi/ic_text_messages.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions res/drawable/ic_location_heatmap_marker.xml
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<size android:width="8dp" android:height="8dp" />
<solid android:color="#80D50000" />
</shape>
37 changes: 29 additions & 8 deletions res/layout/card_diagnostic_action.xml
@@ -1,20 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
card_view:cardCornerRadius="4dp"
android:layout_margin="16dp">
<TextView
android:id="@+id/message_action"
android:layout_margin="16dp"
android:layout_margin="8dp">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content">
<TextView android:id="@+id/action_title"
android:background="#C62828"
android:padding="8dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical|start"
android:layout_weight="1"
android:textSize="14sp"
android:textStyle="bold"
android:textColor="@android:color/white" />
<TextView android:id="@+id/action_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:textSize="14sp"
android:textColor="@android:color/black"
android:background="@android:color/white"
android:padding="12dp">
</TextView>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
30 changes: 18 additions & 12 deletions res/layout/card_generator_location_google.xml
Expand Up @@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
Expand Down Expand Up @@ -42,24 +43,29 @@
android:textColor="@android:color/white"
android:layout_marginRight="8dp"/>
</LinearLayout>
<FrameLayout android:orientation="horizontal"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="240dp">
android:layout_height="200dp">
<com.google.android.gms.maps.MapView android:id="@+id/map_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#757575"
app:mapType="hybrid"
app:liteMode="true" />
<TextView android:id="@+id/generator_location_description"
android:layout_width="match_parent"
android:background="#757575" />
<android.support.v7.widget.SwitchCompat
android:id="@+id/pdk_google_location_map_type_hybrid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:textColor="@android:color/white"
android:background="#C0000000"
android:padding="8dp">
</TextView>
android:layout_gravity="bottom|right"
android:layout_marginRight="6dp"
android:layout_marginBottom="104dp" />
</FrameLayout>
<!-- <TextView android:id="@+id/generator_location_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:textColor="@android:color/white"
android:background="#33691E"
android:padding="8dp">
</TextView> -->
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
9 changes: 8 additions & 1 deletion res/layout/card_generator_phone_calls.xml
Expand Up @@ -41,7 +41,8 @@
android:textColor="@android:color/white"
android:layout_marginRight="8dp"/>
</LinearLayout>
<LinearLayout android:orientation="horizontal"
<LinearLayout android:id="@+id/card_content"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp">
Expand Down Expand Up @@ -150,6 +151,12 @@
android:layout_marginBottom="8dp"/>
</LinearLayout>
</LinearLayout>
<TextView android:id="@+id/card_empty"
android:text="@string/message_generator_phone_calls_empty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="16dp" />
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
9 changes: 8 additions & 1 deletion res/layout/card_generator_screen_state.xml
Expand Up @@ -41,7 +41,8 @@
android:textColor="@android:color/white"
android:layout_marginRight="8dp"/>
</LinearLayout>
<LinearLayout android:orientation="horizontal"
<LinearLayout android:id="@+id/card_content"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp">
Expand Down Expand Up @@ -138,6 +139,12 @@
</LinearLayout>
</LinearLayout>
</LinearLayout>
<TextView android:id="@+id/card_empty"
android:text="@string/message_generator_screen_state_empty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="16dp" />
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
134 changes: 134 additions & 0 deletions res/layout/card_generator_text_messages.xml
@@ -0,0 +1,134 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
card_view:cardCornerRadius="4dp"
android:layout_margin="8dp">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#9C27B0"
android:padding="8dp"
android:baselineAligned="false">
<ImageView android:src="@drawable/ic_text_messages"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginRight="8dp" />
<TextView android:text="@string/generator_text_messages"
android:gravity="center_vertical|start"
android:layout_width="0dp"
android:layout_height="24dp"
android:layout_weight="1"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="@android:color/white" />
<TextView android:id="@+id/generator_data_point_date"
android:gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:textSize="12sp"
android:textColor="@android:color/white"
android:layout_marginRight="8dp"/>
</LinearLayout>
<LinearLayout android:id="@+id/card_content"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp">
<com.github.mikephil.charting.charts.PieChart
android:id="@+id/chart_text_messages"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_marginRight="16dp"/>
<LinearLayout android:orientation="vertical"
android:layout_width="100dp"
android:layout_height="120dp">
<View android:layout_weight="1"
android:layout_height="0dp"
android:layout_width="40dp" />
<LinearLayout android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp">
<View android:layout_width="16dp"
android:layout_marginRight="4dp"
android:layout_height="16dp"
android:background="@color/generator_text_messages_incoming" />
<TextView android:text="@string/generator_text_messages_incoming_label"
android:layout_width="wrap_content"
android:textSize="12sp"
android:layout_height="16dp" />
</LinearLayout>
<LinearLayout android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp">
<View android:layout_width="16dp"
android:layout_marginRight="4dp"
android:layout_height="16dp"
android:background="@color/generator_text_messages_outgoing" />
<TextView android:text="@string/generator_text_messages_outgoing_label"
android:layout_width="wrap_content"
android:textSize="12sp"
android:layout_height="16dp" />
</LinearLayout>
<View android:layout_weight="1"
android:layout_height="0dp"
android:layout_width="40dp" />
</LinearLayout>
<LinearLayout android:orientation="vertical"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content">
<TextView android:text="@string/generator_text_messages_latest_text_message_label"
android:textStyle="bold"
android:textSize="12sp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView android:id="@+id/field_latest_text_message"
android:textSize="13sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"/>
<TextView android:text="@string/generator_text_messages_length_label"
android:textStyle="bold"
android:textSize="12sp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView android:id="@+id/field_length"
android:textSize="13sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"/>
<TextView android:text="@string/generator_text_messages_direction_label"
android:textStyle="bold"
android:textSize="12sp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView android:id="@+id/field_direction"
android:textSize="13sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"/>
</LinearLayout>
</LinearLayout>
<TextView android:id="@+id/card_empty"
android:text="@string/message_generator_text_messages_empty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="16dp" />
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
19 changes: 14 additions & 5 deletions res/layout/layout_diagnostics_pdk.xml
@@ -1,7 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.RecyclerView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/list_view"
android:scrollbars="vertical"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/list_view"
android:scrollbars="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<TextView android:id="@+id/message_no_diagnostics"
android:text="@string/message_no_diagnostic_actions"
android:gravity="center"
android:textSize="14sp"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
6 changes: 6 additions & 0 deletions res/menu/diagnostic_menu.xml
@@ -0,0 +1,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" >
<item android:id="@+id/action_diagnostics"
android:title="@string/action_diagnostics"
app:showAsAction="never" />
</menu>

0 comments on commit b26d339

Please sign in to comment.