diff --git a/CHANGES.md b/CHANGES.md
index 3fa394c97b..a6bb5d6a29 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@ Changes in Riot.imX 0.91.4 (2020-XX-XX)
===================================================
Features ✨:
- -
+ - Re-activate Wellknown support with updated UI (#1614)
Improvements 🙌:
-
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
index eaf0a3cc78..28c2299faa 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
@@ -54,6 +54,7 @@ class LoginFragment @Inject constructor() : AbstractLoginFragment() {
private var passwordShown = false
private var isSignupMode = false
+
// Temporary patch for https://github.com/vector-im/riotX-android/issues/1410,
// waiting for https://github.com/matrix-org/synapse/issues/7576
private var isNumericOnlyUserIdForbidden = false
@@ -138,6 +139,7 @@ class LoginFragment @Inject constructor() : AbstractLoginFragment() {
loginServerIcon.isVisible = false
loginTitle.text = getString(R.string.login_signin_matrix_id_title)
loginNotice.text = getString(R.string.login_signin_matrix_id_notice)
+ loginPasswordNotice.isVisible = true
} else {
val resId = when (state.signMode) {
SignMode.Unknown -> error("developer error")
@@ -165,6 +167,7 @@ class LoginFragment @Inject constructor() : AbstractLoginFragment() {
loginNotice.text = getString(R.string.login_server_other_text)
}
}
+ loginPasswordNotice.isVisible = false
}
}
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index a35a60104d..8e7fc9e418 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -106,6 +106,16 @@
</FrameLayout>
+ <TextView
+ android:id="@+id/loginPasswordNotice"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="start"
+ android:text="@string/login_signin_matrix_id_password_notice"
+ android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+ android:visibility="gone"
+ tools:visibility="visible" />
+
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index f634456935..16465486a2 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -188,35 +188,23 @@
android:layout_marginTop="24dp"
android:text="@string/login_continue"
android:transitionName="loginSubmitTransition"
- app:layout_constraintBottom_toTopOf="@+id/loginServerIKnowMyIdNotice"
+ app:layout_constraintBottom_toTopOf="@+id/loginServerIKnowMyIdSubmit"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOther" />
- <TextView
- android:id="@+id/loginServerIKnowMyIdNotice"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="24dp"
- android:gravity="start"
- android:text="@string/login_connect_using_matrix_id_notice"
- android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
- android:visibility="gone"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/loginServerSubmit" />
-
<com.google.android.material.button.MaterialButton
android:id="@+id/loginServerIKnowMyIdSubmit"
style="@style/Style.Vector.Login.Button.Text"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:layout_marginTop="32dp"
+ android:layout_marginBottom="32dp"
android:text="@string/login_connect_using_matrix_id_submit"
- android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/loginServerIKnowMyIdNotice" />
+ app:layout_constraintTop_toBottomOf="@+id/loginServerSubmit" />
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index d8aad6f539..c3f0e9df41 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1995,10 +1995,11 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
</plurals>
<string name="login_connect_using_matrix_id_notice">Alternatively, if you already have an account and you know your Matrix identifier and your password, you can use this method:</string>
- <string name="login_connect_using_matrix_id_submit">Sign in with my Matrix identifier</string>
- <string name="login_signin_matrix_id_title">Sign in</string>
- <string name="login_signin_matrix_id_notice">Enter your identifier and your password</string>
- <string name="login_signin_matrix_id_hint">User identifier</string>
+ <string name="login_connect_using_matrix_id_submit">Sign in with Matrix ID</string>
+ <string name="login_signin_matrix_id_title">Sign in with Matrix ID</string>
+ <string name="login_signin_matrix_id_notice">If you set up an account on a homeserver, use your Matrix ID (e.g. @user:domain.com) and password below.</string>
+ <string name="login_signin_matrix_id_hint">Matrix ID</string>
+ <string name="login_signin_matrix_id_password_notice">If you don’t know your password, go back to reset it.</string>
<string name="login_signin_matrix_id_error_invalid_matrix_id">This is not a valid user identifier. Expected format: \'@user:homeserver.org\'</string>
<string name="autodiscover_well_known_error">Unable to find a valid homeserver. Please check your identifier</string>