Merge remote-tracking branch 'origin/upstream-master' into masterHEADstudio-3.4.0studio-3.2.1studio-3.1.2studio-3.0studio-2.3gradle_3.4.0gradle_3.1.2gradle_3.0.0gradle_2.3.0studio-master-devmirror-goog-studio-master-devmastermain

Change-Id: I63f5e16d09297c48432192761b840310935eb903

1 files changed, 166 insertions, 0 deletions

diff --git a/WordPress/src/main/res/layout/stats_visitors_and_views_fragment.xml b/WordPress/src/main/res/layout/stats_visitors_and_views_fragment.xml
new file mode 100644
index 000000000..c563ce6da
--- /dev/null
+++ b/WordPress/src/main/res/layout/stats_visitors_and_views_fragment.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_gravity="center"
+    android:gravity="center">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/stats_white_background"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/stats_pager_tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="gone" >
+
+            <!-- VIEWS tab-->
+            <include
+                layout="@layout/stats_visitors_and_views_tab"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:layout_weight="1"/>
+
+            <!-- VISITORS tab -->
+            <include
+                layout="@layout/stats_visitors_and_views_tab"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:layout_weight="1"/>
+
+            <!-- LIKES tab -->
+            <include
+                layout="@layout/stats_visitors_and_views_tab"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:layout_weight="1"/>
+
+            <!-- COMMENTS tab -->
+            <include
+                layout="@layout/stats_visitors_and_views_tab"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:layout_weight="1"/>
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:id="@+id/stats_bar_chart_fragment_container"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/margin_large"
+                android:paddingLeft="@dimen/margin_medium"
+                android:paddingRight="@dimen/margin_extra_small"
+                android:paddingBottom="@dimen/margin_large"
+                android:minHeight="@dimen/stats_barchart_height"
+                android:orientation="vertical" />
+            <LinearLayout
+                android:id="@+id/stats_bar_chart_no_activity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:gravity="center_horizontal|center_vertical"
+                android:paddingTop="@dimen/margin_medium"
+                android:paddingBottom="@dimen/margin_medium"
+                android:paddingLeft="@dimen/margin_extra_large"
+                android:paddingStart="@dimen/margin_extra_large"
+                android:paddingRight="@dimen/margin_extra_large"
+                android:paddingEnd="@dimen/margin_extra_large"
+                android:visibility="gone"
+                android:background="@drawable/stats_barchart_no_activity_background"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    app:srcCompat="@drawable/stats_icon_info"
+                    android:paddingEnd="@dimen/margin_medium"
+                    android:paddingRight="@dimen/margin_medium"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#404040"
+                    android:textSize="@dimen/text_sz_medium"
+                    android:text="@string/stats_no_activity_this_period"/>
+            </LinearLayout>
+        </RelativeLayout>
+
+        <!-- Bottom Legend -->
+        <LinearLayout
+            android:id="@+id/stats_legend_container"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:layout_marginBottom="@dimen/margin_medium">
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <!-- Have to use a CheckedTextView instead of a plain TextView otherwise
+                there was a "jumpy UI" when the CheckBox below 'stats_checkbox_visitors' is not on the screen. This is due to the
+                CheckedTextView/CheckBox touching area that is bigger than the touching area of a TextView .
+                -->
+                <CheckedTextView
+                    android:id="@+id/stats_legend_label"
+                    android:gravity="center_vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:enabled="false"
+                    android:checkMark="?android:attr/listChoiceIndicatorSingle"
+                    android:drawableLeft="@drawable/stats_visitors_and_views_legend_background_primary"
+                    android:drawableStart="@drawable/stats_visitors_and_views_legend_background_primary"
+                    android:drawablePadding="@dimen/margin_medium"
+                    android:textSize="@dimen/text_sz_small"
+                    android:text="@string/stats_views"
+                    android:textColor="@color/grey_darken_30"/>
+            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/stats_checkbox_visitors_container"
+                android:orientation="horizontal"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:visibility="gone">
+                <CheckBox
+                    android:id="@+id/stats_checkbox_visitors"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawableLeft="@drawable/stats_visitors_and_views_legend_background_secondary"
+                    android:drawableStart="@drawable/stats_visitors_and_views_legend_background_secondary"
+                    android:drawablePadding="@dimen/margin_medium"
+                    android:textSize="@dimen/text_sz_small"
+                    android:text="@string/stats_visitors"
+                    android:textColor="@color/grey_darken_30"/>
+            </LinearLayout>
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/stats_summary_date"
+        android:textAppearance="?android:attr/textAppearance"
+        android:textSize="@dimen/text_sz_large"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_extra_large"
+        android:layout_marginBottom="@dimen/margin_small"
+        android:textColor="@color/grey_darken_20"
+        tools:text="Date"/>
+</LinearLayout>