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

design part 1

Browse Source
This commit is contained in:
cimenmus
2017-11-01 23:52:27 +03:00
parent 7c623b0c1b
commit cc8a845098
44 changed files with 609 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package ch.pizzalink.android.activity;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.style.ForegroundColorSpan;
@@ -81,13 +82,13 @@ public class LoginActivity extends BaseActivity {
private void initRegisterTextView(){
Spannable wordtoSpan = new SpannableString(notHaveAnAccountText + " " + registerText);
wordtoSpan.setSpan(new ForegroundColorSpan(Color.RED), 23, wordtoSpan.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
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(Color.RED), 35, wordtoSpan.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
wordtoSpan.setSpan(new ForegroundColorSpan(ContextCompat.getColor(this, R.color.red)), 35, wordtoSpan.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
forgotPasswordTextView.setText(wordtoSpan);
}

169
app/src/main/java/ch/pizzalink/android/activity/MainActivity.java
View File

@@ -1,6 +1,7 @@
package ch.pizzalink.android.activity;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.support.design.widget.BottomNavigationView;
import android.support.v4.app.FragmentManager;
@@ -11,7 +12,12 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.Gravity;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx;
@@ -20,6 +26,7 @@ import java.util.ArrayList;
import java.util.List;
import butterknife.BindColor;
import butterknife.BindDrawable;
import butterknife.BindView;
import butterknife.ButterKnife;
import ch.pizzalink.android.R;
@@ -46,6 +53,13 @@ public class MainActivity extends BaseActivity {
@BindView(R.id.pizzalinkToolbar) PizzalinkToolbar pizzalinkToolbar;
@BindView(R.id.bottomNavigationView) BottomNavigationViewEx bottomNavigationView;
@BindView(R.id.shoppingCartLayout) RelativeLayout shoppingCartLayout;
@BindView(R.id.shoppingCartImageView) ImageView shoppingCartImageView;
@BindView(R.id.shoppingCartTextView) TextView shoppingCartTextView;
@BindDrawable(R.drawable.ic_bottom_nav_item_cart_white) Drawable whiteCartDrawable;
@BindDrawable(R.drawable.ic_bottom_nav_item_cart_red) Drawable redCartDrawable;
@BindColor(R.color.red) int redColor;
@BindColor(R.color.white) int whiteColor;
@@ -56,6 +70,7 @@ public class MainActivity extends BaseActivity {
private ArrayList<CategoryModel> categoryList = new ArrayList<>();
private NavigationMenuRecyclerAdapter navigationMenuRecyclerAdapter;
private Badge badge;
private Animation animUp,animDown;
private SectionedRecyclerViewAdapter sectionAdapter = new SectionedRecyclerViewAdapter();
@@ -83,6 +98,38 @@ public class MainActivity extends BaseActivity {
initBottomNavigationView();
showStartScreen();
setCartItemCount();
initShoppingCartButton();
}
private void initShoppingCartButton(){
animDown = AnimationUtils.loadAnimation(this, R.anim.anim_scale_down);
animUp = AnimationUtils.loadAnimation(this, R.anim.anim_scale_up);
shoppingCartLayout.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
switch (event.getAction()) {
case (android.view.MotionEvent.ACTION_DOWN):
shoppingCartLayout.startAnimation(animDown);
return false;
case (android.view.MotionEvent.ACTION_UP):
shoppingCartLayout.startAnimation(animUp);
return false;
case (android.view.MotionEvent.ACTION_CANCEL):
shoppingCartLayout.startAnimation(animUp);
}
return false;
}
});
shoppingCartLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
bottomNavigationView.setCurrentItem(2);
}
});
}
private void initBadgeView(){
@@ -120,14 +167,23 @@ public class MainActivity extends BaseActivity {
fragmentManager.beginTransaction().replace(R.id.fragmentContainer,
MenuFragment.newInstance(categoryList.get(2))).commit();
currentFragmentName = MenuFragment.FRAGMENT_NAME;
shoppingCartImageView.setImageDrawable(whiteCartDrawable);
shoppingCartTextView.setTextColor(whiteColor);
return true;
case R.id.action_cart:
case R.id.action_empty:
if (currentFragmentName.equals(CartFragment.FRAGMENT_NAME))
return true;
fragmentManager.beginTransaction().replace(R.id.fragmentContainer, CartFragment.newInstance()).commit();
currentFragmentName = CartFragment.FRAGMENT_NAME;
currentCategoryId = -1;
shoppingCartImageView.setImageDrawable(redCartDrawable);
shoppingCartTextView.setTextColor(redColor);
return true;
case R.id.action_history:
@@ -135,7 +191,12 @@ public class MainActivity extends BaseActivity {
return true;
fragmentManager.beginTransaction().replace(R.id.fragmentContainer, HistoryFragment.newInstance()).commit();
currentFragmentName = HistoryFragment.FRAGMENT_NAME;
currentCategoryId = -1;
shoppingCartImageView.setImageDrawable(whiteCartDrawable);
shoppingCartTextView.setTextColor(whiteColor);
return true;
case R.id.action_profile:
@@ -143,7 +204,12 @@ public class MainActivity extends BaseActivity {
return true;
fragmentManager.beginTransaction().replace(R.id.fragmentContainer, ProfileFragment.newInstance()).commit();
currentFragmentName = ProfileFragment.FRAGMENT_NAME;
currentCategoryId = -1;
shoppingCartImageView.setImageDrawable(whiteCartDrawable);
shoppingCartTextView.setTextColor(whiteColor);
return true;
case R.id.action_info:
@@ -151,7 +217,12 @@ public class MainActivity extends BaseActivity {
return true;
fragmentManager.beginTransaction().replace(R.id.fragmentContainer, StoreInfoFragment.newInstance()).commit();
currentFragmentName = StoreInfoFragment.FRAGMENT_NAME;
currentCategoryId = -1;
shoppingCartImageView.setImageDrawable(whiteCartDrawable);
shoppingCartTextView.setTextColor(whiteColor);
return true;
}
return false;
@@ -215,9 +286,34 @@ public class MainActivity extends BaseActivity {
this.pstn = pstn;
}
private class HeaderViewHolder extends RecyclerView.ViewHolder {
private final View rootView;
private final TextView categoryNameItem;
private final View bottomLineView;
HeaderViewHolder(View view) {
super(view);
rootView = view;
categoryNameItem = (TextView) view.findViewById(R.id.categoryNameItem);
bottomLineView = view.findViewById(R.id.bottomLineView);
}
}
private class ItemViewHolder extends RecyclerView.ViewHolder {
private final View rootView;
private final TextView subcategoryNameItem;
ItemViewHolder(View view) {
super(view);
rootView = view;
subcategoryNameItem = (TextView) view.findViewById(R.id.subcategoryNameItem);
}
}
@Override
public int getContentItemsTotal() {
return list.size();
public RecyclerView.ViewHolder getHeaderViewHolder(View view) {
return new HeaderViewHolder(view);
}
@Override
@@ -225,11 +321,37 @@ public class MainActivity extends BaseActivity {
return new ItemViewHolder(view);
}
@Override
public void onBindHeaderViewHolder(RecyclerView.ViewHolder holder) {
final HeaderViewHolder headerHolder = (HeaderViewHolder) holder;
headerHolder.categoryNameItem.setText(title);
headerHolder.rootView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openProductsScreen(categoryList.get(pstn));
}
});
if(pstn == categoryList.size() - 1){
headerHolder.bottomLineView.setVisibility(View.GONE);
return;
}
if(categoryList.get(pstn).getSubCategoryList() == null ||
categoryList.get(pstn).getSubCategoryList().size() == 0){
headerHolder.bottomLineView.setVisibility(View.VISIBLE);
}else {
headerHolder.bottomLineView.setVisibility(View.GONE);
}
}
@Override
public void onBindItemViewHolder(RecyclerView.ViewHolder holder, final int position) {
final ItemViewHolder itemHolder = (ItemViewHolder) holder;
String name = list.get(position).getName();
itemHolder.subcategoryNameItem.setText("- " + name);
itemHolder.subcategoryNameItem.setText(name);
itemHolder.rootView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -239,43 +361,8 @@ public class MainActivity extends BaseActivity {
}
@Override
public RecyclerView.ViewHolder getHeaderViewHolder(View view) {
return new HeaderViewHolder(view);
}
@Override
public void onBindHeaderViewHolder(RecyclerView.ViewHolder holder) {
final HeaderViewHolder headerHolder = (HeaderViewHolder) holder;
headerHolder.categoryNameItem.setText(title);
headerHolder.rootView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openProductsScreen(categoryList.get(pstn));
}
});
}
}
private class HeaderViewHolder extends RecyclerView.ViewHolder {
private final View rootView;
private final TextView categoryNameItem;
HeaderViewHolder(View view) {
super(view);
rootView = view;
categoryNameItem = (TextView) view.findViewById(R.id.categoryNameItem);
}
}
private class ItemViewHolder extends RecyclerView.ViewHolder {
private final View rootView;
private final TextView subcategoryNameItem;
ItemViewHolder(View view) {
super(view);
rootView = view;
subcategoryNameItem = (TextView) view.findViewById(R.id.subcategoryNameItem);
public int getContentItemsTotal() {
return list.size();
}
}

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

@@ -34,6 +34,6 @@ public class DisplayHelper {
Window window = BaseActivity.currentActivity.getWindow();
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
window.setStatusBarColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.black));
window.setStatusBarColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.navy));
}
}

