diff options
5 files changed, 124 insertions, 6 deletions
diff --git a/sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java b/sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java index cbc020bdba..777832aa4c 100644 --- a/sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java +++ b/sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java @@ -20,6 +20,7 @@ public final class R { 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 int listPackages=0x7f050006; } public static final class layout { public static final int search=0x7f030000; diff --git a/sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml b/sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml index fe20d9d7ce..1af13900a3 100644 --- a/sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml +++ b/sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml @@ -1,6 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content"> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView android:text="Available Packages" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + + <ListView android:id="@+id/listPackages" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> </LinearLayout> diff --git a/sandbox/travelsample/scatours-android-ui/src/scatours/SCAToursSearchProxy.java b/sandbox/travelsample/scatours-android-ui/src/scatours/SCAToursSearchProxy.java index d43d5f7029..cfd6b98bcf 100644 --- a/sandbox/travelsample/scatours-android-ui/src/scatours/SCAToursSearchProxy.java +++ b/sandbox/travelsample/scatours-android-ui/src/scatours/SCAToursSearchProxy.java @@ -55,12 +55,13 @@ public class SCAToursSearchProxy implements SCAToursSearch { for(int i = 0; i < result.length(); i++) { TripItem item = new TripItem(); + item.setType(result.getJSONObject(i).getString("type")); item.setName(result.getJSONObject(i).getString("name")); item.setDescription(result.getJSONObject(i).getString("description")); item.setLocation(result.getJSONObject(i).getString("location")); item.setFromDate(result.getJSONObject(i).getString("fromDate")); item.setToDate(result.getJSONObject(i).getString("toDate")); - item.setPrice(result.getJSONObject(i).getLong("price")); + item.setPrice(result.getJSONObject(i).getDouble("price")); item.setCurrency(result.getJSONObject(i).getString("currency")); tripCatalog.add(item); diff --git a/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java b/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java index e2eb98625b..b64c14a583 100644 --- a/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java +++ b/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java @@ -5,6 +5,9 @@ import scatours.SCAToursSearchProxy; import scatours.common.TripItem; import scatours.common.TripLeg; import android.app.Activity; +import android.app.AlertDialog; +import android.content.DialogInterface; +import android.content.Intent; import android.os.Bundle; import android.util.Log; import android.view.View; @@ -127,8 +130,57 @@ public class TripSearch extends Activity { tripLeg.setNoOfPeople("2"); TripItem[] tripsAvailable = searchProxy.search(tripLeg); - Log.i(getString(R.string.app_name),"Found " + tripsAvailable.length + " trips"); + + Log.i(getString(R.string.app_name),"Calling Results view..."); + + displayTripSearchResults(tripsAvailable); + + /* + try { + Intent resultView = new Intent(this, TripSearchResults.class); + resultView.putExtra("results", tripsAvailable); + startActivity(resultView); + } catch(Exception e) { + Log.e(getString(R.string.app_name), e.getMessage()); + } + */ + + //TripSearchResults searchResults = new TripSearchResults(tripsAvailable); + //searchResults.setContentView(R.layout.search_results); + + Log.i(getString(R.string.app_name),"Called..."); + + } + + private void displayTripSearchResults(TripItem[] tripsAvailable) { + + String result = ""; + for(TripItem item : tripsAvailable) { + Log.i(getString(R.string.app_name), "Item type:" + item.getType()); + if (item.getType().equals(TripItem.TRIP)) { + result += item.getDescription() + " (" + item.getCurrency() + " " + item.getPrice() + ")\n"; + } + } + + + //Search trips here + new AlertDialog.Builder(TripSearch.this) + .setTitle("SCATour") + .setMessage("Found:\n" + result) + .setIcon(R.drawable.icon) + .setCancelable(false) + .setPositiveButton(R.string.alert_yes, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int whichButton) { + + }}) + .setNegativeButton(R.string.alert_cancel, new DialogInterface.OnClickListener(){ + public void onClick(DialogInterface dialog, int which) { + + } + }) + .show(); + } }
\ No newline at end of file diff --git a/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearchResults.java b/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearchResults.java new file mode 100644 index 0000000000..002ef8def1 --- /dev/null +++ b/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearchResults.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +package scatours.android; + +import scatours.common.TripItem; +import android.app.Activity; +import android.os.Bundle; +import android.util.Log; +import android.widget.ArrayAdapter; +import android.widget.ListView; + +public class TripSearchResults extends Activity { + private TripItem[] results; + + private ListView listResults; + + public TripSearchResults( ) { + super(); + } + + public void setResults(TripItem[] results) { + Log.i(getString(R.string.app_name),"Setting results : " + results.length); + this.results = results; + } + + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.search_results); + + Log.i(getString(R.string.app_name),"Displaying " + results.length + " trips"); + + listResults = (ListView) findViewById(R.id.listPackages); + //listResults.setAdapter(new ArrayAdapter<TripItem>(this, R.id.listPackages, results)); + + + } + +} |