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

campaign fix

Browse Source
This commit is contained in:
cimenmus
2018-06-12 21:26:45 +03:00
parent 87f3596b50
commit b716af3bf4
21 changed files with 950 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

261
app/src/main/res/layout/activity_campaign_product_details.xml Normal file
View File

@@ -0,0 +1,261 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white"
tools:context="ch.pizzapp.android.activity.CampaignProductDetailsActivity">
<ImageView
android:layout_width="36dp"
android:layout_height="36dp"
android:padding="12dp"
android:src="@drawable/ic_back"
android:visibility="gone"/>
<!-- android:background="@color/cart_dialog_background" -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:focusable="true"
android:focusableInTouchMode="true"
android:background="@color/white">
<ImageView
android:id="@+id/backIcon"
android:layout_width="36dp"
android:layout_height="36dp"
android:src="@drawable/ic_back"
android:tint="@color/red"
android:padding="8dp"
android:visibility="gone"/>
<ImageView
android:id="@+id/closeImageView"
android:layout_width="36dp"
android:layout_height="36dp"
android:src="@drawable/ic_cancel"
android:layout_gravity="right|end"
android:padding="12dp"
android:visibility="visible"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/productImageView"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_marginLeft="24dp"
android:layout_marginStart="24dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"
android:layout_gravity="center_horizontal" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginRight="12dp"
android:layout_centerVertical="true"
android:layout_marginEnd="12dp"
android:layout_toRightOf="@+id/productImageView"
android:layout_toEndOf="@+id/productImageView">
<TextView
android:id="@+id/productNameTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/navy"
android:textSize="18sp"
android:padding="12sp"
android:text="Pizza Formaggio"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_gravity="center"
android:gravity="center" />
<TextView
android:id="@+id/productPriceTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/red"
android:text="CHF 25.00"
android:textSize="18sp"
android:paddingBottom="12dp"
android:paddingLeft="12dp"
android:paddingStart="12dp"
android:paddingRight="12dp"
android:paddingEnd="12dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_gravity="center"
android:gravity="center" />
</LinearLayout>
</RelativeLayout>
<TextView
android:id="@+id/productDescriptionTextView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="24dp"
android:paddingBottom="12dp"
android:paddingLeft="24dp"
android:paddingStart="24dp"
android:paddingRight="24dp"
android:paddingEnd="24dp"
android:textColor="@color/navy"
android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>
<Button
android:id="@+id/addToCartButton"
android:layout_width="match_parent"
android:layout_height="48dp"
android:text="@string/add_to_cart"
style="@style/PizzalinkRedButton"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fontPath="fonts/Quicksand-Bold.ttf"
android:text="@string/count"
android:paddingTop="12dp"
android:paddingLeft="12dp"
android:paddingStart="12dp"
android:paddingRight="12dp"
android:paddingEnd="12dp"
android:textSize="16sp"
android:textColor="@color/navy"/>
<RelativeLayout
android:id="@+id/ProductCountLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_margin="12dp">
<ImageView
android:id="@+id/deccreaseProductCountImageView"
android:layout_width="24dp"
android:layout_height="24dp"
android:padding="4dp"
android:src="@drawable/ic_decrease"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:layout_alignParentBottom="true"
android:visibility="gone"/>
<TextView
android:id="@+id/productCountTextView"
android:layout_width="24dp"
android:gravity="center"
android:layout_height="wrap_content"
android:text="1"
android:includeFontPadding="false"
android:lineSpacingExtra="0dp"
android:textSize="24sp"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_toRightOf="@+id/deccreaseProductCountImageView"
android:layout_toEndOf="@+id/deccreaseProductCountImageView"
android:layout_alignParentBottom="true"
android:textColor="@color/navy"/>
<ImageView
android:id="@+id/increaseProductCountImageView"
android:layout_width="24dp"
android:layout_height="24dp"
android:padding="4dp"
android:layout_gravity="center_vertical"
android:layout_toRightOf="@+id/productCountTextView"
android:layout_toEndOf="@+id/productCountTextView"
android:src="@drawable/ic_increase"
android:layout_alignParentBottom="true"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:visibility="gone"/>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/navy"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"/>
<TextView
android:id="@+id/radioRecyclerHeaderTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fontPath="fonts/Quicksand-Bold.ttf"
android:padding="12dp"
android:visibility="gone"
android:text="Size"
android:textSize="16sp"
android:textColor="@color/navy"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/radioRecyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"/>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/navy"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"/>
<TextView
android:id="@+id/checkboxRecyclerHeaderTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fontPath="fonts/Quicksand-Bold.ttf"
android:padding="12dp"
android:visibility="gone"
android:textSize="16sp"
android:textColor="@color/navy"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/checkboxRecyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"/>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</LinearLayout>
</LinearLayout>

