Factored out ActionBar subtitle setting across all activities.

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookBagDetails.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookBagDetails.java
index 4e357e0..2642509 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookBagDetails.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookBagDetails.java
@@ -30,6 +30,7 @@ import org.evergreen_ils.accountAccess.SessionNotFoundException;
 import org.evergreen_ils.searchCatalog.RecordInfo;
 import org.evergreen_ils.searchCatalog.SearchCatalog;
 import org.evergreen_ils.searchCatalog.SearchCatalogListView;
+import org.evergreen_ils.utils.ui.ActionBarUtils;
 import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
@@ -92,11 +93,7 @@ public class BookBagDetails extends ActionBarActivity {
         }
 
         setContentView(R.layout.bookbagitem_list);
-
-        // set up action bar
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setSubtitle(AccountAccess.userName);
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        ActionBarUtils.initActionBarForActivity(this);
 
         accountAccess = AccountAccess.getAccountAccess();
         bookBag = (BookBag) getIntent().getSerializableExtra("bookBag");

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookbagsListView.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookbagsListView.java
index 8425c84..b7fcaad 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookbagsListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookbagsListView.java
@@ -28,6 +28,7 @@ import org.evergreen_ils.R;
 import org.evergreen_ils.accountAccess.AccountAccess;
 import org.evergreen_ils.accountAccess.SessionNotFoundException;
 import org.evergreen_ils.searchCatalog.SearchCatalogListView;
+import org.evergreen_ils.utils.ui.ActionBarUtils;
 import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
@@ -81,11 +82,7 @@ public class BookbagsListView extends ActionBarActivity {
         }
 
         setContentView(R.layout.bookbag_list);
-
-        // set up action bar
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setSubtitle(AccountAccess.userName);
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        ActionBarUtils.initActionBarForActivity(this);
 
         context = this;
         accountAccess = AccountAccess.getAccountAccess();

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 5524e30..c613b4f 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
@@ -31,6 +31,7 @@ import org.evergreen_ils.accountAccess.MaxRenewalsException;
 import org.evergreen_ils.accountAccess.ServerErrorMessage;
 import org.evergreen_ils.accountAccess.SessionNotFoundException;
 import org.evergreen_ils.searchCatalog.SearchFormat;
+import org.evergreen_ils.utils.ui.ActionBarUtils;
 import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.ProgressDialog;
