pizza screen
This commit is contained in:
@@ -10,7 +10,6 @@ import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx;
|
||||
|
||||
@@ -20,6 +19,7 @@ import butterknife.OnClick;
|
||||
import ch.pizzalink.android.R;
|
||||
import ch.pizzalink.android.fragment.CartFragment;
|
||||
import ch.pizzalink.android.fragment.InfoFragment;
|
||||
import ch.pizzalink.android.fragment.HistoryFragment;
|
||||
import ch.pizzalink.android.fragment.order.ChickenFragment;
|
||||
import ch.pizzalink.android.fragment.order.DessertFragment;
|
||||
import ch.pizzalink.android.fragment.order.DrinksFragment;
|
||||
@@ -100,7 +100,7 @@ public class MainActivity extends BaseActivity {
|
||||
@Override
|
||||
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
|
||||
switch (item.getItemId()){
|
||||
case R.id.action_order:
|
||||
case R.id.action_menu:
|
||||
if (currentFragmentName.equals(PizzaFragment.FRAGMENT_NAME))
|
||||
return true;
|
||||
fragmentManager.beginTransaction().replace(R.id.fragmentContainer, PizzaFragment.newInstance()).commit();
|
||||
@@ -114,6 +114,13 @@ public class MainActivity extends BaseActivity {
|
||||
currentFragmentName = CartFragment.FRAGMENT_NAME;
|
||||
return true;
|
||||
|
||||
case R.id.action_history:
|
||||
if (currentFragmentName.equals(HistoryFragment.FRAGMENT_NAME))
|
||||
return true;
|
||||
fragmentManager.beginTransaction().replace(R.id.fragmentContainer, HistoryFragment.newInstance()).commit();
|
||||
currentFragmentName = HistoryFragment.FRAGMENT_NAME;
|
||||
return true;
|
||||
|
||||
case R.id.action_profile:
|
||||
if (currentFragmentName.equals(ProfileFragment.FRAGMENT_NAME))
|
||||
return true;
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
package ch.pizzalink.android.adapter.recycler;
|
||||
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import butterknife.BindDrawable;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import ch.pizzalink.android.R;
|
||||
import ch.pizzalink.android.activity.BaseActivity;
|
||||
import ch.pizzalink.android.helper.ImageLoadHelper;
|
||||
import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
|
||||
import ch.pizzalink.android.model.PizzaModel;
|
||||
|
||||
/**
|
||||
* Created by cimenmus on 20/09/2017.
|
||||
*/
|
||||
|
||||
public class PizzaRecyclerAdapter extends RecyclerView.Adapter<PizzaRecyclerAdapter.ViewHolder> {
|
||||
|
||||
private ArrayList<PizzaModel> pizzaList;
|
||||
private RecyclerItemClickListener recyclerItemClickListener;
|
||||
|
||||
public static class ViewHolder extends RecyclerView.ViewHolder{
|
||||
|
||||
@BindView(R.id.pizzaNameTextView) TextView pizzaNameTextView;
|
||||
@BindView(R.id.pizzaImageView) ImageView pizzaImageView;
|
||||
@BindView(R.id.pizzaIngredientsTextView) TextView pizzaIngredientsTextView;
|
||||
|
||||
public ViewHolder(final View view, final RecyclerItemClickListener recyclerItemClickListener) {
|
||||
super(view);
|
||||
ButterKnife.bind(this, view);
|
||||
/*
|
||||
favoriteOfferImageView.setClickable(true);
|
||||
|
||||
view.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if(recyclerItemClickListener != null)
|
||||
recyclerItemClickListener.onItemClick(view, getAdapterPosition());
|
||||
}
|
||||
});
|
||||
|
||||
favoriteOfferImageView.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if(recyclerItemClickListener != null)
|
||||
recyclerItemClickListener.onItemClick(favoriteOfferImageView, getAdapterPosition());
|
||||
}
|
||||
});
|
||||
*/
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public PizzaRecyclerAdapter(ArrayList<PizzaModel> pizzaList, RecyclerItemClickListener recyclerItemClickListener){
|
||||
this.pizzaList = pizzaList;
|
||||
this.recyclerItemClickListener = recyclerItemClickListener;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PizzaRecyclerAdapter.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
|
||||
View root = LayoutInflater.from(BaseActivity.currentActivity).inflate(R.layout.row_pizza, viewGroup, false);
|
||||
return new PizzaRecyclerAdapter.ViewHolder(root, recyclerItemClickListener);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(PizzaRecyclerAdapter.ViewHolder holder, int position) {
|
||||
holder.pizzaNameTextView.setText("Anatolia");
|
||||
holder.pizzaIngredientsTextView.setText("Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano");
|
||||
ImageLoadHelper.loadImage(holder.pizzaImageView, "http://www.pizzalink.ch/pizza/image/cache/catalog/pizza/2-220x220.png");
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
//return pizzaList.size();
|
||||
return 12;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -15,7 +15,7 @@ import ch.pizzalink.android.R;
|
||||
|
||||
public class CartFragment extends BaseFragment {
|
||||
|
||||
@BindString(R.string.bottom_nav_menu_item_my_cart) String fragmentTitle;
|
||||
@BindString(R.string.bottom_nav_menu_item_cart) String fragmentTitle;
|
||||
|
||||
public static final java.lang.String FRAGMENT_NAME = "cartFragment";
|
||||
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
package ch.pizzalink.android.fragment;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import butterknife.BindString;
|
||||
import butterknife.ButterKnife;
|
||||
import ch.pizzalink.android.R;
|
||||
|
||||
/**
|
||||
* Created by cimenmus on 20/09/2017.
|
||||
*/
|
||||
|
||||
public class HistoryFragment extends BaseFragment {
|
||||
|
||||
@BindString(R.string.bottom_nav_menu_item_history) String fragmentTitle;
|
||||
|
||||
public static final java.lang.String FRAGMENT_NAME = "historyFragment";
|
||||
|
||||
public HistoryFragment() {}
|
||||
|
||||
public static HistoryFragment newInstance() {
|
||||
return new HistoryFragment();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
View view = inflater.inflate(R.layout.fragment_history, container, false);
|
||||
ButterKnife.bind(this, view);
|
||||
initViews();
|
||||
return view;
|
||||
}
|
||||
|
||||
private void initViews(){
|
||||
setPizzalinkToolbarFields(false, fragmentTitle);
|
||||
}
|
||||
}
|
||||
@@ -15,7 +15,7 @@ import ch.pizzalink.android.R;
|
||||
|
||||
public class ChickenFragment extends OrderBaseFragment {
|
||||
|
||||
@BindString(R.string.navigation_menu_item_chicken) String fragmentTitle;
|
||||
@BindString(R.string.fragment_title_chicken) String fragmentTitle;
|
||||
|
||||
public static final java.lang.String FRAGMENT_NAME = "chickenFragment";
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ import ch.pizzalink.android.R;
|
||||
|
||||
public class DessertFragment extends OrderBaseFragment {
|
||||
|
||||
@BindString(R.string.navigation_menu_item_dessert) String fragmentTitle;
|
||||
@BindString(R.string.fragment_title_dessert) String fragmentTitle;
|
||||
|
||||
public static final java.lang.String FRAGMENT_NAME = "dessertFragment";
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ public class DrinksFragment extends OrderBaseFragment {
|
||||
|
||||
@BindView(R.id.drinksTextView) TextView drinksTextView;
|
||||
|
||||
@BindString(R.string.navigation_menu_item_drinks) String allDrinksFragmentTitle;
|
||||
@BindString(R.string.fragment_title_drinks) String allDrinksFragmentTitle;
|
||||
@BindString(R.string.fragment_title_rose_drinks) String roseDrinksFragmentTitle;
|
||||
@BindString(R.string.fragment_title_item_rotwein_drinks) String rotweinDrinksFragmentTitle;
|
||||
@BindString(R.string.fragment_title_item_spirituosen_drinks) String spirituosenDrinksFragmentTitle;
|
||||
|
||||
@@ -15,7 +15,7 @@ import ch.pizzalink.android.R;
|
||||
|
||||
public class ExtraKebapFragment extends OrderBaseFragment {
|
||||
|
||||
@BindString(R.string.navigation_menu_item_ekstra_kebap) String fragmentTitle;
|
||||
@BindString(R.string.fragment_title_ekstra_kebap) String fragmentTitle;
|
||||
|
||||
public static final java.lang.String FRAGMENT_NAME = "extraKebapFragment";
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ import ch.pizzalink.android.R;
|
||||
|
||||
public class HaussFragment extends OrderBaseFragment {
|
||||
|
||||
@BindString(R.string.navigation_menu_item_hauss) String fragmentTitle;
|
||||
@BindString(R.string.fragment_title_hauss) String fragmentTitle;
|
||||
|
||||
public static final java.lang.String FRAGMENT_NAME = "haussFragment";
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ import ch.pizzalink.android.R;
|
||||
|
||||
public class OwnPizzaFragment extends OrderBaseFragment {
|
||||
|
||||
@BindString(R.string.navigation_menu_item_create_own_pizza) String fragmentTitle;
|
||||
@BindString(R.string.fragment_title_create_own_pizza) String fragmentTitle;
|
||||
|
||||
public static final java.lang.String FRAGMENT_NAME = "ownPizzaFragment";
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ import ch.pizzalink.android.R;
|
||||
|
||||
public class PastaFragment extends OrderBaseFragment {
|
||||
|
||||
@BindString(R.string.navigation_menu_item_pasta) String fragmentTitle;
|
||||
@BindString(R.string.fragment_title_pasta) String fragmentTitle;
|
||||
|
||||
public static final java.lang.String FRAGMENT_NAME = "pastaFragment";
|
||||
|
||||
|
||||
@@ -1,13 +1,24 @@
|
||||
package ch.pizzalink.android.fragment.order;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.support.v7.widget.GridLayoutManager;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import butterknife.BindString;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import ch.pizzalink.android.R;
|
||||
import ch.pizzalink.android.activity.BaseActivity;
|
||||
import ch.pizzalink.android.adapter.recycler.PizzaRecyclerAdapter;
|
||||
import ch.pizzalink.android.helper.DisplayHelper;
|
||||
import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
|
||||
import ch.pizzalink.android.model.PizzaModel;
|
||||
import ch.pizzalink.android.view.GridSpacesItemDecoration;
|
||||
|
||||
/**
|
||||
* Created by cimenmus on 18/09/2017.
|
||||
@@ -15,9 +26,13 @@ import ch.pizzalink.android.R;
|
||||
|
||||
public class PizzaFragment extends OrderBaseFragment {
|
||||
|
||||
@BindString(R.string.navigation_menu_item_pizza) String fragmentTitle;
|
||||
@BindView(R.id.pizzaRecyclerView) RecyclerView pizzaRecyclerView;
|
||||
|
||||
@BindString(R.string.fragment_title_pizza) String fragmentTitle;
|
||||
|
||||
public static final java.lang.String FRAGMENT_NAME = "pizzaFragment";
|
||||
private ArrayList<PizzaModel> pizzaList = new ArrayList<>();
|
||||
private PizzaRecyclerAdapter pizzaRecyclerAdapter;
|
||||
|
||||
public PizzaFragment() {}
|
||||
|
||||
@@ -40,5 +55,21 @@ public class PizzaFragment extends OrderBaseFragment {
|
||||
|
||||
private void initViews(){
|
||||
setPizzalinkToolbarFields(true, fragmentTitle);
|
||||
initRecyclerView();
|
||||
}
|
||||
|
||||
private void initRecyclerView(){
|
||||
|
||||
GridLayoutManager layoutManager = new GridLayoutManager(BaseActivity.currentActivity, 2);
|
||||
pizzaRecyclerAdapter = new PizzaRecyclerAdapter(pizzaList, new RecyclerItemClickListener() {
|
||||
@Override
|
||||
public void onItemClick(View view, int position) {
|
||||
|
||||
}
|
||||
});
|
||||
pizzaRecyclerView.addItemDecoration(new GridSpacesItemDecoration(DisplayHelper.dpToPx(12)));
|
||||
pizzaRecyclerView.setLayoutManager(layoutManager);
|
||||
pizzaRecyclerView.setAdapter(pizzaRecyclerAdapter);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ import ch.pizzalink.android.R;
|
||||
|
||||
public class SalatFragment extends OrderBaseFragment {
|
||||
|
||||
@BindString(R.string.navigation_menu_item_salat) String fragmentTitle;
|
||||
@BindString(R.string.fragment_title_salat) String fragmentTitle;
|
||||
|
||||
public static final java.lang.String FRAGMENT_NAME = "salatFragment";
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ import ch.pizzalink.android.R;
|
||||
|
||||
public class VorspeisenFragment extends OrderBaseFragment {
|
||||
|
||||
@BindString(R.string.navigation_menu_item_vorspeisen) String fragmentTitle;
|
||||
@BindString(R.string.fragment_title_vorspeisen) String fragmentTitle;
|
||||
|
||||
public static final java.lang.String FRAGMENT_NAME = "vorspeisenFragment";
|
||||
|
||||
|
||||
@@ -10,7 +10,23 @@ import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import com.squareup.picasso.Picasso;
|
||||
|
||||
import ch.pizzalink.android.activity.BaseActivity;
|
||||
|
||||
public class ImageLoadHelper {
|
||||
|
||||
public static void loadImage(ImageView imageView, String url){
|
||||
|
||||
if(url == null || url.isEmpty())
|
||||
url = "empty";
|
||||
|
||||
Picasso.with(BaseActivity.currentActivity)
|
||||
.load(url)
|
||||
//.placeholder(R.drawable.placeholder)
|
||||
//.placeholder(R.drawable.progress_animation)
|
||||
//.error(R.drawable.placeholder)
|
||||
//.resize(500, 0)
|
||||
//.onlyScaleDown()
|
||||
.into(imageView);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
80
app/src/main/java/ch/pizzalink/android/model/PizzaModel.java
Normal file
80
app/src/main/java/ch/pizzalink/android/model/PizzaModel.java
Normal file
@@ -0,0 +1,80 @@
|
||||
package ch.pizzalink.android.model;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* Created by cimenmus on 20/09/2017.
|
||||
*/
|
||||
|
||||
public class PizzaModel {
|
||||
|
||||
private String id, name, ingredients;
|
||||
private int count, isCartCount;
|
||||
private double price;
|
||||
private boolean isInCart;
|
||||
private ArrayList<SizeModel> pizzaSizeList;
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getIngredients() {
|
||||
return ingredients;
|
||||
}
|
||||
|
||||
public void setIngredients(String ingredients) {
|
||||
this.ingredients = ingredients;
|
||||
}
|
||||
|
||||
public int getCount() {
|
||||
return count;
|
||||
}
|
||||
|
||||
public void setCount(int count) {
|
||||
this.count = count;
|
||||
}
|
||||
|
||||
public int getIsCartCount() {
|
||||
return isCartCount;
|
||||
}
|
||||
|
||||
public void setIsCartCount(int isCartCount) {
|
||||
this.isCartCount = isCartCount;
|
||||
}
|
||||
|
||||
public double getPrice() {
|
||||
return price;
|
||||
}
|
||||
|
||||
public void setPrice(double price) {
|
||||
this.price = price;
|
||||
}
|
||||
|
||||
public boolean isInCart() {
|
||||
return isInCart;
|
||||
}
|
||||
|
||||
public void setInCart(boolean inCart) {
|
||||
isInCart = inCart;
|
||||
}
|
||||
|
||||
public ArrayList<SizeModel> getPizzaSizeList() {
|
||||
return pizzaSizeList;
|
||||
}
|
||||
|
||||
public void setPizzaSizeList(ArrayList<SizeModel> pizzaSizeList) {
|
||||
this.pizzaSizeList = pizzaSizeList;
|
||||
}
|
||||
}
|
||||
27
app/src/main/java/ch/pizzalink/android/model/SizeModel.java
Normal file
27
app/src/main/java/ch/pizzalink/android/model/SizeModel.java
Normal file
@@ -0,0 +1,27 @@
|
||||
package ch.pizzalink.android.model;
|
||||
|
||||
/**
|
||||
* Created by cimenmus on 20/09/2017.
|
||||
*/
|
||||
|
||||
public class SizeModel {
|
||||
|
||||
private String name;
|
||||
private boolean isChecked;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public boolean isChecked() {
|
||||
return isChecked;
|
||||
}
|
||||
|
||||
public void setChecked(boolean checked) {
|
||||
isChecked = checked;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package ch.pizzalink.android.view;
|
||||
|
||||
import android.graphics.Rect;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.view.View;
|
||||
|
||||
/**
|
||||
* Created by cimenmus on 20/09/2017.
|
||||
*/
|
||||
|
||||
// This item decoration is for two column grid layout manager
|
||||
public class GridSpacesItemDecoration extends RecyclerView.ItemDecoration {
|
||||
|
||||
private int space;
|
||||
|
||||
public GridSpacesItemDecoration(int space) {
|
||||
this.space = space;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
|
||||
|
||||
outRect.left = space;
|
||||
outRect.bottom = space;
|
||||
|
||||
// Add top margin only for the first item to avoid double space between items
|
||||
if (parent.getChildLayoutPosition(view) == 0 || parent.getChildLayoutPosition(view) == 1)
|
||||
outRect.top = space;
|
||||
else
|
||||
outRect.top = 0;
|
||||
|
||||
// Add right margin only for the first item in the line to avoid double space between items
|
||||
if (parent.getChildLayoutPosition(view) % 2 == 1)
|
||||
outRect.right = space;
|
||||
else
|
||||
outRect.right = 0;
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user