32
app/src/main/res/layout/activity_campaign_product_list.xml Normal file
View File

@@ -0,0 +1,32 @@
<?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"
tools:context="ch.pizzapp.android.activity.CampaignProductListActivity">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/background_wood"/>
<ch.pizzapp.android.view.AppToolbar
android:id="@+id/campaignProductsAppToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
app:showCloseIcon="true"
app:title="@string/activity_title_login"
app:titleTextColor="@color/navy" />
<android.support.v7.widget.RecyclerView
android:id="@+id/campaignProductRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
android:layout_below="@+id/campaignProductsAppToolbar"/>
</RelativeLayout>

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

@@ -74,7 +74,7 @@
<com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx
android:id="@+id/bottomNavigationView"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="?android:attr/actionBarSize"
app:itemIconTint="@drawable/selector_bottom_navigation_item"
app:itemTextColor="@drawable/selector_bottom_navigation_item"
android:background="@color/navy"

0
app/src/main/res/layout/activity_product_properties.xml → app/src/main/res/layout/activity_product_details.xml
View File

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

@@ -14,7 +14,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize">
android:layout_height="?android:attr/actionBarSize">
<TextView
android:id="@+id/previousTextView"

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

@@ -6,7 +6,7 @@
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="?android:attr/actionBarSize"
android:contentInsetLeft="0dp"
android:contentInsetStart="0dp"
app:contentInsetLeft="0dp"
@@ -27,17 +27,27 @@
<ImageView
android:id="@+id/hamburgerIcon"
android:layout_width="?attr/actionBarSize"
android:layout_height="?attr/actionBarSize"
android:layout_width="?android:attr/actionBarSize"
android:layout_height="?android:attr/actionBarSize"
android:padding="20dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_hamburger_menu"
android:visibility="gone"/>
<ImageView
android:id="@+id/closeIcon"
android:layout_width="?android:attr/actionBarSize"
android:layout_height="?android:attr/actionBarSize"
android:padding="20dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_cancel"
android:tint="@color/white"
android:visibility="gone"/>
<ImageView
android:id="@+id/backIcon"
android:layout_width="?attr/actionBarSize"
android:layout_height="?attr/actionBarSize"
android:layout_width="?android:attr/actionBarSize"
android:layout_height="?android:attr/actionBarSize"
android:padding="20dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_back"
@@ -54,8 +64,8 @@
android:visibility="gone"/>
<ImageView
android:layout_width="?attr/actionBarSize"
android:layout_height="?attr/actionBarSize"
android:layout_width="?android:attr/actionBarSize"
android:layout_height="?android:attr/actionBarSize"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:padding="12dp"

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

@@ -4,6 +4,7 @@
<declare-styleable name="AppToolbar">
<attr name="showHamburgerMenuIcon" format="boolean" />
<attr name="showBackIcon" format="boolean" />
<attr name="showCloseIcon" format="boolean" />
<attr name="title" format="string" />
<attr name="toolbarBackgroundColor" format="reference" />
<attr name="toolbarTitleTextColor" format="reference" />

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

@@ -31,8 +31,10 @@
<!-- General-->
<!-- 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="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 -->
@@ -48,7 +50,8 @@
<!-- 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_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-->
@@ -70,7 +73,8 @@
<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_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-->
@@ -97,7 +101,8 @@
<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="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-->