Skip to content
This repository was archived by the owner on Nov 8, 2018. It is now read-only.

Commit 2c027d4

Browse files
ashu-dadhichashu-dadhich
committed
Login Screen Enhancement
1 parent 5673e4b commit 2c027d4

File tree

2 files changed

+55
-57
lines changed

2 files changed

+55
-57
lines changed

‎app/src/main/res/layout/activity_login.xml‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,36 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:layout_width="match_parent"
5-
android:layout_height="match_parent"
6-
android:orientation="vertical"
7-
android:fitsSystemWindows="true">
8-
9-
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
10-
xmlns:tools="http://schemas.android.com/tools"
114
android:layout_width="match_parent"
125
android:layout_height="match_parent"
13-
tools:context=".SignupActivity">
14-
15-
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
16-
android:layout_width="match_parent"
17-
android:layout_height="match_parent">
6+
android:fitsSystemWindows="true"
7+
android:orientation="vertical">
188

19-
<android.support.design.widget.AppBarLayout
9+
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
10+
xmlns:tools="http://schemas.android.com/tools"
2011
android:layout_width="match_parent"
21-
android:layout_height="wrap_content"
22-
android:theme="@style/MyMaterialTheme.AppBarOverlay">
12+
android:layout_height="match_parent"
13+
tools:context=".SignupActivity">
2314

24-
<include android:layout_height="wrap_content"
15+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
2516
android:layout_width="match_parent"
26-
layout="@layout/toolbar" />
17+
android:layout_height="match_parent">
18+
19+
<android.support.design.widget.AppBarLayout
20+
android:layout_width="match_parent"
21+
android:layout_height="wrap_content"
22+
android:theme="@style/MyMaterialTheme.AppBarOverlay">
23+
24+
<include
25+
layout="@layout/toolbar"
26+
android:layout_width="match_parent"
27+
android:layout_height="wrap_content" />
2728

28-
</android.support.design.widget.AppBarLayout>
29+
</android.support.design.widget.AppBarLayout>
2930

30-
</ScrollView>
31+
</ScrollView>
3132

32-
<include layout="@layout/content_login" />
33-
</android.support.design.widget.CoordinatorLayout>
33+
<include layout="@layout/content_login" />
34+
</android.support.design.widget.CoordinatorLayout>
3435

3536
</LinearLayout>

‎app/src/main/res/layout/content_login.xml‎

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,84 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
2+
3+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
34
xmlns:app="http://schemas.android.com/apk/res-auto"
45
xmlns:tools="http://schemas.android.com/tools"
56
android:layout_width="match_parent"
67
android:layout_height="match_parent"
8+
android:background="@color/background_app"
9+
android:fitsSystemWindows="true"
710
android:paddingBottom="@dimen/activity_vertical_margin"
811
android:paddingLeft="@dimen/activity_horizontal_margin"
912
android:paddingRight="@dimen/activity_horizontal_margin"
10-
android:background="@color/background_app"
1113
android:paddingTop="@dimen/activity_vertical_margin"
12-
android:fitsSystemWindows="true"
1314
app:layout_behavior="@string/appbar_scrolling_view_behavior"
1415
tools:context=".SignupActivity"
1516
tools:showIn="@layout/activity_login">
16-
<RelativeLayout
17-
android:layout_width="match_parent"
18-
android:layout_height="match_parent">
1917

2018
<TextView
19+
android:id="@+id/first"
2120
android:layout_width="fill_parent"
2221
android:layout_height="wrap_content"
22+
android:layout_marginBottom="@dimen/padding_10"
2323
android:gravity="center"
24-
android:id="@+id/first"
24+
android:text="@string/first_aide"
2525
android:textColor="@color/primary_text_default_material_dark"
2626
android:textSize="@dimen/title_font"
27-
android:textStyle="bold"
28-
android:layout_marginBottom="@dimen/padding_10"
29-
android:text="@string/first_aide"
30-
/>
27+
android:textStyle="bold" />
3128

3229
<View
3330
android:id="@+id/second"
3431
android:layout_width="match_parent"
35-
android:layout_below="@id/first"
3632
android:layout_height="@dimen/contacting_post_staff_view_width"
37-
android:background="@color/photo_border"/>
33+
android:layout_below="@id/first"
34+
android:background="@color/photo_border" />
3835

3936
<TextView
37+
android:id="@+id/third"
4038
android:layout_width="match_parent"
4139
android:layout_height="wrap_content"
42-
android:gravity="center"
43-
android:id="@+id/third"
4440
android:layout_below="@id/second"
45-
android:textColor="@color/primary_text_default_material_dark"
46-
android:textSize="@dimen/sub_title_font"
47-
android:textStyle="bold"
4841
android:layout_marginTop="@dimen/padding_10"
42+
android:gravity="center"
4943
android:text="@string/home_title"
50-
/>
44+
android:textColor="@color/primary_text_default_material_dark"
45+
android:textSize="@dimen/sub_title_font"
46+
android:textStyle="bold" />
5147

5248

5349
<LinearLayout
54-
android:layout_marginTop="@dimen/fragment_main_marginTop_35"
5550
android:layout_width="match_parent"
56-
android:orientation="vertical"
57-
android:gravity="center"
51+
android:layout_height="wrap_content"
5852
android:layout_below="@id/third"
59-
android:layout_height="wrap_content">
53+
android:layout_marginTop="@dimen/fragment_main_marginTop_35"
54+
android:gravity="center"
55+
android:orientation="vertical">
56+
6057
<EditText
61-
android:background="@drawable/edit_text_bg"
58+
android:id="@+id/edit_name"
6259
android:layout_width="match_parent"
63-
android:layout_marginTop="@dimen/contacting_post_staff_marginTop_15"
6460
android:layout_height="wrap_content"
65-
android:id="@+id/edit_name"
61+
android:layout_marginTop="@dimen/contacting_post_staff_marginTop_15"
62+
android:background="@drawable/edit_text_bg"
6663
android:hint="@string/enter_name"
6764
android:inputType="textPersonName|textCapWords" />
6865

6966
<Spinner
7067
android:id="@+id/spinner_country"
7168
android:layout_width="fill_parent"
7269
android:layout_height="wrap_content"
73-
android:dropDownWidth="@dimen/contacting_post_staff_spinner_width"
74-
android:layout_marginTop="@dimen/contacting_post_staff_marginTop_15" />
75-
<Button
76-
android:id="@+id/loginButton"
77-
style="@style/NavigateButton"
78-
android:text="@string/login"
79-
android:layout_marginTop="@dimen/fragment_main_marginTop_35"
80-
android:layout_width="match_parent" />
70+
android:layout_marginTop="@dimen/contacting_post_staff_marginTop_15"
71+
android:dropDownWidth="match_parent" />
8172

8273
</LinearLayout>
8374

84-
75+
<Button
76+
android:id="@+id/loginButton"
77+
style="@style/NavigateButton"
78+
android:layout_width="match_parent"
79+
android:layout_alignParentBottom="true"
80+
android:layout_gravity="bottom"
81+
android:layout_marginTop="@dimen/fragment_main_marginTop_35"
82+
android:text="@string/login" />
8583

8684
</RelativeLayout>
87-
</ScrollView>

0 commit comments

Comments
 (0)