17
app/src/main/res/anim/anim_scale_down.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/linear_interpolator"
android:fillAfter="true"
android:fillEnabled="true">
<scale
android:fromXScale="1"
android:toXScale="0.95"
android:fromYScale="1"
android:toYScale="0.95"
android:pivotX="50%"
android:pivotY="50%"
android:duration="100"/>
</set>

14
app/src/main/res/anim/anim_scale_up.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/linear_interpolator">
<scale
android:fromXScale="0.95"
android:toXScale="1"
android:fromYScale="0.95"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:duration="50" />
</set>

BIN
app/src/main/res/drawable-xhdpi/background_wood.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 662 KiB

BIN
app/src/main/res/drawable-xhdpi/splash_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 188 KiB

20
app/src/main/res/drawable/background_button_cart.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<!-- fill color -->
<solid android:color="@color/navy" />
<!-- radius -->
<stroke
android:width="1dp"
android:color="@color/navy" />
<!-- corners -->
<corners
android:bottomLeftRadius="2dp"
android:bottomRightRadius="2dp"
android:topLeftRadius="2dp"
android:topRightRadius="2dp" />
</shape>

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

@@ -1,4 +1,4 @@
<vector android:height="20dp" android:viewportHeight="240.823"
android:viewportWidth="240.823" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#EC1649" android:pathData="M57.63,129.01L165.93,237.27c4.75,4.74 12.45,4.74 17.22,0c4.75,-4.74 4.75,-12.44 0,-17.18l-99.71,-99.67l99.69,-99.67c4.75,-4.74 4.75,-12.44 0,-17.19c-4.75,-4.74 -12.46,-4.74 -17.22,0L57.62,111.82C52.94,116.51 52.94,124.33 57.63,129.01z"/>
<path android:fillColor="#ffffff" android:pathData="M57.63,129.01L165.93,237.27c4.75,4.74 12.45,4.74 17.22,0c4.75,-4.74 4.75,-12.44 0,-17.18l-99.71,-99.67l99.69,-99.67c4.75,-4.74 4.75,-12.44 0,-17.19c-4.75,-4.74 -12.46,-4.74 -17.22,0L57.62,111.82C52.94,116.51 52.94,124.33 57.63,129.01z"/>
</vector>

