Add and Edit Font

whyfoo · Dec 17, 2021 · 22d0e94 · 22d0e94
1 parent 6b7f7f4
commit 22d0e94
Show file tree

Hide file tree

Showing 61 changed files with 165 additions and 82 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/res/font/lato_black.ttf b/app/src/main/res/font/lato_black.ttf
diff --git a/app/src/main/res/font/lato_black_italic.ttf b/app/src/main/res/font/lato_black_italic.ttf
diff --git a/app/src/main/res/font/lato_bold.ttf b/app/src/main/res/font/lato_bold.ttf
diff --git a/app/src/main/res/font/lato_bold_italic.ttf b/app/src/main/res/font/lato_bold_italic.ttf
diff --git a/app/src/main/res/font/lato_family.xml b/app/src/main/res/font/lato_family.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        android:fontStyle="normal"
+        android:fontWeight="400"
+        android:font="@font/lato_regular" />
+    <font
+        android:fontStyle="italic"
+        android:fontWeight="400"
+        android:font="@font/lato_italic" />
+</font-family>
diff --git a/app/src/main/res/font/lato_italic.ttf b/app/src/main/res/font/lato_italic.ttf
diff --git a/app/src/main/res/font/lato_light.ttf b/app/src/main/res/font/lato_light.ttf
diff --git a/app/src/main/res/font/lato_light_italic.ttf b/app/src/main/res/font/lato_light_italic.ttf
diff --git a/app/src/main/res/font/lato_regular.ttf b/app/src/main/res/font/lato_regular.ttf
diff --git a/app/src/main/res/font/lato_thin.ttf b/app/src/main/res/font/lato_thin.ttf
diff --git a/app/src/main/res/font/lato_thin_italic.ttf b/app/src/main/res/font/lato_thin_italic.ttf
diff --git a/app/src/main/res/font/nunito_black.ttf b/app/src/main/res/font/nunito_black.ttf
diff --git a/app/src/main/res/font/nunito_black_italic.ttf b/app/src/main/res/font/nunito_black_italic.ttf
diff --git a/app/src/main/res/font/nunito_bold.ttf b/app/src/main/res/font/nunito_bold.ttf
diff --git a/app/src/main/res/font/nunito_bold_italic.ttf b/app/src/main/res/font/nunito_bold_italic.ttf
diff --git a/app/src/main/res/font/nunito_extra_bold.ttf b/app/src/main/res/font/nunito_extra_bold.ttf
diff --git a/app/src/main/res/font/nunito_extra_bold_italic.ttf b/app/src/main/res/font/nunito_extra_bold_italic.ttf
diff --git a/app/src/main/res/font/nunito_extra_light.ttf b/app/src/main/res/font/nunito_extra_light.ttf
diff --git a/app/src/main/res/font/nunito_extra_light_italic.ttf b/app/src/main/res/font/nunito_extra_light_italic.ttf
diff --git a/app/src/main/res/font/nunito_family.xml b/app/src/main/res/font/nunito_family.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        android:fontStyle="normal"
+        android:fontWeight="400"
+        android:font="@font/nunito_regular" />
+    <font
+        android:fontStyle="italic"
+        android:fontWeight="400"
+        android:font="@font/nunito_italic" />
+</font-family>
diff --git a/app/src/main/res/font/nunito_italic.ttf b/app/src/main/res/font/nunito_italic.ttf
diff --git a/app/src/main/res/font/nunito_light.ttf b/app/src/main/res/font/nunito_light.ttf
diff --git a/app/src/main/res/font/nunito_light_italic.ttf b/app/src/main/res/font/nunito_light_italic.ttf
diff --git a/app/src/main/res/font/nunito_medium.ttf b/app/src/main/res/font/nunito_medium.ttf
diff --git a/app/src/main/res/font/nunito_medium_italic.ttf b/app/src/main/res/font/nunito_medium_italic.ttf
diff --git a/app/src/main/res/font/nunito_regular.ttf b/app/src/main/res/font/nunito_regular.ttf
diff --git a/app/src/main/res/font/nunito_semi_bold.ttf b/app/src/main/res/font/nunito_semi_bold.ttf
diff --git a/app/src/main/res/font/nunito_semi_bold_italic.ttf b/app/src/main/res/font/nunito_semi_bold_italic.ttf
diff --git a/app/src/main/res/font/roboto_black.ttf b/app/src/main/res/font/roboto_black.ttf
diff --git a/app/src/main/res/font/roboto_black_italic.ttf b/app/src/main/res/font/roboto_black_italic.ttf
diff --git a/app/src/main/res/font/roboto_bold.ttf b/app/src/main/res/font/roboto_bold.ttf
diff --git a/app/src/main/res/font/roboto_bold_italic.ttf b/app/src/main/res/font/roboto_bold_italic.ttf
diff --git a/app/src/main/res/font/roboto_family.xml b/app/src/main/res/font/roboto_family.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        android:fontStyle="normal"
+        android:fontWeight="400"
+        android:font="@font/roboto_regular" />
+    <font
+        android:fontStyle="italic"
+        android:fontWeight="400"
+        android:font="@font/roboto_italic" />
+</font-family>
diff --git a/app/src/main/res/font/roboto_italic.ttf b/app/src/main/res/font/roboto_italic.ttf
diff --git a/app/src/main/res/font/roboto_light.ttf b/app/src/main/res/font/roboto_light.ttf
diff --git a/app/src/main/res/font/roboto_light_italic.ttf b/app/src/main/res/font/roboto_light_italic.ttf
diff --git a/app/src/main/res/font/roboto_medium.ttf b/app/src/main/res/font/roboto_medium.ttf
diff --git a/app/src/main/res/font/roboto_medium_italic.ttf b/app/src/main/res/font/roboto_medium_italic.ttf
diff --git a/app/src/main/res/font/roboto_regular.ttf b/app/src/main/res/font/roboto_regular.ttf
diff --git a/app/src/main/res/font/roboto_thin.ttf b/app/src/main/res/font/roboto_thin.ttf
diff --git a/app/src/main/res/font/roboto_thin_italic.ttf b/app/src/main/res/font/roboto_thin_italic.ttf
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -24,6 +24,7 @@
             android:textSize="36sp"
             android:textStyle="bold"
             android:textColor="@color/purple"
