Skip to content

Commit c134b2d

Browse files
author
Mahavir Jain
authored
Merge pull request #150 from codetoart/master
Bug Fixes
2 parents 68fe717 + f539591 commit c134b2d

File tree

9 files changed

+89
-98
lines changed

9 files changed

+89
-98
lines changed

‎folioreader/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ dependencies {
9898
compile "org.readium:r2-parser:$R2_STREAMER_VERSION"
9999
compile "org.readium:r2-server:$R2_STREAMER_VERSION"
100100

101-
compile 'com.squareup:otto:1.3.8'
101+
compile 'org.greenrobot:eventbus:3.1.1'
102102
}
103103

104104
apply from: '../folioreader/bintray/installv1.gradle'

‎folioreader/src/main/java/com/folioreader/model/event/BusOwner.java‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎folioreader/src/main/java/com/folioreader/model/event/UpdateHighlightEvent.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package com.folioreader.model.event;
2+
3+
/**
4+
* Created by gautam on 8/12/17.
5+
*/
6+
7+
public class UpdateHighlightEvent {
8+
}

‎folioreader/src/main/java/com/folioreader/ui/folio/activity/ContentHighlightActivity.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ public class ContentHighlightActivity extends AppCompatActivity {
2525
protected void onCreate(Bundle savedInstanceState) {
2626
super.onCreate(savedInstanceState);
2727
setContentView(R.layout.activity_content_highlight);
28-
getSupportActionBar().hide();
28+
if (getSupportActionBar() != null) {
29+
getSupportActionBar().hide();
30+
}
2931
mConfig = AppUtil.getSavedConfig(this);
30-
mIsNightMode = mConfig.isNightMode();
32+
mIsNightMode = mConfig != null && mConfig.isNightMode();
3133
initViews();
3234
}
3335

‎folioreader/src/main/java/com/folioreader/ui/folio/activity/FolioActivity.java‎

Lines changed: 26 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import com.folioreader.R;
4646
import com.folioreader.model.HighlightImpl;
4747
import com.folioreader.model.event.AnchorIdEvent;
48-
import com.folioreader.model.event.BusOwner;
4948
import com.folioreader.model.event.MediaOverlayHighlightStyleEvent;
5049
import com.folioreader.model.event.MediaOverlayPlayPauseEvent;
5150
import com.folioreader.model.event.MediaOverlaySpeedEvent;
@@ -62,9 +61,8 @@
6261
import com.folioreader.view.DirectionalViewpager;
6362
import com.folioreader.view.ObservableWebView;
6463
import com.folioreader.view.StyleableTextView;
65-
import com.squareup.otto.Bus;
66-
import com.squareup.otto.ThreadEnforcer;
6764

65+
import org.greenrobot.eventbus.EventBus;
6866
import org.readium.r2_streamer.model.container.Container;
6967
import org.readium.r2_streamer.model.container.EpubContainer;
7068
import org.readium.r2_streamer.model.publication.EpubPublication;
@@ -86,7 +84,6 @@ public class FolioActivity
8684
implements FolioPageFragment.FolioPageFragmentCallback,
8785
ObservableWebView.ToolBarListener,
8886
ConfigBottomSheetDialogFragment.ConfigDialogCallback,
89-
BusOwner,
9087
MainMvpView {
9188

9289
private static final String TAG = "FolioActivity";
@@ -107,12 +104,6 @@ public enum EpubSourceType {
107104
private String bookFileName;
108105
private static final String HIGHLIGHT_ITEM = "highlight_item";
109106

110-
private final Bus BUS = new Bus(ThreadEnforcer.MAIN);
111-
@Override
112-
public Bus getBus() {
113-
return BUS;
114-
}
115-
116107
public boolean mIsActionBarVisible;
117108
private DirectionalViewpager mFolioPageViewPager;
118109
private Toolbar mToolbar;
@@ -164,9 +155,6 @@ protected void onCreate(Bundle savedInstanceState) {
164155

165156
initColors();
166157

167-
BUS.register(this);
168-
169-
170158
if (ContextCompat.checkSelfPermission(FolioActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
171159
ActivityCompat.requestPermissions(FolioActivity.this, Constants.getWriteExternalStoragePerms(), Constants.WRITE_EXTERNAL_STORAGE_REQUEST);
172160
} else {
@@ -273,15 +261,15 @@ public void onOrientationChange(int orentation) {
273261
}
274262

275263
private void configFolio() {
276-
mFolioPageViewPager = (DirectionalViewpager) findViewById(R.id.folioPageViewPager);
264+
mFolioPageViewPager = findViewById(R.id.folioPageViewPager);
277265
mFolioPageViewPager.setOnPageChangeListener(new DirectionalViewpager.OnPageChangeListener() {
278266
@Override
279267
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
280268
}
281269

282270
@Override
283271
public void onPageSelected(int position) {
284-
BUS.post(new MediaOverlayPlayPauseEvent(mSpineReferenceList.get(mChapterPosition).href, false, true));
272+
EventBus.getDefault().post(new MediaOverlayPlayPauseEvent(mSpineReferenceList.get(mChapterPosition).href, false, true));
285273
mPlayPauseBtn.setImageDrawable(ContextCompat.getDrawable(FolioActivity.this, R.drawable.play_icon));
286274
mChapterPosition = position;
287275
}
@@ -402,15 +390,15 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
402390
mChapterPosition = mSpineReferenceList.indexOf(spine);
403391
mFolioPageViewPager.setCurrentItem(mChapterPosition);
404392
title.setText(data.getStringExtra(Constants.BOOK_TITLE));
405-
BUS.post(new AnchorIdEvent(selectedChapterHref));
393+
EventBus.getDefault().post(new AnchorIdEvent(selectedChapterHref));
406394
break;
407395
}
408396
}
409397
} else if (type.equals(HIGHLIGHT_SELECTED)) {
410398
HighlightImpl highlightImpl = data.getParcelableExtra(HIGHLIGHT_ITEM);
411399
int position = highlightImpl.getPageNumber();
412400
mFolioPageViewPager.setCurrentItem(position);
413-
BUS.post(new WebViewPosition(mSpineReferenceList.get(mChapterPosition).href, highlightImpl.getRangy()));
401+
EventBus.getDefault().post(new WebViewPosition(mSpineReferenceList.get(mChapterPosition).href, highlightImpl.getRangy()));
414402
}
415403
}
416404
}
@@ -421,7 +409,6 @@ protected void onDestroy() {
421409
if (mEpubServer != null) {
422410
mEpubServer.stop();
423411
}
424-
BUS.unregister(this);
425412
}
426413

427414
public int getmChapterPosition() {
@@ -473,18 +460,18 @@ private void setConfig() {
473460
private RelativeLayout shade;
474461

475462
private void initAudioView() {
476-
mHalfSpeed = (StyleableTextView) findViewById(R.id.btn_half_speed);
477-
mOneSpeed = (StyleableTextView) findViewById(R.id.btn_one_x_speed);
478-
mTwoSpeed = (StyleableTextView) findViewById(R.id.btn_twox_speed);
479-
audioContainer = (RelativeLayout) findViewById(R.id.container);
480-
shade = (RelativeLayout) findViewById(R.id.shade);
481-
mOneAndHalfSpeed = (StyleableTextView) findViewById(R.id.btn_one_and_half_speed);
482-
mPlayPauseBtn = (ImageButton) findViewById(R.id.play_button);
483-
mPreviousButton = (ImageButton) findViewById(R.id.prev_button);
484-
mNextButton = (ImageButton) findViewById(R.id.next_button);
485-
mBackgroundColorStyle = (StyleableTextView) findViewById(R.id.btn_backcolor_style);
486-
mUnderlineStyle = (StyleableTextView) findViewById(R.id.btn_text_undeline_style);
487-
mTextColorStyle = (StyleableTextView) findViewById(R.id.btn_text_color_style);
463+
mHalfSpeed = findViewById(R.id.btn_half_speed);
464+
mOneSpeed = findViewById(R.id.btn_one_x_speed);
465+
mTwoSpeed = findViewById(R.id.btn_twox_speed);
466+
audioContainer = findViewById(R.id.container);
467+
shade = findViewById(R.id.shade);
468+
mOneAndHalfSpeed = findViewById(R.id.btn_one_and_half_speed);
469+
mPlayPauseBtn = findViewById(R.id.play_button);
470+
mPreviousButton = findViewById(R.id.prev_button);
471+
mNextButton = findViewById(R.id.next_button);
472+
mBackgroundColorStyle = findViewById(R.id.btn_backcolor_style);
473+
mUnderlineStyle = findViewById(R.id.btn_text_undeline_style);
474+
mTextColorStyle = findViewById(R.id.btn_text_color_style);
488475
mIsSpeaking = false;
489476

490477
final Context mContext = mHalfSpeed.getContext();
@@ -519,11 +506,11 @@ public void onClick(View v) {
519506
@Override
520507
public void onClick(View v) {
521508
if (mIsSpeaking) {
522-
BUS.post(new MediaOverlayPlayPauseEvent(mSpineReferenceList.get(mChapterPosition).href, false, false));
509+
EventBus.getDefault().post(new MediaOverlayPlayPauseEvent(mSpineReferenceList.get(mChapterPosition).href, false, false));
523510
mPlayPauseBtn.setImageDrawable(ContextCompat.getDrawable(FolioActivity.this, R.drawable.play_icon));
524511
UiUtil.setColorToImage(mContext, mConfig.getThemeColor(), mPlayPauseBtn.getDrawable());
525512
} else {
526-
BUS.post(new MediaOverlayPlayPauseEvent(mSpineReferenceList.get(mChapterPosition).href, true, false));
513+
EventBus.getDefault().post(new MediaOverlayPlayPauseEvent(mSpineReferenceList.get(mChapterPosition).href, true, false));
527514
mPlayPauseBtn.setImageDrawable(ContextCompat.getDrawable(FolioActivity.this, R.drawable.pause_btn));
528515
UiUtil.setColorToImage(mContext, mConfig.getThemeColor(), mPlayPauseBtn.getDrawable());
529516
}
@@ -539,7 +526,7 @@ public void onClick(View v) {
539526
mOneSpeed.setSelected(false);
540527
mOneAndHalfSpeed.setSelected(false);
541528
mTwoSpeed.setSelected(false);
542-
BUS.post(new MediaOverlaySpeedEvent(MediaOverlaySpeedEvent.Speed.HALF));
529+
EventBus.getDefault().post(new MediaOverlaySpeedEvent(MediaOverlaySpeedEvent.Speed.HALF));
543530
}
544531
});
545532

@@ -551,7 +538,7 @@ public void onClick(View v) {
551538
mOneSpeed.setSelected(true);
552539
mOneAndHalfSpeed.setSelected(false);
553540
mTwoSpeed.setSelected(false);
554-
BUS.post(new MediaOverlaySpeedEvent(MediaOverlaySpeedEvent.Speed.ONE));
541+
EventBus.getDefault().post(new MediaOverlaySpeedEvent(MediaOverlaySpeedEvent.Speed.ONE));
555542
}
556543
});
557544
mOneAndHalfSpeed.setOnClickListener(new View.OnClickListener() {
@@ -562,7 +549,7 @@ public void onClick(View v) {
562549
mOneSpeed.setSelected(false);
563550
mOneAndHalfSpeed.setSelected(true);
564551
mTwoSpeed.setSelected(false);
565-
BUS.post(new MediaOverlaySpeedEvent(MediaOverlaySpeedEvent.Speed.ONE_HALF));
552+
EventBus.getDefault().post(new MediaOverlaySpeedEvent(MediaOverlaySpeedEvent.Speed.ONE_HALF));
566553
}
567554
});
568555
mTwoSpeed.setOnClickListener(new View.OnClickListener() {
@@ -572,7 +559,7 @@ public void onClick(View v) {
572559
mOneSpeed.setSelected(false);
573560
mOneAndHalfSpeed.setSelected(false);
574561
mTwoSpeed.setSelected(true);
575-
BUS.post(new MediaOverlaySpeedEvent(MediaOverlaySpeedEvent.Speed.TWO));
562+
EventBus.getDefault().post(new MediaOverlaySpeedEvent(MediaOverlaySpeedEvent.Speed.TWO));
576563
}
577564
});
578565

@@ -582,7 +569,7 @@ public void onClick(View v) {
582569
mBackgroundColorStyle.setSelected(true);
583570
mUnderlineStyle.setSelected(false);
584571
mTextColorStyle.setSelected(false);
585-
BUS.post(new MediaOverlayHighlightStyleEvent(MediaOverlayHighlightStyleEvent.Style.DEFAULT));
572+
EventBus.getDefault().post(new MediaOverlayHighlightStyleEvent(MediaOverlayHighlightStyleEvent.Style.DEFAULT));
586573
}
587574
});
588575

@@ -592,7 +579,7 @@ public void onClick(View v) {
592579
mBackgroundColorStyle.setSelected(false);
593580
mUnderlineStyle.setSelected(true);
594581
mTextColorStyle.setSelected(false);
595-
BUS.post(new MediaOverlayHighlightStyleEvent(MediaOverlayHighlightStyleEvent.Style.UNDERLINE));
582+
EventBus.getDefault().post(new MediaOverlayHighlightStyleEvent(MediaOverlayHighlightStyleEvent.Style.UNDERLINE));
596583

597584
}
598585
});
@@ -603,7 +590,7 @@ public void onClick(View v) {
603590
mBackgroundColorStyle.setSelected(false);
604591
mUnderlineStyle.setSelected(false);
605592
mTextColorStyle.setSelected(true);
606-
BUS.post(new MediaOverlayHighlightStyleEvent(MediaOverlayHighlightStyleEvent.Style.BACKGROUND));
593+
EventBus.getDefault().post(new MediaOverlayHighlightStyleEvent(MediaOverlayHighlightStyleEvent.Style.BACKGROUND));
607594
}
608595
});
609596

0 commit comments

Comments
 (0)