volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

beta bugs fixed

Browse Source
This commit is contained in:
cimenmus
2017-10-28 15:22:27 +03:00
parent 454e06607a
commit 5d5b9c5af7
21 changed files with 229 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@@ -34,7 +34,7 @@
android:name=".activity.MainActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.OrderActivity"
android:name=".activity.CreateOrderActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ForgotPasswordActivity"

31
app/src/main/java/ch/pizzalink/android/activity/OrderActivity.java → app/src/main/java/ch/pizzalink/android/activity/CreateOrderActivity.java
View File

@@ -3,31 +3,24 @@ package ch.pizzalink.android.activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.FragmentManager;
import android.support.v4.view.ViewPager;
import android.view.View;
import android.widget.TextView;
import com.badoualy.stepperindicator.StepperIndicator;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import ch.pizzalink.android.R;
import ch.pizzalink.android.adapter.pager.OrderPagerAdapter;
import ch.pizzalink.android.fragment.order.OrderResultFragment;
import ch.pizzalink.android.fragment.order.OrderSummaryFragment;
import ch.pizzalink.android.fragment.order.PaymentMethodFragment;
import ch.pizzalink.android.fragment.order.ShippingAddressFragment;
import ch.pizzalink.android.fragment.order.ShippingMethodFragment;
import ch.pizzalink.android.fragment.createOrder.CreateOrderResultFragment;
import ch.pizzalink.android.fragment.createOrder.CreateOrderSummaryFragment;
import ch.pizzalink.android.fragment.createOrder.PaymentMethodFragment;
import ch.pizzalink.android.fragment.createOrder.ShippingAddressFragment;
import ch.pizzalink.android.fragment.createOrder.ShippingMethodFragment;
import ch.pizzalink.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.model.AddressModel;
import ch.pizzalink.android.model.PaymentMethodModel;
import ch.pizzalink.android.model.ShippingMethodModel;
import ch.pizzalink.android.model.cart.CartInfoModel;
import ch.pizzalink.android.view.NoSwipeViewPager;
import ch.pizzalink.android.view.PizzalinkToolbar;
public class OrderActivity extends BaseActivity {
public class CreateOrderActivity extends BaseActivity {
@BindView(R.id.stepperIndicator) StepperIndicator stepperIndicator;
@@ -41,7 +34,7 @@ public class OrderActivity extends BaseActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_order);
setContentView(R.layout.activity_create_order);
ButterKnife.bind(this);
getDataFromIntent();
initViews();
@@ -93,11 +86,11 @@ public class OrderActivity extends BaseActivity {
break;
case 3:
fragmentManager.beginTransaction().replace(R.id.orderFragmentsContainer,
OrderSummaryFragment.newInstance()).commit();
CreateOrderSummaryFragment.newInstance()).commit();
break;
case 4:
fragmentManager.beginTransaction().replace(R.id.orderFragmentsContainer,
OrderResultFragment.newInstance()).commit();
CreateOrderResultFragment.newInstance()).commit();
break;
}
stepperIndicator.setCurrentStep(position);
@@ -114,10 +107,10 @@ public class OrderActivity extends BaseActivity {
case PaymentMethodFragment.FRAGMENT_NAME:
openFragment(3);
break;
case OrderSummaryFragment.FRAGMENT_NAME:
case CreateOrderSummaryFragment.FRAGMENT_NAME:
openFragment(4);
break;
case OrderResultFragment.FRAGMENT_NAME:
case CreateOrderResultFragment.FRAGMENT_NAME:
Intent mainActivityIntent = new Intent(this, MainActivity.class);
mainActivityIntent.putExtra("isStartWithOrderHistory", true);
startActivity(mainActivityIntent);
@@ -135,7 +128,7 @@ public class OrderActivity extends BaseActivity {
case PaymentMethodFragment.FRAGMENT_NAME:
openFragment(1);
break;
case OrderSummaryFragment.FRAGMENT_NAME:
case CreateOrderSummaryFragment.FRAGMENT_NAME:
openFragment(2);
break;
}

14
app/src/main/java/ch/pizzalink/android/adapter/pager/OrderPagerAdapter.java
View File

@@ -4,11 +4,11 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import ch.pizzalink.android.fragment.order.OrderResultFragment;
import ch.pizzalink.android.fragment.order.OrderSummaryFragment;
import ch.pizzalink.android.fragment.order.PaymentMethodFragment;
import ch.pizzalink.android.fragment.order.ShippingAddressFragment;
import ch.pizzalink.android.fragment.order.ShippingMethodFragment;
import ch.pizzalink.android.fragment.createOrder.CreateOrderResultFragment;
import ch.pizzalink.android.fragment.createOrder.CreateOrderSummaryFragment;
import ch.pizzalink.android.fragment.createOrder.PaymentMethodFragment;
import ch.pizzalink.android.fragment.createOrder.ShippingAddressFragment;
import ch.pizzalink.android.fragment.createOrder.ShippingMethodFragment;
/**
* Created by cimenmus on 17/10/2017.
@@ -30,9 +30,9 @@ public class OrderPagerAdapter extends FragmentPagerAdapter {
case 2:
return PaymentMethodFragment.newInstance();
case 3:
return OrderSummaryFragment.newInstance();
return CreateOrderSummaryFragment.newInstance();
case 4:
return OrderResultFragment.newInstance();
return CreateOrderResultFragment.newInstance();
default:
return ShippingMethodFragment.newInstance();
}

7
app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java
View File

@@ -15,6 +15,7 @@ import butterknife.ButterKnife;
import ch.pizzalink.android.R;
import ch.pizzalink.android.helper.ImageLoadHelper;
import ch.pizzalink.android.helper.PriceHelper;
import ch.pizzalink.android.helper.TextHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.menu.MenuProductModel;
@@ -109,12 +110,18 @@ public class MenuProductRecyclerAdapter extends RecyclerView.Adapter<RecyclerVie
menuProductViewHolder.productNameTextView.setText(menuProductList.get(position).getName());
menuProductViewHolder.productPriceTextView.setText(
PriceHelper.getPriceWithCurreny(menuProductList.get(position).getPrice()));
TextHelper.setTextFromHTML(menuProductViewHolder.productIngredientsTextView, menuProductList.get(position).getDescription());
/*
if(menuProductList.get(position).isDescriptionAvailable()){
menuProductViewHolder.productIngredientsLayout.setVisibility(View.VISIBLE);
menuProductViewHolder.productIngredientsTextView.setText(menuProductList.get(position).getDescription());
}
else
menuProductViewHolder.productIngredientsLayout.setVisibility(View.GONE);
*/
break;
case HOLDER_SPACE :

5
app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java
View File

@@ -26,8 +26,8 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
import ch.pizzalink.android.R;
import ch.pizzalink.android.activity.BaseActivity;
import ch.pizzalink.android.activity.CreateOrderActivity;
import ch.pizzalink.android.activity.MainActivity;
import ch.pizzalink.android.activity.OrderActivity;
import ch.pizzalink.android.adapter.recycler.CartRecyclerAdapter;
import ch.pizzalink.android.api.ApiEndPoints;
import ch.pizzalink.android.api.ApiErrorUtils;
@@ -40,7 +40,6 @@ import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.RemoveProductFromCartResponseModel;
import ch.pizzalink.android.model.cart.CartInfoModel;
import ch.pizzalink.android.model.cart.CartProductModel;
import ch.pizzalink.android.model.cart.CartTotalModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
@@ -113,7 +112,7 @@ public class CartFragment extends BaseFragment {
});
break;
case R.id.continueCartButton:
Intent continueCartIntent = new Intent(BaseActivity.currentActivity, OrderActivity.class);
Intent continueCartIntent = new Intent(BaseActivity.currentActivity, CreateOrderActivity.class);
continueCartIntent.putExtra("cartInfoModel", cartInfoModel);
startActivity(continueCartIntent);
break;

