From e544b34cc2bc354fdde943874eacb491cadef433 Mon Sep 17 00:00:00 2001
From: cimenmus <cimenmus@macbook-MacBook-Pro.local>
Date: Wed, 27 Jun 2018 00:10:08 +0300
Subject: [PATCH] tesxts fix

---
 .idea/caches/build_file_checksums.ser | Bin 538 -> 538 bytes
 .idea/misc.xml                        |   2 +-
 app/build.gradle                      |   6 +++---
 app/release/output.json               |   2 +-
 app/src/main/res/values/strings.xml   |   8 +++++---
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index d8f686db61fb33e62f7717f11523927bb14b396d..1102e95f02c02bfde0e3d884af7cc53ac4535da9 100644
GIT binary patch
delta 33
pcmbQmGK*!x3>MqBhr2e;$z>E=)MD8k{CW9S&(m$a<}Hg|D**g~4|)Iq

delta 33
rcmV++0N($a1eyepm;^DZF3ho<Z2=J|(z?vjq`qf1Du&(G)|@$b^{Nly

diff --git a/.idea/misc.xml b/.idea/misc.xml
index c0f68ed..99202cc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -25,7 +25,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index c3c3e73..38a5323 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "ch.pizzapp.capri"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 5  // play store'daki version : 4
-        versionName "2.1"   // play store'daki version : 2.0
+        versionCode 6  // play store'daki version : 4
+        versionName "2.0"   // play store'daki version : 2.0
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -21,7 +21,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support.constraint:constraint-layout:1.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
diff --git a/app/release/output.json b/app/release/output.json
index 0d530ea..41524b3 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"2.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5,"versionName":"2.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 058842b..667fc61 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,13 +174,15 @@
     <string name="delivery_date">Lieferungsdatum:</string>
     <string name="delivery_time">Lieferungszeit:</string>
     <string name="today">HEUTE</string>
+    <string name="unknown_payment_method">Unbekannte Zahlungsmethode.</string>
+    <string name="payment_canceled">Die Zahlung wurde storniert.</string>
+    <string name="andorid_pay_not_found">Android Pay konnte nicht finden.</string>
     <!-- CreateOrderSummaryFragment-->
 
     <!-- CreateOrderResultFragment-->
     <string name="order_successed">Ihre Bestellung ist erfolgreich. Ihre Bestellübersicht werden in der Bestellungshistorie angezeigt und kann dort verfolgt werden.</string>
-    <!-- tr -->
-    <string name="accept_campaign">EVET</string>
-    <string name="decline_campaign">HAYIR</string>
+    <string name="accept_campaign">JA</string>
+    <string name="decline_campaign">NEIN</string>
     <!-- CreateOrderSummaryFragment-->
 
     <!-- ProfileFragment-->