This commit is contained in:
cimenmus
2017-11-01 21:23:28 +03:00
parent 1f176c6885
commit 7c623b0c1b
18 changed files with 49 additions and 310 deletions

View File

@@ -6,6 +6,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application
android:name=".Pizzalink"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -22,7 +22,7 @@ public class Pizzalink extends Application {
private void initCalligraphy(){
CalligraphyConfig.initDefault(new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/AvenirNextLTProRegular.otf")
.setDefaultFontPath("fonts/Quicksand-Regular.ttf")
.setFontAttrId(R.attr.fontPath)
.build()
);

View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:id="@+id/cartFragmentMainLayout"
android:orientation="vertical"
android:layout_width="match_parent"
@@ -71,7 +73,7 @@
android:layout_marginTop="12dp"
android:textColor="@color/black"
android:layout_gravity="center_horizontal"
android:textStyle="bold"/>
fontPath="fonts/Quicksand-Bold.ttf"/>
<LinearLayout
android:layout_width="match_parent"

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"
@@ -42,7 +44,7 @@
android:textColor="@color/navigation_drawer_background"
android:textSize="18sp"
android:text="Pizza Formaggio"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_gravity="center"
android:gravity="center"
android:layout_centerVertical="true"/>
@@ -66,7 +68,7 @@
android:paddingStart="12dp"
android:paddingRight="12dp"
android:paddingEnd="12dp"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_gravity="center"
android:gravity="center"
android:layout_centerVertical="true"/>
@@ -109,7 +111,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:text="@string/count"
android:paddingTop="12dp"
android:paddingLeft="12dp"
@@ -166,7 +168,7 @@
android:id="@+id/radioRecyclerHeaderTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:padding="12dp"
android:visibility="gone"
android:text="Size"
@@ -188,7 +190,7 @@
android:id="@+id/checkboxRecyclerHeaderTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:padding="12dp"
android:visibility="gone"
android:textSize="16sp"
@@ -207,99 +209,4 @@
</LinearLayout>
</LinearLayout>
<!--
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<View
android:id="@+id/fakeShadow"
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@drawable/shadow" />
<LinearLayout
android:id="@+id/productNameLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_below="@+id/fakeShadow">
<TextView
android:id="@+id/productNameTextView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="@android:color/black"
android:textSize="16sp"
android:text="Pizza Formaggio"
android:padding="16dp"
android:textStyle="bold"
android:gravity="center"/>
<TextView
android:id="@+id/productPriceTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:text="CHF 25.00"
android:textSize="16sp"
android:paddingBottom="16dp"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:textStyle="bold"
android:layout_gravity="center_horizontal" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_below="@+id/productNameLayout"
android:layout_above="@+id/addToCartButtonLayout">
</LinearLayout>
<RelativeLayout
android:id="@+id/addToCartButtonLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:padding="16dp">
<Button
android:id="@+id/addToCartButton"
android:layout_width="match_parent"
android:layout_height="48dp"
android:text="@string/add_to_cart"
style="@style/PizzalinkButtonWithoutMargin" />
</RelativeLayout>
</RelativeLayout>
-->

View File

@@ -1,10 +1,11 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/ordersBottomLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_alignParentBottom="true">
android:layout_alignParentBottom="true"
tools:ignore="MissingPrefix">
<View
android:layout_width="match_parent"
@@ -21,7 +22,7 @@
android:layout_height="match_parent"
android:textColor="@color/red"
android:text="@string/previous"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingRight="16dp"
@@ -34,7 +35,7 @@
android:layout_height="match_parent"
android:textColor="@color/red"
android:text="@string/next"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingRight="16dp"

View File

@@ -49,9 +49,8 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="@color/red"
fontPath="fonts/AvenirNextLTProDemi.otf"
fontPath="fonts/Quicksand-Bold.ttf"
android:visibility="gone"/>
<ImageView

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="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
@@ -13,7 +15,7 @@
android:text="@string/order_person_fullname"
android:textColor="@color/heater"
android:textSize="12sp"
android:textStyle="bold" />
fontPath="fonts/Quicksand-Bold.ttf" />
<TextView
android:id="@+id/infoTextView"
@@ -21,7 +23,7 @@
android:layout_height="wrap_content"
android:text="Aytaç Cici"
android:layout_marginTop="4dp"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/black"/>
</LinearLayout>

View File

@@ -2,6 +2,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"
@@ -39,7 +41,7 @@
android:textSize="16sp"
android:textColor="@color/black"
android:padding="12dp"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/cartProductCountTextView"
android:layout_toEndOf="@+id/cartProductCountTextView"
@@ -53,7 +55,7 @@
android:text="CHF 25.00"
android:textColor="@color/black"
android:padding="8dp"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/removeProductFromCartImageView"
android:layout_toStartOf="@+id/removeProductFromCartImageView"/>
@@ -79,7 +81,7 @@
android:textColor="@color/black"
android:layout_marginLeft="64dp"
android:layout_marginStart="64dp"
android:textStyle="italic"
fontPath="fonts/Quicksand-Regular-Italic.otf"
android:paddingBottom="12dp"
android:paddingLeft="12dp"
android:paddingStart="12dp"

View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
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"
@@ -12,4 +14,4 @@
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:textSize="16sp"
android:textStyle="bold" />
fontPath="fonts/Quicksand-Bold.ttf" />

View File

@@ -2,6 +2,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="wrap_content"
android:layout_height="wrap_content"
@@ -25,7 +27,7 @@
android:textSize="16sp"
android:text="Anatoliajefjefje\nwhufjechfuhefu"
android:padding="8dp"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_centerInParent="true"
android:gravity="center"/>
@@ -66,7 +68,7 @@
android:textColor="@android:color/black"
android:text="CHF 25.00"
android:padding="16dp"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_gravity="center_horizontal" />
</LinearLayout>

View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
<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"
@@ -25,7 +26,7 @@
android:text="5 Oct. 2017 "
android:textColor="@color/black"
android:padding="8dp"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:textSize="16sp" />
<TextView
@@ -36,7 +37,7 @@
android:textColor="@color/black"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
android:textStyle="italic"
fontPath="fonts/Quicksand-Regular-Italic.otf"
android:paddingBottom="12dp"
android:paddingLeft="12dp"
android:paddingStart="12dp"
@@ -51,7 +52,7 @@
android:textColor="@color/black"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
android:textStyle="italic"
fontPath="fonts/Quicksand-Regular-Italic.otf"
android:paddingBottom="12dp"
android:paddingLeft="12dp"
android:paddingStart="12dp"

View File

@@ -2,6 +2,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"
@@ -45,7 +47,7 @@
android:textSize="16sp"
android:padding="12dp"
android:text="Anatolia"
android:textStyle="bold"/>
fontPath="fonts/Quicksand-Bold.ttf"/>
<!--
android:background="@color/row_pizza_ingredients_background"
@@ -238,7 +240,7 @@
android:layout_height="wrap_content"
android:text="1"
android:textSize="18sp"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_gravity="center_vertical"
android:textColor="@color/black"/>
@@ -267,7 +269,7 @@
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:text="CHF 25.00"
android:textStyle="bold"
fontPath="fonts/Quicksand-Bold.ttf"
android:textSize="18sp"
android:padding="12dp"
android:layout_gravity="center_horizontal"/>
@@ -299,188 +301,4 @@
</LinearLayout>
<!--
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/pizzaImageView"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_gravity="center_horizontal" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_toRightOf="@+id/pizzaImageView"
android:layout_toEndOf="@+id/pizzaImageView">
<TextView
android:id="@+id/pizzaNameTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textSize="16sp"
android:paddingTop="12dp"
android:text="Anatolia"
android:textStyle="bold"
android:layout_gravity="center_horizontal" />
<TextView
android:id="@+id/pizzaIngredientsTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/row_pizza_ingredients_background"
android:padding="12dp"
android:textColor="@android:color/black"
android:gravity="center"
android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_margin="12dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:layout_weight="1">
<TextView
android:id="@+id/pizzaSize3NameTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Gross"
android:textSize="10sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/pizzaSize3CheckBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="4dp"
/>
<TextView
android:id="@+id/pizzaSize3LengthTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="50cm"
android:textSize="12sp"
android:layout_marginTop="4dp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:layout_weight="1">
<TextView
android:id="@+id/pizzaSize1NameTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Klein"
android:textSize="10sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/pizzaSize1CheckBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="4dp"
/>
<TextView
android:id="@+id/pizzaSize1LengthTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="26cm"
android:textSize="12sp"
android:layout_marginTop="4dp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:layout_weight="1">
<TextView
android:id="@+id/pizzaSize2NameTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Normal"
android:textSize="10sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/pizzaSize2CheckBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="4dp"
/>
<TextView
android:id="@+id/pizzaSize2LengthTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="32cm"
android:textSize="12sp"
android:layout_marginTop="4dp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/pizzaPriceTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:text="CHF 25.00"
android:textStyle="bold"
android:layout_gravity="center_horizontal" />
<Button
android:id="@+id/addPizzaToCartTextView"
android:layout_width="match_parent"
android:layout_height="36dp"
android:layout_margin="12dp"
style="@style/AddCartButton"
android:text="Add to Cart"/>
</RelativeLayout>
-->
</android.support.v7.widget.CardView>

View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
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"
@@ -12,4 +14,4 @@
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:textSize="16sp"
android:textStyle="bold" />
fontPath="fonts/Quicksand-Bold.ttf" />