From 4ad9fcdc6f25c157e4e5c13d82cf03a9f6142a1b Mon Sep 17 00:00:00 2001
From: Coffeemakr <l34k@bk.ru>
Date: Sun, 2 Jul 2017 22:22:37 +0200
Subject: [PATCH] Revert error/retry/loading changes

---
 app/src/main/res/layout/fragment_channel.xml  | 30 +++++++++++-----
 app/src/main/res/layout/fragment_search.xml   | 27 +++++++++++----
 .../main/res/layout/fragment_video_detail.xml | 34 +++++++++++++++----
 .../main/res/layout/loading_error_retry.xml   | 26 --------------
 4 files changed, 71 insertions(+), 46 deletions(-)
 delete 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 03e561a79..4393ca190 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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"
-    tools:context=".fragments.channel.ChannelFragment">
+    android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/channel_streams_view"
@@ -13,9 +12,24 @@
         android:scrollbars="vertical"
         tools:listitem="@layout/stream_item" />
 
-    <include
-        layout="@layout/loading_error_retry"
-        android:layout_width="match_parent"
+    <ProgressBar
+        android:id="@+id/loading_progress_bar"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center" />
-</FrameLayout>
+        android:layout_centerInParent="true"
+        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"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_marginTop="50dp"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index a779a18e0..9a7d5f6a2 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -15,9 +15,24 @@
         app:layoutManager="LinearLayoutManager"
         tools:listitem="@layout/stream_item" />
 
-    <include
-        layout="@layout/loading_error_retry"
-        android:layout_width="match_parent"
+    <ProgressBar
+        android:id="@+id/loading_progress_bar"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical" />
-</FrameLayout>
\ No newline at end of file
+        android:layout_centerInParent="true"
+        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"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="50dp"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 7e7fff952..4ce77921d 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -54,12 +54,11 @@
             </FrameLayout>
 
             <!-- CONTENT -->
-            <LinearLayout
+            <RelativeLayout
                 android:id="@+id/detail_content_root_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="?android:windowBackground"
-                android:orientation="vertical">
+                android:background="?android:windowBackground">
 
                 <!-- TITLE -->
                 <FrameLayout
@@ -95,11 +94,36 @@
                         tools:ignore="ContentDescription,RtlHardcoded" />
 
                 </FrameLayout>
+
+                <!-- LOADING INDICATOR-->
+                <ProgressBar
+                    android:id="@+id/loading_progress_bar"
+                    style="@style/Widget.AppCompat.ProgressBar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detail_title_root_layout"
+                    android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
+                    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_below="@id/detail_title_root_layout"
+                    android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
                 <!--HIDING ROOT-->
                 <LinearLayout
                     android:id="@+id/detail_content_root_hiding"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:layout_below="@+id/detail_title_root_layout"
                     android:orientation="vertical"
                     android:visibility="gone"
                     tools:visibility="visible">
@@ -364,9 +388,7 @@
                     </LinearLayout>
                 </LinearLayout>
 
-                <!-- LOADING BAR, ERROR & RETRY -->
-                <include layout="@layout/loading_error_retry" />
-            </LinearLayout>
+            </RelativeLayout>
         </LinearLayout>
     </com.nirhart.parallaxscroll.views.ParallaxScrollView>
 </FrameLayout>
diff --git a/app/src/main/res/layout/loading_error_retry.xml b/app/src/main/res/layout/loading_error_retry.xml
deleted file mode 100644
index 081dc3e6d..000000000
--- a/app/src/main/res/layout/loading_error_retry.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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