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

beta bugs fixed

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

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

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

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

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

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

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

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

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