From 2f57316d7a96cc5cc8dad9edb76de0f4358d3af2 Mon Sep 17 00:00:00 2001
From: cimenmus <cimenmus@macbook-MacBook-Pro.local>
Date: Wed, 14 Feb 2018 21:58:42 +0300
Subject: [PATCH] coupon code addded and api base url changed

---
 app/build.gradle                              |  4 +--
 app/release/output.json                       |  2 +-
 .../pizzalink/android/api/ApiEndPoints.java   |  2 +-
 .../layout/activity_product_properties.xml    |  6 ++--
 app/src/main/res/layout/row_menu_product.xml  | 28 +++++++++++++------
 app/src/main/res/values/strings.xml           | 18 ++++++------
 6 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6344d9f..a2ab108 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "ch.pizzalink.android"
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 4   // play store'daki version : 3
-        versionName "1.12"   // play store'daki version : 1.11
+        versionCode 6   // play store'daki version : 5
+        versionName "1.14"   // play store'daki version : 1.13
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/release/output.json b/app/release/output.json
index 8e8a69c..03e5913 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4},"path":"app-release.apk","properties":{"packageId":"ch.pizzalink.android","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5},"path":"app-release.apk","properties":{"packageId":"ch.pizzalink.android","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
diff --git a/app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java
index cbc5fff..ae0c378 100644
--- a/app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java
+++ b/app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java
@@ -2,7 +2,7 @@ package ch.pizzalink.android.api;
 
 public class ApiEndPoints {
 
-    private static final String PREFIX = "pizza2/index.php?route=mobile/service/";
+    private static final String PREFIX = "pizza/index.php?route=mobile/service/";
     private static final String SUFFIX = "&is_mobile=1";
 
     public static final String API_GET_ALL_CATEGORIES = PREFIX + "getAllCategories" + SUFFIX;
diff --git a/app/src/main/res/layout/activity_product_properties.xml b/app/src/main/res/layout/activity_product_properties.xml
index c2d774e..d7ca6bc 100644
--- a/app/src/main/res/layout/activity_product_properties.xml
+++ b/app/src/main/res/layout/activity_product_properties.xml
@@ -50,8 +50,8 @@
                 android:id="@+id/productImageView"
                 android:layout_width="120dp"
                 android:layout_height="120dp"
-                android:layout_marginLeft="12dp"
-                android:layout_marginStart="12dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginStart="24dp"
                 android:layout_marginRight="12dp"
                 android:layout_marginEnd="12dp"
                 android:layout_gravity="center_horizontal" />
@@ -102,7 +102,7 @@
             android:id="@+id/productDescriptionTextView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingTop="12dp"
+            android:paddingTop="24dp"
             android:paddingBottom="12dp"
             android:paddingLeft="24dp"
             android:paddingStart="24dp"
diff --git a/app/src/main/res/layout/row_menu_product.xml b/app/src/main/res/layout/row_menu_product.xml
index 2f1d3aa..983ef1b 100644
--- a/app/src/main/res/layout/row_menu_product.xml
+++ b/app/src/main/res/layout/row_menu_product.xml
@@ -28,17 +28,27 @@
 
     </RelativeLayout>
 
-    <!-- android:background="@color/transparent_white" -->
-    <ImageView
-        android:id="@+id/productImageView"
+
+
+    <RelativeLayout
         android:layout_width="160dp"
         android:layout_height="160dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginEnd="12dp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:layout_marginStart="12dp"
-        android:background="@color/white"/>
+        android:background="@color/white">
+
+        <!-- android:background="@color/transparent_white" -->
+        <ImageView
+            android:id="@+id/productImageView"
+            android:layout_width="120dp"
+            android:layout_height="120dp"
+            android:layout_centerInParent="true"
+            android:layout_marginEnd="12dp"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="12dp"
+            android:layout_marginStart="12dp"
+            android:scaleType="centerCrop"
+            android:background="@color/white"/>
+
+    </RelativeLayout>
 
     <RelativeLayout
         android:id="@+id/productIngredientsLayout"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b697e03..4a75228 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,16 +12,16 @@
     <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_march">März</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_may">Mai</string>    
+    <string name="month_name_jun">Juni</string>    
+    <string name="month_name_july">Juli</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_september">Sept.</string>    
+    <string name="month_name_october">Okt.</string>  
     <string name="month_name_november">Nov.</string> 
-    <string name="month_name_december">Dec.</string>
+    <string name="month_name_december">Dez.</string>
     <string name="chf">CHF</string> 
     <string name="empty_description">..</string>
     <string name="choose">Wählen</string>
@@ -86,7 +86,7 @@
 
     <!-- ProductPropertiesBottomSheetDialog -->    
     <string name="add_to_cart">IN DEN WARENKORB LEGEN</string>    
-    <string name="count">Betrag</string>    
+    <string name="count">Stückzahl</string>    
     <string name="no_options_selected_part">wurde nicht ausgewählt.</string>
     <!-- ProductPropertiesBottomSheetDialog -->
 
@@ -146,7 +146,7 @@
     <string name="alert_choose_payment_method">Bitte wählen Sie ein Bezahlverfahren aus.</string>
     <string name="coupon_code">Gutscheincode (Wahlweise)</string>
     <string name="payment_method">Bezahlverfahren</string>
-    <string name="coupon_is_not_active">Coupon is not active.</string>
+    <string name="coupon_is_not_active">Der Coupon ist nicht aktiv.</string>
     <!-- PaymentMethodFragment-->
 
     <!-- CreateOrderNoteFragment-->