summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-03-17 22:57:49 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-03-18 12:20:55 +0000
commitdb6c0e830ea103d1e0270cde6528f53c29f70661 (patch)
treebe339c7094a2bad6d256ab90038e7dc09c916ed2 /android/src
parentcd86ddf0945ea3ade0f96eafc99adff2f3689be8 (diff)
downloadmullvadvpn-db6c0e830ea103d1e0270cde6528f53c29f70661.tar.xz
mullvadvpn-db6c0e830ea103d1e0270cde6528f53c29f70661.zip
Rename layout to `confirm_dns`
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt2
-rw-r--r--android/src/main/res/layout/confirm_dns.xml (renamed from android/src/main/res/layout/confirm_public_dns.xml)3
2 files changed, 3 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt
index 3741860d9d..ef2aa1667b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt
@@ -21,7 +21,7 @@ class ConfirmDnsDialogFragment @JvmOverloads constructor(
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
- val view = inflater.inflate(R.layout.confirm_public_dns, container, false)
+ val view = inflater.inflate(R.layout.confirm_dns, container, false)
view.findViewById<Button>(R.id.back_button).setOnClickListener {
activity?.onBackPressed()
diff --git a/android/src/main/res/layout/confirm_public_dns.xml b/android/src/main/res/layout/confirm_dns.xml
index 90b1dfda08..2471f2d533 100644
--- a/android/src/main/res/layout/confirm_public_dns.xml
+++ b/android/src/main/res/layout/confirm_dns.xml
@@ -13,7 +13,8 @@
android:layout_marginTop="8dp"
android:layout_gravity="center"
android:src="@drawable/icon_alert" />
- <TextView android:layout_width="wrap_content"
+ <TextView android:id="@+id/message"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:layout_marginTop="16dp"