nezumi/Foodify-Shipper
1
0
Fork 0
mirror of https://github.com/Nezumi-2711/Foodify-Shipper.git synced 2026-09-22 20:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update function, UI

Browse Source
This commit is contained in:
Nezumi
2023-04-16 10:16:55 +07:00
parent e8c1cb4d5c
commit d42ff1fbb7
26 changed files with 833 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_forgot_password.xml
+119
View File
@@ -0,0 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Activity.ForgotPasswordActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="false"
>
<ImageView
android:id="@+id/back_image"
android:layout_width="40dp"
android:layout_height="40dp"
android:padding="8dp"
android:layout_marginStart="5dp"
android:layout_marginTop="20dp"
android:src="@drawable/back_button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="90dp"
android:fontFamily="@font/bebas"
android:text="Quên mật khẩu?"
android:textColor="@color/black"
android:textSize="50sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/back_image" />
<TextView
android:id="@+id/forgot_Password_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Vui lòng nhập địa chỉ email vào ô dưới đây để tiến hành đặt lại mật khẩu của bạn."
android:fontFamily="@font/opensans"
android:textColor="@color/gray"
android:textStyle="bold"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="25dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView"
app:layout_constraintEnd_toEndOf="parent"
/>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textInput_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="40dp"
android:layout_marginTop="50dp"
android:hint="Email"
app:boxBackgroundColor="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:startIconDrawable="@drawable/baseline_email_24"
app:startIconTint="@color/primaryColor">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edt_email"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:inputType="textEmailAddress" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/send_code_button"
style="@style/DefaultSolid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/bebas"
android:padding="10dp"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
android:layout_marginTop="30dp"
android:text="Gửi email"
android:textSize="20sp"
app:layout_constraintTop_toBottomOf="@+id/textInput_email" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#80000000"
android:id="@+id/progress_layout"
android:clickable="true"
android:visibility="gone"
>
<ProgressBar
android:id="@+id/progressBarLoadData"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminateTint="@color/primaryColor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/activity_sign_in.xml
+16 -3
View File
@@ -61,7 +61,7 @@
android:fontFamily="@font/bebas"
android:textSize="35sp"
android:textColor="@color/black"
android:layout_marginTop="40dp"
android:layout_marginTop="30dp"
android:layout_marginEnd="15dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -74,7 +74,7 @@
android:id="@+id/textInput_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginTop="50dp"
android:layout_marginRight="20dp"
android:layout_marginLeft="20dp"
android:layout_marginBottom="10dp"
@@ -118,6 +118,19 @@
</com.google.android.material.textfield.TextInputLayout>
<TextView
android:id="@+id/txt_forgot_password"
android:fontFamily="@font/opensans"
android:textStyle="bold"
android:text="Quên mật khẩu?"
android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/textInput_password"
/>
<com.google.android.material.button.MaterialButton
android:id="@+id/sign_in_button"
android:text="Đăng nhập"
@@ -125,7 +138,7 @@
android:fontFamily="@font/bebas"
style="@style/DefaultSolid"
android:backgroundTint="@color/primaryColor"
android:layout_marginTop="30dp"
android:layout_marginTop="80dp"
android:layout_marginStart="50dp"
android:layout_marginEnd="50dp"
android:layout_width="match_parent"
app/src/main/res/layout/fragment_waiting_order.xml → app/src/main/res/layout/fragment_cancel.xml
+2 -3
View File
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".Fragment.Order.AwaitingOrder"
tools:context=".Fragment.Order.CancelOrder"
>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
app/src/main/res/layout/fragment_completed_order.xml
+1 -1
View File
@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".Fragment.Order.AwaitingOrder"
tools:context=".Fragment.Order.ConfirmedOrder"
>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
app/src/main/res/layout/fragment_shipping.xml → app/src/main/res/layout/fragment_confirmed_order.xml
+3 -2
View File
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Fragment.Order.ShippingFragment"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".Fragment.Order.ConfirmedOrder"
>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
app/src/main/res/layout/fragment_order.xml
+141 -7
View File
@@ -19,24 +19,158 @@
android:textColor="@color/black"
android:text="Xin chào, Nguyễn Văn A!"
android:layout_marginTop="30dp"
android:layout_marginStart="20dp"
android:layout_marginStart="15dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
app:layout_constraintTop_toBottomOf="@id/welcome_text"
android:orientation="vertical"
android:id="@+id/order_shipping_layout"
android:visibility="gone"
>
<TextView
android:text="Đơn hàng đang giao"
android:fontFamily="@font/bebas"
android:textColor="@color/black"
android:textSize="20sp"
android:layout_marginStart="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardElevation="5dp"
app:cardUseCompatPadding="true"
app:cardCornerRadius="10dp"
android:id="@+id/card_view_order_shipping"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_weight="0.9"
>
<TextView
android:id="@+id/order_tracking_number"
android:text="Order #123456789"
android:fontFamily="@font/bebas"
android:textColor="@color/primaryColor"
android:textSize="23sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
/>
<TextView
android:id="@+id/user_name"
android:text="Tên: Nguyễn Văn A"
android:textSize="13sp"
android:fontFamily="@font/opensans"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/order_tracking_number"
app:layout_constraintStart_toStartOf="parent"
/>
<TextView
android:id="@+id/phone"
android:text="Số điện thoại: 0987654321"
android:textSize="13sp"
android:fontFamily="@font/opensans"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/user_name"
app:layout_constraintStart_toStartOf="parent"
/>
<TextView
android:id="@+id/address"
android:text="Địa chỉ nhận hàng: Hẻm 215, đường Phạm Như Xương, phường Hoà Khánh Nam, quận Liên Chiểu"
android:textSize="13sp"
android:fontFamily="@font/opensans"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/phone"
app:layout_constraintStart_toStartOf="parent"
/>
<TextView
android:id="@+id/order_time"
android:text="Thời gian đặt: 14:05 02/02/2023"
android:textSize="13sp"
android:fontFamily="@font/opensans"
android:textStyle="italic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/address"
app:layout_constraintStart_toStartOf="parent"
/>
<TextView
android:id="@+id/total"
android:text="Tổng đơn hàng: 1.200.000"
android:textSize="17sp"
android:fontFamily="@font/opensans"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
app:layout_constraintTop_toBottomOf="@id/order_time"
app:layout_constraintStart_toStartOf="parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:src="@drawable/back_button"
android:rotation="180"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.1"
android:layout_gravity="center"
/>
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
<TextView
android:id="@+id/textView2"
android:textSize="20sp"
android:fontFamily="@font/bebas"
android:textColor="@color/black"
android:text="Danh sách các đơn hàng"
android:layout_marginTop="30dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:layout_marginStart="15dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/welcome_text"
app:layout_constraintTop_toBottomOf="@id/order_shipping_layout"
app:layout_constraintStart_toStartOf="parent"
/>
@@ -66,17 +200,17 @@
>
<com.google.android.material.tabs.TabItem
android:text="CẦN GIAO"
android:text="Cần giao"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<com.google.android.material.tabs.TabItem
android:text="ĐANG GIAO"
android:text="Đã giao"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<com.google.android.material.tabs.TabItem
android:text="ĐÃ GIAO"
android:text="Đơn huỷ"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</com.google.android.material.tabs.TabLayout>
app/src/main/res/layout/fragment_profile.xml
+45 -1
View File
@@ -225,6 +225,50 @@
</LinearLayout>
<LinearLayout
android:id="@+id/feedback"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
app:layout_constraintTop_toBottomOf="@id/change_information"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:orientation="horizontal"
>
<ImageView
android:id="@+id/ic_feedback"
android:src="@drawable/feedback"
android:layout_width="24dp"
android:layout_height="24dp"
tools:ignore="ContentDescription"
app:tint="@color/primaryColor"
/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="12dp"
android:layout_weight="1"
android:fontFamily="@font/opensans"
android:text="Đóng góp ý kiến"
android:textColor="@color/black"
android:textSize="18sp"
tools:ignore="HardcodedText" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:rotation="180"
android:src="@drawable/back_button"
tools:ignore="ContentDescription" />
</LinearLayout>
<LinearLayout
android:id="@+id/log_out"
android:layout_width="match_parent"
@@ -234,7 +278,7 @@
android:layout_marginEnd="20dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/change_information"
app:layout_constraintTop_toBottomOf="@id/feedback"
android:orientation="horizontal"
>