From 64c03a6fcd601b39b27e87ac7f548bcc3fba0266 Mon Sep 17 00:00:00 2001 From: kenstir Date: Sun, 29 Dec 2013 14:39:42 -0500 Subject: [PATCH] More activities now have the standard action bar: checkouts, holds, fines --- .../core/res/drawable-hdpi/items_checked_out.png | Bin 0 -> 7929 bytes Open-ILS/src/Android/core/res/drawable/holds2.png | Bin 0 -> 5281 bytes .../src/Android/core/res/layout/activity_main.xml | 2 +- Open-ILS/src/Android/core/res/layout/fines.xml | 2 -- .../src/Android/core/res/layout/holds_list.xml | 4 +-- Open-ILS/src/Android/core/res/values/strings.xml | 3 +- .../checkout/ItemsCheckOutListView.java | 1 + .../accountAccess/fines/FinesActivity.java | 34 +++++---------------- .../accountAccess/holds/HoldsListView.java | 30 +++++------------- .../src/Android/cwmars_app/AndroidManifest.xml | 20 +++++++++--- 10 files changed, 34 insertions(+), 62 deletions(-) create mode 100644 Open-ILS/src/Android/core/res/drawable-hdpi/items_checked_out.png create mode 100644 Open-ILS/src/Android/core/res/drawable/holds2.png 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 index 0000000000000000000000000000000000000000..10fc3bb0c88669a81d0aee35d469f9938ae8c7c9 GIT binary patch literal 7929 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 KW$VEfA^!u6iv#EY literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..2f2d4c7e1ecb4bb5b35825869219e7c2994ab307 GIT binary patch literal 5281 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 literal 0 HcmV?d00001 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 ad7f1f6e94..cf401aab64 100644 --- 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"/>