Skip to content

Commit 9fce3df

Browse files
author
Chenhe
committed
fix lint warnings
1 parent 729edfe commit 9fce3df

File tree

2 files changed

+82
-63
lines changed

2 files changed

+82
-63
lines changed

‎app/src/main/java/cc/chenhe/qqnotifyevo/preference/AdvancedFr.kt‎

Lines changed: 52 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,36 @@ class AdvancedFr : PreferenceFragmentCompat() {
2929
val newWrapper: String = new as? String ?: ""
3030
if (newWrapper.indexOf("\$n") == -1) {
3131
AlertDialog.Builder(requireContext())
32-
.setTitle(R.string.tip)
33-
.setMessage(R.string.pref_advanced_nickname_wrapper_invalid_message)
34-
.setPositiveButton(R.string.confirm, null)
35-
.show()
32+
.setTitle(R.string.tip)
33+
.setMessage(R.string.pref_advanced_nickname_wrapper_invalid_message)
34+
.setPositiveButton(R.string.confirm, null)
35+
.show()
3636
false
3737
} else {
3838
true
3939
}
4040
}
4141
}
42-
findPreference<ListPreference>("avatar_cache_period")!!.summaryProvider = AvatarCachePeriodSummaryProvider()
42+
findPreference<ListPreference>("avatar_cache_period")!!.summaryProvider =
43+
AvatarCachePeriodSummaryProvider()
4344
findPreference<SwitchPreferenceCompat>("log")!!.setOnPreferenceChangeListener { pref, new ->
4445
if (new as Boolean) {
4546
AlertDialog.Builder(requireContext())
46-
.setTitle(R.string.tip)
47-
.setMessage(R.string.pref_log_dialog_message)
48-
.setCancelable(false)
49-
.setPositiveButton(R.string.confirm) { _, _ ->
50-
(pref as SwitchPreferenceCompat).isChecked = true
51-
}
52-
.setNegativeButton(R.string.cancel, null)
53-
.show()
47+
.setTitle(R.string.tip)
48+
.setMessage(R.string.pref_log_dialog_message)
49+
.setCancelable(false)
50+
.setPositiveButton(R.string.confirm) { _, _ ->
51+
(pref as SwitchPreferenceCompat).isChecked = true
52+
}
53+
.setNegativeButton(R.string.cancel, null)
54+
.show()
5455
false
5556
} else {
5657
true
5758
}
5859
}
59-
findPreference<SwitchPreferenceCompat>("show_in_recent")!!.summaryProvider = ShowInRecentSummaryProvider()
60+
findPreference<SwitchPreferenceCompat>("show_in_recent")!!.summaryProvider =
61+
ShowInRecentSummaryProvider()
6062
deleteLog = findPreference("delete_log")!!
6163
refreshLogSize()
6264
}
@@ -67,21 +69,25 @@ class AdvancedFr : PreferenceFragmentCompat() {
6769
nevoMultiMsgTip(requireContext(), true)
6870
Toast.makeText(requireContext(), R.string.done, Toast.LENGTH_SHORT).show()
6971
if (NotificationManagerCompat.from(requireContext())
70-
.getNotificationChannel(NOTIFY_SELF_TIPS_CHANNEL_ID)?.importance ==
71-
NotificationManagerCompat.IMPORTANCE_NONE) {
72+
.getNotificationChannel(NOTIFY_SELF_TIPS_CHANNEL_ID)?.importance ==
73+
NotificationManagerCompat.IMPORTANCE_NONE
74+
) {
7275
AlertDialog.Builder(requireContext())
73-
.setTitle(R.string.tip)
74-
.setMessage(R.string.pref_reset_tips_notify_dialog)
75-
.setPositiveButton(R.string.confirm) { _, _ ->
76-
openTipsNotificationSetting()
77-
}
78-
.setNegativeButton(R.string.cancel, null)
79-
.show()
76+
.setTitle(R.string.tip)
77+
.setMessage(R.string.pref_reset_tips_notify_dialog)
78+
.setPositiveButton(R.string.confirm) { _, _ ->
79+
openTipsNotificationSetting()
80+
}
81+
.setNegativeButton(R.string.cancel, null)
82+
.show()
8083
}
8184
}
8285
"delete_avatar_cache" -> {
83-
AvatarManager.get(getAvatarDiskCacheDir(requireContext()), getAvatarCachePeriod(requireContext()))
84-
.clearCache()
86+
AvatarManager.get(
87+
getAvatarDiskCacheDir(requireContext()),
88+
getAvatarCachePeriod(requireContext())
89+
)
90+
.clearCache()
8591
Toast.makeText(requireContext(), R.string.done, Toast.LENGTH_SHORT).show()
8692
}
8793
"delete_nevo_channel" -> {
@@ -91,15 +97,15 @@ class AdvancedFr : PreferenceFragmentCompat() {
9197
}
9298
"delete_log" -> {
9399
AlertDialog.Builder(requireContext())
94-
.setTitle(R.string.tip)
95-
.setMessage(R.string.pref_delete_log_dialog_message)
96-
.setPositiveButton(R.string.confirm) { _, _ ->
97-
(requireContext().applicationContext as MyApplication).deleteLog()
98-
Toast.makeText(requireContext(), R.string.done, Toast.LENGTH_SHORT).show()
99-
refreshLogSize()
100-
}
101-
.setNegativeButton(R.string.cancel, null)
102-
.show()
100+
.setTitle(R.string.tip)
101+
.setMessage(R.string.pref_delete_log_dialog_message)
102+
.setPositiveButton(R.string.confirm) { _, _ ->
103+
(requireContext().applicationContext as MyApplication).deleteLog()
104+
Toast.makeText(requireContext(), R.string.done, Toast.LENGTH_SHORT).show()
105+
refreshLogSize()
106+
}
107+
.setNegativeButton(R.string.cancel, null)
108+
.show()
103109
}
104110
}
105111
return super.onPreferenceTreeClick(preference)
@@ -124,12 +130,16 @@ class AdvancedFr : PreferenceFragmentCompat() {
124130

125131
private fun refreshLogSize() {
126132
val files = getLogDir(requireContext()).listFiles { f -> f.isFile }
127-
val size = files?.sumByDouble { f -> f.length().toDouble() } ?: 0.0
128-
deleteLog.summary = getString(R.string.pref_delete_log_summary,
129-
files?.size ?: 0, describeFileSize(size.toLong()))
133+
val size = files?.sumOf { f -> f.length() } ?: 0
134+
deleteLog.summary = getString(
135+
R.string.pref_delete_log_summary,
136+
files?.size ?: 0,
137+
describeFileSize(size)
138+
)
130139
}
131140

132-
private inner class AvatarCachePeriodSummaryProvider : Preference.SummaryProvider<ListPreference> {
141+
private inner class AvatarCachePeriodSummaryProvider :
142+
Preference.SummaryProvider<ListPreference> {
133143
override fun provideSummary(preference: ListPreference): CharSequence {
134144
val period: Long = preference.value.toLong() / 1000
135145
val day = (period / (24 * 3600)).toInt()
@@ -158,9 +168,11 @@ class AdvancedFr : PreferenceFragmentCompat() {
158168
}
159169
}
160170

161-
private inner class ShowInRecentSummaryProvider : Preference.SummaryProvider<SwitchPreferenceCompat> {
171+
private inner class ShowInRecentSummaryProvider :
172+
Preference.SummaryProvider<SwitchPreferenceCompat> {
162173

163-
private val summaries = requireContext().resources.getStringArray(R.array.pref_show_in_recent_summaries)
174+
private val summaries =
175+
requireContext().resources.getStringArray(R.array.pref_show_in_recent_summaries)
164176

165177
override fun provideSummary(preference: SwitchPreferenceCompat): CharSequence {
166178
return if (preference.isChecked) summaries[0] else summaries[1]

‎app/src/main/java/cc/chenhe/qqnotifyevo/preference/MainPreferenceFr.kt‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ class MainPreferenceFr : PreferenceFragmentCompat() {
5151

5252
findPreference<Preference>("permission")?.fragment = PermissionFr::class.java.name
5353
findPreference<Preference>("advanced")?.fragment = AdvancedFr::class.java.name
54-
findPreference<Preference>("version_code")?.summary = getString(R.string.pref_version_code, getVersion(ctx))
54+
findPreference<Preference>("version_code")?.summary =
55+
getString(R.string.pref_version_code, getVersion(ctx))
5556
}
5657

5758
fun setMode(@Mode mode: Int) {
@@ -64,10 +65,14 @@ class MainPreferenceFr : PreferenceFragmentCompat() {
6465
lifecycleScope.launch { checkServiceRunning() }
6566

6667
model.mode.observe(viewLifecycleOwner) { mode ->
67-
notification.setTitle(if (mode == MODE_NEVO)
68-
R.string.pref_notify_nevo else R.string.pref_notify_system)
69-
notification.setSummary(if (mode == MODE_NEVO)
70-
R.string.pref_notify_nevo_summary else R.string.pref_notify_system_summary)
68+
notification.setTitle(
69+
if (mode == MODE_NEVO)
70+
R.string.pref_notify_nevo else R.string.pref_notify_system
71+
)
72+
notification.setSummary(
73+
if (mode == MODE_NEVO)
74+
R.string.pref_notify_nevo_summary else R.string.pref_notify_system_summary
75+
)
7176
}
7277

7378
model.serviceRunning.observe(viewLifecycleOwner) { serviceRunning ->
@@ -94,7 +99,8 @@ class MainPreferenceFr : PreferenceFragmentCompat() {
9499
override fun onPreferenceTreeClick(preference: Preference): Boolean {
95100
when (preference.key) {
96101
"system_notify_setting" -> {
97-
val pkgName = if (model.mode.value == MODE_NEVO) "com.oasisfeng.nevo" else requireContext().packageName
102+
val pkgName =
103+
if (model.mode.value == MODE_NEVO) "com.oasisfeng.nevo" else requireContext().packageName
98104
Intent().let {
99105
it.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
100106
it.putExtra(Settings.EXTRA_APP_PACKAGE, pkgName)
@@ -126,10 +132,10 @@ class MainPreferenceFr : PreferenceFragmentCompat() {
126132
}
127133
} catch (e: Exception) {
128134
AlertDialog.Builder(requireContext())
129-
.setTitle(R.string.tip)
130-
.setMessage(R.string.main_nevo_not_install)
131-
.setPositiveButton(R.string.confirm, null)
132-
.show()
135+
.setTitle(R.string.tip)
136+
.setMessage(R.string.main_nevo_not_install)
137+
.setPositiveButton(R.string.confirm, null)
138+
.show()
133139
}
134140
}
135141

@@ -146,22 +152,22 @@ class MainPreferenceFr : PreferenceFragmentCompat() {
146152

147153
private fun donate() {
148154
AlertDialog.Builder(requireContext())
149-
.setTitle(R.string.pref_donate_message)
150-
.setSingleChoiceItems(R.array.pref_donate_options, -1) { _, i ->
151-
startAliPay()
152-
}
153-
.show()
155+
.setTitle(R.string.pref_donate_message)
156+
.setSingleChoiceItems(R.array.pref_donate_options, -1) { _, _ ->
157+
startAliPay()
158+
}
159+
.show()
154160
}
155161

156162
private fun showInfo() {
157163
AlertDialog.Builder(requireContext())
158-
.setTitle(getString(R.string.about_dialog_title))
159-
.setMessage(getString(R.string.about_dialog_message))
160-
.setNeutralButton(R.string.about_dialog_github) { _, _ ->
161-
openUrl(GITHUB_URL)
162-
}
163-
.setPositiveButton(R.string.confirm, null)
164-
.show()
164+
.setTitle(getString(R.string.about_dialog_title))
165+
.setMessage(getString(R.string.about_dialog_message))
166+
.setNeutralButton(R.string.about_dialog_github) { _, _ ->
167+
openUrl(GITHUB_URL)
168+
}
169+
.setPositiveButton(R.string.confirm, null)
170+
.show()
165171
}
166172

167173
private fun startAliPay() {
@@ -170,7 +176,8 @@ class MainPreferenceFr : PreferenceFragmentCompat() {
170176
val intent = Intent(Intent.ACTION_VIEW, uri)
171177
startActivity(intent)
172178
} catch (e: java.lang.Exception) {
173-
Toast.makeText(requireContext(), R.string.pref_donate_alipay_error, Toast.LENGTH_SHORT).show()
179+
Toast.makeText(requireContext(), R.string.pref_donate_alipay_error, Toast.LENGTH_SHORT)
180+
.show()
174181
}
175182
}
176183

0 commit comments

Comments
 (0)