Merge cart

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

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

@@ -15,19 +15,88 @@
         android:id="@+id/rvCart"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@id/btCheckout"
+        android:layout_above="@id/cardview"
         android:layout_below="@id/cAppBar"
         android:overScrollMode="never"
         app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         tools:listitem="@layout/item_cart" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btCheckout"
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/cardview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:background="@color/colorPrimary"
-        android:gravity="center"
-        android:text="@string/title_checkout" />
+        app:cardElevation="0dp"
+        android:backgroundTint="#45EAEAEA"
+        android:layout_alignParentBottom="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:paddingTop="15dp"
+        android:paddingBottom="10dp"
+        android:paddingHorizontal="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/tvCheckout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:fontFamily="@font/roboto"
+            android:text="Total"
+            android:textColor="#000"
+            android:textFontWeight="600"
+            android:textSize="24sp"
+            app:layout_constraintBottom_toTopOf="@+id/btSave"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/tvHarga"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Rp. 600"
+            android:textSize="24sp"
+            android:textColor="#000"
+            android:textFontWeight="600"
+            android:layout_marginEnd="15dp"
+            app:layout_constraintBottom_toTopOf="@id/btCheckout"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btSave"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:backgroundTint="#FB8C00"
+            android:gravity="center"
+            android:text="save"
+            android:textAllCaps="true"
+            android:layout_marginEnd="5dp"
+            android:textColor="@android:color/white"
+            android:textStyle="bold"
+            android:paddingVertical="15dp"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"/>
+
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btCheckout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:backgroundTint="@color/colorPrimary"
+            android:gravity="center"
+            android:text="@string/title_checkout"
+            android:textAllCaps="true"
+            android:textColor="@android:color/white"
+            android:layout_marginStart="5dp"
+            android:textStyle="bold"
+            android:paddingVertical="15dp"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/btSave" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.card.MaterialCardView>
 
 </RelativeLayout>

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

@@ -14,8 +14,6 @@
         android:layout_height="match_parent"
         tools:context=".MainActivity">
 
-
-
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/topBar"
             android:layout_width="match_parent"
@@ -29,10 +27,10 @@
                 android:id="@+id/topAppBar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/gradient"
+                android:background="@color/colorPrimary"
                 app:menu="@menu/home"
                 android:elevation="0dp"
-                app:navigationIcon="@drawable/logo"
+                app:navigationIcon="@drawable/logo_32"
                 style="@style/Widget.MaterialComponents.Toolbar.Primary"
                 >
 

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

@@ -40,7 +40,6 @@
                     android:id="@+id/image_cat"
                     android:layout_width="30dp"
                     android:layout_height="50dp"
-                    android:layout_marginStart="10dp"
                     android:src="@drawable/ic_meser"/>
 
                 <TextView