Code clean

EhViewer-NekoInverter · Sep 28, 2024 · f4cf528 · f4cf528
1 parent 65a9c50
commit f4cf528
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 19 deletions.
diff --git a/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt
@@ -17,7 +17,6 @@ package com.hippo.ehviewer.preference
 
 import android.content.Context
 import android.content.DialogInterface
-import android.text.Html
 import android.util.AttributeSet
 import android.view.View
 import android.view.WindowManager
@@ -66,17 +65,13 @@ class AccountPreference(
                 }
             }
             mCookie = EhCookieStore.KEY_IPB_MEMBER_ID + ": " + ipbMemberId +
-                "<br>" + EhCookieStore.KEY_IPB_PASS_HASH + ": " + ipbPassHash
-            igneous?.let { mCookie += "<br>" + EhCookieStore.KEY_IGNEOUS + ": " + it }
-            mMessage = Html.fromHtml(
-                context.getString(R.string.settings_eh_account_identity_cookies, mCookie),
-                Html.FROM_HTML_MODE_LEGACY,
-            ).toString()
+                "\n" + EhCookieStore.KEY_IPB_PASS_HASH + ": " + ipbPassHash
+            igneous?.let { mCookie += "\n" + EhCookieStore.KEY_IGNEOUS + ": " + it }
+            mMessage = context.getString(R.string.settings_eh_account_identity_cookies, mCookie)
             if (igneousExpire > 0 && igneousExpire != ReadableTime.MAX_VALUE_MILLIS) {
                 mMessage += "\n" + context.getString(R.string.settings_eh_account_igneous_expire) +
                     ReadableTime.getShortTime(igneousExpire)
             }
-            mCookie = mCookie!!.replace("<br>", "\n")
             mDialog.setMessage(mMessage)
         }
     }

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -301,7 +301,7 @@
     <string name="settings_eh">EH</string>
     <string name="settings_eh_account_sign_out">ログアウト</string>
     <string name="settings_eh_account_sign_out_tip">ログアウトしました。アプリを再起動することで再度ログインします。</string>
-    <string name="settings_eh_account_identity_cookies">下記の情報を持つ誰でもこのアカウントにログインできますので&lt;br&gt;&lt;b&gt;絶対に他人に渡さないように！&lt;/b&gt;&lt;br&gt;&lt;br&gt;%s</string>
+    <string name="settings_eh_account_identity_cookies">下記の情報を持つ誰でもこのアカウントにログインできますので\n絶対に他人に渡さないように！\n\n%s</string>
     <string name="settings_eh_account_identity_cookies_copy">コピー</string>
     <string name="settings_eh_gallery_site">ギャラリーサイト</string>
     <string name="settings_eh_launch_page">アプリ既定画面</string>

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -381,7 +381,7 @@
     <string name="settings_eh_account_refresh_igneous">刷新 igneous</string>
     <string name="settings_eh_account_sign_out">退出登录</string>
     <string name="settings_eh_account_sign_out_tip">已退出登录，重启应用以便再次登录</string>
-    <string name="settings_eh_account_identity_cookies">身份 Cookie 可用于登录该账号。&lt;br&gt;&lt;b&gt;注意数据安全&lt;/b&gt;&lt;br&gt;&lt;br&gt;%s</string>
+    <string name="settings_eh_account_identity_cookies">身份 Cookie 可用于登录该账号。\n注意数据安全\n\n%s</string>
     <string name="settings_eh_account_igneous_expire">igneous 有效期：</string>
     <string name="settings_eh_account_identity_cookies_copy">复制</string>
     <string name="settings_eh_gallery_site">画廊站点</string>

diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
@@ -381,7 +381,7 @@
     <string name="settings_eh_account_refresh_igneous">刷新 igneous</string>
     <string name="settings_eh_account_sign_out">退出登錄</string>
     <string name="settings_eh_account_sign_out_tip">已退出登錄，重啓應用以便再次登錄</string>
-    <string name="settings_eh_account_identity_cookies">身份 Cookie 可用於登錄該賬號。&lt;br&gt;&lt;b&gt;注意數據安全&lt;/b&gt;&lt;br&gt;&lt;br&gt;%s</string>
+    <string name="settings_eh_account_identity_cookies">身份 Cookie 可用於登錄該賬號。\n注意數據安全\n\n%s</string>
     <string name="settings_eh_account_igneous_expire">igneous 有效期：</string>
     <string name="settings_eh_account_identity_cookies_copy">複製</string>
     <string name="settings_eh_gallery_site">畫廊站點</string>

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -381,7 +381,7 @@
     <string name="settings_eh_account_refresh_igneous">重新整理 igneous</string>
     <string name="settings_eh_account_sign_out">登出</string>
     <string name="settings_eh_account_sign_out_tip">已登出，重新啟動程式以再次登入</string>
-    <string name="settings_eh_account_identity_cookies">身份 Cookie 可用於登入該帳號。&lt;br&gt;&lt;b&gt;請注意資料安全&lt;/b&gt;&lt;br&gt;&lt;br&gt;%s</string>
+    <string name="settings_eh_account_identity_cookies">身份 Cookie 可用於登入該帳號。\n請注意資料安全\n\n%s</string>
     <string name="settings_eh_account_igneous_expire">igneous 有效期限：</string>
     <string name="settings_eh_account_identity_cookies_copy">複製</string>
     <string name="settings_eh_gallery_site">圖庫站台</string>

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -144,12 +144,6 @@
         <attr name="dialogLayout" format="reference" />
     </declare-styleable>
 
-    <declare-styleable name="MessagePreference">
-        <attr name="dialogMessage" format="string" />
-        <attr name="dialogMessageHtml" format="boolean" />
-        <attr name="dialogMessageLinkify" format="boolean" />
-    </declare-styleable>
-
     <declare-styleable name="ListPreference">
         <!-- The human-readable array to present as a list. Each entry must have a corresponding
              index in entryValues. -->

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -407,7 +407,7 @@
     <string name="settings_eh_account_refresh_igneous">Refresh igneous</string>
     <string name="settings_eh_account_sign_out">Sign out</string>
     <string name="settings_eh_account_sign_out_tip">You have signed out. Restart the application to sign in again</string>
-    <string name="settings_eh_account_identity_cookies">Identity cookies can be used to sign in to this account.&lt;br&gt;&lt;b&gt;KEEP IT SAFE&lt;/b&gt;&lt;br&gt;&lt;br&gt;%s</string>
+    <string name="settings_eh_account_identity_cookies">Identity cookies can be used to sign in to this account.\nKEEP IT SAFE\n\n%s</string>
     <string name="settings_eh_account_igneous_expire">ignous valid until: </string>
     <string name="settings_eh_account_identity_cookies_copy">Copy</string>
     <string name="settings_eh_gallery_site">Gallery site</string>