Use `onClickListener` property

2 files changed, 9 insertions, 7 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
index c5e6737c2f..7528045921 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.model.Settings
+import net.mullvad.mullvadvpn.ui.widget.Cell
 
 private const val MIN_MTU_VALUE = 1280
 private const val MAX_MTU_VALUE = 1420
@@ -40,11 +41,11 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
             text = context.getString(R.string.wireguard_mtu_footer, MIN_MTU_VALUE, MAX_MTU_VALUE)
         }
 
-        view.findViewById<View>(R.id.wireguard_keys).setOnClickListener {
+        view.findViewById<Cell>(R.id.wireguard_keys).onClickListener = {
             openSubFragment(WireguardKeyFragment())
         }
 
-        view.findViewById<View>(R.id.split_tunnelling).setOnClickListener {
+        view.findViewById<Cell>(R.id.split_tunnelling).onClickListener = {
             openSubFragment(SplitTunnellingFragment())
         }
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
index edc8bf518a..b2b50894b7 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
@@ -13,6 +13,7 @@ import android.widget.TextView
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoCache
 import net.mullvad.mullvadvpn.service.AccountCache
+import net.mullvad.mullvadvpn.ui.widget.Cell
 
 class SettingsFragment : ServiceAwareFragment() {
     private lateinit var accountMenu: View
@@ -64,14 +65,14 @@ class SettingsFragment : ServiceAwareFragment() {
             }
         }
 
-        preferencesMenu = view.findViewById<View>(R.id.preferences).apply {
-            setOnClickListener {
+        preferencesMenu = view.findViewById<Cell>(R.id.preferences).apply {
+            onClickListener = {
                 openSubFragment(PreferencesFragment())
             }
         }
 
-        advancedMenu = view.findViewById<View>(R.id.advanced).apply {
-            setOnClickListener {
+        advancedMenu = view.findViewById<Cell>(R.id.advanced).apply {
+            onClickListener = {
                 openSubFragment(AdvancedFragment())
             }
         }
@@ -80,7 +81,7 @@ class SettingsFragment : ServiceAwareFragment() {
             openLink(R.string.download_url)
         }
 
-        view.findViewById<View>(R.id.report_a_problem).setOnClickListener {
+        view.findViewById<Cell>(R.id.report_a_problem).onClickListener = {
             openSubFragment(ProblemReportFragment())
         }