From: drizea Date: Wed, 4 Jul 2012 10:49:38 +0000 (+0300) Subject: list view holds finish (needs UI design), started work on place hold X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=53ed7f4678eb5b8a8146ba6b2134f43122ab28a7;p=working%2FEvergreen.git list view holds finish (needs UI design), started work on place hold --- diff --git a/Open-ILS/src/Android/AndroidManifest.xml b/Open-ILS/src/Android/AndroidManifest.xml index 236824c4a6..0a3bc4bb8c 100644 --- a/Open-ILS/src/Android/AndroidManifest.xml +++ b/Open-ILS/src/Android/AndroidManifest.xml @@ -42,7 +42,9 @@ - + + + diff --git a/Open-ILS/src/Android/bin/EvergreenApp.apk b/Open-ILS/src/Android/bin/EvergreenApp.apk index 715dc55cdb..6c076a6c8e 100644 Binary files a/Open-ILS/src/Android/bin/EvergreenApp.apk and b/Open-ILS/src/Android/bin/EvergreenApp.apk differ diff --git a/Open-ILS/src/Android/bin/classes.dex b/Open-ILS/src/Android/bin/classes.dex index 5d557a227f..af342eefe4 100644 Binary files a/Open-ILS/src/Android/bin/classes.dex and b/Open-ILS/src/Android/bin/classes.dex differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$id.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$id.class index 36831ef4ab..d45e406070 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$id.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$id.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$layout.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$layout.class index d7c621d845..c765634010 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$layout.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$layout.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$string.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$string.class index 73eaa73189..a71e352ec6 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$string.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$string.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$style.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$style.class index 1907398ac9..c21aaa559a 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$style.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$style.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/accountAccess/AccountAccess.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/accountAccess/AccountAccess.class index 5dba9b7658..616791a908 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/accountAccess/AccountAccess.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/accountAccess/AccountAccess.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/Utils.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/Utils.class index f77d4d7ee7..da272b5c8d 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/Utils.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/Utils.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Info.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Info.class index 349270f837..2f1e4e1026 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Info.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Info.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Simple.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Simple.class index a0ce90ce9a..7abf7b9c8d 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Simple.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Simple.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordInfo.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordInfo.class index 36e6726b81..d98c8a70fb 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordInfo.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordInfo.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class index 10eb85e293..8410c3740b 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class index 7ffeaf535f..65b45c3115 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class index ffe3981eea..47f363edac 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class index 5e414cfbf2..d4048765e6 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class index 59be769e66..dd2ced182e 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class index 93bea92e51..0edc694f98 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class index 18e33a8b2d..63d7f7c0a5 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/AccountScreenDashboard.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/AccountScreenDashboard.class index 6ddf31c6dd..3d1666a321 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/AccountScreenDashboard.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/AccountScreenDashboard.class differ diff --git a/Open-ILS/src/Android/bin/resources.ap_ b/Open-ILS/src/Android/bin/resources.ap_ index 97cf74f216..ed5fafff70 100644 Binary files a/Open-ILS/src/Android/bin/resources.ap_ and b/Open-ILS/src/Android/bin/resources.ap_ differ diff --git a/Open-ILS/src/Android/gen/org/evergreen/android/R.java b/Open-ILS/src/Android/gen/org/evergreen/android/R.java index 1f9bbe8993..834bfeeea4 100644 --- a/Open-ILS/src/Android/gen/org/evergreen/android/R.java +++ b/Open-ILS/src/Android/gen/org/evergreen/android/R.java @@ -52,42 +52,53 @@ public final class R { public static final int account_btn_check_out=0x7f090007; public static final int account_btn_fines=0x7f090009; public static final int account_btn_holds=0x7f090008; + public static final int action_bar=0x7f090015; + public static final int cancel_hold=0x7f090016; public static final int checkout_due_date=0x7f090005; public static final int checkout_items_list=0x7f090001; public static final int checkout_record_author=0x7f090003; public static final int checkout_record_title=0x7f090002; public static final int checkout_renewals_remaining=0x7f090004; - public static final int chose_organisation=0x7f090027; - public static final int hold_active=0x7f090013; + public static final int chose_organisation=0x7f090032; + public static final int header=0x7f090013; + public static final int header_title=0x7f090014; public static final int hold_author=0x7f090011; - public static final int hold_expiration_date=0x7f090014; + public static final int hold_contact_telephone=0x7f09001a; + public static final int hold_enable_email_notification=0x7f09001c; + public static final int hold_enable_phone_notification=0x7f09001b; + public static final int hold_expiration_date=0x7f09001e; + public static final int hold_physical_description=0x7f090019; + public static final int hold_pickup_location=0x7f09001d; + public static final int hold_recipient=0x7f090018; public static final int hold_status=0x7f090012; + public static final int hold_suspend_hold=0x7f09001f; public static final int hold_title=0x7f090010; public static final int holds_item_list=0x7f09000f; public static final int holds_number=0x7f09000e; public static final int main_btn_account=0x7f09000c; public static final int main_btn_app_settings=0x7f09000d; public static final int main_btn_search=0x7f09000b; - public static final int record_details_info_author=0x7f090016; - public static final int record_details_info_publisher=0x7f090017; - public static final int record_details_info_title=0x7f090015; - public static final int record_details_simple_author=0x7f090019; - public static final int record_details_simple_isbn=0x7f09001e; - public static final int record_details_simple_publisher=0x7f09001a; - public static final int record_details_simple_series=0x7f09001c; - public static final int record_details_simple_subject=0x7f09001b; - public static final int record_details_simple_synopsis=0x7f09001d; - public static final int record_details_simple_title=0x7f090018; + public static final int place_hold=0x7f090017; + public static final int record_details_info_author=0x7f090021; + public static final int record_details_info_publisher=0x7f090022; + public static final int record_details_info_title=0x7f090020; + public static final int record_details_simple_author=0x7f090024; + public static final int record_details_simple_isbn=0x7f090029; + public static final int record_details_simple_publisher=0x7f090025; + public static final int record_details_simple_series=0x7f090027; + public static final int record_details_simple_subject=0x7f090026; + public static final int record_details_simple_synopsis=0x7f090028; + public static final int record_details_simple_title=0x7f090023; public static final int renew_button=0x7f090006; - public static final int searchButton=0x7f090025; - public static final int searchText=0x7f090024; - public static final int search_more_items_button=0x7f09001f; - public static final int search_record_author=0x7f090022; - public static final int search_record_img=0x7f090020; - public static final int search_record_publishing=0x7f090023; - public static final int search_record_title=0x7f090021; + public static final int searchButton=0x7f090030; + public static final int searchText=0x7f09002f; + public static final int search_more_items_button=0x7f09002a; + public static final int search_record_author=0x7f09002d; + public static final int search_record_img=0x7f09002b; + public static final int search_record_publishing=0x7f09002e; + public static final int search_record_title=0x7f09002c; public static final int search_result_number=0x7f090000; - public static final int search_results_list=0x7f090026; + public static final int search_results_list=0x7f090031; } public static final class layout { public static final int checkout_list=0x7f030000; @@ -97,17 +108,33 @@ public final class R { public static final int holds_list=0x7f030004; public static final int holds_list_item=0x7f030005; public static final int main=0x7f030006; - public static final int record_details_info=0x7f030007; - public static final int record_details_simple=0x7f030008; - public static final int search_result_footer_view=0x7f030009; - public static final int search_result_item=0x7f03000a; - public static final int search_result_list=0x7f03000b; + public static final int place_hold=0x7f030007; + public static final int record_details_info=0x7f030008; + public static final int record_details_simple=0x7f030009; + public static final int search_result_footer_view=0x7f03000a; + public static final int search_result_item=0x7f03000b; + public static final int search_result_list=0x7f03000c; } public static final class string { public static final int app_name=0x7f070001; + public static final int author=0x7f07000d; + public static final int cancel=0x7f070017; + public static final int contact_email_address=0x7f070011; + public static final int contact_telephone=0x7f07000f; + public static final int enable_email_notification=0x7f070012; + public static final int enable_phone_notification=0x7f070010; + public static final int expiration_date=0x7f070014; public static final int hello=0x7f070000; + public static final int physical_description=0x7f07000e; + public static final int pickup_location=0x7f070013; + public static final int place_hold=0x7f070016; + /** Place Hold Activity View + */ + public static final int recipient=0x7f07000b; public static final int renew_button=0x7f07000a; public static final int search_result_text=0x7f070009; + public static final int suspend_hold=0x7f070015; + public static final int title=0x7f07000c; public static final int title_application_settings=0x7f070004; public static final int title_book_bags=0x7f070008; public static final int title_check_out=0x7f070005; diff --git a/Open-ILS/src/Android/res/layout/holds_list_item.xml b/Open-ILS/src/Android/res/layout/holds_list_item.xml index 3c0a85c774..32302cfe3d 100644 --- a/Open-ILS/src/Android/res/layout/holds_list_item.xml +++ b/Open-ILS/src/Android/res/layout/holds_list_item.xml @@ -1,8 +1,7 @@ - + android:layout_height="match_parent" > - - - - - - \ No newline at end of file diff --git a/Open-ILS/src/Android/res/layout/place_hold.xml b/Open-ILS/src/Android/res/layout/place_hold.xml new file mode 100644 index 0000000000..e1d56a2444 --- /dev/null +++ b/Open-ILS/src/Android/res/layout/place_hold.xml @@ -0,0 +1,271 @@ + + + + + + + + + + + +