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

theme changed

Browse Source
This commit is contained in:
mustafa içmen
2019-11-24 15:39:52 +03:00
parent b0af25dbc0
commit e1d9544f23
167 changed files with 741 additions and 983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
app/src/main/res/drawable-nodpi/pizzamaxx_logo.png → app/src/main/res/drawable-nodpi/pizzaleu_logo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 79 KiB

2
app/src/main/res/drawable/background_button_add_cart.xml
View File

@@ -2,7 +2,7 @@
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/red"/>
<solid android:color="@color/yellow"/>
<corners android:radius="4dp"/>
</shape>

2
app/src/main/res/drawable/background_product_cart_price.xml
View File

@@ -2,7 +2,7 @@
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/red"/>
<solid android:color="@color/yellow"/>
<corners
android:bottomLeftRadius="4dp"
android:bottomRightRadius="4dp" />

2
app/src/main/res/drawable/ic_bottom_nav_item_cart_red.xml → app/src/main/res/drawable/ic_bottom_nav_item_cart_gray.xml
View File

@@ -1,4 +1,4 @@
<vector android:height="24dp" android:viewportHeight="196.095"
android:viewportWidth="196.095" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#E31E38" android:pathData="M155.16,78.07l-24.13,-48.27c2.44,-2.63 3.97,-6.13 3.97,-9.99c0,-8.12 -6.57,-14.7 -14.68,-14.7c-8.12,0 -14.69,6.57 -14.69,14.7c0,7.94 6.31,14.37 14.19,14.64l21.82,43.62H54.49l21.81,-43.62c7.87,-0.27 14.19,-6.7 14.19,-14.64c0,-8.12 -6.58,-14.7 -14.69,-14.7c-8.11,0 -14.7,6.57 -14.7,14.7c0,3.87 1.54,7.36 3.98,9.99l-24.14,48.27H0l42.49,112.92h111.11l42.5,-112.92H155.16zM78.09,147.41v-25.77h39.94v25.77H78.09zM118.03,159.51v19.36H78.09v-19.36H118.03zM39.06,147.49l-9.72,-25.85h36.64v25.78H39.08L39.06,147.49L39.06,147.49zM78.09,109.53V90.17h39.94v19.36H78.09zM130.13,121.64h36.63l-9.71,25.84v-0.07h-26.9v-25.77H130.13zM130.13,109.53V90.17h48.48l-7.28,19.36H130.13zM65.98,90.17v19.36H24.78l-7.28,-19.36H65.98zM43.59,159.51h22.39v19.36H50.87L43.59,159.51zM130.13,178.88v-19.36h22.39l-7.29,19.36H130.13z"/>
<path android:fillColor="#7F797C" android:pathData="M155.16,78.07l-24.13,-48.27c2.44,-2.63 3.97,-6.13 3.97,-9.99c0,-8.12 -6.57,-14.7 -14.68,-14.7c-8.12,0 -14.69,6.57 -14.69,14.7c0,7.94 6.31,14.37 14.19,14.64l21.82,43.62H54.49l21.81,-43.62c7.87,-0.27 14.19,-6.7 14.19,-14.64c0,-8.12 -6.58,-14.7 -14.69,-14.7c-8.11,0 -14.7,6.57 -14.7,14.7c0,3.87 1.54,7.36 3.98,9.99l-24.14,48.27H0l42.49,112.92h111.11l42.5,-112.92H155.16zM78.09,147.41v-25.77h39.94v25.77H78.09zM118.03,159.51v19.36H78.09v-19.36H118.03zM39.06,147.49l-9.72,-25.85h36.64v25.78H39.08L39.06,147.49L39.06,147.49zM78.09,109.53V90.17h39.94v19.36H78.09zM130.13,121.64h36.63l-9.71,25.84v-0.07h-26.9v-25.77H130.13zM130.13,109.53V90.17h48.48l-7.28,19.36H130.13zM65.98,90.17v19.36H24.78l-7.28,-19.36H65.98zM43.59,159.51h22.39v19.36H50.87L43.59,159.51zM130.13,178.88v-19.36h22.39l-7.29,19.36H130.13z"/>
</vector>

2
app/src/main/res/drawable/ic_bottom_nav_item_cart_white.xml → app/src/main/res/drawable/ic_bottom_nav_item_cart_yellow.xml
View File