4
app/src/main/res/drawable/ic_bottom_nav_item_cart_red.xml Normal file
View File

@@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="196.095"
android:viewportWidth="196.095" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#E31E38" android:pathData="M155.16,78.07l-24.13,-48.27c2.44,-2.63 3.97,-6.13 3.97,-9.99c0,-8.12 -6.57,-14.7 -14.68,-14.7c-8.12,0 -14.69,6.57 -14.69,14.7c0,7.94 6.31,14.37 14.19,14.64l21.82,43.62H54.49l21.81,-43.62c7.87,-0.27 14.19,-6.7 14.19,-14.64c0,-8.12 -6.58,-14.7 -14.69,-14.7c-8.11,0 -14.7,6.57 -14.7,14.7c0,3.87 1.54,7.36 3.98,9.99l-24.14,48.27H0l42.49,112.92h111.11l42.5,-112.92H155.16zM78.09,147.41v-25.77h39.94v25.77H78.09zM118.03,159.51v19.36H78.09v-19.36H118.03zM39.06,147.49l-9.72,-25.85h36.64v25.78H39.08L39.06,147.49L39.06,147.49zM78.09,109.53V90.17h39.94v19.36H78.09zM130.13,121.64h36.63l-9.71,25.84v-0.07h-26.9v-25.77H130.13zM130.13,109.53V90.17h48.48l-7.28,19.36H130.13zM65.98,90.17v19.36H24.78l-7.28,-19.36H65.98zM43.59,159.51h22.39v19.36H50.87L43.59,159.51zM130.13,178.88v-19.36h22.39l-7.29,19.36H130.13z"/>
</vector>

0
app/src/main/res/drawable/ic_bottom_nav_item_cart.xml → app/src/main/res/drawable/ic_bottom_nav_item_cart_white.xml
View File

6
app/src/main/res/drawable/ic_hamburger_menu.xml
View File

