null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing login/out strings + adguard key

Browse source
This commit is contained in:
Jays2Kings 2021-10-05 18:26:40 -04:00
parent 469fce0e8c
commit 1f304ec8a9
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
View file

@ -199,7 +199,7 @@ class SettingsAdvancedController : SettingsController() {
R.string.disabled, R.string.disabled,
R.string.cloudflare, R.string.cloudflare,
R.string.google, R.string.google,
R.string.adGuard R.string.ad_guard
) )
entryValues = listOf(-1, PREF_DOH_CLOUDFLARE, PREF_DOH_GOOGLE, PREF_DOH_ADGUARD) entryValues = listOf(-1, PREF_DOH_CLOUDFLARE, PREF_DOH_GOOGLE, PREF_DOH_ADGUARD)

4
app/src/main/java/eu/kanade/tachiyomi/widget/preference/TrackLogoutDialog.kt
View file

@ -20,9 +20,9 @@ class TrackLogoutDialog(bundle: Bundle? = null) : DialogController(bundle) {
override fun onCreateDialog(savedViewState: Bundle?): Dialog { override fun onCreateDialog(savedViewState: Bundle?): Dialog {
val serviceName = activity!!.getString(service.nameRes()) val serviceName = activity!!.getString(service.nameRes())
return activity!!.materialAlertDialog() return activity!!.materialAlertDialog()
.setTitle(activity!!.getString(R.string.logout_from_, serviceName)) .setTitle(activity!!.getString(R.string.log_out_from_, serviceName))
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.logout) { _, _ -> .setPositiveButton(R.string.log_out) { _, _ ->
service.logout() service.logout()
(targetController as? Listener)?.trackLogoutDialogClosed(service) (targetController as? Listener)?.trackLogoutDialogClosed(service)
activity!!.toast(R.string.successfully_logged_out) activity!!.toast(R.string.successfully_logged_out)

2
app/src/main/res/layout/pref_account_login.xml
View file

@ -58,7 +58,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:text="@string/login" android:text="@string/log_in"
android:textSize="16sp" android:textSize="16sp"
app:finalCornerAngle="50dp" app:finalCornerAngle="50dp"
app:initialCornerAngle="2dp" app:initialCornerAngle="2dp"

10
app/src/main/res/values/strings.xml
View file

@ -579,7 +579,7 @@
<string name="komga" translatable="false">Komga</string> <string name="komga" translatable="false">Komga</string>
<string name="started_reading_date">Started reading date</string> <string name="started_reading_date">Started reading date</string>
<string name="finished_reading_date">Finished reading date</string> <string name="finished_reading_date">Finished reading date</string>
<string name="myanimelist_relogin">Please login to MAL again</string> <string name="myanimelist_relogin">Please log in to MAL again</string>
<string name="use_suggested_date">Use suggested date</string> <string name="use_suggested_date">Use suggested date</string>
<!-- Migration --> <!-- Migration -->
@ -753,7 +753,7 @@
<string name="disabled">Disabled</string> <string name="disabled">Disabled</string>
<string name="cloudflare" translatable="false">Cloudflare</string> <string name="cloudflare" translatable="false">Cloudflare</string>
<string name="google" translatable="false">Google</string> <string name="google" translatable="false">Google</string>
<string name="adGuard" translatable="false">AdGuard</string> <string name="ad_guard" translatable="false">AdGuard</string>
<string name="requires_app_restart">Requires app restart to take effect</string> <string name="requires_app_restart">Requires app restart to take effect</string>
<string name="used_">Used: %1$s</string> <string name="used_">Used: %1$s</string>
<plurals name="cache_cleared"> <plurals name="cache_cleared">
@ -836,9 +836,9 @@
<string name="username">Username</string> <string name="username">Username</string>
<string name="email">Email address</string> <string name="email">Email address</string>
<string name="password">Password</string> <string name="password">Password</string>
<string name="login">Login</string> <string name="log_in">Log in</string>
<string name="logout">Logout</string> <string name="log_out">Log out</string>
<string name="logout_from_">Logout from %1$s?</string> <string name="log_out_from_">Log out from %1$s?</string>
<string name="successfully_logged_in">Successfully logged in</string> <string name="successfully_logged_in">Successfully logged in</string>
<string name="username_must_not_be_blank">Username or password cannot be blank</string> <string name="username_must_not_be_blank">Username or password cannot be blank</string>