@@ -1,4 +1,4 @@
<vector android:height="24dp" android:viewportHeight="196.095"
android:viewportWidth="196.095" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFFFFF" android:pathData="M155.16,78.07l-24.13,-48.27c2.44,-2.63 3.97,-6.13 3.97,-9.99c0,-8.12 -6.57,-14.7 -14.68,-14.7c-8.12,0 -14.69,6.57 -14.69,14.7c0,7.94 6.31,14.37 14.19,14.64l21.82,43.62H54.49l21.81,-43.62c7.87,-0.27 14.19,-6.7 14.19,-14.64c0,-8.12 -6.58,-14.7 -14.69,-14.7c-8.11,0 -14.7,6.57 -14.7,14.7c0,3.87 1.54,7.36 3.98,9.99l-24.14,48.27H0l42.49,112.92h111.11l42.5,-112.92H155.16zM78.09,147.41v-25.77h39.94v25.77H78.09zM118.03,159.51v19.36H78.09v-19.36H118.03zM39.06,147.49l-9.72,-25.85h36.64v25.78H39.08L39.06,147.49L39.06,147.49zM78.09,109.53V90.17h39.94v19.36H78.09zM130.13,121.64h36.63l-9.71,25.84v-0.07h-26.9v-25.77H130.13zM130.13,109.53V90.17h48.48l-7.28,19.36H130.13zM65.98,90.17v19.36H24.78l-7.28,-19.36H65.98zM43.59,159.51h22.39v19.36H50.87L43.59,159.51zM130.13,178.88v-19.36h22.39l-7.29,19.36H130.13z"/>
<path android:fillColor="#FAC30A" android:pathData="M155.16,78.07l-24.13,-48.27c2.44,-2.63 3.97,-6.13 3.97,-9.99c0,-8.12 -6.57,-14.7 -14.68,-14.7c-8.12,0 -14.69,6.57 -14.69,14.7c0,7.94 6.31,14.37 14.19,14.64l21.82,43.62H54.49l21.81,-43.62c7.87,-0.27 14.19,-6.7 14.19,-14.64c0,-8.12 -6.58,-14.7 -14.69,-14.7c-8.11,0 -14.7,6.57 -14.7,14.7c0,3.87 1.54,7.36 3.98,9.99l-24.14,48.27H0l42.49,112.92h111.11l42.5,-112.92H155.16zM78.09,147.41v-25.77h39.94v25.77H78.09zM118.03,159.51v19.36H78.09v-19.36H118.03zM39.06,147.49l-9.72,-25.85h36.64v25.78H39.08L39.06,147.49L39.06,147.49zM78.09,109.53V90.17h39.94v19.36H78.09zM130.13,121.64h36.63l-9.71,25.84v-0.07h-26.9v-25.77H130.13zM130.13,109.53V90.17h48.48l-7.28,19.36H130.13zM65.98,90.17v19.36H24.78l-7.28,-19.36H65.98zM43.59,159.51h22.39v19.36H50.87L43.59,159.51zM130.13,178.88v-19.36h22.39l-7.29,19.36H130.13z"/>
</vector>

BIN
app/src/main/res/drawable/pizzaleu_splash_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 249 KiB

BIN
app/src/main/res/drawable/pizzamax_splash_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 42 KiB

4
app/src/main/res/drawable/selector_bottom_navigation_item.xml
View File

@@ -3,8 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:color="@color/bottom_menu_selected_item"
android:color="@color/yellow"
android:state_checked="true" />
<item android:color="@color/white" />
<item android:color="@color/venus" />
</selector>

14
app/src/main/res/layout/activity_add_address.xml
View File

@@ -7,11 +7,11 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white"
tools:context="ch.pizzamaxx.android.activity.AddAddressActivity"
tools:context="ch.pizzaleu.android.activity.AddAddressActivity"
android:focusable="true"
android:focusableInTouchMode="true">
<ch.pizzamaxx.android.view.AppToolbar
<ch.pizzaleu.android.view.AppToolbar
android:id="@+id/addAddressToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -56,7 +56,7 @@
android:orientation="vertical"
android:background="@color/white">
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/address1PizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -64,7 +64,7 @@
app:inputType="address"
app:hint="@string/addres_line_1"/>
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/postcodePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -72,14 +72,14 @@
app:inputType="postcode"
app:hint="@string/postcode"/>
<ch.pizzamaxx.android.view.AppDropdownView
<ch.pizzaleu.android.view.AppDropdownView
android:id="@+id/cityPizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownTheme="navy"
app:dropdownHintView="@string/city"/>
<ch.pizzamaxx.android.view.AppDropdownView
<ch.pizzaleu.android.view.AppDropdownView
android:id="@+id/countryPizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -87,7 +87,7 @@
app:dropdownHintView="@string/country"
android:visibility="gone"/>
<ch.pizzamaxx.android.view.AppDropdownView
<ch.pizzaleu.android.view.AppDropdownView
android:id="@+id/zonePizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@@ -7,7 +7,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white"
tools:context="ch.pizzamaxx.android.activity.CampaignProductDetailsActivity">
tools:context="ch.pizzaleu.android.activity.CampaignProductDetailsActivity">
<ImageView
android:layout_width="36dp"

