Add activity title in "actionbar" area instead of a static logo/string. Removed...

diff --git a/Open-ILS/src/Android/core/res/layout-land/dashbord_account.xml b/Open-ILS/src/Android/core/res/layout-land/dashbord_account.xml
index 01ea120..18bd518 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout-land/dashbord_account.xml
+++ b/Open-ILS/src/Android/core/res/layout-land/dashbord_account.xml
@@ -15,7 +15,7 @@
         android:paddingTop="3dip" >
 
         <Button
-            android:id="@+id/library_logo"
+            android:id="@+id/action_bar_home_button"
             style="@style/LibraryLogoText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -23,21 +23,11 @@
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
             android:paddingLeft="5dip"
-            android:text="@string/library_text_logo"
+            android:text="@string/ou_action_bar_text"
             android:textColor="@color/white"
             android:textSize="16sp"
-            android:textStyle="bold"
-            android:typeface="monospace" />
+            />
 
-        <Button
-            android:id="@+id/my_account_button"
-            style="@style/HeaderButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="5dip"
-            android:padding="10dip"
-            android:text="@string/my_account_button_text" />
     </RelativeLayout>
 
     <ScrollView

diff --git a/Open-ILS/src/Android/core/res/layout-land/search_result_list.xml b/Open-ILS/src/Android/core/res/layout-land/search_result_list.xml
index c68fce3..a0ce343 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout-land/search_result_list.xml
+++ b/Open-ILS/src/Android/core/res/layout-land/search_result_list.xml
@@ -15,18 +15,16 @@
         >
         
                 <Button
-            android:id="@+id/library_logo"
+            android:id="@+id/action_bar_home_button"
             style="@style/LibraryLogoText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
-            android:text="@string/library_text_logo" 
+            android:text="@string/ou_action_bar_text"
             android:textColor="@color/white"
             android:textSize="16sp"
-            android:typeface="monospace"
-            android:textStyle="bold"
             android:paddingLeft="5dip"
             />
 
@@ -35,11 +33,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/my_account_button_text"
-            android:layout_alignParentRight="true"
             android:padding="10dip"
-            android:layout_marginTop="5dip"
             style="@style/HeaderButton"
-            />
+            android:layout_alignTop="@+id/action_bar_home_button" android:layout_alignParentRight="true"
+            android:layout_centerVertical="true" android:gravity="center_vertical" android:layout_marginTop="10dip"/>
 
 
         <LinearLayout
@@ -50,7 +47,7 @@
             android:id="@+id/search_text_container"
             android:focusable="true" 
                android:focusableInTouchMode="true"
-            android:layout_below="@id/library_logo">
+            android:layout_below="@id/action_bar_home_button">
 
             <EditText
                     android:id="@+id/searchText"

diff --git a/Open-ILS/src/Android/core/res/layout/activity_splash.xml b/Open-ILS/src/Android/core/res/layout/activity_splash.xml
index 5956a49..1cb6263 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout/activity_splash.xml
+++ b/Open-ILS/src/Android/core/res/layout/activity_splash.xml
@@ -14,7 +14,7 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="106dp"
             android:src="@drawable/evergreen_logo_sm072"
-            android:contentDescription="@string/library_text_logo" />
+            android:contentDescription="@string/ou_action_bar_text" />
     
         <TextView
             android:id="@+id/action_in_progress"

diff --git a/Open-ILS/src/Android/core/res/layout/dashbord_account.xml b/Open-ILS/src/Android/core/res/layout/dashbord_account.xml
index 670bc39..78e5516 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout/dashbord_account.xml
+++ b/Open-ILS/src/Android/core/res/layout/dashbord_account.xml
@@ -17,31 +17,19 @@
          >
 
         <Button
-            android:id="@+id/library_logo"
+            android:id="@+id/action_bar_home_button"
             style="@style/LibraryLogoText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
-            android:text="@string/library_text_logo" 
+            android:text="@string/ou_action_bar_text"
             android:textColor="@color/white"
             android:textSize="16sp"
