From f0b7fc08076a8b5238a2fa97993ef5ed040ee810 Mon Sep 17 00:00:00 2001
From: drizea <danielrizea27@gmail.com>
Date: Wed, 25 Jul 2012 12:06:11 +0300
Subject: [PATCH] added header action bar to activities + bug fix on delete
 bookbag

added action bar to activities and added title for good user navigation
---
 .../res/drawable/header_rounded_corners.xml        |  2 +-
 .../res/drawable/one_header_rounded_corner.xml     |  8 +++
 Open-ILS/src/Android/res/layout/bookbag_list.xml   |  3 ++
 .../src/Android/res/layout/bookbagitem_list.xml    |  1 +
 Open-ILS/src/Android/res/layout/checkout_list.xml  |  3 ++
 Open-ILS/src/Android/res/layout/fines.xml          |  2 +
 Open-ILS/src/Android/res/layout/hold_details.xml   | 24 +--------
 Open-ILS/src/Android/res/layout/holds_list.xml     |  3 ++
 .../src/Android/res/layout/search_result_list.xml  |  6 ++-
 .../src/Android/res/layout/simple_actionbar.xml    | 32 ++++++++++--
 Open-ILS/src/Android/res/values/strings.xml        | 10 ++++
 Open-ILS/src/Android/res/values/styles.xml         |  4 ++
 .../accountAccess/bookbags/BookBagDetails.java     | 40 +++++++++++----
 .../accountAccess/bookbags/BookbagsListView.java   | 31 ++++++++++++
 .../checkout/ItemsCheckOutListView.java            | 33 ++++++++++++
 .../android/accountAccess/fines/FinesActivity.java | 34 +++++++++++++
 .../android/accountAccess/holds/HoldDetails.java   | 42 +++++++++++----
 .../android/accountAccess/holds/HoldsListView.java | 32 ++++++++++++
 .../searchCatalog/SampleUnderlinesNoFade.java      | 33 +++++++++++-
 .../searchCatalog/SearchCatalogListView.java       | 59 ++++++++++++++++------
 .../android/utils/ui/BasicDetailsFragment.java     |  4 +-
 21 files changed, 338 insertions(+), 68 deletions(-)
 create mode 100644 Open-ILS/src/Android/res/drawable/one_header_rounded_corner.xml

diff --git a/Open-ILS/src/Android/res/drawable/header_rounded_corners.xml b/Open-ILS/src/Android/res/drawable/header_rounded_corners.xml
index ff1ab2eadc..723a013d88 100644
--- a/Open-ILS/src/Android/res/drawable/header_rounded_corners.xml
+++ b/Open-ILS/src/Android/res/drawable/header_rounded_corners.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?> 
 <shape xmlns:android="http://schemas.android.com/apk/res/android" 
      android:shape="rectangle"> 
-     <gradient android:startColor="@color/header_gradient_start" android:endColor="@color/header_gradient_stop" 
+     <gradient android:startColor="@color/header_gradient_stop" android:endColor="@color/header_gradient_stop" 
             android:angle="270"/> 
 
     <corners android:bottomRightRadius="8dp" android:bottomLeftRadius="8dp" /> 
diff --git a/Open-ILS/src/Android/res/drawable/one_header_rounded_corner.xml b/Open-ILS/src/Android/res/drawable/one_header_rounded_corner.xml
new file mode 100644
index 0000000000..f081f7ba6e
--- /dev/null
+++ b/Open-ILS/src/Android/res/drawable/one_header_rounded_corner.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<shape xmlns:android="http://schemas.android.com/apk/res/android" 
+     android:shape="rectangle"> 
+     <gradient android:startColor="@color/header_gradient_start" android:endColor="@color/header_gradient_stop" 
+            android:angle="270"/> 
+
+    <corners android:bottomLeftRadius="8dp"/> 
+</shape> 
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/layout/bookbag_list.xml b/Open-ILS/src/Android/res/layout/bookbag_list.xml
index 19e543ffbc..8d96a54aa6 100644
--- a/Open-ILS/src/Android/res/layout/bookbag_list.xml
+++ b/Open-ILS/src/Android/res/layout/bookbag_list.xml
@@ -4,10 +4,13 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
    
+    <include android:id="@+id/header_actionbar" layout="@layout/simple_actionbar"/>
+    
     <LinearLayout 
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        style="@style/Content"
         >
 
         <TextView 
