Merge branch '0.7.x'

This commit is contained in:
Mikołaj Pich
2019-04-08 13:51:02 +02:00
6 changed files with 21 additions and 5 deletions

View File

@ -124,7 +124,8 @@
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/loginFormHost"
android:layout_width="match_parent"
android:layout_height="56dp" />
android:layout_height="56dp"
android:entries="@array/endpoints_keys" />
</LinearLayout>
<TextView
@ -144,6 +145,15 @@
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/loginFormHostLayout" />
<TextView
android:id="@+id/loginFormPrivacyPolicyLink"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="@string/login_privacy_policy"
app:layout_constraintStart_toStartOf="@+id/loginFormHostLayout"
app:layout_constraintTop_toBottomOf="@+id/loginFormHostLayout" />
<com.google.android.material.button.MaterialButton
android:id="@+id/loginFormSignIn"
style="@style/Widget.MaterialComponents.Button"