@@ -1,6 +1,6 @@
<vector android:height="24dp" android:viewportHeight="53.0"
android:viewportWidth="53.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#EC1649" android:pathData="M2,13.5h49c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H2c-1.1,0 -2,0.9 -2,2S0.9,13.5 2,13.5z"/>
<path android:fillColor="#EC1649" android:pathData="M2,28.5h49c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H2c-1.1,0 -2,0.9 -2,2S0.9,28.5 2,28.5z"/>
<path android:fillColor="#EC1649" android:pathData="M2,43.5h49c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H2c-1.1,0 -2,0.9 -2,2S0.9,43.5 2,43.5z"/>
<path android:fillColor="#ffffff" android:pathData="M2,13.5h49c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H2c-1.1,0 -2,0.9 -2,2S0.9,13.5 2,13.5z"/>
<path android:fillColor="#ffffff" android:pathData="M2,28.5h49c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H2c-1.1,0 -2,0.9 -2,2S0.9,28.5 2,28.5z"/>
<path android:fillColor="#ffffff" android:pathData="M2,43.5h49c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H2c-1.1,0 -2,0.9 -2,2S0.9,43.5 2,43.5z"/>
</vector>

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

@@ -6,5 +6,5 @@
android:color="@color/bottom_menu_selected_item"
android:state_checked="true" />
<item android:color="@color/gray_3" />
<item android:color="@color/white" />
</selector>

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

@@ -18,7 +18,7 @@
app:title="@string/activity_title_add_address"
android:background="@color/white"
app:showBackIcon="true"
app:titleTextColor="@color/black" />
app:titleTextColor="@color/navy" />
<ScrollView
android:layout_width="match_parent"

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

@@ -16,7 +16,7 @@
app:title="@string/activity_title_create_order"
android:background="@color/white"
app:showBackIcon="true"
app:titleTextColor="@color/black" />
app:titleTextColor="@color/navy" />
<LinearLayout
android:id="@+id/stepIndicatorLayout"

72
app/src/main/res/layout/activity_forgot_password.xml
View File

@@ -18,37 +18,55 @@
android:background="@color/white"
app:title="@string/activity_title_forgot_password"
app:showBackIcon="true"
app:titleTextColor="@color/black" />
app:titleTextColor="@color/navy" />
<TextView
android:id="@+id/registerTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset_password_hint"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:textColor="@color/black"
android:padding="24dp" />
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/forgotPasswordEmailPizzalinkEditText"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/email"
app:inputType="email"/>
android:layout_height="match_parent">
<android.support.v4.widget.Space
android:layout_width="match_parent"
android:layout_height="24dp" />
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/background_wood" />
<Button
android:id="@+id/resetPasswordButton"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:text="@string/reset_password_button"
style="@style/PizzalinkButton" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/registerTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:padding="24dp"
android:text="@string/reset_password_hint"
android:textColor="@color/white" />
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/forgotPasswordEmailPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/email"
app:inputType="email" />
<android.support.v4.widget.Space
android:layout_width="match_parent"
android:layout_height="24dp" />
<Button
android:id="@+id/resetPasswordButton"
style="@style/PizzalinkRedButton"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:text="@string/reset_password_button" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>

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

@@ -16,12 +16,18 @@
android:layout_height="wrap_content"
app:title="@string/activity_title_login"
android:background="@color/white"
app:titleTextColor="@color/black" />
app:titleTextColor="@color/navy" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/background_wood" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -31,11 +37,11 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:layout_centerInParent="true"
android:text="Hello World!"
android:src="@drawable/pizzalink_logo"/>
android:src="@drawable/splash_logo"
android:text="Hello World!" />
</RelativeLayout>
@@ -43,23 +49,23 @@
android:id="@+id/loginLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_above="@+id/loginBottomLayout"
android:layout_centerInParent="true"
android:layout_above="@+id/loginBottomLayout">
android:orientation="vertical">
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/emailPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/email"
app:inputType="email"/>
app:inputType="email" />
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/passwordPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/password"
app:inputType="password"/>
app:inputType="password" />
<android.support.v4.widget.Space
android:layout_width="match_parent"
@@ -67,12 +73,12 @@
<Button
android:id="@+id/loginButton"
style="@style/PizzalinkRedButton"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:text="@string/button_login"
style="@style/PizzalinkButton" />
android:layout_marginTop="16dp"
android:text="@string/button_login" />
</LinearLayout>
@@ -80,32 +86,32 @@
android:id="@+id/loginBottomLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_alignParentBottom="true">
android:layout_alignParentBottom="true"
android:orientation="vertical">
<TextView
android:id="@+id/forgotPasswordTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/register_text"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:textColor="@color/black"
android:padding="24dp" />
android:padding="24dp"
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:text="@string/register_text"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:textColor="@color/black"
android:paddingBottom="24dp"
android:paddingEnd="24dp"
android:paddingLeft="24dp"
android:paddingStart="24dp"
android:paddingRight="24dp"
android:paddingEnd="24dp" />
android:paddingStart="24dp"
android:text="@string/register_text"
android:textColor="@color/white" />
</LinearLayout>
@@ -113,6 +119,4 @@
</RelativeLayout>
</LinearLayout>

