Use `MtuCell` widget

2 files changed, 12 insertions, 54 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 89579263b2..826ebfceea 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
@@ -4,16 +4,13 @@ import android.os.Bundle
 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.MtuCell
 import net.mullvad.mullvadvpn.ui.widget.NavigateCell
 
-private const val MIN_MTU_VALUE = 1280
-private const val MAX_MTU_VALUE = 1420
-
 class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
-    private lateinit var wireguardMtuInput: CellInput
+    private lateinit var wireguardMtuInput: MtuCell
     private lateinit var titleController: CollapsibleTitleController
 
     override fun onSafelyCreateView(
@@ -27,19 +24,14 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
             parentActivity.onBackPressed()
         }
 
-        wireguardMtuInput =
-            CellInput(view.findViewById(R.id.wireguard_mtu_input), MIN_MTU_VALUE, MAX_MTU_VALUE)
-
-        wireguardMtuInput.onSubmit = { mtu ->
-            jobTracker.newBackgroundJob("updateMtu") {
-                daemon.setWireguardMtu(mtu)
+        wireguardMtuInput = view.findViewById<MtuCell>(R.id.wireguard_mtu).apply {
+            onSubmit = { mtu ->
+                jobTracker.newBackgroundJob("updateMtu") {
+                    daemon.setWireguardMtu(mtu)
+                }
             }
         }
 
-        view.findViewById<TextView>(R.id.wireguard_mtu_footer).apply {
-            text = context.getString(R.string.wireguard_mtu_footer, MIN_MTU_VALUE, MAX_MTU_VALUE)
-        }
-
         view.findViewById<NavigateCell>(R.id.wireguard_keys).apply {
             targetFragment = WireguardKeyFragment::class
         }
diff --git a/android/src/main/res/layout/advanced.xml b/android/src/main/res/layout/advanced.xml
index 79e1603fd3..f9640e956d 100644
--- a/android/src/main/res/layout/advanced.xml
+++ b/android/src/main/res/layout/advanced.xml
@@ -42,45 +42,11 @@
                           android:layout_marginLeft="24dp"
                           android:text="@string/settings_advanced"
                           style="@style/SettingsExpandedHeader" />
-                <LinearLayout android:layout_width="match_parent"
-                              android:layout_height="wrap_content"
-                              android:layout_marginTop="24dp"
-                              android:paddingHorizontal="16dp"
-                              android:background="@drawable/cell_button_background"
-                              android:gravity="center">
-                    <TextView android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:layout_weight="1"
-                              android:paddingHorizontal="8dp"
-                              android:paddingVertical="17dp"
-                              android:textColor="@color/white"
-                              android:textSize="20sp"
-                              android:textStyle="bold"
-                              android:text="@string/wireguard_mtu" />
-                    <EditText android:id="@+id/wireguard_mtu_input"
-                              android:layout_width="80dp"
-                              android:layout_height="34dp"
-                              android:layout_weight="0"
-                              android:paddingHorizontal="4dp"
-                              android:background="@drawable/cell_input_background"
-                              android:digits="0123456789"
-                              android:inputType="number"
-                              android:singleLine="true"
-                              android:imeOptions="flagNoPersonalizedLearning"
-                              android:textCursorDrawable="@drawable/cell_input_cursor"
-                              android:gravity="center"
-                              android:hint="@string/hint_default"
-                              android:textColorHint="@color/white80"
-                              android:textColor="@color/white"
-                              android:textSize="20sp" />
-                </LinearLayout>
-                <TextView android:id="@+id/wireguard_mtu_footer"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:paddingTop="8dp"
-                          android:paddingHorizontal="24dp"
-                          android:textColor="@color/white60"
-                          android:textSize="13sp" />
+                <net.mullvad.mullvadvpn.ui.widget.MtuCell android:id="@+id/wireguard_mtu"
+                                                          android:layout_width="match_parent"
+                                                          android:layout_height="wrap_content"
+                                                          android:layout_marginTop="24dp"
+                                                          mullvad:text="@string/wireguard_mtu" />
                 <net.mullvad.mullvadvpn.ui.widget.NavigateCell android:id="@+id/wireguard_keys"
                                                                android:layout_width="match_parent"
                                                                android:layout_height="wrap_content"