From 2ccb9760581c12ffde1075186d69416c387d02ea Mon Sep 17 00:00:00 2001 From: kenstir Date: Fri, 6 Nov 2015 21:27:51 -0500 Subject: [PATCH] Renamed consortium -> library --- Open-ILS/src/Android/core/res/values/strings.xml | 2 +- .../{Consortium.java => Library.java} | 2 +- ...iumActivity.java => ChooseLibraryActivity.java} | 59 +++++++++++++--------- .../views/splashscreen/SplashActivity.java | 4 +- Open-ILS/src/Android/eg_app/AndroidManifest.xml | 2 +- 5 files changed, 41 insertions(+), 28 deletions(-) rename Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/{Consortium.java => Library.java} (85%) rename Open-ILS/src/Android/core/src/org/evergreen_ils/views/{ChooseConsortiumActivity.java => ChooseLibraryActivity.java} (63%) diff --git a/Open-ILS/src/Android/core/res/values/strings.xml b/Open-ILS/src/Android/core/res/values/strings.xml index ac8c16186f..fb18d6e800 100644 --- a/Open-ILS/src/Android/core/res/values/strings.xml +++ b/Open-ILS/src/Android/core/res/values/strings.xml @@ -150,7 +150,7 @@ Settings Retry - Select your Evergreen Library + Select your Library Select diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Consortium.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Library.java similarity index 85% rename from Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Consortium.java rename to Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Library.java index a65a74ecdc..80d40ec533 100644 --- a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Consortium.java +++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Library.java @@ -3,7 +3,7 @@ package org.evergreen_ils.searchCatalog; /** value class * Created by kenstir on 11/5/2015. */ -public class Consortium { +public class Library { public String name; public String library_url; } diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java similarity index 63% rename from Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java rename to Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java index b1a87cdf86..d32e417de0 100644 --- a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java +++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java @@ -12,10 +12,8 @@ import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.Spinner; import org.evergreen_ils.R; -import org.evergreen_ils.accountAccess.AccountAccess; import org.evergreen_ils.globals.Utils; -import org.evergreen_ils.searchCatalog.Consortium; -import org.evergreen_ils.utils.ui.CompatSpinnerAdapter; +import org.evergreen_ils.searchCatalog.Library; import org.opensrf.util.JSONException; import org.opensrf.util.JSONReader; @@ -24,15 +22,15 @@ import java.util.*; /** * Created by kenstir on 2015-11-05. */ -public class ChooseConsortiumActivity extends ActionBarActivity { +public class ChooseLibraryActivity extends ActionBarActivity { - private final String TAG = ChooseConsortiumActivity.class.getSimpleName(); + private final String TAG = ChooseLibraryActivity.class.getSimpleName(); public static String consortiumsJSONUrl = "http://evergreen-ils.org/testing/libraries.json"; Context context; Spinner consortiumSpinner; Button button; - String consortium_url = null; - List consortiums = new ArrayList(); + String library_url = null; + List libraries = new ArrayList(); private class FetchConsortiumsTask extends AsyncTask { protected String doInBackground(String... params) { @@ -49,10 +47,10 @@ public class ChooseConsortiumActivity extends ActionBarActivity { protected void onPostExecute(String result) { Log.d(TAG, "results available: "+result); - consortiums = parseEvergreenConsortiums(result); - ArrayList l = new ArrayList(consortiums.size()); - for (Consortium consortium : consortiums) { - l.add(consortium.name); + libraries = parseEvergreenConsortiums(result); + ArrayList l = new ArrayList(libraries.size()); + for (Library library : libraries) { + l.add(library.name); } //ArrayAdapter adapter = CompatSpinnerAdapter.CreateCompatSpinnerAdapter(context, l); //ArrayAdapter adapter = new ArrayAdapter(context, android.R.layout.simple_spinner_item, l); @@ -72,9 +70,24 @@ public class ChooseConsortiumActivity extends ActionBarActivity { ActionBar actionBar = getSupportActionBar(); consortiumSpinner = (Spinner) findViewById(R.id.choose_library_spinner); + consortiumSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + library_url = libraries.get(position).library_url; + Log.d(TAG, "selected library_url "+ library_url); + } + + @Override + public void onNothingSelected(AdapterView parent) {} + }); button = (Button) findViewById(R.id.choose_library_button); + button.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Log.d(TAG, "clicked! library_url="+ library_url); + } + }); - //init asynctask here FetchConsortiumsTask task = new FetchConsortiumsTask(); task.execute(consortiumsJSONUrl); } @@ -83,35 +96,35 @@ public class ChooseConsortiumActivity extends ActionBarActivity { int id = v.getId(); } - public List parseEvergreenConsortiums(String json) { - List consortiums = new ArrayList(); + public List parseEvergreenConsortiums(String json) { + List libraries = new ArrayList(); if (json != null) { List> l; try { l = (List>) new JSONReader(json).readArray(); } catch (JSONException e) { - Log.d(TAG, "failed parsing consortiums array", e); - return consortiums; + Log.d(TAG, "failed parsing libraries array", e); + return libraries; } for (Map map : l) { - Consortium c = new Consortium(); + Library c = new Library(); c.name = (String) map.get("library_name"); c.library_url = (String) map.get("url"); - consortiums.add(c); + libraries.add(c); } - Collections.sort(consortiums, new Comparator() { + Collections.sort(libraries, new Comparator() { @Override - public int compare(Consortium a, Consortium b) { + public int compare(Library a, Library b) { return a.name.compareTo(b.name); } }); - for (int i=0; i -- 2.11.0