From 13bea952121a025d99b4375c8dd70e289f5be2f4 Mon Sep 17 00:00:00 2001 From: Pratistha Date: Mon, 1 Mar 2021 00:05:14 +0530 Subject: [PATCH 1/6] cart button --- app/src/main/res/layout/activity_food_item.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/activity_food_item.xml b/app/src/main/res/layout/activity_food_item.xml index b20931b..56f4d6a 100644 --- a/app/src/main/res/layout/activity_food_item.xml +++ b/app/src/main/res/layout/activity_food_item.xml @@ -41,17 +41,16 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|start" - android:layout_margin="32dp" android:clickable="true" android:src="@drawable/cart_icon" app:backgroundTint="@color/colorPrimaryDark" app:fabSize="normal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.019" + app:layout_constraintHorizontal_bias="0.966" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.995" + app:layout_constraintVertical_bias="0.013" app:rippleColor="@color/colorAccent" app:tint="@android:color/white" /> From 2e3962ee694ab8e4aaa2b9189b1d2cc05dd15f09 Mon Sep 17 00:00:00 2001 From: Pratistha Date: Mon, 1 Mar 2021 13:17:07 +0530 Subject: [PATCH 2/6] edited spacing, font sizes and styles wherever required. --- .../main/res/layout/activity_add_address.xml | 17 +-- .../main/res/layout/activity_cart_main.xml | 17 ++- app/src/main/res/layout/activity_confirm.xml | 8 +- .../main/res/layout/activity_food_item.xml | 20 ++-- .../main/res/layout/activity_order_placed.xml | 20 ++-- app/src/main/res/layout/activity_orders.xml | 101 +++++++++--------- app/src/main/res/layout/activity_referral.xml | 17 ++- .../res/layout/activity_select_address.xml | 25 +++-- app/src/main/res/layout/activity_sign_up.xml | 19 ++-- .../bottom_sheet_layout_payment_mode.xml | 17 +-- app/src/main/res/layout/cart_item_layout.xml | 15 ++- .../main/res/layout/food_item_layout_2.xml | 19 ++-- app/src/main/res/layout/fragment_about_us.xml | 10 +- .../main/res/layout/fragment_contact_us.xml | 10 +- .../main/res/layout/fragment_edit_profile.xml | 27 ++--- .../layout/fragment_terms_and_condition.xml | 10 +- app/src/main/res/layout/header_layout.xml | 16 +-- .../main/res/layout/order_item_details.xml | 45 ++++---- 18 files changed, 213 insertions(+), 200 deletions(-) diff --git a/app/src/main/res/layout/activity_add_address.xml b/app/src/main/res/layout/activity_add_address.xml index 67b084e..6fc35fa 100644 --- a/app/src/main/res/layout/activity_add_address.xml +++ b/app/src/main/res/layout/activity_add_address.xml @@ -13,10 +13,10 @@ + @@ -88,14 +88,13 @@ + + android:text="Are you sure?" + android:textSize="26dp" /> @@ -38,6 +39,7 @@ android:layout_width="100dp" android:layout_height="wrap_content" android:text="No" + android:textColor="@android:color/white" android:layout_marginHorizontal="5dp" android:background="@drawable/button_rounded"/> diff --git a/app/src/main/res/layout/activity_food_item.xml b/app/src/main/res/layout/activity_food_item.xml index 56f4d6a..929133f 100644 --- a/app/src/main/res/layout/activity_food_item.xml +++ b/app/src/main/res/layout/activity_food_item.xml @@ -11,19 +11,19 @@ + app:layout_constraintBottom_toTopOf="@id/food_item_recycler" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + diff --git a/app/src/main/res/layout/activity_orders.xml b/app/src/main/res/layout/activity_orders.xml index 3366574..495f64b 100644 --- a/app/src/main/res/layout/activity_orders.xml +++ b/app/src/main/res/layout/activity_orders.xml @@ -12,67 +12,68 @@ android:layout_height="match_parent"> - - - - - - + + + - + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0"> + + + + app:layout_constraintTop_toBottomOf="@id/line" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> +