From 04d5a37c9625ded915244118d490ee3be9b6bd03 Mon Sep 17 00:00:00 2001 From: kenstir Date: Mon, 30 Dec 2013 23:41:20 -0500 Subject: [PATCH] Fixed action bar in Place Hold activity to return to Search Details (back, not up). Fixed action bar in Search Details to return to Search (back, not up). --- .../src/Android/core/res/layout/place_hold.xml | 9 ++--- Open-ILS/src/Android/core/res/values/strings.xml | 1 - .../accountAccess/holds/PlaceHold.java | 42 +++++++++++----------- .../searchCatalog/SampleUnderlinesNoFade.java | 12 ++++++- .../src/Android/cwmars_app/AndroidManifest.xml | 10 +++--- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Open-ILS/src/Android/core/res/layout/place_hold.xml b/Open-ILS/src/Android/core/res/layout/place_hold.xml index e5f54bfc13..9ba1d4a0b9 100644 --- a/Open-ILS/src/Android/core/res/layout/place_hold.xml +++ b/Open-ILS/src/Android/core/res/layout/place_hold.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:background="@drawable/background_grey_image" > - - - - - + @@ -43,7 +39,6 @@ android:layout_height="wrap_content" android:fillViewport="true" android:layout_above="@id/action_bar" - android:layout_below="@id/header_actionbar" android:padding="5dip" > Pickup location Expiration Date Suspend Hold - Place hold Cancel Delete Back diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java index 8c1ce74caf..c94ef65800 100644 --- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java +++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java @@ -23,7 +23,10 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarActivity; import android.util.Log; +import android.view.MenuItem; import org.evergreen_ils.R; import org.evergreen_ils.accountAccess.AccountAccess; import org.evergreen_ils.accountAccess.SessionNotFoundException; @@ -56,7 +59,7 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; -public class PlaceHold extends Activity { +public class PlaceHold extends ActionBarActivity { private final String TAG = PlaceHold.class.getName(); @@ -123,31 +126,16 @@ public class PlaceHold extends Activity { } setContentView(R.layout.place_hold); + + // set up action bar + ActionBar actionBar = getSupportActionBar(); + actionBar.setSubtitle(AccountAccess.userName); + actionBar.setDisplayHomeAsUpEnabled(true); + globalConfigs = GlobalConfigs.getGlobalConfigs(this); RecordInfo record = (RecordInfo) getIntent().getSerializableExtra( "recordInfo"); - myAccountButton = (Button) findViewById(R.id.my_account_button); - myAccountButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - Intent intent = new Intent(getApplicationContext(), - AccountScreenDashboard.class); - startActivity(intent); - } - }); - - homeButton = (Button) findViewById(R.id.action_bar_home_button); - homeButton.setText(R.string.hold_place_title); - homeButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - Intent intent = new Intent(getApplicationContext(), - SearchCatalogListView.class); - startActivity(intent); - } - }); - context = this; accountAccess = AccountAccess.getAccountAccess(); @@ -374,6 +362,16 @@ public class PlaceHold extends Activity { }); } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int id = item.getItemId(); + if (id == android.R.id.home) { + onBackPressed(); + return true; + } + return super.onOptionsItemSelected(item); + } + public void disableView(View view) { // view.setFocusable(false); diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java index 3161cacaee..c89f7f9c15 100644 --- a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java +++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarActivity; +import android.view.MenuItem; import org.evergreen_ils.R; import org.evergreen_ils.accountAccess.AccountAccess; import org.evergreen_ils.utils.ui.*; @@ -155,7 +156,16 @@ public class SampleUnderlinesNoFade extends BaseSampleActivity { return super.onKeyDown(keyCode, event); } - + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int id = item.getItemId(); + if (id == android.R.id.home) { + onBackPressed(); + return true; + } + return super.onOptionsItemSelected(item); + } + class SearchFragmentAdapter extends TestFragmentAdapter { public SearchFragmentAdapter(FragmentManager fm) { super(fm); diff --git a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml index 72fc22abaf..7afafff5e3 100644 --- a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml +++ b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml @@ -69,11 +69,7 @@ - + android:label="@string/search_details_title"> @@ -113,7 +109,9 @@ android:name="android.support.PARENT_ACTIVITY" android:value="org.evergreen_ils.views.MainActivity"/> - + -- 2.11.0