From: kenstir <kenstir@gmail.com>
Date: Tue, 31 Dec 2013 04:16:55 +0000 (-0500)
Subject: Fixed crash on horizontal swipe past end of search results.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=89a9b9efe6b28d25b986ba32362fa70099e7ba61;p=working%2FEvergreen.git

Fixed crash on horizontal swipe past end of search results.
Changed inexplicable "1 / 1" text to "1 of 1 copy available" in search results.
---

diff --git a/Open-ILS/src/Android/core/res/layout/record_details_basic_fragment.xml b/Open-ILS/src/Android/core/res/layout/record_details_basic_fragment.xml
index d02e8b5da0..aff3a10d73 100644
--- a/Open-ILS/src/Android/core/res/layout/record_details_basic_fragment.xml
+++ b/Open-ILS/src/Android/core/res/layout/record_details_basic_fragment.xml
@@ -10,16 +10,14 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-		style="@style/SearchDetailsInfoSeparator"
-         >
+        >
+        <!-- style="@style/SearchDetailsInfoSeparator" -->
 
         <TextView
             android:id="@+id/record_header_text"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textColor="@color/blue"
             android:gravity="center"
-            android:textSize="@dimen/search_details_rect_text_size"
             android:textStyle="bold"
             />
         
@@ -106,9 +104,10 @@
 
             <TextView
                 android:id="@+id/record_details_simple_copy_count"
-                style="@style/SeparatorInformation"
-            	
-            />
+                android:textStyle="bold"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"/>
+            <!-- style="@style/SeparatorInformation" -->
 
 			<LinearLayout
 			    android:id="@+id/record_details_copy_information"
@@ -123,11 +122,10 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-		style="@style/SearchDetailsInfoSeparator"
 		android:orientation="horizontal"
-         >
+        style="@style/SearchDetailsInfoSeparator"
+        >
 
-		    
 		<ImageView 
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
@@ -139,8 +137,8 @@
             android:layout_height="wrap_content"
             android:textColor="@color/blue"
             android:text="@string/show_more_text"
-            android:textSize="@dimen/search_details_rect_text_size"
             android:textStyle="bold"
+            android:textSize="@dimen/search_details_rect_text_size"
         />
         
     	</LinearLayout>
diff --git a/Open-ILS/src/Android/core/res/layout/simple_underlines.xml b/Open-ILS/src/Android/core/res/layout/simple_underlines.xml
index bcad2dc5e8..f1d64453d4 100644
--- a/Open-ILS/src/Android/core/res/layout/simple_underlines.xml
+++ b/Open-ILS/src/Android/core/res/layout/simple_underlines.xml
@@ -22,8 +22,6 @@
     android:background="@color/background"
     >
 
-	<include android:id="@+id/header_actionbar" layout="@layout/simple_actionbar"/>
-
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"
         android:layout_width="fill_parent"
@@ -35,7 +33,7 @@
         />
     <org.evergreen_ils.utils.ui.UnderlinePageIndicator
         android:id="@+id/indicator"
-        android:layout_height="2dp"
+        android:layout_height="3dp"
         android:layout_width="fill_parent"
         />
 </LinearLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/core/res/values/dimens.xml b/Open-ILS/src/Android/core/res/values/dimens.xml
index d83619b7f1..82c0900dee 100644
--- a/Open-ILS/src/Android/core/res/values/dimens.xml
+++ b/Open-ILS/src/Android/core/res/values/dimens.xml
@@ -22,7 +22,7 @@
     <dimen name="text_size_medium">18sp</dimen>
     <dimen name="text_size_large">22sp</dimen>
     <dimen name="library_logo_text_size">16sp</dimen>
-    <dimen name="search_details_rect_text_size">16dip</dimen>
+    <dimen name="search_details_rect_text_size">12dip</dimen>
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="bigActionButton_marginVertical">18dp</dimen>
diff --git a/Open-ILS/src/Android/core/res/values/strings.xml b/Open-ILS/src/Android/core/res/values/strings.xml
index f464c74d61..a4c6afc007 100644
--- a/Open-ILS/src/Android/core/res/values/strings.xml
+++ b/Open-ILS/src/Android/core/res/values/strings.xml
@@ -58,7 +58,9 @@
     <string name="title_book_bags">Bookbags</string>
     <string name="renew_button">Renew</string>
     <string name="item_renewed">Item renewed</string>