84
app/src/main/res/layout/activity_main.xml
View File

@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/pizzalinkToolbar"
android:layout_above="@+id/bottomNavigationViewLayout">
android:layout_above="@+id/bottomNavigationView">
<FrameLayout
android:id="@+id/fragmentContainer"
@@ -38,17 +38,82 @@
</android.support.v4.widget.DrawerLayout>
<LinearLayout
<com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx
android:id="@+id/bottomNavigationView"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:itemIconTint="@drawable/selector_bottom_navigation_item"
app:itemTextColor="@drawable/selector_bottom_navigation_item"
android:background="@color/navy"
app:menu="@menu/menu_bottom_navigation"
app:itemBackground="@color/navy"
android:layout_alignParentBottom="true"/>
<RelativeLayout
android:id="@+id/shoppingCartLayout"
android:layout_width="72dp"
android:layout_height="72dp"
android:orientation="vertical"
android:background="@drawable/background_button_cart"
android:layout_alignParentBottom="true"
android:layout_centerInParent="true"
android:layout_marginBottom="-8dp"
android:elevation="9dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_centerInParent="true">
<ImageView
android:id="@+id/shoppingCartImageView"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_bottom_nav_item_cart_white"/>
<TextView
android:id="@+id/shoppingCartTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bottom_nav_menu_item_cart"
android:textSize="12sp"
android:textColor="@color/white"/>
</LinearLayout>
</RelativeLayout>
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/shoppingCartButton"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@drawable/background_button_cart"
android:gravity="center"
android:src="@drawable/ic_bottom_nav_item_cart_white"
android:layout_alignParentBottom="true"
android:layout_centerInParent="true"
android:elevation="9dp"
android:visibility="gone"/>
<!--
<RelativeLayout
android:id="@+id/bottomNavigationViewLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_alignParentBottom="true">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/shadow" />
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/shoppingCartButton"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@drawable/background_button_cart"
android:gravity="center"
android:src="@drawable/ic_bottom_nav_item_cart_white"
android:elevation="9dp"
android:layout_marginBottom="-12dp"
android:layout_centerHorizontal="true"/>
<com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx
android:id="@+id/bottomNavigationView"
@@ -56,12 +121,13 @@
android:layout_height="wrap_content"
app:itemIconTint="@drawable/selector_bottom_navigation_item"
app:itemTextColor="@drawable/selector_bottom_navigation_item"
android:background="@color/white"
android:background="@color/navy"
app:menu="@menu/menu_bottom_navigation"
app:itemBackground="@color/white"
app:itemBackground="@color/navy"
app:elevation="0dp"/>
</LinearLayout>
</RelativeLayout>
-->
</RelativeLayout>

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

@@ -15,7 +15,7 @@
app:title="@string/my_addresses"
android:background="@color/white"
app:showBackIcon="true"
app:titleTextColor="@color/black" />
app:titleTextColor="@color/navy" />
<android.support.v7.widget.RecyclerView
android:id="@+id/myAddressesRecyclerView"

