From e0c910f94051b2ac89ac9ce2588261741f0d6f45 Mon Sep 17 00:00:00 2001
From: Danilo Ercoli <ercoli@gmail.com>
Date: Thu, 2 Jul 2015 16:59:39 +0200
Subject: Introduce 2 columns on tablets, and more bars on 720DP devices in
 Landscape.

---
 .../src/main/res/layout-sw720dp/stats_activity.xml | 224 +++++++++++++++++++++
 1 file changed, 224 insertions(+)
 create mode 100644 WordPress/src/main/res/layout-sw720dp/stats_activity.xml

(limited to 'WordPress/src/main/res/layout-sw720dp/stats_activity.xml')

diff --git a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
new file mode 100644
index 000000000..9c8344069
--- /dev/null
+++ b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
@@ -0,0 +1,224 @@
+<?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"
+    android:orientation="vertical">
+
+    <include
+        layout="@layout/toolbar"
+        android:id="@+id/toolbar" />
+
+    <org.wordpress.android.util.widgets.CustomSwipeRefreshLayout
+        android:id="@+id/ptr_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/grey_lighten_30">
+
+        <org.wordpress.android.ui.stats.ScrollViewExt
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/scroll_view_stats"
+            android:fillViewport="true">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/content_margin"
+                android:layout_marginRight="@dimen/content_margin"
+                android:orientation="vertical">
+
+                <!-- Insights -->
+                <LinearLayout
+                    android:id="@+id/stats_insights_fragments_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="@dimen/margin_medium"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <!-- POPULAR DAY AND TIME SECTION -->
+                    <FrameLayout
+                        android:id="@+id/stats_insights_most_popular_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_large" />
+
+                    <!-- ALL TIME SECTION -->
+                    <FrameLayout
+                        android:id="@+id/stats_insights_all_time_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_large" />
+
+                    <!-- TODAY SECTION -->
+                    <FrameLayout
+                        android:id="@+id/stats_insights_today_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_large" />
+
+                    <org.wordpress.android.widgets.WPTextView
+                        android:textAppearance="?android:attr/textAppearance"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_large"
+                        android:layout_marginBottom="@dimen/margin_extra_small"
+                        android:textColor="@color/stats_blue_labels"
+                        android:gravity="start"
+                        android:text="@string/stats_other_recent_stats_label" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <!-- Left column -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:layout_marginRight="@dimen/margin_medium"
+                            android:layout_marginEnd="@dimen/margin_medium" >
+                            <FrameLayout
+                                android:id="@+id/stats_comments_container"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/margin_large" />
+
+                            <FrameLayout
+                                android:id="@+id/stats_tags_and_categories_container"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/margin_large" />
+                        </LinearLayout>
+
+                        <!-- Right column -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:layout_marginLeft="@dimen/margin_medium"
+                            android:layout_marginStart="@dimen/margin_medium" >
+                            <FrameLayout
+                                android:id="@+id/stats_followers_container"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/margin_large" />
+
+                            <FrameLayout
+                                android:id="@+id/stats_publicize_container"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/margin_large" />
+                        </LinearLayout>
+                    </LinearLayout>
+                </LinearLayout>
+
+                <!-- Timeline -->
+                <LinearLayout
+                    android:id="@+id/stats_timeline_fragments_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="@dimen/margin_medium"
+                    android:orientation="vertical">
+
+                    <FrameLayout
+                        android:id="@+id/stats_visitors_and_views_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_large" />
+
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <!-- Left column -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:layout_marginRight="@dimen/margin_medium"
+                            android:layout_marginEnd="@dimen/margin_medium" >
+                            <FrameLayout
+                                android:id="@+id/stats_top_posts_container"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/margin_large" />
+
+                            <FrameLayout
+                                android:id="@+id/stats_referrers_container"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/margin_large" />
+
+                            <FrameLayout
+                                android:id="@+id/stats_clicks_container"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/margin_large" />
+
+                            <FrameLayout
+                                android:id="@+id/stats_top_authors_container"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/margin_large" />
+
+                        </LinearLayout>
+
+                        <!-- Right column -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:layout_marginLeft="@dimen/margin_medium"
+                            android:layout_marginStart="@dimen/margin_medium" >
+                            <FrameLayout
+                                android:id="@+id/stats_geoviews_container"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/margin_large" />
+
+                            <FrameLayout
+                                android:id="@+id/stats_search_terms_container"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/margin_large" />
+
+                            <FrameLayout
+                                android:id="@+id/stats_video_container"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/margin_large" />
+
+                        </LinearLayout>
+                    </LinearLayout>
+
+                    <org.wordpress.android.widgets.WPTextView
+                        android:textAppearance="?android:attr/textAppearance"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_large"
+                        android:textColor="@color/stats_blue_labels"
+                        android:gravity="start"
+                        android:text="@string/stats_other_recent_stats_label" />
+
+                    <org.wordpress.android.widgets.WPTextView
+                        android:id="@+id/stats_other_recent_stats_moved"
+                        android:textAppearance="?android:attr/textAppearance"
+                        android:background="?android:selectableItemBackground"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_small"
+                        android:textColor="@color/stats_link_text_color"
+                        android:gravity="start"
+                        android:textSize="@dimen/text_sz_small"
+                        android:text="@string/stats_other_recent_stats_moved_label" />
+
+                </LinearLayout>
+            </LinearLayout>
+        </org.wordpress.android.ui.stats.ScrollViewExt>
+    </org.wordpress.android.util.widgets.CustomSwipeRefreshLayout>
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 8af6f222740f2858381c25e76eb9da23c9c5d908 Mon Sep 17 00:00:00 2001
From: Danilo Ercoli <ercoli@gmail.com>
Date: Tue, 14 Jul 2015 12:01:12 +0200
Subject: Make the "Other Recent Stats" text size larger.

