Skip to content
This repository was archived by the owner on Dec 16, 2023. It is now read-only.

Commit 023bd1e

Browse files
MarkNjungeMarkNjunge
committed
Update authentication activities design
1 parent e23d410 commit 023bd1e

3 files changed

Lines changed: 134 additions & 137 deletions

File tree

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

Lines changed: 49 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
6-
android:layout_height="match_parent">
6+
android:layout_height="match_parent"
7+
tools:context="com.marknkamau.justjava.ui.resetPassword.ResetPasswordActivity">
78

89
<LinearLayout
910
android:id="@+id/layoutResetPasswordError"
@@ -39,57 +40,60 @@
3940
android:textSize="16sp" />
4041
</LinearLayout>
4142

42-
<androidx.constraintlayout.widget.ConstraintLayout
43+
<LinearLayout
4344
android:id="@+id/layoutResetPassword"
4445
android:layout_width="match_parent"
4546
android:layout_height="match_parent"
46-
tools:context="com.marknkamau.justjava.ui.resetPassword.ResetPasswordActivity">
47+
android:orientation="vertical">
4748

48-
<ProgressBar
49-
android:id="@+id/pbLoading"
50-
style="?android:attr/progressBarStyleHorizontal"
51-
android:layout_width="0dp"
49+
<LinearLayout
50+
android:layout_width="match_parent"
5251
android:layout_height="wrap_content"
53-
android:indeterminate="true"
54-
android:visibility="gone"
55-
app:layout_constraintEnd_toEndOf="parent"
56-
app:layout_constraintStart_toStartOf="parent"
57-
app:layout_constraintTop_toTopOf="parent"
58-
tools:visibility="visible" />
52+
android:background="@color/colorPrimaryDark"
53+
android:orientation="vertical">
5954

60-
<ImageView
61-
android:id="@+id/imageView"
62-
android:layout_width="72dp"
63-
android:layout_height="72dp"
64-
android:layout_marginStart="16dp"
65-
android:contentDescription="@string/app_icon_content_desc"
66-
android:tint="@color/colorPrimary"
67-
app:layout_constraintBottom_toTopOf="@+id/textView20"
68-
app:layout_constraintStart_toStartOf="parent"
69-
app:layout_constraintTop_toTopOf="parent"
70-
app:layout_constraintVertical_chainStyle="packed"
71-
app:srcCompat="@drawable/ic_just_java_logo" />
55+
<ImageView
56+
android:id="@+id/imageView"
57+
android:layout_width="72dp"
58+
android:layout_height="72dp"
59+
android:layout_marginStart="16dp"
60+
android:layout_marginTop="16dp"
61+
android:contentDescription="@string/app_icon_content_desc"
62+
android:tint="#FFFFFF"
63+
app:srcCompat="@drawable/ic_just_java_logo" />
7264

73-
<TextView
74-
android:id="@+id/textView20"
75-
android:layout_width="wrap_content"
76-
android:layout_height="wrap_content"
77-
android:layout_marginStart="16dp"
78-
android:layout_marginBottom="8dp"
79-
android:fontFamily="@font/bree_serif"
80-
android:text="@string/app_name"
81-
android:textColor="@color/colorPrimary"
82-
android:textSize="48sp"
83-
app:layout_constraintBottom_toTopOf="@+id/guideline"
84-
app:layout_constraintStart_toStartOf="parent"
85-
app:layout_constraintTop_toBottomOf="@+id/imageView" />
65+
<TextView
66+
android:id="@+id/textView20"
67+
android:layout_width="wrap_content"
68+
android:layout_height="wrap_content"
69+
android:layout_marginStart="16dp"
70+
android:layout_marginBottom="8dp"
71+
android:fontFamily="@font/bree_serif"
72+
android:text="@string/app_name"
73+
android:textColor="#FFFFFF"
74+
android:textSize="48sp" />
75+
76+
<ProgressBar
77+
android:id="@+id/pbLoading"
78+
style="?android:attr/progressBarStyleHorizontal"
79+
android:layout_width="match_parent"
80+
android:layout_height="wrap_content"
81+
android:indeterminate="true"
82+
android:visibility="gone"
83+
app:layout_constraintEnd_toEndOf="parent"
84+
app:layout_constraintStart_toStartOf="parent"
85+
app:layout_constraintTop_toTopOf="parent"
86+
tools:visibility="visible" />
87+
88+
</LinearLayout>
8689

