diff options
author | Fup Duck <fupduck@sacknagel.com> | 2018-01-18 01:57:03 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2018-01-18 01:57:03 +0100 |
commit | 1ccb2f9e1bcfaf8279ef9576b3bca233e37af61b (patch) | |
tree | 1cd2adc2caadf1a24da4c021e92d5d755044a0f1 /app/src/main/res/layout/a_login.xml | |
parent | 20582f79321627257d1b66b22af791e9e22817fd (diff) |
WizardConfiguration theme
* download VPN certificate after loging in (#8813)
* get the new design up to date (#8819)
* fix crash when pressing login (#8817)
* add a loading screen according to design (#8816)
Diffstat (limited to 'app/src/main/res/layout/a_login.xml')
-rw-r--r-- | app/src/main/res/layout/a_login.xml | 45 |
1 files changed, 27 insertions, 18 deletions
diff --git a/app/src/main/res/layout/a_login.xml b/app/src/main/res/layout/a_login.xml index 5ecb807c..5b33ec16 100644 --- a/app/src/main/res/layout/a_login.xml +++ b/app/src/main/res/layout/a_login.xml @@ -1,29 +1,38 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + style="@style/BitmaskActivity"> - <include - layout="@layout/provider_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <include layout="@layout/loading_screen" /> - <include layout="@layout/provider_credentials_login" + <LinearLayout + android:id="@+id/content" android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:layout_height="match_parent" + android:orientation="vertical"> - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> + <include + layout="@layout/provider_header" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <include layout="@layout/provider_credentials_login" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> - <Button - android:id="@+id/button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/login_button" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true"/> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> - </RelativeLayout> + <android.support.v7.widget.AppCompatButton + android:id="@+id/button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/login_button" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true"/> + </RelativeLayout> + </LinearLayout> </LinearLayout>
\ No newline at end of file |