---
 WordPress/src/main/res/layout-sw720dp/stats_activity.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'WordPress/src/main/res/layout-sw720dp/stats_activity.xml')

diff --git a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
index 9c8344069..2cde5603d 100644
--- a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
+++ b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
@@ -58,6 +58,7 @@
 
                     <org.wordpress.android.widgets.WPTextView
                         android:textAppearance="?android:attr/textAppearance"
+                        android:textSize="@dimen/text_sz_large"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/margin_large"
@@ -203,6 +204,7 @@
                         android:layout_marginTop="@dimen/margin_large"
                         android:textColor="@color/stats_blue_labels"
                         android:gravity="start"
+                        android:textSize="@dimen/text_sz_large"
                         android:text="@string/stats_other_recent_stats_label" />
 
                     <org.wordpress.android.widgets.WPTextView
-- 
cgit v1.2.3


From 3627a281f387c7f9a5d50f5904ccbcececf1b101 Mon Sep 17 00:00:00 2001
From: Danilo Ercoli <ercoli@gmail.com>
Date: Tue, 11 Aug 2015 18:04:07 +0200
Subject: Add most of the code for "Latest Post Summary" module. I changed a
 bit of other things while adding the module since some of the required code
 was already there, but in private class/method.

---
 WordPress/src/main/res/layout-sw720dp/stats_activity.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'WordPress/src/main/res/layout-sw720dp/stats_activity.xml')

diff --git a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
index 2cde5603d..3102e5f34 100644
--- a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
+++ b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
@@ -56,6 +56,13 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/margin_large" />
 
+                    <!-- LATEST POST SUMMARY SECTION -->
+                    <FrameLayout
+                        android:id="@+id/stats_insights_latest_post_summary_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/margin_large" />
+
                     <org.wordpress.android.widgets.WPTextView
                         android:textAppearance="?android:attr/textAppearance"
                         android:textSize="@dimen/text_sz_large"
-- 
cgit v1.2.3


From 700f0cc388f55064209c2eb58d7dcddd89f71a66 Mon Sep 17 00:00:00 2001
From: Danilo Ercoli <ercoli@gmail.com>
Date: Wed, 7 Oct 2015 12:26:22 +0200
Subject: Delay the setup of labels

---
 WordPress/src/main/res/layout-sw720dp/stats_activity.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'WordPress/src/main/res/layout-sw720dp/stats_activity.xml')

diff --git a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
index 3102e5f34..ac8b72eca 100644
--- a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
+++ b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
@@ -64,6 +64,7 @@
                         android:layout_marginTop="@dimen/margin_large" />
 
                     <org.wordpress.android.widgets.WPTextView