-            android:typeface="monospace"
-            android:textStyle="bold"
             android:paddingLeft="5dip"
             />
-        
-        <Button
-            android:id="@+id/my_account_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="5dip"
-            android:padding="10dip"
-            android:text="@string/my_account_button_text" 
-            style="@style/HeaderButton"
-            />
+
     </RelativeLayout>
     
        <LinearLayout

diff --git a/Open-ILS/src/Android/core/res/layout/search_result_list.xml b/Open-ILS/src/Android/core/res/layout/search_result_list.xml
index 610e80f..f4be2eb 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout/search_result_list.xml
+++ b/Open-ILS/src/Android/core/res/layout/search_result_list.xml
@@ -16,31 +16,26 @@
          >
 
         <Button
-            android:id="@+id/library_logo"
+            android:id="@+id/action_bar_home_button"
             style="@style/LibraryLogoText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
-            android:text="@string/library_text_logo" 
+            android:text="@string/ou_action_bar_text"
             android:textColor="@color/white"
             android:textSize="16sp"
-            android:typeface="monospace"
-            android:textStyle="bold"
-            android:paddingLeft="5dip"
-            />
+            android:paddingLeft="5dip"/>
         
         <Button
             android:id="@+id/my_account_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="5dip"
             android:padding="10dip"
             android:text="@string/my_account_button_text" 
             style="@style/HeaderButton"
-            />
+            android:layout_centerVertical="true" android:layout_alignParentRight="true"/>
     </RelativeLayout>
 
     <LinearLayout

diff --git a/Open-ILS/src/Android/core/res/layout/simple_actionbar.xml b/Open-ILS/src/Android/core/res/layout/simple_actionbar.xml
index 54883ff..8f27a7a 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout/simple_actionbar.xml
+++ b/Open-ILS/src/Android/core/res/layout/simple_actionbar.xml
@@ -17,18 +17,16 @@
          >
 
         <Button
-            android:id="@+id/library_logo"
+            android:id="@+id/action_bar_home_button"
             style="@style/LibraryLogoText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
-            android:text="@string/library_text_logo" 
+            android:text="@string/ou_action_bar_text"
             android:textColor="@color/white"
             android:textSize="16sp"
-            android:typeface="monospace"
-            android:textStyle="bold"
             android:paddingLeft="5dip"
             />
         
@@ -36,22 +34,10 @@
             android:id="@+id/my_account_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="5dip"
             android:padding="10dip"
             android:text="@string/my_account_button_text"
             style="@style/HeaderButton"
-             />
+            android:layout_centerVertical="true" android:layout_alignParentRight="true"/>
     </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:layout_alignParentLeft="true"
-            style="@style/HeaderTitle"
-            />
-        
+
 </RelativeLayout>
\ No newline at end of file

diff --git a/Open-ILS/src/Android/core/res/values/ou.xml b/Open-ILS/src/Android/core/res/values/ou.xml
index 8417f8e..4f514d0 100644 (file)
--- a/Open-ILS/src/Android/core/res/values/ou.xml
+++ b/Open-ILS/src/Android/core/res/values/ou.xml
@@ -7,8 +7,9 @@
     <!--  TODO: make URLs HTTPS -->
     <string name="ou_library_url">http://bark.cwmars.org</string>
     <string name="ou_app_name">C/W Mars Library</string>
-    <string name="ou_app_label">C/W Mars</string>
+    <string name="ou_app_label">C/W Mars Library</string>
     <string name="ou_app_welcome_label">Welcome</string>
     <string name="ou_account_label">C/W Mars Library</string>
     <string name="ou_account_sign_in_message">Sign in to your\nC/W Mars Library Account</string>
+    <string name="ou_action_bar_text">C/W Mars</string>
 </resources>

