New selection menu

app/src/main/res/layout/dialog_contentsettings.xml

@@ -1,83 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:minWidth="550dp"
-    android:orientation="vertical"
-    android:padding="12dp">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_alignParentTop="true"
-        android:layout_above="@id/buttonLayout"
+        android:layout_margin="2dp"
         android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/firstText"
+        <RelativeLayout
+            android:id="@+id/topBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="2dp"
-            android:paddingTop="2dp"
-            android:text="@string/selection"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
+            android:layout_marginBottom="5dp"
+            android:orientation="horizontal"
+            android:paddingBottom="3dp"
+            android:paddingTop="3dp">
 
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/tabs"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="0dp"
-            android:background="@color/gray_transparent">
+            <TextView
+                android:id="@+id/secondText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="3dp"
+                android:text="@string/chosenTabs"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
 
-        </android.support.v7.widget.RecyclerView>
+            <Button
+                android:id="@+id/buttonAdd"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="10dp"
+                android:background="@color/transparent_background_color"
+                android:paddingBottom="5dp"
+                android:paddingLeft="5dp"
+                android:paddingRight="15dp"
+                android:paddingTop="5dp" />
 
-        <TextView
-            android:id="@+id/secondText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="2dp"
-            android:paddingTop="2dp"
-            android:text="@string/chosenTabs"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
+        </RelativeLayout>
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/usedTabs"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="0dp"
-            android:background="@color/gray_transparent" />
+            android:layout_height="match_parent"
+            android:layout_margin="0dp" />
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/buttonLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="10dp"
-        android:orientation="horizontal"
-        android:padding="4dp">
-
-        <TextView
-            android:id="@+id/cancelText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="4dp"
-            android:paddingLeft="6dp"
-            android:paddingRight="6dp"
-            android:text="@string/cancel"
-            android:textColor="@color/black_settings_accent_color"
-            android:textStyle="bold" />
-
-        <TextView
-            android:id="@+id/confirmText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="4dp"
-            android:text="@string/accept"
-            android:textColor="@color/black_settings_accent_color"
-            android:textStyle="bold" />
-
-    </LinearLayout>
 </RelativeLayout>

app/src/main/res/layout/dialog_contentsettingsadd.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/allTabs"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="0dp" />
+
+</RelativeLayout>

app/src/main/res/layout/dialog_contentsettingtab.xml

@@ -8,18 +8,16 @@
         android:id="@+id/tabName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="2dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
         android:layout_marginStart="0dp"
-        android:paddingBottom="2dp"
-        android:paddingLeft="2dp"
+        android:layout_toLeftOf="@id/buttonDown"
+        android:layout_toStartOf="@id/buttonDown"
         android:paddingStart="3dp"
-        android:paddingTop="2dp"
         android:textAppearance="?android:attr/textAppearanceListItem"
         android:textSize="24sp"
-        android:layout_toStartOf="@id/buttonDown"
-        android:layout_toLeftOf="@id/buttonDown"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
+        android:paddingLeft="3dp" />
 
     <Button
         android:id="@+id/buttonAddRemove"

app/src/main/res/values/attrs.xml

@@ -35,6 +35,7 @@
     <attr name="ic_import_export" format="reference"/>
     <attr name="ic_save" format="reference"/>
     <attr name="ic_backup" format="reference"/>
+    <attr name="ic_add" format="reference"/>
 
     <!-- Can't refer to colors directly into drawable's xml-->
     <attr name="toolbar_shadow_drawable" format="reference"/>

app/src/main/res/values/styles.xml

@@ -51,6 +51,7 @@
         <item name="ic_import_export">@drawable/ic_import_export_black_24dp</item>
         <item name="ic_save">@drawable/ic_save_black_24dp</item>
         <item name="ic_backup">@drawable/ic_backup_black_24dp</item>
+        <item name="ic_add">@drawable/ic_add_black_24dp</item>
 
         <item name="separator_color">@color/light_separator_color</item>
         <item name="contrast_background_color">@color/light_contrast_background_color</item>
@@ -108,6 +109,7 @@
         <item name="ic_import_export">@drawable/ic_import_export_white_24dp</item>
         <item name="ic_save">@drawable/ic_save_white_24dp</item>
         <item name="ic_backup">@drawable/ic_backup_white_24dp</item>
+        <item name="ic_add">@drawable/ic_add_white_24dp</item>
 
         <item name="separator_color">@color/dark_separator_color</item>
         <item name="contrast_background_color">@color/dark_contrast_background_color</item>

app/src/main/res/xml/content_settings.xml

@@ -43,7 +43,8 @@
         android:title="@string/download_thumbnail_title"
         android:summary="@string/download_thumbnail_summary"/>
 
-    <Preference
+    <PreferenceScreen
+        android:fragment="org.schabi.newpipe.settings.ContentSettingsMain"
         android:summary="@string/main_page_content_summary"
         android:key="@string/main_page_content_key"
         android:title="@string/main_page_content"/>