+                        android:id="@+id/stats_other_recent_stats_label_insights"
                         android:textAppearance="?android:attr/textAppearance"
                         android:textSize="@dimen/text_sz_large"
                         android:layout_width="match_parent"
@@ -205,6 +206,7 @@
                     </LinearLayout>
 
                     <org.wordpress.android.widgets.WPTextView
+                        android:id="@+id/stats_other_recent_stats_label_timeline"
                         android:textAppearance="?android:attr/textAppearance"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-- 
cgit v1.2.3


From b0157f519913ba41c3a57e23ee5190227cfb7611 Mon Sep 17 00:00:00 2001
From: Danilo Ercoli <ercoli@gmail.com>
Date: Fri, 8 Jan 2016 16:49:36 +0100
Subject: Reordered modules on Insights

---
 WordPress/src/main/res/layout-sw720dp/stats_activity.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'WordPress/src/main/res/layout-sw720dp/stats_activity.xml')

diff --git a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
index ac8b72eca..281968708 100644
--- a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
+++ b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
@@ -35,30 +35,30 @@
                     android:orientation="vertical"
                     android:visibility="gone">
 
-                    <!-- POPULAR DAY AND TIME SECTION -->
+                    <!-- LATEST POST SUMMARY SECTION -->
                     <FrameLayout
-                        android:id="@+id/stats_insights_most_popular_container"
+                        android:id="@+id/stats_insights_latest_post_summary_container"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/margin_large" />
 
-                    <!-- ALL TIME SECTION -->
+                    <!-- TODAY SECTION -->
                     <FrameLayout
-                        android:id="@+id/stats_insights_all_time_container"
+                        android:id="@+id/stats_insights_today_container"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/margin_large" />
 
-                    <!-- TODAY SECTION -->
+                    <!-- ALL TIME SECTION -->
                     <FrameLayout
-                        android:id="@+id/stats_insights_today_container"
+                        android:id="@+id/stats_insights_all_time_container"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/margin_large" />
 
-                    <!-- LATEST POST SUMMARY SECTION -->
+                    <!-- POPULAR DAY AND TIME SECTION -->
                     <FrameLayout
-                        android:id="@+id/stats_insights_latest_post_summary_container"
+                        android:id="@+id/stats_insights_most_popular_container"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/margin_large" />
-- 
cgit v1.2.3


From bd6c4537a45cb19dac740126eb355771ee47d777 Mon Sep 17 00:00:00 2001
From: Mario Zorz <mariozorz@gmail.com>
Date: Wed, 17 Feb 2016 20:09:04 -0300
Subject: removed unused import + unnecessary xmlns declaration in layout +
 fixed layout for Stats for sw720dp according to review comments by @nbradbury
 and @daniloercoli

---
 .../src/main/res/layout-sw720dp/stats_activity.xml | 385 +++++++++++----------
 1 file changed, 207 insertions(+), 178 deletions(-)

(limited to 'WordPress/src/main/res/layout-sw720dp/stats_activity.xml')

diff --git a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
index 281968708..b4af030ac 100644
--- a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
+++ b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
@@ -1,5 +1,6 @@
 <?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="match_parent"
     android:orientation="vertical">
@@ -8,228 +9,256 @@
         layout="@layout/toolbar"
         android:id="@+id/toolbar" />
 
-    <org.wordpress.android.util.widgets.CustomSwipeRefreshLayout
-        android:id="@+id/ptr_layout"
+    <android.support.design.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/grey_lighten_30">
+        android:layout_height="match_parent">
 
