From 11237719baeaba7aeb9474f9210531f9ad3624ee Mon Sep 17 00:00:00 2001 From: gedoor Date: Tue, 24 Aug 2021 09:09:06 +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 | 23 ++++++++++++++++--- app/src/main/res/layout/dialog_login.xml | 5 ++-- 2 files changed, 22 insertions(+), 6 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 264c845e5..23faff246 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 @@ -1,5 +1,6 @@ package io.legado.app.ui.book.login +import android.content.DialogInterface import android.os.Bundle import android.text.InputType import android.view.LayoutInflater @@ -21,6 +22,14 @@ class RuleUiLoginDialog : BaseDialogFragment() { private val binding by viewBinding(DialogLoginBinding::bind) private val viewModel by activityViewModels() + override fun onStart() { + super.onStart() + dialog?.window?.setLayout( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT + ) + } + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -32,24 +41,27 @@ class RuleUiLoginDialog : BaseDialogFragment() { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { binding.toolBar.setBackgroundColor(primaryColor) val bookSource = viewModel.bookSource ?: return - val loginHeader = bookSource.getLoginHeader() + binding.toolBar.title = getString(R.string.login_source, bookSource.bookSourceName) + val loginInfo = bookSource.getLoginInfo() 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 { - setText(loginHeader?.get(rowUi.name)) + 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 { inputType = InputType.TYPE_TEXT_VARIATION_PASSWORD or InputType.TYPE_CLASS_TEXT - setText(loginHeader?.get(rowUi.name)) + setText(loginInfo?.get(rowUi.name)) } } } @@ -76,4 +88,9 @@ class RuleUiLoginDialog : BaseDialogFragment() { } } + override fun onDismiss(dialog: DialogInterface) { + super.onDismiss(dialog) + activity?.finish() + } + } \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_login.xml b/app/src/main/res/layout/dialog_login.xml index cbb5f1d42..616485e29 100644 --- a/app/src/main/res/layout/dialog_login.xml +++ b/app/src/main/res/layout/dialog_login.xml @@ -1,11 +1,11 @@ + android:orientation="vertical"> - \ No newline at end of file