diff --git a/Open-ILS/src/Android/res/layout/bookbagitem_list.xml b/Open-ILS/src/Android/res/layout/bookbagitem_list.xml
index c433c1e2d9..75ab737d3e 100644
--- a/Open-ILS/src/Android/res/layout/bookbagitem_list.xml
+++ b/Open-ILS/src/Android/res/layout/bookbagitem_list.xml
@@ -4,6 +4,7 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
     
+    <include android:id="@+id/header_actionbar" layout="@layout/simple_actionbar"/>
     
     <LinearLayout 
         android:layout_width="fill_parent"
diff --git a/Open-ILS/src/Android/res/layout/checkout_list.xml b/Open-ILS/src/Android/res/layout/checkout_list.xml
index 0f81f555f1..3e804023dd 100644
--- a/Open-ILS/src/Android/res/layout/checkout_list.xml
+++ b/Open-ILS/src/Android/res/layout/checkout_list.xml
@@ -4,6 +4,9 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
     
+    
+   	<include android:id="@+id/header_actionbar" layout="@layout/simple_actionbar"/>
+    
     <LinearLayout android:layout_width="fill_parent"
          android:layout_height="wrap_content">
          <TextView 
diff --git a/Open-ILS/src/Android/res/layout/fines.xml b/Open-ILS/src/Android/res/layout/fines.xml
index feb41cf41a..a6b59700ba 100644
--- a/Open-ILS/src/Android/res/layout/fines.xml
+++ b/Open-ILS/src/Android/res/layout/fines.xml
@@ -4,6 +4,8 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
+   	<include android:id="@+id/header_actionbar" layout="@layout/simple_actionbar"/>
+    
          <TableLayout 
              android:layout_width="fill_parent"
              android:layout_height="wrap_content"
diff --git a/Open-ILS/src/Android/res/layout/hold_details.xml b/Open-ILS/src/Android/res/layout/hold_details.xml
index 5871df6398..4608f040e0 100644
--- a/Open-ILS/src/Android/res/layout/hold_details.xml
+++ b/Open-ILS/src/Android/res/layout/hold_details.xml
@@ -3,27 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
   
-    
-    <LinearLayout
-		android:id="@+id/header"
-        android:layout_width="fill_parent"
-        android:layout_height="40dip"
-        android:background="@color/blue"
-        android:layout_alignParentTop="true"
-    >
-    	    <TextView
-    	        android:id="@+id/header_title"
-    	        android:layout_width="wrap_content"
-    	        android:layout_height="wrap_content"
-    	        android:paddingLeft="5dip"
-    	        android:paddingTop="5dip"
-    	        android:textColor="@color/white"
-    	        android:textStyle="bold"
-    	        android:textSize="16dip"
-    	        />
-
-        
-    </LinearLayout>
+  	<include android:id="@+id/header_actionbar" layout="@layout/simple_actionbar"/>
         
     	<LinearLayout
     	    android:id="@+id/action_bar"
@@ -61,7 +41,7 @@
         android:layout_height="wrap_content"
         android:fillViewport="true"
         android:layout_above="@id/action_bar"
-        android:layout_below="@id/header"
+        android:layout_below="@id/header_actionbar"
         >
        <LinearLayout 
            android:layout_width="fill_parent"
diff --git a/Open-ILS/src/Android/res/layout/holds_list.xml b/Open-ILS/src/Android/res/layout/holds_list.xml
index b03267e0bc..b7bb8375a5 100644
--- a/Open-ILS/src/Android/res/layout/holds_list.xml
+++ b/Open-ILS/src/Android/res/layout/holds_list.xml
@@ -3,6 +3,9 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
+    
+    <include android:id="@+id/header_actionbar" layout="@layout/simple_actionbar"/>
+    
      <LinearLayout android:layout_width="fill_parent"
          android:layout_height="wrap_content">
          <TextView 
diff --git a/Open-ILS/src/Android/res/layout/search_result_list.xml b/Open-ILS/src/Android/res/layout/search_result_list.xml
index 22219e56b4..41929f6550 100644
--- a/Open-ILS/src/Android/res/layout/search_result_list.xml
+++ b/Open-ILS/src/Android/res/layout/search_result_list.xml
@@ -38,6 +38,8 @@
             android:layout_height="wrap_content"
             android:padding="4dp"
             android:id="@+id/search_text_container"
