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

beta bug fixes 2

Browse Source
This commit is contained in:
cimenmus
2017-10-28 18:47:33 +03:00
parent 5d5b9c5af7
commit 6491c37fc9
18 changed files with 431 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/res/layout/fragment_create_order_note.xml Normal file
View File

@@ -0,0 +1,20 @@
<?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"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:focusable="true"
android:focusableInTouchMode="true">
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/orderNotePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/order_note"
app:inputType="multiline"/>
<include layout="@layout/layout_orders_bottom"/>
</RelativeLayout>

8
app/src/main/res/layout/fragment_create_order_summary.xml
View File

@@ -12,7 +12,8 @@
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_above="@id/ordersBottomLayout">
android:layout_above="@id/ordersBottomLayout"
android:scrollbars="vertical">
<LinearLayout
android:layout_width="match_parent"
@@ -49,6 +50,11 @@
android:layout_height="wrap_content"
app:description="@string/order_total" />
<ch.pizzalink.android.view.PizzalinkInfoView
android:id="@+id/orderNotePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_notee" />
</LinearLayout>

1
app/src/main/res/values/attrs.xml
View File

@@ -12,6 +12,7 @@
<declare-styleable name="PizzalinkEditText">
<attr name="hint" format="string" />
<attr name="inputType" format="string" />
<attr name="lineCount" format="integer" />
</declare-styleable>
<declare-styleable name="PizzalinkButton">

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

@@ -1,199 +1,207 @@
<resources>
<!-- General-->
<string name="app_name">Pizzalink</string> <!--bu alanı alanını değiştirmyin !!!-->
<string name="something_went_wrong">Bir hata oluştu.</string>
<string name="alert">Uyarı</string>
<string name="error_message">Bir hata oluştu.</string>
<string name="bad_request">Bad Request</string>
<string name="failed">Connection failed</string>
<string name="ok">Tamam</string>
<string name="cancel">İptal</string>
<string name="loading">Lütfen bekleyiniz...</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="empty_description">..</string>
<string name="choose">Seçiniz</string>
<!-- General-->
    <string name="app_name">Pizzalink</string>  <!--bu alanı alanını değiştirmyin !!!-->
    <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="month_name_december">Dec.</string>
    <string name="chf">CHF</string>
    <string name="empty_description">..</string>
    <string name="choose">Wählen</string>
    <!-- General-->
<!-- uygulamının ilk açılan ekranı. pizzlink logosunun oldugu ekran -->
<!-- SplashActivity -->
<string name="no_network_message">İnternet bağlantısı yok. Lütfen daha sonra tekrar deneyiniz.</string>
<string name="alert_update_app">Pizzalink uygulamasını kullanabilmek için uygulamanızı güncellemeniz gerekmektedir.</string>
<string name="update_app">GÜNCELLE</string>
<!-- SplashActivity -->
    <!-- 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>
    <string name="update_app">AKTUALISIEREN</string>
    <!-- SplashActivity -->
<!-- giriş yap ekranı -->
<!-- LoginActivity-->
<string name="activity_title_login">Giriş Yap</string>
<string name="button_login">GİRİŞ YAP</string>
<string name="not_have_an_accaount">Hesabın yok mu?</string>
<string name="register_text">KAYIT OL</string>
<string name="forgot_password_hint">Şifreni mi unuttun?</string>
<string name="reset_password">ŞİFRENİ SIFIRLA</string>
<!-- LoginActivity-->
    <!-- giriş yap ekranı -->
    <!-- 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="reset_password">PASSWORT ZURÜCKSETZEN</string>
    <!-- LoginActivity-->
<!-- şifremi unuttum ekranı -->
<!-- ForgotPasswordActivity-->
<string name="activity_title_forgot_password">Şifremi Unuttum</string>
<string name="reset_password_hint">Kayıt olurken mail adresini giriniz ve gelen maildeki yönergeleri takip ediniz.</string>
<string name="reset_password_button">GÖNDER</string>
<string name="password_reset">Mail adresinize gerekli bilgiler gönderilmiştir. İlgili maildeki yönergeleri takip ederek şifrenizi sıfırlayabilirsiniz.</string>
<!-- ForgotPasswordActivity-->
    <!-- ş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>
    <string name="password_reset">Erforderliche Informationen wurden an Ihre E-Mail-Adresse geschickt. Folgen Sie den Anweisungen um Ihr Passwort zurückzusetzen.</string>
    <!-- ForgotPasswordActivity-->
