From 89605d7270d346adacc8dd9fa3180178c3a0c059 Mon Sep 17 00:00:00 2001
From: Jeffrey Sharkey <jsharkey@jsharkey.org>
Date: Sat, 25 Oct 2008 02:36:07 +0000
Subject: * updated prefs to handle enter key nicely (singleLine) * moved
 wizard stuff around so scrollview works as expected between different steps
 (instead of fixed height) * added password dialog to console--it will manage
 showing/hiding as needed

---
 res/layout/act_console.xml  | 40 ++++++++++++++++++++++++++++++++++++----
 res/layout/act_wizard.xml   | 15 +++------------
 res/layout/wiz_eula.xml     | 20 +++++++++++++++-----
 res/layout/wiz_features.xml | 12 ++++++++++--
 4 files changed, 64 insertions(+), 23 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/act_console.xml b/res/layout/act_console.xml
index 3f0f66b..39564d8 100644
--- a/res/layout/act_console.xml
+++ b/res/layout/act_console.xml
@@ -16,9 +16,41 @@
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-
-<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/console_flip"  
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"  
 	android:layout_height="fill_parent"  
-	/>
+	>
+	
+	<TextView
+		android:id="@android:id/empty"
+		android:layout_width="fill_parent"  
+		android:layout_height="fill_parent"  
+		android:text="No hosts currently connected"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:gravity="center" 
+		/>
+
+	<ViewFlipper 
+		android:id="@+id/console_flip"  
+		android:layout_width="fill_parent"  
+		android:layout_height="fill_parent" 
+		/>
+
+	<FrameLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:padding="5dip"  
+		>
+		
+		<EditText
+			android:id="@+id/console_password"
+			android:layout_width="fill_parent"  
+			android:layout_height="wrap_content"
+			android:password="true"
+			android:singleLine="true"  
+			/>
+	
+	</FrameLayout>
+	
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/act_wizard.xml b/res/layout/act_wizard.xml
index 3b97103..73cf130 100644
--- a/res/layout/act_wizard.xml
+++ b/res/layout/act_wizard.xml
@@ -24,22 +24,13 @@
 	android:gravity="right"
 	>
 
-	<ScrollView
-		xmlns:android="http://schemas.android.com/apk/res/android"
+	<ViewFlipper
+		android:id="@+id/wizard_flipper"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:layout_weight="1"
-		android:id="@+id/wizard_scroll"
-		>
+		/>
 		
-		<ViewFlipper
-			android:id="@+id/wizard_flipper"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			/>
-		
-	</ScrollView>
-	
 	<LinearLayout
 		android:orientation="horizontal"
 		android:layout_width="wrap_content"
diff --git a/res/layout/wiz_eula.xml b/res/layout/wiz_eula.xml
index 20af081..7616612 100644
--- a/res/layout/wiz_eula.xml
+++ b/res/layout/wiz_eula.xml
@@ -16,8 +16,14 @@
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<LinearLayout
+<ScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	>
+	
+<LinearLayout
 	android:orientation="vertical"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
@@ -43,7 +49,7 @@
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:paddingTop="10dip"
-		android:text="Before we get started, we need to get some legal information out of the way.  ConnectBot is provided under a GPLv3 license.  Here are a few key points:\n\nThere is no warranty for the program, to the extent permitted by applicable law.  Except when otherwise stated in writing the copyright holders and/or other parties provide the program 'as is' without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.  The entire risk as to the quality and performance of the program is with you.  Should the program prove defective, you assume the cost of all necessary servicing, repair or correction.\n\nIn no event unless required by applicable law or agreed to in writing will any copyright holder, or any other party who modifies and/or conveys the program as permitted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the program (including but not limited to loss of data or data being rendered inaccurate or losses sustained by you or third parties or a failure of the program to operate with any other programs), even if such holder or other party has been advised of the possibility of such damages."
+		android:text="Before we get started, we need to get some legal information out of the way.  ConnectBot is provided under a GPLv3 license.  Here are a few key points:\n\nThis 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.\n\nThis program 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."
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		/>
 
@@ -53,7 +59,8 @@
 		android:paddingTop="10dip"
 		android:autoLink="web"
 		android:text="You can view the full text at http://www.gnu.org/licenses/gpl-3.0.txt"
-		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textSize="14sp"
+		android:textColor="#bebebe"
 		/>
 
  	<TextView
@@ -69,9 +76,12 @@
 		android:layout_height="wrap_content"
 		android:paddingTop="10dip"
 		android:autoLink="web"
-		android:text="Copyright (c) 2007-2008 Kenny Root http://the-b.org, Jeffrey Sharkey http://jsharkey.org\n\nBased in part on the Trilead SSH2 client, provided under a BSD-style license.  Copyright (c) 2007 Trilead AG.  http://www.trilead.com\n\nAlso based on JTA Telnet/SSH client, provided under the GPLv2 license.  Copyright (c) Matthias L. Jugel, Marcus Meiner 1996-2005.  http://www.javassh.org"
-		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:text="Copyright \u00a9 2007-2008 Kenny Root http://the-b.org, Jeffrey Sharkey http://jsharkey.org\n\nBased in part on the Trilead SSH2 client, provided under a BSD-style license.  Copyright \u00a9 2007 Trilead AG.  http://www.trilead.com\n\nAlso based on JTA Telnet/SSH client, provided under the GPLv2 license.  Copyright \u00a9 Matthias L. Jugel, Marcus Meiner 1996-2005.  http://www.javassh.org"
+		android:textSize="14sp"
+		android:textColor="#bebebe"
 		/>
  
 		
 </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/wiz_features.xml b/res/layout/wiz_features.xml
index b6e07b1..cfda82a 100644
--- a/res/layout/wiz_features.xml
+++ b/res/layout/wiz_features.xml
@@ -16,14 +16,20 @@
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<LinearLayout
+<ScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	>
+	
+<LinearLayout
 	android:orientation="vertical"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
 	android:padding="10dip"
 	>
-	
+
 	<TextView
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
@@ -66,3 +72,5 @@
 		/>
 
 </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
-- 
cgit v1.2.3