12
app/src/main/java/ch/pizzalink/android/fragment/MenuFragment.java
View File

@@ -8,6 +8,8 @@ import android.view.View;
import android.view.ViewGroup;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -115,6 +117,7 @@ public class MenuFragment extends BaseFragment {
MenuProductModel.checkNull(productList);
menuProductList.clear();
menuProductList.addAll(productList);
sortProductsByName();
menuProductRecyclerAdapter.notifyDataSetChanged();
}
@@ -124,6 +127,13 @@ public class MenuFragment extends BaseFragment {
productPropertiesBottomSheetDialog.show(getChildFragmentManager(), "dialog");
}
private void sortProductsByName(){
Collections.sort(menuProductList, new Comparator<MenuProductModel>() {
@Override
public int compare(MenuProductModel product1, MenuProductModel product2) {
return product1.getName().compareTo(product2.getName());
}
});
}
}

6
app/src/main/java/ch/pizzalink/android/fragment/ProductFragment.java
View File

@@ -37,7 +37,7 @@ public class ProductFragment extends BaseFragment {
@BindView(R.id.customProductRecyclerView) RecyclerView customProductRecyclerView;
public static final java.lang.String FRAGMENT_NAME = "productFragment";
public static final String FRAGMENT_NAME = "productFragment";
private ArrayList<MenuProductModel> productList = new ArrayList<>();
private MenuProductRecyclerAdapter menuProductRecyclerAdapter;
private CategoryModel categoryModel;
@@ -134,4 +134,8 @@ public class ProductFragment extends BaseFragment {
productPropertiesBottomSheetDialog.setMenuProductModel(menuProductModel);
productPropertiesBottomSheetDialog.show(getChildFragmentManager(), "dialog");
}
private void sortProductsByName(){
}
}

