From 8ab1b7fd8f464cc7bda061c36e0281a673d73d68 Mon Sep 17 00:00:00 2001
From: Coffeemakr <l34k@bk.ru>
Date: Tue, 27 Jun 2017 22:35:52 +0200
Subject: [PATCH] Fix loading and retry positioning

---
 app/src/main/res/layout/fragment_channel.xml  | 26 +++-------------
 app/src/main/res/layout/fragment_search.xml   | 31 +++++--------------
 .../main/res/layout/fragment_video_detail.xml | 22 ++-----------
 .../main/res/layout/loading_error_retry.xml   | 26 ++++++++++++++++
 4 files changed, 40 insertions(+), 65 deletions(-)
 create mode 100644 app/src/main/res/layout/loading_error_retry.xml

diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index 950761b77..03e561a79 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -12,26 +11,11 @@
         android:layout_height="match_parent"
         android:background="?android:windowBackground"
         android:scrollbars="vertical"
-        tools:listitem="@layout/stream_item"/>
+        tools:listitem="@layout/stream_item" />
 
-    <ProgressBar
-        android:id="@+id/loading_progress_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminate="true"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <!--ERROR PANEL-->
     <include
-        android:id="@+id/error_panel"
-        layout="@layout/error_retry"
-        android:layout_width="wrap_content"
+        layout="@layout/loading_error_retry"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="50dp"
-        android:visibility="gone"
-        tools:visibility="visible"/>
-
+        android:layout_gravity="center" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 4608aa8fa..a779a18e0 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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"
     android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:orientation="vertical">
+    android:focusableInTouchMode="true">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/result_list_view"
@@ -15,26 +13,11 @@
         android:layout_height="match_parent"
         android:scrollbars="vertical"
         app:layoutManager="LinearLayoutManager"
-        tools:listitem="@layout/stream_item"/>
+        tools:listitem="@layout/stream_item" />
 
-    <ProgressBar
-        android:id="@+id/loading_progress_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminate="true"
-        android:visibility="gone"
-        tools:visibility="visible"/>
-
-    <!--ERROR PANEL-->
     <include
-        android:id="@+id/error_panel"
-        layout="@layout/error_retry"
-        android:layout_width="wrap_content"
+        layout="@layout/loading_error_retry"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="50dp"
-        android:visibility="gone"
-        tools:visibility="visible"/>
-
-</FrameLayout>
+        android:layout_gravity="center_vertical" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 0006d0004..7e7fff952 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -364,26 +364,8 @@
                     </LinearLayout>
                 </LinearLayout>
 
-                <!-- LOADING BAR -->
-                <ProgressBar
-                    android:id="@+id/loading_progress_bar"
-                    style="@style/Widget.AppCompat.ProgressBar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:indeterminate="true"
-                    android:visibility="gone"
-                    tools:visibility="visible" />
-
-                <!--ERROR PANEL-->
-                <include
-                    android:id="@+id/error_panel"
-                    layout="@layout/error_retry"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
-                    android:visibility="gone"
-                    tools:visibility="visible" />
+                <!-- LOADING BAR, ERROR & RETRY -->
+                <include layout="@layout/loading_error_retry" />
             </LinearLayout>
         </LinearLayout>
     </com.nirhart.parallaxscroll.views.ParallaxScrollView>
diff --git a/app/src/main/res/layout/loading_error_retry.xml b/app/src/main/res/layout/loading_error_retry.xml
new file mode 100644
index 000000000..081dc3e6d
--- /dev/null
+++ b/app/src/main/res/layout/loading_error_retry.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="15dp">
+
+    <ProgressBar
+        android:id="@+id/loading_progress_bar"
+        style="@style/Widget.AppCompat.ProgressBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <!--ERROR PANEL-->
+    <include
+        android:id="@+id/error_panel"
+        layout="@layout/error_retry"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
+        android:visibility="gone"
+        tools:visibility="visible" />
+</FrameLayout>
\ No newline at end of file