修复登录ui

pull/1272/head
gedoor 4 years ago
parent f6f80da3fe
commit 6fd341ccf2
  1. 22
      app/src/main/java/io/legado/app/ui/book/login/RuleUiLoginDialog.kt
  2. 5
      app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt
  3. 6
      app/src/main/res/layout/dialog_login.xml

@ -46,19 +46,21 @@ class RuleUiLoginDialog : BaseDialogFragment() {
val loginUi = bookSource.loginUi val loginUi = bookSource.loginUi
loginUi?.forEachIndexed { index, rowUi -> loginUi?.forEachIndexed { index, rowUi ->
when (rowUi.type) { when (rowUi.type) {
"text" -> layoutInflater.inflate(R.layout.item_source_edit, binding.root) "text" -> layoutInflater.inflate(R.layout.item_source_edit, binding.root, false)
.apply { .let {
id = index binding.listView.addView(it)
findViewById<TextInputLayout>(R.id.textInputLayout).hint = rowUi.name it.id = index
findViewById<EditText>(R.id.editText).apply { (it as TextInputLayout).hint = rowUi.name
it.findViewById<EditText>(R.id.editText).apply {
setText(loginInfo?.get(rowUi.name)) setText(loginInfo?.get(rowUi.name))
} }
} }
"password" -> layoutInflater.inflate(R.layout.item_source_edit, binding.root) "password" -> layoutInflater.inflate(R.layout.item_source_edit, binding.root, false)
.apply { .let {
id = index binding.listView.addView(it)
findViewById<TextInputLayout>(R.id.textInputLayout).hint = rowUi.name it.id = index
findViewById<EditText>(R.id.editText).apply { (it as TextInputLayout).hint = rowUi.name
it.findViewById<EditText>(R.id.editText).apply {
inputType = inputType =
InputType.TYPE_TEXT_VARIATION_PASSWORD or InputType.TYPE_CLASS_TEXT InputType.TYPE_TEXT_VARIATION_PASSWORD or InputType.TYPE_CLASS_TEXT
setText(loginInfo?.get(rowUi.name)) setText(loginInfo?.get(rowUi.name))

@ -17,10 +17,12 @@ import io.legado.app.data.entities.BookSource
import io.legado.app.databinding.ItemBookSourceBinding import io.legado.app.databinding.ItemBookSourceBinding
import io.legado.app.lib.theme.backgroundColor import io.legado.app.lib.theme.backgroundColor
import io.legado.app.model.Debug 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.DragSelectTouchHelper
import io.legado.app.ui.widget.recycler.ItemTouchCallback.Callback import io.legado.app.ui.widget.recycler.ItemTouchCallback.Callback
import io.legado.app.utils.ColorUtils import io.legado.app.utils.ColorUtils
import io.legado.app.utils.invisible import io.legado.app.utils.invisible
import io.legado.app.utils.startActivity
import io.legado.app.utils.visible import io.legado.app.utils.visible
@ -166,6 +168,9 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) :
when (menuItem.itemId) { when (menuItem.itemId) {
R.id.menu_top -> callBack.toTop(source) R.id.menu_top -> callBack.toTop(source)
R.id.menu_bottom -> callBack.toBottom(source) R.id.menu_bottom -> callBack.toBottom(source)
R.id.menu_login -> context.startActivity<SourceLoginActivity> {
putExtra("sourceUrl", source.bookSourceUrl)
}
R.id.menu_debug_source -> callBack.debug(source) R.id.menu_debug_source -> callBack.debug(source)
R.id.menu_del -> callBack.del(source) R.id.menu_del -> callBack.del(source)
R.id.menu_enable_explore -> { R.id.menu_enable_explore -> {

@ -19,4 +19,10 @@
app:popupTheme="@style/AppTheme.PopupOverlay" app:popupTheme="@style/AppTheme.PopupOverlay"
app:titleTextAppearance="@style/ToolbarTitle" /> app:titleTextAppearance="@style/ToolbarTitle" />
<LinearLayout
android:id="@+id/list_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
</LinearLayout> </LinearLayout>
Loading…
Cancel
Save