This commit is contained in:
2017-10-08 20:09:01 +03:00
parent dfcb093c7a
commit cfe308b413
37 changed files with 820 additions and 864 deletions

View File

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

View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.RecyclerView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pizzaRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/actvity_default_background_color_1"
android:scrollbars="vertical"/>

View File

@@ -27,7 +27,7 @@
android:layout_height="24dp"
android:textColor="@color/black"
android:textSize="16sp"
android:textColorHint="@color/row_pizza_ingredients_background"
android:textColorHint="@color/row_product_ingredients_background"
android:layout_centerVertical="true"
android:background="@android:color/transparent"
android:layout_marginBottom="12dp"/>
@@ -37,7 +37,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/row_pizza_ingredients_background"
android:background="@color/row_product_ingredients_background"
android:layout_marginTop="2dp"/>

View File

@@ -0,0 +1,74 @@
<?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"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/white"
app:cardCornerRadius="4dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="56dp">
<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="Anatoliajefjefje\nwhufjechfuhefu"
android:padding="8dp"
android:textStyle="bold"
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" />
<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="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:text="CHF 25.00"
android:padding="16dp"
android:textStyle="bold"
android:layout_gravity="center_horizontal" />
</LinearLayout>
</android.support.v7.widget.CardView>

View File

@@ -1,59 +0,0 @@
<?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"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/white"
app:cardCornerRadius="4dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<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" />
<ImageView
android:id="@+id/pizzaImageView"
android:layout_width="160dp"
android:layout_height="160dp"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp" />
<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"/>
<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:padding="16dp"
android:textStyle="bold"
android:layout_gravity="center_horizontal" />
</LinearLayout>
</android.support.v7.widget.CardView>

View File

@@ -10,7 +10,7 @@
<color name="bottom_menu_selected_item">#EC1649</color>
<color name="bottom_menu_unselected_item">#ffffff</color>
<color name="navigation_drawer_background">#4C4B4A</color>
<color name="row_pizza_ingredients_background">#EBECEC</color>
<color name="row_product_ingredients_background">#EBECEC</color>
<!-- android:background="?android:colorBackground" -->
<color name="actvity_default_background_color_1">#EEEEEE</color>

View File

@@ -28,7 +28,7 @@
<string name="navigation_menu_item_dessert">DESSERT</string>
<!-- NavigationMenu-->
<string name="fragment_title_create_own_pizza">Wunschpizza</string>
<string name="fragment_title_wunschpizza">Wunschpizza</string>
<string name="fragment_title_ekstra_kebap">Ekstra Kebap</string>
<string name="fragment_title_pizza">Pizza</string>
<string name="fragment_title_vorspeisen">Vorspeisen</string>
@@ -110,5 +110,8 @@
<string name="month_name_november">Nov.</string>
<string name="month_name_december">Dec.</string>
<string name="chf">CHF</string>
<string name="empty_description">..</string>
</resources>