+            android:focusable="true" 
+    		android:focusableInTouchMode="true"
             android:layout_below="@id/library_logo">
 
             <EditText
@@ -101,6 +103,7 @@
              />
          
             <Button 
+             android:id="@+id/library_hours_button"
              android:layout_width="fill_parent"
              android:layout_height="wrap_content"
              android:text="@string/menu_button_library_hours"
@@ -109,7 +112,8 @@
              />
                   
             
-            <Button 
+            <Button
+             android:id="@+id/preference_button" 
              android:layout_width="fill_parent"
              android:layout_height="wrap_content"
              android:text="@string/menu_button_application_preferences"
diff --git a/Open-ILS/src/Android/res/layout/simple_actionbar.xml b/Open-ILS/src/Android/res/layout/simple_actionbar.xml
index 4c9b5bbe90..18aa0fbd44 100644
--- a/Open-ILS/src/Android/res/layout/simple_actionbar.xml
+++ b/Open-ILS/src/Android/res/layout/simple_actionbar.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    >
+
 <RelativeLayout
-    	xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/header"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:background="@drawable/header_rounded_corners"
+        android:background="@drawable/one_header_rounded_corner"
         android:paddingTop="3dip"
         android:paddingBottom="3dip"
         >
@@ -19,7 +25,7 @@
             android:layout_alignParentLeft="true"
             android:padding="10dip"
             />
-
+        
         <Button
             android:id="@+id/my_acount_button"
             android:layout_width="wrap_content"
@@ -28,5 +34,21 @@
             android:layout_alignParentRight="true"
             android:padding="10dip"
             />
-
-    </RelativeLayout>
\ No newline at end of file
+    </RelativeLayout>
+    
+        <TextView 
+            android:id="@+id/header_title"
+            android:layout_width="150dip"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:layout_below="@id/header"
+            android:paddingLeft="5dip"
+            android:paddingTop="2dip"
+            android:paddingBottom="2dip"
+            android:textStyle="bold"
+            android:gravity="center"
+            android:layout_alignParentLeft="true"
+            android:background="@drawable/header_rounded_corners"
+            />
+        
+</RelativeLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/values/strings.xml b/Open-ILS/src/Android/res/values/strings.xml
index 9ff7a61142..1333c201a6 100644
--- a/Open-ILS/src/Android/res/values/strings.xml
+++ b/Open-ILS/src/Android/res/values/strings.xml
@@ -6,6 +6,16 @@
     <string name="my_account_button_text">My Account</string>
     <string name="options_button_text">Options</string>
     
+    <string name="checkout_items_title">checkout items</string>
+    <string name="hold_items_title">holds</string>
+    <string name="hold_place_title">place hold</string>
+    <string name="hold_details_title">hold details</string>
+    <string name="bookbag_items_title">bookbags</string>
+    <string name="bookbag_details_title">bookbag details</string>
+    <string name="fines_title">fines</string>
+    
+    
+    
     <string name="search_hint">What are you looking for?</string>
     <string name="advanced_search_hint">Enter text here</string>
     <string name="advanced_search_add_filter_button">Add filter</string>
diff --git a/Open-ILS/src/Android/res/values/styles.xml b/Open-ILS/src/Android/res/values/styles.xml
index 64a9758e88..232af06a66 100644
--- a/Open-ILS/src/Android/res/values/styles.xml
+++ b/Open-ILS/src/Android/res/values/styles.xml
@@ -148,6 +148,10 @@
         <item name="android:textStyle">bold</item>
    </style>
    
+   
+   <style name="Content">
+       <item name="android:layout_marginTop">5dip</item>
+   </style>
     
     <!--  Menu List Buttons -->
    <style name="MenuListButton">
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java
index 84066bed68..41d617dd5a 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java
@@ -11,6 +11,8 @@ import org.evergreen.android.globals.NoNetworkAccessException;
 import org.evergreen.android.globals.Utils;
 import org.evergreen.android.searchCatalog.RecordInfo;
 import org.evergreen.android.searchCatalog.SearchCatalog;
+import org.evergreen.android.searchCatalog.SearchCatalogListView;
+import org.evergreen.android.views.AccountScreenDashboard;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -19,6 +21,7 @@ import android.app.Service;
 import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.os.Bundle;
 import android.util.Log;
