From b730cb099f775b650b0c0738c2d88edafeb63d04 Mon Sep 17 00:00:00 2001
From: Somethingweirdhere <gtp@g.com>
Date: Sat, 16 Jun 2018 11:49:02 +0200
Subject: [PATCH] Fixed 4. buggy behavior when adding a new tab.

---
 .../newpipe/settings/ContentSettingsMain.java |  3 --
 .../settings/ContentSettingsMainDialog.java   | 11 +----
 .../res/layout/dialog_contentsettingtab.xml   | 40 +++----------------
 3 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsMain.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsMain.java
index 0c31630e0..24eaa5aab 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsMain.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsMain.java
@@ -184,9 +184,6 @@ public class ContentSettingsMain extends Fragment {
         class TabViewHolder extends RecyclerView.ViewHolder {
 
             TextView text;
-            Button remove;
-            Button up;
-            Button down;
 
             public TabViewHolder(View itemView) {
                 super(itemView);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsMainDialog.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsMainDialog.java
index 513c7cd69..aae4b4898 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsMainDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsMainDialog.java
@@ -101,26 +101,17 @@ public class ContentSettingsMainDialog extends DialogFragment {
         class TabViewHolder extends RecyclerView.ViewHolder {
 
             TextView text;
-            Button add;
-            Button up;
-            Button down;
             View view;
 
             public TabViewHolder(View itemView) {
                 super(itemView);
 
                 text = itemView.findViewById(R.id.tabName);
-                add = itemView.findViewById(R.id.buttonAddRemove);
-                up = itemView.findViewById(R.id.buttonUp);
-                down = itemView.findViewById(R.id.buttonDown);
-                view = itemView;
+                view = itemView.findViewById(R.id.layout);
             }
 
             void bind(int position) {
-                up.setBackgroundResource(0);
-                down.setBackgroundResource(0);
                 text.setText(allTabs[position]);
-                add.setBackgroundResource(0);
                 view.setOnClickListener(v -> {
                     addTab(position);
                 });
diff --git a/app/src/main/res/layout/dialog_contentsettingtab.xml b/app/src/main/res/layout/dialog_contentsettingtab.xml
index e2f0be6ae..947a5bdf6 100644
--- a/app/src/main/res/layout/dialog_contentsettingtab.xml
+++ b/app/src/main/res/layout/dialog_contentsettingtab.xml
@@ -1,51 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
     <TextView
         android:id="@+id/tabName"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:layout_marginStart="0dp"
-        android:layout_toLeftOf="@id/buttonDown"
-        android:layout_toStartOf="@id/buttonDown"
+        android:paddingLeft="3dp"
         android:paddingStart="3dp"
         android:textAppearance="?android:attr/textAppearanceListItem"
-        android:textSize="24sp"
-        android:paddingLeft="3dp" />
-
-    <Button
-        android:id="@+id/buttonAddRemove"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginEnd="0dp"
-        android:layout_marginRight="0dp"
-        android:background="@color/transparent_background_color" />
-
-    <Button
-        android:id="@+id/buttonDown"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_centerVertical="true"
-        android:layout_toLeftOf="@+id/buttonUp"
-        android:layout_toStartOf="@+id/buttonUp"
-        android:background="@color/transparent_background_color" />
-
-    <Button
-        android:id="@+id/buttonUp"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_centerVertical="true"
-        android:layout_toLeftOf="@+id/buttonAddRemove"
-        android:layout_toStartOf="@+id/buttonAddRemove"
-        android:background="@color/transparent_background_color" />
+        android:textSize="24sp" />
 
 </RelativeLayout>
\ No newline at end of file