Skip to content

Commit d72af8d

Browse files
committed
tts: add org.coolreader.cmd.TTS_STOP ReaderAction intent
1 parent 0a6dd32 commit d72af8d

5 files changed

Lines changed: 11 additions & 0 deletions

File tree

android/res/menu/cr3_reader_menu.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<item android:title="@string/action_toggle_document_styles" android:id="@+id/cr3_mi_toggle_document_styles" android:numericShortcut="6" android:titleCondensed="@string/action_toggle_document_styles" android:orderInCategory="9"></item>
2424
<item android:title="@string/action_toggle_text_autoformat" android:id="@+id/cr3_mi_toggle_text_autoformat" android:numericShortcut="6" android:titleCondensed="@string/action_toggle_document_styles" android:orderInCategory="9"></item>
2525
<item android:title="@string/mi_tts_play" android:id="@+id/cr3_mi_tts_play" android:numericShortcut="6" android:titleCondensed="@string/dlg_about" android:orderInCategory="10"></item>
26+
<item android:title="@string/mi_tts_stop" android:id="@+id/cr3_mi_tts_stop" android:numericShortcut="6" android:titleCondensed="@string/dlg_about" android:orderInCategory="10"></item>
2627
<item android:title="@string/mi_exit" android:titleCondensed="@string/mi_exit" android:id="@+id/cr3_mi_exit" android:icon="@drawable/cr3_viewer_exit" android:orderInCategory="14" android:numericShortcut="8"></item>
2728
<item android:title="@string/dlg_about" android:id="@+id/cr3_mi_about" android:numericShortcut="6" android:titleCondensed="@string/dlg_about" android:orderInCategory="11"></item>
2829
<item android:title="@string/dlg_book_info" android:id="@+id/cr3_mi_book_info" android:numericShortcut="6" android:titleCondensed="@string/dlg_book_info" android:orderInCategory="12"></item>

android/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@
288288
<string name="progress_downloading">Downloading</string>
289289
<string name="mi_book_opds_root">Online catalogs</string>
290290
<string name="mi_tts_play">Read Aloud</string>
291+
<string name="mi_tts_stop">Stop Read Aloud</string>
291292
<string name="options_format_image_scaling_block_scale">Block image max zoom</string>
292293
<string name="options_format_image_scaling_mode_integer_factor">Integer scale</string>
293294
<string name="options_format_image_scaling_block_mode">Block image scaling mode</string>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public String toString() {
9797
public final static ReaderAction GO_BACK = new ReaderAction("GO_BACK", R.string.action_go_back, ReaderCommand.DCMD_LINK_BACK, 0, R.id.cr3_go_back ).setIconId(R.drawable.cr3_button_prev);
9898
public final static ReaderAction GO_FORWARD = new ReaderAction("GO_FORWARD", R.string.action_go_forward, ReaderCommand.DCMD_LINK_FORWARD, 0, R.id.cr3_go_forward).setIconId(R.drawable.cr3_button_next);
9999
public final static ReaderAction TTS_PLAY = new ReaderAction("TTS_PLAY", R.string.mi_tts_play, ReaderCommand.DCMD_TTS_PLAY, 0, R.id.cr3_mi_tts_play ).setIconId(R.drawable.cr3_button_tts); //.setActivateWithLongMenuKey()
100+
public final static ReaderAction TTS_STOP = new ReaderAction("TTS_STOP", R.string.mi_tts_stop, ReaderCommand.DCMD_TTS_STOP, 0, R.id.cr3_mi_tts_stop ).setIconId(R.drawable.cr3_button_tts); //.setActivateWithLongMenuKey()
100101
public final static ReaderAction TOGGLE_TITLEBAR = new ReaderAction("TOGGLE_TITLEBAR", R.string.action_toggle_titlebar, ReaderCommand.DCMD_TOGGLE_TITLEBAR, 0 );
101102
public final static ReaderAction SHOW_POSITION_INFO_POPUP = new ReaderAction("SHOW_POSITION_INFO_POPUP", R.string.action_show_position_info, ReaderCommand.DCMD_SHOW_POSITION_INFO_POPUP, 0 );
102103
public final static ReaderAction SHOW_DICTIONARY = new ReaderAction("SHOW_DICTIONARY", R.string.action_show_dictionary, ReaderCommand.DCMD_SHOW_DICTIONARY, 0);
@@ -242,6 +243,7 @@ public static ArrayList<ReaderAction> createList(ReaderAction ... actions) {
242243
ABOUT,
243244
BOOK_INFO,
244245
TTS_PLAY,
246+
TTS_STOP,
245247
TOGGLE_TITLEBAR,
246248
SHOW_POSITION_INFO_POPUP,
247249
SHOW_DICTIONARY,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public enum ReaderCommand
8080
DCMD_ABOUT(2019),
8181
DCMD_BOOK_INFO(2020),
8282
DCMD_TTS_PLAY(2021),
83+
DCMD_TTS_STOP(2883),
8384
DCMD_TOGGLE_TITLEBAR(2022),
8485
DCMD_SHOW_POSITION_INFO_POPUP(2023),
8586
DCMD_SHOW_DICTIONARY(2024),

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2393,6 +2393,12 @@ public void onCommand(final ReaderCommand cmd, final int param, final Runnable o
23932393
}));
23942394
}
23952395
break;
2396+
case DCMD_TTS_STOP:
2397+
if(ttsToolbar != null){
2398+
log.i("DCMD_TTS_STOP: stopping TTS");
2399+
ttsToolbar.stopAndClose();
2400+
}
2401+
break;
23962402
case DCMD_TOGGLE_DOCUMENT_STYLES:
23972403
if (isBookLoaded())
23982404
toggleDocumentStyles();

0 commit comments

Comments
 (0)