4
app/src/main/res/layout/activity_campaign_product_list.xml
View File

@@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="ch.pizzamaxx.android.activity.CampaignProductListActivity">
tools:context="ch.pizzaleu.android.activity.CampaignProductListActivity">
<ImageView
android:layout_width="match_parent"
@@ -13,7 +13,7 @@
android:scaleType="centerCrop"
android:src="@drawable/background_wood"/>
<ch.pizzamaxx.android.view.AppToolbar
<ch.pizzaleu.android.view.AppToolbar
android:id="@+id/campaignProductsAppToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"

6
app/src/main/res/layout/activity_create_order.xml
View File

@@ -8,9 +8,9 @@
android:background="@color/white"
android:focusable="true"
android:focusableInTouchMode="true"
tools:context="ch.pizzamaxx.android.activity.CreateOrderActivity">
tools:context="ch.pizzaleu.android.activity.CreateOrderActivity">
<ch.pizzamaxx.android.view.AppToolbar
<ch.pizzaleu.android.view.AppToolbar
android:id="@+id/orderToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"
tools:context="ch.pizzamaxx.android.activity.CreateOrderActivity">
tools:context="ch.pizzaleu.android.activity.CreateOrderActivity">
<LinearLayout
android:id="@+id/stepIndicatorLayout"

6
app/src/main/res/layout/activity_forgot_password.xml
View File

@@ -9,9 +9,9 @@
android:background="@color/white"
android:focusable="true"
android:focusableInTouchMode="true"
tools:context="ch.pizzamaxx.android.activity.ForgotPasswordActivity">
tools:context="ch.pizzaleu.android.activity.ForgotPasswordActivity">
<ch.pizzamaxx.android.view.AppToolbar
<ch.pizzaleu.android.view.AppToolbar
android:id="@+id/forgotPasswordPizzalinkToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
android:text="@string/reset_password_hint"
android:textColor="@color/white" />
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/forgotPasswordEmailPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@@ -7,11 +7,11 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white"
tools:context="ch.pizzamaxx.android.activity.LoginActivity"
tools:context="ch.pizzaleu.android.activity.LoginActivity"
android:focusable="true"
android:focusableInTouchMode="true">
<ch.pizzamaxx.android.view.AppToolbar
<ch.pizzaleu.android.view.AppToolbar
android:id="@+id/loginAppToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -42,14 +42,14 @@
android:src="@drawable/splash_logo"
android:layout_gravity="center_horizontal" />
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/emailPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/email"
app:inputType="email" />
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/passwordPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@@ -7,9 +7,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="ch.pizzamaxx.android.activity.MainActivity">
tools:context="ch.pizzaleu.android.activity.MainActivity">
<ch.pizzamaxx.android.view.AppToolbar
<ch.pizzaleu.android.view.AppToolbar
android:id="@+id/pizzalinkToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -173,7 +173,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_bottom_nav_item_cart_white"/>
android:src="@drawable/ic_bottom_nav_item_cart_gray"/>
<TextView
android:id="@+id/shoppingCartTextView"
@@ -181,7 +181,7 @@
android:layout_height="wrap_content"
android:text="@string/bottom_nav_menu_item_cart"
android:textSize="10sp"
android:textColor="@color/white"/>
android:textColor="@color/venus"/>
</LinearLayout>
@@ -196,7 +196,7 @@
android:layout_height="64dp"
android:background="@drawable/background_button_cart"
android:gravity="center"
android:src="@drawable/ic_bottom_nav_item_cart_white"
android:src="@drawable/ic_bottom_nav_item_cart_gray"
android:layout_alignParentBottom="true"
android:layout_centerInParent="true"
android:elevation="9dp"

4
app/src/main/res/layout/activity_my_addresses.xml
View File

@@ -6,9 +6,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
tools:context="ch.pizzamaxx.android.activity.MyAddressesActivity">
tools:context="ch.pizzaleu.android.activity.MyAddressesActivity">
<ch.pizzamaxx.android.view.AppToolbar
<ch.pizzaleu.android.view.AppToolbar
android:id="@+id/myAddressesToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@@ -8,11 +8,11 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white"
tools:context="ch.pizzamaxx.android.activity.OrderHistoryDetailsActivity"
tools:context="ch.pizzaleu.android.activity.OrderHistoryDetailsActivity"
android:focusable="true"
android:focusableInTouchMode="true">
<ch.pizzamaxx.android.view.AppToolbar
<ch.pizzaleu.android.view.AppToolbar
android:id="@+id/orderHistoryDetailsToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -53,32 +53,32 @@
android:orientation="vertical"
android:background="@color/white">
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderDatePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_date" />
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderStatusPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_status"
android:visibility="gone"/>
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderShippingTimePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_shipping_time" />
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderTotalPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_total" />
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderPaymentMethodPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -107,25 +107,25 @@
</LinearLayout>
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderFullnamePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_fullname" />
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderShippingMethodPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_shipping_method" />
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderShippingAddressPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_shipping_address" />
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderNotePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -133,12 +133,11 @@
<Button
android:id="@+id/repeatOrderButton"
android:textColor="@color/white"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@drawable/background_button_pizzapp_gray"
android:layout_margin="16dp"
android:textSize="12sp"
style="@style/PizzappGrayButtonWithoutMargin"
android:text="@string/repeat_order_uppercased"/>
<android.support.v4.widget.Space

