bookmarks, citations user ui, corrections

Author: plotn

android/res/layout/userdic_list_dialog.xml

@@ -51,6 +51,31 @@
                 android:text="_" />
         </TableRow>
     </TableLayout>
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/page_item_body"
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+        <EditText
+            android:id="@+id/search_text"
+            android:layout_width="0dip"
+            android:layout_weight="6"
+            android:layout_height="wrap_content"
+            android:text=""
+            style="@style/TextAppearance.Widget.EditText"
+            android:editable="true" android:hint="@string/dlg_search_hint" android:singleLine="true"
+            />
+        <ImageButton
+            android:id="@+id/btn_search"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:layout_weight="1"
+            android:src="@drawable/icons8_search"
+            android:background="@null"
+            android:contentDescription="@string/dlg_bookmark_user_dic"
+            android:text="@null" />
+    </LinearLayout>
 
     <RadioGroup
         android:id="@+id/rg_scope"

android/src/org/coolreader/crengine/BookmarkEditDialog.java

@@ -46,7 +46,7 @@ protected void onPositiveButtonClick() {
 		   ) {
 			UserDicEntry ude = new UserDicEntry();
 			ude.setId(0L);
-			ude.setDic_word(posEdit.getText().toString().toLowerCase());
+			ude.setDic_word(posEdit.getText().toString());
 			ude.setDic_word_translate(commentEdit.getText().toString());
 			final String sBookFName = mBookInfo.getFileInfo().filename;
 			CRC32 crc = new CRC32();

android/src/org/coolreader/crengine/UserDicDlg.java

@@ -12,6 +12,7 @@
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.CompoundButton;
+import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ListAdapter;
 import android.widget.ListView;
@@ -41,7 +42,8 @@ public class UserDicDlg extends BaseDialog {
 	final RadioButton btnPage;
 	final RadioButton btnBook;
 	final RadioButton btnAll;
-
+	final ImageButton searchButton;
+	final EditText selEdit;
 
 	private ArrayList<UserDicEntry> mUserDic = new ArrayList<UserDicEntry>();
 
@@ -183,10 +185,17 @@ public void updateAdapter( UserDicAdapter adapter ) {
 
 	private void setChecked(ImageButton btn) {
 		rb_descr.setText(btn.getContentDescription()+" ");
+		btnPage.setEnabled(true);
 		if (btn.getContentDescription().equals(mCoolReader.getString(R.string.dlg_bookmark_user_dic))) {
 			openPage = 0;
 		}
 		if (btn.getContentDescription().equals(mCoolReader.getString(R.string.dlg_bookmark_citation))) {
+			if (openPage == 0) {
+				if (btnPage.isChecked()) {
+					btnBook.setChecked(true);
+				}
+			}
+			btnPage.setEnabled(false);
 			openPage = 1;
 		}
 		int colorGray;
@@ -224,7 +233,15 @@ private void checkedCallback(RadioButton btn) {
 		if (bPageC) {
 			mUserDic.clear();
 			for (UserDicEntry ude: mCoolReader.getmReaderFrame().getUserDicPanel().getArrUdeWords()) {
-				if (ude.getIs_citation()==openPage) mUserDic.add(ude);
+				if (ude.getIs_citation()==openPage)
+					if (
+					    (selEdit.getText().toString().trim().equals("")) ||
+						(
+					    	(ude.getDic_word().toLowerCase().contains(selEdit.getText().toString().toLowerCase().trim())) ||
+				        	(ude.getDic_word_translate().toLowerCase().contains(selEdit.getText().toString().toLowerCase().trim()))
+						)
+					   )
+					  mUserDic.add(ude);
 			}
 		}
 		if (bBookC) {
@@ -247,7 +264,8 @@ public UserDicDlg(final CoolReader activity, final int openPage)
 		mCoolReader = activity;
 		mUserDic.clear();
 		for (UserDicEntry ude: activity.getmReaderFrame().getUserDicPanel().getArrUdeWords()) {
-			if (ude.getIs_citation()==openPage) mUserDic.add(ude);
+			if (ude.getIs_citation()==openPage)
+				mUserDic.add(ude);
 			//mCoolReader.showToast(ude.getDic_word()+" "+ude.getIs_citation());
 		}
 		View frame = mInflater.inflate(R.layout.userdic_list_dialog, null);
@@ -264,8 +282,19 @@ public UserDicDlg(final CoolReader activity, final int openPage)
 		if (openPage==1) setChecked(btnCitation);
 		body.addView(mList);
 		setView(frame);
+		searchButton = (ImageButton) frame.findViewById(R.id.btn_search);
+		selEdit = (EditText) frame.findViewById(R.id.search_text);
+		selEdit.clearFocus();
+		searchButton.requestFocus();
 		setFlingHandlers(mList, null, null);
 
+		searchButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				checkedCallback(null);
+			}
+		});
+
 		btnPage.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
 			@Override
 			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -313,7 +342,15 @@ private void updUserDic(String sCRC) {
 			Map.Entry pair = (Map.Entry)it.next();
 			UserDicEntry ude = (UserDicEntry)pair.getValue();
 			if (((ude.getDic_from_book().equals(sCRC))||(sCRC.equals(""))) &&
-				(openPage==ude.getIs_citation())) mUserDic.add(ude);
+				(openPage==ude.getIs_citation()))
+				if (
+						(selEdit.getText().toString().trim().equals("")) ||
+								(
+									(ude.getDic_word().toLowerCase().contains(selEdit.getText().toString().toLowerCase().trim())) ||
+									(ude.getDic_word_translate().toLowerCase().contains(selEdit.getText().toString().toLowerCase().trim()))
+								)
+						)
+					mUserDic.add(ude);
 			//mCoolReader.showToast(ude.getDic_word()+" "+ude.getIs_citation());
 		}
 		Collections.sort(mUserDic, new Comparator<UserDicEntry>() {

android/src/org/coolreader/db/MainDB.java

@@ -345,7 +345,8 @@ public boolean saveUserDic(UserDicEntry ude, int action) {
 			return false;
 		if ((sWordTranslate==null)&&(action == UserDicEntry.ACTION_NEW))
 			return false;
-		sWord = sWord.trim().toLowerCase();
+		if (ude.getIs_citation()==0)
+			sWord = sWord.trim().toLowerCase();
 		if (sWord.length()==0)
 			return false;
 		sWordTranslate = sWordTranslate.trim();