From 658d9cf28c680e85774300bc706300fef8f7e3be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Wed, 20 Sep 2017 23:45:50 +0300 Subject: [PATCH] pizza screen --- .../android/activity/MainActivity.java | 11 ++- .../recycler/PizzaRecyclerAdapter.java | 87 +++++++++++++++++++ .../android/fragment/CartFragment.java | 2 +- .../android/fragment/HistoryFragment.java | 44 ++++++++++ .../fragment/order/ChickenFragment.java | 2 +- .../fragment/order/DessertFragment.java | 2 +- .../fragment/order/DrinksFragment.java | 2 +- .../fragment/order/ExtraKebapFragment.java | 2 +- .../android/fragment/order/HaussFragment.java | 2 +- .../fragment/order/OwnPizzaFragment.java | 2 +- .../android/fragment/order/PastaFragment.java | 2 +- .../android/fragment/order/PizzaFragment.java | 33 ++++++- .../android/fragment/order/SalatFragment.java | 2 +- .../fragment/order/VorspeisenFragment.java | 2 +- .../android/helper/ImageLoadHelper.java | 16 ++++ .../pizzalink/android/model/PizzaModel.java | 80 +++++++++++++++++ .../ch/pizzalink/android/model/SizeModel.java | 27 ++++++ .../view/GridSpacesItemDecoration.java | 39 +++++++++ .../drawable/ic_bottom_nav_item_history.xml | 5 ++ ..._order.xml => ic_bottom_nav_item_menu.xml} | 0 .../drawable/ic_bottom_nav_item_profile.xml | 10 +-- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/fragment_history.xml | 15 ++++ app/src/main/res/layout/fragment_pizza.xml | 15 +--- .../res/layout/layout_pizzalink_toolbar.xml | 1 - app/src/main/res/layout/row_pizza.xml | 49 +++++++++++ .../main/res/menu/menu_bottom_navigation.xml | 13 ++- app/src/main/res/values/colors.xml | 5 +- app/src/main/res/values/strings.xml | 25 ++++-- 29 files changed, 452 insertions(+), 45 deletions(-) create mode 100644 app/src/main/java/ch/pizzalink/android/adapter/recycler/PizzaRecyclerAdapter.java create mode 100644 app/src/main/java/ch/pizzalink/android/fragment/HistoryFragment.java create mode 100644 app/src/main/java/ch/pizzalink/android/model/PizzaModel.java create mode 100644 app/src/main/java/ch/pizzalink/android/model/SizeModel.java create mode 100644 app/src/main/java/ch/pizzalink/android/view/GridSpacesItemDecoration.java create mode 100644 app/src/main/res/drawable/ic_bottom_nav_item_history.xml rename app/src/main/res/drawable/{ic_bottom_nav_item_order.xml => ic_bottom_nav_item_menu.xml} (100%) create mode 100644 app/src/main/res/layout/fragment_history.xml create mode 100644 app/src/main/res/layout/row_pizza.xml diff --git a/app/src/main/java/ch/pizzalink/android/activity/MainActivity.java b/app/src/main/java/ch/pizzalink/android/activity/MainActivity.java index c6550ac..a3d0fb7 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/MainActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/MainActivity.java @@ -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; diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/PizzaRecyclerAdapter.java b/app/src/main/java/ch/pizzalink/android/adapter/recycler/PizzaRecyclerAdapter.java new file mode 100644 index 0000000..9656c1e --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/adapter/recycler/PizzaRecyclerAdapter.java @@ -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 { + + private ArrayList 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 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; + } + +} \ No newline at end of file diff --git a/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java index 5ff0eae..aaa6f08 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java @@ -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"; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/HistoryFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/HistoryFragment.java new file mode 100644 index 0000000..fcaebc6 --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/fragment/HistoryFragment.java @@ -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); + } +} diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/ChickenFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/ChickenFragment.java index b9e6753..320281d 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/ChickenFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/ChickenFragment.java @@ -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"; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/DessertFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/DessertFragment.java index 4c2096a..f61bc54 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/DessertFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/DessertFragment.java @@ -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"; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/DrinksFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/DrinksFragment.java index 957012d..86fc010 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/DrinksFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/DrinksFragment.java @@ -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; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/ExtraKebapFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/ExtraKebapFragment.java index 65d5eb3..da81da0 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/ExtraKebapFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/ExtraKebapFragment.java @@ -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"; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/HaussFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/HaussFragment.java index 5ec573f..8d9aec2 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/HaussFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/HaussFragment.java @@ -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"; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/OwnPizzaFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/OwnPizzaFragment.java index f7282e8..0826b71 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/OwnPizzaFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/OwnPizzaFragment.java @@ -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"; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/PastaFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/PastaFragment.java index 25294e3..b2525a3 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/PastaFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/PastaFragment.java @@ -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"; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/PizzaFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/PizzaFragment.java index 195b383..bd254ff 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/PizzaFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/PizzaFragment.java @@ -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 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); + } + } diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/SalatFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/SalatFragment.java index 99752f8..60c4ee2 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/SalatFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/SalatFragment.java @@ -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"; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/VorspeisenFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/VorspeisenFragment.java index 8d2fe5e..6c78e0c 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/VorspeisenFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/VorspeisenFragment.java @@ -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"; diff --git a/app/src/main/java/ch/pizzalink/android/helper/ImageLoadHelper.java b/app/src/main/java/ch/pizzalink/android/helper/ImageLoadHelper.java index 2421db9..fea0ece 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/ImageLoadHelper.java +++ b/app/src/main/java/ch/pizzalink/android/helper/ImageLoadHelper.java @@ -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); + } } diff --git a/app/src/main/java/ch/pizzalink/android/model/PizzaModel.java b/app/src/main/java/ch/pizzalink/android/model/PizzaModel.java new file mode 100644 index 0000000..eefdbd3 --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/model/PizzaModel.java @@ -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 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 getPizzaSizeList() { + return pizzaSizeList; + } + + public void setPizzaSizeList(ArrayList pizzaSizeList) { + this.pizzaSizeList = pizzaSizeList; + } +} diff --git a/app/src/main/java/ch/pizzalink/android/model/SizeModel.java b/app/src/main/java/ch/pizzalink/android/model/SizeModel.java new file mode 100644 index 0000000..a8751e4 --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/model/SizeModel.java @@ -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; + } +} diff --git a/app/src/main/java/ch/pizzalink/android/view/GridSpacesItemDecoration.java b/app/src/main/java/ch/pizzalink/android/view/GridSpacesItemDecoration.java new file mode 100644 index 0000000..ae52ef5 --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/view/GridSpacesItemDecoration.java @@ -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; + + } +} diff --git a/app/src/main/res/drawable/ic_bottom_nav_item_history.xml b/app/src/main/res/drawable/ic_bottom_nav_item_history.xml new file mode 100644 index 0000000..c135539 --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_nav_item_history.xml @@ -0,0 +1,5 @@ + + + + diff --git a/app/src/main/res/drawable/ic_bottom_nav_item_order.xml b/app/src/main/res/drawable/ic_bottom_nav_item_menu.xml similarity index 100% rename from app/src/main/res/drawable/ic_bottom_nav_item_order.xml rename to app/src/main/res/drawable/ic_bottom_nav_item_menu.xml diff --git a/app/src/main/res/drawable/ic_bottom_nav_item_profile.xml b/app/src/main/res/drawable/ic_bottom_nav_item_profile.xml index bbd8b8a..893ccb4 100644 --- a/app/src/main/res/drawable/ic_bottom_nav_item_profile.xml +++ b/app/src/main/res/drawable/ic_bottom_nav_item_profile.xml @@ -1,7 +1,5 @@ - - - - - + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1412330..8069816 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -12,7 +12,7 @@ android:id="@+id/pizzalinkToolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - app:title="@string/bottom_nav_menu_item_order" + app:title="@string/bottom_nav_menu_item_menu" app:showHamburgerMenuIcon="true"/> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_pizza.xml b/app/src/main/res/layout/fragment_pizza.xml index e821e8f..f32f1f9 100644 --- a/app/src/main/res/layout/fragment_pizza.xml +++ b/app/src/main/res/layout/fragment_pizza.xml @@ -1,15 +1,6 @@ - - - - - \ No newline at end of file + android:layout_height="match_parent"/> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_pizzalink_toolbar.xml b/app/src/main/res/layout/layout_pizzalink_toolbar.xml index 5a719d5..e05d505 100644 --- a/app/src/main/res/layout/layout_pizzalink_toolbar.xml +++ b/app/src/main/res/layout/layout_pizzalink_toolbar.xml @@ -36,7 +36,6 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:textSize="16sp" - android:textAllCaps="true" android:textStyle="bold" android:textColor="@color/white" fontPath="fonts/AvenirNextLTProDemi.otf" diff --git a/app/src/main/res/layout/row_pizza.xml b/app/src/main/res/layout/row_pizza.xml new file mode 100644 index 0000000..fb51df5 --- /dev/null +++ b/app/src/main/res/layout/row_pizza.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_bottom_navigation.xml b/app/src/main/res/menu/menu_bottom_navigation.xml index 34acfa7..2740ca0 100644 --- a/app/src/main/res/menu/menu_bottom_navigation.xml +++ b/app/src/main/res/menu/menu_bottom_navigation.xml @@ -4,14 +4,19 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> + android:id="@+id/action_menu" + android:icon="@drawable/ic_bottom_nav_item_menu" + android:title="@string/bottom_nav_menu_item_menu" /> + android:title="@string/bottom_nav_menu_item_cart" /> + + #EC1649 #ffffff #4C4B4A + #EBECEC - + + #EEEEEE + #FAFAFA diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7659a4b..d99807a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,8 +3,9 @@ Pizzalink - Order - My Cart + Menu + Cart + History Profile Info @@ -27,10 +28,20 @@ DESSERT - ROSE - ROTWEIN - SPIRITUOSEN - WEISSWEIN - BEER + Wunschpizza + Ekstra Kebap + Pizza + Vorspeisen + Haussspezialitaten + Salat + Pasta + Chicken + Drinks + Rose + Rotwein + Spirituosen + Weisswein + Beer + Dessert