+            android:fontFamily="@font/lato_family"
             android:layout_margin="25dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"

diff --git a/app/src/main/res/layout/activity_checkout.xml b/app/src/main/res/layout/activity_checkout.xml
@@ -32,6 +32,7 @@
             android:text="@string/checkout"
             android:textSize="20sp"
             android:textColor="@color/white"
+            android:fontFamily="@font/nunito_family"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
@@ -54,6 +55,7 @@
             android:textSize="20sp"
             android:textStyle="bold"
             android:textColor="@color/white"
+            android:fontFamily="@font/nunito_family"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
@@ -116,6 +118,7 @@
             android:textSize="20sp"
             android:textStyle="bold"
             android:textColor="@color/white"
+            android:fontFamily="@font/nunito_family"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
@@ -213,6 +216,7 @@
                     android:text="@string/grand_total"
                     android:textSize="18sp"
                     android:textColor="@color/white"
+                    android:fontFamily="@font/nunito_family"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
@@ -223,8 +227,9 @@
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:text="@string/grand_total_price_dummy"
-                    android:textColor="@color/white"
                     android:textSize="18sp"
+                    android:textColor="@color/white"
+                    android:fontFamily="@font/nunito_family"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
@@ -238,6 +243,8 @@
                 android:layout_height="50dp"
                 android:text="@string/pay"
                 android:textColor="@color/bgc"
+                android:textStyle="bold"
+                android:fontFamily="@font/nunito_family"
                 android:layout_margin="15dp"
                 android:background="@drawable/rounded_button"
                 app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml
@@ -12,42 +12,40 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/bgc"
         android:gravity="center"
-        android:orientation="vertical"
-        android:background="@color/bgc">
+        android:orientation="vertical">
 
         <ImageView
             android:id="@+id/image_view_profile"
             android:layout_width="150dp"
             android:layout_height="150dp"
             android:layout_margin="5dp"
-            android:src="@drawable/profile"
-            android:contentDescription="@string/profile_picture" />
+            android:contentDescription="@string/profile_picture"
+            android:src="@drawable/profile" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/text_field_username"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="25dp"
-            android:gravity="center"
-            >
+            android:gravity="center">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edit_text_username"
                 android:layout_width="300dp"
                 android:layout_height="35dp"
-                android:inputType="text"
-                android:hint="@string/username"
-                android:textColorHint="@color/grey"
+                android:autofillHints="Name"
                 android:background="@drawable/rounded_edittext"
+                android:hint="@string/username"
+                android:inputType="text"
                 android:paddingStart="10dp"
+                android:textColorHint="@color/grey"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                android:autofillHints="Name"
-                tools:ignore="RtlSymmetry"
-                />
+                tools:ignore="RtlSymmetry" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -56,25 +54,23 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="25dp"
-            android:gravity="center"
-            >
+            android:gravity="center">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edit_text_email"
                 android:layout_width="300dp"
                 android:layout_height="35dp"
-                android:inputType="textEmailAddress"
-                android:hint="@string/email"
-                android:textColorHint="@color/grey"
+                android:autofillHints="Email"
                 android:background="@drawable/rounded_edittext"
