From 8c94cfe3aa9bab49a565cf12b1ce68f307b84149 Mon Sep 17 00:00:00 2001 From: PawelZielinski Date: Wed, 24 Feb 2021 23:27:45 +0100 Subject: [PATCH] =?UTF-8?q?Zaimplementowane=20wszystkie=20aktywno=C5=9Bci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 5 +- .../com/example/pizzujemyv3/CartActivity.java | 49 ++--- .../com/example/pizzujemyv3/CartAdapter.java | 43 +--- .../example/pizzujemyv3/CheckoutActivity.java | 53 +++++ .../pizzujemyv3/CollectFormActivity.java | 27 ++- .../pizzujemyv3/CollectFormActivityTC.java | 59 ++++++ .../pizzujemyv3/DeliveryFormActivity.java | 33 +-- .../pizzujemyv3/DeliveryFormActivityTC.java | 70 +++++++ .../com/example/pizzujemyv3/MainActivity.java | 3 + .../java/com/example/pizzujemyv3/Menu.java | 6 +- .../com/example/pizzujemyv3/PizzaAdapter.java | 6 + .../com/example/pizzujemyv3/UserInfo.java | 160 +++++++++++++++ app/src/main/res/layout/activity_cart.xml | 2 +- app/src/main/res/layout/activity_checkout.xml | 124 ++++++++++++ .../res/layout/activity_collect_form_t_c.xml | 126 ++++++++++++ .../res/layout/activity_delivery_form_t_c.xml | 190 ++++++++++++++++++ app/src/main/res/layout/cart_list_row.xml | 61 ++---- 17 files changed, 882 insertions(+), 135 deletions(-) create mode 100644 app/src/main/java/com/example/pizzujemyv3/CheckoutActivity.java create mode 100644 app/src/main/java/com/example/pizzujemyv3/CollectFormActivityTC.java create mode 100644 app/src/main/java/com/example/pizzujemyv3/DeliveryFormActivityTC.java create mode 100644 app/src/main/java/com/example/pizzujemyv3/UserInfo.java create mode 100644 app/src/main/res/layout/activity_checkout.xml create mode 100644 app/src/main/res/layout/activity_collect_form_t_c.xml create mode 100644 app/src/main/res/layout/activity_delivery_form_t_c.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dd87ccb..d2af0b4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,7 +9,10 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.PizzujemyV3"> - + + + + diff --git a/app/src/main/java/com/example/pizzujemyv3/CartActivity.java b/app/src/main/java/com/example/pizzujemyv3/CartActivity.java index a43e278..2a37a5e 100644 --- a/app/src/main/java/com/example/pizzujemyv3/CartActivity.java +++ b/app/src/main/java/com/example/pizzujemyv3/CartActivity.java @@ -1,6 +1,8 @@ package com.example.pizzujemyv3; import androidx.appcompat.app.AppCompatActivity; + +import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.Button; @@ -14,7 +16,7 @@ import java.util.ArrayList; public class CartActivity extends AppCompatActivity { ListView cLView; -ArrayList menuArrayList = new ArrayList<>(); +ArrayList menuArrayList; Switch oSwitch; Button oButton; @Override @@ -24,39 +26,40 @@ Button oButton; cLView = findViewById(R.id.cartListView); ArrayList cartArrayList = new ArrayList<>(); - //cartArrayList.add(pizzaArrayList.get(1)); - //cartArrayList.add(pizzaArrayList.get(3)); - menuArrayList = getIntent().getParcelableArrayListExtra("pizzas"); - Cart cart= new Cart(menuArrayList); + + UserInfo user = getIntent().getParcelableExtra("user"); + menuArrayList = getIntent().getParcelableArrayListExtra("pizzas"); + Cart cart= new Cart(menuArrayList); + TextView totalPrice = (TextView)findViewById(R.id.totalPrice); totalPrice.setText("Cena: " + cart.getStringTotalPrice()); PizzaAdapter pizzaAdapter = new PizzaAdapter(this,R.layout.list_row,cart.cartLista); cLView.setAdapter(pizzaAdapter); -/* - cartListView = findViewById(R.id.listView); - pizzaArrayList = new ArrayList<>(); - pizzaArrayList = getIntent().getParcelableArrayListExtra("pizzas"); - PizzaAdapter pizzaAdapter = new PizzaAdapter(this,R.layout.list_row,pizzaArrayList); - cartListView.setAdapter(pizzaAdapter); -*/ - /* cartListView = findViewById(R.id.cartListView); - ArrayList pizzaArrayList = new ArrayList<>(); - pizzaArrayList = getIntent().getParcelableArrayListExtra("pizzas"); - - - Cart cart = new Cart(pizzaArrayList); - PizzaAdapter pizzaAdapter = new PizzaAdapter(this,R.layout.cart_list_row,cart.cartLista); - cartListView.setAdapter(pizzaAdapter);*/ + oSwitch = findViewById(R.id.dowozSwitch); oButton = findViewById(R.id.zamow); oButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if(oSwitch.isChecked()); - + if(user.getName().isEmpty()) { - Toast.makeText(getApplicationContext(),"Szacowany czas oczekiwania: 50 minut", Toast.LENGTH_SHORT); + if(oSwitch.isChecked()){ + Intent intent = new Intent(CartActivity.this, DeliveryFormActivityTC.class); + intent.putParcelableArrayListExtra("cartpizzas",cart.cartLista); + startActivity(intent); + } + else { + Intent intent = new Intent(CartActivity.this, CollectFormActivityTC.class); + intent.putParcelableArrayListExtra("cartpizzas",cart.cartLista); + startActivity(intent); + } + } + else { + Intent intent = new Intent(CartActivity.this, CheckoutActivity.class); + intent.putExtra("user",user); + intent.putParcelableArrayListExtra("cartpizzas",cart.cartLista); + startActivity(intent); } } }); diff --git a/app/src/main/java/com/example/pizzujemyv3/CartAdapter.java b/app/src/main/java/com/example/pizzujemyv3/CartAdapter.java index b0f3839..2a5d26b 100644 --- a/app/src/main/java/com/example/pizzujemyv3/CartAdapter.java +++ b/app/src/main/java/com/example/pizzujemyv3/CartAdapter.java @@ -31,51 +31,18 @@ public class CartAdapter extends ArrayAdapter { convertView = layoutInflater.inflate(mResource,parent,false); - TextView txtSumPrice = convertView.findViewById(R.id.sumTxtPrice); - TextView addCounter = convertView.findViewById(R.id.addCounter); - + TextView txtName = convertView.findViewById(R.id.txtName); + TextView txtPrice = convertView.findViewById(R.id.txtPrice); + TextView txtSumPrice = convertView.findViewById(R.id.sumTxtPrice); ImageView imageView = convertView.findViewById(R.id.image); - TextView txtName = convertView.findViewById(R.id.txtName); - - TextView txtPrice = convertView.findViewById(R.id.txtPrice); - - TextView txtContent = convertView.findViewById(R.id.txtContent); - - Button minButton = convertView.findViewById(R.id.minButton); - - Button addButton = convertView.findViewById(R.id.addButton); imageView.setImageResource(getItem(position).getResID()); - addCounter.setText((getItem(position).getStringOnOrder())); - + addCounter.setText("x" +(getItem(position).getStringOnOrder())); txtName.setText(getItem(position).getName()); - - txtSumPrice.setText(getItem(position).getStringSumPrice()); - txtPrice.setText(getItem(position).getStringPrice()); - - txtContent.setText(getItem(position).getDes()); - - minButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - getItem(position).minOnOrder(); - addCounter.setText(((getItem(position).getStringOnOrder()))); - } - }); - addButton.setOnClickListener(new View.OnClickListener() { - @Override - - - public void onClick(View v) { - Toast.makeText(getContext(), "Dodano do koszyka!", Toast.LENGTH_SHORT).show(); - getItem(position).addOnOrder(); - addCounter.setText((getItem(position).getStringOnOrder())); - } - }); - + txtSumPrice.setText( getItem(position).getStringSumPrice()); return convertView; } diff --git a/app/src/main/java/com/example/pizzujemyv3/CheckoutActivity.java b/app/src/main/java/com/example/pizzujemyv3/CheckoutActivity.java new file mode 100644 index 0000000..7509a26 --- /dev/null +++ b/app/src/main/java/com/example/pizzujemyv3/CheckoutActivity.java @@ -0,0 +1,53 @@ +package com.example.pizzujemyv3; + +import androidx.appcompat.app.AppCompatActivity; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.ListView; +import android.widget.TextView; +import android.widget.Toast; + +import java.util.ArrayList; + +public class CheckoutActivity extends AppCompatActivity { + + ListView cLView; + ArrayList cartArrayList = new ArrayList<>(); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_checkout); + cLView = findViewById(R.id.cartListView); + + UserInfo user = getIntent().getParcelableExtra("user"); + cartArrayList = getIntent().getParcelableArrayListExtra("cartpizzas"); + + Cart checkoutCart = new Cart(cartArrayList); + + TextView userInfo = findViewById(R.id.userInfoOnCheckout); + TextView totalPrice = findViewById(R.id.totalPriceOnCheckout); + + String buffer = user.toCheckout(); + userInfo.setText(buffer); + totalPrice.setText(checkoutCart.getStringTotalPrice()); + + CartAdapter cartAdapter = new CartAdapter(this,R.layout.cart_list_row,cartArrayList); + cLView.setAdapter(cartAdapter); + + Button zamowButton = findViewById(R.id.cart); + + zamowButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + + + Toast.makeText(getApplicationContext(),"Zamówienie zostało przyjęte! Smacznego!", Toast.LENGTH_LONG).show(); + + } + }); + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/pizzujemyv3/CollectFormActivity.java b/app/src/main/java/com/example/pizzujemyv3/CollectFormActivity.java index ba9b2af..34870c5 100644 --- a/app/src/main/java/com/example/pizzujemyv3/CollectFormActivity.java +++ b/app/src/main/java/com/example/pizzujemyv3/CollectFormActivity.java @@ -13,6 +13,8 @@ import com.basgeekball.awesomevalidation.AwesomeValidation; import com.basgeekball.awesomevalidation.ValidationStyle; import com.basgeekball.awesomevalidation.utility.RegexTemplate; +import java.util.ArrayList; + public class CollectFormActivity extends AppCompatActivity { EditText tUserName, tUserNameS, tPhoneNumber; @@ -22,29 +24,32 @@ public class CollectFormActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_collect_form); - tUserName = findViewById(R.id.txtUserName); - tUserNameS = findViewById(R.id.txtUserNameS); - tPhoneNumber = findViewById(R.id.txtPhoneNumber); + + tUserName = (EditText) findViewById(R.id.txtUserName); + tUserNameS = (EditText) findViewById(R.id.txtUserNameS); + tPhoneNumber = (EditText) findViewById(R.id.txtPhoneNumber); zamowButton = findViewById((R.id.Confirm)); + awesomeValidation = new AwesomeValidation(ValidationStyle.BASIC); - awesomeValidation.addValidation(this,R.id.txtUserName, RegexTemplate.NOT_EMPTY,R.string.invalid_name); - awesomeValidation.addValidation(this,R.id.txtUserNameS, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS); + awesomeValidation.addValidation(this,R.id.txtPhoneNumber, "[2-9]{1}[0-9]{8}$",R.string.invalid_number); - awesomeValidation.addValidation(this,R.id.txtPhoneNumber, "[5-9]{1}[0-9]{9}$",R.string.invalid_number); - zamowButton.setOnClickListener(new View.OnClickListener() + UserInfo user = new UserInfo(tUserName.getText().toString(), tUserNameS.getText().toString(), tPhoneNumber.getText().toString()); + zamowButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (awesomeValidation.validate()){ - Intent intent = new Intent(CollectFormActivity.this, Menu.class); - startActivity(intent); - } + UserInfo user = new UserInfo(tUserName.getText().toString(), tUserNameS.getText().toString(), tPhoneNumber.getText().toString()); + Intent intent = new Intent(CollectFormActivity.this, Menu.class); + intent.putExtra("user",user); + startActivity(intent); + } else{ Toast.makeText(getApplicationContext(),"Wprowadź dane poprawnie", Toast.LENGTH_LONG).show(); - } + } } }); } diff --git a/app/src/main/java/com/example/pizzujemyv3/CollectFormActivityTC.java b/app/src/main/java/com/example/pizzujemyv3/CollectFormActivityTC.java new file mode 100644 index 0000000..8b90f0c --- /dev/null +++ b/app/src/main/java/com/example/pizzujemyv3/CollectFormActivityTC.java @@ -0,0 +1,59 @@ +package com.example.pizzujemyv3; + +import androidx.appcompat.app.AppCompatActivity; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import com.basgeekball.awesomevalidation.AwesomeValidation; +import com.basgeekball.awesomevalidation.ValidationStyle; +import com.basgeekball.awesomevalidation.utility.RegexTemplate; + +import java.util.ArrayList; + +public class CollectFormActivityTC extends AppCompatActivity { + + EditText tUserName, tUserNameS, tPhoneNumber; + Button zamowButton; + ArrayList cartList = new ArrayList(); + AwesomeValidation awesomeValidation; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_collect_form_t_c); + + cartList = getIntent().getParcelableArrayListExtra("cartpizzas"); + tUserName = findViewById(R.id.txtUserName); + tUserNameS = findViewById(R.id.txtUserNameS); + tPhoneNumber = findViewById(R.id.txtPhoneNumber); + zamowButton = findViewById((R.id.Confirm)); + + awesomeValidation = new AwesomeValidation(ValidationStyle.BASIC); + awesomeValidation.addValidation(this,R.id.txtUserName, RegexTemplate.NOT_EMPTY,R.string.invalid_name); + awesomeValidation.addValidation(this,R.id.txtUserNameS, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS); + awesomeValidation.addValidation(this,R.id.txtPhoneNumber, "[2-9]{1}[0-9]{8}$",R.string.invalid_number); + + + zamowButton.setOnClickListener(new View.OnClickListener() + { + @Override + public void onClick(View v) { + if (awesomeValidation.validate()){ + UserInfo user = new UserInfo(tUserName.getText().toString(), tUserNameS.getText().toString(), tPhoneNumber.getText().toString()); + + Intent intent = new Intent(CollectFormActivityTC.this, CheckoutActivity.class); + intent.putParcelableArrayListExtra("cartpizzas",cartList); + intent.putExtra("user",user); + startActivity(intent); + } + else{ + Toast.makeText(getApplicationContext(),"Wprowadź dane poprawnie", Toast.LENGTH_LONG).show(); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/pizzujemyv3/DeliveryFormActivity.java b/app/src/main/java/com/example/pizzujemyv3/DeliveryFormActivity.java index e263040..fb880c8 100644 --- a/app/src/main/java/com/example/pizzujemyv3/DeliveryFormActivity.java +++ b/app/src/main/java/com/example/pizzujemyv3/DeliveryFormActivity.java @@ -13,43 +13,50 @@ import com.basgeekball.awesomevalidation.AwesomeValidation; import com.basgeekball.awesomevalidation.ValidationStyle; import com.basgeekball.awesomevalidation.utility.RegexTemplate; +import java.util.ArrayList; + public class DeliveryFormActivity extends AppCompatActivity { EditText tUserName, tUserNameS, tPhoneNumber, tCity, tStreet, tStreetNumber; Button zamowButton; + ArrayList cartList = new ArrayList(); AwesomeValidation awesomeValidation; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_collect_form); - tUserName = findViewById(R.id.txtUserName); - tUserNameS = findViewById(R.id.txtUserNameS); - tPhoneNumber = findViewById(R.id.txtPhoneNumber); - tCity = findViewById(R.id.txtCity); - tStreet = findViewById(R.id.txtStreet); - tStreetNumber = findViewById(R.id.txtStreetNumber); - zamowButton = findViewById((R.id.Confirm)); + setContentView(R.layout.activity_delivery_form); + + tUserName = (EditText)findViewById(R.id.txtUserName); + tUserNameS = (EditText)findViewById(R.id.txtUserNameS); + tPhoneNumber = (EditText)findViewById(R.id.txtPhoneNumber); + tCity = (EditText)findViewById(R.id.txtCity); + tStreet = (EditText)findViewById(R.id.txtStreet); + tStreetNumber = (EditText)findViewById(R.id.txtStreetNumber); awesomeValidation = new AwesomeValidation(ValidationStyle.BASIC); - awesomeValidation.addValidation(this,R.id.txtUserName, RegexTemplate.NOT_EMPTY,R.string.invalid_name); - awesomeValidation.addValidation(this,R.id.txtUserNameS, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS); - - awesomeValidation.addValidation(this,R.id.txtPhoneNumber, "[5-9]{1}[0-9]{9}$",R.string.invalid_number); + awesomeValidation.addValidation(this,R.id.txtPhoneNumber, "[3-9]{1}[0-9]{8}$",R.string.invalid_number); awesomeValidation.addValidation(this,R.id.txtCity, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS); awesomeValidation.addValidation(this,R.id.txtStreet, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS); awesomeValidation.addValidation(this,R.id.txtStreetNumber, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS); + zamowButton = findViewById((R.id.Confirm)); + + zamowButton.setOnClickListener(new View.OnClickListener() + { @Override public void onClick(View v) { if (awesomeValidation.validate()){ + UserInfo user = new UserInfo(tUserName.getText().toString(), tUserNameS.getText().toString(), tPhoneNumber.getText().toString(), tCity.getText().toString(), tStreet.getText().toString(), tStreetNumber.getText().toString()); + Intent intent = new Intent(DeliveryFormActivity.this, Menu.class); - startActivity(intent); + intent.putExtra("user",user); + startActivity(intent); } else{ Toast.makeText(getApplicationContext(),"Wprowadź dane poprawnie", Toast.LENGTH_LONG).show(); diff --git a/app/src/main/java/com/example/pizzujemyv3/DeliveryFormActivityTC.java b/app/src/main/java/com/example/pizzujemyv3/DeliveryFormActivityTC.java new file mode 100644 index 0000000..a4227c4 --- /dev/null +++ b/app/src/main/java/com/example/pizzujemyv3/DeliveryFormActivityTC.java @@ -0,0 +1,70 @@ +package com.example.pizzujemyv3; + +import androidx.appcompat.app.AppCompatActivity; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import com.basgeekball.awesomevalidation.AwesomeValidation; +import com.basgeekball.awesomevalidation.ValidationStyle; +import com.basgeekball.awesomevalidation.utility.RegexTemplate; + +import java.util.ArrayList; + +public class DeliveryFormActivityTC extends AppCompatActivity { + + EditText tUserName, tUserNameS, tPhoneNumber, tCity, tStreet, tStreetNumber; + Button zamowButton; + ArrayList cartList = new ArrayList(); + AwesomeValidation awesomeValidation; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_delivery_form_t_c); + + cartList = getIntent().getParcelableArrayListExtra("cartpizzas"); + + tUserName = (EditText)findViewById(R.id.txtUserName); + tUserNameS = (EditText)findViewById(R.id.txtUserNameS); + tPhoneNumber = (EditText)findViewById(R.id.txtPhoneNumber); + tCity = (EditText)findViewById(R.id.txtCity); + tStreet = (EditText)findViewById(R.id.txtStreet); + tStreetNumber = (EditText)findViewById(R.id.txtStreetNumber); + + awesomeValidation = new AwesomeValidation(ValidationStyle.BASIC); + awesomeValidation.addValidation(this,R.id.txtUserName, RegexTemplate.NOT_EMPTY,R.string.invalid_name); + awesomeValidation.addValidation(this,R.id.txtUserNameS, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS); + awesomeValidation.addValidation(this,R.id.txtPhoneNumber, "[3-9]{1}[0-9]{8}$",R.string.invalid_number); + + awesomeValidation.addValidation(this,R.id.txtCity, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS); + awesomeValidation.addValidation(this,R.id.txtStreet, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS); + awesomeValidation.addValidation(this,R.id.txtStreetNumber, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS); + + + zamowButton = findViewById((R.id.Confirm)); + + + zamowButton.setOnClickListener(new View.OnClickListener() + + { + @Override + public void onClick(View v) { + if (awesomeValidation.validate()){ + UserInfo user = new UserInfo(tUserName.getText().toString(), tUserNameS.getText().toString(), tPhoneNumber.getText().toString(), tCity.getText().toString(), tStreet.getText().toString(), tStreetNumber.getText().toString()); + + Intent intent = new Intent(DeliveryFormActivityTC.this, CheckoutActivity.class); + intent.putParcelableArrayListExtra("cartpizzas",cartList); + intent.putExtra("user",user); + startActivity(intent); + } + else{ + Toast.makeText(getApplicationContext(),"Wprowadź dane poprawnie", Toast.LENGTH_LONG).show(); + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/pizzujemyv3/MainActivity.java b/app/src/main/java/com/example/pizzujemyv3/MainActivity.java index 0e51448..42c0a17 100644 --- a/app/src/main/java/com/example/pizzujemyv3/MainActivity.java +++ b/app/src/main/java/com/example/pizzujemyv3/MainActivity.java @@ -14,11 +14,14 @@ public class MainActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + UserInfo initialUser = new UserInfo(); menuButton = findViewById(R.id.menuButton); menuButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { + Intent intent = new Intent(MainActivity.this, Menu.class); + intent.putExtra("user",initialUser); startActivity(intent); } diff --git a/app/src/main/java/com/example/pizzujemyv3/Menu.java b/app/src/main/java/com/example/pizzujemyv3/Menu.java index 7909acf..ae0611d 100644 --- a/app/src/main/java/com/example/pizzujemyv3/Menu.java +++ b/app/src/main/java/com/example/pizzujemyv3/Menu.java @@ -19,6 +19,9 @@ public class Menu extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_menu); + + UserInfo user = getIntent().getParcelableExtra("user"); + menuListView = findViewById(R.id.listView); ArrayList arrayList = new ArrayList<>(); @@ -38,7 +41,8 @@ public class Menu extends AppCompatActivity { public void onClick(View v) { Intent intent = new Intent(Menu.this, CartActivity.class); intent.putParcelableArrayListExtra("pizzas",arrayList); + intent.putExtra("user",user); startActivity(intent); - }; + } }); }} diff --git a/app/src/main/java/com/example/pizzujemyv3/PizzaAdapter.java b/app/src/main/java/com/example/pizzujemyv3/PizzaAdapter.java index 4d6963e..35ff7a3 100644 --- a/app/src/main/java/com/example/pizzujemyv3/PizzaAdapter.java +++ b/app/src/main/java/com/example/pizzujemyv3/PizzaAdapter.java @@ -32,6 +32,8 @@ public class PizzaAdapter extends ArrayAdapter { convertView = layoutInflater.inflate(mResource,parent,false); + + TextView txtSumPrice = convertView.findViewById(R.id.sumTxtPrice); TextView addCounter = convertView.findViewById(R.id.addCounter); @@ -64,6 +66,8 @@ public class PizzaAdapter extends ArrayAdapter { public void onClick(View v) { getItem(position).minOnOrder(); addCounter.setText(((getItem(position).getStringOnOrder()))); + txtSumPrice.setText(getItem(position).getStringSumPrice()); + } }); addButton.setOnClickListener(new View.OnClickListener() { @@ -74,6 +78,8 @@ public class PizzaAdapter extends ArrayAdapter { Toast.makeText(getContext(), "Dodano do koszyka!", Toast.LENGTH_SHORT).show(); getItem(position).addOnOrder(); addCounter.setText((getItem(position).getStringOnOrder())); + txtSumPrice.setText(getItem(position).getStringSumPrice()); + } }); diff --git a/app/src/main/java/com/example/pizzujemyv3/UserInfo.java b/app/src/main/java/com/example/pizzujemyv3/UserInfo.java new file mode 100644 index 0000000..0718d67 --- /dev/null +++ b/app/src/main/java/com/example/pizzujemyv3/UserInfo.java @@ -0,0 +1,160 @@ +package com.example.pizzujemyv3; + +import android.os.Parcel; +import android.os.Parcelable; + +public class UserInfo implements Parcelable { + private String name; + private String nameS; + private String phone; + private String city; + private String street; + private String streetNumber; + + @Override + public String toString() { + return "UserInfo{" + + "name='" + name + '\'' + + ", nameS='" + nameS + '\'' + + ", phone='" + phone + '\'' + + ", city='" + city + '\'' + + ", street='" + street + '\'' + + ", streetNumber='" + streetNumber + '\'' + + '}'; + } + UserInfo(String name, String nameS, String phone, String city, String street, String streetNumber){ + this.name = name; + this.nameS = nameS; + this.phone = phone; + this.city = city; + this.street = street; + this.streetNumber = streetNumber; + } + UserInfo(String name, String nameS, String phone){ + this.name = name; + this.nameS = nameS; + this.phone = phone; + this.city = ""; + this.street = ""; + this.streetNumber =""; + } + UserInfo(){ + this.name = ""; + this.nameS = ""; + this.phone = ""; + this.city = ""; + this.street = ""; + this.streetNumber =""; + } + + UserInfo(UserInfo user) + { + this.name = user.getName(); + this.nameS = user.getNameS(); + this.phone = user.getPhone(); + this.city = user.getCity(); + this.street = user.getStreet(); + this.streetNumber = user.getStreetNumber(); + } + + public String toCheckout() + { + if(this.city == "") { + return name + " " + nameS + "\n" +phone; + } + else { + return this.name + " " + this.nameS + "\n" + this.phone + "\n" + this.city + " " + this.street + " " + this.streetNumber; + } + } + + protected UserInfo(Parcel in) { + name = in.readString(); + nameS = in.readString(); + phone = in.readString(); + city = in.readString(); + street = in.readString(); + streetNumber = in.readString(); + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(name); + dest.writeString(nameS); + dest.writeString(phone); + dest.writeString(city); + dest.writeString(street); + dest.writeString(streetNumber); + } + protected boolean isUserEntered(){ + if(name.isEmpty()){return false;} + else{return true;} + } + + @Override + public int describeContents() { + return 0; + } + + public static final Creator CREATOR = new Creator() { + @Override + public UserInfo createFromParcel(Parcel in) { + return new UserInfo(in); + } + + @Override + public UserInfo[] newArray(int size) { + return new UserInfo[size]; + } + }; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getNameS() { + return nameS; + } + + public void setNameS(String nameS) { + this.nameS = nameS; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getStreetNumber() { + return streetNumber; + } + + public void setStreetNumber(String streetNumber) { + this.streetNumber = streetNumber; + } + + + +} diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml index a5d46fe..f827bbe 100644 --- a/app/src/main/res/layout/activity_cart.xml +++ b/app/src/main/res/layout/activity_cart.xml @@ -70,7 +70,7 @@ > + + + + + + + + + + + + + + + + + + + + +