From 46c6ad364f9cae46a6cf8485b760ee8d4585b0ba Mon Sep 17 00:00:00 2001 From: Elliot Wolk Date: Sun, 13 Mar 2022 13:39:49 -0400 Subject: [PATCH 1/4] tts: whitespace-only change in preparation of small refactor of toolbar --- android/res/layout/tts_toolbar.xml | 350 ++++++++++++++--------------- 1 file changed, 175 insertions(+), 175 deletions(-) diff --git a/android/res/layout/tts_toolbar.xml b/android/res/layout/tts_toolbar.xml index 0508c6528..670a63a0f 100644 --- a/android/res/layout/tts_toolbar.xml +++ b/android/res/layout/tts_toolbar.xml @@ -10,182 +10,182 @@ android:baselineAligned="true" android:orientation="vertical"> - - - - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:baselineAligned="true" + android:orientation="horizontal"> + + + + + - From 165a855dbd3bd7b8ea59a051f6d71e4d48a68222 Mon Sep 17 00:00:00 2001 From: Elliot Wolk Date: Sun, 13 Mar 2022 13:44:38 -0400 Subject: [PATCH 2/4] tts: wrap toolbar in a transparent fullscreen overlay --- android/res/layout/tts_toolbar.xml | 31 ++++++++++++++----- .../coolreader/crengine/TTSToolbarDlg.java | 2 +- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/android/res/layout/tts_toolbar.xml b/android/res/layout/tts_toolbar.xml index 670a63a0f..d42985074 100644 --- a/android/res/layout/tts_toolbar.xml +++ b/android/res/layout/tts_toolbar.xml @@ -1,14 +1,28 @@ - + android:layout_height="fill_parent"> + + + + + + diff --git a/android/src/org/coolreader/crengine/TTSToolbarDlg.java b/android/src/org/coolreader/crengine/TTSToolbarDlg.java index 2f22c5b9e..dfff576e4 100644 --- a/android/src/org/coolreader/crengine/TTSToolbarDlg.java +++ b/android/src/org/coolreader/crengine/TTSToolbarDlg.java @@ -557,7 +557,7 @@ public void onStopTrackingTouch(SeekBar seekBar) { mWindow.setBackgroundDrawable(new BitmapDrawable()); mWindow.setWidth(WindowManager.LayoutParams.FILL_PARENT); - mWindow.setHeight(WindowManager.LayoutParams.WRAP_CONTENT); + mWindow.setHeight(WindowManager.LayoutParams.FILL_PARENT); mWindow.setFocusable(true); mWindow.setTouchable(true); mWindow.setOutsideTouchable(true); From 44d0ef9b847b5504918960e42c45752f3b31759c Mon Sep 17 00:00:00 2001 From: Elliot Wolk Date: Sun, 13 Mar 2022 13:46:59 -0400 Subject: [PATCH 3/4] tts: toggle toolbar visibility on outside-click, instead of stopping TTS --- .../src/org/coolreader/crengine/TTSToolbarDlg.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/android/src/org/coolreader/crengine/TTSToolbarDlg.java b/android/src/org/coolreader/crengine/TTSToolbarDlg.java index dfff576e4..d2c3e8d44 100644 --- a/android/src/org/coolreader/crengine/TTSToolbarDlg.java +++ b/android/src/org/coolreader/crengine/TTSToolbarDlg.java @@ -39,6 +39,7 @@ import android.view.ViewGroup; import android.view.WindowManager; import android.widget.ImageButton; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; @@ -65,6 +66,8 @@ public class TTSToolbarDlg implements Settings { private final PopupWindow mWindow; private final CoolReader mCoolReader; private final ReaderView mReaderView; + private final LinearLayout glassPanel; + private final LinearLayout toolbarBody; private final TTSControlServiceAccessor mTTSControl; private final ImageButton mPlayPauseButton; private final TextView mVolumeTextView; @@ -77,6 +80,7 @@ public class TTSToolbarDlg implements Settings { private boolean mClosed; private Selection mCurrentSelection; private boolean isSpeaking; + private boolean isToolbarHidden; private int mMotionTimeout; private boolean mAutoSetDocLang; private String mBookAuthors; @@ -438,6 +442,14 @@ public TTSToolbarDlg(CoolReader coolReader, ReaderView readerView, TTSControlSer LayoutInflater inflater = LayoutInflater.from(context); View panel = inflater.inflate(R.layout.tts_toolbar, null); + glassPanel = panel.findViewById(R.id.tts_glass_panel); + toolbarBody = panel.findViewById(R.id.tts_toolbar_body); + + glassPanel.setOnClickListener(v -> { + isToolbarHidden = !isToolbarHidden; + toolbarBody.setVisibility(isToolbarHidden ? View.INVISIBLE: View.VISIBLE); + }); + mPlayPauseButton = panel.findViewById(R.id.tts_play_pause); mPlayPauseButton.setImageResource(Utils.resolveResourceIdByAttr(mCoolReader, R.attr.ic_media_play_drawable, R.drawable.ic_media_play)); ImageButton backButton = panel.findViewById(R.id.tts_back); From 6c5a254fe3bb584376639950fbb5741e4c778b3c Mon Sep 17 00:00:00 2001 From: Elliot Wolk Date: Thu, 19 Jun 2025 00:05:34 -0400 Subject: [PATCH 4/4] tts: revert the whitespace-only change for merging with other ui changes --- android/res/layout/tts_toolbar.xml | 350 ++++++++++++++--------------- 1 file changed, 175 insertions(+), 175 deletions(-) diff --git a/android/res/layout/tts_toolbar.xml b/android/res/layout/tts_toolbar.xml index d42985074..f065ffee4 100644 --- a/android/res/layout/tts_toolbar.xml +++ b/android/res/layout/tts_toolbar.xml @@ -24,183 +24,183 @@ android:baselineAligned="true" android:orientation="vertical"> - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + - - - - - + android:layout_marginStart="10dip" + android:layout_marginLeft="10dip" + android:layout_marginTop="5dip" + android:layout_marginEnd="2dip" + android:layout_marginRight="2dip" + android:layout_marginBottom="5dip" + android:layout_weight="1" /> +