pull/1395/head
gedoor 4 years ago
parent cb7a47e210
commit 93cd72bd78
  1. 2
      app/src/main/java/io/legado/app/ui/login/SourceLoginActivity.kt
  2. 3
      app/src/main/java/io/legado/app/ui/login/SourceLoginDialog.kt
  3. 5
      app/src/main/res/menu/source_login.xml
  4. 1
      app/src/main/res/values-es-rES/strings.xml
  5. 1
      app/src/main/res/values-ja-rJP/strings.xml
  6. 1
      app/src/main/res/values-pt-rBR/strings.xml
  7. 1
      app/src/main/res/values-zh-rHK/strings.xml
  8. 1
      app/src/main/res/values-zh-rTW/strings.xml
  9. 1
      app/src/main/res/values-zh/strings.xml
  10. 1
      app/src/main/res/values/strings.xml

@ -27,7 +27,7 @@ class SourceLoginActivity : VMBaseActivity<ActivitySourceLoginBinding, SourceLog
.replace(R.id.fl_fragment, WebViewLoginFragment()) .replace(R.id.fl_fragment, WebViewLoginFragment())
.commit() .commit()
} else { } else {
showDialogFragment<RuleUiLoginDialog>() showDialogFragment<SourceLoginDialog>()
} }
} }

@ -25,7 +25,7 @@ import kotlinx.coroutines.withContext
import splitties.init.appCtx import splitties.init.appCtx
import splitties.views.onClick import splitties.views.onClick
class RuleUiLoginDialog : BaseDialogFragment(R.layout.dialog_login) { class SourceLoginDialog : BaseDialogFragment(R.layout.dialog_login) {
private val binding by viewBinding(DialogLoginBinding::bind) private val binding by viewBinding(DialogLoginBinding::bind)
private val viewModel by activityViewModels<SourceLoginViewModel>() private val viewModel by activityViewModels<SourceLoginViewModel>()
@ -92,6 +92,7 @@ class RuleUiLoginDialog : BaseDialogFragment(R.layout.dialog_login) {
} }
login(source, loginData) login(source, loginData)
} }
R.id.menu_del_login_header -> source.removeLoginHeader()
R.id.menu_log -> showDialogFragment<AppLogDialog>() R.id.menu_log -> showDialogFragment<AppLogDialog>()
} }
return@setOnMenuItemClickListener true return@setOnMenuItemClickListener true

@ -10,6 +10,11 @@
android:title="@string/ok" android:title="@string/ok"
app:showAsAction="always" /> app:showAsAction="always" />
<item
android:id="@+id/menu_del_login_header"
android:title="@string/del_login_header"
app:showAsAction="never" />
<item <item
android:id="@+id/menu_log" android:id="@+id/menu_log"
android:title="@string/log" android:title="@string/log"

@ -897,5 +897,6 @@
<string name="use_browser_open">是否使用外部浏览器打开?</string> <string name="use_browser_open">是否使用外部浏览器打开?</string>
<string name="see">查看</string> <string name="see">查看</string>
<string name="open">打开</string> <string name="open">打开</string>
<string name="del_login_header">删除登录头</string>
</resources> </resources>

@ -901,5 +901,6 @@
<string name="use_browser_open">是否使用外部浏览器打开?</string> <string name="use_browser_open">是否使用外部浏览器打开?</string>
<string name="see">查看</string> <string name="see">查看</string>
<string name="open">打开</string> <string name="open">打开</string>
<string name="del_login_header">删除登录头</string>
</resources> </resources>

@ -901,5 +901,6 @@
<string name="use_browser_open">是否使用外部浏览器打开?</string> <string name="use_browser_open">是否使用外部浏览器打开?</string>
<string name="see">查看</string> <string name="see">查看</string>
<string name="open">打开</string> <string name="open">打开</string>
<string name="del_login_header">删除登录头</string>
</resources> </resources>

@ -898,5 +898,6 @@
<string name="use_browser_open">是否使用外部浏览器打开?</string> <string name="use_browser_open">是否使用外部浏览器打开?</string>
<string name="see">查看</string> <string name="see">查看</string>
<string name="open">打开</string> <string name="open">打开</string>
<string name="del_login_header">删除登录头</string>
</resources> </resources>

@ -900,5 +900,6 @@
<string name="use_browser_open">是否使用外部浏览器打开?</string> <string name="use_browser_open">是否使用外部浏览器打开?</string>
<string name="see">查看</string> <string name="see">查看</string>
<string name="open">打开</string> <string name="open">打开</string>
<string name="del_login_header">删除登录头</string>
</resources> </resources>

@ -900,5 +900,6 @@
<string name="use_browser_open">是否使用外部浏览器打开?</string> <string name="use_browser_open">是否使用外部浏览器打开?</string>
<string name="see">查看</string> <string name="see">查看</string>
<string name="open">打开</string> <string name="open">打开</string>
<string name="del_login_header">删除登录头</string>
</resources> </resources>

@ -901,5 +901,6 @@
<string name="use_browser_open">是否使用外部浏览器打开?</string> <string name="use_browser_open">是否使用外部浏览器打开?</string>
<string name="see">查看</string> <string name="see">查看</string>
<string name="open">打开</string> <string name="open">打开</string>
<string name="del_login_header">删除登录头</string>
</resources> </resources>

Loading…
Cancel
Save