From 1808c4a6b38ca106226b1a2ab6e0c6249d14b71e Mon Sep 17 00:00:00 2001 From: septs Date: Sun, 1 Dec 2024 12:08:53 +0800 Subject: [PATCH 1/2] chore: simplify settings intent --- .../im/angry/openeuicc/ui/SettingsFragment.kt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt index 9c071bd..878984f 100644 --- a/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt +++ b/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt @@ -46,17 +46,13 @@ class SettingsFragment: PreferenceFragmentCompat() { setOnPreferenceClickListener(this@SettingsFragment::onAppVersionClicked) } - findPreference("pref_info_source_code") - ?.setOnPreferenceClickListener { - startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(it.summary.toString()))) - true - } + findPreference("pref_info_source_code")?.apply { + intent = Intent(Intent.ACTION_VIEW, Uri.parse(summary.toString())) + } - findPreference("pref_advanced_logs") - ?.setOnPreferenceClickListener { - startActivity(Intent(requireContext(), LogsActivity::class.java)) - true - } + findPreference("pref_advanced_logs")?.apply { + intent = Intent(requireContext(), LogsActivity::class.java) + } findPreference("pref_notifications_download") ?.bindBooleanFlow(preferenceRepository.notificationDownloadFlow, PreferenceKeys.NOTIFICATION_DOWNLOAD) -- 2.45.3 From 4c9d07498b43d03f98ad474d03e1ae4c2c286c42 Mon Sep 17 00:00:00 2001 From: septs Date: Sun, 1 Dec 2024 12:20:01 +0800 Subject: [PATCH 2/2] chore: simplify settings intent --- .../java/im/angry/openeuicc/ui/SettingsFragment.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt index 878984f..d2ae9d6 100644 --- a/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt +++ b/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt @@ -38,13 +38,12 @@ class SettingsFragment: PreferenceFragmentCompat() { }.collect() } - findPreference("pref_info_app_version") - ?.apply { - summary = requireContext().selfAppVersion + findPreference("pref_info_app_version")?.apply { + summary = requireContext().selfAppVersion - // Enable developer options when this is clicked for 7 times - setOnPreferenceClickListener(this@SettingsFragment::onAppVersionClicked) - } + // Enable developer options when this is clicked for 7 times + setOnPreferenceClickListener(::onAppVersionClicked) + } findPreference("pref_info_source_code")?.apply { intent = Intent(Intent.ACTION_VIEW, Uri.parse(summary.toString())) -- 2.45.3