yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

synchronisation with intro branch

Browse source
This commit is contained in:
Nikolay Pultsin 2014-12-23 17:27:18 +00:00
parent 1114a515c7
commit 9e002e2576
2 changed files with 46 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/org/geometerplus/android/fbreader/DisplayBookPopupAction.java
View file

@ -19,6 +19,10 @@
package org.geometerplus.android.fbreader; package org.geometerplus.android.fbreader;
import android.view.View;
import android.widget.PopupWindow;
import android.widget.*;
import org.geometerplus.zlibrary.text.view.*; import org.geometerplus.zlibrary.text.view.*;
import org.geometerplus.fbreader.fbreader.FBReaderApp; import org.geometerplus.fbreader.fbreader.FBReaderApp;
@ -41,5 +45,45 @@ class DisplayBookPopupAction extends FBAndroidAction {
if (!element.isInitialized()) { if (!element.isInitialized()) {
return; return;
} }
final View mainView = (View)BaseActivity.getViewWidget();
final View bookView = BaseActivity.getLayoutInflater().inflate(R.layout.book_popup, null);
final int inch = (int)TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_IN, 1, BaseActivity.getResources().getDisplayMetrics()
);
final PopupWindow popup = new PopupWindow(
bookView,
Math.min(4 * inch, mainView.getWidth() * 9 / 10),
Math.min(3 * inch, mainView.getHeight() * 9 / 10)
);
popup.setFocusable(true);
popup.setOutsideTouchable(true);
final ZLResource buttonResource = ZLResource.resource("dialog").getResource("button")
final View buttonsView = bookView.findViewById(R.id.book_popup_buttons);
final Button downloadButton = (Button)buttonsView.findViewById(R.id.ok_button);
downloadButton.setText(buttonResource.getResource("download").getValue());
downloadButton.setOnClickListener(new Button.OnClickListener() {
public void onClick(View v) {
// TODO: implement
popup.dismiss();
}
});
final Button cancelButton = (Button)buttonsView.findViewById(R.id.cancel_button);
cancelButton.setText(buttonResource.getResource("cancel").getValue());
cancelButton.setOnClickListener(new Button.OnClickListener() {
public void onClick(View v) {
popup.dismiss();
}
});
popup.setOnDismissListener(new PopupWindow.OnDismissListener() {
public void onDismiss() {
}
});
popup.showAtLocation(BaseActivity.getCurrentFocus(), Gravity.CENTER, 0, 0);
} }
} }

2
src/org/geometerplus/zlibrary/text/view/ZLTextElementAreaVector.java
View file

@ -71,6 +71,8 @@ final class ZLTextElementAreaVector {
soul = new ZLTextVideoRegionSoul(area, (ZLTextVideoElement)area.Element); soul = new ZLTextVideoRegionSoul(area, (ZLTextVideoElement)area.Element);
} else if (area.Element instanceof ZLTextWord && !((ZLTextWord)area.Element).isASpace()) { } else if (area.Element instanceof ZLTextWord && !((ZLTextWord)area.Element).isASpace()) {
soul = new ZLTextWordRegionSoul(area, (ZLTextWord)area.Element); soul = new ZLTextWordRegionSoul(area, (ZLTextWord)area.Element);
} else if (area.Element instanceof BookElement) {
soul = new BookRegionSoul(area, (BookElement)area.Element);
} }
if (soul != null) { if (soul != null) {
myCurrentElementRegion = new ZLTextRegion(soul, myAreas, myAreas.size()); myCurrentElementRegion = new ZLTextRegion(soul, myAreas, myAreas.size());