@@ -60,6 +63,11 @@ private String TAG = "BookBags";
 	
 	private Button delete_bookbag_button;
 	
+	private Button homeButton;
+	
+	private Button myAccountButton;
+	
+	private TextView headerTitle;
 	
 	private Runnable getBookBagsItemsRunnable;
 	@Override
@@ -68,6 +76,29 @@ private String TAG = "BookBags";
 		super.onCreate(savedInstanceState);
 		
 		setContentView(R.layout.bookbagitem_list);
+		 //header portion actions
+        homeButton = (Button) findViewById(R.id.library_logo);
+        myAccountButton = (Button) findViewById(R.id.my_acount_button);
+        headerTitle = (TextView) findViewById(R.id.header_title);
+        headerTitle.setText(R.string.bookbag_details_title);
+        
+        myAccountButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(),AccountScreenDashboard.class);
+				startActivity(intent);
+			}
+		});
+        
+        homeButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(),SearchCatalogListView.class);
+				startActivity(intent);
+			}
+		});
+        //end header portion actions
+		
 		accountAccess = AccountAccess.getAccountAccess();
 		bookBag = (BookBag) getIntent().getSerializableExtra("bookBag");
 		
@@ -125,15 +156,6 @@ private String TAG = "BookBags";
 
 								progressDialog = ProgressDialog.show(context, "Please wait", "Deleting Bookbag");
 								deleteBookbag.start();
-								
-										runOnUiThread(new Runnable() {
-											@Override
-											public void run() {
-												progressDialog.dismiss();
-												setResult(RESULT_CODE_UPDATE);
-												finish();	
-											}
-										});
 									}
 								});
 
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java
index e213cb8818..7cc1226f13 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java
@@ -9,6 +9,8 @@ import org.evergreen.android.accountAccess.SessionNotFoundException;
 import org.evergreen.android.globals.NoAccessToServer;
 import org.evergreen.android.globals.NoNetworkAccessException;
 import org.evergreen.android.globals.Utils;
+import org.evergreen.android.searchCatalog.SearchCatalogListView;
+import org.evergreen.android.views.AccountScreenDashboard;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
@@ -52,6 +54,12 @@ public class BookbagsListView extends Activity{
 	
 	private Runnable getBookbagsRunnable;
 	
+	private Button homeButton;
+	
+	private Button myAccountButton;
+	
+	private TextView headerTitle;
+	
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		// TODO Auto-generated method stub
@@ -59,6 +67,29 @@ public class BookbagsListView extends Activity{
 		
 		setContentView(R.layout.bookbag_list);
 		
+		 //header portion actions
+        homeButton = (Button) findViewById(R.id.library_logo);
+        myAccountButton = (Button) findViewById(R.id.my_acount_button);
+        headerTitle = (TextView) findViewById(R.id.header_title);
+        headerTitle.setText(R.string.bookbag_items_title);
+        
+        myAccountButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(),AccountScreenDashboard.class);
+				startActivity(intent);
+			}
+		});
+        
+        homeButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(),SearchCatalogListView.class);
+				startActivity(intent);
+			}
+		});
+        //end header portion actions
+		
 		context = this;
 		accountAccess = AccountAccess.getAccountAccess();
 		
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
index 42d5c71a03..54cb29ec5c 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
@@ -10,10 +10,13 @@ import org.evergreen.android.accountAccess.SessionNotFoundException;
 import org.evergreen.android.globals.NoAccessToServer;
 import org.evergreen.android.globals.NoNetworkAccessException;
 import org.evergreen.android.globals.Utils;
