From 0bcbbbfca588216fb58467d311ca7692c8e43443 Mon Sep 17 00:00:00 2001
From: phanhuuloi27 <73208452+Nezumi2711@users.noreply.github.com>
Date: Tue, 5 Jul 2022 10:24:27 +0700
Subject: [PATCH] Improve Layout

---
 .../com/waterbase/foodify/Common/Common.java  |   7 ++++
 .../com/waterbase/foodify/OrderStatus.java    |   2 +-
 Foodify/app/src/main/res/drawable/avatar.png  | Bin 0 -> 18906 bytes
 .../app/src/main/res/layout/activity_home.xml |   6 +--
 .../src/main/res/layout/nav_header_home.xml   |   8 ++--
 .../foodifyServer/Common/Common.java          |   7 ++++
 .../waterbase/foodifyServer/OrderStatus.java  |  33 ++++++++++++---
 .../main/res/layout/update_order_layout.xml   |  39 ++++++++++++++++--
 .../app/src/main/res/values/colors.xml        |   1 +
 9 files changed, 86 insertions(+), 17 deletions(-)
 create mode 100644 Foodify/app/src/main/res/drawable/avatar.png

diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/Common/Common.java b/Foodify/app/src/main/java/com/waterbase/foodify/Common/Common.java
index 23ee1c7..3351d25 100644
--- a/Foodify/app/src/main/java/com/waterbase/foodify/Common/Common.java
+++ b/Foodify/app/src/main/java/com/waterbase/foodify/Common/Common.java
@@ -46,6 +46,13 @@ public class Common {
             return "Giao thành công";
     }
 
