From 71c7a5c9ef2e03fd9e77aeeba8c82d88e47c8782 Mon Sep 17 00:00:00 2001
From: dzan <dzan@DznDesk.(none)>
Date: Mon, 25 Jul 2011 17:09:02 +0200
Subject: [PATCH] Updated the layout of the confirmation screens.

---
 AndroidManifest.xml                           |   4 +-
 res/layout/account_setup_confirm.xml          | 118 +++++++++++++-----
 .../account_setup_confirm_spinners_item.xml   |   3 +-
 .../setup/AbstractSetupConfirmActivity.java   |  12 +-
 4 files changed, 94 insertions(+), 43 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 539a8433d..678fc7cee 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -110,13 +110,13 @@
         </activity>
         <activity
             android:name="com.fsck.k9.activity.setup.AccountSetupConfirmIncoming"
-            android:label="@string/account_setup_autoconfig_title"
+            android:label="@string/account_setup_confirm_incoming_title"
             android:configChanges="keyboardHidden|orientation|locale"
             >
         </activity>
         <activity
             android:name="com.fsck.k9.activity.setup.AccountSetupConfirmOutgoing"
-            android:label="@string/account_setup_autoconfig_title"
+            android:label="@string/account_setup_confirm_outgoing_title"
             android:configChanges="keyboardHidden|orientation|locale"
             >
         </activity>
diff --git a/res/layout/account_setup_confirm.xml b/res/layout/account_setup_confirm.xml
index ae186c0b3..3855b8ce4 100644
--- a/res/layout/account_setup_confirm.xml
+++ b/res/layout/account_setup_confirm.xml
@@ -2,45 +2,95 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="fill_parent"
-              android:layout_height="fill_parent">
+              android:layout_height="fill_parent"
+              android:orientation="vertical">
 
-    <LinearLayout android:id="@+id/confirm_first_option"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <TextView android:id="@+id/confirm_type_label"
-            android:layout_width="wrap_content"
+        <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/confirm_options"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="Type" />
+            android:layout_centerHorizontal="true"
+            android:stretchColumns="3"
+            android:padding="15dp">
+            <TableRow>
+                <TextView android:layout_column="1"
+                    android:textSize="14sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Type:"
+                    android:paddingRight="40dp"/>
+                <Spinner android:id="@+id/spinner_protocol"
+                    android:layout_column="2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawSelectorOnTop="true"
+                    android:prompt="@string/account_setup_basics_email_hint" />
+                <TextView android:layout_column="3"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:text="Extra information"
+                    android:gravity="center_vertical|center_horizontal"/>
+            </TableRow>
+            <TableRow>
+                <TextView android:layout_column="1"
+                    android:textSize="16sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Security:" />
+                <Spinner android:id="@+id/spinner_sockettype"
+                    android:layout_column="2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawSelectorOnTop="true"
+                    android:prompt="@string/account_setup_basics_email_hint"/>
+                <TextView android:layout_column="3"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:text="Extra information"
+                    android:gravity="center_vertical|center_horizontal"/>
+            </TableRow>
+        </TableLayout>
 
-        <Spinner android:id="@+id/spinner_protocol"
-            android:layout_width="wrap_content"
+    <RelativeLayout android:id="@+id/server_information_header"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:drawSelectorOnTop="true"
-            android:layout_toRightOf="@id/confirm_type_label"
-            android:prompt="@string/account_setup_basics_email_hint" />
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/confirm_second_option"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_below="@id/confirm_first_option">
-        <TextView android:id="@+id/confirm_security_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Security" />
-
-        <Spinner android:id="@+id/spinner_sockettype"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawSelectorOnTop="true"
-            android:prompt="@string/account_setup_basics_email_hint"
-            android:layout_toRightOf="@id/confirm_security_label" />
-    </LinearLayout>
+            android:layout_below="@id/confirm_options"
+            android:layout_marginTop="3dp"
+            android:padding="9dp"
+            android:textSize="16sp"
+            android:background="#AAA" >
+        <TextView android:text="Server information"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"/>
+        <TextView android:id="@+id/server_count_label"
+                  android:text="( 1 / 1 )"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_alignParentRight="true"/>
+    </RelativeLayout>
 
     <TextView android:id="@+id/server_information"
+        android:padding="8dp"
+        android:layout_below="@id/server_information_header"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_below="@id/confirm_second_option"/>
+        android:layout_height="wrap_content" />
+
+    <!-- ONLY SHOW WHEN USER HAS TO ENTER A USERNAME HIMSELF -->
+    <!-- TODO -->
+
+    <!-- SHOULD ONLY BE MADE VISIBLE WHEN THERE ARE MULTIPLE MATCHING SERVERS -->
+    <!-- TODO -->
+
+    <!-- SHOULD ONLY BE MADE VISIBLE WHEN THE XML PROVIDES EXTRA INFORMATION LINKS -->
+    <!-- TODO -->
+
+    <Button android:id="@+id/confirm_ok_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:layout_centerHorizontal="true"
+            android:layout_alignParentBottom="true"
+            android:text="Ok go"/>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/account_setup_confirm_spinners_item.xml b/res/layout/account_setup_confirm_spinners_item.xml
index 044a25bba..110a31c75 100644
--- a/res/layout/account_setup_confirm_spinners_item.xml
+++ b/res/layout/account_setup_confirm_spinners_item.xml
@@ -2,7 +2,6 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:padding="10dp"
     android:layout_marginLeft="5dp"
-    android:textSize="16sp" >
+    android:textSize="14sp" >
 </TextView>
\ No newline at end of file
diff --git a/src/com/fsck/k9/activity/setup/AbstractSetupConfirmActivity.java b/src/com/fsck/k9/activity/setup/AbstractSetupConfirmActivity.java
index e56b8efcd..a70853f5e 100644
--- a/src/com/fsck/k9/activity/setup/AbstractSetupConfirmActivity.java
+++ b/src/com/fsck/k9/activity/setup/AbstractSetupConfirmActivity.java
@@ -10,11 +10,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.AdapterView;
+import android.widget.*;
 import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ArrayAdapter;
-import android.widget.Spinner;
-import android.widget.TextView;
 import com.fsck.k9.Account;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
@@ -61,6 +58,7 @@ public abstract class AbstractSetupConfirmActivity extends K9Activity implements
     Spinner mProtocolSpinner;
     Spinner mSocketTypeSpinner;
     TextView mServerInfoText;
+    Button mOkButton;
 
     // difference between incomming & outgoing
     protected abstract List<? extends Server> getServers();
@@ -76,6 +74,7 @@ public abstract class AbstractSetupConfirmActivity extends K9Activity implements
         mSocketTypeSpinner = (Spinner) findViewById(R.id.spinner_sockettype);
         mProtocolSpinner = (Spinner) findViewById(R.id.spinner_protocol);
         mServerInfoText = (TextView) findViewById(R.id.server_information);
+        mOkButton = (Button) findViewById(R.id.confirm_ok_button);
 
         // get the data out of our intent
         // if no blank account passed make one
@@ -101,11 +100,14 @@ public abstract class AbstractSetupConfirmActivity extends K9Activity implements
         // attach the listeners
         mProtocolSpinner.setOnItemSelectedListener(this);
         mSocketTypeSpinner.setOnItemSelectedListener(this);
+        mOkButton.setOnClickListener(this);
     }
 
     @Override
     public void onClick(View view) {
-        //To change body of implemented methods use File | Settings | File Templates.
+        if( view.getId() == R.id.confirm_ok_button ){
+            Toast.makeText(this,"go go go", 400).show();
+        }
     }
 
     @Override