+import org.evergreen.android.searchCatalog.SearchCatalogListView;
+import org.evergreen.android.views.AccountScreenDashboard;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -24,6 +27,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -44,6 +48,12 @@ public class ItemsCheckOutListView extends Activity{
 	
 	private ProgressDialog progressDialog;
 	
+	private Button homeButton;
+	
+	private Button myAccountButton;
+	
+	private TextView headerTitle;
+	
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		// TODO Auto-generated method stub
@@ -52,6 +62,29 @@ public class ItemsCheckOutListView extends Activity{
 		setContentView(R.layout.checkout_list);
 		setTitle("Checkout items");
 		
+		 //header portion actions
+        homeButton = (Button) findViewById(R.id.library_logo);
+        myAccountButton = (Button) findViewById(R.id.my_acount_button);
+        headerTitle = (TextView) findViewById(R.id.header_title);
+        headerTitle.setText(R.string.checkout_items_title);
+        
+        myAccountButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(),AccountScreenDashboard.class);
+				startActivity(intent);
+			}
+		});
+        
+        homeButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(),SearchCatalogListView.class);
+				startActivity(intent);
+			}
+		});
+        //end header portion actions
+		
 		context = this;
 		accountAccess = AccountAccess.getAccountAccess();
 		lv = (ListView) findViewById(R.id.checkout_items_list);
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesActivity.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesActivity.java
index 1add524224..1e461211c9 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesActivity.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesActivity.java
@@ -9,17 +9,22 @@ import org.evergreen.android.accountAccess.SessionNotFoundException;
 import org.evergreen.android.globals.NoAccessToServer;
 import org.evergreen.android.globals.NoNetworkAccessException;
 import org.evergreen.android.globals.Utils;
+import org.evergreen.android.searchCatalog.SearchCatalogListView;
+import org.evergreen.android.views.AccountScreenDashboard;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -42,6 +47,11 @@ public class FinesActivity extends Activity{
 	
 	private OverdueMaterialsArrayAdapter  listAdapter;
 	
+	private Button homeButton;
+	
+	private Button myAccountButton;
+	
+	private TextView headerTitle;
 	
 	private Context context;
 	@Override
@@ -49,6 +59,30 @@ public class FinesActivity extends Activity{
 		super.onCreate(savedInstanceState);
 		
 		setContentView(R.layout.fines);
+		
+		 //header portion actions
+        homeButton = (Button) findViewById(R.id.library_logo);
+        myAccountButton = (Button) findViewById(R.id.my_acount_button);
+        headerTitle = (TextView) findViewById(R.id.header_title);
+        headerTitle.setText(R.string.fines_title);
+        
+        myAccountButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(),AccountScreenDashboard.class);
+				startActivity(intent);
+			}
+		});
+        
+        homeButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(),SearchCatalogListView.class);
+				startActivity(intent);
+			}
+		});
+        //end header portion actions
+		
 		lv = (ListView) findViewById(R.id.fines_overdue_materials_list);
 		
 		total_owned = (TextView) findViewById(R.id.fines_total_owned);
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldDetails.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldDetails.java
index 1cea6bfa4b..52526af4b9 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldDetails.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldDetails.java
@@ -11,31 +11,33 @@ import org.evergreen.android.globals.GlobalConfigs;
 import org.evergreen.android.globals.NoAccessToServer;
 import org.evergreen.android.globals.NoNetworkAccessException;
 import org.evergreen.android.globals.Utils;
+import org.evergreen.android.searchCatalog.SearchCatalogListView;
+import org.evergreen.android.views.AccountScreenDashboard;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.ProgressDialog;
 import android.app.AlertDialog.Builder;
 import android.app.DatePickerDialog;
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.text.format.DateFormat;
-import android.text.format.Time;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.Toast;
 
 public class HoldDetails extends Activity {
@@ -96,6 +98,12 @@ public class HoldDetails extends Activity {
 
 	private GlobalConfigs globalConfigs;
 
+	private Button homeButton;
+	
+	private Button myAccountButton;
+	
+	private TextView headerTitle;
+	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -103,6 +111,27 @@ public class HoldDetails extends Activity {
 		setContentView(R.layout.hold_details);
 		globalConfigs = GlobalConfigs.getGlobalConfigs(this);
 
+		
+		homeButton = (Button) findViewById(R.id.library_logo);
+		myAccountButton = (Button) findViewById(R.id.my_acount_button);
+		headerTitle = (TextView) findViewById(R.id.header_title);
+		headerTitle.setText(R.string.hold_details_title);
+		homeButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(),SearchCatalogListView.class);
+				startActivity(intent);
+			}
+		});
+		myAccountButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(), AccountScreenDashboard.class);
+				startActivity(intent);
+			}
+		});
+		
+		
 		final HoldRecord record = (HoldRecord) getIntent()
 				.getSerializableExtra("holdRecord");
 
