From b00aacbc41e902f0d10a78db7ec216ceec48e035 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sun, 29 Mar 2020 10:02:53 +0530
Subject: Fix tunnel editor theming

Also set textInputStyle in the base theme to avoid setting styles to all elements

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 ui/src/main/res/layout/tunnel_editor_fragment.xml | 7 -------
 ui/src/main/res/layout/tunnel_editor_peer.xml     | 5 -----
 2 files changed, 12 deletions(-)

(limited to 'ui/src/main/res/layout')

diff --git a/ui/src/main/res/layout/tunnel_editor_fragment.xml b/ui/src/main/res/layout/tunnel_editor_fragment.xml
index 4c6d8fd4..d87e1efb 100644
--- a/ui/src/main/res/layout/tunnel_editor_fragment.xml
+++ b/ui/src/main/res/layout/tunnel_editor_fragment.xml
@@ -68,7 +68,6 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/interface_name_layout"
-                            style="@style/TextInputLayoutBase"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
@@ -88,7 +87,6 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/private_key_text_layout"
-                            style="@style/TextInputLayoutBase"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
@@ -111,7 +109,6 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/public_key_label_layout"
-                            style="@style/TextInputLayoutBase"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
@@ -135,7 +132,6 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/addresses_label_layout"
-                            style="@style/TextInputLayoutBase"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
@@ -156,7 +152,6 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/listen_port_label_layout"
-                            style="@style/TextInputLayoutBase"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
@@ -178,7 +173,6 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/dns_servers_label_layout"
-                            style="@style/TextInputLayoutBase"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
@@ -199,7 +193,6 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/mtu_label_layout"
-                            style="@style/TextInputLayoutBase"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
diff --git a/ui/src/main/res/layout/tunnel_editor_peer.xml b/ui/src/main/res/layout/tunnel_editor_peer.xml
index 77e47d40..2f3b0689 100644
--- a/ui/src/main/res/layout/tunnel_editor_peer.xml
+++ b/ui/src/main/res/layout/tunnel_editor_peer.xml
@@ -58,7 +58,6 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/public_key_label_layout"
-                style="@style/TextInputLayoutBase"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
@@ -79,7 +78,6 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/pre_shared_key_label_layout"
-                style="@style/TextInputLayoutBase"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
@@ -99,7 +97,6 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/persistent_keepalive_label_layout"
-                style="@style/TextInputLayoutBase"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
@@ -119,7 +116,6 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/endpoint_label_layout"
-                style="@style/TextInputLayoutBase"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
@@ -138,7 +134,6 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/allowed_ips_label_layout"
-                style="@style/TextInputLayoutBase"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-- 
cgit v1.2.3