From 3d12fdb887f08dac3f050f5d06d36f0900530d8a Mon Sep 17 00:00:00 2001
From: ktprograms <ktprograms@gmail.com>
Date: Tue, 24 Aug 2021 09:39:18 +0800
Subject: [PATCH 1/4] Add how to remove tab from main page text

---
 app/build.gradle                                |  4 ++++
 .../main/res/layout/fragment_choose_tabs.xml    | 17 ++++++++++++++++-
 app/src/main/res/values/strings.xml             |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index c4a8afea4..7b3ecd2d4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -214,6 +214,10 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation "androidx.room:room-runtime:${androidxRoomVersion}"
     implementation "androidx.room:room-rxjava3:${androidxRoomVersion}"
+
+    // Apple Silicon Mac workaround (https://issuetracker.google.com/issues/174695268#comment9)
+    kapt "org.xerial:sqlite-jdbc:3.34.0"
+
     kapt "androidx.room:room-compiler:${androidxRoomVersion}"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.webkit:webkit:1.4.0'
diff --git a/app/src/main/res/layout/fragment_choose_tabs.xml b/app/src/main/res/layout/fragment_choose_tabs.xml
index ac6a0f4e5..d35b58a49 100644
--- a/app/src/main/res/layout/fragment_choose_tabs.xml
+++ b/app/src/main/res/layout/fragment_choose_tabs.xml
@@ -9,9 +9,24 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/selectedTabs"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/helpTextView"
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="0dp"
         tools:listitem="@layout/list_choose_tabs" />
 
+    <TextView
+        android:id="@+id/helpTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="8dp"
+        android:layout_toStartOf="@id/addTabsButton"
+        android:text="@string/main_page_content_how_to_remove"
+        android:textSize="16sp" />
+
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/addTabsButton"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc381f42c..e761871b0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -432,6 +432,7 @@
     <!-- Content -->
     <string name="main_page_content">Content of main page</string>
     <string name="main_page_content_summary">What tabs are shown on the main page</string>
+    <string name="main_page_content_how_to_remove">Swipe left or right to remove item</string>
     <string name="selection">Selection</string>
     <string name="blank_page_summary">Blank Page</string>
     <string name="kiosk_page_summary">Kiosk Page</string>

From 3b0e4ab3110838008a42f7c560cec6556b71f9ae Mon Sep 17 00:00:00 2001
From: ktprograms <ktprograms@gmail.com>
Date: Tue, 24 Aug 2021 17:28:28 +0800
Subject: [PATCH 2/4] Move Choose Tabs help message to Action Bar subtitle

---
 .../settings/tabs/ChooseTabsFragment.java       |  4 ++++
 .../main/res/layout/fragment_choose_tabs.xml    | 17 +----------------
 app/src/main/res/values/strings.xml             |  2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
index 6e50765ba..d8a9637bf 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
@@ -17,6 +17,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.fragment.app.Fragment;
@@ -86,6 +87,9 @@ public class ChooseTabsFragment extends Fragment {
 
         selectedTabsAdapter = new SelectedTabsAdapter(requireContext(), itemTouchHelper);
         listSelectedTabs.setAdapter(selectedTabsAdapter);
+
+        ((AppCompatActivity) getActivity()).getSupportActionBar()
+                .setSubtitle(R.string.main_page_content_swipe_remove);
     }
 
     @Override
diff --git a/app/src/main/res/layout/fragment_choose_tabs.xml b/app/src/main/res/layout/fragment_choose_tabs.xml
index d35b58a49..ac6a0f4e5 100644
--- a/app/src/main/res/layout/fragment_choose_tabs.xml
+++ b/app/src/main/res/layout/fragment_choose_tabs.xml
@@ -9,24 +9,9 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/selectedTabs"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/helpTextView"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="0dp"
+        android:layout_height="match_parent"
         tools:listitem="@layout/list_choose_tabs" />
 
-    <TextView
-        android:id="@+id/helpTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginStart="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_toStartOf="@id/addTabsButton"
-        android:text="@string/main_page_content_how_to_remove"
-        android:textSize="16sp" />
-
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/addTabsButton"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e761871b0..3b129d9c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -432,7 +432,7 @@
     <!-- Content -->
     <string name="main_page_content">Content of main page</string>
     <string name="main_page_content_summary">What tabs are shown on the main page</string>
-    <string name="main_page_content_how_to_remove">Swipe left or right to remove item</string>
+    <string name="main_page_content_swipe_remove">Swipe items to remove them</string>
     <string name="selection">Selection</string>
     <string name="blank_page_summary">Blank Page</string>
     <string name="kiosk_page_summary">Kiosk Page</string>

From ed60cd778c41b6d8e24eafc4d570b35dee03794b Mon Sep 17 00:00:00 2001
From: ktprograms <ktprograms@gmail.com>
Date: Tue, 24 Aug 2021 19:43:27 +0800
Subject: [PATCH 3/4] Remove xerial sqlite dependency

---
 app/build.gradle | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7b3ecd2d4..c4a8afea4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -214,10 +214,6 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation "androidx.room:room-runtime:${androidxRoomVersion}"
     implementation "androidx.room:room-rxjava3:${androidxRoomVersion}"
-
-    // Apple Silicon Mac workaround (https://issuetracker.google.com/issues/174695268#comment9)
-    kapt "org.xerial:sqlite-jdbc:3.34.0"
-
     kapt "androidx.room:room-compiler:${androidxRoomVersion}"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.webkit:webkit:1.4.0'

From 64004723bbdfb77f9e65c0e61f0f765690541bea Mon Sep 17 00:00:00 2001
From: ktprograms <ktprograms@gmail.com>
Date: Fri, 27 Aug 2021 09:20:23 +0800
Subject: [PATCH 4/4] Add help text in fragment_choose_tabs.xml, convert to
 ConstraintLayout

---
 .../settings/tabs/ChooseTabsFragment.java     |  4 ---
 .../main/res/layout/fragment_choose_tabs.xml  | 32 +++++++++++++++----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
index d8a9637bf..6e50765ba 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
@@ -17,7 +17,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.fragment.app.Fragment;
@@ -87,9 +86,6 @@ public class ChooseTabsFragment extends Fragment {
 
         selectedTabsAdapter = new SelectedTabsAdapter(requireContext(), itemTouchHelper);
         listSelectedTabs.setAdapter(selectedTabsAdapter);
-
-        ((AppCompatActivity) getActivity()).getSupportActionBar()
-                .setSubtitle(R.string.main_page_content_swipe_remove);
     }
 
     @Override
diff --git a/app/src/main/res/layout/fragment_choose_tabs.xml b/app/src/main/res/layout/fragment_choose_tabs.xml
index ac6a0f4e5..e59dad637 100644
--- a/app/src/main/res/layout/fragment_choose_tabs.xml
+++ b/app/src/main/res/layout/fragment_choose_tabs.xml
@@ -1,31 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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:orientation="vertical">
 
+    <TextView
+        android:id="@+id/helpTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:gravity="center"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:text="@string/main_page_content_swipe_remove"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/selectedTabs"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/helpTextView"
+        app:layout_constraintVertical_bias="1.0"
         tools:listitem="@layout/list_choose_tabs" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/addTabsButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentBottom="true"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
         android:clickable="true"
         android:focusable="true"
         app:backgroundTint="?attr/colorPrimary"
         app:fabSize="auto"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:srcCompat="@drawable/ic_add" />
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>