<string name="action_settings">Settings</string>
<string name="retry_label">Retry</string>
- <string name="choose_library_message">Select your Evergreen Library</string>
+ <string name="choose_library_message">Select your Library</string>
<string name="action_choose_library">Select</string>
</resources>
+++ /dev/null
-package org.evergreen_ils.searchCatalog;
-
-/** value class
- * Created by kenstir on 11/5/2015.
- */
-public class Consortium {
- public String name;
- public String library_url;
-}
--- /dev/null
+package org.evergreen_ils.searchCatalog;
+
+/** value class
+ * Created by kenstir on 11/5/2015.
+ */
+public class Library {
+ public String name;
+ public String library_url;
+}
+++ /dev/null
-package org.evergreen_ils.views;
-
-import android.content.Context;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
-import android.util.Log;
-import android.view.View;
-import android.widget.AdapterView;
-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.opensrf.util.JSONException;
-import org.opensrf.util.JSONReader;
-
-import java.util.*;
-
-/**
- * Created by kenstir on 2015-11-05.
- */
-public class ChooseConsortiumActivity extends ActionBarActivity {
-
- private final String TAG = ChooseConsortiumActivity.class.getSimpleName();
- public static String consortiumsJSONUrl = "http://evergreen-ils.org/testing/libraries.json";
- Context context;
- Spinner consortiumSpinner;
- Button button;
- String consortium_url = null;
- List<Consortium> consortiums = new ArrayList<Consortium>();
-
- private class FetchConsortiumsTask extends AsyncTask<String, Integer, String> {
- protected String doInBackground(String... params) {
- String url = params[0];
- String result = null;
- try {
- Log.d(TAG, "fetching "+url);
- result = Utils.getNetPageContent(url);
- } catch (Exception e) {
- Log.d(TAG, "error fetching", e);
- }
- return result;
- }
-
- protected void onPostExecute(String result) {
- Log.d(TAG, "results available: "+result);
- consortiums = parseEvergreenConsortiums(result);
- ArrayList<String> l = new ArrayList<String>(consortiums.size());
- for (Consortium consortium : consortiums) {
- l.add(consortium.name);
- }
- //ArrayAdapter<String> adapter = CompatSpinnerAdapter.CreateCompatSpinnerAdapter(context, l);
- //ArrayAdapter<String> adapter = new ArrayAdapter<String>(context, android.R.layout.simple_spinner_item, l);
- ArrayAdapter<String> adapter = new ArrayAdapter<String>(context, android.R.layout.simple_spinner_dropdown_item, l);
- consortiumSpinner.setAdapter(adapter);
- }
- }
-
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- context = getApplicationContext();
-
- // do not start SplashActivity here...it started us
-
- setContentView(R.layout.activity_choose_library);
-
- ActionBar actionBar = getSupportActionBar();
-
- consortiumSpinner = (Spinner) findViewById(R.id.choose_library_spinner);
- button = (Button) findViewById(R.id.choose_library_button);
-
- //init asynctask here
- FetchConsortiumsTask task = new FetchConsortiumsTask();
- task.execute(consortiumsJSONUrl);
- }
-
- public void onButtonClick(View v) {
- int id = v.getId();
- }
-
- public List<Consortium> parseEvergreenConsortiums(String json) {
- List<Consortium> consortiums = new ArrayList<Consortium>();
- if (json != null) {
- List<Map<String,?>> l;
- try {
- l = (List<Map<String,?>>) new JSONReader(json).readArray();
- } catch (JSONException e) {
- Log.d(TAG, "failed parsing consortiums array", e);
- return consortiums;
- }
- for (Map<String, ?> map : l) {
- Consortium c = new Consortium();
- c.name = (String) map.get("library_name");
- c.library_url = (String) map.get("url");
- consortiums.add(c);
- }
-
- Collections.sort(consortiums, new Comparator<Consortium>() {
- @Override
- public int compare(Consortium a, Consortium b) {
- return a.name.compareTo(b.name);
- }
- });
-
- for (int i=0; i<consortiums.size(); ++i) {
- Log.d(TAG, "c["+i+"]: "+consortiums.get(i).name);
- }
- }
- return consortiums;
- }
-
-}
--- /dev/null
+package org.evergreen_ils.views;
+
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.Spinner;
+import org.evergreen_ils.R;
+import org.evergreen_ils.globals.Utils;
+import org.evergreen_ils.searchCatalog.Library;
+import org.opensrf.util.JSONException;
+import org.opensrf.util.JSONReader;
+
+import java.util.*;
+
+/**
+ * Created by kenstir on 2015-11-05.
+ */
+public class ChooseLibraryActivity extends ActionBarActivity {
+
+ 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 library_url = null;
+ List<Library> libraries = new ArrayList<Library>();
+
+ private class FetchConsortiumsTask extends AsyncTask<String, Integer, String> {
+ protected String doInBackground(String... params) {
+ String url = params[0];
+ String result = null;
+ try {
+ Log.d(TAG, "fetching "+url);
+ result = Utils.getNetPageContent(url);
+ } catch (Exception e) {
+ Log.d(TAG, "error fetching", e);
+ }
+ return result;
+ }
+
+ protected void onPostExecute(String result) {
+ Log.d(TAG, "results available: "+result);
+ libraries = parseEvergreenConsortiums(result);
+ ArrayList<String> l = new ArrayList<String>(libraries.size());
+ for (Library library : libraries) {
+ l.add(library.name);
+ }
+ //ArrayAdapter<String> adapter = CompatSpinnerAdapter.CreateCompatSpinnerAdapter(context, l);
+ //ArrayAdapter<String> adapter = new ArrayAdapter<String>(context, android.R.layout.simple_spinner_item, l);
+ ArrayAdapter<String> adapter = new ArrayAdapter<String>(context, android.R.layout.simple_spinner_dropdown_item, l);
+ consortiumSpinner.setAdapter(adapter);
+ }
+ }
+
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ context = getApplicationContext();
+
+ // do not start SplashActivity here...it started us
+
+ setContentView(R.layout.activity_choose_library);
+
+ 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);
+ }
+ });
+
+ FetchConsortiumsTask task = new FetchConsortiumsTask();
+ task.execute(consortiumsJSONUrl);
+ }
+
+ public void onButtonClick(View v) {
+ int id = v.getId();
+ }
+
+ public List<Library> parseEvergreenConsortiums(String json) {
+ List<Library> libraries = new ArrayList<Library>();
+ if (json != null) {
+ List<Map<String,?>> l;
+ try {
+ l = (List<Map<String,?>>) new JSONReader(json).readArray();
+ } catch (JSONException e) {
+ Log.d(TAG, "failed parsing libraries array", e);
+ return libraries;
+ }
+ for (Map<String, ?> map : l) {
+ Library c = new Library();
+ c.name = (String) map.get("library_name");
+ c.library_url = (String) map.get("url");
+ libraries.add(c);
+ }
+
+ Collections.sort(libraries, new Comparator<Library>() {
+ @Override
+ public int compare(Library a, Library b) {
+ return a.name.compareTo(b.name);
+ }
+ });
+
+ for (int i = 0; i< libraries.size(); ++i) {
+ Log.d(TAG, "c["+i+"]: "+ libraries.get(i).name);
+ }
+ }
+ return libraries;
+ }
+
+}
import android.content.SharedPreferences;
import org.evergreen_ils.R;
import org.evergreen_ils.globals.GlobalConfigs;
-import org.evergreen_ils.views.ChooseConsortiumActivity;
+import org.evergreen_ils.views.ChooseLibraryActivity;
import org.evergreen_ils.views.MainActivity;
import org.evergreen_ils.views.splashscreen.LoadingTask.LoadingTaskListener;
library_url = prefs.getString("library_url", "");
}
if (library_url.isEmpty()) {
- Intent i = new Intent(this, ChooseConsortiumActivity.class);
+ Intent i = new Intent(this, ChooseLibraryActivity.class);
i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(i);
finish();
android:theme="@android:style/Theme.NoTitleBar">
</activity>
<activity
- android:name="org.evergreen_ils.views.ChooseConsortiumActivity"
+ android:name="org.evergreen_ils.views.ChooseLibraryActivity"
android:label="@string/ou_account_label">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
projects / working / Evergreen.git / commitdiff