From 25409cf1097e599053fb584240f7e2fd3ef3a8be Mon Sep 17 00:00:00 2001 From: kunfei Date: Thu, 5 Mar 2020 09:49:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/base/BaseFragment.kt | 2 ++ .../app/ui/book/read/config/ReadAloudDialog.kt | 16 +++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/io/legado/app/base/BaseFragment.kt b/app/src/main/java/io/legado/app/base/BaseFragment.kt index c4b712349..c19033aa8 100644 --- a/app/src/main/java/io/legado/app/base/BaseFragment.kt +++ b/app/src/main/java/io/legado/app/base/BaseFragment.kt @@ -1,5 +1,6 @@ package io.legado.app.base +import android.annotation.SuppressLint import android.os.Bundle import android.view.* import androidx.appcompat.view.SupportMenuInflater @@ -18,6 +19,7 @@ abstract class BaseFragment(layoutID: Int) : Fragment(layoutID), private set val menuInflater: MenuInflater + @SuppressLint("RestrictedApi") get() = SupportMenuInflater(requireContext()) override val coroutineContext: CoroutineContext diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt index 8cce7d4d2..f084eb02d 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt @@ -7,8 +7,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.SeekBar -import androidx.fragment.app.DialogFragment import io.legado.app.R +import io.legado.app.base.BaseDialogFragment import io.legado.app.constant.EventBus import io.legado.app.help.AppConfig import io.legado.app.lib.theme.bottomBackground @@ -23,7 +23,7 @@ import kotlinx.android.synthetic.main.dialog_read_aloud.* import org.jetbrains.anko.sdk27.listeners.onClick import org.jetbrains.anko.sdk27.listeners.onLongClick -class ReadAloudDialog : DialogFragment() { +class ReadAloudDialog : BaseDialogFragment() { var callBack: CallBack? = null override fun onStart() { @@ -56,18 +56,15 @@ class ReadAloudDialog : DialogFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) ll_bottom_bg.setBackgroundColor(requireContext().bottomBackground) - initData() initOnChange() + initData() initOnClick() + observeLiveBusEvent() } private fun initData() { - observeEvent(EventBus.ALOUD_STATE) { upPlayState() } - observeEvent(EventBus.TTS_DS) { seek_timer.progress = it } upPlayState() seek_timer.progress = BaseReadAloudService.timeMinute - tv_timer.text = - requireContext().getString(R.string.timer_m, BaseReadAloudService.timeMinute) cb_tts_follow_sys.isChecked = requireContext().getPrefBoolean("ttsFollowSys", true) seek_tts_SpeechRate.isEnabled = !cb_tts_follow_sys.isChecked seek_tts_SpeechRate.progress = AppConfig.ttsSpeechRate @@ -139,6 +136,11 @@ class ReadAloudDialog : DialogFragment() { } } + private fun observeLiveBusEvent() { + observeEvent(EventBus.ALOUD_STATE) { upPlayState() } + observeEvent(EventBus.TTS_DS) { seek_timer.progress = it } + } + interface CallBack { fun showMenuBar() fun openChapterList()