From 96a7fed78d33f014cfbac6a42a11082a02bba1aa Mon Sep 17 00:00:00 2001 From: phanhuuloi27 <73208452+Nezumi2711@users.noreply.github.com> Date: Thu, 30 Jun 2022 16:41:49 +0700 Subject: [PATCH] Improve UI --- .../foodifyServer/BannerActivity.java | 49 +++++++++- .../waterbase/foodifyServer/OrderStatus.java | 18 +++- .../src/main/res/layout/add_new_banner.xml | 94 +++++++++++++++++++ 3 files changed, 159 insertions(+), 2 deletions(-) create mode 100644 FoodifyServer/app/src/main/res/layout/add_new_banner.xml diff --git a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/BannerActivity.java b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/BannerActivity.java index 7141de0..9a8fa7c 100644 --- a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/BannerActivity.java +++ b/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 { @@ -47,6 +58,8 @@ public class BannerActivity extends AppCompatActivity { Banner newBanner; Uri filePath; + + List foodList = new ArrayList<>(); @Override protected void onCreate(Bundle 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); } } \ No newline at end of file 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 fb4f3cf..4bd4b85 100644 --- a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/OrderStatus.java +++ b/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); diff --git a/FoodifyServer/app/src/main/res/layout/add_new_banner.xml b/FoodifyServer/app/src/main/res/layout/add_new_banner.xml new file mode 100644 index 0000000..d2f4375 --- /dev/null +++ b/FoodifyServer/app/src/main/res/layout/add_new_banner.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file