Add row when adding a new custom DNS server

2 files changed, 23 insertions, 2 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/AddCustomDnsServerHolder.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/AddCustomDnsServerHolder.kt
index 5ea8f49e96..1d0f940d4b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/AddCustomDnsServerHolder.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/AddCustomDnsServerHolder.kt
@@ -1,5 +1,16 @@
 package net.mullvad.mullvadvpn.ui.customdns
 
 import android.view.View
+import net.mullvad.mullvadvpn.R
 
-class AddCustomDnsServerHolder(view: View) : CustomDnsItemHolder(view)
+class AddCustomDnsServerHolder(view: View, adapter: CustomDnsAdapter) : CustomDnsItemHolder(view) {
+    init {
+        view.findViewById<View>(R.id.add).setOnClickListener {
+            adapter.newDnsServer()
+        }
+
+        view.findViewById<View>(R.id.click_area).setOnClickListener {
+            adapter.newDnsServer()
+        }
+    }
+}
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt
index 7a48b2485b..db89555a8e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt
@@ -68,7 +68,7 @@ class CustomDnsAdapter(val customDns: CustomDns) : Adapter<CustomDnsItemHolder>(
             }
             ViewTypes.ADD_SERVER -> {
                 val view = inflater.inflate(R.layout.add_custom_dns_server, parentView, false)
-                return AddCustomDnsServerHolder(view)
+                return AddCustomDnsServerHolder(view, this)
             }
             ViewTypes.EDIT_SERVER -> {
                 val view = inflater.inflate(R.layout.edit_custom_dns_server, parentView, false)
@@ -82,4 +82,14 @@ class CustomDnsAdapter(val customDns: CustomDns) : Adapter<CustomDnsItemHolder>(
     fun onDestroy() {
         customDns.onEnabledChanged.unsubscribe(this)
     }
+
+    fun newDnsServer() {
+        if (enabled) {
+            val count = getItemCount()
+
+            enteringNewServer = true
+
+            notifyItemChanged(count - 2)
+        }
+    }
 }