Merge branch 'master' into convert-activities-to-appcompat

2 files changed, 60 insertions, 30 deletions

diff --git a/app/src/main/res/layout/act_hostlist.xml b/app/src/main/res/layout/act_hostlist.xml
index bf80b1d..216fedf 100644
--- a/app/src/main/res/layout/act_hostlist.xml
+++ b/app/src/main/res/layout/act_hostlist.xml
@@ -20,54 +20,37 @@
 
 <RelativeLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	android:orientation="vertical"
 	>
 
-	<LinearLayout
-		android:id="@+id/quickconnect"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_alignParentBottom="true"
-		android:layout_alignParentLeft="true"
-		android:layout_alignParentStart="true"
-		android:orientation="horizontal"
-		>
-
-		<Spinner
-			android:id="@+id/transport_selection"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			/>
-
-		<EditText
-			android:id="@+id/front_quickconnect"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:ellipsize="end"
-			android:focusableInTouchMode="true"
-			android:hint="username@hostname:port"
-			android:inputType="textEmailAddress"
-			android:maxLines="1"
-			android:singleLine="true"/>
-	</LinearLayout>
-
 	<android.support.v7.widget.RecyclerView
 		android:id="@+id/list"
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
-		android:layout_above="@+id/quickconnect"
 		/>
 
 	<TextView
 		android:id="@+id/empty"
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
-		android:layout_above="@+id/quickconnect"
 		android:gravity="center"
 		android:text="@string/list_host_empty"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		/>
 
+	<android.support.design.widget.FloatingActionButton
+		android:id="@+id/add_host_button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:layout_alignParentEnd="true"
+		android:layout_alignParentRight="true"
+		android:layout_margin="16dp"
+		android:src="@drawable/ic_add"
+		app:backgroundTint="@color/accent"
+		app:rippleColor="@color/dark_accent" />
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/dia_add_host.xml b/app/src/main/res/layout/dia_add_host.xml
new file mode 100644
index 0000000..609690f
--- /dev/null
+++ b/app/src/main/res/layout/dia_add_host.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ ConnectBot: simple, powerful, open-source SSH client for Android
+  ~ Copyright 2015 Kenny Root, Jeffrey Sharkey
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:orientation="horizontal"
+	android:padding="10dp"
+	>
+
+	<Spinner
+		android:id="@+id/transport_selection"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		/>
+
+	<EditText
+		android:id="@+id/front_quickconnect"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:ellipsize="end"
+		android:focusableInTouchMode="true"
+		android:hint="username@hostname:port"
+		android:inputType="textEmailAddress"
+		android:maxLines="1"
+		android:singleLine="true"
+		android:layout_marginBottom="30dp"
+		/>
+
+</LinearLayout>