From 36375a0bf3223fa32eb7f188cd9775dfd6e87707 Mon Sep 17 00:00:00 2001 From: kenstir Date: Thu, 5 Nov 2015 14:15:26 -0500 Subject: [PATCH] checkpoint. Splash activity is not correctly launching choose library activity. --- .../evergreen_ils/searchCatalog/Consortium.java | 7 ++ .../evergreen_ils/views/ChooseLibraryActivity.java | 80 ++++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Consortium.java create mode 100644 Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java 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 new file mode 100644 index 0000000000..cfad5e075b --- /dev/null +++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Consortium.java @@ -0,0 +1,7 @@ +package org.evergreen_ils.searchCatalog; + +/** + * Created by kenstir on 11/5/2015. + */ +public class Consortium { +} diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java new file mode 100644 index 0000000000..b859cccbb1 --- /dev/null +++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java @@ -0,0 +1,80 @@ +package org.evergreen_ils.views; + +import android.content.Intent; +import android.os.Bundle; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarActivity; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import org.evergreen_ils.R; +import org.evergreen_ils.accountAccess.AccountAccess; +import org.evergreen_ils.accountAccess.checkout.ItemsCheckOutListView; +import org.evergreen_ils.accountAccess.fines.FinesActivity; +import org.evergreen_ils.accountAccess.holds.HoldsListView; +import org.evergreen_ils.globals.GlobalConfigs; +import org.evergreen_ils.searchCatalog.SearchCatalogListView; +import org.evergreen_ils.views.splashscreen.SplashActivity; + +/** + * Created by kenstir on 12/28/13. + */ +public class ChooseLibraryActivity extends ActionBarActivity { + + private GlobalConfigs globalConfigs; + + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (!SplashActivity.isAppInitialized()) { + SplashActivity.restartApp(this); + return; + } + + setContentView(R.layout.activity_main); + + ActionBar actionBar = getSupportActionBar(); + actionBar.setSubtitle(AccountAccess.userName); + + // singleton initialize necessary IDL and Org data + globalConfigs = GlobalConfigs.getGlobalConfigs(this); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.menu_main, menu); + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int id = item.getItemId(); + if (id == R.id.action_search) { + startActivity(new Intent(getApplicationContext(), SearchCatalogListView.class)); + return true; + } + return super.onOptionsItemSelected(item); + } + + public void onButtonClick(View v) { + int id = v.getId(); + if (id == R.id.account_btn_check_out) { + startActivity(new Intent(getApplicationContext(), ItemsCheckOutListView.class)); + + } else if (id == R.id.account_btn_holds) { + startActivity(new Intent(getApplicationContext(), HoldsListView.class)); + + } else if (id == R.id.account_btn_fines) { + startActivity(new Intent(getApplicationContext(), FinesActivity.class)); + + /* + } else if (id == R.id.account_btn_book_bags) { + startActivity(new Intent(getApplicationContext(), BookbagsListView.class)); + */ + + } else if (id == R.id.main_btn_search) { + startActivity(new Intent(getApplicationContext(), SearchCatalogListView.class)); + } + } +} -- 2.11.0