-        <org.wordpress.android.ui.stats.ScrollViewExt
+        <android.support.design.widget.AppBarLayout
+            android:layout_height="@dimen/toolbar_subtitle_height"
+            android:layout_width="match_parent">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar_filter"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/FilteredRecyclerViewFilterContainer"
+                app:layout_scrollFlags="scroll|enterAlways">
+
+                <Spinner
+                    style="@style/FilteredRecyclerViewSpinner.WordPress"
+                    android:id="@+id/filter_spinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:overlapAnchor="false"/>
+
+            </android.support.v7.widget.Toolbar>
+
+        </android.support.design.widget.AppBarLayout>
+
+        <org.wordpress.android.util.widgets.CustomSwipeRefreshLayout
+            android:id="@+id/ptr_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:id="@+id/scroll_view_stats"
-            android:fillViewport="true">
-            <LinearLayout
+            android:background="@color/grey_lighten_30"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+            <org.wordpress.android.ui.stats.NestedScrollViewExt
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/content_margin"
-                android:layout_marginRight="@dimen/content_margin"
-                android:orientation="vertical">
-
-                <!-- Insights -->
+                android:id="@+id/scroll_view_stats"
+                android:fillViewport="true">
                 <LinearLayout
-                    android:id="@+id/stats_insights_fragments_container"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingBottom="@dimen/margin_medium"
-                    android:orientation="vertical"
-                    android:visibility="gone">
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="@dimen/content_margin"
+                    android:layout_marginRight="@dimen/content_margin"
+                    android:orientation="vertical">
 
-                    <!-- LATEST POST SUMMARY SECTION -->
-                    <FrameLayout
-                        android:id="@+id/stats_insights_latest_post_summary_container"
+                    <!-- Insights -->
+                    <LinearLayout
+                        android:id="@+id/stats_insights_fragments_container"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_large" />
+                        android:paddingBottom="@dimen/margin_medium"
+                        android:orientation="vertical"
+                        android:visibility="gone">
 
-                    <!-- TODAY SECTION -->
-                    <FrameLayout
-                        android:id="@+id/stats_insights_today_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_large" />
+                        <!-- LATEST POST SUMMARY SECTION -->
+                        <FrameLayout
+                            android:id="@+id/stats_insights_latest_post_summary_container"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/margin_large" />
 
-                    <!-- ALL TIME SECTION -->
-                    <FrameLayout
-                        android:id="@+id/stats_insights_all_time_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_large" />
+                        <!-- TODAY SECTION -->
+                        <FrameLayout
+                            android:id="@+id/stats_insights_today_container"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/margin_large" />
 
-                    <!-- POPULAR DAY AND TIME SECTION -->
-                    <FrameLayout
-                        android:id="@+id/stats_insights_most_popular_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_large" />
+                        <!-- ALL TIME SECTION -->
+                        <FrameLayout
+                            android:id="@+id/stats_insights_all_time_container"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/margin_large" />
 
-                    <org.wordpress.android.widgets.WPTextView
-                        android:id="@+id/stats_other_recent_stats_label_insights"
-                        android:textAppearance="?android:attr/textAppearance"
-                        android:textSize="@dimen/text_sz_large"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_large"
-                        android:layout_marginBottom="@dimen/margin_extra_small"
-                        android:textColor="@color/stats_blue_labels"
-                        android:gravity="start"
-                        android:text="@string/stats_other_recent_stats_label" />
+                        <!-- POPULAR DAY AND TIME SECTION -->
+                        <FrameLayout
+                            android:id="@+id/stats_insights_most_popular_container"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/margin_large" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        <org.wordpress.android.widgets.WPTextView
+                            android:id="@+id/stats_other_recent_stats_label_insights"
+                            android:textAppearance="?android:attr/textAppearance"
+                            android:textSize="@dimen/text_sz_large"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/margin_large"
+                            android:layout_marginBottom="@dimen/margin_extra_small"
+                            android:textColor="@color/stats_blue_labels"
+                            android:gravity="start"
+                            android:text="@string/stats_other_recent_stats_label" />
 
-                        <!-- Left column -->
                         <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:layout_marginRight="@dimen/margin_medium"
-                            android:layout_marginEnd="@dimen/margin_medium" >
-                            <FrameLayout
-                                android:id="@+id/stats_comments_container"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/margin_large" />
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
 
-                            <FrameLayout
-                                android:id="@+id/stats_tags_and_categories_container"
-                                android:layout_width="match_parent"
+                            <!-- Left column -->
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/margin_large" />
-                        </LinearLayout>
+                                android:orientation="vertical"
+                                android:layout_marginRight="@dimen/margin_medium"
+                                android:layout_marginEnd="@dimen/margin_medium" >
+                                <FrameLayout
+                                    android:id="@+id/stats_comments_container"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/margin_large" />
 