8790
<TextView
8891
android:id="@+id/textView9"
8992
style="@style/AppTheme.Text.18Primary"
9093
android:layout_width="wrap_content"
9194
android:layout_height="wrap_content"
9295
android:layout_marginStart="16dp"
96+
android:layout_marginTop="32dp"
9397
android:text="Enter your new password"
9498
app:layout_constraintBottom_toTopOf="@+id/guideline"
9599
app:layout_constraintStart_toStartOf="parent" />
@@ -104,16 +108,16 @@
104108
<com.google.android.material.textfield.TextInputLayout
105109
android:id="@+id/tilnewPassword"
106110
style="@style/AppTheme.InputField"
107-
android:layout_width="0dp"
111+
android:layout_width="match_parent"
108112
android:layout_height="wrap_content"
109113
android:layout_marginStart="16dp"
110-
android:layout_marginTop="8dp"
114+
android:layout_marginTop="16dp"
111115
android:layout_marginEnd="16dp"
112116
android:hint="@string/password"
113-
app:passwordToggleEnabled="true"
114117
app:layout_constraintEnd_toEndOf="parent"
115118
app:layout_constraintStart_toStartOf="parent"
116-
app:layout_constraintTop_toTopOf="@+id/guideline">
119+
app:layout_constraintTop_toTopOf="@+id/guideline"
120+
app:passwordToggleEnabled="true">
117121

118122
<com.google.android.material.textfield.TextInputEditText
119123
android:id="@+id/etNewPassword"
@@ -122,9 +126,9 @@
122126
android:inputType="textPassword" />
123127
</com.google.android.material.textfield.TextInputLayout>
124128

125-
<Button
129+
<com.google.android.material.button.MaterialButton
126130
android:id="@+id/btnChangePassword"
127-
android:layout_width="0dp"
131+
android:layout_width="match_parent"
128132
android:layout_height="56dp"
129133
android:layout_marginStart="32dp"
130134
android:layout_marginTop="32dp"
@@ -133,6 +137,6 @@
133137
app:layout_constraintEnd_toEndOf="parent"
134138
app:layout_constraintStart_toStartOf="parent"
135139
app:layout_constraintTop_toBottomOf="@+id/tilnewPassword" />
136-
</androidx.constraintlayout.widget.ConstraintLayout>
140+
</LinearLayout>
137141

138142
</FrameLayout>

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

Lines changed: 66 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -10,79 +10,69 @@
1010
android:focusableInTouchMode="true"
1111
tools:context=".ui.login.SignInActivity">
1212

13-
<androidx.constraintlayout.widget.ConstraintLayout
13+
<LinearLayout
1414
android:layout_width="match_parent"
15-
android:layout_height="wrap_content">
15+
android:layout_height="wrap_content"
16+
android:orientation="vertical">
1617

