From 75b0e488150bde83f1744611df9f898cd70d6214 Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Thu, 4 Apr 2024 22:21:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=EF=BC=9Acode=20review?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/client/CallQueryFragment.kt | 4 +- .../fragment/client/ContactQueryFragment.kt | 4 +- .../fragment/client/SmsQueryFragment.kt | 4 +- .../sms/forwarder/utils/mail/EmailSender.kt | 2 +- .../sms/forwarder/utils/mail/PgpUtils.kt | 2 +- .../sms/forwarder/utils/mail/SmimeUtils.kt | 2 +- .../sms/forwarder/utils/task/TaskUtils.kt | 3 ++ .../res/drawable-anydpi-v24/ic_forwarder.xml | 3 +- app/src/main/res/layout/dialog_rule_test.xml | 2 +- app/src/main/res/values-en/styles_widget.xml | 6 ++- app/src/main/res/values/arrays.xml | 43 ------------------- app/src/main/res/values/styles_widget.xml | 6 ++- 12 files changed, 24 insertions(+), 57 deletions(-) diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/CallQueryFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/CallQueryFragment.kt index a47486ab..af9d55fd 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/CallQueryFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/CallQueryFragment.kt @@ -149,9 +149,9 @@ class CallQueryFragment : BaseFragment() { //搜索框 binding!!.searchView.findViewById(com.xuexiang.xui.R.id.search_layout).visibility = View.GONE - binding!!.searchView.setVoiceSearch(true) + //binding!!.searchView.setVoiceSearch(true) binding!!.searchView.setEllipsize(true) - binding!!.searchView.setSuggestions(resources.getStringArray(R.array.query_suggestions)) + //binding!!.searchView.setSuggestions(resources.getStringArray(R.array.query_suggestions)) binding!!.searchView.setOnQueryTextListener(object : MaterialSearchView.OnQueryTextListener { override fun onQueryTextSubmit(query: String): Boolean { SnackbarUtils.Indefinite(view, String.format(getString(R.string.search_keyword), query)).info() diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/ContactQueryFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/ContactQueryFragment.kt index 2590dc29..fb03bb04 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/ContactQueryFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/ContactQueryFragment.kt @@ -131,9 +131,9 @@ class ContactQueryFragment : BaseFragment() //搜索框 binding!!.searchView.findViewById(com.xuexiang.xui.R.id.search_layout).visibility = View.GONE - binding!!.searchView.setVoiceSearch(true) + //binding!!.searchView.setVoiceSearch(true) binding!!.searchView.setEllipsize(true) - binding!!.searchView.setSuggestions(resources.getStringArray(R.array.query_suggestions)) + //binding!!.searchView.setSuggestions(resources.getStringArray(R.array.query_suggestions)) binding!!.searchView.setOnQueryTextListener(object : MaterialSearchView.OnQueryTextListener { override fun onQueryTextSubmit(query: String): Boolean { SnackbarUtils.Indefinite(view, String.format(getString(R.string.search_keyword), query)).info() diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/SmsQueryFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/SmsQueryFragment.kt index 271840aa..77fa1d29 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/SmsQueryFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/SmsQueryFragment.kt @@ -137,9 +137,9 @@ class SmsQueryFragment : BaseFragment() { //搜索框 binding!!.searchView.findViewById(com.xuexiang.xui.R.id.search_layout).visibility = View.GONE - binding!!.searchView.setVoiceSearch(true) + //binding!!.searchView.setVoiceSearch(true) binding!!.searchView.setEllipsize(true) - binding!!.searchView.setSuggestions(resources.getStringArray(R.array.query_suggestions)) + //binding!!.searchView.setSuggestions(resources.getStringArray(R.array.query_suggestions)) binding!!.searchView.setOnQueryTextListener(object : MaterialSearchView.OnQueryTextListener { override fun onQueryTextSubmit(query: String): Boolean { SnackbarUtils.Indefinite(view, String.format(getString(R.string.search_keyword), query)).info() diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/mail/EmailSender.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/mail/EmailSender.kt index 5ae83b39..2b76411f 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/mail/EmailSender.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/mail/EmailSender.kt @@ -12,7 +12,7 @@ import java.util.Properties import javax.mail.Authenticator import javax.mail.PasswordAuthentication -@Suppress("PrivatePropertyName", "unused", "DEPRECATION") +@Suppress("PrivatePropertyName", "DEPRECATION") class EmailSender( // SMTP参数 private val host: String, // SMTP服务器地址 diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/mail/PgpUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/mail/PgpUtils.kt index a595b16a..dcb8f7ca 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/mail/PgpUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/mail/PgpUtils.kt @@ -36,7 +36,7 @@ import javax.mail.internet.MimeUtility import javax.mail.util.ByteArrayDataSource -@Suppress("PrivatePropertyName", "unused") +@Suppress("PrivatePropertyName") class PgpUtils( private val properties: Properties, private val authenticator: Authenticator, diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/mail/SmimeUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/mail/SmimeUtils.kt index 9205f20f..b14328e0 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/mail/SmimeUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/mail/SmimeUtils.kt @@ -36,7 +36,7 @@ import javax.mail.internet.MimeMessage import javax.mail.internet.MimeMultipart import javax.mail.internet.MimeUtility -@Suppress("PrivatePropertyName", "unused") +@Suppress("PrivatePropertyName") class SmimeUtils( private val properties: Properties, private val authenticator: Authenticator, diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/task/TaskUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/task/TaskUtils.kt index 45a88b28..5aefb22a 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/task/TaskUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/task/TaskUtils.kt @@ -32,6 +32,7 @@ import com.idormy.sms.forwarder.utils.TASK_ACTION_RULE import com.idormy.sms.forwarder.utils.TASK_ACTION_SENDER import com.idormy.sms.forwarder.utils.TASK_ACTION_SENDSMS import com.idormy.sms.forwarder.utils.TASK_ACTION_SETTINGS +import com.idormy.sms.forwarder.utils.TASK_ACTION_TASK import com.idormy.sms.forwarder.utils.TASK_CONDITION_APP import com.idormy.sms.forwarder.utils.TASK_CONDITION_BATTERY import com.idormy.sms.forwarder.utils.TASK_CONDITION_BLUETOOTH @@ -77,6 +78,7 @@ class TaskUtils private constructor() { TASK_ACTION_SENDER -> R.drawable.auto_task_icon_sender TASK_ACTION_ALARM -> R.drawable.auto_task_icon_alarm TASK_ACTION_RESEND -> R.drawable.auto_task_icon_resend + TASK_ACTION_TASK -> R.drawable.auto_task_icon_task else -> R.drawable.auto_task_icon_custom_time } } @@ -106,6 +108,7 @@ class TaskUtils private constructor() { TASK_ACTION_SENDER -> R.drawable.auto_task_icon_sender_grey TASK_ACTION_ALARM -> R.drawable.auto_task_icon_alarm_grey TASK_ACTION_RESEND -> R.drawable.auto_task_icon_resend_grey + TASK_ACTION_TASK -> R.drawable.auto_task_icon_task_grey else -> R.drawable.auto_task_icon_custom_time_grey } } diff --git a/app/src/main/res/drawable-anydpi-v24/ic_forwarder.xml b/app/src/main/res/drawable-anydpi-v24/ic_forwarder.xml index 96eb261a..67b68aeb 100644 --- a/app/src/main/res/drawable-anydpi-v24/ic_forwarder.xml +++ b/app/src/main/res/drawable-anydpi-v24/ic_forwarder.xml @@ -1,8 +1,7 @@ true 0dp 0dp - 5dpS + 5dp 30dp 30dp @dimen/text_size_small @drawable/custom_radio_button + + + +