-                        <!-- Right column -->
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:layout_marginLeft="@dimen/margin_medium"
-                            android:layout_marginStart="@dimen/margin_medium" >
-                            <FrameLayout
-                                android:id="@+id/stats_followers_container"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/margin_large" />
+                                <FrameLayout
+                                    android:id="@+id/stats_tags_and_categories_container"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/margin_large" />
+                            </LinearLayout>
 
-                            <FrameLayout
-                                android:id="@+id/stats_publicize_container"
-                                android:layout_width="match_parent"
+                            <!-- Right column -->
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/margin_large" />
+                                android:orientation="vertical"
+                                android:layout_marginLeft="@dimen/margin_medium"
+                                android:layout_marginStart="@dimen/margin_medium" >
+                                <FrameLayout
+                                    android:id="@+id/stats_followers_container"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/margin_large" />
+
+                                <FrameLayout
+                                    android:id="@+id/stats_publicize_container"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/margin_large" />
+                            </LinearLayout>
                         </LinearLayout>
                     </LinearLayout>
-                </LinearLayout>
-
-                <!-- Timeline -->
-                <LinearLayout
-                    android:id="@+id/stats_timeline_fragments_container"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingBottom="@dimen/margin_medium"
-                    android:orientation="vertical">
 
-                    <FrameLayout
-                        android:id="@+id/stats_visitors_and_views_container"
+                    <!-- Timeline -->
+                    <LinearLayout
+                        android:id="@+id/stats_timeline_fragments_container"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_large" />
+                        android:paddingBottom="@dimen/margin_medium"
+                        android:orientation="vertical">
 
+                        <FrameLayout
+                            android:id="@+id/stats_visitors_and_views_container"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/margin_large" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
 
-                        <!-- Left column -->
                         <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:layout_marginRight="@dimen/margin_medium"
-                            android:layout_marginEnd="@dimen/margin_medium" >
-                            <FrameLayout
-                                android:id="@+id/stats_top_posts_container"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/margin_large" />
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
 
-                            <FrameLayout
-                                android:id="@+id/stats_referrers_container"
-                                android:layout_width="match_parent"
+                            <!-- Left column -->
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/margin_large" />
+                                android:orientation="vertical"
+                                android:layout_marginRight="@dimen/margin_medium"
+                                android:layout_marginEnd="@dimen/margin_medium" >
+                                <FrameLayout
+                                    android:id="@+id/stats_top_posts_container"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/margin_large" />
 
-                            <FrameLayout
-                                android:id="@+id/stats_clicks_container"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/margin_large" />
+                                <FrameLayout
+                                    android:id="@+id/stats_referrers_container"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/margin_large" />
 
-                            <FrameLayout
-                                android:id="@+id/stats_top_authors_container"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/margin_large" />
+                                <FrameLayout
+                                    android:id="@+id/stats_clicks_container"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/margin_large" />
 
-                        </LinearLayout>
+                                <FrameLayout
+                                    android:id="@+id/stats_top_authors_container"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/margin_large" />
 
-                        <!-- Right column -->
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:layout_marginLeft="@dimen/margin_medium"
-                            android:layout_marginStart="@dimen/margin_medium" >
-                            <FrameLayout
-                                android:id="@+id/stats_geoviews_container"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/margin_large" />
+                            </LinearLayout>
 
-                            <FrameLayout
-                                android:id="@+id/stats_search_terms_container"
-                                android:layout_width="match_parent"
+                            <!-- Right column -->
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/margin_large" />
+                                android:orientation="vertical"
+                                android:layout_marginLeft="@dimen/margin_medium"
+                                android:layout_marginStart="@dimen/margin_medium" >
+                                <FrameLayout
+                                    android:id="@+id/stats_geoviews_container"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/margin_large" />
 
-                            <FrameLayout
-                                android:id="@+id/stats_video_container"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/margin_large" />
+                                <FrameLayout
+                                    android:id="@+id/stats_search_terms_container"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/margin_large" />
+
+                                <FrameLayout
+                                    android:id="@+id/stats_video_container"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/margin_large" />
 
+                            </LinearLayout>
                         </LinearLayout>