<!-- kayıt ol ekranı -->
<!-- RegisterActivity-->
<string name="activity_title_register">Kayıt Ol</string>
<string name="firstname">Ad</string>
<string name="lastname">Soyad</string>
<string name="telephone">Telefon Numarası</string>
<string name="email">Email</string>
<string name="password">Şifre</string>
<string name="password_again">Şifre (Tekrar)</string>
<string name="addres_line_1">Adres</string>
<string name="addres_line_2">Adres 2</string>
<string name="city">Şehir</string>
<string name="postcode">Posta Kodu</string>
<string name="zone">Bölge</string>
<string name="country">Ülke</string>
<string name="alert_fill_all_fields">Lütfen istenen tüm bigileri doldurunuz.</string>
<string name="alert_invalid_email">Lütfen geçerli bir mail adresi giriniz.</string>
<string name="alert_passwords_not_matched">Şifreler uyuşmuyor..</string>
<string name="alert_invalid_post_code">Lütfen geçerli bir posta kodu giriniz.</string>
<string name="alert_select_country_first">Lütfen önce ülke seçimini yapınız.</string>
<string name="button_register">KAYIT OL</string>
<!-- RegisterActivity-->
    <!-- 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>
    <string name="button_register">REGISTRIEREN</string>
    <!-- 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>
<string name="bottom_nav_menu_item_info">Info</string>
<!-- MainAcitivity -->
    <!-- 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>
    <string name="bottom_nav_menu_item_info">Info</string>
    <!-- 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">SEPETE EKLE</string>
<string name="count">Count</string>
<string name="no_options_selected_part">is not selected.</string>
<!-- ProductPropertiesBottomSheetDialog -->
    <!-- ü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>
    <string name="no_options_selected_part">is not selected.</string>
    <!-- ProductPropertiesBottomSheetDialog -->
<!-- sepet ekranı -->
<!-- CartFragment-->
<string name="continue_cart">DEVAM</string>
<string name="clear_cart">TEMİZLE</string>
<string name="no_product_on_cart">Sepetinizde ürün bulunmamaktadır.</string>
<string name="alert_remove_prdocut_from_cart">Bu ürünü sepetinizden silmek istediğinize emin misiniz?</string>
<string name="product_removed_from_cart">Ürün sepetinizden silindi.</string>
<string name="alert_clear_cart">Sepetinizdeki ürünleri silmek istediğinize emin misiniz?</string>
<!-- CartFragment-->
    <!-- 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>
    <string name="alert_clear_cart">Möchten Sie alle Produkte aus dem Warenkorb entfernen?</string>
    <!-- CartFragment-->
<!-- sipariş geçmişi ekranı -->
<!-- OrderHistoryFragment-->
<string name="order_history_total">Total :</string>
<string name="order_history_date">Date</string>
<string name="order_history_status">Status</string>
<!-- OrderHistoryFragment-->
    <!-- sipariş geçmişi ekranı -->
    <!-- OrderHistoryFragment-->
    <string name="order_history_total">Total :</string>
    <string name="order_history_date">Date</string>
    <string name="order_history_status">Status</string>
    <!-- OrderHistoryFragment-->
<!-- sipariş oluşturma ekranı -->
<!-- CreateOrderActivity -->
<string name="activity_title_create_order">Sipariş Ver</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>Shipping Method</item>
<item>Shipping Address</item>
<item>Payment Method</item>
<item>Summary</item>
</string-array>
<!-- CreateOrderActivity -->
    <!-- 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>
    <string-array name="stepperLabels">
        <item>Versandart</item>
        <item>Versandadresse</item>
        <item>Bezahlverfahren</item>
<item>Nachricht</item>
        <item>Betrag</item>
    </string-array>
    <!-- CreateOrderActivity -->
<!-- teslimat yöntemi seçme ekranı -->
<!-- ShippingMethodFragment-->
<string name="alert_choose_shipping_method">Lütfen bir teslimat yöntemi seçiniz.</string>
<!-- ShippingMethodFragment-->
<!-- teslimat adresi seçme ekranı -->
<!-- ShippingAddressFragment-->
<string name="alert_choose_shipping_address">Lütfen bir teslimat adresi seçiniz ya da yeni bir teslimat adresi ekleyiniz.</string>
<!-- ShippingAddressFragment-->
    <!-- teslimat yöntemi seçme ekranı -->
    <!-- ShippingMethodFragment-->
    <string name="alert_choose_shipping_method">Lütfen bir teslimat yöntemi seçiniz.</string>
    <!-- ShippingMethodFragment-->
    
    <!-- teslimat adresi seçme ekranı -->
    <!-- ShippingAddressFragment-->
    <string name="alert_choose_shipping_address">Bitte wählen Sie eine Versandadresse aus oder fügen Sie eine neue Versandadresse hinzu.</string>
    <!-- ShippingAddressFragment-->