26
app/src/main/res/layout/activity_register.xml
View File

@@ -7,11 +7,11 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white"
tools:context="ch.pizzamaxx.android.activity.RegisterActivity"
tools:context="ch.pizzaleu.android.activity.RegisterActivity"
android:focusable="true"
android:focusableInTouchMode="true">
<ch.pizzamaxx.android.view.AppToolbar
<ch.pizzaleu.android.view.AppToolbar
android:id="@+id/registerToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -41,76 +41,76 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/firstnamePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:inputType="name"
app:hint="@string/firstname"/>
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/lasstnamePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:inputType="name"
app:hint="@string/lastname"/>
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/telephonePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/telephone"
app:inputType="phone"/>
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/emailPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/email"
app:inputType="email"/>
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/passwordPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/password"
app:inputType="password"/>
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/passwordAgainPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/password_again"
app:inputType="password"/>
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/address1PizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:inputType="address"
app:hint="@string/addres_line_1"/>
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/postcodePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:inputType="postcode"
app:hint="@string/postcode"/>
<ch.pizzamaxx.android.view.AppDropdownView
<ch.pizzaleu.android.view.AppDropdownView
android:id="@+id/cityPizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownHintView="@string/city"/>
<ch.pizzamaxx.android.view.AppDropdownView
<ch.pizzaleu.android.view.AppDropdownView
android:id="@+id/countryPizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownHintView="@string/country"
android:visibility="gone"/>
<ch.pizzamaxx.android.view.AppDropdownView
<ch.pizzaleu.android.view.AppDropdownView
android:id="@+id/zonePizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"

10
app/src/main/res/layout/activity_splash.xml
View File

@@ -6,7 +6,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="ch.pizzamaxx.android.activity.SplashActivity"
tools:context="ch.pizzaleu.android.activity.SplashActivity"
android:background="@color/white">
<ImageView
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:src="@drawable/pizzamax_splash_logo"
android:src="@drawable/pizzaleu_splash_logo"
android:adjustViewBounds="true"
android:layout_margin="16dp"
android:scaleType="fitXY" />
@@ -50,7 +50,7 @@
android:text="@string/choose_post_code"
android:layout_centerInParent="true"
android:textSize="12sp"
android:textColor="@color/white"/>
android:textColor="@color/main_black"/>
<ImageView
android:layout_width="12dp"
@@ -58,7 +58,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:src="@drawable/ic_down_black"
android:tint="@color/white"
android:tint="@color/main_black"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:layout_centerVertical="true"/>
@@ -68,7 +68,7 @@
<Button
android:id="@+id/choosePostCodeButton"
android:background="@drawable/background_button_pizzapp_gray"
android:textColor="@color/white"
android:textColor="@color/yellow"
android:textSize="12sp"
android:textAllCaps="false"
android:layout_width="match_parent"

10
app/src/main/res/layout/activity_update_password.xml
View File

