From dab2ecda3318e3772c9a4702b83496e75cc3ea80 Mon Sep 17 00:00:00 2001 From: kenstir Date: Sat, 17 Oct 2015 15:37:10 -0400 Subject: [PATCH] tried 2 different methods for creating adapters for the format spinner, but both of them had strange and different effects on the vertical size of the spinner. Stuck with the vertically squished original. --- .../src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java | 2 ++ .../core/src/org/evergreen_ils/utils/ui/CompatSpinnerAdapter.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) 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 68b4d4331e..37bb5b7314 100644 --- 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 @@ -480,6 +480,8 @@ public class SearchCatalogListView extends ActionBarActivity { String formats_json = loadJSONFromResource(R.raw.search_formats); SearchFormat.initFromJSON(formats_json); List labels = SearchFormat.getSpinnerLabels(); + //ArrayAdapter adapter = CompatSpinnerAdapter.CreateCompatSpinnerAdapter(this, labels); + //ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_spinner_dropdown_item, labels); ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item, labels); searchFormatSpinner.setAdapter(adapter); } diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/CompatSpinnerAdapter.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/CompatSpinnerAdapter.java index 90fa9c8e10..c71e63037f 100644 --- a/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/CompatSpinnerAdapter.java +++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/CompatSpinnerAdapter.java @@ -6,6 +6,7 @@ import android.widget.ArrayAdapter; import org.evergreen_ils.R; import java.util.ArrayList; +import java.util.List; /** * Created by kenstir on 1/5/14. @@ -17,7 +18,7 @@ public class CompatSpinnerAdapter { * The fix is to use two different spinner layouts, one for GB with textColor="@color/dark" * and one for newer versions with textColor="?android:textColorPrimary". */ - public static ArrayAdapter CreateCompatSpinnerAdapter(Context context, ArrayList list) { + public static ArrayAdapter CreateCompatSpinnerAdapter(Context context, List list) { int spinner_layout = (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) ? R.layout.spinner_gb_layout : R.layout.spinner_layout; -- 2.11.0