diff --git a/.idea/misc.xml b/.idea/misc.xml index cca2cda..7158618 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + 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 72bfd70..c6550ac 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/MainActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/MainActivity.java @@ -5,10 +5,10 @@ import android.support.design.widget.BottomNavigationView; import android.support.v4.app.FragmentManager; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.view.MenuItem; import android.view.View; +import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; @@ -20,8 +20,17 @@ 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.OrderFragment; +import ch.pizzalink.android.fragment.order.ChickenFragment; +import ch.pizzalink.android.fragment.order.DessertFragment; +import ch.pizzalink.android.fragment.order.DrinksFragment; +import ch.pizzalink.android.fragment.order.ExtraKebapFragment; +import ch.pizzalink.android.fragment.order.HaussFragment; +import ch.pizzalink.android.fragment.order.OwnPizzaFragment; +import ch.pizzalink.android.fragment.order.PastaFragment; +import ch.pizzalink.android.fragment.order.PizzaFragment; import ch.pizzalink.android.fragment.ProfileFragment; +import ch.pizzalink.android.fragment.order.SalatFragment; +import ch.pizzalink.android.fragment.order.VorspeisenFragment; import ch.pizzalink.android.view.PizzalinkToolbar; public class MainActivity extends BaseActivity { @@ -29,10 +38,23 @@ public class MainActivity extends BaseActivity { @BindView(R.id.drawerLayout) DrawerLayout drawerLayout; @BindView(R.id.pizzalinkToolbar) PizzalinkToolbar pizzalinkToolbar; @BindView(R.id.bottomNavigationView) BottomNavigationViewEx bottomNavigationView; - @BindView(R.id.navMenuItem1) TextView navMenuItem1; - @BindView(R.id.navMenuItem2) TextView navMenuItem2; - @BindView(R.id.navMenuItem3) TextView navMenuItem3; - @BindView(R.id.navMenuItem4) TextView navMenuItem4; + + @BindView(R.id.ownPizzaMenuItem) TextView ownPizzaMenuItem; + @BindView(R.id.exstraKebapMenuItem) TextView exstraKebapMenuItem; + @BindView(R.id.pizzaMenuItem) TextView pizzaMenuItem; + @BindView(R.id.vorspeisenMenuItem) TextView vorspeisenMenuItem; + @BindView(R.id.haussMenuItem) TextView haussMenuItem; + @BindView(R.id.salatMenuItem) TextView salatMenuItem; + @BindView(R.id.pastaMenuItem) TextView pastaMenuItem; + @BindView(R.id.chickenMenuItem) TextView chickenMenuItem; + @BindView(R.id.drinksMenuItem) TextView drinksMenuItem; + @BindView(R.id.drinksLayout) LinearLayout drinksLayout; + @BindView(R.id.roseDrinksMenuItem) TextView roseDrinksMenuItem; + @BindView(R.id.rotweinDrinksMenuItem) TextView rotweinDrinksMenuItem; + @BindView(R.id.spirituosenDrinksMenuItem) TextView spirituosenDrinksMenuItem; + @BindView(R.id.weissweinDrinksMenuItem) TextView weissweinDrinksMenuItem; + @BindView(R.id.beerDrinksMenuItem) TextView beerDrinksMenuItem; + @BindView(R.id.dessertMenuItem) TextView dessertMenuItem; private FragmentManager fragmentManager; private String currentFragmentName = ""; @@ -45,7 +67,11 @@ public class MainActivity extends BaseActivity { initViews(); } - @OnClick({R.id.navMenuItem1, R.id.navMenuItem2, R.id.navMenuItem3, R.id.navMenuItem4}) + @OnClick({R.id.ownPizzaMenuItem, R.id.exstraKebapMenuItem, R.id.pizzaMenuItem, + R.id.vorspeisenMenuItem, R.id.haussMenuItem, R.id.salatMenuItem, + R.id.pastaMenuItem, R.id.chickenMenuItem, R.id.drinksMenuItem, + R.id.roseDrinksMenuItem, R.id.rotweinDrinksMenuItem, R.id.spirituosenDrinksMenuItem, + R.id.weissweinDrinksMenuItem, R.id.beerDrinksMenuItem, R.id.dessertMenuItem}) public void onClick(View view){ selectMenuItem(view); } @@ -58,8 +84,8 @@ public class MainActivity extends BaseActivity { private void showStartScreen(){ fragmentManager = getSupportFragmentManager(); - fragmentManager.beginTransaction().replace(R.id.fragmentContainer, OrderFragment.newInstance()).commit(); - currentFragmentName = OrderFragment.FRAGMENT_NAME; + fragmentManager.beginTransaction().replace(R.id.fragmentContainer, PizzaFragment.newInstance()).commit(); + currentFragmentName = PizzaFragment.FRAGMENT_NAME; } private void initBottomNavigationView(){ @@ -75,10 +101,10 @@ public class MainActivity extends BaseActivity { public boolean onNavigationItemSelected(@NonNull MenuItem item) { switch (item.getItemId()){ case R.id.action_order: - if (currentFragmentName.equals(OrderFragment.FRAGMENT_NAME)) + if (currentFragmentName.equals(PizzaFragment.FRAGMENT_NAME)) return true; - fragmentManager.beginTransaction().replace(R.id.fragmentContainer, OrderFragment.newInstance()).commit(); - currentFragmentName = OrderFragment.FRAGMENT_NAME; + fragmentManager.beginTransaction().replace(R.id.fragmentContainer, PizzaFragment.newInstance()).commit(); + currentFragmentName = PizzaFragment.FRAGMENT_NAME; return true; case R.id.action_cart: @@ -111,7 +137,10 @@ public class MainActivity extends BaseActivity { pizzalinkToolbar.getHamburgerIcon().setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - openNavigationDrawer(); + if(drawerLayout.isDrawerOpen(GravityCompat.START)) + drawerLayout.closeDrawers(); + else + openNavigationDrawer(); } }); @@ -122,19 +151,111 @@ public class MainActivity extends BaseActivity { } private void selectMenuItem(View view){ - drawerLayout.closeDrawers(); + //drawerLayout.closeDrawers(); switch (view.getId()){ - case R.id.navMenuItem1: - Toast.makeText(this, "NavMenuItem1", Toast.LENGTH_SHORT).show(); + case R.id.ownPizzaMenuItem: + if (currentFragmentName.equals(OwnPizzaFragment.FRAGMENT_NAME)) + break; + fragmentManager.beginTransaction().replace(R.id.fragmentContainer, OwnPizzaFragment.newInstance()).commit(); + currentFragmentName = OwnPizzaFragment.FRAGMENT_NAME; + drinksLayout.setVisibility(View.GONE); + drawerLayout.closeDrawers(); break; - case R.id.navMenuItem2: - Toast.makeText(this, "NavMenuItem2", Toast.LENGTH_SHORT).show(); + + case R.id.exstraKebapMenuItem: + if (currentFragmentName.equals(ExtraKebapFragment.FRAGMENT_NAME)) + break; + fragmentManager.beginTransaction().replace(R.id.fragmentContainer, ExtraKebapFragment.newInstance()).commit(); + currentFragmentName = ExtraKebapFragment.FRAGMENT_NAME; + drinksLayout.setVisibility(View.GONE); + drawerLayout.closeDrawers(); break; - case R.id.navMenuItem3: - Toast.makeText(this, "NavMenuItem3", Toast.LENGTH_SHORT).show(); + + case R.id.pizzaMenuItem: + if (currentFragmentName.equals(PizzaFragment.FRAGMENT_NAME)) + break; + fragmentManager.beginTransaction().replace(R.id.fragmentContainer, PizzaFragment.newInstance()).commit(); + currentFragmentName = PizzaFragment.FRAGMENT_NAME; + drinksLayout.setVisibility(View.GONE); + drawerLayout.closeDrawers(); break; - case R.id.navMenuItem4: - Toast.makeText(this, "NavMenuItem4", Toast.LENGTH_SHORT).show(); + + case R.id.vorspeisenMenuItem: + if (currentFragmentName.equals(VorspeisenFragment.FRAGMENT_NAME)) + break; + fragmentManager.beginTransaction().replace(R.id.fragmentContainer, VorspeisenFragment.newInstance()).commit(); + currentFragmentName = VorspeisenFragment.FRAGMENT_NAME; + drinksLayout.setVisibility(View.GONE); + drawerLayout.closeDrawers(); + break; + + case R.id.haussMenuItem: + if (currentFragmentName.equals(HaussFragment.FRAGMENT_NAME)) + break; + fragmentManager.beginTransaction().replace(R.id.fragmentContainer, HaussFragment.newInstance()).commit(); + currentFragmentName = HaussFragment.FRAGMENT_NAME; + drinksLayout.setVisibility(View.GONE); + drawerLayout.closeDrawers(); + break; + + case R.id.salatMenuItem: + if (currentFragmentName.equals(SalatFragment.FRAGMENT_NAME)) + break; + fragmentManager.beginTransaction().replace(R.id.fragmentContainer, SalatFragment.newInstance()).commit(); + currentFragmentName = SalatFragment.FRAGMENT_NAME; + drinksLayout.setVisibility(View.GONE); + drawerLayout.closeDrawers(); + break; + + case R.id.pastaMenuItem: + if (currentFragmentName.equals(PastaFragment.FRAGMENT_NAME)) + break; + fragmentManager.beginTransaction().replace(R.id.fragmentContainer, PastaFragment.newInstance()).commit(); + currentFragmentName = PastaFragment.FRAGMENT_NAME; + drinksLayout.setVisibility(View.GONE); + drawerLayout.closeDrawers(); + break; + + case R.id.chickenMenuItem: + if (currentFragmentName.equals(ChickenFragment.FRAGMENT_NAME)) + break; + fragmentManager.beginTransaction().replace(R.id.fragmentContainer, ChickenFragment.newInstance()).commit(); + currentFragmentName = ChickenFragment.FRAGMENT_NAME; + drinksLayout.setVisibility(View.GONE); + drawerLayout.closeDrawers(); + break; + + case R.id.drinksMenuItem: + /* + if (currentFragmentName.equals(DrinksFragment.FRAGMENT_NAME)) + break; + */ + drinksLayout.setVisibility(View.VISIBLE); + fragmentManager.beginTransaction().replace(R.id.fragmentContainer, DrinksFragment.newInstance(view.getId())).commit(); + currentFragmentName = DrinksFragment.FRAGMENT_NAME; + break; + + case R.id.roseDrinksMenuItem: + case R.id.rotweinDrinksMenuItem: + case R.id.spirituosenDrinksMenuItem: + case R.id.weissweinDrinksMenuItem: + case R.id.beerDrinksMenuItem: + /* + if (currentFragmentName.equals(DrinksFragment.FRAGMENT_NAME)) + break; + */ + fragmentManager.beginTransaction().replace(R.id.fragmentContainer, DrinksFragment.newInstance(view.getId())).commit(); + currentFragmentName = DrinksFragment.FRAGMENT_NAME; + drawerLayout.closeDrawers(); + break; + + case R.id.dessertMenuItem: + if (currentFragmentName.equals(DessertFragment.FRAGMENT_NAME)) + break; + fragmentManager.beginTransaction().replace(R.id.fragmentContainer, DessertFragment.newInstance()).commit(); + currentFragmentName = DessertFragment.FRAGMENT_NAME; + drinksLayout.setVisibility(View.GONE); + drawerLayout.closeDrawers(); break; } } 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 7b58af8..5ff0eae 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.fragment_title_cart) String fragmentTitle; + @BindString(R.string.bottom_nav_menu_item_my_cart) String fragmentTitle; public static final java.lang.String FRAGMENT_NAME = "cartFragment"; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/InfoFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/InfoFragment.java index 59bb33b..e3fd1aa 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/InfoFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/InfoFragment.java @@ -15,7 +15,7 @@ import ch.pizzalink.android.R; public class InfoFragment extends BaseFragment { - @BindString(R.string.fragment_title_info) String fragmentTitle; + @BindString(R.string.bottom_nav_menu_item_info) String fragmentTitle; public static final java.lang.String FRAGMENT_NAME = "infoFragment"; diff --git a/app/src/main/java/ch/pizzalink/android/fragment/ProfileFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/ProfileFragment.java index 5c556b2..f44d090 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/ProfileFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/ProfileFragment.java @@ -15,7 +15,7 @@ import ch.pizzalink.android.R; public class ProfileFragment extends BaseFragment { - @BindString(R.string.fragment_title_profile) String fragmentTitle; + @BindString(R.string.bottom_nav_menu_item_profile) String fragmentTitle; public static final java.lang.String FRAGMENT_NAME = "profileFragment"; 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 new file mode 100644 index 0000000..b9e6753 --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/ChickenFragment.java @@ -0,0 +1,44 @@ +package ch.pizzalink.android.fragment.order; + +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 19/09/2017. + */ + +public class ChickenFragment extends OrderBaseFragment { + + @BindString(R.string.navigation_menu_item_chicken) String fragmentTitle; + + public static final java.lang.String FRAGMENT_NAME = "chickenFragment"; + + public ChickenFragment() {} + + public static ChickenFragment newInstance() { + return new ChickenFragment(); + } + + @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_chicken, container, false); + ButterKnife.bind(this, view); + initViews(); + return view; + } + + private void initViews(){ + setPizzalinkToolbarFields(true, fragmentTitle); + } +} 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 new file mode 100644 index 0000000..4c2096a --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/DessertFragment.java @@ -0,0 +1,44 @@ +package ch.pizzalink.android.fragment.order; + +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 19/09/2017. + */ + +public class DessertFragment extends OrderBaseFragment { + + @BindString(R.string.navigation_menu_item_dessert) String fragmentTitle; + + public static final java.lang.String FRAGMENT_NAME = "dessertFragment"; + + public DessertFragment() {} + + public static DessertFragment newInstance() { + return new DessertFragment(); + } + + @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_dessert, container, false); + ButterKnife.bind(this, view); + initViews(); + return view; + } + + private void initViews(){ + setPizzalinkToolbarFields(true, fragmentTitle); + } +} 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 new file mode 100644 index 0000000..957012d --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/DrinksFragment.java @@ -0,0 +1,95 @@ +package ch.pizzalink.android.fragment.order; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import butterknife.BindString; +import butterknife.BindView; +import butterknife.ButterKnife; +import ch.pizzalink.android.R; + +/** + * Created by cimenmus on 19/09/2017. + */ + +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_rose_drinks) String roseDrinksFragmentTitle; + @BindString(R.string.fragment_title_item_rotwein_drinks) String rotweinDrinksFragmentTitle; + @BindString(R.string.fragment_title_item_spirituosen_drinks) String spirituosenDrinksFragmentTitle; + @BindString(R.string.fragment_title_item_weisswein_drinks) String weissweinDrinksFragmentTitle; + @BindString(R.string.fragment_title_item_beer_drinks) String beerDrinksFragmentTitle; + + private int selectedDrinkCategoryId; + + public static final java.lang.String FRAGMENT_NAME = "drinksFragment"; + + public DrinksFragment() {} + + public static DrinksFragment newInstance(int selectedDrinkCategoryName) { + Bundle args = new Bundle(); + args.putInt("selectedDrinkCategoryId", selectedDrinkCategoryName); + DrinksFragment fragment = new DrinksFragment(); + fragment.setArguments(args); + return fragment; + } + + @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_drinks, container, false); + ButterKnife.bind(this, view); + getDataFromExtras(); + initViews(); + return view; + } + + private void getDataFromExtras(){ + selectedDrinkCategoryId = getArguments().getInt("selectedDrinkCategoryId", 0); + } + + private void initViews(){ + setPizzalinkToolbarFields(true, allDrinksFragmentTitle); + setText(); + } + + private void setText(){ + switch (selectedDrinkCategoryId){ + case R.id.drinksMenuItem: + drinksTextView.setText("All Drinks Fragment"); + setPizzalinkToolbarFields(true, allDrinksFragmentTitle); + break; + case R.id.roseDrinksMenuItem: + drinksTextView.setText("Rose Drinks Fragment"); + setPizzalinkToolbarFields(true, roseDrinksFragmentTitle); + break; + case R.id.rotweinDrinksMenuItem: + drinksTextView.setText("Rotwein Drinks Fragment"); + setPizzalinkToolbarFields(true, rotweinDrinksFragmentTitle); + break; + case R.id.spirituosenDrinksMenuItem: + drinksTextView.setText("Spirituosen Drinks Fragment"); + setPizzalinkToolbarFields(true, spirituosenDrinksFragmentTitle); + break; + case R.id.weissweinDrinksMenuItem: + drinksTextView.setText("Weisswein Drinks Fragment"); + setPizzalinkToolbarFields(true, weissweinDrinksFragmentTitle); + break; + case R.id.beerDrinksMenuItem: + drinksTextView.setText("Beer Drinks Fragment"); + setPizzalinkToolbarFields(true, beerDrinksFragmentTitle); + break; + + } + } +} 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 new file mode 100644 index 0000000..65d5eb3 --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/ExtraKebapFragment.java @@ -0,0 +1,44 @@ +package ch.pizzalink.android.fragment.order; + +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 19/09/2017. + */ + +public class ExtraKebapFragment extends OrderBaseFragment { + + @BindString(R.string.navigation_menu_item_ekstra_kebap) String fragmentTitle; + + public static final java.lang.String FRAGMENT_NAME = "extraKebapFragment"; + + public ExtraKebapFragment() {} + + public static ExtraKebapFragment newInstance() { + return new ExtraKebapFragment(); + } + + @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_extra_kebap, container, false); + ButterKnife.bind(this, view); + initViews(); + return view; + } + + private void initViews(){ + setPizzalinkToolbarFields(true, fragmentTitle); + } +} 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 new file mode 100644 index 0000000..5ec573f --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/HaussFragment.java @@ -0,0 +1,44 @@ +package ch.pizzalink.android.fragment.order; + +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 19/09/2017. + */ + +public class HaussFragment extends OrderBaseFragment { + + @BindString(R.string.navigation_menu_item_hauss) String fragmentTitle; + + public static final java.lang.String FRAGMENT_NAME = "haussFragment"; + + public HaussFragment() {} + + public static HaussFragment newInstance() { + return new HaussFragment(); + } + + @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_hauss, container, false); + ButterKnife.bind(this, view); + initViews(); + return view; + } + + private void initViews(){ + setPizzalinkToolbarFields(true, fragmentTitle); + } +} diff --git a/app/src/main/java/ch/pizzalink/android/fragment/OrderBaseFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/OrderBaseFragment.java similarity index 67% rename from app/src/main/java/ch/pizzalink/android/fragment/OrderBaseFragment.java rename to app/src/main/java/ch/pizzalink/android/fragment/order/OrderBaseFragment.java index 2a4e871..6dba39d 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/OrderBaseFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/OrderBaseFragment.java @@ -1,8 +1,9 @@ -package ch.pizzalink.android.fragment; +package ch.pizzalink.android.fragment.order; import android.support.v4.app.Fragment; import ch.pizzalink.android.activity.MainActivity; +import ch.pizzalink.android.fragment.BaseFragment; /** * Created by cimenmus on 18/09/2017. 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 new file mode 100644 index 0000000..f7282e8 --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/OwnPizzaFragment.java @@ -0,0 +1,44 @@ +package ch.pizzalink.android.fragment.order; + +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 19/09/2017. + */ + +public class OwnPizzaFragment extends OrderBaseFragment { + + @BindString(R.string.navigation_menu_item_create_own_pizza) String fragmentTitle; + + public static final java.lang.String FRAGMENT_NAME = "ownPizzaFragment"; + + public OwnPizzaFragment() {} + + public static OwnPizzaFragment newInstance() { + return new OwnPizzaFragment(); + } + + @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_own_pizza, container, false); + ButterKnife.bind(this, view); + initViews(); + return view; + } + + private void initViews(){ + setPizzalinkToolbarFields(true, fragmentTitle); + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..25294e3 --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/PastaFragment.java @@ -0,0 +1,44 @@ +package ch.pizzalink.android.fragment.order; + +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 19/09/2017. + */ + +public class PastaFragment extends OrderBaseFragment { + + @BindString(R.string.navigation_menu_item_pasta) String fragmentTitle; + + public static final java.lang.String FRAGMENT_NAME = "pastaFragment"; + + public PastaFragment() {} + + public static PastaFragment newInstance() { + return new PastaFragment(); + } + + @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_pasta, container, false); + ButterKnife.bind(this, view); + initViews(); + return view; + } + + private void initViews(){ + setPizzalinkToolbarFields(true, fragmentTitle); + } +} diff --git a/app/src/main/java/ch/pizzalink/android/fragment/OrderFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/PizzaFragment.java similarity index 63% rename from app/src/main/java/ch/pizzalink/android/fragment/OrderFragment.java rename to app/src/main/java/ch/pizzalink/android/fragment/order/PizzaFragment.java index 1316778..195b383 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/OrderFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/PizzaFragment.java @@ -1,4 +1,4 @@ -package ch.pizzalink.android.fragment; +package ch.pizzalink.android.fragment.order; import android.os.Bundle; import android.view.LayoutInflater; @@ -13,16 +13,16 @@ import ch.pizzalink.android.R; * Created by cimenmus on 18/09/2017. */ -public class OrderFragment extends BaseFragment { +public class PizzaFragment extends OrderBaseFragment { - @BindString(R.string.fragment_title_order) String fragmentTitle; + @BindString(R.string.navigation_menu_item_pizza) String fragmentTitle; - public static final java.lang.String FRAGMENT_NAME = "orderFragment"; + public static final java.lang.String FRAGMENT_NAME = "pizzaFragment"; - public OrderFragment() {} + public PizzaFragment() {} - public static OrderFragment newInstance() { - return new OrderFragment(); + public static PizzaFragment newInstance() { + return new PizzaFragment(); } @Override @@ -32,7 +32,7 @@ public class OrderFragment extends BaseFragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_order, container, false); + View view = inflater.inflate(R.layout.fragment_pizza, container, false); ButterKnife.bind(this, view); initViews(); return view; 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 new file mode 100644 index 0000000..99752f8 --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/SalatFragment.java @@ -0,0 +1,44 @@ +package ch.pizzalink.android.fragment.order; + +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 19/09/2017. + */ + +public class SalatFragment extends OrderBaseFragment { + + @BindString(R.string.navigation_menu_item_salat) String fragmentTitle; + + public static final java.lang.String FRAGMENT_NAME = "salatFragment"; + + public SalatFragment() {} + + public static SalatFragment newInstance() { + return new SalatFragment(); + } + + @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_salat, container, false); + ButterKnife.bind(this, view); + initViews(); + return view; + } + + private void initViews(){ + setPizzalinkToolbarFields(true, fragmentTitle); + } +} 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 new file mode 100644 index 0000000..8d2fe5e --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/VorspeisenFragment.java @@ -0,0 +1,44 @@ +package ch.pizzalink.android.fragment.order; + +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 19/09/2017. + */ + +public class VorspeisenFragment extends OrderBaseFragment { + + @BindString(R.string.navigation_menu_item_vorspeisen) String fragmentTitle; + + public static final java.lang.String FRAGMENT_NAME = "vorspeisenFragment"; + + public VorspeisenFragment() {} + + public static VorspeisenFragment newInstance() { + return new VorspeisenFragment(); + } + + @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_vorspeisen, container, false); + ButterKnife.bind(this, view); + initViews(); + return view; + } + + private void initViews(){ + setPizzalinkToolbarFields(true, fragmentTitle); + } +} diff --git a/app/src/main/res/layout/fragment_chicken.xml b/app/src/main/res/layout/fragment_chicken.xml new file mode 100644 index 0000000..51f5da4 --- /dev/null +++ b/app/src/main/res/layout/fragment_chicken.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dessert.xml b/app/src/main/res/layout/fragment_dessert.xml new file mode 100644 index 0000000..a644a03 --- /dev/null +++ b/app/src/main/res/layout/fragment_dessert.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_drinks.xml b/app/src/main/res/layout/fragment_drinks.xml new file mode 100644 index 0000000..2ca2a01 --- /dev/null +++ b/app/src/main/res/layout/fragment_drinks.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_extra_kebap.xml b/app/src/main/res/layout/fragment_extra_kebap.xml new file mode 100644 index 0000000..3fe3361 --- /dev/null +++ b/app/src/main/res/layout/fragment_extra_kebap.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_hauss.xml similarity index 92% rename from app/src/main/res/layout/fragment_order.xml rename to app/src/main/res/layout/fragment_hauss.xml index bbdd176..121945e 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_hauss.xml @@ -8,7 +8,7 @@ diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xml index bbdd176..6ad2d09 100644 --- a/app/src/main/res/layout/fragment_info.xml +++ b/app/src/main/res/layout/fragment_info.xml @@ -8,7 +8,7 @@ diff --git a/app/src/main/res/layout/fragment_own_pizza.xml b/app/src/main/res/layout/fragment_own_pizza.xml new file mode 100644 index 0000000..933e5c2 --- /dev/null +++ b/app/src/main/res/layout/fragment_own_pizza.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_pasta.xml b/app/src/main/res/layout/fragment_pasta.xml new file mode 100644 index 0000000..a3b2542 --- /dev/null +++ b/app/src/main/res/layout/fragment_pasta.xml @@ -0,0 +1,15 @@ + + + + + + \ 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 new file mode 100644 index 0000000..e821e8f --- /dev/null +++ b/app/src/main/res/layout/fragment_pizza.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index bbdd176..41a2fcb 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -8,7 +8,7 @@ diff --git a/app/src/main/res/layout/fragment_salat.xml b/app/src/main/res/layout/fragment_salat.xml new file mode 100644 index 0000000..e944f85 --- /dev/null +++ b/app/src/main/res/layout/fragment_salat.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_vorspeisen.xml b/app/src/main/res/layout/fragment_vorspeisen.xml new file mode 100644 index 0000000..0183623 --- /dev/null +++ b/app/src/main/res/layout/fragment_vorspeisen.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_navigation_drawer.xml b/app/src/main/res/layout/layout_navigation_drawer.xml index e1c0d8e..9c68058 100644 --- a/app/src/main/res/layout/layout_navigation_drawer.xml +++ b/app/src/main/res/layout/layout_navigation_drawer.xml @@ -1,47 +1,256 @@ - - + android:orientation="vertical"> - + - + - + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 6cf919f..5a719d5 100644 --- a/app/src/main/res/layout/layout_pizzalink_toolbar.xml +++ b/app/src/main/res/layout/layout_pizzalink_toolbar.xml @@ -35,6 +35,9 @@ android:layout_width="wrap_content" 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" android:visibility="gone"/> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 09441b1..39f6e42 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -9,4 +9,8 @@ #ffffff #EC1649 #ffffff + #4C4B4A + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 91299bc..7659a4b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,5 @@ + Pizzalink @@ -8,20 +9,28 @@ Info - - Order - + + WUNSCHPIZZA + EKSTRA KEBAP + PIZZA + VORSPEISEN + HAUSSSPEZIALITÄTEN + SALAT + PASTA + CHICKEN + DRINKS + - ROSE + - ROTWEIN + - SPIRITUOSEN + - WEISSWEIN + - BEER + DESSERT + - - Cart - - - - Profile - - - - Info - + ROSE + ROTWEIN + SPIRITUOSEN + WEISSWEIN + BEER