order history details

This commit is contained in:
cimenmus
2017-11-22 22:25:16 +03:00
parent 334171c8ca
commit 47136dde71
15 changed files with 1182 additions and 434 deletions

View File

@@ -0,0 +1,117 @@
<?xml version="1.0" encoding="utf-8"?>
<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"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white"
tools:context="ch.pizzalink.android.activity.OrderHistoryDetailsActivity"
android:focusable="true"
android:focusableInTouchMode="true">
<ch.pizzalink.android.view.PizzalinkToolbar
android:id="@+id/orderHistoryDetailsToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/activity_title_order_history_details"
android:background="@color/white"
app:showBackIcon="true"
app:titleTextColor="@color/navy" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/orderHistoryDetailsToolbar">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/background_wood" />
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
app:cardCornerRadius="4dp"
android:layout_margin="12dp">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:scrollbars="none">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/white">
<ch.pizzalink.android.view.PizzalinkInfoView
android:id="@+id/orderDatePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_date" />
<ch.pizzalink.android.view.PizzalinkInfoView
android:id="@+id/orderStatusPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_status" />
<ch.pizzalink.android.view.PizzalinkInfoView
android:id="@+id/orderShippingTimePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_shipping_time" />
<ch.pizzalink.android.view.PizzalinkInfoView
android:id="@+id/orderTotalPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_total" />
<ch.pizzalink.android.view.PizzalinkInfoView
android:id="@+id/orderPaymentMethodPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_payment_method" />
<ch.pizzalink.android.view.PizzalinkInfoView
android:id="@+id/orderFullnamePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_fullname" />
<ch.pizzalink.android.view.PizzalinkInfoView
android:id="@+id/orderShippingMethodPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_shipping_method" />
<ch.pizzalink.android.view.PizzalinkInfoView
android:id="@+id/orderShippingAddressPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_shipping_address" />
<ch.pizzalink.android.view.PizzalinkInfoView
android:id="@+id/orderNotePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_note" />
</LinearLayout>
</ScrollView>
</android.support.v7.widget.CardView>
</RelativeLayout>
</RelativeLayout>

View File

@@ -50,20 +50,43 @@
</RelativeLayout>
<TextView
android:id="@+id/orderStatusTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Pending"
android:textColor="@color/navy"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
fontPath="fonts/Quicksand-Regular-Italic.otf"
android:paddingBottom="12dp"
android:paddingLeft="12dp"
android:paddingStart="12dp"
android:paddingRight="12dp"
android:paddingEnd="12dp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/orderStatusTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Pending"
android:textColor="@color/navy"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
android:layout_marginRight="32dp"
android:layout_marginEnd="32dp"
android:layout_toLeftOf="@+id/arrow"
android:layout_toStartOf="@+id/arrow"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
fontPath="fonts/Quicksand-Regular-Italic.otf"
android:paddingBottom="12dp"
android:paddingLeft="12dp"
android:paddingStart="12dp"
android:paddingRight="12dp"
android:paddingEnd="12dp" />
<ImageView
android:id="@+id/arrow"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:src="@drawable/ic_back"
android:tint="@color/navy"
android:padding="6dp"
android:rotation="180"/>
</RelativeLayout>
</LinearLayout>

View File

@@ -1,326 +1,200 @@
<resources>
<!-- General-->
<string name="app_name">Pizzalink</string>  <!--bu alanı alanını değiştirmyin !!!-->
    
<string name="app_name">Pizzalink</string>
<string name="something_went_wrong">Es ist ein Fehler aufgetreten.</string>
    
<string name="alert">Warnung</string>
    
<string name="error_message">Es ist ein Fehler aufgetreten.</string>
    
<string name="bad_request">Bad Request</string>
    
<string name="failed">Connection failed</string>
    
<string name="ok">Ok</string>
    
<string name="cancel">Beenden</string>
    
<string name="loading">Bitte warten...</string>
    
<string name="month_name_january">Jan.</string>
    
<string name="month_name_february">Feb.</string>
    
<string name="month_name_march">Mar.</string>
    
<string name="month_name_april">Apr.</string>
    
<string name="month_name_may">May</string>
    
<string name="month_name_jun">June</string>
    
<string name="month_name_july">July</string>
    
<string name="month_name_august">Aug.</string>
    
<string name="month_name_september">Sept</string>
    
