fixing layout

app/src/main/java/com/example/yourcashiertest/activities/ProductActivity.java

@@ -174,6 +174,14 @@ public class ProductActivity extends AppCompatActivity{
         onBackPressed();
         return super.onSupportNavigateUp();
     }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        startActivity(new Intent(ProductActivity.this, MainActivity.class));
+        finish();
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();

app/src/main/res/font/wellfleet.xml

+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:fontProviderAuthority="com.google.android.gms.fonts"
+        app:fontProviderPackage="com.google.android.gms"
+        app:fontProviderQuery="Wellfleet"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>

app/src/main/res/layout/activity_order.xml

@@ -17,14 +17,12 @@
             android:id="@+id/tvListOrder"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:fontFamily="@font/wellfleet"
             android:gravity="top"
-            android:layout_marginBottom="4dp"
-            android:text="TRANSACTION LIST"
+            android:text="Transaction List"
             android:textAppearance="@style/payment"
-            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.105" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageButton
             android:id="@+id/btnFilter"
@@ -38,35 +36,6 @@
             app:layout_constraintStart_toEndOf="@+id/tvListOrder"
             app:layout_constraintTop_toTopOf="@+id/tvListOrder" />
 
-
-<!--        <com.google.android.material.button.MaterialButton-->
-<!--            android:id="@+id/btnPending"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginEnd="5dp"-->
-<!--            android:text="PENDING"-->
-<!--            android:textSize="10dp"-->
-<!--            android:backgroundTint="@color/colorPending"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintEnd_toStartOf="@+id/btnSuccess"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/tvListOrder"-->
-<!--            app:layout_constraintBottom_toTopOf="@id/rvListOrder"-->
-<!--            tools:layout_editor_absoluteX="16dp"-->
-<!--            tools:layout_editor_absoluteY="654dp" />-->
-
-<!--        <com.google.android.material.button.MaterialButton-->
-<!--            android:id="@+id/btnSuccess"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginStart="5dp"-->
-<!--            android:text="SUCCESS"-->
-<!--            android:textSize="10dp"-->
-<!--            app:layout_constraintStart_toEndOf="@+id/btnPending"-->
-<!--            app:layout_constraintBottom_toTopOf="@id/rvListOrder"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/tvListOrder"-->
-<!--            app:layout_constraintVertical_bias="0.0" />-->
-
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvListOrder"
             android:layout_width="match_parent"

app/src/main/res/layout/item_order.xml

@@ -21,6 +21,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:cardElevation="3dp"
         android:layout_margin="5dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -34,8 +35,6 @@
                 android:id="@+id/tvOrderNumber"
                 android:layout_width="136dp"
                 android:layout_height="41dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true"
                 android:layout_marginStart="4dp"
                 android:layout_marginTop="4dp"
                 android:text="Order Number : "
@@ -48,22 +47,17 @@
                 android:id="@+id/tvOrderId"
                 android:layout_width="250dp"
                 android:layout_height="41dp"
-                android:text="@{transaction.orderId + ``}"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true"
                 android:layout_marginStart="4dp"
-                android:layout_marginTop="4dp"
+                android:text="@{transaction.orderId + ``}"
                 android:textAppearance="@style/some_id"
+                app:layout_constraintBottom_toBottomOf="@+id/tvOrderNumber"
                 app:layout_constraintStart_toEndOf="@id/tvOrderNumber"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:layout_editor_absoluteX="169dp" />
+                app:layout_constraintTop_toTopOf="@+id/tvOrderNumber" />
 
             <TextView
                 android:id="@+id/tvTotal"
                 android:layout_width="136dp"
                 android:layout_height="41dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true"
                 android:layout_marginStart="4dp"
                 android:layout_marginTop="4dp"
                 android:text="Total                 : "
@@ -75,29 +69,26 @@
                 android:id="@+id/tvAmount"
                 android:layout_width="250dp"
                 android:layout_height="41dp"
-                android:text="@{amount}"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true"
                 android:layout_marginStart="4dp"
-                android:layout_marginTop="4dp"
+                android:text="@{amount}"
                 android:textAppearance="@style/some_id"
+                app:layout_constraintBottom_toBottomOf="@+id/tvTotal"
                 app:layout_constraintStart_toEndOf="@id/tvTotal"
-                app:layout_constraintTop_toBottomOf="@id/tvOrderId"
-                tools:layout_editor_absoluteX="169dp"/>
+                app:layout_constraintTop_toBottomOf="@+id/tvOrderNumber" />
 
             <TextView
                 android:id="@+id/tvStatus"
                 android:layout_width="0dp"
                 android:layout_height="41dp"
                 android:layout_marginStart="4dp"
-                android:layout_marginTop="4dp"
                 android:gravity="center"
-                android:textColor="@{visibility ? @color/colorPending : @color/colorPrimary}"
                 android:text="@{transaction.status}"
+                android:textColor="@{visibility ? @color/colorPending : @color/colorPrimary}"
                 android:textStyle="bold"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/btnContinue"
-                app:layout_constraintTop_toBottomOf="@+id/tvTotal" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/btnContinue" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnContinue"

app/src/main/res/values/preloaded_fonts.xml

@@ -4,5 +4,6 @@
         <item>@font/allerta</item>
         <item>@font/carter_one</item>
         <item>@font/roboto_bold</item>
+        <item>@font/wellfleet</item>
     </array>
 </resources>