Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Improves 2FA link in login activity #348

This commit is contained in:
stom79 2018-03-14 16:07:16 +01:00
parent 7fe5a7c29e
commit 31f6baf44c
2 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/res/layout-sw600dp/activity_login.xml
View File

@ -56,6 +56,21 @@
android:hint="@string/instance_example"
/>
</android.support.design.widget.TextInputLayout>
<TextView
android:id="@+id/login_two_step"
android:textAllCaps="false"
android:gravity="center"
android:drawablePadding="10dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:visibility="gone"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorAccent"
android:text="@string/two_factor_authentification" />
<EditText
android:id="@+id/login_uid"
android:layout_width="300dp"
@ -98,18 +113,7 @@
android:layout_height="wrap_content"
android:textSize="20sp"
android:text="@string/login" />
<TextView
android:id="@+id/login_two_step"
android:textAllCaps="false"
android:gravity="center"
android:layout_marginTop="20dp"
android:drawablePadding="10dp"
android:padding="20dp"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorAccent"
android:text="@string/two_factor_authentification" />
</LinearLayout>
</LinearLayout>
</ScrollView>

36
app/src/main/res/layout/activity_login.xml
View File

@ -36,11 +36,17 @@
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="match_parent"
android:layout_margin="50dp"
android:layout_marginLeft="50dp"
android:layout_marginStart="50dp"
android:layout_marginRight="50dp"
android:layout_marginEnd="50dp"
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
>
<android.support.design.widget.TextInputLayout
android:id="@+id/login_instance_layout"
android:layout_width="match_parent"
@ -56,6 +62,20 @@
android:hint="@string/instance_example"
/>
</android.support.design.widget.TextInputLayout>
<TextView
android:id="@+id/login_two_step"
android:textAllCaps="false"
android:gravity="center"
android:visibility="gone"
android:drawablePadding="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorAccent"
android:text="@string/two_factor_authentification" />
<EditText
android:id="@+id/login_uid"
android:layout_width="match_parent"
@ -98,17 +118,7 @@
android:layout_height="wrap_content"
android:textSize="20sp"
android:text="@string/login" />
<TextView
android:id="@+id/login_two_step"
android:textAllCaps="false"
android:gravity="center"
android:drawablePadding="10dp"
android:padding="20dp"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorAccent"
android:text="@string/two_factor_authentification" />
</LinearLayout>
</LinearLayout>