<string name="month_name_october">Oct.</string>
    
<string name="month_name_november">Nov.</string>
    
<string name="cancel">Beenden</string>    
<string name="loading">Bitte warten...</string>    
<string name="month_name_january">Jan.</string>    
<string name="month_name_february">Feb.</string>    
<string name="month_name_march">Mar.</string>    
<string name="month_name_april">Apr.</string>    
<string name="month_name_may">May</string>    
<string name="month_name_jun">June</string>    
<string name="month_name_july">July</string>  
<string name="month_name_august">Aug.</string>    
<string name="month_name_september">Sept</string>    
<string name="month_name_october">Oct.</string>  
<string name="month_name_november">Nov.</string> 
<string name="month_name_december">Dec.</string>
    
<string name="chf">CHF</string>
    
<string name="chf">CHF</string> 
<string name="empty_description">..</string>
    
<string name="choose">Wählen</string>
    <!-- General-->
<!-- General-->
    <!-- uygulamının ilk açılan ekranı. pizzlink logosunun oldugu ekran -->
    <!-- SplashActivity -->
    
<string name="no_network_message">Keine Internetverbindung. Bitte versuchen Sie es später noch einmal.</string>
    
<string name="alert_update_app">Sie müssen die Pizzalink-Applikation aktualisieren, um sie zu verwenden.</string>
    
<!-- SplashActivity -->  
<string name="no_network_message">Keine Internetverbindung. Bitte versuchen Sie es später noch einmal.</string>  
<string name="alert_update_app">Sie müssen die Pizzalink-Applikation aktualisieren, um sie zu verwenden.</string>    
<string name="update_app">AKTUALISIEREN</string>
    <!-- SplashActivity -->
<!-- SplashActivity -->
    <!-- giriş yap ekranı -->
    <!-- LoginActivity-->
    
<!-- LoginActivity-->
<string name="activity_title_login">Einloggen</string>
    
<string name="button_login">EINLOGGEN</string>
    
<string name="not_have_an_accaount">Sie haben kein Konto?</string>
    
<string name="register_text">REGISTRIEREN</string>
    
<string name="forgot_password_hint">Haben Sie Ihr Passwort vergessen?</string>
    
<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>
    <!-- LoginActivity-->
<!-- LoginActivity-->
    <!-- şifremi unuttum ekranı -->
    <!-- ForgotPasswordActivity-->
    
<string name="activity_title_forgot_password">Passwort vergessen</string>
    
<string name="reset_password_hint"> Geben sie beim registrieren ihre E-Mail-Adresse ein und folgen Sie den Anweisungen.</string>
    
<string name="reset_password_button">SENDEN</string>
    
<!-- ForgotPasswordActivity-->
<string name="activity_title_forgot_password">Passwort vergessen</string>    
<string name="reset_password_hint"> Geben sie beim registrieren ihre E-Mail-Adresse ein und folgen Sie den Anweisungen.</string>    
<string name="reset_password_button">SENDEN</string>    
<string name="password_reset">Erforderliche Informationen wurden an Ihre E-Mail-Adresse geschickt. Folgen Sie den Anweisungen um Ihr Passwort zurückzusetzen.</string>
    <!-- ForgotPasswordActivity-->
<!-- ForgotPasswordActivity-->
    <!-- kayıt ol ekranı -->
    <!-- RegisterActivity-->
    
<string name="activity_title_register">Registrieren</string>
    
<string name="firstname">Vorname</string>
    
<string name="lastname">Nachname</string>
    
<string name="telephone">Telefonnummer</string>
    
<string name="email">E-Mail-Adresse</string>
    
<string name="password">Passwort</string>
    
<string name="password_again">Passwort (erneut eingeben)</string>
    
<string name="addres_line_1">Adresse</string>
    
<string name="addres_line_2">Adresse 2</string>
    
<string name="city">Stadt</string>
    
<string name="postcode">Postleitzahl</string>
    
<string name="zone">Gebiet</string>
    
<string name="country">Land</string>
    
<string name="alert_fill_all_fields">Bitte füllen Sie alle Felder aus.</string>
    
<string name="alert_invalid_email">Bitte geben sie eine gültige E-Mail-Adresse ein.</string>
    
<string name="alert_passwords_not_matched">Passwörter stimmen nicht überein.</string>
    
