From afed9314dcf8b56438afee48ff4f946dfa644687 Mon Sep 17 00:00:00 2001
From: kenstir <kenstir@gmail.com>
Date: Thu, 2 Jan 2014 20:29:52 -0500
Subject: [PATCH] Fixed main activity to fit on a 480x800 screen in landscape.

---
 Open-ILS/src/Android/core/res/layout/activity_main.xml         |  6 +-----
 Open-ILS/src/Android/core/res/values-land/dimens.xml           |  2 +-
 .../src/org/evergreen_ils/utils/ui/BasicDetailsFragment.java   | 10 ++++------
 .../org/evergreen_ils/views/splashscreen/SplashActivity.java   |  8 ++++++++
 4 files changed, 14 insertions(+), 12 deletions(-)

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 a080194e67..2eafd08632 100644
--- a/Open-ILS/src/Android/core/res/layout/activity_main.xml
+++ b/Open-ILS/src/Android/core/res/layout/activity_main.xml
@@ -4,13 +4,9 @@
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
+              android:paddingTop="@dimen/bigActionButton_marginVertical"
               android:background="@drawable/background_grey_image">
 
-    <TextView
-            android:layout_width="20px"
-            android:layout_height="18dp"
-            />
-
     <Button
             android:layout_width="match_parent"
             android:layout_height="56dp"
diff --git a/Open-ILS/src/Android/core/res/values-land/dimens.xml b/Open-ILS/src/Android/core/res/values-land/dimens.xml
index 497c0ccf57..d2da6bcaed 100644
--- a/Open-ILS/src/Android/core/res/values-land/dimens.xml
+++ b/Open-ILS/src/Android/core/res/values-land/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="bigActionButton_marginVertical">9dp</dimen>
+    <dimen name="bigActionButton_marginVertical">6dp</dimen>
 </resources>
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 d62b594079..11ed9f977a 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
@@ -355,10 +355,10 @@ public class BasicDetailsFragment extends Fragment {
             TextView copy_location = (TextView) copy_info_view
                     .findViewById(R.id.copy_information_copy_location);
 
-            library.setText(gl.getOrganizationName(record.copyInformationList
-                    .get(i).org_id) + " ");
-            call_number.setText(record.copyInformationList.get(i).call_number_sufix);
-            copy_location.setText(record.copyInformationList.get(i).copy_location);
+            CopyInformation info = record.copyInformationList.get(i);
+            library.setText(gl.getOrganizationName(info.org_id));
+            call_number.setText(info.call_number_sufix);
+            copy_location.setText(info.copy_location);
 
             // insert into main view
             insertPoint.addView(copy_info_view, new ViewGroup.LayoutParams(
@@ -368,8 +368,6 @@ public class BasicDetailsFragment extends Fragment {
             LinearLayout copy_statuses = (LinearLayout) copy_info_view
                     .findViewById(R.id.copy_information_statuses);
 
-            CopyInformation info = record.copyInformationList.get(i);
-
             Set<Entry<String, String>> set = info.statusInformation.entrySet();
 
             Iterator<Entry<String, String>> it = set.iterator();
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java
index 32c8bc61f7..0464c7d9c5 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java
@@ -19,6 +19,7 @@
  */
 package org.evergreen_ils.views.splashscreen;
 
+import android.os.Build;
 import org.evergreen_ils.R;
 import org.evergreen_ils.globals.GlobalConfigs;
 import org.evergreen_ils.searchCatalog.SearchCatalogListView;
@@ -102,6 +103,13 @@ public class SplashActivity extends Activity implements LoadingTaskListener {
             }
         });
 
+        /* this didn't work, but the progress bar is weird on GB 2.2,
+           and it's lopsided in landscape mode on GB 2.3.7
+        int currentApiVersion = android.os.Build.VERSION.SDK_INT;
+        if (currentApiVersion < Build.VERSION_CODES.HONEYCOMB)
+            mProgressBar.setScrollBarStyle(android.R.attr.progressBarStyleHorizontal);
+         */
+
         GlobalConfigs.httpAddress = getString(R.string.ou_library_url);
         startTask();
     }
-- 
2.11.0