aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-09-15 13:29:53 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2020-09-15 18:53:30 +0200
commitd79cdb0d41f05f53c13a0b247f54c28f42609e2f (patch)
treec28ea457fd49356f409a0f49b48178df317e8165
parentwireguard-tools: bump to fix invalid free (diff)
downloadwireguard-android-d79cdb0d41f05f53c13a0b247f54c28f42609e2f.tar.xz
wireguard-android-d79cdb0d41f05f53c13a0b247f54c28f42609e2f.zip
MonkeyedTextInputEditText: au revoir
Remember to go back to using com.google.android.material when 1.3.0-alpha03 comes out. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--build.gradle3
-rw-r--r--ui/build.gradle2
-rw-r--r--ui/src/main/java/com/wireguard/android/widget/MonkeyedTextInputEditText.kt36
-rw-r--r--ui/src/main/res/layout/tunnel_editor_fragment.xml9
-rw-r--r--ui/src/main/res/layout/tunnel_editor_peer.xml12
5 files changed, 16 insertions, 46 deletions
diff --git a/build.gradle b/build.gradle
index e43199a..adfa53a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
jsr305Version = '3.0.2'
junitVersion = '4.13'
kotlinVersion = '1.4.10'
- materialComponentsVersion = '1.3.0-alpha02'
+ materialComponentsVersion = '22973ff10305397bfc72fed41684175fee8aeefb'
mavenPluginVersion = '2.1'
preferenceVersion = '1.1.1'
zxingEmbeddedVersion = '3.6.0'
@@ -39,6 +39,7 @@ allprojects {
repositories {
google()
jcenter()
+ maven { url 'https://jitpack.io' }
}
}
diff --git a/ui/build.gradle b/ui/build.gradle
index 0f258dc..936a95d 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -66,7 +66,7 @@ dependencies {
implementation "androidx.databinding:databinding-runtime:$agpVersion"
implementation "androidx.fragment:fragment-ktx:$fragmentVersion"
implementation "androidx.preference:preference-ktx:$preferenceVersion"
- implementation "com.google.android.material:material:$materialComponentsVersion"
+ implementation "com.github.material-components:material-components-android:$materialComponentsVersion"
implementation "com.journeyapps:zxing-android-embedded:$zxingEmbeddedVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
diff --git a/ui/src/main/java/com/wireguard/android/widget/MonkeyedTextInputEditText.kt b/ui/src/main/java/com/wireguard/android/widget/MonkeyedTextInputEditText.kt
deleted file mode 100644
index f9b81be..0000000
--- a/ui/src/main/java/com/wireguard/android/widget/MonkeyedTextInputEditText.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright © 2020 WireGuard LLC. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package com.wireguard.android.widget
-
-import android.content.Context
-import android.text.Editable
-import android.text.SpannableStringBuilder
-import android.util.AttributeSet
-import com.google.android.material.R
-import com.google.android.material.textfield.TextInputEditText
-import com.google.android.material.textfield.TextInputLayout
-
-/* Is this no longer necessary?
- * https://github.com/material-components/material-components-android/pull/1163 was merged via
- * https://github.com/material-components/material-components-android/commit/22973ff10305397bfc72fed41684175fee8aeefb .
- * It would seem like we can now set expandedHintEnabled=false
- * TODO: when a new material-components library comes out, switch to expandedHintEnabled=false.
- */
-class MonkeyedTextInputEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = R.attr.editTextStyle) : TextInputEditText(context, attrs, defStyleAttr) {
- @Override
- override fun getText(): Editable? {
- val text = super.getText()
- if (!text.isNullOrEmpty())
- return text
- /* We want this expression in TextInputLayout.java to be true if there's a hint set:
- * final boolean hasText = editText != null && !TextUtils.isEmpty(editText.getText());
- * But for everyone else it should return the real value, so we check the caller.
- */
- if (!hint.isNullOrEmpty() && Thread.currentThread().stackTrace[3].className == TextInputLayout::class.qualifiedName)
- return SpannableStringBuilder(hint)
- return text
- }
-}
diff --git a/ui/src/main/res/layout/tunnel_editor_fragment.xml b/ui/src/main/res/layout/tunnel_editor_fragment.xml
index dffc9d9..8b2ff2e 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 88c9044..76aaa1c 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