Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Resolving merge conflict
- Loading branch information
Showing
39 changed files
with
1,773 additions
and
541 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
Oops, something went wrong.