@@ -79,11 +80,7 @@ public class ItemsCheckOutListView extends ActionBarActivity {
         SearchFormat.init(this);
 
         setContentView(R.layout.checkout_list);
-
-        // set up action bar
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setSubtitle(AccountAccess.userName);
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        ActionBarUtils.initActionBarForActivity(this);
 
         context = this;
         itemsNo = (TextView) findViewById(R.id.checkout_items_number);

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 74307b9..fa84823 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
@@ -28,6 +28,7 @@ import android.support.v7.app.ActionBarActivity;
 import org.evergreen_ils.R;
 import org.evergreen_ils.accountAccess.AccountAccess;
 import org.evergreen_ils.accountAccess.SessionNotFoundException;
+import org.evergreen_ils.utils.ui.ActionBarUtils;
 import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
@@ -79,11 +80,7 @@ public class FinesActivity extends ActionBarActivity {
         }
 
         setContentView(R.layout.fines);
-
-        // set up action bar
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setSubtitle(AccountAccess.userName);
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        ActionBarUtils.initActionBarForActivity(this);
 
         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/HoldDetails.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java
index 2d58d42..eb5b41e 100644 (file)
--- 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
@@ -31,6 +31,7 @@ import org.evergreen_ils.R;
 import org.evergreen_ils.accountAccess.AccountAccess;
 import org.evergreen_ils.accountAccess.SessionNotFoundException;
 import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.utils.ui.ActionBarUtils;
 import org.evergreen_ils.utils.ui.CompatSpinnerAdapter;
 import org.evergreen_ils.views.splashscreen.SplashActivity;
 
@@ -119,11 +120,7 @@ public class HoldDetails extends ActionBarActivity {
         }
 
         setContentView(R.layout.hold_details);
-
-        // set up action bar
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setSubtitle(AccountAccess.userName);
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        ActionBarUtils.initActionBarForActivity(this);
 
         context = this;
         globalConfigs = GlobalConfigs.getGlobalConfigs(this);

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 0b0b491..18b8d97 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
@@ -36,6 +36,7 @@ import org.evergreen_ils.accountAccess.AccountAccess;
 import org.evergreen_ils.accountAccess.SessionNotFoundException;
 import org.evergreen_ils.searchCatalog.ImageDownloader;
 import org.evergreen_ils.searchCatalog.SearchFormat;
+import org.evergreen_ils.utils.ui.ActionBarUtils;
 import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import java.util.ArrayList;
@@ -79,11 +80,7 @@ public class HoldsListView extends ActionBarActivity {
         SearchFormat.init(this);
 
         setContentView(R.layout.holds_list);
-
-        // set up action bar
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setSubtitle(AccountAccess.userName);
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        ActionBarUtils.initActionBarForActivity(this);
 
         holdsNoText = (TextView) findViewById(R.id.holds_number);
 

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 54b8eeb..9dc98f8 100644 (file)
--- 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
@@ -33,6 +33,7 @@ import org.evergreen_ils.accountAccess.SessionNotFoundException;
 import org.evergreen_ils.globals.GlobalConfigs;
 import org.evergreen_ils.searchCatalog.Organisation;
 import org.evergreen_ils.searchCatalog.RecordInfo;
+import org.evergreen_ils.utils.ui.ActionBarUtils;
 import org.evergreen_ils.utils.ui.CompatSpinnerAdapter;
 import org.evergreen_ils.views.splashscreen.SplashActivity;
 
@@ -122,11 +123,7 @@ public class PlaceHold extends ActionBarActivity {
         }
 
         setContentView(R.layout.place_hold);
-
-        // set up action bar
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setSubtitle(AccountAccess.userName);
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        ActionBarUtils.initActionBarForActivity(this);
 
         globalConfigs = GlobalConfigs.getGlobalConfigs(this);
         RecordInfo record = (RecordInfo) getIntent().getSerializableExtra(

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 4eeef10..3d0f5e4 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
@@ -26,6 +26,7 @@ import android.support.v7.app.ActionBarActivity;
 import android.view.MenuItem;
 import org.evergreen_ils.R;
 import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.utils.ui.ActionBarUtils;
 import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
@@ -60,11 +61,7 @@ public class AdvancedSearchActivity extends ActionBarActivity {
         }
 
         setContentView(R.layout.advanced_search);
-
-        // set up action bar
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setSubtitle(AccountAccess.userName);
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        ActionBarUtils.initActionBarForActivity(this);
 
         advancedSearchFormattedText = new StringBuilder();
 

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/MoreCopyInformation.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/MoreCopyInformation.java
index 2310fcf..491144b 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/MoreCopyInformation.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/MoreCopyInformation.java
@@ -29,6 +29,7 @@ import android.view.MenuItem;
 import org.evergreen_ils.R;
 import org.evergreen_ils.accountAccess.AccountAccess;
 import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.utils.ui.ActionBarUtils;
 import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.content.Context;
@@ -57,11 +58,7 @@ public class MoreCopyInformation extends ActionBarActivity {
         }
 
         setContentView(R.layout.copy_information_more);
-
-        // set up action bar
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setSubtitle(AccountAccess.userName);
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        ActionBarUtils.initActionBarForActivity(this);
 
         globalConfigs = GlobalConfigs.getGlobalConfigs(context);
         context = this;

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java
index c81e005..3a01916 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java
@@ -71,11 +71,7 @@ public class SampleUnderlinesNoFade extends BaseSampleActivity {
         }
 
         setContentView(R.layout.simple_underlines);
-
-        // set up action bar
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setSubtitle(AccountAccess.userName);
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        ActionBarUtils.initActionBarForActivity(this);
 
         search = SearchCatalog.getInstance();
 

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 ba3cd8a..7e344cb 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
@@ -31,6 +31,7 @@ import org.evergreen_ils.accountAccess.bookbags.BookBag;
 import org.evergreen_ils.accountAccess.holds.PlaceHold;
 import org.evergreen_ils.barcodescan.CaptureActivity;
 import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.utils.ui.ActionBarUtils;
 import org.evergreen_ils.utils.ui.CompatSpinnerAdapter;
 import org.evergreen_ils.views.splashscreen.SplashActivity;
 
@@ -132,11 +133,7 @@ public class SearchCatalogListView extends ActionBarActivity {
         SearchFormat.init(this);
 
         setContentView(R.layout.search_result_list);
-
-        // set up action bar
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setSubtitle(AccountAccess.userName);
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        ActionBarUtils.initActionBarForActivity(this);
 
         // get bookbags
         bookBags = AccountAccess.getAccountAccess().getBookbags();

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/ActionBarUtils.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/ActionBarUtils.java
new file mode 100644 (file)
index 0000000..ecebd9b
--- /dev/null
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/ActionBarUtils.java
@@ -0,0 +1,23 @@
+package org.evergreen_ils.utils.ui;
+
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.globals.AppPrefs;
+
+/**
+ * Created by kenstir on 11/21/2015.
+ */
+public class ActionBarUtils {
+    public static void initActionBarForActivity(ActionBarActivity activity, boolean isMainActivity) {
+        ActionBar actionBar = activity.getSupportActionBar();
+        actionBar.setSubtitle(AppPrefs.getString(AppPrefs.LIBRARY_NAME) + " - " + AccountAccess.userName);
+        if (!isMainActivity) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+    }
+
+    public static void initActionBarForActivity(ActionBarActivity activity) {
+        initActionBarForActivity(activity, false);
+    }
+}

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 0719c46..3b72a65 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
@@ -20,6 +20,7 @@ import org.evergreen_ils.globals.AppPrefs;
 import org.evergreen_ils.globals.GlobalConfigs;
 import org.evergreen_ils.searchCatalog.AdvancedSearchActivity;
 import org.evergreen_ils.searchCatalog.SearchCatalogListView;
+import org.evergreen_ils.utils.ui.ActionBarUtils;
 import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 /**
@@ -37,10 +38,7 @@ public class MainActivity extends ActionBarActivity {
         }
 
         setContentView(R.layout.activity_main);
-
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setTitle(AppPrefs.getString(AppPrefs.LIBRARY_NAME));
-        actionBar.setSubtitle(AccountAccess.userName);
+        ActionBarUtils.initActionBarForActivity(this, true);
 
         // singleton initialize necessary IDL and Org data
         globalConfigs = GlobalConfigs.getGlobalConfigs(this);

diff --git a/Open-ILS/src/Android/hemlock_app/AndroidManifest.xml b/Open-ILS/src/Android/hemlock_app/AndroidManifest.xml
index 348b112..6b2aa34 100644 (file)
--- a/Open-ILS/src/Android/hemlock_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/hemlock_app/AndroidManifest.xml
@@ -6,7 +6,7 @@
           android:versionName="1.0">
 
     <uses-sdk
-        android:minSdkVersion="10"
+        android:minSdkVersion="15"
         android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />