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

fixes

Browse Source
This commit is contained in:
cimenmus
2018-01-07 15:38:14 +03:00
parent 01374caa79
commit 67a9fe01a4
12 changed files with 154 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,6 +128,7 @@
android:id="@+id/shoppingCartImageView"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_bottom_nav_item_cart_white"/>
<TextView
@@ -135,7 +136,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bottom_nav_menu_item_cart"
android:textSize="12sp"
android:textSize="10sp"
android:textColor="@color/white"/>
</LinearLayout>

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

@@ -73,17 +73,17 @@
<!-- 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_cart">Warenkorb</string>    
<string name="bottom_nav_menu_item_history">Bestellungshistorie</string>    
<string name="bottom_nav_menu_item_profile">Mein Konto</string>    
<string name="bottom_nav_menu_item_info">Info</string>
<string name="cart_total">ZWISHENSUMME</string>
<!-- MainAcitivity -->
<!-- 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>
<string name="count">Betrag</string>    
<string name="no_options_selected_part">wurde nicht ausgewählt.</string>
<!-- ProductPropertiesBottomSheetDialog -->
<!-- CartFragment-->    
@@ -96,33 +96,33 @@
<!-- CartFragment-->
<!-- OrderHistoryFragment-->
<string name="order_history_total">Total :</string>    
<string name="order_history_date">Date</string>    
<string name="order_history_total">Gesamtbetrag :</string>    
<string name="order_history_date">Datum</string>    
<string name="order_history_status">Status</string>
<!-- OrderHistoryFragment-->
<!-- OrderHistoryDetailsActivity-->
<string name="activity_title_order_history_details">Order Details</string>    
<string name="order_history_order_date">CREATE DATE</string>    
<string name="activity_title_order_history_details">Bestellungsdetail</string>    
<string name="order_history_order_date">BESTELLUNGSDATUM</string>    
<string name="order_history_order_status">STATUS</string>    
<string name="order_history_order_shipping_time">SHIPPING TIME</string>    
<string name="order_history_order_shipping_time">VERSANDZEIT</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_payment_method">ZAHLUNGSWEISE</string>    
<string name="order_history_order_fullname">VOLLNAME</string>    
<string name="order_history_order_shipping_method">LIEFERUNGSMETHODE</string>    
<string name="order_history_order_shipping_address">LIEFERUNGSADRESSE</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 name="next">NÄCHSTE</string>    
<string name="previous">VORHERIGE</string>    
<string name="confirm_order">BESTÄTIGEN</string>    
<string name="done_order">FERTIG</string>    
<string-array name="stepperLabels">
<item>Versandart</item>
<item>Versandadresse</item>        
<item>Lieferungsart</item>
<item>Lieferungadresseadresse</item>        
<item>Bezahlverfahren</item>
<item>Nachricht</item>        
<item>Betrag</item>    
@@ -130,11 +130,11 @@
<!-- CreateOrderActivity -->
<!-- ShippingMethodFragment-->    
<string name="alert_choose_shipping_method">Lütfen bir teslimat yöntemi seçiniz.</string>
<string name="alert_choose_shipping_method">Bitte wählen Sie eine Lieferungsmethode</string>
<!-- ShippingMethodFragment-->
    
<!-- ShippingAddressFragment-->
<string name="alert_choose_shipping_address">Bitte wählen Sie eine Versandadresse aus oder fügen Sie eine neue Versandadresse hinzu.</string>
<string name="alert_choose_shipping_address">Bitte wählen Sie eine Lieferungsadresse aus oder fügen Sie eine neue Lieferungsadresse hinzu.</string>
<!-- ShippingAddressFragment-->
<!-- PaymentMethodFragment-->
@@ -146,11 +146,11 @@
<!-- CreateOrderNoteFragment-->
<!-- 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_person_fullname">AN</string>    
<string name="order_shipping_method">LIEFERUNGSMETHODE</string>    
<string name="order_shipping_address">LIEFERUNGSADRESSE</string>    
<string name="order_payment_method">ZAHLUNGSWEISE</string>    
<string name="order_total">ZWISCHENSUMME</string>
<string name="order_notee">NACHRICHT</string>
<!-- CreateOrderSummaryFragment-->
@@ -164,8 +164,8 @@
<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="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-->