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-02-02 00:05:13 +03:00
parent 64f25ee44f
commit 218e4717bc
12 changed files with 175 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,6 +93,18 @@
</LinearLayout>
<TextView
android:id="@+id/loginAsGuestTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="@string/login_as_guest"
android:layout_alignParentBottom="true"
android:padding="16dp"
android:layout_centerHorizontal="true"
android:textColor="@color/white" />
</RelativeLayout>

3
app/src/main/res/layout/activity_order_history_details.xml
View File

@@ -63,7 +63,8 @@
android:id="@+id/orderStatusPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_status" />
app:description="@string/order_history_order_status"
android:visibility="gone"/>
<ch.pizzalink.android.view.PizzalinkInfoView
android:id="@+id/orderShippingTimePizzalinkInfoLayout"

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

@@ -1,4 +1,76 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
app:cardCornerRadius="4dp"
android:layout_marginTop="12dp"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="12dp">
<TextView
android:id="@+id/orderDateTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="5 Oct. 2017"
android:textColor="@color/red"
android:padding="8dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:textSize="16sp"
android:layout_centerVertical="true"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true">
<TextView
android:id="@+id/orderTotalTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="CHF 25.00"
android:textColor="@color/navy"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:padding="8dp"
android:layout_gravity="center_vertical"/>
<ImageView
android:id="@+id/arrow"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_back"
android:tint="@color/navy"
android:padding="6dp"
android:rotation="180"/>
</LinearLayout>
</RelativeLayout>
</android.support.v7.widget.CardView>
<!--
<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"
@@ -92,6 +164,15 @@
</android.support.v7.widget.CardView>
-->
<!--
<?xml version="1.0" encoding="utf-8"?>

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

@@ -25,6 +25,9 @@
<string name="chf">CHF</string> 
<string name="empty_description">..</string>
<string name="choose">Wählen</string>
<string name="need_to_login_for_shopping">Alışveriş yapabilmek için üye olmanız gerekmektedir.</string>
<string name="need_to_login_for_that_part">Bu bölüme girebilmek için üye olmanız gerekmektedir.</string>
<string name="cancel_all_caps">BEENDEN</string>
<!-- General-->
<!-- SplashActivity -->  
@@ -40,6 +43,7 @@
<string name="register_text">REGISTRIEREN</string>    
<string name="forgot_password_hint">Haben Sie Ihr Passwort vergessen?</string>  
<string name="reset_password"><b><u>\nPASSWORT ZURÜCKSETZEN</u></b></string>
<string name="login_as_guest">Login as Guest</string>
<!-- LoginActivity-->
<!-- ForgotPasswordActivity-->