From: kenstir Date: Sat, 7 Nov 2015 02:27:51 +0000 (-0500) Subject: Renamed consortium -> library X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2ccb9760581c12ffde1075186d69416c387d02ea;p=working%2FEvergreen.git Renamed consortium -> library --- 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/Consortium.java deleted file mode 100644 index a65a74ecdc..0000000000 --- a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Consortium.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.evergreen_ils.searchCatalog; - -/** value class - * Created by kenstir on 11/5/2015. - */ -public class Consortium { - public String name; - public String library_url; -} diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Library.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Library.java new file mode 100644 index 0000000000..80d40ec533 --- /dev/null +++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Library.java @@ -0,0 +1,9 @@ +package org.evergreen_ils.searchCatalog; + +/** value class + * Created by kenstir on 11/5/2015. + */ +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/ChooseConsortiumActivity.java deleted file mode 100644 index b1a87cdf86..0000000000 --- a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java +++ /dev/null @@ -1,117 +0,0 @@ -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 consortiums = new ArrayList(); - - private class FetchConsortiumsTask extends AsyncTask { - 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 l = new ArrayList(consortiums.size()); - for (Consortium consortium : consortiums) { - l.add(consortium.name); - } - //ArrayAdapter adapter = CompatSpinnerAdapter.CreateCompatSpinnerAdapter(context, l); - //ArrayAdapter adapter = new ArrayAdapter(context, android.R.layout.simple_spinner_item, l); - ArrayAdapter adapter = new ArrayAdapter(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 parseEvergreenConsortiums(String json) { - List consortiums = 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; - } - for (Map 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() { - @Override - public int compare(Consortium a, Consortium b) { - return a.name.compareTo(b.name); - } - }); - - for (int i=0; i libraries = new ArrayList(); + + private class FetchConsortiumsTask extends AsyncTask { + 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 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); + ArrayAdapter adapter = new ArrayAdapter(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 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 libraries array", e); + return libraries; + } + for (Map 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() { + @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; + } + +} 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 70116eb45e..13cb8f3656 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 @@ -22,7 +22,7 @@ package org.evergreen_ils.views.splashscreen; 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; @@ -92,7 +92,7 @@ public class SplashActivity extends Activity implements 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(); diff --git a/Open-ILS/src/Android/eg_app/AndroidManifest.xml b/Open-ILS/src/Android/eg_app/AndroidManifest.xml index be2f068784..887d0a6d07 100644 --- a/Open-ILS/src/Android/eg_app/AndroidManifest.xml +++ b/Open-ILS/src/Android/eg_app/AndroidManifest.xml @@ -30,7 +30,7 @@ android:theme="@android:style/Theme.NoTitleBar">