<string name="alert_invalid_post_code">Bitte geben sie eine gültige Postleitzahl ein.</string>
    
<string name="alert_select_country_first">Bitte wählen Sie zuerst ein Land.</string>
    
<!-- RegisterActivity-->
<string name="activity_title_register">Registrieren</string>    
<string name="firstname">Vorname</string>    
<string name="lastname">Nachname</string>    
<string name="telephone">Telefonnummer</string>    
<string name="email">E-Mail-Adresse</string>    
<string name="password">Passwort</string>    
<string name="password_again">Passwort (erneut eingeben)</string>    
<string name="addres_line_1">Adresse</string>    
<string name="addres_line_2">Adresse 2</string>    
<string name="city">Stadt</string>    
<string name="postcode">Postleitzahl</string>    
<string name="zone">Gebiet</string>    
<string name="country">Land</string> 
<string name="alert_fill_all_fields">Bitte füllen Sie alle Felder aus.</string>    
<string name="alert_invalid_email">Bitte geben sie eine gültige E-Mail-Adresse ein.</string>  
<string name="alert_passwords_not_matched">Passwörter stimmen nicht überein.</string>    
<string name="alert_invalid_post_code">Bitte geben sie eine gültige Postleitzahl ein.</string>    
<string name="alert_select_country_first">Bitte wählen Sie zuerst ein Land.</string>    
<string name="button_register">REGISTRIEREN</string>
    <!-- RegisterActivity-->
<!-- RegisterActivity-->
    <!-- ana ekrandaki alt menuler -->
    <!-- MainAcitivity -->
    
<string name="bottom_nav_menu_item_menu">Menu</string>
    
<string name="bottom_nav_menu_item_cart">Cart</string>
    
<string name="bottom_nav_menu_item_history">History</string>
    
<string name="bottom_nav_menu_item_profile">Profile</string>
    
<!-- MainAcitivity -->    
<string name="bottom_nav_menu_item_menu">Menu</string>    
<string name="bottom_nav_menu_item_cart">Cart</string>    
<string name="bottom_nav_menu_item_history">History</string>    
<string name="bottom_nav_menu_item_profile">Profile</string>    
<string name="bottom_nav_menu_item_info">Info</string>
<string name="cart_total">ZWISHENSUMME</string>
<!-- MainAcitivity -->
    <!-- MainAcitivity -->
 
  <!-- ürün sayısı, bouyutu ve içeriklerinin seçilip sepete ekleme işleminin yapıldıgı ekran -->
    <!-- ProductPropertiesBottomSheetDialog -->
    
<string name="add_to_cart">IN DEN WARENKORB LEGEN</string>
    
<string name="count">Count</string>
    
<!-- ProductPropertiesBottomSheetDialog -->    
<string name="add_to_cart">IN DEN WARENKORB LEGEN</string>    
<string name="count">Count</string>    
<string name="no_options_selected_part">is not selected.</string>
    <!-- ProductPropertiesBottomSheetDialog -->
<!-- ProductPropertiesBottomSheetDialog -->
    <!-- sepet ekranı -->
    <!-- CartFragment-->
    
<string name="continue_cart">WEITER</string>
    
<string name="clear_cart">LÖSCHEN</string>
    
<string name="no_product_on_cart">Es befindet sich kein Produkt im Warenkorb.</string>
    
<string name="alert_remove_prdocut_from_cart">Möchten Sie das Produkt aus dem Warenkorb entfernen?</string>
    
<string name="product_removed_from_cart">Produkt wurde aus dem Warenkorb entfernt.</string>
    
<!-- CartFragment-->    
<string name="continue_cart">WEITER</string>    
<string name="clear_cart">LÖSCHEN</string>    
<string name="no_product_on_cart">Es befindet sich kein Produkt im Warenkorb.</string>    
<string name="alert_remove_prdocut_from_cart">Möchten Sie das Produkt aus dem Warenkorb entfernen?</string>    
<string name="product_removed_from_cart">Produkt wurde aus dem Warenkorb entfernt.</string>    
<string name="alert_clear_cart">Möchten Sie alle Produkte aus dem Warenkorb entfernen?</string>
    <!-- CartFragment-->
<!-- CartFragment-->
    <!-- sipariş geçmişi ekranı -->
    <!-- OrderHistoryFragment-->
    
<string name="order_history_total">Total :</string>
    
