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, 74 insertions, 0 deletions

diff --git a/WordPress/src/main/res/layout/theme_browser_fragment.xml b/WordPress/src/main/res/layout/theme_browser_fragment.xml
new file mode 100644
index 000000000..94e53d257
--- /dev/null
+++ b/WordPress/src/main/res/layout/theme_browser_fragment.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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">
+
+    <TextView
+        android:id="@+id/theme_no_search_result_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/theme_no_search_result_found"
+        android:visibility="gone"
+        android:layout_margin="@dimen/margin_extra_large"/>
+
+    <org.wordpress.android.util.widgets.CustomSwipeRefreshLayout
+        android:id="@+id/ptr_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <org.wordpress.android.widgets.HeaderGridView
+            android:id="@+id/theme_listview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:horizontalSpacing="@dimen/margin_none"
+            android:scrollbarStyle="outsideOverlay"
+            android:columnWidth="@dimen/theme_browser_default_column_width"
+            android:numColumns="auto_fit"
+            android:divider="@android:color/transparent"
+            android:stretchMode="columnWidth"
+            android:layout_below="@id/theme_no_search_result_text">
+        </org.wordpress.android.widgets.HeaderGridView>
+    </org.wordpress.android.util.widgets.CustomSwipeRefreshLayout>
+
+    <ProgressBar
+        android:id="@+id/theme_loading_progress_bar"
+        style="?android:attr/progressBarStyleInverse"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="@dimen/margin_large"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <RelativeLayout
+        android:id="@+id/empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerHorizontal="true"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <ImageView
+            android:id="@+id/drake_empty_results"
+            android:layout_width="@dimen/drake_themes_width"
+            android:layout_height="wrap_content"
+            app:srcCompat="@drawable/drake_empty_results"
+            android:adjustViewBounds="true"
+            android:layout_centerHorizontal="true"
+            android:contentDescription="@string/theme_no_search_result_found" />
+
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/text_empty"
+            style="@style/WordPress.EmptyList.Title"
+            android:layout_below="@id/drake_empty_results"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="@string/themes_fetching"
+            app:fixWidowWords="true"/>
+    </RelativeLayout>
+
+</RelativeLayout>