From 1107391c43831522dc1beede34247cf451d19962 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 27 Nov 2020 15:00:25 +0100
Subject: [PATCH] Fix a crash

---
 .../fedilabtube/VideosTimelineActivity.java   |  4 +-
 .../res/layout/activity_search_result.xml     | 60 -------------
 .../res/layout/activity_videos_timeline.xml   | 85 +++++++++++++++++++
 3 files changed, 87 insertions(+), 62 deletions(-)
 create mode 100644 app/src/main/res/layout/activity_videos_timeline.xml

diff --git a/app/src/main/java/app/fedilab/fedilabtube/VideosTimelineActivity.java b/app/src/main/java/app/fedilab/fedilabtube/VideosTimelineActivity.java
index 56064f2..3aff82b 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/VideosTimelineActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/VideosTimelineActivity.java
@@ -33,7 +33,7 @@ import java.util.GregorianCalendar;
 import java.util.Locale;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.databinding.ActivitySearchResultBinding;
+import app.fedilab.fedilabtube.databinding.ActivityVideosTimelineBinding;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
@@ -50,7 +50,7 @@ public class VideosTimelineActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        ActivitySearchResultBinding binding = ActivitySearchResultBinding.inflate(getLayoutInflater());
+        ActivityVideosTimelineBinding binding = ActivityVideosTimelineBinding.inflate(getLayoutInflater());
         View mainView = binding.getRoot();
         setContentView(mainView);
 
diff --git a/app/src/main/res/layout/activity_search_result.xml b/app/src/main/res/layout/activity_search_result.xml
index bdf76e4..343c854 100644
--- a/app/src/main/res/layout/activity_search_result.xml
+++ b/app/src/main/res/layout/activity_search_result.xml
@@ -36,66 +36,6 @@
             app:expandedTitleMarginEnd="64dp"
             app:expandedTitleMarginStart="48dp"
             app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/top_banner"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp">
-
-                <HorizontalScrollView
-                    android:id="@+id/history_filter"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
-                    android:paddingTop="5dp"
-                    android:paddingBottom="5dp"
-                    android:visibility="gone"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:id="@+id/history_filter_all"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/background_rounded_item"
-                            android:paddingStart="5dp"
-                            android:paddingEnd="5dp"
-                            android:text="@string/all"
-                            android:textColor="?attr/colorAccent" />
-
-                        <TextView
-                            android:id="@+id/history_filter_today"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="5dp"
-                            android:background="@drawable/background_rounded_item"
-                            android:paddingStart="5dp"
-                            android:paddingEnd="5dp"
-                            android:text="@string/today"
-                            android:textColor="?attr/colorAccent" />
-
-                        <TextView
-                            android:id="@+id/history_filter_last_7_days"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="5dp"
-                            android:background="@drawable/background_rounded_item"
-                            android:paddingStart="5dp"
-                            android:paddingEnd="5dp"
-                            android:text="@string/last_7_days"
-                            android:textColor="?attr/colorAccent" />
-                    </LinearLayout>
-
-                </HorizontalScrollView>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
         <com.google.android.material.tabs.TabLayout
diff --git a/app/src/main/res/layout/activity_videos_timeline.xml b/app/src/main/res/layout/activity_videos_timeline.xml
new file mode 100644
index 0000000..52ed63d
--- /dev/null
+++ b/app/src/main/res/layout/activity_videos_timeline.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2020 Thomas Schneider
+
+    This file is a part of TubeLab
+
+    This program is free software; you can redistribute it and/or modify it under the terms of the
+    GNU General Public License as published by the Free Software Foundation; either version 3 of the
+    License, or (at your option) any later version.
+
+    TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+    Public License for more details.
+
+    You should have received a copy of the GNU General Public License along with TubeLab; if not,
+    see <http://www.gnu.org/licenses>.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout 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">
+
+    <HorizontalScrollView
+        android:id="@+id/history_filter"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/history_filter_all"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/background_rounded_item"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:text="@string/all"
+                android:textColor="?attr/colorAccent" />
+
+            <TextView
+                android:id="@+id/history_filter_today"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:background="@drawable/background_rounded_item"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:text="@string/today"
+                android:textColor="?attr/colorAccent" />
+
+            <TextView
+                android:id="@+id/history_filter_last_7_days"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:background="@drawable/background_rounded_item"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:text="@string/last_7_days"
+                android:textColor="?attr/colorAccent" />
+        </LinearLayout>
+
+    </HorizontalScrollView>
+
+    <RelativeLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/history_filter">
+
+
+    </RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>