Improve UI

FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/BannerActivity.java

@@ -1,27 +1,38 @@
 package com.waterbase.foodifyServer;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
+import android.widget.Toast;
 
 import com.firebase.ui.database.FirebaseRecyclerAdapter;
 import com.firebase.ui.database.FirebaseRecyclerOptions;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.database.ValueEventListener;
 import com.google.firebase.storage.FirebaseStorage;
 import com.google.firebase.storage.StorageReference;
 import com.rengwuxian.materialedittext.MaterialEditText;
 import com.squareup.picasso.Picasso;
 import com.waterbase.foodifyServer.Model.Banner;
+import com.waterbase.foodifyServer.Model.Food;
 import com.waterbase.foodifyServer.ViewHolder.BannerViewHolder;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import info.hoang8f.widget.FButton;
 
 public class BannerActivity extends AppCompatActivity {
@@ -48,6 +59,8 @@ public class BannerActivity extends AppCompatActivity {
     Banner newBanner;
     Uri filePath;
     
+    List<Food> foodList =  new ArrayList<>();
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -89,10 +102,37 @@ public class BannerActivity extends AppCompatActivity {
             @NonNull
             @Override
             public BannerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-                return null;
+                View itemView = LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.banner_layout, parent, false);
+                return new BannerViewHolder(itemView);
             }
         };
         adapter.startListening();
+
+        //Set adapter
+        adapter.startListening();
+        recyclerView.setAdapter(adapter);
+    }
+    
+    private void loadListFood() {
+        FirebaseDatabase database = FirebaseDatabase.getInstance();
+        DatabaseReference foods = database.getReference("Foods");
+
+        foods.addValueEventListener(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                for(DataSnapshot snapshot: dataSnapshot.getChildren()){
+                    Food food = snapshot.getValue(Food.class);
+                    foodList.add(food);
+                    adapter.notifyDataSetChanged();
+                }
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+                Toast.makeText(BannerActivity.this, "Can't get list Banner from database!", Toast.LENGTH_SHORT).show();
+            }
+        });
     }
 
     @Override
@@ -102,6 +142,13 @@ public class BannerActivity extends AppCompatActivity {
     }
 
     private void showAddBanner() {
+        AlertDialog.Builder alertDialog = new AlertDialog.Builder(BannerActivity.this);
+        alertDialog.setTitle("Thêm ảnh bìa");
+        alertDialog.setMessage("Chọn món ăn bạn muốn thêm:");
 
+        loadListFood();
+
+        LayoutInflater inflater = this.getLayoutInflater();
+        View add_menu_layout = inflater.inflate(R.layout.add_new_banner, null);
     }
 }

FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/OrderStatus.java

@@ -162,7 +162,23 @@ public class OrderStatus extends AppCompatActivity {
         final View view = inflater.inflate(R.layout.update_order_layout, null);
 
         spinner = (MaterialSpinner) view.findViewById(R.id.statusSpinner);
-        spinner.setItems("Placed", "On my way", "Shipped");
+        spinner.setItems("ĐÃ NHẬN ĐƠN", "ĐANG TRÊN ĐƯỜNG", "GIAO THÀNH CÔNG");
+
+        requests.orderByKey().equalTo(key)
+                .addValueEventListener(new ValueEventListener() {
+                    @Override
+                    public void onDataChange(DataSnapshot dataSnapshot) {
+                        for(DataSnapshot postSnapShot: dataSnapshot.getChildren()) {
+                            Request data = postSnapShot.getValue(Request.class);
+                            spinner.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();
+                    }
+                });
 
         alertDialog.setView(view);
 

FoodifyServer/app/src/main/res/layout/add_new_banner.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardElevation="4dp">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:orientation="vertical">
+
+            <com.rengwuxian.materialedittext.MaterialEditText
+                android:id="@+id/edtFoodId"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:backgroundTint="#CCCCCC"
+                android:drawablePadding="13dp"
+                android:hint="Food Id"
+                android:inputType="text"
+                android:textColor="@color/black"
+                android:textColorHint="@color/black"
+                android:textSize="20sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintWidth_percent=".8" />
+
+            <com.rengwuxian.materialedittext.MaterialEditText
+                android:id="@+id/edtFoodName"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:backgroundTint="#CCCCCC"
+                android:drawablePadding="13dp"
+                android:hint="Food Name"
+                android:inputType="text"
+                android:textColor="@color/black"
+                android:textColorHint="@color/black"
+                android:textSize="18sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintWidth_percent=".8" />
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:weightSum="2">
+
+                <info.hoang8f.widget.FButton
+                    android:id="@+id/btnSelect"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_margin="8dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_weight="1"
+                    android:text="Chọn ảnh..."
+                    android:textColor="@color/white"
+                    app:cornerRadius="4dp"
+                    app:fButtonColor="@color/colorPrimary"
+                    app:shadowColor="@color/black"
+                    app:shadowEnabled="true"
+                    app:shadowHeight="5dp" />
+
+                <info.hoang8f.widget.FButton
+                    android:id="@+id/btnUpload"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_margin="8dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_weight="1"
+                    android:text="Tải ảnh lên"
+                    android:textColor="@color/white"
+                    app:cornerRadius="4dp"
+                    app:fButtonColor="@color/btnSignActive"
+                    app:shadowColor="@color/black"
+                    app:shadowEnabled="true"
+                    app:shadowHeight="5dp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.cardview.widget.CardView>