-    <string name="record_of">Record %1$d of %2$d</string>
+    <string name="record_of">record %1$d of %2$d</string>
+    <string name="displaying_n_of_m_results">displaying %1$d of %2$d results</string>
+    <string name="n_of_m_available">%1$d of %2$s available</string>
 
     <!-- Search Details View -->
     <string name="show_more_text">Show More</string>
diff --git a/Open-ILS/src/Android/core/res/values/styles.xml b/Open-ILS/src/Android/core/res/values/styles.xml
index 5683638078..33b0c2dc27 100644
--- a/Open-ILS/src/Android/core/res/values/styles.xml
+++ b/Open-ILS/src/Android/core/res/values/styles.xml
@@ -134,8 +134,8 @@
     <!-- Search Details -->
     <style name="SearchDetailsInfoSeparator">
         <item name="android:background">@drawable/shadow_rect</item>
-        <item name="android:padding">5dip</item>
-        <item name="android:layout_marginTop">10dip</item>
+        <item name="android:padding">3dip</item>
+        <item name="android:layout_marginTop">3dip</item>
         <item name="android:textColor">@color/dark</item>
     </style>
 
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 f2b290343a..3161cacaee 100644
--- 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
@@ -43,7 +43,7 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
 
-public class SampleUnderlinesNoFade extends ActionBarActivity {
+public class SampleUnderlinesNoFade extends BaseSampleActivity {
 
     private ArrayList<RecordInfo> records;
 
@@ -63,10 +63,6 @@ public class SampleUnderlinesNoFade extends ActionBarActivity {
     
     private Runnable searchRunnableWithOffset;
 
-    public TestFragmentAdapter mAdapter;
-    public ViewPager mPager;
-    public PageIndicator mIndicator;
-
     public static final int RETURN_DATA = 5;
     
     @Override
@@ -136,6 +132,7 @@ public class SampleUnderlinesNoFade extends ActionBarActivity {
                             // option button
 
                         }
+                        mAdapter.notifyDataSetChanged();
                         progressDialog.dismiss();
                     }
                 });
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/BaseSampleActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/BaseSampleActivity.java
index 46cb48de6a..dfb96212ba 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/BaseSampleActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/BaseSampleActivity.java
@@ -21,6 +21,7 @@ package org.evergreen_ils.utils.ui;
 
 import java.util.Random;
 
+import android.support.v7.app.ActionBarActivity;
 import org.evergreen_ils.R;
 
 import android.support.v4.app.FragmentActivity;
@@ -29,7 +30,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-public abstract class BaseSampleActivity extends FragmentActivity {
+public abstract class BaseSampleActivity extends ActionBarActivity {
     private static final Random RANDOM = new Random();
 
     public TestFragmentAdapter mAdapter;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/BasicDetailsFragment.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/BasicDetailsFragment.java
index fb9175b18a..d2c516015d 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/BasicDetailsFragment.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/BasicDetailsFragment.java
@@ -76,7 +76,7 @@ public class BasicDetailsFragment extends Fragment {
     private TextView synopsisTextView;
     private TextView isbnTextView;
 
-    private TextView copyCountTestView;
+    private TextView copyCountTextView;
 
     private Button placeHoldButton;
 
@@ -144,7 +144,7 @@ public class BasicDetailsFragment extends Fragment {
                 R.layout.record_details_basic_fragment, null);
 
         record_header = (TextView) layout.findViewById(R.id.record_header_text);
-        copyCountTestView = (TextView) layout
+        copyCountTextView = (TextView) layout
                 .findViewById(R.id.record_details_simple_copy_count);
         showMore = (LinearLayout) layout
                 .findViewById(R.id.record_details_show_more);
@@ -299,7 +299,8 @@ public class BasicDetailsFragment extends Fragment {
             if (record.copyCountListInfo.get(i).org_id == current_org) {
                 int total = record.copyCountListInfo.get(i).count;
                 int available = record.copyCountListInfo.get(i).available;
-                copyCountTestView.setText(available + " / " + total);
+                String totalCopies = getResources().getQuantityString(R.plurals.number_of_copies, total, total);
+                copyCountTextView.setText(String.format(getString(R.string.n_of_m_available), available, totalCopies));
                 break;
             }
         }