184
app/src/main/res/layout/activity_register.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
<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"
@@ -18,109 +18,121 @@
app:title="@string/activity_title_register"
android:background="@color/white"
app:showBackIcon="true"
app:titleTextColor="@color/black" />
app:titleTextColor="@color/navy" />
<ScrollView
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/registerToolbar"
android:layout_above="@+id/registerButton">
android:layout_height="match_parent">
<LinearLayout
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/white">
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/background_wood" />
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/firstnamePizzalinkEditText"
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/registerButton">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:inputType="name"
app:hint="@string/firstname"/>
android:orientation="vertical">
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/lasstnamePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:inputType="name"
app:hint="@string/lastname"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/firstnamePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:inputType="name"
app:hint="@string/firstname"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/telephonePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/telephone"
app:inputType="phone"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/lasstnamePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:inputType="name"
app:hint="@string/lastname"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/emailPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/email"
app:inputType="email"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/telephonePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/telephone"
app:inputType="phone"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/passwordPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/password"
app:inputType="password"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/emailPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/email"
app:inputType="email"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/passwordAgainPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/password_again"
app:inputType="password"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/passwordPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/password"
app:inputType="password"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/address1PizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:inputType="address"
app:hint="@string/addres_line_1"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/passwordAgainPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/password_again"
app:inputType="password"/>
<ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/cityPizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownHintView="@string/city"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/address1PizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:inputType="address"
app:hint="@string/addres_line_1"/>
<ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/postcodePizzalinkDrowpdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownHintView="@string/postcode"/>
<ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/cityPizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownHintView="@string/city"/>
<ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/countryPizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownHintView="@string/country"/>
<ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/postcodePizzalinkDrowpdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownHintView="@string/postcode"/>
<ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/zonePizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownHintView="@string/zone"/>
<android.support.v4.widget.Space
android:layout_width="match_parent"
android:layout_height="48dp" />
<ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/countryPizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownHintView="@string/country"/>
</LinearLayout>
<ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/zonePizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownHintView="@string/zone"/>
</ScrollView>
<android.support.v4.widget.Space
android:layout_width="match_parent"
android:layout_height="48dp" />
<Button
android:id="@+id/registerButton"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/PizzalinkButton"
android:text="@string/button_register"
android:layout_alignParentBottom="true" />
</LinearLayout>
</RelativeLayout>
</ScrollView>
<Button
android:id="@+id/registerButton"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/PizzalinkRedButton"
android:text="@string/button_register"
android:layout_alignParentBottom="true" />
</RelativeLayout>
</LinearLayout>

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

@@ -8,6 +8,12 @@
tools:context="ch.pizzalink.android.activity.SplashActivity"
android:background="@color/white">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/background_wood"/>
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -16,6 +22,6 @@
android:layout_centerInParent="true"
android:text="Hello World!"
android:layout_margin="64dp"
android:src="@drawable/pizzalink_logo"/>
android:src="@drawable/splash_logo"/>
</RelativeLayout>

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

@@ -16,7 +16,7 @@
app:title="@string/activity_title_update_password"
android:background="@color/white"
app:showBackIcon="true"
app:titleTextColor="@color/black" />
app:titleTextColor="@color/navy" />
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/oldPasswordPizzalinkEditText"

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

@@ -17,7 +17,7 @@
app:title="@string/activity_title_update_profile"
android:background="@color/white"
app:showBackIcon="true"
app:titleTextColor="@color/black" />
app:titleTextColor="@color/navy" />
<LinearLayout
android:layout_width="match_parent"

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

@@ -15,7 +15,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/no_product_on_cart"
android:textColor="@color/black"
android:textColor="@color/navy"
android:gravity="center_horizontal"
android:textSize="16sp"
android:padding="24dp"
@@ -60,7 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:textColor="@color/black"
android:textColor="@color/navy"
android:layout_gravity="center_horizontal"
android:text="TOTAL"/>
@@ -71,7 +71,7 @@
android:text="CHF 50.00"
android:textSize="18sp"
android:layout_marginTop="12dp"
android:textColor="@color/black"
android:textColor="@color/navy"
android:layout_gravity="center_horizontal"
fontPath="fonts/Quicksand-Bold.ttf"/>

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

@@ -18,7 +18,7 @@
android:layout_centerInParent="true"
android:gravity="center"
android:padding="16dp"
android:textColor="@color/black" />
android:textColor="@color/navy" />
</RelativeLayout>

22
app/src/main/res/layout/fragment_menu.xml
View File

@@ -1,8 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.RecyclerView
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/menuProductRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/actvity_default_background_color_1"
android:scrollbars="vertical"/>
android:layout_height="match_parent">
<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/menuProductRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"/>
</RelativeLayout>

22
app/src/main/res/layout/fragment_product.xml
View File

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

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

@@ -54,7 +54,7 @@
android:layout_height="wrap_content"
android:text="@string/my_addresses"
android:layout_marginTop="4dp"
android:textColor="@color/black"
android:textColor="@color/navy"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
@@ -91,7 +91,7 @@
android:layout_height="wrap_content"
android:text="@string/update_profile"
android:layout_marginTop="4dp"
android:textColor="@color/black"
android:textColor="@color/navy"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
@@ -129,7 +129,7 @@
android:layout_height="wrap_content"
android:text="@string/update_password"
android:layout_marginTop="4dp"
android:textColor="@color/black"
android:textColor="@color/navy"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
@@ -166,7 +166,7 @@
android:layout_height="wrap_content"
android:text="@string/button_logout"
android:layout_marginTop="4dp"
android:textColor="@color/black"
android:textColor="@color/navy"
android:layout_centerVertical="true" />
</RelativeLayout>

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

@@ -145,7 +145,7 @@
android:text="1"
android:textSize="18sp"
android:layout_gravity="center_vertical"
android:textColor="@color/black"/>
android:textColor="@color/navy"/>
<ImageView
android:id="@+id/increaseProductCountImageView"

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