<string name="order_history_date">Date</string>
    
<!-- OrderHistoryFragment-->
<string name="order_history_total">Total :</string>    
<string name="order_history_date">Date</string>    
<string name="order_history_status">Status</string>
    <!-- OrderHistoryFragment-->
<!-- OrderHistoryFragment-->
    <!-- sipariş oluşturma ekranı -->
    <!-- CreateOrderActivity -->
    
<string name="activity_title_create_order">Bestellen</string>
    
<string name="next">NEXT</string>
    
<string name="previous">PREVIOUS</string>
    
<string name="confirm_order">APPROVE</string>
    
<string name="done_order">DONE</string>
    
<!-- OrderHistoryDetailsActivity-->
<string name="activity_title_order_history_details">Order Details</string>    
<string name="order_history_order_date">CREATE DATE</string>    
<string name="order_history_order_status">STATUS</string>    
<string name="order_history_order_shipping_time">SHIPPING TIME</string>    
<string name="order_history_order_total">ZWISHENSUMME</string>    
<string name="order_history_order_payment_method">PAYMENT METHOD</string>    
<string name="order_history_order_fullname">FULLNAME</string>    
<string name="order_history_order_shipping_method">SHIPPING METHOD</string>    
<string name="order_history_order_shipping_address">SHIPPING ADDRESS</string>     
<string name="order_history_order_note">NACHRICHT</string> 
<!-- OrderHistoryDetailsActivity-->
<!-- CreateOrderActivity --> 
<string name="activity_title_create_order">Bestellen</string>    
<string name="next">NEXT</string>    
<string name="previous">PREVIOUS</string>    
<string name="confirm_order">APPROVE</string>    
<string name="done_order">DONE</string>    
<string-array name="stepperLabels">
        
<item>Versandart</item>
        
<item>Versandadresse</item>
        
<item>Versandadresse</item>        
<item>Bezahlverfahren</item>
<item>Nachricht</item>
        
<item>Betrag</item>
    
<item>Nachricht</item>        
<item>Betrag</item>    
</string-array>
    <!-- CreateOrderActivity -->
<!-- CreateOrderActivity -->
    <!-- teslimat yöntemi seçme ekranı -->
    <!-- ShippingMethodFragment-->
    
<!-- ShippingMethodFragment-->    
<string name="alert_choose_shipping_method">Lütfen bir teslimat yöntemi seçiniz.</string>
    <!-- ShippingMethodFragment-->
<!-- ShippingMethodFragment-->
    
    <!-- teslimat adresi seçme ekranı -->
    <!-- ShippingAddressFragment-->
    
<!-- ShippingAddressFragment-->
<string name="alert_choose_shipping_address">Bitte wählen Sie eine Versandadresse aus oder fügen Sie eine neue Versandadresse hinzu.</string>
    <!-- ShippingAddressFragment-->
<!-- ShippingAddressFragment-->
    <!-- ödeme yöntemi seçme ekranı -->
    <!-- PaymentMethodFragment-->
    
<!-- PaymentMethodFragment-->
<string name="alert_choose_payment_method">Bitte wählen Sie ein Bezahlverfahren aus.</string>
    <!-- PaymentMethodFragment-->
<!-- PaymentMethodFragment-->
<!-- sipariş notu ekranı -->
<!-- CreateOrderNoteFragment-->
<string name="order_note">Nachricht (Optional)</string>
<!-- CreateOrderNoteFragment-->
    <!-- sipariş özet ekranı -->
    <!-- CreateOrderSummaryFragment-->
    
<string name="order_person_fullname">TO</string>
    
<string name="order_shipping_method">SHIPPING METHOD</string>
    
<string name="order_shipping_address">SHIPPING ADDRESS</string>
    
<string name="order_payment_method">PAYMENT METHOD</string>
    
<!-- CreateOrderSummaryFragment-->    
<string name="order_person_fullname">TO</string>    
<string name="order_shipping_method">SHIPPING METHOD</string>    
<string name="order_shipping_address">SHIPPING ADDRESS</string>    
<string name="order_payment_method">PAYMENT METHOD</string>    
<string name="order_total">TOTAL</string>
<string name="order_notee">NACHRICHT</string>
    <!-- CreateOrderSummaryFragment-->
<!-- CreateOrderSummaryFragment-->
    <!-- sipariş sınucu ekranı -->
    <!-- CreateOrderResultFragment-->
    