@@ -8,9 +8,9 @@
android:background="@color/white"
android:focusable="true"
android:focusableInTouchMode="true"
tools:context="ch.pizzamaxx.android.activity.UpdatePasswordActivity">
tools:context="ch.pizzaleu.android.activity.UpdatePasswordActivity">
<ch.pizzamaxx.android.view.AppToolbar
<ch.pizzaleu.android.view.AppToolbar
android:id="@+id/updatePasswordToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/oldPasswordPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
app:inputType="password"
app:hint="@string/hint_old_password"/>
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/newPasswordPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
app:inputType="password"
app:hint="@string/hint_new_password"/>
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/confirmNewPasswordPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@@ -8,9 +8,9 @@
android:background="@color/white"
android:focusable="true"
android:focusableInTouchMode="true"
tools:context="ch.pizzamaxx.android.activity.UpdateProfileActivity">
tools:context="ch.pizzaleu.android.activity.UpdateProfileActivity">
<ch.pizzamaxx.android.view.AppToolbar
<ch.pizzaleu.android.view.AppToolbar
android:id="@+id/updateProfileToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
android:orientation="vertical"
android:layout_above="@+id/updateProfileButton">
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/firstnamePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -55,7 +55,7 @@
app:inputType="name"
app:hint="@string/firstname"/>
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/lasstnamePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -63,7 +63,7 @@
app:inputType="name"
app:hint="@string/lastname"/>
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/telephonePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
app:hint="@string/telephone"
app:inputType="phone"/>
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/emailPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@@ -11,7 +11,7 @@
android:focusable="true"
android:focusableInTouchMode="true">
<ch.pizzamaxx.android.view.AppEditText
<ch.pizzaleu.android.view.AppEditText
android:id="@+id/orderNotePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@@ -23,32 +23,32 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderPersonFullnamePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_person_fullname" />
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderShippingMethodPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_shipping_method" />
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderShippingAddressPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_shipping_address" />
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderPaymentMethodPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_payment_method" />
<!--
<pizzamaxxxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderTotalPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -97,7 +97,7 @@
android:layout_height="wrap_content"
android:scrollbars="none"/>
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/orderNotePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@@ -34,37 +34,37 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/pizzapassCountPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/pizza_pass" />
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/kebappassCountPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/kebap_pass" />
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/firstnamePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/profile_firstname" />
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/lastnamePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/profile_lastname" />
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/emailPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/profile_email" />
<ch.pizzamaxx.android.view.AppInfoView
<ch.pizzaleu.android.view.AppInfoView
android:id="@+id/phonePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"

10
app/src/main/res/layout/layout_pizzalink_toolbar.xml
View File

@@ -32,6 +32,7 @@
android:padding="20dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_hamburger_menu"
android:tint="@color/yellow"
android:visibility="gone"/>
<ImageView
@@ -41,7 +42,7 @@
android:padding="20dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_cancel"
android:tint="@color/white"
android:tint="@color/yellow"
android:visibility="gone"/>
<ImageView
@@ -51,6 +52,7 @@
android:padding="20dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_back"
android:tint="@color/yellow"
android:visibility="gone"/>
<TextView
@@ -59,7 +61,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:textSize="18sp"
android:textColor="@color/white"
android:textColor="@color/yellow"
fontPath="fonts/Quicksand-Bold.ttf"
android:visibility="gone"/>
@@ -70,8 +72,8 @@
android:layout_alignParentEnd="true"
android:padding="12dp"
android:layout_centerVertical="true"
android:tint="@color/white"
android:src="@drawable/pizzamaxx_logo" />
android:tint="@color/yellow"
android:src="@drawable/pizzaleu_logo" />
</RelativeLayout>

4
app/src/main/res/layout/row_menu_product.xml
View File

@@ -73,7 +73,7 @@
android:id="@+id/productPriceTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textColor="@color/main_black"
android:padding="17dp"
android:gravity="center_horizontal"
fontPath="fonts/Quicksand-Bold.ttf"
@@ -89,7 +89,7 @@
android:layout_alignParentEnd="true"
android:padding="6dp"
android:layout_margin="8dp"
android:tint="@color/white"/>
android:tint="@color/main_black"/>
</RelativeLayout>

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 41 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 69 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 34 KiB

244
app/src/main/res/values-fr/strings.xml
View File

@@ -1,244 +0,0 @@
<resources>
<!-- General-->
<string name="app_name">PizzaMaxx</string>
<string name="something_went_wrong">Une erreur s\'est formée.</string>
<string name="alert">Attention</string>
<string name="error_message">Une erreur s\'est formée.</string>
<string name="bad_request">Mauvaise Demande</string>
<string name="failed">Erreur de connexion</string>
<string name="ok">D\'accord</string>
<string name="cancel">Sortir</string>    
<string name="loading">Veuillez attendre..</string>    
<string name="month_name_january">Janvier</string>    
<string name="month_name_february">Février</string>    
<string name="month_name_march">Mars</string>    
<string name="month_name_april">Avril</string>    
<string name="month_name_may">Mai</string>    
<string name="month_name_jun">Juin</string>    
<string name="month_name_july">Juillet</string>  
<string name="month_name_august">Août</string>    
<string name="month_name_september">Septembre</string>    
<string name="month_name_october">Octobre</string>  
<string name="month_name_november">Novembre</string> 
<string name="month_name_december">Décembre</string>
<string name="chf">CHF</string> 
<string name="empty_description">..</string>
<string name="choose">Choisir</string>
<string name="need_to_login_for_shopping">Veuillez entrer, vous devez vous inscrire pour passer une commande.</string>
<string name="need_to_login_for_that_part">Vous devez vous inscrire pour visiter cette page.</string>
<string name="cancel_all_caps">SORTIR</string>
<!-- General-->
<!-- SplashActivity -->  
<string name="no_network_message">Pas de connexion Internet, Veuillez réessayer plus tard.</string>
<string name="alert_update_app">Vous devez mettre à jour pour continuer à utiliser l\'application Pizzamaxx.</string>
<string name="update_app">Mettre à jour</string>
<string name="choose_store">Sélectionnez le code postal</string>
<string name="choose_post_code">Code Postal</string>
<string name="choose_post_code_button">ALLER!</string>
<!-- SplashActivity -->
<!-- LoginActivity-->
<string name="activity_title_login">Entrer</string>
<string name="button_login">ENTRER</string>
<string name="not_have_an_accaount">Votre compte n\est pas présent?</string>
<string name="register_text">S\'INSCRIRE</string>    
<string name="forgot_password_hint">Vous avez oublié votre mot de passe?</string>  
<string name="reset_password"><b><u>\nRÉINITIALISER LE MOT DE PASSE</u></b></string>
<string name="login_as_guest">Entrer en tant que visiteur</string>
<!-- LoginActivity-->
<!-- ForgotPasswordActivity-->
<string name="activity_title_forgot_password">Mot de passe oublié</string>    
<string name="reset_password_hint">Suivre les indicateurs pour continuer en entrant votre adresse e-mail enregistrée.</string>
    
