Advanced search working again, off of the Search activity

diff --git a/Open-ILS/src/Android/core/res/layout/advanced_search.xml b/Open-ILS/src/Android/core/res/layout/advanced_search.xml
index 52ef8d8..e526618 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout/advanced_search.xml
+++ b/Open-ILS/src/Android/core/res/layout/advanced_search.xml
@@ -6,10 +6,6 @@
     android:background="@drawable/background_grey_image"
     >
 
-    <include
-        android:id="@+id/header_actionbar"
-        layout="@layout/simple_actionbar" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -75,11 +71,13 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="60dip"
-        android:background="@drawable/bottom_rounded_menu_background"
+        android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="horizontal"
         android:padding="5dip" >
+        <!--
+                android:background="@drawable/bottom_rounded_menu_background"
+        -->
 
         <Button
             android:id="@+id/advanced_search_cancel"

diff --git a/Open-ILS/src/Android/core/res/menu/menu_main.xml b/Open-ILS/src/Android/core/res/menu/menu_main.xml
index 48e66cd..a7758e0 100644 (file)
--- a/Open-ILS/src/Android/core/res/menu/menu_main.xml
+++ b/Open-ILS/src/Android/core/res/menu/menu_main.xml
@@ -3,7 +3,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:yourapp="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/action_search"
-          android:icon="@drawable/ic_action_search"
+          android:icon="@drawable/abc_ic_search"
           android:title="@string/title_search"
           yourapp:showAsAction="ifRoom"/>
+    <item android:id="@+id/action_advanced_search"
+          android:icon="@drawable/abc_ic_search"
+          android:title="@string/advanced_search"/>
 </menu>
\ No newline at end of file

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/AdvancedSearchActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/AdvancedSearchActivity.java
index 1065ab6..c8ce1e9 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/AdvancedSearchActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/AdvancedSearchActivity.java
@@ -21,6 +21,8 @@ package org.evergreen_ils.searchCatalog;
 
 import java.util.StringTokenizer;
 
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
 import org.evergreen_ils.R;
 import org.evergreen_ils.accountAccess.AccountAccess;
 import org.evergreen_ils.views.AccountScreenDashboard;
@@ -39,20 +41,12 @@ import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-public class AdvancedSearchActivity extends Activity {
+public class AdvancedSearchActivity extends ActionBarActivity {
 
     private final String TAG = AdvancedSearchActivity.class.getName();
 
-    private AccountAccess accountAccess = null;
-
     private Context context;
 
-    private Button homeButton;
-
-    private Button myAccountButton;
-
-    private TextView headerTitle;
-
     private StringBuilder advancedSearchFormattedText;
 
     public static final int RESULT_ADVANCED_SEARCH = 10;
@@ -67,30 +61,12 @@ public class AdvancedSearchActivity extends Activity {
 
         setContentView(R.layout.advanced_search);
 
-        advancedSearchFormattedText = new StringBuilder();
+        // set up action bar
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setSubtitle(AccountAccess.userName);
+        actionBar.setDisplayHomeAsUpEnabled(true);
 
-        // header portion actions
-        myAccountButton = (Button) findViewById(R.id.my_account_button);
-        myAccountButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getApplicationContext(),
-                        AccountScreenDashboard.class);
-                startActivity(intent);
-            }
-        });
-
-        homeButton = (Button) findViewById(R.id.action_bar_home_button);
-        homeButton.setText(R.string.advanced_search);
-        homeButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getApplicationContext(),
-                        SearchCatalogListView.class);
-                startActivity(intent);
-            }
-        });
-        // end header portion actions
+        advancedSearchFormattedText = new StringBuilder();
 
         context = this;
 