<!-- ödeme yöntemi seçme ekranı -->
<!-- PaymentMethodFragment-->
<string name="alert_choose_payment_method">Lütfen bir ödeme yöntemi seçiniz.</string>
<!-- PaymentMethodFragment-->
    <!-- ödeme yöntemi seçme ekranı -->
    <!-- PaymentMethodFragment-->
    <string name="alert_choose_payment_method">Bitte wählen Sie ein Bezahlverfahren aus.</string>
    <!-- PaymentMethodFragment-->
<!-- 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>
<string name="order_total">TOTAL</string>
<!-- CreateOrderSummaryFragment-->
<!-- sipariş notu ekranı -->
<!-- CreateOrderNoteFragment-->
<string name="order_note">Nachricht (Optional)</string>
<!-- CreateOrderNoteFragment-->
<!-- sipariş sınucu ekranı -->
<!-- CreateOrderResultFragment-->
<string name="order_successed">Siparişiniz başarı ile alınmıştır. Siparişinizin detaylarını sipariş geçmişinden görebilir ve siparişinizi takip edebilirsiniz.</string>
<!-- CreateOrderSummaryFragment-->
    <!-- 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>
    <string name="order_total">TOTAL</string>
<string name="order_notee">NACHRICHT</string>
    <!-- CreateOrderSummaryFragment-->
<!-- profil ekranı -->
<!-- ProfileFragment-->
<string name="profile_firstname">AD</string>
<string name="profile_lastname">SOYAD</string>
<string name="profile_telephone">TELEFON NUMARASI</string>
<string name="profile_email">EMAIL</string>
<string name="my_addresses">Adreslerim</string>
<string name="update_profile">Profilimi Güncelle</string>
<string name="update_password">Şifremi Güncelle</string>
<string name="button_logout">Çıkış Yap</string>
<string name="alert_logout">Çıkış yapmak istediğinize emin misiniz?</string>
<!-- ProfileFragment-->
    <!-- sipariş sınucu ekranı -->
    <!-- CreateOrderResultFragment-->
    <string name="order_successed">Ihre Bestellung ist erfolgreich. Ihre Bestellübersicht werden in der Bestellungshistorie angezeigt und kann dort verfolgt werden.</string>
    <!-- CreateOrderSummaryFragment-->
<!-- profil bilgilerini güncelleme ekranı -->
<!-- UpdateProfilectivity-->
<string name="activity_title_update_profile">Profilimi Güncelle</string>
<string name="profile_updated">Profil bilgileriniz başarı ile güncellenmiştir.</string>
<!-- UpdateProfilectivity-->
    <!-- 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>
    <string name="alert_logout">Möchten Sie sich abmelden?</string>
    <!-- ProfileFragment-->
<!-- şifre güncelleme ekranı -->
<!-- UpdatePasswordActivity-->
<string name="activity_title_update_password">Şifre Güncelle</string>
<string name="hint_old_password">Eski Şifre</string>
<string name="hint_new_password">Yeni Şifre</string>
<string name="hint_confirm_new_password">Yeni Şifre (Tekrar)</string>
<string name="password_updated">Şifreniz başarı ile güncellenmiştir.</string>
<!-- UpdatePasswordActivity-->
    <!-- profil bilgilerini güncelleme ekranı -->
    <!-- UpdateProfilectivity-->
    <string name="activity_title_update_profile">Profil Aktualisieren</string>
    <string name="profile_updated">Ihr Profil wurde erfolgreich aktualisiert..</string>
    <!-- UpdateProfilectivity-->
<!-- adreslerini görüntüleme ekranı -->
<!-- MyAddressesActivity-->
<string name="activity_title_my_addresses">Adreslerim</string>
<string name="add_new_address">YENİ ADRES EKLE</string>
<string name="alert_delete_address">Adresinizi silmek istediğinize emin misiniz?</string>
<string name="address_deleted">Adresiniz başarı ile silindi.</string>
<!-- MyAddressesActivity-->
    <!-- ş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>
    <string name="password_updated">Ihr Passwort wurde erfolgreich aktualisiert.</string>
    <!-- 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>
    <string name="address_deleted">Ihre Adresse wurde erfolgreich gelöscht.</string>
    <!-- MyAddressesActivity-->
    <!-- yeni adres ekleme ekranı -->
    <!-- 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-->
<!-- yeni adres ekleme ekranı -->
<!-- AddAddressActivity-->
<string name="activity_title_add_address">Yeni Adres Ekle</string>
<string name="add">KAYDET</string>
<string name="new_address_added">Adresiniz başarı ile eklendi.</string>
<!-- AddAddressActivity-->
</resources>