+    public static String convertCodePaymentToStatus(String status) {
+        if(status.equals("0"))
+            return "CHƯA THANH TOÁN";
+        else
+            return "ĐÃ THANH TOÁN";
+    }
+
     public static boolean isConnectedToInternet(Context context) {
         ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
 
diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/OrderStatus.java b/Foodify/app/src/main/java/com/waterbase/foodify/OrderStatus.java
index 75ba3cd..9b3d1ed 100644
--- a/Foodify/app/src/main/java/com/waterbase/foodify/OrderStatus.java
+++ b/Foodify/app/src/main/java/com/waterbase/foodify/OrderStatus.java
@@ -99,7 +99,7 @@ public class OrderStatus extends AppCompatActivity {
                 orderViewHolder.txtOrderStatus.setText("Tình trạng đơn: " + Common.convertCodeToStatus(model.getStatus()));
                 orderViewHolder.txtOrderAddress.setText("Địa chỉ: " + model.getAddress());
                 orderViewHolder.txtOrderDate.setText("Ngày đặt: " + Common.getDate(Long.parseLong(adapter.getRef(i).getKey())));
-                orderViewHolder.txtOrderPayment.setText("Tình trạng thanh toán: " + model.getPaymentStatus());
+                orderViewHolder.txtOrderPayment.setText("Tình trạng thanh toán: " + Common.convertCodePaymentToStatus(model.getPaymentStatus()));
                 orderViewHolder.btn_delete.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
diff --git a/Foodify/app/src/main/res/drawable/avatar.png b/Foodify/app/src/main/res/drawable/avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..d713c6f3e939e291a036ad4aee23ea6deaca0383
GIT binary patch
literal 18906
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

literal 0
HcmV?d00001

diff --git a/Foodify/app/src/main/res/layout/activity_home.xml b/Foodify/app/src/main/res/layout/activity_home.xml
index 098e750..0f7c356 100644
--- a/Foodify/app/src/main/res/layout/activity_home.xml
+++ b/Foodify/app/src/main/res/layout/activity_home.xml
@@ -20,12 +20,12 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:background="@color/overlayBackground"
+        android:background="@color/white"
         android:fitsSystemWindows="true"
         app:headerLayout="@layout/nav_header_home"
 
-        app:itemIconTint="@color/white"
-        app:itemTextColor="@color/white"
+        app:itemIconTint="@color/black"
+        app:itemTextColor="@color/black"
         app:menu="@menu/activity_main_drawer" />
 
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/Foodify/app/src/main/res/layout/nav_header_home.xml b/Foodify/app/src/main/res/layout/nav_header_home.xml
index ba00046..9e085db 100644
--- a/Foodify/app/src/main/res/layout/nav_header_home.xml
+++ b/Foodify/app/src/main/res/layout/nav_header_home.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height"
-    android:background="@color/fbutton_color_transparent"
+    android:background="@color/purple_500"
     android:gravity="bottom"
     android:orientation="vertical"
     android:paddingLeft="@dimen/activity_horizontal_margin"
@@ -14,11 +14,11 @@
 
     <ImageView
         android:id="@+id/imageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
         android:contentDescription="@string/nav_header_desc"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
-        app:srcCompat="@mipmap/ic_launcher_round" />
+        app:srcCompat="@drawable/avatar" />
 
     <TextView
         android:id="@+id/txtFullName"
diff --git a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Common/Common.java b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Common/Common.java
index 1dffcff..fecd11b 100644
--- a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Common/Common.java
+++ b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Common/Common.java
@@ -45,6 +45,13 @@ public class Common {
             return "Giao thành công";
     }
 
+    public static String coverCodePaymentToStatus(String code){
+        if(code.equals("0"))
+            return "CHƯA THANH TOÁN";
+        else
+            return "ĐÃ THANH TOÁN";
+    }
+
     public static IGeoCoordinates getGeoCodeService() {
         return RetrofitClient.getClient(baseUrl).create(IGeoCoordinates.class);
     }
diff --git a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/OrderStatus.java b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/OrderStatus.java
index d26e8ee..1a86ce0 100644
--- a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/OrderStatus.java
+++ b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/OrderStatus.java
@@ -48,7 +48,7 @@ public class OrderStatus extends AppCompatActivity {
     FirebaseDatabase db;
     DatabaseReference requests;
 
-    MaterialSpinner spinner;
+    MaterialSpinner spinnerOrder, spinnerPayment;
 
     APIService mService;
 
@@ -89,7 +89,7 @@ public class OrderStatus extends AppCompatActivity {
                 viewHolder.txtOrderStatus.setText("Tình trạng đơn: " + Common.coverCodeToStatus(model.getStatus()));
                 viewHolder.txtOrderAddress.setText("Địa chỉ giao hàng: " + model.getAddress());
                 viewHolder.txtOrderPhone.setText("Số điện thoại giao hàng: " + model.getPhone());
-                viewHolder.txtOrderPayment.setText("Tình trạng thanh toán: " + model.getPaymentStatus());
+                viewHolder.txtOrderPayment.setText("Tình trạng thanh toán: " + Common.coverCodePaymentToStatus(model.getPaymentStatus()));
 
 
 
@@ -167,8 +167,8 @@ public class OrderStatus extends AppCompatActivity {
         LayoutInflater inflater = this.getLayoutInflater();
         final View view = inflater.inflate(R.layout.update_order_layout, null);
 
-        spinner = (MaterialSpinner) view.findViewById(R.id.statusSpinner);
-        spinner.setItems("ĐÃ NHẬN ĐƠN", "ĐANG TRÊN ĐƯỜNG", "GIAO THÀNH CÔNG");
+        spinnerOrder = (MaterialSpinner) view.findViewById(R.id.statusOrderSpinner);
+        spinnerOrder.setItems("ĐÃ NHẬN ĐƠN", "ĐANG TRÊN ĐƯỜNG", "GIAO THÀNH CÔNG");
 
         //Set value default spinner
         requests.orderByKey().equalTo(key)
@@ -177,7 +177,27 @@ public class OrderStatus extends AppCompatActivity {
                     public void onDataChange(DataSnapshot dataSnapshot) {
                         for(DataSnapshot postSnapShot: dataSnapshot.getChildren()) {
                             Request data = postSnapShot.getValue(Request.class);
-                            spinner.setSelectedIndex(Integer.parseInt(data.getStatus()));
+                            spinnerOrder.setSelectedIndex(Integer.parseInt(data.getStatus()));
+                        }
+                    }
+
+                    @Override
+                    public void onCancelled(DatabaseError databaseError) {
+                        Toast.makeText(OrderStatus.this, "Đã có lỗi từ hệ thống, vui lòng thử lại sau!", Toast.LENGTH_SHORT).show();
+                    }
+                });
+
+        spinnerPayment = (MaterialSpinner) view.findViewById(R.id.statusPaymentSpinner);
+        spinnerPayment.setItems("CHƯA THANH TOÁN", "ĐÃ THANH TOÁN");
+
+        //Set value default spinner
+        requests.orderByKey().equalTo(key)
+                .addValueEventListener(new ValueEventListener() {
+                    @Override
+                    public void onDataChange(DataSnapshot dataSnapshot) {
+                        for(DataSnapshot postSnapShot: dataSnapshot.getChildren()) {
+                            Request data = postSnapShot.getValue(Request.class);
+                            spinnerPayment.setSelectedIndex(Integer.parseInt(data.getPaymentStatus()));
                         }
                     }
 
@@ -194,7 +214,8 @@ public class OrderStatus extends AppCompatActivity {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 dialog.dismiss();;
-                item.setStatus(String.valueOf(spinner.getSelectedIndex()));
+                item.setStatus(String.valueOf(spinnerOrder.getSelectedIndex()));
+                item.setPaymentStatus(String.valueOf(spinnerPayment.getSelectedIndex()));
 
                 requests.child(localKey).setValue(item);
                 adapter.notifyDataSetChanged();
diff --git a/FoodifyServer/app/src/main/res/layout/update_order_layout.xml b/FoodifyServer/app/src/main/res/layout/update_order_layout.xml
index 37dbd32..e495be3 100644
--- a/FoodifyServer/app/src/main/res/layout/update_order_layout.xml
+++ b/FoodifyServer/app/src/main/res/layout/update_order_layout.xml
@@ -8,8 +8,41 @@
     app:cardElevation="4dp"
     >
 
-    <com.jaredrummler.materialspinner.MaterialSpinner
-        android:id="@+id/statusSpinner"
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_margin="10dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        >
+
+        <TextView
+            android:text="Tình trạng đơn hàng"
+            android:textAllCaps="true"
+            android:textStyle="italic"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            />
+
+        <com.jaredrummler.materialspinner.MaterialSpinner
+            android:id="@+id/statusOrderSpinner"
+            android:backgroundTint="@color/backgroundSpinner"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <TextView
+            android:layout_marginTop="10dp"
+            android:text="Tình trạng thanh toán"
+            android:textAllCaps="true"
+            android:textStyle="italic"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            />
+
+        <com.jaredrummler.materialspinner.MaterialSpinner
+            android:id="@+id/statusPaymentSpinner"
+            android:backgroundTint="@color/backgroundSpinner"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/FoodifyServer/app/src/main/res/values/colors.xml b/FoodifyServer/app/src/main/res/values/colors.xml
index 1f01711..6ecf7f2 100644
--- a/FoodifyServer/app/src/main/res/values/colors.xml
+++ b/FoodifyServer/app/src/main/res/values/colors.xml
@@ -17,4 +17,5 @@
 
     <color name="overlayBackground">#7f333639</color>
     <color name="overlayActionBar">#0e0d0e</color>
+    <color name="backgroundSpinner">#E3E3E3</color>
 </resources>
\ No newline at end of file