Configure `NavigateCell` target fragments

2 files changed, 13 insertions, 49 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 7528045921..89579263b2 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
@@ -1,14 +1,13 @@
 package net.mullvad.mullvadvpn.ui
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 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
+import net.mullvad.mullvadvpn.ui.widget.NavigateCell
 
 private const val MIN_MTU_VALUE = 1280
 private const val MAX_MTU_VALUE = 1420
@@ -41,12 +40,12 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
             text = context.getString(R.string.wireguard_mtu_footer, MIN_MTU_VALUE, MAX_MTU_VALUE)
         }
 
-        view.findViewById<Cell>(R.id.wireguard_keys).onClickListener = {
-            openSubFragment(WireguardKeyFragment())
+        view.findViewById<NavigateCell>(R.id.wireguard_keys).apply {
+            targetFragment = WireguardKeyFragment::class
         }
 
-        view.findViewById<Cell>(R.id.split_tunnelling).onClickListener = {
-            openSubFragment(SplitTunnellingFragment())
+        view.findViewById<NavigateCell>(R.id.split_tunnelling).apply {
+            targetFragment = SplitTunnellingFragment::class
         }
 
         settingsListener.subscribe(this) { settings ->
@@ -70,18 +69,4 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
         titleController.onDestroy()
         settingsListener.unsubscribe(this)
     }
-
-    private fun openSubFragment(fragment: Fragment) {
-        fragmentManager?.beginTransaction()?.apply {
-            setCustomAnimations(
-                R.anim.fragment_enter_from_right,
-                R.anim.fragment_half_exit_to_left,
-                R.anim.fragment_half_enter_from_left,
-                R.anim.fragment_exit_to_right
-            )
-            replace(R.id.main_fragment, fragment)
-            addToBackStack(null)
-            commit()
-        }
-    }
 }
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 1ddd72a57a..970b3b7639 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
@@ -3,7 +3,6 @@ package net.mullvad.mullvadvpn.ui
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -14,7 +13,7 @@ import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoCache
 import net.mullvad.mullvadvpn.service.AccountCache
 import net.mullvad.mullvadvpn.ui.widget.AccountCell
-import net.mullvad.mullvadvpn.ui.widget.Cell
+import net.mullvad.mullvadvpn.ui.widget.NavigateCell
 
 class SettingsFragment : ServiceAwareFragment() {
     private lateinit var accountMenu: AccountCell
@@ -60,29 +59,23 @@ class SettingsFragment : ServiceAwareFragment() {
         }
 
         accountMenu = view.findViewById<AccountCell>(R.id.account).apply {
-            onClickListener = {
-                openSubFragment(AccountFragment())
-            }
+            targetFragment = AccountFragment::class
         }
 
-        preferencesMenu = view.findViewById<Cell>(R.id.preferences).apply {
-            onClickListener = {
-                openSubFragment(PreferencesFragment())
-            }
+        preferencesMenu = view.findViewById<NavigateCell>(R.id.preferences).apply {
+            targetFragment = PreferencesFragment::class
         }
 
-        advancedMenu = view.findViewById<Cell>(R.id.advanced).apply {
-            onClickListener = {
-                openSubFragment(AdvancedFragment())
-            }
+        advancedMenu = view.findViewById<NavigateCell>(R.id.advanced).apply {
+            targetFragment = AdvancedFragment::class
         }
 
         view.findViewById<View>(R.id.app_version).setOnClickListener {
             openLink(R.string.download_url)
         }
 
-        view.findViewById<Cell>(R.id.report_a_problem).onClickListener = {
-            openSubFragment(ProblemReportFragment())
+        view.findViewById<NavigateCell>(R.id.report_a_problem).apply {
+            targetFragment = ProblemReportFragment::class
         }
 
         appVersionWarning = view.findViewById(R.id.app_version_warning)
@@ -141,20 +134,6 @@ class SettingsFragment : ServiceAwareFragment() {
         }
     }
 
-    private fun openSubFragment(fragment: Fragment) {
-        fragmentManager?.beginTransaction()?.apply {
-            setCustomAnimations(
-                R.anim.fragment_enter_from_right,
-                R.anim.fragment_half_exit_to_left,
-                R.anim.fragment_half_enter_from_left,
-                R.anim.fragment_exit_to_right
-            )
-            replace(R.id.main_fragment, fragment)
-            addToBackStack(null)
-            commit()
-        }
-    }
-
     private fun openLink(urlResourceId: Int) {
         val intent = Intent(Intent.ACTION_VIEW, Uri.parse(parentActivity.getString(urlResourceId)))