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

Commit e3230ea

Browse files
MarkNjungeMarkNjunge
committed
Minor UI changes
1 parent e01a349 commit e3230ea

9 files changed

Lines changed: 118 additions & 107 deletions

File tree

‎app/src/main/java/com/marknkamau/justjava/ui/about/AboutActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ class AboutActivity : AppCompatActivity(), View.OnClickListener {
3636
imgLinkedin -> openUrl("https://linkedin.com/in/marknjunge")
3737
imgGithub -> openUrl("https://github.com/MarkNjunge")
3838
imgWebsite -> openUrl("https://marknjunge.com")
39-
tvPrivacyPolicy -> openUrl("https://markn.dev/justjava/privacy")
39+
tvPrivacyPolicy -> openUrl("https://marknjunge.com/justjava/privacy")
4040
}
4141
}
4242

4343
private fun openUrl(url: String) = startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
4444

4545
private fun sendEmail() {
46-
val addresses = arrayOf("contact@markn.dev") //Has to be String array or it will ignore
46+
val addresses = arrayOf("contact@marknjunge.com") //Has to be String array or it will ignore
4747
val intent = Intent(Intent.ACTION_SENDTO)
4848
intent.data = Uri.parse("mailto:") // only email apps should handle this
4949
intent.putExtra(Intent.EXTRA_EMAIL, addresses)

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

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -92,41 +92,44 @@
9292
android:id="@+id/textView8"
9393
android:layout_width="wrap_content"
9494
android:layout_height="wrap_content"
95-
android:layout_marginLeft="8dp"
95+
android:layout_marginLeft="16dp"
9696
android:layout_marginTop="8dp"
9797
android:text="@string/developer"
9898
android:textColor="@color/colorAccent"
99-
android:textSize="17sp"
99+
android:textSize="18sp"
100100
app:layout_constraintLeft_toLeftOf="parent"
101101
app:layout_constraintTop_toBottomOf="@+id/tvSource" />
102102

103103
<TextView
104104
android:id="@+id/textView9"
105105
android:layout_width="wrap_content"
106106
android:layout_height="wrap_content"
107-
android:layout_marginLeft="8dp"
107+
android:layout_marginLeft="16dp"
108108
android:layout_marginTop="8dp"
109109
android:text="Mark Njung'e"
110110
android:textColor="@android:color/white"
111+
android:textSize="17sp"
111112
app:layout_constraintLeft_toLeftOf="parent"
112113
app:layout_constraintTop_toBottomOf="@+id/textView8" />
113114

114115
<TextView
115116
android:id="@+id/textView10"
116117
android:layout_width="wrap_content"
117118
android:layout_height="wrap_content"
118-
android:layout_marginLeft="8dp"
119-
android:text="@string/mark_kamau_outlook_com"
119+
android:layout_marginLeft="16dp"
120+
android:text="contact@marknjunge.com"
120121
android:textColor="@android:color/white"
122+
android:textSize="17sp"
121123
app:layout_constraintLeft_toLeftOf="parent"
122124
app:layout_constraintTop_toBottomOf="@+id/textView9" />
123125

124126
<ImageView
125127
android:id="@+id/imgMail"
126-
android:layout_width="24dp"
127-
android:layout_height="24dp"
128-
android:layout_marginLeft="8dp"
128+
android:layout_width="wrap_content"
129+
android:layout_height="wrap_content"
130+
android:layout_marginStart="16dp"
129131
android:layout_marginTop="8dp"
132+
android:padding="8dp"
130133
app:layout_constraintEnd_toStartOf="@+id/imgLinkedin"
131134
app:layout_constraintHorizontal_bias="0.5"
132135
app:layout_constraintHorizontal_chainStyle="spread_inside"
@@ -136,9 +139,10 @@
136139

137140
<ImageView
138141
android:id="@+id/imgLinkedin"
139-
android:layout_width="24dp"
140-
android:layout_height="24dp"
142+
android:layout_width="40dp"
143+
android:layout_height="40dp"
141144
android:layout_marginTop="8dp"
145+
android:padding="8dp"
142146
app:layout_constraintEnd_toStartOf="@+id/imgGithub"
143147
app:layout_constraintHorizontal_bias="0.5"
144148
app:layout_constraintStart_toEndOf="@+id/imgMail"
@@ -147,10 +151,11 @@
147151

148152
<ImageView
149153
android:id="@+id/imgGithub"
150-
android:layout_width="24dp"
151-
android:layout_height="24dp"
154+
android:layout_width="40dp"
155+
android:layout_height="40dp"
152156
android:layout_marginStart="8dp"
153157
android:layout_marginTop="8dp"
158+
android:padding="8dp"
154159
app:layout_constraintEnd_toStartOf="@+id/imgWebsite"
155160
app:layout_constraintHorizontal_bias="0.5"
156161
app:layout_constraintStart_toEndOf="@+id/imgLinkedin"
@@ -162,6 +167,7 @@
162167
android:layout_width="wrap_content"
163168
android:layout_height="wrap_content"
164169
android:layout_marginTop="8dp"
170+
android:padding="8dp"
165171
app:layout_constraintEnd_toEndOf="@+id/textView10"
166172
app:layout_constraintHorizontal_bias="0.5"
167173
app:layout_constraintStart_toEndOf="@+id/imgGithub"
@@ -172,24 +178,24 @@
172178
android:id="@+id/textView18"
173179
android:layout_width="wrap_content"
174180
android:layout_height="wrap_content"
175-
android:layout_marginStart="8dp"
181+
android:layout_marginStart="16dp"
176182
android:layout_marginTop="16dp"
177183
android:text="App icon"
178184
android:textColor="@color/colorAccent"
179-
android:textSize="17sp"
185+
android:textSize="18sp"
180186
app:layout_constraintStart_toStartOf="parent"
181187
app:layout_constraintTop_toBottomOf="@+id/imgMail" />
182188

183189
<TextView
184190
android:id="@+id/textView19"
185191
android:layout_width="0dp"
186192
android:layout_height="wrap_content"
187-
android:layout_marginEnd="8dp"
188-
android:layout_marginStart="8dp"
193+
android:layout_marginStart="16dp"
189194
android:layout_marginTop="8dp"
195+
android:layout_marginEnd="16dp"
190196
android:text="Coffee by Nikita Tcherednikov from the Noun Project"
191197
android:textColor="@android:color/white"
192-
android:textSize="14sp"
198+
android:textSize="17sp"
193199
app:layout_constraintEnd_toEndOf="parent"
194200
app:layout_constraintHorizontal_bias="0.0"
195201
app:layout_constraintStart_toStartOf="parent"
@@ -199,7 +205,7 @@
199205
android:id="@+id/tvPrivacyPolicy"
200206
android:layout_width="wrap_content"
201207
android:layout_height="wrap_content"
202-
android:layout_marginStart="8dp"
208+
android:layout_marginStart="16dp"
203209
android:layout_marginTop="8dp"
204210
android:paddingTop="8dp"
205211
android:paddingBottom="8dp"
@@ -213,7 +219,7 @@
213219
android:id="@+id/tvLibraries"
214220
android:layout_width="wrap_content"
215221
android:layout_height="wrap_content"
216-
android:layout_marginStart="8dp"
222+
android:layout_marginStart="16dp"
217223
android:layout_marginTop="8dp"
218224
android:paddingTop="8dp"
219225
android:paddingBottom="8dp"

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

Lines changed: 44 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,55 +7,72 @@
77
android:orientation="vertical"
88
tools:context="com.marknkamau.justjava.ui.cart.CartActivity">
99

10-
<androidx.recyclerview.widget.RecyclerView
11-
android:id="@+id/rvCart"
12-
android:layout_width="0dp"
13-
android:layout_height="0dp"
14-
app:layout_constraintBottom_toTopOf="@+id/textView5"
10+
<com.google.android.material.button.MaterialButton
11+
android:id="@+id/btnClearCart"
12+
style="@style/AppTheme.SecondaryButton"
13+
android:layout_width="wrap_content"
14+
android:layout_height="wrap_content"
15+
android:layout_marginStart="8dp"
16+
android:layout_marginTop="8dp"
17+
android:layout_marginEnd="8dp"
18+
android:focusableInTouchMode="true"
19+
android:text="@string/clear_cart"
1520
app:layout_constraintEnd_toEndOf="parent"
1621
app:layout_constraintStart_toStartOf="parent"
17-
app:layout_constraintTop_toBottomOf="@+id/btnClearCart"
18-
tools:itemCount="15"
19-
tools:listitem="@layout/item_cart">
20-
21-
</androidx.recyclerview.widget.RecyclerView>
22+
app:layout_constraintTop_toTopOf="parent" />
2223

2324
<TextView
2425
android:id="@+id/tvNoItems"
2526
android:layout_width="wrap_content"
2627
android:layout_height="wrap_content"
27-
android:layout_marginBottom="8dp"
28-
android:layout_marginEnd="8dp"
2928
android:layout_marginStart="8dp"
3029
android:layout_marginTop="8dp"
30+
android:layout_marginEnd="8dp"
31+
android:layout_marginBottom="8dp"
3132
android:text="@string/there_are_no_items_in_your_cart"
3233
android:textAlignment="center"
3334
app:layout_constraintBottom_toBottomOf="parent"
3435
app:layout_constraintEnd_toEndOf="parent"
3536
app:layout_constraintStart_toStartOf="parent"
3637
app:layout_constraintTop_toTopOf="@+id/btnClearCart" />
3738

38-
<com.google.android.material.button.MaterialButton
39-
android:id="@+id/btnClearCart"
40-
style="@style/AppTheme.SecondaryButton"
41-
android:layout_width="wrap_content"
42-
android:layout_height="wrap_content"
43-
android:layout_marginStart="8dp"
44-
android:layout_marginEnd="8dp"
45-
android:focusableInTouchMode="true"
46-
android:text="@string/clear_cart"
39+
<androidx.recyclerview.widget.RecyclerView
40+
android:id="@+id/rvCart"
41+
android:layout_width="0dp"
42+
android:layout_height="0dp"
43+
app:layout_constraintBottom_toTopOf="@+id/textView5"
4744
app:layout_constraintEnd_toEndOf="parent"
4845
app:layout_constraintStart_toStartOf="parent"
49-
app:layout_constraintTop_toTopOf="parent" />
46+
app:layout_constraintTop_toBottomOf="@+id/btnClearCart"
47+
tools:itemCount="15"
48+
tools:listitem="@layout/item_cart">
49+
50+
</androidx.recyclerview.widget.RecyclerView>
51+
52+
<TextView
53+
android:id="@+id/textView5"
54+
android:layout_width="wrap_content"
55+
android:layout_height="wrap_content"
56+
android:layout_marginStart="16dp"
57+
android:layout_marginBottom="8dp"
58+
android:alpha=".87"
59+
android:text="@string/total"
60+
android:textColor="#000000"
61+
android:textSize="18sp"
62+
android:textStyle="bold"
63+
app:layout_constraintBottom_toTopOf="@+id/btnCheckout"
64+
app:layout_constraintStart_toStartOf="parent" />
5065

5166
<TextView
5267
android:id="@+id/tvCartTotal"
53-
style="@style/main_text"
5468
android:layout_width="wrap_content"
5569
android:layout_height="wrap_content"
70+
android:layout_marginEnd="16dp"
5671
android:layout_marginBottom="8dp"
57-
android:layout_marginEnd="8dp"
72+
android:alpha=".87"
5873
android:text="@string/total"
74+
android:textColor="#000000"
75+
android:textSize="18sp"
5976
android:textStyle="bold"
6077
android:visibility="visible"
6178
app:layout_constraintBottom_toTopOf="@+id/btnCheckout"
@@ -66,27 +83,15 @@
6683
style="@style/AppTheme.PrimaryButton"
6784
android:layout_width="0dp"
6885
android:layout_height="56dp"
69-
android:layout_marginBottom="8dp"
70-
android:layout_marginEnd="8dp"
71-
android:layout_marginStart="8dp"
86+
android:layout_marginStart="16dp"
87+
android:layout_marginEnd="16dp"
88+
android:layout_marginBottom="16dp"
7289
android:text="@string/proceed_to_checkout"
7390
android:textColor="@android:color/white"
7491
app:layout_constraintBottom_toBottomOf="parent"
7592
app:layout_constraintEnd_toEndOf="parent"
7693
app:layout_constraintStart_toStartOf="parent" />
7794

78-
<TextView
79-
android:id="@+id/textView5"
80-
style="@style/main_text"
81-
android:layout_width="wrap_content"
82-
android:layout_height="wrap_content"
83-
android:layout_marginBottom="8dp"
84-
android:layout_marginStart="8dp"
85-
android:text="@string/total"
86-
android:textStyle="bold"
87-
app:layout_constraintBottom_toTopOf="@+id/btnCheckout"
88-
app:layout_constraintStart_toStartOf="parent" />
89-
9095
<androidx.constraintlayout.widget.Group
9196
android:id="@+id/groupCartNotEmpty"
9297
android:layout_width="wrap_content"

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616

1717
<TextView
1818
android:id="@+id/textView2"
19-
style="@style/AppTheme.HeaderText"
2019
android:layout_width="wrap_content"
2120
android:layout_height="wrap_content"
22-
android:layout_marginStart="8dp"
23-
android:layout_marginTop="8dp"
21+
android:layout_marginStart="16dp"
22+
android:layout_marginTop="16dp"
23+
android:alpha=".87"
2424
android:text="@string/customer_details"
25+
android:textColor="#000000"
2526
app:layout_constraintStart_toStartOf="parent"
2627
app:layout_constraintTop_toTopOf="parent" />
2728

@@ -30,9 +31,9 @@
3031
style="@style/AppTheme.InputField"
3132
android:layout_width="0dp"
3233
android:layout_height="wrap_content"
33-
android:layout_marginLeft="8dp"
34+
android:layout_marginLeft="16dp"
3435
android:layout_marginTop="8dp"
35-
android:layout_marginRight="8dp"
36+
android:layout_marginRight="16dp"
3637
app:layout_constraintHorizontal_bias="0.0"
3738
app:layout_constraintLeft_toLeftOf="parent"
3839
app:layout_constraintRight_toRightOf="parent"
@@ -42,19 +43,19 @@
4243
android:id="@+id/etName"
4344
android:layout_width="match_parent"
4445
android:layout_height="match_parent"
45-
android:textSize="14sp"
4646
android:hint="@string/name"
47-
android:inputType="textPersonName"/>
47+
android:inputType="textPersonName"
48+
android:textSize="14sp" />
4849
</com.google.android.material.textfield.TextInputLayout>
4950

5051
<com.google.android.material.textfield.TextInputLayout
5152
android:id="@+id/tilPhone"
5253
style="@style/AppTheme.InputField"
5354
android:layout_width="0dp"
5455
android:layout_height="wrap_content"
55-
android:layout_marginLeft="8dp"
56+
android:layout_marginLeft="16dp"
5657
android:layout_marginTop="8dp"
57-
android:layout_marginRight="8dp"
58+
android:layout_marginRight="16dp"
5859
app:layout_constraintLeft_toLeftOf="parent"
5960
app:layout_constraintRight_toRightOf="parent"
6061
app:layout_constraintTop_toBottomOf="@+id/tilName">
@@ -73,9 +74,9 @@
7374
style="@style/AppTheme.InputField"
7475
android:layout_width="0dp"
7576
android:layout_height="wrap_content"
76-
android:layout_marginLeft="8dp"
77+
android:layout_marginLeft="16dp"
7778
android:layout_marginTop="8dp"
78-
android:layout_marginRight="8dp"
79+
android:layout_marginRight="16dp"
7980
app:layout_constraintLeft_toLeftOf="parent"
8081
app:layout_constraintRight_toRightOf="parent"
8182
app:layout_constraintTop_toBottomOf="@+id/tilPhone">
@@ -94,9 +95,9 @@
9495
style="@style/AppTheme.InputField"
9596
android:layout_width="0dp"
9697
android:layout_height="wrap_content"
97-
android:layout_marginLeft="8dp"
98+
android:layout_marginLeft="16dp"
9899
android:layout_marginTop="8dp"
99-
android:layout_marginRight="8dp"
100+
android:layout_marginRight="16dp"
100101
android:hint="@string/additional_comments"
101102
app:helperText="Optional"
102103
app:layout_constraintHorizontal_bias="0.0"
@@ -130,9 +131,9 @@
130131
style="@style/AppTheme.PrimaryButton"
131132
android:layout_width="0dp"
132133
android:layout_height="56dp"
133-
android:layout_marginLeft="8dp"
134-
android:layout_marginRight="8dp"
135-
android:layout_marginBottom="9dp"
134+
android:layout_marginLeft="16dp"
135+
android:layout_marginRight="16dp"
136+
android:layout_marginBottom="16dp"
136137
android:text="@string/place_order"
137138
android:textColor="@android:color/white"
138139
app:layout_constraintBottom_toBottomOf="parent"
@@ -141,10 +142,9 @@
141142

142143
<TextView
143144
android:id="@+id/textView"
144-
style="@style/AppTheme.HeaderText"
145145
android:layout_width="wrap_content"
146146
android:layout_height="wrap_content"
147-
android:layout_marginStart="8dp"
147+
android:layout_marginStart="16dp"
148148
android:layout_marginTop="16dp"
149149
android:text="@string/payment"
150150
app:layout_constraintStart_toStartOf="parent"
@@ -154,7 +154,7 @@
154154
android:id="@+id/rgPayment"
155155
android:layout_width="wrap_content"
156156
android:layout_height="wrap_content"
157-
android:layout_marginStart="8dp"
157+
android:layout_marginStart="16dp"
158158
android:layout_marginTop="8dp"
159159
app:layout_constraintStart_toStartOf="parent"
160160
app:layout_constraintTop_toBottomOf="@+id/textView">

0 commit comments

Comments
 (0)