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

bug fixes

Browse Source
This commit is contained in:
cimenmus
2018-01-26 22:58:57 +03:00
parent 2aca6fb523
commit 7b19d9dab9
12 changed files with 250 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:focusable="true"
android:focusableInTouchMode="true"
android:background="@color/white">
<ImageView

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

@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
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="match_parent"
@@ -16,6 +19,68 @@
app:hint="@string/order_note"
app:inputType="multiline"/>
<LinearLayout
android:id="@+id/slicePizzaLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"
android:layout_below="@+id/orderNotePizzalinkEditText"
android:layout_marginTop="20dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/navy"
android:paddingLeft="20dp"
android:paddingStart="20dp"
android:paddingRight="20dp"
android:paddingEnd="20dp"
android:text="@string/slice_pizza"/>
<RelativeLayout
android:id="@+id/yesLayout"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:padding="12dp">
<android.support.v7.widget.AppCompatRadioButton
android:id="@+id/yesRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/yes"
android:clickable="false"
android:textColor="@color/navy"
android:checked="true"
fontPath="fonts/Quicksand-Bold.ttf"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/noLayout"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:padding="12dp">
<android.support.v7.widget.AppCompatRadioButton
android:id="@+id/noRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/no"
android:clickable="false"
android:textColor="@color/navy"
fontPath="fonts/Quicksand-Bold.ttf"/>
</RelativeLayout>
</LinearLayout>
<include layout="@layout/layout_orders_bottom"/>
</RelativeLayout>

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

@@ -144,6 +144,9 @@
<!-- CreateOrderNoteFragment-->
<string name="order_note">Nachricht (Optional)</string>
<string name="slice_pizza">Pizzanızın dilimlenmesini ister misiniz?</string>
<string name="yes">Ja</string>
<string name="no">Nein</string>
<!-- CreateOrderNoteFragment-->
<!-- CreateOrderSummaryFragment-->