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

Commit a4b1d8b

Browse files
MarkNjungeMarkNjunge
committed
Change to material components
1 parent de3fd54 commit a4b1d8b

12 files changed

Lines changed: 238 additions & 229 deletions

File tree

‎app/src/main/java/com/marknkamau/justjava/ui/checkout/CheckoutActivity.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,11 @@ class CheckoutActivity : BaseActivity(), CheckoutView {
9090

9191
override fun showUploadBar() {
9292
pbSavingProfile.visibility = View.VISIBLE
93-
btnPlaceOrder.setBackgroundResource(R.drawable.large_button_disabled)
9493
btnPlaceOrder.isEnabled = false
9594
}
9695

9796
override fun hideUploadBar() {
9897
pbSavingProfile.visibility = View.INVISIBLE
99-
btnPlaceOrder.setBackgroundResource(R.drawable.large_button)
10098
btnPlaceOrder.isEnabled = true
10199
}
102100

‎app/src/main/java/com/marknkamau/justjava/ui/login/LogInActivity.kt‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,18 @@ package com.marknkamau.justjava.ui.login
22

33
import android.content.Intent
44
import android.os.Bundle
5-
import androidx.appcompat.app.AppCompatActivity
65
import android.text.TextUtils
7-
import android.text.method.PasswordTransformationMethod
86
import android.view.View
97
import android.widget.Toast
10-
8+
import androidx.appcompat.app.AppCompatActivity
119
import com.marknkamau.justjava.JustJavaApp
1210
import com.marknkamau.justjava.R
1311
import com.marknkamau.justjava.ui.signup.SignUpActivity
14-
1512
import com.marknkamau.justjava.utils.trimmedText
1613
import kotlinx.android.synthetic.main.activity_log_in.*
1714

1815
class LogInActivity : AppCompatActivity(), LogInView, View.OnClickListener {
1916
private lateinit var email: String
20-
private var passVisible = false
2117
private lateinit var presenter: LogInPresenter
2218

2319
override fun onCreate(savedInstanceState: Bundle?) {
@@ -31,10 +27,9 @@ class LogInActivity : AppCompatActivity(), LogInView, View.OnClickListener {
3127
presenter = LogInPresenter(this, preferencesRepository, authService, database)
3228
presenter.checkSignInStatus()
3329

34-
imgVisibility.setOnClickListener(this)
3530
btnLogin.setOnClickListener(this)
3631
tvForgotPass.setOnClickListener(this)
37-
tvSignup.setOnClickListener(this)
32+
btnSignUp.setOnClickListener(this)
3833
}
3934

4035
override fun onResume() {
@@ -44,19 +39,9 @@ class LogInActivity : AppCompatActivity(), LogInView, View.OnClickListener {
4439

4540
override fun onClick(view: View) {
4641
when (view) {
47-
imgVisibility ->
48-
if (passVisible) {
49-
etPassword.transformationMethod = PasswordTransformationMethod()
50-
imgVisibility.setImageResource(R.drawable.ic_visibility_off)
51-
passVisible = false
52-
} else {
53-
imgVisibility.setImageResource(R.drawable.ic_visibility)
54-
etPassword.transformationMethod = null
55-
passVisible = true
56-
}
5742
btnLogin -> signIn()
5843
tvForgotPass -> resetUserPassword()
59-
tvSignup -> {
44+
btnSignUp -> {
6045
startActivity(Intent(this@LogInActivity, SignUpActivity::class.java))
6146
}
6247
}
@@ -105,13 +90,13 @@ class LogInActivity : AppCompatActivity(), LogInView, View.OnClickListener {
10590

10691
private fun disableButtons() {
10792
btnLogin.isEnabled = false
108-
tvSignup.isEnabled = false
93+
btnSignUp.isEnabled = false
10994
tvForgotPass.isEnabled = false
11095
}
11196

11297
private fun enableButtons() {
11398
btnLogin.isEnabled = true
114-
tvSignup.isEnabled = true
99+
btnSignUp.isEnabled = true
115100
tvForgotPass.isEnabled = true
116101
}
117102

‎app/src/main/java/com/marknkamau/justjava/ui/signup/SignUpActivity.kt‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.marknkamau.justjava.ui.signup
22

33
import android.os.Bundle
4-
import androidx.appcompat.app.AppCompatActivity
5-
import android.text.method.PasswordTransformationMethod
64
import android.util.Patterns
75
import android.view.View
86
import android.widget.Toast
7+
import androidx.appcompat.app.AppCompatActivity
98
import com.marknkamau.justjava.JustJavaApp
109
import com.marknkamau.justjava.R
1110
import com.marknkamau.justjava.utils.trimmedText
@@ -18,7 +17,6 @@ class SignUpActivity : AppCompatActivity(), SignUpView, View.OnClickListener {
1817
private lateinit var email: String
1918
private lateinit var address: String
2019
private lateinit var password: String
21-
private var passVisible = false
2220
private lateinit var presenter: SignUpPresenter
2321

2422
override fun onCreate(savedInstanceState: Bundle?) {
@@ -31,23 +29,12 @@ class SignUpActivity : AppCompatActivity(), SignUpView, View.OnClickListener {
3129

3230
presenter = SignUpPresenter(this, preferencesRepository, auth, database)
3331

34-
imgViewPass.setOnClickListener(this)
3532
btnSignup.setOnClickListener(this)
3633
tvLogin.setOnClickListener(this)
3734
}
3835

3936
override fun onClick(view: View) {
4037
when (view) {
41-
imgViewPass ->
42-
if (passVisible) {
43-
etPassword.transformationMethod = PasswordTransformationMethod()
44-
imgViewPass.setImageResource(R.drawable.ic_visibility_off)
45-
passVisible = false
46-
} else {
47-
etPassword.transformationMethod = null
48-
imgViewPass.setImageResource(R.drawable.ic_visibility)
49-
passVisible = true
50-
}
5138
btnSignup -> createUser()
5239
tvLogin -> {
5340
finish()

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
app:layout_constraintStart_toStartOf="parent"
3636
app:layout_constraintTop_toTopOf="@+id/btnClearCart" />
3737

38-
<Button
38+
<com.google.android.material.button.MaterialButton
3939
android:id="@+id/btnClearCart"
40+
style="@style/AppTheme.SecondaryButton"
4041
android:layout_width="wrap_content"
4142
android:layout_height="wrap_content"
4243
android:layout_marginStart="8dp"
4344
android:layout_marginEnd="8dp"
44-
android:background="@android:color/transparent"
4545
android:focusableInTouchMode="true"
4646
android:text="@string/clear_cart"
4747
app:layout_constraintEnd_toEndOf="parent"
@@ -61,14 +61,14 @@
6161
app:layout_constraintBottom_toTopOf="@+id/btnCheckout"
6262
app:layout_constraintEnd_toEndOf="parent" />
6363

64-
<Button
64+
<com.google.android.material.button.MaterialButton
6565
android:id="@+id/btnCheckout"
66+
style="@style/AppTheme.PrimaryButton"
6667
android:layout_width="0dp"
67-
android:layout_height="wrap_content"
68+
android:layout_height="56dp"
6869
android:layout_marginBottom="8dp"
6970
android:layout_marginEnd="8dp"
7071
android:layout_marginStart="8dp"
71-
android:background="@drawable/large_button"
7272
android:text="@string/proceed_to_checkout"
7373
android:textColor="@android:color/white"
7474
app:layout_constraintBottom_toBottomOf="parent"

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

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,101 +16,98 @@
1616

1717
<TextView
1818
android:id="@+id/textView2"
19+
style="@style/AppTheme.HeaderText"
1920
android:layout_width="wrap_content"
2021
android:layout_height="wrap_content"
2122
android:layout_marginStart="8dp"
2223
android:layout_marginTop="8dp"
23-
android:alpha=".87"
2424
android:text="@string/customer_details"
25-
android:textColor="@android:color/black"
2625
app:layout_constraintStart_toStartOf="parent"
2726
app:layout_constraintTop_toTopOf="parent" />
2827

2928
<com.google.android.material.textfield.TextInputLayout
3029
android:id="@+id/tilName"
30+
style="@style/AppTheme.InputField"
3131
android:layout_width="0dp"
3232
android:layout_height="wrap_content"
33-
android:layout_marginStart="8dp"
33+
android:layout_marginLeft="8dp"
3434
android:layout_marginTop="8dp"
35+
android:layout_marginRight="8dp"
3536
app:layout_constraintHorizontal_bias="0.0"
3637
app:layout_constraintLeft_toLeftOf="parent"
3738
app:layout_constraintRight_toRightOf="parent"
3839
app:layout_constraintTop_toBottomOf="@+id/textView2">
3940

40-
<EditText
41+
<com.google.android.material.textfield.TextInputEditText
4142
android:id="@+id/etName"
4243
android:layout_width="match_parent"
4344
android:layout_height="match_parent"
44-
android:ems="10"
45-
android:hint="@string/name"
46-
android:inputType="textPersonName"
4745
android:textSize="14sp"
48-
tools:ignore="Autofill" />
46+
android:hint="@string/name"
47+
android:inputType="textPersonName"/>
4948
</com.google.android.material.textfield.TextInputLayout>
5049

5150
<com.google.android.material.textfield.TextInputLayout
5251
android:id="@+id/tilPhone"
52+
style="@style/AppTheme.InputField"
5353
android:layout_width="0dp"
5454
android:layout_height="wrap_content"
55-
android:layout_marginStart="8dp"
55+
android:layout_marginLeft="8dp"
5656
android:layout_marginTop="8dp"
57+
android:layout_marginRight="8dp"
5758
app:layout_constraintLeft_toLeftOf="parent"
5859
app:layout_constraintRight_toRightOf="parent"
59-
app:layout_constraintTop_toBottomOf="@+id/tilName"
60-
tools:layout_editor_absoluteX="8dp"
61-
tools:layout_editor_absoluteY="0dp">
60+
app:layout_constraintTop_toBottomOf="@+id/tilName">
6261

63-
<EditText
62+
<com.google.android.material.textfield.TextInputEditText
6463
android:id="@+id/etPhone"
6564
android:layout_width="match_parent"
6665
android:layout_height="match_parent"
67-
android:ems="10"
6866
android:hint="@string/phone_number"
6967
android:inputType="none|phone"
70-
android:textSize="14sp"
71-
tools:ignore="Autofill" />
68+
android:textSize="14sp" />
7269
</com.google.android.material.textfield.TextInputLayout>
7370

7471
<com.google.android.material.textfield.TextInputLayout
7572
android:id="@+id/tilAddress"
73+
style="@style/AppTheme.InputField"
7674
android:layout_width="0dp"
7775
android:layout_height="wrap_content"
78-
android:layout_marginStart="8dp"
76+
android:layout_marginLeft="8dp"
7977
android:layout_marginTop="8dp"
78+
android:layout_marginRight="8dp"
8079
app:layout_constraintLeft_toLeftOf="parent"
8180
app:layout_constraintRight_toRightOf="parent"
82-
app:layout_constraintTop_toBottomOf="@+id/tilPhone"
83-
tools:layout_editor_absoluteX="8dp"
84-
tools:layout_editor_absoluteY="0dp">
81+
app:layout_constraintTop_toBottomOf="@+id/tilPhone">
8582

86-
<EditText
83+
<com.google.android.material.textfield.TextInputEditText
8784
android:id="@+id/etDeliveryAddress"
8885
android:layout_width="match_parent"
8986
android:layout_height="match_parent"
90-
android:ems="10"
9187
android:hint="@string/delivery_address"
9288
android:inputType="textMultiLine"
93-
android:textSize="14sp"
94-
tools:ignore="Autofill" />
89+
android:textSize="14sp" />
9590
</com.google.android.material.textfield.TextInputLayout>
9691

9792
<com.google.android.material.textfield.TextInputLayout
9893
android:id="@+id/tilComments"
94+
style="@style/AppTheme.InputField"
9995
android:layout_width="0dp"
10096
android:layout_height="wrap_content"
10197
android:layout_marginLeft="8dp"
10298
android:layout_marginTop="8dp"
10399
android:layout_marginRight="8dp"
100+
android:hint="@string/additional_comments"
101+
app:helperText="Optional"
104102
app:layout_constraintHorizontal_bias="0.0"
105103
app:layout_constraintLeft_toLeftOf="parent"
106104
app:layout_constraintRight_toRightOf="parent"
107105
app:layout_constraintTop_toBottomOf="@+id/tilAddress">
108106

109-
<MultiAutoCompleteTextView
107+
<com.google.android.material.textfield.TextInputEditText
110108
android:id="@+id/etComments"
111109
android:layout_width="match_parent"
112110
android:layout_height="match_parent"
113-
android:hint="@string/additional_comments_optional"
114111
android:textSize="14sp" />
115112
</com.google.android.material.textfield.TextInputLayout>
116113

@@ -128,14 +125,14 @@
128125
app:layout_constraintTop_toBottomOf="@+id/rgPayment"
129126
app:layout_constraintVertical_bias="1.0" />
130127

131-
<Button
128+
<com.google.android.material.button.MaterialButton
132129
android:id="@+id/btnPlaceOrder"
130+
style="@style/AppTheme.PrimaryButton"
133131
android:layout_width="0dp"
134-
android:layout_height="wrap_content"
132+
android:layout_height="56dp"
135133
android:layout_marginLeft="8dp"
136134
android:layout_marginRight="8dp"
137135
android:layout_marginBottom="9dp"
138-
android:background="@drawable/large_button"
139136
android:text="@string/place_order"
140137
android:textColor="@android:color/white"
141138
app:layout_constraintBottom_toBottomOf="parent"
@@ -144,13 +141,12 @@
144141

145142
<TextView
146143
android:id="@+id/textView"
144+
style="@style/AppTheme.HeaderText"
147145
android:layout_width="wrap_content"
148146
android:layout_height="wrap_content"
149147
android:layout_marginStart="8dp"
150-
android:layout_marginTop="8dp"
151-
android:alpha=".87"
148+
android:layout_marginTop="16dp"
152149
android:text="@string/payment"
153-
android:textColor="@android:color/black"
154150
app:layout_constraintStart_toStartOf="parent"
155151
app:layout_constraintTop_toBottomOf="@+id/tilComments" />
156152

0 commit comments

Comments
 (0)