+                android:hint="@string/email"
+                android:inputType="textEmailAddress"
                 android:paddingStart="10dp"
+                android:textColorHint="@color/grey"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                android:autofillHints="Email"
-                tools:ignore="RtlSymmetry"
-                />
+                tools:ignore="RtlSymmetry" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -83,25 +79,23 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="25dp"
-            android:gravity="center"
-            >
+            android:gravity="center">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edit_text_password"
                 android:layout_width="300dp"
                 android:layout_height="35dp"
-                android:inputType="textPassword"
-                android:hint="@string/password"
-                android:textColorHint="@color/grey"
+                android:autofillHints="Password"
                 android:background="@drawable/rounded_edittext"
+                android:hint="@string/password"
+                android:inputType="textPassword"
                 android:paddingStart="10dp"
+                android:textColorHint="@color/grey"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                android:autofillHints="Password"
-                tools:ignore="RtlSymmetry"
-                />
+                tools:ignore="RtlSymmetry" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -110,25 +104,23 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="25dp"
-            android:gravity="center"
-            >
+            android:gravity="center">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edit_text_new_password"
                 android:layout_width="300dp"
                 android:layout_height="35dp"
-                android:inputType="textPassword"
-                android:hint="@string/new_password"
-                android:textColorHint="@color/grey"
+                android:autofillHints="New Password"
                 android:background="@drawable/rounded_edittext"
+                android:hint="@string/new_password"
+                android:inputType="textPassword"
                 android:paddingStart="10dp"
+                android:textColorHint="@color/grey"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                android:autofillHints="New Password"
-                tools:ignore="RtlSymmetry"
-                />
+                tools:ignore="RtlSymmetry" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -137,41 +129,40 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="25dp"
-            android:gravity="center"
-            >
+            android:gravity="center">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edit_text_retype_password"
                 android:layout_width="300dp"
                 android:layout_height="35dp"
-                android:inputType="textPassword"
-                android:hint="@string/retype_password"
-                android:textColorHint="@color/grey"
+                android:autofillHints="Retype Password"
                 android:background="@drawable/rounded_edittext"
+                android:hint="@string/retype_password"
+                android:inputType="textPassword"
                 android:paddingStart="10dp"
+                android:textColorHint="@color/grey"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                android:autofillHints="Retype Password"
-                tools:ignore="RtlSymmetry"
-                />
+                tools:ignore="RtlSymmetry" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
         <Button
             android:id="@+id/button_save"
             android:layout_width="300dp"
             android:layout_height="35dp"
-            android:text="@string/save"
-            android:textColor="@color/bgc"
             android:layout_marginTop="25dp"
             android:background="@drawable/rounded_button"
+            android:text="@string/save"
+            android:textStyle="bold"
+            android:textColor="@color/bgc"
+            android:fontFamily="@font/nunito_family"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            />
+            app:layout_constraintTop_toTopOf="parent" />
 
     </LinearLayout>
 

diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
@@ -24,6 +24,7 @@
             android:textSize="36sp"
             android:textStyle="bold"
             android:textColor="@color/purple"
+            android:fontFamily="@font/lato_family"
             android:layout_margin="25dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"

diff --git a/app/src/main/res/layout/activity_home_failed.xml b/app/src/main/res/layout/activity_home_failed.xml
@@ -24,6 +24,7 @@
             android:textSize="36sp"
             android:textStyle="bold"
             android:textColor="@color/pink"
+            android:fontFamily="@font/lato_family"
             android:layout_marginBottom="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -37,7 +38,7 @@
             android:layout_height="250dp"
             android:layout_margin="5dp"
             android:src="@drawable/cross"
-            />
+            android:contentDescription="@string/failed" />
 
         <TextView
             android:id="@+id/text_view_failed"
@@ -46,6 +47,7 @@
             android:text="@string/click_here_to_retry"
             android:textSize="20sp"
             android:textColor="@color/pink"
+            android:fontFamily="@font/nunito_family"
             android:layout_marginBottom="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"

diff --git a/app/src/main/res/layout/activity_home_success.xml b/app/src/main/res/layout/activity_home_success.xml
@@ -24,6 +24,7 @@
             android:textSize="36sp"
             android:textStyle="bold"
             android:textColor="@color/pink"
+            android:fontFamily="@font/lato_family"
             android:layout_marginBottom="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -37,7 +38,7 @@
             android:layout_height="250dp"
             android:layout_margin="5dp"
             android:src="@drawable/checklist"
-            />
+            android:contentDescription="@string/success" />
 
         <TextView
             android:id="@+id/text_view_success"
@@ -46,6 +47,7 @@
             android:text="@string/happy_shopping"
             android:textSize="20sp"
             android:textColor="@color/pink"
+            android:fontFamily="@font/nunito_family"
             android:layout_marginBottom="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"