@@ -128,10 +104,8 @@ public class AdvancedSearchActivity extends Activity {
                     break;
                 case 1: {
                     // excludes
-
                     StringTokenizer str = new StringTokenizer(
                             search_filter_text.getText().toString());
-
                     while (str.hasMoreTokens()) {
                         String token = str.nextToken(" ");
                         advancedSearchFormattedText.append(" -" + token);

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java
index a4c8742..add1d85 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java
@@ -24,6 +24,7 @@ import java.util.List;
 
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
+import android.view.*;
 import org.evergreen_ils.R;
 import org.evergreen_ils.R.layout;
 import org.evergreen_ils.accountAccess.AccountAccess;
@@ -44,16 +45,9 @@ import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnKeyListener;
-import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AbsListView;
@@ -133,18 +127,6 @@ public class SearchCatalogListView extends ActionBarActivity {
         actionBar.setSubtitle(AccountAccess.userName);
         actionBar.setDisplayHomeAsUpEnabled(true);
 
-        /*
-        advancedSearchButton = (Button) findViewById(R.id.menu_advanced_search_button);
-        advancedSearchButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                // show advanced view dialog
-                Intent advancedSearch = new Intent(context, AdvancedSearchActivity.class);
-                startActivityForResult(advancedSearch, 2);
-            }
-        });
-        */
-
         // get bookbags
         bookBags = AccountAccess.getAccountAccess().getBookbags();
 
@@ -540,9 +522,7 @@ public class SearchCatalogListView extends ActionBarActivity {
                 View layout = inflater.inflate(R.layout.bookbag_spinner, null);
 
                 Spinner s = (Spinner) layout.findViewById(R.id.bookbag_spinner);
-
-                Button add = (Button) layout
-                        .findViewById(R.id.add_to_bookbag_button);
+                Button add = (Button) layout.findViewById(R.id.add_to_bookbag_button);
                 ArrayAdapter adapter = new ArrayAdapter(context,
                         android.R.layout.simple_spinner_item, array_spinner);
 
@@ -559,8 +539,7 @@ public class SearchCatalogListView extends ActionBarActivity {
                         Thread addtoBookbag = new Thread(new Runnable() {
                             @Override
                             public void run() {
-                                AccountAccess ac = AccountAccess
-                                        .getAccountAccess();
+                                AccountAccess ac = AccountAccess.getAccountAccess();
                                 try {
                                     ac.addRecordToBookBag(info.doc_id,
                                             bookBags.get(bookbag_selected).id);
@@ -612,30 +591,41 @@ public class SearchCatalogListView extends ActionBarActivity {
     }
 
     @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu_main, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        if (id == R.id.action_search) {
+            startActivityForResult(new Intent(getApplicationContext(), AdvancedSearchActivity.class), 2);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
         switch (resultCode) {
 
         case SampleUnderlinesNoFade.RETURN_DATA : {
-            
             ArrayList<RecordInfo> records = (ArrayList)data.getSerializableExtra("recordList");
-        
             recordList.clear();
             for(int i=0;i<records.size();i++){
                 recordList.add(records.get(i));
             }
             adapter.notifyDataSetChanged();
-            
-            searchResultsNumber.setText(adapter
-                    .getCount()
-                    + " out of "
-                    + search.visible);
+            searchResultsNumber.setText(adapter.getCount()
+                    + " out of " + search.visible);
         }
         break;
         
         case AdvancedSearchActivity.RESULT_ADVANCED_SEARCH: {
-            Log.d(TAG,
-                    "result text" + data.getStringExtra("advancedSearchText"));
+            Log.d(TAG, "result text:" + data.getStringExtra("advancedSearchText"));
             searchText.setText(data.getStringExtra("advancedSearchText"));
             Thread searchThread = new Thread(searchForResultsRunnable);
             searchThread.start();

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/MainActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/MainActivity.java
index d17421f..c010491 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/MainActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/MainActivity.java
@@ -17,6 +17,7 @@ import org.evergreen_ils.accountAccess.checkout.ItemsCheckOutListView;
 import org.evergreen_ils.accountAccess.fines.FinesActivity;
 import org.evergreen_ils.accountAccess.holds.HoldsListView;
 import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.searchCatalog.AdvancedSearchActivity;
 import org.evergreen_ils.searchCatalog.SearchCatalogListView;
 import org.evergreen_ils.views.splashscreen.SplashActivity;
 

diff --git a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
index 0228adb..c093484 100644 (file)
--- a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
@@ -83,7 +83,9 @@
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="org.evergreen_ils.views.MainActivity"/>
         </activity>
-        <activity android:name="org.evergreen_ils.searchCatalog.AdvancedSearchActivity" >
+        <activity
+                android:name="org.evergreen_ils.searchCatalog.AdvancedSearchActivity"
+                android:label="@string/advanced_search">
         </activity>
         <activity
             android:name="org.evergreen_ils.barcodescan.CaptureActivity"