diff --git a/app/src/main/java/io/legado/app/constant/AppConst.kt b/app/src/main/java/io/legado/app/constant/AppConst.kt index 8ce9b0687..5ec3fbcbf 100644 --- a/app/src/main/java/io/legado/app/constant/AppConst.kt +++ b/app/src/main/java/io/legado/app/constant/AppConst.kt @@ -52,7 +52,7 @@ object AppConst { ) @SuppressLint("PrivateResource") - val sysElevation = if (AppConfig.isEInkMode) 0 else appCtx.resources + val sysElevation = appCtx.resources .getDimension(com.google.android.material.R.dimen.design_appbar_elevation) .toInt() diff --git a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt index a80a49f13..bb7215d31 100644 --- a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt @@ -156,7 +156,7 @@ class ChangeChapterSourceDialog() : BaseDialogFragment(R.layout.dialog_chapter_c binding.ivHideToc.setOnClickListener { binding.clToc.gone() } - binding.flHideToc.elevation = if (AppConfig.isEInkMode) 0f else requireContext().elevation + binding.flHideToc.elevation = requireContext().elevation } private fun initRecyclerView() { diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt index fa2cd8b39..7fa379f68 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt @@ -8,8 +8,6 @@ import android.graphics.PorterDuff import android.graphics.drawable.GradientDrawable import android.util.AttributeSet import android.view.LayoutInflater -import android.view.View.OnClickListener -import android.view.View.OnLongClickListener import android.view.WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE import android.view.animation.Animation import android.widget.FrameLayout @@ -100,7 +98,7 @@ class ReadMenu @JvmOverloads constructor( private val showBrightnessView get() = context.getPrefBoolean( PreferKey.showBrightnessView, - !AppConfig.isEInkMode + true ) private val sourceMenu by lazy { PopupMenu(context, binding.tvSourceAction).apply { @@ -202,7 +200,7 @@ class ReadMenu @JvmOverloads constructor( brightnessBackground.cornerRadius = 5F.dpToPx() brightnessBackground.setColor(ColorUtils.adjustAlpha(bgColor, 0.5f)) llBrightness.background = brightnessBackground - if(AppConfig.isEInkMode) { + if (AppConfig.isEInkMode) { titleBar.setBackgroundResource(R.drawable.bg_eink_border_bottom) llBottomBg.setBackgroundResource(R.drawable.bg_eink_border_top) } else { diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt index d104f6883..008996766 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt @@ -98,11 +98,6 @@ class ReadStyleDialog : BaseDialogFragment(R.layout.dialog_read_book_style), } } } - if(AppConfig.isEInkMode) { - binding.vwBgFg1.visibility = View.INVISIBLE - binding.llBgTs.visibility = View.GONE - binding.rvStyle.visibility = View.GONE - } } private fun initData() { diff --git a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt index fa7c63d66..308e5820a 100644 --- a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt +++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt @@ -53,7 +53,6 @@ import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import kotlin.collections.set import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine @@ -112,7 +111,7 @@ class MainActivity : VMBaseActivity(), return@addCallback } } - if (!AppConfig.isEInkMode && System.currentTimeMillis() - exitTime > 2000) { + if (System.currentTimeMillis() - exitTime > 2000) { toastOnUi(R.string.double_click_exit) exitTime = System.currentTimeMillis() } else { diff --git a/app/src/main/res/layout/dialog_read_book_style.xml b/app/src/main/res/layout/dialog_read_book_style.xml index 993af0698..91f66fa74 100644 --- a/app/src/main/res/layout/dialog_read_book_style.xml +++ b/app/src/main/res/layout/dialog_read_book_style.xml @@ -267,7 +267,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" - android:id="@+id/ll_bg_ts" android:orientation="horizontal">