From 7762161e844a0cf4f3eda05095af440c0b645526 Mon Sep 17 00:00:00 2001
From: kenstir <kenstir@gmail.com>
Date: Mon, 30 Dec 2013 23:48:57 -0500
Subject: [PATCH] Make HoldDetails activity use the action bar

---
 .../accountAccess/holds/HoldDetails.java           | 49 ++++++++++------------
 .../accountAccess/holds/PlaceHold.java             |  1 +
 .../src/Android/cwmars_app/AndroidManifest.xml     |  4 +-
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java
index 377ab0d514..632ae69caa 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java
@@ -23,7 +23,10 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
+import android.view.MenuItem;
 import org.evergreen_ils.R;
 import org.evergreen_ils.accountAccess.AccountAccess;
 import org.evergreen_ils.accountAccess.SessionNotFoundException;
@@ -58,7 +61,7 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
-public class HoldDetails extends Activity {
+public class HoldDetails extends ActionBarActivity {
 
     private final String TAG = HoldDetails.class.getName();
 
@@ -112,12 +115,6 @@ 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);
@@ -126,30 +123,15 @@ public class HoldDetails extends Activity {
             return;
         }
 
-        context = this;
         setContentView(R.layout.hold_details);
-        globalConfigs = GlobalConfigs.getGlobalConfigs(this);
 
-        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);
-            }
-        });
+        // set up action bar
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setSubtitle(AccountAccess.userName);
+        actionBar.setDisplayHomeAsUpEnabled(true);
 
-        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(),
-                        SearchCatalogListView.class);
-                startActivity(intent);
-            }
-        });
+        context = this;
+        globalConfigs = GlobalConfigs.getGlobalConfigs(this);
 
         final HoldRecord record = (HoldRecord) getIntent()
                 .getSerializableExtra("holdRecord");
@@ -413,6 +395,17 @@ public class HoldDetails extends Activity {
         });
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        if (id == android.R.id.home) {
+            // make the action bar "up" caret work like "back"
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     public void disableView(View view) {
 
         // view.setFocusable(false);
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java
index c94ef65800..7f8dedd0fb 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java
@@ -366,6 +366,7 @@ public class PlaceHold extends ActionBarActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
         if (id == android.R.id.home) {
+            // make the action bar "up" caret work like "back"
             onBackPressed();
             return true;
         }
diff --git a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
index 7afafff5e3..7b7f2fe260 100644
--- a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
@@ -113,7 +113,9 @@
                 android:name="org.evergreen_ils.accountAccess.holds.PlaceHold"
                 android:label="@string/hold_place_title">
         </activity>
-        <activity android:name="org.evergreen_ils.accountAccess.holds.HoldDetails" >
+        <activity
+                android:name="org.evergreen_ils.accountAccess.holds.HoldDetails"
+                android:label="@string/hold_details_title">
         </activity>
 
         <!-- Fines Activities -->
-- 
2.11.0