From 0db277bdfcdd303ad34c4a96b5d95c7ac6cbb52c Mon Sep 17 00:00:00 2001 From: kunfei Date: Sat, 12 Mar 2022 00:17:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/keyboard/KeyboardAssistsConfig.kt | 18 ++++++++++++++++-- .../res/layout/item_1line_text_and_del.xml | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/widget/keyboard/KeyboardAssistsConfig.kt b/app/src/main/java/io/legado/app/ui/widget/keyboard/KeyboardAssistsConfig.kt index 2af55b0ca..7004363f2 100644 --- a/app/src/main/java/io/legado/app/ui/widget/keyboard/KeyboardAssistsConfig.kt +++ b/app/src/main/java/io/legado/app/ui/widget/keyboard/KeyboardAssistsConfig.kt @@ -6,6 +6,7 @@ import android.view.MenuItem import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.Toolbar +import androidx.core.view.setPadding import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -23,6 +24,7 @@ import io.legado.app.lib.theme.primaryColor import io.legado.app.ui.widget.recycler.ItemTouchCallback import io.legado.app.ui.widget.recycler.VerticalDivider import io.legado.app.utils.applyTint +import io.legado.app.utils.dp import io.legado.app.utils.setLayout import io.legado.app.utils.viewbindingdelegate.viewBinding import io.legado.app.utils.visible @@ -84,8 +86,10 @@ class KeyboardAssistsConfig : BaseDialogFragment(R.layout.dialog_recycler_view), setTitle("辅助按键") val alertBinding = DialogMultipleEditTextBinding.inflate(layoutInflater).apply { layout1.hint = "key" + edit1.setText(keyboardAssist?.key) layout2.hint = "value" layout2.visible() + edit2.setText(keyboardAssist?.value) } setCustomView(alertBinding.root) cancelButton() @@ -115,7 +119,10 @@ class KeyboardAssistsConfig : BaseDialogFragment(R.layout.dialog_recycler_view), private var isMoved = false override fun getViewBinding(parent: ViewGroup): Item1lineTextAndDelBinding { - return Item1lineTextAndDelBinding.inflate(inflater, parent, false) + return Item1lineTextAndDelBinding.inflate(inflater, parent, false).apply { + root.setPadding(16.dp) + ivDelete.visible() + } } override fun convert( @@ -128,11 +135,18 @@ class KeyboardAssistsConfig : BaseDialogFragment(R.layout.dialog_recycler_view), } override fun registerListener(holder: ItemViewHolder, binding: Item1lineTextAndDelBinding) { - binding.ivDelete.setOnClickListener { + binding.root.setOnClickListener { getItemByLayoutPosition(holder.layoutPosition)?.let { keyboardAssist -> editKey(keyboardAssist) } } + binding.ivDelete.setOnClickListener { + getItemByLayoutPosition(holder.layoutPosition)?.let { keyboardAssist -> + launch(IO) { + appDb.keyboardAssistsDao.delete(keyboardAssist) + } + } + } } override fun swap(srcPosition: Int, targetPosition: Int): Boolean { diff --git a/app/src/main/res/layout/item_1line_text_and_del.xml b/app/src/main/res/layout/item_1line_text_and_del.xml index 85af06345..2cc6daa2c 100644 --- a/app/src/main/res/layout/item_1line_text_and_del.xml +++ b/app/src/main/res/layout/item_1line_text_and_del.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="horizontal" android:padding="6dp"