4
app/src/main/java/ch/pizzalink/android/fragment/order/OrderBaseFragment.java → app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderBaseFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.fragment.order;
package ch.pizzalink.android.fragment.createOrder;
import android.widget.TextView;
@@ -10,7 +10,7 @@ import ch.pizzalink.android.fragment.BaseFragment;
* Created by cimenmus on 21.10.2017.
*/
public class OrderBaseFragment extends BaseFragment {
public class CreateOrderBaseFragment extends BaseFragment {
@BindView(R.id.previousTextView) TextView previousTextView;
@BindView(R.id.nextTextView) TextView nextTextView;

19
app/src/main/java/ch/pizzalink/android/fragment/order/OrderResultFragment.java → app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderResultFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.fragment.order;
package ch.pizzalink.android.fragment.createOrder;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -9,24 +9,23 @@ import butterknife.BindString;
import butterknife.ButterKnife;
import butterknife.OnClick;
import ch.pizzalink.android.R;
import ch.pizzalink.android.activity.OrderActivity;
import ch.pizzalink.android.fragment.BaseFragment;
import ch.pizzalink.android.activity.CreateOrderActivity;
import ch.pizzalink.android.helper.SharedPrefsHelper;
/**
* Created by cimenmus on 17/10/2017.
*/
public class OrderResultFragment extends OrderBaseFragment {
public class CreateOrderResultFragment extends CreateOrderBaseFragment {
@BindString(R.string.done_order) String doneOrderText;
public static final java.lang.String FRAGMENT_NAME = "orderResultFragment";
public OrderResultFragment() {}
public CreateOrderResultFragment() {}
public static OrderResultFragment newInstance() {
return new OrderResultFragment();
public static CreateOrderResultFragment newInstance() {
return new CreateOrderResultFragment();
}
@Override
@@ -36,7 +35,7 @@ public class OrderResultFragment extends OrderBaseFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_order_result, container, false);
View view = inflater.inflate(R.layout.fragment_create_order_result, container, false);
ButterKnife.bind(this, view);
initViews();
return view;
@@ -44,8 +43,8 @@ public class OrderResultFragment extends OrderBaseFragment {
@OnClick( R.id.nextTextView)
protected void onClick(){
OrderActivity orderActivity = (OrderActivity) getActivity();
orderActivity.onNextClicked(FRAGMENT_NAME);
CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
createOrderActivity.onNextClicked(FRAGMENT_NAME);
}
private void initViews(){

44
app/src/main/java/ch/pizzalink/android/fragment/order/OrderSummaryFragment.java → app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderSummaryFragment.java
View File

@@ -1,10 +1,9 @@
package ch.pizzalink.android.fragment.order;
package ch.pizzalink.android.fragment.createOrder;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import java.util.HashMap;
@@ -13,14 +12,13 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import ch.pizzalink.android.R;
import ch.pizzalink.android.activity.OrderActivity;
import ch.pizzalink.android.activity.CreateOrderActivity;
import ch.pizzalink.android.api.ApiEndPoints;
import ch.pizzalink.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService;
import ch.pizzalink.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SessionHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.view.PizzalinkInfoView;
import retrofit2.Call;
import retrofit2.Callback;
@@ -30,7 +28,7 @@ import retrofit2.Response;
* Created by cimenmus on 17/10/2017.
*/
public class OrderSummaryFragment extends OrderBaseFragment {
public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
@BindView(R.id.orderPersonFullnamePizzalinkInfoLayout) PizzalinkInfoView orderPersonFullnamePizzalinkInfoLayout;
@BindView(R.id.orderShippingMethodPizzalinkInfoLayout) PizzalinkInfoView orderShippingMethodPizzalinkInfoLayout;
@@ -41,12 +39,12 @@ public class OrderSummaryFragment extends OrderBaseFragment {
@BindString(R.string.confirm_order) String confirmOrderText;
public static final java.lang.String FRAGMENT_NAME = "orderSummaryFragment";
private OrderActivity orderActivity;
private CreateOrderActivity createOrderActivity;
public OrderSummaryFragment() {}
public CreateOrderSummaryFragment() {}
public static OrderSummaryFragment newInstance() {
return new OrderSummaryFragment();
public static CreateOrderSummaryFragment newInstance() {
return new CreateOrderSummaryFragment();
}
@Override
@@ -56,7 +54,7 @@ public class OrderSummaryFragment extends OrderBaseFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_order_summary, container, false);
View view = inflater.inflate(R.layout.fragment_create_order_summary, container, false);
ButterKnife.bind(this, view);
initViews();
return view;
@@ -64,10 +62,10 @@ public class OrderSummaryFragment extends OrderBaseFragment {
@OnClick({R.id.previousTextView, R.id.nextTextView})
protected void onClick(View view){
OrderActivity orderActivity = (OrderActivity) getActivity();
CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
switch (view.getId()){
case R.id.previousTextView:
orderActivity.onPreviousClicked(FRAGMENT_NAME);
createOrderActivity.onPreviousClicked(FRAGMENT_NAME);
break;
case R.id.nextTextView:
createOrder();
@@ -79,13 +77,13 @@ public class OrderSummaryFragment extends OrderBaseFragment {
nextTextView.setText(confirmOrderText);
orderActivity = (OrderActivity) getActivity();
createOrderActivity = (CreateOrderActivity) getActivity();
orderPersonFullnamePizzalinkInfoLayout.setText(SessionHelper.getUser().getFullname());
orderShippingMethodPizzalinkInfoLayout.setText(orderActivity.getSelectedShippingMethod().getTitle());
orderShippingAddressPizzalinkInfoLayout.setText(orderActivity.getSelectedShippingAddress().getAddress());
orderPaymentMethodPizzalinkInfoLayout.setText(orderActivity.getSelectedPaymentMethod().getTitle());
orderTotalPizzalinkInfoLayout.setText(orderActivity.getCartInfo().getTotals().get(0).getText());
orderShippingMethodPizzalinkInfoLayout.setText(createOrderActivity.getSelectedShippingMethod().getTitle());
orderShippingAddressPizzalinkInfoLayout.setText(createOrderActivity.getSelectedShippingAddress().getAddress());
orderPaymentMethodPizzalinkInfoLayout.setText(createOrderActivity.getSelectedPaymentMethod().getTitle());
orderTotalPizzalinkInfoLayout.setText(createOrderActivity.getCartInfo().getTotals().get(0).getText());
}
private void createOrder(){
@@ -97,7 +95,7 @@ public class OrderSummaryFragment extends OrderBaseFragment {
public void onResponse(Call<ResponseObject<Integer>> call, Response<ResponseObject<Integer>> response) {
DialogHelper.hideLoadingDialog();
if(response.isSuccessful() && response.body().isSuccess()){
orderActivity.onNextClicked(FRAGMENT_NAME);
createOrderActivity.onNextClicked(FRAGMENT_NAME);
}
else{
ApiErrorUtils.parseError(response);
@@ -115,11 +113,11 @@ public class OrderSummaryFragment extends OrderBaseFragment {
private HashMap<String, Object> getCreateOrderParams(){
HashMap<String, Object> params = new HashMap<>();
params.put("customer_id", SessionHelper.getUser().getId());
params.put("shipping_method_title", orderActivity.getSelectedShippingMethod().getTitle());
params.put("shipping_method_code", orderActivity.getSelectedShippingMethod().getCode());
params.put("address_id", orderActivity.getSelectedShippingAddress().getId());
params.put("payment_method_title", orderActivity.getSelectedPaymentMethod().getTitle());
params.put("payment_method_code", orderActivity.getSelectedPaymentMethod().getCode());
params.put("shipping_method_title", createOrderActivity.getSelectedShippingMethod().getTitle());
params.put("shipping_method_code", createOrderActivity.getSelectedShippingMethod().getCode());
params.put("address_id", createOrderActivity.getSelectedShippingAddress().getId());
params.put("payment_method_title", createOrderActivity.getSelectedPaymentMethod().getTitle());
params.put("payment_method_code", createOrderActivity.getSelectedPaymentMethod().getCode());
return params;
}
}

16
app/src/main/java/ch/pizzalink/android/fragment/order/PaymentMethodFragment.java → app/src/main/java/ch/pizzalink/android/fragment/createOrder/PaymentMethodFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.fragment.order;
package ch.pizzalink.android.fragment.createOrder;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
@@ -15,13 +15,11 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
import ch.pizzalink.android.R;
import ch.pizzalink.android.activity.BaseActivity;
import ch.pizzalink.android.activity.OrderActivity;
import ch.pizzalink.android.activity.CreateOrderActivity;
import ch.pizzalink.android.adapter.recycler.PaymentMethodsRecyclerAdapter;
import ch.pizzalink.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService;
import ch.pizzalink.android.api.ResponseArray;
import ch.pizzalink.android.api.ResponseObject;
import ch.pizzalink.android.fragment.BaseFragment;
import ch.pizzalink.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SessionHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
@@ -35,7 +33,7 @@ import retrofit2.Response;
* Created by cimenmus on 17/10/2017.
*/
public class PaymentMethodFragment extends OrderBaseFragment {
public class PaymentMethodFragment extends CreateOrderBaseFragment {
@BindView(R.id.paymentMethodsRecyclerView) RecyclerView paymentMethodsRecyclerView;
@@ -70,10 +68,10 @@ public class PaymentMethodFragment extends OrderBaseFragment {
@OnClick({R.id.previousTextView, R.id.nextTextView})
protected void onClick(View view){
OrderActivity orderActivity = (OrderActivity) getActivity();
CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
switch (view.getId()){
case R.id.previousTextView:
orderActivity.onPreviousClicked(FRAGMENT_NAME);
createOrderActivity.onPreviousClicked(FRAGMENT_NAME);
break;
case R.id.nextTextView:
@@ -81,8 +79,8 @@ public class PaymentMethodFragment extends OrderBaseFragment {
DialogHelper.showAlertDialog(BaseActivity.currentActivity, choosePaymentMethodText);
break;
}
orderActivity.setSelectedPaymentMethod(selectedPaymentMethod);
orderActivity.onNextClicked(FRAGMENT_NAME);
createOrderActivity.setSelectedPaymentMethod(selectedPaymentMethod);
createOrderActivity.onNextClicked(FRAGMENT_NAME);
break;
}
}

15
app/src/main/java/ch/pizzalink/android/fragment/order/ShippingAddressFragment.java → app/src/main/java/ch/pizzalink/android/fragment/createOrder/ShippingAddressFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.fragment.order;
package ch.pizzalink.android.fragment.createOrder;
import android.content.Intent;
import android.os.Bundle;
@@ -18,12 +18,11 @@ import butterknife.OnClick;
import ch.pizzalink.android.R;
import ch.pizzalink.android.activity.AddAddressActivity;
import ch.pizzalink.android.activity.BaseActivity;
import ch.pizzalink.android.activity.OrderActivity;
import ch.pizzalink.android.activity.CreateOrderActivity;
import ch.pizzalink.android.adapter.recycler.ShippingAddressesRecyclerAdapter;
import ch.pizzalink.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService;
import ch.pizzalink.android.api.ResponseArray;
import ch.pizzalink.android.fragment.BaseFragment;
import ch.pizzalink.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SessionHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
@@ -38,7 +37,7 @@ import static android.app.Activity.RESULT_OK;
* Created by cimenmus on 17/10/2017.
*/
public class ShippingAddressFragment extends OrderBaseFragment {
public class ShippingAddressFragment extends CreateOrderBaseFragment {
@BindView(R.id.shippingAddressesRecyclerView) RecyclerView shippingAddressesRecyclerView;
@BindView(R.id.addNewAddressButton) Button addNewAddressButton;
@@ -86,7 +85,7 @@ public class ShippingAddressFragment extends OrderBaseFragment {
@OnClick({R.id.addNewAddressButton, R.id.previousTextView, R.id.nextTextView})
protected void onClick(View view){
OrderActivity orderActivity = (OrderActivity) getActivity();
CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
switch (view.getId()){
case R.id.addNewAddressButton:
Intent addNewAddressIntent = new Intent(BaseActivity.currentActivity,
@@ -94,7 +93,7 @@ public class ShippingAddressFragment extends OrderBaseFragment {
startActivityForResult(addNewAddressIntent, REQUEST_CODE_ADD_NEW_ADDRESS);
break;
case R.id.previousTextView:
orderActivity.onPreviousClicked(FRAGMENT_NAME);
createOrderActivity.onPreviousClicked(FRAGMENT_NAME);
break;
case R.id.nextTextView:
@@ -103,8 +102,8 @@ public class ShippingAddressFragment extends OrderBaseFragment {
return;
}
orderActivity.setSelectedShippingAddress(selectedAddress);
orderActivity.onNextClicked(FRAGMENT_NAME);
createOrderActivity.setSelectedShippingAddress(selectedAddress);
createOrderActivity.onNextClicked(FRAGMENT_NAME);
break;
}
}

16
app/src/main/java/ch/pizzalink/android/fragment/order/ShippingMethodFragment.java → app/src/main/java/ch/pizzalink/android/fragment/createOrder/ShippingMethodFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.fragment.order;
package ch.pizzalink.android.fragment.createOrder;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
@@ -6,7 +6,6 @@ import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import java.util.ArrayList;
@@ -16,18 +15,15 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
import ch.pizzalink.android.R;
import ch.pizzalink.android.activity.BaseActivity;
import ch.pizzalink.android.activity.OrderActivity;
import ch.pizzalink.android.activity.CreateOrderActivity;
import ch.pizzalink.android.adapter.recycler.ShippingMethodsRecyclerAdapter;
import ch.pizzalink.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService;
import ch.pizzalink.android.api.ResponseArray;
import ch.pizzalink.android.api.ResponseObject;
import ch.pizzalink.android.fragment.BaseFragment;
import ch.pizzalink.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SessionHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.ShippingMethodModel;
import ch.pizzalink.android.model.ShippingMethodsResponseModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
@@ -36,7 +32,7 @@ import retrofit2.Response;
* Created by cimenmus on 17/10/2017.
*/
public class ShippingMethodFragment extends OrderBaseFragment {
public class ShippingMethodFragment extends CreateOrderBaseFragment {
@BindView(R.id.shippingMethodsRecyclerView) RecyclerView shippingMethodsRecyclerView;
@@ -77,9 +73,9 @@ public class ShippingMethodFragment extends OrderBaseFragment {
return;
}
OrderActivity orderActivity = (OrderActivity) getActivity();
orderActivity.setSelectedShippingMethod(selectedShippingMethodModel);
orderActivity.onNextClicked(FRAGMENT_NAME);
CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
createOrderActivity.setSelectedShippingMethod(selectedShippingMethodModel);
createOrderActivity.onNextClicked(FRAGMENT_NAME);
}
private void initViews(){

2
app/src/main/java/ch/pizzalink/android/helper/PriceHelper.java
View File

@@ -81,7 +81,7 @@ public class PriceHelper {
public static String getProductOptionPriceText(MenuProductOptionValueModel productOptionValueModel){
return new StringBuilder()
//.append(productOptionValueModel.getPrice_prefix())
.append(productOptionValueModel.getPrice_prefix())
.append(" ")
.append(BaseActivity.currentActivity.getString(R.string.chf))
.append(" ")

14
app/src/main/java/ch/pizzalink/android/helper/TextHelper.java
View File

@@ -1,5 +1,8 @@
package ch.pizzalink.android.helper;
import android.text.Html;
import android.widget.TextView;
public class TextHelper {
public static String parseDate(String pureDate, boolean shouldShowTime){
@@ -24,4 +27,15 @@ public class TextHelper {
return day + "." + month + "." + year + " " + "Saat " + time;
}
@SuppressWarnings("deprecation")
public static void setTextFromHTML(TextView textView, String html) {
if (android.os.Build.VERSION.SDK_INT >= 24)
textView.setText(Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY));
else
textView.setText(Html.fromHtml(html));
}
}

2
app/src/main/res/layout/activity_order.xml → app/src/main/res/layout/activity_create_order.xml
View File

@@ -7,7 +7,7 @@
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"
tools:context="ch.pizzalink.android.activity.OrderActivity">
tools:context="ch.pizzalink.android.activity.CreateOrderActivity">
<ch.pizzalink.android.view.PizzalinkToolbar
android:id="@+id/orderToolbar"

0
app/src/main/res/layout/fragment_order_result.xml → app/src/main/res/layout/fragment_create_order_result.xml
View File

0
app/src/main/res/layout/fragment_order_summary.xml → app/src/main/res/layout/fragment_create_order_summary.xml
View File

12
app/src/main/res/layout/layout_bottomsheet.xml
View File

@@ -127,12 +127,12 @@
android:layout_margin="12dp">
<ImageView
android:id="@+id/increaseProductCountImageView"
android:id="@+id/deccreaseProductCountImageView"
android:layout_width="24dp"
android:layout_height="24dp"
android:padding="4dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_increase"
android:src="@drawable/ic_decrease"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"/>
@@ -146,14 +146,14 @@
android:textColor="@color/black"/>
<ImageView
android:id="@+id/deccreaseProductCountImageView"
android:id="@+id/increaseProductCountImageView"
android:layout_width="24dp"
android:layout_height="24dp"
android:padding="4dp"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_decrease"/>
android:src="@drawable/ic_increase"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp" />
</LinearLayout>

256
app/src/main/res/layout/layout_navigation_drawer.xml
View File

@@ -1,256 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="240dp"
android:layout_height="match_parent"
android:background="@color/navigation_drawer_background"
android:layout_gravity="start"
android:clickable="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<android.support.v4.widget.Space
android:layout_width="match_parent"
android:layout_height="12dp"/>
<TextView
android:id="@+id/ownPizzaMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingStart="20dp"
android:paddingRight="20dp"
android:paddingEnd="20dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_create_own_pizza"/>
<TextView
android:id="@+id/exstraKebapMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingStart="20dp"
android:paddingRight="20dp"
android:paddingEnd="20dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_ekstra_kebap"/>
<TextView
android:id="@+id/pizzaMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingStart="20dp"
android:paddingRight="20dp"
android:paddingEnd="20dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_pizza"/>
<TextView
android:id="@+id/vorspeisenMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingStart="20dp"
android:paddingRight="20dp"
android:paddingEnd="20dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_vorspeisen"/>
<TextView
android:id="@+id/haussMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingStart="20dp"
android:paddingRight="20dp"
android:paddingEnd="20dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_hauss"/>
<TextView
android:id="@+id/salatMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingStart="20dp"
android:paddingRight="20dp"
android:paddingEnd="20dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_salat"/>
<TextView
android:id="@+id/pastaMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingStart="20dp"
android:paddingRight="20dp"
android:paddingEnd="20dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_pasta"/>
<TextView
android:id="@+id/chickenMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingStart="20dp"
android:paddingRight="20dp"
android:paddingEnd="20dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_chicken"/>
<TextView
android:id="@+id/drinksMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingStart="20dp"
android:paddingRight="20dp"
android:paddingEnd="20dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_drinks"/>
<LinearLayout
android:id="@+id/drinksLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/roseDrinksMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="48dp"
android:paddingStart="48dp"
android:paddingRight="48dp"
android:paddingEnd="48dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_rose_drinks"/>
<TextView
android:id="@+id/rotweinDrinksMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="48dp"
android:paddingStart="48dp"
android:paddingRight="48dp"
android:paddingEnd="48dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_rotwein_drinks"/>
<TextView
android:id="@+id/spirituosenDrinksMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="48dp"
android:paddingStart="48dp"
android:paddingRight="48dp"
android:paddingEnd="48dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_spirituosen_drinks"/>
<TextView
android:id="@+id/weissweinDrinksMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="48dp"
android:paddingStart="48dp"
android:paddingRight="48dp"
android:paddingEnd="48dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_weisswein_drinks"/>
<TextView
android:id="@+id/beerDrinksMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="48dp"
android:paddingStart="48dp"
android:paddingRight="48dp"
android:paddingEnd="48dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_beer_drinks"/>
</LinearLayout>
<TextView
android:id="@+id/dessertMenuItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingStart="20dp"
android:paddingRight="20dp"
android:paddingEnd="20dp"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/navigation_menu_item_dessert"/>
</LinearLayout>
</ScrollView>

228
app/src/main/res/values/strings.xml
View File

@@ -1,49 +1,59 @@
<resources>
<string name="app_name">Pizzalink</string>
<!-- MainAcitivity -->
<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 -->
<!-- General-->
<string name="app_name">Pizzalink</string> <!--bu alanı alanını değiştirmyin !!!-->
<string name="something_went_wrong">Bir hata oluştu.</string>
<string name="alert">Uyarı</string>
<string name="error_message">Bir hata oluştu.</string>
<string name="bad_request">Bad Request</string>
<string name="failed">Connection failed</string>
<string name="ok">Tamam</string>
<string name="cancel">İptal</string>
<string name="loading">Lütfen bekleyiniz...</string>
<string name="month_name_january">Jan.</string>
<string name="month_name_february">Feb.</string>
<string name="month_name_march">Mar.</string>
<string name="month_name_april">Apr.</string>
<string name="month_name_may">May</string>
<string name="month_name_jun">June</string>
<string name="month_name_july">July</string>
<string name="month_name_august">Aug.</string>
<string name="month_name_september">Sept</string>
<string name="month_name_october">Oct.</string>
<string name="month_name_november">Nov.</string>
<string name="month_name_december">Dec.</string>
<string name="chf">CHF</string>
<string name="empty_description">..</string>
<string name="choose">Seçiniz</string>
<!-- General-->
<!-- NavigationMenu-->
<string name="navigation_menu_item_create_own_pizza">WUNSCHPIZZA</string>
<string name="navigation_menu_item_ekstra_kebap">EKSTRA KEBAP</string>
<string name="navigation_menu_item_pizza">PIZZA</string>
<string name="navigation_menu_item_vorspeisen">VORSPEISEN</string>
<string name="navigation_menu_item_hauss">HAUSSSPEZIALITÄTEN</string>
<string name="navigation_menu_item_salat">SALAT</string>
<string name="navigation_menu_item_pasta">PASTA</string>
<string name="navigation_menu_item_chicken">CHICKEN</string>
<string name="navigation_menu_item_drinks">DRINKS</string>
<string name="navigation_menu_item_rose_drinks"> - ROSE</string>
<string name="navigation_menu_item_rotwein_drinks"> - ROTWEIN</string>
<string name="navigation_menu_item_spirituosen_drinks"> - SPIRITUOSEN</string>
<string name="navigation_menu_item_weisswein_drinks"> - WEISSWEIN</string>
<string name="navigation_menu_item_beer_drinks"> - BEER</string>
<string name="navigation_menu_item_dessert">DESSERT</string>
<!-- NavigationMenu-->
<!-- uygulamının ilk açılan ekranı. pizzlink logosunun oldugu ekran -->
<!-- SplashActivity -->
<string name="no_network_message">İnternet bağlantısı yok. Lütfen daha sonra tekrar deneyiniz.</string>
<string name="alert_update_app">Pizzalink uygulamasını kullanabilmek için uygulamanızı güncellemeniz gerekmektedir.</string>
<string name="update_app">GÜNCELLE</string>
<!-- SplashActivity -->
<string name="fragment_title_wunschpizza">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>
<!-- giriş yap ekranı -->
<!-- LoginActivity-->
<string name="activity_title_login">Giriş Yap</string>
<string name="button_login">GİRİŞ YAP</string>
<string name="not_have_an_accaount">Hesabın yok mu?</string>
<string name="register_text">KAYIT OL</string>
<string name="forgot_password_hint">Şifreni mi unuttun?</string>
<string name="reset_password">ŞİFRENİ SIFIRLA</string>
<!-- LoginActivity-->
<!-- şifremi unuttum ekranı -->
<!-- ForgotPasswordActivity-->
<string name="activity_title_forgot_password">Şifremi Unuttum</string>
<string name="reset_password_hint">Kayıt olurken mail adresini giriniz ve gelen maildeki yönergeleri takip ediniz.</string>
<string name="reset_password_button">GÖNDER</string>
<string name="password_reset">Mail adresinize gerekli bilgiler gönderilmiştir. İlgili maildeki yönergeleri takip ederek şifrenizi sıfırlayabilirsiniz.</string>
<!-- ForgotPasswordActivity-->
<!-- kayıt ol ekranı -->
<!-- RegisterActivity-->
<string name="activity_title_register">Kayıt Ol</string>
<string name="firstname">Ad</string>
@@ -66,96 +76,84 @@
<string name="button_register">KAYIT OL</string>
<!-- RegisterActivity-->
<!-- LoginActivity-->
<string name="activity_title_login">Giriş Yap</string>
<string name="button_login">GİRİŞ YAP</string>
<string name="not_have_an_accaount">Hesabın yok mu?</string>
<string name="register_text">KAYIT OL</string>
<!-- LoginActivity-->
<!-- ana ekrandaki alt menuler -->
<!-- MainAcitivity -->
<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 -->
<!-- ProfileFragment-->
<string name="button_logout">Çıkış Yap</string>
<!-- ProfileFragment-->
<!-- OrderHistoryFragment-->
<string name="order_history_total">Total :</string>
<string name="order_history_date">Date</string>
<string name="order_history_status">Status</string>
<!-- OrderHistoryFragment-->
<!-- ürün sayısı, bouyutu ve içeriklerinin seçilip sepete ekleme işleminin yapıldıgı ekran -->
<!-- ProductPropertiesBottomSheetDialog -->
<string name="add_to_cart">SEPETE EKLE</string>
<string name="count">Count</string>
<string name="no_options_selected_part">is not selected.</string>
<!-- ProductPropertiesBottomSheetDialog -->
<!-- sepet ekranı -->
<!-- CartFragment-->
<string name="continue_cart">DEVAM</string>
<string name="clear_cart">TEMİZLE</string>
<string name="no_product_on_cart">Sepetinizde ürün bulunmamaktadır.</string>
<string name="alert_remove_prdocut_from_cart">Bu ürünü sepetinizden silmek istediğinize emin misiniz?</string>
<string name="product_removed_from_cart">Ürün sepetinizden silindi.</string>
<string name="alert_clear_cart">Sepetinizdeki ürünleri silmek istediğinize emin misiniz?</string>
<!-- CartFragment-->
<string name="something_went_wrong">Bir hata oluştu.</string>
<string name="alert">Uyarı</string>
<string name="error_message">Bir hata oluştu.</string>
<string name="no_network_message">İnternet bağlanıtısı yok. Lütfen daha sonra tekrar deneyiniz.</string>
<string name="bad_request">Bad Request</string>
<string name="failed">Connection failed</string>
<string name="ok">Tamam</string>
<string name="cancel">İptal</string>
<string name="loading">Lütfen bekleyiniz...</string>
<string name="alert_logout">Çıkış yapmak istediğinize emin misiniz?</string>
<string name="alert_update_app">Pizzalink uygulamasını kullanabilmek için uygulamanızı güncellemeniz gerekmektedir.</string>
<string name="update_app">GÜNCELLE</string>
<string name="month_name_january">Jan.</string>
<string name="month_name_february">Feb.</string>
<string name="month_name_march">Mar.</string>
<string name="month_name_april">Apr.</string>
<string name="month_name_may">May</string>
<string name="month_name_jun">June</string>
<string name="month_name_july">July</string>
<string name="month_name_august">Aug.</string>
<string name="month_name_september">Sept</string>
<string name="month_name_october">Oct.</string>
<string name="month_name_november">Nov.</string>
<string name="month_name_december">Dec.</string>
<string name="chf">CHF</string>
<string name="empty_description">..</string>
<string name="add_to_cart">SEPETE EKLE</string>
<string name="count">Count</string>
<string name="no_options_selected_part">is not selected.</string>
<string name="alert_clear_cart">Sepetinizdeki ürünleri silmek istediğinize emin misiniz?</string>
<!-- sipariş geçmişi ekranı -->
<!-- OrderHistoryFragment-->
<string name="order_history_total">Total :</string>
<string name="order_history_date">Date</string>
<string name="order_history_status">Status</string>
<!-- OrderHistoryFragment-->
<!-- sipariş oluşturma ekranı -->
<!-- CreateOrderActivity -->
<string name="activity_title_create_order">Sipariş Ver</string>
<string name="activity_title_forgot_password">Şifremi Unuttum</string>
<string name="reset_password_hint">Kayıt olurken mail adresini giriniz ve gelen maildeki yönergeleri takip ediniz.</string>
<string name="reset_password_button">GÖNDER</string>
<string name="password_reset">Mail adresinize gerekli bilgiler gönderilmiştir. İlgili maildeki yönergeleri takip ederek şifrenizi sıfırlayabilirsiniz.</string>
<string name="forgot_password_hint">Şifreni mi unuttun?</string>
<string name="reset_password">ŞİFRENİ SIFIRLA</string>
<string name="next">NEXT</string>
<string name="previous">PREVIOUS</string>
<string name="alert_choose_shipping_method">Lütfen bir teslimat yöntemi seçiniz.</string>
<string name="alert_choose_shipping_address">Lütfen bir teslimat adresi seçiniz ya da yeni bir teslimat adresi ekleyiniz.</string>
<string name="alert_choose_payment_method">Lütfen bir ödeme yöntemi seçiniz.</string>
<string name="confirm_order">APPROVE</string>
<string name="done_order">DONE</string>
<string-array name="stepperLabels">
<item>Shipping Method</item>
<item>Shipping Address</item>
<item>Payment Method</item>
<item>Summary</item>
</string-array>
<!-- CreateOrderActivity -->
<string name="choose">Seçiniz</string>
<!-- teslimat yöntemi seçme ekranı -->
<!-- ShippingMethodFragment-->
<string name="alert_choose_shipping_method">Lütfen bir teslimat yöntemi seçiniz.</string>
<!-- ShippingMethodFragment-->
<!-- teslimat adresi seçme ekranı -->
<!-- ShippingAddressFragment-->
<string name="alert_choose_shipping_address">Lütfen bir teslimat adresi seçiniz ya da yeni bir teslimat adresi ekleyiniz.</string>
<!-- ShippingAddressFragment-->
<!-- OrderSummaryFragment-->
<!-- ödeme yöntemi seçme ekranı -->
<!-- PaymentMethodFragment-->
<string name="alert_choose_payment_method">Lütfen bir ödeme yöntemi seçiniz.</string>
<!-- PaymentMethodFragment-->
<!-- sipariş özet ekranı -->
<!-- CreateOrderSummaryFragment-->
<string name="order_person_fullname">TO</string>
<string name="order_shipping_method">SHIPPING METHOD</string>
<string name="order_shipping_address">SHIPPING ADDRESS</string>
<string name="order_payment_method">PAYMENT METHOD</string>
<string name="order_total">TOTAL</string>
<!-- OrderSummaryFragment-->
<!-- CreateOrderSummaryFragment-->
<!-- sipariş sınucu ekranı -->
<!-- CreateOrderResultFragment-->
<string name="order_successed">Siparişiniz başarı ile alınmıştır. Siparişinizin detaylarını sipariş geçmişinden görebilir ve siparişinizi takip edebilirsiniz.</string>
<!-- CreateOrderSummaryFragment-->
<!-- profil ekranı -->
<!-- ProfileFragment-->
<string name="profile_firstname">AD</string>
<string name="profile_lastname">SOYAD</string>
@@ -164,17 +162,17 @@
<string name="my_addresses">Adreslerim</string>
<string name="update_profile">Profilimi Güncelle</string>
<string name="update_password">Şifremi Güncelle</string>
<string name="button_logout">Çıkış Yap</string>
<string name="alert_logout">Çıkış yapmak istediğinize emin misiniz?</string>
<!-- ProfileFragment-->
<!-- OrderResultFragment-->
<string name="order_successed">Siparişiniz başarı ile alınmıştır. Siparişinizin detaylarını sipariş geçmişinden görebilir ve siparişinizi takip edebilirsiniz.</string>
<!-- OrderSummaryFragment-->
<!-- profil bilgilerini güncelleme ekranı -->
<!-- UpdateProfilectivity-->
<string name="activity_title_update_profile">Profilimi Güncelle</string>
<string name="profile_updated">Profil bilgileriniz başarı ile güncellenmiştir.</string>
<!-- UpdateProfilectivity-->
<!-- şifre güncelleme ekranı -->
<!-- UpdatePasswordActivity-->
<string name="activity_title_update_password">Şifre Güncelle</string>
<string name="hint_old_password">Eski Şifre</string>
@@ -183,6 +181,7 @@
<string name="password_updated">Şifreniz başarı ile güncellenmiştir.</string>
<!-- UpdatePasswordActivity-->
<!-- adreslerini görüntüleme ekranı -->
<!-- MyAddressesActivity-->
<string name="activity_title_my_addresses">Adreslerim</string>
<string name="add_new_address">YENİ ADRES EKLE</string>
@@ -190,18 +189,11 @@
<string name="address_deleted">Adresiniz başarı ile silindi.</string>
<!-- MyAddressesActivity-->
<!-- yeni adres ekleme ekranı -->
<!-- AddAddressActivity-->
<string name="activity_title_add_address">Yeni Adres Ekle</string>
<string name="add">KAYDET</string>
<string name="new_address_added">Adresiniz başarı ile eklendi.</string>
<!-- AddAddressActivity-->
<string-array name="stepperLabels">
<item>Shipping Method</item>
<item>Shipping Address</item>
<item>Payment Method</item>
<item>Summary</item>
</string-array>
</resources>