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

coupon code addded and api base url changed

Browse Source
This commit is contained in:
cimenmus
2018-02-14 21:58:42 +03:00
parent d100fdf6d2
commit 2f57316d7a
6 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -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 {

2
app/release/output.json
View File

@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4},"path":"app-release.apk","properties":{"packageId":"ch.pizzalink.android","split":"","minSdkVersion":"16"}}]
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5},"path":"app-release.apk","properties":{"packageId":"ch.pizzalink.android","split":"","minSdkVersion":"16"}}]

2
app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java
View File

@@ -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;

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

@@ -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"

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

@@ -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"

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

@@ -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-->