@@ -115,7 +144,6 @@ public class HoldDetails extends Activity {
 		title = (TextView) findViewById(R.id.hold_title);
 		author = (TextView) findViewById(R.id.hold_author);
 		physical_description = (TextView) findViewById(R.id.hold_physical_description);
-		screen_title = (TextView) findViewById(R.id.header_title);
 		cancelHold = (Button) findViewById(R.id.cancel_hold_button);
 		updateHold = (Button) findViewById(R.id.update_hold_button);
 		back = (Button) findViewById(R.id.back_button);
@@ -129,10 +157,6 @@ public class HoldDetails extends Activity {
 		expiration_date = (EditText) findViewById(R.id.hold_expiration_date);
 		thaw_date_edittext = (EditText) findViewById(R.id.hold_thaw_date);
 
-		screen_title.setText("Place Hold");
-
-
-
 		recipient.setText(accountAccess.userName);
 		title.setText(record.title);
 		author.setText(record.author);
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldsListView.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldsListView.java
index bc64a57097..36b62214b5 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldsListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldsListView.java
@@ -9,6 +9,8 @@ import org.evergreen.android.accountAccess.SessionNotFoundException;
 import org.evergreen.android.globals.NoAccessToServer;
 import org.evergreen.android.globals.NoNetworkAccessException;
 import org.evergreen.android.globals.Utils;
+import org.evergreen.android.searchCatalog.SearchCatalogListView;
+import org.evergreen.android.views.AccountScreenDashboard;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
@@ -18,10 +20,12 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -42,6 +46,12 @@ public class HoldsListView extends Activity{
 	
 	Runnable getHoldsRunnable= null;
 	
+	private Button homeButton;
+	
+	private Button myAccountButton;
+	
+	private TextView headerTitle;
+
 	private ProgressDialog progressDialog;
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -49,6 +59,28 @@ public class HoldsListView extends Activity{
 		
 		setContentView(R.layout.holds_list);
 		
+		 //header portion actions
+        homeButton = (Button) findViewById(R.id.library_logo);
+        myAccountButton = (Button) findViewById(R.id.my_acount_button);
+        headerTitle = (TextView) findViewById(R.id.header_title);
+        headerTitle.setText(R.string.hold_items_title);
+        
+        myAccountButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(),AccountScreenDashboard.class);
+				startActivity(intent);
+			}
+		});
+        
+        homeButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(),SearchCatalogListView.class);
+				startActivity(intent);
+			}
+		});
+        //end header portion actions
 		
 		lv = (ListView)findViewById(R.id.holds_item_list);
 		context = this;
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java
index e717763613..7a72928759 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java
@@ -7,17 +7,24 @@ import org.evergreen.android.utils.ui.BaseSampleActivity;
 import org.evergreen.android.utils.ui.BasicDetailsFragment;
 import org.evergreen.android.utils.ui.TestFragmentAdapter;
 import org.evergreen.android.utils.ui.UnderlinePageIndicator;
+import org.evergreen.android.views.AccountScreenDashboard;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.view.ViewPager;
-import android.widget.ListView;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
 
 public class SampleUnderlinesNoFade extends BaseSampleActivity {
 
 	private List<RecordInfo> records;
 	
+	private Button myAccountButton;
+	
+	private Button homeButton;
 	
 	@Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -25,7 +32,28 @@ public class SampleUnderlinesNoFade extends BaseSampleActivity {
         setContentView(R.layout.simple_underlines);
    
         records = (List<RecordInfo>)getIntent().getSerializableExtra("recordList");
-
+        
+        //header portion actions
+        homeButton = (Button) findViewById(R.id.library_logo);
+        myAccountButton = (Button) findViewById(R.id.my_acount_button);
+        
+        myAccountButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(),AccountScreenDashboard.class);
+				startActivity(intent);
+			}
+		});
+        
+        homeButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(),SearchCatalogListView.class);
+				startActivity(intent);
+			}
+		});
+        //end header portion actions
+        
         int record_position = getIntent().getIntExtra("recordPosition", 0);
         mAdapter = new SearchFragmentAdapter(getSupportFragmentManager());
 
