Allow to add followed instance in the reorder tabs activity

3 files changed, 69 insertions, 19 deletions

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d1ad8e192..e5c7b2c66 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -147,17 +147,6 @@
             android:layout_margin="@dimen/fab_margin_floating"
             app:srcCompat="@drawable/ic_action_add_new"
             tools:ignore="VectorDrawableCompat" />
-
-        <android.support.design.widget.FloatingActionButton
-            android:id="@+id/federated_timeline"
-            android:layout_width="wrap_content"
-            android:contentDescription="@string/follow_instance"
-            android:layout_height="wrap_content"
-            app:fabSize="mini"
-            android:layout_gravity="bottom|start"
-            android:layout_margin="@dimen/fab_margin_floating"
-            app:srcCompat="@drawable/ic_public_world"
-            tools:ignore="VectorDrawableCompat" />
     </android.support.design.widget.CoordinatorLayout>
 
     <android.support.design.widget.NavigationView
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 0ff791af3..1347fe518 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -214,14 +214,6 @@
                 />
         </RadioGroup>
 
-        <!-- HIDE FOLLOW INSTANCE BUTTON  -->
-        <CheckBox
-            android:id="@+id/set_display_follow_instance"
-            android:layout_width="wrap_content"
-            android:layout_marginTop="@dimen/settings_checkbox_margin"
-            android:layout_marginBottom="@dimen/settings_checkbox_margin"
-            android:text="@string/set_display_follow_instance"
-            android:layout_height="wrap_content" />
 
         <!-- DISPLAY NEW BADGE -->
         <CheckBox
diff --git a/app/src/main/res/layout/simple_bar_add.xml b/app/src/main/res/layout/simple_bar_add.xml
new file mode 100644
index 000000000..c5a934cfa
--- /dev/null
+++ b/app/src/main/res/layout/simple_bar_add.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2017 Thomas Schneider
+
+    This file is a part of Mastalab
+
+    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.
+
+    Mastalab 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 Mastalab; if not,
+    see <http://www.gnu.org/licenses>.
+-->
+<android.support.v7.widget.Toolbar 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:id="@+id/toolbar"
+    android:contentInsetLeft="0dp"
+    android:contentInsetStart="0dp"
+    app:contentInsetLeft="0dp"
+    app:contentInsetStart="0dp"
+    android:contentInsetRight="0dp"
+    android:contentInsetEnd="0dp"
+    app:contentInsetRight="0dp"
+    app:contentInsetEnd="0dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/colorPrimary"
+    app:popupTheme="?attr/popupOverlay"
+    tools:ignore="UnusedAttribute">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <ImageView
+            android:id="@+id/toolbar_close"
+            android:src="@drawable/ic_close"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:gravity="center_vertical"
+            android:layout_marginEnd="10dp"
+            android:layout_marginRight="10dp"
+            android:contentDescription="@string/close" />
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:scrollHorizontally="true"
+            android:ellipsize="end"
+            android:layout_gravity="center_vertical"
+            android:layout_height="wrap_content"
+            android:textColor="?attr/actionBarTextColor"
+            android:textSize="16sp"
+            android:maxLines="1"
+            android:id="@+id/toolbar_title" />
+        <ImageView
+            android:id="@+id/add_remote_instance"
+            android:src="@drawable/ic_add"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_gravity="center_vertical"
+            android:gravity="center_vertical"
+            android:contentDescription="@string/add_remote_instance"/>
+    </LinearLayout>
+
+</android.support.v7.widget.Toolbar>
\ No newline at end of file