@@ -25,7 +25,7 @@
android:id="@+id/textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/navy"
android:textSize="16sp"
android:textColorHint="@color/row_product_ingredients_background"
android:layout_centerVertical="true"

11
app/src/main/res/layout/layout_pizzalink_drowdown_view.xml
View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -13,7 +15,7 @@
android:id="@+id/hintTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/venus"
android:textColor="@color/white"
android:layout_marginTop="12dp"
android:layout_marginBottom="4dp"/>
@@ -25,9 +27,10 @@
android:id="@+id/textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/white"
android:textSize="16sp"
android:textColorHint="@color/row_product_ingredients_background"
android:textColorHint="@color/white"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_centerVertical="true"
android:background="@android:color/transparent"
android:layout_marginBottom="12dp" />
@@ -37,7 +40,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/row_product_ingredients_background"
android:background="@color/white"
android:layout_marginTop="2dp"/>
</LinearLayout>

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

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -13,7 +15,7 @@
android:id="@+id/hintTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/venus"
android:textColor="@color/white"
android:layout_marginTop="12dp"
android:layout_marginBottom="4dp"/>
@@ -25,9 +27,10 @@
android:id="@+id/editText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/white"
android:textSize="16sp"
android:textColorHint="@color/row_product_ingredients_background"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColorHint="@color/white"
android:layout_centerVertical="true"
android:background="@android:color/transparent"
android:layout_marginBottom="12dp"/>
@@ -37,7 +40,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/row_product_ingredients_background"
android:background="@color/white"
android:layout_marginTop="2dp"/>

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

@@ -15,7 +15,7 @@
android:contentInsetEnd="0dp"
app:contentInsetRight="0dp"
app:contentInsetEnd="0dp"
android:background="@color/white">
android:background="@color/red">
<RelativeLayout
android:layout_width="match_parent"
@@ -48,8 +48,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:textSize="16sp"
android:textColor="@color/red"
android:textSize="18sp"
android:textColor="@color/white"
fontPath="fonts/Quicksand-Bold.ttf"
android:visibility="gone"/>
@@ -60,6 +60,7 @@
android:layout_alignParentEnd="true"
android:padding="12dp"
android:layout_centerVertical="true"
android:tint="@color/white"
android:src="@drawable/pizzalink_logo" />
</RelativeLayout>
@@ -68,7 +69,8 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@drawable/shadow"
android:layout_alignParentBottom="true"/>
android:layout_alignParentBottom="true"
android:visibility="gone"/>
</RelativeLayout>

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

@@ -24,6 +24,6 @@
android:text="Aytaç Cici"
android:layout_marginTop="4dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/black"/>
android:textColor="@color/navy"/>
</LinearLayout>

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

@@ -29,7 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2 x "
android:textColor="@color/black"
android:textColor="@color/navy"
android:padding="12dp"
android:layout_centerVertical="true"/>
@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:text="Pizza Formaggio"
android:textSize="16sp"
android:textColor="@color/black"
android:textColor="@color/navy"
android:padding="12dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_centerVertical="true"
@@ -53,7 +53,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="CHF 25.00"
android:textColor="@color/black"
android:textColor="@color/navy"
android:padding="8dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_centerVertical="true"
@@ -78,7 +78,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Gross"
android:textColor="@color/black"
android:textColor="@color/navy"
android:layout_marginLeft="64dp"
android:layout_marginStart="64dp"
fontPath="fonts/Quicksand-Regular-Italic.otf"

31
app/src/main/res/layout/row_category.xml
View File

@@ -1,17 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:id="@+id/categoryNameItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/navigation_drawer_background"
android:orientation="vertical"
android:paddingLeft="20dp"
android:paddingStart="20dp"
android:paddingRight="20dp"
android:paddingEnd="20dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:textSize="16sp"
fontPath="fonts/Quicksand-Bold.ttf" />
android:paddingEnd="20dp">
<TextView
android:id="@+id/categoryNameItem"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/navy"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:textSize="16sp"
fontPath="fonts/Quicksand-Bold.ttf" />
<View
android:id="@+id/bottomLineView"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/navy"/>
</LinearLayout>

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

@@ -23,7 +23,7 @@
android:id="@+id/productNameTextView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="@android:color/black"
android:textColor="@color/navy"
android:textSize="16sp"
android:text="Anatoliajefjefje\nwhufjechfuhefu"
android:padding="8dp"
@@ -63,11 +63,13 @@
<TextView
android:id="@+id/productPriceTextView"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textColor="@color/white"
android:background="@color/red"
android:text="CHF 25.00"
android:padding="16dp"
android:padding="17dp"
android:gravity="center_horizontal"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_gravity="center_horizontal" />

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

