From: drizea Date: Fri, 3 Aug 2012 07:16:16 +0000 (+0300) Subject: removed unused classes + bug fix on search list context details + added more X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=637ebe190618e540f4a2b4aebbb0220c086acc32;p=working%2FEvergreen.git removed unused classes + bug fix on search list context details + added more copy info activity --- diff --git a/Open-ILS/src/Android/AndroidManifest.xml b/Open-ILS/src/Android/AndroidManifest.xml index 720ee4a39e..617c2ce7a0 100644 --- a/Open-ILS/src/Android/AndroidManifest.xml +++ b/Open-ILS/src/Android/AndroidManifest.xml @@ -34,26 +34,27 @@ - - - + - - + + + + + + + + @@ -65,11 +66,6 @@ - - - - - diff --git a/Open-ILS/src/Android/res/drawable/radialbackground.xml b/Open-ILS/src/Android/res/drawable/radialbackground.xml new file mode 100644 index 0000000000..2e04825aea --- /dev/null +++ b/Open-ILS/src/Android/res/drawable/radialbackground.xml @@ -0,0 +1,8 @@ + + + + diff --git a/Open-ILS/src/Android/res/layout/copy_information_more.xml b/Open-ILS/src/Android/res/layout/copy_information_more.xml new file mode 100644 index 0000000000..df1baee7c4 --- /dev/null +++ b/Open-ILS/src/Android/res/layout/copy_information_more.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Open-ILS/src/Android/res/layout/record_details_info.xml b/Open-ILS/src/Android/res/layout/record_details_info.xml deleted file mode 100644 index f324a31d6b..0000000000 --- a/Open-ILS/src/Android/res/layout/record_details_info.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Open-ILS/src/Android/res/layout/record_details_simple.xml b/Open-ILS/src/Android/res/layout/record_details_simple.xml deleted file mode 100644 index 92fc9b7193..0000000000 --- a/Open-ILS/src/Android/res/layout/record_details_simple.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Open-ILS/src/Android/res/layout/search_result_list.xml b/Open-ILS/src/Android/res/layout/search_result_list.xml index a44487159f..728f72b1d0 100644 --- a/Open-ILS/src/Android/res/layout/search_result_list.xml +++ b/Open-ILS/src/Android/res/layout/search_result_list.xml @@ -1,7 +1,8 @@ + android:layout_height="fill_parent" + > > set = info.statusInformation.entrySet(); + + Iterator> it = set.iterator(); + + while(it.hasNext()){ + + Entry ent = it.next(); + TextView statusName = new TextView(context); + statusName.setText(ent.getKey() + " : " + ent.getValue()); + + copy_statuses.addView(statusName, new LayoutParams(LayoutParams.WRAP_CONTENT,LayoutParams.WRAP_CONTENT)); + + } + + } + + } +} diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails.java deleted file mode 100644 index c2cee37915..0000000000 --- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.evergreen.android.searchCatalog; - -import org.evergreen.android.R; -import org.evergreen.android.utils.ui.RealViewSwitcher; - -import android.app.Activity; -import android.graphics.Color; -import android.os.Bundle; -import android.util.Log; -import android.view.Gravity; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.LinearLayout; -import android.widget.ScrollView; -import android.widget.TextView; - -public class RecordDetails extends Activity{ - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - // create the view switcher - RealViewSwitcher realViewSwitcher = new RealViewSwitcher(getApplicationContext()); - - // add some views to it - final int[] backgroundColors = { Color.RED, Color.BLUE, Color.CYAN, Color.GREEN, Color.YELLOW }; - for (int i = 0; i < 5; i++) { - - - - TextView textView = new TextView(getApplicationContext()); - textView.setText(Integer.toString(i + 1)); - textView.setTextSize(100); - textView.setTextColor(Color.BLACK); - textView.setGravity(Gravity.CENTER); - textView.setBackgroundColor(backgroundColors[i]); - realViewSwitcher.addView(textView); - } - - LayoutInflater factory = getLayoutInflater(); - - - LinearLayout layout = (LinearLayout) factory.inflate(R.layout.record_details_info, null); - - - ScrollView scroll = (ScrollView) factory.inflate(R.layout.record_details_simple, null); - - - System.out.println( layout + " scrol" + scroll); - - realViewSwitcher.addView(layout); - realViewSwitcher.addView(scroll); - - // set as content view - setContentView(realViewSwitcher); - - - - // yeah, it really is as simple as this :-) - - // note that you can also define your own views directly in a resource XML, too by using: - // - // - // - - - - // OPTIONAL: listen for screen changes - realViewSwitcher.setOnScreenSwitchListener(onScreenSwitchListener); - - } - private final RealViewSwitcher.OnScreenSwitchListener onScreenSwitchListener = new RealViewSwitcher.OnScreenSwitchListener() { - - @Override - public void onScreenSwitched(int screen) { - // this method is executed if a screen has been activated, i.e. the screen is completely visible - // and the animation has stopped (might be useful for removing / adding new views) - Log.d("RealViewSwitcher", "switched to screen: " + screen); - } - - }; -} diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails_Content.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails_Content.java deleted file mode 100644 index c03b957726..0000000000 --- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails_Content.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.evergreen.android.searchCatalog; - -import android.app.Activity; -import android.os.Bundle; - -public class RecordDetails_Content extends Activity{ - - @Override - protected void onCreate(Bundle savedInstanceState) { - // TODO Auto-generated method stub - super.onCreate(savedInstanceState); - } -} diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails_Details.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails_Details.java deleted file mode 100644 index 7c48d11935..0000000000 --- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails_Details.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.evergreen.android.searchCatalog; - -import android.app.Activity; -import android.os.Bundle; - -public class RecordDetails_Details extends Activity{ - - @Override - protected void onCreate(Bundle savedInstanceState) { - // TODO Auto-generated method stub - super.onCreate(savedInstanceState); - } -} diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails_Info.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails_Info.java deleted file mode 100644 index a7543e7561..0000000000 --- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails_Info.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.evergreen.android.searchCatalog; - -import java.security.PublicKey; - -import org.evergreen.android.R; -import org.evergreen.android.R.id; -import org.evergreen.android.R.layout; - -import android.app.Activity; -import android.os.Bundle; -import android.widget.TextView; - -public class RecordDetails_Info extends Activity{ - - - private TextView titleTextView; - - private TextView authorTextView; - - private TextView publisherTextView; - - @Override - protected void onCreate(Bundle savedInstanceState) { - // TODO Auto-generated method stub - super.onCreate(savedInstanceState); - setContentView(R.layout.record_details_info); - - RecordInfo record = (RecordInfo)getIntent().getSerializableExtra("recordInfo"); - - titleTextView = (TextView) findViewById(R.id.record_details_info_title); - authorTextView = (TextView) findViewById(R.id.record_details_info_author); - publisherTextView = (TextView) findViewById(R.id.record_details_info_publisher); - - - titleTextView.setText(record.title); - authorTextView.setText(record.author); - publisherTextView.setText(record.publisher); - - } -} diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails_Simple.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails_Simple.java deleted file mode 100644 index 3f6ba74d7b..0000000000 --- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/RecordDetails_Simple.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.evergreen.android.searchCatalog; - -import org.evergreen.android.R; -import org.evergreen.android.R.id; -import org.evergreen.android.R.layout; - -import android.app.Activity; -import android.os.Bundle; -import android.widget.TextView; - -public class RecordDetails_Simple extends Activity { - - - private TextView titleTextView; - private TextView authorTextView; - private TextView publisherTextView; - private TextView seriesTextView; - private TextView subjectTextView; - private TextView synopsisTextView; - private TextView isbnTextView; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - setContentView(R.layout.record_details_simple); - - - - titleTextView = (TextView) findViewById(R.id.record_details_simple_title); - authorTextView = (TextView) findViewById(R.id.record_details_simple_author); - publisherTextView = (TextView) findViewById(R.id.record_details_simple_publisher); - - seriesTextView = (TextView) findViewById(R.id.record_details_simple_series); - subjectTextView = (TextView) findViewById(R.id.record_details_simple_subject); - synopsisTextView = (TextView) findViewById(R.id.record_details_simple_synopsis); - - isbnTextView = (TextView) findViewById(R.id.record_details_simple_isbn); - - RecordInfo record = (RecordInfo) getIntent().getSerializableExtra("recordInfo"); - - titleTextView.setText(record.title); - authorTextView.setText(record.author); - publisherTextView.setText(record.pubdate + " " + record.publisher); - - seriesTextView.setText(record.series); - subjectTextView.setText(record.subject); - synopsisTextView.setText(record.synopsis); - - isbnTextView.setText(record.isbn); - - } -} diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java index 1389988982..c216fd9878 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java @@ -501,10 +501,15 @@ public class SearchCatalogListView extends Activity{ case DETAILS : { - Intent intent = new Intent(getBaseContext(),RecordDetails_Simple.class); + Intent intent = new Intent(getBaseContext(),SampleUnderlinesNoFade.class); //serialize object and pass it to next activity intent.putExtra("recordInfo", info); + intent.putExtra("orgID",search.selectedOrganization.id); + intent.putExtra("depth",(search.selectedOrganization.level-1)); + intent.putExtra("recordList", recordList); + //TODO put total number + intent.putExtra("recordPosition", menuArrayItem.position); startActivity(intent); } break; diff --git a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java b/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java index 515e9a3571..c1c5006e59 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java @@ -15,11 +15,13 @@ import org.evergreen.android.globals.NoAccessToServer; import org.evergreen.android.globals.NoNetworkAccessException; import org.evergreen.android.searchCatalog.CopyInformation; import org.evergreen.android.searchCatalog.ImageDownloader; +import org.evergreen.android.searchCatalog.MoreCopyInformation; import org.evergreen.android.searchCatalog.RecordInfo; import org.evergreen.android.searchCatalog.SearchCatalog; import android.app.Dialog; import android.app.ProgressDialog; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; @@ -279,13 +281,10 @@ public class BasicDetailsFragment extends Fragment{ @Override public void onClick(View v) { - // TODO Auto-generated method stub - - System.out.println("Show more tabed"); - // insert into main view - LinearLayout insertPoint = (LinearLayout) lay.findViewById(R.id.record_details_copy_information); - addCopyInfo(list_size, record.copyCountListInfo.size(), inf, insertPoint); - + //show more details + Intent intent = new Intent(getActivity().getApplicationContext(),MoreCopyInformation.class); + intent.putExtra("recordInfo", record); + startActivity(intent); } });