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

Complete shipper app

Browse Source
This commit is contained in:
Nezumi
2023-04-07 11:18:57 +07:00
parent 07aa4da787
commit 068b8bf98c
9 changed files with 107 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_main.xml
-21
View File
@@ -32,25 +32,4 @@
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#80000000"
android:id="@+id/progress_layout"
android:visibility="visible"
>
<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_order_detail.xml
+22 -3
View File
@@ -64,7 +64,7 @@
<TextView
android:id="@+id/textView2"
android:text="Thông tin người giao"
android:text="Thông tin người nhận"
android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:fontFamily="@font/bebas"
@@ -258,7 +258,7 @@
<TextView
android:id="@+id/txt_distance"
android:text="10 km"
android:text="- km"
android:fontFamily="@font/opensans"
android:textStyle="bold"
android:layout_marginTop="5dp"
@@ -362,6 +362,7 @@
app:layout_constraintEnd_toEndOf="parent"
android:drawableLeft="@drawable/baseline_local_shipping_24"
android:drawableTint="@color/white"
android:visibility="gone"
/>
<LinearLayout
@@ -373,7 +374,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginTop="20dp"
android:visibility="gone"
android:visibility="visible"
>
@@ -412,6 +413,24 @@
android:drawableLeft="@drawable/baseline_verified_24"
android:drawableTint="@color/white"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_cancel_order"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:backgroundTint="@color/red"
android:layout_marginTop="10dp"
android:layout_gravity="center"
android:fontFamily="@font/opensans"
android:gravity="center"
android:textStyle="bold"
android:text="Không giao được"
android:textAllCaps="false"
android:textColor="@color/white"
app:iconGravity="textStart"
android:drawableLeft="@drawable/baseline_cancel_24"
android:drawableTint="@color/white"/>
</LinearLayout>