Skip to content

Commit

Permalink
fix lint warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
Chenhe committed Sep 22, 2021
1 parent 729edfe commit 9fce3df
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 63 deletions.
92 changes: 52 additions & 40 deletions app/src/main/java/cc/chenhe/qqnotifyevo/preference/AdvancedFr.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,36 @@ class AdvancedFr : PreferenceFragmentCompat() {
val newWrapper: String = new as? String ?: ""
if (newWrapper.indexOf("\$n") == -1) {
AlertDialog.Builder(requireContext())
.setTitle(R.string.tip)
.setMessage(R.string.pref_advanced_nickname_wrapper_invalid_message)
.setPositiveButton(R.string.confirm, null)
.show()
.setTitle(R.string.tip)
.setMessage(R.string.pref_advanced_nickname_wrapper_invalid_message)
.setPositiveButton(R.string.confirm, null)
.show()
false
} else {
true
}
}
}
findPreference<ListPreference>("avatar_cache_period")!!.summaryProvider = AvatarCachePeriodSummaryProvider()
findPreference<ListPreference>("avatar_cache_period")!!.summaryProvider =
AvatarCachePeriodSummaryProvider()
findPreference<SwitchPreferenceCompat>("log")!!.setOnPreferenceChangeListener { pref, new ->
if (new as Boolean) {
AlertDialog.Builder(requireContext())
.setTitle(R.string.tip)
.setMessage(R.string.pref_log_dialog_message)
.setCancelable(false)
.setPositiveButton(R.string.confirm) { _, _ ->
(pref as SwitchPreferenceCompat).isChecked = true
}
.setNegativeButton(R.string.cancel, null)
.show()
.setTitle(R.string.tip)
.setMessage(R.string.pref_log_dialog_message)
.setCancelable(false)
.setPositiveButton(R.string.confirm) { _, _ ->
(pref as SwitchPreferenceCompat).isChecked = true
}
.setNegativeButton(R.string.cancel, null)
.show()
false
} else {
true
}
}
findPreference<SwitchPreferenceCompat>("show_in_recent")!!.summaryProvider = ShowInRecentSummaryProvider()
findPreference<SwitchPreferenceCompat>("show_in_recent")!!.summaryProvider =
ShowInRecentSummaryProvider()
deleteLog = findPreference("delete_log")!!
refreshLogSize()
}
Expand All @@ -67,21 +69,25 @@ class AdvancedFr : PreferenceFragmentCompat() {
nevoMultiMsgTip(requireContext(), true)
Toast.makeText(requireContext(), R.string.done, Toast.LENGTH_SHORT).show()
if (NotificationManagerCompat.from(requireContext())
.getNotificationChannel(NOTIFY_SELF_TIPS_CHANNEL_ID)?.importance ==
NotificationManagerCompat.IMPORTANCE_NONE) {
.getNotificationChannel(NOTIFY_SELF_TIPS_CHANNEL_ID)?.importance ==
NotificationManagerCompat.IMPORTANCE_NONE
) {
AlertDialog.Builder(requireContext())
.setTitle(R.string.tip)
.setMessage(R.string.pref_reset_tips_notify_dialog)
.setPositiveButton(R.string.confirm) { _, _ ->
openTipsNotificationSetting()
}
.setNegativeButton(R.string.cancel, null)
.show()
.setTitle(R.string.tip)
.setMessage(R.string.pref_reset_tips_notify_dialog)
.setPositiveButton(R.string.confirm) { _, _ ->
openTipsNotificationSetting()
}
.setNegativeButton(R.string.cancel, null)
.show()
}
}
"delete_avatar_cache" -> {
AvatarManager.get(getAvatarDiskCacheDir(requireContext()), getAvatarCachePeriod(requireContext()))
.clearCache()
AvatarManager.get(
getAvatarDiskCacheDir(requireContext()),
getAvatarCachePeriod(requireContext())
)
.clearCache()
Toast.makeText(requireContext(), R.string.done, Toast.LENGTH_SHORT).show()
}
"delete_nevo_channel" -> {
Expand All @@ -91,15 +97,15 @@ class AdvancedFr : PreferenceFragmentCompat() {
}
"delete_log" -> {
AlertDialog.Builder(requireContext())
.setTitle(R.string.tip)
.setMessage(R.string.pref_delete_log_dialog_message)
.setPositiveButton(R.string.confirm) { _, _ ->
(requireContext().applicationContext as MyApplication).deleteLog()
Toast.makeText(requireContext(), R.string.done, Toast.LENGTH_SHORT).show()
refreshLogSize()
}
.setNegativeButton(R.string.cancel, null)
.show()
.setTitle(R.string.tip)
.setMessage(R.string.pref_delete_log_dialog_message)
.setPositiveButton(R.string.confirm) { _, _ ->
(requireContext().applicationContext as MyApplication).deleteLog()
Toast.makeText(requireContext(), R.string.done, Toast.LENGTH_SHORT).show()
refreshLogSize()
}
.setNegativeButton(R.string.cancel, null)
.show()
}
}
return super.onPreferenceTreeClick(preference)
Expand All @@ -124,12 +130,16 @@ class AdvancedFr : PreferenceFragmentCompat() {

private fun refreshLogSize() {
val files = getLogDir(requireContext()).listFiles { f -> f.isFile }
val size = files?.sumByDouble { f -> f.length().toDouble() } ?: 0.0
deleteLog.summary = getString(R.string.pref_delete_log_summary,
files?.size ?: 0, describeFileSize(size.toLong()))
val size = files?.sumOf { f -> f.length() } ?: 0
deleteLog.summary = getString(
R.string.pref_delete_log_summary,
files?.size ?: 0,
describeFileSize(size)
)
}

private inner class AvatarCachePeriodSummaryProvider : Preference.SummaryProvider<ListPreference> {
private inner class AvatarCachePeriodSummaryProvider :
Preference.SummaryProvider<ListPreference> {
override fun provideSummary(preference: ListPreference): CharSequence {
val period: Long = preference.value.toLong() / 1000
val day = (period / (24 * 3600)).toInt()
Expand Down Expand Up @@ -158,9 +168,11 @@ class AdvancedFr : PreferenceFragmentCompat() {
}
}

private inner class ShowInRecentSummaryProvider : Preference.SummaryProvider<SwitchPreferenceCompat> {
private inner class ShowInRecentSummaryProvider :
Preference.SummaryProvider<SwitchPreferenceCompat> {

private val summaries = requireContext().resources.getStringArray(R.array.pref_show_in_recent_summaries)
private val summaries =
requireContext().resources.getStringArray(R.array.pref_show_in_recent_summaries)

override fun provideSummary(preference: SwitchPreferenceCompat): CharSequence {
return if (preference.isChecked) summaries[0] else summaries[1]
Expand Down
53 changes: 30 additions & 23 deletions app/src/main/java/cc/chenhe/qqnotifyevo/preference/MainPreferenceFr.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ class MainPreferenceFr : PreferenceFragmentCompat() {

findPreference<Preference>("permission")?.fragment = PermissionFr::class.java.name
findPreference<Preference>("advanced")?.fragment = AdvancedFr::class.java.name
findPreference<Preference>("version_code")?.summary = getString(R.string.pref_version_code, getVersion(ctx))
findPreference<Preference>("version_code")?.summary =
getString(R.string.pref_version_code, getVersion(ctx))
}

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

model.mode.observe(viewLifecycleOwner) { mode ->
notification.setTitle(if (mode == MODE_NEVO)
R.string.pref_notify_nevo else R.string.pref_notify_system)
notification.setSummary(if (mode == MODE_NEVO)
R.string.pref_notify_nevo_summary else R.string.pref_notify_system_summary)
notification.setTitle(
if (mode == MODE_NEVO)
R.string.pref_notify_nevo else R.string.pref_notify_system
)
notification.setSummary(
if (mode == MODE_NEVO)
R.string.pref_notify_nevo_summary else R.string.pref_notify_system_summary
)
}

model.serviceRunning.observe(viewLifecycleOwner) { serviceRunning ->
Expand All @@ -94,7 +99,8 @@ class MainPreferenceFr : PreferenceFragmentCompat() {
override fun onPreferenceTreeClick(preference: Preference): Boolean {
when (preference.key) {
"system_notify_setting" -> {
val pkgName = if (model.mode.value == MODE_NEVO) "com.oasisfeng.nevo" else requireContext().packageName
val pkgName =
if (model.mode.value == MODE_NEVO) "com.oasisfeng.nevo" else requireContext().packageName
Intent().let {
it.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
it.putExtra(Settings.EXTRA_APP_PACKAGE, pkgName)
Expand Down Expand Up @@ -126,10 +132,10 @@ class MainPreferenceFr : PreferenceFragmentCompat() {
}
} catch (e: Exception) {
AlertDialog.Builder(requireContext())
.setTitle(R.string.tip)
.setMessage(R.string.main_nevo_not_install)
.setPositiveButton(R.string.confirm, null)
.show()
.setTitle(R.string.tip)
.setMessage(R.string.main_nevo_not_install)
.setPositiveButton(R.string.confirm, null)
.show()
}
}

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

private fun donate() {
AlertDialog.Builder(requireContext())
.setTitle(R.string.pref_donate_message)
.setSingleChoiceItems(R.array.pref_donate_options, -1) { _, i ->
startAliPay()
}
.show()
.setTitle(R.string.pref_donate_message)
.setSingleChoiceItems(R.array.pref_donate_options, -1) { _, _ ->
startAliPay()
}
.show()
}

private fun showInfo() {
AlertDialog.Builder(requireContext())
.setTitle(getString(R.string.about_dialog_title))
.setMessage(getString(R.string.about_dialog_message))
.setNeutralButton(R.string.about_dialog_github) { _, _ ->
openUrl(GITHUB_URL)
}
.setPositiveButton(R.string.confirm, null)
.show()
.setTitle(getString(R.string.about_dialog_title))
.setMessage(getString(R.string.about_dialog_message))
.setNeutralButton(R.string.about_dialog_github) { _, _ ->
openUrl(GITHUB_URL)
}
.setPositiveButton(R.string.confirm, null)
.show()
}

private fun startAliPay() {
Expand All @@ -170,7 +176,8 @@ class MainPreferenceFr : PreferenceFragmentCompat() {
val intent = Intent(Intent.ACTION_VIEW, uri)
startActivity(intent)
} catch (e: java.lang.Exception) {
Toast.makeText(requireContext(), R.string.pref_donate_alipay_error, Toast.LENGTH_SHORT).show()
Toast.makeText(requireContext(), R.string.pref_donate_alipay_error, Toast.LENGTH_SHORT)
.show()
}
}

Expand Down

0 comments on commit 9fce3df

Please sign in to comment.