17-
<ProgressBar
18-
android:id="@+id/pbLoading"
19-
style="?android:attr/progressBarStyleHorizontal"
20-
android:layout_width="0dp"
18+
<LinearLayout
19+
android:layout_width="match_parent"
2120
android:layout_height="wrap_content"
22-
android:indeterminate="true"
23-
android:visibility="gone"
24-
app:layout_constraintEnd_toEndOf="parent"
25-
app:layout_constraintStart_toStartOf="parent"
26-
app:layout_constraintTop_toTopOf="parent"
27-
tools:visibility="visible" />
28-
29-
<ImageView
30-
android:id="@+id/imageView"
31-
android:layout_width="72dp"
32-
android:layout_height="72dp"
33-
android:layout_marginStart="16dp"
34-
android:contentDescription="@string/app_icon_content_desc"
35-
android:tint="@color/colorPrimary"
36-
app:layout_constraintBottom_toTopOf="@+id/textView20"
37-
app:layout_constraintStart_toStartOf="parent"
38-
app:layout_constraintTop_toTopOf="parent"
39-
app:layout_constraintVertical_chainStyle="packed"
40-
app:srcCompat="@drawable/ic_just_java_logo" />
21+
android:background="@color/colorPrimaryDark"
22+
android:orientation="vertical">
23+
24+
<ImageView
25+
android:id="@+id/imageView"
26+
android:layout_width="72dp"
27+
android:layout_height="72dp"
28+
android:layout_marginStart="16dp"
29+
android:layout_marginTop="16dp"
30+
android:contentDescription="@string/app_icon_content_desc"
31+
android:tint="#FFFFFF"
32+
app:srcCompat="@drawable/ic_just_java_logo" />
4133

42-
<TextView
43-
android:id="@+id/textView20"
44-
android:layout_width="wrap_content"
45-
android:layout_height="wrap_content"
46-
android:layout_marginStart="16dp"
47-
android:layout_marginBottom="8dp"
48-
android:fontFamily="@font/bree_serif"
49-
android:text="@string/app_name"
50-
android:textColor="@color/colorPrimary"
51-
android:textSize="48sp"
52-
app:layout_constraintBottom_toTopOf="@+id/guideline"
53-
app:layout_constraintStart_toStartOf="parent"
54-
app:layout_constraintTop_toBottomOf="@+id/imageView" />
34+
<TextView
35+
android:id="@+id/textView20"
36+
android:layout_width="wrap_content"
37+
android:layout_height="wrap_content"
38+
android:layout_marginStart="16dp"
39+
android:layout_marginBottom="8dp"
40+
android:fontFamily="@font/bree_serif"
41+
android:text="@string/app_name"
42+
android:textColor="#FFFFFF"
43+
android:textSize="48sp" />
44+
45+
<ProgressBar
46+
android:id="@+id/pbLoading"
47+
style="?android:attr/progressBarStyleHorizontal"
48+
android:layout_width="match_parent"
49+
android:layout_height="wrap_content"
50+
android:indeterminate="true"
51+
android:visibility="gone"
52+
app:layout_constraintEnd_toEndOf="parent"
53+
app:layout_constraintStart_toStartOf="parent"
54+
app:layout_constraintTop_toTopOf="parent"
55+
tools:visibility="visible" />
56+
</LinearLayout>
5557

5658
<TextView
5759
android:id="@+id/textView9"
5860
style="@style/AppTheme.Text.18Primary"
5961
android:layout_width="wrap_content"
6062
android:layout_height="wrap_content"
6163
android:layout_marginStart="16dp"
62-
android:text="Sign in to continue"
63-
app:layout_constraintBottom_toTopOf="@+id/guideline"
64-
app:layout_constraintStart_toStartOf="parent" />
65-
66-
<androidx.constraintlayout.widget.Guideline
67-
android:id="@+id/guideline"
68-
android:layout_width="wrap_content"
69-
android:layout_height="wrap_content"
70-
android:orientation="horizontal"
71-
app:layout_constraintGuide_percent="0.4" />
64+
android:layout_marginTop="32dp"
65+
android:text="Sign in to continue" />
7266

7367
<com.google.android.material.textfield.TextInputLayout
7468
android:id="@+id/tilEmail"
7569
style="@style/AppTheme.InputField"
7670
android:layout_width="match_parent"
7771
android:layout_height="wrap_content"
7872
android:layout_marginLeft="16dp"
79-
android:layout_marginTop="8dp"
73+
android:layout_marginTop="16dp"
8074
android:layout_marginRight="16dp"
81-
android:hint="@string/email_address"
82-
app:layout_constraintHorizontal_bias="0.0"
83-
app:layout_constraintLeft_toLeftOf="parent"
84-
app:layout_constraintRight_toRightOf="parent"
85-
app:layout_constraintTop_toTopOf="@+id/guideline">
75+
android:hint="@string/email_address">
8676