diff --git a/Open-ILS/src/Android/core/res/values/strings.xml b/Open-ILS/src/Android/core/res/values/strings.xml
index 346dd07..6376f58 100644 (file)
--- a/Open-ILS/src/Android/core/res/values/strings.xml
+++ b/Open-ILS/src/Android/core/res/values/strings.xml
@@ -8,7 +8,6 @@
     <string name="menu_barcode_scan">barcode scan</string>
 
     <!-- Header portion -->
-    <string name="library_text_logo">Evergreen</string>
     <string name="my_account_button_text">My Account</string>
     <string name="options_button_text">Options</string>
     <string name="search_details_title">Search Details</string>
@@ -26,8 +25,6 @@
 
     <!-- first config activity -->
 
-    <string name="first_config_message">Please enter the Evergreen server url, username and password of your account.</string>
-    <string name="server_name">Library Catalog URL:</string>
     <string name="username">Username:</string>
     <string name="hint_username">Card Number or Username</string>
     <string name="password">Password:</string>
@@ -40,10 +37,11 @@
 
     <!-- Search -->
 
-    <string name="search_hint">What are you looking for?</string>
-    <string name="advanced_search">Search</string>
+    <string name="browse_catalog">Browse catalog</string>
+    <string name="search_hint">Search keywords</string>
+    <string name="advanced_search">Advanced Search</string>
     <string name="loading_dialog_text"></string>
-    <string name="dialog_please_wait">Please wait</string>
+    <string name="dialog_please_wait"></string>
     <string name="dialog_fetching_data_message">Searching catalog</string>
     <string name="dialog_load_more_message">Fetching more results</string>
     <string name="advanced_search_hint">Enter text here</string>
@@ -53,17 +51,13 @@
     <string name="menu_button_library_hours">Library hours</string>
     <string name="menu_button_application_preferences">Preferences</string>
     <string name="copy_information"> Availability of the book :</string>
-    <string name="hello">Hello World, EvergreenAppActivity!</string>
-    <string name="generic_app_name">Evergreen</string>
     <string name="title_activity_startup">Welcome to Evergreen</string>
     <string name="title_search">Search</string>
     <string name="title_my_account">My Account</string>
-    <string name="title_application_settings">App. Settings </string>
     <string name="title_check_out">Items Checked Out</string>
     <string name="title_holds">Holds</string>
     <string name="title_fines">Fines</string>
     <string name="title_book_bags">Bookbags</string>
-    <string name="search_result_text"> Search result :</string>
     <string name="renew_button">renew</string>
     <string name="record_of">Record %1$d of %2$d</string>
 

diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java
index 18ff9aa..199093b 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java
@@ -98,10 +98,8 @@ public class BookBagDetails extends Activity {
 
         setContentView(R.layout.bookbagitem_list);
         // header portion actions
-        homeButton = (Button) findViewById(R.id.library_logo);
+        homeButton = (Button) findViewById(R.id.action_bar_home_button);
         myAccountButton = (Button) findViewById(R.id.my_account_button);
-        headerTitle = (TextView) findViewById(R.id.header_title);
-        headerTitle.setText(R.string.bookbag_details_title);
 
         myAccountButton.setOnClickListener(new OnClickListener() {
             @Override
@@ -112,6 +110,7 @@ public class BookBagDetails extends Activity {
             }
         });
 
+        homeButton.setText(R.string.bookbag_details_title);
         homeButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java
index 18d71ee..074168b 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java
@@ -25,7 +25,6 @@ import java.util.List;
 import org.evergreen.android.R;
 import org.evergreen.android.accountAccess.AccountAccess;
 import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.globals.Utils;
 import org.evergreen.android.searchCatalog.SearchCatalogListView;
 import org.evergreen.android.views.AccountScreenDashboard;
 import org.evergreen.android.views.splashscreen.SplashActivity;
@@ -89,11 +88,7 @@ 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_account_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) {
@@ -103,6 +98,8 @@ public class BookbagsListView extends Activity {
             }
         });
 
