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;
|
||||
|
||||
}
|
||||
}
|
||||
5
app/src/main/res/drawable/ic_bottom_nav_item_history.xml
Normal file
5
app/src/main/res/drawable/ic_bottom_nav_item_history.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<vector android:height="24dp" android:viewportHeight="448.0"
|
||||
android:viewportWidth="448.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#FFFFFF" android:pathData="M255.9,32C149.8,32 64,118 64,224H0l83.1,83.1l1.5,3.1L170.7,224h-64c0,-82.5 66.9,-149.3 149.3,-149.3S405.3,141.5 405.3,224S338.5,373.3 256,373.3c-41.3,0 -78.5,-16.9 -105.5,-43.8L120.3,359.7C155,394.5 202.9,416 255.9,416C362,416 448,330 448,224S362,32 255.9,32z"/>
|
||||
<path android:fillColor="#FFFFFF" android:pathData="M234.7,138.7l0,106.7l91.3,54.2l15.4,-25.9l-74.7,-44.3l0,-90.7z"/>
|
||||
</vector>
|
||||
@@ -1,7 +1,5 @@
|
||||
<vector android:height="24dp" android:viewportHeight="350.0"
|
||||
android:viewportWidth="350.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#FFFFFF" android:pathData="M175,171.2c38.9,0 70.5,-38.3 70.5,-85.6C245.5,38.3 235.1,0 175,0s-70.5,38.3 -70.5,85.6C104.5,132.9 136.1,171.2 175,171.2z"/>
|
||||
<path android:fillColor="#FFFFFF" android:pathData="M41.9,301.9C41.9,299 41.9,301 41.9,301.9L41.9,301.9z"/>
|
||||
<path android:fillColor="#FFFFFF" android:pathData="M308.1,304.1C308.1,303.3 308.1,298.6 308.1,304.1L308.1,304.1z"/>
|
||||
<path android:fillColor="#FFFFFF" android:pathData="M307.9,298.4c-1.3,-82.3 -12.1,-105.8 -94.4,-120.7c0,0 -11.6,14.8 -38.6,14.8s-38.6,-14.8 -38.6,-14.8c-81.4,14.7 -92.8,37.8 -94.3,118c-0.1,6.5 -0.2,6.9 -0.2,6.1c0,1.4 0,4.1 0,8.7c0,0 19.6,39.5 133.1,39.5c113.5,0 133.1,-39.5 133.1,-39.5c0,-3 0,-5 0,-6.4C308.1,304.6 308,303.7 307.9,298.4z"/>
|
||||
<vector android:height="24dp" android:viewportHeight="482.9"
|
||||
android:viewportWidth="482.9" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#FFFFFF" android:pathData="M239.7,260.2c0.5,0 1,0 1.6,0c0.2,0 0.4,0 0.6,0c0.3,0 0.7,0 1,0c29.3,-0.5 53,-10.8 70.5,-30.5c38.5,-43.4 32.1,-117.8 31.4,-124.9c-2.5,-53.3 -27.7,-78.8 -48.5,-90.7C280.8,5.2 262.7,0.4 242.5,0h-0.7c-0.1,0 -0.3,0 -0.4,0h-0.6c-11.1,0 -32.9,1.8 -53.8,13.7c-21,11.9 -46.6,37.4 -49.1,91.1c-0.7,7.1 -7.1,81.5 31.4,124.9C186.7,249.4 210.4,259.7 239.7,260.2zM164.6,107.3c0,-0.3 0.1,-0.6 0.1,-0.8c3.3,-71.7 54.2,-79.4 76,-79.4h0.4c0.2,0 0.5,0 0.8,0c27,0.6 72.9,11.6 76,79.4c0,0.3 0,0.6 0.1,0.8c0.1,0.7 7.1,68.7 -24.7,104.5c-12.6,14.2 -29.4,21.2 -51.5,21.4c-0.2,0 -0.3,0 -0.5,0l0,0c-0.2,0 -0.3,0 -0.5,0c-22,-0.2 -38.9,-7.2 -51.4,-21.4C157.7,176.2 164.5,107.9 164.6,107.3z"/>
|
||||
<path android:fillColor="#FFFFFF" android:pathData="M446.8,383.6c0,-0.1 0,-0.2 0,-0.3c0,-0.8 -0.1,-1.6 -0.1,-2.5c-0.6,-19.8 -1.9,-66.1 -45.3,-80.9c-0.3,-0.1 -0.7,-0.2 -1,-0.3c-45.1,-11.5 -82.6,-37.5 -83,-37.8c-6.1,-4.3 -14.5,-2.8 -18.8,3.3c-4.3,6.1 -2.8,14.5 3.3,18.8c1.7,1.2 41.5,28.9 91.3,41.7c23.3,8.3 25.9,33.2 26.6,56c0,0.9 0,1.7 0.1,2.5c0.1,9 -0.5,22.9 -2.1,30.9c-16.2,9.2 -79.7,41 -176.3,41c-96.2,0 -160.1,-31.9 -176.4,-41.1c-1.6,-8 -2.3,-21.9 -2.1,-30.9c0,-0.8 0.1,-1.6 0.1,-2.5c0.7,-22.8 3.3,-47.7 26.6,-56c49.8,-12.8 89.6,-40.6 91.3,-41.7c6.1,-4.3 7.6,-12.7 3.3,-18.8c-4.3,-6.1 -12.7,-7.6 -18.8,-3.3c-0.4,0.3 -37.7,26.3 -83,37.8c-0.4,0.1 -0.7,0.2 -1,0.3c-43.4,14.9 -44.7,61.2 -45.3,80.9c0,0.9 0,1.7 -0.1,2.5c0,0.1 0,0.2 0,0.3c-0.1,5.2 -0.2,31.9 5.1,45.3c1,2.6 2.8,4.8 5.2,6.3c3,2 74.9,47.8 195.2,47.8s192.2,-45.9 195.2,-47.8c2.3,-1.5 4.2,-3.7 5.2,-6.3C447,415.5 446.9,388.8 446.8,383.6z"/>
|
||||
</vector>
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
<android.support.v4.widget.DrawerLayout
|
||||
|
||||
15
app/src/main/res/layout/fragment_history.xml
Normal file
15
app/src/main/res/layout/fragment_history.xml
Normal file
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Orders Fragment"
|
||||
android:layout_centerInParent="true"
|
||||
android:textColor="@color/black"/>
|
||||
|
||||
</RelativeLayout>
|
||||
@@ -1,15 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout
|
||||
<android.support.v7.widget.RecyclerView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:id="@+id/pizzaRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Pizza Fragment"
|
||||
android:layout_centerInParent="true"
|
||||
android:textColor="@color/black"/>
|
||||
|
||||
</RelativeLayout>
|
||||
android:layout_height="match_parent"/>
|
||||
@@ -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"
|
||||
|
||||
49
app/src/main/res/layout/row_pizza.xml
Normal file
49
app/src/main/res/layout/row_pizza.xml
Normal file
@@ -0,0 +1,49 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<android.support.v7.widget.CardView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/white"
|
||||
app:cardCornerRadius="4dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/pizzaNameTextView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@android:color/black"
|
||||
android:textSize="16sp"
|
||||
android:paddingTop="12dp"
|
||||
android:text="Anatolia"
|
||||
android:textStyle="bold"
|
||||
android:layout_gravity="center_horizontal" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/pizzaImageView"
|
||||
android:layout_width="160dp"
|
||||
android:layout_height="160dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginLeft="12dp"
|
||||
android:layout_marginStart="12dp"
|
||||
android:layout_marginRight="12dp"
|
||||
android:layout_marginEnd="12dp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/pizzaIngredientsTextView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/row_pizza_ingredients_background"
|
||||
android:padding="12dp"
|
||||
android:textColor="@android:color/black"
|
||||
android:gravity="center"
|
||||
android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</android.support.v7.widget.CardView>
|
||||
@@ -4,14 +4,19 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:id="@+id/action_order"
|
||||
android:icon="@drawable/ic_bottom_nav_item_order"
|
||||
android:title="@string/bottom_nav_menu_item_order" />
|
||||
android:id="@+id/action_menu"
|
||||
android:icon="@drawable/ic_bottom_nav_item_menu"
|
||||
android:title="@string/bottom_nav_menu_item_menu" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_cart"
|
||||
android:icon="@drawable/ic_bottom_nav_item_cart"
|
||||
android:title="@string/bottom_nav_menu_item_my_cart" />
|
||||
android:title="@string/bottom_nav_menu_item_cart" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_history"
|
||||
android:icon="@drawable/ic_bottom_nav_item_history"
|
||||
android:title="@string/bottom_nav_menu_item_history" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_profile"
|
||||
|
||||
@@ -10,7 +10,10 @@
|
||||
<color name="bottom_menu_selected_item">#EC1649</color>
|
||||
<color name="bottom_menu_unselected_item">#ffffff</color>
|
||||
<color name="navigation_drawer_background">#4C4B4A</color>
|
||||
<color name="row_pizza_ingredients_background">#EBECEC</color>
|
||||
|
||||
|
||||
<!-- android:background="?android:colorBackground" -->
|
||||
<color name="actvity_default_background_color_1">#EEEEEE</color>
|
||||
<color name="actvity_default_background_color_2">#FAFAFA</color>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -3,8 +3,9 @@
|
||||
<string name="app_name">Pizzalink</string>
|
||||
|
||||
<!-- MainAcitivity -->
|
||||
<string name="bottom_nav_menu_item_order">Order</string>
|
||||
<string name="bottom_nav_menu_item_my_cart">My Cart</string>
|
||||
<string name="bottom_nav_menu_item_menu">Menu</string>
|
||||
<string name="bottom_nav_menu_item_cart">Cart</string>
|
||||
<string name="bottom_nav_menu_item_history">History</string>
|
||||
<string name="bottom_nav_menu_item_profile">Profile</string>
|
||||
<string name="bottom_nav_menu_item_info">Info</string>
|
||||
<!-- MainAcitivity -->
|
||||
@@ -27,10 +28,20 @@
|
||||
<string name="navigation_menu_item_dessert">DESSERT</string>
|
||||
<!-- NavigationMenu-->
|
||||
|
||||
<string name="fragment_title_rose_drinks">ROSE</string>
|
||||
<string name="fragment_title_item_rotwein_drinks">ROTWEIN</string>
|
||||
<string name="fragment_title_item_spirituosen_drinks">SPIRITUOSEN</string>
|
||||
<string name="fragment_title_item_weisswein_drinks">WEISSWEIN</string>
|
||||
<string name="fragment_title_item_beer_drinks">BEER</string>
|
||||
<string name="fragment_title_create_own_pizza">Wunschpizza</string>
|
||||
<string name="fragment_title_ekstra_kebap">Ekstra Kebap</string>
|
||||
<string name="fragment_title_pizza">Pizza</string>
|
||||
<string name="fragment_title_vorspeisen">Vorspeisen</string>
|
||||
<string name="fragment_title_hauss">Haussspezialitaten</string>
|
||||
<string name="fragment_title_salat">Salat</string>
|
||||
<string name="fragment_title_pasta">Pasta</string>
|
||||
<string name="fragment_title_chicken">Chicken</string>
|
||||
<string name="fragment_title_drinks">Drinks</string>
|
||||
<string name="fragment_title_rose_drinks">Rose</string>
|
||||
<string name="fragment_title_item_rotwein_drinks">Rotwein</string>
|
||||
<string name="fragment_title_item_spirituosen_drinks">Spirituosen</string>
|
||||
<string name="fragment_title_item_weisswein_drinks">Weisswein</string>
|
||||
<string name="fragment_title_item_beer_drinks">Beer</string>
|
||||
<string name="fragment_title_dessert">Dessert</string>
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user