Skip to content

Commit f7eb2d8

Browse files
author
avez raj
committed
#23 TST causes a crash/#22 when changing the font the image becomes invisible solved
1 parent 162abc3 commit f7eb2d8

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

folioreader/res/layout/folio_activity.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<android.support.v7.widget.Toolbar
99
android:id="@+id/toolbar"
1010
android:layout_width="match_parent"
11-
android:layout_height="?attr/actionBarSize"
11+
android:layout_height="50dp"
1212
android:alpha="0.8"
1313
app:contentInsetEnd="0dp"
1414
android:layout_margin="0dp"
@@ -51,6 +51,7 @@
5151
android:layout_height="wrap_content"
5252
android:layout_alignParentRight="true"
5353
android:layout_centerInParent="true"
54+
android:visibility="invisible"
5455
android:src="@drawable/man_speech_icon"
5556
android:scaleType="centerCrop"
5657
android:padding="20dp"/>

folioreader/src/main/java/com/folioreader/activity/FolioActivity.java

+10-6
Original file line numberDiff line numberDiff line change
@@ -131,17 +131,17 @@ public void onClick(View v) {
131131
findViewById(R.id.btn_speaker).setOnClickListener(new View.OnClickListener() {
132132
@Override
133133
public void onClick(View v) {
134-
if (mIsSmilParsed) {
134+
//if (mIsSmilParsed) {
135135
if (mAudioView.isDragViewAboveTheLimit()) {
136136
mAudioView.moveToOriginalPosition();
137137
} else {
138138
mAudioView.moveOffScreen();
139139
}
140-
} else {
140+
/*// } else {
141141
Toast.makeText(FolioActivity.this,
142142
getString(R.string.please_wait_till_audio_is_parsed),
143143
Toast.LENGTH_SHORT).show();
144-
}
144+
}*/
145145
}
146146
});
147147
}
@@ -489,7 +489,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
489489
}
490490

491491
private void parseSmil() {
492-
mIsSmilParsed = false;
492+
//mIsSmilParsed = false;
493493
new Thread(new Runnable() {
494494
@Override
495495
public void run() {
@@ -508,7 +508,9 @@ public void run() {
508508
runOnUiThread(new Runnable() {
509509
@Override
510510
public void run() {
511-
mIsSmilParsed = true;
511+
if(mAudioElementArrayList!=null && mTextElementList!=null) {
512+
findViewById(R.id.btn_speaker).setVisibility(View.VISIBLE);
513+
}
512514
}
513515
});
514516
}
@@ -530,7 +532,9 @@ public void setHighLightStyle(String style) {
530532
}
531533

532534
public AudioElement getElement(int position) {
533-
return mAudioElementArrayList.get(position);
535+
if(mAudioElementArrayList.size()>0) {
536+
return mAudioElementArrayList.get(position);
537+
} else return null;
534538
}
535539

536540

folioreader/src/main/java/com/folioreader/fragments/FolioPageFragment.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,8 @@ public void onSaveInstanceState(Bundle outState) {
436436
public void reload() {
437437
final WebView webView = (WebView) mRootView.findViewById(R.id.contentWebView);
438438
String htmlContent = getHtmlContent(mActivityCallback.getChapterHtmlContent(mPosition));
439-
webView.loadDataWithBaseURL(null, htmlContent, "text/html", "UTF-8", null);
439+
String baseUrl = "file://" + AppUtil.getFolioEpubFolderPath(mEpubFileName) + "/OEBPS//";
440+
webView.loadDataWithBaseURL(baseUrl, htmlContent, "text/html", "UTF-8", null);
440441
updatePagesLeftTextBg();
441442
}
442443

0 commit comments

Comments
 (0)