-                    </LinearLayout>
 
-                    <org.wordpress.android.widgets.WPTextView
-                        android:id="@+id/stats_other_recent_stats_label_timeline"
-                        android:textAppearance="?android:attr/textAppearance"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_large"
-                        android:textColor="@color/stats_blue_labels"
-                        android:gravity="start"
-                        android:textSize="@dimen/text_sz_large"
-                        android:text="@string/stats_other_recent_stats_label" />
-
-                    <org.wordpress.android.widgets.WPTextView
-                        android:id="@+id/stats_other_recent_stats_moved"
-                        android:textAppearance="?android:attr/textAppearance"
-                        android:background="?android:selectableItemBackground"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_small"
-                        android:textColor="@color/stats_link_text_color"
-                        android:gravity="start"
-                        android:textSize="@dimen/text_sz_small"
-                        android:text="@string/stats_other_recent_stats_moved_label" />
+                        <org.wordpress.android.widgets.WPTextView
+                            android:id="@+id/stats_other_recent_stats_label_timeline"
+                            android:textAppearance="?android:attr/textAppearance"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/margin_large"
+                            android:textColor="@color/stats_blue_labels"
+                            android:gravity="start"
+                            android:textSize="@dimen/text_sz_large"
+                            android:text="@string/stats_other_recent_stats_label" />
 
+                        <org.wordpress.android.widgets.WPTextView
+                            android:id="@+id/stats_other_recent_stats_moved"
+                            android:textAppearance="?android:attr/textAppearance"
+                            android:background="?android:selectableItemBackground"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/margin_small"
+                            android:textColor="@color/stats_link_text_color"
+                            android:gravity="start"
+                            android:textSize="@dimen/text_sz_small"
+                            android:text="@string/stats_other_recent_stats_moved_label" />
+
+                    </LinearLayout>
                 </LinearLayout>
-            </LinearLayout>
-        </org.wordpress.android.ui.stats.ScrollViewExt>
-    </org.wordpress.android.util.widgets.CustomSwipeRefreshLayout>
+            </org.wordpress.android.ui.stats.NestedScrollViewExt>
+        </org.wordpress.android.util.widgets.CustomSwipeRefreshLayout>
+    </android.support.design.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 94b5616e23a5fdcda81d9740449ac57ecf0ae426 Mon Sep 17 00:00:00 2001
From: Danilo Ercoli <ercoli@gmail.com>
Date: Wed, 13 Apr 2016 17:35:45 +0200
Subject: Move the margin settings up of one level in the UI hierarchy.

---
 WordPress/src/main/res/layout-sw720dp/stats_activity.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'WordPress/src/main/res/layout-sw720dp/stats_activity.xml')

diff --git a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
index b4af030ac..68c844301 100644
--- a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
+++ b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
@@ -45,13 +45,13 @@
             <org.wordpress.android.ui.stats.NestedScrollViewExt
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:paddingLeft="@dimen/content_margin"
+                android:paddingRight="@dimen/content_margin"
                 android:id="@+id/scroll_view_stats"
                 android:fillViewport="true">
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/content_margin"
-                    android:layout_marginRight="@dimen/content_margin"
                     android:orientation="vertical">
 
                     <!-- Insights -->
-- 
cgit v1.2.3


From 5bdb33d45147f6741a9ecef95c9ac4936f0e2d01 Mon Sep 17 00:00:00 2001
From: Nick Bradbury <nick.bradbury@gmail.com>
Date: Fri, 6 May 2016 16:06:07 -0400
Subject: Renamed FilteredRecyclerViewFilterContainer style to
 FilteredRecyclerViewToolbar

---
 WordPress/src/main/res/layout-sw720dp/stats_activity.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'WordPress/src/main/res/layout-sw720dp/stats_activity.xml')

diff --git a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
index 68c844301..54585e28c 100644
--- a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
+++ b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml
@@ -21,7 +21,7 @@
                 android:id="@+id/toolbar_filter"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/FilteredRecyclerViewFilterContainer"
+                style="@style/FilteredRecyclerViewToolbar"
                 app:layout_scrollFlags="scroll|enterAlways">
 
                 <Spinner
-- 
cgit v1.2.3