@@ -39,6 +67,7 @@ public class SampleUnderlinesNoFade extends BaseSampleActivity {
         indicator.setViewPager(mPager);
         indicator.setFades(false);
         mIndicator = indicator;
+        
     }
     
     class SearchFragmentAdapter extends TestFragmentAdapter {
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
index 75ba139c63..a4ec2e543c 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
@@ -12,6 +12,8 @@ import org.evergreen.android.globals.GlobalConfigs;
 import org.evergreen.android.globals.NoAccessToServer;
 import org.evergreen.android.globals.NoNetworkAccessException;
 import org.evergreen.android.globals.Utils;
+import org.evergreen.android.views.AccountScreenDashboard;
+import org.evergreen.android.views.ApplicationPreferences;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -21,6 +23,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.os.Bundle;
+import android.preference.PreferenceActivity;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
@@ -94,8 +97,14 @@ public class SearchCatalogListView extends Activity{
 	
 	private Button advancedSearchButton = null;
 	
+	private Button libraryHoursButton = null;
+	
+	private Button preferenceButton = null;
+	
 	private Button homeButton = null;
 	
+	private Button myAccountButton = null;
+	
 	private String advancedSearchString = null;
 	
     @Override
@@ -104,7 +113,16 @@ public class SearchCatalogListView extends Activity{
         setContentView(R.layout.search_result_list);
         setTitle("Browse catalog");
         
+        myAccountButton = (Button) findViewById(R.id.my_acount_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.library_logo);
         
         homeButton.setOnClickListener(new OnClickListener() {
@@ -113,7 +131,8 @@ public class SearchCatalogListView extends Activity{
 				searchOptionsMenu.setVisibility(View.VISIBLE);	
 			}
 		});
-        
+        //end header portion actions
+
         advancedSearchButton = (Button) findViewById(R.id.menu_advanced_search_button);
         
         advancedSearchButton.setOnClickListener(new OnClickListener() {
@@ -152,15 +171,29 @@ public class SearchCatalogListView extends Activity{
 					public void onClick(View v) {
 						dialog.dismiss();
 					}
-				});
-                
-                
-                
+				});   
                 dialog.setCancelable(true);
                 dialog.show();
 			}
 		});
         
+        libraryHoursButton = (Button) findViewById(R.id.library_hours_button);
+        libraryHoursButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				// TODO Auto-generated method stub
+			}
+		});
+        
+        preferenceButton = (Button) findViewById(R.id.preference_button);
+        preferenceButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getApplicationContext(), ApplicationPreferences.class);
+				startActivity(intent);
+			}
+		});
+        
         //singleton initialize necessary IDL and Org data
         globalConfigs = GlobalConfigs.getGlobalConfigs(this);
         
@@ -593,22 +626,17 @@ public class SearchCatalogListView extends Activity{
 	    			
 
 	    			alertDialog.show();
-	    			
-	    			
-	    			
+	
 	    			s.setOnItemSelectedListener(new OnItemSelectedListener() {
 
 						@Override
 						public void onItemSelected(AdapterView<?> arg0, View arg1,
-								int position, long arg3) {
-							
+								int position, long arg3) {	
 						bookbag_selected = position;
 						}
 
 						@Override
 						public void onNothingSelected(AdapterView<?> arg0) {
-							// TODO Auto-generated method stub
-							
 						}
 					
 	    			});
@@ -626,6 +654,7 @@ public class SearchCatalogListView extends Activity{
     }
     
     class SearchArrayAdapter extends ArrayAdapter<RecordInfo> {
+    	
     	private static final String tag = "SearchArrayAdapter";
     	private Context context;
     	private ImageView recordImage;
@@ -677,10 +706,8 @@ public class SearchCatalogListView extends Activity{
 			    			row = inflater.inflate(R.layout.search_result_item, parent, false);
 			    			Log.d(tag, "Successfully completed XML Row Inflation!");
 	
-		    		}
-    		
-		    
-
+		    }
+		    		
     		Log.d(TAG, "reord image value " + recordImage);
     		// Get reference to ImageView 
     		recordImage = (ImageView) row.findViewById(R.id.search_record_img);
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java b/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java
index 4a91e02cfe..692f6daa0d 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java
@@ -135,9 +135,7 @@ public class BasicDetailsFragment extends Fragment{
 				@Override
 				public void onClick(View v) {
 					// TODO Auto-generated method stub
-					
-				
-					
+
 					System.out.println("Show more tabed");
 					// insert into main view
 					LinearLayout insertPoint = (LinearLayout) lay.findViewById(R.id.record_details_copy_information);
-- 
2.11.0