More activities now have the standard action bar: checkouts, holds, fines

diff --git a/Open-ILS/src/Android/core/res/drawable-hdpi/items_checked_out.png b/Open-ILS/src/Android/core/res/drawable-hdpi/items_checked_out.png
new file mode 100644 (file)
index 0000000..10fc3bb
Binary files /dev/null and b/Open-ILS/src/Android/core/res/drawable-hdpi/items_checked_out.png differ

diff --git a/Open-ILS/src/Android/core/res/drawable/holds2.png b/Open-ILS/src/Android/core/res/drawable/holds2.png
new file mode 100644 (file)
index 0000000..2f2d4c7
Binary files /dev/null and b/Open-ILS/src/Android/core/res/drawable/holds2.png differ

diff --git a/Open-ILS/src/Android/core/res/layout/activity_main.xml b/Open-ILS/src/Android/core/res/layout/activity_main.xml
index ad7f1f6..cf401aa 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout/activity_main.xml
+++ b/Open-ILS/src/Android/core/res/layout/activity_main.xml
@@ -18,7 +18,7 @@
             android:text="@string/title_check_out"
             android:id="@+id/account_btn_check_out"
             android:onClick="onButtonClick"
-            android:drawableStart="@drawable/check_out"/>
+            android:drawableStart="@drawable/items_checked_out"/>
 
     <Button
             android:layout_width="match_parent"

diff --git a/Open-ILS/src/Android/core/res/layout/fines.xml b/Open-ILS/src/Android/core/res/layout/fines.xml
index f3e799b..f17d975 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout/fines.xml
+++ b/Open-ILS/src/Android/core/res/layout/fines.xml
@@ -6,8 +6,6 @@
     android:background="@color/background"
      >
 
-       <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/core/res/layout/holds_list.xml b/Open-ILS/src/Android/core/res/layout/holds_list.xml
index 99c9c77..692f8d4 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout/holds_list.xml
+++ b/Open-ILS/src/Android/core/res/layout/holds_list.xml
@@ -5,9 +5,7 @@
     android:orientation="vertical"
     android:background="@color/background"
      >
-    
-    <include android:id="@+id/header_actionbar" layout="@layout/simple_actionbar"/>
-    
+
      <LinearLayout android:layout_width="fill_parent"
          android:layout_height="wrap_content"
          android:orientation="horizontal"

diff --git a/Open-ILS/src/Android/core/res/values/strings.xml b/Open-ILS/src/Android/core/res/values/strings.xml
index 71160bf..0dbfc8a 100644 (file)
--- a/Open-ILS/src/Android/core/res/values/strings.xml
+++ b/Open-ILS/src/Android/core/res/values/strings.xml
@@ -17,7 +17,7 @@
     <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="title_fines">Fines</string>
     <string name="copy_information_title">Copy Information</string>
     <string name="button_place_hold">Place Hold</string>
     <string name="button_add_to_bookbag">Add to Bookbag</string>
@@ -56,7 +56,6 @@
     <string name="title_my_account">My Account</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="renew_button">Renew</string>
     <string name="item_renewed">Item renewed</string>

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java
index bb5d43a..c0f6a71 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java
@@ -86,6 +86,7 @@ public class ItemsCheckOutListView extends ActionBarActivity {
 
         setContentView(R.layout.checkout_list);
 
+        // set up action bar
         ActionBar actionBar = getSupportActionBar();
         actionBar.setSubtitle(AccountAccess.userName);
         actionBar.setDisplayHomeAsUpEnabled(true);

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/fines/FinesActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/fines/FinesActivity.java
index 07bd4e2..2fdba22 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/fines/FinesActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/fines/FinesActivity.java
@@ -23,6 +23,8 @@ import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 
+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.accountAccess.SessionNotFoundException;
@@ -46,7 +48,7 @@ import android.widget.Button;
 import android.widget.ListView;
 import android.widget.TextView;
 
-public class FinesActivity extends Activity {
+public class FinesActivity extends ActionBarActivity {
 
     private TextView total_owned;
 
@@ -64,10 +66,6 @@ public class FinesActivity extends Activity {
 
     private OverdueMaterialsArrayAdapter listAdapter;
 
-    private Button homeButton;
-
-    private Button myAccountButton;
-
     private TextView headerTitle;
 
     private Context context;
@@ -84,28 +82,10 @@ public class FinesActivity extends Activity {
 
         setContentView(R.layout.fines);
 
-        // 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.fines_title);
-        homeButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getApplicationContext(),
-                        SearchCatalogListView.class);
-                startActivity(intent);
-            }
-        });
-        // end header portion actions
+        // set up action bar
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setSubtitle(AccountAccess.userName);
+        actionBar.setDisplayHomeAsUpEnabled(true);
 
         decimalFormater = new DecimalFormat("#0.00");
         lv = (ListView) findViewById(R.id.fines_overdue_materials_list);

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldsListView.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldsListView.java
index 301be4a..39aef16 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldsListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldsListView.java
@@ -22,6 +22,8 @@ package org.evergreen_ils.accountAccess.holds;
 import java.util.ArrayList;
 import java.util.List;
 
+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.accountAccess.SessionNotFoundException;
@@ -50,7 +52,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import org.evergreen_ils.accountAccess.holds.HoldRecord;
 
-public class HoldsListView extends Activity {
+public class HoldsListView extends ActionBarActivity {
 
     private final String TAG = HoldsListView.class.getName();
 
@@ -88,28 +90,10 @@ public class HoldsListView extends Activity {
 
         setContentView(R.layout.holds_list);
 
-        // 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.hold_items_title);
-        homeButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getApplicationContext(),
-                        SearchCatalogListView.class);
-                startActivity(intent);
-            }
-        });
-        // end header portion actions
+        // set up action bar
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setSubtitle(AccountAccess.userName);
+        actionBar.setDisplayHomeAsUpEnabled(true);
 
         holdsNoText = (TextView) findViewById(R.id.holds_number);
 

diff --git a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
index d8c7952..33531a4 100644 (file)
--- a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
@@ -90,12 +90,18 @@
                 android:label="@string/checkout_items_title"
                 android:parentActivityName="org.evergreen_ils.views.MainActivity">
             <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.evergreen_ils.views.MainActivity"/>
+                    android:name="android.support.PARENT_ACTIVITY"
+                    android:value="org.evergreen_ils.views.MainActivity"/>
         </activity>
 
         <!-- Holds Activities -->
-        <activity android:name="org.evergreen_ils.accountAccess.holds.HoldsListView" >
+        <activity
+                android:name="org.evergreen_ils.accountAccess.holds.HoldsListView"
+                android:label="@string/hold_items_title"
+                android:parentActivityName="org.evergreen_ils.views.MainActivity">
+            <meta-data
+                    android:name="android.support.PARENT_ACTIVITY"
+                    android:value="org.evergreen_ils.views.MainActivity"/>
         </activity>
         <activity android:name="org.evergreen_ils.accountAccess.holds.PlaceHold" >
         </activity>
@@ -103,7 +109,13 @@
         </activity>
 
         <!-- Fines Activities -->
-        <activity android:name="org.evergreen_ils.accountAccess.fines.FinesActivity" >
+        <activity
+                android:name="org.evergreen_ils.accountAccess.fines.FinesActivity"
+                android:label="@string/title_fines"
+                android:parentActivityName="org.evergreen_ils.views.MainActivity">
+            <meta-data
+                    android:name="android.support.PARENT_ACTIVITY"
+                    android:value="org.evergreen_ils.views.MainActivity"/>
         </activity>
 
         <!-- Bookbags -->