From 6fd341ccf2b762972b6e4dbd90192bc4c79928df Mon Sep 17 00:00:00 2001 From: gedoor Date: Wed, 25 Aug 2021 09:59:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ui/book/login/RuleUiLoginDialog.kt | 22 ++++++++++--------- .../book/source/manage/BookSourceAdapter.kt | 5 +++++ app/src/main/res/layout/dialog_login.xml | 6 +++++ 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/login/RuleUiLoginDialog.kt b/app/src/main/java/io/legado/app/ui/book/login/RuleUiLoginDialog.kt index 23faff246..36a85ff5c 100644 --- a/app/src/main/java/io/legado/app/ui/book/login/RuleUiLoginDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/login/RuleUiLoginDialog.kt @@ -46,19 +46,21 @@ class RuleUiLoginDialog : BaseDialogFragment() { val loginUi = bookSource.loginUi loginUi?.forEachIndexed { index, rowUi -> when (rowUi.type) { - "text" -> layoutInflater.inflate(R.layout.item_source_edit, binding.root) - .apply { - id = index - findViewById(R.id.textInputLayout).hint = rowUi.name - findViewById(R.id.editText).apply { + "text" -> layoutInflater.inflate(R.layout.item_source_edit, binding.root, false) + .let { + binding.listView.addView(it) + it.id = index + (it as TextInputLayout).hint = rowUi.name + it.findViewById(R.id.editText).apply { setText(loginInfo?.get(rowUi.name)) } } - "password" -> layoutInflater.inflate(R.layout.item_source_edit, binding.root) - .apply { - id = index - findViewById(R.id.textInputLayout).hint = rowUi.name - findViewById(R.id.editText).apply { + "password" -> layoutInflater.inflate(R.layout.item_source_edit, binding.root, false) + .let { + binding.listView.addView(it) + it.id = index + (it as TextInputLayout).hint = rowUi.name + it.findViewById(R.id.editText).apply { inputType = InputType.TYPE_TEXT_VARIATION_PASSWORD or InputType.TYPE_CLASS_TEXT setText(loginInfo?.get(rowUi.name)) diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt index d2a7d1237..ca74e22ae 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt @@ -17,10 +17,12 @@ import io.legado.app.data.entities.BookSource import io.legado.app.databinding.ItemBookSourceBinding import io.legado.app.lib.theme.backgroundColor import io.legado.app.model.Debug +import io.legado.app.ui.book.login.SourceLoginActivity import io.legado.app.ui.widget.recycler.DragSelectTouchHelper import io.legado.app.ui.widget.recycler.ItemTouchCallback.Callback import io.legado.app.utils.ColorUtils import io.legado.app.utils.invisible +import io.legado.app.utils.startActivity import io.legado.app.utils.visible @@ -166,6 +168,9 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) : when (menuItem.itemId) { R.id.menu_top -> callBack.toTop(source) R.id.menu_bottom -> callBack.toBottom(source) + R.id.menu_login -> context.startActivity { + putExtra("sourceUrl", source.bookSourceUrl) + } R.id.menu_debug_source -> callBack.debug(source) R.id.menu_del -> callBack.del(source) R.id.menu_enable_explore -> { diff --git a/app/src/main/res/layout/dialog_login.xml b/app/src/main/res/layout/dialog_login.xml index 616485e29..98088eda3 100644 --- a/app/src/main/res/layout/dialog_login.xml +++ b/app/src/main/res/layout/dialog_login.xml @@ -19,4 +19,10 @@ app:popupTheme="@style/AppTheme.PopupOverlay" app:titleTextAppearance="@style/ToolbarTitle" /> + + \ No newline at end of file