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

design part 2

Browse Source
This commit is contained in:
cimenmus
2017-11-03 00:20:16 +03:00
parent cc8a845098
commit 2002a3c7f0
27 changed files with 439 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java
View File

@@ -36,7 +36,6 @@ public class LoginActivity extends BaseActivity {
@BindView(R.id.passwordPizzalinkEditText) PizzalinkEditText passwordPizzalinkEditText; @BindView(R.id.passwordPizzalinkEditText) PizzalinkEditText passwordPizzalinkEditText;
@BindView(R.id.loginButton) Button loginButton; @BindView(R.id.loginButton) Button loginButton;
@BindView(R.id.forgotPasswordTextView) TextView forgotPasswordTextView; @BindView(R.id.forgotPasswordTextView) TextView forgotPasswordTextView;
@BindView(R.id.registerTextView) TextView registerTextView;
@BindString(R.string.forgot_password_hint) String forgotPasswordHintText; @BindString(R.string.forgot_password_hint) String forgotPasswordHintText;
@BindString(R.string.reset_password) String resetPasswordText; @BindString(R.string.reset_password) String resetPasswordText;
@@ -51,10 +50,10 @@ public class LoginActivity extends BaseActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_login); setContentView(R.layout.activity_login);
ButterKnife.bind(this); ButterKnife.bind(this);
initViews(); //initViews();
} }
@OnClick({R.id.loginButton, R.id.forgotPasswordTextView, R.id.registerTextView}) @OnClick({R.id.loginButton, R.id.forgotPasswordTextView, R.id.registerButton})
protected void onClick(View view){ protected void onClick(View view){
switch (view.getId()){ switch (view.getId()){
case R.id.loginButton: case R.id.loginButton:
@@ -65,33 +64,12 @@ public class LoginActivity extends BaseActivity {
case R.id.forgotPasswordTextView: case R.id.forgotPasswordTextView:
startActivity(new Intent(LoginActivity.this, ForgotPasswordActivity.class)); startActivity(new Intent(LoginActivity.this, ForgotPasswordActivity.class));
break; break;
case R.id.registerTextView: case R.id.registerButton:
startActivity(new Intent(LoginActivity.this, RegisterActivity.class)); startActivity(new Intent(LoginActivity.this, RegisterActivity.class));
break; break;
} }
} }
private void initViews(){
initRegisterTextView();
initForgotPasswordTextView();
/*
emailPizzalinkEditText.getEditText().setText("aytaccici@gmail.com");
passwordPizzalinkEditText.getEditText().setText("3522625");
*/
}
private void initRegisterTextView(){
Spannable wordtoSpan = new SpannableString(notHaveAnAccountText + " " + registerText);
wordtoSpan.setSpan(new ForegroundColorSpan(ContextCompat.getColor(this, R.color.red)), 23, wordtoSpan.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
registerTextView.setText(wordtoSpan);
}
private void initForgotPasswordTextView(){
Spannable wordtoSpan = new SpannableString(forgotPasswordHintText + " " + resetPasswordText);
wordtoSpan.setSpan(new ForegroundColorSpan(ContextCompat.getColor(this, R.color.red)), 35, wordtoSpan.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
forgotPasswordTextView.setText(wordtoSpan);
}
private boolean checkFields(){ private boolean checkFields(){
if(emailPizzalinkEditText.isEmpty() || passwordPizzalinkEditText.isEmpty()){ if(emailPizzalinkEditText.isEmpty() || passwordPizzalinkEditText.isEmpty()){

12
app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java
View File

@@ -3,6 +3,7 @@ package ch.pizzalink.android.view;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.support.v4.content.ContextCompat;
import android.text.Editable; import android.text.Editable;
import android.text.InputType; import android.text.InputType;
import android.text.TextWatcher; import android.text.TextWatcher;
@@ -11,6 +12,7 @@ import android.view.View;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.EditText; import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import ch.pizzalink.android.R; import ch.pizzalink.android.R;
@@ -26,10 +28,12 @@ public class PizzalinkEditText extends LinearLayout implements View.OnClickListe
private View rootView; private View rootView;
private TextView hintTextView; private TextView hintTextView;
private EditText editText; private EditText editText;
private RelativeLayout bottomLineLayout;
private boolean isPasswordHidden = true; private boolean isPasswordHidden = true;
private Typeface typeFace; private Typeface typeFace;
private String hint; private String hint;
private String inputType; private String inputType;
private String edittextTheme;
/* /*
public PizzalinkEditText(LinearLayout rootView, boolean isLeftIconVisible, int leftIconId, public PizzalinkEditText(LinearLayout rootView, boolean isLeftIconVisible, int leftIconId,
@@ -53,6 +57,7 @@ public class PizzalinkEditText extends LinearLayout implements View.OnClickListe
try { try {
hint = a.getString(R.styleable.PizzalinkEditText_hint); hint = a.getString(R.styleable.PizzalinkEditText_hint);
inputType = a.getString(R.styleable.PizzalinkEditText_inputType); inputType = a.getString(R.styleable.PizzalinkEditText_inputType);
edittextTheme = a.getString(R.styleable.PizzalinkEditText_edittextTheme);
} finally { } finally {
a.recycle(); a.recycle();
} }
@@ -63,7 +68,14 @@ public class PizzalinkEditText extends LinearLayout implements View.OnClickListe
rootView = inflate(context, R.layout.layout_pizzalink_edittext, this); rootView = inflate(context, R.layout.layout_pizzalink_edittext, this);
hintTextView = (TextView) rootView.findViewById(R.id.hintTextView); hintTextView = (TextView) rootView.findViewById(R.id.hintTextView);
editText = (EditText) rootView.findViewById(R.id.editText); editText = (EditText) rootView.findViewById(R.id.editText);
bottomLineLayout = (RelativeLayout) rootView.findViewById(R.id.bottomLineLayout);
hintTextView.setText(hint); hintTextView.setText(hint);
if(edittextTheme != null && edittextTheme.equals("navy")){
int navyColor = ContextCompat.getColor(BaseActivity.currentActivity, R.color.navigation_drawer_background);
hintTextView.setTextColor(navyColor);
editText.setTextColor(navyColor);
bottomLineLayout.setBackgroundColor(navyColor);
}
setInputType(); setInputType();
rootView.setOnClickListener(new View.OnClickListener() { rootView.setOnClickListener(new View.OnClickListener() {
@Override @Override

8
app/src/main/res/drawable/background_button_pizzalink_red.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/red"/>
<corners android:radius="8dp"/>
</shape>

8
app/src/main/res/drawable/background_cart_dialog_price.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white"/>
<corners android:radius="4dp"/>
</shape>

10
app/src/main/res/drawable/background_product_cart_name.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white"/>
<corners
android:topLeftRadius="4dp"
android:topRightRadius="4dp" />
</shape>

10
app/src/main/res/drawable/background_product_cart_price.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/red"/>
<corners
android:bottomLeftRadius="4dp"
android:bottomRightRadius="4dp" />
</shape>

2
app/src/main/res/drawable/ic_decrease.xml
View File

@@ -1,4 +1,4 @@
<vector android:height="24dp" android:viewportHeight="612.0" <vector android:height="24dp" android:viewportHeight="612.0"
android:viewportWidth="612.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> android:viewportWidth="612.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M306,0C137,0 0,137 0,306s137,306 306,306s306,-137 306,-306S475,0 306,0zM306,573.8C158.1,573.8 38.3,453.9 38.3,306C38.3,158.1 158.1,38.3 306,38.3c147.9,0 267.8,119.9 267.8,267.8C573.8,453.9 453.9,573.8 306,573.8zM420.8,286.9h-229.5c-10.6,0 -19.1,8.6 -19.1,19.1c0,10.6 8.6,19.1 19.1,19.1h229.5c10.6,0 19.1,-8.6 19.1,-19.1C439.9,295.4 431.3,286.9 420.8,286.9z"/> <path android:fillColor="#1B374C" android:pathData="M306,0C137,0 0,137 0,306s137,306 306,306s306,-137 306,-306S475,0 306,0zM306,573.8C158.1,573.8 38.3,453.9 38.3,306C38.3,158.1 158.1,38.3 306,38.3c147.9,0 267.8,119.9 267.8,267.8C573.8,453.9 453.9,573.8 306,573.8zM420.8,286.9h-229.5c-10.6,0 -19.1,8.6 -19.1,19.1c0,10.6 8.6,19.1 19.1,19.1h229.5c10.6,0 19.1,-8.6 19.1,-19.1C439.9,295.4 431.3,286.9 420.8,286.9z"/>
</vector> </vector>

2
app/src/main/res/drawable/ic_increase.xml
View File

@@ -1,4 +1,4 @@
<vector android:height="24dp" android:viewportHeight="612.0" <vector android:height="24dp" android:viewportHeight="612.0"
android:viewportWidth="612.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> android:viewportWidth="612.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M306,0C137,0 0,137 0,306s137,306 306,306s306,-137 306,-306S475,0 306,0zM306,573.8C158.1,573.8 38.3,453.9 38.3,306C38.3,158.1 158.1,38.3 306,38.3c147.9,0 267.8,119.9 267.8,267.8C573.8,453.9 453.9,573.8 306,573.8zM420.8,286.9h-95.6V191.3c0,-10.6 -8.6,-19.1 -19.1,-19.1c-10.6,0 -19.1,8.6 -19.1,19.1v95.6H191.3c-10.6,0 -19.1,8.6 -19.1,19.1c0,10.6 8.6,19.1 19.1,19.1h95.6v95.6c0,10.6 8.6,19.1 19.1,19.1c10.6,0 19.1,-8.6 19.1,-19.1v-95.6h95.6c10.6,0 19.1,-8.6 19.1,-19.1C439.9,295.4 431.3,286.9 420.8,286.9z"/> <path android:fillColor="#1B374C" android:pathData="M306,0C137,0 0,137 0,306s137,306 306,306s306,-137 306,-306S475,0 306,0zM306,573.8C158.1,573.8 38.3,453.9 38.3,306C38.3,158.1 158.1,38.3 306,38.3c147.9,0 267.8,119.9 267.8,267.8C573.8,453.9 453.9,573.8 306,573.8zM420.8,286.9h-95.6V191.3c0,-10.6 -8.6,-19.1 -19.1,-19.1c-10.6,0 -19.1,8.6 -19.1,19.1v95.6H191.3c-10.6,0 -19.1,8.6 -19.1,19.1c0,10.6 8.6,19.1 19.1,19.1h95.6v95.6c0,10.6 8.6,19.1 19.1,19.1c10.6,0 19.1,-8.6 19.1,-19.1v-95.6h95.6c10.6,0 19.1,-8.6 19.1,-19.1C439.9,295.4 431.3,286.9 420.8,286.9z"/>
</vector> </vector>

68
app/src/main/res/layout/activity_login.xml
View File

@@ -28,30 +28,18 @@
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/background_wood" /> android:src="@drawable/background_wood" />
<RelativeLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_above="@+id/loginLayout" android:orientation="vertical">
android:layout_alignParentTop="true">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="100dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/splash_logo" android:src="@drawable/splash_logo"
android:text="Hello World!" /> android:layout_gravity="center_horizontal" />
</RelativeLayout>
<LinearLayout
android:id="@+id/loginLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/loginBottomLayout"
android:layout_centerInParent="true"
android:orientation="vertical">
<ch.pizzalink.android.view.PizzalinkEditText <ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/emailPizzalinkEditText" android:id="@+id/emailPizzalinkEditText"
@@ -67,9 +55,15 @@
app:hint="@string/password" app:hint="@string/password"
app:inputType="password" /> app:inputType="password" />
<android.support.v4.widget.Space <TextView
android:layout_width="match_parent" android:id="@+id/forgotPasswordTextView"
android:layout_height="24dp" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|end"
android:padding="12dp"
android:textSize="12sp"
android:text="@string/forgot_password_hint"
android:textColor="@color/white" />
<Button <Button
android:id="@+id/loginButton" android:id="@+id/loginButton"
@@ -80,42 +74,26 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/button_login" /> android:text="@string/button_login" />
</LinearLayout>
<LinearLayout
android:id="@+id/loginBottomLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/forgotPasswordTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:padding="24dp" android:text="@string/not_have_an_accaount"
android:text="@string/register_text"
android:textColor="@color/white" />
<TextView
android:id="@+id/registerTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:paddingBottom="24dp"
android:paddingEnd="24dp"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:paddingStart="24dp"
android:text="@string/register_text"
android:textColor="@color/white" /> android:textColor="@color/white" />
<Button
android:id="@+id/registerButton"
style="@style/PizzalinkRedButton"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:text="@string/register_text" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

16
app/src/main/res/layout/fragment_cart.xml
View File

@@ -9,17 +9,23 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/actvity_default_background_color_1"> android:background="@color/actvity_default_background_color_1">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/background_wood" />
<TextView <TextView
android:id="@+id/noProductsOnCartTextView" android:id="@+id/noProductsOnCartTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:text="@string/no_product_on_cart" android:text="@string/no_product_on_cart"
android:textColor="@color/navy" android:textColor="@color/white"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textSize="16sp" android:textSize="16sp"
android:padding="24dp" android:padding="24dp"
android:visibility="gone"/> android:visibility="gone" />
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/cartRecyclerView" android:id="@+id/cartRecyclerView"
@@ -71,7 +77,7 @@
android:text="CHF 50.00" android:text="CHF 50.00"
android:textSize="18sp" android:textSize="18sp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:textColor="@color/navy" android:textColor="@color/red"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
fontPath="fonts/Quicksand-Bold.ttf"/> fontPath="fonts/Quicksand-Bold.ttf"/>
@@ -88,7 +94,7 @@
android:layout_marginRight="6dp" android:layout_marginRight="6dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:text="@string/clear_cart" android:text="@string/clear_cart"
style="@style/PizzalinkButtonWithoutMargin" style="@style/PizzalinkRedWithoutMargin"
android:layout_weight="1"/> android:layout_weight="1"/>
<Button <Button
@@ -99,7 +105,7 @@
android:layout_marginLeft="6dp" android:layout_marginLeft="6dp"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:text="@string/continue_cart" android:text="@string/continue_cart"
style="@style/PizzalinkButtonWithoutMargin" style="@style/PizzalinkRedWithoutMargin"
android:layout_weight="1"/> android:layout_weight="1"/>
</LinearLayout> </LinearLayout>

1
app/src/main/res/layout/fragment_create_order_note.xml
View File

@@ -12,6 +12,7 @@
android:id="@+id/orderNotePizzalinkEditText" android:id="@+id/orderNotePizzalinkEditText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:edittextTheme="navy"
app:hint="@string/order_note" app:hint="@string/order_note"
app:inputType="multiline"/> app:inputType="multiline"/>

20
app/src/main/res/layout/fragment_history.xml
View File

@@ -1,7 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.RecyclerView <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/orderHistoryRecyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:background="@color/actvity_default_background_color_1"/>
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/background_wood" />
<android.support.v7.widget.RecyclerView
android:id="@+id/orderHistoryRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</RelativeLayout>

2
app/src/main/res/layout/fragment_shipping_address.xml
View File

@@ -19,7 +19,7 @@
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
style="@style/PizzalinkButton" style="@style/PizzalinkRedButton"
android:text="@string/add_new_address" android:text="@string/add_new_address"
android:layout_above="@+id/ordersBottomLayout"/> android:layout_above="@+id/ordersBottomLayout"/>

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

@@ -18,30 +18,38 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="12dp"> android:background="@color/cart_dialog_background">
<ImageView <ImageView
android:id="@+id/productImageView" android:id="@+id/productImageView"
android:layout_width="144dp" android:layout_width="144dp"
android:layout_height="144dp" android:layout_height="144dp"
android:layout_marginTop="-48dp"
android:layout_marginBottom="36dp"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"
android:layout_gravity="center_horizontal" /> android:layout_gravity="center_horizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="144dp" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginRight="12dp"
android:layout_toRightOf="@+id/productImageView" android:layout_toRightOf="@+id/productImageView"
android:layout_toEndOf="@+id/productImageView"> android:layout_toEndOf="@+id/productImageView">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp"> android:layout_height="48dp"
android:background="@drawable/background_cart_dialog_price">
<TextView <TextView
android:id="@+id/productNameTextView" android:id="@+id/productNameTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/navigation_drawer_background" android:textColor="@color/navy"
android:textSize="18sp" android:textSize="18sp"
android:text="Pizza Formaggio" android:text="Pizza Formaggio"
fontPath="fonts/Quicksand-Bold.ttf" fontPath="fonts/Quicksand-Bold.ttf"
@@ -60,7 +68,7 @@
android:id="@+id/productPriceTextView" android:id="@+id/productPriceTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/navigation_drawer_background" android:textColor="@color/red"
android:text="CHF 25.00" android:text="CHF 25.00"
android:textSize="16sp" android:textSize="16sp"
android:paddingBottom="12dp" android:paddingBottom="12dp"
@@ -75,23 +83,17 @@
</RelativeLayout> </RelativeLayout>
<Button
android:id="@+id/addToCartButton"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:text="@string/add_to_cart"
style="@style/PizzalinkButtonWithoutMargin" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<View <Button
android:id="@+id/addToCartButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="48dp"
android:background="@drawable/shadow"/> android:layout_marginTop="-24dp"
android:text="@string/add_to_cart"
style="@style/PizzalinkRedButton" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -119,9 +121,9 @@
android:paddingRight="12dp" android:paddingRight="12dp"
android:paddingEnd="12dp" android:paddingEnd="12dp"
android:textSize="16sp" android:textSize="16sp"
android:textColor="@color/navigation_drawer_background"/> android:textColor="@color/navy"/>
<LinearLayout <RelativeLayout
android:id="@+id/ProductCountLayout" android:id="@+id/ProductCountLayout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -133,18 +135,24 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:padding="4dp" android:padding="4dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_decrease" android:src="@drawable/ic_decrease"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"/> android:layout_marginEnd="4dp"
android:layout_alignParentBottom="true"/>
<TextView <TextView
android:id="@+id/productCountTextView" android:id="@+id/productCountTextView"
android:layout_width="wrap_content" android:layout_width="24dp"
android:gravity="center"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="1" android:text="1"
android:textSize="18sp" android:includeFontPadding="false"
android:layout_gravity="center_vertical" android:lineSpacingExtra="0dp"
android:textSize="24sp"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_toRightOf="@+id/deccreaseProductCountImageView"
android:layout_toEndOf="@+id/deccreaseProductCountImageView"
android:layout_alignParentBottom="true"
android:textColor="@color/navy"/> android:textColor="@color/navy"/>
<ImageView <ImageView
@@ -153,16 +161,23 @@
android:layout_height="24dp" android:layout_height="24dp"
android:padding="4dp" android:padding="4dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_toRightOf="@+id/productCountTextView"
android:layout_toEndOf="@+id/productCountTextView"
android:src="@drawable/ic_increase" android:src="@drawable/ic_increase"
android:layout_alignParentBottom="true"
android:layout_marginLeft="4dp" android:layout_marginLeft="4dp"
android:layout_marginStart="4dp" /> android:layout_marginStart="4dp" />
</LinearLayout> </RelativeLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="0.5dp"
android:background="@drawable/shadow"/> android:background="@color/navy"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"/>
<TextView <TextView
android:id="@+id/radioRecyclerHeaderTextView" android:id="@+id/radioRecyclerHeaderTextView"
@@ -173,7 +188,7 @@
android:visibility="gone" android:visibility="gone"
android:text="Size" android:text="Size"
android:textSize="16sp" android:textSize="16sp"
android:textColor="@color/navigation_drawer_background"/> android:textColor="@color/navy"/>
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/radioRecyclerView" android:id="@+id/radioRecyclerView"
@@ -183,8 +198,12 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="0.5dp"
android:background="@drawable/shadow"/> android:background="@color/navy"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"/>
<TextView <TextView
android:id="@+id/checkboxRecyclerHeaderTextView" android:id="@+id/checkboxRecyclerHeaderTextView"
@@ -194,7 +213,7 @@
android:padding="12dp" android:padding="12dp"
android:visibility="gone" android:visibility="gone"
android:textSize="16sp" android:textSize="16sp"
android:textColor="@color/navigation_drawer_background"/> android:textColor="@color/navy"/>
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/checkboxRecyclerView" android:id="@+id/checkboxRecyclerView"

1
app/src/main/res/layout/layout_pizzalink_edittext.xml
View File

@@ -38,6 +38,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/bottomLineLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@color/white" android:background="@color/white"

133
app/src/main/res/layout/row_cart.xml
View File

@@ -1,4 +1,135 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
app:cardCornerRadius="4dp"
android:layout_marginTop="12dp"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/productCountLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="12dp"
android:layout_centerVertical="true">
<TextView
android:id="@+id/cartProductCountTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2 x "
android:textColor="@color/navy" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/productCountLayout"
android:layout_toEndOf="@+id/productCountLayout"
android:padding="12dp"
android:layout_centerVertical="true">
<View
android:id="@+id/dividerView"
android:layout_width="1dp"
android:layout_height="48dp"
android:background="@color/navy"
android:layout_centerVertical="true"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_toRightOf="@+id/dividerView"
android:layout_toEndOf="@+id/dividerView">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp">
<TextView
android:id="@+id/cartProductNameTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Pizza Formaggio"
android:textSize="16sp"
android:textColor="@color/navy"
android:padding="12dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_toLeftOf="@+id/cartProductTotalPriceTextView"
android:layout_toStartOf="@+id/cartProductTotalPriceTextView"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<TextView
android:id="@+id/cartProductTotalPriceTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="CHF 25.00"
android:textColor="@color/navy"
android:padding="8dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"/>
</RelativeLayout>
<TextView
android:id="@+id/cartProductInfoTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Gross"
android:textColor="@color/navy"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
fontPath="fonts/Quicksand-Regular-Italic.otf"
android:paddingBottom="12dp"
android:paddingLeft="12dp"
android:paddingStart="12dp"
android:paddingRight="12dp"
android:paddingEnd="12dp" />
</LinearLayout>
</RelativeLayout>
<ImageView
android:id="@+id/removeProductFromCartImageView"
android:layout_width="32dp"
android:layout_height="32dp"
android:padding="8dp"
android:src="@drawable/ic_cancel_2"
android:layout_gravity="center_vertical"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"/>
</RelativeLayout>
</android.support.v7.widget.CardView>
<!--
<android.support.v7.widget.CardView <android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -91,3 +222,5 @@
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
-->

78
app/src/main/res/layout/row_menu_product.xml
View File

@@ -1,4 +1,78 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:orientation="vertical"
android:layout_width="160dp"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="@drawable/background_product_cart_name">
<TextView
android:id="@+id/productNameTextView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="@color/navy"
android:textSize="16sp"
android:text="Anatoliajefjefje\nwhufjechfuhefu"
android:padding="8dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_centerInParent="true"
android:gravity="center"/>
</RelativeLayout>
<ImageView
android:id="@+id/productImageView"
android:layout_width="160dp"
android:layout_height="160dp"
android:layout_gravity="center_horizontal"
android:layout_marginEnd="12dp"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_marginStart="12dp"
android:background="@color/transparent_white"/>
<RelativeLayout
android:id="@+id/productIngredientsLayout"
android:layout_width="match_parent"
android:layout_height="96dp">
<TextView
android:id="@+id/productIngredientsTextView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/row_product_ingredients_background"
android:padding="8dp"
android:textColor="@android:color/black"
android:gravity="center"
android:layout_centerInParent="true"
android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>
</RelativeLayout>
<TextView
android:id="@+id/productPriceTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:background="@drawable/background_product_cart_price"
android:text="CHF 25.00"
android:padding="17dp"
android:gravity="center_horizontal"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_gravity="center_horizontal" />
</LinearLayout>
<!--
<android.support.v7.widget.CardView <android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -75,4 +149,6 @@
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
-->

8
app/src/main/res/layout/row_option_checkbox.xml
View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -12,7 +14,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="false" android:clickable="false"
android:text="Klein"/> android:text="Klein"
android:textColor="@color/navy"
fontPath="fonts/Quicksand-Bold.ttf"/>
<RelativeLayout <RelativeLayout
android:layout_width="84dp" android:layout_width="84dp"
@@ -25,6 +29,8 @@
android:id="@+id/optionPriceDescriptionTextView" android:id="@+id/optionPriceDescriptionTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/navy"
android:text="CHF 14.00"/> android:text="CHF 14.00"/>
</RelativeLayout> </RelativeLayout>

8
app/src/main/res/layout/row_option_radio.xml
View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -12,7 +14,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Klein" android:text="Klein"
android:clickable="false"/> android:clickable="false"
android:textColor="@color/navy"
fontPath="fonts/Quicksand-Bold.ttf"/>
<RelativeLayout <RelativeLayout
android:layout_width="84dp" android:layout_width="84dp"
@@ -25,6 +29,8 @@
android:id="@+id/optionPriceDescriptionTextView" android:id="@+id/optionPriceDescriptionTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/navy"
android:text="CHF 14.00"/> android:text="CHF 14.00"/>
</RelativeLayout> </RelativeLayout>

52
app/src/main/res/layout/row_order_history.xml
View File

@@ -19,30 +19,36 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<TextView <RelativeLayout
android:id="@+id/orderDateTextView" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:text="5 Oct. 2017 "
android:textColor="@color/navy"
android:padding="8dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:textSize="16sp" />
<TextView <TextView
android:id="@+id/orderTotalTextView" android:id="@+id/orderDateTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="CHF 25.00" android:text="5 Oct. 2017 "
android:textColor="@color/navy" android:textColor="@color/red"
android:layout_marginLeft="32dp" android:padding="8dp"
android:layout_marginStart="32dp" fontPath="fonts/Quicksand-Bold.ttf"
fontPath="fonts/Quicksand-Regular-Italic.otf" android:textSize="16sp"
android:paddingBottom="12dp" android:layout_centerVertical="true"/>
android:paddingLeft="12dp"
android:paddingStart="12dp" <TextView
android:paddingRight="12dp" android:id="@+id/orderTotalTextView"
android:paddingEnd="12dp" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="CHF 25.00"
android:textColor="@color/navy"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:padding="8dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"/>
</RelativeLayout>
<TextView <TextView
android:id="@+id/orderStatusTextView" android:id="@+id/orderStatusTextView"

6
app/src/main/res/layout/row_payment_method.xml
View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -12,6 +14,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Gel ad" android:text="Gel ad"
android:clickable="false"/> android:clickable="false"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/navy"/>
</RelativeLayout> </RelativeLayout>

6
app/src/main/res/layout/row_shipment_address.xml
View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -12,6 +14,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Gel ad" android:text="Gel ad"
android:clickable="false"/> android:clickable="false"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/navy"/>
</RelativeLayout> </RelativeLayout>

10
app/src/main/res/layout/row_shipment_method.xml
View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -12,7 +14,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Gel ad" android:text="Gel ad"
android:clickable="false"/> android:clickable="false"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/navy"/>
<RelativeLayout <RelativeLayout
android:layout_width="84dp" android:layout_width="84dp"
@@ -25,7 +29,9 @@
android:id="@+id/shipmentMethodPriceTextView" android:id="@+id/shipmentMethodPriceTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="CHF 14.00"/> android:text="CHF 14.00"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/navy"/>
</RelativeLayout> </RelativeLayout>

1
app/src/main/res/values/attrs.xml
View File

@@ -13,6 +13,7 @@
<attr name="hint" format="string" /> <attr name="hint" format="string" />
<attr name="inputType" format="string" /> <attr name="inputType" format="string" />
<attr name="lineCount" format="integer" /> <attr name="lineCount" format="integer" />
<attr name="edittextTheme" format="string" />
</declare-styleable> </declare-styleable>
<declare-styleable name="PizzalinkButton"> <declare-styleable name="PizzalinkButton">

2
app/src/main/res/values/colors.xml
View File

@@ -17,6 +17,8 @@
<color name="bottom_menu_unselected_item">#ffffff</color> <color name="bottom_menu_unselected_item">#ffffff</color>
<color name="navigation_drawer_background">#4C4B4A</color> <color name="navigation_drawer_background">#4C4B4A</color>
<color name="row_product_ingredients_background">#EBECEC</color> <color name="row_product_ingredients_background">#EBECEC</color>
<color name="transparent_white">#33ffffff</color>
<color name="cart_dialog_background">#EEEEEE</color>
<!-- android:background="?android:colorBackground" --> <!-- android:background="?android:colorBackground" -->
<!-- <!--

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

@@ -39,7 +39,7 @@
    <string name="activity_title_login">Einloggen</string>     <string name="activity_title_login">Einloggen</string>
    <string name="button_login">EINLOGGEN</string>     <string name="button_login">EINLOGGEN</string>
    <string name="not_have_an_accaount">Sie haben kein Konto?</string>     <string name="not_have_an_accaount">Sie haben kein Konto?</string>
    <string name="register_text"><b><u>\nREGISTRIEREN</u></b></string>     <string name="register_text">REGISTRIEREN</string>
    <string name="forgot_password_hint">Haben Sie Ihr Passwort vergessen?</string>     <string name="forgot_password_hint">Haben Sie Ihr Passwort vergessen?</string>
    <string name="reset_password"><b><u>\nPASSWORT ZURÜCKSETZEN</u></b></string>     <string name="reset_password"><b><u>\nPASSWORT ZURÜCKSETZEN</u></b></string>
    <!-- LoginActivity-->     <!-- LoginActivity-->

9
app/src/main/res/values/styles.xml
View File

@@ -39,8 +39,15 @@
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
</style> </style>
<style name="PizzalinkRedWithoutMargin">
<item name="android:background">@drawable/background_button_pizzalink_red</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">12sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="PizzalinkRedButton" parent="PizzalinkButtonWithoutMargin"> <style name="PizzalinkRedButton" parent="PizzalinkButtonWithoutMargin">
<item name="android:background">@color/red</item> <item name="android:background">@drawable/background_button_pizzalink_red</item>
<item name="android:textColor">@color/white</item> <item name="android:textColor">@color/white</item>
<item name="android:layout_marginLeft">24dp</item> <item name="android:layout_marginLeft">24dp</item>
<item name="android:layout_marginStart">24dp</item> <item name="android:layout_marginStart">24dp</item>