+        homeButton = (Button) findViewById(R.id.action_bar_home_button);
+        homeButton.setText(R.string.bookbag_items_title);
         homeButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
index fb438a1..8d6ce2f 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
@@ -28,7 +28,6 @@ import org.evergreen.android.accountAccess.AccountAccess;
 import org.evergreen.android.accountAccess.MaxRenewalsException;
 import org.evergreen.android.accountAccess.ServerErrorMessage;
 import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.globals.Utils;
 import org.evergreen.android.searchCatalog.SearchCatalogListView;
 import org.evergreen.android.views.AccountScreenDashboard;
 import org.evergreen.android.views.splashscreen.SplashActivity;
@@ -97,11 +96,7 @@ public class ItemsCheckOutListView extends Activity {
         currentDate = new Date(System.currentTimeMillis());
 
         // header portion actions
-        homeButton = (Button) findViewById(R.id.library_logo);
         myAccountButton = (Button) findViewById(R.id.my_account_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) {
@@ -111,6 +106,8 @@ public class ItemsCheckOutListView extends Activity {
             }
         });
 
+        homeButton = (Button) findViewById(R.id.action_bar_home_button);
+        homeButton.setText(R.string.checkout_items_title);
         homeButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesActivity.java b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesActivity.java
index 0e9c171..ddb4d75 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesActivity.java
@@ -26,7 +26,6 @@ import java.util.List;
 import org.evergreen.android.R;
 import org.evergreen.android.accountAccess.AccountAccess;
 import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.globals.Utils;
 import org.evergreen.android.searchCatalog.SearchCatalogListView;
 import org.evergreen.android.views.AccountScreenDashboard;
 import org.evergreen.android.views.splashscreen.SplashActivity;
@@ -86,11 +85,7 @@ public class FinesActivity extends Activity {
         setContentView(R.layout.fines);
 
         // header portion actions
-        homeButton = (Button) findViewById(R.id.library_logo);
         myAccountButton = (Button) findViewById(R.id.my_account_button);
-        headerTitle = (TextView) findViewById(R.id.header_title);
-        headerTitle.setText(R.string.fines_title);
-
         myAccountButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -100,6 +95,8 @@ public class FinesActivity extends Activity {
             }
         });
 
+        homeButton = (Button) findViewById(R.id.action_bar_home_button);
+        homeButton.setText(R.string.fines_title);
         homeButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldDetails.java b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldDetails.java
index 2d822af..2766377 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldDetails.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldDetails.java
@@ -28,7 +28,6 @@ import org.evergreen.android.R;
 import org.evergreen.android.accountAccess.AccountAccess;
 import org.evergreen.android.accountAccess.SessionNotFoundException;
 import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.globals.Utils;
 import org.evergreen.android.searchCatalog.SearchCatalogListView;
 import org.evergreen.android.views.AccountScreenDashboard;
 import org.evergreen.android.views.splashscreen.SplashActivity;
@@ -131,23 +130,23 @@ 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_account_button);
-        headerTitle = (TextView) findViewById(R.id.header_title);
-        headerTitle.setText(R.string.hold_details_title);
-        homeButton.setOnClickListener(new OnClickListener() {
+        myAccountButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(getApplicationContext(),
-                        SearchCatalogListView.class);
+                        AccountScreenDashboard.class);
                 startActivity(intent);
             }
         });
-        myAccountButton.setOnClickListener(new OnClickListener() {
+
+        homeButton = (Button) findViewById(R.id.action_bar_home_button);
+        homeButton.setText(R.string.hold_details_title);
+        homeButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(getApplicationContext(),
-                        AccountScreenDashboard.class);
+                        SearchCatalogListView.class);
                 startActivity(intent);
             }
         });

diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldsListView.java b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldsListView.java
index bd38443..0ffacb2 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldsListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldsListView.java
@@ -26,7 +26,6 @@ import org.evergreen.android.R;
 import org.evergreen.android.accountAccess.AccountAccess;
 import org.evergreen.android.accountAccess.SessionNotFoundException;
 import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.globals.Utils;
 import org.evergreen.android.searchCatalog.ImageDownloader;
 import org.evergreen.android.searchCatalog.SearchCatalogListView;
 import org.evergreen.android.views.AccountScreenDashboard;