8777
<com.google.android.material.textfield.TextInputEditText
8878
android:id="@+id/etEmail"
@@ -101,9 +91,6 @@
10191
android:layout_marginTop="8dp"
10292
android:layout_marginRight="16dp"
10393
android:hint="@string/password"
104-
app:layout_constraintLeft_toLeftOf="parent"
105-
app:layout_constraintRight_toRightOf="parent"
106-
app:layout_constraintTop_toBottomOf="@+id/tilEmail"
10794
app:passwordToggleEnabled="true">
10895

10996
<com.google.android.material.textfield.TextInputEditText
@@ -114,38 +101,46 @@
114101
android:textSize="14sp" />
115102
</com.google.android.material.textfield.TextInputLayout>
116103

104+
<TextView
105+
android:id="@+id/tvForgotPassword"
106+
android:layout_width="wrap_content"
107+
android:layout_height="wrap_content"
108+
android:layout_gravity="end"
109+
android:layout_marginEnd="8dp"
110+
android:padding="8dp"
111+
android:text="Forgot password?" />
112+
117113
<com.google.android.material.button.MaterialButton
118114
android:id="@+id/btnSignIn"
119115
style="@style/AppTheme.Button.FilledAccent"
120-
android:layout_width="0dp"
116+
android:layout_width="match_parent"
121117
android:layout_height="56dp"
122118
android:layout_marginLeft="32dp"
123119
android:layout_marginTop="8dp"
124120
android:layout_marginRight="32dp"
125-
android:text="Sign in"
126-
app:layout_constraintLeft_toLeftOf="parent"
127-
app:layout_constraintRight_toRightOf="parent"
128-
app:layout_constraintTop_toBottomOf="@+id/tvForgotPassword" />
121+
android:text="Sign in" />
129122

130123
<com.google.android.gms.common.SignInButton
131124
android:id="@+id/btnSignInGoogle"
132125
android:layout_width="wrap_content"
133126
android:layout_height="wrap_content"
134-
android:layout_marginTop="8dp"
135-
app:layout_constraintEnd_toEndOf="parent"
136-
app:layout_constraintStart_toStartOf="parent"
137-
app:layout_constraintTop_toBottomOf="@+id/btnSignIn" />
127+
android:layout_gravity="center"
128+
android:layout_marginTop="8dp" />
129+
130+
<Space
131+
android:layout_width="match_parent"
132+
android:layout_height="match_parent"
133+
android:layout_weight="1" />
138134

139135
<LinearLayout
140136
android:id="@+id/llSignUp"
141137
android:layout_width="wrap_content"
142138
android:layout_height="wrap_content"
139+
android:layout_gravity="center"
140+
android:layout_marginTop="16dp"
143141
android:layout_marginBottom="16dp"
144142
android:orientation="horizontal"
145-
android:padding="8dp"
146-
app:layout_constraintBottom_toBottomOf="parent"
147-
app:layout_constraintEnd_toEndOf="parent"
148-
app:layout_constraintStart_toStartOf="parent">
143+
android:padding="8dp">
149144

150145
<TextView
151146
android:id="@+id/textView26"
@@ -165,15 +160,6 @@
165160
android:text="@string/sign_up" />
166161
</LinearLayout>
167162

168-
<TextView
169-
android:id="@+id/tvForgotPassword"
170-
android:layout_width="wrap_content"
171-
android:layout_height="wrap_content"
172-
android:layout_marginEnd="8dp"
173-
android:padding="8dp"
174-
android:text="Forgot password?"
175-
app:layout_constraintEnd_toEndOf="parent"
176-
app:layout_constraintTop_toBottomOf="@+id/tilPassword" />
177163

178-
</androidx.constraintlayout.widget.ConstraintLayout>
164+
</LinearLayout>
179165
</ScrollView>

0 commit comments

Comments
 (0)