diff options
Diffstat (limited to 'ui/src/main/res/layout')
| -rw-r--r-- | ui/src/main/res/layout/tunnel_editor_fragment.xml | 9 | ||||
| -rw-r--r-- | ui/src/main/res/layout/tunnel_editor_peer.xml | 12 |
2 files changed, 13 insertions, 8 deletions
diff --git a/ui/src/main/res/layout/tunnel_editor_fragment.xml b/ui/src/main/res/layout/tunnel_editor_fragment.xml index dffc9d97..8b2ff2ec 100644 --- a/ui/src/main/res/layout/tunnel_editor_fragment.xml +++ b/ui/src/main/res/layout/tunnel_editor_fragment.xml @@ -111,11 +111,12 @@ android:layout_height="wrap_content" android:layout_margin="4dp" android:hint="@string/public_key" + app:expandedHintEnabled="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/private_key_text_layout"> - <com.wireguard.android.widget.MonkeyedTextInputEditText + <com.google.android.material.textfield.TextInputEditText android:id="@+id/public_key_text" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -154,12 +155,13 @@ android:layout_height="wrap_content" android:layout_margin="4dp" android:hint="@string/listen_port" + app:expandedHintEnabled="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_weight="0.3" app:layout_constraintStart_toEndOf="@id/addresses_label_layout" app:layout_constraintTop_toBottomOf="@id/public_key_label_layout"> - <com.wireguard.android.widget.MonkeyedTextInputEditText + <com.google.android.material.textfield.TextInputEditText android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/hint_random" @@ -195,12 +197,13 @@ android:layout_height="wrap_content" android:layout_margin="4dp" android:hint="@string/mtu" + app:expandedHintEnabled="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_weight="0.3" app:layout_constraintStart_toEndOf="@id/dns_servers_label_layout" app:layout_constraintTop_toBottomOf="@id/addresses_label_layout"> - <com.wireguard.android.widget.MonkeyedTextInputEditText + <com.google.android.material.textfield.TextInputEditText android:id="@+id/mtu_text" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/ui/src/main/res/layout/tunnel_editor_peer.xml b/ui/src/main/res/layout/tunnel_editor_peer.xml index 88c9044b..76aaa1cd 100644 --- a/ui/src/main/res/layout/tunnel_editor_peer.xml +++ b/ui/src/main/res/layout/tunnel_editor_peer.xml @@ -84,11 +84,12 @@ android:layout_height="wrap_content" android:layout_margin="4dp" android:hint="@string/pre_shared_key" + app:expandedHintEnabled="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/public_key_label_layout"> - <com.wireguard.android.widget.MonkeyedTextInputEditText + <com.google.android.material.textfield.TextInputEditText android:id="@+id/pre_shared_key_text" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -106,18 +107,19 @@ android:layout_height="wrap_content" android:layout_margin="4dp" android:hint="@string/persistent_keepalive" - app:suffixText="@{@plurals/persistent_keepalive_seconds_suffix(BindingAdapters.tryParseInt(item.persistentKeepalive))}" + app:expandedHintEnabled="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/pre_shared_key_label_layout"> + app:layout_constraintTop_toBottomOf="@id/pre_shared_key_label_layout" + app:suffixText="@{@plurals/persistent_keepalive_seconds_suffix(BindingAdapters.tryParseInt(item.persistentKeepalive))}"> - <com.wireguard.android.widget.MonkeyedTextInputEditText + <com.google.android.material.textfield.TextInputEditText android:id="@+id/persistent_keepalive_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/hint_optional_discouraged" android:inputType="number" - android:text="@={item.persistentKeepalive}"/> + android:text="@={item.persistentKeepalive}" /> </com.google.android.material.textfield.TextInputLayout> <com.google.android.material.textfield.TextInputLayout |