@@ -49,7 +48,6 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 public class HoldsListView extends Activity {
 
@@ -90,11 +88,7 @@ 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_account_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) {
@@ -104,6 +98,8 @@ public class HoldsListView extends Activity {
             }
         });
 
+        homeButton = (Button) findViewById(R.id.action_bar_home_button);
+        homeButton.setText(R.string.hold_items_title);
         homeButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/PlaceHold.java b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/PlaceHold.java
index 4c2a071..249600a 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/PlaceHold.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/PlaceHold.java
@@ -28,7 +28,6 @@ import org.evergreen.android.R;
 import org.evergreen.android.accountAccess.AccountAccess;
 import org.evergreen.android.accountAccess.SessionNotFoundException;
 import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.globals.Utils;
 import org.evergreen.android.searchCatalog.RecordInfo;
 import org.evergreen.android.searchCatalog.SearchCatalogListView;
 import org.evergreen.android.views.AccountScreenDashboard;
@@ -128,11 +127,7 @@ public class PlaceHold extends Activity {
         RecordInfo record = (RecordInfo) getIntent().getSerializableExtra(
                 "recordInfo");
 
-        homeButton = (Button) findViewById(R.id.library_logo);
         myAccountButton = (Button) findViewById(R.id.my_account_button);
-        headerTitle = (TextView) findViewById(R.id.header_title);
-        headerTitle.setText(R.string.hold_place_title);
-
         myAccountButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -142,6 +137,8 @@ public class PlaceHold extends Activity {
             }
         });
 
+        homeButton = (Button) findViewById(R.id.action_bar_home_button);
+        homeButton.setText(R.string.hold_place_title);
         homeButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -159,7 +156,6 @@ public class PlaceHold 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);
         cancel = (Button) findViewById(R.id.cancel_hold);
         placeHold = (Button) findViewById(R.id.place_hold);
         expiration_date = (EditText) findViewById(R.id.hold_expiration_date);