<!-- CreateOrderResultFragment-->
<string name="order_successed">Ihre Bestellung ist erfolgreich. Ihre Bestellübersicht werden in der Bestellungshistorie angezeigt und kann dort verfolgt werden.</string>
    <!-- CreateOrderSummaryFragment-->
<!-- CreateOrderSummaryFragment-->
    <!-- profil ekranı -->
    <!-- ProfileFragment-->
    
<string name="profile_firstname">VORNAME</string>
    
<string name="profile_lastname">NACHNAME</string>
    
<string name="profile_telephone">TELEFONNUMMER</string>
    
<string name="profile_email">E-MAIL-ADRESSE</string>
    
<string name="my_addresses">Meine Adressen</string>
    
<string name="update_profile">Profil aktualisieren</string>
    
<string name="update_password">Passwort aktualisieren</string>
    
<string name="button_logout">Abmelden</string>
    
<!-- ProfileFragment-->    
<string name="profile_firstname">VORNAME</string>    
<string name="profile_lastname">NACHNAME</string>    
<string name="profile_telephone">TELEFONNUMMER</string>    
<string name="profile_email">E-MAIL-ADRESSE</string>    
<string name="my_addresses">Meine Adressen</string>    
<string name="update_profile">Profil aktualisieren</string>    
<string name="update_password">Passwort aktualisieren</string>    
<string name="button_logout">Abmelden</string>    
<string name="alert_logout">Möchten Sie sich abmelden?</string>
    <!-- ProfileFragment-->
<!-- ProfileFragment-->
    <!-- profil bilgilerini güncelleme ekranı -->
    <!-- UpdateProfilectivity-->
    
<!-- UpdateProfilectivity-->
<string name="activity_title_update_profile">Profil Aktualisieren</string>
    
<string name="profile_updated">Ihr Profil wurde erfolgreich aktualisiert..</string>
    <!-- UpdateProfilectivity-->
<!-- UpdateProfilectivity-->
    <!-- şifre güncelleme ekranı -->
    <!-- UpdatePasswordActivity-->
    
<string name="activity_title_update_password">Passwort Aktualisieren</string>
    
<string name="hint_old_password">Altes Passwort</string>
    
<string name="hint_new_password">Neues Passwort</string>
    
<string name="hint_confirm_new_password">Neues Passwort (erneut eingeben)</string>
    
<!-- UpdatePasswordActivity-->    
<string name="activity_title_update_password">Passwort Aktualisieren</string>    
<string name="hint_old_password">Altes Passwort</string>    
<string name="hint_new_password">Neues Passwort</string>    
<string name="hint_confirm_new_password">Neues Passwort (erneut eingeben)</string>    
<string name="password_updated">Ihr Passwort wurde erfolgreich aktualisiert.</string>
    <!-- UpdatePasswordActivity-->
<!-- UpdatePasswordActivity-->
    <!-- adreslerini görüntüleme ekranı -->
    <!-- MyAddressesActivity-->
    
<string name="activity_title_my_addresses">Meine Adressen</string>
    
<string name="add_new_address">NEUE ADRESSE HINZUFÜGEN</string>
    
<string name="alert_delete_address">Möchten Sie diese Adresse löschen?</string>
    
<!-- MyAddressesActivity-->    
<string name="activity_title_my_addresses">Meine Adressen</string>    
<string name="add_new_address">NEUE ADRESSE HINZUFÜGEN</string>    
<string name="alert_delete_address">Möchten Sie diese Adresse löschen?</string>    
<string name="address_deleted">Ihre Adresse wurde erfolgreich gelöscht.</string>
    <!-- MyAddressesActivity-->
<!-- MyAddressesActivity-->
    <!-- yeni adres ekleme ekranı -->
    <!-- AddAddressActivity-->
    
<string name="activity_title_add_address">Neue Adresse hinzufügen</string>
    
<string name="add">HINZUFÜGEN</string>
    
<!-- AddAddressActivity-->
<string name="activity_title_add_address">Neue Adresse hinzufügen</string> 
<string name="add">HINZUFÜGEN</string>    
<string name="new_address_added">Adresse wurde erfolgreich hinzugefügt.</string>
    <!-- AddAddressActivity-->
<!-- AddAddressActivity-->
</resources>