<string name="reset_password_button">ENVOYER</string>    
<string name="password_reset">Les renseignements nécessaires ont été envoyés à votre adresse e-mail. Suivre les indicateurs pour réinitialiser votre mot de passe</string>
<!-- ForgotPasswordActivity-->
<!-- RegisterActivity-->
<string name="activity_title_register">S\'inscrire</string>    
<string name="firstname">Prénom</string>    
<string name="lastname">Nom de famille</string>    
<string name="telephone">Natel</string>    
<string name="email">Adresse e-mail</string>    
<string name="password">Mot de passe</string>    
<string name="password_again">Mot de passe (à nouveau)</string>    
<string name="addres_line_1">Adresse</string>    
<string name="addres_line_2">Adresse 2</string>    
<string name="city">Ville</string>    
<string name="postcode">Code Postal</string>    
<string name="zone">Région</string>    
<string name="country">Pays</string> 
<string name="alert_fill_all_fields">Veuillez compléter tous les espaces.</string>    
<string name="alert_invalid_email">Veuillez entrer votre e-mail.</string>  
<string name="alert_passwords_not_matched">Les mots de passe sont différents.</string>    
<string name="alert_invalid_post_code">Veuillez entrer un code postal valide.</string> 
  
<string name="alert_select_country_first">Veuillez d\'abord sélectionner le pays.</string>    
<string name="button_register">S\'INSCRIRE</string>
<!-- RegisterActivity-->
<!-- MainAcitivity -->    
<string name="bottom_nav_menu_item_menu">Menu</string>    
<string name="bottom_nav_menu_item_cart">Panier</string>    
<string name="bottom_nav_menu_item_history">Antécédent de commande</string>    
<string name="bottom_nav_menu_item_profile">Mon compte</string>    
<string name="bottom_nav_menu_item_info">Renseignement</string>
<string name="cart_total">Sous-Total</string>
<string name="store_minimum_price">Minimum de commande (Seulement à la livraison)</string>
<!-- MainAcitivity -->
<!-- ProductPropertiesBottomSheetDialog -->    
<string name="add_to_cart">AJOUTER AU PANIER</string>    
<string name="count">Quantité</string>    
<string name="no_options_selected_part">Non-sélectionné</string>
<string name="cannot_use_campaign">L\'offre ne peut pas être utilisée car elle a été utilisée auparavant.</string>
<string name="restaurant_out_of_order">Vous êtes actuellement en dehors des horaires de commande. Veuillez entrer un moment valide.</string>
<string name="restaurant_out_of_order_on_selected_date">Le restaurant est fermé à la date et l\'heure sélectionnés. Souhaitez-vous entrer un autre temps?</string>
<!-- ProductPropertiesBottomSheetDialog -->
<!-- CartFragment-->    
<string name="continue_cart">Continuer</string>    
<string name="clear_cart">SUPPRIMER TOUT</string>    
<string name="no_product_on_cart">Pas de produit dans le panier.</string>    
<string name="alert_remove_prdocut_from_cart">Souhaitez-vous supprimer le produit de votre panier?</string>
    