@@ -169,7 +165,6 @@ public class PlaceHold extends Activity {
         suspendHold = (CheckBox) findViewById(R.id.hold_suspend_hold);
         orgSelector = (Spinner) findViewById(R.id.hold_pickup_location);
         thaw_date_edittext = (EditText) findViewById(R.id.hold_thaw_date);
-        screen_title.setText("Place Hold");
 
         recipient.setText(accountAccess.userName);
         title.setText(record.title);

diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/AdvancedSearchActivity.java b/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/AdvancedSearchActivity.java
index e1a114d..61d251d 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/AdvancedSearchActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/AdvancedSearchActivity.java
@@ -35,7 +35,6 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -68,13 +67,10 @@ public class AdvancedSearchActivity extends Activity {
 
         setContentView(R.layout.advanced_search);
 
+        advancedSearchFormattedText = new StringBuilder();
+
         // header portion actions
-        homeButton = (Button) findViewById(R.id.library_logo);
         myAccountButton = (Button) findViewById(R.id.my_account_button);
-        headerTitle = (TextView) findViewById(R.id.header_title);
-        headerTitle.setText(R.string.advanced_search);
-
-        advancedSearchFormattedText = new StringBuilder();
 
         myAccountButton.setOnClickListener(new OnClickListener() {
             @Override
@@ -85,6 +81,8 @@ public class AdvancedSearchActivity extends Activity {
             }
         });
 
+        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) {

diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/MoreCopyInformation.java b/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/MoreCopyInformation.java
index 5f2f95c..e53d6dd 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/MoreCopyInformation.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/MoreCopyInformation.java
@@ -69,11 +69,7 @@ public class MoreCopyInformation extends Activity {
         record = (RecordInfo) getIntent().getSerializableExtra("recordInfo");
 
         // header portion actions
-        homeButton = (Button) findViewById(R.id.library_logo);
         myAccountButton = (Button) findViewById(R.id.my_account_button);
-        headerTitle = (TextView) findViewById(R.id.header_title);
-        headerTitle.setText(R.string.copy_information_title);
-
         myAccountButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -83,6 +79,8 @@ public class MoreCopyInformation extends Activity {
             }
         });
 
+        homeButton = (Button) findViewById(R.id.action_bar_home_button);
+        homeButton.setText(R.string.copy_information_title);
         homeButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java b/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java
index f3eccf9..bd20290 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java
@@ -22,8 +22,6 @@ package org.evergreen.android.searchCatalog;
 import java.util.ArrayList;
 
 import org.evergreen.android.R;
-import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.globals.Utils;
 import org.evergreen.android.utils.ui.BaseSampleActivity;
 import org.evergreen.android.utils.ui.BasicDetailsFragment;
 import org.evergreen.android.utils.ui.TestFragmentAdapter;
@@ -88,10 +86,8 @@ public class SampleUnderlinesNoFade extends BaseSampleActivity {
         context = this;
         
         // header portion actions
-        homeButton = (Button) findViewById(R.id.library_logo);
+        homeButton = (Button) findViewById(R.id.action_bar_home_button);
         myAccountButton = (Button) findViewById(R.id.my_account_button);
-        headerTitle = (TextView) findViewById(R.id.header_title);
-        headerTitle.setText(R.string.search_details_title);
 
         myAccountButton.setOnClickListener(new OnClickListener() {
             @Override
@@ -102,6 +98,7 @@ public class SampleUnderlinesNoFade extends BaseSampleActivity {
             }
         });
 
+        homeButton.setText(R.string.search_details_title);
         homeButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java b/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
index ad1bbb0..00a1642 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
@@ -30,7 +30,6 @@ import org.evergreen.android.accountAccess.bookbags.BookBag;
 import org.evergreen.android.accountAccess.holds.PlaceHold;
 import org.evergreen.android.barcodescan.CaptureActivity;
 import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.globals.Utils;
 import org.evergreen.android.views.AccountScreenDashboard;
 import org.evergreen.android.views.ApplicationPreferences;
 import org.evergreen.android.views.splashscreen.SplashActivity;
@@ -140,10 +139,9 @@ public class SearchCatalogListView extends Activity {
         }
 
         setContentView(R.layout.search_result_list);
-        setTitle("Browse catalog");
+        setTitle(R.string.browse_catalog);
 
         myAccountButton = (Button) findViewById(R.id.my_account_button);
-
         myAccountButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -153,8 +151,8 @@ public class SearchCatalogListView extends Activity {
             }
         });
 
-        homeButton = (Button) findViewById(R.id.library_logo);
-
+        homeButton = (Button) findViewById(R.id.action_bar_home_button);
+        homeButton.setText(R.string.browse_catalog);
         homeButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/views/AccountScreenDashboard.java b/Open-ILS/src/Android/core/src/org/evergreen/android/views/AccountScreenDashboard.java
index 723951c..9adc1e1 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/views/AccountScreenDashboard.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/views/AccountScreenDashboard.java
@@ -62,15 +62,16 @@ public class AccountScreenDashboard extends Activity {
 
         setContentView(R.layout.dashbord_account);
 
-        myAccountButton = (Button) findViewById(R.id.my_account_button);
-        myAccountButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-
-            }
-        });
-
-        homeButton = (Button) findViewById(R.id.library_logo);
+//        myAccountButton = (Button) findViewById(R.id.my_account_button);
+//        myAccountButton.setEnabled(false);
+//        myAccountButton.setOnClickListener(new OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//            }
+//        });
+
+        homeButton = (Button) findViewById(R.id.action_bar_home_button);
+        homeButton.setText(R.string.my_account_button_text);
         homeButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {