From 5303ecdfa25802a95733a7ae6d03eb8beda06a31 Mon Sep 17 00:00:00 2001 From: septs Date: Mon, 2 Dec 2024 09:53:49 +0800 Subject: [PATCH 1/3] chore: simplify intent --- .../openeuicc/ui/EuiccManagementFragment.kt | 21 +++++++------------ .../im/angry/openeuicc/ui/MainActivity.kt | 7 +++---- .../openeuicc/ui/UnprivilegedMainActivity.kt | 11 ++-------- 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt index b7462e2..0dac684 100644 --- a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt +++ b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt @@ -135,26 +135,19 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener, override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { super.onCreateOptionsMenu(menu, inflater) inflater.inflate(R.menu.fragment_euicc, menu) + menu.findItem(R.id.show_notifications).intent = + Intent(requireContext(), NotificationsActivity::class.java) + menu.findItem(R.id.euicc_info).intent = + Intent(requireContext(), EuiccInfoActivity::class.java) } override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) { - R.id.show_notifications -> { + R.id.show_notifications, R.id.euicc_info -> { if (logicalSlotId != -1) { - Intent(requireContext(), NotificationsActivity::class.java).apply { + startActivity(item.intent!!.cloneFilter().apply { putExtra("logicalSlotId", logicalSlotId) - startActivity(this) - } - } - true - } - - R.id.euicc_info -> { - if (logicalSlotId != -1) { - Intent(requireContext(), EuiccInfoActivity::class.java).apply { - putExtra("logicalSlotId", logicalSlotId) - startActivity(this) - } + }) } true } diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt b/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt index 74f2147..79aa667 100644 --- a/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt +++ b/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt @@ -102,16 +102,15 @@ open class MainActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker { } override fun onCreateOptionsMenu(menu: Menu): Boolean { + super.onCreateOptionsMenu(menu) menuInflater.inflate(R.menu.activity_main, menu) + menu.findItem(R.id.settings).intent = + Intent(this, SettingsActivity::class.java) return true } override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) { - R.id.settings -> { - startActivity(Intent(this, SettingsActivity::class.java)); - true - } R.id.reload -> { refresh() true diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt index 1ed0cce..db2ae03 100644 --- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt +++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt @@ -9,15 +9,8 @@ class UnprivilegedMainActivity: MainActivity() { override fun onCreateOptionsMenu(menu: Menu): Boolean { super.onCreateOptionsMenu(menu) menuInflater.inflate(R.menu.activity_main_unprivileged, menu) + menu.findItem(R.id.compatibility_check).intent = + Intent(this, CompatibilityCheckActivity::class.java) return true } - - override fun onOptionsItemSelected(item: MenuItem): Boolean = - when (item.itemId) { - R.id.compatibility_check -> { - startActivity(Intent(this, CompatibilityCheckActivity::class.java)) - true - } - else -> super.onOptionsItemSelected(item) - } } \ No newline at end of file -- 2.45.3 From c633e3d3cec4e0a20b8498e0b35aa8133d51fd4c Mon Sep 17 00:00:00 2001 From: septs Date: Mon, 2 Dec 2024 10:23:14 +0800 Subject: [PATCH 2/3] revert: EuiccManagementFragment --- .../openeuicc/ui/EuiccManagementFragment.kt | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt index 0dac684..b7462e2 100644 --- a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt +++ b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt @@ -135,19 +135,26 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener, override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { super.onCreateOptionsMenu(menu, inflater) inflater.inflate(R.menu.fragment_euicc, menu) - menu.findItem(R.id.show_notifications).intent = - Intent(requireContext(), NotificationsActivity::class.java) - menu.findItem(R.id.euicc_info).intent = - Intent(requireContext(), EuiccInfoActivity::class.java) } override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) { - R.id.show_notifications, R.id.euicc_info -> { + R.id.show_notifications -> { if (logicalSlotId != -1) { - startActivity(item.intent!!.cloneFilter().apply { + Intent(requireContext(), NotificationsActivity::class.java).apply { putExtra("logicalSlotId", logicalSlotId) - }) + startActivity(this) + } + } + true + } + + R.id.euicc_info -> { + if (logicalSlotId != -1) { + Intent(requireContext(), EuiccInfoActivity::class.java).apply { + putExtra("logicalSlotId", logicalSlotId) + startActivity(this) + } } true } -- 2.45.3 From cb1c2f9c42142e227c06e1fe2d563c3fe624d375 Mon Sep 17 00:00:00 2001 From: septs Date: Mon, 2 Dec 2024 10:25:43 +0800 Subject: [PATCH 3/3] revert: MainActivity --- .../src/main/java/im/angry/openeuicc/ui/MainActivity.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt b/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt index 79aa667..74f2147 100644 --- a/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt +++ b/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt @@ -102,15 +102,16 @@ open class MainActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker { } override fun onCreateOptionsMenu(menu: Menu): Boolean { - super.onCreateOptionsMenu(menu) menuInflater.inflate(R.menu.activity_main, menu) - menu.findItem(R.id.settings).intent = - Intent(this, SettingsActivity::class.java) return true } override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) { + R.id.settings -> { + startActivity(Intent(this, SettingsActivity::class.java)); + true + } R.id.reload -> { refresh() true -- 2.45.3