<string name="product_removed_from_cart">Le produit a été supprimé du panier.</string>    
<string name="alert_clear_cart">Souhaitez-vous supprimer tous les produits du panier?</string>
<string name="minimum_order_price_alert_part_1">Votre total de produits du panier n\'est pas suffisant</string>
<string name="minimum_order_price_alert_part_2">pour pouvoir passer une commande.</string>
<!-- CartFragment-->
<!-- OrderHistoryFragment-->
<string name="order_history_total">Montant total :</string>    
<string name="order_history_date">Date</string>    
<string name="order_history_status">Situation</string>
<string name="repeat_order_lowercased"><u>Répéter la commande</u></string>
<!-- OrderHistoryFragment-->
<!-- OrderHistoryDetailsActivity-->
<string name="activity_title_order_history_details">Détail de la commande</string>    
<string name="order_history_order_date">DATE DE LA COMMANDE</string>    
<string name="order_history_order_status">SITUATION</string>    
<string name="order_history_order_shipping_time">TEMPS D\'ENVOIE</string>    
<string name="order_history_order_total">SOUS-TOTAL</string>    
<string name="order_history_order_payment_method">MÉTHODE DE PAIEMENT</string>    
<string name="order_products">LES PRODUITS</string>    
<string name="order_history_order_fullname">NOM COMPLET</string>    
<string name="order_history_order_shipping_method">TYPE D\'ENVOIE</string>    
<string name="order_history_order_shipping_address">ADRESSE D\'ENVOIE</string>     
<string name="order_history_order_note">REMARQUES</string> 
<string name="repeat_order_uppercased">RÉPÉTER LA COMMANDE</string>
<!-- OrderHistoryDetailsActivity-->
<!-- CreateOrderActivity --> 
<string name="activity_title_create_order">Passer la commande</string>    
<string name="next">APRÈS</string>    
<string name="previous">AVANT</string>    
<string name="confirm_order">PASSER LA COMMANDE MAINTENANT</string>    
<string name="done_order">PRÊT</string>    
<string-array name="stepperLabels">
<item>Envoie</item>
<item>Adresse</item>        
<item>Paiement</item>
<item>Remarque</item>        
<item>Résumé</item>    
</string-array>
<!-- CreateOrderActivity -->
<!-- ShippingMethodFragment-->    
<string name="alert_choose_shipping_method">Veuillez sélectionner le type d\'envoie</string>
<string name="shipping_method_info">Montant de commande minimum pour l\'envoie gratuit</string>
<!-- ShippingMethodFragment-->
    
<!-- ShippingAddressFragment-->
<string name="add_new_shipping_address">AUTRE ADRESSE</string>
<string name="alert_choose_shipping_address">Sélectionner l\'adresse d\'envoie ou entrer une nouvelle adresse d\'envoie.</string>
<!-- ShippingAddressFragment-->
<!-- PaymentMethodFragment-->
<string name="alert_choose_payment_method">Veuillez sélectionner une méthode de paiement.</string>
<string name="coupon_code">Code de cadeau (optionnel)</string>
<string name="payment_method">Méthode de paiement</string>
<string name="coupon_used_dialog_title">Code Promotionnel</string>
<string name="coupon_used_dialog_content_part_1">Vous avez activé votre code de cadeau</string>
<string name="coupon_used_dialog_content_part_2">rachetés.</string>
<string name="coupon_is_not_active">Le code de cadeau n\'est pas valide.</string>
<!-- PaymentMethodFragment-->
<!-- CreateOrderNoteFragment-->
<string name="order_note">À quoi faire attention?</string>
<string name="slice_pizza_for_customer">Aus Gründen der Qualität empfehlen wir nicht, die Pizza zu schneiden</string>
<string name="slice_pizza">Bitte Pizza Schneiden</string>
<string name="do_not_slice_pizza">Nein, bitte Pizza nicht schneiden</string>
<!-- CreateOrderNoteFragment-->
<!-- CreateOrderSummaryFragment-->    
<string name="order_person_fullname">NOM COMPLET</string>    
<string name="order_shipping_method">TYPE D\'ENVOIE</string>    
<string name="order_shipping_address">ADRESSE D\'ENVOIE</string>    
<string name="order_payment_method">MÉTHODE DE PAIEMENT</string>    
<string name="order_product_list">PANIER</string>    
<string name="order_total">TOTAL DE LA COMMANDE</string>
<string name="order_notee">REMARQUES</string>
<string name="slice_pizza_for_store">Die Pizza zu schneiden</string>
<string name="delivery_date">Date de livraison:</string>
<string name="delivery_time">Temps d\'envoie:</string>
<string name="today">Aujourd\hui</string>
<string name="unknown_payment_method">Méthode de paiement inconnue.</string>
<string name="payment_canceled">Le paiement a été annulé.</string>
<string name="andorid_pay_not_found">Android pay non trouvé.</string>
<!-- CreateOrderSummaryFragment-->
<!-- CreateOrderResultFragment-->
<string name="order_successed">Votre commande a été reçue avec succès par notre restaurant. Si le e-mail d\'approbation n\'a pas été reçu, veuillez contrôler le classeur des spams. Si vous n\'avez pas reçu le SMS d\'approbation sur la commande, veuillez contrôler du profil votre numéro de téléphone mobile. Merci pour votre commande.</string>
<string name="accept_campaign">OUI</string>
<string name="decline_campaign">NO</string>
<!-- CreateOrderSummaryFragment-->
<!-- ProfileFragment-->    
<string name="pizza_pass">PIZZA PASS</string> 
<string name="kebap_pass">KEBAP PASS</string>      
<string name="profile_firstname">PRÉNOM</string>    
<string name="profile_lastname">NOM DE FAMILLE</string>    
<string name="profile_telephone">NATEL</string>    
<string name="profile_email">ADRESSE E-MAIL</string>    
<string name="my_addresses">Mes adresses</string>    
<string name="update_profile">Mettre à jour le profil</string>    
<string name="update_password">Mettre à jour le mot de passe</string>    
<string name="enable_notifications">Activer les messages</string>    
<string name="change_post_code">Modifier le Code Postal</string>    
<string name="alert_logout">Vous voulez sortir?</string>
<string name="button_logout">Sortir</string> 
<!-- ProfileFragment-->
<!-- UpdateProfilectivity-->
<string name="activity_title_update_profile">Mettre à jour le profil</string>
<string name="profile_updated">Votre profil a été mis à jour avec succès.</string>
<!-- UpdateProfilectivity-->
<!-- UpdatePasswordActivity-->    
<string name="activity_title_update_password">Mettre à jour le mot de passe</string>    
<string name="hint_old_password">Ancien mot de passe</string>    
<string name="hint_new_password">Nouveau mot de passe</string>    
<string name="hint_confirm_new_password">Nouveau mot de passe (Essayer à nouveau)</string>    
<string name="password_updated">Votre mot de passe a été modifié avec succès.</string>
<!-- UpdatePasswordActivity-->
<!-- MyAddressesActivity-->    
<string name="activity_title_my_addresses">Mes adresses</string>    
<string name="add_new_address">AJOUTER UNE NOUVELLE ADRESSE</string>    
<string name="alert_delete_address">Vous souhaitez supprimer cette adresse?</string>    
<string name="address_deleted"> Votre adresse a été supprimée.</string>
<!-- MyAddressesActivity-->
<!-- AddAddressActivity-->
<string name="activity_title_add_address">Ajouter une nouvelle adresse</string> 
<string name="add">AJOUTER</string>    
<string name="new_address_added"> L\'adresse a été ajoutée avec succès.</string>
<!-- AddAddressActivity-->
</resources>

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

