Updating initial android ui based on scatour web ui

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@779216 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 108 insertions, 12 deletions

diff --git a/sandbox/travelsample/scatours-android-ui/bin/classes.dex b/sandbox/travelsample/scatours-android-ui/bin/classes.dex
index b5f59f23ec..bd99887b37 100644
--- a/sandbox/travelsample/scatours-android-ui/bin/classes.dex
+++ b/sandbox/travelsample/scatours-android-ui/bin/classes.dex
diff --git a/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R$layout.class b/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R$layout.class
index 2a44e6d8cb..3500401d64 100644
--- a/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R$layout.class
+++ b/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R$layout.class
diff --git a/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R$string.class b/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R$string.class
index 98ee2ba709..f8e6c81660 100644
--- a/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R$string.class
+++ b/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R$string.class
diff --git a/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R.class b/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R.class
index 70c5afc161..469ee2c951 100644
--- a/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R.class
+++ b/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R.class
diff --git a/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/TripSearch.class b/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/TripSearch.class
index 501519acb7..952ede323a 100644
--- a/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/TripSearch.class
+++ b/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/TripSearch.class
diff --git a/sandbox/travelsample/scatours-android-ui/bin/resources.ap_ b/sandbox/travelsample/scatours-android-ui/bin/resources.ap_
index 1e94426d07..1a4ca621ec 100644
--- a/sandbox/travelsample/scatours-android-ui/bin/resources.ap_
+++ b/sandbox/travelsample/scatours-android-ui/bin/resources.ap_
diff --git a/sandbox/travelsample/scatours-android-ui/bin/scatours-android-ui.apk b/sandbox/travelsample/scatours-android-ui/bin/scatours-android-ui.apk
index c49e76417c..0a3cb72ee9 100644
--- a/sandbox/travelsample/scatours-android-ui/bin/scatours-android-ui.apk
+++ b/sandbox/travelsample/scatours-android-ui/bin/scatours-android-ui.apk
diff --git a/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java b/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java
index 80c33cad57..d2976a42db 100644
--- a/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java
+++ b/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java
@@ -13,11 +13,20 @@ public final class R {
     public static final class drawable {
         public static final int icon=0x7f020000;
     }
+    public static final class id {
+        public static final int Spinner01=0x7f050006;
+        public static final int btnSearch=0x7f050005;
+        public static final int edit_NumberOfPeople=0x7f050004;
+        public static final int edit_date_end=0x7f050003;
+        public static final int edit_date_start=0x7f050002;
+        public static final int edit_fromLocation=0x7f050000;
+        public static final int edit_toLocation=0x7f050001;
+    }
     public static final class layout {
         public static final int main=0x7f030000;
+        public static final int test=0x7f030001;
     }
     public static final class string {
-        public static final int app_name=0x7f040001;
-        public static final int hello=0x7f040000;
+        public static final int app_name=0x7f040000;
     }
 }
diff --git a/sandbox/travelsample/scatours-android-ui/res/layout/main.xml b/sandbox/travelsample/scatours-android-ui/res/layout/main.xml
index 3a5f117d3c..180326ab2d 100644
--- a/sandbox/travelsample/scatours-android-ui/res/layout/main.xml
+++ b/sandbox/travelsample/scatours-android-ui/res/layout/main.xml
@@ -1,12 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<TextView  
     android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:text="@string/hello"
-    />
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="From:" />
+
+    <AutoCompleteTextView android:id="@+id/edit_fromLocation"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="LGW"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="To:"/>
+
+    <AutoCompleteTextView android:id="@+id/edit_toLocation"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="FLR"/>
+        
+     <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Start Date:" />
+        
+     <AutoCompleteTextView android:id="@+id/edit_date_start"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="06/12/09"/>
+        
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="End Date:" />
+        
+     <AutoCompleteTextView android:id="@+id/edit_date_end"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="13/12/09"/>        
+            
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Number of People:" />
+        
+     <AutoCompleteTextView android:id="@+id/edit_NumberOfPeople"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="2"/>      
+        
+        
+      <Button android:id="@+id/btnSearch" 
+        android:layout_width="100px" 
+        android:layout_height="40px"/>  
+        
 </LinearLayout>
+
+
diff --git a/sandbox/travelsample/scatours-android-ui/res/values/strings.xml b/sandbox/travelsample/scatours-android-ui/res/values/strings.xml
index 365da9489d..d0fa135e50 100644
--- a/sandbox/travelsample/scatours-android-ui/res/values/strings.xml
+++ b/sandbox/travelsample/scatours-android-ui/res/values/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="hello">Hello World, TripSearch!</string>
-    <string name="app_name">SCA Tours</string>
+    <string name="app_name">SCA Tours - Search Trip</string>
 </resources>
diff --git a/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java b/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java
index 978d97cc59..38492aa36d 100644
--- a/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java
+++ b/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java
@@ -1,7 +1,11 @@
 package com.scatours.android;
 
+import java.util.Calendar;
+
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 
 public class TripSearch extends Activity {
     /** Called when the activity is first created. */
@@ -9,5 +13,37 @@ public class TripSearch extends Activity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
+        
+        
+        ArrayAdapter adapter = new ArrayAdapter(this,android.R.layout.simple_dropdown_item_1line, AIRPORT_CODES);
+        
+        AutoCompleteTextView textViewFrom = (AutoCompleteTextView) findViewById(R.id.edit_fromLocation);
+        //ArrayAdapter adapterFrom = new ArrayAdapter(this,android.R.layout.simple_dropdown_item_1line, AIRPORT_CODES);
+        textViewFrom.setAdapter(adapter);
+        
+        AutoCompleteTextView textViewTo = (AutoCompleteTextView) findViewById(R.id.edit_toLocation);
+        //ArrayAdapter adapterTo = new ArrayAdapter(this,android.R.layout.simple_dropdown_item_1line, AIRPORT_CODES);
+        textViewTo.setAdapter(adapter);
+        
+        //String currentDate = getCurrentDate();
+        //AutoCompleteTextView textStartDate = (AutoCompleteTextView) findViewById(R.id.date_start);
+        //textStartDate.setText(currentDate.toCharArray(), 0, currentDate.length());
+        
+    }
+    
+    private String getCurrentDate() {
+        final Calendar c = Calendar.getInstance();
+        int mYear = c.get(Calendar.YEAR);
+        int mMonth = c.get(Calendar.MONTH);
+        int mDay = c.get(Calendar.DAY_OF_MONTH);
+        
+        return Integer.toString(mMonth) + "/" + Integer.toString(mDay) + "/" + Integer.toString(mYear); 
     }
+
+    static final String[] AIRPORT_CODES = new String[] {
+                                                    "LGW - London Gatwick Airport", 
+                                                    "FLR - Luigi Ridolfi Airport",
+                                                    "SFO - San Francisco Airport"
+                                                    };
+
 }
\ No newline at end of file