From 1a5c9bfacfa8dda493bfa16256d7f365c0bd1139 Mon Sep 17 00:00:00 2001 From: kunfei Date: Sun, 23 Feb 2020 11:51:40 +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 --- .../io/legado/app/data/dao/TxtTocRuleDao.kt | 4 ++ .../app/ui/book/read/config/TocRegexDialog.kt | 47 ++++++++++++++----- app/src/main/res/layout/item_group_manage.xml | 1 + app/src/main/res/layout/item_group_select.xml | 1 + app/src/main/res/layout/item_toc_regex.xml | 4 +- 5 files changed, 45 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/io/legado/app/data/dao/TxtTocRuleDao.kt b/app/src/main/java/io/legado/app/data/dao/TxtTocRuleDao.kt index 119daa651..c63133164 100644 --- a/app/src/main/java/io/legado/app/data/dao/TxtTocRuleDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/TxtTocRuleDao.kt @@ -1,11 +1,15 @@ package io.legado.app.data.dao +import androidx.lifecycle.LiveData import androidx.room.* import io.legado.app.data.entities.TxtTocRule @Dao interface TxtTocRuleDao { + @Query("select * from txtTocRules order by serialNumber") + fun observeAll(): LiveData> + @get:Query("select * from txtTocRules order by serialNumber") val all: List diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/TocRegexDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/TocRegexDialog.kt index f0cd6b31a..4359b15d5 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/TocRegexDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/TocRegexDialog.kt @@ -9,6 +9,10 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.fragment.app.FragmentManager +import androidx.lifecycle.LiveData +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import io.legado.app.App import io.legado.app.R import io.legado.app.base.BaseDialogFragment import io.legado.app.base.adapter.ItemViewHolder @@ -16,20 +20,15 @@ import io.legado.app.base.adapter.SimpleRecyclerAdapter import io.legado.app.constant.Theme import io.legado.app.data.entities.TxtTocRule import io.legado.app.utils.applyTint +import io.legado.app.utils.getVerticalDivider import kotlinx.android.synthetic.main.dialog_toc_regex.* +import kotlinx.android.synthetic.main.item_toc_regex.view.* class TocRegexDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener { - companion object { - fun show(fragmentManager: FragmentManager, tocRegex: String? = null) { - val dialog = TocRegexDialog() - val bundle = Bundle() - bundle.putString("tocRegex", tocRegex) - dialog.arguments = bundle - dialog.show(fragmentManager, "tocRegexDialog") - } - } + private lateinit var adapter: TocRegexAdapter + private var tocRegexLiveData: LiveData>? = null override fun onStart() { super.onStart() @@ -53,10 +52,22 @@ class TocRegexDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener { tool_bar.menu.applyTint(requireContext(), Theme.getTheme()) tool_bar.setOnMenuItemClickListener(this) initView() + initData() } private fun initView() { + adapter = TocRegexAdapter(requireContext()) + recycler_view.layoutManager = LinearLayoutManager(requireContext()) + recycler_view.addItemDecoration(recycler_view.getVerticalDivider()) + recycler_view.adapter = adapter + } + private fun initData() { + tocRegexLiveData?.removeObservers(viewLifecycleOwner) + tocRegexLiveData = App.db.txtTocRule().observeAll() + tocRegexLiveData?.observe(viewLifecycleOwner, Observer { + adapter.setItems(it) + }) } override fun onMenuItemClick(item: MenuItem?): Boolean { @@ -65,15 +76,29 @@ class TocRegexDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener { } - inner class TocRegexDialog(context: Context) : + inner class TocRegexAdapter(context: Context) : SimpleRecyclerAdapter(context, R.layout.item_toc_regex) { override fun convert(holder: ItemViewHolder, item: TxtTocRule, payloads: MutableList) { - + holder.itemView.apply { + rb_regex_name.text = item.name + } } override fun registerListener(holder: ItemViewHolder) { } } + + + companion object { + fun show(fragmentManager: FragmentManager, tocRegex: String? = null) { + val dialog = TocRegexDialog() + val bundle = Bundle() + bundle.putString("tocRegex", tocRegex) + dialog.arguments = bundle + dialog.show(fragmentManager, "tocRegexDialog") + } + } + } \ No newline at end of file diff --git a/app/src/main/res/layout/item_group_manage.xml b/app/src/main/res/layout/item_group_manage.xml index d7d85630a..763a19acd 100644 --- a/app/src/main/res/layout/item_group_manage.xml +++ b/app/src/main/res/layout/item_group_manage.xml @@ -4,6 +4,7 @@ android:layout_height="wrap_content" android:background="@color/background" android:padding="8dp" + android:gravity="center_vertical" android:orientation="horizontal"> + android:layout_weight="1" + android:maxLines="1" />