@@ -18,7 +18,7 @@
android:layout_toLeftOf="@+id/deleteAddressImageView"
android:layout_toStartOf="@+id/deleteAddressImageView"
android:layout_centerVertical="true"
android:textColor="@color/black" />
android:textColor="@color/navy" />
<ImageView
android:id="@+id/deleteAddressImageView"

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

@@ -24,7 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="5 Oct. 2017 "
android:textColor="@color/black"
android:textColor="@color/navy"
android:padding="8dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:textSize="16sp" />
@@ -34,7 +34,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="CHF 25.00"
android:textColor="@color/black"
android:textColor="@color/navy"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
fontPath="fonts/Quicksand-Regular-Italic.otf"
@@ -49,7 +49,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Pending"
android:textColor="@color/black"
android:textColor="@color/navy"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
fontPath="fonts/Quicksand-Regular-Italic.otf"

14
app/src/main/res/layout/row_pizza_2.xml
View File

@@ -109,7 +109,7 @@
android:text="Klein"
android:textSize="10sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
android:textColor="@color/navy"/>
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/pizzaSize1CheckBox"
@@ -127,7 +127,7 @@
android:textSize="12sp"
android:layout_marginTop="4dp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
android:textColor="@color/navy"/>
</LinearLayout>
@@ -148,7 +148,7 @@
android:text="Normal"
android:textSize="10sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
android:textColor="@color/navy"/>
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/pizzaSize2CheckBox"
@@ -166,7 +166,7 @@
android:textSize="12sp"
android:layout_marginTop="4dp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
android:textColor="@color/navy"/>
</LinearLayout>
@@ -187,7 +187,7 @@
android:text="Gross"
android:textSize="10sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
android:textColor="@color/navy"/>
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/pizzaSize3CheckBox"
@@ -205,7 +205,7 @@
android:textSize="12sp"
android:layout_marginTop="4dp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
android:textColor="@color/navy"/>
</LinearLayout>
@@ -242,7 +242,7 @@
android:textSize="18sp"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_gravity="center_vertical"
android:textColor="@color/black"/>
android:textColor="@color/navy"/>
<ImageView
android:id="@+id/deccreasePizzaCountTextView"

34
app/src/main/res/layout/row_subcategory.xml
View File

@@ -1,17 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:id="@+id/subcategoryNameItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/navigation_drawer_background"
android:orientation="horizontal"
android:paddingLeft="40dp"
android:paddingStart="40dp"
android:paddingRight="40dp"
android:paddingEnd="40dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:textSize="16sp"
fontPath="fonts/Quicksand-Bold.ttf" />
android:paddingEnd="40dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/red"
android:text="- "
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:textSize="16sp"
fontPath="fonts/Quicksand-Bold.ttf" />
<TextView
android:id="@+id/subcategoryNameItem"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/navy"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:textSize="16sp"
fontPath="fonts/Quicksand-Bold.ttf" />
</LinearLayout>

9
app/src/main/res/menu/menu_bottom_navigation.xml
View File

@@ -8,16 +8,15 @@
android:icon="@drawable/ic_bottom_nav_item_menu"
android:title="@string/bottom_nav_menu_item_menu" />
<item
android:id="@+id/action_cart"
android:icon="@drawable/ic_bottom_nav_item_cart"
android:title="@string/bottom_nav_menu_item_cart" />
<item
android:id="@+id/action_history"
android:icon="@drawable/ic_bottom_nav_item_history"
android:title="@string/bottom_nav_menu_item_history" />
<item
android:id="@+id/action_empty"
android:title="" />
<item
android:id="@+id/action_profile"
android:icon="@drawable/ic_bottom_nav_item_profile"

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

@@ -1,13 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#EC1649</color>
<color name="colorPrimaryDark">#EC1649</color>
<color name="colorAccent">#EC1649</color>
<color name="red">#EC1649</color>
<!-- EC1649 -->
<color name="colorPrimary">#E31E38</color>
<color name="colorPrimaryDark">#E31E38</color>
<color name="colorAccent">#E31E38</color>
<!--
<color name="black">#303030</color>
-->
<color name="red">#E31E38</color>
<color name="navy">#1B374C</color>
<color name="white">#ffffff</color>
<color name="bottom_menu_selected_item">#EC1649</color>
<color name="bottom_menu_selected_item">#E31E38</color>
<color name="bottom_menu_unselected_item">#ffffff</color>
<color name="navigation_drawer_background">#4C4B4A</color>
<color name="row_product_ingredients_background">#EBECEC</color>

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

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