@@ -16,7 +16,7 @@
<color name="bottom_menu_selected_item">#f15d51</color>
<color name="bottom_menu_unselected_item">#ffffff</color>
<color name="navigation_drawer_background">#4C4B4A</color>
<color name="main_black">#231F20</color><!--#232b2b-->
<color name="main_black">#000000</color><!--#232b2b-->
<color name="black">#000000</color>
<color name="row_product_ingredients_background">#EBECEC</color>
<color name="transparent_white">#33ffffff</color>
@@ -49,6 +49,7 @@
<color name="heater">#ABB6C2</color>
<color name="yellow">#FAC30A</color>
</resources>

2
app/src/main/res/values/ic_launcher_background.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#D03F3F</color>
<color name="ic_launcher_background">#000000</color>
</resources>

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

@@ -1,7 +1,7 @@
<resources>
<!-- General-->
<string name="app_name">PizzaMaxx</string>
<string name="app_name">Pizza Leu</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>

8
app/src/main/res/values/styles.xml
View File

@@ -61,15 +61,15 @@
-->
<style name="PizzappButtonWithoutMargin">
<item name="android:background">@drawable/background_button_enabled_gray</item>
<item name="android:textColor">@color/main_black</item>
<item name="android:background">@drawable/background_button_pizzapp_gray</item>
<item name="android:textColor">@color/yellow</item>
<item name="android:textSize">12sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="PizzappGrayButtonWithoutMargin">
<item name="android:background">@drawable/background_button_pizzapp_gray</item>
<item name="android:textColor">@color/white</item>
<item name="android:textColor">@color/yellow</item>
<item name="android:textSize">12sp</item>
<item name="android:textAllCaps">false</item>
</style>
@@ -77,7 +77,7 @@
<style name="PizzappGrayButton" parent="PizzappButtonWithoutMargin">
<item name="android:background">@drawable/background_button_pizzapp_gray</item>
<item name="android:textColor">@color/white</item>
<item name="android:textColor">@color/yellow</item>
<item name="android:layout_marginLeft">24dp</item>
<item name="android:layout_marginStart">24dp</item>
<item name="android:layout_marginRight">24dp</item>