From dd525d0d032ef28e1eab0a8d89e32eb5e72654bb Mon Sep 17 00:00:00 2001
From: Nathan Lasseter <nathan@4574.co.uk>
Date: Wed, 22 May 2013 17:39:57 +0100
Subject: Username & Password

---
 res/layout/start.xml   | 29 +++++++++++++++++++++++++++--
 res/values/strings.xml |  2 ++
 2 files changed, 29 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/layout/start.xml b/res/layout/start.xml
index d0f7d30..0168774 100644
--- a/res/layout/start.xml
+++ b/res/layout/start.xml
@@ -1,6 +1,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+    android:layout_width="fill_parent"
     android:layout_height="match_parent"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
@@ -39,13 +39,17 @@
         android:layout_below="@+id/protocol"
         android:ems="10"
         android:hint="@string/uri"
-        android:inputType="textUri" />
+        android:inputType="textUri">
+
+        <requestFocus />
+    </EditText>
 
     <EditText
         android:id="@+id/port"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
+        android:layout_alignRight="@+id/protocol"
         android:layout_below="@+id/uri"
         android:ems="10"
         android:hint="@string/port"
@@ -59,4 +63,25 @@
         android:layout_below="@+id/port"
         android:text="@string/connect" />
 
+    <EditText
+        android:id="@+id/username"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignRight="@+id/password"
+        android:layout_below="@+id/connectbutton"
+        android:ems="10"
+        android:hint="@string/username"
+        android:inputType="text" />
+
+    <EditText
+        android:id="@+id/password"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/username"
+        android:ems="10"
+        android:hint="@string/password"
+        android:inputType="textPassword" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2c832b0..23ecb7c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8,5 +8,7 @@
     <string name="tcp">TCP</string>
     <string name="ssl">SSL</string>
     <string name="port">Port</string>
+    <string name="username">Username</string>
+    <string name="password">Password</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.1